From 01ae7d7f7ccc15fcb89fc8709b3a9474a95d1086 Mon Sep 17 00:00:00 2001
From: "John W. Parent" <45471568+johnwparent@users.noreply.github.com>
Date: Tue, 12 Sep 2023 23:23:57 -0400
Subject: [PATCH 01/35] Examples: add missing include (#331)

example_utilities.hpp requires `stoi` and similar methods. These are
declared in `<string>`, but `<string>` is not included. This means this
file will break any TU it's included in.

Resolves #330

Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 examples/utilities/example_utilities.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/examples/utilities/example_utilities.hpp b/examples/utilities/example_utilities.hpp
index 96a158b841..1d436eb234 100644
--- a/examples/utilities/example_utilities.hpp
+++ b/examples/utilities/example_utilities.hpp
@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <string>
 #include <vector>
 
 // Check for an unrecoverable (negative) return value from a SUNDIALS function

From 75ffe46d14e571256860732dd7a9992b57dccb90 Mon Sep 17 00:00:00 2001
From: Martin Robinson <martinjrobins@gmail.com>
Date: Wed, 13 Sep 2023 08:24:00 +0100
Subject: [PATCH 02/35] append to CMAKE_MODULE_PATH instead of overwrite (#336)

Fixes #335

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c937443af..9612b9de19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,7 @@ project(SUNDIALS C)
 
 # Specify the location of additional CMAKE modules
 set(CMAKE_MODULE_PATH
+  ${CMAKE_MODULE_PATH}
   ${PROJECT_SOURCE_DIR}/cmake
   ${PROJECT_SOURCE_DIR}/cmake/macros
   ${PROJECT_SOURCE_DIR}/cmake/tpl

From 235a5069b1d028e93c1f8b2c30df3accfa4fe0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20MOTTELET?= <stephane.mottelet@utc.fr>
Date: Thu, 14 Sep 2023 22:38:03 +0200
Subject: [PATCH 03/35] Change typedefs names to allow simulateous use of idas
 and cvodes (#337)

Fixes #333. Some other typedefs already had specialized (towards idas or
cvodes) prefixed names, it won't harm to generalize this.

---------

Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 CHANGELOG.md                             |   4 +
 doc/cvodes/guide/source/Introduction.rst |   5 +
 doc/idas/guide/source/Introduction.rst   |   5 +
 src/cvodes/cvodea.c                      | 112 ++++++++++-----------
 src/cvodes/cvodea_io.c                   |  14 +--
 src/cvodes/cvodes_impl.h                 |  32 +++---
 src/idas/idaa.c                          | 122 +++++++++++------------
 src/idas/idaa_io.c                       |  14 +--
 src/idas/idas_impl.h                     |  32 +++---
 9 files changed, 177 insertions(+), 163 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f246a840d5..dd786dde05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SUNDIALS Changelog
 
+## Changes to SUNDIALS in release X.X.X
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 1fde2952fb..6ad961ebd3 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -111,6 +111,11 @@ Fortran.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index ba71498036..676dd88777 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -86,6 +86,11 @@ integrate any final-condition ODE dependent on the solution of the original IVP
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 Changes in v5.6.1
 -----------------
 
diff --git a/src/cvodes/cvodea.c b/src/cvodes/cvodea.c
index 5f53830241..c382e80a2f 100644
--- a/src/cvodes/cvodea.c
+++ b/src/cvodes/cvodea.c
@@ -54,14 +54,14 @@
  * =================================================================
  */
 
-static CkpntMem CVAckpntInit(CVodeMem cv_mem);
-static CkpntMem CVAckpntNew(CVodeMem cv_mem);
-static void CVAckpntDelete(CkpntMem *ck_memPtr);
+static CVckpntMem CVAckpntInit(CVodeMem cv_mem);
+static CVckpntMem CVAckpntNew(CVodeMem cv_mem);
+static void CVAckpntDelete(CVckpntMem *ck_memPtr);
 
 static void CVAbckpbDelete(CVodeBMem *cvB_memPtr);
 
-static int  CVAdataStore(CVodeMem cv_mem, CkpntMem ck_mem);
-static int  CVAckpntGet(CVodeMem cv_mem, CkpntMem ck_mem);
+static int  CVAdataStore(CVodeMem cv_mem, CVckpntMem ck_mem);
+static int  CVAckpntGet(CVodeMem cv_mem, CVckpntMem ck_mem);
 
 static int CVAfindIndex(CVodeMem cv_mem, realtype t,
                         long int *indx, booleantype *newpoint);
@@ -69,12 +69,12 @@ static int CVAfindIndex(CVodeMem cv_mem, realtype t,
 static booleantype CVAhermiteMalloc(CVodeMem cv_mem);
 static void CVAhermiteFree(CVodeMem cv_mem);
 static int CVAhermiteGetY(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
-static int CVAhermiteStorePnt(CVodeMem cv_mem, DtpntMem d);
+static int CVAhermiteStorePnt(CVodeMem cv_mem, CVdtpntMem d);
 
 static booleantype CVApolynomialMalloc(CVodeMem cv_mem);
 static void CVApolynomialFree(CVodeMem cv_mem);
 static int CVApolynomialGetY(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
-static int CVApolynomialStorePnt(CVodeMem cv_mem, DtpntMem d);
+static int CVApolynomialStorePnt(CVodeMem cv_mem, CVdtpntMem d);
 
 /* Wrappers */
 
@@ -174,7 +174,7 @@ int CVodeAdjInit(void *cvode_mem, long int steps, int interp)
   /* Allocate space for the array of Data Point structures */
 
   ca_mem->dt_mem = NULL;
-  ca_mem->dt_mem = (DtpntMem *) malloc((steps+1)*sizeof(struct DtpntMemRec *));
+  ca_mem->dt_mem = (CVdtpntMem *) malloc((steps+1)*sizeof(struct CVdtpntMemRec *));
   if (ca_mem->dt_mem == NULL) {
     free(ca_mem); ca_mem = NULL;
     cvProcessError(cv_mem, CV_MEM_FAIL, "CVODEA", "CVodeAdjInit", MSGCV_MEM_FAIL);
@@ -184,7 +184,7 @@ int CVodeAdjInit(void *cvode_mem, long int steps, int interp)
 
   for (i=0; i<=steps; i++) {
     ca_mem->dt_mem[i] = NULL;
-    ca_mem->dt_mem[i] = (DtpntMem) malloc(sizeof(struct DtpntMemRec));
+    ca_mem->dt_mem[i] = (CVdtpntMem) malloc(sizeof(struct CVdtpntMemRec));
     if (ca_mem->dt_mem[i] == NULL) {
       for(ii=0; ii<i; ii++) {free(ca_mem->dt_mem[ii]); ca_mem->dt_mem[ii] = NULL;}
       free(ca_mem->dt_mem); ca_mem->dt_mem = NULL;
@@ -380,8 +380,8 @@ int CVodeF(void *cvode_mem, realtype tout, N_Vector yout,
 {
   CVadjMem ca_mem;
   CVodeMem cv_mem;
-  CkpntMem tmp;
-  DtpntMem *dt_mem;
+  CVckpntMem tmp;
+  CVdtpntMem *dt_mem;
   long int nstloc;
   int flag, i;
   booleantype allocOK, earlyret;
@@ -1281,7 +1281,7 @@ int CVodeB(void *cvode_mem, realtype tBout, int itaskB)
   CVodeMem cv_mem;
   CVadjMem ca_mem;
   CVodeBMem cvB_mem, tmp_cvB_mem;
-  CkpntMem ck_mem;
+  CVckpntMem ck_mem;
   int sign, flag=0;
   realtype tfuzz, tBret, tBn;
   booleantype gotCheckpoint, isActive, reachedTBout;
@@ -1630,14 +1630,14 @@ int CVodeGetQuadB(void *cvode_mem, int which, realtype *tret, N_Vector qB)
  * information from the initial time.
  */
 
-static CkpntMem CVAckpntInit(CVodeMem cv_mem)
+static CVckpntMem CVAckpntInit(CVodeMem cv_mem)
 {
-  CkpntMem ck_mem;
+  CVckpntMem ck_mem;
   int is;
 
   /* Allocate space for ckdata */
   ck_mem = NULL;
-  ck_mem = (CkpntMem) malloc(sizeof(struct CkpntMemRec));
+  ck_mem = (CVckpntMem) malloc(sizeof(struct CVckpntMemRec));
   if (ck_mem == NULL) return(NULL);
 
   ck_mem->ck_zn[0] = N_VClone(cv_mem->cv_tempv);
@@ -1737,14 +1737,14 @@ static CkpntMem CVAckpntInit(CVodeMem cv_mem)
  * its data from current values in cv_mem.
  */
 
-static CkpntMem CVAckpntNew(CVodeMem cv_mem)
+static CVckpntMem CVAckpntNew(CVodeMem cv_mem)
 {
-  CkpntMem ck_mem;
+  CVckpntMem ck_mem;
   int j, jj, is, qmax;
 
   /* Allocate space for ckdata */
   ck_mem = NULL;
-  ck_mem = (CkpntMem) malloc(sizeof(struct CkpntMemRec));
+  ck_mem = (CVckpntMem) malloc(sizeof(struct CVckpntMemRec));
   if (ck_mem == NULL) return(NULL);
 
   /* Set cv_next to NULL */
@@ -1976,9 +1976,9 @@ static CkpntMem CVAckpntNew(CVodeMem cv_mem)
  * the new list head
  */
 
-static void CVAckpntDelete(CkpntMem *ck_memPtr)
+static void CVAckpntDelete(CVckpntMem *ck_memPtr)
 {
-  CkpntMem tmp;
+  CVckpntMem tmp;
   int j;
 
   if (*ck_memPtr == NULL) return;
@@ -2095,10 +2095,10 @@ static void CVAbckpbDelete(CVodeBMem *cvB_memPtr)
  * CV_FWD_FAIL
  */
 
-static int CVAdataStore(CVodeMem cv_mem, CkpntMem ck_mem)
+static int CVAdataStore(CVodeMem cv_mem, CVckpntMem ck_mem)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
+  CVdtpntMem *dt_mem;
   realtype t;
   long int i;
   int flag, sign;
@@ -2151,7 +2151,7 @@ static int CVAdataStore(CVodeMem cv_mem, CkpntMem ck_mem)
  * the check point ck_mem
  */
 
-static int CVAckpntGet(CVodeMem cv_mem, CkpntMem ck_mem)
+static int CVAckpntGet(CVodeMem cv_mem, CVckpntMem ck_mem)
 {
   int flag, j, is, qmax, retval;
 
@@ -2310,7 +2310,7 @@ static int CVAfindIndex(CVodeMem cv_mem, realtype t,
                         long int *indx, booleantype *newpoint)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
+  CVdtpntMem *dt_mem;
   int sign;
   booleantype to_left, to_right;
 
@@ -2427,8 +2427,8 @@ int CVodeGetAdjY(void *cvode_mem, realtype t, N_Vector y)
 static booleantype CVAhermiteMalloc(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  CVdtpntMem *dt_mem;
+  CVhermiteDataMem content;
   long int i, ii=0;
   booleantype allocOK;
 
@@ -2458,7 +2458,7 @@ static booleantype CVAhermiteMalloc(CVodeMem cv_mem)
   for (i=0; i<=ca_mem->ca_nsteps; i++) {
 
     content = NULL;
-    content = (HermiteDataMem) malloc(sizeof(struct HermiteDataMemRec));
+    content = (CVhermiteDataMem) malloc(sizeof(struct CVhermiteDataMemRec));
     if (content == NULL) {
       ii = i;
       allocOK = SUNFALSE;
@@ -2522,7 +2522,7 @@ static booleantype CVAhermiteMalloc(CVodeMem cv_mem)
     }
 
     for (i=0; i<ii; i++) {
-      content = (HermiteDataMem) (dt_mem[i]->content);
+      content = (CVhermiteDataMem) (dt_mem[i]->content);
       N_VDestroy(content->y);
       N_VDestroy(content->yd);
       if (ca_mem->ca_IMstoreSensi) {
@@ -2546,8 +2546,8 @@ static booleantype CVAhermiteMalloc(CVodeMem cv_mem)
 static void CVAhermiteFree(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  CVdtpntMem *dt_mem;
+  CVhermiteDataMem content;
   long int i;
 
   ca_mem = cv_mem->cv_adj_mem;
@@ -2561,7 +2561,7 @@ static void CVAhermiteFree(CVodeMem cv_mem)
   dt_mem = ca_mem->dt_mem;
 
   for (i=0; i<=ca_mem->ca_nsteps; i++) {
-    content = (HermiteDataMem) (dt_mem[i]->content);
+    content = (CVhermiteDataMem) (dt_mem[i]->content);
     N_VDestroy(content->y);
     N_VDestroy(content->yd);
     if (ca_mem->ca_IMstoreSensi) {
@@ -2580,15 +2580,15 @@ static void CVAhermiteFree(CVodeMem cv_mem)
  * Note that the time is already stored.
  */
 
-static int CVAhermiteStorePnt(CVodeMem cv_mem, DtpntMem d)
+static int CVAhermiteStorePnt(CVodeMem cv_mem, CVdtpntMem d)
 {
   CVadjMem ca_mem;
-  HermiteDataMem content;
+  CVhermiteDataMem content;
   int is, retval;
 
   ca_mem = cv_mem->cv_adj_mem;
 
-  content = (HermiteDataMem) d->content;
+  content = (CVhermiteDataMem) d->content;
 
   /* Load solution */
 
@@ -2647,8 +2647,8 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
                           N_Vector y, N_Vector *yS)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content0, content1;
+  CVdtpntMem *dt_mem;
+  CVhermiteDataMem content0, content1;
 
   realtype t0, t1, delta;
   realtype factor1, factor2, factor3;
@@ -2682,7 +2682,7 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
      then return y at the left limit. */
 
   if (indx == 0) {
-    content0 = (HermiteDataMem) (dt_mem[0]->content);
+    content0 = (CVhermiteDataMem) (dt_mem[0]->content);
     N_VScale(ONE, content0->y, y);
 
     if (NS > 0) {
@@ -2703,7 +2703,7 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
   t1 = dt_mem[indx]->t;
   delta = t1 - t0;
 
-  content0 = (HermiteDataMem) (dt_mem[indx-1]->content);
+  content0 = (CVhermiteDataMem) (dt_mem[indx-1]->content);
   y0  = content0->y;
   yd0 = content0->yd;
   if (ca_mem->ca_IMinterpSensi) {
@@ -2715,7 +2715,7 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
 
     /* Recompute Y0 and Y1 */
 
-    content1 = (HermiteDataMem) (dt_mem[indx]->content);
+    content1 = (CVhermiteDataMem) (dt_mem[indx]->content);
 
     y1  = content1->y;
     yd1 = content1->yd;
@@ -2822,8 +2822,8 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
 static booleantype CVApolynomialMalloc(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  CVdtpntMem *dt_mem;
+  CVpolynomialDataMem content;
   long int i, ii=0;
   booleantype allocOK;
 
@@ -2853,7 +2853,7 @@ static booleantype CVApolynomialMalloc(CVodeMem cv_mem)
   for (i=0; i<=ca_mem->ca_nsteps; i++) {
 
     content = NULL;
-    content = (PolynomialDataMem) malloc(sizeof(struct PolynomialDataMemRec));
+    content = (CVpolynomialDataMem) malloc(sizeof(struct CVpolynomialDataMemRec));
     if (content == NULL) {
       ii = i;
       allocOK = SUNFALSE;
@@ -2896,7 +2896,7 @@ static booleantype CVApolynomialMalloc(CVodeMem cv_mem)
     }
 
     for (i=0; i<ii; i++) {
-      content = (PolynomialDataMem) (dt_mem[i]->content);
+      content = (CVpolynomialDataMem) (dt_mem[i]->content);
       N_VDestroy(content->y);
       if (ca_mem->ca_IMstoreSensi) {
         N_VDestroyVectorArray(content->yS, cv_mem->cv_Ns);
@@ -2919,8 +2919,8 @@ static booleantype CVApolynomialMalloc(CVodeMem cv_mem)
 static void CVApolynomialFree(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  CVdtpntMem *dt_mem;
+  CVpolynomialDataMem content;
   long int i;
 
   ca_mem = cv_mem->cv_adj_mem;
@@ -2934,7 +2934,7 @@ static void CVApolynomialFree(CVodeMem cv_mem)
   dt_mem = ca_mem->dt_mem;
 
   for (i=0; i<=ca_mem->ca_nsteps; i++) {
-    content = (PolynomialDataMem) (dt_mem[i]->content);
+    content = (CVpolynomialDataMem) (dt_mem[i]->content);
     N_VDestroy(content->y);
     if (ca_mem->ca_IMstoreSensi) {
       N_VDestroyVectorArray(content->yS, cv_mem->cv_Ns);
@@ -2951,15 +2951,15 @@ static void CVApolynomialFree(CVodeMem cv_mem)
  * Note that the time is already stored.
  */
 
-static int CVApolynomialStorePnt(CVodeMem cv_mem, DtpntMem d)
+static int CVApolynomialStorePnt(CVodeMem cv_mem, CVdtpntMem d)
 {
   CVadjMem ca_mem;
-  PolynomialDataMem content;
+  CVpolynomialDataMem content;
   int is, retval;
 
   ca_mem = cv_mem->cv_adj_mem;
 
-  content = (PolynomialDataMem) d->content;
+  content = (CVpolynomialDataMem) d->content;
 
   N_VScale(ONE, cv_mem->cv_zn[0], content->y);
 
@@ -2989,8 +2989,8 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
                              N_Vector y, N_Vector *yS)
 {
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  CVdtpntMem *dt_mem;
+  CVpolynomialDataMem content;
 
   int flag, dir, order, i, j, is, NS, retval;
   long int indx, base;
@@ -3013,7 +3013,7 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
      then return y at the left limit. */
 
   if (indx == 0) {
-    content = (PolynomialDataMem) (dt_mem[0]->content);
+    content = (CVpolynomialDataMem) (dt_mem[0]->content);
     N_VScale(ONE, content->y, y);
 
     if (NS > 0) {
@@ -3039,12 +3039,12 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
 
   if (dir == 1) {
     base = indx;
-    content = (PolynomialDataMem) (dt_mem[base]->content);
+    content = (CVpolynomialDataMem) (dt_mem[base]->content);
     order = content->order;
     if(indx < order) base += order-indx;
   } else {
     base = indx-1;
-    content = (PolynomialDataMem) (dt_mem[base]->content);
+    content = (CVpolynomialDataMem) (dt_mem[base]->content);
     order = content->order;
     if (ca_mem->ca_np-indx > order) base -= indx+order-ca_mem->ca_np;
   }
@@ -3057,7 +3057,7 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
     if (dir == 1) {
       for(j=0;j<=order;j++) {
         ca_mem->ca_T[j] = dt_mem[base-j]->t;
-        content = (PolynomialDataMem) (dt_mem[base-j]->content);
+        content = (CVpolynomialDataMem) (dt_mem[base-j]->content);
         N_VScale(ONE, content->y, ca_mem->ca_Y[j]);
 
         if (NS > 0) {
@@ -3071,7 +3071,7 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
     } else {
       for(j=0;j<=order;j++) {
         ca_mem->ca_T[j] = dt_mem[base-1+j]->t;
-        content = (PolynomialDataMem) (dt_mem[base-1+j]->content);
+        content = (CVpolynomialDataMem) (dt_mem[base-1+j]->content);
         N_VScale(ONE, content->y, ca_mem->ca_Y[j]);
         if (NS > 0) {
           for (is=0; is<NS; is++)
diff --git a/src/cvodes/cvodea_io.c b/src/cvodes/cvodea_io.c
index 24a784d2b8..3cd6ac7af2 100644
--- a/src/cvodes/cvodea_io.c
+++ b/src/cvodes/cvodea_io.c
@@ -570,7 +570,7 @@ int CVodeGetAdjCheckPointsInfo(void *cvode_mem, CVadjCheckPointRec *ckpnt)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
-  CkpntMem ck_mem;
+  CVckpntMem ck_mem;
   int i;
 
   /* Check if cvode_mem exists */
@@ -630,8 +630,8 @@ int CVodeGetAdjDataPointHermite(void *cvode_mem, int which,
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  CVdtpntMem *dt_mem;
+  CVhermiteDataMem content;
 
   /* Check if cvode_mem exists */
   if (cvode_mem == NULL) {
@@ -656,7 +656,7 @@ int CVodeGetAdjDataPointHermite(void *cvode_mem, int which,
 
   *t = dt_mem[which]->t;
 
-  content = (HermiteDataMem) (dt_mem[which]->content);
+  content = (CVhermiteDataMem) (dt_mem[which]->content);
 
   if (y != NULL)
     N_VScale(ONE, content->y, y);
@@ -679,8 +679,8 @@ int CVodeGetAdjDataPointPolynomial(void *cvode_mem, int which,
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  CVdtpntMem *dt_mem;
+  CVpolynomialDataMem content;
 
   /* Check if cvode_mem exists */
   if (cvode_mem == NULL) {
@@ -705,7 +705,7 @@ int CVodeGetAdjDataPointPolynomial(void *cvode_mem, int which,
 
   *t = dt_mem[which]->t;
 
-  content = (PolynomialDataMem) (dt_mem[which]->content);
+  content = (CVpolynomialDataMem) (dt_mem[which]->content);
 
   if (y != NULL)
     N_VScale(ONE, content->y, y);
diff --git a/src/cvodes/cvodes_impl.h b/src/cvodes/cvodes_impl.h
index b4a18676a8..c1f9721427 100644
--- a/src/cvodes/cvodes_impl.h
+++ b/src/cvodes/cvodes_impl.h
@@ -207,8 +207,8 @@ extern "C" {
  */
 
 typedef struct CVadjMemRec  *CVadjMem;
-typedef struct CkpntMemRec  *CkpntMem;
-typedef struct DtpntMemRec  *DtpntMem;
+typedef struct CVckpntMemRec  *CVckpntMem;
+typedef struct CVdtpntMemRec  *CVdtpntMem;
 typedef struct CVodeBMemRec *CVodeBMem;
 
 /*
@@ -704,15 +704,15 @@ typedef struct CVodeMemRec {
 
 /*
  * -----------------------------------------------------------------
- * Types : struct CkpntMemRec, CkpntMem
+ * Types : struct CVckpntMemRec, CVckpntMem
  * -----------------------------------------------------------------
- * The type CkpntMem is type pointer to struct CkpntMemRec.
+ * The type CVckpntMem is type pointer to struct CVckpntMemRec.
  * This structure contains fields to store all information at a
  * check point that is needed to 'hot' start cvodes.
  * -----------------------------------------------------------------
  */
 
-struct CkpntMemRec {
+struct CVckpntMemRec {
 
   /* Integration limits */
   realtype ck_t0;
@@ -768,7 +768,7 @@ struct CkpntMemRec {
   realtype ck_saved_tq5;
 
   /* Pointer to next structure in list */
-  struct CkpntMemRec *ck_next;
+  struct CVckpntMemRec *ck_next;
 
 };
 
@@ -790,11 +790,11 @@ struct CkpntMemRec {
 typedef booleantype (*cvaIMMallocFn)(CVodeMem cv_mem);
 typedef void (*cvaIMFreeFn)(CVodeMem cv_mem);
 typedef int (*cvaIMGetYFn)(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
-typedef int (*cvaIMStorePntFn)(CVodeMem cv_mem, DtpntMem d);
+typedef int (*cvaIMStorePntFn)(CVodeMem cv_mem, CVdtpntMem d);
 
 /*
  * -----------------------------------------------------------------
- * Type : struct DtpntMemRec
+ * Type : struct CVdtpntMemRec
  * -----------------------------------------------------------------
  * This structure contains fields to store all information at a
  * data point that is needed to interpolate solution of forward
@@ -802,25 +802,25 @@ typedef int (*cvaIMStorePntFn)(CVodeMem cv_mem, DtpntMem d);
  * -----------------------------------------------------------------
  */
 
-struct DtpntMemRec {
+struct CVdtpntMemRec {
   realtype t;    /* time */
   void *content; /* IMtype-dependent content */
 };
 
 /* Data for cubic Hermite interpolation */
-typedef struct HermiteDataMemRec {
+typedef struct CVhermiteDataMemRec {
   N_Vector y;
   N_Vector yd;
   N_Vector *yS;
   N_Vector *ySd;
-} *HermiteDataMem;
+} *CVhermiteDataMem;
 
 /* Data for polynomial interpolation */
-typedef struct PolynomialDataMemRec {
+typedef struct CVpolynomialDataMemRec {
   N_Vector y;
   N_Vector *yS;
   int order;
-} *PolynomialDataMem;
+} *CVpolynomialDataMem;
 
 
 /*
@@ -935,13 +935,13 @@ struct CVadjMemRec {
    * ---------------- */
 
   /* Storage for check point information */
-  struct CkpntMemRec *ck_mem;
+  struct CVckpntMemRec *ck_mem;
 
   /* Number of check points */
   int ca_nckpnts;
 
   /* address of the check point structure for which data is available */
-  struct CkpntMemRec *ca_ckpntData;
+  struct CVckpntMemRec *ca_ckpntData;
 
   /* ------------------
    * Interpolation data
@@ -954,7 +954,7 @@ struct CVadjMemRec {
   long int ca_ilast;
 
   /* Storage for data from forward runs */
-  struct DtpntMemRec **dt_mem;
+  struct CVdtpntMemRec **dt_mem;
 
   /* Actual number of data points in dt_mem (typically np=nsteps+1) */
   long int ca_np;
diff --git a/src/idas/idaa.c b/src/idas/idaa.c
index 2b09738d78..64ccdd45b1 100644
--- a/src/idas/idaa.c
+++ b/src/idas/idaa.c
@@ -46,30 +46,30 @@
 /*               Private Functions Prototypes                      */
 /*=================================================================*/
 
-static CkpntMem IDAAckpntInit(IDAMem IDA_mem);
-static CkpntMem IDAAckpntNew(IDAMem IDA_mem);
-static void IDAAckpntCopyVectors(IDAMem IDA_mem, CkpntMem ck_mem);
-static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, CkpntMem ck_mem);
-static void IDAAckpntDelete(CkpntMem *ck_memPtr);
+static IDAckpntMem IDAAckpntInit(IDAMem IDA_mem);
+static IDAckpntMem IDAAckpntNew(IDAMem IDA_mem);
+static void IDAAckpntCopyVectors(IDAMem IDA_mem, IDAckpntMem ck_mem);
+static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem);
+static void IDAAckpntDelete(IDAckpntMem *ck_memPtr);
 
 static void IDAAbckpbDelete(IDABMem *IDAB_memPtr);
 
 static booleantype IDAAdataMalloc(IDAMem IDA_mem);
 static void IDAAdataFree(IDAMem IDA_mem);
-static int  IDAAdataStore(IDAMem IDA_mem, CkpntMem ck_mem);
+static int  IDAAdataStore(IDAMem IDA_mem, IDAckpntMem ck_mem);
 
-static int  IDAAckpntGet(IDAMem IDA_mem, CkpntMem ck_mem);
+static int  IDAAckpntGet(IDAMem IDA_mem, IDAckpntMem ck_mem);
 
 static booleantype IDAAhermiteMalloc(IDAMem IDA_mem);
 static void        IDAAhermiteFree(IDAMem IDA_mem);
-static int         IDAAhermiteStorePnt(IDAMem IDA_mem, DtpntMem d);
+static int         IDAAhermiteStorePnt(IDAMem IDA_mem, IDAdtpntMem d);
 static int         IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
                                    N_Vector yy, N_Vector yp,
                                    N_Vector *yyS, N_Vector *ypS);
 
 static booleantype IDAApolynomialMalloc(IDAMem IDA_mem);
 static void        IDAApolynomialFree(IDAMem IDA_mem);
-static int         IDAApolynomialStorePnt(IDAMem IDA_mem, DtpntMem d);
+static int         IDAApolynomialStorePnt(IDAMem IDA_mem, IDAdtpntMem d);
 static int         IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
                                       N_Vector yy, N_Vector yp,
                                       N_Vector *yyS, N_Vector *ypS);
@@ -360,8 +360,8 @@ int IDASolveF(void *ida_mem, realtype tout, realtype *tret,
 {
   IDAadjMem IDAADJ_mem;
   IDAMem IDA_mem;
-  CkpntMem tmp;
-  DtpntMem *dt_mem;
+  IDAckpntMem tmp;
+  IDAdtpntMem *dt_mem;
   long int nstloc;
   int flag, i;
   booleantype allocOK, earlyret;
@@ -1451,7 +1451,7 @@ int IDASolveB(void *ida_mem, realtype tBout, int itaskB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
-  CkpntMem ck_mem;
+  IDAckpntMem ck_mem;
   IDABMem IDAB_mem, tmp_IDAB_mem;
   int flag=0, sign;
   realtype tfuzz, tBret, tBn;
@@ -1798,12 +1798,12 @@ int IDAGetQuadB(void *ida_mem, int which, realtype *tret, N_Vector qB)
  * information from the initial time.
 */
 
-static CkpntMem IDAAckpntInit(IDAMem IDA_mem)
+static IDAckpntMem IDAAckpntInit(IDAMem IDA_mem)
 {
-  CkpntMem ck_mem;
+  IDAckpntMem ck_mem;
 
   /* Allocate space for ckdata */
-  ck_mem = (CkpntMem) malloc(sizeof(struct CkpntMemRec));
+  ck_mem = (IDAckpntMem) malloc(sizeof(struct IDAckpntMemRec));
   if (NULL==ck_mem) return(NULL);
 
   ck_mem->ck_t0    = IDA_mem->ida_tn;
@@ -1844,13 +1844,13 @@ static CkpntMem IDAAckpntInit(IDAMem IDA_mem)
  * its data from current values in IDA_mem.
 */
 
-static CkpntMem IDAAckpntNew(IDAMem IDA_mem)
+static IDAckpntMem IDAAckpntNew(IDAMem IDA_mem)
 {
-  CkpntMem ck_mem;
+  IDAckpntMem ck_mem;
   int j;
 
   /* Allocate space for ckdata */
-  ck_mem = (CkpntMem) malloc(sizeof(struct CkpntMemRec));
+  ck_mem = (IDAckpntMem) malloc(sizeof(struct IDAckpntMemRec));
   if (ck_mem == NULL) return(NULL);
 
   ck_mem->ck_nst       = IDA_mem->ida_nst;
@@ -1908,9 +1908,9 @@ static CkpntMem IDAAckpntNew(IDAMem IDA_mem)
  * This routine deletes the first check point in list.
 */
 
-static void IDAAckpntDelete(CkpntMem *ck_memPtr)
+static void IDAAckpntDelete(IDAckpntMem *ck_memPtr)
 {
-  CkpntMem tmp;
+  IDAckpntMem tmp;
   int j;
 
   if (*ck_memPtr != NULL) {
@@ -1951,7 +1951,7 @@ static void IDAAckpntDelete(CkpntMem *ck_memPtr)
  * current state of IDAMem.
  *
  */
-static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, CkpntMem ck_mem)
+static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   int j, jj;
 
@@ -2032,7 +2032,7 @@ static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, CkpntMem ck_mem)
  * Copy phi* vectors from IDAMem in the corresponding vectors from checkpoint
  *
  */
-static void IDAAckpntCopyVectors(IDAMem IDA_mem, CkpntMem ck_mem)
+static void IDAAckpntCopyVectors(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   int j, is;
 
@@ -2096,18 +2096,18 @@ static void IDAAckpntCopyVectors(IDAMem IDA_mem, CkpntMem ck_mem)
 static booleantype IDAAdataMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
+  IDAdtpntMem *dt_mem;
   long int i, j;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
   IDAADJ_mem->dt_mem = NULL;
 
-  dt_mem = (DtpntMem *)malloc((IDAADJ_mem->ia_nsteps+1)*sizeof(struct DtpntMemRec *));
+  dt_mem = (IDAdtpntMem *)malloc((IDAADJ_mem->ia_nsteps+1)*sizeof(struct IDAdtpntMemRec *));
   if (dt_mem==NULL) return(SUNFALSE);
 
   for (i=0; i<=IDAADJ_mem->ia_nsteps; i++) {
 
-    dt_mem[i] = (DtpntMem)malloc(sizeof(struct DtpntMemRec));
+    dt_mem[i] = (IDAdtpntMem)malloc(sizeof(struct IDAdtpntMemRec));
 
     /* On failure, free any allocated memory and return NULL. */
     if (dt_mem[i] == NULL) {
@@ -2166,10 +2166,10 @@ static void IDAAdataFree(IDAMem IDA_mem)
  *   - IDA_SUCCESS
  */
 
-static int IDAAdataStore(IDAMem IDA_mem, CkpntMem ck_mem)
+static int IDAAdataStore(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
+  IDAdtpntMem *dt_mem;
   realtype t;
   long int i;
   int flag, sign;
@@ -2222,7 +2222,7 @@ static int IDAAdataStore(IDAMem IDA_mem, CkpntMem ck_mem)
  * the check point ck_mem
  */
 
-static int IDAAckpntGet(IDAMem IDA_mem, CkpntMem ck_mem)
+static int IDAAckpntGet(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   int flag, j, is;
 
@@ -2331,8 +2331,8 @@ static int IDAAckpntGet(IDAMem IDA_mem, CkpntMem ck_mem)
 static booleantype IDAAhermiteMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDAhermiteDataMem content;
   long int i, ii=0;
   booleantype allocOK;
 
@@ -2377,7 +2377,7 @@ static booleantype IDAAhermiteMalloc(IDAMem IDA_mem)
   for (i=0; i<=IDAADJ_mem->ia_nsteps; i++) {
 
     content = NULL;
-    content = (HermiteDataMem) malloc(sizeof(struct HermiteDataMemRec));
+    content = (IDAhermiteDataMem) malloc(sizeof(struct IDAhermiteDataMemRec));
     if (content == NULL) {
       ii = i;
       allocOK = SUNFALSE;
@@ -2442,7 +2442,7 @@ static booleantype IDAAhermiteMalloc(IDAMem IDA_mem)
     }
 
     for (i=0; i<ii; i++) {
-      content = (HermiteDataMem) (dt_mem[i]->content);
+      content = (IDAhermiteDataMem) (dt_mem[i]->content);
       N_VDestroy(content->y);
       N_VDestroy(content->yd);
 
@@ -2468,8 +2468,8 @@ static booleantype IDAAhermiteMalloc(IDAMem IDA_mem)
 static void IDAAhermiteFree(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDAhermiteDataMem content;
   long int i;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
@@ -2486,7 +2486,7 @@ static void IDAAhermiteFree(IDAMem IDA_mem)
 
   for (i=0; i<=IDAADJ_mem->ia_nsteps; i++) {
 
-    content = (HermiteDataMem) (dt_mem[i]->content);
+    content = (IDAhermiteDataMem) (dt_mem[i]->content);
     /* content might be NULL, if IDAAdjInit was called but IDASolveF was not. */
     if(content) {
 
@@ -2511,15 +2511,15 @@ static void IDAAhermiteFree(IDAMem IDA_mem)
  * Note that the time is already stored.
  */
 
-static int IDAAhermiteStorePnt(IDAMem IDA_mem, DtpntMem d)
+static int IDAAhermiteStorePnt(IDAMem IDA_mem, IDAdtpntMem d)
 {
   IDAadjMem IDAADJ_mem;
-  HermiteDataMem content;
+  IDAhermiteDataMem content;
   int is, retval;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
 
-  content = (HermiteDataMem) d->content;
+  content = (IDAhermiteDataMem) d->content;
 
   /* Load solution(s) */
   N_VScale(ONE, IDA_mem->ida_phi[0], content->y);
@@ -2559,8 +2559,8 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
                           N_Vector *yyS, N_Vector *ypS)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content0, content1;
+  IDAdtpntMem *dt_mem;
+  IDAhermiteDataMem content0, content1;
 
   realtype t0, t1, delta;
   realtype factor1, factor2, factor3;
@@ -2592,7 +2592,7 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
      then return y at the left limit. */
 
   if (indx == 0) {
-    content0 = (HermiteDataMem) (dt_mem[0]->content);
+    content0 = (IDAhermiteDataMem) (dt_mem[0]->content);
     N_VScale(ONE, content0->y,  yy);
     N_VScale(ONE, content0->yd, yp);
 
@@ -2615,7 +2615,7 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
   t1 = dt_mem[indx]->t;
   delta = t1 - t0;
 
-  content0 = (HermiteDataMem) (dt_mem[indx-1]->content);
+  content0 = (IDAhermiteDataMem) (dt_mem[indx-1]->content);
   y0  = content0->y;
   yd0 = content0->yd;
   if (IDAADJ_mem->ia_interpSensi) {
@@ -2626,7 +2626,7 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
   if (newpoint) {
 
     /* Recompute Y0 and Y1 */
-    content1 = (HermiteDataMem) (dt_mem[indx]->content);
+    content1 = (IDAhermiteDataMem) (dt_mem[indx]->content);
 
     y1  = content1->y;
     yd1 = content1->yd;
@@ -2770,8 +2770,8 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
 static booleantype IDAApolynomialMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDApolynomialDataMem content;
   long int i, ii=0;
   booleantype allocOK;
 
@@ -2814,7 +2814,7 @@ static booleantype IDAApolynomialMalloc(IDAMem IDA_mem)
   for (i=0; i<=IDAADJ_mem->ia_nsteps; i++) {
 
     content = NULL;
-    content = (PolynomialDataMem) malloc(sizeof(struct PolynomialDataMemRec));
+    content = (IDApolynomialDataMem) malloc(sizeof(struct IDApolynomialDataMemRec));
     if (content == NULL) {
       ii = i;
       allocOK = SUNFALSE;
@@ -2887,7 +2887,7 @@ static booleantype IDAApolynomialMalloc(IDAMem IDA_mem)
     }
 
     for (i=0; i<ii; i++) {
-      content = (PolynomialDataMem) (dt_mem[i]->content);
+      content = (IDApolynomialDataMem) (dt_mem[i]->content);
       N_VDestroy(content->y);
 
       if (content->yd) N_VDestroy(content->yd);
@@ -2915,8 +2915,8 @@ static booleantype IDAApolynomialMalloc(IDAMem IDA_mem)
 static void IDAApolynomialFree(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDApolynomialDataMem content;
   long int i;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
@@ -2933,7 +2933,7 @@ static void IDAApolynomialFree(IDAMem IDA_mem)
 
   for (i=0; i<=IDAADJ_mem->ia_nsteps; i++) {
 
-    content = (PolynomialDataMem) (dt_mem[i]->content);
+    content = (IDApolynomialDataMem) (dt_mem[i]->content);
 
     /* content might be NULL, if IDAAdjInit was called but IDASolveF was not. */
     if(content) {
@@ -2964,14 +2964,14 @@ static void IDAApolynomialFree(IDAMem IDA_mem)
  * in which case content->yp is non-null.
  */
 
-static int IDAApolynomialStorePnt(IDAMem IDA_mem, DtpntMem d)
+static int IDAApolynomialStorePnt(IDAMem IDA_mem, IDAdtpntMem d)
 {
   IDAadjMem IDAADJ_mem;
-  PolynomialDataMem content;
+  IDApolynomialDataMem content;
   int is, retval;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
-  content = (PolynomialDataMem) d->content;
+  content = (IDApolynomialDataMem) d->content;
 
   N_VScale(ONE, IDA_mem->ida_phi[0], content->y);
 
@@ -3013,8 +3013,8 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
                               N_Vector *yyS, N_Vector *ypS)
 {
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDApolynomialDataMem content;
 
   int flag, dir, order, i, j, is, NS, retval;
   long int indx, base;
@@ -3035,7 +3035,7 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
      then return y at the left limit. */
 
   if (indx == 0) {
-    content = (PolynomialDataMem) (dt_mem[0]->content);
+    content = (IDApolynomialDataMem) (dt_mem[0]->content);
     N_VScale(ONE, content->y,  yy);
     N_VScale(ONE, content->yd, yp);
 
@@ -3064,12 +3064,12 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
 
   if (dir == 1) {
     base = indx;
-    content = (PolynomialDataMem) (dt_mem[base]->content);
+    content = (IDApolynomialDataMem) (dt_mem[base]->content);
     order = content->order;
     if(indx < order) base += order-indx;
   } else {
     base = indx-1;
-    content = (PolynomialDataMem) (dt_mem[base]->content);
+    content = (IDApolynomialDataMem) (dt_mem[base]->content);
     order = content->order;
     if (IDAADJ_mem->ia_np-indx > order) base -= indx+order-IDAADJ_mem->ia_np;
   }
@@ -3082,7 +3082,7 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
     if (dir == 1) {
       for(j=0;j<=order;j++) {
         IDAADJ_mem->ia_T[j] = dt_mem[base-j]->t;
-        content = (PolynomialDataMem) (dt_mem[base-j]->content);
+        content = (IDApolynomialDataMem) (dt_mem[base-j]->content);
         N_VScale(ONE, content->y, IDAADJ_mem->ia_Y[j]);
 
         if (NS > 0) {
@@ -3096,7 +3096,7 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
     } else {
       for(j=0;j<=order;j++) {
         IDAADJ_mem->ia_T[j] = dt_mem[base-1+j]->t;
-        content = (PolynomialDataMem) (dt_mem[base-1+j]->content);
+        content = (IDApolynomialDataMem) (dt_mem[base-1+j]->content);
         N_VScale(ONE, content->y, IDAADJ_mem->ia_Y[j]);
 
         if (NS > 0) {
@@ -3289,7 +3289,7 @@ static int IDAAfindIndex(IDAMem ida_mem, realtype t,
 {
   IDAadjMem IDAADJ_mem;
   IDAMem IDA_mem;
-  DtpntMem *dt_mem;
+  IDAdtpntMem *dt_mem;
   int sign;
   booleantype to_left, to_right;
 
diff --git a/src/idas/idaa_io.c b/src/idas/idaa_io.c
index 76923817c2..4af2ec0e05 100644
--- a/src/idas/idaa_io.c
+++ b/src/idas/idaa_io.c
@@ -553,7 +553,7 @@ int IDAGetAdjCheckPointsInfo(void *ida_mem, IDAadjCheckPointRec *ckpnt)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
-  CkpntMem ck_mem;
+  IDAckpntMem ck_mem;
   int i;
   
   /* Is ida_mem valid? */
@@ -666,8 +666,8 @@ int IDAGetAdjDataPointHermite(void *ida_mem, int which,
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  HermiteDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDAhermiteDataMem content;
 
     /* Is ida_mem valid? */
   if (ida_mem == NULL) {
@@ -691,7 +691,7 @@ int IDAGetAdjDataPointHermite(void *ida_mem, int which,
   }
 
   *t = dt_mem[which]->t;
-  content = (HermiteDataMem) dt_mem[which]->content;
+  content = (IDAhermiteDataMem) dt_mem[which]->content;
 
   if (yy != NULL) N_VScale(ONE, content->y, yy);
   if (yd != NULL) N_VScale(ONE, content->yd, yd);
@@ -716,8 +716,8 @@ int IDAGetAdjDataPointPolynomial(void *ida_mem, int which,
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
-  DtpntMem *dt_mem;
-  PolynomialDataMem content;
+  IDAdtpntMem *dt_mem;
+  IDApolynomialDataMem content;
   /* Is ida_mem valid? */
   if (ida_mem == NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAA", "IDAGetAdjDataPointPolynomial", MSGAM_NULL_IDAMEM);
@@ -740,7 +740,7 @@ int IDAGetAdjDataPointPolynomial(void *ida_mem, int which,
   }
 
   *t = dt_mem[which]->t;
-  content = (PolynomialDataMem) dt_mem[which]->content;
+  content = (IDApolynomialDataMem) dt_mem[which]->content;
  
   if (y != NULL) N_VScale(ONE, content->y, y); 
 
diff --git a/src/idas/idas_impl.h b/src/idas/idas_impl.h
index ed1cf325f4..ee29def3ea 100644
--- a/src/idas/idas_impl.h
+++ b/src/idas/idas_impl.h
@@ -550,8 +550,8 @@ typedef struct IDAMemRec {
  */
 
 typedef struct IDAadjMemRec *IDAadjMem;
-typedef struct CkpntMemRec *CkpntMem;
-typedef struct DtpntMemRec *DtpntMem;
+typedef struct IDAckpntMemRec *IDAckpntMem;
+typedef struct IDAdtpntMemRec *IDAdtpntMem;
 typedef struct IDABMemRec *IDABMem;
 
 /*
@@ -574,19 +574,19 @@ typedef void (*IDAAMFreeFn)(IDAMem IDA_mem);
 typedef int (*IDAAGetYFn)(IDAMem IDA_mem, realtype t,
                           N_Vector yy, N_Vector yp,
                           N_Vector *yyS, N_Vector *ypS);
-typedef int (*IDAAStorePntFn)(IDAMem IDA_mem, DtpntMem d);
+typedef int (*IDAAStorePntFn)(IDAMem IDA_mem, IDAdtpntMem d);
 
 /*
  * -----------------------------------------------------------------
- * Types : struct CkpntMemRec, CkpntMem
+ * Types : struct IDAckpntMemRec, IDAckpntMem
  * -----------------------------------------------------------------
- * The type CkpntMem is type pointer to struct CkpntMemRec.
+ * The type IDAckpntMem is type pointer to struct IDAckpntMemRec.
  * This structure contains fields to store all information at a
  * check point that is needed to 'hot' start IDAS.
  * -----------------------------------------------------------------
  */
 
-struct CkpntMemRec {
+struct IDAckpntMemRec {
 
   /* Integration limits */
   realtype ck_t0;
@@ -646,12 +646,12 @@ struct CkpntMemRec {
   int          ck_phi_alloc;
 
   /* Pointer to next structure in list */
-  struct CkpntMemRec *ck_next;
+  struct IDAckpntMemRec *ck_next;
 };
 
 /*
  * -----------------------------------------------------------------
- * Type : struct DtpntMemRec
+ * Type : struct IDAdtpntMemRec
  * -----------------------------------------------------------------
  * This structure contains fields to store all information at a
  * data point that is needed to interpolate solution of forward
@@ -659,21 +659,21 @@ struct CkpntMemRec {
  * -----------------------------------------------------------------
  */
 
-struct DtpntMemRec {
+struct IDAdtpntMemRec {
   realtype t;    /* time */
   void *content; /* interpType-dependent content */
 };
 
 /* Data for cubic Hermite interpolation */
-typedef struct HermiteDataMemRec {
+typedef struct IDAhermiteDataMemRec {
   N_Vector y;
   N_Vector yd;
   N_Vector *yS;
   N_Vector *ySd;
-} *HermiteDataMem;
+} *IDAhermiteDataMem;
 
 /* Data for polynomial interpolation */
-typedef struct PolynomialDataMemRec {
+typedef struct IDApolynomialDataMemRec {
   N_Vector y;
   N_Vector *yS;
 
@@ -682,7 +682,7 @@ typedef struct PolynomialDataMemRec {
   N_Vector yd;
   N_Vector *ySd;
   int order;
-} *PolynomialDataMem;
+} *IDApolynomialDataMem;
 
 /*
  * -----------------------------------------------------------------
@@ -798,10 +798,10 @@ struct IDAadjMemRec {
    * ---------------- */
 
   /* Storage for check point information */
-  struct CkpntMemRec *ck_mem;
+  struct IDAckpntMemRec *ck_mem;
 
   /* address of the check point structure for which data is available */
-  struct CkpntMemRec *ia_ckpntData;
+  struct IDAckpntMemRec *ia_ckpntData;
 
   /* Number of checkpoints. */
   int ia_nckpnts;
@@ -817,7 +817,7 @@ struct IDAadjMemRec {
   long int ia_ilast;
 
   /* Storage for data from forward runs */
-  struct DtpntMemRec **dt_mem;
+  struct IDAdtpntMemRec **dt_mem;
 
   /* Actual number of data points saved in current dt_mem */
   /* Commonly, np = nsteps+1                              */

From 5aebf4434a77ee8eea482ae355cf111cca7f8e25 Mon Sep 17 00:00:00 2001
From: Yu Pan <70486009+yu-nix@users.noreply.github.com>
Date: Fri, 15 Sep 2023 11:56:40 -0400
Subject: [PATCH 04/35] Feature/compare califiles (#318)

Add scripts for comparing benchmark and example timings against release timings and a notebook using Thicket to visualize data

---------

Co-authored-by: David J. Gardner <gardner48@llnl.gov>
Co-authored-by: Cody J. Balos <balos1@llnl.gov>
---
 .gitlab/build_and_test.sh       |  22 ++++--
 .gitlab/lassen-jobs.yml         |   3 +-
 src/sundials/sundials_context.c |   3 +-
 test/benchmark_analysis.ipynb   |  87 ++++++++++++++++++++++++
 test/compare_benchmarks.py      | 109 ++++++++++++++++++++++++++++++
 test/compare_examples.py        | 115 ++++++++++++++++++++++++++++++++
 test/testRunner                 |   2 +
 7 files changed, 334 insertions(+), 7 deletions(-)
 create mode 100644 test/benchmark_analysis.ipynb
 create mode 100644 test/compare_benchmarks.py
 create mode 100644 test/compare_examples.py

diff --git a/.gitlab/build_and_test.sh b/.gitlab/build_and_test.sh
index 0ef3a2e9ce..cf7ab193fa 100755
--- a/.gitlab/build_and_test.sh
+++ b/.gitlab/build_and_test.sh
@@ -188,11 +188,23 @@ then
     $cmake_exe --version
 
     # configure
-    $cmake_exe \
-        -C "${hostconfig_path}" \
-        -DCMAKE_INSTALL_PREFIX=${install_dir} \
-        "${project_dir}"
-    
+    if [[ "${CI_COMMIT_BRANCH}" == "main" ]]
+    then
+        # redirect caliper files to release directory
+        sundials_version=$(cd ${project_dir}; git describe --abbrev=0)
+        $cmake_exe \
+            -C "${hostconfig_path}" \
+            -DCMAKE_INSTALL_PREFIX=${install_dir} \
+            -DSUNDIALS_CALIPER_OUTPUT_DIR="${CALIPER_DIR}/Release/${hostname}/${sundials_version}" \
+            "${project_dir}"
+
+    else
+        $cmake_exe \
+            -C "${hostconfig_path}" \
+            -DCMAKE_INSTALL_PREFIX=${install_dir} \
+            "${project_dir}"
+    fi
+
     # build
     VERBOSE_BUILD=${VERBOSE_BUILD:-"OFF"}
     if [[ "${VERBOSE_BUILD}" == "ON" ]]; then
diff --git a/.gitlab/lassen-jobs.yml b/.gitlab/lassen-jobs.yml
index 92362a3d2a..1ffca71d46 100644
--- a/.gitlab/lassen-jobs.yml
+++ b/.gitlab/lassen-jobs.yml
@@ -38,7 +38,8 @@ lassen_gcc_cuda_bench:
     matrix:
       - COMPILER_SPEC: gcc@8.3.1
         CUDA_SPEC: [cuda@11.8.0]
+        CALIPER_DIR: /usr/workspace/sundials/califiles
   variables:
-    SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 build_type=Release precision=double scheduler=lsf caliper-dir=/usr/workspace/sundials/califiles ~int64 +benchmarks+profiling+caliper+adiak+mpi+openmp+cuda+raja cuda_arch=70 ^raja+cuda~openmp~examples~exercises cuda_arch=70 ^caliper+adiak+cuda cuda_arch=70 ^${CUDA_SPEC}+allow-unsupported-compilers"
+    SPEC: "%${COMPILER_SPEC} cstd=99 cxxstd=14 build_type=Release precision=double scheduler=lsf caliper-dir=${CALIPER_DIR} ~int64 +benchmarks+profiling+caliper+adiak+mpi+openmp+cuda+raja cuda_arch=70 ^raja+cuda~openmp~examples~exercises cuda_arch=70 ^caliper+adiak+cuda cuda_arch=70 ^${CUDA_SPEC}+allow-unsupported-compilers"
   extends: .lassen_build_and_bench
 
diff --git a/src/sundials/sundials_context.c b/src/sundials/sundials_context.c
index 26ea56f944..94f90301b8 100644
--- a/src/sundials/sundials_context.c
+++ b/src/sundials/sundials_context.c
@@ -239,7 +239,8 @@ void sunAdiakCollectMetadata() {
   adiak_namevalue("fortran_compiler_version", 2, NULL, "%s", SUN_FORTRAN_COMPILER_VERSION);
   adiak_namevalue("fortran_compiler_flags", 2, NULL, "%s", SUN_FORTRAN_COMPILER_FLAGS);
 
-  adiak_namevalue("sundials_version", 2, NULL, "%s", SUNDIALS_GIT_VERSION);
+  adiak_namevalue("sundials_version", 2, NULL, "%s", SUNDIALS_VERSION);
+  adiak_namevalue("sundials_git_version", 2, NULL, "%s", SUNDIALS_GIT_VERSION);
   adiak_namevalue("build_type", 2, NULL, "%s", SUN_BUILD_TYPE);
   adiak_namevalue("third_party_libraries", 2, NULL, "%s", SUN_TPL_LIST);
 #ifdef SUN_JOB_ID
diff --git a/test/benchmark_analysis.ipynb b/test/benchmark_analysis.ipynb
new file mode 100644
index 0000000000..9dccfc010d
--- /dev/null
+++ b/test/benchmark_analysis.ipynb
@@ -0,0 +1,87 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import os\n",
+    "import subprocess\n",
+    "import sys\n",
+    "import re\n",
+    "import glob\n",
+    "import numpy as np\n",
+    "import pandas as pd\n",
+    "import matplotlib.pyplot as plt\n",
+    "\n",
+    "from IPython.display import display, HTML\n",
+    "display(HTML(\"<style>.container { width:100% !important; }</style>\"))\n",
+    "\n",
+    "import hatchet as ht\n",
+    "import thicket as tt"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# Set desired pandas options\n",
+    "pd.set_option('display.max_rows', None)\n",
+    "pd.set_option('display.max_columns', None)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "caliDir = \"/usr/workspace/pan13/shrimp/Benchmarking/diffusion_2D/arkode_diffusion_2D_mpi_d2d_arkode_serial\"\n",
+    "caliFiles = glob.glob(\"%s/*.cali\" % caliDir)\n",
+    "\n",
+    "th_bench = tt.Thicket.from_caliperreader(caliFiles)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "df_merge = th_bench.dataframe.merge(th_bench.metadata, on='profile')\n",
+    "df_merge['launchdate'] = pd.to_datetime(df_merge['launchdate'], unit='s')\n",
+    "\n",
+    "# display only the top-most node\n",
+    "df_main = df_merge[df_merge['name'] == 'main']\n",
+    "df_main.set_index('launchdate')\n",
+    "\n",
+    "# adjust y-axis to be 2 degrees of precision\n",
+    "df_main.plot(x='launchdate', y=['Max time/rank', 'Avg time/rank', 'Min time/rank'], kind='line', use_index=True, xticks=df_main['launchdate'], rot=80, x_compat=True, figsize=(18,1))\n"
+   ]
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3 (ipykernel)",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.7.6"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/test/compare_benchmarks.py b/test/compare_benchmarks.py
new file mode 100644
index 0000000000..663f406262
--- /dev/null
+++ b/test/compare_benchmarks.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------
+# Programmer(s): Yu Pan @ LLNL
+# -----------------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# -----------------------------------------------------------------------------
+
+import os
+import glob
+import argparse
+import multiprocessing as mp
+
+import thicket as tt
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Compare Sundials performance results against previous results')
+
+    parser.add_argument('--release', dest='release', action='store_true', help='indicate if the current run to process is a release')
+
+    parser.add_argument('--calidir', dest='caliDir', type=str, help='path to directory containing caliper files', default="/usr/workspace/sundials/califiles")
+
+    parser.add_argument('--releasedir', dest='releaseDir', type=str, help='path to directory containing release caliper files', default="/usr/workspace/sundials/califiles/Release")
+
+    parser.add_argument('--outpath', dest='outPath', type=str, help='path to directory to write results to', default="/dev/null")
+
+    parser.add_argument('--jobid', dest='jobID', type=int, help='job id of the current run to identify .cali files')
+
+    parser.add_argument('--threshold', dest="threshold", type=float, help='the percentage threshold in performance difference that indicates a regression', default=2.0)
+
+    args = parser.parse_args()
+
+    release = args.release
+    releaseDir = args.releaseDir
+    caliDir = args.caliDir
+    outPath = args.outPath
+    jobID = args.jobID
+    threshold = args.threshold
+
+    # Get available benchmarks
+    benchFiles = glob.glob("%s/Benchmarking/*/*" % caliDir)
+
+    if not os.path.exists(outPath):
+        os.makedirs(outPath)
+    outFile = open("%s/benchmark_output.out" % outPath, 'w')
+
+    # thread per file
+    with mp.Pool() as pool:
+        for res in pool.starmap(process_benchmark, [(jobID, release, releaseDir, i, threshold) for i in benchFiles]):
+            if res:
+                outFile.write(res + "\n")
+    outFile.close()
+
+    outFile = open("%s/benchmark_output.out" % outPath, 'r')
+    try:
+        outLines = outFile.readlines()
+    finally:
+        outFile.close()
+
+    if (len(outLines) == 0):
+        return -1 
+    return 0
+
+def process_benchmark(jobID, isRelease, releaseDir, benchmarkDir, threshold):
+    # Get the current benchmark run
+    benchmarkFiles = glob.glob("%s/*.cali" % benchmarkDir)
+    # Don't compare if the run didn't include this benchmark
+    if (len(benchmarkFiles) == 0):
+        return 
+    
+    th_files = tt.Thicket.from_caliperreader(benchmarkFiles)
+    curFilter = lambda x: x['job_id'] == jobID
+    th_current = th_files.filter_metadata(curFilter)
+
+    # Get the release caliper file
+    cluster = th_current.metadata['cluster'].values[0]
+    if isRelease:
+        # Get the last release
+        versionDirs = glob.glob("%s/%s/*" % (releaseDir, cluster))
+        versionDirs.sort(key=os.path.getmtime, reverse=True)
+        versionDir = versionDirs[1]
+    else:
+        # Get the release the run is a part of
+        version = th_current.metadata['sundials_version'].values[0]
+        versionDir = "%s/%s/%s" % (releaseDir, cluster, version)
+    benchmarkName = th_current.metadata['env.TEST_NAME'].values[0]
+    releaseFile = glob.glob("%s/Benchmarking/*/%s/*.cali" % (versionDir, benchmarkName), recursive=True)
+    th_compare = tt.Thicket.from_caliperreader(releaseFile)
+    metrics = ['Max time/rank']
+    tt.mean(th_current, columns=metrics)
+    tt.mean(th_compare, columns=metrics)
+
+    ratio = th_current.statsframe.dataframe['Max time/rank_mean'] / th_compare.statsframe.dataframe['Max time/rank_mean']
+
+    tolerance = threshold/100
+    if 1 - ratio[0] < tolerance:
+        return benchmarkName
+
+
+if __name__ == "__main__":
+    main()
diff --git a/test/compare_examples.py b/test/compare_examples.py
new file mode 100644
index 0000000000..4b792ba03a
--- /dev/null
+++ b/test/compare_examples.py
@@ -0,0 +1,115 @@
+#!/usr/bin/env python3
+# -----------------------------------------------------------------------------
+# Programmer(s): Yu Pan @ LLNL
+# -----------------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# -----------------------------------------------------------------------------
+
+import os
+import subprocess
+import sys
+import re
+import glob
+import argparse
+import multiprocessing as mp
+import numpy as np
+import pandas as pd
+import matplotlib.pyplot as plt
+
+import hatchet as ht
+import thicket as tt
+
+def main():
+    parser = argparse.ArgumentParser(description='Compare Sundials performance results against previous results')
+
+    parser.add_argument('--release', dest='release', action='store_true', help='indicate if the current run to process is a release')
+
+    parser.add_argument('--calidir', dest='caliDir', type=str, help='path to directory containing caliper files', default="/usr/workspace/sundials/califiles")
+
+    parser.add_argument('--releasedir', dest='releaseDir', type=str, help='path to directory containing release caliper files', default="/usr/workspace/sundials/califiles/Release")
+
+    parser.add_argument('--outpath', dest='outPath', type=str, help='path to directory to write results to', default="/dev/null")
+
+    parser.add_argument('--threshold', dest="threshold", type=float, help='the percentage threshold in performance difference that indicates a regression', default=2.0)
+
+    args = parser.parse_args()
+
+    release = args.release
+    releaseDir = args.releaseDir
+    caliDir = args.caliDir
+    outPath = args.outPath
+    threshold = args.threshold
+
+    # Get the latest test run
+    runDirs = glob.glob("%s/Testing/*" % caliDir, recursive = True)
+    runDirs.sort(key=os.path.getmtime, reverse=True)
+    runDir = runDirs[0]
+
+    runFile = glob.glob(runDir)[0]
+    th_temp = tt.Thicket.from_caliperreader(runFile) 
+    cluster = th_temp.metadata['cluster']
+    # get machine from the file
+    if release:
+        # Compare against the last release
+        versionDirs = glob.glob("%s/%s/*" % (releaseDir, cluster))
+        versionDirs.sort(key=os.path.getmtime, reverse=True)
+        versionDir = versionDirs[1]
+    else:
+        # Compare against the release the run is a part of
+        version = th_temp.metadata['sundials_version'].values[0]
+        versionDir = "%s/%s/%s" % (releaseDir, cluster, version)
+
+    # Gather files to process
+    runFiles = glob.glob("%s/*.cali" % (runDir))
+
+    if not os.path.exists(outPath):
+        os.makedirs(outPath)
+    outFile = open("%s/output.out" % outPath, 'w')
+
+    # Compare test results against past runs. If a test performs below a threshold, output test name to outFile.
+    with mp.Pool() as pool:
+        for res in pool.starmap(compare_against_release, [(versionDir, i, threshold) for i in runFiles]):
+            if res:
+                outFile.write(res + "\n")
+    outFile.close()
+
+    outFile = open("%s/example_output.out" % outPath, 'r')
+    try:
+        outLines = outFile.readlines()
+    finally:
+        outFile.close()
+
+    if (len(outLines) == 0):
+        return -1 
+    return 0
+
+
+def compare_against_release(releaseDir, file, threshold):
+    th = tt.Thicket.from_caliperreader(file)
+
+    testName = th.metadata['env.TEST_NAME'].values[0]
+
+    # Gather release run
+    releaseFile = glob.glob("%s/Testing/*/%s.*.cali" % (releaseDir, testName), recursive=True)
+    th_release = tt.Thicket.from_caliperreader(releaseFile)
+
+    metrics = ['Max time/rank']
+    tt.mean(th_release, columns=metrics)
+    tt.mean(th, columns=metrics)
+
+    ratio = th.statsframe.dataframe['Max time/rank_mean'] / th_release.statsframe.dataframe['Max time/rank_mean']
+    print(ratio[0])
+    tolerance = threshold/100
+    if 1 - ratio[0] < tolerance:
+        return testName
+
+if __name__ == "__main__":
+    main()
diff --git a/test/testRunner b/test/testRunner
index 630ec67261..7f854785e7 100755
--- a/test/testRunner
+++ b/test/testRunner
@@ -201,6 +201,8 @@ def main():
             dateTime = datetime.datetime.now().strftime("%m%d%Y_%H%M%S")
             profilePath = os.path.join(caliDir, args.testName+".%s.cali" % dateTime)
             os.environ['CALI_SERVICES_ENABLE'] = 'env'
+            os.environ['TEST_NAME'] = testName
+            os.environ['CALI_ENV_EXTRA'] = 'TEST_NAME'
             os.environ['CALI_CONFIG'] = 'spot(output=%s)' % profilePath
 
         # if user supplies precision info overide the default choices

From 0ece42cce58e3654362a4497032fa9d48a8e7cb5 Mon Sep 17 00:00:00 2001
From: phannebohm <phannebohm@hsbi.de>
Date: Mon, 18 Sep 2023 02:49:32 +0200
Subject: [PATCH 05/35] Fix time complexity issue for sparse matrix (#257)

Fixes part of #253 by avoiding nested loops that take `O(M*N)` operations.

Also fixes #256.

---------

Signed-off-by: phannebohm <phannebohm@fh-bielefeld.de>
Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 CHANGELOG.md                             |  4 ++
 doc/arkode/guide/source/Introduction.rst | 11 +++-
 doc/cvode/guide/source/Introduction.rst  |  7 +++
 doc/cvodes/guide/source/Introduction.rst |  4 ++
 doc/ida/guide/source/Introduction.rst    |  7 +++
 doc/idas/guide/source/Introduction.rst   |  4 ++
 doc/kinsol/guide/source/Introduction.rst |  7 +++
 src/sunmatrix/sparse/sunmatrix_sparse.c  | 71 +++++++++++++-----------
 8 files changed, 82 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd786dde05..e040f9abdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 9bc832af85..df64ba2729 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -85,8 +85,8 @@ with adaptive explicit methods of orders 2-8.
    H(t, p, q) = T(t, p) + V(t, q)
 
 .. math::
-   \dot{p} = f_1(t,q) = \frac{\partial V(t,q)}{\partial q}, \quad 
-   \dot{q} = f_2(t,p) = \frac{\partial T(t,p)}{\partial p}, 
+   \dot{p} = f_1(t,q) = \frac{\partial V(t,q)}{\partial q}, \quad
+   \dot{q} = f_2(t,p) = \frac{\partial T(t,p)}{\partial p},
    :label: ARKODE_ODE_hamiltonian
 
 allowing for conservation of quadratic invariants.
@@ -130,6 +130,13 @@ provided with SUNDIALS, or again may utilize a user-supplied module.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index ca4c41b3de..d67e63dee2 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -111,6 +111,13 @@ implementations.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 6ad961ebd3..71ef9989a2 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -116,6 +116,10 @@ Changes in vX.X.X
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 9d18bd826a..9e81c930c4 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -72,6 +72,13 @@ systems.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index 676dd88777..b9893a4fd0 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -91,6 +91,10 @@ Changes in vX.X.X
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index 039eed6918..4269af1a5c 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -88,6 +88,13 @@ applications written in Fortran.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
+`O(NNZ)`.
+Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/src/sunmatrix/sparse/sunmatrix_sparse.c b/src/sunmatrix/sparse/sunmatrix_sparse.c
index 0afa22bac4..efa956f84f 100644
--- a/src/sunmatrix/sparse/sunmatrix_sparse.c
+++ b/src/sunmatrix/sparse/sunmatrix_sparse.c
@@ -572,7 +572,7 @@ int SUNMatCopy_Sparse(SUNMatrix A, SUNMatrix B)
 
 int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
 {
-  sunindextype j, i, p, nz, newvals, M, N, cend;
+  sunindextype j, i, p, nz, newvals, M, N, cend, nw;
   booleantype newmat, found;
   sunindextype *w, *Ap, *Ai, *Cp, *Ci;
   realtype *x, *Ax, *Cx;
@@ -640,8 +640,7 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
   /*   case 2: A has sufficient storage, but does not already contain a diagonal */
   } else if (!newmat) {
 
-
-    /* create work arrays for nonzero indices and values in a single column (row) */
+    /* create work arrays for nonzero row (column) indices and values in a single column (row) */
     w = (sunindextype *) malloc(M * sizeof(sunindextype));
     x = (realtype *) malloc(M * sizeof(realtype));
 
@@ -656,30 +655,38 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
     /* iterate through columns (rows) backwards */
     for (j=N-1; j>=0; j--) {
 
-      /* clear out temporary arrays for this column (row) */
-      for (i=0; i<M; i++) {
-        w[i] = 0;
-        x[i] = RCONST(0.0);
-      }
+      /* reset diagonal entry, in case it's not in A */
+      x[j] = ZERO;
 
       /* iterate down column (row) of A, collecting nonzeros */
-      for (p=Ap[j]; p<cend; p++) {
-        w[Ai[p]] += 1;         /* indicate that row (column) is filled */
+      for (p=Ap[j], i=0; p<cend; p++, i++) {
+        w[i] = Ai[p];        /* collect row (column) index */
         x[Ai[p]] = c*Ax[p];    /* collect/scale value */
       }
 
+      /* NNZ in this column (row) */
+      nw = cend - Ap[j];
+
       /* add identity to this column (row) */
       if (j < M) {
-        w[j] += 1;     /* indicate that row (column) is filled */
         x[j] += ONE;   /* update value */
       }
 
       /* fill entries of A with this column's (row's) data */
-      for (i=M-1; i>=0; i--) {
-        if ( w[i] > 0 ) {
-          Ai[--nz] = i;
-          Ax[nz] = x[i];
-        }
+      /* fill entries past diagonal */
+      for (i=nw-1; i>=0 && w[i]>j; i--) {
+        Ai[--nz] = w[i];
+        Ax[nz] = x[w[i]];
+      }
+      /* fill diagonal if applicable */
+      if (i < 0 /* empty or insert at front */ || w[i] != j /* insert behind front */) {
+        Ai[--nz] = j;
+        Ax[nz] = x[j];
+      }
+      /* fill entries before diagonal */
+      for (; i>=0; i--) {
+        Ai[--nz] = w[i];
+        Ax[nz] = x[w[i]];
       }
 
       /* store ptr past this col (row) from orig A, update value for new A */
@@ -696,8 +703,7 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
   /*   case 3: A must be reallocated with sufficient storage */
   } else {
 
-    /* create work arrays for nonzero indices and values */
-    w = (sunindextype *) malloc(M * sizeof(sunindextype));
+    /* create work array for nonzero values in a single column (row) */
     x = (realtype *) malloc(M * sizeof(realtype));
 
     /* create new matrix for sum */
@@ -724,30 +730,34 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
       /* set current column (row) pointer to current # nonzeros */
       Cp[j] = nz;
 
-      /* clear out temporary arrays for this column (row) */
-      for (i=0; i<M; i++) {
-        w[i] = 0;
-        x[i] = 0.0;
-      }
+      /* reset diagonal entry, in case it's not in A */
+      x[j] = ZERO;
 
       /* iterate down column (along row) of A, collecting nonzeros */
       for (p=Ap[j]; p<Ap[j+1]; p++) {
-        w[Ai[p]] += 1;         /* indicate that row is filled */
         x[Ai[p]] = c*Ax[p];    /* collect/scale value */
       }
 
       /* add identity to this column (row) */
       if (j < M) {
-        w[j] += 1;     /* indicate that row is filled */
         x[j] += ONE;   /* update value */
       }
 
       /* fill entries of C with this column's (row's) data */
-      for (i=0; i<M; i++) {
-        if ( w[i] > 0 ) {
-          Ci[nz] = i;
-          Cx[nz++] = x[i];
-        }
+      /* fill entries before diagonal */
+      for (p=Ap[j]; p<Ap[j+1] && Ai[p]<j; p++) {
+        Ci[nz] = Ai[p];
+        Cx[nz++] = x[Ai[p]];
+      }
+      /* fill diagonal if applicable */
+      if (p >= Ap[j+1] /* empty or insert at end */ ||  Ai[p] != j /* insert before end */) {
+        Ci[nz] = j;
+        Cx[nz++] = x[j];
+      }
+      /* fill entries past diagonal */
+      for (; p<Ap[j+1]; p++) {
+        Ci[nz] = Ai[p];
+        Cx[nz++] = x[Ai[p]];
       }
     }
 
@@ -774,7 +784,6 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
 
     /* clean up */
     SUNMatDestroy_Sparse(C);
-    free(w);
     free(x);
 
   }

From 60b5849bf74fc472a6942b44c656d364a8d53db4 Mon Sep 17 00:00:00 2001
From: Julien Schueller <schueller@phimeca.com>
Date: Wed, 27 Sep 2023 22:06:13 +0200
Subject: [PATCH 06/35] Fix missing soversion (#343)

Fix missing soversion on some SUNLinSol and SUNNonlinSol targets

---------

Signed-off-by: Julien Schueller <schueller@phimeca.com>
Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 CHANGELOG.md                               | 4 ++++
 doc/arkode/guide/source/Introduction.rst   | 9 ++++++---
 doc/cvode/guide/source/Introduction.rst    | 9 ++++++---
 doc/cvodes/guide/source/Introduction.rst   | 9 ++++++---
 doc/ida/guide/source/Introduction.rst      | 9 ++++++---
 doc/idas/guide/source/Introduction.rst     | 9 ++++++---
 doc/kinsol/guide/source/Introduction.rst   | 9 ++++++---
 src/sunlinsol/band/CMakeLists.txt          | 2 +-
 src/sunlinsol/cusolversp/CMakeLists.txt    | 2 +-
 src/sunlinsol/dense/CMakeLists.txt         | 2 +-
 src/sunlinsol/klu/CMakeLists.txt           | 2 +-
 src/sunlinsol/lapackband/CMakeLists.txt    | 2 +-
 src/sunlinsol/lapackdense/CMakeLists.txt   | 2 +-
 src/sunlinsol/pcg/CMakeLists.txt           | 2 +-
 src/sunlinsol/spbcgs/CMakeLists.txt        | 2 +-
 src/sunlinsol/spfgmr/CMakeLists.txt        | 2 +-
 src/sunlinsol/spgmr/CMakeLists.txt         | 2 +-
 src/sunlinsol/sptfqmr/CMakeLists.txt       | 2 +-
 src/sunlinsol/superludist/CMakeLists.txt   | 2 +-
 src/sunlinsol/superlumt/CMakeLists.txt     | 2 +-
 src/sunnonlinsol/fixedpoint/CMakeLists.txt | 2 +-
 src/sunnonlinsol/newton/CMakeLists.txt     | 2 +-
 22 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e040f9abdf..998379450f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,17 @@
 # SUNDIALS Changelog
 
+
 ## Changes to SUNDIALS in release X.X.X
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
 Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
 `O(NNZ)`.
+
 Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 
+Fixed missing soversions in some `SUNLinearSolver` CMake targets.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index df64ba2729..3b31d1a83d 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,9 +133,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v5.6.1
 -----------------
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index d67e63dee2..81e7226f58 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -114,9 +114,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 71ef9989a2..71f1e416c2 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -116,9 +116,12 @@ Changes in vX.X.X
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 9e81c930c4..cee6ce1b53 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -75,9 +75,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index b9893a4fd0..db661cf71f 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -91,9 +91,12 @@ Changes in vX.X.X
 
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v5.6.1
 -----------------
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index 4269af1a5c..4e0a7531bf 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -91,9 +91,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
-`O(NNZ)`.
-Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
+``O(NNZ)``.
+
+Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
+
+Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/src/sunlinsol/band/CMakeLists.txt b/src/sunlinsol/band/CMakeLists.txt
index 6d912ecf13..3041c51c38 100644
--- a/src/sunlinsol/band/CMakeLists.txt
+++ b/src/sunlinsol/band/CMakeLists.txt
@@ -34,7 +34,7 @@ sundials_add_library(sundials_sunlinsolband
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_BAND module")
diff --git a/src/sunlinsol/cusolversp/CMakeLists.txt b/src/sunlinsol/cusolversp/CMakeLists.txt
index 7d1539624c..e2e7f95589 100644
--- a/src/sunlinsol/cusolversp/CMakeLists.txt
+++ b/src/sunlinsol/cusolversp/CMakeLists.txt
@@ -33,7 +33,7 @@ sundials_add_library(sundials_sunlinsolcusolversp
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_CUSOLVERSP module")
diff --git a/src/sunlinsol/dense/CMakeLists.txt b/src/sunlinsol/dense/CMakeLists.txt
index ad8e0e4e07..40e10cd3bd 100644
--- a/src/sunlinsol/dense/CMakeLists.txt
+++ b/src/sunlinsol/dense/CMakeLists.txt
@@ -34,7 +34,7 @@ sundials_add_library(sundials_sunlinsoldense
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+    ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_DENSE module")
diff --git a/src/sunlinsol/klu/CMakeLists.txt b/src/sunlinsol/klu/CMakeLists.txt
index ee39c58795..69c4eb0ddc 100644
--- a/src/sunlinsol/klu/CMakeLists.txt
+++ b/src/sunlinsol/klu/CMakeLists.txt
@@ -33,7 +33,7 @@ sundials_add_library(sundials_sunlinsolklu
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_KLU module")
diff --git a/src/sunlinsol/lapackband/CMakeLists.txt b/src/sunlinsol/lapackband/CMakeLists.txt
index 48ffb2b399..a89e132998 100644
--- a/src/sunlinsol/lapackband/CMakeLists.txt
+++ b/src/sunlinsol/lapackband/CMakeLists.txt
@@ -33,7 +33,7 @@ sundials_add_library(sundials_sunlinsollapackband
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_LAPACKBAND module")
diff --git a/src/sunlinsol/lapackdense/CMakeLists.txt b/src/sunlinsol/lapackdense/CMakeLists.txt
index 947085e320..e52a4b6825 100644
--- a/src/sunlinsol/lapackdense/CMakeLists.txt
+++ b/src/sunlinsol/lapackdense/CMakeLists.txt
@@ -33,7 +33,7 @@ sundials_add_library(sundials_sunlinsollapackdense
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_LAPACKDENSE module")
diff --git a/src/sunlinsol/pcg/CMakeLists.txt b/src/sunlinsol/pcg/CMakeLists.txt
index 21c0e7f70e..9094ba0e45 100644
--- a/src/sunlinsol/pcg/CMakeLists.txt
+++ b/src/sunlinsol/pcg/CMakeLists.txt
@@ -32,7 +32,7 @@ sundials_add_library(sundials_sunlinsolpcg
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_PCG module")
diff --git a/src/sunlinsol/spbcgs/CMakeLists.txt b/src/sunlinsol/spbcgs/CMakeLists.txt
index a1c678328b..e7446be084 100644
--- a/src/sunlinsol/spbcgs/CMakeLists.txt
+++ b/src/sunlinsol/spbcgs/CMakeLists.txt
@@ -32,7 +32,7 @@ sundials_add_library(sundials_sunlinsolspbcgs
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SPBCGS module")
diff --git a/src/sunlinsol/spfgmr/CMakeLists.txt b/src/sunlinsol/spfgmr/CMakeLists.txt
index 660f8e7576..817fbda37c 100644
--- a/src/sunlinsol/spfgmr/CMakeLists.txt
+++ b/src/sunlinsol/spfgmr/CMakeLists.txt
@@ -31,7 +31,7 @@ sundials_add_library(sundials_sunlinsolspfgmr
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SPFGMR module")
diff --git a/src/sunlinsol/spgmr/CMakeLists.txt b/src/sunlinsol/spgmr/CMakeLists.txt
index 5e4bbd8356..df03282a92 100644
--- a/src/sunlinsol/spgmr/CMakeLists.txt
+++ b/src/sunlinsol/spgmr/CMakeLists.txt
@@ -31,7 +31,7 @@ sundials_add_library(sundials_sunlinsolspgmr
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+    ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SPGMR module")
diff --git a/src/sunlinsol/sptfqmr/CMakeLists.txt b/src/sunlinsol/sptfqmr/CMakeLists.txt
index d5f4c35e7f..86f06b8b1b 100644
--- a/src/sunlinsol/sptfqmr/CMakeLists.txt
+++ b/src/sunlinsol/sptfqmr/CMakeLists.txt
@@ -31,7 +31,7 @@ sundials_add_library(sundials_sunlinsolsptfqmr
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+    ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SPTFQMR module")
diff --git a/src/sunlinsol/superludist/CMakeLists.txt b/src/sunlinsol/superludist/CMakeLists.txt
index 189a844ee8..0d7ad0803f 100644
--- a/src/sunlinsol/superludist/CMakeLists.txt
+++ b/src/sunlinsol/superludist/CMakeLists.txt
@@ -39,7 +39,7 @@ sundials_add_library(sundials_sunlinsolsuperludist
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SUPERLUDIST module")
diff --git a/src/sunlinsol/superlumt/CMakeLists.txt b/src/sunlinsol/superlumt/CMakeLists.txt
index 6d1a075fad..f2a1e9ff66 100644
--- a/src/sunlinsol/superlumt/CMakeLists.txt
+++ b/src/sunlinsol/superlumt/CMakeLists.txt
@@ -43,7 +43,7 @@ sundials_add_library(sundials_sunlinsolsuperlumt
   VERSION
     ${sunlinsollib_VERSION}
   SOVERSION
-    ${sunlinsollib_VERSION}
+  ${sunlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNLINSOL_SUPERLUMT module")
diff --git a/src/sunnonlinsol/fixedpoint/CMakeLists.txt b/src/sunnonlinsol/fixedpoint/CMakeLists.txt
index 2b19f025c5..50d520be5e 100644
--- a/src/sunnonlinsol/fixedpoint/CMakeLists.txt
+++ b/src/sunnonlinsol/fixedpoint/CMakeLists.txt
@@ -31,7 +31,7 @@ sundials_add_library(sundials_sunnonlinsolfixedpoint
   VERSION
     ${sunnonlinsollib_VERSION}
   SOVERSION
-    ${sunnonlinsollib_VERSION}
+    ${sunnonlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNNONLINSOL_FIXEDPOINT module")
diff --git a/src/sunnonlinsol/newton/CMakeLists.txt b/src/sunnonlinsol/newton/CMakeLists.txt
index 64d2dcba56..54856d2d55 100644
--- a/src/sunnonlinsol/newton/CMakeLists.txt
+++ b/src/sunnonlinsol/newton/CMakeLists.txt
@@ -31,7 +31,7 @@ sundials_add_library(sundials_sunnonlinsolnewton
   VERSION
     ${sunnonlinsollib_VERSION}
   SOVERSION
-    ${sunnonlinsollib_VERSION}
+  ${sunnonlinsollib_SOVERSION}
 )
 
 message(STATUS "Added SUNNONLINSOL_NEWTON module")

From a4e18e58df39ccb0c9ce67de1fe5f3168fda33c2 Mon Sep 17 00:00:00 2001
From: Steven Roberts <roberts115@llnl.gov>
Date: Wed, 27 Sep 2023 17:16:30 -0700
Subject: [PATCH 07/35] Update ARKODE methods docs (#344)

1. Adds missing implicit tables to the ARKODE constants docs
2. Makes formatting of constants consistent in ARKODE docs
3. Groups implicit tables by order

---------

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 doc/arkode/guide/source/Butcher.rst   | 319 +++++++++++++-------------
 doc/arkode/guide/source/Constants.rst |  44 ++--
 2 files changed, 186 insertions(+), 177 deletions(-)

diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst
index 73f4028e04..ecafdab263 100644
--- a/doc/arkode/guide/source/Butcher.rst
+++ b/doc/arkode/guide/source/Butcher.rst
@@ -967,8 +967,75 @@ lower-order method (from :cite:p:`Bank:85`).
    region is outlined in blue; the embedding's region is in red.
 
 
+.. _Butcher.ESDIRK324L2SA:
+
+ESDIRK324L2SA-4-2-3
+^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK324L2SA-4-2-3 method
+
+Accessible via the constant ``ARKODE_ESDIRK324L2SA_4_2_3`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK324L2SA_4_2_3"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK3(2)4L[2]SA method from :cite:p:`KenCarp:19b`.
+Both the method and embedding are A- and L-stable.
+
+.. figure:: /figs/arkode/stab_region_25.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the ESDIRK324L2SA-4-2-3 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
+.. _Butcher.ESDIRK325L2SA:
+
+ESDIRK325L2SA-5-2-3
+^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK325L2SA-5-2-3 method
+
+Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK325L2SA_5_2_3"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK3(2)5L[2]SA method from :cite:p:`KenCarp:16`.
+Both the method and embedding are A- and L-stable.
+
+.. figure:: /figs/arkode/stab_region_26.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the ESDIRK325L2SA-5-2-3 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
+.. _Butcher.ESDIRK32I5L2SA:
+
+ESDIRK32I5L2SA-5-2-3
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK32I5L2SA-5-2-3 method
+
+Accessible via the constant ``ARKODE_ESDIRK32I5L2SA_5_2_3`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK32I5L2SA_5_2_3"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK3(2I)5L[2]SA method from :cite:p:`KenCarp:16`.
+Both the method and embedding are A- and L-stable.
 
+.. figure:: /figs/arkode/stab_region_27.png
+   :scale: 50 %
+   :align: center
 
+   Linear stability region for the ESDIRK32I5L2SA-5-2-3 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
 
 
 .. _Butcher.Kvaerno_4_2_3:
@@ -1309,8 +1376,96 @@ This is the implicit portion of the 4th order ARK4(3)7L[2]SA method from
    region is outlined in blue; the embedding's region is in red.
 
 
+.. _Butcher.ESDIRK436L2SA:
+
+ESDIRK436L2SA-6-3-4
+^^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK436L2SA-6-3-4 method
+
+Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`.
+Both the method and embedding are A- and L-stable.
+
+.. figure:: /figs/arkode/stab_region_28.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the ESDIRK436L2SA-6-3-4 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+.. _Butcher.ESDIRK43I6L2SA:
+
+ESDIRK43I6L2SA-6-3-4
+^^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK43I6L2SA-6-3-4 method
+
+Accessible via the constant ``ARKODE_ESDIRK43I6L2SA_6_3_4`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK43I6L2SA_6_3_4"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK4(3I)6L[2]SA method from :cite:p:`KenCarp:16`.
+Both the method and embedding are A- and L-stable.
+
+.. figure:: /figs/arkode/stab_region_29.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the ESDIRK43I6L2SA-6-3-4 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+.. _Butcher.QESDIRK436L2SA:
+
+QESDIRK436L2SA-6-3-4
+^^^^^^^^^^^^^^^^^^^^
+
+.. index:: QESDIRK436L2SA-6-3-4 method
+
+Accessible via the constant ``ARKODE_QESDIRK436L2SA_6_3_4`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_QESDIRK436L2SA_6_3_4"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the QESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`.
+Both the method and embedding are A- and L-stable.
+
+.. figure:: /figs/arkode/stab_region_30.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the QESDIRK436L2SA-6-3-4 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+.. _Butcher.ESDIRK437L2SA:
+
+ESDIRK437L2SA-7-3-4
+^^^^^^^^^^^^^^^^^^^
+
+.. index:: ESDIRK437L2SA-7-3-4 method
+
+Accessible via the constant ``ARKODE_ESDIRK437L2SA_7_3_4`` to
+:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
+Accessible via the string ``"ARKODE_ESDIRK437L2SA_7_3_4"`` to
+:c:func:`ARKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadDIRKByName`.
+This is the ESDIRK4(3)7L[2]SA method from :cite:p:`KenCarp:19b`.
+Both the method and embedding are A- and L-stable.
 
+.. figure:: /figs/arkode/stab_region_31.png
+   :scale: 50 %
+   :align: center
 
+   Linear stability region for the ESDIRK437L2SA-7-3-4 method method.  The method's
+   region is outlined in blue; the embedding's region is in red.
 
 
 .. _Butcher.Kvaerno_7_4_5:
@@ -1446,170 +1601,6 @@ Both the method and embedding are A-stable; additionally the method is L-stable
    region is outlined in blue; the embedding's region is in red.
 
 
-
-.. _Butcher.ESDIRK324L2SA:
-
-ESDIRK324L2SA-4-2-3
-^^^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK324L2SA-4-2-3 method
-
-Accessible via the constant ``ARKODE_ESDIRK324L2SA_4_2_3`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK324L2SA_4_2_3"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK3(2)4L[2]SA method from :cite:p:`KenCarp:19b`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_25.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK324L2SA-4-2-3 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-
-.. _Butcher.ESDIRK325L2SA:
-
-ESDIRK325L2SA-5-2-3
-^^^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK325L2SA-5-2-3 method
-
-Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK325L2SA_5_2_3"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK3(2)5L[2]SA method from :cite:p:`KenCarp:16`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_26.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK325L2SA-5-2-3 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-
-.. _Butcher.ESDIRK32I5L2SA:
-
-ESDIRK32I5L2SA-5-2-3
-^^^^^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK32I5L2SA-5-2-3 method
-
-Accessible via the constant ``ARKODE_ESDIRK32I5L2SA_5_2_3`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK32I5L2SA_5_2_3"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK3(2I)5L[2]SA method from :cite:p:`KenCarp:16`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_27.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK32I5L2SA-5-2-3 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-.. _Butcher.ESDIRK436L2SA:
-
-ESDIRK436L2SA-6-3-4
-^^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK436L2SA-6-3-4 method
-
-Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_28.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK436L2SA-6-3-4 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-.. _Butcher.ESDIRK43I6L2SA:
-
-ESDIRK43I6L2SA-6-3-4
-^^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK43I6L2SA-6-3-4 method
-
-Accessible via the constant ``ARKODE_ESDIRK43I6L2SA_6_3_4`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK43I6L2SA_6_3_4"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK4(3I)6L[2]SA method from :cite:p:`KenCarp:16`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_29.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK43I6L2SA-6-3-4 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-.. _Butcher.QESDIRK436L2SA:
-
-QESDIRK436L2SA-6-3-4
-^^^^^^^^^^^^^^^^^^^^
-
-.. index:: QESDIRK436L2SA-6-3-4 method
-
-Accessible via the constant ``ARKODE_QESDIRK436L2SA_6_3_4`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_QESDIRK436L2SA_6_3_4"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the QESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_30.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the QESDIRK436L2SA-6-3-4 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
-.. _Butcher.ESDIRK437L2SA:
-
-ESDIRK437L2SA-7-3-4
-^^^^^^^^^^^^^^^^^^^
-
-.. index:: ESDIRK437L2SA-7-3-4 method
-
-Accessible via the constant ``ARKODE_ESDIRK437L2SA_7_3_4`` to
-:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`.
-Accessible via the string ``"ARKODE_ESDIRK437L2SA_7_3_4"`` to
-:c:func:`ARKStepSetTableName` or
-:c:func:`ARKodeButcherTable_LoadDIRKByName`.
-This is the ESDIRK4(3)7L[2]SA method from :cite:p:`KenCarp:19b`.
-Both the method and embedding are A- and L-stable.
-
-.. figure:: /figs/arkode/stab_region_31.png
-   :scale: 50 %
-   :align: center
-
-   Linear stability region for the ESDIRK437L2SA-7-3-4 method method.  The method's
-   region is outlined in blue; the embedding's region is in red.
-
-
 .. _Butcher.ESDIRK547L2SA:
 
 ESDIRK547L2SA-7-4-5
diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst
index 968b68b432..9a3e6600ac 100644
--- a/doc/arkode/guide/source/Constants.rst
+++ b/doc/arkode/guide/source/Constants.rst
@@ -148,6 +148,12 @@ contains the ARKODE output constants.
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_BILLINGTON_3_3_2`              | Use the Billington-3-3-2 SDIRK method.                     |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK324L2SA_4_2_3`           | Use the ESDIRK324L2SA-4-2-3 ESDIRK method.                 |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK325L2SA_5_2_3`           | Use the ESDIRK325L2SA-5-2-3 ESDIRK method.                 |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK32I5L2SA_5_2_3`          | Use the ESDIRK32I5L2SA-5-2-3 ESDIRK method.                |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_TRBDF2_3_3_2`                  | Use the TRBDF2-3-3-2 ESDIRK method.                        |
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_KVAERNO_4_2_3`                 | Use the Kvaerno-4-2-3 ESDIRK method.                       |
@@ -166,12 +172,24 @@ contains the ARKODE output constants.
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_KVAERNO_7_4_5`                 | Use the Kvaerno-7-4-5 ESDIRK method.                       |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK436L2SA_6_3_4`           | Use the ESDIRK436L2SA-6-3-4 method.                        |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK43I6L2SA_6_3_4`          | Use the ESDIRK43I6L2SA-6-3-4 method.                       |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_QESDIRK436L2SA_6_3_4`          | Use the QESDIRK436L2SA-6-3-4 method.                       |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK437L2SA_7_3_4`           | Use the ESDIRK437L2SA-7-3-4 method.                        |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK548L2SA_DIRK_8_4_5`         | Use the ARK-8-4-5 ESDIRK method.                           |
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK437L2SA_DIRK_7_3_4`         | Use the ARK-7-3-4 ESDIRK method.                           |
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK548L2SAb_DIRK_8_4_5`        | Use the ARK-8-4-5b ESDIRK method.                          |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK547L2SA_7_4_5`           | Use the ESDIRK547L2SA-7-4-5 ESDIRK method.                 |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_ESDIRK547L2SA2_7_4_5`          | Use the ESDIRK547L2SA2-7-4-5 ESDIRK method.                |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKSTEP_DEFAULT_DIRK_2`               | Use ARKStep's default second-order DIRK method             |
    |                                               | (ARKODE_SDIRK_2_1_2).                                      |
    +-----------------------------------------------+------------------------------------------------------------+
@@ -215,33 +233,33 @@ contains the ARKODE output constants.
    | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_5`         | (ARKODE_ARK548L2SA_ERK_8_4_5 and                           |
    |                                               | ARKODE_ARK548L2SA_DIRK_8_4_5).                             |
    +-----------------------------------------------+------------------------------------------------------------+
-   |                                               | +                                                          |
+   |                                               |                                                            |
    +-----------------------------------------------+------------------------------------------------------------+
    | **Symplectic Method storage specification**   |                                                            |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_EULER_1_1`              | Symplectic Euler 1st order method with 1 stage.            |
+   | :index:`ARKODE_SPRK_EULER_1_1`                | Symplectic Euler 1st order method with 1 stage.            |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_LEAPFROG_2_2`           | Symplectic Leapfrog 2nd order method with 2 stages.        |
+   | :index:`ARKODE_SPRK_LEAPFROG_2_2`             | Symplectic Leapfrog 2nd order method with 2 stages.        |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_PSEUDO_LEAPFROG_2_2`    | Symplectic Pseudo Leapfrog 2nd order method with 2 stages. |
+   | :index:`ARKODE_SPRK_PSEUDO_LEAPFROG_2_2`      | Symplectic Pseudo Leapfrog 2nd order method with 2 stages. |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_RUTH_3_3`               | Symplectic Ruth 3rd order method with 3 stages.            |
+   | :index:`ARKODE_SPRK_RUTH_3_3`                 | Symplectic Ruth 3rd order method with 3 stages.            |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_MCLACHLAN_2_2`          | Symplectic McLachlan 2nd order method with 2 stages.       |
+   | :index:`ARKODE_SPRK_MCLACHLAN_2_2`            | Symplectic McLachlan 2nd order method with 2 stages.       |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_MCLACHLAN_3_3`          | Symplectic McLachlan 3rd order method with 3 stages.       |
+   | :index:`ARKODE_SPRK_MCLACHLAN_3_3`            | Symplectic McLachlan 3rd order method with 3 stages.       |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_CANDY_ROZMUS_4_4`       | Symplectic Candy-Rozmus 4th order method with 4 stages.    |
+   | :index:`ARKODE_SPRK_CANDY_ROZMUS_4_4`         | Symplectic Candy-Rozmus 4th order method with 4 stages.    |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_MCLACHLAN_4_4`          | Symplectic McLachlan 4th order method with 4 stages.       |
+   | :index:`ARKODE_SPRK_MCLACHLAN_4_4`            | Symplectic McLachlan 4th order method with 4 stages.       |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_MCLACHLAN_5_6`          | Symplectic McLachlan 5th order method with 6 stages.       |
+   | :index:`ARKODE_SPRK_MCLACHLAN_5_6`            | Symplectic McLachlan 5th order method with 6 stages.       |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_YOSHIDA_6_8`            | Symplectic Yoshida 6th order method with 8 stages.         |
+   | :index:`ARKODE_SPRK_YOSHIDA_6_8`              | Symplectic Yoshida 6th order method with 8 stages.         |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_SUZUKI_UMENO_8_16`      | Symplectic McLachlan 8th order method with 16 stages.      |
+   | :index:`ARKODE_SPRK_SUZUKI_UMENO_8_16`        | Symplectic McLachlan 8th order method with 16 stages.      |
    +-----------------------------------------------+------------------------------------------------------------+
-   | :c:macro:`ARKODE_SPRK_SOFRONIOU_10_36`        | Symplectic Sofroniou 10th order method with 36 stages.     |
+   | :index:`ARKODE_SPRK_SOFRONIOU_10_36`          | Symplectic Sofroniou 10th order method with 36 stages.     |
    +-----------------------------------------------+------------------------------------------------------------+
    |                                               |                                                            |
    +-----------------------------------------------+------------------------------------------------------------+

From b557eea56e84e315816e456fb3b0a86f99dc70f5 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Fri, 29 Sep 2023 18:21:21 -0500
Subject: [PATCH 08/35] Bugfix: Support ARK2-3-1-2 in ARKStepSetTableNum (#346)

Update ARKStepSetTableNum to recognize ARK2-3-1-2 as a valid ARK pair.
---
 CHANGELOG.md                             | 3 +++
 doc/arkode/guide/source/Introduction.rst | 4 ++++
 src/arkode/arkode_arkstep_io.c           | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 998379450f..0854c78ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@
 
 ## Changes to SUNDIALS in release X.X.X
 
+Fixed a bug in `ARKStepSetTableNum` wherein it did not recognize `ARKODE_ARK2_ERK_3_1_2` and
+`ARKODE_ARK2_DIRK_3_1_2` as a valid additive Runge--Kutta Butcher table pair.
+
 Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
 
 Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 3b31d1a83d..18bccb9935 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,6 +133,10 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed a bug in :c:func:`ARKStepSetTableNum` wherein it did not recognize
+`ARKODE_ARK2_ERK_3_1_2` and `ARKODE_ARK2_DIRK_3_1_2` as a valid additive
+Runge--Kutta Butcher table pair.
+
 Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
 ``O(NNZ)``.
 
diff --git a/src/arkode/arkode_arkstep_io.c b/src/arkode/arkode_arkstep_io.c
index 50f9182a75..fc2df26f98 100644
--- a/src/arkode/arkode_arkstep_io.c
+++ b/src/arkode/arkode_arkstep_io.c
@@ -1130,7 +1130,8 @@ int ARKStepSetTableNum(void *arkode_mem, ARKODE_DIRKTableID itable, ARKODE_ERKTa
          !((etable == ARKODE_ARK436L2SA_ERK_6_3_4) && (itable == ARKODE_ARK436L2SA_DIRK_6_3_4)) &&
          !((etable == ARKODE_ARK437L2SA_ERK_7_3_4) && (itable == ARKODE_ARK437L2SA_DIRK_7_3_4)) &&
          !((etable == ARKODE_ARK548L2SA_ERK_8_4_5) && (itable == ARKODE_ARK548L2SA_DIRK_8_4_5)) &&
-         !((etable == ARKODE_ARK548L2SAb_ERK_8_4_5) && (itable == ARKODE_ARK548L2SAb_DIRK_8_4_5)) ) {
+         !((etable == ARKODE_ARK548L2SAb_ERK_8_4_5) && (itable == ARKODE_ARK548L2SAb_DIRK_8_4_5)) &&
+         !((etable == ARKODE_ARK2_ERK_3_1_2) && (itable == ARKODE_ARK2_DIRK_3_1_2)) ) {
       arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep",
                       "ARKStepSetTableNum",
                       "Incompatible Butcher tables for ARK method");

From e800b1538eb51d83edf05ee8b490a83d39f2c6ee Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Wed, 4 Oct 2023 12:28:41 -0700
Subject: [PATCH 09/35] Bugfix: stop time and output time reached in same step
 (#349)

Fixes #339: A regression was introduced by the stop time bug fix in
v6.6.1 causing integrators to return at the stop time rather than the
requested output time if the stop time was reached in the same step in
which the output time was passed.

Also fixes a missing check in ARKODE to interpolate (or not) the
solution at the stop time.
---
 CHANGELOG.md                                  |  25 +-
 doc/arkode/guide/source/Introduction.rst      |  22 +-
 doc/cvode/guide/source/Introduction.rst       |  18 +-
 doc/cvodes/guide/source/Introduction.rst      |  21 +-
 doc/ida/guide/source/Introduction.rst         |  11 +-
 doc/idas/guide/source/Introduction.rst        |  14 +-
 doc/kinsol/guide/source/Introduction.rst      |   3 +-
 scripts/arkode                                |  23 +-
 scripts/cvode                                 |  20 +-
 scripts/cvodes                                |  20 +-
 scripts/ida                                   |  17 +-
 scripts/idas                                  |  16 +-
 scripts/kinsol                                |   7 +-
 scripts/shared                                |  13 +-
 src/arkode/arkode.c                           |  70 +++--
 src/cvode/cvode.c                             |  80 +++---
 src/cvodes/cvodes.c                           |  80 +++---
 src/ida/ida.c                                 |  67 +++--
 src/idas/idas.c                               |  69 +++--
 test/answers                                  |   2 +-
 .../unit_tests/arkode/C_serial/CMakeLists.txt |   1 +
 .../arkode/C_serial/ark_test_tstop.c          | 231 +++++++++++++++++
 test/unit_tests/cvode/C_serial/CMakeLists.txt |   1 +
 .../unit_tests/cvode/C_serial/cv_test_tstop.c | 234 +++++++++++++++++
 .../unit_tests/cvodes/C_serial/CMakeLists.txt |   1 +
 .../cvodes/C_serial/cvs_test_tstop.c          | 234 +++++++++++++++++
 test/unit_tests/ida/C_serial/CMakeLists.txt   |   1 +
 test/unit_tests/ida/C_serial/ida_test_tstop.c | 243 ++++++++++++++++++
 test/unit_tests/idas/C_serial/CMakeLists.txt  |   1 +
 .../idas/C_serial/idas_test_tstop.c           | 243 ++++++++++++++++++
 30 files changed, 1511 insertions(+), 277 deletions(-)
 create mode 100644 test/unit_tests/arkode/C_serial/ark_test_tstop.c
 create mode 100644 test/unit_tests/cvode/C_serial/cv_test_tstop.c
 create mode 100644 test/unit_tests/cvodes/C_serial/cvs_test_tstop.c
 create mode 100644 test/unit_tests/ida/C_serial/ida_test_tstop.c
 create mode 100644 test/unit_tests/idas/C_serial/idas_test_tstop.c

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0854c78ebe..4182e059f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,17 +3,29 @@
 
 ## Changes to SUNDIALS in release X.X.X
 
-Fixed a bug in `ARKStepSetTableNum` wherein it did not recognize `ARKODE_ARK2_ERK_3_1_2` and
-`ARKODE_ARK2_DIRK_3_1_2` as a valid additive Runge--Kutta Butcher table pair.
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where ARKODE,
+CVODE, CVODES, IDA, and IDAS would return at the stop time rather than the
+requested output time if the stop time was reached in the same step in which the
+output time was passed.
 
-Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+Fixed a bug in ARKODE where `ARKStepSetInterpolateStopTime` would return an
+interpolated solution at the stop time in some cases when interpolation was
+disabled.
+
+Fixed a bug in `ARKStepSetTableNum` wherein it did not recognize
+`ARKODE_ARK2_ERK_3_1_2` and `ARKODE_ARK2_DIRK_3_1_2` as a valid additive
+Runge--Kutta Butcher table pair.
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be
+built together in the same binary.
 
 Improved computational complexity of `SUNMatScaleAddI_Sparse` from `O(M*N)` to
 `O(NNZ)`.
 
 Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 
-Fixed missing soversions in some `SUNLinearSolver` CMake targets.
+Fixed missing soversions in some `SUNLinearSolver` and `SUNNonlinearSolver`
+CMake targets.
 
 ## Changes to SUNDIALS in release 6.6.1
 
@@ -24,8 +36,9 @@ object.
 
 Fixed a bug in ARKODE, CVODE, CVODES, IDA, and IDAS where the stop time may not
 be cleared when using normal mode if the requested output time is the same as
-the stop time. Additionally, with ARKODE, CVODE, and CVODES an unnecessary
-interpolation of the solution at the stop time may occur in this case.
+the stop time. Additionally, with ARKODE, CVODE, and CVODES this fix removes an
+unnecessary interpolation of the solution at the stop time that could occur in
+this case.
 
 ## Changes to SUNDIALS in release 6.6.0
 
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 18bccb9935..3b5d5ac711 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,16 +133,25 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where ARKODE
+steppers would return at the stop time rather than the requested output time if
+the stop time was reached in the same step in which the output time was passed.
+
+Fixed a bug in ARKODE where :c:func:`ARKStepSetInterpolateStopTime` would return
+an interpolated solution at the stop time in some cases when interpolation was
+disabled.
+
 Fixed a bug in :c:func:`ARKStepSetTableNum` wherein it did not recognize
 `ARKODE_ARK2_ERK_3_1_2` and `ARKODE_ARK2_DIRK_3_1_2` as a valid additive
 Runge--Kutta Butcher table pair.
 
-Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
-``O(NNZ)``.
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
+to ``O(NNZ)``.
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v5.6.1
 -----------------
@@ -152,9 +161,10 @@ Updated the Tpetra NVector interface to support Trilinos 14.
 Fixed a memory leak when destroying a CUDA, HIP, SYCL, or system SUNMemoryHelper
 object.
 
-Fixed a bug where the stop time may not be cleared and an unnecessary
-interpolation may occur when using normal mode if the requested output time is
-the same as the stop time.
+Fixed a bug where the stop time may not be cleared when using normal mode if the
+requested output time is the same as the stop time. Additionally, this fix
+removes an unnecessary interpolation of the solution at the stop time that could
+occur in this case.
 
 Changes in v5.6.0
 -----------------
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index 81e7226f58..085aae8f34 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -114,12 +114,17 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
-``O(NNZ)``.
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where CVODE
+would return at the stop time rather than the requested output time if the stop
+time was reached in the same step in which the output time was passed.
+
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
+to ``O(NNZ)``.
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v6.6.1
 -----------------
@@ -129,9 +134,10 @@ Updated the Tpetra NVector interface to support Trilinos 14.
 Fixed a memory leak when destroying a CUDA, HIP, SYCL, or system SUNMemoryHelper
 object.
 
-Fixed a bug where the stop time may not be cleared and an unnecessary
-interpolation may occur when using normal mode if the requested output time is
-the same as the stop time.
+Fixed a bug where the stop time may not be cleared when using normal mode if the
+requested output time is the same as the stop time. Additionally, this fix
+removes an unnecessary interpolation of the solution at the stop time that could
+occur in this case.
 
 Changes in v6.6.0
 -----------------
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 71f1e416c2..4382d3c2cb 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -114,14 +114,20 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where CVODES
+would return at the stop time rather than the requested output time if the stop
+time was reached in the same step in which the output time was passed.
 
-Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
-``O(NNZ)``.
+Renamed some internal types in CVODES and IDAS to allow both packages to be
+built together in the same binary.
+
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
+to ``O(NNZ)``.
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v6.6.1
 -----------------
@@ -131,9 +137,10 @@ Updated the Tpetra NVector interface to support Trilinos 14.
 Fixed a memory leak when destroying a CUDA, HIP, SYCL, or system SUNMemoryHelper
 object.
 
-Fixed a bug where the stop time may not be cleared and an unnecessary
-interpolation may occur when using normal mode if the requested output time is
-the same as the stop time.
+Fixed a bug where the stop time may not be cleared when using normal mode if the
+requested output time is the same as the stop time. Additionally, this fix
+removes an unnecessary interpolation of the solution at the stop time that could
+occur in this case.
 
 Changes in v6.6.0
 -----------------
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index cee6ce1b53..1fa001bde2 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -75,12 +75,17 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
-``O(NNZ)``.
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where IDA would
+return at the stop time rather than the requested output time if the stop time
+was reached in the same step in which the output time was passed.
+
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
+to ``O(NNZ)``.
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index db661cf71f..16db98882a 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -89,14 +89,20 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
-Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+Fixed a regression introduced by the stop time bug fix in v6.6.1 where IDAS
+would return at the stop time rather than the requested output time if the stop
+time was reached in the same step in which the output time was passed.
 
-Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
-``O(NNZ)``.
+Renamed some internal types in CVODES and IDAS to allow both packages to be
+built together in the same binary.
+
+Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
+to ``O(NNZ)``.
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v5.6.1
 -----------------
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index 4e0a7531bf..0500e6d0df 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -96,7 +96,8 @@ Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)``
 
 Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 
-Fixed missing soversions in some ``SUNLinearSolver`` CMake targets.
+Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
+CMake targets.
 
 Changes in v6.6.1
 -----------------
diff --git a/scripts/arkode b/scripts/arkode
index bb216f7248..6df8c34b75 100755
--- a/scripts/arkode
+++ b/scripts/arkode
@@ -387,25 +387,4 @@ $tar $tarfile $distrobase/examples/arkode/F2003_serial/test_ark_butcher_f2003.f9
 
 echo "   --- Add arkode unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/arkode/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/arkode/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/arkode/C_serial/ark_test_arkstepsetforcing.c
-$tar $tarfile $distrobase/test/unit_tests/arkode/C_serial/ark_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/arkode/C_serial/ark_test_interp.c
-$tar $tarfile $distrobase/test/unit_tests/arkode/C_serial/ark_test_reset.c
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_0.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_1.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_butcher.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_getjac.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_serial/ark_test_getjac_mri.out
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_parallel/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
-$tar $tarfile $distrobase/test/unit_tests/arkode/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/arkode/F2003_serial/ark_test_table_f2003.f90
+$tar $tarfile $distrobase/test/unit_tests/arkode
diff --git a/scripts/cvode b/scripts/cvode
index af97c77f74..2f83eb3ebf 100755
--- a/scripts/cvode
+++ b/scripts/cvode
@@ -272,22 +272,4 @@ $tar $tarfile $distrobase/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.out
 
 echo "   --- Add cvode unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/cvode/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvode/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvode/C_serial/cv_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_getjac.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr.cpp
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_jbad_1.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_lsetup_0.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_cf_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_ef_0.1_--small_nef_1.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_fs_2.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_ef_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_es_2_--small_nst_5.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_gs_2.out
+$tar $tarfile $distrobase/test/unit_tests/cvode
diff --git a/scripts/cvodes b/scripts/cvodes
index ae262ac1d0..cab37658ee 100755
--- a/scripts/cvodes
+++ b/scripts/cvodes
@@ -190,22 +190,4 @@ $tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvsAdvDiff_FSA_non_f2003_
 
 echo "   --- Add cvodes unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvodes/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvodes/C_serial/cvs_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_getjac.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.cpp
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_jbad_1.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_lsetup_0.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_cf_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_ef_0.1_--small_nef_1.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_fs_2.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_ef_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_es_2_--small_nst_5.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_gs_2.out
+$tar $tarfile $distrobase/test/unit_tests/cvodes
diff --git a/scripts/ida b/scripts/ida
index e616bf7a19..cc320c286b 100755
--- a/scripts/ida
+++ b/scripts/ida
@@ -162,19 +162,4 @@ $tar $tarfile $distrobase/examples/ida/F2003_serial/idaRoberts_dns_f2003.out
 
 echo "   --- Add ida unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/ida/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/ida/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/ida/C_serial/ida_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_getjac.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr.cpp
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--dcj_0.9.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_cf_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_max_fs_2.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_2.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_ef_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out
-$tar $tarfile $distrobase/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out
+$tar $tarfile $distrobase/test/unit_tests/ida
diff --git a/scripts/idas b/scripts/idas
index a373b1eeda..7604bb5983 100755
--- a/scripts/idas
+++ b/scripts/idas
@@ -151,18 +151,4 @@ $tar $tarfile $distrobase/examples/idas/F2003_serial/idasHeat2D_kry_f2003.out
 
 echo "   --- Add idas unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/idas/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/idas/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/idas/C_serial/idas_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_getjac.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr.cpp
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--dcj_0.9.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_cf_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_2.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_ef_0.5.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out
-$tar $tarfile $distrobase/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out
+$tar $tarfile $distrobase/test/unit_tests/idas
diff --git a/scripts/kinsol b/scripts/kinsol
index cc081f8c2d..c7bf7dc752 100755
--- a/scripts/kinsol
+++ b/scripts/kinsol
@@ -145,9 +145,4 @@ $tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f20
 
 echo "   --- Add kinsol unit tests to $tarfile"
 
-$tar $tarfile $distrobase/test/unit_tests/kinsol/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/kinsol/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/kinsol/C_serial/kin_test_getuserdata.c
-$tar $tarfile $distrobase/test/unit_tests/kinsol/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
-$tar $tarfile $distrobase/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.out
+$tar $tarfile $distrobase/test/unit_tests/kinsol
diff --git a/scripts/shared b/scripts/shared
index 2a9cef1731..9e42969552 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -835,15 +835,4 @@ echo "   --- Add unit tests files to $tarfile"
 
 $tar $tarfile $distrobase/test/unit_tests/CMakeLists.txt
 $tar $tarfile $distrobase/test/unit_tests/reductions
-$tar $tarfile $distrobase/test/unit_tests/reductions/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/reductions/test_reduction_operators.cpp
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/sys
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/sys/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/sys/test_sunmemory_sys.cpp
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/cuda/test_sunmemory_cuda.cu
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/hip/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/hip/test_sunmemory_hip.cpp
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/sycl/CMakeLists.txt
-$tar $tarfile $distrobase/test/unit_tests/sunmemory/sycl/test_sunmemory_sycl.cpp
+$tar $tarfile $distrobase/test/unit_tests/sunmemory
diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c
index 43a3920a18..601abca7ae 100644
--- a/src/arkode/arkode.c
+++ b/src/arkode/arkode.c
@@ -967,22 +967,31 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
     }
 
     /* Check if tn is at tstop or near tstop */
-    if ( ark_mem->tstopset ) {
+    if ( ark_mem->tstopset )
+    {
       troundoff = FUZZ_FACTOR*ark_mem->uround *
         (SUNRabs(ark_mem->tcur) + SUNRabs(ark_mem->h));
-      if ( SUNRabs(ark_mem->tcur - ark_mem->tstop) <= troundoff) {
-        if (ark_mem->tstopinterp) {
-          (void) arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
-        } else {
-          N_VScale(ONE, ark_mem->yn, yout);
+
+      if ( SUNRabs(ark_mem->tcur - ark_mem->tstop) <= troundoff)
+      {
+        /* Ensure tout >= tstop, otherwise check for tout return below */
+        if ((tout - ark_mem->tstop) * ark_mem->h >= ZERO ||
+            SUNRabs(tout - ark_mem->tstop) <= troundoff)
+        {
+          if (ark_mem->tstopinterp) {
+            (void) arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
+          } else {
+            N_VScale(ONE, ark_mem->yn, yout);
+          }
+          ark_mem->tretlast = *tret = ark_mem->tstop;
+          ark_mem->tstopset = SUNFALSE;
+          istate = ARK_TSTOP_RETURN;
+          break;
         }
-        ark_mem->tretlast = *tret = ark_mem->tstop;
-        ark_mem->tstopset = SUNFALSE;
-        istate = ARK_TSTOP_RETURN;
-        break;
       }
       /* limit upcoming step if it will overcome tstop */
-      if ( (ark_mem->tcur + ark_mem->hprime - ark_mem->tstop)*ark_mem->h > ZERO ) {
+      else if ( (ark_mem->tcur + ark_mem->hprime - ark_mem->tstop)*ark_mem->h > ZERO )
+      {
         ark_mem->hprime = (ark_mem->tstop - ark_mem->tcur) *
           (ONE-FOUR*ark_mem->uround);
         ark_mem->eta = ark_mem->hprime/ark_mem->h;
@@ -2105,24 +2114,35 @@ int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
     } /* end of root stop check */
 
   /* Test for tn at tstop or near tstop */
-  if ( ark_mem->tstopset ) {
-
-    if ( SUNRabs(ark_mem->tcur - ark_mem->tstop) <= troundoff) {
-      *ier = arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
-      if (*ier != ARK_SUCCESS) {
-        arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkStopTests",
-                        MSG_ARK_BAD_TSTOP, ark_mem->tstop, ark_mem->tcur);
-        *ier = ARK_ILL_INPUT;
+  if ( ark_mem->tstopset )
+  {
+    if ( SUNRabs(ark_mem->tcur - ark_mem->tstop) <= troundoff)
+    {
+      /* Ensure tout >= tstop, otherwise check for tout return below */
+      if ((tout - ark_mem->tstop) * ark_mem->h >= ZERO ||
+          SUNRabs(tout - ark_mem->tstop) <= troundoff)
+      {
+        if (ark_mem->tstopinterp)
+        {
+          *ier = arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
+          if (*ier != ARK_SUCCESS) {
+            arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkStopTests",
+                            MSG_ARK_BAD_TSTOP, ark_mem->tstop, ark_mem->tcur);
+            *ier = ARK_ILL_INPUT;
+            return(1);
+          }
+        } else {
+          N_VScale(ONE, ark_mem->yn, yout);
+        }
+        ark_mem->tretlast = *tret = ark_mem->tstop;
+        ark_mem->tstopset = SUNFALSE;
+        *ier = ARK_TSTOP_RETURN;
         return(1);
       }
-      ark_mem->tretlast = *tret = ark_mem->tstop;
-      ark_mem->tstopset = SUNFALSE;
-      *ier = ARK_TSTOP_RETURN;
-      return(1);
     }
-
     /* If next step would overtake tstop, adjust stepsize */
-    if ( (ark_mem->tcur + ark_mem->hprime - ark_mem->tstop)*ark_mem->h > ZERO ) {
+    else if ( (ark_mem->tcur + ark_mem->hprime - ark_mem->tstop)*ark_mem->h > ZERO )
+    {
       ark_mem->hprime = (ark_mem->tstop - ark_mem->tcur)*(ONE-FOUR*ark_mem->uround);
       ark_mem->eta = ark_mem->hprime/ark_mem->h;
     }
diff --git a/src/cvode/cvode.c b/src/cvode/cvode.c
index 2fd769b299..dddf19e171 100644
--- a/src/cvode/cvode.c
+++ b/src/cvode/cvode.c
@@ -1233,32 +1233,38 @@ int CVode(void *cvode_mem, realtype tout, N_Vector yout,
     } /* end of root stop check */
 
     /* Test for tn at tstop or near tstop */
-    if ( cv_mem->cv_tstopset ) {
-
-      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff ) {
-        if (cv_mem->cv_tstopinterp) {
-          ier =  CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
-          if (ier != CV_SUCCESS) {
-            cvProcessError(cv_mem, CV_ILL_INPUT, "CVODE", "CVode",
-                           MSGCV_BAD_TSTOP, cv_mem->cv_tstop, cv_mem->cv_tn);
-            SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
-            return(CV_ILL_INPUT);
+    if ( cv_mem->cv_tstopset )
+    {
+      /* Test for tn at tstop */
+      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff )
+      {
+        /* Ensure tout >= tstop, otherwise check for tout return below */
+        if ((tout - cv_mem->cv_tstop) * cv_mem->cv_h >= ZERO ||
+            SUNRabs(tout - cv_mem->cv_tstop) <= troundoff)
+        {
+          if (cv_mem->cv_tstopinterp) {
+            ier =  CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
+            if (ier != CV_SUCCESS) {
+              cvProcessError(cv_mem, CV_ILL_INPUT, "CVODE", "CVode",
+                             MSGCV_BAD_TSTOP, cv_mem->cv_tstop, cv_mem->cv_tn);
+              SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
+              return(CV_ILL_INPUT);
+            }
+          } else {
+            N_VScale(ONE, cv_mem->cv_zn[0], yout);
           }
-        } else {
-          N_VScale(ONE, cv_mem->cv_zn[0], yout);
+          cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
+          cv_mem->cv_tstopset = SUNFALSE;
+          SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
+          return(CV_TSTOP_RETURN);
         }
-        cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
-        cv_mem->cv_tstopset = SUNFALSE;
-        SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
-        return(CV_TSTOP_RETURN);
       }
-
       /* If next step would overtake tstop, adjust stepsize */
-      if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO ) {
+      else if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO )
+      {
         cv_mem->cv_hprime = (cv_mem->cv_tstop - cv_mem->cv_tn)*(ONE-FOUR*cv_mem->cv_uround);
         cv_mem->cv_eta = cv_mem->cv_hprime / cv_mem->cv_h;
       }
-
     }
 
     /* In CV_NORMAL mode, test if tout was reached */
@@ -1424,27 +1430,35 @@ int CVode(void *cvode_mem, realtype tout, N_Vector yout,
     }
 
     /* Check if tn is at tstop or near tstop */
-    if ( cv_mem->cv_tstopset ) {
-
+    if ( cv_mem->cv_tstopset )
+    {
       troundoff = FUZZ_FACTOR * cv_mem->cv_uround *
         (SUNRabs(cv_mem->cv_tn) + SUNRabs(cv_mem->cv_h));
-      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff) {
-        if (cv_mem->cv_tstopinterp) {
-          (void) CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
-        } else {
-          N_VScale(ONE, cv_mem->cv_zn[0], yout);
+
+      /* Test for tn at tstop */
+      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff)
+      {
+        /* Ensure tout >= tstop, otherwise check for tout return below */
+        if ((tout - cv_mem->cv_tstop) * cv_mem->cv_h >= ZERO ||
+            SUNRabs(tout - cv_mem->cv_tstop) <= troundoff)
+        {
+          if (cv_mem->cv_tstopinterp) {
+            (void) CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
+          } else {
+            N_VScale(ONE, cv_mem->cv_zn[0], yout);
+          }
+          cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
+          cv_mem->cv_tstopset = SUNFALSE;
+          istate = CV_TSTOP_RETURN;
+          break;
         }
-        cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
-        cv_mem->cv_tstopset = SUNFALSE;
-        istate = CV_TSTOP_RETURN;
-        break;
       }
-
-      if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO ) {
+      /* If next step would overtake tstop, adjust stepsize */
+      else if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO )
+      {
         cv_mem->cv_hprime = (cv_mem->cv_tstop - cv_mem->cv_tn)*(ONE-FOUR*cv_mem->cv_uround);
         cv_mem->cv_eta = cv_mem->cv_hprime / cv_mem->cv_h;
       }
-
     }
 
     /* In NORMAL mode, check if tout reached */
diff --git a/src/cvodes/cvodes.c b/src/cvodes/cvodes.c
index 204d207fb0..cd1fabfd3d 100644
--- a/src/cvodes/cvodes.c
+++ b/src/cvodes/cvodes.c
@@ -3059,32 +3059,38 @@ int CVode(void *cvode_mem, realtype tout, N_Vector yout,
     } /* end of root stop check */
 
     /* Test for tn at tstop or near tstop */
-    if ( cv_mem->cv_tstopset ) {
-
-      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff ) {
-        if (cv_mem->cv_tstopinterp) {
-          ier =  CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
-          if (ier != CV_SUCCESS) {
-            cvProcessError(cv_mem, CV_ILL_INPUT, "CVODES", "CVode",
-                           MSGCV_BAD_TSTOP, cv_mem->cv_tstop, cv_mem->cv_tn);
-            SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
-            return(CV_ILL_INPUT);
+    if ( cv_mem->cv_tstopset )
+    {
+      /* Test for tn at tstop */
+      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff )
+      {
+        /* Ensure tout >= tstop, otherwise check for tout return below */
+        if ((tout - cv_mem->cv_tstop) * cv_mem->cv_h >= ZERO ||
+            SUNRabs(tout - cv_mem->cv_tstop) <= troundoff)
+        {
+          if (cv_mem->cv_tstopinterp) {
+            ier =  CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
+            if (ier != CV_SUCCESS) {
+              cvProcessError(cv_mem, CV_ILL_INPUT, "CVODES", "CVode",
+                             MSGCV_BAD_TSTOP, cv_mem->cv_tstop, cv_mem->cv_tn);
+              SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
+              return(CV_ILL_INPUT);
+            }
+          } else {
+            N_VScale(ONE, cv_mem->cv_zn[0], yout);
           }
-        } else {
-          N_VScale(ONE, cv_mem->cv_zn[0], yout);
+          cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
+          cv_mem->cv_tstopset = SUNFALSE;
+          SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
+          return(CV_TSTOP_RETURN);
         }
-        cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
-        cv_mem->cv_tstopset = SUNFALSE;
-        SUNDIALS_MARK_FUNCTION_END(CV_PROFILER);
-        return(CV_TSTOP_RETURN);
       }
-
       /* If next step would overtake tstop, adjust stepsize */
-      if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO ) {
+      else if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO )
+      {
         cv_mem->cv_hprime = (cv_mem->cv_tstop - cv_mem->cv_tn)*(ONE-FOUR*cv_mem->cv_uround);
         cv_mem->cv_eta = cv_mem->cv_hprime / cv_mem->cv_h;
       }
-
     }
 
     /* In CV_NORMAL mode, test if tout was reached */
@@ -3294,27 +3300,35 @@ int CVode(void *cvode_mem, realtype tout, N_Vector yout,
     }
 
     /* Check if tn is at tstop or near tstop */
-    if ( cv_mem->cv_tstopset ) {
-
+    if ( cv_mem->cv_tstopset )
+    {
       troundoff = FUZZ_FACTOR * cv_mem->cv_uround *
         (SUNRabs(cv_mem->cv_tn) + SUNRabs(cv_mem->cv_h));
-      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff) {
-        if (cv_mem->cv_tstopinterp) {
-          (void) CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
-        } else {
-          N_VScale(ONE, cv_mem->cv_zn[0], yout);
+
+      /* Test for tn at tstop */
+      if ( SUNRabs(cv_mem->cv_tn - cv_mem->cv_tstop) <= troundoff)
+      {
+        /* Ensure tout >= tstop, otherwise check for tout return below */
+        if ((tout - cv_mem->cv_tstop) * cv_mem->cv_h >= ZERO ||
+            SUNRabs(tout - cv_mem->cv_tstop) <= troundoff)
+        {
+          if (cv_mem->cv_tstopinterp) {
+            (void) CVodeGetDky(cv_mem, cv_mem->cv_tstop, 0, yout);
+          } else {
+            N_VScale(ONE, cv_mem->cv_zn[0], yout);
+          }
+          cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
+          cv_mem->cv_tstopset = SUNFALSE;
+          istate = CV_TSTOP_RETURN;
+          break;
         }
-        cv_mem->cv_tretlast = *tret = cv_mem->cv_tstop;
-        cv_mem->cv_tstopset = SUNFALSE;
-        istate = CV_TSTOP_RETURN;
-        break;
       }
-
-      if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO ) {
+      /* If next step would overtake tstop, adjust stepsize */
+      else if ( (cv_mem->cv_tn + cv_mem->cv_hprime - cv_mem->cv_tstop)*cv_mem->cv_h > ZERO )
+      {
         cv_mem->cv_hprime = (cv_mem->cv_tstop - cv_mem->cv_tn)*(ONE-FOUR*cv_mem->cv_uround);
         cv_mem->cv_eta = cv_mem->cv_hprime / cv_mem->cv_h;
       }
-
     }
 
     /* In NORMAL mode, check if tout reached */
diff --git a/src/ida/ida.c b/src/ida/ida.c
index 9e9b7c4b1d..2250bd6937 100644
--- a/src/ida/ida.c
+++ b/src/ida/ida.c
@@ -1977,28 +1977,42 @@ static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
   int ier;
   realtype troundoff;
 
-  if (IDA_mem->ida_tstopset) {
-    /* Test for tn past tstop, tn = tretlast, tn past tout, tn near tstop. */
-    if ( (IDA_mem->ida_tn - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO) {
+  if (IDA_mem->ida_tstopset)
+  {
+    /* Test for tn past tstop */
+    if ( (IDA_mem->ida_tn - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
       IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDA", "IDASolve",
                       MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
       return(IDA_ILL_INPUT);
     }
 
     troundoff = HUNDRED * IDA_mem->ida_uround * (SUNRabs(IDA_mem->ida_tn) + SUNRabs(IDA_mem->ida_hh));
-    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff) {
-      ier = IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
-      if (ier != IDA_SUCCESS) {
-        IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDA", "IDASolve",
-                        MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
-        return(IDA_ILL_INPUT);
+
+    /* Test for tn at tstop */
+    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff)
+    {
+      /* Ensure tout >= tstop, otherwise check for tout return below */
+      if ((tout - IDA_mem->ida_tstop) * IDA_mem->ida_hh >= ZERO ||
+          SUNRabs(tout - IDA_mem->ida_tstop) <= troundoff)
+      {
+        ier = IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
+        if (ier != IDA_SUCCESS)
+        {
+          IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDA", "IDASolve",
+                          MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
+          return(IDA_ILL_INPUT);
+        }
+        *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
+        IDA_mem->ida_tstopset = SUNFALSE;
+        return(IDA_TSTOP_RETURN);
       }
-      *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
-      IDA_mem->ida_tstopset = SUNFALSE;
-      return(IDA_TSTOP_RETURN);
     }
-    if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    /* Test for tn approaching tstop */
+    else if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
       IDA_mem->ida_hh = (IDA_mem->ida_tstop - IDA_mem->ida_tn)*(ONE - FOUR * IDA_mem->ida_uround);
+    }
   }
 
   switch (itask) {
@@ -2065,17 +2079,28 @@ static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
   /* int ier; */
   realtype troundoff;
 
-  if (IDA_mem->ida_tstopset) {
-    /* Test for tn at tstop and for tn near tstop */
+  if (IDA_mem->ida_tstopset)
+  {
     troundoff = HUNDRED * IDA_mem->ida_uround * (SUNRabs(IDA_mem->ida_tn) + SUNRabs(IDA_mem->ida_hh));
-    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff) {
-      /* ier = */ IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
-      *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
-      IDA_mem->ida_tstopset = SUNFALSE;
-      return(IDA_TSTOP_RETURN);
+
+    /* Test for tn at tstop */
+    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff)
+    {
+      /* Ensure tout >= tstop, otherwise check for tout return below */
+      if ((tout - IDA_mem->ida_tstop) * IDA_mem->ida_hh >= ZERO ||
+          SUNRabs(tout - IDA_mem->ida_tstop) <= troundoff)
+      {
+        /* ier = */ IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
+        *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
+        IDA_mem->ida_tstopset = SUNFALSE;
+        return(IDA_TSTOP_RETURN);
+      }
     }
-    if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    /* Test for tn approaching tstop */
+    else if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
       IDA_mem->ida_hh = (IDA_mem->ida_tstop - IDA_mem->ida_tn)*(ONE - FOUR * IDA_mem->ida_uround);
+    }
   }
 
   switch (itask) {
diff --git a/src/idas/idas.c b/src/idas/idas.c
index a2b0874d03..0008a13375 100644
--- a/src/idas/idas.c
+++ b/src/idas/idas.c
@@ -4985,28 +4985,42 @@ static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
   int ier;
   realtype troundoff;
 
-  if (IDA_mem->ida_tstopset) {
-    /* Test for tn past tstop, tn past tretlast, and tn near tstop. */
-    if ((IDA_mem->ida_tn - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO) {
-      IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDA", "IDASolve",
+  if (IDA_mem->ida_tstopset)
+  {
+    /* Test for tn past tstop */
+    if ( (IDA_mem->ida_tn - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
+      IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDAS", "IDASolve",
                       MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
       return(IDA_ILL_INPUT);
     }
 
     troundoff = HUNDRED * IDA_mem->ida_uround * (SUNRabs(IDA_mem->ida_tn) + SUNRabs(IDA_mem->ida_hh));
-    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff) {
-      ier = IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
-      if (ier != IDA_SUCCESS) {
-        IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDA", "IDASolve",
-                        MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
-        return(IDA_ILL_INPUT);
+
+    /* Test for tn at tstop */
+    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff)
+    {
+      /* Ensure tout >= tstop, otherwise check for tout return below */
+      if ((tout - IDA_mem->ida_tstop) * IDA_mem->ida_hh >= ZERO ||
+          SUNRabs(tout - IDA_mem->ida_tstop) <= troundoff)
+      {
+        ier = IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
+        if (ier != IDA_SUCCESS)
+        {
+          IDAProcessError(IDA_mem, IDA_ILL_INPUT, "IDAS", "IDASolve",
+                          MSG_BAD_TSTOP, IDA_mem->ida_tstop, IDA_mem->ida_tn);
+          return(IDA_ILL_INPUT);
+        }
+        *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
+        IDA_mem->ida_tstopset = SUNFALSE;
+        return(IDA_TSTOP_RETURN);
       }
-      *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
-      IDA_mem->ida_tstopset = SUNFALSE;
-      return(IDA_TSTOP_RETURN);
     }
-    if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    /* Test for tn approaching tstop */
+    else if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
       IDA_mem->ida_hh = (IDA_mem->ida_tstop - IDA_mem->ida_tn)*(ONE - FOUR * IDA_mem->ida_uround);
+    }
   }
 
   switch (itask) {
@@ -5073,17 +5087,28 @@ static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
   /* int ier; */
   realtype troundoff;
 
-  if (IDA_mem->ida_tstopset) {
-    /* Test for tn at tstop and for tn near tstop */
+  if (IDA_mem->ida_tstopset)
+  {
     troundoff = HUNDRED * IDA_mem->ida_uround * (SUNRabs(IDA_mem->ida_tn) + SUNRabs(IDA_mem->ida_hh));
-    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff) {
-      /* ier = */ IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
-      *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
-      IDA_mem->ida_tstopset = SUNFALSE;
-      return(IDA_TSTOP_RETURN);
+
+    /* Test for tn at tstop */
+    if (SUNRabs(IDA_mem->ida_tn - IDA_mem->ida_tstop) <= troundoff)
+    {
+      /* Ensure tout >= tstop, otherwise check for tout return below */
+      if ((tout - IDA_mem->ida_tstop) * IDA_mem->ida_hh >= ZERO ||
+          SUNRabs(tout - IDA_mem->ida_tstop) <= troundoff)
+      {
+        /* ier = */ IDAGetSolution(IDA_mem, IDA_mem->ida_tstop, yret, ypret);
+        *tret = IDA_mem->ida_tretlast = IDA_mem->ida_tstop;
+        IDA_mem->ida_tstopset = SUNFALSE;
+        return(IDA_TSTOP_RETURN);
+      }
     }
-    if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    /* Test for tn approaching tstop */
+    else if ((IDA_mem->ida_tn + IDA_mem->ida_hh - IDA_mem->ida_tstop)*IDA_mem->ida_hh > ZERO)
+    {
       IDA_mem->ida_hh = (IDA_mem->ida_tstop - IDA_mem->ida_tn)*(ONE - FOUR * IDA_mem->ida_uround);
+    }
   }
 
   switch (itask) {
diff --git a/test/answers b/test/answers
index b47ad4f1f5..8f1d469a42 160000
--- a/test/answers
+++ b/test/answers
@@ -1 +1 @@
-Subproject commit b47ad4f1f5da5548b62f1933dad38294d9943fc5
+Subproject commit 8f1d469a426ffb562361ab2aa1702ad15194cb2c
diff --git a/test/unit_tests/arkode/C_serial/CMakeLists.txt b/test/unit_tests/arkode/C_serial/CMakeLists.txt
index 597196c228..2c4daa7d74 100644
--- a/test/unit_tests/arkode/C_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/C_serial/CMakeLists.txt
@@ -30,6 +30,7 @@ set(ARKODE_unit_tests
   "ark_test_interp\;-10000"
   "ark_test_interp\;-1000000"
   "ark_test_reset\;"
+  "ark_test_tstop\;"
   )
 
 # Add the build and install targets for each test
diff --git a/test/unit_tests/arkode/C_serial/ark_test_tstop.c b/test/unit_tests/arkode/C_serial/ark_test_tstop.c
new file mode 100644
index 0000000000..66a17b5a46
--- /dev/null
+++ b/test/unit_tests/arkode/C_serial/ark_test_tstop.c
@@ -0,0 +1,231 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for setting stop time
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nvector/nvector_serial.h"
+#include "sundials/sundials_matrix.h"
+#include "sundials/sundials_nvector.h"
+#include "sunmatrix/sunmatrix_dense.h"
+#include "sunlinsol/sunlinsol_dense.h"
+#include "arkode/arkode_arkstep.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+
+int ode_rhs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
+{
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  ydot_data[0] = ONE;
+  return 0;
+}
+
+
+int ode_jac(sunrealtype t, N_Vector y, N_Vector f, SUNMatrix J, void *user_data,
+            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
+{
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
+  J_data[0] = ZERO;
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  SUNContext      sunctx     = NULL;
+  N_Vector        y          = NULL;
+  SUNMatrix       A          = NULL;
+  SUNLinearSolver LS         = NULL;
+  void*           arkode_mem = NULL;
+
+  int         flag        = 0;
+  int         arkode_flag = 0;
+  int         i           = 0;
+  sunrealtype tout        = SUN_RCONST(0.10);
+  sunrealtype dt_tout     = SUN_RCONST(0.25);
+  sunrealtype tstop       = SUN_RCONST(0.30);
+  sunrealtype dt_tstop    = SUN_RCONST(0.30);
+  sunrealtype tret        = ZERO;
+  sunrealtype tcur        = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag)
+  {
+    fprintf(stderr, "SUNContext_Create returned %i\n", flag);
+    return 1;
+  }
+
+  /* -----------------------
+   * Setup initial condition
+   * ----------------------- */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ZERO, y);
+
+  /* -----------
+   * Setup ARKODE
+   * ----------- */
+
+  arkode_mem = ARKStepCreate(NULL, ode_rhs, ZERO, y, sunctx);
+  if (!arkode_mem) { return 1; }
+
+  flag = ARKStepSStolerances(arkode_mem, SUN_RCONST(1.0e-4), SUN_RCONST(1.0e-8));
+  if (flag) { return 1; }
+
+  A = SUNDenseMatrix(1, 1, sunctx);
+  if (!A) { return 1; }
+
+  LS = SUNLinSol_Dense(y, A, sunctx);
+  if (!LS) { return 1; }
+
+  flag = ARKStepSetLinearSolver(arkode_mem, LS, A);
+  if (flag) { return 1; }
+
+  flag = ARKStepSetJacFn(arkode_mem, ode_jac);
+  if (flag) { return 1; }
+
+  flag = ARKStepSetOrder(arkode_mem, 2);
+  if (flag) { return 1; }
+
+  flag = ARKStepSetStopTime(arkode_mem, tstop);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  printf("0: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM "\n",
+         tout, tstop, tret, tcur);
+
+  for (i = 1; i <= 6; i++)
+  {
+    arkode_flag = ARKStepEvolve(arkode_mem, tout, y, &tret, ARK_NORMAL);
+    if (arkode_flag < 0) { flag = 1; break; }
+
+    flag = ARKStepGetCurrentTime(arkode_mem, &tcur);
+    if (flag) { break; }
+
+    printf("%i: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM ", return = %i\n",
+           i, tout, tstop, tret, tcur, arkode_flag);
+
+    /* First return: output time < stop time */
+    if (i == 1 && arkode_flag != ARK_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* Second return: output time > stop time */
+    if (i == 2)
+    {
+      if (arkode_flag != ARK_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = ARKStepSetStopTime(arkode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Third return: output time = stop time */
+    if (i == 3)
+    {
+      if (arkode_flag != ARK_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = ARKStepSetStopTime(arkode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Fourth return: output time < stop time but both output time and the stop
+       time are overtaken in the same step */
+    if (i == 4)
+    {
+      if (arkode_flag != ARK_SUCCESS)
+      {
+        printf("ERROR: Expected output return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Fifth return: output time > stop time after step where both output time
+       and the stop time were overtaken in the same step */
+    if (i == 5)
+    {
+      if (arkode_flag != ARK_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Sixth return: output time < stop time (not updated) */
+    if (i == 6 && arkode_flag != ARK_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* update output time */
+    tout += dt_tout;
+  }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  ARKStepFree(&arkode_mem);
+  N_VDestroy(y);
+  SUNMatDestroy(A);
+  SUNLinSolFree(LS);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/
diff --git a/test/unit_tests/cvode/C_serial/CMakeLists.txt b/test/unit_tests/cvode/C_serial/CMakeLists.txt
index e576d75ddd..f396478a16 100644
--- a/test/unit_tests/cvode/C_serial/CMakeLists.txt
+++ b/test/unit_tests/cvode/C_serial/CMakeLists.txt
@@ -17,6 +17,7 @@
 # List of test tuples of the form "name\;args"
 set(unit_tests
   "cv_test_getuserdata\;"
+  "cv_test_tstop\;"
   )
 
 # Add the build and install targets for each test
diff --git a/test/unit_tests/cvode/C_serial/cv_test_tstop.c b/test/unit_tests/cvode/C_serial/cv_test_tstop.c
new file mode 100644
index 0000000000..50c7e053d6
--- /dev/null
+++ b/test/unit_tests/cvode/C_serial/cv_test_tstop.c
@@ -0,0 +1,234 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for setting stop time
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nvector/nvector_serial.h"
+#include "sundials/sundials_matrix.h"
+#include "sundials/sundials_nvector.h"
+#include "sunmatrix/sunmatrix_dense.h"
+#include "sunlinsol/sunlinsol_dense.h"
+#include "cvode/cvode.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+
+int ode_rhs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
+{
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  ydot_data[0] = ONE;
+  return 0;
+}
+
+
+int ode_jac(sunrealtype t, N_Vector y, N_Vector f, SUNMatrix J, void *user_data,
+            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
+{
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
+  J_data[0] = ZERO;
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  SUNContext      sunctx    = NULL;
+  N_Vector        y         = NULL;
+  SUNMatrix       A         = NULL;
+  SUNLinearSolver LS        = NULL;
+  void*           cvode_mem = NULL;
+
+  int         flag       = 0;
+  int         cvode_flag = 0;
+  int         i          = 0;
+  sunrealtype tout       = SUN_RCONST(0.10);
+  sunrealtype dt_tout    = SUN_RCONST(0.25);
+  sunrealtype tstop      = SUN_RCONST(0.30);
+  sunrealtype dt_tstop   = SUN_RCONST(0.30);
+  sunrealtype tret       = ZERO;
+  sunrealtype tcur       = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag)
+  {
+    fprintf(stderr, "SUNContext_Create returned %i\n", flag);
+    return 1;
+  }
+
+  /* -----------------------
+   * Setup initial condition
+   * ----------------------- */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ZERO, y);
+
+  /* -----------
+   * Setup CVODE
+   * ----------- */
+
+  cvode_mem = CVodeCreate(CV_BDF, sunctx);
+  if (!cvode_mem) { return 1; }
+
+  flag = CVodeInit(cvode_mem, ode_rhs, ZERO, y);
+  if (flag) { return 1; }
+
+  flag = CVodeSStolerances(cvode_mem, SUN_RCONST(1.0e-4), SUN_RCONST(1.0e-8));
+  if (flag) { return 1; }
+
+  A = SUNDenseMatrix(1, 1, sunctx);
+  if (!A) { return 1; }
+
+  LS = SUNLinSol_Dense(y, A, sunctx);
+  if (!LS) { return 1; }
+
+  flag = CVodeSetLinearSolver(cvode_mem, LS, A);
+  if (flag) { return 1; }
+
+  flag = CVodeSetJacFn(cvode_mem, ode_jac);
+  if (flag) { return 1; }
+
+  flag = CVodeSetMaxOrd(cvode_mem, 1);
+  if (flag) { return 1; }
+
+  flag = CVodeSetStopTime(cvode_mem, tstop);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  printf("0: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM "\n",
+         tout, tstop, tret, tcur);
+
+  for (i = 1; i <= 6; i++)
+  {
+    cvode_flag = CVode(cvode_mem, tout, y, &tret, CV_NORMAL);
+    if (cvode_flag < 0) { flag = 1; break; }
+
+    flag = CVodeGetCurrentTime(cvode_mem, &tcur);
+    if (flag) { break; }
+
+    printf("%i: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM ", return = %i\n",
+           i, tout, tstop, tret, tcur, cvode_flag);
+
+    /* First return: output time < stop time */
+    if (i == 1 && cvode_flag != CV_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* Second return: output time > stop time */
+    if (i == 2)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = CVodeSetStopTime(cvode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Third return: output time = stop time */
+    if (i == 3)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = CVodeSetStopTime(cvode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Fourth return: output time < stop time but both output time and the stop
+       time are overtaken in the same step */
+    if (i == 4)
+    {
+      if (cvode_flag != CV_SUCCESS)
+      {
+        printf("ERROR: Expected output return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Fifth return: output time > stop time after step where both output time
+       and the stop time were overtaken in the same step */
+    if (i == 5)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Sixth return: output time < stop time (not updated) */
+    if (i == 6 && cvode_flag != CV_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* update output time */
+    tout += dt_tout;
+  }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  CVodeFree(&cvode_mem);
+  N_VDestroy(y);
+  SUNMatDestroy(A);
+  SUNLinSolFree(LS);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/
diff --git a/test/unit_tests/cvodes/C_serial/CMakeLists.txt b/test/unit_tests/cvodes/C_serial/CMakeLists.txt
index 0775ba2ab5..96c747becb 100644
--- a/test/unit_tests/cvodes/C_serial/CMakeLists.txt
+++ b/test/unit_tests/cvodes/C_serial/CMakeLists.txt
@@ -17,6 +17,7 @@
 # List of test tuples of the form "name\;args"
 set(unit_tests
   "cvs_test_getuserdata\;"
+  "cvs_test_tstop\;"
   )
 
 # Add the build and install targets for each test
diff --git a/test/unit_tests/cvodes/C_serial/cvs_test_tstop.c b/test/unit_tests/cvodes/C_serial/cvs_test_tstop.c
new file mode 100644
index 0000000000..5ce9c1c611
--- /dev/null
+++ b/test/unit_tests/cvodes/C_serial/cvs_test_tstop.c
@@ -0,0 +1,234 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for setting stop time
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nvector/nvector_serial.h"
+#include "sundials/sundials_matrix.h"
+#include "sundials/sundials_nvector.h"
+#include "sunmatrix/sunmatrix_dense.h"
+#include "sunlinsol/sunlinsol_dense.h"
+#include "cvodes/cvodes.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+
+int ode_rhs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
+{
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  ydot_data[0] = ONE;
+  return 0;
+}
+
+
+int ode_jac(sunrealtype t, N_Vector y, N_Vector f, SUNMatrix J, void *user_data,
+            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
+{
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
+  J_data[0] = ZERO;
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  SUNContext      sunctx    = NULL;
+  N_Vector        y         = NULL;
+  SUNMatrix       A         = NULL;
+  SUNLinearSolver LS        = NULL;
+  void*           cvode_mem = NULL;
+
+  int         flag       = 0;
+  int         cvode_flag = 0;
+  int         i          = 0;
+  sunrealtype tout       = SUN_RCONST(0.10);
+  sunrealtype dt_tout    = SUN_RCONST(0.25);
+  sunrealtype tstop      = SUN_RCONST(0.30);
+  sunrealtype dt_tstop   = SUN_RCONST(0.30);
+  sunrealtype tret       = ZERO;
+  sunrealtype tcur       = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag)
+  {
+    fprintf(stderr, "SUNContext_Create returned %i\n", flag);
+    return 1;
+  }
+
+  /* -----------------------
+   * Setup initial condition
+   * ----------------------- */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ZERO, y);
+
+  /* -----------
+   * Setup CVODE
+   * ----------- */
+
+  cvode_mem = CVodeCreate(CV_BDF, sunctx);
+  if (!cvode_mem) { return 1; }
+
+  flag = CVodeInit(cvode_mem, ode_rhs, ZERO, y);
+  if (flag) { return 1; }
+
+  flag = CVodeSStolerances(cvode_mem, SUN_RCONST(1.0e-4), SUN_RCONST(1.0e-8));
+  if (flag) { return 1; }
+
+  A = SUNDenseMatrix(1, 1, sunctx);
+  if (!A) { return 1; }
+
+  LS = SUNLinSol_Dense(y, A, sunctx);
+  if (!LS) { return 1; }
+
+  flag = CVodeSetLinearSolver(cvode_mem, LS, A);
+  if (flag) { return 1; }
+
+  flag = CVodeSetJacFn(cvode_mem, ode_jac);
+  if (flag) { return 1; }
+
+  flag = CVodeSetMaxOrd(cvode_mem, 1);
+  if (flag) { return 1; }
+
+  flag = CVodeSetStopTime(cvode_mem, tstop);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  printf("0: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM "\n",
+         tout, tstop, tret, tcur);
+
+  for (i = 1; i <= 6; i++)
+  {
+    cvode_flag = CVode(cvode_mem, tout, y, &tret, CV_NORMAL);
+    if (cvode_flag < 0) { flag = 1; break; }
+
+    flag = CVodeGetCurrentTime(cvode_mem, &tcur);
+    if (flag) { break; }
+
+    printf("%i: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM ", return = %i\n",
+           i, tout, tstop, tret, tcur, cvode_flag);
+
+    /* First return: output time < stop time */
+    if (i == 1 && cvode_flag != CV_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* Second return: output time > stop time */
+    if (i == 2)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = CVodeSetStopTime(cvode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Third return: output time = stop time */
+    if (i == 3)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = CVodeSetStopTime(cvode_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Fourth return: output time < stop time but both output time and the stop
+       time are overtaken in the same step */
+    if (i == 4)
+    {
+      if (cvode_flag != CV_SUCCESS)
+      {
+        printf("ERROR: Expected output return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Fifth return: output time > stop time after step where both output time
+       and the stop time were overtaken in the same step */
+    if (i == 5)
+    {
+      if (cvode_flag != CV_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Sixth return: output time < stop time (not updated) */
+    if (i == 6 && cvode_flag != CV_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* update output time */
+    tout += dt_tout;
+  }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  CVodeFree(&cvode_mem);
+  N_VDestroy(y);
+  SUNMatDestroy(A);
+  SUNLinSolFree(LS);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/
diff --git a/test/unit_tests/ida/C_serial/CMakeLists.txt b/test/unit_tests/ida/C_serial/CMakeLists.txt
index f2060ee3ee..543b11c4f9 100644
--- a/test/unit_tests/ida/C_serial/CMakeLists.txt
+++ b/test/unit_tests/ida/C_serial/CMakeLists.txt
@@ -17,6 +17,7 @@
 # List of test tuples of the form "name\;args"
 set(unit_tests
   "ida_test_getuserdata\;"
+  "ida_test_tstop\;"
   )
 
 # Add the build and install targets for each test
diff --git a/test/unit_tests/ida/C_serial/ida_test_tstop.c b/test/unit_tests/ida/C_serial/ida_test_tstop.c
new file mode 100644
index 0000000000..491910ae1b
--- /dev/null
+++ b/test/unit_tests/ida/C_serial/ida_test_tstop.c
@@ -0,0 +1,243 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for setting stop time
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nvector/nvector_serial.h"
+#include "sundials/sundials_matrix.h"
+#include "sundials/sundials_nvector.h"
+#include "sunmatrix/sunmatrix_dense.h"
+#include "sunlinsol/sunlinsol_dense.h"
+#include "ida/ida.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+
+int dae_res(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector res,
+            void *user_data)
+{
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  sunrealtype* res_data  = N_VGetArrayPointer(res);
+  res_data[0] = ydot_data[0] - ONE;
+  return 0;
+}
+
+
+int dae_jac(sunrealtype t, sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+            SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
+            N_Vector tempv3)
+{
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
+  J_data[0] = ONE;
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  SUNContext      sunctx  = NULL;
+  N_Vector        y       = NULL;
+  N_Vector        yp      = NULL;
+  SUNMatrix       A       = NULL;
+  SUNLinearSolver LS      = NULL;
+  void*           ida_mem = NULL;
+
+  int         flag     = 0;
+  int         ida_flag = 0;
+  int         i        = 0;
+  sunrealtype tout     = SUN_RCONST(0.10);
+  sunrealtype dt_tout  = SUN_RCONST(0.25);
+  sunrealtype tstop    = SUN_RCONST(0.30);
+  sunrealtype dt_tstop = SUN_RCONST(0.30);
+  sunrealtype tret     = ZERO;
+  sunrealtype tcur     = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag)
+  {
+    fprintf(stderr, "SUNContext_Create returned %i\n", flag);
+    return 1;
+  }
+
+  /* -----------------------
+   * Setup initial condition
+   * ------------------------ */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ZERO, y);
+
+  yp = N_VClone(y);
+  if (!yp) { return 1; }
+  N_VConst(ONE, yp);
+
+  /* ---------
+   * Setup IDA
+   * --------- */
+
+  ida_mem = IDACreate(sunctx);
+  if (!ida_mem) { return 1; }
+
+  flag = IDAInit(ida_mem, dae_res, ZERO, y, yp);
+  if (flag) { return 1; }
+
+  flag = IDASStolerances(ida_mem, SUN_RCONST(1.0e-4), SUN_RCONST(1.0e-8));
+  if (flag) { return 1; }
+
+  A = SUNDenseMatrix(1, 1, sunctx);
+  if (!A) { return 1; }
+
+  LS = SUNLinSol_Dense(y, A, sunctx);
+  if (!LS) { return 1; }
+
+  flag = IDASetLinearSolver(ida_mem, LS, A);
+  if (flag) { return 1; }
+
+  flag = IDASetJacFn(ida_mem, dae_jac);
+  if (flag) { return 1; }
+
+  flag = IDASetMaxOrd(ida_mem, 1);
+  if (flag) { return 1; }
+
+  flag = IDASetStopTime(ida_mem, tstop);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  printf("0: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM "\n",
+         tout, tstop, tret, tcur);
+
+  for (i = 1; i <= 6; i++)
+  {
+    ida_flag = IDASolve(ida_mem, tout, &tret, y, yp, IDA_NORMAL);
+    if (ida_flag < 0) { flag = 1; break; }
+
+    flag = IDAGetCurrentTime(ida_mem, &tcur);
+    if (flag) { break; }
+
+    printf("%i: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM ", return = %i\n",
+           i, tout, tstop, tret, tcur, ida_flag);
+
+    /* First return: output time < stop time */
+    if (i == 1 && ida_flag != IDA_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* Second return: output time > stop time */
+    if (i == 2)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = IDASetStopTime(ida_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Third return: output time = stop time */
+    if (i == 3)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = IDASetStopTime(ida_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Fourth return: output time < stop time but both output time and the stop
+       time are overtaken in the same step */
+    if (i == 4)
+    {
+      if (ida_flag != IDA_SUCCESS)
+      {
+        printf("ERROR: Expected output return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Fifth return: output time > stop time after step where both output time
+       and the stop time were overtaken in the same step */
+    if (i == 5)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Sixth return: output time < stop time (not updated) */
+    if (i == 6 && ida_flag != IDA_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* update output time */
+    tout += dt_tout;
+  }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  IDAFree(&ida_mem);
+  N_VDestroy(y);
+  N_VDestroy(yp);
+  SUNMatDestroy(A);
+  SUNLinSolFree(LS);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/
diff --git a/test/unit_tests/idas/C_serial/CMakeLists.txt b/test/unit_tests/idas/C_serial/CMakeLists.txt
index 2514c73c1e..f928ff11ba 100644
--- a/test/unit_tests/idas/C_serial/CMakeLists.txt
+++ b/test/unit_tests/idas/C_serial/CMakeLists.txt
@@ -17,6 +17,7 @@
 # List of test tuples of the form "name\;args"
 set(unit_tests
   "idas_test_getuserdata\;"
+  "idas_test_tstop\;"
   )
 
 # Add the build and install targets for each test
diff --git a/test/unit_tests/idas/C_serial/idas_test_tstop.c b/test/unit_tests/idas/C_serial/idas_test_tstop.c
new file mode 100644
index 0000000000..6875fa4d79
--- /dev/null
+++ b/test/unit_tests/idas/C_serial/idas_test_tstop.c
@@ -0,0 +1,243 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for setting stop time
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "nvector/nvector_serial.h"
+#include "sundials/sundials_matrix.h"
+#include "sundials/sundials_nvector.h"
+#include "sunmatrix/sunmatrix_dense.h"
+#include "sunlinsol/sunlinsol_dense.h"
+#include "idas/idas.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+
+int dae_res(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector res,
+            void *user_data)
+{
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  sunrealtype* res_data  = N_VGetArrayPointer(res);
+  res_data[0] = ydot_data[0] - ONE;
+  return 0;
+}
+
+
+int dae_jac(sunrealtype t, sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+            SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
+            N_Vector tempv3)
+{
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
+  J_data[0] = ONE;
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  SUNContext      sunctx  = NULL;
+  N_Vector        y       = NULL;
+  N_Vector        yp      = NULL;
+  SUNMatrix       A       = NULL;
+  SUNLinearSolver LS      = NULL;
+  void*           ida_mem = NULL;
+
+  int         flag     = 0;
+  int         ida_flag = 0;
+  int         i        = 0;
+  sunrealtype tout     = SUN_RCONST(0.10);
+  sunrealtype dt_tout  = SUN_RCONST(0.25);
+  sunrealtype tstop    = SUN_RCONST(0.30);
+  sunrealtype dt_tstop = SUN_RCONST(0.30);
+  sunrealtype tret     = ZERO;
+  sunrealtype tcur     = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag)
+  {
+    fprintf(stderr, "SUNContext_Create returned %i\n", flag);
+    return 1;
+  }
+
+  /* -----------------------
+   * Setup initial condition
+   * ------------------------ */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ZERO, y);
+
+  yp = N_VClone(y);
+  if (!yp) { return 1; }
+  N_VConst(ONE, yp);
+
+  /* ---------
+   * Setup IDA
+   * --------- */
+
+  ida_mem = IDACreate(sunctx);
+  if (!ida_mem) { return 1; }
+
+  flag = IDAInit(ida_mem, dae_res, ZERO, y, yp);
+  if (flag) { return 1; }
+
+  flag = IDASStolerances(ida_mem, SUN_RCONST(1.0e-4), SUN_RCONST(1.0e-8));
+  if (flag) { return 1; }
+
+  A = SUNDenseMatrix(1, 1, sunctx);
+  if (!A) { return 1; }
+
+  LS = SUNLinSol_Dense(y, A, sunctx);
+  if (!LS) { return 1; }
+
+  flag = IDASetLinearSolver(ida_mem, LS, A);
+  if (flag) { return 1; }
+
+  flag = IDASetJacFn(ida_mem, dae_jac);
+  if (flag) { return 1; }
+
+  flag = IDASetMaxOrd(ida_mem, 1);
+  if (flag) { return 1; }
+
+  flag = IDASetStopTime(ida_mem, tstop);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  printf("0: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM "\n",
+         tout, tstop, tret, tcur);
+
+  for (i = 1; i <= 6; i++)
+  {
+    ida_flag = IDASolve(ida_mem, tout, &tret, y, yp, IDA_NORMAL);
+    if (ida_flag < 0) { flag = 1; break; }
+
+    flag = IDAGetCurrentTime(ida_mem, &tcur);
+    if (flag) { break; }
+
+    printf("%i: tout = %" GSYM ", tstop = %" GSYM ", tret = %" GSYM ", tcur = %" GSYM ", return = %i\n",
+           i, tout, tstop, tret, tcur, ida_flag);
+
+    /* First return: output time < stop time */
+    if (i == 1 && ida_flag != IDA_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* Second return: output time > stop time */
+    if (i == 2)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = IDASetStopTime(ida_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Third return: output time = stop time */
+    if (i == 3)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+
+      /* Update stop time */
+      tstop += dt_tstop;
+      flag = IDASetStopTime(ida_mem, tstop);
+      if (flag) { break; }
+    }
+
+    /* Fourth return: output time < stop time but both output time and the stop
+       time are overtaken in the same step */
+    if (i == 4)
+    {
+      if (ida_flag != IDA_SUCCESS)
+      {
+        printf("ERROR: Expected output return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Fifth return: output time > stop time after step where both output time
+       and the stop time were overtaken in the same step */
+    if (i == 5)
+    {
+      if (ida_flag != IDA_TSTOP_RETURN)
+      {
+        printf("ERROR: Expected stop return!\n");
+        flag = 1;
+        break;
+      }
+    }
+
+    /* Sixth return: output time < stop time (not updated) */
+    if (i == 6 && ida_flag != IDA_SUCCESS)
+    {
+      printf("ERROR: Expected output return!\n");
+      flag = 1;
+      break;
+    }
+
+    /* update output time */
+    tout += dt_tout;
+  }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  IDAFree(&ida_mem);
+  N_VDestroy(y);
+  N_VDestroy(yp);
+  SUNMatDestroy(A);
+  SUNLinSolFree(LS);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/

From df0b21109ace56aac92f8200e53d5888b049ae2c Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Fri, 20 Oct 2023 14:03:50 -0700
Subject: [PATCH 10/35] Bugfix: docs missing cvodequadsstolerances (#352)

Fix CVodeQuadSStolerances docs, add CVodeQuadSVtolerances docs (Fixes #340)
---
 doc/cvodes/guide/source/Usage/ADJ.rst |  2 +-
 doc/cvodes/guide/source/Usage/SIM.rst | 22 +++++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/doc/cvodes/guide/source/Usage/ADJ.rst b/doc/cvodes/guide/source/Usage/ADJ.rst
index db4d6b9655..80e567f024 100644
--- a/doc/cvodes/guide/source/Usage/ADJ.rst
+++ b/doc/cvodes/guide/source/Usage/ADJ.rst
@@ -24,7 +24,7 @@ several supporting user-callable functions. For this reason, in the following
 sections we refer to the *backward problem* and not to the *adjoint problem*
 when discussing details relevant to the ODEs that are integrated backward in
 time. The backward problem can be the adjoint problem :eq:`CVODES_adj_eqns` or
-:eq:`CVODES_adj_eqns`, and can be augmented with some quadrature differential
+:eq:`CVODES_adj1_eqns`, and can be augmented with some quadrature differential
 equations.
 
 CVODES uses various constants for both input and output. These are defined as
diff --git a/doc/cvodes/guide/source/Usage/SIM.rst b/doc/cvodes/guide/source/Usage/SIM.rst
index dbc6506dd1..539f521ea7 100644
--- a/doc/cvodes/guide/source/Usage/SIM.rst
+++ b/doc/cvodes/guide/source/Usage/SIM.rst
@@ -4122,13 +4122,13 @@ If the quadrature variables are part of the step size control mechanism,
 one of the following functions must be called to specify the
 integration tolerances for quadrature variables.
 
-.. c:function:: int CVodeQuadSVtolerances(void * cvode_mem, realtype reltolQ, N_Vector abstolQ)
+.. c:function:: int CVodeQuadSStolerances(void *cvode_mem, realtype reltolQ, realtype abstolQ)
 
-   The function ``CVodeQuadSStolerances`` specifies scalar relative and absolute  tolerances.
+   The function ``CVodeQuadSStolerances`` specifies scalar relative and absolute tolerances.
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODES memory block.
-     * ``reltolQ`` --  tolerances is the scalar relative error tolerance.
+     * ``reltolQ`` --  is the scalar relative error tolerance.
      * ``abstolQ`` -- is the scalar absolute error tolerance.
 
    **Return value:**
@@ -4138,6 +4138,22 @@ integration tolerances for quadrature variables.
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
+.. c:function:: int CVodeQuadSVtolerances(void * cvode_mem, realtype reltolQ, N_Vector abstolQ)
+
+   The function ``CVodeQuadSVtolerances`` specifies scalar relative and vector absolute tolerances.
+
+   **Arguments:**
+     * ``cvode_mem`` -- pointer to the CVODES memory block.
+     * ``reltolQ`` --  is the scalar relative error tolerance.
+     * ``abstolQ`` -- the vector of absolute error tolerances.
+
+   **Return value:**
+     * ``CV_SUCCESS`` -- The optional value has been successfully set.
+     * ``CV_NO_QUAD`` -- Quadrature integration was not initialized.
+     * ``CV_MEM_NULL`` -- The ``cvode_mem`` pointer is ``NULL``.
+     * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
+
+
 .. _CVODES.Usage.purequad.optional_output:
 
 Optional outputs for quadrature integration

From 6ae281ef1a6c366fc3ed91322c1626907a5507a0 Mon Sep 17 00:00:00 2001
From: Steven Roberts <roberts115@llnl.gov>
Date: Thu, 26 Oct 2023 07:18:42 -0700
Subject: [PATCH 11/35] Add Sofroniou-Spaletta-5-3-4 method only (#355)

Only adding the `Sofroniou-Spaletta-5-3-4` method but not changing the
defaults like #345

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 CHANGELOG.md                                  |   2 +
 doc/arkode/guide/source/Butcher.rst           |  37 ++++++++++++++++++
 doc/arkode/guide/source/Constants.rst         |   2 +
 doc/arkode/guide/source/Introduction.rst      |   2 +
 .../sofroniou_spaletta_erk_stab_region.png    | Bin 0 -> 25026 bytes
 doc/shared/sundials.bib                       |  12 ++++++
 include/arkode/arkode_butcher_erk.h           |   3 +-
 src/arkode/arkode_butcher_erk.def             |  34 ++++++++++++++++
 8 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 doc/shared/figs/arkode/sofroniou_spaletta_erk_stab_region.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4182e059f3..4b1c49a4a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,8 @@ Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 Fixed missing soversions in some `SUNLinearSolver` and `SUNNonlinearSolver`
 CMake targets.
 
+Added the fourth order ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst
index ecafdab263..c9166aa55a 100644
--- a/doc/arkode/guide/source/Butcher.rst
+++ b/doc/arkode/guide/source/Butcher.rst
@@ -331,6 +331,43 @@ This is the default 3th order slow and fast MRIStep method (from
    Linear stability region for the Knoth-Wolke method
 
 
+.. _Butcher.Sofroniou_Spaletta:
+
+Sofroniou-Spaletta-5-3-4
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: Sofroniou-Spaletta-5-3-4 ERK method
+
+Accessible via the constant ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`
+or :c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_SOFRONIOU_SPALETTA_5_3_4"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+(from :cite:p:`Sof:04`).
+
+.. math::
+
+   \renewcommand{\arraystretch}{1.5}
+   \begin{array}{r|ccccc}
+     0 & 0 & 0 & 0 & 0 & 0 \\
+     \frac{2}{5} & \frac{2}{5} & 0 & 0 & 0 & 0 \\
+     \frac{3}{5} & -\frac{3}{20} & \frac{3}{4} & 0 & 0 & 0 \\
+     1 & \frac{19}{44} & -\frac{15}{44} & \frac{10}{11} & 0 & 0 \\
+     1 & \frac{11}{72} & \frac{25}{72} & \frac{25}{72} & \frac{11}{72} & 0 \\
+     4 & \frac{11}{72} & \frac{25}{72} & \frac{25}{72} & \frac{11}{72} & 0 \\
+     3 & \frac{1251515}{8970912} & \frac{3710105}{8970912} & \frac{2519695}{8970912} & \frac{61105}{8970912} & \frac{119041}{747576} \\
+   \end{array}
+
+.. figure:: /figs/arkode/sofroniou_spaletta_erk_stab_region.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the Sofroniou-Spaletta method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
 
 .. _Butcher.Zonneveld:
 
diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst
index 9a3e6600ac..95b6a43125 100644
--- a/doc/arkode/guide/source/Constants.rst
+++ b/doc/arkode/guide/source/Constants.rst
@@ -80,6 +80,8 @@ contains the ARKODE output constants.
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK324L2SA_ERK_4_2_3`          | Use the ARK-4-2-3 ERK method.                              |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_SOFRONIOU_SPALETTA_5_3_4`      | Use the Sofroniou-Spaletta-5-3-4 ERK method.               |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ZONNEVELD_5_3_4`               | Use the Zonneveld-5-3-4 ERK method.                        |
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK436L2SA_ERK_6_3_4`          | Use the ARK-6-3-4 ERK method.                              |
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 3b5d5ac711..4fafa4d0bb 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -153,6 +153,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added the fourth order ERK method ``ARKODE_SOFRONIOU_SPALETTA_5_3_4``.
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/shared/figs/arkode/sofroniou_spaletta_erk_stab_region.png b/doc/shared/figs/arkode/sofroniou_spaletta_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..78bd107329d9d7efff80a6e3c3b3b301617e2389
GIT binary patch
literal 25026
zcmc$`by$^Mw=cXvR8SBEl~OuH8c8Wx)B+>~36T^K=>`b_5fr2wNhtwoq>&V)LApb_
zq^08<%V)oPzvrC2zw7*Wysqbgb+0?-ocEk#{9;V}loX`#u8>_pAP{&mC<$c*;({3h
zff<602}gqdIAp;O9Bb55I|PE55d9y9aZ)dwg}7`lBQJS*5r_B!>$Qd?NjEq|XD_K?
zuVVGW-bvrq2q7=_<dGPXh3d&mBPw})`<Logwq|xLR5F$ZY(g3nByc_r`h0O)BYk@l
zD@&>;CKg5rE-qFTBWqSJ4zBxDTpSO$c^+_b)4s8-Lm;RSG7@4>Ud69XxVqgKs6XHO
zT0tQ08}s24MsEu(mPDg3>Pg;*h6|XI?b(_fG|Ep1oC{Je<|<{ElGS^)HEGIA63AXJ
zo@Wxd+jd7Xz*Ee?(<>~KYEwKU#Cz@RjO63BD#5S!tL_VybssnR53R2mE_QTujcg<e
z7&8!D@xg-DetPy{;v)R?Y!9KrKp^yRabP?UKmMP5NE^{cu=6{tL=e!hvdWO(C&8`R
zZe#A9jfjX4Tra1sISf=#yyhBhnT1Er>vndy*gL!Tdra4^lV>kVIwPD>F;A;vd#NY2
zcTo$wr`F><iuKv3GRbNXk96+mj+^hr!<g$(dBd_O5pq!yw%p%=SG<wbRqfNVjEafz
z!mfM0>2hV36PnMSF?*xr<%Rdh?eZ&EzBv9K#k=!h_e*wOn6ZfaNjY~g0ga$w)#Fqt
zKbFe8JT_WdahLeeP@C<!)`JDU2NSzDIiG0am+w!y>c0AQae1rUW;W5|%-OX)wb|?9
z)%D8NJWBTiF#(%_FRHJP_vAH6aqpOI*)*6+%@2R4#u1bh{aUKram0#q^V8bkGb>@o
zwU{5c+EtDT4;;SioiH&mJ$?H0_gEPvmtl)hwD#vhU)}Sgq1Q*dk82({tn}wTD{E7v
z^f=jSaVkjIqbS_kv@x)t3?>K=w4Q#Lp^(5`x>EP%LgWtqod-|cO-720aM-j(^t=g3
zNl9(Gt?Vn8nV)ACQ*c<0^E(gx2qZUlvU#4JnF*s2c=9S=v*ezM5r<1oQ$0?0){l?x
z#R(lhP`|K9kNNYA@ZQ6xUte@`ms-zB1qqxN=zljgHSIr}8&KC(t+DSG-oJZZT3p=U
z8yOh)Pph;oC@H(1H_vtnZj2Wiyq`$_$xKggG+p<m*Fe}fHlPbXU$es2NL>8w?m-)K
zzT1o+V;bddf}oRvCTW;;j(|ST0RN7jz4}G$)-Zax?VX(@_oL+)yGe&3ZT6ajl#|_(
zAsuoNxAI8Ix6cI9Wo<+AYtN1-&kx@3@-s7={Rkixe}BzlwAe&jdt$W2%xQhR!hTuV
zRgQ##mGyVh`ALSu&iCxL_V)Q^r%7kyZN+7VMUAhod3g9Y_3X7TE@3n^HBD4HT#buK
zO3LRwhd1o9yF~4MaI({F+!gOU*K*zDXuQJCfT3l~s`eDdATo(ft9%n)XJG#DrVwG8
z{<Bi^P)dAqUh|F^&fZz6Kr%cM4!t^041A%@x@7V9X?|agyV;o0|H9Abe28^43ZMJz
zmY0`nJm{KoS<U^kI^^+ZKwUcM_DHG4Se8l#bY-V6>8#jwf1Or3Na%R&Yl(lc-C~z<
z(rd@Q&+?)to8pfj_q^Vp$XN5XU+HH$jF50~Ia(X}S~A7Da>A)@xG`C6Hk22c7(~W%
zFNe5)d%k`C<9j@E$M1N2FQdiIM_WtHM~d|7y<jF<j1;BY%>ICvvEHB6cgJbG=d(Qd
zym^wx+2QVTUwX5EfI!=k{n^Q3Xf{Cw4=kTQ8KS2qzeh`;xyysOW0{XrFX569sKsp5
zo}Y~vCuvu^{8>!$m@F|HBDeaswO+L`s3Cny>DjW48e4peFT($7bNZQ8^`FDVB*q%r
zH2Ffyi3iSYu$Iyk-5nkG0!Z)UTI|Fat;37#e@^mXkmj8C#mMu#&u3xH)l9{r3Y_>l
z{vvy1Gs8@#agS#|DHO=!eub6S+pBECoZv9{)W^qXqRNR<*roVHgmbm*j-Vr5GJ|?w
znbp*oWtIH-3B2j!CU$pf;jZ>}avsx&-Gkvm0|y5OvI#z`s^6tUI<E5WmG;ZMah8=b
z-GsDGTZ6gJlAISl!b@6QSlHW`^5{*Ik&orRj{LUMB?vENqS&PGBC*!bDyI#ZaE6kX
zJv7^RL{mn+6ga6Fdr?b5Mc!MZlPYT>f$JhxHHV+S{rT|W0~r|^_Y1YXUf<nbId++^
zM#je3o#El(M1z#fIabXLK38d7ZG;c!!cBLY`GglfwCEyfG}$w=^J_HSOHxvh2L7bl
zRZ4fCsHp6;>z;9$)+?*1P`a*h&Ua+1<%a2Yc6O@PaJ%fjJfyEsSJH5vbld6d=;$a&
z7lI(zwm(wkWM#PXaH{6@yo;8^Za~jD1~zjy%<Wv3?hiMaAB|jZlfV8M0)SMRa|c)U
z&F?=88TxcfW3sa{=KRb*#85H@25CjPukkb%s?6|b5@iv7*HNZ$lI@J;aXtQBmOk=)
z&`Pa;Zj}206IrZo#i|d%pFe+0J#5=q%UTpwR8;UBc5%lprl+UtXHUWE`2HSWboZyY
zexIG4UG3pQTtOL^QM6=~tm5xGT(1n99*?==;Pe)BiyS{XeA?RGO)2VrGIh3BmO0h@
zZY3cgAi&GZ%l-5SqNU8!?+bHtw}oAvxGT;-4vmeCO-!Wt(>c$+Fh|z{qotv7H+rR=
zy*6TM6aD|iwaMzLy#=01$7H3KKR=0)84)2L#qr7~3WQ>1sU^alFI>Kc+Tr8o&cx#i
zk-m5(5-V%*0)bj$e0+RMXV^iIFKI5Wg`KcbP}|SKTg{90N?uQxooV7|7Mf*f$)6q-
z4iPjf_|1L_s*>#|If;&q)zr|?P*VC7fA}3=6!&8SmBX!Paa@yu<b0Noy-$z#vpe(0
zgV}3OiiD~^eR}v?(bmpxzIl0h`TU?+)IRFIEpgiC&r)|{8HVKa*DDq&m>r)QW<95{
zBs`T?b1SKi4xyUufiROv84K+TrIn6~jBK@Y-|dlRR?AW1JrUY&p=DMGubp62h%a~E
zc`;9OjZ$PBX2N0qLT4OfZJN+MZ-UM^KHU;iRdI1~NlD55^@;gq$WtHUMc1*ij3xh`
z_T?m5O<9>n(c^GFx}+?(r$oiEQdVC6^>TVN%xTCH5u%RpiXqaaA4ck?A08gINj5(U
zLHfe{TTFCa|Jp6W%*v{I7O!1yoy>g>Gd;3B;l8ngg@pyI!QtT1f(Mf4m#K1ukiID?
zDZRbDK39p)j)rQZRt6iL8iVc#s^w_(<m-w$pWzTOppIQ2?MjtZBywf<c;qx~Isep=
z7p7OVR%txp&$^SQ=CM{nI>97`zoLYxnqte$6estr#FX9&Z+?)Og#~vxb1EmZwWR6x
zvpa)QneiSC-Z<@mF(5RCD~e>r*SzdWiSb7%Dh?ey&S0=5uH73o8!NTAY9`;&))vcW
zH3_krK|VGu{%&osUlmKy6HffHka}9?n$bx)RLE9lUfv)@hJZ;g-TcXx_J!v?DU#c|
zH;IYc`@RQVF-kw5kJi2CaS|CF{r-_`h>KcUO^r@om?kt&aicfgpPTdk{ja5^YOc9~
zc?m@*{W$GI;r*r5U|Av<RS0*gUHOb+UGV}ciM5bM5&_A)GMVY*n_^LXqIMe(53eo!
zj>}3!CZ%V=HtwAV+}rr_BiHrGB`l3_NT(KD+Hx2|4dfL^xYbk?TZzVRaEdCJUQQjL
zJjNG2v6jTD$ojFQ!0Dot-J?SP#UdRY5)akj|G6i<&}W)OzAaM`)26}67C*WcRIX;p
z75`vUk6u{H1-t^n4UUCwf09;KOy}(@@{y48iz3(GQ@V$Ij;m@9ps=KVD;?!mQY~kr
z{{5Afb^S#&x{+hA?uY1^+4+Z_o?b4BrRV(J`)hZOPB%QJQl*0dxLj6H*^})lFV3<3
zq_sMjJ0C&Sb=xo&%f!UQ7JmkoPQF%!GIpVHH^pI5aoL1pT#wo253MRl_R@(dC%Nq2
zN`n_)XuBECwS;aP%tyZj{IjbEd30N1o<A}o;zmgnd1&3`>B43T|M-_pK}xdLanh_`
z$x@qR)05t}gfW(vL(JoW+2pZbHH8;I6`U+nfZ4BNM6XQW7V&KP&ya4ds{T-(_O={@
z&c_y|!V<nBWk*NHuh>WUzjk+b#ok_8zFm6&x$)0(-{N%r+XquZ_ndEcL(=#ZFJjn2
zuq-AkD?9rmaDKU7Psv4ZnXS*Rob*A_O!n_;@4{glSs9rMNHrUfZ&WfA02Air<d`q_
zrbFO}FxL3?Y76k$?ze$NVOPK{*Y}>uXF%*K$ZllX_#Sm4r~w&u0pH``t-V7v<mDQV
z^D{`x?@qpKBL>C0N14p#3M|*!+S()JLqkK8Z_AHBI%{!`NL7kdH8k8ZwDCan_Vuw>
z%!OsLf2^WypeyR+Y0LTXv+%{lBDHBN(bM?E;P6;O_qEgyRha#DN{q_%_n6AUgk<@`
zo<3{Mc`ohp%ZC^@u!-&7y|(UdQS0ftm4WQP8NqI$gNd2>S(#<RsH&vv-Wn5r12a4O
zMo(&UrNb(^yZo|o0K^BM8cV*;0-&-zn^`NIGiLMvpHEy`?RH6Za|jhtWK`5(hGLS)
z>!Wdx^V8bHPOC(h6(*C)?IFL?%am?PdG=SXT=@}nXY7k=HqZ_TaP1qPrOuWa!Z%ic
z7s$vslH0+I0&K*PQ1TQos;X+_xJsHqbC8sk{b%Ff(D&8V)pREPMV6J7mAU4}tDOZ?
zBcI(u)6&yho3NQZ3^N|cj8h^4PtDeYu)|w;73c0}Eo#W6nUAJKjaN3A*mX5ezPy;Z
z_(>s6_DNeyO9)>VfZ6Q5k^8Ibi!W{p+Q6eC2^V8|%<`(%A1p`DL6}W?HG?xBNDwI%
zOd)JOT(C9UET_nP?;asesOfVGY?(=;P~1CDZTj~p#J#x9A&v9!@BoJhcFO|1Xe*yw
zD=FsOG<|+Lbsovi=Kvr)#^af;ZY@9+fA$&;7c$&Sk;Ha5<PTzRqo3_1CocXyf=Oj=
z)gep!li1tD60@nAYBwnZxN)1PdKb&aHKRrH`C&uqMi@}NV(-ugPU|dXjes_#50!^i
zp3+bv@EF#8IRGt;&+re1sqsF$MZ9kt2mpc2AW;w9civUsms2&T5IoYF6-5pW=OimS
zjf#h5%GKQRb*k5E&)uD|wPj>l(TH}h+IpjU|1%74v_k}P&UK@j*pXpW8G8Nr>ZkLT
z52>a5Bu8RoYEPezK*TvaJ!aP^cvv%7OE3c~tF0=7S@9Lq``40=(@JMp(acAcm6b8k
zXHn?%w>=A(<_;PjFpCqf4~n}=(h0llhUAY@O^s3U@C^KXO7gU$L`4VR@o0CsIhZn<
zVq>h#YHOxxTW%YN$0#Ekuy~91g(R1ithTl`epwQ!5r@xdX%c7N@RGzHq~2hv$M+<&
zbMg-Bv7jj94=PEE?2Kw^s@5VB-LqMX;NZkJ{ThT_F_b_+W6C_8k>u_I9c@!I7_^ES
zoFjw5*{khYIvfKK+3Iun>pkV!Zic8yhui*y6LbEY5&(Xf=s<iPgf@^rKVrMz_A~UR
zw8aLGBmTTiQo+^Y7skfAum21<J3H%FKZuxZpn%9)AR1bUq!e^yxp9T5YWLQyTWp%e
zOTb|8s_dg|30@lRyaE;peC4JiAFuQ6kA4P)CF&A;fJuEKty@B<AMoY(lmOTC+-7vp
z(U}A;4xm3Pez?NUc%CLgomfs$5tu8gIq1&!TVEU{ZAu0JeHC+W0la!rx<9wDaEq82
zXc5brvSC|~^E(j)*}PvwOAvMzzA|rRCtl=JrXT~>pzgO_g~N~KEN4FZ9@!|zO|1l1
zR|qyOi6x*SGsk78Uhiw~EOgFC=Y895Bi4DP50URGF<U&pO-k{N<%XoNm_Kn9JQbxe
z28B%@b*ISGsgmHUqK<7IrhzjFQW_ruV1`+cjM;L3Tz;nbW}el2o$bC$xeqSIzt#{-
z4rbuWLY$S_Su4z^)V=ITk$I2fv8j|AzoH3bZsj9I#b6imscUy0v^1yr;V8RG8n$J(
zqIPxlI+jL#kjVqt>Sp%OEC;?sZhsj~Rzf)ssXtXv2-@y_Zo>$`b9daXTe8OE#fybV
zbsZ*A)j=j0iFdskG=el~e<9>oLc=He&9Oa2Ci$Ne!{SPqaOqq4)%t!mPmU)%-$h3b
z+%ehJq5Prsj?@5J&Q(4;Gg}J=h89S&MxR6TuV-&D>Whl(Y;PBfr#;2tGF)NvPu;sl
zDpV9O_%}x6l$JXFYVau=xAou72+Oe;D+M%dKBxP8xNtV=nI+D#R@?i|Z_Yar>^xSJ
zCsxq)BBS;>Cb9t|dHK#5PJ;+M1Q2XhouBQESfqB6hQT67nJ1>h!W_>nb;QjWN2*=-
z**y;13v}H_Mn;Gj9`U;!SkEa#PK&6$lMipLtxZ<giRVd;pVXZvnwnp7D6d|*GMJ|=
zh}I=!H4;+JFX(XxHdWIiV|(ry8pbszP|XSs;zr85@;F3|N671Qi;-z}hJ*%JzvFk5
zy?xn%M)mn{@BYS==!=e+mg7*v7cbBZM_*kg;A!ngjc~L3oMP{g)JF4t#U?6Qb)z1H
zj>gE}1SZeDa6gu{&tzANUkYYP1;~trG+x&uu?49I$X$|<GZzUiuW5g#Tr`_au-4T}
zZ?o0&MQmmoD*(6-sH&6RDRKb>As@$k@ojxW19J68)^eFq`>jLiVF;gzuV(xtCgm4L
z;Y*OSP!nGO%Q*lnHZ}hNQdZ6R*)afI2-E611`RCrde*>}VBMGj`z|7m{c+;whUkx}
zqNO1nUGVdr)sWL1F@LJ%*3PqUkZ+gKKQPeR$^+6A+3B5~PrUoS*q7d-C6Z`eccz;q
z5ZG_w5fm;x+)GaT%@v3VloMWjqL`OAeZ<h8%$%HWODX<qtie`=w0c#UIE0>KHawIu
zCLo)ju`UQ}M}Hv0eSe2XTS7-Eh>6f+8l}?zjOM>1%Zng_oX>?TY8JoLHwZoPyMwX#
z36F4-4t+*(G52yd4I`s5C>?;NXiJ8@;A_aKr2N*Oc87Pzb`S+uEkZzk<anq5{O=De
z9Qa{?`sbKJXOz;U*DVC%m8ztq&xB;bWt`r7HK(ZM$4W|ddp$oGKKRMsAd0)o!29@-
zIgN$8CC3a4F9PAa4r#2Q3fuZFAsu{T+d9tpp8X%U{IB~{Jvb6W;yLjYW4#?hAU1_W
zJtq1t{rl6=r>0!R!gM6YxF+cZ(rFK;2Bzu%a38dYDj_Y3%9Qz91wGKn{Pd}Aou*FS
z&DF;`6@5)GEzv_pcdMo5r{?fIi8%U(o}6^3fBO)S*0T!4Lg3ZrCxV%y)%>z57WmeY
zMr@@B^7eIFss5p%t3P%z5N<hNzL@@585q*CgUM#`$YTcpf39{_snf<Jpg-QzPJOnn
z=c`=K+jB`LbBvDBm<Z1~xa~B^Jo~@LGUCf&h0n~)z%<k-Yy`+dOiXMwQ91B|?|lU-
zr111lzQ+V)n+^AU!K$m6h=<$eKx>wMCIi3>nz;CeD3r?JU?n?0@%7$F{oBj%(24aT
zXemGDDSYwU$|LUMM**X@8-K68q3dz_2c#PR4<Br8ZDr-;+S}UT7eFqrx0;BrQiEQ^
z<8gKZ5kkklM-uP`T8EAFa6LKL0;Hd#TPs3>>$pCC2x6K=Pm0fOFQC}LoTs$j2b<sV
z<G4*|<WJCI&H3-va7JDC!+D@*fV=`pI8)T~b@VSnex6E^^cOil*(okAo~(9-Y?A|8
zuKo_-qUz$}-Ji+g#JX-<AW}V=;3&|*Ub)4p*`KFf#W&@4|HhSpfdP=I;G?6<nbIP>
zxoqbeqz;I41Sx50bfTi7%*@%&I}1o(K=J!i9v)2}Zi2K5FQv1!^*R#rn>!@uZA!So
z9;_2$BtYlS1qB>{#{>nBPxq&yby!(hL3+7?gc$WAiGke`kj0$`_AMP9=9Ax?U0f;&
zW`aFVQj4BIMuRM)C@;^-!V(dMrdenPB?O5t{DaHylA%)5fiKXKVBx(Og6AOg4qBBi
z1-NSpoiF!3^m>8@c?}H>ke=lf0~uOSYPW772oe^vb(wmNjEsQdpj1STmQsNh0E1qb
zpU>5)){N!1TX;m>2%#%21I7VlK0prh^YgtCAfJ^%M*u8I2UA3T&e1H9#ohu;AgMhL
z9R!+>O#TVu*9VP+aRK>8ZYLr-I^*-_g~dg6H8oik9hYT#YKg~>Lr+8m9oIl^MkgA$
zf>z#nyOj~-frNOfLtAwku`fph`R)UNCJw{p$>|W~kNdAY#V$MZr<1I#d3}73@ftbr
zBh#2C3LPyiOA}RPy9dedDF~6~<K>S9zJp%H>K(&pmALzaR;+D<_TzoyAg;qe()&`_
z)bG_>S<A*#v{JacfqG`fFM{Z7Z|n8Q&7EDJPTsyfnq3#<?M6SMc?xO-q8r<1{7A7A
zt)wf)@t84qm#-DIM-ZVokD}=56PFVpBZfvspfD|$BcWFW$nHp&OL$~yZlhmRnW-BK
z4Vu$3fJC%IEBi8nZ7G=g+pNweT{l41bNW51D$p&@H*v$R#~NFzS3+G`ISiD(xH#rh
zOd=#VH#Z7DjY(b0#-~3QLdKX6UZ{+W%yp!pq2XOdP_tTyoj`gvmY0_YLOJ&gUR0CT
zxbtEHaRvVfOn2H^n)F}%k&%(TeL#bWZ{2#=86F)?jD8lOp*_65-2D7n@GfX|!x-2!
z3Z_3W=b>CGARvorYHGp|=)mf2iB5aNj#G08x^n}=rMF_#-u-=#u|vbcY#}BTIMbY8
z36k^*SpR687)pMJ9<+sU26;jxDBa@NHo)yhRk#ocLJ&#I;5qq_JJsS9S4T@$fzbp}
zin8fmLj7gt)QvntTC~Eyd(+!L%f~4sJcx|iOS%g<<5u6*3;sXxxhesA;S2S7obP*p
zB&ztmix`2Jrh!>w2mFLcQRw<%Sii<y@0QNao5)6+;Cgb)^5o>?Uyz)`GvXgOnC`8O
zWMySRpo#jtyD?Q;Q{xUcz_t(o)~DZI74{g_vlWYBBBlkM08oO-@L4fQM^%-_?O+p{
zGuYn`bjG;e>msCT3JyI_f)oh3Xf+I!U`3B36(;#f$1w|+NjK1l0O{y{e)N$L_Y!Cp
zIxw4+m6dgL&On@jY^oe<451A&^6Sm|%Wv!TK!^vRat>een)J@W6dTOtc_abZp)MGd
zEKY!?u*_IBi&3#*v9Y6|cKEYZqFiFb!nXHo&tJE}>IBB0n|rg8Xzr<TLW$)>CE9}s
zm8J;&3{z70>|hoon*t$4cqcI7s=@471OOKD`35oZl=XK!TB!gIvy1v!4^gwD2w!zE
zF)?(eO-CS<sJ|mplWvK6R4!fq-?QR>Cg}glrjWt^j}IxCU%teOdYnPTe&n%;9<L<P
zbC9TeMZ1S|J%l0Z<BJ^B?KV(}pwl2h6NHNo{{DRC!+J-8R+HZ<%FAEDqB&Y*VrOS(
zV@nkEs9E+Ab3-T7x@C~pMC_M-qJ^P#uW4x$N0<x<s(0{tH;`|#pz6i}K05j5IsFfL
z<YWb!Pz}ikL`0B7K}ReqDuQ1iLP9oZLi$3;hvs^~>mk;*?*Rt@Os(+(K2h7bmXpIB
zNMc1_zrM$(gnY{<E=P>~Ke9<mp4Xnxl>71T<BeL69!X+{<zC4ODR_~uKo~7E9|?<!
z;(gxet5fabbNY)h$xT^P6Tsv3Wedebp$f2D)*+n1Y}xoB`Gi{I6SM|k2!i0sVJcFm
z%JDaNBkbNU0aNMg>w~5Wwg^0iy}RIf(-mq7h!5`W?rLgkkQ{snKp;jNFQD6VadE}+
zTEvEj)1nv2DHtyi9)AG3LF!n6?1bjB|Cw--)4SvN6g9^|ia;wPpgD-{4I3bRjoPD@
zlZ-)BMfyS`nc8{5iUisN*^Ad|Qpj`!Rt;OVMXmek_V#uPn`Y}$MiYJ#8xI{y?%<I2
zA|hz!@JdBx<pV}WMt1i6Z{M_H(a?t1VwBr#a1HI`-e9u&zeq?8XDbls!#>{@aYF-<
zTYn?|Vz1NMFo^o25N^Rok&6A*%9!*>US9PFzwnNPd<Yn+FkogcUt;?pr`&er0n_yL
z_2E;Bu;ix_q=4($)p*~y3)gjwgAR2{B69)Z>E9VIu+tJs>wk+iOhM)<HMnkYM*K$2
zu_cJLZ31Y!_%g+-hc4ska?yZ<qNAgODMf2QZR%}2Uaw-Or8NN2uB{fF#p7AZ^Si=b
zt*y@Uk?P(AUx^bp{#6SAQMR{Y7brv?L@OYGq1|RM2cAA4V(q)H_ypcONbIJvvL6Tl
z$J|1LjMuMEA$F#zrz6h}yFH@1+ovF8fl%RlSo-rVtisKthjqE<G-&q;`V3b;$Wwaq
zgw7kgilF;{%3%WOAp5mtfNKX5_V3!WKkNx|9-uzJEQjg##Vs6-_79(Q3q8go<3=48
zt7fYqeF3e>C;~bfgRC#dRv{tK9YQVsyoPmGj}8w}=K*HBoL(&Wh7dgsjg6&io~Wy5
zxRLQnNSRhbDpXSFXl)%Svr4j+UF=HuK3NJ~g+%or8m&MASSg5xITWGzr-Nt!@>z!4
zz1+|>h;4Xs=}6zJY~@r7W5~a2oGl6@zMQ9D(J^J4-o#VR%l+Wj`vNAAO36x7jF-Vf
z2eJ5y>vDgVN?V4@f}eP*R3O-Nl)RiQs<f8q*rSyLDkJn(Cz?$=t-k;B@$_4K&;+yN
zx6h6@0P09B_Ey<17XjvhXq%pX%4iGjXw#CA&C+D`aa$yF@NIz<mNC#RiQJx{(DBmK
ze*y?6q(ViZEr~g~dOeP<eRQgTNiv@S5{(P+W)S0Z?3U5ubbfx4pi`dEDSE0Av#WJw
z87K0OznTryHySH3Q=hTAii0Le<--$BQ`Ls8Vat6P>Z+=Elp^1tK>#H|8hu)zS3lPp
zei@e}Wcqk<ejdod>T*U>S9iBAtVJ+Yhk?CAh|pc^1>H&%3~-R@I7o2!)+b!g&rX4_
zzk~#F?KVFZJF;8IrW|H3F^dKVEN-yZXF&Ow1Q-mgY8VWpvMG1LWL8XSEHvjSdsg_o
z310t;&RBZg8b%(T62KG?F(1!Zi2(h806%Rkdi)ereu5N`2w){CUu)~parxiUkq#>x
zTg|U`<Wd17)U|IDoo9CPJx<NgF85-$E{Lwjd%w{ZD?oU7`ZMRs+gmu^LfjOc0wCVr
zyLWGm?INO1`lc-h2@5l`;HynN1qB6|m)|cjFfPHMQo3!5Sz4~AN9&MH^+Mkv0_!?1
z_tKjqN_w0LcSX;4L}6X$WM;mEi{`SWL|M-c?Imf%G#k1pnGn`D?iq>-f`0;Sp38vM
zP&xB~8N4^R5vhYaVVZmK3=|nz-D6`Daa<b)?d)~^MPhSkJLpir=t0FUtkTkXh$eiK
z+#m!t`4e|13Rjhu@(K#N0)m3uDhpo67yp~s;w-EG0M)4;SXX{UH1zi0NaA-Oj-Jgo
zZ`>Hx#;P+zpUl4VyGiZQb!_VaQHj5_lHktP_5X&TRz9TCbGkmQ^f$}iIi*VeZ&GzC
zC0#$d1n8mt?ptp%bm~L|{K|XxWo31h&vLvRI3BD{P_o9y$3eUMmYLbIZVS~z!vR=X
zUotb74z_0Xi3A;1xFI}3*y)a<!9avO8Yd=)=6qqRJ=uo!3^weyZ$i|Kkl7YHK7NJZ
zp?kWb4p6(S${rYV&;d5jNh!xPfNm%dID&;o%&y}$ViaxC@l;6()XmUhFAU(ZJ3B+d
zv?jPO$IET>^^*x^fWSFMLqSs=FCFTFSG}H*Q93~iFtEP|+iiqVnaPxCY|4)D0(LJP
z9RB!Tr)B%LiL8>tLQq7$GE8=ga$Z`w#6#CY0&)k0VzT8e@L_}vegwR^aC!6@9l{#R
zUo(R+n8oHsKs*+SgjYZ^5JHHn^?C&<DKk^&XZtFO!VY^Q#`{Y>v<sBCZrt#e-?A`%
zh6uXlL||{e@*!2vl)S!h6<bik{p&HQK_Q+-iRl3J5@6vZ)OMVlxCIKF3h`g{><nN)
z)?DnDu#`EsV9vXo)!D7PACSg54N?Fl=W_`Qi{J1xr>b_$IuA???Q?H}<d8QWN<<aO
z4W(c42`H1_eI5Q`zc&0B`?0F3k&_tWm4BB+!%#(F18>c@b|kgfl-vP6PHzk#;49Rz
z+$PWAl=2UWZepJb;_7c4%${Ajh$$+<S#+7mq<JnJlaWeHN?lv~b(g>*x8=BoKw(jl
zE#P0IFBEO`e741~=J+j9H&m0G)3KRxzSf~8V;1G`!#3yDj;~P<K4DKNRq8P?bf|s$
z1x&3JYB)qi&msE&fdtj;+NHN|FX62W=EhB2#L^=Qw6dysd8e-Hl;{JaEJIOzX1^xi
zEc4aBv$+SZD6trGoNtS4^Q)++0FC|I>E77ydpAAjer>Y_89!Ix`e-{Gh;sbcAN8Zf
zHpU-|bOIK5joYDZl^jN$3!P-NwJxHFNBYZ6>DJeAHx!UwSkvU*aMW`4`R&_Lw2?HI
zqnXQ2mc9D^wj1MBXa<)ryZ3L-{NLFHY+*rK!jaiGeQs+R4*Ox@)Xii2ug`6@WHQ{a
zec@_ISJJL4RfFY0BZg^xb34WCkef@&cGKAcuTAYqFCBzP&%U0qsghv_%?Q7a`Z4+<
z%Czl|W6wD{0OC*6d0&f8P43}X{#I(e^rM$TipcrmqhCM&cpk#?HkUNC7gaV$ncEp{
z$c<xP5wLX1yRr+<L9xxeQ~$YU$mJXo7+3Z}Bf@^?3)Ll9vi?17ORU8lPg|S=Lv3{N
zl`HNwFqvJrA4-Lx;rUJqU*DJ^E}V>(=v#a_dEQ$;emEZUCgPVsd|GMv4jiAWxQU5F
z_;B2pM5ob2`m&9(K^jv_s1A&l9#&S5|8RDfk<&uaOwF)kK2e957Z$<Q!-mx1!aRLl
zgS6$X$6H-mA>$L!@DysTSH#DIkwQ*V&*Ggur15j3bRo3F|9DBFnEEz#we?N=v#Ot|
z+4HaIP<8t+!?xM>axc^Gv-zs+z71#_;d7F>0bk_97u=5d(ezsZj<z$i%SJX*WAdmF
z&!nGp^CoLLlv_(#y2vztxH07?;kMP`?;`XU*{ps$Ak&_~v5gd&w!YzNf`;w0w=%1j
zv*vm(spV6PVJ3>ZMr0JaUhisCtD0+;rbniQ!!YE3l4+|NF7vJT&v2g~ROKhaA+#1~
z@X6?z!LI&BP9t25OoUMw_nThQUVGNq>P288C)(o6WlhC@9nK`zOc(kvjZGADhsGi}
zIKJJHg^+HV5KEe!hNr<zM=0TUZpjul9C|gr(*CUcl%HiWmq6xz8v4Ctr1bPWdub`5
z{Lx-sk`W>=`rsn9pv%Rq>w9u65`?g*v2gftMtX>_gRHOQk5BltAMq2wLlIu7?L8&e
z6{OF+MqpHOTY~Z=O})+NI11jmhbV!%XpVHWr&gvNzc;zn(I}k>eV1t-aMtqa#}2l(
z(?#Yj%s!+;QTeq5Sw1xMHm(qmsQlWmBjtq^=C!t@Cn0s<TTdVZawc4Ni&pS~;v6aG
z9{!1>lP{eJ5)X&40C%KE=H*K)_qkkGiUu}#Uzh=3OUZKsJa4H_n8xO;K7vC}45j0K
zHe!>c=8Mz)lXYUe?FMBeh-meKG^l&`4we!>D^I}_UQmf>2DD(ubki>u2@EIrVP&O%
z`{o8YA4<+{Ad9W0YK*%RK|d(1QnDr~O1;?P|1gaI_)6$CHZoMmJrO8_@*`qYQ&)d4
zPbpwK2RO)riSYLOwU=R;fmG(|RL=e3WPhJes;#Oz0Ac+dE~)K=!_fTV;#F#1^WjY(
zKhaT9FN}-;V7+!ECMbPg{^<G3=UBHTcC<<Zw?Z$W-p`gv+N-Ln29ohS02MTXXb5;8
znCVco5-fVgPfss7+YO!tKoJ%;T61Jys@R-l-EzEou0Xy-&*9-}B5%u*W~n);Kq0^*
zPzV9FUB;&{N0)raT|C}O<-fH}Gc9tBTzNL?V9D;EM8-jK0~v4EB>;&`Mmq8qp7Zrh
z>_}=J$3Jh=7;Hoc(=gCH<n`;<fJlJZt+8DV^IdyICa#01m2r2oS2nm?976Ty0gz;X
zXWj%*Y3P}F2yJZmd{CP0U3JJW(p!Ul;C~@+ZFZB4Z#!<H8x>LsrrC2yte}8QpbP!7
z)!BtTkUI9l?}rR;P5<yjnB#_a<=fNNj-19b$%GUR3=U4(bqfPydwUuGtkcTfz{w`$
zMpu3-p%f9Vr}cGl)39;;FwGW8R0t=C*Hcig8OLX}K9sL3BjY#G^yZI{ORjV!2d1xh
z?@a2%Vz)jCj<Ouk8=%{K7Nh;3-GcZrqJ3MVTU<Vvn-kOb{hexRQsG%CI+QAaYk&}d
zN-O|P`2|ldo~@zSr4W{LXQM+IsE{78S<t@tmd!u9k7G2pnyvmtXcyvYg5|s7O3JjW
zX1XW7kSyYWEdm+7LJbB!)RGYItyF_j1<uUqV>XRC`f4lR07RGsXW~0RD0D4Lpl_yK
zhHeD8IUH>MYGu8a^J{I?|7$NosAJ?N$Mdg?mXe8!i_dba-tCyOYm#E{`$jGr$E#yB
zw?aNI7Hf#UZMP8nP70y$LR%E|MX-!ktigEgY+lX~YntYBvvk#}UJNXH(ZZ}1<<C+p
z@`ybBy=AhQRH)zjMc$fQi3&uFv(8+5k3%Ek0=3&`dannXmQ4_o25O?Hnbdta%Rz1M
z88<iPCa=mp-kDU!P^w=hxB8!@Ng>?zfB2ctq^iRa?azA{jQp4n-7@bBLsnzw%G&44
zx{jEUT1_p3uLb;6HQ@q|t0kH5;UnwT4`~5@<tdCh(wUX(b1{M*_4nvduYBtdP<FJ4
zMuH(dXdop#`evmWix(|o=>|4dfLi!xop-mpB)z<km(5(}gm@4nH@Su{wJwpKQ;9Xq
zb7wQhl4DSr_y*S?y}aYH;wu>VF+Eu`ZBK#24t;QZ?xQk*(4#p$rGgjEM~5o!`{;19
z{yHM((^pEmRAV<^ES$2(_Qlk2(R>;~mQHu?X-^U=#5(ffL+tAW)M7rMHi%iQiNlrB
zR0ME9^&+B`5E}~_>%cZa`Pv@~hmU_^7bOfwZ`>DYD1%G$D31r@MGWL!un-x^rhBY}
zbn#1~;)Y9`*oYvB3u)cy!`g^x+&6U|@BUn;#HiE3=!{4GSu=)r%G6a(Awflj`9uMs
zcfaJC1nwsc970}yTY2d`)=LP_uc1`>aZ6&M2iS-%sS9XWP^u*F_e2gcO&2=!))0Y5
zM~9+Q4Om0DVIdg(M)AYGka=PGrS&`z>{QeQdg_CP(=JKMOmxU4YJyR>bx@5@ibHto
zL+G80cc2|TG{<7f#^NxF^!7&5xzQMiJ(VBQWK_u#Ufze#-;2-CBFYH{cn#@LF*530
za~(Vg1e>&%x4`a;=HdGoh<N1s<yIzhZ)&jyEN)>;PevxVosYO5mY?^Mh3ec8GXg<@
z^pZHiZIpJe1c8*A4%PTwqmOp$I%1q@+a<)4u4x^!?zL|)Vw%X-Esaf@WR%JP{6~<J
zME}dm;^(CW=MW+0)xSAvmd~nNa{`rqz!)O9(^FC!CTT|eVQ}1Ue7Y}~GR;!@1)}}>
zaA7Ja9zc-62-~9-!SuwxSRQui$<Iq!E3jO_-OK>}#)shI#fy%_%?d6a?%VfoBEHez
zxZ?NF^UIx3U><IXWc1J_geNM#>D@gT2ZZkjUX(=hKm!Ki%|p+76pwo@`Q6=}T#SW>
zC;pgkOn%3U%9e0UwQq0ov~NOoX<b0Ly~7}sr9)+x)3d+pahSLiOM!tnBRcF{UwkCv
z)#$Ng@tO{rCi)Yf5V+34<F!F)xXN?G+j}}?#@8#9n*gcE4`(1e`%ocN@DpLc@1MJp
z8Z6=h{#T?5unt;b5+2hhKydE(aOnnEqa1<tU5D1!0L<kv8@!v*q6oxZPuj0T8s-PW
zhDz)U89&rXy}9t4&1W9Q9Z`4pNbD$j(8wA6ff|Y1`0mOm)$4mwZgeo_bZ)d%!02wg
zglUa<V0~*WIE9akkP^5Q=&n=L=%!(XQk~Kt<zDqe-wPY=rSMA0a2ywG0AF4drC-?1
z)G`@p`O9Ry-h6&LJOpA!k~~dU!o>4$$I5?RS{5xv-=`6NyZUS54*EV+7{y{ol6NIm
zVbnP;TZBwH!OVv_gP;q*TD~gE`|xiQNKqja`v(7f5%V5v`8Bl|x{oht#9Xvc)<dMQ
zL4}JjEraub3@D-}*0Oe^G#tVsOq0HdiS+gSJD@wERMo!l0uecLHLkt=gM(=Or(0;J
z<Jb51P#^^xJmR9F9HC5%$6|CBjGo(~?ru=W`I{~Ef;Y(<=uHkGb_Ju68&ueXGIX@v
z&R$~N-qC>;7a<QuL)BZnm*l;>cQZ3H3yeoH*iT#NfhqgVR7r#<=<Yk(Nqd1GO9l+h
z!J!1bktNq*b+8Pm9Y_HQAZS62G47?+l@)N-ctJCOnT<9DdvzzkFbEdf_GP_T`kOYL
zzh7YGpPLfl^!7kSgk{D2Eoup{cNaQ7hQq!C;d9V6CqWg0lz2zfT}W8?v`<k~UW%z3
z?H0Vkn4*t8iKm+23|oLLCu1P@fQXkLvjs*?Lc(jPx(0*y52%Z+9Ua9r_CbF~S>~4)
zFN&||mvrk#bq_i)KOWT$`7w-A{ld9D2QQFmJetbv??0lC^=}UXVT8k4UgK<+LY+L6
zr33DOO0m=~>ppotZO0KK8MerTw4EVMBG3*x=4!B*4uQi9+AkHj?psz}ox#117gCIZ
zS+rWtBX*6HO9Gn{c0d5&8d@(J{;(&7K!n&^%7@gRpKegPEKyT80tf)JLUc^~_OqTz
z^t0P@ag?z+q5c94+sD{j9rwE*B?^tK&kVo01R9>+WnxAYwFH!lspV-gdBZ^Qr5z6*
zT*CvUglc&_fy##fii3W2B?v-o%NnTtDJe817^Bcw4*yl6Gy)nP9tW5eusZ;~Z{cV1
zcaU1GoczMP%pO9c<6cpV$$~XZhxbzi%AF>RK>XO`+NW>%_U)TmuBPPcWsutvIrNcX
z?H9n7;(J42jAYe2%pDw1)VH%GN9d8&JmG$N=CGl+ZuVEzsqS54^XvmiSq*v#%#y`;
zI|VQs^2=wgptT7|BgDmGP@)YR36?=DkUHN474Po7d$NW-V4+omR+i|t-3k`@3249+
zFjc{xP=T4=;tH)TPq<2$Mlh3GHhGVQ<z%GWeGlehQ~V*^2)!{zRb5+EOUrF{si&Oy
zs7IPo{v#K9hX<%1N4tHB=Ws(XMjSvx1Z?|ie8c3L3m8I(XB7r?onR^Y`}^0P?meT1
z9VITXo8S^Y#dyAMExOP-Jsm(7)YHv22cQ4K_ZY5rEpy{Zg2IK9y|UUs*JM$+HE8sl
z|A;HHDzGBZ8%|)My#jU*ZzuW3l;&88+I=xXb_~SlUviS+Nz%RLv|_SoopLe3X??0z
z*R>Q}YA9ZS^6s>Z4921ysO_Jhn*+Q2slX|ev5K3REPLY+q2=4HMUcEai8s?zTDx(2
z<!Mb|;}9C!Lg7Cso=fn?VB9vr@_`CYP-D36-|rS!j9<;Kt%0pK;B@%0XM;t7-2+Ru
zU>Ph}NfVQ--Fr~CAzHyCCJU##!VsoP<I6=CnGLZ~H^Rk4yuy5Z>eyRgJ!n*dtc75-
zYevP+9fO4GO(1%@toZ%2+yrIt9l;mkAK}~hH&~?FXmNCA?Q3_?ktqjB|Je?DN7Hoi
zLn<m^0wfkDhBF1lPE51V0%x%ET1s=<hW&EkCg*-alR^;G<>63&$<Bs*wsNtu{%}N>
zD)i@-wAskr5{?q>meIHs?A&2Mu`@gytmu)&pDt7?5_Iw+I`;iZYZFe<moF<&5qqw#
zu1@@C00cUT$#0;WA+Zk|9&(xB1~R>MfEH@CMdED3PO4_0RWM8gFQ9zq5E@JPR07O7
z$zm+$&1o^}MoD7rh?Y2*`sK05goaRhc>!OD${StA0JR8GQc`n5OiX@z8{ZaU&A<%>
z(q%o<=m%iCy>H5S@eZ|w7aw}kTl4JGqnJd{^P<5UXOI;=EBPSifgs8Qp%X1&$7(!%
zdWiObL4t#?QXTv+!FBww62axt!PYl%i+BVq=Je<fxL@d9a8UYNbF`9Odos^nueS-d
zQCnA6smn5SEoi<5YXk~EBrMf4bwM8nYx3x)IR4)P{~{x#FW7<26s~K;wFi=fQF)SN
zw=+l>;9((;*5yLr{?9;jhZvFXSSUpV0@WVccXVNb`>xN_Fn<t*atfrc>v~1=x)&Tf
zh&UdF2n01*Ca}uEOyGjjG_(9_-j$Zs^P~K8S@(K4>!dCc2O<*}J^ef=s`ud(P6Meq
zTt8j>-sS!(WUmY;?i!sCg24xYDv`|Ha!3Y`^Di&&JX3{buhI4z2mHxUq%TyI3;*d?
z0l(Xk_%h^lr*Xcp1yI6~*fXh0<C_!^5<fz8zwqXvl+?SaSxC{Iui-O<bjX&^R8$O{
z#Nyw)fT$W`51oag`<Y!;>eHa>P$^Y+ZJk`k?jKtfmz;NPHdqu4-aSS4?eNT@x9AN-
z;kvx8)?4t55G}YE4s?UF>rHUHzd<SV%DUhAn};xpbk+occ-ULPE(W%D8dS87?nqcf
z?iTsJK#kG^G;x5|Ksk?5mH#xy_0EuDIq06;VNPyWc1r*>-Va~{(idiojF{K%l}a?k
zGqjNwZGjs>NL@}6CBSCUD5$I4=8v#v6TI<Y2dX$cTgOAGV8f^BU9lrebe-5k!U|e3
zv@)re7M|omL}!6UKQ8O25RcPU-QR3pt^}ZBdp4bnsx3Od@zk@1OA0RG^!lgOb9<dY
zLSlhu-$l~FQCytfs<gb2_*R%6FKESF$f(gT3gC(jM*SzK8bV{3{fiRNIryE1Fs=FY
zm39jO`Xr!w%U9nZ{`Ko?<MG6I1mL$5N_p-2Q^rx7_(3OeXvL0@2iiqAq0n^<I@EbG
zJzPo$ml8il(xR_zr0)a_&d@eC;GHxFjrfTqPYaeXd56Y-h*?xf4H3P>CCvC9`05Ca
z^<3gow*$~azyc7^Pvlx0`kD6dnCs}f(RpFvTx7e6K13yU6rrYMXpV<?_+tnog<9-L
zJ%E5IlLt|^f$8O6L;WD{F2yqrl5x;@!Q1j7K)dP_O`K1uK8ZYhX6iQ=3r(H|F^Dz4
zdT$iU&qQIXB6w&rDrnb+HLT)!ngn_TeL=g{gjZ1slpeAy)Mres7irM{I5c%O$1^U*
zK-8HOi<wq{ErqUX+}*XOmJkzrGtpEiyY^X%j22!KCXTZIdldr`^xb|2e;o!SZrCzF
zgHdPvlG_vD@0qxIur&J18n8;TB@!{5n)ofX50w)AC^Hb#CT|{ke$ZJ+s<Chhp~{{4
z@Qoxg&ka?ELTtVvSWLJ<^B;o8^OgQA&>gn>przo0w*1)Uf0O5SSNF0njGt$B2vrm8
zDTXLHp8-M<jo6jbzyS1^*Lk2qQgU)09dgtA^hk<w-J&rGz(RB<|Mgsa?CY&1()S<n
zKsW3B!93(CE~DnH-shP+dyklw>|gbjAWw@z=c^`S-6sm9_g@6;>h)(nh7DMbH`*xv
zzEhZ9QBd{a2qmL!Oxt}J7cLDyrV+djy|==A^YHEsQ1+2Z>9e@-9$?GbZK%GSNVg`a
zs7m#9E<tJUU?6U@O5C}269h>8Hn*2QU=w^s>R%pr9she^=*b6g*Ti4G1q#S5#U(|K
z(7O9@0PiMHR=OL#(fB5Bu@J;5fBT}3sT~+vEP?46_t*mnB#zyZX+VTACZha`MJTqo
zm-olr1r)rkIy`hYfsVp1s$9(->tsrV_1gmXkSAjyK$LN^IF(<{p}JmP@XWTRAqVcI
zfl?2egXvm+`6e$gWetUow5hc@M`VaP1^rVhlXu<$SblUpWQO7p5u|5a(E6u@a@GQ>
zQWDcsPDxcfgi8Nv?rj-(oz@&=^wdCfdE0IuCjD$7wLn-0K-8KGxQ^!J;kI+6fx+Hz
z+9jwBm5+se^6vI8EOC918A(bW7@przqQ_Z@rvbbu{&v#nkQ>}mn4Wfzg^z)ZE9@rS
zmVw6~zZ@ryyM#&tQK!PaBQ#@-&My=ZV#o=U`u_1P970QiD}G9M=`gicE+gXKzCel6
zis8Lx@P&2#_wNEU2qTk2uv-Me?&2UyXWK+-Kt0L!Mk0MfuqA4v=n!>J9vtI8#y=)d
z-+43EB3>eXzMMp>t`o0}fgtj+*D94h6IR4qV+PG5+-*j}G?Gph)AKcd^lx$Czh;tG
z{fxB~!idHZAuQgg+GIRJOUD;-X|_dB1aA_Fg-FGG<C$C;ZZ~o!Moy=tu){FAEni0J
zcmZL<VXtf6c|@WkPEI$j$XUv;pf%Gm8aUMk!Axr4;4%)OPO`0(;7R~tm(2yw<t2h;
zqQB}8Wo=u9Zy16=QcGW{ncj2S1&+#nGgjhn#zXWpsoo@{5e~+}=?)c7^Uav?ALSq&
z62$PFx=te;fL5eT9#WYQB4$2YMbM6az{1(+6)u%pjFTbpxPW*^K!aAT6u(Y45OP1l
z+`M}K#}m8Pl=(Db4XY8x#hrO|{k>@y{V@@OG4|Kq6D$kUp$^{uxv4Qs-Y0~E;6kSD
zTdRv7NZD?b-Td?JgO(Aorx_NSPC5_V+85dd{o)rR@9C8VLq3E$m%X~V_J*`vniI%d
z_Z@Y0kh6wPbJ>V#PRF5o4v@lY3|D;I30Ztuwz<nD(k~#g31}vQut>$7oe$xU6#!~s
z@`kM~uR)}Q8UqWbWW7s^3G#mCiH7{w5U%lg<QLv}j${=1SU<mr`yELCf3IdgT3Gwa
zG`d(tYm7kjJ-tq;SbLwk7tEF~@DJ8Ahha;|YF-tasHiS>q5k)G=xtn3e9g?fT64Vq
zwaSyj&!Fq2S)XNcKs*LwCZf?y4I0@VHfUl6C0anJde8+H@#PTJ0L~h}c;SAs)y%~7
zWeE8nthXkBBbXeS#*0ahu%qMatEk-j11_vZ$d~_7)6Uj#UX7ib&f$aR_Twx2MWLc;
z#K?$nFTJgY;%1Pw3#(WPJhj4chA!vD7+2FSVt5wZjgBXZv^AzF#|D=Yh+$bxO%3R~
zAeVy#J{UqyTm8qM-&S==2B%ISjX;KVjs}EsC_dtb@*(O*0GxVGPxUw{<JJ6PnM#Zi
z(>9J}ST2>lf5-^abYN2}2^iUMSEuGXPP;1u%nK(V9O<jLjg1WEj!)h1z3ZZki7nU_
z{u7Kd!}sU5!6z^F?-QoQK=BO#^pj$Edtg~!iOVQ0-GhCqurrNZ=+&l``wqFVm7LBl
z_M*B;l-~#{i<cas{z0vW{?Lo{TE5M{r1Ixb3;>&)xBCFI`_Q)>9UWDzSDFDt1t7`H
z#3bW_q0e{DBlRWuK0P9v^UDv`e`Sodd%<uWq(#_8t^)JOxHC3#Jf&VH{`Cd&swI;Q
z!?zf0(*<pv`b}bBn}sGO=Itp%JtUB4bYad{W5pR-Z|hDxb90H$SmV;wJ?tM(sf@0P
zM&se&D64XifEM!Y1|`@l39+%JPJYw46qPRwZ9|wah?NAee^=VvSu9Ej#>!fOVioj0
zBOd~&Xn>lgtFC|0)r6n|{Ju+kyDoJo;1OA#<28O?m2fh3UweMSw0q8;dr&n-t9u97
zovr_cMSbr;8In&Ih666({uudLTaSO@mhF&4Bdr-AC0j>WsCj6<eA)R0#_iVy$7sI<
zRflVTQmWBGG-dv(j^oZ^e!|ZViOv<YuSC}tKI$c5z-rlw9rJzb{S|T3+o0yg$O^Pb
zm49;F!-eA{;_VcK;DWK#=~-0upm1LHOyn55ilP9GWq^emrC(4Qes>=+arc**)IIvK
zSz7cRGy-lf3ysd&4$Ezdh|Hr%a0pRXY}4MF>?a#K)vNGR;)aJ%y`iI#uEcmlm}n#<
z@&F18yq8wF!ADyzUk}cHY5&P^s9t{NgWfg2V6DF9H(<=k!xvXW8GfnFvBv~r;S7Jc
zy{wrgQ+{dSDhpJE+<urhB2e;MflQlmB;4Bjm8fsm@@1S1YB5X&WOy3mU61RVsR&2e
zat0fen;}Wyg}?5gw2S2M$MwuU46`khw><C+6`zFB1+%*O6y8Ty99dY9)foP8V)N{Z
z=wu2n*84kG`(lVG6Mo`{+01o;R;1<C!wU|tWlVSfp!C>mY9ncS9msH=W8QzlZam4O
zs6QZ&sk39uH}SMbJDCcNcpD!^Ia+HZ%@h5D3A=Mcq`_c~rj>OeW9|Cc9((Z8N)#;V
zS&*0Om}ye!RP)t;-t!}25uE!S7;Mc2cMu3Qu*9<YE;w9`y*Qy8prggOK_!McDVd#?
z(Zhj5{mnTgdZq0qv;hC7`MiUD^e)rttikrN7$M~Z0MP@SPPN1z>wiKG=UHZG(M2k?
zDf+#AFC%xkf)`kV^P-HQvs1J0I?*@0>|8jTy18cR3@N$JWV~Rc@1?z?u;A!Y7<B)$
zG{hiG-*@D^uEfO2PV{lMQR!Qu!AaS0gGOZR?%k9$vsZ;5yZl$@*g-gu3Sp@BT@UM;
zZ;GF9a@eLNr1N~0l`c~s{no!nyI1TsK}pB&%gdfOy-dLL?jYDpc=*X)^vBXzE9c|(
zoP(v9f4*S(#G50yt;(M`nt#DDRaGdW^q}|^OfAnQnhV&hnwCFIEU!AV3A#L2CAb6b
zyRAvmMo>J4LX(MQxB!<O>F>*}jP;`Ea)9&+B&ooKc<Iz`Ojku>=@-&|T?Z`+`_y3k
zGy0uuCx`Z`E@7C(#91v$^GO4&z_c!n35*EcsUuy&$Zjh6<*$1&1O~5MwqHt?E1lfB
zDTA`&o?zQ4mCQLnGpuRb$F-d__tQt?3uFvG;rfi<%$u2+W((F=*zgZ={Sc4_L$^tD
zTBvOCf-bt4DD7N$IA`tM%e5&r{YJ1S>iGJf)8j>5OTB+yWk4*zFIedi-T<>o^Z&Pi
zh$DE^i2;3;ag2Nai1}>68i}qB_kPXrCLthND9r^W>An0K{Miwx-hm=}p=TeksAK{d
z<N`(C@ZdVAD#c9^mcEd-^EgJAzhGs}gLcc#!oqU*ZcBSR5fc7>gDY%-hb;yNu#KSP
zZ$ZfAx@%;*nPk5tkMZ>>0_XCpJ-E-*@(nLax2t3Qd^2cbpb*awzGptD3GT47Gg{m6
z<ES}gikmlYwz7~Qr2P*Q*bhd_k`k+LFwxE61Z}alAK2=#!tS9AaEGEz{@1c3Pgidw
z=b2w$uHoppUV4n{a)1X7)oFO*WeHUGwI}N`2L6IO-@~{uL>!drpPC!|ujNag@0ZB?
zKk-TQqKqzfW>36w2)9c?n+z^8BQ_ukL#aPhZ<lX2T>Z^<9g);?sBKwX66X8qUG@ZG
z1-9|PP6w#U<LR9Rqs0|$20;D+hwA^4^i(k)DwE0!*d%@4RgRyTk^f2kj{{uj0Q+&^
zk28?qsy%sfay)hJzLJ&E1%fGsu*=Kyo6grg1sm^#J=&mVoEYTT`gu#b9`)f~IYpZC
z9A8z^eflI^PS^$U?%kzB6JXltEfBmrP(I9{5FY~->rmJRo_luZ!eaeXL`X>E+pLY+
zp%8BOv&sxSWftwqV)zpW?xUHHX#=sGPyY-BlW@*}Vtoj$IIFvWPnYhAm}Z<4t;73Q
zZltIGaWm+F<Jw(sfH6e{k3d1WCgpVlDxTjhOjSAM6QqD15ETKWxA_zB6KhEuRTwmY
z0@!h&B30<sV^TMQYV%S$8G%4iKyX1@OYpZh+`vD8>Vq-ZW`1&V0^<g|S3p;OK!SUX
zj5`y60MrP8R6qePG;E21y;Ry2w&}LdK|%tF1<k{%WT7BUPmnO}3lz(_9d6H~w_qX0
z&>qp>YWft~zf}~_-hcnQTN1<^r|XNGSJ2gWzCr(#ae!>`@0-MWptK5R0MLcMyVuYa
znE!c;{U%_Vp&cu4W9mM>T=&NVf`ve=eZF-|UdD<uJo8A|HyB+Q0%ACgN`k{v)&)W7
zz!*d6m$0yb5VYki#QWYVp=*@=dq9s<Ah6=@8y_T14y7R#0R^*m@dFNW^z+)wIR)><
z_uzBc-o%a&fr=4C9VT0MP^EWn?EUVZ?_}twKAL~OMiOcJ+9YxJ0lGIYc4YNFoV$eR
zoAj1tjaH#M5F^nhLvclBK?|R2MdLQU1wFci3ZZwYyGeQ{D`DY9Y6X<JAUwS<Vm4A4
z(2z5Xc;-P34uXnvGBCKcoV}Dw_MQBjw-C7zC{L%^RMhtC!tW_*PGw*CAjlznqcdhx
zEz;y=!_&Zf1$kiSC*86+)8AbJPTOJ^45`){rc1GXB<|jD_xt}^yYg@-_rLv6*;0&B
zGT8=+iYy7)BjY4wNs^tArPN8J7%59h(TT~HEjc9`+L$;=n3Oe%vSx}Fib}<a-~Duc
z*L(f`c>j2>_kHJ|F_&v*p6~Phe)jvm2jDT1yO6(iuMs`iE<wRUkI#?AL#$6;eg0_E
zY)VVw?I?4QkBCsrBxpfdi-O1tA=-8GWqcGW{R%ZtkBE?q7R`>GHrbM|-m!yxHE4Z;
zK0{s#BT%>ULMMiQ1U4;xDpt7e8EuS2gUYHJ($^)A^RH;&XV+~f|1U9;@Bf<rLvkU!
zH$m9suFycA3(cK+{=SdB?IL!jnmz~qS@CI&w9t@u{E1xhrirSRS_u608;FM?U{76I
zsUL1D5DNQw>AH+yXmaj6FQ{A`WqQ0b5P~i67{z5}%S{~|9J*as5)AL~JDah;`<oMk
zOphK2UFK2-9^D*Q$%w^XN)Q&QF0|_UZ4;D7=Epl<1Csk5oxCV$T=ck#5)Auxr4F|c
zLAIO8@uV>{Pmcfu2~<mObtDN=B=+C1<<$Az%s&13d6=w8!_>=xS#3?tgP^R0EuT*e
z@=5Czj2(ZEC?EWQo*}VJ&5eXJr>3T6WvvX5z*J6sb*n#HcR&Y7jhT&Q*V_61d<_D>
zjlow3)KVmR=CCtCgvgK3NA7Sd7f-Z@phFY^%Z;raL{Cz>ao`seb4bz{oE}fP)Q9JF
zbd!~id2b<6n1Xgz*?PC~@=T&$pt+B3si0h%ntKiWrLuj|O(--a-%(WKC8D@5R=zEH
zZ}K8tN-<^NLsZKj3Un5f!+iN0k;hvK+P#}$W@fVYK2v$CsO$fmed*m-r_ePnOka-u
zKQPYPB=~mZ55Sz(y^*n=4)#2MV?rHhbaZ7+6G*&#<meN~T9I!mRs*oN4fN9llOCgv
zZ|;rTbqsZ;f91hQ>7@@%Yqsha=(E?I@b~v;Y6YZ<dcmOs2CsH+y<q)3B0R0!v11}Y
zIYOW-#F$#hgNh-2_kqN=_Qv*Bqu<a#47K~i3a5KHpT)mvu8i|$Vd=t|Ii2M@D{c8p
zWMBO<<dg?uj$CuaK8Z^D8SJW-tbsw_oiooc{xawLE#9xG`1$t34(LLXHm$mJ!>Rgv
zKhD$=%L`-*r(Ox1&iVBjYrNvLW4}2G2h0hsXm2FX?{~h7BC9M}BrlfOzv7p7Q}y^%
zvhi<{tU%-s-<JR7m;UFTj&wu6$hJt73C8F@&7|(!T#|CDBlT}Sa6Yr!Or4dO`yXIu
z*(!`y9)Omc_sbfqFy-oTov*X>Ki#MmBW8Ms$0zib<^lP>(Ap;uf_NYkPa$Q6&zETN
z!jR*>1i1<#iTwWm-3z7`d*Pr7_6Zs-5Lx;NhNx+tEg}ezt8NYsK8Gt)um86gxY@a}
zzDO(k5i0+u_*mN*%ZIhyvO02h*>R^iw5Iv1M73?x>ebT{D9s+MQDJIR2v2syXwl<U
zR3RZr`GZ0y9w#;3T_j;DTDem|{_cfQ*(GK)Sz(pN0hy8X(!jha(*WI{QL}pY3_eEo
z8%8j$j7;vxP6kEw=g*%_V>vlF$;ru@`dj6T4iOP?zCA#A98{)AN?zTg=0mYyk4}&b
zRm^3aoSs9sDfamBqsNXtd+Ym3xzM#OobO^mM$gkLHj51SYn*}b=5P{B3*zG&;cui?
zt`yd|?A+DSk;-ItzkGSEO`1xbA;)tSk*21m&dwJP%%J{ULZPT@+G~aA@txZUeLdTq
zJG<N4C%BK6lwPi=uy3y6&|LEym7pjE8!ML;ZI4?-1%$#S#yGdCK>5nKE|cLUJ}sI<
zE4fcTPfR!igiVqQ)!eMipo2kPM!i?)?%lfqD$n!VNX2jyMLG%49vmFRm{oK;@Yf{!
zX1rIIO3ehR&NkZwqpYByAg;^3>guoRF7jIPJlq(h2Z{Awetv!;B4;7V5U74!*)L_h
zeK@9}p#hWUCtY1rfUH9baCCeeqhw=q^LogXESA<UZV_0;G_B%4!+%b9Z-mhFx9=0)
z?(Xh+w%xtGL8FyV;xM_rR#s+{$EvE@wR-81h=^_0)>p?>#S%}L0_h;~Role-iZ>B4
zjH|rFWDed2Tpyxlf2ozz(?=&7P>i269lEf_$!8tpyFd^#&HL19H0RLw+{d1to;$&(
zVIdWsx<`Abiwl$=PbKj2@d+EG_Y8jcP;#^yGuE%XF&<cK6V=REnwR5zJLn=t<#~SU
zPI5>3`ue<B-7PKFvmHZlXf%2G#8D85;xaQPOxpxZY^f@op8MrNm@`rU;9hY=m9MUR
z?c;K@oBM}MH?ZlKJ6J6BW7d0B+i47A4sA(Sf4{X^U{}d@|B;;dK{v;E%gb$63xcgT
zzbO{{X7X;i(<Tx?QC(fFuC88MS{j#=Qi}v_>t(w<+u}FX-9Yob861?Q2+ltas&xw8
zr>R}Od7i+DwHm?b#^wEK7z!#gW&75xr}bi)yM&tQZEy5^k~3^g-fca4^r)kw_?_Uu
zz{h{Z-_X)nzy3z_ToesL6?T5nk&%)6_U*&ogFyq$HxMXE&?soQ(W|v68GNDw&OVc~
zvorf>N5C%;e^D9Dt*fhRU0FNdp8hR&g3z$oRxJDVH3spwSS(NH+c>hc6sVy9uM&p4
z8<&&Lla!piN<jf#B@bkuF)=Z%y+&va%~rhl{yiKlKaex+>^d;O-y0HA+WJURejB+e
z-uy?8ENSJpZe>q8j^~JqTWOyBU0Bjc_F(4;A-hP#n%y~}Bt0tN>8hTyp`oGWV<0;|
zeE9Ihi4(70d4+^7>$jDfPm`39832tK3VS|2T+k8oTbM#urWf$m;$*q(+NB_7X>Put
zb%%ME1u>H4$7iyz=)C!KLVuQ~ujtx!>k{b^u8twC5ubA=KDPdDN6$$%8Ro}5wW3kK
zfF<v)a-k^-+?}j(k;4dJR#s2IrG*+vc$m1|A<;s+x1<o0ySvP?WmAyK3Ou$n&Jz};
zC}wG4!G9_0r~hqUe{ScTW5)vb3jeTtKW>pQ?>DZOyZfaFExqSOTUuH&q)(P9E9`5C
z)m|?5&$^*-IBBGjbd~?5Q|WF?GXn#I>FlQ^_LTX5I;e;x0_X|9f=VxMI0g{j1plK)
zcQ=M6HJ2=CV+MS=R=Ch@PkV`ZD|6e5`Qt9e7v2*g1|^{Q?G2T6D>|otY<_Ty3C^N;
z;gr^{!0T*wW&#?5y2qLujEfdN;BpJ;3Rg=@7Yhh5Q{Kh9EDnGuK$VEE!=81FhM=yr
zbzI+N7r*D9%~FmX{P?kTy%qe*=xFh+TenKGXBu>&DX?zw!^cZgubj<o*5$0+aPid@
z$Le=uV^UI5j{YCsy=!{(NG>0mfRbKz6=!^Vz{NlK%m%#8Q`Gp1iVDa(Jn!sO2&{~r
zt2sbuYG^$4VgX%}sDG+3iikO9zJ5_);CsBABxivSSKa^v!ko3fp<&BxnYtZ)%g@{i
z2^>`&e%(3%T}j=9bLT{H)ZqfZeEoXs&K)NQhZ}3zI88YQkBqWWqfbsApk*+bbUNKO
z{1BRs2ot?wz$F7~jRFcLbvF&J5A<J@p5T6}I+qu+*)y2^_x34aCVXjpNGE5z5##T!
z?r!GAi^>CHGBT~fAG%qa!&VW_T8bMA8uuk8CX$d7;0WB^2Y}Cr!VJBnWNn%+i1Og6
z$-Z2qtYFieJ3)mHE0*=^epP=OJ_)E4)qznicPW+14t}Y<xp{BeBk5BmWo1rLB+^G^
zx`q_jtocqm%rYjGcYb^yJ{vLhcH071UXBt-+3D-9Hl_TOkd`jZmoHEFJwf`Cj;?OD
zQM941ZY7e9++0S&hYufW{+@h1I_m#SYMbuKn~Nnc!SFn%zPz>H+!_<VN=b=IrOy2r
zk%{v}ep&jrRAVlT`8#sXLObQU^=@u%`ZK+J74w|uYltOs!Hm+@);2UWd}kEo^IuVu
zR|Vw+hMGx<QCG=7i0gS|{Xr1Tx&Mdfw$pF};2v#@1i!{{$BuX2h6JJMpOdGA%9Vg{
zo)>FpjW1MPRaI3%qwnwUuR1%>*?AKX6I}h?7p%*d6*q3Ylbh>79&ej@gt5)1>Tbg0
z)T`m)Ygexp9aYxX2S{L8xZtT`288ym6ciKy=-J-By&xIZC?_X}b;1!>p=viS+b>Qf
zte&Hz{Je{Ngu(xTX$B;QXgjo%Y_jz(KfZxv$&00<ufO~0WJ*F-b~d6IZY~~&F3uwu
zZsbjQ>KhUg0!p-}r<|w&5OM(ZkilrRnwm|zXGM8=f<HR$FAkkOb&8h%<cXE*8^~ch
z-4zid2Hk6GYoYRsD_i?m#hnwfZ{Hm954}yBNVEnTM>aOCShk*y4(H?3fdO|{SHy_-
zBO^)!Ip@zmZEsia3l&+Z;}H_l5<D|A<Kpc6tg};i@!}UfJ<V;K<`GQGVpM{&zI*mG
z1g{>Dj{-&mL`ty~M9>Qto<T+c@IY0!d*Rbx0)E8ryZdsDd*s-LljBGYSFc%<Ier&j
zyj&>NlgVH(P#|SwNRDT%CK#+*M^FNzH)v^zroi+|a)u!a0by&zPeX`9UcWwun2+R*
zmI9~iPjYPQ>dFl;o=)V{)ou3VE>W_+sXU~*Q_Z!?VQBvvr&5J{eDu$ITM5FIyqmH#
zNhzu3mX@0RL%bApIkwGSMo_|BDb5opy5$lQoDEPcg)YL#7+9IW!ox-SY&v}C5G4f|
zu?OGFBUOFLNfLGvI9_O7tl6!8_~60wixv<bC;r)Sa3N84Jqbqerj_5gA)06=B+doZ
zw9qcV!y}i?W<L<XX2Nk`>W+?_;d5FFJ;5I|w5uYn&dw3vKY7L&pMxsl-<&D1@)L{M
zY!~*o1w`&X-0%Cps|$Mv1X!A_eSAQii+ltpP&_O!I9M?s{sj6=C)43j5{fG;ox3y)
z4Xw>Szxi|e{fqwo95^#G1o>}YzBu&9WQuQGN-!v<3j~RxHF|n_ii#&+)_@O5f)HI@
zrQjMN)e-IeYIJlp1>Ge)w&}JY2n1z%N~HO|c3Jx6+qcHX#<OS6C@Lw%$HiThupN2>
ziyn><LVqKHQ(ylY&?*XrGB!4b&J}8bwCabB2Usjtd8Vv5C;bSB{GjaOqL>F-hlYl_
zySq{R-UAc@eNASFMsJS=GTgpM9-?id1FEe#zu@3(CX=LWmXwq*nG!v_l6p^_jg5^3
zUMupAEG!wZ2FBB*##+n9<Od|166n*QwpQVbfIcLJ6o1LQ!$agohcBbTGys4_l<@ZU
z?(I06H8|)&Q&Ce(cfaMQhgtP(q+g*G@}uD3>$a<r{yP~6Ja_$3D@73U<oX7U%xDw}
zDBvOc_n!-NhLj^Reh!CYA#?0u-xB3A>{nDzHiJRX_67#pcaK3(y7z?vNTe)Cn;P)5
zc3PRu&dyd<ixb4LU#ER8At?!8lTKGaodKbP-K4yQsJOTzwn9>}%CnA7Mn;DGFzmDV
z>3XnjE@Z2H`TW`CrvG+W?EU-qKermGQKv8;GvkhqhC_1Ub*%KJFsm?4-{@%Mcx>dA
zddr)62w`4v1%iR|b`y6JG-R-lvaj(X3PZ^Vu2a>u>h~X$zC9|ba48D~1t%saQ@{F3
ztOBk@UVa#yaH03ViEX#AX#8U!nUn;7q{2a0SuABT-xMvoI;$UScOJq+Z|!644I4=A
zzNZ8<5e}Ob?(~LdA0U4t;PBy-W#{GcvHsj#S-9Fu(X-B{H{Y9RpyCn{(<iU2=OL1W
zT2O=fGdv|wDm<If(b0L>(2%2hun2SAss)T9(gUW@u?bBU#QHrtpr)_?yv4!-rvYm9
zCjo&yqqoJ(OnA{EXaMPd4xr+96UdW}M@H>lL<Bg<738V<e|)|;#}isJ+m@wp(w+QV
NOLJ?pQd5uP{{qWb56l1n

literal 0
HcmV?d00001

diff --git a/doc/shared/sundials.bib b/doc/shared/sundials.bib
index 7972a7b814..af8882cc04 100644
--- a/doc/shared/sundials.bib
+++ b/doc/shared/sundials.bib
@@ -2053,6 +2053,18 @@ @article{Sof:02
   pages   = {506--515}
 }
 
+@article{Sof:04,
+  author = {M. Sofroniou and G. Spaletta},
+  title = {Construction of explicit {Runge-Kutta} pairs with stiffness detection},
+  journal = {Mathematical and Computer Modelling},
+  volume = {40},
+  number = {11},
+  pages = {1157-1169},
+  year = {2004},
+  issn = {0895-7177},
+  doi = {10.1016/j.mcm.2005.01.010}
+}
+
 @article{Ver:78,
   author  = {Verner, J.H},
   title   = {Explicit Runge-Kutta methods with estimates of the local truncation error},
diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h
index 6673acb119..1fa298ae75 100644
--- a/include/arkode/arkode_butcher_erk.h
+++ b/include/arkode/arkode_butcher_erk.h
@@ -85,7 +85,8 @@ typedef enum {
   ARKODE_ARK437L2SA_ERK_7_3_4,
   ARKODE_ARK548L2SAb_ERK_8_4_5,
   ARKODE_ARK2_ERK_3_1_2,
-  ARKODE_MAX_ERK_NUM = ARKODE_ARK2_ERK_3_1_2
+  ARKODE_SOFRONIOU_SPALETTA_5_3_4,
+  ARKODE_MAX_ERK_NUM = ARKODE_SOFRONIOU_SPALETTA_5_3_4
 } ARKODE_ERKTableID;
 
 /* Accessor routine to load built-in ERK table */
diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def
index f25fafb830..5cfb3f2af6 100644
--- a/src/arkode/arkode_butcher_erk.def
+++ b/src/arkode/arkode_butcher_erk.def
@@ -41,6 +41,7 @@
      ARKODE_HEUN_EULER_2_1_2             Y
      ARKODE_BOGACKI_SHAMPINE_4_2_3       Y
      ARKODE_ARK324L2SA_ERK_4_2_3*        N
+     ARKODE_SOFRONIOU_SPALETTA_5_3_4     Y
      ARKODE_ZONNEVELD_5_3_4              Y
      ARKODE_ARK436L2SA_ERK_6_3_4*        N
      ARKODE_ARK437L2SA_ERK_7_3_4*        N
@@ -165,6 +166,39 @@ ARK_BUTCHER_TABLE(ARKODE_ARK324L2SA_ERK_4_2_3, { /* ARK3(2)4L[2]SA-ERK */
     return B;
   })
 
+ARK_BUTCHER_TABLE(ARKODE_SOFRONIOU_SPALETTA_5_3_4, { /* Sofroniou-Spaletta-ERK */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
+    B->q = 4;
+    B->p = 3;
+    B->A[1][0] = RCONST(2.0) / RCONST(5.0);
+    B->A[2][0] = RCONST(-3.0) / RCONST(20.0);
+    B->A[2][1] = RCONST(3.0) / RCONST(4.0);
+    B->A[3][0] = RCONST(19.0)/RCONST(44.0);
+    B->A[3][1] = RCONST(-15.0)/RCONST(44.0);
+    B->A[3][2] = RCONST(10.0)/RCONST(11.0);
+    B->A[4][0] = RCONST(11.0)/RCONST(72.0);
+    B->A[4][1] = RCONST(25.0)/RCONST(72.0);
+    B->A[4][2] = RCONST(25.0)/RCONST(72.0);
+    B->A[4][3] = RCONST(11.0)/RCONST(72.0);
+
+    B->b[0] = RCONST(11.0)/RCONST(72.0);
+    B->b[1] = RCONST(25.0)/RCONST(72.0);
+    B->b[2] = RCONST(25.0)/RCONST(72.0);
+    B->b[3] = RCONST(11.0)/RCONST(72.0);
+
+    B->d[0] = RCONST(1251515.0)/RCONST(8970912.0);
+    B->d[1] = RCONST(3710105.0)/RCONST(8970912.0);
+    B->d[2] = RCONST(2519695.0)/RCONST(8970912.0);
+    B->d[3] = RCONST(61105.0)/RCONST(8970912.0);
+    B->d[4] = RCONST(119041.0)/RCONST(747576.0);
+
+    B->c[1] = RCONST(2.0) / RCONST(5.0);
+    B->c[2] = RCONST(3.0) / RCONST(5.0);
+    B->c[3] = RCONST(1.0);
+    B->c[4] = RCONST(1.0);
+    return B;
+  })
+
 ARK_BUTCHER_TABLE(ARKODE_ZONNEVELD_5_3_4, { /* Zonneveld */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;

From 747da2ef60accfa78a71077abe2786bc3a532b59 Mon Sep 17 00:00:00 2001
From: "Yu-Hsiang M. Tsai" <19565938+yhmtsai@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:05:37 +0200
Subject: [PATCH 12/35] Add Ginkgo dpcpp into example (#351)

This PR adds the ginkgo dpcpp support in the examples: sunmatrix,
sunlinsol, and cvode/cv_heat2D

I currently only know `queue->wait_and_throw()` to synchronize which
requires queue unlike `cudaDeviceSynchronize` or `hipDeviceSynchronize`
In sunlinsol and cv_heat2D, some function signatures are also used in
other files such that I can not pass an additional parameter.
I use global variable to store ginkgo executor and then get the queue
when SYCL needs sync or submit the kernel in those functions.

---------

Signed-off-by: Yu-Hsiang M. Tsai <yhmtsai@gmail.com>
Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 .clang-format                                 |   1 -
 cmake/macros/SundialsAddExamplesGinkgo.cmake  |   2 +
 examples/cvode/ginkgo/CMakeLists.txt          |   5 +-
 .../cvode/ginkgo/cv_heat2D_ginkgo.DPCPP.out   |  77 +++
 .../cvode/ginkgo/cv_heat2D_ginkgo.HIP.out     |  77 +++
 examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp    | 339 ++++++++---
 examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp    | 224 +++++---
 examples/sunlinsol/ginkgo/CMakeLists.txt      |   5 +-
 .../ginkgo/test_sunlinsol_ginkgo.cpp          | 543 ++++++++++++------
 examples/sunmatrix/ginkgo/CMakeLists.txt      |   5 +-
 .../ginkgo/test_sunmatrix_ginkgo.cpp          | 349 ++++++-----
 11 files changed, 1163 insertions(+), 464 deletions(-)
 create mode 100644 examples/cvode/ginkgo/cv_heat2D_ginkgo.DPCPP.out
 create mode 100644 examples/cvode/ginkgo/cv_heat2D_ginkgo.HIP.out

diff --git a/.clang-format b/.clang-format
index 35fa8341a5..c7692ae54e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -140,7 +140,6 @@ SpacesInConditionalStatement        : false
 SpacesInContainerLiterals           : true
 SpacesInParentheses                 : false
 SpacesInSquareBrackets              : false
-SpaceBeforeSquareBrackets           : false
 Standard                            : c++14
 TabWidth: 2
 UseCRLF : false
diff --git a/cmake/macros/SundialsAddExamplesGinkgo.cmake b/cmake/macros/SundialsAddExamplesGinkgo.cmake
index 1e56b34230..7fc5ef2d5f 100644
--- a/cmake/macros/SundialsAddExamplesGinkgo.cmake
+++ b/cmake/macros/SundialsAddExamplesGinkgo.cmake
@@ -63,6 +63,8 @@ macro(sundials_add_examples_ginkgo EXAMPLES_VAR)
       elseif(backend MATCHES "HIP")
         set_source_files_properties(${example} PROPERTIES LANGUAGE CXX)
         set(vector nvechip)
+      elseif(backend MATCHES "DPCPP")
+        set(vector nvecsycl)
       elseif(backend MATCHES "OMP")
         set(vector nvecopenmp)
       elseif(backend MATCHES "REF")
diff --git a/examples/cvode/ginkgo/CMakeLists.txt b/examples/cvode/ginkgo/CMakeLists.txt
index c993e377c4..6c876d691c 100644
--- a/examples/cvode/ginkgo/CMakeLists.txt
+++ b/examples/cvode/ginkgo/CMakeLists.txt
@@ -20,7 +20,7 @@ set(cpu_gpu_examples
 
 sundials_add_examples_ginkgo(cpu_gpu_examples
   TARGETS sundials_cvode
-  BACKENDS REF OMP CUDA HIP)
+  BACKENDS REF OMP CUDA HIP DPCPP)
 
 # Examples that only support CPU Ginkgo backends
 set(cpu_examples
@@ -39,6 +39,9 @@ if(EXAMPLES_INSTALL)
   if(SUNDIALS_GINKGO_BACKENDS MATCHES "HIP")
     list(APPEND vectors nvechip)
   endif()
+  if(SUNDIALS_GINKGO_BACKENDS MATCHES "DPCPP")
+    list(APPEND vectors nvecsycl)
+  endif()
   if((SUNDIALS_GINKGO_BACKENDS MATCHES "OMP") OR
       (SUNDIALS_GINKGO_BACKENDS MATCHES "REF"))
     list(APPEND vectors nvecserial)
diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.DPCPP.out b/examples/cvode/ginkgo/cv_heat2D_ginkgo.DPCPP.out
new file mode 100644
index 0000000000..a843e62f28
--- /dev/null
+++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.DPCPP.out
@@ -0,0 +1,77 @@
+
+2D Heat problem:
+ ----------------------------
+  kx        = 1
+  ky        = 1
+  tf        = 1
+  xu        = 1
+  yu        = 1
+  nx        = 64
+  ny        = 64
+  dx        = 0.015873
+  dy        = 0.015873
+ ----------------------------
+  rtol      = 0.0001
+  atol      = 1e-08
+ ----------------------------
+  lin iters = 20
+  eps lin   = 0
+ ----------------------------
+  output    = 0
+ ----------------------------
+
+          t                     ||u||_rms                max error
+ -----------------------------------------------------------------------
+ 0.000000000000000e+00    1.273091462283009e+00    0.000000000000000e+00
+ 5.000000000000000e-02    1.265953031236337e+00    5.779434661301597e-04
+ 1.000000000000000e-01    1.245126467995815e+00    8.596410825743028e-04
+ 1.500000000000000e-01    1.212971698816507e+00    1.027071183737238e-03
+ 2.000000000000000e-01    1.173149707911348e+00    1.049506292939650e-03
+ 2.500000000000000e-01    1.129970993609124e+00    7.767258516966358e-04
+ 3.000000000000000e-01    1.088067923761304e+00    3.857233565973672e-04
+ 3.500000000000000e-01    1.051569245238569e+00    2.296842605538085e-04
+ 4.000000000000000e-01    1.023519508142414e+00    1.160865021105906e-04
+ 4.500000000000000e-01    1.005965995289331e+00    3.382124480899584e-05
+ 4.999999999999999e-01    9.999934385586851e-01    6.776957530241212e-05
+ 5.499999999999999e-01    1.005920028619227e+00    1.074298825753939e-04
+ 6.000000000000000e-01    1.023439646225216e+00    1.256532195708093e-04
+ 6.500000000000000e-01    1.051474380012092e+00    4.493207354094864e-05
+ 7.000000000000001e-01    1.087965937316374e+00    8.048432853913212e-05
+ 7.500000000000001e-01    1.129792873621271e+00    2.390181284921411e-04
+ 8.000000000000002e-01    1.172918427971992e+00    4.322892993839922e-04
+ 8.500000000000002e-01    1.212840417005807e+00    6.887143222911174e-04
+ 9.000000000000002e-01    1.245177171528506e+00    9.911108446238881e-04
+ 9.500000000000003e-01    1.266240637720725e+00    1.309517693130591e-03
+ 1.000000000000000e+00    1.273471195699113e+00    1.189685923645323e-03
+ -----------------------------------------------------------------------
+
+Final integrator statistics:
+Current time                 = 1
+Steps                        = 41
+Error test fails             = 0
+NLS step fails               = 0
+Initial step size            = 0.002110117778857815
+Last step size               = 0.02437232616233551
+Current step size            = 0.02437232616233551
+Last method order            = 3
+Current method order         = 3
+Stab. lim. order reductions  = 0
+RHS fn evals                 = 52
+NLS iters                    = 49
+NLS fails                    = 0
+NLS iters per step           = 1.195121951219512
+LS setups                    = 7
+Jac fn evals                 = 1
+LS RHS fn evals              = 0
+Prec setup evals             = 0
+Prec solves                  = 0
+LS iters                     = 873
+LS fails                     = 0
+Jac-times setups             = 0
+Jac-times evals              = 0
+LS iters per NLS iter        = 17.81632653061224
+Jac evals per NLS iter       = 0.02040816326530612
+Prec evals per NLS iter      = 0
+Root fn evals                = 0
+
+Max error = 1.189685923645323e-03
diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.HIP.out b/examples/cvode/ginkgo/cv_heat2D_ginkgo.HIP.out
new file mode 100644
index 0000000000..4022dba817
--- /dev/null
+++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.HIP.out
@@ -0,0 +1,77 @@
+
+2D Heat problem:
+ ----------------------------
+  kx        = 1
+  ky        = 1
+  tf        = 1
+  xu        = 1
+  yu        = 1
+  nx        = 64
+  ny        = 64
+  dx        = 0.015873
+  dy        = 0.015873
+ ----------------------------
+  rtol      = 0.0001
+  atol      = 1e-08
+ ----------------------------
+  lin iters = 20
+  eps lin   = 0
+ ----------------------------
+  output    = 0
+ ----------------------------
+
+          t                     ||u||_rms                max error
+ -----------------------------------------------------------------------
+ 0.000000000000000e+00    1.273091462283009e+00    0.000000000000000e+00
+ 5.000000000000000e-02    1.265953031236678e+00    5.779434664550109e-04
+ 1.000000000000000e-01    1.245126468025294e+00    8.596397006188639e-04
+ 1.500000000000000e-01    1.212971692633635e+00    1.027175433592653e-03
+ 2.000000000000000e-01    1.173149607363054e+00    1.048511182224932e-03
+ 2.500000000000000e-01    1.129971118809724e+00    7.777031646749588e-04
+ 3.000000000000000e-01    1.088068652479702e+00    3.867786296469777e-04
+ 3.500000000000000e-01    1.051569453796381e+00    2.291655197173004e-04
+ 4.000000000000000e-01    1.023519691519509e+00    1.152507676536185e-04
+ 4.500000000000000e-01    1.005966466128100e+00    3.464712602863074e-05
+ 4.999999999999999e-01    9.999941074735683e-01    6.549023902890916e-05
+ 5.499999999999999e-01    1.005920139252285e+00    1.085862394125670e-04
+ 6.000000000000000e-01    1.023440066617863e+00    1.253667245226797e-04
+ 6.500000000000000e-01    1.051474489311814e+00    4.368064039983466e-05
+ 7.000000000000001e-01    1.087966430721224e+00    8.251704806849780e-05
+ 7.500000000000001e-01    1.129793211633907e+00    2.403035068856418e-04
+ 8.000000000000002e-01    1.172918720617323e+00    4.322501964297842e-04
+ 8.500000000000002e-01    1.212839862652567e+00    6.883283219258907e-04
+ 9.000000000000002e-01    1.245175128903723e+00    9.857170108882318e-04
+ 9.500000000000003e-01    1.266235911062742e+00    1.301833676780495e-03
+ 1.000000000000000e+00    1.273469281873646e+00    1.183015268845011e-03
+ -----------------------------------------------------------------------
+
+Final integrator statistics:
+Current time                 = 1
+Steps                        = 41
+Error test fails             = 0
+NLS step fails               = 0
+Initial step size            = 0.002110117764420172
+Last step size               = 0.02782878040979117
+Current step size            = 0.02782878040979117
+Last method order            = 3
+Current method order         = 3
+Stab. lim. order reductions  = 0
+RHS fn evals                 = 52
+NLS iters                    = 49
+NLS fails                    = 0
+NLS iters per step           = 1.195121951219512
+LS setups                    = 7
+Jac fn evals                 = 1
+LS RHS fn evals              = 0
+Prec setup evals             = 0
+Prec solves                  = 0
+LS iters                     = 875
+LS fails                     = 0
+Jac-times setups             = 0
+Jac-times evals              = 0
+LS iters per NLS iter        = 17.85714285714286
+Jac evals per NLS iter       = 0.02040816326530612
+Prec evals per NLS iter      = 0
+Root fn evals                = 0
+
+Max error = 1.183015268845011e-03
diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp b/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp
index 2671c77934..e979d60459 100644
--- a/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp
+++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp
@@ -38,8 +38,9 @@
  * The spatial derivatives are computed using second-order centered differences,
  * with the data distributed over nx * ny points on a uniform spatial grid. The
  * problem is advanced in time with BDF methods using an inexact Newton method
- * paired with the CG linear solver from Ginkgo. Several command line options are
- * available to change the problem parameters and CVODE settings. Use the flag
+ * paired with the CG linear solver from Ginkgo. Several command line options
+ * are available to change the problem parameters and CVODE settings. Use the
+ * flag
  * --help for more information.
  * ---------------------------------------------------------------------------*/
 
@@ -53,19 +54,23 @@
 
 #if defined(USE_CUDA)
 #include <nvector/nvector_cuda.h>
-#define HIP_OR_CUDA(a, b) b
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) b
 constexpr auto N_VNew = N_VNew_Cuda;
 #elif defined(USE_HIP)
 #include <nvector/nvector_hip.h>
-#define HIP_OR_CUDA(a, b) a
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) a
 constexpr auto N_VNew = N_VNew_Hip;
+#elif defined(USE_DPCPP)
+#include <nvector/nvector_sycl.h>
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) c
+constexpr auto N_VNew = N_VNew_Sycl;
 #elif defined(USE_OMP)
 #include <nvector/nvector_serial.h>
-#define HIP_OR_CUDA(a, b)
+#define HIP_OR_CUDA_OR_SYCL(a, b, c)
 constexpr auto N_VNew = N_VNew_Serial;
 #else
 #include <nvector/nvector_serial.h>
-#define HIP_OR_CUDA(a, b)
+#define HIP_OR_CUDA_OR_SYCL(a, b, c)
 constexpr auto N_VNew = N_VNew_Serial;
 #endif
 
@@ -73,7 +78,8 @@ using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
 using GkoSolverType = gko::solver::Cg<sunrealtype>;
 
 using SUNGkoMatrixType = sundials::ginkgo::Matrix<GkoMatrixType>;
-using SUNGkoSolverType = sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>;
+using SUNGkoSolverType =
+  sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>;
 
 // -----------------------------------------------------------------------------
 // Functions provided to the SUNDIALS integrator
@@ -83,7 +89,8 @@ using SUNGkoSolverType = sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrix
 int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data);
 
 // Jacobian of RHS function
-int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data,
+      N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
 // Main Program
@@ -104,12 +111,36 @@ int main(int argc, char* argv[])
   if (ReadInputs(args, udata)) return 1;
   PrintUserData(udata);
 
+  // ---------------------------------------
+  // Create Ginkgo matrix and linear solver
+  // ---------------------------------------
+
+#if defined(USE_CUDA)
+  auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false,
+                                          gko::allocation_mode::device)};
+#elif defined(USE_HIP)
+  auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false,
+                                         gko::allocation_mode::device)};
+#elif defined(USE_DPCPP)
+  auto gko_exec{gko::DpcppExecutor::create(0, gko::ReferenceExecutor::create())};
+#elif defined(USE_OMP)
+  auto gko_exec{gko::OmpExecutor::create()};
+#else
+  auto gko_exec{gko::ReferenceExecutor::create()};
+#endif
+
+  udata.exec = gko_exec;
+
   // ---------------
   // Create vectors
   // ---------------
 
   // Create solution vector
+#if defined(USE_DPCPP)
+  N_Vector u = N_VNew(udata.nodes, gko_exec->get_queue(), sunctx);
+#else
   N_Vector u = N_VNew(udata.nodes, sunctx);
+#endif
   if (check_ptr(u, "N_VNew")) return 1;
 
   // Set initial condition
@@ -120,34 +151,26 @@ int main(int argc, char* argv[])
   N_Vector e = N_VClone(u);
   if (check_ptr(e, "N_VClone")) return 1;
 
-    // ---------------------------------------
-    // Create Ginkgo matrix and linear solver
-    // ---------------------------------------
-
-#if defined(USE_CUDA)
-  auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)};
-#elif defined(USE_HIP)
-  auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)};
-#elif defined(USE_OMP)
-  auto gko_exec{gko::OmpExecutor::create()};
-#else
-  auto gko_exec{gko::ReferenceExecutor::create()};
-#endif
-
   auto gko_matrix_dim = gko::dim<2>(udata.nodes, udata.nodes);
   auto gko_matrix_nnz{(5 * (udata.nx - 2) + 2) * (udata.ny - 2) + 2 * udata.nx};
-  auto gko_matrix = gko::share(GkoMatrixType::create(gko_exec, gko_matrix_dim, gko_matrix_nnz));
+  auto gko_matrix =
+    gko::share(GkoMatrixType::create(gko_exec, gko_matrix_dim, gko_matrix_nnz));
 
   SUNGkoMatrixType A{gko_matrix, sunctx};
 
   // Use default stopping criteria
-  auto crit{sundials::ginkgo::DefaultStop::build().with_max_iters(static_cast<gko::uint64>(udata.liniters)).on(gko_exec)};
+  auto crit{sundials::ginkgo::DefaultStop::build()
+              .with_max_iters(static_cast<gko::uint64>(udata.liniters))
+              .on(gko_exec)};
 
   // Use Jacobi preconditioner
-  auto precon{gko::preconditioner::Jacobi<sunrealtype, sunindextype>::build().on(gko_exec)};
+  auto precon{
+    gko::preconditioner::Jacobi<sunrealtype, sunindextype>::build().on(gko_exec)};
 
-  auto gko_solver_factory = gko::share(
-      GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec));
+  auto gko_solver_factory = gko::share(GkoSolverType::build()
+                                         .with_criteria(std::move(crit))
+                                         .with_preconditioner(std::move(precon))
+                                         .on(gko_exec));
 
   SUNGkoSolverType LS{gko_solver_factory, sunctx};
 
@@ -206,7 +229,8 @@ int main(int argc, char* argv[])
   flag = WriteOutput(t, u, e, udata);
   if (check_flag(flag, "WriteOutput")) return 1;
 
-  for (int iout = 0; iout < udata.nout; iout++) {
+  for (int iout = 0; iout < udata.nout; iout++)
+  {
     // Evolve in time
     flag = CVode(cvode_mem, tout, u, &t, CV_NORMAL);
     if (check_flag(flag, "CVode")) break;
@@ -239,13 +263,15 @@ int main(int argc, char* argv[])
 
   sunrealtype maxerr = N_VMaxNorm(e);
 
-  std::cout << std::scientific << std::setprecision(std::numeric_limits<sunrealtype>::digits10)
+  std::cout << std::scientific
+            << std::setprecision(std::numeric_limits<sunrealtype>::digits10)
             << "\nMax error = " << maxerr << std::endl;
 
   // --------------------
   // Clean up and return
   // --------------------
 
+  udata.exec = nullptr;
   CVodeFree(&cvode_mem); // Free integrator memory
   N_VDestroy(u);         // Free vectors
   N_VDestroy(e);
@@ -259,15 +285,19 @@ int main(int argc, char* argv[])
 
 #if defined(USE_CUDA) || defined(USE_HIP)
 // GPU kernel to compute the ODE RHS function f(t,y).
-__global__ void f_kernel(const sunindextype nx, const sunindextype ny, const sunrealtype dx, const sunrealtype dy,
-                         const sunrealtype cx, const sunrealtype cy, const sunrealtype cc, const sunrealtype bx,
-                         const sunrealtype by, const sunrealtype sin_t_cos_t, const sunrealtype cos_sqr_t,
-                         sunrealtype* uarray, sunrealtype* farray)
+__global__ void f_kernel(const sunindextype nx, const sunindextype ny,
+                         const sunrealtype dx, const sunrealtype dy,
+                         const sunrealtype cx, const sunrealtype cy,
+                         const sunrealtype cc, const sunrealtype bx,
+                         const sunrealtype by, const sunrealtype sin_t_cos_t,
+                         const sunrealtype cos_sqr_t, sunrealtype* uarray,
+                         sunrealtype* farray)
 {
   const sunindextype i = blockIdx.x * blockDim.x + threadIdx.x;
   const sunindextype j = blockIdx.y * blockDim.y + threadIdx.y;
 
-  if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1) {
+  if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1)
+  {
     auto x = i * dx;
     auto y = j * dy;
 
@@ -284,7 +314,8 @@ __global__ void f_kernel(const sunindextype nx, const sunindextype ny, const sun
     auto idx_e = (i + 1) + j * nx;
     auto idx_w = (i - 1) + j * nx;
 
-    farray[idx_c] = cc * uarray[idx_c] + cx * (uarray[idx_w] + uarray[idx_e]) + cy * (uarray[idx_s] + uarray[idx_n]) -
+    farray[idx_c] = cc * uarray[idx_c] + cx * (uarray[idx_w] + uarray[idx_e]) +
+                    cy * (uarray[idx_s] + uarray[idx_n]) -
                     TWO * PI * sin_sqr_x * sin_sqr_y * sin_t_cos_t -
                     bx * (cos_sqr_x - sin_sqr_x) * sin_sqr_y * cos_sqr_t -
                     by * (cos_sqr_y - sin_sqr_y) * sin_sqr_x * cos_sqr_t;
@@ -328,14 +359,67 @@ int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data)
   if (check_ptr(farray, "N_VGetDeviceArrayPointer")) return -1;
 
   dim3 threads_per_block{16, 16};
-  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block.x - 1) / threads_per_block.x};
-  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block.y - 1) / threads_per_block.y};
+  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block.x - 1) /
+                 threads_per_block.x};
+  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block.y - 1) /
+                 threads_per_block.y};
   dim3 num_blocks{nbx, nby};
 
-  f_kernel<<<num_blocks, threads_per_block>>>(nx, ny, dx, dy, cx, cy, cc, bx, by, sin_t_cos_t, cos_sqr_t, uarray, farray);
+  f_kernel<<<num_blocks, threads_per_block>>>(nx, ny, dx, dy, cx, cy, cc, bx,
+                                              by, sin_t_cos_t, cos_sqr_t,
+                                              uarray, farray);
 
-  HIP_OR_CUDA(hipDeviceSynchronize();, cudaDeviceSynchronize(););
+  HIP_OR_CUDA_OR_SYCL(hipDeviceSynchronize(), cudaDeviceSynchronize(), );
 
+#elif defined(USE_DPCPP)
+  // Access device data arrays
+  sunrealtype* uarray = N_VGetDeviceArrayPointer(u);
+  if (check_ptr(uarray, "N_VGetDeviceArrayPointer")) return -1;
+
+  sunrealtype* farray = N_VGetDeviceArrayPointer(f);
+  if (check_ptr(farray, "N_VGetDeviceArrayPointer")) return -1;
+
+  std::dynamic_pointer_cast<const gko::DpcppExecutor>(udata->exec)
+    ->get_queue()
+    ->submit(
+      [&](sycl::handler& cgh)
+      {
+        cgh.parallel_for(sycl::range<2>(ny, nx),
+                         [=](sycl::id<2> id)
+                         {
+                           const sunindextype i = id[1];
+                           const sunindextype j = id[0];
+                           if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1)
+                           {
+                             auto x = i * dx;
+                             auto y = j * dy;
+
+                             auto sin_sqr_x = sin(PI * x) * sin(PI * x);
+                             auto sin_sqr_y = sin(PI * y) * sin(PI * y);
+
+                             auto cos_sqr_x = cos(PI * x) * cos(PI * x);
+                             auto cos_sqr_y = cos(PI * y) * cos(PI * y);
+
+                             // center, north, south, east, and west indices
+                             auto idx_c = i + j * nx;
+                             auto idx_n = i + (j + 1) * nx;
+                             auto idx_s = i + (j - 1) * nx;
+                             auto idx_e = (i + 1) + j * nx;
+                             auto idx_w = (i - 1) + j * nx;
+
+                             farray[idx_c] =
+                               cc * uarray[idx_c] +
+                               cx * (uarray[idx_w] + uarray[idx_e]) +
+                               cy * (uarray[idx_s] + uarray[idx_n]) -
+                               TWO * PI * sin_sqr_x * sin_sqr_y * sin_t_cos_t -
+                               bx * (cos_sqr_x - sin_sqr_x) * sin_sqr_y *
+                                 cos_sqr_t -
+                               by * (cos_sqr_y - sin_sqr_y) * sin_sqr_x *
+                                 cos_sqr_t;
+                           }
+                         });
+      });
+  udata->exec->synchronize();
 #else
 
   // Access host data arrays
@@ -346,8 +430,10 @@ int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data)
   if (check_ptr(farray, "N_VGetArrayPointer")) return -1;
 
   // Iterate over domain interior and fill the RHS vector
-  for (sunindextype j = 1; j < ny - 1; j++) {
-    for (sunindextype i = 1; i < nx - 1; i++) {
+  for (sunindextype j = 1; j < ny - 1; j++)
+  {
+    for (sunindextype i = 1; i < nx - 1; i++)
+    {
       auto x = i * dx;
       auto y = j * dy;
 
@@ -364,7 +450,8 @@ int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data)
       auto idx_e = (i + 1) + j * nx;
       auto idx_w = (i - 1) + j * nx;
 
-      farray[idx_c] = cc * uarray[idx_c] + cx * (uarray[idx_w] + uarray[idx_e]) + cy * (uarray[idx_s] + uarray[idx_n]) -
+      farray[idx_c] = cc * uarray[idx_c] + cx * (uarray[idx_w] + uarray[idx_e]) +
+                      cy * (uarray[idx_s] + uarray[idx_n]) -
                       TWO * PI * sin_sqr_x * sin_sqr_y * sin_t_cos_t -
                       bx * (cos_sqr_x - sin_sqr_x) * sin_sqr_y * cos_sqr_t -
                       by * (cos_sqr_y - sin_sqr_y) * sin_sqr_x * cos_sqr_t;
@@ -380,12 +467,14 @@ int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data)
 #if defined(USE_CUDA) || defined(USE_HIP)
 // GPU kernel to fill southern (j = 0) and northern (j = nx - 1) boundary
 // entries including the corners.
-__global__ void J_sn_kernel(const sunindextype nx, const sunindextype ny, sunindextype* row_ptrs,
-                            sunindextype* col_idxs, sunrealtype* mat_data)
+__global__ void J_sn_kernel(const sunindextype nx, const sunindextype ny,
+                            sunindextype* row_ptrs, sunindextype* col_idxs,
+                            sunrealtype* mat_data)
 {
   const sunindextype i = blockIdx.x * blockDim.x + threadIdx.x;
 
-  if (i >= 0 && i < nx) {
+  if (i >= 0 && i < nx)
+  {
     // Southern face
     mat_data[i] = ZERO;
     col_idxs[i] = i;
@@ -404,12 +493,14 @@ __global__ void J_sn_kernel(const sunindextype nx, const sunindextype ny, sunind
 
 // GPU kernel to fill western (i = 0) and eastern (i = nx - 1) boundary entries
 // excluding the corners (set by J_sn_kernel).
-__global__ void J_we_kernel(const sunindextype nx, const sunrealtype ny, sunindextype* row_ptrs, sunindextype* col_idxs,
+__global__ void J_we_kernel(const sunindextype nx, const sunrealtype ny,
+                            sunindextype* row_ptrs, sunindextype* col_idxs,
                             sunrealtype* mat_data)
 {
   const sunindextype j = blockIdx.x * blockDim.x + threadIdx.x;
 
-  if (j > 0 && j < ny - 1) {
+  if (j > 0 && j < ny - 1)
+  {
     // Western face
     auto col      = j * nx;
     auto idx      = (5 * (nx - 2) + 2) * (j - 1) + nx;
@@ -427,13 +518,16 @@ __global__ void J_we_kernel(const sunindextype nx, const sunrealtype ny, suninde
 }
 
 // GPU kernel to compute the ODE RHS Jacobian function df/dy(t,y).
-__global__ void J_kernel(const sunindextype nx, const sunindextype ny, const sunrealtype cx, const sunrealtype cy,
-                         const sunrealtype cc, sunindextype* row_ptrs, sunindextype* col_idxs, sunrealtype* mat_data)
+__global__ void J_kernel(const sunindextype nx, const sunindextype ny,
+                         const sunrealtype cx, const sunrealtype cy,
+                         const sunrealtype cc, sunindextype* row_ptrs,
+                         sunindextype* col_idxs, sunrealtype* mat_data)
 {
   const sunindextype i = blockIdx.x * blockDim.x + threadIdx.x;
   const sunindextype j = blockIdx.y * blockDim.y + threadIdx.y;
 
-  if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1) {
+  if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1)
+  {
     auto row   = i + j * nx;
     auto col_s = row - nx;
     auto col_w = row - 1;
@@ -467,7 +561,8 @@ __global__ void J_kernel(const sunindextype nx, const sunindextype ny, const sun
 // J routine to compute the ODE RHS Jacobian function df/dy(t,y). This
 // explicitly set boundary entries to zero so J(t,y) has the same sparsity
 // pattern as A = I - gamma * J(t,y).
-int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data,
+      N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
   auto udata    = static_cast<UserData*>(user_data);
@@ -492,35 +587,141 @@ int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Ve
 #if defined(USE_CUDA) || defined(USE_HIP)
 
   unsigned threads_per_block_bx = 16;
-  unsigned num_blocks_bx        = ((nx + threads_per_block_bx - 1) / threads_per_block_bx);
+  unsigned num_blocks_bx =
+    ((nx + threads_per_block_bx - 1) / threads_per_block_bx);
 
-  J_sn_kernel<<<num_blocks_bx, threads_per_block_bx>>>(nx, ny, row_ptrs, col_idxs, mat_data);
+  J_sn_kernel<<<num_blocks_bx, threads_per_block_bx>>>(nx, ny, row_ptrs,
+                                                       col_idxs, mat_data);
 
   unsigned threads_per_block_by = 16;
-  unsigned num_blocks_by        = ((ny + threads_per_block_by - 1) / threads_per_block_by);
+  unsigned num_blocks_by =
+    ((ny + threads_per_block_by - 1) / threads_per_block_by);
 
-  J_we_kernel<<<num_blocks_by, threads_per_block_by>>>(nx, ny, row_ptrs, col_idxs, mat_data);
+  J_we_kernel<<<num_blocks_by, threads_per_block_by>>>(nx, ny, row_ptrs,
+                                                       col_idxs, mat_data);
 
   dim3 threads_per_block_i{16, 16};
-  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block_i.x - 1) / threads_per_block_i.x};
-  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block_i.y - 1) / threads_per_block_i.y};
+  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block_i.x - 1) /
+                 threads_per_block_i.x};
+  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block_i.y - 1) /
+                 threads_per_block_i.y};
   dim3 num_blocks_i{nbx, nby};
 
-  J_kernel<<<num_blocks_i, threads_per_block_i>>>(nx, ny, cx, cy, cc, row_ptrs, col_idxs, mat_data);
-
-  HIP_OR_CUDA(hipDeviceSynchronize();, cudaDeviceSynchronize(););
-
+  J_kernel<<<num_blocks_i, threads_per_block_i>>>(nx, ny, cx, cy, cc, row_ptrs,
+                                                  col_idxs, mat_data);
+
+  HIP_OR_CUDA_OR_SYCL(hipDeviceSynchronize(), cudaDeviceSynchronize(), );
+#elif defined(USE_DPCPP)
+  auto queue =
+    std::dynamic_pointer_cast<const gko::DpcppExecutor>(udata->exec)->get_queue();
+  // J_sn_kernel
+  queue->submit(
+    [&](sycl::handler& cgh)
+    {
+      cgh.parallel_for(nx,
+                       [=](sycl::id<1> id)
+                       {
+                         const sunindextype i = id[0];
+
+                         // Southern face
+                         mat_data[i] = ZERO;
+                         col_idxs[i] = i;
+                         row_ptrs[i] = i;
+
+                         // Northern face
+                         auto col      = i + (ny - 1) * nx;
+                         auto idx      = (5 * (nx - 2) + 2) * (ny - 2) + nx + i;
+                         mat_data[idx] = ZERO;
+                         col_idxs[idx] = col;
+                         row_ptrs[col] = idx;
+
+                         if (i == nx - 1)
+                           row_ptrs[nx * ny] = (5 * (nx - 2) + 2) * (ny - 2) +
+                                               2 * nx;
+                       });
+    });
+  // J_we_kernel
+  queue->submit(
+    [&](sycl::handler& cgh)
+    {
+      cgh.parallel_for(ny,
+                       [=](sycl::id<1> id)
+                       {
+                         const sunindextype j = id[0];
+                         if (j > 0 && j < ny - 1)
+                         {
+                           // Western face
+                           auto col      = j * nx;
+                           auto idx      = (5 * (nx - 2) + 2) * (j - 1) + nx;
+                           mat_data[idx] = ZERO;
+                           col_idxs[idx] = col;
+                           row_ptrs[col] = idx;
+
+                           // Eastern face
+                           col = (nx - 1) + j * nx;
+                           idx = (5 * (nx - 2) + 2) * (j - 1) + nx + 1 +
+                                 5 * (nx - 2);
+                           mat_data[idx] = ZERO;
+                           col_idxs[idx] = col;
+                           row_ptrs[col] = idx;
+                         }
+                       });
+    });
+  // J_kernel
+  queue->submit(
+    [&](sycl::handler& cgh)
+    {
+      cgh.parallel_for(sycl::range<2>(ny, nx),
+                       [=](sycl::id<2> id)
+                       {
+                         const sunindextype i = id[1];
+                         const sunindextype j = id[0];
+
+                         if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1)
+                         {
+                           auto row   = i + j * nx;
+                           auto col_s = row - nx;
+                           auto col_w = row - 1;
+                           auto col_c = row;
+                           auto col_e = row + 1;
+                           auto col_n = row + nx;
+
+                           // Number of non-zero entries from preceding rows
+                           auto prior_nnz = (5 * (nx - 2) + 2) * (j - 1) + nx;
+
+                           // Starting index for this row
+                           auto idx = prior_nnz + 1 + 5 * (i - 1);
+
+                           mat_data[idx]     = cy;
+                           mat_data[idx + 1] = cx;
+                           mat_data[idx + 2] = cc;
+                           mat_data[idx + 3] = cx;
+                           mat_data[idx + 4] = cy;
+
+                           col_idxs[idx]     = col_s;
+                           col_idxs[idx + 1] = col_w;
+                           col_idxs[idx + 2] = col_c;
+                           col_idxs[idx + 3] = col_e;
+                           col_idxs[idx + 4] = col_n;
+
+                           row_ptrs[row] = idx;
+                         }
+                       });
+    });
+  udata->exec->synchronize();
 #else
 
   // Fill southern boundary entries (j = 0)
-  for (sunindextype i = 0; i < nx; i++) {
+  for (sunindextype i = 0; i < nx; i++)
+  {
     mat_data[i] = ZERO;
     col_idxs[i] = i;
     row_ptrs[i] = i;
   }
 
   // Fill western boundary entries (i = 0)
-  for (sunindextype j = 1; j < ny - 1; j++) {
+  for (sunindextype j = 1; j < ny - 1; j++)
+  {
     auto col      = j * nx;
     auto idx      = (5 * (nx - 2) + 2) * (j - 1) + nx;
     mat_data[idx] = ZERO;
@@ -529,7 +730,8 @@ int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Ve
   }
 
   // Fill eastern boundary entries (i = nx - 1)
-  for (sunindextype j = 1; j < ny - 1; j++) {
+  for (sunindextype j = 1; j < ny - 1; j++)
+  {
     auto col      = (nx - 1) + j * nx;
     auto idx      = (5 * (nx - 2) + 2) * (j - 1) + nx + 1 + 5 * (nx - 2);
     mat_data[idx] = ZERO;
@@ -538,7 +740,8 @@ int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Ve
   }
 
   // Fill northern boundary entries (j = ny - 1)
-  for (sunindextype i = 0; i < nx; i++) {
+  for (sunindextype i = 0; i < nx; i++)
+  {
     auto col      = i + (ny - 1) * nx;
     auto idx      = (5 * (nx - 2) + 2) * (ny - 2) + nx + i;
     mat_data[idx] = ZERO;
@@ -548,8 +751,10 @@ int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Ve
   row_ptrs[nx * ny] = (5 * (nx - 2) + 2) * (ny - 2) + 2 * nx;
 
   // Fill interior entries
-  for (sunindextype j = 1; j < ny - 1; j++) {
-    for (sunindextype i = 1; i < nx - 1; i++) {
+  for (sunindextype j = 1; j < ny - 1; j++)
+  {
+    for (sunindextype i = 1; i < nx - 1; i++)
+    {
       auto row   = i + j * nx;
       auto col_s = row - nx;
       auto col_w = row - 1;
diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp b/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
index bc459c68d1..a363985c7b 100644
--- a/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
+++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
@@ -15,24 +15,30 @@
  * See cv_heat2D_ginkgo.cpp for more information.
  * ---------------------------------------------------------------------------*/
 
+#include <cmath>
 #include <cstdio>
-#include <iostream>
-#include <iomanip>
 #include <fstream>
+#include <iomanip>
+#include <iostream>
 #include <limits>
-#include <cmath>
+#include <memory>
 #include <string>
 
 // SUNDIALS types
-#include <sundials/sundials_types.h>
 #include <sundials/sundials_nvector.h>
+#include <sundials/sundials_types.h>
 
 #if defined(USE_CUDA)
 #include <nvector/nvector_cuda.h>
 #elif defined(USE_HIP)
 #include <nvector/nvector_hip.h>
+#elif defined(USE_DPCPP)
+#include <nvector/nvector_sycl.h>
 #endif
 
+// Ginkgo Type
+#include <ginkgo/ginkgo.hpp>
+
 // Common utility functions
 #include <example_utilities.hpp>
 
@@ -72,19 +78,22 @@ struct UserData
   sunrealtype dy = yu / (ny - 1);
 
   // Integrator settings
-  sunrealtype rtol     = SUN_RCONST(1.0e-4); // relative tolerance
-  sunrealtype atol     = SUN_RCONST(1.0e-8); // absolute tolerance
-  int         maxsteps = 0;                  // max number of steps between outputs
+  sunrealtype rtol = SUN_RCONST(1.0e-4); // relative tolerance
+  sunrealtype atol = SUN_RCONST(1.0e-8); // absolute tolerance
+  int maxsteps     = 0;                  // max number of steps between outputs
 
   // Linear solver settings
-  int         liniters = 20;   // number of linear iterations
-  sunrealtype epslin   = ZERO; // linear solver tolerance factor
+  int liniters       = 20;   // number of linear iterations
+  sunrealtype epslin = ZERO; // linear solver tolerance factor
 
   // Ouput variables
-  bool          output = false; // write solution to disk
-  int           nout   = 20;    // number of output times
-  std::ofstream uout;           // output file stream
-  std::ofstream eout;           // error file stream
+  bool output = false; // write solution to disk
+  int nout    = 20;    // number of output times
+  std::ofstream uout;  // output file stream
+  std::ofstream eout;  // error file stream
+
+  // Ginkgo executor for synchronization on sycl
+  std::shared_ptr<const gko::Executor> exec;
 };
 
 // -----------------------------------------------------------------------------
@@ -93,11 +102,9 @@ struct UserData
 
 #if defined(USE_CUDA) || defined(USE_HIP)
 // GPU kernel to compute the ODE RHS function f(t,y).
-__global__
-void solution_kernel(const sunindextype nx, const sunindextype ny,
-                     const sunrealtype dx, const sunrealtype dy,
-                     const sunrealtype cos_sqr_t,
-                     sunrealtype* uarray)
+__global__ void solution_kernel(const sunindextype nx, const sunindextype ny,
+                                const sunrealtype dx, const sunrealtype dy,
+                                const sunrealtype cos_sqr_t, sunrealtype* uarray)
 {
   const sunindextype i = blockIdx.x * blockDim.x + threadIdx.x;
   const sunindextype j = blockIdx.y * blockDim.y + threadIdx.y;
@@ -110,14 +117,14 @@ void solution_kernel(const sunindextype nx, const sunindextype ny,
     auto sin_sqr_x = sin(PI * x) * sin(PI * x);
     auto sin_sqr_y = sin(PI * y) * sin(PI * y);
 
-    auto idx = i + j * nx;
+    auto idx    = i + j * nx;
     uarray[idx] = sin_sqr_x * sin_sqr_y * cos_sqr_t + ONE;
   }
 }
 #endif
 
 // Compute the exact solution
-int Solution(sunrealtype t, N_Vector u, UserData &udata)
+int Solution(sunrealtype t, N_Vector u, UserData& udata)
 {
   // Access problem data and set shortcuts
   const auto nx = udata.nx;
@@ -133,22 +140,49 @@ int Solution(sunrealtype t, N_Vector u, UserData &udata)
 
 #if defined(USE_CUDA) || defined(USE_HIP)
 
-  sunrealtype *uarray = N_VGetDeviceArrayPointer(u);
+  sunrealtype* uarray = N_VGetDeviceArrayPointer(u);
   if (check_ptr(uarray, "N_VGetDeviceArrayPointer")) return -1;
 
   dim3 threads_per_block{16, 16};
-  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block.x - 1)
-      / threads_per_block.x};
-  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block.y - 1)
-      / threads_per_block.y};
+  const auto nbx{(static_cast<unsigned int>(nx) + threads_per_block.x - 1) /
+                 threads_per_block.x};
+  const auto nby{(static_cast<unsigned int>(ny) + threads_per_block.y - 1) /
+                 threads_per_block.y};
   dim3 num_blocks{nbx, nby};
 
-  solution_kernel<<<num_blocks, threads_per_block>>>
-    (nx, ny, dx, dy, cos_sqr_t, uarray);
-
+  solution_kernel<<<num_blocks, threads_per_block>>>(nx, ny, dx, dy, cos_sqr_t,
+                                                     uarray);
+#elif defined(USE_DPCPP)
+  sunrealtype* uarray = N_VGetDeviceArrayPointer(u);
+  if (check_ptr(uarray, "N_VGetDeviceArrayPointer")) return -1;
+  std::dynamic_pointer_cast<const gko::DpcppExecutor>(udata.exec)
+    ->get_queue()
+    ->submit(
+      [&](sycl::handler& cgh)
+      {
+        cgh.parallel_for(sycl::range<2>(ny, nx),
+                         [=](sycl::id<2> id)
+                         {
+                           const sunindextype i = id[1];
+                           const sunindextype j = id[0];
+
+                           if (i > 0 && i < nx - 1 && j > 0 && j < ny - 1)
+                           {
+                             auto x = i * dx;
+                             auto y = j * dy;
+
+                             auto sin_sqr_x = sin(PI * x) * sin(PI * x);
+                             auto sin_sqr_y = sin(PI * y) * sin(PI * y);
+
+                             auto idx    = i + j * nx;
+                             uarray[idx] = sin_sqr_x * sin_sqr_y * cos_sqr_t +
+                                           ONE;
+                           }
+                         });
+      });
 #else
 
-  sunrealtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype* uarray = N_VGetArrayPointer(u);
   if (check_ptr(uarray, "N_VGetArrayPointer")) return -1;
 
   for (sunindextype j = 1; j < ny - 1; j++)
@@ -161,18 +195,18 @@ int Solution(sunrealtype t, N_Vector u, UserData &udata)
       auto sin_sqr_x = sin(PI * x) * sin(PI * x);
       auto sin_sqr_y = sin(PI * y) * sin(PI * y);
 
-      auto idx = i + j * nx;
+      auto idx    = i + j * nx;
       uarray[idx] = sin_sqr_x * sin_sqr_y * cos_sqr_t + ONE;
     }
   }
 
 #endif
-
+  udata.exec->synchronize();
   return 0;
 }
 
 // Compute the solution error
-int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
+int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData& udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -188,29 +222,28 @@ int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
 // Print command line options
 void InputHelp()
 {
-  std::cout
-    << std::endl
-    << "Command line options:\n"
-    << "  --nx <nx>          : number of x mesh points\n"
-    << "  --nx <nx>          : number of y mesh points\n"
-    << "  --xu <xu>          : x upper bound\n"
-    << "  --yu <yu>          : y upper bound\n"
-    << "  --kx <kx>          : x diffusion coefficient\n"
-    << "  --kx <ky>          : y diffusion coefficient\n"
-    << "  --tf <time>        : final time\n"
-    << "  --rtol <rtol>      : relative tolerance\n"
-    << "  --atol <atol>      : absoltue tolerance\n"
-    << "  --liniters <iters> : max number of iterations\n"
-    << "  --epslin <factor>  : linear tolerance factor\n"
-    << "  --msbp <steps>     : max steps between prec setups\n"
-    << "  --output           : write solution to disk\n"
-    << "  --nout <nout>      : number of outputs\n"
-    << "  --maxsteps <steps> : max steps between outputs\n"
-    << "  --help             : print this message and exit\n";
+  std::cout << std::endl
+            << "Command line options:\n"
+            << "  --nx <nx>          : number of x mesh points\n"
+            << "  --ny <ny>          : number of y mesh points\n"
+            << "  --xu <xu>          : x upper bound\n"
+            << "  --yu <yu>          : y upper bound\n"
+            << "  --kx <kx>          : x diffusion coefficient\n"
+            << "  --kx <ky>          : y diffusion coefficient\n"
+            << "  --tf <time>        : final time\n"
+            << "  --rtol <rtol>      : relative tolerance\n"
+            << "  --atol <atol>      : absoltue tolerance\n"
+            << "  --liniters <iters> : max number of iterations\n"
+            << "  --epslin <factor>  : linear tolerance factor\n"
+            << "  --msbp <steps>     : max steps between prec setups\n"
+            << "  --output           : write solution to disk\n"
+            << "  --nout <nout>      : number of outputs\n"
+            << "  --maxsteps <steps> : max steps between outputs\n"
+            << "  --help             : print this message and exit\n";
 }
 
 // Read command line inputs
-int ReadInputs(std::vector<std::string> &args, UserData &udata)
+int ReadInputs(std::vector<std::string>& args, UserData& udata)
 {
   if (find(args.begin(), args.end(), "--help") != args.end())
   {
@@ -242,46 +275,43 @@ int ReadInputs(std::vector<std::string> &args, UserData &udata)
   return 0;
 }
 
-
 // Print user data
-void PrintUserData(UserData &udata)
+void PrintUserData(UserData& udata)
 {
-  std::cout
-    << std::endl
-    << "2D Heat problem:\n"
-    << " ----------------------------\n"
-    << "  kx        = " << udata.kx << "\n"
-    << "  ky        = " << udata.ky << "\n"
-    << "  tf        = " << udata.tf << "\n"
-    << "  xu        = " << udata.xu << "\n"
-    << "  yu        = " << udata.yu << "\n"
-    << "  nx        = " << udata.nx << "\n"
-    << "  ny        = " << udata.ny << "\n"
-    << "  dx        = " << udata.dx << "\n"
-    << "  dy        = " << udata.dy << "\n"
-    << " ----------------------------\n"
-    << "  rtol      = " << udata.rtol << "\n"
-    << "  atol      = " << udata.atol << "\n"
-    << " ----------------------------\n"
-    << "  lin iters = " << udata.liniters << "\n"
-    << "  eps lin   = " << udata.epslin << "\n"
-    << " ----------------------------\n"
-    << "  output    = " << udata.output << "\n"
-    << " ----------------------------\n"
-    << std::endl;
+  std::cout << std::endl
+            << "2D Heat problem:\n"
+            << " ----------------------------\n"
+            << "  kx        = " << udata.kx << "\n"
+            << "  ky        = " << udata.ky << "\n"
+            << "  tf        = " << udata.tf << "\n"
+            << "  xu        = " << udata.xu << "\n"
+            << "  yu        = " << udata.yu << "\n"
+            << "  nx        = " << udata.nx << "\n"
+            << "  ny        = " << udata.ny << "\n"
+            << "  dx        = " << udata.dx << "\n"
+            << "  dy        = " << udata.dy << "\n"
+            << " ----------------------------\n"
+            << "  rtol      = " << udata.rtol << "\n"
+            << "  atol      = " << udata.atol << "\n"
+            << " ----------------------------\n"
+            << "  lin iters = " << udata.liniters << "\n"
+            << "  eps lin   = " << udata.epslin << "\n"
+            << " ----------------------------\n"
+            << "  output    = " << udata.output << "\n"
+            << " ----------------------------\n"
+            << std::endl;
 }
 
 // Initialize output
-int OpenOutput(UserData &udata)
+int OpenOutput(UserData& udata)
 {
   // Header for status output
-  std::cout
-    << std::scientific
-    << std::setprecision(std::numeric_limits<sunrealtype>::digits10)
-    << "          t                     ||u||_rms      "
-    << "          max error\n"
-    << " ----------------------------------------------"
-    << "-------------------------\n";
+  std::cout << std::scientific
+            << std::setprecision(std::numeric_limits<sunrealtype>::digits10)
+            << "          t                     ||u||_rms      "
+            << "          max error\n"
+            << " ----------------------------------------------"
+            << "-------------------------\n";
 
   // Output problem information and open output streams
   if (udata.output)
@@ -289,11 +319,11 @@ int OpenOutput(UserData &udata)
     // Each processor outputs subdomain information
     std::ofstream dout;
     dout.open("heat2d_info.txt");
-    dout <<  "xu  " << udata.xu       << std::endl;
-    dout <<  "yu  " << udata.yu       << std::endl;
-    dout <<  "nx  " << udata.nx       << std::endl;
-    dout <<  "ny  " << udata.ny       << std::endl;
-    dout <<  "nt  " << udata.nout + 1 << std::endl;
+    dout << "xu  " << udata.xu << std::endl;
+    dout << "yu  " << udata.yu << std::endl;
+    dout << "nx  " << udata.nx << std::endl;
+    dout << "ny  " << udata.ny << std::endl;
+    dout << "nt  " << udata.nout + 1 << std::endl;
     dout.close();
 
     // Open output streams for solution and error
@@ -310,7 +340,7 @@ int OpenOutput(UserData &udata)
 }
 
 // Write output
-int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
+int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData& udata)
 {
   // Compute the error
   int flag = SolutionError(t, u, e, udata);
@@ -323,7 +353,8 @@ int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
   sunrealtype urms = sqrt(N_VDotProd(u, u) / udata.nx / udata.ny);
 
   // Output current status
-  std::cout << std::setw(22) << t << std::setw(25) << urms << std::setw(25) << max << std::endl;
+  std::cout << std::setw(22) << t << std::setw(25) << urms << std::setw(25)
+            << max << std::endl;
 
   // Write solution and error to disk
   if (udata.output)
@@ -335,10 +366,13 @@ int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
 #elif defined(USE_HIP)
     N_VCopyFromDevice_Hip(u);
     N_VCopyFromDevice_Hip(e);
+#elif defined(USE_DPCPP)
+    N_VCopyFromDevice_Sycl(u);
+    N_VCopyFromDevice_Sycl(e);
 #endif
 
     // Access host data array
-    sunrealtype *uarray = N_VGetArrayPointer(u);
+    sunrealtype* uarray = N_VGetArrayPointer(u);
     if (check_ptr(uarray, "N_VGetArrayPointer")) return -1;
 
     udata.uout << t << " ";
@@ -349,7 +383,7 @@ int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
     udata.uout << std::endl;
 
     // Access host data array
-    sunrealtype *earray = N_VGetArrayPointer(e);
+    sunrealtype* earray = N_VGetArrayPointer(e);
     if (check_ptr(earray, "N_VGetArrayPointer")) return -1;
 
     udata.eout << t << " ";
@@ -364,7 +398,7 @@ int WriteOutput(sunrealtype t, N_Vector u, N_Vector e, UserData &udata)
 }
 
 // Finalize output
-int CloseOutput(UserData &udata)
+int CloseOutput(UserData& udata)
 {
   // Footer for status output
   std::cout << " ----------------------------------------------"
diff --git a/examples/sunlinsol/ginkgo/CMakeLists.txt b/examples/sunlinsol/ginkgo/CMakeLists.txt
index 3f616192e0..f64df0912b 100644
--- a/examples/sunlinsol/ginkgo/CMakeLists.txt
+++ b/examples/sunlinsol/ginkgo/CMakeLists.txt
@@ -32,7 +32,7 @@ include_directories(..)
 
 sundials_add_examples_ginkgo(examples
   TARGETS test_sunlinsol_obj
-  BACKENDS REF OMP CUDA HIP
+  BACKENDS REF OMP CUDA HIP DPCPP
   UNIT_TEST)
 
 # Install the targets
@@ -44,6 +44,9 @@ if(EXAMPLES_INSTALL)
   if(SUNDIALS_GINKGO_BACKENDS MATCHES "HIP")
     list(APPEND vectors nvechip)
   endif()
+  if(SUNDIALS_GINKGO_BACKENDS MATCHES "DPCPP")
+    list(APPEND vectors nvecsycl)
+  endif()
   if(SUNDIALS_GINKGO_BACKENDS MATCHES "OMP")
     list(APPEND vectors nvecopenmp)
   endif()
diff --git a/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp b/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp
index beb26f7c69..b5549c7e4e 100644
--- a/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp
+++ b/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <ginkgo/ginkgo.hpp>
 #include <map>
+#include <memory>
 #include <random>
 #include <sundials/sundials_context.hpp>
 #include <sundials/sundials_math.h>
@@ -31,26 +32,29 @@
 
 #if defined(USE_HIP)
 #include <nvector/nvector_hip.h>
-#define HIP_OR_CUDA(a, b) a
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) a
 constexpr auto N_VNew = N_VNew_Hip;
 #elif defined(USE_CUDA)
 #include <nvector/nvector_cuda.h>
-#define HIP_OR_CUDA(a, b) b
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) b
 constexpr auto N_VNew = N_VNew_Cuda;
+#elif defined(USE_DPCPP)
+#include <nvector/nvector_sycl.h>
+#define HIP_OR_CUDA_OR_SYCL(a, b, c) c
+constexpr auto N_VNew = N_VNew_Sycl;
 #elif defined(USE_OMP)
 #include <nvector/nvector_openmp.h>
-#define HIP_OR_CUDA(a, b)
-auto N_VNew = [](sunindextype length, SUNContext sunctx) {
+#define HIP_OR_CUDA_OR_SYCL(a, b, c)
+auto N_VNew = [](sunindextype length, SUNContext sunctx)
+{
   auto omp_num_threads_var{std::getenv("OMP_NUM_THREADS")};
   int num_threads{1};
-  if (omp_num_threads_var) {
-    num_threads = std::atoi(omp_num_threads_var);
-  }
+  if (omp_num_threads_var) { num_threads = std::atoi(omp_num_threads_var); }
   return N_VNew_OpenMP(length, num_threads, sunctx);
 };
 #else
 #include <nvector/nvector_serial.h>
-#define HIP_OR_CUDA(a, b)
+#define HIP_OR_CUDA_OR_SYCL(a, b, c)
 constexpr auto N_VNew = N_VNew_Serial;
 #endif
 
@@ -60,8 +64,10 @@ constexpr auto N_VNew = N_VNew_Serial;
 
 // "multigrid" does not support the combined stopping criteria we use
 // "cbgmres" does not support setting stopping criteria
-const std::unordered_map<std::string, int> methods{{"bicg", 0}, {"bicgstab", 1}, {"cg", 2}, {"cgs", 3},
-                                                   {"fcg", 4},  {"gmres", 5},    {"idr", 6}};
+const std::unordered_map<std::string, int> methods{{"bicg", 0}, {"bicgstab", 1},
+                                                   {"cg", 2},   {"cgs", 3},
+                                                   {"fcg", 4},  {"gmres", 5},
+                                                   {"idr", 6}};
 
 const std::unordered_map<std::string, int> matrix_types{{"csr", 0}, {"dense", 1}};
 
@@ -70,13 +76,15 @@ const std::unordered_map<std::string, int> matrix_types{{"csr", 0}, {"dense", 1}
  * -------------------------------------------------------------------------- */
 
 #if defined(USE_CUDA) || defined(USE_HIP)
-__global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols, sunindextype* row_ptrs,
-                            sunindextype* col_idxs, sunrealtype* mat_data)
+__global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols,
+                            sunindextype* row_ptrs, sunindextype* col_idxs,
+                            sunrealtype* mat_data)
 {
   const sunindextype row = blockIdx.x * blockDim.x + threadIdx.x;
   const sunindextype nnz = 3 * mat_rows - 2;
 
-  if (row == 0) {
+  if (row == 0)
+  {
     // first row
     mat_data[0] = 2;
     mat_data[1] = -1;
@@ -84,7 +92,8 @@ __global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols, sunind
     col_idxs[1] = 1;
     row_ptrs[0] = 0;
   }
-  else if (row == mat_rows - 1) {
+  else if (row == mat_rows - 1)
+  {
     // last row
     mat_data[nnz - 2]      = -1;
     mat_data[nnz - 1]      = 2;
@@ -93,7 +102,8 @@ __global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols, sunind
     row_ptrs[mat_rows - 1] = nnz - 2;
     row_ptrs[mat_rows]     = nnz;
   }
-  else if (row < mat_rows) {
+  else if (row < mat_rows)
+  {
     // other rows
     sunindextype idx  = 3 * row - 1;
     mat_data[idx]     = -1;
@@ -106,21 +116,25 @@ __global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols, sunind
   }
 }
 
-__global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols, sunrealtype* mat_data)
+__global__ void fill_kernel(sunindextype mat_rows, sunindextype mat_cols,
+                            sunrealtype* mat_data)
 {
   const sunindextype row = blockIdx.x * blockDim.x + threadIdx.x;
 
-  if (row == 0) {
+  if (row == 0)
+  {
     // first row
     mat_data[0] = 2;
     mat_data[1] = -1;
   }
-  else if (row == mat_rows - 1) {
+  else if (row == mat_rows - 1)
+  {
     // last row
     mat_data[mat_cols * mat_rows - 2] = -1;
     mat_data[mat_cols * mat_rows - 1] = 2;
   }
-  else if (row < mat_rows) {
+  else if (row < mat_rows)
+  {
     // other rows
     sunindextype idx  = mat_cols * row + row;
     mat_data[idx - 1] = -1;
@@ -140,10 +154,58 @@ void fill_matrix(gko::matrix::Csr<sunrealtype, sunindextype>* matrix)
 
 #if defined(USE_CUDA) || defined(USE_HIP)
   unsigned threads_per_block = 256;
-  unsigned num_blocks        = (mat_rows + threads_per_block - 1) / threads_per_block;
-
-  fill_kernel<<<num_blocks, threads_per_block>>>(mat_rows, mat_cols, row_ptrs, col_idxs, mat_data);
-  HIP_OR_CUDA(hipDeviceSynchronize();, cudaDeviceSynchronize(););
+  unsigned num_blocks = (mat_rows + threads_per_block - 1) / threads_per_block;
+
+  fill_kernel<<<num_blocks, threads_per_block>>>(mat_rows, mat_cols, row_ptrs,
+                                                 col_idxs, mat_data);
+  HIP_OR_CUDA_OR_SYCL(hipDeviceSynchronize(), cudaDeviceSynchronize(), );
+#elif defined(USE_DPCPP)
+  std::dynamic_pointer_cast<const gko::DpcppExecutor>(matrix->get_executor())
+    ->get_queue()
+    ->submit(
+      [&](sycl::handler& cgh)
+      {
+        cgh.parallel_for(mat_rows,
+                         [=](sycl::id<1> id)
+                         {
+                           const sunindextype row = id[0];
+                           // copied from fill_kernel for csr`
+                           const sunindextype nnz = 3 * mat_rows - 2;
+
+                           if (row == 0)
+                           {
+                             // first row
+                             mat_data[0] = 2;
+                             mat_data[1] = -1;
+                             col_idxs[0] = 0;
+                             col_idxs[1] = 1;
+                             row_ptrs[0] = 0;
+                           }
+                           else if (row == mat_rows - 1)
+                           {
+                             // last row
+                             mat_data[nnz - 2]      = -1;
+                             mat_data[nnz - 1]      = 2;
+                             col_idxs[nnz - 2]      = mat_rows - 2;
+                             col_idxs[nnz - 1]      = mat_rows - 1;
+                             row_ptrs[mat_rows - 1] = nnz - 2;
+                             row_ptrs[mat_rows]     = nnz;
+                           }
+                           else if (row < mat_rows)
+                           {
+                             // other rows
+                             sunindextype idx  = 3 * row - 1;
+                             mat_data[idx]     = -1;
+                             mat_data[idx + 1] = 2;
+                             mat_data[idx + 2] = -1;
+                             col_idxs[idx]     = row - 1;
+                             col_idxs[idx + 1] = row;
+                             col_idxs[idx + 2] = row + 1;
+                             row_ptrs[row]     = idx;
+                           }
+                         });
+      });
+  matrix->get_executor()->synchronize();
 #else
   // Matrix entries
   const sunrealtype vals[] = {-1, 2, -1};
@@ -151,10 +213,13 @@ void fill_matrix(gko::matrix::Csr<sunrealtype, sunindextype>* matrix)
   // Fill matrix
   int idx     = 0;
   row_ptrs[0] = idx;
-  for (auto row = 0; row < mat_rows; ++row) {
-    for (auto diag_offset : {-1, 0, 1}) {
+  for (auto row = 0; row < mat_rows; ++row)
+  {
+    for (auto diag_offset : {-1, 0, 1})
+    {
       auto col = row + diag_offset;
-      if (0 <= col && col < mat_cols) {
+      if (0 <= col && col < mat_cols)
+      {
         mat_data[idx] = vals[diag_offset + 1];
         col_idxs[idx] = col;
         ++idx;
@@ -171,21 +236,58 @@ void fill_matrix(gko::matrix::Dense<sunrealtype>* matrix)
   sunindextype mat_cols = matrix->get_size()[1];
   sunrealtype* mat_data = matrix->get_values();
 
-#if defined(USE_CUDA)
+#if defined(USE_CUDA) || defined(USE_HIP)
   unsigned threads_per_block = 256;
-  unsigned num_blocks        = (mat_rows + threads_per_block - 1) / threads_per_block;
+  unsigned num_blocks = (mat_rows + threads_per_block - 1) / threads_per_block;
 
   fill_kernel<<<num_blocks, threads_per_block>>>(mat_rows, mat_cols, mat_data);
-  HIP_OR_CUDA(hipDeviceSynchronize();, cudaDeviceSynchronize(););
+  HIP_OR_CUDA_OR_SYCL(hipDeviceSynchronize(), cudaDeviceSynchronize(), );
+#elif defined(USE_DPCPP)
+  std::dynamic_pointer_cast<const gko::DpcppExecutor>(matrix->get_executor())
+    ->get_queue()
+    ->submit(
+      [&](sycl::handler& cgh)
+      {
+        cgh.parallel_for(mat_rows,
+                         [=](sycl::id<1> id)
+                         {
+                           const sunindextype row = id[0];
+                           // copied from fill_kernel for dense
+                           if (row == 0)
+                           {
+                             // first row
+                             mat_data[0] = 2;
+                             mat_data[1] = -1;
+                           }
+                           else if (row == mat_rows - 1)
+                           {
+                             // last row
+                             mat_data[mat_cols * mat_rows - 2] = -1;
+                             mat_data[mat_cols * mat_rows - 1] = 2;
+                           }
+                           else if (row < mat_rows)
+                           {
+                             // other rows
+                             sunindextype idx  = mat_cols * row + row;
+                             mat_data[idx - 1] = -1;
+                             mat_data[idx]     = 2;
+                             mat_data[idx + 1] = -1;
+                           }
+                         });
+      });
+  matrix->get_executor()->synchronize();
 #else
   // Matrix entries
   const sunrealtype vals[] = {-1, 2, -1};
 
   // Fill matrix
-  for (auto row = 0; row < mat_rows; ++row) {
-    for (auto diag_offset : {-1, 0, 1}) {
+  for (auto row = 0; row < mat_rows; ++row)
+  {
+    for (auto diag_offset : {-1, 0, 1})
+    {
       auto col = row + diag_offset;
-      if (0 <= col && col < mat_cols) {
+      if (0 <= col && col < mat_cols)
+      {
         // Data stored in row-major format
         auto idx      = row * mat_cols + col;
         mat_data[idx] = vals[diag_offset + 1];
@@ -200,11 +302,14 @@ void fill_matrix(gko::matrix::Dense<sunrealtype>* matrix)
  * -------------------------------------------------------------------------- */
 
 template<class GkoSolverType, class GkoMatrixType>
-void Test_Move(std::unique_ptr<typename GkoSolverType::Factory>&& gko_solver_factory, sundials::Context& sunctx)
+void Test_Move(std::unique_ptr<typename GkoSolverType::Factory>&& gko_solver_factory,
+               sundials::Context& sunctx)
 {
   // Move constructor
-  sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType> solver{std::move(gko_solver_factory), sunctx};
-  sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType> solver2{std::move(solver)};
+  sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>
+    solver{std::move(gko_solver_factory), sunctx};
+  sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType> solver2{
+    std::move(solver)};
   assert(solver2.GkoFactory());
   assert(solver2.GkoExec());
   assert(SUNLinSolNumIters(solver2) == 0);
@@ -219,6 +324,12 @@ void Test_Move(std::unique_ptr<typename GkoSolverType::Factory>&& gko_solver_fac
   std::cout << "    PASSED test -- Test_Move\n";
 }
 
+/* -------------------------------------------------------------------------- *
+ * Global Executor for sync_device                                            *
+ * -------------------------------------------------------------------------- */
+// sycl only provides synchronize on queue
+std::shared_ptr<const gko::Executor> global_exec;
+
 /* -------------------------------------------------------------------------- *
  * SUNLinSol_Ginkgo Testing Routine                                           *
  * -------------------------------------------------------------------------- */
@@ -231,20 +342,28 @@ int main(int argc, char* argv[])
   sundials::Context sunctx;
 
 #if defined(USE_HIP)
-  auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)};
+  auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false,
+                                         gko::allocation_mode::device)};
 #elif defined(USE_CUDA)
-  auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)};
+  auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false,
+                                          gko::allocation_mode::device)};
+#elif defined(USE_DPCPP)
+  auto gko_exec{gko::DpcppExecutor::create(0, gko::ReferenceExecutor::create())};
 #elif defined(USE_OMP)
   auto gko_exec{gko::OmpExecutor::create()};
 #else
   auto gko_exec{gko::ReferenceExecutor::create()};
 #endif
 
+  // For sync_device
+  global_exec = gko_exec;
+
   /* ------------ *
    * Check inputs *
    * ------------ */
 
-  if (argc < 7) {
+  if (argc < 7)
+  {
     std::cerr << "ERROR: SIX (6) inputs required:\n"
               << "  1) method\n"
               << "  2) matrix type\n"
@@ -256,13 +375,13 @@ int main(int argc, char* argv[])
   }
 
   std::string method{argv[++argi]};
-  std::transform(method.begin(), method.end(), method.begin(), [](unsigned char c) { return std::tolower(c); });
+  std::transform(method.begin(), method.end(), method.begin(),
+                 [](unsigned char c) { return std::tolower(c); });
 
-  if (!methods.count(method)) {
+  if (!methods.count(method))
+  {
     std::cerr << "ERROR: method must be one of ";
-    for (const auto& m : methods) {
-      std::cout << m.first << ", ";
-    }
+    for (const auto& m : methods) { std::cout << m.first << ", "; }
     std::cout << std::endl;
     return 1;
   }
@@ -271,31 +390,33 @@ int main(int argc, char* argv[])
   std::transform(matrix_type.begin(), matrix_type.end(), matrix_type.begin(),
                  [](unsigned char c) { return std::tolower(c); });
 
-  if (!matrix_types.count(matrix_type)) {
+  if (!matrix_types.count(matrix_type))
+  {
     std::cerr << "ERROR: matrix type must be one of ";
-    for (const auto& m : matrix_types) {
-      std::cout << m.first << ", ";
-    }
+    for (const auto& m : matrix_types) { std::cout << m.first << ", "; }
     std::cout << std::endl;
     return 1;
   }
 
   const auto matcols{static_cast<sunindextype>(atoll(argv[++argi]))};
-  if (matcols <= 0) {
+  if (matcols <= 0)
+  {
     std::cerr << "ERROR: number of matrix columns must be a positive integer\n";
     return 1;
   }
   const auto matrows{matcols};
 
   const auto matcond{static_cast<sunrealtype>(atof(argv[++argi]))};
-  if (matcond < 0) {
+  if (matcond < 0)
+  {
     std::cerr << "ERROR: matrix condition number must be positive or 0 "
                  "(poisson test)\n";
     return 1;
   }
 
   const auto max_iters{static_cast<unsigned long>(atoll(argv[++argi]))};
-  if (max_iters <= 0) {
+  if (max_iters <= 0)
+  {
     std::cerr << "ERROR: max iterations must be a positive integer\n";
     return 1;
   }
@@ -314,7 +435,11 @@ int main(int argc, char* argv[])
    * Create solution and RHS vectors *
    * ------------------------------- */
 
+#if defined(USE_DPCPP)
+  N_Vector x{N_VNew(matcols, gko_exec->get_queue(), sunctx)};
+#else
   N_Vector x{N_VNew(matcols, sunctx)};
+#endif
   N_Vector b{N_VClone(x)};
 
   /* Fill x with random data */
@@ -322,10 +447,12 @@ int main(int argc, char* argv[])
   std::uniform_real_distribution<sunrealtype> distribution_real(8, 10);
 
   auto xdata{N_VGetArrayPointer(x)};
-  for (sunindextype i = 0; i < matcols; i++) {
+  for (sunindextype i = 0; i < matcols; i++)
+  {
     xdata[i] = distribution_real(engine);
   }
-  HIP_OR_CUDA(N_VCopyToDevice_Hip(x), N_VCopyToDevice_Cuda(x));
+  HIP_OR_CUDA_OR_SYCL(N_VCopyToDevice_Hip(x), N_VCopyToDevice_Cuda(x),
+                      N_VCopyToDevice_Sycl(x));
 
   /* -------------------- *
    * Create system matrix *
@@ -338,44 +465,55 @@ int main(int argc, char* argv[])
 
   auto matrix_dim{gko::dim<2>(matrows, matcols)};
 
-  if (matrix_type == "csr") {
+  if (matrix_type == "csr")
+  {
     using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
     auto matrix_nnz{3 * matrows - 2};
-    auto gko_matrix = gko::share(GkoMatrixType::create(gko_exec, matrix_dim, matrix_nnz));
-
-    if (matcond) {
-      auto gko_matdata{gko::matrix_data<sunrealtype, sunindextype>::cond(matrows,
-                                                                         gko::remove_complex<sunrealtype>{matcond},
-                                                                         distribution_real, engine)};
+    auto gko_matrix =
+      gko::share(GkoMatrixType::create(gko_exec, matrix_dim, matrix_nnz));
+
+    if (matcond)
+    {
+      auto gko_matdata{gko::matrix_data<
+        sunrealtype, sunindextype>::cond(matrows,
+                                         gko::remove_complex<sunrealtype>{matcond},
+                                         distribution_real, engine)};
       gko_matdata.remove_zeros();
       gko_matrix->read(gko_matdata);
     }
-    else {
-      fill_matrix(gko::lend(gko_matrix));
-    }
-    A = std::make_unique<sundials::ginkgo::Matrix<GkoMatrixType>>(std::move(gko_matrix), sunctx);
+    else { fill_matrix(gko::lend(gko_matrix)); }
+    A = std::make_unique<sundials::ginkgo::Matrix<GkoMatrixType>>(std::move(
+                                                                    gko_matrix),
+                                                                  sunctx);
   }
-  else if (matrix_type == "dense") {
+  else if (matrix_type == "dense")
+  {
     using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-    auto gko_matrix     = gko::share(GkoMatrixType::create(gko_exec, matrix_dim));
-    if (matcond) {
-      auto gko_matdata{gko::matrix_data<sunrealtype, sunindextype>::cond(matrows,
-                                                                         gko::remove_complex<sunrealtype>{matcond},
-                                                                         distribution_real, engine)};
+    auto gko_matrix = gko::share(GkoMatrixType::create(gko_exec, matrix_dim));
+    if (matcond)
+    {
+      auto gko_matdata{gko::matrix_data<
+        sunrealtype, sunindextype>::cond(matrows,
+                                         gko::remove_complex<sunrealtype>{matcond},
+                                         distribution_real, engine)};
       gko_matdata.remove_zeros();
       gko_matrix->read(gko_matdata);
     }
-    else {
+    else
+    {
       gko_matrix->fill(0.0);
       fill_matrix(gko::lend(gko_matrix));
     }
-    A = std::make_unique<sundials::ginkgo::Matrix<GkoMatrixType>>(std::move(gko_matrix), sunctx);
+    A = std::make_unique<sundials::ginkgo::Matrix<GkoMatrixType>>(std::move(
+                                                                    gko_matrix),
+                                                                  sunctx);
   }
 
   /* Create right-hand side vector for linear solve */
   fails += SUNMatMatvecSetup(A->Convert());
   fails += SUNMatMatvec(A->Convert(), x, b);
-  if (fails) {
+  if (fails)
+  {
     std::cerr << "FAIL: SUNLinSol SUNMatMatvec failure\n";
     N_VDestroy(x);
     N_VDestroy(b);
@@ -387,154 +525,211 @@ int main(int argc, char* argv[])
    * -------------------- */
 
   /* Use default stopping criteria */
-  auto crit{sundials::ginkgo::DefaultStop::build().with_max_iters(max_iters).on(gko_exec)};
+  auto crit{sundials::ginkgo::DefaultStop::build().with_max_iters(max_iters).on(
+    gko_exec)};
 
   /* Use a Jacobi preconditioner */
-  auto precon{gko::preconditioner::Jacobi<sunrealtype, sunindextype>::build().on(gko_exec)};
+  auto precon{
+    gko::preconditioner::Jacobi<sunrealtype, sunindextype>::build().on(gko_exec)};
 
   /* Wrap ginkgo matrix for SUNDIALS,
      Matrix is overloaded to a SUNLinearSolver. */
   std::unique_ptr<sundials::ConvertibleTo<SUNLinearSolver>> LS;
 
-  if (method == "bicg") {
+  if (method == "bicg")
+  {
     using GkoSolverType = gko::solver::Bicg<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "bicgstab") {
+  else if (method == "bicgstab")
+  {
     using GkoSolverType = gko::solver::Bicgstab<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "cg") {
+  else if (method == "cg")
+  {
     using GkoSolverType = gko::solver::Cg<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "cgs") {
+  else if (method == "cgs")
+  {
     using GkoSolverType = gko::solver::Cgs<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "fcg") {
+  else if (method == "fcg")
+  {
     using GkoSolverType = gko::solver::Fcg<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "gmres") {
+  else if (method == "gmres")
+  {
     using GkoSolverType = gko::solver::Gmres<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
-  else if (method == "idr") {
+  else if (method == "idr")
+  {
     using GkoSolverType = gko::solver::Idr<sunrealtype>;
-    auto gko_solver_factory{
-        GkoSolverType::build().with_criteria(std::move(crit)).with_preconditioner(std::move(precon)).on(gko_exec)};
-    if (matrix_type == "csr") {
+    auto gko_solver_factory{GkoSolverType::build()
+                              .with_criteria(std::move(crit))
+                              .with_preconditioner(std::move(precon))
+                              .on(gko_exec)};
+    if (matrix_type == "csr")
+    {
       using GkoMatrixType = gko::matrix::Csr<sunrealtype, sunindextype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
-    else if (matrix_type == "dense") {
+    else if (matrix_type == "dense")
+    {
       using GkoMatrixType = gko::matrix::Dense<sunrealtype>;
-      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(), sunctx);
-      LS = std::make_unique<sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory),
-                                                                                          sunctx);
+      Test_Move<GkoSolverType, GkoMatrixType>(gko_solver_factory->clone(),
+                                              sunctx);
+      LS = std::make_unique<sundials::ginkgo::LinearSolver<
+        GkoSolverType, GkoMatrixType>>(std::move(gko_solver_factory), sunctx);
     }
   }
 
   /* Run Tests */
   fails += Test_SUNLinSolGetID(LS->Convert(), SUNLINEARSOLVER_GINKGO, 0);
-  fails += Test_SUNLinSolGetType(LS->Convert(), SUNLINEARSOLVER_MATRIX_ITERATIVE, 0);
+  fails += Test_SUNLinSolGetType(LS->Convert(),
+                                 SUNLINEARSOLVER_MATRIX_ITERATIVE, 0);
   fails += Test_SUNLinSolInitialize(LS->Convert(), 0);
   fails += Test_SUNLinSolSetup(LS->Convert(), A->Convert(), 0);
-  fails += Test_SUNLinSolSolve(LS->Convert(), A->Convert(), x, b, 1e4 * SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS->Convert(), A->Convert(), x, b,
+                               1e4 * SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   /* Print result */
-  if (fails) {
+  if (fails)
+  {
     std::cerr << "FAIL: SUNLinSol module failed " << fails << " tests\n\n";
   }
-  else {
-    std::cout << "\nSUCCESS: SUNLinSol module passed all tests\n\n";
-  }
+  else { std::cout << "\nSUCCESS: SUNLinSol module passed all tests\n\n"; }
 
   /* Print solve information */
-  std::cout << "Number of linear solver iterations: " << static_cast<long int>(SUNLinSolNumIters(LS->Convert()))
+  std::cout << "Number of linear solver iterations: "
+            << static_cast<long int>(SUNLinSolNumIters(LS->Convert()))
             << std::endl;
-  std::cout << "Final residual norm: " << SUNLinSolResNorm(LS->Convert()) << std::endl;
+  std::cout << "Final residual norm: " << SUNLinSolResNorm(LS->Convert())
+            << std::endl;
+
+  // clear global_exec
+  global_exec = nullptr;
 
   /* Free solver, matrix and vectors */
   N_VDestroy(x);
@@ -552,8 +747,12 @@ int check_vector(N_Vector expected, N_Vector actual, sunrealtype check_tol)
   int failure{0};
 
   /* copy vectors to host */
-  HIP_OR_CUDA(N_VCopyFromDevice_Hip(actual), N_VCopyFromDevice_Cuda(actual));
-  HIP_OR_CUDA(N_VCopyFromDevice_Hip(expected), N_VCopyFromDevice_Cuda(expected));
+  HIP_OR_CUDA_OR_SYCL(N_VCopyFromDevice_Hip(actual),
+                      N_VCopyFromDevice_Cuda(actual),
+                      N_VCopyFromDevice_Sycl(actual));
+  HIP_OR_CUDA_OR_SYCL(N_VCopyFromDevice_Hip(expected),
+                      N_VCopyFromDevice_Cuda(expected),
+                      N_VCopyFromDevice_Sycl(expected));
 
   /* get vector data */
   auto xdata{N_VGetArrayPointer(actual)};
@@ -563,22 +762,27 @@ int check_vector(N_Vector expected, N_Vector actual, sunrealtype check_tol)
   auto xldata{N_VGetLength(actual)};
   auto yldata{N_VGetLength(expected)};
 
-  if (xldata != yldata) {
+  if (xldata != yldata)
+  {
     std::cerr << ">>> ERROR: check_vector: Different data array lengths\n";
     return 1;
   }
 
   /* check vector data */
-  for (sunindextype i = 0; i < xldata; i++) {
+  for (sunindextype i = 0; i < xldata; i++)
+  {
     failure += SUNRCompareTol(xdata[i], ydata[i], check_tol);
   }
 
-  if (failure > ZERO) {
+  if (failure > ZERO)
+  {
     std::cerr << "check_vector failures:\n";
-    for (sunindextype i = 0; i < xldata; i++) {
-      if (SUNRCompareTol(xdata[i], ydata[i], check_tol) != 0) {
-        std::cerr << "  x[" << i << "] = " << xdata[i] << " != " << ydata[i] << " (err = " << abs(xdata[i] - ydata[i])
-                  << ")\n";
+    for (sunindextype i = 0; i < xldata; i++)
+    {
+      if (SUNRCompareTol(xdata[i], ydata[i], check_tol) != 0)
+      {
+        std::cerr << "  x[" << i << "] = " << xdata[i] << " != " << ydata[i]
+                  << " (err = " << abs(xdata[i] - ydata[i]) << ")\n";
       }
     }
   }
@@ -588,5 +792,6 @@ int check_vector(N_Vector expected, N_Vector actual, sunrealtype check_tol)
 
 void sync_device()
 {
-  HIP_OR_CUDA(hipDeviceSynchronize(), cudaDeviceSynchronize());
+  HIP_OR_CUDA_OR_SYCL(hipDeviceSynchronize(), cudaDeviceSynchronize(),
+                      global_exec->synchronize());
 }
diff --git a/examples/sunmatrix/ginkgo/CMakeLists.txt b/examples/sunmatrix/ginkgo/CMakeLists.txt
index 29b861e408..09474ac97b 100644
--- a/examples/sunmatrix/ginkgo/CMakeLists.txt
+++ b/examples/sunmatrix/ginkgo/CMakeLists.txt
@@ -28,7 +28,7 @@ include_directories(..)
 
 sundials_add_examples_ginkgo(examples
   TARGETS test_sunmatrix_obj sundials_sunmatrixdense
-  BACKENDS REF OMP CUDA HIP
+  BACKENDS REF OMP CUDA HIP DPCPP
   UNIT_TEST)
 
 # Install the targets
@@ -40,6 +40,9 @@ if(EXAMPLES_INSTALL)
   if(SUNDIALS_GINKGO_BACKENDS MATCHES "HIP")
     list(APPEND vectors nvechip)
   endif()
+  if(SUNDIALS_GINKGO_BACKENDS MATCHES "DPCPP")
+    list(APPEND vectors nvecsycl)
+  endif()
   if(SUNDIALS_GINKGO_BACKENDS MATCHES "OMP")
     list(APPEND vectors nvecopenmp)
   endif()
diff --git a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
index 6cb291b273..f0e3bc2685 100644
--- a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
+++ b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
@@ -25,13 +25,15 @@
 #include "test_sunmatrix.h"
 
 #if defined(USE_HIP)
-#define REF_OR_OMP_OR_HIP_OR_CUDA(a, b, c, d) c
+#define REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(a, b, c, d, e) c
 #elif defined(USE_CUDA)
-#define REF_OR_OMP_OR_HIP_OR_CUDA(a, b, c, d) d
+#define REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(a, b, c, d, e) d
+#elif defined(USE_DPCPP)
+#define REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(a, b, c, d, e) e
 #elif defined(USE_OMP)
-#define REF_OR_OMP_OR_HIP_OR_CUDA(a, b, c, d) b
+#define REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(a, b, c, d, e) b
 #else
-#define REF_OR_OMP_OR_HIP_OR_CUDA(a, b, c, d) a
+#define REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(a, b, c, d, e) a
 #endif
 
 #if defined(USE_CUDA)
@@ -40,6 +42,8 @@
 #include <nvector/nvector_hip.h>
 #elif defined(USE_OMP)
 #include <nvector/nvector_openmp.h>
+#elif defined(USE_DPCPP)
+#include <nvector/nvector_sycl.h>
 #else
 #include <nvector/nvector_serial.h>
 #endif
@@ -92,73 +96,91 @@ int main(int argc, char* argv[])
   /* Create SUNDIALS context before calling any other SUNDIALS function*/
   sundials::Context sunctx;
 
-  auto gko_exec{REF_OR_OMP_OR_HIP_OR_CUDA(gko::ReferenceExecutor::create(), gko::OmpExecutor::create(),
-                                          gko::HipExecutor::create(0, gko::OmpExecutor::create(), true),
-                                          gko::CudaExecutor::create(0, gko::OmpExecutor::create(), true))};
+  auto gko_exec{
+    REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(gko::ReferenceExecutor::create(),
+                                      gko::OmpExecutor::create(),
+                                      gko::HipExecutor::create(0,
+                                                               gko::OmpExecutor::create(),
+                                                               true),
+                                      gko::CudaExecutor::create(0,
+                                                                gko::OmpExecutor::create(),
+                                                                true),
+                                      gko::DpcppExecutor::
+                                        create(0,
+                                               gko::ReferenceExecutor::create()))};
 
   /* check input and set vector length */
-  if (argc < 4) {
-    std::cerr << "ERROR: THREE (3) Input required: matrix rows, matrix cols, format (0 = csr, 1 = dense)\n";
+  if (argc < 4)
+  {
+    std::cerr << "ERROR: THREE (3) Input required: matrix rows, matrix cols, "
+                 "format (0 = csr, 1 = dense)\n";
     return 1;
   }
 
   int argi{0};
 
   auto matrows{static_cast<sunindextype>(atol(argv[++argi]))};
-  if (matrows <= 0) {
+  if (matrows <= 0)
+  {
     std::cerr << "ERROR: number of rows must be a positive integer \n";
     return 1;
   }
 
   auto matcols{static_cast<sunindextype>(atol(argv[++argi]))};
-  if (matcols <= 0) {
+  if (matcols <= 0)
+  {
     std::cerr << "ERROR: number of cols must be a positive integer \n";
     return 1;
   }
 
   auto format{static_cast<int>(atoi(argv[++argi]))};
-  if (format != 0 && format != 1) {
+  if (format != 0 && format != 1)
+  {
     std::cerr << "ERROR: format must be 0 (csr) or 1 (dense) \n";
     return 1;
   }
 
-  if (format == 0) {
-    using_csr_matrix_type = true;
-  }
-  else if (format == 1) {
-    using_dense_matrix_type = true;
-  }
+  if (format == 0) { using_csr_matrix_type = true; }
+  else if (format == 1) { using_dense_matrix_type = true; }
 
 #if defined(USE_OMP)
   int num_threads{1};
   auto omp_num_threads_var{std::getenv("OMP_NUM_THREADS")};
-  if (omp_num_threads_var) {
-    num_threads = std::atoi(omp_num_threads_var);
-  }
+  if (omp_num_threads_var) { num_threads = std::atoi(omp_num_threads_var); }
 #endif
 
   SetTiming(0);
 
   int square{matrows == matcols ? 1 : 0};
-  std::cout << "\n SUNMATRIX_GINKGO test: size " << matrows << " x " << matcols << ", format ";
-  if (using_csr_matrix_type) {
-    std::cout << "csr\n";
-  }
-  else if (using_dense_matrix_type) {
-    std::cout << "dense\n";
-  }
+  std::cout << "\n SUNMATRIX_GINKGO test: size " << matrows << " x " << matcols
+            << ", format ";
+  if (using_csr_matrix_type) { std::cout << "csr\n"; }
+  else if (using_dense_matrix_type) { std::cout << "dense\n"; }
 
   /* Create vectors and matrices */
   std::default_random_engine generator;
-  std::uniform_real_distribution<sunrealtype> distribution{0.0, static_cast<sunrealtype>(matrows)};
-
-  N_Vector x{REF_OR_OMP_OR_HIP_OR_CUDA(N_VNew_Serial(matcols, sunctx), N_VNew_OpenMP(matcols, num_threads, sunctx),
-                                       N_VNew_Hip(matcols, sunctx), N_VNew_Cuda(matcols, sunctx))};
-  N_Vector y{REF_OR_OMP_OR_HIP_OR_CUDA(N_VNew_Serial(matrows, sunctx), N_VNew_OpenMP(matrows, num_threads, sunctx),
-                                       N_VNew_Hip(matrows, sunctx), N_VNew_Cuda(matrows, sunctx))};
+  std::uniform_real_distribution<sunrealtype>
+    distribution{0.0, static_cast<sunrealtype>(matrows)};
+
+  N_Vector x{
+    REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(N_VNew_Serial(matcols, sunctx),
+                                      N_VNew_OpenMP(matcols, num_threads, sunctx),
+                                      N_VNew_Hip(matcols, sunctx),
+                                      N_VNew_Cuda(matcols, sunctx),
+                                      N_VNew_Sycl(matcols, gko_exec->get_queue(),
+                                                  sunctx))};
+  N_Vector y{
+    REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(N_VNew_Serial(matrows, sunctx),
+                                      N_VNew_OpenMP(matrows, num_threads, sunctx),
+                                      N_VNew_Hip(matrows, sunctx),
+                                      N_VNew_Cuda(matrows, sunctx),
+                                      N_VNew_Sycl(matrows, gko_exec->get_queue(),
+                                                  sunctx))};
 
   auto matrix_dim{gko::dim<2>(matrows, matcols)};
-  auto gko_matdata{gko::matrix_data<sunrealtype, sunindextype>(matrix_dim, distribution, generator)};
+  auto gko_matdata{gko::matrix_data<sunrealtype, sunindextype>(matrix_dim,
+                                                               distribution,
+                                                               generator)};
 
   /* Wrap ginkgo matrices for SUNDIALS.
      sundials::ginkgo::Matrix is overloaded to a SUNMatrix. */
@@ -167,84 +189,105 @@ int main(int argc, char* argv[])
   std::unique_ptr<sundials::ConvertibleTo<SUNMatrix>> I;
 
   auto xdata{N_VGetArrayPointer(x)};
-  for (sunindextype i = 0; i < matcols; i++) {
+  for (sunindextype i = 0; i < matcols; i++)
+  {
     xdata[i] = distribution(generator);
   }
-  REF_OR_OMP_OR_HIP_OR_CUDA(, , N_VCopyToDevice_Hip(x), N_VCopyToDevice_Cuda(x));
+  REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(, , N_VCopyToDevice_Hip(x),
+                                    N_VCopyToDevice_Cuda(x),
+                                    N_VCopyToDevice_Sycl(x));
 
   /* Compute true solution */
   SUNMatrix Aref{SUNDenseMatrix(matrows, matcols, sunctx)};
-  if (using_csr_matrix_type) {
+  if (using_csr_matrix_type)
+  {
     auto gko_matrix{GkoCsrMat::create(gko_exec, matrix_dim)};
     gko_matrix->read(gko_matdata);
     auto gko_ident{GkoCsrMat::create(gko_exec, matrix_dim)};
-    if (square) {
-      gko_ident->read(gko::matrix_data<sunrealtype, sunindextype>::diag(matrix_dim, 1.0));
+    if (square)
+    {
+      gko_ident->read(
+        gko::matrix_data<sunrealtype, sunindextype>::diag(matrix_dim, 1.0));
     }
 
     auto Arowptrs{gko_matrix->get_const_row_ptrs()};
     auto Acolidxs{gko_matrix->get_const_col_idxs()};
     auto Avalues{gko_matrix->get_const_values()};
-    for (auto irow = 0; irow < gko_matrix->get_size()[0]; irow++) {
-      for (auto inz = Arowptrs[irow]; inz < Arowptrs[irow + 1]; inz++) {
-        SM_ELEMENT_D(Aref, irow, Acolidxs[inz]) = Avalues[inz];
+    for (auto irow = 0; irow < gko_matrix->get_size()[0]; irow++)
+    {
+      for (auto inz = gko_exec->copy_val_to_host(Arowptrs + irow);
+           inz < gko_exec->copy_val_to_host(Arowptrs + irow + 1); inz++)
+      {
+        SM_ELEMENT_D(Aref, irow, gko_exec->copy_val_to_host(Acolidxs + inz)) =
+          gko_exec->copy_val_to_host(Avalues + inz);
       }
     }
 
     fails += Test_CopyAndMove(gko_matrix->clone(), sunctx);
 
-    A = std::make_unique<sundials::ginkgo::Matrix<GkoCsrMat>>(std::move(gko_matrix), sunctx);
-    I = std::make_unique<sundials::ginkgo::Matrix<GkoCsrMat>>(std::move(gko_ident), sunctx);
+    A = std::make_unique<sundials::ginkgo::Matrix<GkoCsrMat>>(std::move(gko_matrix),
+                                                              sunctx);
+    I = std::make_unique<sundials::ginkgo::Matrix<GkoCsrMat>>(std::move(gko_ident),
+                                                              sunctx);
   }
-  else if (using_dense_matrix_type) {
+  else if (using_dense_matrix_type)
+  {
     auto gko_matrix{GkoDenseMat::create(gko_exec, matrix_dim)};
     gko_matrix->read(gko_matdata);
     auto gko_ident{GkoDenseMat::create(gko_exec, matrix_dim)};
-    if (square) {
-      gko_ident->read(gko::matrix_data<sunrealtype, sunindextype>::diag(matrix_dim, 1.0));
+    if (square)
+    {
+      gko_ident->read(
+        gko::matrix_data<sunrealtype, sunindextype>::diag(matrix_dim, 1.0));
     }
 
-    for (sunindextype j = 0; j < matcols; j++) {
-      for (sunindextype i = 0; i < matrows; i++) {
-        SM_ELEMENT_D(Aref, i, j) = gko_matrix->at(i, j);
+    auto Avalues{gko_matrix->get_const_values()};
+    for (sunindextype j = 0; j < matcols; j++)
+    {
+      for (sunindextype i = 0; i < matrows; i++)
+      {
+        SM_ELEMENT_D(Aref, i, j) =
+          gko_exec->copy_val_to_host(Avalues + i * gko_matrix->get_stride() + j);
       }
     }
 
     fails += Test_CopyAndMove(gko_matrix->clone(), sunctx);
 
-    A = std::make_unique<sundials::ginkgo::Matrix<GkoDenseMat>>(std::move(gko_matrix), sunctx);
-    I = std::make_unique<sundials::ginkgo::Matrix<GkoDenseMat>>(std::move(gko_ident), sunctx);
+    A = std::make_unique<sundials::ginkgo::Matrix<GkoDenseMat>>(std::move(
+                                                                  gko_matrix),
+                                                                sunctx);
+    I = std::make_unique<sundials::ginkgo::Matrix<GkoDenseMat>>(std::move(
+                                                                  gko_ident),
+                                                                sunctx);
   }
   SUNMatMatvec_Dense(Aref, x, y);
   SUNMatDestroy(Aref);
-
-  REF_OR_OMP_OR_HIP_OR_CUDA(, , N_VCopyToDevice_Hip(y), N_VCopyToDevice_Cuda(y));
-
+  REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(, , N_VCopyToDevice_Hip(y),
+                                    N_VCopyToDevice_Cuda(y),
+                                    N_VCopyToDevice_Sycl(y));
   /* SUNMatrix Tests */
   fails += Test_SUNMatGetID(*A, SUNMATRIX_GINKGO, 0);
   fails += Test_SUNMatClone(*A, 0);
   fails += Test_SUNMatCopy(*A, 0);
   fails += Test_SUNMatZero(*A, 0);
-  if (square) {
+  if (square)
+  {
 #if !defined(USE_OMP)
     // TODO(CJB): ScaleAdd with a dense matrix is not supported in develop
     // branch, possibly supported on the batch-develop branch. CSR matrix with
     // OMP executor currently fails on the develop branch.
-    if (!using_dense_matrix_type) {
-      fails += Test_SUNMatScaleAdd(*A, *I, 0);
-    }
+    if (!using_dense_matrix_type) { fails += Test_SUNMatScaleAdd(*A, *I, 0); }
 #endif
     fails += Test_SUNMatScaleAddI(*A, *I, 0);
   }
   fails += Test_SUNMatMatvec(*A, x, y, 0);
 
   /* Print result */
-  if (fails) {
+  if (fails)
+  {
     std::cerr << " FAIL: SUNMatrix module failed " << fails << " tests \n\n";
   }
-  else {
-    std::cout << " SUCCESS: SUNMatrix module passed all tests \n\n";
-  }
+  else { std::cout << " SUCCESS: SUNMatrix module passed all tests \n\n"; }
 
   /* Free vectors */
   N_VDestroy(x);
@@ -259,24 +302,31 @@ int main(int argc, char* argv[])
 int check_matrix_csr(SUNMatrix A, SUNMatrix B, realtype tol)
 {
   int failure{0};
-  auto Amat{static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
-  auto Bmat{static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(B->content)->GkoMtx()};
-  auto Arowptrs{Amat->get_const_row_ptrs()};
-  auto Acolidxs{Amat->get_const_col_idxs()};
-  auto Avalues{Amat->get_const_values()};
-  auto Browptrs{Bmat->get_const_row_ptrs()};
-  auto Bcolidxs{Bmat->get_const_col_idxs()};
-  auto Bvalues{Bmat->get_const_values()};
+  auto Amat{
+    static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
+  auto Bmat{
+    static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(B->content)->GkoMtx()};
+  auto Amat_ref = Amat->clone(Amat->get_executor()->get_master());
+  auto Bmat_ref = Bmat->clone(Bmat->get_executor()->get_master());
+  auto Arowptrs{Amat_ref->get_const_row_ptrs()};
+  auto Acolidxs{Amat_ref->get_const_col_idxs()};
+  auto Avalues{Amat_ref->get_const_values()};
+  auto Browptrs{Bmat_ref->get_const_row_ptrs()};
+  auto Bcolidxs{Bmat_ref->get_const_col_idxs()};
+  auto Bvalues{Bmat_ref->get_const_values()};
 
   /* check lengths */
-  if (Amat->get_size() != Bmat->get_size()) {
+  if (Amat_ref->get_size() != Bmat_ref->get_size())
+  {
     std::cerr << ">>> ERROR: check_matrix: Different data array lengths \n";
     return 1;
   }
 
   /* compare data */
-  for (sunindextype irow = 0; irow < Amat->get_size()[0]; irow++) {
-    for (sunindextype inz = Arowptrs[irow]; inz < Arowptrs[irow + 1]; inz++) {
+  for (sunindextype irow = 0; irow < Amat_ref->get_size()[0]; irow++)
+  {
+    for (sunindextype inz = Arowptrs[irow]; inz < Arowptrs[irow + 1]; inz++)
+    {
       failure += SUNRCompareTol(Avalues[inz], Bvalues[inz], tol);
     }
   }
@@ -287,21 +337,28 @@ int check_matrix_csr(SUNMatrix A, SUNMatrix B, realtype tol)
 int check_matrix_dense(SUNMatrix A, SUNMatrix B, realtype tol)
 {
   int failure{0};
-  auto Amat{static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
-  auto Bmat{static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(B->content)->GkoMtx()};
+  auto Amat{
+    static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
+  auto Bmat{
+    static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(B->content)->GkoMtx()};
+  auto Amat_ref = Amat->clone(Amat->get_executor()->get_master());
+  auto Bmat_ref = Bmat->clone(Bmat->get_executor()->get_master());
   auto rows{Amat->get_size()[0]};
   auto cols{Amat->get_size()[1]};
 
   /* check lengths */
-  if (Amat->get_size() != Bmat->get_size()) {
+  if (Amat->get_size() != Bmat->get_size())
+  {
     std::cerr << ">>> ERROR: check_matrix: Different data array lengths \n";
     return 1;
   }
 
   /* compare data */
-  for (sunindextype i = 0; i < rows; i++) {
-    for (sunindextype j = 0; j < cols; j++) {
-      failure += SUNRCompareTol(Amat->at(i, j), Bmat->at(i, j), tol);
+  for (sunindextype i = 0; i < rows; i++)
+  {
+    for (sunindextype j = 0; j < cols; j++)
+    {
+      failure += SUNRCompareTol(Amat_ref->at(i, j), Bmat_ref->at(i, j), tol);
     }
   }
 
@@ -318,17 +375,23 @@ extern "C" int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
 int check_matrix_entry_csr(SUNMatrix A, realtype val, realtype tol)
 {
   int failure{0};
-  auto Amat{static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
-  auto Arowptrs{Amat->get_const_row_ptrs()};
-  auto Acolidxs{Amat->get_const_col_idxs()};
-  auto Avalues{Amat->get_const_values()};
+  auto Amat{
+    static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
+  auto Amat_ref = Amat->clone(Amat->get_executor()->get_master());
+  auto Arowptrs{Amat_ref->get_const_row_ptrs()};
+  auto Acolidxs{Amat_ref->get_const_col_idxs()};
+  auto Avalues{Amat_ref->get_const_values()};
 
   /* compare data */
-  for (sunindextype irow = 0; irow < Amat->get_size()[0]; irow++) {
-    for (sunindextype inz = Arowptrs[irow]; inz < Arowptrs[irow + 1]; inz++) {
+  for (sunindextype irow = 0; irow < Amat_ref->get_size()[0]; irow++)
+  {
+    for (sunindextype inz = Arowptrs[irow]; inz < Arowptrs[irow + 1]; inz++)
+    {
       int check = SUNRCompareTol(Avalues[inz], val, tol);
-      if (check) {
-        std::cerr << "  actual = " << Avalues[inz] << " != " << val << " (err = " << SUNRabs(Avalues[inz] - val) << ")\n";
+      if (check)
+      {
+        std::cerr << "  actual = " << Avalues[inz] << " != " << val
+                  << " (err = " << SUNRabs(Avalues[inz] - val) << ")\n";
         failure += check;
       }
     }
@@ -340,17 +403,23 @@ int check_matrix_entry_csr(SUNMatrix A, realtype val, realtype tol)
 int check_matrix_entry_dense(SUNMatrix A, realtype val, realtype tol)
 {
   int failure{0};
-  auto Amat{static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
+  auto Amat{
+    static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
   auto rows{Amat->get_size()[0]};
   auto cols{Amat->get_size()[1]};
 
+  auto Amat_ref = Amat->clone(Amat->get_executor()->get_master());
   /* compare data */
-  for (sunindextype i = 0; i < rows; i++) {
-    for (sunindextype j = 0; j < cols; j++) {
-      int check = SUNRCompareTol(Amat->at(i, j), val, tol);
-      if (check) {
-        std::cerr << "  actual[" << i << "," << j << "] = " << Amat->at(i, j) << " != " << val
-                  << " (err = " << SUNRabs(Amat->at(i, j) - val) << ")\n";
+  for (sunindextype i = 0; i < rows; i++)
+  {
+    for (sunindextype j = 0; j < cols; j++)
+    {
+      int check = SUNRCompareTol(Amat_ref->at(i, j), val, tol);
+      if (check)
+      {
+        std::cerr << "  actual[" << i << "," << j
+                  << "] = " << Amat_ref->at(i, j) << " != " << val
+                  << " (err = " << SUNRabs(Amat_ref->at(i, j) - val) << ")\n";
         failure += check;
       }
     }
@@ -361,15 +430,12 @@ int check_matrix_entry_dense(SUNMatrix A, realtype val, realtype tol)
 
 extern "C" int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
 {
-  if (using_csr_matrix_type) {
-    return check_matrix_entry_csr(A, val, tol);
-  }
-  else if (using_dense_matrix_type) {
+  if (using_csr_matrix_type) { return check_matrix_entry_csr(A, val, tol); }
+  else if (using_dense_matrix_type)
+  {
     return check_matrix_entry_dense(A, val, tol);
   }
-  else {
-    return 1;
-  }
+  else { return 1; }
 }
 
 extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
@@ -377,8 +443,12 @@ extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
   int failure{0};
 
   /* copy vectors to host */
-  REF_OR_OMP_OR_HIP_OR_CUDA(, , N_VCopyFromDevice_Hip(computed), N_VCopyFromDevice_Cuda(computed));
-  REF_OR_OMP_OR_HIP_OR_CUDA(, , N_VCopyFromDevice_Hip(expected), N_VCopyFromDevice_Cuda(expected));
+  REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(, , N_VCopyFromDevice_Hip(computed),
+                                    N_VCopyFromDevice_Cuda(computed),
+                                    N_VCopyFromDevice_Sycl(computed));
+  REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(, , N_VCopyFromDevice_Hip(expected),
+                                    N_VCopyFromDevice_Cuda(expected),
+                                    N_VCopyFromDevice_Sycl(expected));
 
   /* get vector data */
   auto xdata{N_VGetArrayPointer(computed)};
@@ -388,19 +458,23 @@ extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
   auto xldata{N_VGetLength(computed)};
   auto yldata{N_VGetLength(expected)};
 
-  if (xldata != yldata) {
+  if (xldata != yldata)
+  {
     std::cerr << "ERROR check_vector: different vector lengths\n";
     return 1;
   }
 
   /* check vector data */
-  for (sunindextype i = 0; i < xldata; i++) failure += SUNRCompareTol(xdata[i], ydata[i], tol);
+  for (sunindextype i = 0; i < xldata; i++)
+    failure += SUNRCompareTol(xdata[i], ydata[i], tol);
 
-  if (failure > ZERO) {
+  if (failure > ZERO)
+  {
     std::cerr << "Check_vector failures:\n";
     for (sunindextype i = 0; i < xldata; i++)
       if (SUNRCompareTol(xdata[i], ydata[i], tol) != 0)
-        std::cerr << "  computed[" << i << "] = " << xdata[i] << " != " << ydata[i]
+        std::cerr << "  computed[" << i << "] = " << xdata[i]
+                  << " != " << ydata[i]
                   << " (err = " << SUNRabs(xdata[i] - ydata[i]) << ")\n";
   }
 
@@ -409,35 +483,52 @@ extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
 
 extern "C" booleantype has_data(SUNMatrix A)
 {
-  if (using_csr_matrix_type) {
-    auto Amat{static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
-    return !(Amat->get_values() == nullptr || Amat->get_size()[0] == 0 || Amat->get_size()[1] == 0);
-  }
-  else if (using_dense_matrix_type) {
-    auto Amat{static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
-    return !(Amat->get_values() == nullptr || Amat->get_size()[0] == 0 || Amat->get_size()[1] == 0);
-  }
-  else {
-    return SUNFALSE;
-  }
+  if (using_csr_matrix_type)
+  {
+    auto Amat{
+      static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
+    return !(Amat->get_values() == nullptr || Amat->get_size()[0] == 0 ||
+             Amat->get_size()[1] == 0);
+  }
+  else if (using_dense_matrix_type)
+  {
+    auto Amat{
+      static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
+    return !(Amat->get_values() == nullptr || Amat->get_size()[0] == 0 ||
+             Amat->get_size()[1] == 0);
+  }
+  else { return SUNFALSE; }
 }
 
 extern "C" booleantype is_square(SUNMatrix A)
 {
-  if (using_csr_matrix_type) {
-    auto Amat{static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
+  if (using_csr_matrix_type)
+  {
+    auto Amat{
+      static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)->GkoMtx()};
     return Amat->get_size()[0] == Amat->get_size()[1];
   }
-  else if (using_dense_matrix_type) {
-    auto Amat{static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
+  else if (using_dense_matrix_type)
+  {
+    auto Amat{
+      static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)->GkoMtx()};
     return Amat->get_size()[0] == Amat->get_size()[1];
   }
-  else {
-    return SUNTRUE;
-  }
+  else { return SUNTRUE; }
 }
 
 extern "C" void sync_device(SUNMatrix A)
 {
-  REF_OR_OMP_OR_HIP_OR_CUDA(, , hipDeviceSynchronize(), cudaDeviceSynchronize());
-}
+  if (using_csr_matrix_type)
+  {
+    static_cast<sundials::ginkgo::Matrix<GkoCsrMat>*>(A->content)
+      ->GkoExec()
+      ->synchronize();
+  }
+  else if (using_dense_matrix_type)
+  {
+    static_cast<sundials::ginkgo::Matrix<GkoDenseMat>*>(A->content)
+      ->GkoExec()
+      ->synchronize();
+  }
+}
\ No newline at end of file

From b84b3302ad324553342f957757c245a54fa87631 Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Thu, 26 Oct 2023 17:46:04 -0700
Subject: [PATCH 13/35] Bugfix: CMake FindMAGMA (#356)

Always append hipblas and hipsparse CMake targets with HIP backend as these
libraries are not reliably included in the pkgconfig file.

Replace cublas and cusparse with the CMake targets because the library path in
the pkgconfig file is not reliable. Specifically, the path is wrong on systems
using the NVIDIA HPC SDK.

---------

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 CHANGELOG.md                                  |  3 +
 cmake/tpl/FindMAGMA.cmake                     | 42 ++++++++----
 doc/arkode/guide/source/Introduction.rst      |  3 +
 doc/cvode/guide/source/Introduction.rst       |  3 +
 doc/cvodes/guide/source/Introduction.rst      |  3 +
 doc/ida/guide/source/Introduction.rst         |  3 +
 doc/idas/guide/source/Introduction.rst        |  3 +
 doc/kinsol/guide/source/Introduction.rst      |  3 +
 scripts/shared                                |  2 +
 src/sundials/sundials_cuda.h                  | 39 +----------
 src/sundials/sundials_cusolver.h              | 68 +++++++++++++++++++
 src/sundials/sundials_cusparse.h              | 66 ++++++++++++++++++
 .../sunlinsol_cusolversp_batchqr.cu           |  1 +
 src/sunlinsol/magmadense/CMakeLists.txt       |  2 +-
 src/sunmatrix/cusparse/CMakeLists.txt         |  3 +-
 src/sunmatrix/cusparse/sunmatrix_cusparse.cu  |  1 +
 src/sunmatrix/magmadense/CMakeLists.txt       |  2 +-
 17 files changed, 193 insertions(+), 54 deletions(-)
 create mode 100644 src/sundials/sundials_cusolver.h
 create mode 100644 src/sundials/sundials_cusparse.h

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b1c49a4a2..cf25b99bf6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@ Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 Fixed missing soversions in some `SUNLinearSolver` and `SUNNonlinearSolver`
 CMake targets.
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Added the fourth order ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`.
 
 ## Changes to SUNDIALS in release 6.6.1
diff --git a/cmake/tpl/FindMAGMA.cmake b/cmake/tpl/FindMAGMA.cmake
index d244c504b4..258d7106e3 100644
--- a/cmake/tpl/FindMAGMA.cmake
+++ b/cmake/tpl/FindMAGMA.cmake
@@ -66,24 +66,42 @@ if(MAGMA_LIBRARY AND MAGMA_INCLUDE_DIR)
     list(SUBLIST _libraries_list 1 -1 _libraries_list) # remove 'Libs:' part
 
     set(_interface_libraires )
+
+    if(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
+      if(NOT TARGET roc::hipblas)
+        find_package(hipblas REQUIRED)
+      endif()
+      if(NOT TARGET roc::hipsparse)
+        find_package(hipsparse REQUIRED)
+      endif()
+      # MAGMA does not reliably include these in the pkgconfig file
+      list(APPEND _interface_libraires "roc::hipblas;roc::hipsparse")
+    endif()
+
+    if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
+      if (NOT TARGET CUDA::cudart)
+        find_package(CUDAToolkit REQUIRED)
+      endif() 
+    endif()
+
     foreach(lib ${_libraries_list})
       if(NOT (lib STREQUAL "-lmagma" OR lib STREQUAL "-lmagma_sparse"
             OR lib STREQUAL "-L\${libdir}" OR lib STREQUAL "") )
-
-        # Remove -l only from the beginning of the string
-        string(REPLACE "^-l" "" lib ${lib})
-        list(APPEND _interface_libraires ${lib})
-
-        # Check if we need to find roc::hipblas or roc::hipsparse
-        if(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
-          if((lib STREQUAL "roc::hipblas") AND (NOT TARGET roc::hipblas))
-            find_package(hipblas REQUIRED)
+        
+        # Check if we need to find cusparse or cublas
+        if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
+          # Replace cublas, cusparse with the CMake targets because the library path in
+          # the magma pkgconfig is not reliable. Sepcifically, the path is wrong on systems
+          # like Perlmutter where the NVIDIA HPC SDK is used.
+          if(lib STREQUAL "-lcublas")
+            set(lib CUDA::cublas)
           endif()
-          if((lib STREQUAL "roc::hipsparse") AND (NOT TARGET roc::hipsparse))
-            find_package(hipsparse REQUIRED)
+          if(lib STREQUAL "-lcusparse")
+            set(lib CUDA::cusparse)
           endif()
         endif()
-
+        
+        list(APPEND _interface_libraires ${lib})
       endif()
     endforeach()
 
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 4fafa4d0bb..7fbe137950 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,6 +133,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where ARKODE
 steppers would return at the stop time rather than the requested output time if
 the stop time was reached in the same step in which the output time was passed.
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index 085aae8f34..b28e54a07a 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -114,6 +114,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where CVODE
 would return at the stop time rather than the requested output time if the stop
 time was reached in the same step in which the output time was passed.
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 4382d3c2cb..567c0b0284 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -114,6 +114,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where CVODES
 would return at the stop time rather than the requested output time if the stop
 time was reached in the same step in which the output time was passed.
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 1fa001bde2..5fae985f15 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -75,6 +75,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where IDA would
 return at the stop time rather than the requested output time if the stop time
 was reached in the same step in which the output time was passed.
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index 16db98882a..4d1d3b3c4c 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -89,6 +89,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where IDAS
 would return at the stop time rather than the requested output time if the stop
 time was reached in the same step in which the output time was passed.
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index 0500e6d0df..d91d300fbb 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -91,6 +91,9 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
+and fixed the targets used for rocBLAS and rocSPARSE.
+
 Improved computational complexity of ``SUNMatScaleAddI_Sparse`` from ``O(M*N)`` to
 ``O(NNZ)``.
 
diff --git a/scripts/shared b/scripts/shared
index 9e42969552..7304bc5df8 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -246,6 +246,8 @@ $tar $tarfile $distrobase/src/sundials/sundials_band.c
 $tar $tarfile $distrobase/src/sundials/sundials_context_impl.h
 $tar $tarfile $distrobase/src/sundials/sundials_context.c
 $tar $tarfile $distrobase/src/sundials/sundials_cuda.h
+$tar $tarfile $distrobase/src/sundials/sundials_cusolver.h
+$tar $tarfile $distrobase/src/sundials/sundials_cusparse.h
 $tar $tarfile $distrobase/src/sundials/sundials_cuda_kernels.cuh
 $tar $tarfile $distrobase/src/sundials/sundials_debug.h
 $tar $tarfile $distrobase/src/sundials/sundials_dense.c
diff --git a/src/sundials/sundials_cuda.h b/src/sundials/sundials_cuda.h
index 244e6e76ef..75c0749da4 100644
--- a/src/sundials/sundials_cuda.h
+++ b/src/sundials/sundials_cuda.h
@@ -21,8 +21,6 @@
 #include <stdio.h>
 
 #include <cuda_runtime.h>
-#include <cusolverSp.h>
-#include <cusparse.h>
 
 #include <sundials/sundials_types.h>
 
@@ -38,8 +36,6 @@ extern "C" {
  * ---------------------------------------------------------------------------*/
 
 #define SUNDIALS_CUDA_VERIFY(cuerr) SUNDIALS_CUDA_Assert(cuerr, __FILE__, __LINE__)
-#define SUNDIALS_CUSPARSE_VERIFY(cuerr) SUNDIALS_CUSPARSE_Assert(cuerr, __FILE__, __LINE__)
-#define SUNDIALS_CUSOLVER_VERIFY(cuerr) SUNDIALS_CUSOLVER_Assert(cuerr, __FILE__, __LINE__)
 
 #define SUNDIALS_KERNEL_NAME(...) __VA_ARGS__
 #ifndef SUNDIALS_DEBUG_CUDA_LASTERROR
@@ -75,42 +71,9 @@ inline booleantype SUNDIALS_CUDA_Assert(cudaError_t cuerr, const char *file, int
   return SUNTRUE; /* Assert OK */
 }
 
-inline booleantype SUNDIALS_CUSPARSE_Assert(cusparseStatus_t status, const char *file, int line)
-{
-  if (status != CUSPARSE_STATUS_SUCCESS)
-  {
-#ifdef SUNDIALS_DEBUG
-    fprintf(stderr,
-            "ERROR in cuSPARSE runtime operation: cusparseStatus_t = %d %s:%d\n",
-            status, file, line);
-#ifdef SUNDIALS_DEBUG_ASSERT
-    assert(false);
-#endif
-#endif
-    return SUNFALSE; /*  Assert failed */
-  }
-  return SUNTRUE; /* Assert OK */
-}
-
-inline booleantype SUNDIALS_CUSOLVER_Assert(cusolverStatus_t status, const char *file, int line)
-{
-  if (status != CUSOLVER_STATUS_SUCCESS)
-  {
-#ifdef SUNDIALS_DEBUG
-    fprintf(stderr,
-            "ERROR in cuSOLVER runtime operation: cusolverStatus_t = %d %s:%d\n",
-            status, file, line);
-#ifdef SUNDIALS_DEBUG_ASSERT
-    assert(false);
-#endif
-#endif
-    return SUNFALSE; /*  Assert failed */
-  }
-  return SUNTRUE; /* Assert OK */
-}
 
 #ifdef __cplusplus  /* wrapper to enable C++ usage */
 }
 #endif
 
-#endif /* _SUNDIALS_CUDA_H */
\ No newline at end of file
+#endif /* _SUNDIALS_CUDA_H */
diff --git a/src/sundials/sundials_cusolver.h b/src/sundials/sundials_cusolver.h
new file mode 100644
index 0000000000..b1aee9b266
--- /dev/null
+++ b/src/sundials/sundials_cusolver.h
@@ -0,0 +1,68 @@
+/*
+ * -----------------------------------------------------------------
+ * Programmer(s): Cody J. Balos @ LLNL
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This header files defines internal utility functions and macros
+ * for working with CUDA.
+ * -----------------------------------------------------------------
+ */
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <cuda_runtime.h>
+#include <cusolverDn.h>
+#include <cusolverSp.h>
+
+#include <sundials/sundials_types.h>
+
+#ifndef _SUNDIALS_CUSOLVER_H
+#define _SUNDIALS_CUSOLVER_H
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* ---------------------------------------------------------------------------
+ * Utility macros
+ * ---------------------------------------------------------------------------*/
+
+#define SUNDIALS_CUSOLVER_VERIFY(cuerr) SUNDIALS_CUSOLVER_Assert(cuerr, __FILE__, __LINE__)
+
+
+/* ---------------------------------------------------------------------------
+ * Utility functions
+ * ---------------------------------------------------------------------------*/
+
+inline booleantype SUNDIALS_CUSOLVER_Assert(cusolverStatus_t status, const char *file, int line)
+{
+  if (status != CUSOLVER_STATUS_SUCCESS)
+  {
+#ifdef SUNDIALS_DEBUG
+    fprintf(stderr,
+            "ERROR in cuSOLVER runtime operation: cusolverStatus_t = %d %s:%d\n",
+            status, file, line);
+#ifdef SUNDIALS_DEBUG_ASSERT
+    assert(false);
+#endif
+#endif
+    return SUNFALSE; /*  Assert failed */
+  }
+  return SUNTRUE; /* Assert OK */
+}
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+}
+#endif
+
+#endif /* _SUNDIALS_CUSOLVER_H */
diff --git a/src/sundials/sundials_cusparse.h b/src/sundials/sundials_cusparse.h
new file mode 100644
index 0000000000..3f9c3ae493
--- /dev/null
+++ b/src/sundials/sundials_cusparse.h
@@ -0,0 +1,66 @@
+/*
+ * -----------------------------------------------------------------
+ * Programmer(s): Cody J. Balos @ LLNL
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This header files defines internal utility functions and macros
+ * for working with CUDA.
+ * -----------------------------------------------------------------
+ */
+
+#include <assert.h>
+#include <stdio.h>
+
+#include <cuda_runtime.h>
+#include <cusparse.h>
+
+#include <sundials/sundials_types.h>
+
+#ifndef _SUNDIALS_CUSPARSE_H
+#define _SUNDIALS_CUSPARSE_H
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* ---------------------------------------------------------------------------
+ * Utility macros
+ * ---------------------------------------------------------------------------*/
+
+#define SUNDIALS_CUSPARSE_VERIFY(cuerr) SUNDIALS_CUSPARSE_Assert(cuerr, __FILE__, __LINE__)
+
+/* ---------------------------------------------------------------------------
+ * Utility functions
+ * ---------------------------------------------------------------------------*/
+
+inline booleantype SUNDIALS_CUSPARSE_Assert(cusparseStatus_t status, const char *file, int line)
+{
+  if (status != CUSPARSE_STATUS_SUCCESS)
+  {
+#ifdef SUNDIALS_DEBUG
+    fprintf(stderr,
+            "ERROR in cuSPARSE runtime operation: cusparseStatus_t = %d %s:%d\n",
+            status, file, line);
+#ifdef SUNDIALS_DEBUG_ASSERT
+    assert(false);
+#endif
+#endif
+    return SUNFALSE; /*  Assert failed */
+  }
+  return SUNTRUE; /* Assert OK */
+}
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+}
+#endif
+
+#endif /* _SUNDIALS_CUSPARSE_H */
diff --git a/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu b/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
index d7a351f974..915f6163e9 100644
--- a/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
+++ b/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
@@ -23,6 +23,7 @@
 #include <sunlinsol/sunlinsol_cusolversp_batchqr.h>
 
 #include "sundials_cuda.h"
+#include "sundials_cusolver.h"
 #include "sundials_debug.h"
 
 #define ZERO RCONST(0.0)
diff --git a/src/sunlinsol/magmadense/CMakeLists.txt b/src/sunlinsol/magmadense/CMakeLists.txt
index 116dc2d425..ed186d064d 100644
--- a/src/sunlinsol/magmadense/CMakeLists.txt
+++ b/src/sunlinsol/magmadense/CMakeLists.txt
@@ -19,7 +19,7 @@ if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
   set(_libs_needed sundials_sunmatrixmagmadense sundials_nveccuda)
 elseif(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
   set_source_files_properties(sunlinsol_magmadense.cpp PROPERTIES LANGUAGE CXX)
-  set(_libs_needed sundials_sunmatrixmagmadense sundials_nvechip)
+  set(_libs_needed sundials_sunmatrixmagmadense sundials_nvechip hip::device)
 endif()
 
 # Add the sunlinsol_magmadense library
diff --git a/src/sunmatrix/cusparse/CMakeLists.txt b/src/sunmatrix/cusparse/CMakeLists.txt
index 21ee8a88f5..2efa8a8f7a 100644
--- a/src/sunmatrix/cusparse/CMakeLists.txt
+++ b/src/sunmatrix/cusparse/CMakeLists.txt
@@ -28,8 +28,7 @@ sundials_add_library(sundials_sunmatrixcusparse
     sundials_generic_obj
     sundials_sunmemcuda_obj
   LINK_LIBRARIES
-    PUBLIC CUDA::cusparse
-    PRIVATE CUDA::cusolver
+    PUBLIC CUDA::cusparse CUDA::cusolver
   OUTPUT_NAME
     sundials_sunmatrixcusparse
   VERSION
diff --git a/src/sunmatrix/cusparse/sunmatrix_cusparse.cu b/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
index a986fe7041..70fbc47da9 100644
--- a/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
+++ b/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
@@ -24,6 +24,7 @@
 #include <sunmatrix/sunmatrix_cusparse.h>
 
 #include "sundials_cuda.h"
+#include "sundials_cusparse.h"
 #include "sundials_debug.h"
 #include "cusparse_kernels.cuh"
 
diff --git a/src/sunmatrix/magmadense/CMakeLists.txt b/src/sunmatrix/magmadense/CMakeLists.txt
index 40612e4ae8..91968550fb 100644
--- a/src/sunmatrix/magmadense/CMakeLists.txt
+++ b/src/sunmatrix/magmadense/CMakeLists.txt
@@ -16,7 +16,7 @@ install(CODE "MESSAGE(\"\nInstall SUNMATRIX_MAGMADENSE with ${SUNDIALS_MAGMA_BAC
 
 if(SUNDIALS_MAGMA_BACKENDS MATCHES "CUDA")
   set_source_files_properties(sunmatrix_magmadense.cpp PROPERTIES LANGUAGE CUDA)
-  set(_libs_needed sundials_nveccuda ${CUDA_CUBLAS_LIBRARIES})
+  set(_libs_needed sundials_nveccuda)
 elseif(SUNDIALS_MAGMA_BACKENDS MATCHES "HIP")
   set_source_files_properties(sunmatrix_magmadense.cpp PROPERTIES LANGUAGE CXX)
   set(_libs_needed sundials_nvechip hip::device)

From 9717d6d6dab555646c3babd129c819438fc6f762 Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Fri, 27 Oct 2023 15:43:04 -0700
Subject: [PATCH 14/35] Feature: Fortran interface for lapack dense solver
 (#353)

Added Fortran support for the LAPACK dense SUNLinearSolver implementation.

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
---
 CHANGELOG.md                                  |   3 +
 doc/arkode/guide/source/Introduction.rst      |   3 +
 doc/cvode/guide/source/Introduction.rst       |   2 +
 doc/cvodes/guide/source/Introduction.rst      |   2 +
 doc/ida/guide/source/Introduction.rst         |   2 +
 doc/idas/guide/source/Introduction.rst        |   2 +
 doc/kinsol/guide/source/Introduction.rst      |   2 +
 examples/sunlinsol/lapackdense/CMakeLists.txt |  56 +++
 .../test_fsunlinsol_lapackdense_mod.f90       | 185 ++++++++++
 scripts/shared                                |   4 +
 src/sunlinsol/lapackdense/CMakeLists.txt      |   5 +
 src/sunlinsol/lapackdense/fmod/CMakeLists.txt |  32 ++
 .../fmod/fsunlinsol_lapackdense_mod.c         | 337 ++++++++++++++++++
 .../fmod/fsunlinsol_lapackdense_mod.f90       | 280 +++++++++++++++
 swig/Makefile                                 |   2 +-
 swig/sunlinsol/fsunlinsol_lapackdense_mod.i   |  31 ++
 16 files changed, 947 insertions(+), 1 deletion(-)
 create mode 100644 examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
 create mode 100644 src/sunlinsol/lapackdense/fmod/CMakeLists.txt
 create mode 100644 src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
 create mode 100644 src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90
 create mode 100644 swig/sunlinsol/fsunlinsol_lapackdense_mod.i

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf25b99bf6..b766f5c334 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,11 +27,14 @@ Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 Fixed missing soversions in some `SUNLinearSolver` and `SUNNonlinearSolver`
 CMake targets.
 
+Added Fortran support for the LAPACK dense `SUNLinearSolver` implementations.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
 Added the fourth order ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`.
 
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 7fbe137950..c33aca7415 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -156,8 +156,11 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Added the fourth order ERK method ``ARKODE_SOFRONIOU_SPALETTA_5_3_4``.
 
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index b28e54a07a..7a175c0ca0 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -129,6 +129,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index 567c0b0284..bb561ccca5 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -132,6 +132,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 5fae985f15..9f54d64a68 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -90,6 +90,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index 4d1d3b3c4c..0073960dc2 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -107,6 +107,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index d91d300fbb..ee33d5a33a 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -102,6 +102,8 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
+
 Changes in v6.6.1
 -----------------
 
diff --git a/examples/sunlinsol/lapackdense/CMakeLists.txt b/examples/sunlinsol/lapackdense/CMakeLists.txt
index ef9b00cf55..eb5ef45b0a 100644
--- a/examples/sunlinsol/lapackdense/CMakeLists.txt
+++ b/examples/sunlinsol/lapackdense/CMakeLists.txt
@@ -30,6 +30,16 @@ set(sunlinsol_lapackdense_dependencies
   test_sunlinsol
 )
 
+# If building F2003 tests
+if (BUILD_FORTRAN_MODULE_INTERFACE)
+  set(sunlinsol_lapackdense_fortran_examples
+    "test_fsunlinsol_lapackdense_mod\;10 0 0\;"
+    "test_fsunlinsol_lapackdense_mod\;100 0 0\;"
+    "test_fsunlinsol_lapackdense_mod\;500 0 0\;"
+    "test_fsunlinsol_lapackdense_mod\;1000 0 0\;"
+    )
+endif()
+
 # Add source directory to include directories
 include_directories(. ..)
 
@@ -82,6 +92,52 @@ foreach(example_tuple ${sunlinsol_lapackdense_examples})
 
 endforeach(example_tuple ${sunlinsol_lapackdense_examples})
 
+# Add the build and install targets for each example
+foreach(example_tuple ${sunlinsol_lapackdense_fortran_examples})
+
+  # parse the example tuple
+  list(GET example_tuple 0 example)
+  list(GET example_tuple 1 example_args)
+  list(GET example_tuple 2 example_type)
+
+  # check if this example has already been added, only need to add
+  # example source files once for testing with different inputs
+  if(NOT TARGET ${example})
+    # example source files
+    add_executable(${example} ${example}.f90
+      ${SUNDIALS_SOURCE_DIR}/examples/utilities/test_utilities.f90
+      ${SUNDIALS_SOURCE_DIR}/examples/sunlinsol/test_sunlinsol.f90)
+
+    # folder to organize targets in an IDE
+    set_target_properties(${example} PROPERTIES FOLDER "Examples")
+
+    # set fortran module directory to avoid name collisions
+    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
+    # libraries to link against
+    target_link_libraries(${example}
+      sundials_nvecserial
+      sundials_fnvecserial_mod
+      sundials_sunlinsollapackdense
+      sundials_fsunlinsollapackdense_mod
+      ${EXE_EXTRA_LINK_LIBS})
+
+    # check if example args are provided and set the test name
+    if("${example_args}" STREQUAL "")
+      set(test_name ${example})
+    else()
+      string(REGEX REPLACE " " "_" test_name ${example}_${example_args})
+    endif()
+
+    # add example to regression tests
+    sundials_add_test(${test_name} ${example}
+      TEST_ARGS ${example_args}
+      EXAMPLE_TYPE ${example_type}
+      NODIFF)
+  endif()
+
+endforeach(example_tuple ${sunlinsol_lapackdense_fortran_examples})
+
 
 if(EXAMPLES_INSTALL)
 
diff --git a/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90 b/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
new file mode 100644
index 0000000000..797c77ced5
--- /dev/null
+++ b/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
@@ -0,0 +1,185 @@
+! -----------------------------------------------------------------
+! Programmer(s): Daniel R. Reynolds @ SMU
+! -----------------------------------------------------------------
+! SUNDIALS Copyright Start
+! Copyright (c) 2002-2023, Lawrence Livermore National Security
+! and Southern Methodist University.
+! All rights reserved.
+!
+! See the top-level LICENSE and NOTICE files for details.
+!
+! SPDX-License-Identifier: BSD-3-Clause
+! SUNDIALS Copyright End
+! -----------------------------------------------------------------
+! This file tests the Fortran 2003 interface to the SUNDIALS
+! LAPACK-Dense SUNLinearSolver implementation.
+! -----------------------------------------------------------------
+
+module test_fsunlinsol_lapackdense
+  use, intrinsic :: iso_c_binding
+  use test_utilities
+  implicit none
+
+  integer(C_LONG), private, parameter :: N = 100
+
+contains
+
+  integer(C_INT) function unit_tests() result(fails)
+    use, intrinsic :: iso_c_binding
+    use fsundials_nvector_mod
+    use fsundials_matrix_mod
+    use fsundials_linearsolver_mod
+    use fnvector_serial_mod
+    use fsunmatrix_dense_mod
+    use fsunlinsol_lapackdense_mod
+    use test_sunlinsol
+
+    implicit none
+
+    type(SUNLinearSolver), pointer :: LS                ! test linear solver
+    type(SUNMatrix),       pointer :: A, I              ! test matrices
+    type(N_Vector),        pointer :: x, b              ! test vectors
+    real(C_DOUBLE),        pointer :: colj(:), colIj(:) ! matrix column data
+    real(C_DOUBLE),        pointer :: xdata(:)          ! x vector data
+    real(C_DOUBLE)                 :: tmpr              ! temporary real value
+    integer(C_LONG)                :: j, k
+    integer(C_INT)                 :: tmp
+
+    fails = 0
+
+    A => FSUNDenseMatrix(N, N, sunctx)
+    I => FSUNDenseMatrix(N, N, sunctx)
+    x => FN_VNew_Serial(N, sunctx)
+    b => FN_VNew_Serial(N, sunctx)
+
+    ! fill A matrix with uniform random data in [0, 1/N)
+    do j=1, N
+      colj => FSUNDenseMatrix_Column(A, j-1)
+      do k=1, N
+        call random_number(tmpr)
+        colj(k) = tmpr / N
+      end do
+    end do
+
+    ! create anti-identity matrix
+    j = N
+    do k=1, N
+      colj => FSUNDenseMatrix_Column(I, j-1)
+      colj(k) = ONE
+      j = j-1
+    end do
+
+    ! add anti-identity to ensure the solver needs to do row-swapping
+    do k=1, N
+      do j=1, N
+        colj => FSUNDenseMatrix_Column(A, j-1)
+        colIj => FSUNDenseMatrix_Column(I, j-1)
+        colj(k) = colj(k) + colIj(k)
+      end do
+    end do
+
+    ! fill x vector with uniform random data in [0, 1)
+    xdata => FN_VGetArrayPointer(x)
+    do j=1, N
+      call random_number(tmpr)
+      xdata(j) = tmpr
+    end do
+
+    ! create RHS vector for linear solve
+    fails = FSUNMatMatvec(A, x, b)
+    if (fails /= 0) then
+      call FSUNMatDestroy(A)
+      call FSUNMatDestroy(I)
+      call FN_VDestroy(x)
+      call FN_VDestroy(b)
+      return
+    end if
+
+    ! create dense linear solver
+    LS => FSUNLinSol_LapackDense(x, A, sunctx)
+
+    ! run tests
+    fails = fails + Test_FSUNLinSolInitialize(LS, 0)
+    fails = fails + Test_FSUNLinSolSetup(LS, A, 0)
+    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, 0)
+
+    fails = fails + Test_FSUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0)
+    fails = fails + Test_FSUNLinSolLastFlag(LS, 0)
+    fails = fails + Test_FSUNLinSolSpace(LS, 0)
+
+    ! cleanup
+    tmp = FSUNLinSolFree(LS)
+    call FSUNMatDestroy(A)
+    call FSUNMatDestroy(I)
+    call FN_VDestroy(x)
+    call FN_VDestroy(b)
+
+  end function unit_tests
+
+end module
+
+integer(C_INT) function check_vector(X, Y, tol) result(failure)
+  use, intrinsic :: iso_c_binding
+  use fsundials_nvector_mod
+  use test_utilities
+
+  implicit none
+  type(N_Vector)  :: x, y
+  real(C_DOUBLE)  :: tol, maxerr
+  integer(C_LONG) :: i, xlen, ylen
+  real(C_DOUBLE), pointer :: xdata(:), ydata(:)
+
+  failure = 0
+
+  xdata => FN_VGetArrayPointer(x)
+  ydata => FN_VGetArrayPointer(y)
+
+  xlen = FN_VGetLength(x)
+  ylen = FN_VGetLength(y)
+
+  if (xlen /= ylen) then
+    print *, 'FAIL: check_vector: different data array lengths'
+    failure = 1
+    return
+  end if
+
+  do i = 1, xlen
+    failure = failure + FNEQTOL(xdata(i), ydata(i), tol)
+  end do
+
+  if (failure > 0) then
+    maxerr = ZERO
+    do i = 1, xlen
+      maxerr = max(abs(xdata(i)-ydata(i))/abs(ydata(i)), maxerr)
+    end do
+    write(*,'(A,E14.7,A,E14.7,A)') &
+      "FAIL: check_vector failure: maxerr = ", maxerr, "  (tol = ", tol, ")"
+  end if
+
+end function check_vector
+
+program main
+  !======== Inclusions ==========
+  use, intrinsic :: iso_c_binding
+  use test_fsunlinsol_lapackdense
+
+  !======== Declarations ========
+  implicit none
+  integer(C_INT) :: fails = 0
+
+  !============== Introduction =============
+  print *, 'LAPACK-Dense SUNLinearSolver Fortran 2003 interface test'
+
+  call Test_Init(c_null_ptr)
+
+  fails = unit_tests()
+  if (fails /= 0) then
+    print *, 'FAILURE: n unit tests failed'
+    stop 1
+  else
+    print *,'SUCCESS: all unit tests passed'
+  end if
+
+  call Test_Finalize()
+
+end program main
diff --git a/scripts/shared b/scripts/shared
index 7304bc5df8..74cb6bfbba 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -490,6 +490,9 @@ echo "   --- Add sunlinsol/lapackdense module to $tarfile"
 
 $tar $tarfile $distrobase/src/sunlinsol/lapackdense/CMakeLists.txt
 $tar $tarfile $distrobase/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c
+$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/CMakeLists.txt
+$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
+$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90
 
 echo "   --- Add sunlinsol/magmadense module to $tarfile"
 
@@ -713,6 +716,7 @@ $tar $tarfile $distrobase/examples/sunlinsol/kokkos/CMakeLists.txt
 $tar $tarfile $distrobase/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c
 $tar $tarfile $distrobase/examples/sunlinsol/lapackband/CMakeLists.txt
 $tar $tarfile $distrobase/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c
+$tar $tarfile $distrobase/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
 $tar $tarfile $distrobase/examples/sunlinsol/lapackdense/CMakeLists.txt
 
 $tar $tarfile $distrobase/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp
diff --git a/src/sunlinsol/lapackdense/CMakeLists.txt b/src/sunlinsol/lapackdense/CMakeLists.txt
index e52a4b6825..c03f8c896e 100644
--- a/src/sunlinsol/lapackdense/CMakeLists.txt
+++ b/src/sunlinsol/lapackdense/CMakeLists.txt
@@ -37,3 +37,8 @@ sundials_add_library(sundials_sunlinsollapackdense
 )
 
 message(STATUS "Added SUNLINSOL_LAPACKDENSE module")
+
+# Add module if F2003 interface is enabled
+if(BUILD_FORTRAN_MODULE_INTERFACE)
+  add_subdirectory(fmod)
+endif()
diff --git a/src/sunlinsol/lapackdense/fmod/CMakeLists.txt b/src/sunlinsol/lapackdense/fmod/CMakeLists.txt
new file mode 100644
index 0000000000..d7b281ec71
--- /dev/null
+++ b/src/sunlinsol/lapackdense/fmod/CMakeLists.txt
@@ -0,0 +1,32 @@
+# ----------------------------------------------------------------------
+# Programmer(s): Cody J. Balos @ LLNL
+# ----------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ----------------------------------------------------------------------
+# CMakeLists.txt file for the F2003 LAPACK dense SUNLinearSolver 
+# object library
+# ----------------------------------------------------------------------
+
+sundials_add_f2003_library(sundials_fsunlinsollapackdense_mod
+  SOURCES
+    fsunlinsol_lapackdense_mod.f90 fsunlinsol_lapackdense_mod.c
+  OBJECT_LIBRARIES
+    sundials_fgeneric_mod_obj
+  LINK_LIBRARIES
+    PUBLIC sundials_fsunmatrixdense_mod
+  OUTPUT_NAME
+    sundials_fsunlinsollapackdense_mod
+  VERSION
+    ${sunlinsollib_VERSION}
+  SOVERSION
+    ${sunlinsollib_SOVERSION}
+)
+message(STATUS "Added SUNLINSOL_LAPACKDENSE F2003 interface")
diff --git a/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
new file mode 100644
index 0000000000..2ed9147d9f
--- /dev/null
+++ b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
@@ -0,0 +1,337 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.0
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------
+ * Programmer(s): Auto-generated by swig.
+ * ---------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -------------------------------------------------------------*/
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* qualifier for exported *const* global data variables*/
+#ifndef SWIGEXTERN
+# ifdef __cplusplus
+#   define SWIGEXTERN extern
+# else
+#   define SWIGEXTERN
+# endif
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+#include <assert.h>
+#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
+ { printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
+
+
+#include <stdio.h>
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+# ifndef snprintf
+#  define snprintf _snprintf
+# endif
+#endif
+
+
+/* Support for the `contract` feature.
+ *
+ * Note that RETURNNULL is first because it's inserted via a 'Replaceall' in
+ * the fortran.cxx file.
+ */
+#define SWIG_contract_assert(RETURNNULL, EXPR, MSG) \
+ if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } 
+
+
+#define SWIGVERSION 0x040000 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+
+
+#include "sundials/sundials_linearsolver.h"
+
+
+#include "sunlinsol/sunlinsol_lapackdense.h"
+
+SWIGEXPORT SUNLinearSolver _wrap_FSUNLinSol_LapackDense(N_Vector farg1, SUNMatrix farg2, void *farg3) {
+  SUNLinearSolver fresult ;
+  N_Vector arg1 = (N_Vector) 0 ;
+  SUNMatrix arg2 = (SUNMatrix) 0 ;
+  SUNContext arg3 = (SUNContext) 0 ;
+  SUNLinearSolver result;
+  
+  arg1 = (N_Vector)(farg1);
+  arg2 = (SUNMatrix)(farg2);
+  arg3 = (SUNContext)(farg3);
+  result = (SUNLinearSolver)SUNLinSol_LapackDense(arg1,arg2,arg3);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolGetType_LapackDense(SUNLinearSolver farg1) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  SUNLinearSolver_Type result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  result = (SUNLinearSolver_Type)SUNLinSolGetType_LapackDense(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolGetID_LapackDense(SUNLinearSolver farg1) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  SUNLinearSolver_ID result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  result = (SUNLinearSolver_ID)SUNLinSolGetID_LapackDense(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolInitialize_LapackDense(SUNLinearSolver farg1) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  int result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  result = (int)SUNLinSolInitialize_LapackDense(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolSetup_LapackDense(SUNLinearSolver farg1, SUNMatrix farg2) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  SUNMatrix arg2 = (SUNMatrix) 0 ;
+  int result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  arg2 = (SUNMatrix)(farg2);
+  result = (int)SUNLinSolSetup_LapackDense(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolSolve_LapackDense(SUNLinearSolver farg1, SUNMatrix farg2, N_Vector farg3, N_Vector farg4, double const *farg5) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  SUNMatrix arg2 = (SUNMatrix) 0 ;
+  N_Vector arg3 = (N_Vector) 0 ;
+  N_Vector arg4 = (N_Vector) 0 ;
+  realtype arg5 ;
+  int result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  arg2 = (SUNMatrix)(farg2);
+  arg3 = (N_Vector)(farg3);
+  arg4 = (N_Vector)(farg4);
+  arg5 = (realtype)(*farg5);
+  result = (int)SUNLinSolSolve_LapackDense(arg1,arg2,arg3,arg4,arg5);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int64_t _wrap_FSUNLinSolLastFlag_LapackDense(SUNLinearSolver farg1) {
+  int64_t fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  sunindextype result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  result = SUNLinSolLastFlag_LapackDense(arg1);
+  fresult = (sunindextype)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolSpace_LapackDense(SUNLinearSolver farg1, long *farg2, long *farg3) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  long *arg2 = (long *) 0 ;
+  long *arg3 = (long *) 0 ;
+  int result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  arg2 = (long *)(farg2);
+  arg3 = (long *)(farg3);
+  result = (int)SUNLinSolSpace_LapackDense(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNLinSolFree_LapackDense(SUNLinearSolver farg1) {
+  int fresult ;
+  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
+  int result;
+  
+  arg1 = (SUNLinearSolver)(farg1);
+  result = (int)SUNLinSolFree_LapackDense(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+
diff --git a/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90 b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90
new file mode 100644
index 0000000000..a615f9ba43
--- /dev/null
+++ b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90
@@ -0,0 +1,280 @@
+! This file was automatically generated by SWIG (http://www.swig.org).
+! Version 4.0.0
+!
+! Do not make changes to this file unless you know what you are doing--modify
+! the SWIG interface file instead.
+
+! ---------------------------------------------------------------
+! Programmer(s): Auto-generated by swig.
+! ---------------------------------------------------------------
+! SUNDIALS Copyright Start
+! Copyright (c) 2002-2023, Lawrence Livermore National Security
+! and Southern Methodist University.
+! All rights reserved.
+!
+! See the top-level LICENSE and NOTICE files for details.
+!
+! SPDX-License-Identifier: BSD-3-Clause
+! SUNDIALS Copyright End
+! ---------------------------------------------------------------
+
+module fsunlinsol_lapackdense_mod
+ use, intrinsic :: ISO_C_BINDING
+ use fsundials_linearsolver_mod
+ use fsundials_types_mod
+ use fsundials_context_mod
+ use fsundials_nvector_mod
+ use fsundials_context_mod
+ use fsundials_types_mod
+ use fsundials_matrix_mod
+ use fsundials_nvector_mod
+ use fsundials_context_mod
+ use fsundials_types_mod
+ implicit none
+ private
+
+ ! DECLARATION CONSTRUCTS
+ public :: FSUNLinSol_LapackDense
+ public :: FSUNLinSolGetType_LapackDense
+ public :: FSUNLinSolGetID_LapackDense
+ public :: FSUNLinSolInitialize_LapackDense
+ public :: FSUNLinSolSetup_LapackDense
+ public :: FSUNLinSolSolve_LapackDense
+ public :: FSUNLinSolLastFlag_LapackDense
+ public :: FSUNLinSolSpace_LapackDense
+ public :: FSUNLinSolFree_LapackDense
+
+! WRAPPER DECLARATIONS
+interface
+function swigc_FSUNLinSol_LapackDense(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNLinSol_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNLinSolGetType_LapackDense(farg1) &
+bind(C, name="_wrap_FSUNLinSolGetType_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolGetID_LapackDense(farg1) &
+bind(C, name="_wrap_FSUNLinSolGetID_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolInitialize_LapackDense(farg1) &
+bind(C, name="_wrap_FSUNLinSolInitialize_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolSetup_LapackDense(farg1, farg2) &
+bind(C, name="_wrap_FSUNLinSolSetup_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolSolve_LapackDense(farg1, farg2, farg3, farg4, farg5) &
+bind(C, name="_wrap_FSUNLinSolSolve_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+type(C_PTR), value :: farg4
+real(C_DOUBLE), intent(in) :: farg5
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolLastFlag_LapackDense(farg1) &
+bind(C, name="_wrap_FSUNLinSolLastFlag_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT64_T) :: fresult
+end function
+
+function swigc_FSUNLinSolSpace_LapackDense(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNLinSolSpace_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNLinSolFree_LapackDense(farg1) &
+bind(C, name="_wrap_FSUNLinSolFree_LapackDense") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+end interface
+
+
+contains
+ ! MODULE SUBPROGRAMS
+function FSUNLinSol_LapackDense(y, a, sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNLinearSolver), pointer :: swig_result
+type(N_Vector), target, intent(inout) :: y
+type(SUNMatrix), target, intent(inout) :: a
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = c_loc(y)
+farg2 = c_loc(a)
+farg3 = sunctx
+fresult = swigc_FSUNLinSol_LapackDense(farg1, farg2, farg3)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNLinSolGetType_LapackDense(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(SUNLinearSolver_Type) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(s)
+fresult = swigc_FSUNLinSolGetType_LapackDense(farg1)
+swig_result = fresult
+end function
+
+function FSUNLinSolGetID_LapackDense(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(SUNLinearSolver_ID) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(s)
+fresult = swigc_FSUNLinSolGetID_LapackDense(farg1)
+swig_result = fresult
+end function
+
+function FSUNLinSolInitialize_LapackDense(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(s)
+fresult = swigc_FSUNLinSolInitialize_LapackDense(farg1)
+swig_result = fresult
+end function
+
+function FSUNLinSolSetup_LapackDense(s, a) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+type(SUNMatrix), target, intent(inout) :: a
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = c_loc(s)
+farg2 = c_loc(a)
+fresult = swigc_FSUNLinSolSetup_LapackDense(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNLinSolSolve_LapackDense(s, a, x, b, tol) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+type(SUNMatrix), target, intent(inout) :: a
+type(N_Vector), target, intent(inout) :: x
+type(N_Vector), target, intent(inout) :: b
+real(C_DOUBLE), intent(in) :: tol
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+type(C_PTR) :: farg4 
+real(C_DOUBLE) :: farg5 
+
+farg1 = c_loc(s)
+farg2 = c_loc(a)
+farg3 = c_loc(x)
+farg4 = c_loc(b)
+farg5 = tol
+fresult = swigc_FSUNLinSolSolve_LapackDense(farg1, farg2, farg3, farg4, farg5)
+swig_result = fresult
+end function
+
+function FSUNLinSolLastFlag_LapackDense(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT64_T) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_INT64_T) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(s)
+fresult = swigc_FSUNLinSolLastFlag_LapackDense(farg1)
+swig_result = fresult
+end function
+
+function FSUNLinSolSpace_LapackDense(s, lenrwls, leniwls) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_LONG), dimension(*), target, intent(inout) :: lenrwls
+integer(C_LONG), dimension(*), target, intent(inout) :: leniwls
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = c_loc(s)
+farg2 = c_loc(lenrwls(1))
+farg3 = c_loc(leniwls(1))
+fresult = swigc_FSUNLinSolSpace_LapackDense(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNLinSolFree_LapackDense(s) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNLinearSolver), target, intent(inout) :: s
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(s)
+fresult = swigc_FSUNLinSolFree_LapackDense(farg1)
+swig_result = fresult
+end function
+
+
+end module
diff --git a/swig/Makefile b/swig/Makefile
index ce4f536a66..4a062e0445 100644
--- a/swig/Makefile
+++ b/swig/Makefile
@@ -23,7 +23,7 @@ KINSOL=fkinsol_mod
 GENERIC=fsundials_types_mod fsundials_nvector_mod fsundials_matrix_mod fsundials_linearsolver_mod fsundials_nonlinearsolver_mod fsundials_futils_mod fsundials_context_mod fsundials_profiler_mod fsundials_logger_mod
 NVECTOR=openmp pthreads serial parallel manyvector mpiplusx
 SUNMATRIX=band dense sparse
-SUNLINSOL=band dense klu spbcgs spfgmr spgmr sptfqmr pcg
+SUNLINSOL=band dense lapackdense klu spbcgs spfgmr spgmr sptfqmr pcg
 SUNNONLINSOL=newton fixedpoint
 
 INCLUDES=-I../include
diff --git a/swig/sunlinsol/fsunlinsol_lapackdense_mod.i b/swig/sunlinsol/fsunlinsol_lapackdense_mod.i
new file mode 100644
index 0000000000..8ab3d7792c
--- /dev/null
+++ b/swig/sunlinsol/fsunlinsol_lapackdense_mod.i
@@ -0,0 +1,31 @@
+// ---------------------------------------------------------------
+// Programmer: Cody J. Balos @ LLNL
+// ---------------------------------------------------------------
+// SUNDIALS Copyright Start
+// Copyright (c) 2002-2023, Lawrence Livermore National Security
+// and Southern Methodist University.
+// All rights reserved.
+//
+// See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+// SUNDIALS Copyright End
+// ---------------------------------------------------------------
+// Swig interface file
+// ---------------------------------------------------------------
+
+%module fsunlinsol_lapackdense_mod
+
+// include code common to all nvector implementations
+%include "fsunlinsol.i"
+
+%{
+#include "sunlinsol/sunlinsol_lapackdense.h"
+%}
+
+// sunlinsol_impl macro defines some ignore and inserts with the linear solver name appended
+%sunlinsol_impl(LapackDense)
+
+// Process and wrap functions in the following files
+%include "sunlinsol/sunlinsol_lapackdense.h"
+

From 6c60a5639f0110aed00beaf1605ddf20ff3114fb Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Sat, 28 Oct 2023 18:59:04 -0500
Subject: [PATCH 15/35] Feature/new tables (#359)

 Additional embedded explicit Runge--Kutta
methods to ARKODE.

---------

Co-authored-by: Steven Roberts <roberts115@llnl.gov>
Co-authored-by: David J. Gardner <gardner48@llnl.gov>
---
 CHANGELOG.md                                  |   6 +-
 doc/arkode/guide/source/Butcher.rst           | 492 ++++++++++++++----
 doc/arkode/guide/source/Constants.rst         |  22 +
 doc/arkode/guide/source/Introduction.rst      |  15 +-
 doc/arkode/guide/source/Mathematics.rst       |  13 +-
 .../figs/arkode/shu_osher_erk_stab_region.png | Bin 0 -> 24768 bytes
 .../figs/arkode/v65b_erk_stab_region.png      | Bin 0 -> 24305 bytes
 .../figs/arkode/v76_erk_stab_region.png       | Bin 0 -> 24295 bytes
 .../figs/arkode/v87_erk_stab_region.png       | Bin 0 -> 24583 bytes
 .../figs/arkode/v98_erk_stab_region.png       | Bin 0 -> 24583 bytes
 doc/shared/sundials.bib                       |  40 +-
 include/arkode/arkode_arkstep.h               |   2 +
 include/arkode/arkode_butcher_erk.h           |   9 +-
 include/arkode/arkode_erkstep.h               |   2 +
 src/arkode/arkode_arkstep.c                   |   9 +-
 src/arkode/arkode_butcher_erk.def             | 380 +++++++++++++-
 src/arkode/arkode_erkstep.c                   |   9 +-
 test/answers                                  |   2 +-
 .../arkode/CXX_serial/ark_test_butcher.cpp    |   4 +-
 .../arkode/CXX_serial/ark_test_butcher.out    |  24 +
 20 files changed, 901 insertions(+), 128 deletions(-)
 create mode 100644 doc/shared/figs/arkode/shu_osher_erk_stab_region.png
 create mode 100644 doc/shared/figs/arkode/v65b_erk_stab_region.png
 create mode 100644 doc/shared/figs/arkode/v76_erk_stab_region.png
 create mode 100644 doc/shared/figs/arkode/v87_erk_stab_region.png
 create mode 100644 doc/shared/figs/arkode/v98_erk_stab_region.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b766f5c334..34c8cf9949 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,7 +32,11 @@ Added Fortran support for the LAPACK dense `SUNLinearSolver` implementations.
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
-Added the fourth order ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`.
+Added the third order ERK method `ARKODE_SHU_OSHER_3_2_3`, the fourth order
+ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`, the sixth order ERK method
+`ARKODE_VERNER_9_5_6`, the seventh order ERK method `ARKODE_VERNER_10_6_7`,
+the eighth order ERK method `ARKODE_VERNER_13_7_8`, and the ninth order ERK
+method `ARKODE_VERNER_16_8_9`.
 
 
 ## Changes to SUNDIALS in release 6.6.1
diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst
index c9166aa55a..b9654211f5 100644
--- a/doc/arkode/guide/source/Butcher.rst
+++ b/doc/arkode/guide/source/Butcher.rst
@@ -297,6 +297,39 @@ method from :cite:p:`KenCarp:03`).
    region is outlined in blue; the embedding's region is in red.
 
 
+Shu-Osher-3-2-3
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. index:: Shu-Osher-3-2-3 ERK method
+
+Accessible via the constant ``ARKODE_SHU_OSHER_3_2_3`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or
+:c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_SHU_OSHER_3_2_3"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+(from :cite:p:`ShOs:88` with embedding from :cite:p:`FCS:21`).
+
+.. math::
+
+   \renewcommand{\arraystretch}{1.5}
+   \begin{array}{r|ccc}
+     0 & 0 & 0 & 0 \\
+     1 & 0 & 0 & 0 \\
+     \frac{1}{2} & \frac{1}{4} & \frac{1}{4} & 0 \\
+     \hline
+     3 & \frac{1}{6} & \frac{1}{6} & \frac{2}{3} \\
+     2 & \frac{291485418878409}{1000000000000000} & \frac{291485418878409}{1000000000000000} & \frac{208514581121591}{500000000000000}
+   \end{array}
+
+.. figure:: /figs/arkode/shu_osher_erk_stab_region.png
+   :scale: 50 %
+   :align: center
+
+   Linear stability region for the Shu-Osher method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
 
 .. _Butcher.Knoth_Wolke:
 
@@ -355,6 +388,7 @@ Accessible via the string ``"ARKODE_SOFRONIOU_SPALETTA_5_3_4"`` to
      \frac{3}{5} & -\frac{3}{20} & \frac{3}{4} & 0 & 0 & 0 \\
      1 & \frac{19}{44} & -\frac{15}{44} & \frac{10}{11} & 0 & 0 \\
      1 & \frac{11}{72} & \frac{25}{72} & \frac{25}{72} & \frac{11}{72} & 0 \\
+     \hline
      4 & \frac{11}{72} & \frac{25}{72} & \frac{25}{72} & \frac{11}{72} & 0 \\
      3 & \frac{1251515}{8970912} & \frac{3710105}{8970912} & \frac{2519695}{8970912} & \frac{61105}{8970912} & \frac{119041}{747576} \\
    \end{array}
@@ -467,21 +501,27 @@ Accessible via the string ``"ARKODE_ARK437L2SA_ERK_7_3_4"`` to
 This is the explicit portion of the 4th order additive method (the explicit
 portion of the ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`).
 
-.. math::
+.. only:: html
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|ccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{247}{1000} & \frac{247}{1000} & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{4276536705230}{10142255878289} & \frac{247}{4000} & \frac{2694949928731}{7487940209513} & 0 & 0 & 0 & 0 & 0 \\
-     \frac{67}{200} & \frac{464650059369}{8764239774964} & \frac{878889893998}{2444806327765} & -\frac{952945855348}{12294611323341} & 0 & 0 & 0 & 0 \\
-     \frac{3}{40} & \frac{476636172619}{8159180917465} & -\frac{1271469283451}{7793814740893} & -\frac{859560642026}{4356155882851} & \frac{1723805262919}{4571918432560} & 0 & 0 & 0 \\
-     \frac{7}{10} & \frac{6338158500785}{11769362343261} & -\frac{4970555480458}{10924838743837} & \frac{3326578051521}{2647936831840} & -\frac{880713585975}{1841400956686} & -\frac{1428733748635}{8843423958496} & 0 & 0 \\
-     1 & \frac{760814592956}{3276306540349} & \frac{760814592956}{3276306540349} & -\frac{47223648122716}{6934462133451} & \frac{71187472546993}{9669769126921} & -\frac{13330509492149}{9695768672337} & \frac{11565764226357}{8513123442827} & 0 \\
-     \hline
-     4 & 0 & 0 & \frac{9164257142617}{17756377923965} & -\frac{10812980402763}{74029279521829} & \frac{1335994250573}{5691609445217} & \frac{2273837961795}{8368240463276} & \frac{247}{2000} \\
-     3 & 0 & 0 & \frac{4469248916618}{8635866897933} & -\frac{621260224600}{4094290005349} & \frac{696572312987}{2942599194819} & \frac{1532940081127}{5565293938103} & \frac{2441}{20000}
-   \end{array}
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|ccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{247}{1000} & \frac{247}{1000} & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{4276536705230}{10142255878289} & \frac{247}{4000} & \frac{2694949928731}{7487940209513} & 0 & 0 & 0 & 0 & 0 \\
+        \frac{67}{200} & \frac{464650059369}{8764239774964} & \frac{878889893998}{2444806327765} & -\frac{952945855348}{12294611323341} & 0 & 0 & 0 & 0 \\
+        \frac{3}{40} & \frac{476636172619}{8159180917465} & -\frac{1271469283451}{7793814740893} & -\frac{859560642026}{4356155882851} & \frac{1723805262919}{4571918432560} & 0 & 0 & 0 \\
+        \frac{7}{10} & \frac{6338158500785}{11769362343261} & -\frac{4970555480458}{10924838743837} & \frac{3326578051521}{2647936831840} & -\frac{880713585975}{1841400956686} & -\frac{1428733748635}{8843423958496} & 0 & 0 \\
+        1 & \frac{760814592956}{3276306540349} & \frac{760814592956}{3276306540349} & -\frac{47223648122716}{6934462133451} & \frac{71187472546993}{9669769126921} & -\frac{13330509492149}{9695768672337} & \frac{11565764226357}{8513123442827} & 0 \\
+        \hline
+        4 & 0 & 0 & \frac{9164257142617}{17756377923965} & -\frac{10812980402763}{74029279521829} & \frac{1335994250573}{5691609445217} & \frac{2273837961795}{8368240463276} & \frac{247}{2000} \\
+        3 & 0 & 0 & \frac{4469248916618}{8635866897933} & -\frac{621260224600}{4094290005349} & \frac{696572312987}{2942599194819} & \frac{1532940081127}{5565293938103} & \frac{2441}{20000}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
 .. figure:: /figs/arkode/stab_region_34.png
    :scale: 50 %
@@ -676,22 +716,29 @@ Accessible via the string ``"ARKODE_ARK548L2SA_ERK_8_4_5"`` to
 This is the explicit portion of the default 5th order additive method (the
 explicit portion of the ARK5(4)8L[2]SA method from :cite:p:`KenCarp:03`).
 
-.. math::
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{41}{100} & \frac{41}{100} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{2935347310677}{11292855782101} & \frac{367902744464}{2072280473677} & \frac{677623207551}{8224143866563} & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{1426016391358}{7196633302097} & \frac{1268023523408}{10340822734521} & 0 & \frac{1029933939417}{13636558850479} & 0 & 0 & 0 & 0 & 0 \\
+        \frac{92}{100} & \frac{14463281900351}{6315353703477} & 0 & \frac{66114435211212}{5879490589093} & -\frac{54053170152839}{4284798021562} & 0 & 0 & 0 & 0 \\
+        \frac{24}{100} & \frac{14090043504691}{34967701212078} & 0 & \frac{15191511035443}{11219624916014} & -\frac{18461159152457}{12425892160975} & -\frac{281667163811}{9011619295870} & 0 & 0 & 0 \\
+        \frac{3}{5} & \frac{19230459214898}{13134317526959} & 0 & \frac{21275331358303}{2942455364971} & -\frac{38145345988419}{4862620318723} & -\frac{1}{8} & -\frac{1}{8} & 0 & 0 \\
+        1 & -\frac{19977161125411}{11928030595625} & 0 & -\frac{40795976796054}{6384907823539} & \frac{177454434618887}{12078138498510} & \frac{782672205425}{8267701900261} & -\frac{69563011059811}{9646580694205} & \frac{7356628210526}{4942186776405} & 0 \\
+        \hline
+        5 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
+        4 & -\frac{975461918565}{9796059967033} & 0 & 0 & \frac{78070527104295}{32432590147079} & -\frac{548382580838}{3424219808633} & -\frac{33438840321285}{15594753105479} & \frac{3629800801594}{4656183773603} & \frac{4035322873751}{18575991585200}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|cccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{41}{100} & \frac{41}{100} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{2935347310677}{11292855782101} & \frac{367902744464}{2072280473677} & \frac{677623207551}{8224143866563} & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{1426016391358}{7196633302097} & \frac{1268023523408}{10340822734521} & 0 & \frac{1029933939417}{13636558850479} & 0 & 0 & 0 & 0 & 0 \\
-     \frac{92}{100} & \frac{14463281900351}{6315353703477} & 0 & \frac{66114435211212}{5879490589093} & -\frac{54053170152839}{4284798021562} & 0 & 0 & 0 & 0 \\
-     \frac{24}{100} & \frac{14090043504691}{34967701212078} & 0 & \frac{15191511035443}{11219624916014} & -\frac{18461159152457}{12425892160975} & -\frac{281667163811}{9011619295870} & 0 & 0 & 0 \\
-     \frac{3}{5} & \frac{19230459214898}{13134317526959} & 0 & \frac{21275331358303}{2942455364971} & -\frac{38145345988419}{4862620318723} & -\frac{1}{8} & -\frac{1}{8} & 0 & 0 \\
-     1 & -\frac{19977161125411}{11928030595625} & 0 & -\frac{40795976796054}{6384907823539} & \frac{177454434618887}{12078138498510} & \frac{782672205425}{8267701900261} & -\frac{69563011059811}{9646580694205} & \frac{7356628210526}{4942186776405} & 0 \\
-     \hline
-     5 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
-     4 & -\frac{975461918565}{9796059967033} & 0 & 0 & \frac{78070527104295}{32432590147079} & -\frac{548382580838}{3424219808633} & -\frac{33438840321285}{15594753105479} & \frac{3629800801594}{4656183773603} & \frac{4035322873751}{18575991585200}
-   \end{array}
 
 .. figure:: /figs/arkode/stab_region_9.png
    :scale: 50 %
@@ -721,22 +768,28 @@ Accessible via the string ``"ARKODE_ARK548L2SAb_ERK_8_4_5"`` to
 This is the explicit portion of the 5th order ARK5(4)8L[2]SA method from
 :cite:p:`KenCarp:19`.
 
-.. math::
+.. only:: html
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|cccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{4}{9} & \frac{4}{9} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{6456083330201}{8509243623797} & \frac{1}{9} & \frac{1183333538310}{1827251437969} & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{1632083962415}{14158861528103} & \frac{895379019517}{9750411845327} & \frac{477606656805}{13473228687314} & \frac{-112564739183}{9373365219272} & 0 & 0 & 0 & 0 & 0 \\
-     \frac{6365430648612}{17842476412687} & \frac{-4458043123994}{13015289567637} & \frac{-2500665203865}{9342069639922} & \frac{983347055801}{8893519644487} & \frac{2185051477207}{2551468980502} & 0 & 0 & 0 & 0 \\
-     \frac{18}{25} & \frac{-167316361917}{17121522574472} & \frac{1605541814917}{7619724128744} & \frac{991021770328}{13052792161721} & \frac{2342280609577}{11279663441611} & \frac{3012424348531}{12792462456678} & 0 & 0 & 0 \\
-     \frac{191}{200} & \frac{6680998715867}{14310383562358} & \frac{5029118570809}{3897454228471} & \frac{2415062538259}{6382199904604} & \frac{-3924368632305}{6964820224454} & \frac{-4331110370267}{15021686902756} & \frac{-3944303808049}{11994238218192} & 0 & 0 \\
-     1 & \frac{2193717860234}{3570523412979} & \frac{2193717860234}{3570523412979} & \frac{5952760925747}{18750164281544} & \frac{-4412967128996}{6196664114337} & \frac{4151782504231}{36106512998704} & \frac{572599549169}{6265429158920} & \frac{-457874356192}{11306498036315} & 0 \\
-     \hline
-     5 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & \frac{-1142099968913}{5710983926999} & \frac{2}{9} \\
-     4 & 0 & 0 & \frac{520639020421}{8300446712847} & \frac{4550235134915}{17827758688493} & \frac{1482366381361}{6201654941325} & \frac{5551607622171}{13911031047899} & \frac{-5266607656330}{36788968843917} & \frac{1074053359553}{5740751784926}
-   \end{array}
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{4}{9} & \frac{4}{9} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{6456083330201}{8509243623797} & \frac{1}{9} & \frac{1183333538310}{1827251437969} & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{1632083962415}{14158861528103} & \frac{895379019517}{9750411845327} & \frac{477606656805}{13473228687314} & \frac{-112564739183}{9373365219272} & 0 & 0 & 0 & 0 & 0 \\
+        \frac{6365430648612}{17842476412687} & \frac{-4458043123994}{13015289567637} & \frac{-2500665203865}{9342069639922} & \frac{983347055801}{8893519644487} & \frac{2185051477207}{2551468980502} & 0 & 0 & 0 & 0 \\
+        \frac{18}{25} & \frac{-167316361917}{17121522574472} & \frac{1605541814917}{7619724128744} & \frac{991021770328}{13052792161721} & \frac{2342280609577}{11279663441611} & \frac{3012424348531}{12792462456678} & 0 & 0 & 0 \\
+        \frac{191}{200} & \frac{6680998715867}{14310383562358} & \frac{5029118570809}{3897454228471} & \frac{2415062538259}{6382199904604} & \frac{-3924368632305}{6964820224454} & \frac{-4331110370267}{15021686902756} & \frac{-3944303808049}{11994238218192} & 0 & 0 \\
+        1 & \frac{2193717860234}{3570523412979} & \frac{2193717860234}{3570523412979} & \frac{5952760925747}{18750164281544} & \frac{-4412967128996}{6196664114337} & \frac{4151782504231}{36106512998704} & \frac{572599549169}{6265429158920} & \frac{-457874356192}{11306498036315} & 0 \\
+        \hline
+        5 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & \frac{-1142099968913}{5710983926999} & \frac{2}{9} \\
+        4 & 0 & 0 & \frac{520639020421}{8300446712847} & \frac{4550235134915}{17827758688493} & \frac{1482366381361}{6201654941325} & \frac{5551607622171}{13911031047899} & \frac{-5266607656330}{36788968843917} & \frac{1074053359553}{5740751784926}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
 
 .. figure:: /figs/arkode/stab_region_35.png
@@ -790,6 +843,107 @@ This is the default 6th order explicit method (from :cite:p:`Ver:78`).
 
 
 
+.. _Butcher.Verner-6-5b:
+
+Verner-9-5-6
+^^^^^^^^^^^^^^
+
+.. index:: Verner-9-5-6 ERK method
+
+Accessible via the constant ``ARKODE_VERNER_9_5_6`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`
+or :c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_VERNER_9_5_6"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+This is the 6th order explicit method IIIXb-6(5) from :cite:p:`Ver:10`.
+
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|ccccccccc}
+        0           & 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{3}{50}        & \frac{3}{50}& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{1439}{15000}  & \frac{519479}{27000000}& \frac{2070721}{27000000}& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{1439}{10000}  & \frac{1439}{40000}& 0& \frac{4317}{40000}& 0& 0& 0& 0& 0& 0\\
+        \frac{4973}{10000}  & \frac{109225017611}{82828840000}& 0& -\frac{417627820623}{82828840000}& \frac{43699198143}{10353605000}& 0& 0& 0& 0& 0\\
+        \frac{389}{400}     & -\frac{8036815292643907349452552172369}{191934985946683241245914401600}& 0& \frac{246134619571490020064824665}{1543816496655405117602368}& -\frac{13880495956885686234074067279}{113663489566254201783474344}& \frac{755005057777788994734129}{136485922925633667082436}& 0& 0& 0& 0\\
+        \frac{1999}{2000}   & -\frac{1663299841566102097180506666498880934230261}{30558424506156170307020957791311384232000}& 0& \frac{130838124195285491799043628811093033}{631862949514135618861563657970240}& -\frac{3287100453856023634160618787153901962873}{20724314915376755629135711026851409200}& \frac{2771826790140332140865242520369241}{396438716042723436917079980147600}& -\frac{1799166916139193}{96743806114007800}& 0& 0& 0\\
+        1           & -\frac{832144750039369683895428386437986853923637763}{15222974550069600748763651844667619945204887}& 0& \frac{818622075710363565982285196611368750}{3936576237903728151856072395343129}& -\frac{9818985165491658464841194581385463434793741875}{61642597962658994069869370923196463581866011}& \frac{31796692141848558720425711042548134769375}{4530254033500045975557858016006308628092}& -\frac{14064542118843830075}{766928748264306853644}& -\frac{1424670304836288125}{2782839104764768088217}& 0& 0\\
+        1           &   \frac{382735282417}{11129397249634}& 0& 0& \frac{5535620703125000}{21434089949505429}& \frac{13867056347656250}{32943296570459319}& \frac{626271188750}{142160006043}& -\frac{51160788125000}{289890548217}& \frac{163193540017}{946795234}& 0\\
+        \hline
+        6           & \frac{382735282417}{11129397249634}& 0& 0& \frac{5535620703125000}{21434089949505429}& \frac{13867056347656250}{32943296570459319}& \frac{626271188750}{142160006043}& -\frac{51160788125000}{289890548217}& \frac{163193540017}{946795234}& 0 \\
+        5           & \frac{273361583}{5567482366}& 0& 0& \frac{1964687500000}{8727630165387}& \frac{596054687500}{1269637976277}& \frac{12740367500}{15795556227}& 0& -\frac{4462730789736252634813752317}{7350663039626676022821734166}& \frac{441454562788983500}{7763730504400359099}
+      \end{array}
+
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
+
+
+
+.. figure:: /figs/arkode/v65b_erk_stab_region.png
+   :scale: 75 %
+   :align: center
+
+   Linear stability region for the Verner-9-5-6 method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
+.. _Butcher.Verner-7-6:
+
+Verner-10-6-7
+^^^^^^^^^^^^^^
+
+.. index:: Verner-10-6-7 ERK method
+
+Accessible via the constant ``ARKODE_VERNER_10_6_7`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`
+or :c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_VERNER_10_6_7"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+This is the default 7th order explicit method (from :cite:p:`Ver:10`).
+
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccccc}
+        0                      & 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{1}{200}                  & \frac{1}{200}& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{49}{450}                 & -\frac{4361}{4050}& \frac{2401}{2025}& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{49}{300}                 & \frac{49}{1200}& 0& \frac{49}{400}& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{911}{2000}               & \frac{2454451729}{3841600000}& 0& -\frac{9433712007}{3841600000}& \frac{4364554539}{1920800000}& 0& 0& 0& 0& 0& 0\\
+        \frac{3480084980}{5709648941}  & -\frac{6187101755456742839167388910402379177523537620}{2324599620333464857202963610201679332423082271}& 0& \frac{27569888999279458303270493567994248533230000}{2551701010245296220859455115479340650299761}& -\frac{37368161901278864592027018689858091583238040000}{4473131870960004275166624817435284159975481033}& \frac{1392547243220807196190880383038194667840000000}{1697219131380493083996999253929006193143549863}& 0& 0& 0& 0& 0\\
+        \frac{221}{250}                & \frac{11272026205260557297236918526339}{1857697188743815510261537500000}& 0& -\frac{48265918242888069}{1953194276993750}& \frac{26726983360888651136155661781228}{1308381343805114800955157615625}& -\frac{2090453318815827627666994432}{1096684189897834170412307919}& \frac{1148577938985388929671582486744843844943428041509}{1141532118233823914568777901158338927629837500000}& 0& 0& 0& 0\\
+        \frac{37}{40}                  & \frac{1304457204588839386329181466225966641}{108211771565488329642169667802016000}& 0& -\frac{1990261989751005}{40001418792832}& \frac{2392691599894847687194643439066780106875}{58155654089143548047476915856270826016}& -\frac{1870932273351008733802814881998561250}{419326053051486744762255151208232123}& \frac{1043329047173803328972823866240311074041739158858792987034783181}{510851127745017966999893975119259285040213723744255237522144000}& -\frac{311918858557595100410788125}{3171569057622789618800376448}& 0& 0& 0\\
+        1                      & \frac{17579784273699839132265404100877911157}{1734023495717116205617154737841023480}& 0& -\frac{18539365951217471064750}{434776548575709731377}& \frac{447448655912568142291911830292656995992000}{12511202807447096607487664209063950964109}& -\frac{65907597316483030274308429593905808000000}{15158061430635748897861852383197382130691}& \frac{273847823027445129865693702689010278588244606493753883568739168819449761}{136252034448398939768371761610231099586032870552034688235302796640584360}& \frac{694664732797172504668206847646718750}{1991875650119463976442052358853258111}& -\frac{19705319055289176355560129234220800}{72595753317320295604316217197876507}& 0& 0\\
+        1                      & -\frac{511858190895337044664743508805671}{11367030248263048398341724647960}& 0& \frac{2822037469238841750}{15064746656776439}& -\frac{23523744880286194122061074624512868000}{152723005449262599342117017051789699}& \frac{10685036369693854448650967542704000000}{575558095977344459903303055137999707}& -\frac{6259648732772142303029374363607629515525848829303541906422993}{876479353814142962817551241844706205620792843316435566420120}& \frac{17380896627486168667542032602031250}{13279937889697320236613879977356033}& 0& 0& 0\\
+        \hline
+        7                      & \frac{96762636172307789}{2051985304794103980}& 0& 0& \frac{312188947591288252500000}{1212357694274963646019729}& \frac{13550580884964304000000000000}{51686919683339547115937980629}& \frac{72367769693133178898676076432831566019684378142853445230956642801}{475600216991873963561768100160364792981629064220601844848928537580}& \frac{1619421054120605468750}{3278200730370057108183}& -\frac{66898316144057728000}{227310933007074849597}& \frac{181081444637946577}{2226845467039736466}& 0 \\
+        6                      & \frac{117807213929927}{2640907728177740}& 0& 0& \frac{4758744518816629500000}{17812069906509312711137}& \frac{1730775233574080000000000}{7863520414322158392809673}& \frac{2682653613028767167314032381891560552585218935572349997}{12258338284789875762081637252125169126464880985167722660}& \frac{40977117022675781250}{178949401077111131341}& 0& 0& \frac{2152106665253777}{106040260335225546}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
+
+
+.. figure:: /figs/arkode/v76_erk_stab_region.png
+   :scale: 75 %
+   :align: center
+
+   Linear stability region for the Verner-10-6-7 method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
 .. _Butcher.Fehlberg-8-7:
 
 Fehlberg-13-7-8
@@ -837,6 +991,117 @@ This is the default 8th order explicit method (from :cite:p:`Butcher:08`).
 
 
 
+.. _Butcher.Verner-8-7:
+
+Verner-13-7-8
+^^^^^^^^^^^^^^
+
+.. index:: Verner-13-7-8 ERK method
+
+Accessible via the constant ``ARKODE_VERNER_13_7_8`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`
+or :c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_VERNER_13_7_8"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+This is the 8th order explicit method IIIX-8(7) from :cite:p:`Ver:10`.
+
+
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|ccccccccccccc}
+        0                           & 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{1}{20}                        & \frac{1}{20}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{341}{3200}                    & -\frac{7161}{1024000}& \frac{116281}{1024000}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{1023}{6400}                   & \frac{1023}{25600}& 0& \frac{3069}{25600}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{39}{100}                      & \frac{4202367}{11628100}& 0& -\frac{3899844}{2907025}& \frac{3982992}{2907025}& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{93}{200}                      & \frac{5611}{114400}& 0& 0& \frac{31744}{135025}& \frac{923521}{5106400}& 0& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{31}{200}                      & \frac{21173}{343200}& 0& 0& \frac{8602624}{76559175}& -\frac{26782109}{689364000}& \frac{5611}{283500}& 0& 0& 0& 0& 0& 0& 0\\
+        \frac{943}{1000}                    & -\frac{1221101821869329}{690812928000000}& 0& 0& -\frac{125}{2}& -\frac{1024030607959889}{168929280000000}& \frac{1501408353528689}{265697280000000}& \frac{6070139212132283}{92502016000000}& 0& 0& 0& 0& 0& 0\\
+        \frac{7067558016280}{7837150160667} &  -\frac{1472514264486215803881384708877264246346044433307094207829051978044531801133057155}{1246894801620032001157059621643986024803301558393487900440453636168046069686436608}& 0& 0& -\frac{5172294311085668458375175655246981230039025336933699114138315270772319372469280000}{124619381004809145897278630571215298365257079410236252921850936749076487132995191}& -\frac{12070679258469254807978936441733187949484571516120469966534514296406891652614970375}{2722031154761657221710478184531100699497284085048389015085076961673446140398628096}& \frac{780125155843893641323090552530431036567795592568497182701460674803126770111481625}{183110425412731972197889874507158786859226102980861859505241443073629143100805376}& \frac{664113122959911642134782135839106469928140328160577035357155340392950009492511875}{15178465598586248136333023107295349175279765150089078301139943253016877823170816}& \frac{10332848184452015604056836767286656859124007796970668046446015775000000}{1312703550036033648073834248740727914537972028638950165249582733679393783}& 0& 0& 0& 0& 0\\
+        \frac{909}{1000}                    & -\frac{29055573360337415088538618442231036441314060511}{22674759891089577691327962602370597632000000000}& 0& 0& -\frac{20462749524591049105403365239069}{454251913499893469596231268750}& -\frac{180269259803172281163724663224981097}{38100922558256871086579832832000000}& \frac{21127670214172802870128286992003940810655221489}{4679473877997892906145822697976708633673728000}& \frac{318607235173649312405151265849660869927653414425413}{6714716715558965303132938072935465423910912000000}& \frac{212083202434519082281842245535894}{20022426044775672563822865371173879}& -\frac{2698404929400842518721166485087129798562269848229517793703413951226714583}{469545674913934315077000442080871141884676035902717550325616728175875000000}& 0& 0& 0& 0\\
+        \frac{47}{50}                       & -\frac{2342659845814086836951207140065609179073838476242943917}{1358480961351056777022231400139158760857532162795520000}& 0& 0& -\frac{996286030132538159613930889652}{16353068885996164905464325675}& -\frac{26053085959256534152588089363841}{4377552804565683061011299942400}& \frac{20980822345096760292224086794978105312644533925634933539}{3775889992007550803878727839115494641972212962174156800}& \frac{890722993756379186418929622095833835264322635782294899}{13921242001395112657501941955594013822830119803764736}& \frac{161021426143124178389075121929246710833125}{10997207722131034650667041364346422894371443}& \frac{300760669768102517834232497565452434946672266195876496371874262392684852243925359864884962513}{4655443337501346455585065336604505603760824779615521285751892810315680492364106674524398280000}& -\frac{31155237437111730665923206875}{392862141594230515010338956291}& 0& 0& 0\\
+        1                           & -\frac{2866556991825663971778295329101033887534912787724034363}{868226711619262703011213925016143612030669233795338240}& 0& 0& -\frac{16957088714171468676387054358954754000}{143690415119654683326368228101570221}& -\frac{4583493974484572912949314673356033540575}{451957703655250747157313034270335135744}& \frac{2346305388553404258656258473446184419154740172519949575}{256726716407895402892744978301151486254183185289662464}& \frac{1657121559319846802171283690913610698586256573484808662625}{13431480411255146477259155104956093505361644432088109056}& \frac{345685379554677052215495825476969226377187500}{74771167436930077221667203179551347546362089}& -\frac{3205890962717072542791434312152727534008102774023210240571361570757249056167015230160352087048674542196011}{947569549683965814783015124451273604984657747127257615372449205973192657306017239103491074738324033259120}& \frac{40279545832706233433100438588458933210937500}{8896460842799482846916972126377338947215101}& -\frac{6122933601070769591613093993993358877250}{1050517001510235513198246721302027675953}& 0& 0\\
+        1                           & -\frac{618675905535482500672800859344538410358660153899637}{203544282118214047100119475340667684874292102389760}& 0& 0& -\frac{4411194916804718600478400319122931000}{40373053902469967450761491269633019}& -\frac{16734711409449292534539422531728520225}{1801243715290088669307203927210237952}& \frac{135137519757054679098042184152749677761254751865630525}{16029587794486289597771326361911895112703716593983488}& \frac{38937568367409876012548551903492196137929710431584875}{340956454090191606099548798001469306974758443147264}& -\frac{6748865855011993037732355335815350667265625}{7002880395717424621213565406715087764770357}& -\frac{1756005520307450928195422767042525091954178296002788308926563193523662404739779789732685671}{348767814578469983605688098046186480904607278021030540735333862087061574934154942830062320}& \frac{53381024589235611084013897674181629296875}{8959357584795694524874969598508592944141}& 0& 0& 0\\
+        \hline
+        8                           & \frac{44901867737754616851973}{1014046409980231013380680}& 0& 0& 0& 0& \frac{791638675191615279648100000}{2235604725089973126411512319}& \frac{3847749490868980348119500000}{15517045062138271618141237517}& -\frac{13734512432397741476562500000}{875132892924995907746928783}& \frac{12274765470313196878428812037740635050319234276006986398294443554969616342274215316330684448207141}{489345147493715517650385834143510934888829280686609654482896526796523353052166757299452852166040}& -\frac{9798363684577739445312500000}{308722986341456031822630699}& \frac{282035543183190840068750}{12295407629873040425991}& -\frac{306814272936976936753}{1299331183183744997286}& 0\\
+        7                           & \frac{10835401739407019406577}{244521829356935137978320}& 0& 0& 0& 0& \frac{13908189778321895491375000}{39221135527894265375640567}& \frac{73487947527027243487625000}{296504045773342769773399443}& \frac{68293140641257649609375000}{15353208647806945749946119}& \frac{22060647948996678611017711379974578860522018208949721559448560203338437626022142776381}{1111542009262325874512959185795727215759010577565736079641376621381577236680929558640}& -\frac{547971229495642458203125000}{23237214025700991642563601}& 0& 0& -\frac{28735456870978964189}{79783493704265043693}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
+
+
+.. figure:: /figs/arkode/v87_erk_stab_region.png
+   :scale: 75 %
+   :align: center
+
+   Linear stability region for the Verner-13-7-8 method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
+.. _Butcher.Verner-9-8:
+
+Verner-16-8-9
+^^^^^^^^^^^^^^
+
+.. index:: Verner-16-8-9 ERK method
+
+Accessible via the constant ``ARKODE_VERNER_16_8_9`` to
+:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`
+or :c:func:`ARKodeButcherTable_LoadERK`.
+Accessible via the string ``"ARKODE_VERNER_16_8_9"`` to
+:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or
+:c:func:`ARKodeButcherTable_LoadERKByName`.
+This is the default 9th order explicit method (from :cite:p:`Ver:10`).
+
+
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccccccccccc}
+       0                                             & 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.03462                                     & 0.03462& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.09702435063878044594828361677100617517633 & -0.0389335438857287327017042687229284478532& 0.1359578945245091786499878854939346230295& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.1455365259581706689224254251565092627645    & 0.03638413148954266723060635628912731569111& 0& 0.1091523944686280016918190688673819470733& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.561                                         & 2.025763914393969636805657604282571047511& 0& -7.638023836496292020387602153091964592952& 6.173259922102322383581944548809393545442& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.2290079115904850126662751771814700052182    & 0.05112275589406060872792270881648288397197& 0& 0& 0.1770823794555021537929910813839068684087& 0.00080277624092225014536138698108025283759& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.5449920884095149873337248228185299947818    & 0.1316006357975216279279871693164256985334& 0& 0& -0.2957276252669636417685183174672273730699& 0.0878137803564295237421124704053886667082& 0.6213052975225274774321435005639430026100& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.645                                         & 0.07166666666666666666666666666666666666667& 0& 0& 0& 0& 0.3305533578915319409260346730051472207728& 0.2427799754418013924072986603281861125606& 0& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.48375                                       & 0.071806640625& 0& 0& 0& 0& 0.3294380283228177160744825466257672816401& 0.1165190029271822839255174533742327183599& -0.034013671875& 0& 0& 0& 0& 0& 0& 0& 0\\
+       0.06757                                     & 0.04836757646340646986611287718844085773549& 0& 0& 0& 0& 0.03928989925676163974333190042057047002852& 0.1054740945890344608263649267140088017604& -0.02143865284648312665982642293830533996214& -0.1041229174627194437759832813847147895623& 0& 0& 0& 0& 0& 0& 0\\
+       0.25                                          & -0.02664561487201478635337289243849737340534& 0& 0& 0& 0& 0.03333333333333333333333333333333333333333& -0.1631072244872467239162704487554706387141& 0.03396081684127761199487954930015522928244& 0.1572319413814626097110769806810024118077& 0.2152267478031879552303534778794770376960& 0& 0& 0& 0& 0& 0\\
+       0.6590650618730998549405331618649220295334    & 0.03689009248708622334786359863227633989718& 0& 0& 0& 0& -0.1465181576725542928653609891758501156785& 0.2242577768172024345345469822625833796001& 0.02294405717066072637090897902753790803034& -0.0035850052905728761357394424889330334334& 0.08669223316444385506869203619044453906053& 0.4383840651968337846196219974168630120572& 0& 0& 0& 0& 0\\
+       0.8206                                        & -0.4866012215113340846662212357570395295088& 0& 0& 0& 0& -6.304602650282852990657772792012007122988& -0.281245618289472564778284183790118418111& -2.679019236219849057687906597489223155566& 0.518815663924157511565311164615012522024& 1.365353187603341710683633635235238678626& 5.885091088503946585721274891680604830712& 2.802808786272062889819965117517532194812& 0& 0& 0& 0\\
+       0.9012                                        & 0.4185367457753471441471025246471931649633& 0& 0& 0& 0& 6.724547581906459363100870806514855026676& -0.425444280164611790606983409697113064616& 3.343279153001265577811816947557982637749& 0.617081663117537759528421117507709784737& -0.929966123939932833937749523988800852013& -6.099948804751010722472962837945508844846& -3.002206187889399044804158084895173690015& 0.2553202529443445472336424602988558373637& 0& 0& 0\\
+       1                                             & -0.779374086122884664644623040843840506343& 0& 0& 0& 0& -13.93734253810777678786523664804936051203& 1.252048853379357320949735183924200895136& -14.69150040801686878191527989293072091588& -0.494705058533141685655191992136962873577& 2.242974909146236657906984549543692874755& 13.36789380382864375813864978592679139881& 14.39665048665068644512236935340272139005& -0.7975813331776800379127866056663258667437& 0.4409353709534277758753793068298041158235& 0& 0\\
+       1                                             & 2.058051337466886442151242368989994043993& 0& 0& 0& 0& 22.35793772796803295519317565842520212899& 0.90949810997556332745009198137971890783& 35.89110098240264104710550686568482456493& -3.442515027624453437985000403608480262211& -4.865481358036368826566013387928704014496& -18.90980381354342625688427480879773032857& -34.26354448030451782929251177395134170515& 1.264756521695642578827783499806516664686& 0& 0& 0\\
+       \hline
+       9                                             & 0.01461197685842315252051541915018784713459& 0& 0& 0& 0& 0& 0& -0.3915211862331339089410228267288242030810& 0.2310932500289506415909675644868993669908& 0.1274766769992852382560589467488989175618& 0.2246434176204157731566981937082069688984& 0.5684352689748512932705226972873692126743& 0.05825871557215827200814768021863420902155& 0.1364317403482215641609022744494239843327& 0.03057013983082797397721005067920369646664& 0\\
+       8                                             & 0.01996996514886773085518508418098868756464& 0& 0& 0& 0& 0& 0& 2.191499304949330054530747099310837524864& 0.08857071848208438030833722031786358862953& 0.1140560234865965622484956605091432032674& 0.2533163805345107065564577734569651977347& -2.056564386240941011158999594595981300493& 0.3408096799013119935160094894224543812830& 0& 0& 0.04834231373823958314376726739772871714902
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
+
+
+.. figure:: /figs/arkode/v98_erk_stab_region.png
+   :scale: 75 %
+   :align: center
+
+   Linear stability region for the Verner-16-8-9 method.  The method's
+   region is outlined in blue; the embedding's region is in red.
+
+
+
 
 
 .. _Butcher.implicit:
@@ -1303,19 +1568,26 @@ Accessible via the string ``"ARKODE_KVAERNO_5_3_4"`` to
 :c:func:`ARKodeButcherTable_LoadDIRKByName`.
 Both the method and embedding are A-stable (from :cite:p:`Kva:04`).
 
-.. math::
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|ccccc}
+        0 & 0 & 0 & 0 & 0 & 0 \\
+        0.871733043 & 0.4358665215  & 0.4358665215  & 0 & 0 & 0 \\
+        0.468238744853136 & 0.140737774731968 & -0.108365551378832 & 0.4358665215 & 0 & 0 \\
+        1 & 0.102399400616089 & -0.376878452267324 & 0.838612530151233 & 0.4358665215 & 0 \\
+        1 & 0.157024897860995 & 0.117330441357768 & 0.61667803039168 & -0.326899891110444 & 0.4358665215 \\
+        \hline
+        4 & 0.157024897860995 & 0.117330441357768 & 0.61667803039168 & -0.326899891110444 & 0.4358665215 \\
+        3 & 0.102399400616089 & -0.376878452267324 & 0.838612530151233 & 0.4358665215 & 0
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|ccccc}
-     0 & 0 & 0 & 0 & 0 & 0 \\
-     0.871733043 & 0.4358665215  & 0.4358665215  & 0 & 0 & 0 \\
-     0.468238744853136 & 0.140737774731968 & -0.108365551378832 & 0.4358665215 & 0 & 0 \\
-     1 & 0.102399400616089 & -0.376878452267324 & 0.838612530151233 & 0.4358665215 & 0 \\
-     1 & 0.157024897860995 & 0.117330441357768 & 0.61667803039168 & -0.326899891110444 & 0.4358665215 \\
-     \hline
-     4 & 0.157024897860995 & 0.117330441357768 & 0.61667803039168 & -0.326899891110444 & 0.4358665215 \\
-     3 & 0.102399400616089 & -0.376878452267324 & 0.838612530151233 & 0.4358665215 & 0
-   \end{array}
 
 .. figure:: /figs/arkode/stab_region_19.png
    :scale: 50 %
@@ -1521,21 +1793,28 @@ Accessible via the string ``"ARKODE_KVAERNO_7_4_5"`` to
 Both the method and embedding are A-stable; additionally the method is
 L-stable (from :cite:p:`Kva:04`).
 
-.. math::
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|ccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        0.52 & 0.26 & 0.26 & 0 & 0 & 0 & 0 & 0 \\
+        1.230333209967908 & 0.13 & 0.84033320996790809 & 0.26 & 0 & 0 & 0 & 0 \\
+        0.895765984350076 & 0.22371961478320505 & 0.47675532319799699 & -0.06470895363112615 & 0.26 & 0 & 0 & 0 \\
+        0.436393609858648 & 0.16648564323248321 & 0.10450018841591720 & 0.03631482272098715 & -0.13090704451073998 & 0.26 & 0 & 0 \\
+        1 & 0.13855640231268224 & 0 & -0.04245337201752043 & 0.02446657898003141 & 0.61943039072480676 & 0.26 & 0 \\
+        1 & 0.13659751177640291 & 0 & -0.05496908796538376 & -0.04118626728321046 & 0.62993304899016403 & 0.06962479448202728 & 0.26 \\
+        \hline
+        5 & 0.13659751177640291 & 0 & -0.05496908796538376 & -0.04118626728321046 & 0.62993304899016403 & 0.06962479448202728 & 0.26 \\
+        4 & 0.13855640231268224 & 0 & -0.04245337201752043 & 0.02446657898003141 & 0.61943039072480676 & 0.26 & 0
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|ccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     0.52 & 0.26 & 0.26 & 0 & 0 & 0 & 0 & 0 \\
-     1.230333209967908 & 0.13 & 0.84033320996790809 & 0.26 & 0 & 0 & 0 & 0 \\
-     0.895765984350076 & 0.22371961478320505 & 0.47675532319799699 & -0.06470895363112615 & 0.26 & 0 & 0 & 0 \\
-     0.436393609858648 & 0.16648564323248321 & 0.10450018841591720 & 0.03631482272098715 & -0.13090704451073998 & 0.26 & 0 & 0 \\
-     1 & 0.13855640231268224 & 0 & -0.04245337201752043 & 0.02446657898003141 & 0.61943039072480676 & 0.26 & 0 \\
-     1 & 0.13659751177640291 & 0 & -0.05496908796538376 & -0.04118626728321046 & 0.62993304899016403 & 0.06962479448202728 & 0.26 \\
-     \hline
-     5 & 0.13659751177640291 & 0 & -0.05496908796538376 & -0.04118626728321046 & 0.62993304899016403 & 0.06962479448202728 & 0.26 \\
-     4 & 0.13855640231268224 & 0 & -0.04245337201752043 & 0.02446657898003141 & 0.61943039072480676 & 0.26 & 0
-   \end{array}
 
 .. figure:: /figs/arkode/stab_region_21.png
    :scale: 50 %
@@ -1568,22 +1847,29 @@ default 5th order additive method.  Both the method and embedding are A-stable;
 additionally the method is L-stable (the implicit portion of the ARK5(4)8L[2]SA
 method from :cite:p:`KenCarp:03`).
 
-.. math::
+.. only:: html
+
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{41}{100} & \frac{41}{200} & \frac{41}{200} & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{2935347310677}{11292855782101} & \frac{41}{400} & -\frac{567603406766}{11931857230679} & \frac{41}{200} & 0 & 0 & 0 & 0 & 0 \\
+        \frac{1426016391358}{7196633302097} & \frac{683785636431}{9252920307686} & 0 & -\frac{110385047103}{1367015193373} & \frac{41}{200} & 0 & 0 & 0 & 0 \\
+        \frac{92}{100} & \frac{3016520224154}{10081342136671} & 0 & \frac{30586259806659}{12414158314087} & -\frac{22760509404356}{11113319521817} & \frac{41}{200} & 0 & 0 & 0 \\
+        \frac{24}{100} & \frac{218866479029}{1489978393911} & 0 & \frac{638256894668}{5436446318841} & -\frac{1179710474555}{5321154724896} & -\frac{60928119172}{8023461067671} & \frac{41}{200} & 0 & 0 \\
+        \frac{3}{5} & \frac{1020004230633}{5715676835656} & 0 & \frac{25762820946817}{25263940353407} & -\frac{2161375909145}{9755907335909} & -\frac{211217309593}{5846859502534} & -\frac{4269925059573}{7827059040749} & \frac{41}{200} & 0 \\
+        1 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
+        \hline
+        5 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
+        4 & -\frac{975461918565}{9796059967033} & 0 & 0 & \frac{78070527104295}{32432590147079} & -\frac{548382580838}{3424219808633} & -\frac{33438840321285}{15594753105479} & \frac{3629800801594}{4656183773603} & \frac{4035322873751}{18575991585200}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|cccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{41}{100} & \frac{41}{200} & \frac{41}{200} & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{2935347310677}{11292855782101} & \frac{41}{400} & -\frac{567603406766}{11931857230679} & \frac{41}{200} & 0 & 0 & 0 & 0 & 0 \\
-     \frac{1426016391358}{7196633302097} & \frac{683785636431}{9252920307686} & 0 & -\frac{110385047103}{1367015193373} & \frac{41}{200} & 0 & 0 & 0 & 0 \\
-     \frac{92}{100} & \frac{3016520224154}{10081342136671} & 0 & \frac{30586259806659}{12414158314087} & -\frac{22760509404356}{11113319521817} & \frac{41}{200} & 0 & 0 & 0 \\
-     \frac{24}{100} & \frac{218866479029}{1489978393911} & 0 & \frac{638256894668}{5436446318841} & -\frac{1179710474555}{5321154724896} & -\frac{60928119172}{8023461067671} & \frac{41}{200} & 0 & 0 \\
-     \frac{3}{5} & \frac{1020004230633}{5715676835656} & 0 & \frac{25762820946817}{25263940353407} & -\frac{2161375909145}{9755907335909} & -\frac{211217309593}{5846859502534} & -\frac{4269925059573}{7827059040749} & \frac{41}{200} & 0 \\
-     1 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
-     \hline
-     5 & -\frac{872700587467}{9133579230613} & 0 & 0 & \frac{22348218063261}{9555858737531} & -\frac{1143369518992}{8141816002931} & -\frac{39379526789629}{19018526304540} & \frac{32727382324388}{42900044865799} & \frac{41}{200} \\
-     4 & -\frac{975461918565}{9796059967033} & 0 & 0 & \frac{78070527104295}{32432590147079} & -\frac{548382580838}{3424219808633} & -\frac{33438840321285}{15594753105479} & \frac{3629800801594}{4656183773603} & \frac{4035322873751}{18575991585200}
-   \end{array}
 
 .. figure:: /figs/arkode/stab_region_22.png
    :scale: 50 %
@@ -1612,22 +1898,28 @@ Both the method and embedding are A-stable; additionally the method is L-stable
 (this is the implicit portion of the 5th order ARK5(4)8L[2]SA method from
 :cite:p:`KenCarp:19`).
 
-.. math::
+.. only:: html
 
-   \renewcommand{\arraystretch}{1.5}
-   \begin{array}{r|cccccccc}
-     0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{4}{9} & \frac{2}{9} & \frac{2}{9} & 0 & 0 & 0 & 0 & 0 & 0 \\
-     \frac{6456083330201}{8509243623797} & \frac{2366667076620}{8822750406821} & \frac{2366667076620}{8822750406821} & \frac{2}{9} & 0 & 0 & 0 & 0 & 0 \\
-     \frac{1632083962415}{14158861528103} & -\frac{257962897183}{4451812247028} & -\frac{257962897183}{4451812247028} & \frac{128530224461}{14379561246022} & \frac{2}{9} & 0 & 0 & 0 & 0 \\
-     \frac{6365430648612}{17842476412687} & -\frac{486229321650}{11227943450093} & -\frac{486229321650}{11227943450093} & -\frac{225633144460}{6633558740617} & \frac{1741320951451}{6824444397158} & \frac{2}{9} & 0 & 0 & 0 \\
-     \frac{18}{25} & \frac{621307788657}{4714163060173} & \frac{621307788657}{4714163060173} & -\frac{125196015625}{3866852212004} & \frac{940440206406}{7593089888465} & \frac{961109811699}{6734810228204} & \frac{2}{9} & 0 & 0 \\
-     \frac{191}{200} & \frac{2036305566805}{6583108094622} & \frac{2036305566805}{6583108094622} & -\frac{3039402635899}{4450598839912} & -\frac{1829510709469}{31102090912115} & -\frac{286320471013}{6931253422520} & \frac{8651533662697}{9642993110008} & \frac{2}{9} & 0 \\
-     1 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & -\frac{1142099968913}{5710983926999} & \frac{2}{9} \\
-     \hline
-     5 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & -\frac{1142099968913}{5710983926999} & \frac{2}{9} \\
-     4 & 0 & 0 & \frac{520639020421}{8300446712847} & \frac{4550235134915}{17827758688493} & \frac{1482366381361}{6201654941325} & \frac{5551607622171}{13911031047899} & -\frac{5266607656330}{36788968843917} & \frac{1074053359553}{5740751784926}
-   \end{array}
+   .. math::
+
+      \renewcommand{\arraystretch}{1.5}
+      \begin{array}{r|cccccccc}
+        0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{4}{9} & \frac{2}{9} & \frac{2}{9} & 0 & 0 & 0 & 0 & 0 & 0 \\
+        \frac{6456083330201}{8509243623797} & \frac{2366667076620}{8822750406821} & \frac{2366667076620}{8822750406821} & \frac{2}{9} & 0 & 0 & 0 & 0 & 0 \\
+        \frac{1632083962415}{14158861528103} & -\frac{257962897183}{4451812247028} & -\frac{257962897183}{4451812247028} & \frac{128530224461}{14379561246022} & \frac{2}{9} & 0 & 0 & 0 & 0 \\
+        \frac{6365430648612}{17842476412687} & -\frac{486229321650}{11227943450093} & -\frac{486229321650}{11227943450093} & -\frac{225633144460}{6633558740617} & \frac{1741320951451}{6824444397158} & \frac{2}{9} & 0 & 0 & 0 \\
+        \frac{18}{25} & \frac{621307788657}{4714163060173} & \frac{621307788657}{4714163060173} & -\frac{125196015625}{3866852212004} & \frac{940440206406}{7593089888465} & \frac{961109811699}{6734810228204} & \frac{2}{9} & 0 & 0 \\
+        \frac{191}{200} & \frac{2036305566805}{6583108094622} & \frac{2036305566805}{6583108094622} & -\frac{3039402635899}{4450598839912} & -\frac{1829510709469}{31102090912115} & -\frac{286320471013}{6931253422520} & \frac{8651533662697}{9642993110008} & \frac{2}{9} & 0 \\
+        1 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & -\frac{1142099968913}{5710983926999} & \frac{2}{9} \\
+        \hline
+        5 & 0 & 0 & \frac{3517720773327}{20256071687669} & \frac{4569610470461}{17934693873752} & \frac{2819471173109}{11655438449929} & \frac{3296210113763}{10722700128969} & -\frac{1142099968913}{5710983926999} & \frac{2}{9} \\
+        4 & 0 & 0 & \frac{520639020421}{8300446712847} & \frac{4550235134915}{17827758688493} & \frac{1482366381361}{6201654941325} & \frac{5551607622171}{13911031047899} & -\frac{5266607656330}{36788968843917} & \frac{1074053359553}{5740751784926}
+      \end{array}
+
+.. only:: latex
+
+   The Butcher table is too large to fit in the PDF version of this documentation.  Please see the HTML documentation for the table coefficients.
 
 
 .. figure:: /figs/arkode/stab_region_37.png
diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst
index 95b6a43125..9510f656a0 100644
--- a/doc/arkode/guide/source/Constants.rst
+++ b/doc/arkode/guide/source/Constants.rst
@@ -106,6 +106,16 @@ contains the ARKODE output constants.
    +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKODE_ARK548L2SAb_ERK_8_4_5`         | Use the ARK-8-4-5b ERK method.                             |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_SHU_OSHER_3_2_3`               | Use the Shu-Osher-3-2-3 ERK method.                        |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_VERNER_9_5_6`                  | Use the Verner-9-5-6 ERK method.                           |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_VERNER_10_6_7`                 | Use the Verner-10-6-7 ERK method.                          |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_VERNER_13_7_8`                 | Use the Verner-13-7-8 ERK method.                          |
+   +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKODE_VERNER_16_8_9`                 | Use the Verner-16-8-9 ERK method.                          |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKSTEP_DEFAULT_ERK_2`                | Use ARKStep's default second-order ERK method              |
    |                                               | (ARKODE_HEUN_EULER_2_1_2).                                 |
    +-----------------------------------------------+------------------------------------------------------------+
@@ -121,9 +131,15 @@ contains the ARKODE output constants.
    | :index:`ARKSTEP_DEFAULT_ERK_6`                | Use ARKStep's default sixth-order ERK method               |
    |                                               | (ARKODE_VERNER_8_5_6).                                     |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKSTEP_DEFAULT_ERK_7`                | Use ARKStep's default seventh-order ERK method             |
+   |                                               | (ARKODE_VERNER_10_6_7).                                    |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ARKSTEP_DEFAULT_ERK_8`                | Use ARKStep's default eighth-order ERK method              |
    |                                               | (ARKODE_FEHLBERG_13_7_8).                                  |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ARKSTEP_DEFAULT_ERK_9`                | Use ARKStep's default ninth-order ERK method               |
+   |                                               | (ARKODE_VERNER_16_8_9).                                    |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ERKSTEP_DEFAULT_2`                    | Use ERKStep's default second-order ERK method              |
    |                                               | (ARKODE_HEUN_EULER_2_1_2).                                 |
    +-----------------------------------------------+------------------------------------------------------------+
@@ -139,9 +155,15 @@ contains the ARKODE output constants.
    | :index:`ERKSTEP_DEFAULT_6`                    | Use ERKStep's default sixth-order ERK method               |
    |                                               | (ARKODE_VERNER_8_5_6).                                     |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ERKSTEP_DEFAULT_7`                    | Use ERKStep's default seventh-order ERK method             |
+   |                                               | (ARKODE_VERNER_10_6_7).                                    |
+   +-----------------------------------------------+------------------------------------------------------------+
    | :index:`ERKSTEP_DEFAULT_8`                    | Use ERKStep's default eighth-order ERK method              |
    |                                               | (ARKODE_FEHLBERG_13_7_8).                                  |
    +-----------------------------------------------+------------------------------------------------------------+
+   | :index:`ERKSTEP_DEFAULT_9`                    | Use ERKStep's default ninth-order ERK method               |
+   |                                               | (ARKODE_VERNER_16_8_9).                                    |
+   +-----------------------------------------------+------------------------------------------------------------+
    |                                               |                                                            |
    +-----------------------------------------------+------------------------------------------------------------+
    | **Implicit Butcher table specification**      |                                                            |
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index c33aca7415..8a0e8702d2 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -64,8 +64,8 @@ for splittings tuned for use with optimal implicit solver algorithms.
 This framework allows for significant freedom over the constitutive
 methods used for each component, and ARKODE is packaged with a wide
 array of built-in methods for use.  These built-in Butcher tables
-include adaptive explicit methods of orders 2-8, adaptive implicit
-methods of orders 2-5, and adaptive ImEx methods of orders 3-5.
+include adaptive explicit methods of orders 2-9, adaptive implicit
+methods of orders 2-5, and adaptive ImEx methods of orders 2-5.
 
 
 *ERKStep* focuses specifically on problems posed in explicit form,
@@ -77,7 +77,7 @@ methods of orders 2-5, and adaptive ImEx methods of orders 3-5.
 allowing for increased computational efficiency and memory savings.
 The algorithms used in ERKStep are adaptive- and fixed-step explicit
 Runge--Kutta methods.   As with ARKStep, the ERKStep module is packaged
-with adaptive explicit methods of orders 2-8.
+with adaptive explicit methods of orders 2-9.
 
 *SPRKStep* focuses on Hamiltonian systems posed in the form,
 
@@ -156,10 +156,13 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
-Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
-
-Added the fourth order ERK method ``ARKODE_SOFRONIOU_SPALETTA_5_3_4``.
+Added the third order ERK method ``ARKODE_SHU_OSHER_3_2_3``, the fourth order
+ERK method ``ARKODE_SOFRONIOU_SPALETTA_5_3_4``, the sixth order ERK method
+``ARKODE_VERNER_9_5_6``, the seventh order ERK method ``ARKODE_VERNER_10_6_7``,
+the eighth order ERK method ``ARKODE_VERNER_13_7_8``, and the ninth order ERK
+method ``ARKODE_VERNER_16_8_9``.
 
+Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v5.6.1
 -----------------
diff --git a/doc/arkode/guide/source/Mathematics.rst b/doc/arkode/guide/source/Mathematics.rst
index ec66f9838b..6c9b7ec4e2 100644
--- a/doc/arkode/guide/source/Mathematics.rst
+++ b/doc/arkode/guide/source/Mathematics.rst
@@ -375,10 +375,11 @@ described in the section :numref:`Butcher`.
 For mixed stiff/nonstiff problems, a user should provide both of the
 functions :math:`f^E` and :math:`f^I` that define the IVP system.  For
 such problems, ARKStep currently implements the ARK methods proposed in
-:cite:p:`KenCarp:03`, allowing for methods having order of accuracy :math:`q =
-\{3,4,5\}` and embeddings with orders :math:`p = \{2, 3, 4\}`;
-the tables for these methods are given in section :numref:`Butcher.additive`.
-Additionally, user-defined ARK tables are supported.
+:cite:p:`KenCarp:03,KenCarp:19,giraldo2013implicit`, allowing for methods having
+order of accuracy :math:`q = \{2,3,4,5\}` and embeddings with orders :math:`p =
+\{1,2,3,4\}`; the tables for these methods are given in section
+:numref:`Butcher.additive`.  Additionally, user-defined ARK tables are
+supported.
 
 For nonstiff problems, a user may specify that :math:`f^I = 0`,
 i.e. the equation :eq:`ARKODE_IMEX_IVP` reduces to the non-split IVP
@@ -391,8 +392,8 @@ In this scenario, the coefficients :math:`A^I=0`, :math:`c^I=0`,
 :math:`b^I=0` and :math:`\tilde{b}^I=0` in :eq:`ARKODE_ARK`, and the ARK
 methods reduce to classical :index:`explicit Runge--Kutta methods`
 (ERK).  For these classes of methods, ARKODE provides coefficients
-with orders of accuracy :math:`q = \{2,3,4,5,6,8\}`, with embeddings
-of orders :math:`p = \{1,2,3,4,5,7\}`.  These default to the methods in
+with orders of accuracy :math:`q = \{2,3,4,5,6,7,8,9\}`, with embeddings
+of orders :math:`p = \{1,2,3,4,5,6,7,8\}`.  These default to the methods in
 sections
 :numref:`Butcher.Heun_Euler`,
 :numref:`Butcher.Bogacki_Shampine`, :numref:`Butcher.Zonneveld`,
diff --git a/doc/shared/figs/arkode/shu_osher_erk_stab_region.png b/doc/shared/figs/arkode/shu_osher_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..25c75d6ed8cc9eb3921dfb22d5587850dcf37eb6
GIT binary patch
literal 24768
zcmdqJcRbeb|2O;=GAiS&ki8OR?>$aLgp`z>>^-t~oI=RRD6=GFZz2>zRCZR8mF&IO
z{W|siUDx%yuj{`5y&sRe$K&&<^L(%4eH^dxd_G^V;|#l{u5^x=nixTlb2pR~ZX*b;
z4T7ACB0L4(__%(afxn0xm31B=2qg;pAC5(O51fS%xZF@vB$y$lrX*#gq|fGuuUK6a
z@4MV_Fn4h`b~Z!Q<g{+ep*b0~EX^3zj9o16IXK%q;$*yGZ^A8k{}&aU&x}1^-r3C9
z#md2+QOnBC4B;2%(lBx1;^*ZTVB`}P=Mxea;CIO0NkkAv<c5NrmPg9MFK?d<{hy9k
zpVRPR0^Si)GiFIf2M|)Ruw8Z6WDmW-!Bg=-Av08N>eEw-@&IkCi?2VQp{z)1SL9T@
zr5cVex8&aR8HrKFjSc;|CLbM*SvWd+k=^U$Ff=r>kh1RCu-3X{>bCtg<>k<Fn%E<@
zmRT3<+<bH>(WZpI5n=g2JOl|4V^xL^FaAIIaNfZchm0wa$A|*m+^Uq(LPyf-y<C?q
z^(->dcV|2V*Dq{nmi)oElG4YPNE%XF(N|LTy;<KDtH$i@JP({^d){8Wrkx_;u0GNh
zOy;|{Vf7>b<=yGkx+2BJtw+0S(}UPQWP;Ze7WtVmocU%F^jVn~CSAk}xN#e&d)}&+
znSawQHU08ERU$7p7enUc<aE!#wZEWhH0k9_F~{E@^&IN%rtdZepBa`!hsMRld2P<&
zAH47H?+*(L8=h=#ZdOg?#y>!n^~zUYFb}^P(#qg}@J(c_k3NcCYA;e`w762zRk!%T
zr#Dg3drhP=R96c1-<RGiGK}GTa=fprWhYbXw&*oqP^DdD==-<p_3*GRlY+Ce^UU|u
z{f$|Hhs~j<&r#!TRccm5EYW-Xe!M=@x&Pwzoow~zS2VVy{B3P*;pAjtyVGZ>948}1
z_KxC=j`s$nyf%1`+}EbQNVqTcrPuFFgwu~T>(-NIQ~W4hB)QY$jJ|zEBh7ZKzAh?v
zd7voW>F6;o!Q8QKjf)j8Lji*eh78{B(}(7T4KnWFp^SFpjlbP{J(2WM!*dgTuQM}Q
zxw*glju^goHe(Gpwl)fnUCb^mb)IUAk#0{(NT67;j)*ne$a0!&k*3hErlXlp@n8A<
zDLy`4T6+3$drahLzND32p#DQ~G4DbLE!kMeoijE=h9MkbP852&QIczIqjlZ|+`$bG
zO-%MT=d-1@X0&RDcA2m%ZOLVU4%M@NKm9h*u!mYv+--sC%fmq%qw{F3d-t~I2OKu%
z`lbJH@bEOOf0vLs+L`oTdVl31e%ZUv;glAprXSYYuN{3o`1>ZRe)EUkUhnSu4Cy6)
zR$E2f#?T@|G2i{gs&v1-cUz)jVxBD#mv9M4Z2NLFU0pY8T<5nIN2*M}plnqCGD}Mz
zE&CsP@B9ggdm0|T*$QJ;#&qi2*j5!0F{Sw*d7Ahv43*7f-gxf(=uv07OoPYj#7vrZ
zVMYdef1vBN{PyyggK>6`V@GFa=eKXJFJHvOjN2V`zfp3Z?NKCj`u*|oO96|yYu4XW
z#Ew|oLg>Bz!n6&fbL&^HJSLzgd^IR5$SButwZFBvH~A@uU_Lu<u0L;}%3-YDcVBw5
z?~cXyly0`~NkVx!*gwktUy>c_-}~%3FFN`8)w?wxOg+~SwjEpnJJr(CS{SX{Uz_gW
z(yRQiR5LH`z9eZoSp4K1%^rIv-0o<nRmOhw!)^$JUt33q_e9v02m{_=GVs?QoeQk2
ztY4FaI<`;MbQ;avj!Q@=)T>hW7Wdh4OgzP@S9vqt6V~1RmuuqksTaE9zhDL_Iqy4y
znZr~L6d5&`v_6A>`GcG5RocGmd;~8(+na3@b?45VNF&wtKi}4?372dpVaELTdeeUt
z=-t!Qj7d(G@Yz{`q19aYv%lPMJjrle4PFUr<ucbdyHvYOFJv88WhQuce`&f~yBn_3
zNEH{d?#r2MjjH7dZs~m5rTuwtbAFTK3<YPG@IE;8B?0rly@xt8t_i!(HKb?z-aT)P
zeK9;BnOjzRYLL}O)O9ZI$Q~V<ez;(94D(UmdQaa;QBF?I-hK%ph3=g@EErM$qXSi*
zy3FM$l8{Lr|J{z<yLl?Astreb^E*2`DJdy^eSHfH3nLB<zoee-Hbf*zd2d~yps<d2
z{e1DBsfC66(ofIkQ1UEcUWWMTLI@C~(mSux1<o*m1ufSuOD{TkdF`!?H&wLGbfy;-
z7H<7o-TOqqkRsz>f8_Ed_VV_qw?k_B-}+*3d7sVxdm^@j(FqAZvNh6ICtGc#wC@$@
z3V~UCOBONmUaa_4>&_tK=hK^|_G_#wJ$_*(G4PCx%}}SoZIe0PVCAwsLGi|k$tam0
zd7?Z#MU|C5TEDh@=Uy81oT0O;jElSAu%4NfMO}OI{YI2dwc~4Vi;8!5vZ*`Bd}P|h
z6Vb;R7wr#IQq*Vcs(xi1S7l~4x6Tnim`zc)Ff*HmxlxTW3l9(X9uKD65W82X|L*u2
z7uUBPHkRuVUB_k%I@7l^qhyXmIXJ#d-!b$*be+_TPe`Z{Dc_juS3SOdL1yW}l>cIF
z;!Ihmv_L{DRluo2!pU66?rJBKviT3+`FV`$f9l=1xoGqFt~Qd4A>F%7nA8+PTH9%|
zkdv5_lF!xm{?QCX%?|}`48Br_IxV@mS0^hi`l_8KJEix(wu)~wlnP3Fu_q;s-RD7v
zCM8ib6xAFb?Qdp7ayZ)Vanl)WY(yt+_Ey@Blv#92uYVQb?(OaAQBM&aU(@z0H1)5)
za4N^_PHkrIfiW@p^}x8^qr?5kTK((STVC*)9PJG>cpaz+$1|Qkf4;1=)N6a`SG}*d
ziL;8Dnw0xeig5O78;X)LF*^G9YHB3G9wDo8cJIs7)Plsh!4i|bS~>~0o9ShbX1>=C
z*deMjF5>&!%gb*((4ic6vMe8+e#uyOk%NzKb?VFW;e(2biqXP@E}p^*X{bz@ie<yJ
zzCNu)q4Pe9JI@&pjb@JGhE8S*M@#zw%v1||FN`E={qM}Q&`71-Bk|NusqGZ$%S=qK
z;dutNZvFnc9;(rP+;5zYBg4ZxzJLGT-p>C$KmOC?{=Sh8wMiunWFBUb)+mN;;RdJ6
z4f{*AdmH)roDAu)2?^%<t`J+T=;BR(mlo6W(Dk~rQ$|T`y;v<cF#2MCJ~O?-);jU*
zZ{A=+7CDtXn}I_5?K*H8<EAGUFJ7E|v;=Pt`Mjkv9U`gyuK!=7mC2UKky5kpRhI8*
zQX_TV?uU0_nEhEaQJm;dHnpUD$h4J}m6@5D@b#X{WYxVDqMr1(FC^RxkBlale_8cr
z&GwG@ZX1kU6ApMQu!X@I<xHx(wT;cSYu6&bord)$Af<OX66H2EHKmdnPRHZGD66P=
z9c~Ul1UI^W-_rKteK3FFW55TI=@Q;s3%R+uYirJle{d#W4;>G?^F)y`g98;8JB~L7
zHymviRoRVD_$V%b|G~S|d2j!iVUTdk*B;Of%6aFyr18@CLd&r)S3o<l?empS)jdlM
z$9_@kDN^1)?kg93y4m1XU^h|;0bsyF+G(P>cDa6kBAn;+hlm!ppMSn3&&NN^Z(dli
zby#-DElu&$*IVq7wM_9}7%TyhVo>7(f$dIYFC~}mRA)AX?!HTo2GtCXe>&3}ytnNW
ze>6``O@V7HLH0e^S#1g1+kc_^<%m}O+mF&A1O9-f3(OIC90l-tWA`$jG02RH`ahWb
z&8b_i?0*;1ig5RI+rxv05^f7GRz+N#oJ#gp8%2^d)YKyV?mLWrcrR@rBa#>wr*-%4
zw08{deQ}d_`r5U8J~xvDzwAy{cjevVnf&U<)`m@d$L*b+1KClR1g<BGT6Qt|W~}b$
z>FL=>T4>F@9x?&fw}3>!&2#pKVs$=QU5UPlb?W{da|UpE^J^Vee$NNNGo3}e?sN$a
z=uejXh|ni~_xTMrcn|kRM4UbL_Sz|nXlYM^(79URwYBi>*am!%er&9+)Tik215{=$
z%w=t>l0%X8NM%8Z+II%-GkK(kcMJ{fQwq0J-W3!G33nf^G?6|oFwK71?SuKEyJeAh
zw%?d|yeVF=r)F!|rr}_%0~?W#4tD1UiUtUzy48|}3jnqS5s+@JpX*E!6R`P_?|(RN
z1mQYAKi?(&(+Fc-OZYjxa?6<K&&%vagcq%xoK`mnjFv5M0x207WFUc28u@4vI>Fii
z5ZajSooS0<+3TvuCW;}swnLqoyLsBP>r^9)7&1tPeG-;WtQB5>`^-i~ez{&$0il2X
zd}Ly7b4!cc;&4TIdEcQFZlNzz^BJBGzxglIUL0p`b6qktX9ye`n9I*cB##f)_Y_HM
zraKaC5{1gG`{$a&&JQbuG>xy)ZPe~tmecgZmnz=6y1Ge#?P6nNQ&UsZ(!hGQAvqgD
zmKkloGs91PZ9a%pnwO*u@;=kyDjb$@`TP6mXeoZ$`yAEV%uK5FgqCAF9tbl2$45s-
z9#!xcy_8qJPT8NiyrQl3%iJ6D9{Sol0XVqj1SKUUoAUz$lc|QE<qD_7U*?+myL~}O
z?u7E9GQR>|WbmAdQKI*p0zd;3&vW%E7Tjm4C2w4kK3I{LIX@M{q6CgGv6eT$02r5h
zQixjVblAbStJj~=?(UBr8}2{z$KvRX+4XKEhS_5wdc4E&nVw6%@g0{rT8bV==SMa-
zD@+Q-M^Xzpr?+}oIUeq9Mjo$ue7^ayf(N6ltXw_*gyv^<NG0=6{Ic(L@k1dWw}kw!
zUYm*-Qfy!!4PHI<hzawfdu7NX9X#^gQ7j;Oo3TCke-uQYqurTw-z}Z(sx^yCk@3@M
z2QII3Ip2tk`SkWx40?KcUb=J%fP3E)`P_H!UP^hpX=-)@lJPxzbELxNo)ptXN=iVG
zW-ufiOdD{MYlYQ~lMVa=0-LS$`zoi)Vh=f9yu%u+p!W;(R19N083V)E8zrDBUXr_0
z&l`5XIT-rwn%UK?Dy2DS$Q+i_GnST?5)%_Ai8#>H(A1iBP#pe}bat5H6?VW(v3<xY
zx9olh5N~*P08BD2K7O{&Zn(l`rt<;&bw6$cG&)dN_$gWAbf1Q+YsJyvA<bWiKrPv?
ziGQxHt}dxvpbyU`s@@9TzDi=JSbfGLb)UUVCU9)P=ZxR;zk?-{K+h^#X+-P~j`o*-
zg-i?=8wVYUGBL^7@L3O+W8GuEsNtx{|IlXsM?p)4uAbih&qtk`3qu0MPgQT;>>Dev
z=u8{^(a>tl!Qyk4gPpw#H3OqtuAU@Wywa7xrDy0hdwDXF%pih_5BnA-EfL*m32||F
zw9Iwy)?0`_<xfTP)~Y5+-DFx*j&>IJ+ORY;GXt{q^SJ;0Ba1`5Z^y!<lN?e02a^nY
z9}Qq(HVzw;l9GJ)w`Q|*=}1DHwCEDU*;(GadL?^?8*=gaE9!l%lIz0XgGpg_;6@vF
z1Yq)o>Vus83dAF3`XUC{&M;Nl|FW*c(7P@SYC6zMI8TMH8gXj~;SAI}Fy#}vXZ`Tx
zMb{U-7pT3lLvMRrzrU2sZ}xPnIxEY3uJ4`yP7_0f0D$^~Sq=Z5^ikIVgS|wrrYGmH
zR#i~23V90V${YCRhN@r!w*mG2KwDtbOTTI>S|K`Z@)c&LGdtEkw*OTl1qQKKVFVBn
z3;KO%yXgH7R(Ezhd|$9~DHQ6IwX_Z$cM<QZki0^&+-{VGa3~mN>IINpf{bYk;2~Yw
zmxA;Dt1%%tLZ`Vtj!Ct@krw_D_d4IZlL!bG%#K+Ag?1%5<ihZhoLU>UDM|$j@6T`t
z*L}Zf`?e*xXa=d@>oEpqV48hjI8$X*Ef#!*fZv~?<hG2$a_jLBhPmUO@6OaAKY`|S
z)t;`0m<ta-`wFuZks1v?pXI;=#<Ss(UHia#ETl^tbLP&xBo)qrjd`%!bIabW$kn7L
ziAH{&z>~c$GKf0<ekQRb>bqAi9W+{A>A7z1D@4phEoj+Q<zO`Vts*kq;pu3I#<i&Z
zvqrv~{Q!>X2b1?Jy|<VAJtjJB0P_?rlgJ#b1o63f3tIQFPqO1(zI++*(9YI~11|Rm
z4xD^bf0FDYffI}RbV}Q(J*e36(wy++%hQ!3_Np2h?z0RgA3mtp=6~9W1+7EG{^xy~
z%BDd9aR~|U?hHksI`tilrh6A-ma?gas~lvoG%NYLXRWNz3!4&Op5Uca_faQ~afp)#
z`c*ibzrH-b5*c}Zc6JtkHI=aK3#W&z&*(OHBZJB>v$CG0;(Y~(j+<f5M8U~HRs3Ny
zq1{A@No&M6T`McA-Q8WtRBo5L)f(EmwHEieqrx9tZJb@#wJn?fdCXtSTU+$9fHQJP
zt+5J>no5biZ&cvQl~%J1vWb@#Y28Ng>FGrVqWo4pnZdANI;B%UH3cbbw-$yTb4>!p
zOBS@s&}f)W&>Qtx|8`k5fm6TQ@n^Nu@Skkb_1XQyL(Q3r!HL$f2<hvL3?lX^M@7In
zCUbH|4b9HRphLlR6A}~m*$bkAH?u$Pz3yC4ar@yaDx}w8?tWs4^hCGSxyP*O&ru7u
z?Zg7_^Ik~Hr{g?<-ah9|&Od9#dx^!@_Mf@s+k>yl?HLlMItgBiJPs<yFLqJSeuPyK
zy!=HRMt_PHSFV14Ujw*#a>e!&7K`uh%@@`BE8M=_!&UV&L#ChfTbA{hyQe<h9dh+_
zqMikD(z}5hZPi8i35?(DQLb0HxB#;iEI-sp5$)bVO_Fgf@$>U<*hvSN{e*zFEX~#Z
zlCh(sBl2;JX!X0Od+!e%RWvlV$(iNj8B^Krm6jDYSs_?x?2;r2fk-r*E4$F37Apln
zR1`V-+gD-#YY!WP#*Vf`CY#N_CD{#^&%&|o>JU<TNspzU?_2zZta_#(Q07(XY0W~G
zlsVk!g+xf5Y<il6w%Tn`chRu$^|UvK3xs8SeEhxM@^ZnbZHI#A$EpL69>7ix*Ag3C
zc5zZ;WBJ_{27$Xm<VUCP{0<^jPZs{Rv%jC9XFpVFr$?wH?RBu)dgjcT$T2}39UX`}
zFI#Dd3H0|}iSH_Um|CY2a0d8tAxvYeg|$mHaHE^)(!ZpX*uWyG1wpL%3&IY+dc)z?
z2q4M7eyI*<bYmzv3m`g*uk=`bW*M+EC{0UM!Z%b@z&)c&RAo1+0dqyptVUk3@bv%y
z5Fv6!(rw|sp`jt3x<#_V7e9LSLkqV=L08CnpGEx-Bu=lrcbV-0kpp1yl%pu9CyCFW
zpI^ZbAPF&nwWs7U{4kfBXJ5CeednH>ww9Ld=!c<kN1*8;%g!>#c4PGh$4nAV6AFnu
zs$~a8;vr2XPLtOQYE411z@i&FAw!5@;XL&@g@vG2Mmps@BXbs|1x_R7f8+y_qtDN^
z`{`o8hqsx^FOJ6?&r2#Z{T%pE=PxQ8_Vnq~0=+8jd-qyfTSe@K1tla#TKAkpX$eSZ
z*}1stK*h1OUATMCAU-*nrg3xDQM7(<E)RqhtNCL1KY8sB1-gVHQ(&L(0I-MQ&E8d0
z`v$=fv<Ol<@hKN^V5;^tvsoWLNal3}ckw<ecV77|=UZ;7Ky?uZacj1eHk_WGexDv?
zIaYrNB9{C}VSsWHpGgadH&F~Sg;5?N9xD%St4?W>BM)rK<-9iYj1I3#NJs!>l9DnY
zblO=NA1bqeaQX_&z9WIFtj2|~t8RNVk2ISTQ~f8&2Eb>3xz(LB;hAh#Pa(FE!pcRX
ze*1Qly`a>%12EOAvIj~#R$(&$@~P$BPh=60brzj5zy$$Us=wq9?t4gdawVP>8lX;D
zS=m6Lfz1b_D+`}TJ_?5No*e7;x#=iMJ50y8QCow9Anc)dvy>rCnzwJS?My}`CMLpU
zY-GzEzU#jXrGetJ7A5n%AYj5nt)pm!ZAAeK_#N))=&^z>ZWF^e-v#={)Rbw#xwWz5
zqwNl!2Jqb`FrFR1_*KIa1d-K-V6RR2i8|tsNn?Bbwbn=)N*bE|FIUomI_|s>xOPo-
zN$n|qT);+0+bI><J+nAJ9FvEvQI~oKUXgAD366i4Sf&+svAlct?uz?+d_>mExQ69g
z1`bhA3d|P~Q+s=RJ~tsq^=8V^e?VwE$xIJi<zRT6@_`%qA3hvRd=BS64<29r;L|Cl
z=3nk(c8agz)t&=J8lGcj)UT!(0bWrlwZBkS=e21K83hCh$PvJLL2g=f6y4iiPESs@
zamB$wLftlk;$BQq-oRggcl80KW(y?ClotsJpc@v0Aer+$G0(?|0zsbM+MQ1mR_?^w
zlvziDjsesc0xT6|prAlT!N<p^O^Gv(#ugcj<ut^?Vi;j99*_`0?FIQ04IgChcah$H
zh%G;mQNSaq{^t=mjpZpWVww;iZ{|w=fV6$ofQ=VU446_ropZiH@aqJpFx=%UlN>DI
zM_LqirT*6sE2=s=LmxcXpV5k;o{7kKZTy7~^}BzP9Y2VnpWzW9h<>WLtMyQ+85V-6
z{{;QO&+iEGZqsTQsF7bfJI4UziH_1TDPf0S=(ap61@!>nSULt|3LO8QXRP3aAPaM#
z>KRno8$i6Vwzf7lHrCYCw6>muuvOS_<i*tdT0R6A<vm^9VGsoa0|WC4Yua~)Au)0q
ze((TrMiTM{T$faGMHbLjg+HB`vnluiIuuq*$g)c|*#kt1*`hj#Sitye0bYWl2={cG
z|MBhZ0~oyl1Y;2JCnhIr-It|3R(^vV`u;0uQ)!KjjRF?m_5BYwK>;J3eJZyjMt=I`
z%a^b!$ZwZ+KUu?ipZ8=B0Zjw5`10k8T9P0+8l(ZA)z6e2i98xNZ({XtYwKJxW-hKp
z;GBDB2Ea?d2@Mc3=~mi;EJX)WRc!3qXG$Z>V=hk4n<^?OH0$NdZx2F_oO-i08~_U5
zzJ2>Sn;Hs*!jPTd)3>_Sj>c#-T3=t^&8>2a1Hv6Q50A)q0rw^Sf*eQ*5N$o-3PX=^
ze5Pg~0Zk3Vl7zMrG2ZiQk$9IVt~%UC$nH)_Gup&(gH8{FAC3c6jFpY8(q@2LO3D`^
z_;51_3B*in>M1!=Ts%A=L#SzJ@Njeg$fA|@sRly@d?k%l+svlh<I$n+qn@pkt!gj%
z--6aT>yjqwl;Jx6gNTR-=CJ<{2RHXKkh|L2L_Jns2~PveB1cb6PtPuwxi61aS3?3F
zP8D@RC-b|`^;K7kqB0}9NWsFrYoW%F?ls4;=%lXxU26O19esUC^RF*}ZCRdA_m~I+
zh6b{Ll?LdtI+~g#mfg&Yrd4DaFgmQR2w*ouF?{ZzT0K=<ElpBPSXi5|yWFbxO1e*J
zR@QZi`GPu6JG(_NiILp9*X-I^q9mP<54Rn_q9F|p#|;?y*Hu<-LFn!6OxAe8%XH<+
zm7TkfL$MBX0d?MFQpN$eqlM2f2&YWV*jSt5(R5A(D;^I|f|*~was?_1M}cyNhG}Gt
z=`mgq9~^v!KX^W3YKFQ=MK%y@Fp$2cJaZsVEh0u`=4vV`D%t9(5$ivpgy-rfm_cx_
z2SF}Oxab-L@;bg(xNbvt^X5%K^_yyH{RHkm0ayc}Qc-!juXp#}y@6e)dq%z$`>nH(
zt18kGuMba)0-o<nqnGiMge+*5wz07xE<@cN1kM|v3)YUMhM<90AFI}`Ty7I-@YyZx
z0DXc9)8!>j%mg?Gbe2i}sQo;$Z_3dKl5<%^#Qj^6keHa*Qe^O_`M!6(KnHpBt6!1g
zvSPaIF&+RfY&0G@I}1CE`hY&Svvd3>8VVF4A9x8F_F&pxCCCMx?*H+lexpZq>9~jb
zOfVUMWppUA#OE<!;Ep{4djDP=xK3x1&^2!ELZAo3aj=w-yuQ8^P)g6v$e4gKpy0kv
zF_|59OlII;;gmdS(!O30ucDdcsfDbybaXrc;^3d5xcP$jHB@!bp~8R!ta?mA=!fT|
zCa^L1tjPI~`hc|Of3%){MLp%OqbQVa^mTN^0RBx(Ox$?RCS>#DX0pZC7krQYeD&O$
z&88z!0-XzzxHRB$C@ZE&dh+|IMs_h{-z)`W9*vj$(-i}Ty&=nC;o<W=Z^NbWGyrS>
zu&fFLn4c#3J~vloCzY|Ndg3XlFftom@>qdb__CPTE(8Fdts#p|Pk>~_078upCMY4O
z^=D1Z%!~mIl@B2~*MExn=fjlSh6&~spn1i{qViNB3<aERz^hEn`QX}(b(()^;lJgG
z|K|?@c_2@CuK%&xE+Z)bp!z*oWEo0btNv*Y4To+JMF2~j^E4*o#YSt#3RsMTg9GsV
zCkLrjwnMS$>C5}iM!456P*Tp!%ycG;@Jt2EeZ-myV=f?OQ&1V{#9fMO7<YJ<!p|XV
zPs2)T@J|0!pnN>n^}0!k!PnH4V}%8BQgMMe?nA9$;jy=oxf#RXfb&oQf;4VA9n#bd
zoQi<n;}wX_d;VBh3vmSi*4wNs3JMDKaqSFv*hwz{#l?&8<ufY23E&r$Xe=0j7kK;j
zZGmpZRd)7jz@z%3A2Ko?!ncZwiX0pq@=wlw`Swj{a~2)?ub2cC{y%Ur14Ou1#TBVe
zcgP#CE}+s~1#(uc0Kvw0`<FX-H9ZK5E`Pg#=D+{o2<Ry|I2c6s;SqqXFi<rh<MvQT
zZ@5M|D*9jfB7hUKvUlZqG1r?7f+=_jgGb+lPN<l<g+=S<&miPslg8dzuzgDO&17LN
z78VvUvG-ty=uiv>!&ATW5L^m0H&D)?)Nv7=`Sxw9wD0gvE<h`AxPv5{!rA`3dmtK-
zO_2KU1ijNp2c>??>Hm-r4%018!ZuV)X*z@<Py#(*yL=hetl4BJOC!Co&Te_MuD7>W
z%CDTecu`@mpo8E&iL9plv>LJO@64z$973<)HeXptJO9s_L9s&*G9t`IZx*;23m;zz
z@E~B*dH0Hbut8<^4j~_w0o;><0?=?AMC?(w5j%7!O!DsTESMTpNC5Ev0?#SGl%<|Z
zO-X4H;dJzMl24B9$`x?6|5K_-)Fg~aOw6{Jfb3QCp@5vIhjThgZT$5b8~#V5sm~u@
z=vx&Mm@?SabRW<B0jAA&UHqFxx-T0BTh!Rn>d*sZ$Nyab5PE@ek0`*e5*SF!y$ZXL
zAENR%ZiJCdV2R;+uhKJG4h+cT$xct8nEsh+^5A8wNnl@iE{KYitCxZPqeDT*rJk7`
zt&<?)*Q%zVL6|SI{ZaB)&km94`{En<KL7q5o~nWL<o_*Gm@%dSbiR}>4EhD36NstQ
zS4JJ1&VgtW@1z2<P=tnnfB-n=VW<C5Z>Prpk~SQim+Q8v)At0Tln(c|MWpSZY(O?~
zu)99o3kC-z+`ms~?0LTnJop$OK1Sg;p+b!i(j*GX%bq3JuCUf$EG=3GaCBE&J1aA@
z`Z%wqW_YJ>8ufB;@II5m!-pA84*`^c$wc0Pwt>HEm4JgFzih1cLP$(YO<i0o+SqWJ
zyyO38^)Cp|!qWW-%HS<y?=x>RHA7g`n;B`;0B0wpV}A4YsBG`Jb~u%fk6EBMV?qJ#
z<KqL>D4Ct#xZD0#l+}2%P%n3UIpHW;-l2W4y8%5YfWxW}=0TTk$v*meJ^&yZos8d4
zvkcYT>%0(h$ndrwWo5R6u6UFV_tv;S&Cf4RY!QF|{yo$Qzzn;&vq;_pP@=eSfhrs8
zXi%<)k^lEx6$!a2IrRzx?rT``5Q0Q-i7i+w$(r5kHw>)Ei>aRJXU`%)&hCy;&#d`h
zQyGxcPYuVhmsJ64yp=fwT7UK0HG*^0Q#0AyAlHDn2nN5m0o;^S=AcV7TV@^aH&oi)
zI7R@62Kwv$wG6^TWE{Q3OYe{QK?dssG6JP%Lv3wg)3)gAk<_p#^Z;u=1>&D)yZLvd
z${~6=9cl&eM)wRoFSD?i01O7f*#%%<n$Ow|85!UI*SvN6n9%<Z(Z?LkHy|?dLI41g
z<JI*_E`)>*+e}mAwwP;h_1SNr8y_X&3%?Z8UX$R3z?9B!)^1Z&R|!bVP6gm6RK;{F
ztS=s5;gK;2qcX?4oi;W$!DN8E0aVAVX3&nMkG_%%f>a9mtbqz@bz5VQLqNK)fi{Lc
zi5&rr2S>Y|{y<C3ATVFk&Ie)fTV7E;H3P#jX#AHn5?LPbsk`;^wzaqSoc?y|fehYD
z!lxhGwWk6W97SP5VaDT=l7`>ixsrJ1d5{+1K(O`l@^TV7alEZrXz>6Y<i5K4vkv?|
z^BJO^<D=zcSc@`f!s%Vy%l%k+Ua^upN;%pX8zTl$SJYUp#d4(LmX?A-1QUXLI14Le
z54;C%3C{7p^Jbu6_!E7E_|1F1!23g?#qc&zd>Dh+H2^gm;3<imI=2lB3Vzj`{=_18
z>Q+>m86p3;k|XBsX;S(FP+hToB~UWIeAx{0BWP>eZp`%NFw^Wozp3Q%ZSOBZiwblq
z5#)0RmxE!ODkX$5Y74(2gdBV$#*CT0UE{9B4PQO#k0@{^RM;9L%bUNXbL4eeKj!+4
zH)rIT;OpDJlLf$((q{AI8z$fCrY~P*dm@MXRxuFofd$^nP?Pw5MLmfh)1ukyO78Ym
z#H*TE3Ms7cwB(e{FG1BursWk%Xny#r68$txRNJ#S<CRoTPiII9jAtR>f(iZ)FLs^O
zNzPrLJvo&KJR-)Y<i?zhPf00Fo}K@ZGW^W+Sb5@2Gn|}3y8HQd%F<a0DJ9*K!bk>n
zE|v#y+iuK)CEX9-Odaa!eCc;2BQQ^)BvX{CF|3>>o14SNYQ_J!Y(PIDPXcp|68?OP
z!`b;O=NT?vhc_UPRlUGir$j!lZrv+@!eNAqMIWkOc!kP{bG=frsbQWMAfp^z52$1r
zloaUcIe~vJKnWGYDYPkxi@B)j-rx>(pN41C<wm__$b_M$!C@PaPyt(T_lBIK5jJkb
zQ+<jzNHxSK9!<B{-1B_+_1^uHw@QO*U8<y~^Tz-j_n%Hm*RMYzdkDeH;lt{6;I7Wj
zYv(m2jX?#FU=+Q6{=52ctm2glu{V+8-5(Y}(bItxQ&_)eJ=qKpFp7$gnS)~%G=hl8
z$j#NY6Id6^n@Aq|(6rSO-TUTjevabSr1-l7*X3)c-$6~!oO@N1u=}lQB9I>tHK6FA
zbNlMY(-EmvJHsVOiUzY}r@5<2!ul*uzn^YaC@v4>{r)idH%K`oA!HNn*NVz(IAu3p
z*D<$8)0vrQb}AR>nLc1>^Hc|EL2c(?z0=0p8tPrpT2a7#hD@#PS$D_|JJ&VtUXn%p
z;b>f<9wQ)I;Hyu`Cf;SImBP*Xe(PP{yLDx)EQ62#=e7)HF`Dtvd3EA5Bnn7Y*fPV?
zkAh?wo-gg~&Mz};E%e&LQc&?Z6u}CTz4$ASV<QP>kG>W1qfCE6?VsLzp(G<C1Deie
zL>hJ@(~FpS(CR70&$LaIE-LzT(UmdX&e~y@^exLv;doC`OClsB1bu;jLC}Ua5Gla;
zdEvPCL&EdlP_1fOwWP(6?+P+8Z&`&JvML*av;dVjKuSL$rh~73o0~u=m?W-?Ot3K1
z&JPYUDo0EA{rCYHB44kn5THl168qBys?GBCFf9^h2Ij+E_7<$d(jySk#Ap7Mic1<i
z892)KITTKeqFaQQKGm6f-IUCi=Lv{d3Nu$1pu}+mGa5_=r5XU&ZoA9y&FE`+f@|&g
z7>0rNK^%+1aUIj50wVKbr$IWRo-*iOT>Jzt^Yd5&!hRbCK`3GA8@gyZ&8jvw33O&s
zCUp*nSB_7f>mX{Vn=Leom+5wLcvNSMt)#O1RsUbTq^MgohjfcU;pPt@K`HJHvQ0mW
zdJ5i^%PcWWK>3YPmi%mtzH0$Bkg>UOt(<e3283keB;#^4tglcewJZw(Ka?=C3ii5_
zeDC<_v2GE-FKS^YlIe@NiAS)#yLv&`$jXU=<`#0J`ALo-=0)0a<A=N5)`f(_j5zOR
zugHmIj1b2^DJDD)7P2j$1J8_w2cM^7AU7l*s@#ZBkx|A<ShLY|cHsg8p%`AHRJ)%6
zvjiM`C{{-D(l@E(4CG?t3=<(OO0#et2k*_OZ<^kr<&IC3D@`vtatS|p^s{I9C^V}0
zrl|L?mS#dG)&`!+c1WJK;Ug%O$2)`_nDrjp#k#O46ukA8f?M3FU)shcyiv>Y4$9CT
zNmEQSoS!Kx#H@=ckY{zDN}#ce4)Aq+SHT$?70NyS)eEDn0}qy9lu*I!gj!xmBm3gU
z4TB^5MU|z*t;Lo>eeTH$4G}8zp*}YY<!}sne`A?d56x|DR%OPkPQ$w5K4Fcg(RAC@
zJeAFW`9k?q{=|`25K9pK;+>3u*BoYiY>BRY6OnUw@P<dF)-dxl^bBVNxP2E-siF+J
z3twyGbeff&Q4Yf+x*yqL#`-zx)Sw<an)Q$o8~XB_ruo-0CRrA^6x<~Qw}M!2syu-c
zF$?TG6D+1=JzOt-$w|XdCPZsFgeF)r(H%@5U=hfht!#$K8JOZ<iJ1Kh*a~<eSF{kJ
zvqbpr2EvmN!^uBCUSZK;4|qlt;Gj!kCK7X+2t|0M^bPfnA?9nS-wFng2tzQWd9F`D
zi~Lq-L|E9kLS_D60wN5x0e!rjl>EiV_S4Nuu(*$-Cr%5rGfJbmUf1_CEr3vnA$f_u
zq$PxWhJ&{ryi$Uq`D^ay-=dc$<$9iRoP)`wEq(JaH0oC3?&9cM23Cn@H(}}s<Bskm
z1!eG4_24}a33wu`%*d$E_lCY+1ZN8ei<WLqaAtYsJo>G4a3uEGBO3MQ9EvxH{Wbj@
z?GCws1TJK>a=BASOiJuw)&xitTyP-!>=vq@#G~c!#H(|t99$;!-9AY&N$h+GD}R(g
zV{)k`&gUdEe2a$n=sr#4fp*inC`7swe151MZtf_L8<!gz6(ELD4h9RsJ){V}MY>AP
z+Zt8(`LKR4`m{v}4ijD#yB3`cZGhvelbnJSXsEndd;HO=j%mn0u35*HJqqu&<W&ab
zYsNVgF^fcQ<Q_p|<SHyJ4Xc)-&n=owQcT2lhgoP8_I2i%B-o>#>B+Y7@@D2LN8dWT
zs%h6JgJAG1N?xC}%U6=~xkU*VgeRISpTs59)p2zJVixIB;}gCO8886R@N@XlbaAb0
z2=ZDn5VO!m(mq*p2_Y0iu}&$vY0)PmWK4$k>P^_$V_;=fbh`y#JrIK&XBmWXAtZTl
z4GG|dfjBdX{+6L*7$Oc(Hd&yLk7i^dpLnxYE+;dDhn(>kUZnyBI_2{dPC~dpB_5fb
z{+^t3N&*oPYD>ux(ZfL$C@e~hAK?)cUqob^V;GGs^!acmSjeQxHJQ%Axuxmtn6klQ
zF7ZD0s0Bg=v40jy!z>z50OC9h{1+Lmtm<jxexzS?@kQ*D$r*4Ic$&D|PnNxu1Zqy5
zX;Pq@q0m1)XHvB(mF&tT<Oo0U5Hcnm?mVPk3g_ZOW!?jnW>jfA1iggN;h3)m0zgTn
zvI>jz)u_{!NGN^E=PhgK8V9}y0+1D?u6*wB;c87fSo1?Cv>rc{YOqbPShx)>6ofHY
zS=~uX5&MP@^nfY0oF7{F%+Dm}rD$DF{|UzyKOnXHM4DH)78tZPh==I)aAz40#M2R>
zG{fFRt%XJ*WZ$Y|PeX#uk(^**B)~4BUG(_GXk_fCfP=>I>z>U@vedDgK~txQSWu?b
z(UiDy^KY=%WhCs2)V9Bj#S6=k^TDnoGKhc3NRCe>Kns^#|A(ElC(GZi?cn1mv$I{N
zf?1C02*D##C1;2Sdr%HF(8bvZ+OUR#wnN=!f>S%RLRAoe#@*S`QI>Jb8EblK2x9vb
zZ?+#)kSZu~PF^^)0xVU)9-|M2WO5$KoN+d?ZNor?tO58cD50(#nJvbO#xMkYtP7E%
zv|njd48wRIxU(uN(1Q6kD<RPc5h_N}M~h~a{1!1b^7uuEUMLM(+u22Op7@>kF?sWA
z1><rBq<y#3zH^D^GK!Ts@W+)3tIbX}gng=2LbA5OM>(2MX5!6oj=!wVzt=Tx8J7q5
zc*T!3pKDfR>iSY|gmoEkWVOrXm~BI&tidq?AfXYG!euZfyhFyf*8>#>qZz^T@Ls(>
zaaclJ6s9r92f2kqgnE5F@D|mTd_<O<RT*=E2yJ|phU6nmGsIzqoEXNq<^ep!{ok`+
zH|^Tob()q!9Ckc8uAx}bn4KKqs|*1mv<#UFfeP#^G<S>-+>qbr{$1TA8vKrTf(2pt
zdy@Fjk4-SKmiox=@ZK-R=!dJYvqV^lCN4L}6S;K>t8pT{A$VboU1#53wWdcdC<Q9K
zA|%hv_=AJ6D&t|kcc1(-5HIXw_u04fr|nN6mdeq*QDrYwn59o4F09HgnssglgUcY)
zDAunmN;x5J7Dxa&5z4#^dB>Vdhx`u2BYJKbb{m2t!pkhz=uob}5w<>nAh2pL<l=6f
zZJ<UF`WVJ>2HgxT#R^>HC&WLGmZH;0fC#Jd&SMC=-;HnyiRz_HfnWT-)arY3pfC8e
z@@5x8gsep35q-q<6M_vyjB<@vs2Tg^aaoa9>c9gEclwc&<I9!-TBNQd$O^%K6|lzf
z>&E-ACw>IYz(XksrXdXqUW9UQ1dxwsQLK{VE?KcTkC1?Lpc$3{c-Y-H7@8iKN%;3p
z6dsX=^7*UdS8$P!oIsrX_@THJR#k&!L4gp+>0<vqBhbYbpj{JCCrIH~Nfv1KFXs*}
zC|zPV!StI!)hb#iqE|YSbPT#Ipm#iqPU4R@wjY*B{)yyj^LY^CVmMyZ{zr?ImSWcr
zE}&YxAnZ!Q$Z2}4Ua~si+qDqG*wNnpgoIAl(2yGw8WrWxo$(o$RMK(8t_msyS6Ep^
zX`ju_%|UeP1knm25b*vVhMOQENN@jqlyG6NB{^=vTSEWVIMS%RB_9#luoPq-gr}pW
z<pR};GuSec7`zEIW{$0=%lIF`Mj5ZgiUFXn(b3T>@SchpaWdwUYARcGblf?Ph%xIv
zQ%j4{wp>|jyddzGR=}HB2L9s`LogWxMN+AaF4)a81{DZ+)0ISZ=F;Uk$4_?$k${hb
zug>*6TiAPp!Fxw_l~&f{i(g#H{D3d}AY=(xpzbC=qEeVoV7D(W{k~)&cu_tW7dd6#
zfVT^;;|7Eu=n6?l)8tv`?OcY63Dx-R8|b-5=Ny%==b1F%z1szS4N6|#J1fR{XP_|o
zinf-m4F~r$A=BR0;y!fu=@~%L6sZ^#k~>;*Z}0{Y4?_km7ob;H_J78)eWD(X1U!JF
z#7s{}8IFGFIS?@!Lc0;sdA9oow8<>Daze0Y1PqD78L%m(^5JJ<re=_$Gk;Z`e#~+U
z?tMHc0muAc!^F}^RT1=mf)E6)gQMJCr=d=rGbjy5p+HdSFb1NR0dx?8cnZBmqd)@?
zr0wPtymvYveYic|g4!^aMD?3Ce4|1b7Zws3K~YT>aadY4DuRtP(2vccPY)05Zx*!*
zC&b<VWu2<c5r1n0VOH2`iae}el5h1p@&97&5B>O|ZcyvV(=HH)`egh)!y%9tL8>2`
zLj^xxXduTyWG#nYoh!}Bv4s9s=)Vx$Zv=7Z&-66@dN=e3y`L|v1rfCdHqum$`FXcR
zGePV4eQ*ZeWvJvna2HmNMu%!h@3Klr?9YIV11*zxX1>CG4q)Y=kK+f(9MA=hfAAXH
zpe*Y25F$QyBSaB&Phhw5K=y?lSclkd>Vq_RCsZ+57l`kmgo22kO2!QBsZeMDi`D>T
znMTkOIwzMMMRW7=pnkLhjiX24Uwf9)Q06#XbnvHH2{{72Xb|eL5tjrYxn!$}!3Gfn
z*b4(aP|z!R0L=%RtGdaq1=F0B55cU-nfJ$A%#F60%%bq#ad2_@LK_P-Suc540#Sy+
zLm7dMl@)JY2j)#(P3;%-y*ur}$oHYd3&()<?RdQZCd@Ik?O6S)5l10(A%rH`_g6?<
zYGLM=wl*v^h7Jw)g~3%I(a=!7_4EBBV4u)Wd*j9p00r2p=F9Z-F`($bW%8=4?-RmC
zn|c1jKgkZ<oSc0}XTX-(BrYqfK{fYZGdb#qhM3FW=o41%@-i(UfekYVU8whE=%A#L
zG&HG_)CMgw7_y0)`NBsp3tjys{f|B@CqgZHU~lrp3o80`(Oh~OMR`w;uO{^CgG*5t
zO&f&U+HwjCE}{i(2fHTyp@nie(Zbx^+|2B~BsT{K-<J3^UsQpY?S*sG<9tz`UrqER
zVF!Zqt{){ai<}oMpcIpWr|0_)7cQNa)`7awxJBJFNI=}rhM`TtcZ@Vw+Mrx?ynTFR
z1nsD;$56N+SpNe;>IL*)T-@1m8%wlv2??|>s15PU`9Z-9q{^Ik?^cE7p$G=BD`+>A
zf=icBgJ=!9Ska-{1-kg_f528MAwWPl+vvNaLBs@Y&`Clz2`^s!m4@0`@jb#{e*23s
z%TTNQ;IWD|yUkhf0u&n0vrGXl)+;j#?3*x=lluhz)U?e3q6&7~gbZ|FLNy25l{?%F
zt$0WCM#n1Z>d@|4+qB&c*J*zDBU*#)Pn2kkkhC?lEmVQ0Lpn&4^elyz0BpohKR&Ps
zX<Gd%&<TMMv)>Euosn>eG6exA@V&w7<DQ<LQUBvZi!@Jj*hUFk1fV99l~upecm`x|
zBRpyBI$96$$ZakC@&@5{%>THq>Jznm4(O8%z8jj=GM~NFvqNJJe!PVfF$?Y*Nl@$|
zVge0>?_ca=->-mJgY8d(2Gg0TsR&xJQYfg?7kxNNKi*AmqdW@%3BU4YG|2FvAJxGo
z3Gf!EkdI5tuS`N!68T88f4L2IIoN~LI1CyUjW;dn?bYN|-1_d-iwGGj9EH~=VuI52
z@mdED)S+|?Xkm7y2bWcno<1dJ!doSWyIkE;jRuGd`L4OOYZ6EZvJwRo0ZxyN_1CTy
zaEI#uJ)cdFO|#f=4>eT5)pSiJ9K0v#XR+}Z?)IN{4JdUR`Rz`FoA|9gPxqiDUCYfY
zeCjg<57l}AiDJ+sYH_qq@1#v1WT4hb$p`|7P-N0D1ZYRJ?0WTh*;BGoCByzKDhHAf
zLPiBI0T^{)j#*iS#+<qxycfZFQvil|QVV_CeU=Cz1k`ytWkBm}DkBc^xI{^&4R&=U
z#>el<_}{$wH4y(y<2`I7jvr!?gMPnWt-vW=+mHVGG3OB84tk<e&<**_zZb?b;%29|
zvE5=1N&~k*23h2eU^`Yx4fGWuJ2K_{IIk|DPKvE*Wb9h#bbKU0hgG?n=@xsK(K*N~
z0Gn3waQ>a(__*+Ypcl-^Wk9$`yIJuOM3PCa@k~-?pZpBm0E=!;03gw_W$f+$f=B_^
z&;X1?P^>-~H&moH0`QSO5DWlhiJpM03~oXB+z@l<^>F}@mA2XhRpN6*D8E;iZc7Qu
zpZcFrO$OF_G#Zdy4<<Lq4GE9{gvhAI{^SuX2Wa9eG*;*v<<cjJ&lm;&){;OzhT;(k
zSU%ChqD4o!K#XU((z_7s`79{bn;B9n#u#`kh!X3TQMY5aMjj^-AfQ~IQi{7p%7j8*
zG08DArgUfnu?Fi?#(VZ?=)aIG;K={rTfkk|9o2XtE$nx#gfymc1Cju@<2z$wt8-5W
z@bK}`vatdP@1mMeG%lC>&rv_Ks}W>GACsw`k*qPxF)Or@TfbSusfImRfs;X*a6KJ5
zGxu*Bc*J+jFHiBpZn1zgz(a)GA|^sHDL%VJHMtM(bD~d?Tf+#c8W<5OF){YGaJ(>H
zMun>p?F7ihXhw43DZ;zt%s8@MzzPWN&E!Us5y?UemNk4l$8_5c-u@pa7*`0@qPb^*
z8;}pr7Vrzea(#p&hLPMa<+~OTefDr5J1la{%!K6DlP<!qQeIFQ|0Vdc#KQn|CsaPP
zQ8e`&`;1JjRBc0?GEk)K=LyQ6yHP|)52GA&DPfHD<eZNz$G>NhE5WmvP`3!Md<u`~
z8X0r{^-w&dHXH!2FlfJ!G9N(?Ia4#_C@WVdR@8a<V{5ZnUuGciAD@9#{uO{Dw7o#v
zAhriY7;4eY!^~fTK&%jkHwDj6X-l|hQQ|uU0dlm?8#?cYvo#p<I+$6$n_UH>7)^7c
zx9su%Zv@#?K_CuGeu-9VZ{dIls~j048+a>i6!nD-X`5`_FLTSZU`QmgC;|3rORN8i
zv@H~?hXgA0G0L$=CI3KT|1q;rHjMJLlifLF@YEq=)8{(U%Pcs%!Qc7Y-&k-4{B7<h
zzb+G-qk<p|v)JDSU{&UWu5?gS53TI&?T?QRgZ%Z@9{whbX=hP5<s1!i>9&Jgyuf9m
z+nhS35VNoQ>lPW-MT5;L%A|62zb42cW5ywByTC9Wh{pjnrU(ralUW*SI%TqUfvqsp
zYlv;oWF<8~CK_Ja?ocwK%2P<FN_iDijguAkATcuHe2Fx+?mk<&++Hd4a8!+Yb%>fl
zL&|W_cvHyC^t6s9`=(<nstZLl_`HOHwW;F96TI1u|BYuiR?F&n9>gI5f8_!<-Wr{-
z?6R5*JEYuQPsjpoYyvE=3%ub65l-*5e9BsRat>~&;S+<n{fDYx1hq^GffAOu!k<7S
zVUcTmQf|&Z5j4ERfrC&0$E&n_a+_Y}GDLP(<-tqeZvD>2Ba`~sqVi9-Di%Yt4iX1g
zDxSE5v42Vj9{4VEI3AIXBljIoj51^Us)-RBtFkf%Ol0^CP6wz!|H$kVIuviQJK*k5
zFR7jr^+Q?7;R&-Gdqg@4Ap@0E`RR#KA%tM&Q;H^;Ykw(-6hcRoqmN&HUAn@BVl`D#
zja%EH!?_=P;vZ-nV53oE<OrEAt8xw|fjyX<`LUyM!)+81s=Z5>8J|GHRr6T3+CxlF
z?PRpCsnD3=zukxe3dlAE{5C>BsK68DXZ9*R@~oSrc;O7DxgfsfX7JqxwSbKO;KCia
z6S2uh<qD_kG=w7m#HZ<Qs<)ui5uX3|kqXVKiIyr?IQ4kl`5JXj03Hz`6V<$utBVDK
z+yRXoXHk<Fl&=TR7`)H?6Ka2U(Z9WlW__S;kX?+Gw_AenB#pl+-<=iGsKBjXQC0N>
zbrQn;+p9^hAJ?o3sM@hAf4tHXp><J)A>j8v-RL7}CedZh#Q+Px?e%}_65wwcp@o8_
zkc5^ab29cm`BYq)#_tFd9ubN+vPF55SDk%@#V<WM>qO0vm8~Yv@FI)}81fA`naop<
zC$5Liz23a^fQ$h|0$E4VcLh{_Lb3*O4%-W&pk1AME&EK1hzT{vKZMMVlEzZpw2EeY
z+{L8B9+Z3f;9qnEftQ%ZjEwm;#S%pn1E}n;TP_N>ze;;eT<Kg5w-}e}R2JgZVg;QT
zm-Syj!kiboeGa4C#u>Uk@GoK!%7`mn4KN}OaB#_tI}3U`A@(!%6HJ@$3dj)(WLGN8
zltM9DXkLt{L=cogWt*K=gZl_$qE#HvMgO};F=1rP8nXiWG}EuZA-X9L(({{c*m;sO
z8#@eF()3U$B(Yq^e%TT~9Gg*fYJuxQSk%91(3I_<Za#NOGp{(k%fP>2Gsu)O8mu6c
zEu}BvM6K^kXy>rqg;!^npHaTl&4qG9{|sV)QD`wMsf6&D4a(-Ul4k##<O`F`H1Aj5
zAevlfle2nfr?P}gVRgDAN0{1!+ZD7}=08Ca{zxMFjte?NGc-Mth=;yowfu!3T8=aD
zjjCv;U~fK0o=4sp<Rh!e-tR$MJuji#A;tFx{n}S(ZrFpRY&9zi-+rZbiQ>$<gQg$j
z4e;;5gjHr5{!lxx+5{pCAJgXv^hBs)G3U%fn1Gj#!YJ`nC^!f}T?PO2VTqVEX$-}8
z_3FKZg(<<x4`8zj)%Qof6UKz5tQa*Zy2Qc7(IjF$mGBLQw^d2_fg*@4H)2>8Zxo3z
zax$0N&Emwv<e5k+%UYkMx6<$m&Fmpl86V5lN3mc{9tudvFpFKNz%U`-;*{$S3*Bo?
z5YA*To!v7L!6;*HDhRVIm1JH(L7@r8LsO&3jK|!w_m@u^8zwe_@cJfE%vOTMxVr9S
zjH&{(|GDQ?dvg<pas_7Dm>R}#BT-_QS!))hVS;<|pHc{0l-NVd23^^?xksUU2zuKw
zWZ116P{$3Y;L7K|KxWO&6x)Kad>f*iOXwQfr#-R%g8cmXrZ8Km@zlX-1F&Viy`#e*
zixgVc8!<!)7l;UXoHOZoo3G4K3^81imVUa!j+KsqdBg5BTHXgA>D+(D#KbUR2H{c~
zhYy<f@4rY%IcPqwao<3eQL-(@P1b}}GJL_lgCd7NDX|W)F%%m|L4~nPsRosloaH(+
z_xkQmCzg~LddC1Ui;s)LG(^b0aH@0bo4iJQtmqRV8sD(=KDH$fx&YrdD={emT|}Kf
z59||uhr#T|yMWLM@#LJ=X`vk%%}WfIPNM81DDO6nlcDuJr{lE~@k1{-o4S}pdniat
z?}e?WKmtfw2km5_ug}!noQ;i5*MNetv@J$6g6v(n@~;)$V?nuA3dhTl9RIiCZh+#(
z^11r!8D|G9^Vlagznwk}RZ1gJ1!!Sk7WB0+`0b2C4_v>PzqWQl#|1Nq5wtp9LQb>L
zFmZ{zPuzd<Yz*UP*i8?8A)DFIj{}`a?k}@*bLZeUOs-wMS_8Y${nnGmcGfGW6xko^
z*(x!V)*a*zPM#XcFnt=;*!xfE=1739iaU4S$Q0ZwN>dHYfA`LFqgx4@5PLu(fR;PO
z4*{}$CWK%9%9~`C=MQ!aM*n{HpVVz|-4jlS?TdrZdJAbDyR){9;#~1XXVW-7k_~yg
zwvQPteiJMZRG(rncn-(81qEE}?DwG|9Xk8Mq5_QCV!E5}(`W_P>GW+-ZAd8hlcKJ(
zDi_g`w8HNZl<$Z_ixIRf=c(ci5{U69{jHFb8jN?{*NjfT;e)Lg=RqBKXT4K~68jq~
zu=Q?ux&glNfL@z?cFG3~-15hS8JY3r&xZq5iYdeABGm9*ndQ9R8ojE6{i55)B=7?(
zrJr#YBG|tC{b)Aq_VCv-cO}_Q5D78#tQ7o!^nrg7KL?XzZm@}|tP0vVWW0M+lYI^)
z+syaW^ujACeifZ0I{Bk7&aFyNg2TCwp<%s_bNwKUSv$S5a^ktM32+4MH#d52N9>%x
zIA!gHA$~ZYhL13RoOP-DeVV+vrYeGd)GQ*3&sJj%Qm3roc&^=iR{>)Wr=5G$O|IS(
z14Oz*9<y>O&a@SW2QFB4hse{zT{R=vt;mN1n?BE7w1&nM>{o8GapkAP_~Y^o!xDVz
zHzwtBA(nmACKMu9@*+*>AIS|)*T7C1D&QQsb-t{Z$hRJ$&)**xgX0$qWSBO`upB<z
z94^^gXOaO~m!mq$qAk%vl>C=enV0MR!`;GvC<F<kYRJo2tkt@$uzhT@xu$oxn?`=p
zJi^GK`-Qo!y0l;1-}=K0agYT1GK{K}Mdf-l`r63c<?_At*Wz$zGxj+9{F(aFVA}bS
zxyaVJPLYs*x#Lz;`79gt`}E%wZu&#rP7LU9X&J|p$|nx{SCblYxBY}lqNqf%Fm|J%
z1d2Xk8zL1Ldw^a|iId(-DFyE)Qy08ec3q|b8hFaV3$Bs&g{yPgm5QreR}-Yp{%80e
ztyW8fYYA+M)dN)*g=o6*%SryV=&S@)_5MVU^7yO1&(}))FfAQq6;tr3E0Lj?8iezk
zYcXv2-He<+@8x>4t&1iP3}DKVPI1sY0G%Eo4D{B!^zAwMxKqEE<=lBbzQ)-LeCSZB
z@r^C?vFFW@qc}CSe~A@Aw{CyASFh5vaIC!&CI8_L;cGJ`4Yd{=KfD9*YV019#wW6u
zaLo6pO4}dbf}Ag#+2`pQx-aS2YQ`aZ0V>V`ijs!(Xi4W!#3cg%FchNM)Y&2L)9G+$
zl;Td7nHK547YenPt`D03aFsQ;zQH$9IQJ>>D{dGpGz8zd7fneYLUD;anh+j1rDz%S
z7G|g9KBP$mnNs*Sj{n~7j8VL)WzZ2E4HJ$86#u6N`;R@tHIJ}VnvwHAQ;ZOv`Om=q
za|Byu0imHW@ZUQB|NRCffH%ncp(h5ooR+Sx7yP&Y{7gzhf?Kbe2=qYd7;r=R?;mX3
zi%m>)A8*7@41@m2bdWx=>Fh>KhJv=XHuS{yza?aurM$&n9KrbtFVpBc1=*Hj;Kp=T
zvVHr>51hbmOlZfJ_VEB33f0xa{vy8$+adluRRR#6&!IATu-g5q6|@h+Pk9Z4Xbl-+
zdAMS}g~p*g_W^<^H2jYpSg|cB*g~U)#Th2(;WKg7L6A`Ef7@|jlayfVxFfBk$1TF{
zQZv=O4v@bdL{b$#UwfWF2YGE55+HWdT2;egLDWn5;TUFZUO3~T8P7##xgT~w&!FX}
zpB{eq$FV(*1G_J-5_VN7G`ygC_@ul#Hp?D%JAs1eCQ1uC)nE@>16Ia@9guFbJ)h^C
zaS*b8DBDlAK7Ik6VRm)}M}i_E*k588HHV-1ng+Ch-8KqpWJE-SavUibVtd!=|CZFE
z@St|>4qb~Iu;XO^|7zsQ<DuN!{!~;?QHCcaWtm5tBn)AWwZ<VL3K?YIg(6z)vL+Rk
zv9wsSJw=wtlA5SEhJ%O(VJKy9vDCqMzw@5+yzd{+KWF~AKc6vkyXUuD*Y&%;OD{wN
z=!fdu4<i6qiTb}&=y;_@EojsSW6_C~OU8PYxSS}V1I~BBPXhykC;_y{)*86uJ6U4G
z+851iY(l;c>CofQAha&F3l|sy>9it?i*j^j^S^ljB<yd=*$5AD0+m)*uSM$;6iqp!
zBL)U2ncf}RsP1G|fV;^wxM|=bhamaC7w%5_bHm}iz3z41$fW-d(9>VpqIHfg0<^vA
zXn}W(;(j%wx#{1&eOtUx`0S}H1>|~2b&TnX))BN-?b(%;=K=A9%qesbZ|7pB_E|pu
z@+r#K)PWH%?uATzS3R&<?AH(ZRO06$-CGzP@T#|~o&SPvJ=dTM`ss<*2NO1z!uR=`
znv@MK0-j*|Lu(0a$?cq>49Ec0Dx9X@eycjoj$pooSd;tzxc(VSJz%muvMg^3{^L(5
zVsj}enkMHdv326V7=w`%Tkm;&KHsm|4Paf<(Hh4J0B_dw_@d^OceR2#r{l%dQOPK{
zzmW<iMhajrEq2`F+(fr~A*!P2MHroOF`srOw{5kE4VvdaemffS4Gd}s=KQ$&K=@w)
zYXr$!@+BGx=mgh7KV`c#b^<cd@1M5AvghXQ+ox{(f-@eS^N>wk+*)i-qp^TPt%1E=
z!}fE~Qm&N*ulxu07R<B2qt^tC$$1(VyjNZ-UYtJw%}?ACg=e|XK)<t-ye8|3pw4dL
z0pGt+AFzyV!JfuoCnqOsz~BVcZ3x)Zq4PBZKfiAXc=%$F-s9_Ge%swB(hy`w7nc!e
zgTYtFt5DX+81-TdP%Bk3xhy}wasD=tJ8WP4l7u5KNUxWb1o(m3gnavOm>!3Cz-(@Y
za=;P0X`0?!D|pFz@iW)kZEVbAvV>J1`+je`NZ*id9EjM?E-sv<>Co=HAYh^Z>u^(0
z^uI1yE_B(+8EoIt`B0^-GHItZSHGyqS)QBH%#B-EUiE`ne=J-(dgz_Rse_TK35_XC
zfq(XeW$ZRgPAH*XaoZWs>-bJf_&sAOHZg9&DM>zl<?Ab|JeP`f8n(#Ut<`>g?N;=b
zBl?Qh|DmwbP2_Cfv(P@}lidd=%WvBBej0u>96bLl@cC5KkFllm^P$T(^rXPrFQ2mz
z4u9}q9O7m@s-vT0msq_2yDpJ0v$JoX_dbJfO^Jn?y1M!_nKJj%yDk)lCOV|Va$S3+
z3Ng;$V1~8q{LD<}vvZ?UQ?iMAv7gb>?-EVpWodT?2-LmN;&tBxXdw||J78K5)vv#L
zQ98k35Qw}yJX=^gh2}?(9<}l{HfV|@ODM`POJxkG!2Iqfo}Abdw=>d59G426Ok;sW
z&WS<a{Z6Mn6YQ--tRLnVHp&aRu2fs&PDE<(^6~;iJvTG+!6v)pr1i&{k96A&8#e;W
zURYQV?eGMIJv=;2l@g909vZrTtRQhaZ{uUKgx2irtVcOz_wL5V7}n&TxR;ti3wExD
zAMb;6Tjo!V5@<37OpYGCCjU!G6`!nrXV=G+IPwbV##hP|N*bNM8T!hTUn@=)6cj*<
z*jE}86Z3UC5mOx%8Ch9Xh4V;$c6N4dZf;SL(asyAq4$MUZnTCG5)u+1EsTf-r!|4q
z@14}h7JU|6Tqf0X8#Vc**t>yKs&@j4l2X#rE>4J@lD{;f>*aqnRYfQx!a4|+6t1*6
zxTKZMX*JIR9;vCSDv=3XnDfdxmP)68VzWyyU-h-Pce$o}OLOywkr8t<Gwxc%hmDMk
zgvDkZ6ejuBUf0ioBrg!q2T-u=tSqsbTJ;@?KVmT8GI14d-riSZ)zs8RPBPVx+lM8%
zv^D2PF}MS6dOerf((*B+RRwslK7{-@vcezb>h@n;goI*#7mXNc0JP<iJU%uCO9a4C
zNavNKCc;^MnKm-Q_kd*O<>?lf9#B+V>vho1;CA>97Zn~7*O>F{XXA6{o={0#T>c6x
zkAFwIAbWpp!>{%$1NF1Mw1`HOm63^~tp-hAusw9-ESG2Ud63B-lBb(rrZQIh?y-R4
z`EAJSb{0!jQZhVnuDziluc+v%XZIqFZ3&9)#OP?%O!l4br;^Pz&VQP0Lg?r0yklS?
zjISPYrro!iIGm8orD0kc+0G>Tknw}JT$m~_Fwok%4<}1Qjmvg7DizsQX<whmj1;#^
z^+aAcG}vD)Dk9R(N(tOl-`!20HsMLv_KFvqedCA6B5b-pT3u699_q9uIu>W#P7nW!
z7ppmQ){Zn<>gi{F?)?J7rI3`7wr<_3z}7;@{8v_Ls)*1ZmYqp=RxsrSA}kA&^>eVg
z(eFk?Qu?k{cVs9j%E#ns$i^0Xzr&9=eUD}Y$LEGf*0t;^2O~;ogH$u0M;W!#p!u)a
zN<WuXy0{oL87M+U`Uk$GLq)jc9X&ZvA#3AT$iHEOU^|x_UKd_@;dIv{Tc3lr@s_1z
zJJt13a>~lPZt16|r$hF&IVVKWMUXBNgg??YdhLxn;M6ZbB9XR4yL)+=6_^$k6{Q7C
z?VSd6eMIHD967&5&}6@S!;#znI5nMpmobT$*&RCBS9Qbc)lwzIYvWhHltjnGm`UF<
z8fGxGXfzQb7h~(NICjhz&ZI>}vW83)U9$^KP6}1lQ$s@zd#5wDgs$d^cV>YT<~MuX
z-aa$j^~t0{+-vTlRfr2<z<mZ{NWh=-zyuT%R;^kEQ;ZvU{#wpH0IDy1xl__Dp?yME
zw*gq2qk{uL_^yXEvVuaE@ovn4MY5ruUfbO(8MU>wIG$qzC@S9c9G#d@gVY@PcWG&<
z8y{CuIsbjcaEg@(0j120M|vCgxgbrde)jBcED&heF`Vtn&C6S}W{n>+AeA~?zqt}+
zXI2(zG8v{L-fTwrsx(hY{6&EhBnb`j4|sw(E3g_H8=*3}2r>eGZn85>5Z=FkuawTB
ztxmXN*|?2-CMYw4=OhdbPubZG;<%pw{`2tgjijVfp8<{f;CmNFQuFSGq}6mj`dSD7
zFW4I%m|-z*lO+Vwbocc1_Re-svC0~>Y=6<qQf04i!ssfIlYA95UpF*}es)`PSc+V?
zd4st4J)p+UuC6CQ#4s}>Cg$aRf;u_r=1r%{Y(v+!5BX8`@<I*WrAPw}J&pv)G*AjA
zCKh4av?ZGM#QP5C37@DOnfx94`GU6|(e|k2owDy$H><7+U}z+L9=uLv8%y6pM)&vg
zThGt0#4(e!YRzyrS%2Aa=kI#?z(N7FiKj0f!IeNTk6g!P@eqD!^K#2K!eRzjxKAL2
z7;~Xy0zvaXUohnsc?8BrX%xr=!r+=sQrzp8OZYm21TIsNO>NT?Zqv-sF?+}BRfOW$
zWUD}Y!ra){Sc1+hw=#cd!T$6K1`ncwf({%`O?CB~jt(p*<`YL`DDZ8}%-*8VZxIK_
zENU>YWCeo=ZRY_crIs3Lc*jBs%;(s(FAXG>vggmAXJ)?W?M*+?keQj8l9JNa)>c}o
z;0Labok=BBr&q_}bv!lBeJ#KR7A+^7Lk>}4pQ;J{x@wJ=j}M*s5ymY+OkL8q*;!<a
zNfcTW6N;{Y*M+0-qqf1^1le0Kj_OdNg4eEHx}-z_6KCff)tY^>vOBYs`_I=uo&r2h
zg>{tE?{Kr0S=Wj|Tii>bR73pb<`(NrTM}ihiyHdNfdD2fFap@TZQE1K4pf_-K4c1|
zr>}2<%_a&9=e~#Xt7~B3dD|JJDMzGMZ&ebh4l2={9Os~*zK#yRMA9mP#S!j|aJZ)_
zZ|!A~uV7cf=~FOKPs;bqnJWKrb1SP}$dX~8`)KJK|NQxna0v0Q9)OR-r+c9`pOH4J
z($*!}r(iGi^z^`Zcq(l-A*^js_5gwLoI;_*Hg<QPINo~3NrC3>UO=bAJ=Vn5b^u4T
zix)56KQ;=#Lx`i0a}}*Bo;(q1M=|0*7lh%}Q19a(N3t5*=8cMx+WF><L+b7ogl6tw
zhQ;dT97ER=1Pf*AW9+6$Gn7Fn1o`T%pPrYOmcH!y&p0Zow+kS;pu%j0VPeZ`#1|@*
z(0OH{EoA!E0r;Kh=)8hYh=IQT*{PH@JUngzyaWlYKPMa_LD-_QlizwM5#y+&0@HsV
z*Y2-8bEwc<S4W3;_3E(+Nl42<UC7QJ1|-V1ys5u~SXEOas&UrQaTw+DD~FOJJ3B(1
z17BU<L{(H#akI205R#+0OJQ@p9Ks9rWvR>wZEsfTjy-!0yO#C$+mO=k+^G$iO#A)c
zF&o7NO^{u4Q3yoGChu3C={CzWM(Hik4uW6ArAxEQgTKC-Tu0Cf!^R35*4Nj^xr3by
zW1e}aWezASi>sY4=2{)Upx)Bgp&}#U^?l0K+uNwDS&olc+Ov=HtFA6ge)ID35V$aW
z{1e8X*w~G1Eo@ya?nuoe%;6MmkZFuUUrZy&qU`d658xgtZqy!YlbwZl4>k%g$N6PC
z88_nc{@`^4>EDKJD#dMfl@G2tl)QUvfrZSE-OX6`^Y?GTGHGg(mX$?i)7AW{vE_$~
zhK87!80Xy`B=pA>6?lK_kppcGTw>I8z>}E>ksfxtASR+h@V`G*5Zn19`{XG?Sm<FX
z!O+m<(NTBrF<qmxXBCNWySqJGd&;h7WJvrmeIs!zOa=-I3*iwAX?66uI{)s_GiwN1
z65LR<7-K5EBMYMctJkji?PIgq;0D3bm<`5agSt?G*Xh&7fjxH`8}&$I<KrEy2^_`x
z`qVeeTA%j!S5jMDWo<+y5{V;GD+zXcxC`csxM1A<;$q_hQ(<U~U0i$<ptUt~aB%SR
z^8<4Uf=A)4TlJ~I!NEvXzEx@vJ^R(l$;h07h8pi+_(4c|GjTvu^Iq)J+FEq!b3)rt
z2DH@QL`k|Xst)c{Dd}K3nTKNqY0*ukTbi2SZ}bM$V3l-RZ!h9sbw)-8JZP|@(`ZsK
zhZcjkt$W8#L)&P3^!|~rpc~B~KawKO&d;|lOuoAp%BjkYcp9=qA&wrE<{?OIW6nHZ
z*o1&pS9%Iw5HDZy)XQmTXoQD{Q*3t~qT)dy8r`^d?GF$v4OL#EhD1ex09?M`ekEb;
zx+0A07lvFj^o#sHWf0fG)ftQ(MJ1(uiYwX<!qWAYevYZM&d;@kgVCOd|M5q2j_K&?
zYQilW@}{ShDIA7<ec=~7SK`x4AXpIplN`!^a+AZ~N*?&w-_1R(%PY=PmYA1$*Pr0t
O{jiP^wdkN-#Qy+Qpy#as

literal 0
HcmV?d00001

diff --git a/doc/shared/figs/arkode/v65b_erk_stab_region.png b/doc/shared/figs/arkode/v65b_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a132997539f83c6747c0fa647d3e091a784d488
GIT binary patch
literal 24305
zcmeFZWmr~g)GfRSB_$P*d?=MhrJIM8kOo0Q5fBhTx<dp35eY$5Km=(7lx_^9R8mBw
z1nKUMGnaesv)}i;-}_zX{Q7=;$Lrb~cw)tU&wI`>#~AmD(7vp4f|#BdL68%dR26j*
z1n(At;KmT*!Yhw9+;iav(H&J|R|KJ@LjS|Lnc5AXLI~V0X(|y+5i?K;QFD_#jDwdr
z+?1}k={ecBd0uz1Ml|L1HRQ3p7=2r7jOKMWTO%izTdusAOO7}ArLGLo!ROh~&nviC
zUw5-}a>VG{-L^(9i1KOOaO1lmc;O=E{6z`j3litWv|F)J2!cT_Daz}6CC?9e`%$}(
z9j$03-M^yt{xze?8#a=Y`0pKa8C~XxEhs343QY|ana?R*Q_{I^EZ0{POwu+{d}ZPZ
zOZp;PB_mecM2R;+;WH;;fr|%aMk#0OQnc~SX49`3&opdSePp)T;it?qjk8WNeT|i-
z{5Wu(_`HTo=y1HdrWyl3w8QX;;D`JFCx48s^CQ^F+1`9?cxB}szwFD|Ybl<?vCPd)
zO)~q-ALSdA7FGp2o%^o8xzYT{so}uTXE0qUQgX3UVPqA5tSy0OuCJ)!&S<b(90{w>
z*5c5c>k9trp@i2LWv|@pUQs_k#@YVT(v&}O*jjG6(6s7;=i*>*zR}WfT}^GRDdF|E
zR|;zus~<5*iZ~7X{d#woNzx<UsNQWRuJjQF+xhcvm80n8mnzcJKiHI9ioPu}kicUU
z91!_)f_49-eWX2EwCv$_vbbwT^Nps5-g5;N>wH=XPx#Gtr(Z=M?yq&Ug))dZRL&LF
ze0Z~E*ORp{TzA!HFk372^=saue9fnVqrcwY>;C=l;lnUypL3+vks7|6^Up5cY;QO^
zSQ;C%4EuP!%mj|`BTXSph1r{9xyWI2zW?ZOtKs1FavM)kspF7|593eSAMfuGSk!uT
zbr8?Y%=Bbwt~CTWI5=Rj*hm__<D_(V25wjEjC_8qCDZ>(g?u8vt>iM{$_Ekwuc7ez
zeTxU~wGZeQscv55r~5wBlkHTuVJK_iI8yJQFh|ZPrX67S^|^3wf0^GX1@?zS`D`uB
z2SosJnUZkW`5R3wsg7Tsp7){6CRS2XqKW*pHaH9u;6*IxG%V$v9Yrs^T7CJ_rHEn&
zi+~+#uQr;yP0=h%b1p)*oiE>2Tyz;%wHSyUpPX#t3ELzucO0rd^jz>TD{wi0At^4t
zAnWVBRJRo`5XCHQva^|-oNOP!7PZ}Qa?b0N@ORGkPTNl+Z(v-kU^aac*|gujee1us
znZQiY{jJc$|7rK`#vBt_*!uS7fK%YgC)&&hQRTM>?q?$k_eoESI+|KrXHtxfw>};y
zzdhHT895;FIZ+^yrNX|Kn~#rA$~sc0t(t{Z5k|4E&`e!jorIV;-ka^`Ym>4(=ig05
zb(<y_9$A=Zh{^JOx7IjLg)p+-*S2zH%O4%|Wg&EBk9M?XoUzysU!GkgAY;6eeL3a9
zg9n3ygLnjFug&XBMyRSIA|v<u8V)mub_FvJ_O?Dp8wlUKueR{B3~qbaAm8wk)`;(t
zbO-*<u<uf9G>hNz`{h&oar<)?M{&Pj4LMqr+IGPQd8FMXQj$cSWCHfRD3UZaH1xA{
zjn^i>-s89bb>ZU0feNRk@;7kJ_1{@8+B|gg@!MOdD6#npx0&#yBUM&527jkhft;%&
z)B5w16U<U#;g)!#^1(uRW;GtI(HAdVfHlA=U8wU)IaS7gcYS8<o1RvRq~~Q5F<48%
z=s(;YKG(@F#x))V>tYu#>Q&GB@2@n&X=R<q6z%Nnu3sO8C6^>*=hCAo>b^MWy}dkI
zcB^kw?*)uR?Mf4ax3{<K(Y|XK8B<dfL-u?yS4gGLM&6*rjWUy|_LR9JJfA{~iEJ^C
z`74f&h3jsO;gpWYwwFJWPb9$AE!OWj9v#!(n6awySTLz}n;HEW=DG0G0PYZ`d)Q~L
zfLwO}&f_zh<L>nbn**mW+Nee^c+{+BTd$0LGM5dW>JszYULHBztbnQM?(W`P7>K4j
zpRScE;~2U#lbt&3^*icol4u|d8mz9ZLD!BO(bAK17xQ*Er9ZPXrFX!k!wg4DZ~ka~
zd{$aEl;fQMR^lW?)#F57vub^b1!`*Qo9)S50_5XQjf^KDWr#^j58b+?{E&|IYzrim
z_9Rg)W3B+mJ|8|{XWo9YJT2nzbYP(2aCa^_nK9R^&(u}Z-rgRDLgf)-u2ja|c)m(k
zOvtfipF3882Xht^&1kqtZw<1`Mny%Pkk}n?D92#Ee+9ld9CGh7%iA2T_unI6_LB2~
zB_w6pNI0|dDUz0ln|t5$XTb7%f<#_pHd(VepAG-5A)^Uq>4wUo8c+1>FojxbYO_N%
zTa6Law|et9Lw-~`|K8tOTU%XqtQ@_+I8>vREcRCZ-tiX<q~i`m%LJb^gR*Z01-4Te
zB#MQ+82&m<*sa3i&k-2GB;j^Pj4{B_(BsNV>77xmU0GwJqQ%^g1rO_vixo2bpP%rp
z&A;C4Ru|y<tbGs=V-P?r?n@M1ug0I4ua|v!H6QXz0GSa*YWsvsLPElc(-#_V_4Cqv
zUh9w*D5|>t@%T<=Mh3@(a{N$3eBG<T2kTubET5X2YZfNHijL?z&i;6N<3$3e=a75i
ze*T$&p-bnMokmKeQUi8#i>2B$7}se>v(K6iRlD~xuW^5_g+Q|4bQWXmvk0uKo!nb$
zDDrb(9dB*>I9IMR(dDs6h<-7z_?R<UNI4R~DB-4RUIojwO=0RNs=j3;01l+CruMzy
zYK7yFgvCwuJArTNw`bCF?ENQFt0>Zoi@Q5&j-R0CkS)8ydv|NuV{cwuT-=eR78c-C
zM{3~YvzvoY&T?`dZ2yjSOd?)(AQ~s&4DT`MO)XJB;3Q*JfyL=mzoWc!vj^tm?TzO8
zqr*LOf#N)>jITE8moClp=Jyp;4CmES3@mJt(DJL^;w~bC>}+4=GgQ19c9xW=d%`6%
zE2}MY_i%4%qQL*?U~Ba`tm(}_hkM&@Fys~u0Ra!rhCG$=uP(I_rp_p0>vt&c$<|Vz
zlVl{bc=dW5C+@@5VAAn{E#BxMM^DKMy+>@gmtyX+tjV>_XA5dct%TItGz1*P3vix2
z`&od`xL9!~ZuKGDZf<Ta7Z=wmRnphZPqY^J<|1WNaxEmknjf6v8Bc&TDds+_zmq-W
zSP@MxJlhh>epvCVsjmXA=YUHuYagwt3HSEyZ74lkXnJ_M<ikf;bN&TI`$=Y{wz0KR
zoSdIJ%;VzX#+wcEH&T!GZ~h`^TPX2m@;GyJzWTJZPpOOE-Bdn%YOA2^{5;ty48Jp>
zI90}7_l2Lmb0cskEHZvx^740UClf6KsvruihdSc9^u8Zr5AOz!MVwt-TT7@B3q14#
zpfTaecjb+o$>Mi``hbI7sL~MM5Tr1QPZCEU>#SzwrDE`QPLj~@##k5}rV2|+UNx_`
z?P5D35DC}Ho_Du@dxeJIbo!21TU%TF(MH7;UPyp02NLokj)PaK=H#d{DA;6V4k3Q`
zCzG69TwLOhN-WA9o|PUJTYrw<OA&Q4hr|ihbs%shA+hgWgMY^=A*+Pjbj;(&B@X??
zXH)%FBL(Vn4r$+dE)AmzceYpEJaB(|rQ4IwAUscE@@{;;*7b1@d)AO%d+ET#+EP>F
z1tu023v+Y+2Bm(r&Kw=~D!Mky?5wQg|8t(!XL>>{A|fK%x_S&&WoaaZg$)jgrASy>
zSYERjJSy<W$LJTz2JCMO-}?UAxMVUj(Oj3`;;p3;#`mpB0Zx;tY^p!h%FxhI$Fc|_
zA|e=_bG*FCV$SI<X|+rSH`OtTmSx%bKmVPZg!uSvmRJcWB@?^vzutTG+N|Zvmw1|L
zGp2asDOj3Dhq7KrhX*g5x*SDP+uGE2x?d;zDls$9ZC+e5ph&%J%w6%ZkaQQ4h&zmJ
zb(!z+r<j{xpK~_EKYPX{z#{4Kx^x*<K_V@8Q5sp8LjR)P#6<60#gg%hyLbfEb>}%O
zLI!YRc|LRIJ@Up_Z))vSoC&kDUV-dAn(yW4{#e>~Gv0!mmzVU7gMG){7}{Sj=2zzA
z^AuJ|{R&LV=moC@74w$>wz=8yqQFJ34Ud6^<tXrIEASp<0Q61EOWV>6`TO@a8n$LR
zRJBmh^f0=9xVP9^eL|ivWZ-6E_Mvmqbv4IEPcg<ecCNn3Jc+APBV&OgENQE5C&oL(
z^%KSP35dFXFp@QY2qmfUTv{w!!R}Xg7$y*{&i9u<h4O>qAuah@b$sMhMgG03w5bD5
z4MQc!^(1naws@{p;<@hyu2rT`USbm;(hKLcy`pc-*7IO<%U6QxCpt)WZG$?aSl*a9
zo;`$4+$Ez_yPtm(GAx&8TCE?CK+)a6y%!VxHJ(K@79pRVg7w|M;PIBQwB7cY{nk3+
zBF^|o!hN=dWN7wB{3j?XOPFIF_m||_vNjnBy>Z6-%i=TGm!4oICcD<AI(P`=tZv>k
zs^V&eC@**DPoG!zKHT@V4lVs;8M~JAQ})V{uaQknV`F1A^WbF>S)y+HvPXaqjm=CZ
zYD~)PGr1M3{XHfcAGb}c9=V(GCtmmt&{)SLXVxJ$M=d7ra-ZB`^1aGN)^WPX+YSI3
zqor0`*rTOfHfDQo50sxec@nUh4-D5TF^^H<mzEYnD?OEH<^>cX9+~1@FX<ngyrn<v
z$iFY@c3Rl}+h>6WUQM>`?^m5R7Kirkk;}wbFv<8;<`o><o{1ODyu%RZ^6`YISD^)y
zNRp;FzwT*Et5rciRz*P72?E|s=c(5#1VY}J6s!)($7A=Dyz<)5ZyDIg-X~+)1)Oz>
z<tAG8qnQtO=ZXYOD=~FHE1hpttYo*1wSLr>_NEbtDL&>xW^00oY9@&o$S{dICa=G9
zthi}o({_7sXJ-e;vD1}?p=PMwYh?`Zu(}o#Su?<*aiV)xX?2WWpIubxy)sY6Bq8KD
zxD87iP$Ugj-_Q^sNzu!f*8s!>oGAl5nm@>735(3E+O5C*_Emri`lk#CVJr%(Ch3a=
zxX#M1nha5__fuVaub)zQcV9feu2G(ZL-lcZWaM1eE4Y5?Ga65q=Sw>3cW3jvS8Ho)
zk&5N@9<9$fY@D2&JUsb;E@3X<f>*!Sx=5rrs*fkplCWCdxPf;-%IX3!Xk%ri`n3p}
zJpq3HC%#`w?R(W0GMI4!B=UQ?H6{2$?(B7VDk+8T|5!5`2RPQ2okl$9?Ck7veo!X3
zuPWu<;b!PkkyxokNcPL<s?-a6Iz{Gn0B2hszu^avCY}^=6I0&r;F9aJIX`nN`i18f
zS#PR_7)j@A<BJn|*5*3j<qg-?3yq4*EiKa-g==55?wUU;E-ub!ta6|GF1b{zw|k@<
z5O9bl+*-=?q*!(pxZ;OQl7>De`uZo`!q+p~k}lx;mxny~DSNXlQOx!(zMXz^G>ZTa
z&#kWX&?$Aaa0G7D9XfUJOso$<?vC&qlJ(y$JrXrEG-MXL^Xth~$JiGVDVHafaVz9g
zMq?8aIFHeWeLU~IYPFL%+-G_!0DpVNq|}ymgr(*7q}9Z3cVF6kSO#MfZ^$;(&E6-S
z`7rZs23;^62KD2c`c&%`OBRF;gj$f<R7qK6OfSa(3^{u_ImTl3b*?>JmDC}cz*m!>
zn%rU)2ueMDxK#O@Y@!DsMN1&P`P`HJ5#D!w-y$GHYy5VK_rDd~%;1QT{UJD*_Y$BF
z^%;$r<|yl%H=`Lu+dDojuQannM@Bxr=@E||znSWv^*W$OpCh?2?=ZR7eC%cDoj!6_
zeF(*Gu<(cLd<9@y>eud4jG?p1(8_c5Rs6w#lv7yFermO!U13g6j?1hQYe;eP0HnBy
zEa{}LS@vU#a@$8I<6uTxsIRnadA+&9`+i7(BStGbncfrdLL$Fe95ah-fZs%0!m7G%
zH134ilA5|Ylt(`4fQ??Ggtb|NFc(sH507%c`}05ED%e}N>ZLf1M0W;II_fj6#Z+z$
z`%bXDfrxH1I0OCBM)IQ9yC9s^8$}zHdz%Zs(Dx`9h-i)S%0YIIcfHRO-Qe=Dpf4gz
zdSY_YWB$hqBna*Ad}dWH6R|4Hu};o*Z?E{><_k%D_2I(@ty-e-I_k5R<B#G44tJ&+
z4i=ma`vT|RHpgG2J9+BV#&p;3FqQyqgI_O?IhW(RaFHed9ZJ}xM^6dk2HeV^E~iMi
zt6jeAG50%t{?|S<`IU7_vvmCKS%zf7nwpwsZ!JIhF4awm#6B&OC&Gqbb*ghm+bPc%
z+GM#Ty{hy_sn~LW=M_|Bbb^?7Hy9eTB_RfjgIUGJy~kT(KZcPT@jDEZ7u43fqzmWw
zN?dyvWLRKQweYRu;aI&)?jYX*T9Utaa&U55+t|PosQlV?#`B`l#=@RJbkeLJC4U3E
z-8bg7cc15*pPs)FLNFnvQe1Mgqb+4KgrZ_3U=P?7Ls*(9etF@AmH4&V_~dT9=7KoI
zD(<$Cwl>DXkBW*a>vBr9L;r<|Ymor@E4&%~V+9;nR#u>${PN`sqmXUPKqvLijq2dt
zdmFFX-u@WtYe)*P!5Cd;fBy7o4x{GSoLL(MSBPzQ#wCDHsolFfW4K&z{QC9X%T<98
z>3vaXfAl9Nk5OglRB@^nEjAnlOkBPELTaWg^6feSpzS5!q3~kj=3Bv~CI#kB#^0e>
zTj!A&1g{@)S+(_Baop7^rD@EDnhF_pv*%t7<hQnnvINhDg#HDOiIcZ_FU9aD&H=Vt
zA5`-5t97x>^Yb?N4}(OcyKtWTQt&z>iDj9|P&<A<w511IW1T|s_iGUY-S)JFCdZ1U
z!K#bz7WBQH=O9BD-BO2+uRcUj{z-iNIlL$rOMTfTmpv^b7nkBxiqm=cGrF#SZttF$
znZbd0jXtb7^!^eO69ul8J9NI3Z#xoedoFxyvx&jUtNs>{DiFgidprpOY=F|V>-7PH
zZ;b>7LgiYeDkAE(DS<`|(2APzf%u(YauwoS*aS@e{>kE8z3jH4>Y?4twj24IJ(nIa
zieIp5p{O{*KYQlPBNo|VSLNvWd54LkG@wp4fi*eiWu!3S;b->9jNj<;<wvW1XiX3m
zH8PIOs;xbKh(=EK%LYOt1ETKC$){l)995=;Px!8KZwbR;WqDGiyj{NK=)4de508#+
zfVr7?hAXTVlg1~90a9<?(Eaw?D;F+Y&>wm{39V~U?W!6uF;XfgL~ng}fSlkcs!qB~
z{ym@KjA~yIPr=-`Ty~4B{f5sAlOX|ED?;iFo?j(OlT*5kgEM)vRI|F?5ehAzDg*pq
zyblLHu^1R9zzJe0?exO-8JU^Kq{BOA+#H8%cUC7p_nCQ`H9ul9IAO-i$M^N~XIF_7
zXn%g5=qDL0G^-gudI%A<16|PT_V2hyZkMxN;lsL1`M|f7+4VH_U9WYSXhUz5n;X)4
z8e=^@7Cr+|jaI<i;m4b_;-k!>1So6=gbTEz2EUq3Y2j@k?nVNS>egw0Lb87o71NoC
z!0mFMI|m6<RYPOGJ5xOY@2<bIM9Q&a$Kai6pACDML|r{S1|eIDU%u=ME>@V>JJrVz
zr(Vxeg>|yY8?wsE1_B2LA1>~9XxJNC@>!oA71=n+_Qb{T70h3irg7Mt(MSYYyDq|#
z+MXgQ>a%V;ac~EC1zq4|fY3ZHmQGRqRNQqEZX52o%74$p?vk?d@m$XRZ8qdxW6r&G
zJ0OLiodLS2LuStb=m21*8r){OkCD&-?Fcoti<j!{V$G6_^-|qjQA0q-3+cO}0j&Ce
zzR#AEudOKVxoB!`Zf<Hi2sz|usU5IKa7%*MKZF4IhA4L$tkhY;{g7Q*DVFrr2CxfI
z9F*+Jen1Uo(3mYNAwdyc4;IXHbYdySe%>l_Pa48VOZ&rcYk0G?`e|z16Z{SLNd1be
zyJmfTy|S`0l2)LtA|-}V%1fKDtI$j`rR^Akyp*NN@HEVK2U>JuVnR#ypwz8~BfF={
zXJZzapDWdgFNcreBS_~7cDsFJ;HUtw13IFIu1iM;02Kr(pbGoG!UE4O;N;yDWK~ly
zr$}r7*alcB#>JHjUpm_92qY#Uk=+@83~6C&y6fYSZ-S@vaRjm9JdqrZ{U+~YWN7#u
zh-PSofzu^tmbzl%1?d~g$M&~eJ)n!sp;{f(O2b04*UFW<<CoXSnnx9uqsExd?Hmq&
ztO`7jCO^Q`U2O>Pha?H3J+XZ*WP8CWP!c*Z*2dstB<no%2)-iy4gq3<k@wl^HL@UL
zm2x`HJv40O{fZt5*PtJAU_$VTx)TBY6S6{=JNN|JEscOvAbv>1V(MV2J*Key-4q4v
zm=3>1wOj5!H-gByS@M>9LK#Cj8<<akonfS>yKBAIV7yVH1A50Y`(7VlcsBSki2mJx
z7^L*$6$j}3+HAf&ee1Wgnr~FpM$*&W{la&#%I53yoj@lc@^)MVqo%mlAx)%9-Q}l-
zgHUj$?@YabFaIroOrE5se&tDtJf$I`LcT;?Rzpe^f?=kDBsf&zGdbuVuIVfs$U+PT
z=UwtN0g;^K;N#=SH5=eFd}wi$smj(Q^OWFIPZ^&fIAcc)cVC@ifFq&T_n*EDK|%)S
zK#<vgj|ArsJi9B8CHeFTxH$nCpY<FX2DFbJ`xFTrTiT~4N)z-tetm-FgbE|So1=MX
zX=rGm$Swj<iIkq4ngZ0n2oghN6niPE<-CgoPytP>BO3U@7^>L+blvEM>5M@{w0!-#
z(3y5`$g!ifmFwKOHv<doDvxR>o?H!~2qR}Puk~61hUvM;?dJ&z?!YH<jrh)VX9C-G
zd!&A7#tpKJ$MUcDC+LM@%q1W(0O=J<Vd1x;1if!YD7n;f(EczaNM6WbkV62Gf4qMJ
z)>P8f_fQJzEk8YgA|S%gU+BBFc=|NjP~EvY1?#)LwH4O$AYaAc1<S_p7-l-#FUL*@
zISrdGu_1_Q;kimoky(u)VQfmu5Kv$tAtBJ*kg&csoP&J%z0mAdN&oD(+#3}Gp%f6k
z(0M0}JWWdSJ=o|YVSO%S7x(-*urE~9)D;f>Y<15cKc;435eR|up|u}cTLTnvDWD4(
z8I;&D%r_uh0j=endKtWy-wWS^T$x!X1pG!uhGJDatb~kokY!4s#Ba>?1p;ylrGPiP
z4&QiZZ#tYm=$|0?JLcpR&mSB!e&7bYM}L2Rcbq`OK2%W%W^O=NK-hPGfW=M3dPeI7
zuQVSQ*V}=G*4Ea&t);{#jL>vndVB`bU>#^(rB*PA*ziyiTA!gI=-NQ#_&l)-@H$EO
zmQ9%nWKMyClE9;Y$WPrcIFO+)sRPq=E@T>}xi+QFcguwL37|HVUhIxbH1}z>d>ey_
z3Wh+vc6t5YI{TTXoFl)PA8&u_X-RWRUshM28-codum|O702Cy<Q8=oD$N*&e%<R8}
z1i+P{-+u6+kg63{YWoZ68kkyc@@qamyQOwL(8q;RK!`jQyp9Fg<=ZUZ?ZMGI5ED6|
zigm}K8V=wO=>DJrbjOK~`1Oq5sa<QAbg9{a+Xhlz-!HQB6uK^3m1I>%O!;3Ou4Oun
z)VF2Bh@8R>dJNod3k9}yxWXxQ-3u}bjBo`||D2)FPY|-=KFiGp2C)qlq^Pi_KnM6#
z-yRT2`g$hJ2+GiXm*1)Wo5q%wmOeh!E-8D9HAQV^>{!7#NT?rO8Q9o+$$mPBOkit<
z__Y?jfTo8G4eWJ?rh&e`epL-*cJIZ@0PfG{PG!akF-~=+DRlQdKC6|Ll~rBvI62vL
zqL7jmU66_?P&KOE=lCt^2iG|5eyIzK25ih4RD@p6)+1!ya65@@Y-)NT>Dhjpsl$`i
z^3QsOtFmpmFR(CBaRlu%422XANxr~eg$ZqEvT>-es-oE1-;X3SvY~py2ttz@6}e||
zvcK$>Q40xPR3|x_(6$L>Q5YNcab+x0z^9(WfQFbA%0mc+{NRmcD6Af0jKC>p)sBM}
z>pImAR4u3giBHyn<S#CEIo#h_mB`G@gr%%sBQPB*0l6r>9h8uA``$cQFehng$(bZd
zp;TF0TSJ2hOu-CH9mqxOA+}xVN(Z|ea9RE!09~?MeNVtbYV{j3*ip0WA=<xY_w-k}
zPQkFw&(DJnrj;U5cKzf1ZV8ZlQ)B}Vd$eR1+$4b43IGxw(B=0$gE<KMpZ@kC6c7|a
zwxu2mKcUV+mAd+(zS;6E;0C1^!DmH8HjfS(jzqmz$05!D0z?K;j|=yimH^QMimNS9
zU)^z#J7~?lMmquzOKLAe(vsPmFOl6JC5OvPd}3u|GYqN-EH{!~f{?6f&Q}rf@$u>D
zY<225n7l4>-4Dl3-_`RiS6u6dz=RY&#{Q>1{4XiKQb6QCmW_W43c?z@%Jq*I;7_GN
zs{n2%S|88^os%^-1{HvoMcPMb{3-~1f7b)bZ3$FjgttI_T8p7Q{+?AH6nz0e1s5+~
z^ql`exym>7PeG7ecHdkYNqzRL3P_-TJ{zQJ1b7~*L%Cg#@>1}x22_Yg<fsQ}8Em?<
zG?U0>w&j*|e+5F^Uc21boa6G}Bz=p6(J&SlS64~5>1!1Ot}ZUb#KiL+d%)Z~RZY;a
zHi8-laMcf*X*j5jwY3>&FpdlYe0*lLUe5CJ@|KokuwFoEDzaa~h8Hy)N}N4AHCW|Z
zG3fF+oRYmZ0RLz%S;E~O5Fs#Jn(FF$0qH=T{+D_(z_2yn|M>A^Jrfh|+neAEkn~)f
zhvUH1;Yn96xBbWJF<pt7nw&HbJlMd7pV54tk(C7r5g0|jtK}^`um6wgib4GxFeLWh
za=JD^ECRr9TwuuB$Wv6CZoh;w{~mqN+ybEQEwVV;nM$R_0x5oG*&Q@}Ob8vQvBeG-
zZNAv{7hC)J`N0~gdvY6El5QK{joF0c<azf#HT#YywqiAYtn&73&$YOa@N-!Wn8f(_
z9}An~<KwVa)YYNCf=2c+<Q4PEJMt!M69o{`&|ulMf{0;P(hsC491F6tjom1mJ%j>M
zlZS8L#SSTUK5@`80N005z-W=)S%M-A>mC*XT1+xenfuIeMt(|v=zRC}Z(;c}92^>{
zGDD+xDoqPn0{7oStpbq+TB_BXC$VnRo$~FCPz+oKUNcZx{i3^shfFs5#pqaq41neh
z!`Cs-GeRjep9?(`bsFw3xoPzJN}6d2tZ*&qjresjKE8rL0C!tU01+Jk5od%#8ZYU0
zfD6;F=Mfj*NiZ^xWd=RVbJ$yj@H`kLkgY?|MI;y>p|3dhy@0a*jf#)Nim9l(rzcx8
ziH3oJCj^WJ??Z^Fxp{a%isP>1KDD|OcvLgUFAJauCH|_6@q@wrGC7{klEHHRyz;@+
z_5V^n2G5Mm3{(`Y+JUSWN>MT7k>qk6Ak5anK(=Xjji=K@&m;)M&`rYoIEx1*9Wv?~
z8X8(!Mvmk4dy9H9C*YC*o@D#|1VM$h5tegic2!lC`|LM3Vwp<{4&L!U*AXj(1Wn&a
z_wxU@#3VxR7q2yRzeUx+6Zqq*PR9zMuS}~lAcHw3-G(+3tRc9Ad!T~p>FEub1NCG0
z=X{XFv;DaJ+4><}4(jGojNNB&%yB6p#7BWAUSwos{?&>_Xi=pt;*MA9_kct&U*0(5
zruNYgx8K*nVII=)pgHu0d8>AqIs7z;;ImpU+^$YP$)gma;y|8KugNP%K=To}*?$wN
zPWQFhm^~mFONxu*)q%A~0}|PK@#M*q#6(YE)+;NIlpX<JmTPvF5Qt85=ql{&a*G{+
z9Vwi&VNGMP>V=`I@f`8@grp1>mOa2GaFrYUl!$)RHXY}GEM4Pn68Q}WU@1rycU2Ck
z2EY%M1867NcXgo4{Zp-0p;m&p&fQ09m4X4)UfR)G(r^3DhA0V<d(2^cVj?K~X5vKk
zLdCD4Gj71*Aj`6-h@WSW4{d~wsi_piG;|^H2?<QnK2T9I!9y?$8mMqZYI5=*pp8Cr
z-vY2zK<*0Moyi7jS{8auWJ?C1z|Pu~?7@1^<?IqzQZRC827_gFIaP*li7m!Gc=^YT
zXg;Wsu-FO6nQI~N$ysFf!Kebxg$*co1>Y&}QUv4AjQoz4eUX$j0G20Ul*^%#78kG9
zEY&}rd<p#w7IKvblvqeHPqLTZUIDv-n;mq%8=^9H-5IDc0emCwVvN{uK*fbu-eSei
zH6IOwkiXG?GxcDUJdjQ{pmyEf#%6NJb41$VhoCpf-PhE~fT=XW>H+o$xF@Hs^iP1t
znQ3Xazzo5i^qG>;r**p&1|14+c4lTBOq)yMC<5}kwic0`#rnN?#g1eBGj22|PeLCK
zELC=PcFhTm!Yr5%xFjiPVIh&fUpRPo7Y~>Ue-o4E1BiXuoPJO0;d(YCl~boq2|EoB
zt{IfwR9{avdr?`x{S63Lz$&0Awv=QX=l?4an#R29&s0wY{J|+J4KoW=1AGP)<X`Uo
zkb!bOZ7jkmpu+_at?T#t_3K)oI)G~%o`6bux9!Up=xi(@`Jqk*5F{X;jP&)tfEQ!Q
z<rxl9cMWizB&;SCj&*>BAd~KZR|^{ssTFGG;fz+`s)RdqtKsLMYXMM{Ea~Y8&<m;=
zoD(SY>3mk^yckT~W1DeVujOAK$z=xt2g@F=MDr)!0vxUWgts4nIMk`3Gb>y1adBhi
z9QHibIMaZ_-@%z6Dj4$$ybp_2E&`tb2^1R+*8?R^uW+#*20w;Xp?+sF3D}W`K&~Ir
zv_vB7N`Cm*&ufX&&o6RbeBgU_MAQ}4_C5fmCj(3YHe5?)M={kB41kKrEL_<nB{V!v
zz$3ZrEL4o}2iW~Sj?iI+j85Xvv&#E;0#utZ!$)#xcIDNk_3&-)8agZir*svD8I~K2
z30LCMP>s>KpOrWmOG*|T+c5kYGsqlx<WiWBr;?t9E<4Z~g;4Z1d_4zUv@>ukdO%8m
z!v}bwRTz-<g@Hb30<M<7e);kxz`a+>QQb9e&=yy-%J1q!DS<?(l_YW-vH|=*j%L_<
zDy2hu%M|3O4L$}$|L?|nJsb2o$ATZowUdo1$j>zB&=KU@A2=k(gr+Jz4ULDxO2{>|
zfBqL;{ndT{jnn?mn)JWm+5bJjKNQA)8bs=BPaNc(YMzF5Y|l>2Kir3aAE(k$F7KJ9
zJ%&~nMB_e`T&$O3)2|DuMV?%um!IQb!{um^Tj(#D0<{MlJ^~&`pTuKwEiL_*d#+^<
zdU<W03ki>iNMmIPQdW(@5qBAHd2{_ERP|5_@Lc%N63CTJUu8eHq%(K!k{|v{rY1`Q
zE2u#YJ71mF`Huz7#_e%cn;soxvsaPU`)J|HH3F@<07;LJm)CExYHFRIFzA}<j>ax6
z(fclHajKxv&Ie|pAjP2WGyqvZw3iH9<Gj55!-w&Hh`wsogVNnU1Q16H_x^-HU_^8@
zu+YWB$8adlDUkb-U4O(OgGNbrDpa7!i3!la1{OT*=uQNw+Pqd%k;R&`5Fu$w!Rs?{
zyG8Z8!1tM<(5G=gPgi&FiC{QGXSiMPD~2l9j8+-iYuYaw=DQx^&-9><mh7G#kah64
zJXYB#j%O8R=3lnvIKbTPT-~>hp44c);;@9$Lr|V%RvM|H=kBcGMFy*)3Phx>AL*|Z
zo)Z&7+^|d;p1LE=85tQT7(`Un8NnqfXVMK6X3bFH)tw+)>+i?sxVzF%VA4CAM$G{0
z9FV6NLv4Yz?^pLcE)L5hLSd5S^o9(d04Mxh*S@P391yU3wdu?`uuZ|hoy2}g7S|(m
zUi&IKr*{F<rg%H^l~JBO+YCyZnOfi)7#sIjyWgVxLGjG?P>YCyDwc||Zd3Z(UhySO
z4hmM3nu8XTQZek;bfDjZJ{SCzCo$<-9LNwf#nS?>J!4nC1loJf-1P5Ax_WEPn=lsA
zUodHWuYJ_d=k{{!qa=^64?G@d8p5?!^)#~%&-k0So5pAq^j2?W=`R{RJENe_%%!*+
zkg!cC#{;=xlzQ=3&d!T(G3sn8trQ7S<qpWGN-+M*D%)IV(ip$6XWHYc5{kH;$B3wc
z3_m1JKNPErDpu>h9kI*jefx9P-)9J6PI$x}lB3pLLLUbQmV^VdQZK4C-<jt!%}ZoI
zAkW1KieZ<>%_)4-B)(>?!fE}8lw0xnY7P=E2cLb<E@_W#kL}&dSic8x4Ed|~L&`+@
zSxN3zzMl8dZz8fj9>df^Q-+&4rJ4WgB57+vEZa+VIR%lRH<0sko;&u(3UNGLrIh1f
zlgC}Ylu9pG{3<(0A)}Z+?(fC;>sbH!v7Dlaze1GiT~Q1ZyHR+PEuP#44DNp7i~jS2
zzQUDxSPoX|pzm<1b#-Tb>Emg6&sDu?Fn@Qa;r3Q4c=>r*v47noMr|gU$^FOMsyk;L
zkZL${mnwSZ8@A`~iXjIvn7h+h51~^mtgDH{YUmM&iKxP9d~8%)9%lJ{Q>23GaTc|t
zcP0x_mSJR`Q-#q6G3VUF*LXB<8{ig>PvOC#`mS_(m2ToGIaQE{YD|#$3<XQ;BZ*bR
z6Mxn_6~{FZD-{I2+@RbLNtrk%c7i%qoDfPPDnX*5Jmv`A*auP&d0!^+p57%hh}M;2
zO;bGiseo+92C;o0q55w513gQwCq4p<tOC0vF5)K7BXUiDRNbw5sOPwRY?vrckPTcA
zDVIjXqqOh$UriGeAwOZjo2awSmw$sV_+jL6m8rhxsT99*J|9btM8Q~oBvdJ6mwb+#
z=toMMRq5Z+g-0VnE%Hnp*O2EGm*SXk5PNL`B1MU>3>*>B2$BFNV0&IZ^JtzBAw);W
z^rwh9HH+qa!#%rg7aZGAd?LkjCw{Z{QzF{Z5FTulE0hRDEBdX-`#90)w<xJNDCA2E
zd^q5Wupx#H7-9+*9E4SgiGzYmD8jqc6b})S3&vm1Hu%CWgNu~HT~YuHfR+I6MdH;8
zJ-stgfm1jU#s|uE2T*>f4HRTmLRR2!yTC)n;8d%#gnh4H`XJg$Wq+$&2zf~a00r7H
zZ}7*dsi_S<0VL}OxwrZx(IoY5hDt9xg5gz-89qfz3!u^m)N<(8ZbFk4N+Ibn?**oL
zu(pAwi&}p@ajtur7@UN7Kz>F#ulWAf1i~0dJG7fIt%RNjKyXuYb0A3dZ{HqP$7E$>
zfG}=ns!VrfdX6~PKjiH0MT9<bGSyeP+p7<p=oKJZOoMgjs|^nikEHA5L;lQQaobay
zEyPIBowQR|k7f7FxJiUkpiq9;`mT=79w8!#GmA0!QEI0LOcs!`w?&fR9aca%$fO*T
z)k{?0^51o1Z3J@kRLd@q|BmYE<@xv=fIb9;IxIGAm4iuJCO#)NKRoRUyf85Am0*Ur
zTN_$SsD*xpAN@>we5s{TL2a$y`g9ivaZqE>PHKanjFhYKo+TO$X0e!jZDZpd*h&D@
z{?=?S4;ToS#@@xC)Abl2lAf{gGf-fm!2;UhD^OqPn?hA@86hfO@=#@Hk%h6tU5koV
z-0CZARKZty+;tJoA2bY;A)e9>q`umU^WtC?O{CHi)%zUmNWckrlP+>$2rRn*R?o01
zDk*&ek$%wpkDt5L?v+Z_H4e8xP&iHzbxVeQWR-5|=-Bde2VQxUkL=;u#@<jkfgDGK
z^GZ_2UEBIz3H%`zN>;JkNR$#NF9#SLO*9<OC<o(XH6Aa*eJD~vz^Z*YBt*iGbEsmh
zrqSQ1;J0{msn|lOVig|G_yW#Wg%|OKo)yLtt0Hn4kYUo~_k<CQ59Ag?1@yPESj^p7
zV*e=CQ!%i};1qeB>v*>4VZtGc=kZv@MsMCig5==~zq;U7!!N@TRW%SIBpi?-#!Fug
z7fGikq9QzwXNw?EZi(<CS_uBUDd&W~`4CV`4ozE2GeVC9;lT2))4?G^1nH?bUXsB%
z(bQq~=M@aRf{VUF2)~@=#^4}LivK7{7;RR^4_UZW$h9kw?f;UMaH-my1<*5)K7x}z
z_(p&Paa>-)%`r4LKLmBS7M38mf?<;j7CH=&H-W(fH)9G|`22xZg9`qw=3$VN#uy$V
zSWlPeJZo?{S?oNhCQA)R!$<buivR@xHHLk)A<=p-1&tc4nVB-rkmUGX>{<nuTI9q1
z$0s_k2ptVFu*=f`k;@>0N*jcfw6vb!ydq<ks)X|arEZwtJL6`kuMZ5mGZ4Z+$jbO`
zzFsdRVDY;Htw!}pG3d<nEKiD%M*MR?j6C##r1V0ngk3-hfXE^2IQZje7bwB~U-!su
zI$rqCbaUqSRs)%TCw{dreJB1xX3PP_TI8cUV}5u-G+$-6n&>XMPNjIlA}G3AQP>76
z8gy*G>9jD9rQw5i$)(2T=35pL&|*wm21%&0KbSm<e@dQ$xvrn=6x0MjVwlc7Ca4}=
zHRnzX$O9n(|BP;eREy|`tx%1FBj*Qn80+h9kPF;Hp`BeSA8;gb%?;ufJi&pyQ+$|+
z;e=*h4;aX3M)7n{`JkY#kQ0a?$*VIhK;00sq8&Iam%7im7hla%Ac&T-W(?}fPxYQW
z&8i4J55QT^x=6gg-W7#+vA}F9*TQZDY&fun{*WyJ!Y)TW*Fb`*=)~lSS%J(e4><5)
zZG@r43{@Nt*ZyXOi)b|dAkzJVsaVAByadi0G6xvzmxbjR;BL|^xAD0`!14qrO-)l1
zHnH69FGdyU49^I7`^y(nBHd!kPsDaXo6x#%@RMi+FM^=$WnGK^3<wS2riujWHh<m%
z;+x#n`<f%`bbZTLQXC|U`uA9cCSI3czWYTY%}sWBtU$8wUnA?~4pEMD8YK@O3wHzM
zl0noFWlhTZ%m<*kMM-%xkn50?(=W-2!A>~V7?CJoVYt@>JU}f3Wp6)FL-|X<{D25$
z*PCY$c(gYHv5M-5tE;QC4%8rGPLsx9LMec7bhfvjg?$dba1?GMv<C+I3M$CcXV1Jx
zKZL&Y+?`0YK+Of9_yQpUQqV}l;YJZi^+3)wEPo)8cR~+`|L}a=Bq+<zo;`y#M1{Rl
z@Eypljir$W&?i8Odk`53HVxn)KwR<JnMi~wXX}`}2!4wOK>G4a>*RskAHkjmnstAL
zlZ9O?bgAeafOWOVq5)+jH`j)37fo)Rd6;qct@9$zpK^4AL$wtWF0=P|EU>S;7T`Ys
zdlYJhu`e^cX#s}H;(-OwzuG216Lh(JxqW-(H*jhDwbHPnF0#sh_#w9SCyCa@DtCid
z(+iqnC{MsjOx!A}^MJ(&o;>hvHo?E<W((hiGIR?WNCDtWzjENeFw$T_*j4ZETQLFM
z^XJyqSaXQ~@XN|-F>%}5+dzb(ib+o$qm17bLg$6DzG^<$_(6pQRa2#>4iED5g&Pku
zh#FuPbO@b+8K~k*td<37SSRcP$|oEL2msz`LY*3q+eJm-Q9N=2*5g{60H{|P1lVx8
zPf<_28F!)+*wUn=CeKHEf4RZL!V}n&+06FfbkQkEDIm~UL(Xw=IbY@H{9IYd{pc!G
z-a3y0gGX1#oX2GiAB3zfKW#?8>h3qc^O@g(T<I*{*%lB-j`pWyVYbXIz};5R-UPdh
z*g|5?9*?_p!xnqt3IWXcOVVc;)G=}Sxlk_byyznaqv?p>nx?ylGh{bnC!*CqJtyP<
z!<)Y$TJPJ`;u~vgFN6J-h;{7uZx}+`l76Yah^PX`qjuPN$Sxw{0Td2|a-nfaR;?dk
z8Em-yFfS#XtP`?D=JwNs1Yy{WwXmrRGzORurcfFWge+j9GeRN2cefgjQetB60G(l5
zaSKux;mun79pL?lScRgZ<G}f53H}Vw55xdz02vMmeI+_@|Kp6C%-WZW;PNwBVgl93
z67t#i9GzDZ6+EP-y1L!q?A!Wsu>(kcSOdaX!kQs;6Qb<$JG|>ZBoRce@q&5qJnRht
z4-hbxXDuEJ-`9qZ%549_E7$^3>>6)Vl8zq;=h$#C?arA&E(<zmT`Qr=+6X&{sy&y0
z&=rBHdLixW!{mK1Fmfoee+;4{{P=y17`UwmQBideNHCnRI%cY{8&mgC1BF17dJL>J
zddOMpmEgrOpSt&O^{N3|h^1x7*mpyD=PK-5@Px31LpEL>{TNCCLWnOwJU*Jp;ZJv;
zUFs)CkjnGJs?WQ-by@KN-5_%4A<v&bFOn3sO$hV@?QhN&Sm=;5VAo(B32u(OtJq(e
zyQHM#lRya;x9OcARP8D{CyuYc8G`to5F5J!mX)t5l3St;J5hZ*m?GE+x}10-t5MD#
zK?dmr<iS>6{pO7}p);tC0EK<c!ger}+@#INk#~<*sH}j`1@3Vokg2FFE~q`{3&5gK
zxC5YS*ZFZ@GABF(vrt+g8AKHLJnrU&W^KmUt0F<h@CSD%7)=n-rfC9k=dnhJ;&*+~
z5fRW~=Xy-QdJ4B`QjLM?YM6jI9T`Q)DQu;e4@g7o21g6v@AJx<1Q)0{u#bKLQ20Ve
zv<f^%Zw+C%Ju5Sw0{t<Bj?vv+&MOwWizWa*xS#Z;5JXiqMotcE?B3D{3Hu(jpD>2d
zTvFs{8#3vhfMde};X+Z`Y&VS_(1`|zs$3|As1@E{zZ&T)06Yl?0Hh!cAA~oZ&{zII
zB4v05(}v=q^P*5MZQ)cgs{Tk&4tQaLDaV>_=CR@+_p$H??btV!aD0RgL<mA%U`TNg
zL4ZgUwVk3edgw*qQgLXTeVNBY!bLb#Uz*VA!f#mkt=jhUaYT^;K6?GnZ&L6ZecEf$
z44?ri`r&+psvGx9t?`g_^vEZ&!tfDAa`=qepVx5UwP&3b*3@h`2xSC5QApgGsE!ao
zks)xmtTbaj3eeRfY~(~#o%px=VbUUdYLHk*Fg#d*LI`Yc2nC->>GaRCxhT=$9M3e0
znT!@%YU*y{MhYh~B<NQx#{VZ29BM5o9bMhAa@b5b3Q9qDrmA2JoHb15F)l*E0dO4Z
zBRH~{1+Tq>4bJ^w<7aJzeaGkq#pL8<;FUp2m@$)6l;GM3<z1yjFP6ROQ&B8Ad=G3f
zIYvb<Tt>ldqx^{RH0&UO*!|SBJFf(6jIO?ZhW}~GnGAc?pT%k9?KE;XfRgD@rB9_7
zahRrI38jGi{<hx%3I?ppu1tMF8XK5~r&L6`O#iw6IWMRHGw7!pGwblP6q02z05*`F
zmWtmA3O!?uqaZ>$$%%ABf&2x5z>IJOQsj&o4IL>fM9i6opUA%bm$t{C5Ikrow=Fq<
zZR&LRyZccNJ_!ZPRg7`92Q{$G^>y4%fyE0+hxX*j^`(&`&?in<m5eJ@68Vp_E8@!0
zp-i}I7Ki);l%_W{Y}2~+Eobxz2KpNo|Mjl@{e2*Tfn^J;3lb#9!aXpm#-zV|DYx_O
z_LF8XhN0|#Z7nSDThNh>^3iLkKBnM$x<igo7;>n>CTst?@jGI0zaV6z=*dqp$JW3}
z6$UAU<i=Zn*pL7^Wy08R(38=m#2M@zA~REEsv$y#5HieS{L%g1BDa5Xgn-EsRdomQ
z!RzM*to8aiS`D^F&#zB(sA24wiMr2v2YCbp)KBFD{5j#|d<~mM9=jd^=TUkXxs-bZ
z5<D|K`dk1D`V)$41>e)27z)Q?UrBO*z=#nb3x9V}DR$ldu}R<M!s+CJ>^udLP6-6q
zpB{d<#~vdL)A8~IyvkKd9Q$Pz4<QtWKa7Qld{;Rp5hMf`s09qYh-6Rt351Yo@(+EW
zC&8`2@wgU2^6pBgVyNtXc*eHD5-EeGiZJtbc*ac*<Rv|<wDE3{NuASnmV^CNL6D^6
z6noIWiT>g%+@AMwqJL;dy!{b`)8fxoruLY$=QxssQXZtEIp;DiP$3j_K-SP*Cyrfz
zC?ruYiTnhYoFLVSDTb|T2KiUz=T{1FI#I;F5|aBwyFK=s9S#x@g-=AM`?Q)@E$U}5
zqaCB4Ch`GPTRMa7rn+;k9BeF_Kaf%tS=D#%KK!(ZZI4BQEPz*`GruxNaQgKL1elpg
zibZ7`7b`2>huu?2I4`;25~w6XB#!qhitN%OsNF*Fls`B7G4TtyUK-T&A4PHHE<Vh_
z`Jx;~Dd5N&S6$TdYb+9Zd3qLu<Jx_FmuZ&WJ!8lJ0rJZT2q(Lli-V!9>^K-=XaOJh
zWShji|2aDT3iltv?Tc20y*xMj$9G$!nJ7yL#-ebV-9f!3KE*h@(sw$?P<jhfJ)O*c
z`Zbe@%s`QN6H=-K%uLk!JY(+1N1Azg$*SNkLHQ;fwF<H3YYQ=izoxrTD$MrN@$~18
zUqA1bW+jm{p9l&7Ht6Lo{|qu;VX>JzJCC9n)sgGaMlW0Jj;qp_-P1N$_${CkuRtuv
zQ)-E~eaio5ncX+Ckhb4oH2rge<zU9s&SJa>8xhc)S}vwUa}R%wt7_q}oUjSTr(lMr
z)u1O$EiS3QC0KeIO0bX>UMC?DmE23WoVbUpN&Pwd-yBcH01bd%tv27F&IJiqjuYJo
z8y$QIShj`qvntOI@o)uYs5pXViEkxjRJmFSKYDpHffM)v5Rr&5Rv&0Nzb3Nhd$!cJ
zGhIgMeE4W5iQYR`_1DKwXs|vQIDW8>kUqdClH-xkzhqyN6hmxgSLMwbv<#K4)AVV2
z#*|~}PrZ$h^>f>~0e{9EW+o(>Oy`0NeWmc{vU(BazYdEqRl3KYv?)k%yLF9hqtLG5
z_)A)<3}T?Oz^wd`VhnIv9T5Lt-jx(;+cI&6R{S{i!OXte*{LS|1!WMwYRp}U{~|>Q
zCcF`m^!@UDx`?|&g+SrdK%X*3<&RiJo$rZ5dgEVR;+hM8U*OTDDt^X-(pCPt!^fY~
z_NR{cev$}UQU4LtPRD>EUh(G5a@Ev}o*Il?X(y}Nu7HZy#dH=SbG&eT;E)zzYqnGE
ziZYZduu8o4G!DwS@yPh2Lg+ovhhs4Ln~4qkoH8<~bIOMnKipn9Sy-y{Ta(Hk9=G6!
z!Idf(Yjg8qXwK(7YT#Cv8*Hqklgc+J6c^Z6D1$t}nvH5Q|B4hvp2o<&R;lo9mDXnb
zYZwmIz(auGk}2)rqGAo-0!pru?>ZR<Gp;dGs_B8x7B(f|E5t7U032B2jAT1@0BrX*
z=FWzo8~D-f(O}L3KM(#}W6(21u2&md{xG;G(@joA$oCgd#-aKabX&U@cP;@Dn1TN+
zCFOR-z~i_$)Iw9oL7-`O2{QIHBavdf;1I8lFKe#PA7cAR;S@?0ghxezqXiodw$z%s
zaT`$ap#fUk)m2j?h8(l_@F}}p`EgQ?=Yfm4_f7)8F}Dg0xmkZTY$*F*b&RkyFC^IJ
zHTR`rb_6etOg9wj3LG{P*%eb>3sehIrFo{K`)VFms@$zVk_bo8IVzp9IFrP?e+vOR
zD$ibjVButEt;LlSj>Q<jwm+S##wVU8OlinDepbL%IR~>N)R3-%D45^3_wi95Of~!(
z&ZPXu5mvi=sxGhgwCA{$$lpFQxnsJg5kgkW4JaH4LW=5YlPC48BP9|1Nc4BbzgP8N
zaPMz~7bN~Cb^LL5{i8DcXUUZM@1^*E5AeS|h$&)qB-cns{I|>;9T&lr!%L%X^5-8I
z&^Gu_LK`Hb8e?!yKmbVaU6j=kFb2;oMf%^~6J$C9-#E0HB~S|ZTBS%DuwXlYZPMC$
z0?h!h6TR;9F~s0s3G|THq8>gf%EyPwm}Mpf-5;(xR-vBQT^dp(PZ3RT%H7**U@0MC
z&C+<r)~o`vAA|9ifUP=UiFR>W1#dN5NDe%ThKHx8MjPJUWtZP|+g`rTstAf7n6LYR
z(0~9R0e3CB>*H{@uK{iOm%4G}PW`RJ$S{E$iO?Ag;6QW#m~jJtLm=##&C$zlkK<Hl
zh6k3cuDaBb5F&?QLJjhuyYyQRd_NRp(B{Fu>10u-7p2QU<G>SHz|7!8!+S;0aZpUw
zN$b)j=c^y^<q(7}@xMtQVA^2F;MB{~h_xtyedh3R8&nhqi$h~zFoysx;89dGP3F23
zV+kY^@Z_sKutP_cs2G4EHhg>At74#IFko+CEK$S}3BU3M)g?Jpb+ol#`q4A&jnt=!
z4!J#M{)7|Mi9w}YcDs;`K3<y0(ppd<KnLLmIl*%=+2sIuE@CAHQCMK5z{#IvVAy+y
zM^4B(*`AVbT7T_5E~_F;_&OI21i-NEr_Hml-4pl%uz&1;Z*q5YVeXC?m~#xZwL3x3
z1`GL&nFO*N_Lo$*o(+9G>;`xN*z%7F;wJ|mYKu+<O5tbOt+}fr$a3_b+|t7RE#Ii4
z0QMU|D+a3@W)qrD*rxE`J5T=~+@}8<J0AWgX$|*-ZjAWXQ1P#a;{SEa#Q%Q}&^Tj;
z;DKN=0^tL$JTTBN1#HzYOZ$9#ZLGJ1g+=w3r9d_CuPs#5@H7~2cvgZsxC5l&`8vST
zO<xgw1<&{3;^ywIIY}9%pwCIBlOU#OFh*ezp@44z@io<YHkFr`S3_O>DzFp4+CWEx
zc1ZBR5<A$E1ihqBB2W@?EF7xnPA#CqX=!Oip)G_E11c0MvBp!uG|;PH^AfPR-)e%8
zUmaja+Th1Udf4Q5IeG_BcG088tV&8++KkY7eOkx=!7=2n-SGZVh3D3JO*1FPcPu=a
z!4HBZ*g|gC-wC@Mi$k2A9;C>Q^P92$w#}QD499Lh{k7+%Q!-6aF`b1cA3=E<gO{uj
zl|y-t!d>nd2QG0>7b&H7o{;v{z`((g#p?QBZJ!-)Hl#NEbaiq{9cFCzuH1UzN>{Id
z1ohEeP_46RPqwqMIrF&nByp&Z_?}Z;O^u|MGy0^nWzy3b=GZhrHn#Md8eiZPnV6Uq
zGjwxdR63HyFIu<71AV*3gn^GDviGl5hYiDh!;?{l8v;i@d`QpER^gyJMnDkx$rARc
zo6Br~+^~O(5*L})H!=!i=tu5-wQA10A(A>=T3UMY<VhhRp&$MI;t~=v-m8jiu_tM0
ze7wAXU|nC8e_Wsi=eS0E=R_RvJ@IOsTi-u^WET{S2_JXafl1ELwe$1a2RgjJ08ES|
zCr;e9vjcJ{BrJ?TmJ&ENWSO`R!v(t{{a-(<suE9<2R_l9J7ITs*JXyC5^S|xXU?3F
zkdP1;KYbdda-N>CiqY56Njo&eY#&XhLmFnI2e)6-ArO9SY#X7#aUqBX@dZ^X;!ugt
zDpB-GiY`^AuWEC1BL;}!t!u%8Nzt(V%3KjPIeh#1Gtc}*Z0!5nsB9uAPj{&&DJCWc
z_&5dz*mLq-kd*y#YjH^lCsivb8}O7ACPv0>GN2EUAc7W*FMHx=0BrCmDtHpZ`%~3b
zRh%3gViFRobm&9#kmwkcjzWU2FEgSSj?f+da|8e3=bAj(6KKxCELvV#8m`D@WMss`
z!UE6as=s$Z0v>q;QN6LT0UfowEBddbqGC$&+zowW<JNZWiKV3uPhMs4cuxY=09B2Z
z?d;jJPEJl=pn3iJ^()wi;Je^2G=FpLF2v0U<!M@dhI=npW<n!8uhU(+xcu|y&kr9z
z3eyz4EiQ)Y`3{`a+Yj1)xOsXuH#Z-_Lk#FAU<3ICC-V&ur0RfOEWYJ5w*LmqNw3n=
zA=Z?=RaIMnxbY%tRUMz41cp9Oi)D0f4jw2q@<5S|`PBug9FhCj->=B41wRP4ynh2)
zQiS5z<RrT55gvL|T2XP+%8KLcSrtV^uo<>z9LmoqSy@>*JHG|H`;{wC!S#+!vvqLT
z2LWXJ(PuiSP+yyxvNAJ6m*gI*y1K5x-N8fYW<f;;I6$p)=~63zio_Q$WPqyzDJFRd
z*>Q%F4|`0m8XJQNtGTbQ0v^-D$~p?Q8G0dbDvFMDt&sONY1{g(%hM_=u2UWV20GE{
z`_I7G>g!wMvjd71-Tg~iT2nlNuUuxoaoxWT+qj2%dOmvcHt|bKr(Ayuk5{`$`caT{
zWRxxvjGqU<_RxpI)RBIK#H5g`ze;s#>4|_vyWkgahgZe5w_n!M(z<_raipQ+#x-T!
z-X_eSlQ(@(eU8&){vHx%X<1pB&kl4a5!1lW?uS@g>FVl++rr}rc4;^XzJp=10bm8V
z3&G92$`tARwxWUsbWr6{m_k^dru=<ZBEBgK!6R%842-W{CBVnO6AHkKl$e+;9XPHP
z+UIZO%66tYx7Tsa=txeFBT3?}Ss)x~oVmfmIQp%(my(j%?rb^$0oBZI*tO&e)VX4Y
z_PKEv@e%pcx#;$;4<Aq_-;ZE*<fU$|KKCg~c$VGsr7K?AdU^_q%*@R66AmRG9gp2U
zV}5&G{!a*yU1-5MbCQ^yjjg(-2CVXfU0w2u+zH&GqFZpM0C<dRz0Qx|tQMuE-3<p+
z-~nv;yLa!Py{bZY7geJ>0M9&LVM?KFZEJ&PybYD#PHNh4=$r!9pExx5I$aN=@P|Wd
zyKH$64-Z9jktk>!9fR|`VSo3KxLs#_m~q<6@~sy<CkQqxLjr(JhSJi~Y_aErg!Fl7
zlD1DdeTO}J%8Ksp?rCXhAZMAwLj_=R;fYu1er7NW!#0mJrnBkazki3_(cZqkB^8*_
z1XxBOrbL{RkbwK&hW!PB6kYK6flM8l>mTshE|k?Tuwcu&?l)z7PJa+<!4R0k`iA`>
z3JUj9Qc_;M`VA-Ipt^MZdRkamSadWw#A9@w&_HMBuemwj@fOPRH~IOuK=pu-0KYFC
z<t0VX2DNkbA$&(AV~*|@78Ztwhr<Im!tUR1PnAtwy0e|8&mGYMPYjwe+*IbvQ7G#o
ziqcx@40Vo?-!wBdWgM_7k&=?a#lxF$*#T4dzX@9NuLOMn`>{ZnNjr$|zNIn61=&?<
z&jVs_@Qk|pXRxfoKGjn+G|$^pS!TqQK-&X-aj4$Erl5c?`t50=lx$W1u*Jp2<>h5~
zDj>utIQ9<baOg=Ofw6VJn2(Y6wXv~XI6B^|d{#)ND1`svJ(0{Ms9U{ZpJ6K_!SUn&
zZ2{=dxS*Pn9nM4oPu@#AFFXl)&~yg_ewM-%mzst~X?b~hNlA^@3ftB8Ol^mVnwpv!
zsnm?Mlg>`3{zog<{tsoo$DiaN#$|9YYTeu1)+J#zo6(qzYg<u`TUwVh?ZK<a+A}WE
zu`zO6?OL*(aZ53Cgo9j;5MkSd+&Q9>GbL)}dPwd2>2>~tbNn(dzdZBI^L)Oa@B8z8
zUt~LP7F_T-ae@?@!{KHxu}=+JK7(Qyy1xFgCg_ZXO2vM!o$>wa&B{#{DAX2FS=o^U
z6D1jbS#$HXq4(^kRo}P;73Gf#dOfdiUHi#skat;NA1^#&sHd-Ax5kx2UY|SHueI0n
z-Z4Yf!0LwD+9+_h5Iescb+j^@ABdZv8PHuGB9)QHzi(JHu`H3%XHq0LqmwjG|64~O
znA$_EiJ;A&^Ya@j$lsH18I+upbDYcN`uhG0Qk90cLZR_MPF(9$l%N=*8qsw9ZoSfD
zG!+#`7Q)2}8Qo5KGVwEgKf0E3OwG*9R##V@v>aGKS5z5ENX7mA{oz^g;~hOprSf88
z-m2$Q57xc>M6=)|Q+-vv<>tPG$MAnyP-b4gzE%D9ZnFGNjpXs_AnAaMv>ZIJ<gdVa
zm!8s4Q|q#D4-C``I7+J#2((P)iVl~1C8wlVQB>gAefEG^mX?|MCyh^yj8aX?MIyMS
zVnE&Pr_*_q9_PY|<!zeU;V;@bj;C7U?tiPi*#zx{(Py94Rg<0@`3{S{S52V>(#uZQ
zu+(EP3hoRBKWl1gnnF+Q>T+T*S`!nA(qlX{qsy0NV`Depy^D)aa`CvzEXuP9*W7A+
zL47_uTV0|J09PmO<)^1dMMwWz-%Q|AI)L;0`uck0LG*NYi(%b@wPRsn0S7ETjgh-Q
zZUHwG``6Dns&_G^?0$P5$wR}1eE>5`0~3Smci%~}*=()tR>l<-6_9R$Lx1Lq!+FTN
zYDaf%XX@XYg>MfFv%lUNQEkC{xaF0V)BgyOtCz^AtNX^wOLc&)CiKuQTzs^{Uqd%(
z*B8b)!scdpjKmTb+d4Z#;9-wr2d4w)2t}foeS6&26{Me7KN=fbhh`r4`_HB(Vb%eO
z#BIUP{5AHH0vp1D^4^w2EkuV7$wvN<pBk!=uJk;7Xua$SGN%Or4X5uxcazw&4pf~e
z4H8r+6dp4t6C9J0l3H6^)6(2NWFb*ai$)^@<s2Ct$hNR!=jPhN0Q5cu9GG*JnGKOw
z4D&FA0LR5QcDwzA_>>)zTTO?SV3iyi89^P4qnj2g+SuA61*(5|*jit|gaL$0F`n#{
zA_hq&a_-|F+$iGb&*Rpgrm(y?oOM!XFRlXfgDnn2r{%tQ1HIVT*o1@+!1(Yhi5QmT
zMS|h-YeMFfF%UGf$k`w=Iyw_klH^7R$IF_y3WdNTO&=}sUwr;~9v`oLLuEU-_4e~1
z6cZMgmLRTk2lR3+9can+_w-x>;|-O>8b*i1kTdl5LW4$XkT&d58QAoZX(SK`=4RoZ
zK*!!_vDMZ63No_!S2%a&a5#R*5-lm|n3#x3yg(z`9GFr&h~IK`9h0lfYYV8;;6@i`
zx>KDERed;|$!1<nZS6iQtECr@O6HQzj&+-$3yT&P;a*XP(rI%Fi4SH;sxp#OQ&Z|@
zehtwJnz0_LMBCUCJomN$IKd9G&<OnOyJ4RqJ(iG%K!=SAJ3H0v?d@%(mPV)3J32Z-
z_R{LP-rh7S$$riJg0}Vdk@l%70i@quqofgr6@}BqyZ^}{h^<Q$7*qLWBGD^c4GtiK
zVlw_A-V=Qar$dqw2jPrHU5_)1j=)Xbh2+ON;JlEK2>R&gs7f}9r)#m1Yi0-H{MY;U
zAz844)TQf_rBszYktq^{1+yVdp15HGi3gqjb9}`SLq49y<<7ti%3H8hvX=s(3CYaN
z)MRsN&m6@8Z^lkrqydawL5I-Ow2KUW6A+IOBpmCy8Ym;9F;sC}%O*^NYHe-3vH%4?
z#pYv4NJ?D9ut5cKu}Qjy6C3zdtfPN$Hed}64*pP3P+9#FSdE1_<8BV{uuAq-@3R%5
zP-0*uQ_)WC==9JxZBCt9vP7GVE|%Y59ahZP7-w|_;0$2g+t05VWr&#56=@YLUVa${
zsoGjEaRfOb`RFK>c^R)L%cExSGIJlyBB*9@ZSBo$qNXBSg3wUJO%g1Yf`S5~>vqV<
zl$Dp;0n?%_H+Y17s;;cuen7JP;DO<qs;a*rMDEKkvw9DN?DYm72Y7`6aS_w<3%TSw
z8-~iM8>_wqA+-}tBk=?3DIL3VYO0Hy+a|cZhDMEXnl^p^evpW#cuMN(xo{c*pe}eA
z=lmJRIr8%Iq~z#M?6>C9yp3feD(rnLvs|n!`*bYNbvGREK>Gn)NMF%^(ASs6$1s20
zJ~Ydo($PO%kp3LLZ>08EP|kxqo>FYT;1~M@)N-~1S@yPp)p>ka8u9gG%I4;k5N|Pn
zYLGN`x**kSbZF?h{X%Aay)E_l$&;b;(HO|1UkiqYynsTcg35$Ky<)7X<u^BRH)>?F
zSSJxN9>1-P4Q7NxY<A5h(uZ~K+&N4X=vbANl_HS|c{MkKE9hpxa1o<&fPmp)VL)L2
z-Do?2%M18n;o$&7qODT67sOgO@NY$VISmb-(fG9j(I!W}pZt4)5$^6iC|sta<G5-6
z$jI%&!Y45OVrd};Vbb&pGAtlpx@H+9wdQ@%L21`65aMyG^WGV}-Kk}_Z=Vp)je&}{
z&OHbys+_%gok<W~LHyN;N=QGlTuY73%@a13%N=y8YHH3$MGbKdC-Z%LebsTA2z5n4
z!uv+WfNFTX%DrM{fBoZ%TOL6;{b3ZcOp1<@%;e+8vD4hih6r6<UEp1Sv|-zA-`k^4
zV4_k@>vY!M)|U5F6O?k>tGPLhwy~sWNLH4zaoWMbfy)&mh2fOlgcOm;{sotW1jr)q
lA!J8*+DT{u|Ig1Q#-?8W{_lrhXpxt7IdqtHi+TF5zXK#8FN**G

literal 0
HcmV?d00001

diff --git a/doc/shared/figs/arkode/v76_erk_stab_region.png b/doc/shared/figs/arkode/v76_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..eed5da6a7cf6f59b922167b3e0fc3e13f76cf8e3
GIT binary patch
literal 24295
zcmeFZbyQVt*Dk&Yfh`J1NK0)*MM*)rMA(RcfKt+uA|Tx%0)ikVrIZ4KgrKA}A}W$1
zB`sYd-F4>jdEWDVzw!IVIDejh4r9Ep&)$2*z3zM7b6)eh=3JpSRTWPjXE=@^$Vnxf
zyas|0*dPdg6bU|j6S3iv1OH$i;B=i3gq9NhAD(5}4>$@Tc2-ikMm%$zk@7MZX`MS4
ze1&zsrsJ$>Z{h4_;%JVj$lkgkD|eCgmX$fHiixw8w!Nc`(?wP#ySqFRI>U5uJUe>)
zRY!9ZXKQ;q)?3!L=7_+ROKNwWFA4Ao2(t1EiU|pb35wEeQ#?lyRzyi&_Lh6{?_q0q
z>f0k*E6<!?2nUBq7Fqd+49PU`5MeJ=ks7kHid7iYhcpFImJJ3u7&Fzobd!+1xfqe5
zPAE&{K(D}jnlt~&4IRR#7mGMA;H|Raa4-J&8pdkI*SzMgxz(4mG}9dRXMTR(@Ak%O
zOO8`+OtoPlj1*~zzwe9(|MJmOV&R{4Hd&Y-8J7PWAJV8ZNM%}6#NAX$qGKo{eHK^T
z4gC&Wrd%BzS0%TGG-tABQ_c_*)jBiX|M_k#$-Y+I&eGD-$f-@}OD|PKv1Nzv{>oP_
zwbWZ9lX4-9_SNsLyRyD$9n%SXXcTI(UmK$q)3+d0NhCkoUu-$k`n>plf6?1J<yzX>
zq-^(v2d~i@IQQJvF17BmnEn1r+rTAGY;CS9JI*7JVs373W4<SEZK1cjTZD;hs_fI4
zh}Y)*l(cj=PwGB7`y5BQD|SOIymk3QXT)89EA!Tv-IpxY`|x1QXKQ$CtwY*|t3bbE
zwQ`{#>{FgvlCbSU@7v}@JOUzWYHGsd#gD`+`<sLIaf2Qn9&V#PZcO)-nT`&(>MT1_
z4HoWqNUYs>Ovdbd$z!n0mbY$yweIL(si;Vxe9*Rh5U%wiDamW8W-EAy=)**WxN3?R
zjcKsmaHUF;@TK+rZ{NOITU+<{_g@V@QL(?;a<#hgD!F8LxxLY1#z1)##rQX_v~?pn
zc9NBzd%v{P=V}WlCxe_L&PWctzx$O!+~-&Q!+{;Rd#+T8_s%NLQ12l9l$;1t1TOWz
z9$nluztZ*Y*9f7?WWCt<_<{SvM_ZfCaoiJ{^+Od-J+!vH`MUKU%`GjZr9L}T2`f35
z9IAKc^Vn)bZhijzx$?BQ!+4`{SmnXy;3s|Dr{I%UwWro3br<$wHg4a({V{cQI?4VX
z3xl9V_-4hmYu75vWF&&N?+Gn)cj}L77mc4Q3;a{FH3DYCU~uh2%(G|2WK3^{$YyR<
zjqI?!j+8$9x#-GWURb@_oSo`<-I{a`2IYPH!&<vI*Nwzqjun9viV;k@<#q-gsggd^
z9(#-BJ%fvb<sIL?g{s+RIdxv64U#S{TTvp3j*sun(=KdoZjOnew0#*`_gXoj%&K#|
zVkR}urG4*D)l!_cq54woM(-VXiZF9)nH$Rl7n7Fijt)POOW(4~e*L;FS=0%P>m<YF
zH#s@yd3Z)@ytazWTf*OdSG<0`S^8+F<7XTB`Ne@!<r?P0hb`wSe+7`*)$UBgoi4bI
zdatP*5$?cj<d!diEp5{z@Of_ic{@y!yEW=(biiH-vpQI6LpzNR7xK$p>6~+}-5jvF
zGU{FI*f+6~uUkC*>*FJrH-ggAbzWP4q^RzcSe?3m2rGS|Y7e&4b0HfobMw~%J|op0
zrDvO}mTK=*shqx~=lqq~t^1Wl{R1qnANI_(nv{fuE1v6CQ?50h8$>7Q_>AlQAG7#w
zZ?8-=H;Ot<$Nv3$qviptt(~v)YN)-VL%Wt!di&R-jfFlIDen(OMUH!$i!<#hHvL6Y
zuM-RhG87|EaVY3N_;`$Mz8@xql(+gF?A|oLL(wZ&+!_Kg13ZaxAx<;xImFJtUH4!b
z<qBUO?UxpOen>$4BrGhhibFAC{roR51Wn8KmX@lqU`9FGmo|&H?v&lvg^dU^U4Fmc
z@o;Cx?axpJSnJl1lUhssr5+EM-XwZKi*w~Es@a>_Rv!b7;c0*Lv-v$-wN>bMVB_H6
zU~X={^=BBYMAWz*Ni+4`oy(>*bT?^xA%reTx!tf`<y_X@Ql0cqvH5|$!;N!Ev#{q2
z-@N&7bhsDEBsyMq`U#&~VA1*Bw|BBtVKlE+%hc4=(nOuI#3Yk#4Q<+3yq9I+I`~=w
zj*~bcSsvXYGZ^K7!pd-!oBe35L4|E`e=s@ApS5*naaU>@n)6dBZX+HBmCkdW8DHP1
zXOtveP9B)wJQHGyhj%3+{dS(#TfNfNG%1()TN|61O3&mje*8+MCh=;-cdhM;edXNQ
z4Le6i$CRV!4}U5boUiTw8Lk?29kgv;Y;A3g=1{y)u9hNpTT_!Noods-Z5RyNKF2NL
z(jC{9OXY!UPY%UR!GU#1AMNjMEC>n+*j2B5QF?Z^r_jiV<o&&#T#vPB+kuj~7-b&t
zpB-@f7niNa>*^nD`o1-Kd-z_wbt{!*Z{obOuMt~8xKwz=Ij^IGt)7&mq@)Gcs;jN}
zi@(N~dbEvhTPUlkkqbw5&2?`|tj(P+w(4X*YQLu@eNa*s+_Wd#TY384CZ(@WQnev^
z_**GGJv|0fryi5VYD4?mw|iiU=-&w^wQX)sMCLhx1J>|4$H8&6DoQ;=A&1;r{MJtF
z`r+PEc2?GIb#oYR?Hhw`Fs6M*?SiU5VjJ2w_sfjbx4lN|Qq`n(<nKfZQ}uZ$T3rc>
z3_i&?KRjL9TW$LJiE-SA;XiP$PRbhGu2V|PyqS7&dc)(|V(+GI5PG7vt&2Okd^u8c
zn%6L&=atJs@0hd$xSDyY!E*aTRq}&Nv^PRjpHxow`Q8tr;7Q>AscBbt;JQ)JX3^DS
zFlea=%f0jaLz(Shs))mQwBnhS=c&=rE8tPKFJ5S^F<Q{JVIJ`^Okq*08PyKqqRhNs
zd$?<}$o2MG*y)L{k$y8NZup1Th3ipdk2$!x^Zbqu!GyZca%FdUtWGMKt1i+$X|pIE
zT*OPrKNt(W8nEtJ19qjJC+0jGRatWNF<Fk&=4>a&dfD4g10FRavX6*@&Z&{``|LWK
zx06try^CQY``VeI7`HQQ=k`urYd-P%sdKWy#ajmp4q_=%ch0UdpHdAt;g|GS(<#LC
zjQcM<mv*>@HA{1A>n#?~g}3D;<kq9_g_GVYC-CU%>dsR?{<QL$)+o>@X=F>LoAkT#
zAj|qxf)UwK=)kO~^X&H=&FtL%hB-7wd5+fljPa^4E`5n$uKL*lh8xgUcyI#sdGqV}
z`T53b-<q0k+7B*nl1uON?Q7KdinIUX6WI7Pb+<K<f8bhB-Ifby6W^$pp(IO(n70vI
zDlUo=;=Fc!WOCOW6Thjvl2WMHOoEYbh3V(xwu2oRky4f8b=@r6#An=%*QVPB5@1Q>
z)1-X5E!)zhjh_GMdRF5w@r7Hvz`1Jp_3PJ?p6fTW-G2X6H@G#45lAjgl=iFLeY5E|
z)X*U3vTIXVbK3J$ugPLbjjFBiU|wPEylYinZf=RnG2tXzFp-hbvrXWBt&GHy3C{=O
zR8)LmX6g=i7t+(&ZSU5nUki)fp}nM+=`&p6Gy^auAt7P!GRCSd`qL<QArdx6C#SF{
zPv8pc->;IR=SDAuK$tAhd7lnuFuza5rFv_#^apFM%|ENtJ<%;kQZ?*5-iR@;EbA8+
z5-P2%)bn|=c}}+2qODt?#N2J}2j~94dM$Cfp+C<;U!gW_&pVT=i}5)<>vLV#aDbD>
z$QKG+?w6`DzH&VbrQ+f-ss-FIh3;9`-SN+1Ha?iDVZ+Chi$_yy;8ko#YlpLi_%B_u
zJ>1`c{m{305~r-JnUG<#)VJG{yHzvOv$K-_X^Un&l<@qk)z#JS92#6IFEUf=>}Ec8
zmJv_R%y3ir)ZQ%7o%#Oi>cCNw+v32~QS8r@wy#r;Iiu49PK9sU*rcS_@W3mS+}^qG
zYWqD+%q4fL9P?x5gJmMd5wOYp)t#N4`Sq2FuiRAjH5*zk>6<ovi>@~0G(EddnI0_d
z^$9x9-b~|CFjw5ZPf_|_|JC35vKr`k!H`ut^^{3eK*vMM_SwPih9=8Et&dk?>6{O_
ze2qVE?Y3zUOPU2&oG1ISmBIL54^B^w?hn=a?6F-9wz{LhD16`j_s{na;!i6DtoP;X
z3Z`w-{XTCySa!0^L2kMK)O^36cRStd&2)#V;Q_5m2!^`P3v8D5q&XY=z2)haBn#Uk
zElX+(DLAk=(Td?e+D1O5YH3n<<gOv3oBg>$vM3l``O31?neo_<g*IrnYJ4pyeUWl<
z!xP}p^&|XoSE(jN7N1)wV_?~<o;47YHM7IdNLKc~)q7mp<;uQp?e0DnMC&bVJc-fp
zlF?<3<p`t`x)&>;?sabQU~9CmHgJ>CXzwZ0;mB5@CB*ahKTnNBVKn-L$&05cN?K5y
zS7TT>xM=tN<wLQ~?Atf)jMP6Qu<u)zUS?Lc^&BNo=apeR{>auNs4Vj7u$^{>VPe>-
zQq=s%elSj}$41nrPX`xYwylOpU_blSl12`Ts~VQFXr(JXR@s|fVn1qVAF|$mYJf`Z
zUUuG5m1m8i?K_BiFu=YM?Z7lv8=oZ)7hj2mWuG8-(~D)v01p8xkD!1VU?4;>?(^q$
z%kKAodCJ&BAAeCdCLw{gJ$-X&bhOw~E$ztp)7S$M@AkeoHADLQyt4wH>$7$HQ@qVe
zghrlouOY=)8Fm}J&BDxY8d&f;sKRw1OlSLqQpIG9^8QR@;HR<g5gFaVba7%Qj7S^+
zdf2cW7ctFh_c9_eDIX*-w8B=3HyB|DC3M=@PB04p9(&B9rDZws<>}tm(kP&^Z_l{m
z6ak}+ImNTsdd$Dm@;jUg(!3+G^f2)>#f#0|%g2r#t5hX8AGl24D{0a|I2GJA*9uT8
z(!qYDTG!qLl7*sz_dhEtDlX}jh``ui2-yTeh_L}|!O6)9PfzL^GhkTbnd8Igx;W4S
z85D#kp?lpp`y4rv$DbTVJZ6r0zky6*e$l^;*kxpI?AGlCFSXfy_xXcbx#Vb8&V-nl
zALW2heD<UO-TCcLu%!8H>YDFnsU$V%H?SNo6AQ_hnVZv4Q(v~}y(lUQ(4cMp2mY$N
zgp_7?7%eFqEXXH=$LFj8avB<@I&N=FL`w5;b8CwC!{SQ))O8QQI4%Bmt#bTf%@){k
zv>+rTG;e!kl=9@s@x@`QV}D{}sY_3!-6nAto)%m3Ips~O=%%=xw<b)k?nLsGL5P9R
z*x!?~H;9z>UWe~EO9(UBW4+sTz6Sv{=|?>^85`03x&Cme4N4*5B$YP5F`MDa(#-<l
zOV)#|6U(F4va%0jMEVL0ycSFQE*weUAF1BS$xi)YNTP1j{YD)U6o|0ef8yig6)4#s
z<!rE%!W?y`FHGcY?HzYe2#9U__=p%hdQoxl0n0q>!reTU-z@Te16^)M3r0s8bvcn|
zBpG%?VMzdB&Q}CTo{4mIf7tP|ef!+Gb2kIR1{YHW%%AKkv-}=9%@$bU3W?nO#zXIR
zm;4l?e&zvR<$?F#<U#<6>Dve4x%?T@wS6*D=U2DMmR9vdZ0X>8`Uj5vxq)eQe$z%0
zA=%S3G|W=oIzCNx=G@}qcbNUw*1Od9($sl-(+y=3Ew}yVUMF<VJ^+xnowixnd(8kc
z>wzjXp_aD7yHhs)VD2HnXcWfJi@a-SXuwdNCERmlyke(+{rVG6Jw;A=6dDhdmFp-6
zmK$yVgGh?q%L&+eH-Gnc0fd1a<1p3`G#^J9NI^qGGhowU6RBXmSH5FJraoAbrI7sM
z#S1;PgG+(mH{FvYy~;eTI>sK%iaEH6$Q1^qLq0r@;q7jb`+2{t(tsD6T-ueY;`Sw+
zK3gqK%Z^3D{lT{w&iSj?Bk>n?RWERJ1ES6y^4;vWEVXP13v@l<Vq)@Ym#qJt$s<RJ
zc15h0bl~hC5|+v`k6T0DYi;+=48zpDc;>k=Kb7_@_ym3W2-(kwJwTRE8L#l@mF@^;
z`or*Ojl9)s@)j<R=blx0VbwujFq|}Ss`ikUIJakWaqx%+C(@B}**a#ob9-kd?P#~J
zE;w-qP-b6h#LJQru<6=SzoVLwfQ5WAFX`mM-sQR7zniI=e)trX`m~eh;QIPHKmjp9
z!LDqz@UpAx&(x&m)~H`|RQ%Y{6Ynkom=s3Ki{f}6Rf*I0Zw64LLpFnEKNVVmt|W#f
z3O@o3N#i`3RD{f$qWH>fnS1}tc4iC^g#xw*<olG4UrzizWK#3{160NRi<=OOU|1tF
z*RCe3OZ<G1E7?!ZES70I*V@$7)X~w=(y}HRoire5&^JPE5E+Sc4ZJdmW2hOF*ne@A
z4pRT+49Sk@`JeCa!YpacRIE008~N@`nL}!&S2FvM_{>e=51yti5AJpCoeA;88~aWc
z^Jb$lj}219H%8{bO=xDT8kAT?yS`CWPzV<LBT}OG)iiAMP%2o2pklM+B|wUK{}^Mn
z&R`syJY2M;rRAzNqp4z`=DS^?H#SS$a^9u$|2X*#$S2xyQAI0CQFz0EEC;fgL>;ll
zg=SOA0D?y_A1G|8RO<<?QP*ph4`FuT7VTR?de2L@28zF(YmmNjhq<?XVWU8|_^f>P
zl11AKYqfmlW%dTuY)!B0WjM;rzJ(s)V>ud{nx%KY_1K#kcu6};O0oC<jd)AKk=Jpn
zEH&WReMT_3kmo-B^Z8U4A^isay(y<ZG&NjZo3A7vm6K<8RRBcfOQ8BpsB36g&~|w~
zRQ0OF=NaiYus+|}1oSXJ@+|*8R`1wf_|v`N6C^TmuIxS-W~o(Y`k;NC!CqumF1Tvm
z>g5LM!xi$yM)0?GLmyUvMIztMf&4cKkmlwqh-!7fbA04cetlh4^>FzUxnks*x3-5&
z0PY7$ZQ>Tn6|`qdZ@$jV1S0B<8>Dgp24zAe%Y6l4r@%H<!O1>{_NtJp0?>_M7JqTY
zzCg8lp`hwGDQW4EtC7c4oRRlR(7>30BZMvP3m1MIR)V|tS^dU^$NNBkrp74GYB9v$
z*>>&CEVvH1WT_^gxPY3D!iwn^fJITJ>4@P>PEJnwh-Y5eC#8#x75<#c@k}BQWGYhP
z;$GJzx-btpbx7Lu=C4?jl=t5UrwayVKFRTZ{ugAJ^pc(>p4wgygcBjAYkQeDK*lmP
zJ^f|oLD@(R%e1!5wzH3fiw{^vOm*D>Igx;<*XD0XTLE4#thfW%Pk8oBbH>5%Or#~`
z^Oo(&6|?DK1(ov`3^D|`xw)^{4ot4NL!M1p#pXLUSY#fyd$bUHUNhBmJ_i?n`f$KQ
zBK0Jr@VQ~mBq5t#$W4rsR(|&vqd`zbMa9*%%(dQ{8jdNo=}QIN36#dbVZuj?g0&HH
zwn}mKm&@f9Y!YWW0J*u$erKDa8UQ5kPL_)c#AjcDNEja*+uhxrnVr1_7wt7^S~l4p
zAwQbPS%C0zH6S0rhmW?tezj%CnWVP(XMg`l_(@!{B=b5`CB3{=1s;DeQAGSbR@CmC
z>*?tMkJ6X=M@RISlC^b?!?jlt7Vx~VRl$3_(VlK=Y2hesWD&<lurdKB%!fWW06hm0
z2Yg0zd%J6e{;1EELCD%RNAz2xI$uEb^TUw&iWsxlHZuHs()?oiC=U-$`?qf%6Hl*n
zlhpy0Me6?cHntYxw0YnY$f|%Wf?Of#vbCwRx>jQZaPZ&B1>OLFh)+o1HL8_(^2r$J
zXl#_sCrYYj;3Z(g3knLxZO=MZ<mTpv^8laE$`-{+Fj(bQNRbY!4e^KRveiu>DS3b#
z<u3Rz9?F&a-O!%~LFxl=Q4h~+dmq8RSgM#g6Zv(m?r5(LOb8e_cgQ_~{opyu8-yF`
z5OY}LYZm;fbz2(oJ=kqa5!Zh1KHd6Ue5rbEp|CDh+V3zBLnS9+;N@}`M!?;Y`YV!<
zKGE~u;a>pl4(LuA(kz%OaQTNcVzS3c>s}WX6<w_Q6VPM1@wReT%h2uP{2lj=w?oE_
z>c8t_^NwBv^PummP(hO97|w_wY>nlkzBbMnnd)d(f~xf&%1?Rl5Mwg_N?*ySCU_8t
z?>hmcJa2My#eDZaxbC*6hzCv6T|p54V{n49s%q_G*<c`r({yX6Y8vc+3e$Rjyf3lG
z5F`qrQ=+;hEBi6`cHRhhMxZ2pf!Vby_v%c)21pPP9y9Et&K^93^4I~ZiL8DPU+j}7
zPrzK?8rJBgI0F2U+WdL9StN-fUxM!>f`q+W?U1yMdUg3;chk%{VGs^xi81j1KDa0Z
zk;k4t|817i-<<=r1d3A%)aW|EkKZ2?{?{>qzESU3QI+A;D;Dg<kTp2eEIuyI+!@11
z)so7l&kMiFIGW)Hh8|sM_^N&%y~Wi4LU>v!Ebf2)Fa|OI&O76ehX;Fi-!DHRCg;(4
z_iK6V(|a9}^f2_+_;234aR=y6c1Ge&$_Jml&Hep-*u9P8G*|3LlGD=az^Ce5Wa_+z
z-UshKz*-<{flCvpq`<PHV@1}-UR*|y#GfePs;{36jFqz(<k;7*Ur$z@0U{2(Dp%mo
zDz~M8W29tEBHv-c0|ElVcq(ywL$LdJfm(qy@l0ek1Yoxz2gPS+Rbn4Qx>4u4sK?fb
zVv9OoAM<hB^5HBgbk7&oY!1X<x}%|?0rcMpkb!9pF!&GdE93UHJ7+mLUqikJ<_zk@
z+H=dV5zN4ke~o0Z?<*K?iss0uG@-a_*eC-cK{%MwuMNFlq#mE2(8z@VcmrA>^Yv>X
zyCEGk8Ij)mT};ER1<XFtNd}P=RW^AAg)fkTbaS1ig;A}1mJ5MlxX%6fY*G9=JKGOH
zRdWX13>>#y2)L;ABMl=vKw=P8!SC4)eRw}?M=K|>)+#uV3wJUDu|oJx0*^tgw)JqO
zi-$*rYwFJ04EO6zAQ5znEdV>9+D#BeO9F4?fd%P}rK)SYZrUW+ro?xvca9^JPu7i^
zu4gJMD|27Gcq_{rh-I?J8L)uQpFfAlpnkUfg^)4{Kag)zc5rb>gIZgMN^KGZ%wY{L
z0R;?t5t>b%2Wo~|4$VsOjO=#T=j_S{7dFti2s%*N;3Ai5^3CafIIqpZrZfFBxX{@1
zg|)l66zo^7XdAS{hJ&YoB-w9!jM%)nOHCSRSzMHbtTYbspTcrJ-{4KmgV=%QadtD4
zlPAtdxI^*)Il|Ild7*#<(AZ>;??Rw#9)@SWt)<0dSgj-a^HQJ{u;7r6Mly?+!OH4g
zF$Uxc5j{RR`C_2ekIZk6$fdyj#b%5&Hw@ct0dLfsdz;(58BJtCu7G6Eqbp0LITjYG
zbI}zgh~^#E;BjFHvp>W5s4<j?v8Z98?oj}}$b*-gcA!oKQJ}1rt0{QR+TD5XsZB7{
zA3uJGx&C(7<A8@HIo1B$6HFnqW)OG@wnm6-u~m>TI*BmdbH6<~HDyhEIG3H4m7VRj
z(5oWeajASrV?miimM?|~LAuuH*)vMW#F)qy<+HnTQimKMy8$T&u-su-E||>56ob&c
z$s@;H0%EdrlDws{sGRm&{m&Uu$4tPtQfp=w7QMSaa1`iHzsLn<Zt^MEzV4vx=xTF)
z0tv0}pCQq-&@+*WB(K(;spYU-TrASQLzZWbEZIz=S@Do}$q+dFAQur86+L_!6b%C(
zgq;a{<!vevj^vd-$;u0x0`))Blau#>sD`OOf4)v38Vp6ghOUw1;O`~w*w^$dx=L?!
zYaWuHe;Ong5*~hnO`f@c-~H3cE5Q1qn>ED|QfW{;AR&?R**&KTOt?Zqi;(?@gi9*u
zL;z%FeJ;@j38RlO16hC(Ac=5#LHG$s<ldLEk07KS>}~Pte|WGu`Hg_+1cjWLr6p*I
z?)^pP35K3IF=tVw=fP<y(8y5TPc!Srin|2xiVy`ZT)YT2-q)R@2^&1ORnT{T8`A58
zF>=3UcL|@}by3I3CioF{nBV$r=g+r7=^@|*{b}Cnyf+2ghiqR<ZS-z&zvt%foYVj=
zQPCZiqwTK%Zou@k3=A$cs79f<xzc6fPwn0xG|WAZiI3l$e5Q6dr{<?IlVenOn4RXk
zyEl3SlwoLdEO=8!yALMY%VV8-vW>T5t~6HQ-P8tB7pPDLZE!%O^kTC<<vKgV*I>u|
zpZ)p&;OQx3banf|w}Q)L+2BM|KG16(le3WdrJ_L%J^)MR(H$l`90iLgg8-)pIm{@K
zl-&u{Fgq|r*y_R39R&tet7~ht7j-B$OmAL6?JR1R;fkFEFw7vK(i@QYMw|ZC#Y<<q
zbGkqZvvH=`rh%P=bcw^<{&=n2S7@}f;x6X)#~b9a%ho^Sebzw(;sx~6*5)FX0?rX4
zt7^6r5CwpOsN_IUa)a@KI%(CDdmDl=2+otm%U}z~NKePcGI9~+0kHU63lIy4kDO6B
zA4IxJLjw}<!x8D}>EK7oZTjpco1*cw+14eb54R^Q(|o`c<RvFFEiwpM|ClW8GX#vP
z3|b<DJve)Dtr0vjWZK|tE`&+KCWDl~3#_5Uy6eFe9{g2yqJa|YyUq|B3;P(1ngH;D
zS-+=92T%y1>V5xx*s}m;pNoBZLc<+M5fl^zX&q3sHsIkY8tlr^K)|h)|3HKZ5Y+>*
z6m*w_!*H$BHh^2WV$=J3955olETC{G#-CfJc5ckC&2(rR7660<zzx?yaV}4wPOZ1c
z_F6uOG$j14zjbVF1ua^wAYZt5?;bczf?nafUrw06hrQC#+InL9ho0x?B`tTiV^;&h
zG2C^p5!P3@qab}l!#~cDI12&`{Q5>eh}@7cq9iLSbUcYE2L}gvOWb+LA6|bNvx3lI
zVKEJ3hz$jLn^Nw^bAit@x{(sAAp%p4p;RcFN?{5&H>pLT)_?Q-!C>_R7RA<g^+nbQ
zZ$v>73!&W&c<sV1kU_10LK?P{b{G$=jF1Z%8qyb{>Ubg4V)<SQ7d3Vl3*hOjFvKia
z_s?Op+>bMZD8TO|i@W`SWkxlkl(pQv0?+NS$8m$;z5vCHz$OQ272;0bjbuKPfKOvT
zKR9G;>O$;;+JJD!L6CXD=gWmaS;OO<d0?H>2N!)0Hu`!d2A*-LX+_BAH9Y5f`EN~t
zsHiSUCunlSEZ*Oz9N!vLX?ff_ziRKdm*lDM3lR#8B;Vyd2{9TpB$bpb4%Ui6(gW%O
z(!bQ+rnWX3x$Wc-OSCYc3a}HkoIa%c1EI`f&fD{Og(ZJo;Nq|_2!M9OyFe=+U+a-R
zSnmQ>0|sDC>j><U)l#san#?1jlRrkFHsCqMIC!b%;qmct2sp6+WW_t8*sk6)xY+O!
z$AI|X^48Ew5`Jj0>N%mIEb)7!rV3o2q~!3?s~0aA77fza1g>|b0M)AMES5q{ex_R$
z{CRPQ>0pU9c(_zPqXR%fV9P5W=L7{cy{;sC;NR<h6TMkbq>#(vx8KPXcbts}7+XEs
zum`Bm$fABDsY+7!ATf^Sv0ivA@SE>UJ^?TvJYqBVR}S<&+_6kM521&?jIuqC>z~Lo
z^9tacHTqP{-Fezea6>679}S`TaPYT$#79l%)Rj$#U6w`;05Y_F`=(B$sW?27=4W{G
z=F61Te#^Ad`~3o~+E8)O5Bm}_Kn)Gwr%ZraI>ptPVY5!a4k^gb@9r%FQi6n*6d*bt
z5~@5%@O@$9;1R_*2q`XA!)lTnu}4?WL~^Z8@!l!RPfwSt*@L`C`}S>=3;`p4dSwJq
z#B^IywrXL1zJ8HesB8O!>6}MNc9q|<%RqEjsMR@V^@tF`p0>Ti!T(+hK<*JZI?L8X
zbuBGnz)-M0w{G8F9If*M5)Vx444<(~U<>R>R4j)iy$>WQU_Oo@1X;nx2G~M3ofiqQ
z84!x!_9qsJGZ2D(Kt~sFneT=qoJG>}mQN@;2JoEdHDS|l!<a#Z>4ovs0+|FA2D=b(
z*az4t<j~~_z1kK*sA!;-uLBa~I#_&O_7b=$u-g0JRVPW)Bs^AOYEgcyYS@lV9$W}5
zY%1nhs@)!lghv2c4xzLL_>A;bD_`HklUIiLytf~?V8&WCudw*6cS3RsQDGTm6R0f$
ziF@t*`SWSstD&0@MCZ?bYx#Pa2(r5C%F0g*@R1v=y_X_-cjPwRCBWB%n^ny&zEf@|
zMevN{mags&5P+6uX3q27Id+A$;EhpgVsdi(#LHfBwZOxrqeFX8pCC5c;y?Y-w`cdh
zy{d%;BXBl<KOWzo?{oI&XkIgJ2sUWO&{KtabHFeF%K_UEw5tW2V0rri@&7P>Q)v9G
zwDb||A@EomoC*3xkhX#U?&<D^TB^R;N;4TqXBtCem@yF{N!8WWfJ$1Q3uaeVib+bM
z2@d2S$6Z;^RHD=S{#ph{xFZC#A&0Nb3fgR3koB;hC5iBFgbdFA9EUjm4>YMuKg(Zy
zH-5eE3(<H4*m%e-QzFG{OsZuuvDEY3?#&x?c;C>gxx_Yo<WH4L)9qj2l$QhT2JyEu
zQ>-D0jyeJEg@PyG?(n&`s6bp(AYA0lv5)*E-w#-6u7?n2%EFKd6&{?>e7kZgiX0AJ
z=C&25uQ*ppr$O)>E?qy5dy1^H%i{af?5uy|5K&-H_KiCJf{pDY47jPo?*uX1*(Z>a
zlA?zMTA313XkwclKrDO<`+~#)oFk(FDYAdzm#Aq-IAZ#QkUk!=iIXf+LsO2SAM{OW
zko{xgNvtNF55~405oSh1jodUJ2<D>)f7}4d)KkWWC2SvI*s4bmKfdIV?WUa1Y<QGr
zizDt6Poa278j@uNT6~!cp3m4#)X9D;Ha*PvSt{bay$ppdeD2G?K)j}d0Tid_u_G{5
zHY+pIN1{SPF3qv$;k<gn*<34?%3WDUDO}S-Li*+yPG#_@w{&!7oyFozE+a2lFUo!9
zW6+_%2)uzj9biD2cA+7}3gODr2+;&z2_8F>eZwC-(@;YC?zF>oE?_=j7xgaA0UDFi
z6gf#@e0uWp2aPM`j^Ctj2i{4p39(u`GA|dPG&4r^F)+038_$10n5ew;u$m;1g!Uk;
z+_<kbbli2zC|0aja-i_@4(p|cqlDq+=P|&8{Mh2>;J7>09M?=;KKOR%W|lMPNpsE&
zS}gt{4#RcsVJe<oA7`$W+NMSGB)XAbeC(HmzW|c$>?=W1TAtr<zjunoMMdC!C{IT7
zkF*wjo}jbsS@V%2(>kokJ}K}Hb(glzw*YrTr3r=&h^zB~AAT3Lgy)>_KNEb#OZV3L
zi>-0lJ7&MRuY5j>ckddb*#~_dZOCur-I<x*?yF&pMKm(_%?AF6Ihk!Au!_=Wn&t01
zsWD;^`ot;soaEM?aXK>dYbDyx^UXIOOmMKGmPGX|r@zH}k~BifdAezt7K8IAq~`&@
z(jR}1wG+o;K>4DltX5c2&n)gCA6R7~(WMB5qU~O7r%aM}yJPE*CMkrmKw3o2=J!s=
zJ@|=tVJcVD_i41r<|DH`*|V@8FwNt(hM0%HXL-%;VvU*Mo6w-|F%&r5t7F#TCxUrm
zQRA0MXDy+N+&?3w5;9r&^Dk@i=#*agSE)BiN5M_sSE7k<xKKh&J)N`D4HC1jBss(E
z{r>OhVEhCR>Id9^KRTzuz(HVpLv@@$7t*6f@{@*N?y@w>0ILx4_FH^#EbQ&^heW&_
zop)KkR5P^%Z@{xOp6>6&m56+KHv0ZPJ115lfRKVpp7zuCajT1_9Qh9kF|5s2&X<Wk
zc8b)cl51E8@0+vl;R%3q2w^D7z$1yk)Ngr51uE(wFn;PN=7}fWiA~jp(Xow6-mH?8
zSpN|CF0k85_%~<MQ$ozk2s&;mr%Z)s%QZY@eG4krDFY0Mp2J{g6{_y$Z!_(gQ6&Yc
zNjGI;8#pEv0|;Ld^z%3GSGBx%z)Qq~JLrg5FbiG2tS7t7ZBF3GDvST-SU<mpyh6YA
zo~*!e#?#<WD5(42M}&l*p6DWvVJ72-V@SezBE`O^obvw+&%4bo9vl>`fSiUWUFI&j
zdrn?~@YUv{Oe$>tBSMS}Nzq*yd4)j5LGqY#%*6mgjQ{o<*?WZk=&~zwh#&v>nE+4b
z3MJN9U8^G^Q$arR2YHNY)H`bUMl@ckh2!HX{+FANCMAz8z>RxNKa;+VX24?|z(x7r
z*7@^J=;JBGG?)<6)S=hk`Ga`Q<iw)Od%Q3>RG|3gi=ywj>|+!xCbC$Zj9$EzCsqXC
z{}h}VIN1TQ5KA}8e=m7}xCrK6gH0TNB_TEz8#u}sQ+_TJo@J8F!#mb{!`L)gmFcv6
z0HGPH(}(oVQwSv(7T=ZUYjLd=bVw^KL1JR^Ddp*#Cq$3^A;#d)FJfBz)yql)_PzIH
z^;X7Ty<>uh5pXQ~9?gtbe+%ya97k7z)#pT_Sm08`m`Cw}d4yr<D4Pc-``_19F57t6
z;~<3tH${oFDl)$$>g9mXV5X!)0H5_8zbJb25^o1B{j?dGe1}kCqe3#9^-9F?{he`9
zG7Zu5`i>grCP+Ome8P{uV5d|nfcTHXlwf3YIcm%lb>eR+QuyD5ajaxs*VlM^0%7HY
z0rGiJCP>)eLpXs!h2IKQ&W*!Ex?#cSuBJ9}cD#U!XQ21SRdO3Sdz%0KaQ&ZO)Ei{(
z>tHaHAuJxgMj?@iu`L$IdS+5de>ES2y!;dMln04QlX#_^Dujo~L&$23|Iddf89!xC
zC{b2obx$HP-BGL$6Qj7CzZIWF{NF%5btjk7Y>b(Z|A(lVTck2N5SHYhV=I(ndJv?M
z&^Ah@yNRlDQkM#mxdCTd#jrU$@R1=m87Z+8$6`wQm5KlaCuXo<Db6c7CSddMkPu?{
z>C}HdP(_#$xNs@`NuS_AWVk5J&Q*by54i-ugdhr_?*T#G8>z17yvC;96jg-{tw&H|
zmI&0?GALtuSzSG3xf^nd<E&cheVh{RTqEcOalj{o_#qA@1AxQ}fP(}MkAw{%;PMY;
zUcfm3T2vDGKF;EsV8=O-`tg|R{XjwuEiJ7=!y1LB4Axu)0D~a$1+E7zMU8oO^`smm
zJQprqdg}0$FL-W(qyJP$StfRj#^UInjDgP1OzQie4~1+8y1Ar|vjHJ7_do=wkqZ|t
zoX9yItob8hZbh6J2|1zo-UYY~l=yLgvJ?gb(i1WZ9RB{*auI$!c+6Ihx=nxy<w?i`
zLYwUIr&&D;dw85z%VPnbzZ20HKmrZ;(|}|J2tNq_<8AB2g(_)&04jqZ{tH^Rhck<B
zf|7}rhAxfNeDb)ir4`>n-Qrp%B;J+H+XeOVSi&PCS8fj3-h#?XPbeY-*auPfaDwHC
zZo0TB%#qJ+fkUwXkJWSEum5fGd8Me*2Nn8Tpwj^ChN=!D9UUuY(GYH@D<h{^@DTn_
zxED7eN&y)FoC}m4Rsx`9G$0#)(yNFd0c^5FQ?6B{$B#pStJlW-HSZDzCt^M)ZE}PU
zu!b>6R{Ps4*S(VkEhE}21S{DaBP$3JEAohuM1liW0<@?SK*6OzC^e=Bp|&Ffa@mFM
zoM)$8*i>5?>RX4Ms1RcYY*YP^UAg03D9kvFBx4l5SUbh)dn5Vd4Sg}B-V7FYve7?|
zx76;QMVm2G1yQ(p?-H4ObF=i;`XfSLlioCBoWr;T`;nL;9s*q;-%^EFNTdw@^6_WB
zj}RB|)V?OQbPC>t2pw#g#I<dql~af@IFkJK*sq15kqB}%n$^TQ>xOC8MFxbG2K~WI
zDSVp*!68_jPQp&5G$l+_D8!pE0i!KNur^kcC{_~#i{p1;X=T{iWE-B`aNU1_p1}ua
zM0|@dqC(FAt$|xW<qU@uK0--}q3kuyn&?B%NN1OAkb^VyDBvi}6GDs)zY11R^X_@1
z-Vqn|?zrGJ0l}W*$UETsql{bK@|l4<h3f`bGi=aF5+Hm8l-Nnj7YdT7-DBYd!mdn#
zE^0X8G9?yknMH*A_lKx7OaMLluotknrf_2-MCM`?E8C?ABLW1i*J^4d{D?j#9~<~A
zrmoA+@R4Ok`1;#r6|d<xlz%;)oZPh4fS^j#F{GXrL+N;Z{k}y+6e%KO499)B+<&q2
zDi4ClMzgZLlJBr!sv|-YnE)vx$S&N7hN|Sx^Oy1nat}h^c+=&S%XkP$5Fy4RF~g;U
zkP{!dNeWJc_p%JgF0uiE*w#}WR{n$t4kp?I>ntIt*l-MCy$Jr#kWy?6A9)EbTY&E?
z9Rq?MPG}k#NQy*}Vkol|$*&^FI3&9CSZ4y3lOXfVK}1B5mk?g2<7ZELGno=2O%M<o
zb>z785o8`bF$@uOBEI+X(t#%t|4i`jtx*r~kQl(~|FoX8J|U7qknk8_;3{uxYx_az
zB3f+>^@OUa61oNkDKRmQP@5!V_5D{fcOjFsuQ%}DPYX`5!br{HCxtp9hsHiVhJtMm
zNN>IugU$wqeg7~0&LI`F)AH973C;IhV(+BVOYb9Q_1vz$6Bp<Ar!ATlegvt-(9n=4
z5T~RBbxAvDGPKd74dwg&i>{GhH8nMzAf-c#oQEqnz+E&K1HV-O{AhPnz}x-!C*)M#
z21zjW>J2l)xqvb40|<3BG#r7cCuP$syDtg_=-^HRQ_+-d37A!odB80}Ge;fh67IKl
z?r8Zce}0UqEl|11?tgA<&F(f};45EoFM#-Wg>4F1s`}d%b&}}RR9|o{_ArW#J|i_1
zm8U)~{w%(#2%;e<%a}>8yOS2Pjav_lpWVO<xgfQwWj>YW<y0bzujj2zfEZs~<7|R{
zAo#;sz>3IVTN7AOvKi=4kips}RtS^F;_uj@T_Y3vG|PFJ*bHt2VJ(BhXn@htgv@$t
zanRD4O@@`poEX8i<zpP1qS)j@psyw0ux4OZ53ZX3IUlnMdaV0ov|=Cy)T{aJ4UUHM
z5U+gV15-L-*$aiObU;*d7gn<eq9Q6(8{Kyng)_BG#^JYFAQrx|_+1QihbN6&=!G9x
zds|ajLBB9??S~M@`{7qWOiaws(2y}f3D_OQr7X25Ig+HdGDv}W3@UGFX+fmh1jbIF
zk{!-|4%rqB6wqi9SpoadJ*#JI626Xy==kqYg6LoYL?FJ@IusnJB#ZF3Z?L9@Sc20J
z!178r@f%Mmzx^7Eq0GcwC#10TUVe*u!D$;HOc4L~8sR*wopEt-P<MY1Y75Z*0H8W5
zT^H{;UxV8c!HSqEDSd;Csy$gWV=EM;sqO6Su)H<UQ30&^7!VVNpbm^4ZkB`C@swUL
z3lj7gbJ!7yDR57Uaa08Q@w%lA+Btw>*RzxYp%-dFe4uA(YGwv_kD_+oU8s~+eJ(Jy
zzt)ikln6=)bod>joCGkA9#ECBP<;bNgGs!LZG&2OV8H$MR}|R-hwXrh=!fPIG)6&r
z9H{mG7&_<#Xu%^|7}_x{2scK1R9t*JN1;CnC`;(Wn1*`JxbxYnDV5N2p_(kR0?dh#
zYri>Ls?AhEDZhEZ$o$!Jr({Z2K9*nLJ{n5mki7uH=mW?yLG8h=--ohvX=y*u4_vDx
zWBTSt>*~7ZhN?Y^U3ZNRR}+BthFyP}nmW+EGHz4@E@y8|6-&Z8u>I?w4SP8z3kuz#
zEvFzicXzdgH_hu$1-OZ136CFBj+|UvP~C3`C9Hi$em=gwzThS}{DAXx#jsVnE&UO!
zvFR%SqP{r;CZ*Rbi!cX@tQR2$!wTNry#SO8jhsH5E!733F@Y3d@nLg$1Yi&XPT`rM
zb<px6OX2`UbGtXRE2W{nquC$eB|=Gn5#TEyyc7tgNs2Euzv3<@eE=)fwp*B)iJc0j
zU_XCeDdq9t(6n%Q#ig&dZ{^=S9^|ild!V9iM@lL<s{VWXjdo!wMLG)2Dq}8cYTWC$
z13ne=vs6pmE_Bdw<Zy}hdV2RKTRSK5&GJ&pS7+?L&XyhVR{fALQ#q>|1^p^VOGgKF
zP_5=437RcuOc3<GXpp>0rNg}re-+wn%nZYPCSV@04@d}h+;7K<fVQaQ<bCiXimQ}u
zNmpneQkq@67DR!zl0;u*f>MfZ*!LhToblZ@VUq_|9;OnCDUT$+eT&{)s-Avf1C^Xt
z?*DuMH51VMVw6&Qujc}rd?2kdY!5!6HBKC-6fENn*jBEEXdBL`bC(LVy?g{!<_vVd
zn2&?ndU&wp2X1y4etPd^4cm&)vX*cMNK*`(DFX`)xx{iku!b`oX{ewDB_n5~ytkM9
zj;g*+cz}QT(baYLU>-H^7H>=ul(k0d7w~!0)6;`gKFtv+QG`~aw<M6Vfm9ESsxS1<
zeIA372ZS;nHviG#0WFXIHr(u(xb9u*QedwEwmsbdQ3gp2+i5?CHq)>*Ci346=YdD6
zPjBrbIv<E~-mpiY@<tHAG8B#+WAZqVK3bDr;XMHd9l!CM6=eKp$;sYu)N_EC$)a6;
z!A%`#v4p=dOeyTYudl8?zEBPUif-9E>U7<$*Nw4xL_`(w&`26W1x^|oqe$3*dR_lr
z+yTvX87+9eVE_Z(A!|=FbMo`4<xnJpgqzk9K97x^d>{gu3xX){8wLD^ej^tbm)p1F
zI)mUVomhBGD1qEw(q%(ErQbB8k`oLIn#-oArVfCCLI=3yyH({s^QaoipvH|D$Ni%(
zAP8N%H^vdrE~sg=a!^!fw*2cO-prUcTGa9WZY`lMxC~gB$EjS#c~}Z*6wG8=z{(BS
z6w({uQ^YvF1cUSF)FOuC(a6s-unk6W`X8_Ysm&y~MMw`C(xlIyw+0&ceID_fV>3+n
z5LB2jj-cLFQeyAEhcTOeWx^Ce<W=$%tBq!Tt;om%u2n!Wz#FQK&=Lm(seAdBEaap@
zH~}(wEg(=g`a9g{_<vB*!^Bt5sS(!ml-L{LfkcQu+y5?0X{2k*{0m)7>_UB6lb)p#
zAZCy(!y-YoNfT>l5*t+|KoVyT*@ktIn<o$%D1LtUGlQNIVWp+Sn#sr!Ags_mB2!J_
zh=&xh%F3O=q<o)!i$S7DFqAQTigL=cD02IN9+Jp03GhoCaHL7Z%4Kklh`$~rej@4U
z)s9hOGfe|5aNy(+nM?nBd>BqoMwT|1?`Isca>7}2_i!PENFvN2ph9<x7s+sKz{|KM
zrj_u!{h(2@%gU){g<AdxN#cLuR|JHM)Z(I|o?{rcZ*=J#N9qgVQ@l09Hc2#s6tl_7
zS(pjJ6axa>dCn?N=>l4aTtMKYNIaU;0!qhZeY40qPmLH`!<2N~Xp0J<0C@wC5_|FE
z<;NiyxQHN{oqxHkl7%1(0JAUL=sIz}^)@$B{{(>Y=`KP+Ibf3?!ll@z#iee*6JW6b
z_&?uJ@e0qyL$DX%L(}D)aJVcE_Yamgr(*vPmhXChUlu(DO&(fqME^Ys3rEF%i!dks
zdto#$I4d5137*Ga9zbo+^NW$E;CzffAx2ry{EVP^CxYa_Q7+R96z9>Wegq5?m1_uf
zAP(`5#zochw$gt2`#oS-wpPY3t$J6G`XTg(8~tn=6mTsf9Dk+1Jm|0m&_)Gf)E$!O
zl$2qJKak)t8c>^Fo1?I<J(m-VTZ<z@_&6!eZbH=X`t^_)`d@vrBI)=|LFf;T4HV(C
z38Bv7f$Ty6+w>BQA1WcmpkNm;UKs>5xe(CSs-Xr9q7&$gRA+DSRmwC*={`#o%N>gC
zAwX_$d~4xVp#WD887~y0N4t)LP!G9x+=~~xX-E4Y=UegqfF>vqJ%9Fv=<vIp5Omw{
z$2{LiQ~jI1g=b>WazrTrlAX}&@c5HDRA{KHo8WGTkUK@H^1E#y2o<aB`~=h+oQb3u
zZy@EpTzR@NzJie&onIYx+4*8%77|)|vQ!u!e=>2t6e9Xs`<3opIyRv81;aBt$3V0M
zVHC=MAk37uC&$H234Sgz;JncmODl29A)W;ZIrC389lQX71gOT6uD^dmqjwk7PwCBY
z@m~M5K9MBaLXOBkg5VY>$cfRoktE!<=$hvSM@U(HXHE0S&CB~5POqt<Apop8)WSxt
zT%!0Q=%$<*#d?eYp(Mp<T)b1(3e7-n3q5%=&sYt3`k*Jf9DE2=iP4@u{iQ|*OW1W~
zGABh$rJ76zf8x`zFgDpI(BTWxVzES}egV{P0i6JCkS>4=BJ8bk7qje}GVWk07?m0p
zXtJbKfujtd2K4gts$F^2%a<=deE0x)ccUT+hRl*1ovWq?!f7v|$`j@zZd=5%ohhl!
z!ucAGB#S)Su<)CjCLzLi#x_c}2D(MTkWR~WOT<k<*f~Riz89do8(4|nnNBDg2GQ(W
zNTsnv*H$RCa~L7YLD9#G$$0(u)crkbq+0QlQ(rlV^1X9hl=-*n8EDujLvCoqEFYIr
z)G~u4U{@C3h3i`o!Q5#K@*S9CdHGa|^H?3&=gHuRa7r<?e~By!_;BuKN7P-rn0z9H
zbsC)4<!@27vvAg%lR%R(c(nJlow7w_V6(C|W0j2l9(EQETZc<bT5BFNjg)FciD(L{
z)l6QcaXy6g1^jvf{WbIx;y(-i;ytHQ2(<usN>&ZH%JgKYA<DL~vV#tS=map-#4?`E
zIvJg1M32ZYcM@S5BPCKW*5QPR4bYtqoNDW)?k9geqS~#$j=EMQnwm+aMg(C7R*)Yq
zrNL>6$mqZalguZEt62E32p>NF=a+L>T)q3fkXSa)Z_h&T&{X<i;LDOxjA%OT)97~>
zgYSM45XlgUl9?1;`S5FK0$~*#fFn3=@1@*QoW+A!bCMEXEKxd|!_E3_7eP?<B2hw;
zgQi4LPEV=MLvxMn@iCagz_WudsdE%g;MFbPyVGlJ{#Xdy3sux5=Wp?0c=e9J2PQtc
z1*cIKP$D|VY*AwM=d-9yT%r->lA#XD)6$E2QO0nXSQs*Nnn*HzCc2^2&QUMbsgp|c
z=<~TFvK6A>Zg{Rx>!iiWozn6BXe4SGK37<KDKy8ITEzq^VL3T5ANQzw<xm26M%MP2
zN(|23urT3F^*aWIAINIdgTSZpt|d=PxG~5y=!Kc=M~N1TI?mSGlp4PdFgXs?j8Rdo
z#HBP+kIRDc7cfq^>(@2N%#L=2Zyi1(fKW@A$vK0wWsz6HBJKakZUWCdGRw%*u}I@7
z3}sZ>K5=R3en#fIhI<4u`rvl+ZaQV&{t+vD{RdyDj>fJmgTXNhZCDSzl7qdstIx6x
z)ELg5B4||9p|D)TyQt_T#nhs%WjH9^{p1eb`-Un^uPh^w?Y;9%bCJPH@{C-|4_~8H
ze6eT5EkfmI4b6<l#J-bLqKx<Q!gG$DQ|l_vE~~MhKre`)^ryJ2Kr~s*W|b;Wx2<*p
zl?Rr&9nH=WUhfVrh<Zl`(uvVz)4M>CkxM@x^vX&9rLbj;<3HrPmTX^9`|<F{^^izZ
zi1B|}lC45b_-fgqdT?O&I0ls!-W(GZ&>+0d{fZll3I(he2bh$mLrIv=y{3A}f=#1p
z0?AZ{n5bW#9=?+K=i2^uQVBiNeS-Jon3gQKlOFeR6A~A(0Y>l_8~@<i>ab$>?E1JM
z-VRKheBi`@gWQW7#&{jXN>2hIIw9%)O!V5B-v}o*206l;g4fZnf|;xlm#a34WA8Se
ze%?gw5Ko?d;(oYn><z*f!HTcxV<eHkYEYnX2T9BgiDMF9+Q>p)kFGy5)BMB$S1=8`
zI;gN(@iNMor7=)@xV>(;`tnsdQ;?`u>R;J%bY7q*mcOP0LaxmI1FJz$nLcpbk-H8*
z6WxsX)5&CkeG!y#&K);dA{7O7Q~vz>kI9~yocPtH9^><pcJQPY*o-kBSsp`&B@2n`
zRrdz37J*bE4d8%q)J$4JXB?!w@3ZSL!sSg@?8&J1Z+vBOkSZDd^3}iZb1y)pRUp=J
zH=ScIpQ*tf92=m11(F>n%$K}kUgk%UOBEN2uquLBGcb5#hLY<H-^TAqkKdk#!JNQo
zJO=Lj_N`kaYz1|Po*6cH7oTb=ap>Cqa;3}DwUNfjNP$)iDy}``**po#B<gy4_kfcK
zB<bdv7G&nf`ox~_s%eOfWNHe&45C2&W#G>Dt40snXD=Xx(;J7oT!)P3M6Kw!R&CuD
zqjzUHrHVLUASYVTcanh2{Pm1i>#Q8ot(tVU2gf0stK^JVUNzTvRvdqI?40W&8H?0D
zL|dpH{Q&J63Vrx8EVe|;-vk>U(XF!7UZQjlQ`FBa@Qs4oGvT62_tw&mpl=H8JkKD-
zqd1k8W{Yp$8uW8K^j$?ppO4`Fc2mfG+#^EWFcAKs+%f0fyYF+(7d}}bO&_y8Vr1x@
zg0GMiM?RcolMU8TS6_iFV-p|+Kzz@%Bs69Ror1T}tlD2(vp>gfFRwYf|3_MlxzY6b
zJK=w$_iDEE!MBMOiJi%3F77-Yr}%h}5@oZ(Ul|YbH+-sb7?MmT|H1wrLfjMz&g{zX
z)C@v_2Q-3X*wAK7sBi+>;x$OSUv3k#vIRarPtYDJCeV?Em1=<6aZ{*<93YDTq@zih
z`Cn4=)qCG>{VOzosWC(_Y{nL>TKMls7)F9Rwi72O&63*A1_A^4-&E%M$56c?^5mq<
zwfw--T<g)nK>ArfLZkPubyQ;Za=t?{=2`_k#@N6_cs~Qhcu@;a*i{b%OOgLkqi-Ll
zv;HXX*h*I4$0<kX*pLn6zy789C>9B!_@-eu&uPz!2OLKi5e5n6Z2WE(5!~|7fCvLy
zub#;{Wj#0?pEU~?B?d1fX%W^U!0C)R7h!LHp++n2Vc$gEoDK8e>+r|@BlRIsM)iW}
zk5lmwIdCfeG{>s=gwzGHM5wTt;I5FoHKk{G*&KwsvgiyU{zk`cJj=}Z-Vh#nSw;?(
zmSv3Z4Y6IvUq%n^4md|&L6N|K--?!ilF+IPywuy1b>zI-#MM6w6w~y?#$n9k00Wy&
zjfOd5CGS8pv<|5IluFE)F>*2!&4lEioTERnathwJB8;%!%lB{=KmR@V!X5u@64Z+z
z>K3I;^!Y5<l~a@x=n-cxdRZk!_r1dhSIS!Eot`<=*?fF~garL)*L`(xpo;QlJF${$
zAnLUd2hNF3Ti!<&#zHV~e|~R;!9@OtO4I>(fBOkItcw$L@t^C?6PltO1UTx$8RU9N
z$mw_Q^a{gHHvRqXBHkU&pjXxc&gq<gO$PCAq`9cFE6rdaRd`LF&>OwW^e?K30E1-(
z`+=}#IV2B#)6tFdI!#?(%%7V+vH!aY{<p@{rog$sG|M1`e9|BILdYvoIvep1!Oksu
zViG~_g#Z3Gy8M$O!jXTw6Ij_%`#>io1j>m2F6;ld&XxV&VDkSi@PC@b*K`K{qTWFJ
zLQyIdu0oL)ltaQFfN`P9bBK%_1XEC&b;E$chWCur!3%iiW1*yylnt%U;=b?-awA=j
ziFdpCwVk)=J~c1!==j(a)|yAN+VDfK9F!aW{{0&oBF!x=tMm(ih_{2*2!%dqmocUT
z6&1?OUE$p?s;ceawV^{IE)>eI7@>ateGqiXeEm<W4u8zqSZza(Ya}bP8Iif5_aH1l
z)$vynvX0=QWEY`YvASA9P_P&{M>&#&7Ra&8oz=lwzJLT<>b7LaCJ!Yl!gfO<R^MNe
zF^i$al-l|ZpW$UK4)fjTGf=jX?*`=zE6FrknG0Ma@XK)C2)y9Mz~M8EVWAsT^G{7p
zK}0ivioQ={B%4E!^|{9%NBF+OAX^^ZZz=jM;;it4@V2h*d9*jh9@v`c_LRIE62Krs
zf%guuejU&-1p3IwRGa=SDg=RTo0$l&mKt2tT5??)@%jEzRxU)Dr$YYuD*Bj_seXq$
z<dW;(q2uLnqtGu191zfG9I{V<bg$6o*{}oAIhL^hjXDR)73OwKSr)(x2iO{+9eU!<
zSr8l2S^vqgh9@VD6le{gnO-3l9yMx~F6`3pI`iWG*g5D9tOWuUWZ(!E>4FqLc)Ng{
z6WS+Le-CCBs9p4pHF6=qKwD+Q@Qq0Ljq8!S&EU=W7%bN?Q;<@Y4>`7=FVuqeCA1l5
z(Un)P<V|K~Cgi<nmD4d=ePic`FmfVR*<N6p(a;15m{ztv^m|82ZYBz}6T$8N)4b%1
zKIDJzVS*2WPriQt|2N@HIC(Il?{R=)vj#s;;KtzvIFv`8;jitULND3Kte$E6lp{3B
ztN?coB=d%64X~83?APq<3OZdrqs8fv3BUK+f&xZYS62|#q4CnrS>0i3#T|YyN!hBV
zNYBqlD;{BIR4g};?m^jNsf~69_Y)S<KXx=Mt{-tP=yD1QQlTvYiq{teYf4JGqddp0
z;j+-s1g{2ywFd>@OWhd)6zPC)(<~(T_T7S$qoZn?)S@6-a}GtVafd_4{zn3X+7d0&
zgwVYO){_RWY<q4Rw6zcKvdU6T$t@_NNCz3g?_j|QIO2!5KR*<5D-R&AdLrDE2yaT$
zhkfPhx(UVujq#9>!vvPY3sy1~o}@vaN!IJv*4gMjP@q{m8m!uS`DT8L{8uFLDcu+h
z?{mIHz7H?Xvg#V%<m1T*_#u*YYdj?4#|L8tQ|cF1VrO%NtRLp3hld8wvQE2W9@c+2
zk#1Zi|D+Tvi(w~dqP*|5f8gND+-FdK`lqDtR<)5Iv(!vc$Kztlt^TzNrdQtUor+MU
z3DBhA`@_W0goM7yZ_mC$cM`nqihUQJ^jS;{_3_WpHrkOa%Hiysb^FepJ4QxFy9<ST
zdwY@eg25rjj~|DQnmkZY#Ko&n)0jn6{y=@(@t_8H7aNq+K{+b57}Ni1<=p?FPTM#>
zAu5NOVk0J*tTZ`=C?>TUL()k$g>sg2h#F^wS=K4ljC7hJHaR4R#vxgWSS@*+NrjZG
z1{+es^ZD-n3C}aX%*)HncV_PIec#u0U)SgTIim_KL_$I_pAQ*&C68wx6f});Er$OQ
z*jt}Iy*rsY>f~F#>osOf*BeI~g7~wdg#%eMFf@!!HX&)JThKUQ{q09~i*PSpqH@gf
z*1MKDRx}v{1;>)o(*5b$CNvI+y5*Dvk9jm@rl+SvV&QaRnbTfdyC=6}#cIxud2~#^
zZ@Ojn`g6h$>X*#3u*Qb=!A1#c1Qm{X<lHCyCBizw|9p+J>zV(Vss^yLsulmu%g>KZ
zUK(@w$dS*4Sx-#NiyJ$Rj2w$mPBlX^Y{3XwnZ~CdIB<ZiK8==I(Zh!xr%#U;ohpo#
z)Azk`&u9{58<`cc(b3VqA8r6Z#|2ik!lWTa{7;2vXDfmRoIWT;j}h|QGbc{;17C+#
z+iu3Xr0lAy6C<}{l-^emb@NA$9$_XKi&3?>u5ek1Yv}0sdE}VL??q}&MGT@^zJek?
zRSbIv>NT*pCwJ&yV%v%jDm5oi<~PjsVA{uzz<UfB&3CX0Xrr1Ciw$zbFwAQ3|J1-J
zH*LUG+1V;o`~nomlPy%v`1_L$RCV@(M5EDgThpSWh4mAeF=ekN3ID&`Tyb&nH7z||
zoSQfETitO(>QZu7DG4%PYn|{53{=ke`|p4yPC^55pPfuads-qE=g(15x9bF5ffgnV
zNd5-6fr=AWANBxsb@lxcryrn~9U2nS+tX88TFSX{<;KoXy)9ezX{5<7oaECbB_)?H
zUv6Y%WarFXX2M{A&GK)WnVF#~M7MZ&d%r4j6(`p{d$tTiQ4KUKAr9@ZrBwlf=aybx
zxumV<cQZmCZp2u>O5$T5nEUz_k{171&(d!|c_BK#(lq?Tu0vZ?RG44bM@&sk!@|Ot
zOs0j!3s@>SxVrx6;O$oEKg8s^!UaSlaKi-<;ns+&$GBC&pR>)g%+1US`F!3sFYZhK
zbdF7aa$@3RL@)f@u<-C$DY0+7qq#p)Lqq2@x&kDxZ4h;O(w+L#%*n7Y`WL0A=>|cg
zV0}>3teY?QXj6&cFsMYU0mMr)Z`bLqaxQ5dzePq~`0VZNjcxHTaC*xe_?oG?b@piF
zMxql1wR2h7_NH5gRh36tj#q_jt40-4hC-pp$pz1h9rx`O7k_zXI{sc}rZZp^Bn(PQ
zO6cm{=@Hh=-*nVo8C@3!gMC>jVDZLz;mLm53U2trUF6rpRp-7<dGw$31;b!d=&(ee
z(bU;_bbL|=upn)|uii(lA}=D%R$F4|<HsD!9AK&HD$!#_-|XIC1fS>SsTJH<EEqP=
zwn!g*`_^H>eXc8V*Yx@G=N%m#370we*VL7aPuYbhF#+I@ORrtqg2@Mx&{)LXW^sPZ
zR?pY(Sa^69W;B~Ak)kM^P~FX2Cg(Da{`1F$MlFe;4)uD=pyTrbc=JWY85kH?$X}Mj
z-|yeMB{A2?$hem6w7z=nn&*<0J9S3e58l|G8t3WdwI45<K7<e5c)1axVj&@+89~3-
z%*z)w_li%~l$mzRxm|qaqJgfp&@&M?Wp=`R{6*ZWv|`6#7OT6jk6%)vtEUI0MWUv)
zsx;#n-`|#$sUkd-9XQ~&y-4E3(MVu`6_R0$yB(hB6z*oA2fjm2cXBaBd$ir!+Imf^
zP7B@nzWa-U%2BUUn{*2<k2gLv<XrPcHRI;eLn(Z|eytWH1fHcf)YOULS2`z5rnj@m
zs~hVU7}WW%?gkRIF>Lng!%j{azDPngW!%2K!SShf8fwM&J3On5%k2sdse1ePs7GwC
z1M(NG2<VsYEA!<yLCOm8Bi7cZSfkiQVDAv`4mT=e5mzI%CPZTH9CNRQMaeALc|)q%
z`xf3Jq$p!=s(G4u=s1Jv`!qJDwjinLR@NO{Cf2j)qTPcgBT&v6oF_%a#Joy-p*u_C
zaFDuUc`l>e^x$y05fe3HC?_Msg!P~WnskniN?lvs!7KGA*@}oCva~Eh!8a<3bn4WH
zt<LrBU0v2zR`1@uD^#m=s1ZuwHEagvWN3Ij4&h+q#*NdROcRsx%1Uu^+E-X`2BZuP
zPAZ-Q>{`+g8qnI>3RW!BPUFFY2a!mH(7Z*j_Bb~wDXDZeC(?vf5sdHNuwjnJpc3wq
zgF{2b#l_`c<j7y==CCbx3?4zKX6^(FVP_~cj{V-QI-;uXO_X#wjNgb~3S+N|*yQBo
zfq?-4ylZK+;(<_2Ok4Q^fHyh8wdCKyzI_eez2iHN+dDHjGQuK&#O`jeVt^{C0e*h7
zP^Xu<sWz!RZTqvfu33I!Vqni5=fY!viOsVvEqqeg9Ju{`TWhQTr`~Nz%v!C)?oo{Z
zoBT&5B~#%3++^LLgkv8}Sz1V^aYjLFVIzlxCxc=mLXD9iG*P6)X#0J{vx9;Qk;nay
z&nl@LP7wA0=P%f!tdO>C9$Z2iF%^!LLUKzY<PxgV6@)YpUqnhm0`$|^+~foM>h&@*
z1nlE{PEAu27LY9s4Og`sjo;KFX(iLw%9Ea{QmIr;%?C{Y1b;$q=Xlj<TPy4p<*~Fe
zfne02>-oI5w-+-5uL5}e1U*UzOZPfa(qssj7mj(BWzKhKNze=jZf(v$vmCfiq`j1_
zon77`RfLwr{fhAojg6bNv<g9W;i0(|9d2oDGtw$eh(5jkdC1GlpF8&jLV#b0$c(J)
zTR=AoDpZ>i_rv37?H{wYk|{U~{rgt56G-&I@$pEw{PgzPa9t(kix3^3z|r+O)>!!&
zLZ>JY2nZSvPFVsy#4IEt2vQIcw5db6l%JP3CI|xc?CI)Sryd#_+Sl8AvOFLwC#SKd
z<_^zOl=PB!k@ysC<oLcdg(<VR$8gp(W^{ITA`KvPjx?G9AX%I+g2dkV^>0C|J%=Ca
z=s1AYSQ*+sJIgYPc9E@r{`>=wChG#b0YN;j=kxMcNzw#_UdzcC-pQ{DrW$FAXmF$Q
z2T=16jYC{nQ!}m61+f?!8V?_zVZNG%hDru%RUawAkcpZL+eMecyYh7tG()Lz@R@YF
zW+OzJlEH|QsMJ!Ma9j-WoZJfaL6G$}Jv~7mKgIDXGDLfO`+}Ffy&*v2k#;<eT#SH&
zWwrm$Kg*DJ7#jXX;f<eZMCQi|3HgR9)=EXAye=nrIRBxzg7kKC%u#RBst5mST`t*n
zy6ZAru(w@qoYHQ<#oTq*+1nE)VxtsChz@YRKwL-WKWL5&kt`{vefL8eK-K<-&c9$E
zu+z|2DB8)IaG>5VC=i^eB9Sa4<&;TrYiqR-;;2-vYq>-Kqyl&D+zGkfU*;c8>^n$-
zGx?(!a0WzH^=W~DfvZ}7Kfg1);;5As!_;&QVL|e$zh6@SZN{L~QqqL9G3sK2GV9h=
z1b=q(Eziz&!|lgBz>y0MGhLsq-aDEb4~GWg(KO^<Y7>#}D9d#X+Bc=EtIJ?8O8ETe
z_4T5nqBDNGtD4chJ-Cus$_z$xbMxN4duwWHpiGXBk4JBI*xEncj>X#kX1QgG@BLF=
zUVWG+&_WM$^YinuOCb>17P&OSq_|R?T{-9O?A%safmN^$_bh60Q>s};W+p-uBrytT
z5w_Gd{5jj*-mdFhpSWrLv$nQkbosKf>ilGyiXcv?L`fINFTPJ-XYEgLV~!tz3QMqm
z8wPPDp;}mv{0w<2GT;x{5$|T_=GGjBF^nK@XMd`B))cG7>@|AFQ2E}q^l)-=Y7rYa
ztFKTdOq#f|8{;)0n{L5mfI-7fXx9jK9IjJS5Nd(V<NdWJCl>~d=XxoMii%WA8YkpB
zh0eNoy^=6PTpfS+gRJz5rR3ny&@cHAab#b>go%2NR9jg^<-XN@M3bvmWeX;7B0c$-
z<qvg~gTrkej|T@l@@CE-uvJl&{xv2>WFcYzR3cl75(52jeSJODX_LS7SB2`6;d~f?
z69Zeb0w>icI<9;6>@hK^Ljt?FFLMVeY6G!iM=m$IK-xmM&mrk6Q}YA93~&`YB+MKP
zga20EmGBOyU|}I4I-NcnF2_FpnDx+3V;8h#uODAx0Hf;}ZhHuO3LT?pdgKC~EO&q=
zLYkP8b(kHqMrlo|sR$tUX<uJA*?NQr9B)HXE-PiQ*=)$TDk~}og=7^g9#CaxM+c07
zMqfV_A+heiU9U`vBFnPVwO!3y`VwWgQt9;X7&Ull^zSFN--HVRj#B9s>?tzomRlL*
zIxiR7Jxi;r7lApZrKfweCu6>0PrxP{GU$$~#1bV`Oz{|U(1R!i`?(ac{{N59&5KLU
X8ysxc)~uT$uDjRd0HeUz;lh6b^WdYU

literal 0
HcmV?d00001

diff --git a/doc/shared/figs/arkode/v87_erk_stab_region.png b/doc/shared/figs/arkode/v87_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..237f215969ad967810c923a1baf45812743fde5d
GIT binary patch
literal 24583
zcmdSBc{r7A+dh1ufd;Jz4aO2>PLY{bDpLrhWQd|r=6SAEG^tEs5k-bV88TCnF++%C
zo-&0(nf2|f`+1-D`Mtm2w|(2UZQnnid%L$5>sr@!Ugve3$FU##zMm^lTl3h)b=%hw
z1hG+7MOlX+=sXF6_5nRD{*rul<`Dj2uv0nXNDypH)c<KNK54{J#9AlS<44vGt=qwL
zK<Z|Wb0hx5>vZI_ldi3WldGwNIdS}up2i`v5VzhXbME7&PM7p;9jqONxK(Y=i^!es
z+=}COQjb6EU~cMUX=}r+XL-e(5I-oab>2x>TugjF_rCoy65=uvl1&^b_X&cVP*pyp
z=SKP7>F&ks-1q0FR^-joYVXq64Ptk$582V?P~|YTZWD>rmgaDp#yxh+p7qz()vU`O
z9c8tn8MHei<WRF|v+HKV35PAKg!DgE^IY7#ZsrAdg0QNO?}iPBAAP&DKjP!SFRvdB
z7sMmxdG|*bFXojG*h#IzIAbH}Q`h5P;`%OoOpB5cuO@y;x>Lr0f1Dpm(clmfCVu?V
ze54N_@XJ@B;1_MSKxX_iy7T|r52dMKFtr`|&g%4=w{5%Y_|_)JcdClNu|FUn;NA7L
z;S0hmBAaM8x^k?Nb)8sRS)5F$_%+u0XL-^${ffJn{q(n5>aR=F^^K|`{=+S)XMc@;
z&K72oqyIKYZ`JhUQBuX&$vH7;cE;2izn(nz>2KfLGWAmpvVH%ol$Mft{M#=3^juxb
z>G}P&$FI>}BTYlED>#Goi+z^!v+k32^6@=4%yUTSvORI);b*H*&a<g4Q3q|q{tl`q
z@kdTlxtPO1Wst&xiiez8S->X6CGGYpx9kg5kHU>TMp{jLPl|NBGJVgiCAZnXNGnFp
z{m;sBWB){FL1KJ-uF;k6UtTLN{kT3OwRi8x4K`zXavQn!!yUGZb(B1d+Q`Y0KV24?
z3_Kq#9N*vE==uA5L}a8vs(}Po&UDG2W!rBbBaHPuCyQpcAGG=Iob9u`U{v5z`+lA9
z**6q9_l%)myLRq;`s~?QYkGHq>*O&m@8<U+#_ofmb<whdCMRRa<ba%RpLXZ<ac|!z
zoP4kTbRtc^_ruj!_9Kl6e8(f*q_%m?496LkXgyJwQh%YJE>e>=xIUOvYLy)}NPQ;%
zx_z@U`uV1NTlbO2`rIA{2cMUWGO8cnxI=PPBH{S$<3m@2XGb^Yj17GICQ$Rnw!63|
zL^%F?drrE;VD)aJJ7(w4d;c-`R{zAL(IrG&T->WI@|KP&B`w&vRZC4xV9%aCBf?L7
z7LunDdf(p??2d|wndlEEd2x!QZZ~H7<y^Gx-~m(rhioQZKY#STHwZ7)-@JLVyvNJ~
z&c()-Z<7mR@rVueY;$tJsZ@ia={i{*BlS#++H1OgE6a<C&!4lhv90I9bmVw1{{B7Q
zE}NQpxlMfD{@KxcOw7#Jb>BRgDqSyXSnPGi<8rpa6OYloJY~Lr7ESiP92goZ`BA$5
z*nM_}9!@T|o~wjSt*fAZ+RKwKS`=4)Zc4W<o@rF)@?Cnp<n*)e1KpYp+L@P>w13`_
zHZ;t&>s9<SA2cH+Bjd3!Gvd84ldPAlbK=B_qesg>Jv)ZjOt``jt$g(8%52G>leXSl
zbzEHDEX{pjGufc2p0D%aHVbBCBvepeO-pfkMz^(WekAcpb<h*vmH8ePkqdbAI_~i<
zlU>3R>|9cIv55G_((m8DXI`vtd3mO3tVPD<d(x7cxpm9ShoaV3+TUFH@+z)mP(xGG
zrZYdgsnj6bDl}^)VDql{_sh$(-Sv<6?NU@UF;H-wFia1eMv!Xz+)hvr|2@`P-%U#w
zceiYt$nS|xK}Ah9we6CZAJ61sy>uepx{4Na?fcUV^L7eT<UL(ZQGddg!mv~>jepH<
z>>n7oFp{z`7;ZB0<#j*S<ox{n+D)8=&SR(WHkZ#_ugmz?joS|-nSHp;S?xG8{ArWI
z9QXeH(^ykinw}rGvP#KVpG@k*f_I<`{$Lg%@A+nE({O%qtCsy}bMoE08%9PR@EoSB
z`+<q86y)E%TYi2ZIA(oMYhv&?##i-dcSR5v7KZKo)L@i^bxXWzFw#wHn$cO~p~cCP
zCz4kpXQU)0PtCuu{`B;SjpDVj9Q&oYpS~;8PquB_hS8>;&EXWkpfWqr8NF`0MzqB1
z$Gf%24J$}dXWv|&Z`Rc+TAHfa?R~W5ezCQCeEOyO7<qShchQoisXWIaL&Y0q6?8n_
zEbTeA;o(AOGL&V;&zqS&*Lor%Iy)#kYw!&RW|-H6*{F+Os3b|-r=5OnR!5PpR-1ix
zEQnLiP21zLWYk(l_Tib|hi@?^BqpkVD3~l>j67)Dm1a~Bclee-iH=G2seDInztwh&
zgDQ0~@`8%@@7)Vs+^euK{OtAX*ACjUK1;cxfti}oGR~vT_C_n^J8Ub1FfEhLvS~4H
zeGDZlyq7xje`VGy2+H3N3gQyK5HK_MHQV~gkt3Wk4;7Jh@34u6JxMdj9*wvd^V2*i
zZLJv+oNl6K=j-#w3=Iu)Y&y$>xJ=^6t9i=G@9h|>i;jwjm~S||3D>j4Y}$BMFF4E;
z85<a#&kq`k`7vLiJLg_RR%ysT!*wXbqIUayY>s79xkaY?=`(GIDn2jGPbYjfGc!{&
z;K!qBbF51~Ti=+VZY0}Yv^Y^vEgn+DmDsAqb5WwV@nB7_UDlQMQ$7;>{1xw8Pu|uV
zvXff3Zr#G{<m8*n7Mb&@IbDxhk({qD=@=SP9Cl$ALrrvC=p6+bBPFb#K7C60EpFW+
zH256TGicyGUB;|cSt9YFX!)s^;zHWs{K8mz=->&9VI3~|LH*u%B(xQuA>*1t#O)(B
zv&=S5uOElpYwHyjHReal0+~Zi(wjI#yWcb&o5LrU1<vlRyZV;(?R6BPJ0EtYva_(9
zJbikPX!tS8X`!&bKC}AvpXU&o4(_8Zsbh;f<ef5Rti1<=Qc2|bGnB5W4#)Z`ty+sr
zlg`>`Mr99={HCkc4YBV&ztA`F9G6HOw70iMb_i~I?j^TiESj1iHOua^;<n&fMBc+~
zfAbC^MRPv*%!^a0C!QVk{@r%b#`nfzs8s4HYciRPMG$qs@~MUaf&>paGwb;j?FGrG
zK@&;MkdmZp52QF4Z*}-zl#HsUNbj;8{}{1<DiVu!dZ{z4uSuHyevG`Q$DSCHS#`+X
z#z=Dw%5Ih_t8C+ZCsl)Pi_FjiDH@tYsZrm|;BY}09%IW$)ZWFbKX%(MtVA#BSZunn
zZNJ6cLJO>xP|*(+6*Z#5#)YTnA5Gnrh^noPI;f?h@*w<lYKv|0eEDp~yeH$TLLz3b
zAh+l2L=iHW^H|H?O%J9{hg{2W{f?S9u(%`C-mWZQbBz&2)-^5uSE%Ck^{he<!uff5
zLuSHqbEW2Ae=wV`_g(34t#Fbd+1#qFQZ&@Oxrr;SBV_VecY4`Kf8NlKp^D5ct%Clv
zOc%F~G{jwR=lb;J%a=pf*O;4|S6NSB4dec+^Al8q`BIAxGp;&cez&d2Gsl5VKizn|
zIXQSK4QW`lCX|hvNBMKg$%B`_oXc!;aB#p{;up1Tj1MeK&fwQHQTR~kK0Tlx>U%gb
zA)%^<P3Uyb{2k#BiMqcdar4td^*L>qSFc`OokE}4=Jox{zKWv2OjNdNqs2#3H%KTU
zC~gZA1(S_UO`)M1)x$+XTTJquk{wD=iT4T#eXOl@PI1sSe&<aM;LYSL%O*Z~d2iJF
z^unp?gWX=bzv=Afe)MKrw<3s78v7#aHoguMFkD`!^WK|ztF&_b8=3yj2ZvvyCoS_b
z42;g?4CUsqJUx1EyTiVa4>nzed6VYTv+VS4G=-6pR}65cH}0gIeBp!4SbRB-SJvhG
zgPc=&4(5Zi-$Pqp4{16-sQ!gyRs`gQz%8LJ;lY}4(b@d<cRuu~>$vuL{5(_W_7izI
z+Dh=*vu8uKQLaCF4w+A08y>#oF6+bLogRM5w_g6%6UCT>Tw|Us52W6!*w~~EZ7%4q
z2+~h8$#=gIa_>x4RaGN7as31F9nsQ`N9SGLQBcRuHb-$J=jNU+UJxA0cqphsF}r#;
zVa};qN7{S5T5&^{TmME(Z&NZyOGTOV`SK0(38+}^^GPS3#oqv22xSuxZIX;S-sUv;
zYu&_egmNN)lBVs3%Byw@<bi6pK$Gq~QS;v#^O=0NY|Ve(+^|hY=O<-Up}=WmXNeQ;
zf~)4+q%`RVt=DwzL2IKuFS5f#j7D83K3J2Kosq4_r5`4yk|svg<ZV-h0-H|W+b%&-
zP*=6JY>2&jOG}R_k&dVS`M?3X@QxQ17MXjkX?&M|>09QR9P9oi%xQ6qNrB?YsOT$4
z=Uha7@KEagomz`1MPHvp&FBuv;sDP@iu-X&xTuNGSZWS}aOmr?V>|zFI^+}5&h=KG
zQ$nq2u1RtYp(YNnpu!?^YEq<lM7N>9x7ucJd7|0I(3ou2e|?jJ-2!b*j8y2xjwx<l
zp0b9x!wEO4pBJH??s1J<+89@OZP91OsK#;bhp7ak|NHZOGh?!|uRn6`$!U9Y<?OBZ
zrkQO5CsTMuogz7P&J=RWd&njBd?ih)w=K!9r8OqZzdJ5}Lxc#6YN)7e1+oJ!38~FR
z1^jKVs~I96AjDdOh*=hREY4V7R;K6Dn`N>ou*vN81}+7|wBFwfVTjH79Wv33{tkUw
zgAVhyMz`L_eW$e_|0-b_XL8J>&$DmFV?ugq>8H?#U+d!hUXS+f-np|6n8EAk2R2(E
zB0TGtFM;c*uteS16!1$`Rkir?=s;EQczcfPg8EmsQ!hSS7HbTSuf6X3KF0L@&1Ezv
z;e7T>Ki+RDa31?TKlG#~opJkt%JkIvxsi~Ad+oPhn??=HOEY0T_2Q&-o!&N&3sVPH
zlLMv(YXnUkWXVa*$4ux=U!U&iTG;(+ZRyD~#nX?fzrXXNp+gbn_oe{nN6WcSVYaF1
zdBzIu48`KO4yzXD@3HD^x8ji6a7U%jv{F?cKT`Iczd0kt!_)irD&1_S>yxaX&yPoO
z%DQOK??aM8&yaWD<F}gopSX~akPMCY^Pi4!%}bmrIvypNZS^_dX{7O6ZPX3YhYuf+
zLaM5(zZQFYss^ue9d0-@Vf`>Vy0h4O5!0Zbtdp=MA=@Cev2{4bxX5Gbe9q^M2?`6v
zA=P7f{FvRDS&ti}Lwy@`A3l5-jYh5`Z~DvY^CpPd*=}DGgP4ejk$zTV?_VdS?Ra^4
z<KyF-lTM(0F$21qYU#*mAJ<eLh%#BvvvcQ8ujLIiI!JW!@w~~>Zp#b5hU%Y$%Q8q<
zH7CWNxu@3GpBP-;s}>YJN_YGA?SYE4l7y+LsSqtXmWExsb`6?Id9P~a^nAMEm`R9N
z0G%hdVd#SFthU9b6usoeB2QO$rjFg}VS6qH+iz^Z!x1?dE@Gti_1RcwFWs+Q%pYm@
zB-VK^j3f?HoVvYdoxguMp+;%6TH&iJER>sPRkp~KmXP?|oe_FOP3?AwcFvXd-*f#z
z>b|z$0f(bqyH0d%)wLXMh(idW$#@j=ZD1f|w^LZz*ztX8-ZOL`(z&#J)Ai{$^VZqf
zqc^yA?b^bxv4Y~}G$UE*-61n;lLQAR@1_?osKp441NX#qpEfk~ni)RfE@@HFnZ~Z!
zdtg{XN=HX0KK6WO8=od+5C8Q?-`4$nTcM?2;^RHPqJ<=N%H~jBv6EEDa$3mwoEs#x
zl|OU*ZLnfB(nb~Br{bq}Cni49;qtDhb>lXi{}sKqEcVd#fwG90m^6xiWA?X~2%0Ik
zXRh7eIa{1P&A0rZb<5p#eM;^`OxNzzZ;Q1Y3QIo@OXtc>f83uIEVYoGtuqFMkEcCo
zZ)<63nVg)w+o<E{eRiPey;?8!-l#*rx@YWnGwZs<CzFaXE5_-ho!5+>tV(5<b$N*r
zi<*8m<3ga^yA0A!QPIiwn-oKy2%N15S)Mku4N88QAMAT^3k!>Tbczvu-1pZ99lvSh
zC4aKYUXb{dFDmD|PIdA3_#lJwK)cW5+HZ}Wo65tr5-H1WU$ZP*(@nxTpD1{HU`<b{
z>ug#(IDC6)X=!<JRz0ZO_m6j;WYXP`^B<cU8wd7Z0Cd$^j1A6U_ufS7$xWG~&P$V)
zqVP~_Fuzu{Y7)?6nraf-9)$j{GBk$Uq#Z8AR(}(Cy!sL{_R?u-wXZfgf|DmtG;WaE
zy;nd07&B}s%PF&1kVDSxhoGyM`{dlu{z0yL)J5^+&r;&8P!ped^FgPL($dmcGR1bi
z<TL9g!*$rbO+-?Qr^hOqy2n_^H(EGUH}h&XZLTOQ1KgEVQ0Pk53d*3HYqu>KpJ7ez
zFKlizl-`m9{DI2)XQoLjn$Jhjl5~^w6kz4>%?<YX3~>$tX0b;Z-B-4V=k3;PK~Kb0
z(yrr`4*;=OP_D1P{}v;M%%ukI!BUVCRbzt3^Z-%2iaZZmHCI|Da$5L_js#cB&jJlT
zduet1&K-44O>~0}kt$jffs?JDW(_&{&810<LA!1(E!TOAX0F|J^e#yxWcp~8h)MBF
zia-*wE0_1oCqM<%KpBgVTSwN1^Rxa+xV#cWM<eRDR?~NHwq=vWyKAcf-7YmfzgMU&
zts5E?a#*8K^VwOZ^z)xT6qOv5|F|`s5+=dNca&2}xAAO9oG$%|0+;cQ4#WC{Uv}JH
zdtZ5Nn;9Ecmoqe2mj5>#4gefppIA0>s=L@b)K=Pcg3@mMrSZrpnjXi3&E_l*+siDe
znRq-Ou~@xjYf{<Byl!Pk=Cq2}lO5?>p49c)UG6GuJIp`3UBYS)KiSo@efZ0l(}N*y
z=BgCNTZhj`^WM3ATjzduczO>2OZ}j|P8eP9kH=EW%XM^*q!2OVS!{qiPJERv-@o+c
z=?A6+?(bRsLqobL<t)~V&y@yC3wGZ`o$%FS_TNCG?0+El>E*2)spStWTwIgVPHP10
zWtOBDm^OvC==@Xjm-CHzlmUf~n40z?OFZ$Mkj~K+X-z%bIv!GUYZI5xMBWf3jdtpY
zRac>Vb$H6D)P=T-Pg0GG42=6E?F~{}katkV_P)?xoEhmqAgmJ0MD40{yH<S|X;CmP
zIqRz!J%E-5E5&u8K#q^k0zffse@c8p!rnhGZ9k`ceto{etFR`)L6$RZZe(Pny89>t
z0|OR(wSmkaOULZ9$vn9<HE(YAE~doyPbTHK1Dks7_MCligM?GgzM}TWH#hG1<`EQ@
zl$3-DQ@vj{B}9tuERhZh<Jrfx834VZW+G05FMBj+=YFaa%!&P7Y7=Uq0;=I0^|to;
zx(P!K+uoLq{FooEQOnN?o9J+yb61@i^SGgX&Y{E8cqe;Dp}S+neGYWXS?%M4)uHMd
z8bZHvRSG(bu~K#%w2}MqmM%#C_hXZ1r>3W;_wV07?&1lq@$(Mak%A)6+3J!%NUw8s
zvXdd^*2TUu_?+XAW^%zrz%(lKZESVJ(Vz%eSy(=&o0v#<suFGEzd^U4cBcaG+FTrR
zG01B^)_wggCw-3BpE?QCoc17gX@_qgw~g>;oyoL#$F9sYK#SC7e&Iq#uKi*96UAQh
zScoBl`kD#e@7Ut(7Ut*rM_PZai`-?uZ~>K)+5)-#eEQjHxpUH|HP7*4qV(HyMD>}c
z_c>%wC2De9sbPL2MIz40eY`*L0R$4Y$thHy>icj<@YG8w?**qs21=Z6Q=%4?FT^t#
z@Z1O9<e|g0AUYai%~6g-w(Dy)R)74cp`qcm{Ht}xflGD(?kJZZqYl<vWv89Z5!v$f
z+KHp}a?^J+W_y7S-Fn_$1)Q`z9si^3D!BOdacSy2!_}dJ5fKqU0$B7Xz~u<Dssn74
z-{)vY+?1A<-rI4|%1CLI(uE80pRE8Y!2I-p%PF4!wnOJWAN3B-Wu<sN3J%`opZjNJ
zG5XuxOKlm0Z?3fG=3Lzua^TaZYj^)OV1Cq=yLa!RCy(^XBvpZ)<@Uey>FJH5gCM>e
zn3)p!S?`#mIlOV>2C8a`6PGX^BnAxbMJNA!e9LOk-wiZKjX8K^^V365<lMyt1X7Zc
zDy_2lcJEGzkJo#7`o!2%Q0BwLvQ$y7+s{5E_WN9loNR3RU_bsWmi&=*`_ZFs;{6%D
zDY!;Yw`WsFzd!)^sCxZyDXTLjX3Lf>PLo~o2M@ZUVFsQFW{r`uH~Z1^j!o2f2?_gb
zj*U^HCo>aM=~4%i7lRj_7af_tcvUgYKmRS*d%QtO?&#<cG0LyB*QNj2-o4@ia)lg#
zP`1=RKrEaSkH`|CB`yV(jZ}g274)|&N_gqibaC)r0P$A%>qA26ft36Uz2rxvr?Ihb
zE$5SU69@EhPd(cLn}RW~>v$w>Iv$6ICmI%CsA8Hw2^qkx{Is*y*Ed%dznl*;x3Kt)
z1`dom!T}lg>%}MDE*Sqh7J)+0payItrKJ548hEoQe+v=2uRO)`gtoTWm9JUgw@}{I
zjUPXLJohci7Oh6>`yJat*Fb!Ur)5eskjjDl;IF5o_-}<mz)V4tAVIOvW|0r4j+?4h
zNdC84!SX4HnOFs-LhlGZMCx#)Cx|m-^0k&Dem4H|OOY#7`NEEEA8m0@5VP;66h=be
zDHlIMk256Q_Ms5m|7aaM{;hTR-5#!BAg)0iNx^}oEr<d(VFRbB0aXb}A7Hd2cUYt4
zJx|@ccX%UJN73d3$46}*Mw${s*KgvKdrYAeA~i_-&c*T^7#Ki?d-2*n=_*xisUGNg
zcO3+9Tdw`Hmeq%bF}8nQ&XbYGFJ-tQu))5!^adhW^2*n;^77}2i5JbyKa`gv4P+rh
zlLOG^iW+1MHz(_YQ3I-Uhn5jCS%i4NB6I!z1xbZUZl;@*AgWbG(KR@L@g)a<J$X*P
zv97TckLr}qBzP5&4X;p)Dl03m(yc`$`jmVQV9^*k2MC>O+qO0Y1#mfNF6mT9K-ig?
z84%tFE`PDBe85AqY)0C`nDh+L-++yV=;1nVk`ES1&|gJe{ROJKlamvb3?N~(jkTm&
zx29oLhYFm$eeWI%x$MISBT(!<=fQs?W$f`!LW)H4thI2|(D;auNYHO;YI^qcsXvwB
z*ymbV5QPMbOazJ!rOWE|X@3$#keCcT;FavtLKc}+m8a1dyjfIK)C<FlC~`U{(01zp
zasy%%|7tl)4glZq;!k$o&}6dNcikE`Ud?Pf8ydfft&5GqN8Sz(4`*c^u&hGqd3nkj
z9|HzLr4SOPc2gv?zOul^CagD5Ky!0*-@jkBtO{i2x55qQIShh_KVy(#`hE>h8Q99s
z2^%bG$*9_1JL*yfJB1N~6bfyrs;k4Fk@vvIKhC<avNTT)z*DYlm-d=_)ppsYIq4Jl
zeO_UAbZxa3`vY}NsBws3P3(%$@L1M=RKe+a8FittzpShb^KO3eV$gPp6vv^u#?t0y
zy%(SJty@J#M(%FgKQ%p#PG3Z#cs&osC=YQ7NKn+IxMPg%3mE3AVE$vu%Je*#8c95N
zP>;zh#$R)5EzZ6=cL>aI{BF_Wxjx5w`5Xi=lD}ou%QKmmCENL*c<s#T*Lp0*vv1$0
zpl1OjC5VMA(!&+Wj*PdA|AfY)Z?8^7nPDZ%fpD(AfwZpRFc2`~)?a?_)2C0zBM;=I
zH9SAQgU4TVKi9ACZMySW=+?;r2oF`Q9NTW2Y=gm9f~sn2IyPQ4VZ!_N?L#)#OG95#
z@75_nUbpKOLD28gJbW$w>#-M~Qw+E6*deHu<_;_Z{POtm*4E=J=nFcH5NL+3{IbrY
zA<d3@s@r{>z?_YYpuT}CpUBem@+xdK+7(aDBuarhckMz{7eWSV4UfO7VBRr@8ct#T
zI_|>b->j=k4}Hmgu$m>&*|7Tt=@|8fBQ*H7x5QcFu&xYqbu+W4*5()5vM;w$*BQ0L
zNIc0zRykO{1WrIy{x~A~<43B<abcjdAp`5pk8KS#uMkNAxeP^P5XNdPJcpuP4NV>i
z?7Be$i%SmB>2QP~`XsCEGP>SJ;gCwLe}8X7n1g3;d<4#ug^jH~T2|kfUs2H)z0AtQ
z`may#L#quLhP+~om;}*R_e4?g+*?0DB$h2(pb<Gh0Ac3S815=6AU#F8z#=t5FrvE>
zN~j-t;@cH|FNjlqq5IFuERY_+5Ar(L^Tx);jLgh#xBh!b`08VKfqBu(Q)_3Z&17?O
z6J{06**#=_L-4&tTKD|^YRp<K=wQvOLn8KHtZw3osQm`DtwwkI5oP72l0UOlC?(}S
zH2^BS*Rih<+%%NJ6-aLykq1-_m^e6=f4AHI85H$>*qW>zR~jaKc4e+Y@jj=#fx#mR
zWoaN-i;-PQOq+{zNNMe^Z14w2vzLt45!;_}B^KL_+zeWhKPi>{clqqJq4nebD_~#w
zZ`E6%uXyxt;*S+rKnDKb-~Z1FLBAG!gGtt<Pgpl}#e+ag)C3Fxt2o^exf<nQye*Tz
z=f<Hke<Lb_UCvERTG}1`BTe@dgx}!c;MvLU$wisAwzjHvQ@cz5<prp!y2C2G&dpSt
zl{&I>>{QALX9qsY7NMWmoa{_PysgYlmmysMIkODGJ6mKm1!}$0k+S3dkx+Tlp}Yao
zx)c-vJpxC7NQ_(>y|JDR!YbNb<{dkrpT>lSvh3I)>onW|guRXjNTnEn2$A$TSr=e$
z5K_3^S2rJ@m8VDUWMpJOYgw~lYXd^A<hO{wl+&=bhsOfeG^9Q$$Wl36@1|t{Q>ZbC
zQ~}jA^hpvFM6_vN&_-UkFaX*KwD0gtIo(>u_{7Aap&|9CBIIXiRNx);i#(i7N(|k4
z{A3VMiO!n|VrAb_g6ytc{qNRtZ6SmBD8Rv>RnTOha!jp5a$q5&(Lgy7l#$6tRiiS}
z8PvpT-HO%)0gn2(j;F7$kJ?;%wL%m-iwwS&%j-uVf6S}XLgawiF3<Y(qIzfvUyVTT
zfH*pV(9h}eP^X6pz^c2o4XO|ca{lJ(49s;Z8b4GXJP+ryZ!DXht44tev_{%!Hxiup
zOxe29JaxM)nYB)sXy8EIb98h(fBt-be}86XX2NcMO$xQ1p~HYad(kp5q#lwyD24dl
z;3YB*QqeEm4hrfnbkEGPE5Eyq9Dqt9Q#6*{Y8)J9Smcq7j)5G26U^t%zQ468s`eXF
z<T5Hr<2o#pw6@Eq$`wpn?4zW>jwfnFKz3qhtU%q+17`e(sGr}zjt5VF*TrGzDpFTk
z7y_G2?y}PoEc>|l$rb-m9v=RW@?e<v?R=0tfS=TeJ;ET}xCkr%*uCwa(O6iTLVx{i
z)tPM_K4tXt=TB<=rK+XBgS8YklRr|Vn<|RxBPD7qGQE+y9Ap>$8JOe4>?1_SazFo{
zN=_ecQ#D=f#!_p^%I;ZamE*^+bQc%3)|R?bk>11WJ`|6O;v>JF+(8XFdhFOi%f^9x
zGGKr|Nt1cUui;OJ=d%Dz$N><1^zvTW_m_i!IUzCv1TbYuRTo-P3v4=NxMqt1IDs{h
zK?Dv?p^of%vXF8Ati0!MJp~A1H%WbXu#HW?TL>cwn~u|Yn$WR}Y*>rW50D6A_x^_N
z4OBLI&z^w5Kzr}xq$HL3W=oX^dJ>ni4MNxBu|oq$HEeu&W`AOB%M1NUuwDui%N==+
z09dXbdleLn=bOWwJ5qEKZcio81YW?>aZ-Ct4!FhXQ8{MOD@(<(raa=}8MqsiJV$TU
z?G3s|OI8+MG%*!)ifnB9X+DV(q@QMJ?}58JTb)?^Qg<DK3zRCQiJZ9QzW84Z`8bF<
z?itnuglJU_jgU1_Ydavyffx)?e`C{WP~dWfYc>WG5fR~zRaIG8(0c(lx{{{54xxP(
zRH2VgamHn+*&_WGamtFCCd;5P*RzRG4q)c1f+1noK#j6C+DXVLbtn%H|3}>dS8LwA
z0x$vAbs!NpA-HD`_5C2vNetND{wHQ*a1i=AdQR=Mks6tVACStWL&w2>nRg3?B=ygv
zy?SK_)KtA=tID%csAO4!TaXvr=Lf@a<I-pwaP3W7#bR|5)S!m(YsDC5T&O~X<-1NA
zmycIeQ~>z?<oYvr47@lH&Ck&n=^zY1*1lGl@Wx^XM)LmkSsz6WatK<oS?Jz+N!nDd
zWJ<*AOyU+}pZP(wwHi^9<F~kcF#5@#{S}HUbN#^G)Xvv@;b^Q<-;B*b<wKAf@R)GP
zI9)=<y>sV|@6yj>mOi2c;dB90sry_bLfY}U9LFOdIuK0Ak=4aN8JPJ{FNR>-c++;7
z9I$5Nb|I5uLuvY|=`KONq*sVhcu0aEa)cQl*VOdE3WCnR$M#*gv)V<pOE~En)E_Xz
zNcxJv{lM($B`XGPUO^eL*B`QB&ZET5)y&NLN^h(moTx8WQ2~Rq1^wx--5MgDE(P*}
zf`X!=qLPwta4Ai?oSHoV4$xbHHjwUwJG)T%J>V`XD^pIS`G%-CN_9P4{P-CD9^G_f
z`Bwd9`IDss%~O8racrO_>uPI_kgDX)rv{;6Q*zC9x|NEd=_hF)^6@|;$|`ICkk29S
z(LBDutLb|}|9cgTF36Kek_owIKw%>YlaltN)~tqCZ?ClUJeDCcg7<LTE%E*P;fOh@
zr+46D9eZkxIXkbW7K)aL|D}%HpQsKiRF@2d7IFYUyMp(^5~N%g*?Yq1+oRF0un3;|
z7$aZs>XjIrTv(jceku7pp?0-wB+%*L4fsq<(Wqh$=bN6az#r!VG=m-<O<MZt*QFzC
zHfS<2F&VPmbWeaZ3<NPuE&*8jHO7{dnzxZKy<aw>ilsv8L+~2qJ3V~SV%w4Xsl@jW
zk~8E`caYtjU7ES8lsZ<GKCmXZuZz<a@=wX1<UbzCD~gA{B$!^f(|-;Dnzfe|t!|oj
z#Yo_RA+nyH9=hewnzPwfyC<^p=!m=i`FoVmU}|w<#Hn`(rEcJC(V3gHdgK@R{I!u1
zFJKQjbm$#Qb4bl5E(M`2S0)H;ranG&wuu*!GT=jaNiqX&tR6&f#Y_%aX3aty-|KhE
zSrmBzX`aemV2J}hzqiN~Hp)LBDEI=Y6V9`yd?y?#gNT3XH9rNE5()7MG7{PqUSY4L
zpB3HEFmJO6TAh_7;)4EZqKlJ|<8)uh5OV;w#5Md8z43o`)f#-kEk_7qoZ7GJITdgv
zisl7#J|XT>ZHOr+)*Mg2s$(26%<$F@4LRvjLe2fD>c;k}Xkvpu&PCF8Fm{qs9$Bzo
z=pt<*WDfPM@+0;|_*d~>Jg&NTsGrw~R*co)GtDI-zt?ItH;4TW-l&NS{^m?90JD?y
z(&ojrud1b(>YcCYa(y{kM;}eh1eGyxZ@nhQ*zR28b8n02My?EtGm|eS>>A!Mz9le*
z=BFM#(?|1~-m;bFq|_1}`bO)b^&Dv%_A~MO5$kI$cXvLoZw!AxPfx4>K+@lB*br$W
zecWp#t6_aAUkz{nKSyRvJ$gr;TN6}0Jfiz(M$slLn=8@3i$XZvFJp)enMiIv5aEAI
zc|h7Bk5PQqb-g)Xy|SL!@hg@uB<V;8X_Wq8AWIhF47bEOkLx_o*iAO+I;+FG@luSV
z$zYW{KTYgM9N^``|65wQf%&v*fn$_%jiKZ%LsM%ezLdTHyshS98?*ky_rW(xG$T`P
zIi;Bz*_5jz=q+V1H$8RH4Hi0jmqz&xCbu*j-@dYz&qiFE!><lNb5F;P1FJjPSaR#7
ziIDAq%x~r2*Et_Zea<)FetXV`c<Z{^fQ|5TiRWo^r43P)8W1`{nNmvoK64}ad$d~e
zsnxN*&GxjWBVCai!K(D5<4ZiBofeo@Z<Aa_Wmo(;T3@O*2!(PxkHueO_TzaVb@fM&
z!&>_c3ni7%Xe;k~9c@g0CjhCRJ)<!)k2!pCWT=0@mX=sU?pt-Y#)vMT`+d^e!^6D)
z;QMmri?y-qy{2W>Zt%N`54}IJN+aXB$UXylzh3-G$75|(eMKU%ds%9m@T#`~DilAS
z%FNvTVk*{}aZQuCRS)UTDf4P74OK?QDHpG`u*BSNh5fZ5)iaat%#rSZC}P9C#S}Uj
zry+~s#^{E;jUFoYDc@#Bibu<i6GxA6@W%>PdmP{1@awIoqGlhTpBQ>$r#{Vu=cKH-
zF~9VEj~<Q?rF1wU-H{Gn>zfKD6`M{JFmPYST{j$UY0hIB>W_C}R+8eer;WS)(vm)=
zkFSD7>C3s7GNeZnWyj0o#zJOqI^P%cvm<lxlgvWS=#FJ5u{d?FBKaisuOi>9;>Gf^
zqrc_rdQ^FjV@y!+L=;iV<V;bbe*jUW$*zN4hf&<`$6*Xq!rh;AXcciz8~3a0S}qhU
zxv?sbA)1pyl(Jxe0Z&_>w;Z`D5KlMO<o%fj)JO%xrFR$14tPAyJ?njZW)-Pig`#9v
zRXc3JwrYFND>{08UQO=PTbQrV5~Ncqloe^a9wlSr7*gLR-?{58=2z3Sv$v($bn8d+
zITOA2%0_N6^J{KkmwE*&20iM_GiUqQP1La;-E%9wz}MW4k)S_+_vGw*)OVlhsBZLi
z!wmLlZV&a%bfUh2VWTpKRz{@ZTUE*(t7=E6ot%OUWKBT+2KZLNM_L-O4*OL(<@7(t
z0K%kJ2<|wpM6H#D){>(~jvS{*ofx~OwDywfTH-B(Go>r_^y{7b_dAyQGr<335Wbox
zC=B_}5UKfyv2ho?f!%P|fpM8%?DF?t)p}!t!@-pHlTp{g^m2P#MwK4h?;uLq1Do!Y
zEDegf6fBSDbc=lOWC-uQjzst%Zw(>7Cv`N2YA*mouw%c426~Syk@aLY>Rr_X{_qM5
z3rk8$iip@C_ck&`)$++d2t&cYRu^r0ALsDX=bOkMIs_IaL3TqZtj4>A4YKSOb;xAe
z)X{Pm&xKumd~#+Jw8S+%C62_4=<PxUC3Z_jUHQuigO^;-!|6V-`HI?_)Dzh_-6XE5
zh1!o3-q`f)+MIRy+kmJa9L^MCRkGj1!+s?QcVZ5CdG0E%uC%uys7aCa&hC%aAKtU}
z`xC?-iBTyUlg_#b#6Gd4%)#IDq4Vo;X55ZnW9)tAA7$~EkMP^j650a1nz72R{m%p2
zuHaMh$j`HvG}aQ_+KAbX*nJ#?9|7LN&LxK-x*Ri3dsRlWhf`<#+xRi+nQ1|pb~x8-
z^AH4yn^&_(awu1IHSjVGGJrof&L7Li#E(Mz*U;`Si_%9}op<5&&-UaaGf_{VcZh?(
zG<@34iTc(kMrJx1(<T|=foYdGQ4wh8q&3c`i<A;8&ct6@CoeBKQjFPIP@&L^+A#4^
zpHApQsm(6K_^Z-`eGc@!rFkyF)ERlDT@fhepw+SJS}D(5`x;aW`b~9?JPi3b8A*;;
zbL*3+b;qd}J*3>{|L&7F&Q$wQ%JhN_^>6etO#B<}V|@~rPy^mOH2G*!?_oVY7VOv&
zzlcM=^4OR9Q3|Y?4$=?}TLPJn9(Kj;kT(W0uTl1tAqbuuWekVos7LYylri+%G2=KT
zdT#qt?v4s|0q|P%G&tMUs88gqL^^^bu0j!`|JsB<pW)RUj#>Pw@%NZ*IEIl0b=rR`
z6aP%@@|@G(KkvpdTgOKraL@)adkjARN%@Ii{CS!9o$gX!QU9F(cNj9{KL3^6z^K0$
zDMcarXU~94zt3AVPxPiZ(I$C}rhyIT_eX*uhBxE0hp4w8!vcQ8iCb275vCTjSS;jb
zaMlpjL0&iKYn$HwjewX5fPMjX8hvtbRMc3OS3~R}a99oTDyDbVfis!8gZIJDiyGxO
zL&2)x@+}1JCkFtc!cTk)LL_KMKr#b1u|n;4c($4m>`QebZTLtHfK!4R%U~(YESorF
z4hRU0LO{P4u;=xz%Wy<$YTjQk->_ci3g7vgvFem0LS^+`_NkYEN16~^KEV|8;<JIa
z_5(;Hs>!9)&?lC6+Aq}F<g|l1EQ60a-T6%EwZ&}@0rGqvNG(%&1W*(>!I{)ksWnXH
zNj-Szid&@zo`8SUh!8(QzYm>vx*%+dxgr~;ZP-_yUSlR=Wo_t`9z*Wyg%JoUdM@x7
zBm^qM;_O|TU_d>KzgR1wv?k$Xr#@6Ia0d0&)!<fI$I?sEob5|#sZV$-U0@SGJUyaC
zGmW66K<!0_g+0f+JE-ptZwzcIz~JBr0$Ir)<7S3lz<`b4P&*29X8J&?2>kTky?fF6
zaL71u+pO8<Xh%z&+W>U>-DQz#kjs_!{CzpI?WJ>I>FU4NV>tg=9;8$)K%+ki?qLkw
z&chk)6F}tWr-r6i_Z`Nl)&w>&Q?uO{SSQC`z%);9V_$kCu<a2_1u;`K(36uZ133OT
zDAP%evL(=w#Y6eec_N;6!Jd3@E_x&3XM^==khF=Gc<Y8W=zez_Eul1oS3J~LZy(^5
z@C9{(xO=NCu;FM4HDZFw0<{mlSw*}}!keal4<q5#6+KVn0bgEC|5cIAG=!Mge+f+f
zzdKx8<G<qhKI69E$@@U~e|fX~k`8Lf4;4xSXB&1Go&Wd#8h=h3iB*K(>jzSC2}}jn
zjSY;%UtIE^J8k?e9<yP7#SZoPhgF7QiP8PnMgO%2r{QQ|G?ot)!NhH|0QbzT0W9<1
zr=Tt&wd7Z?eni<8N5Ihyi36O|5Cl~;i11dXqhCfx49b?;Tx5&vQd6epk<!~$aXB`Q
z7wcm<;4}wAE0+$@S^{M8Um0OL<(jmrib`cw)u#)sarMhWlOLBE5BHU=Q4(m-@00Ug
zSpvm}UhW17f-Y9;caYvFY~Z7WS?_e(hzbbgqXMJp2kYrOKV?2*R1eb{oQ2m+4C;h8
zVX}8ozF<Acs8P<GIa4n`OCdeQ2Vgf#h8<++SGrLF)j<by$u#;d);oih4|l!WlR!HZ
zwib_Pv*u+4fcHIi540hm(_sOYNyn1h%*;Fu0{MG)$sbTsfiPf{P<t3Vt%J^#{P!mN
zIjJeTG;pJzUTnII=2p5AU!=o>9>*zIGx#w-Llbv{eI4OvKO$kT0G~Ux*=fs2=(KSy
zDBTZzd-z$<nmj$~853H|_JWx(*$y?luZ$seJ(OiXrV&|t?20%`{|R0Jd=>x%$L1zZ
zmd)psERTcTV<w|JT^cj_)0i(sJ<Z|nKwbKM7b+hFDXyHR--nJAEWsrscDyIm<lVQ0
z4AsIOohLZ}(`T43x|tkS74HlUQK?}YkNrAoMSlp!;MB|0`_Q-HlDjvaJGRG8aaNWf
z#6+(1YEpMPb%B#b_Xk4*wEG{}vvA31=iK!w1d*6XKd)vL{D%oN-$98s<_qD%ByvgM
zeg%bMP>wbx3m`!DVMh>m_*%TRd!O{BTD@ccq{fy6dg%#Uiz;Ce({q$AJj;dDern7b
z|0_H@dFx=I1clO_YyZCc;6z(yA_i#Qu}IZYMGU1Z8{;7^!bP2a_beSMh2TR2wzr$$
ze!{f+w84Fb)bSa6SEj2Ef|ElUf#V!><o3-co}ViM1AGvY1GuHeCg0^T6SU#;LyCVa
zvkhu8&R`H?afuHPgXdAx)GUTMf>dhu8WhkoXmDUvQ?=vBa2fm)rfBS`atH8eW#+Dp
z>{36{eV471UGuSPiH2?sg#Mp^aubaSH5hCcI$k{5l@Tr91<38+dhg9_cDeKLFum+Q
z6QD+U1l(0L*LMfR|8!yGXDcu{U{$g{nC-2Zpvo7V3SMrIkEy$r!VHmtq3{%<93aNI
z@F*X3Rpt${1~Qx8YT7|0D;-;wG6zfqkK2U$N8K-l`-j4-9w81#BzSOq5{l?o*vElQ
zQ5*EjbKS8G2I;?|yuA9K1<~|EUzDc|E`;hiObk(aHD<wH0LeHTHwc$&%EWG2Swt+T
z{KP>ZN);`waAOcMeis*B^lx|$=43t3M9CkYzk3VF0pRm5X#;W)MLhN%Q?SA@@KCvl
z#6g|eT9EYaJ_S`5)N&8|2np+_F`o(wCCAChecLxA7v%o2-%s(>N>@1NomYvir+)RI
znverPALM&~w#o7I@l<`55mNJh{I$-WkXsdU-zY=-g524ERHR+^j~7U^d%jra4zZMK
ztPm6sa9FfLK-Xma1Yyd+<KXBR9j2~&KwM|Gn-fceG%U4$8Nm=CW=aOYRTWfLR`!CP
zYTkAP<lGI?RCA2D<wtE~!<r2Hzp>I<77-c>=2wbG`5z9Zvuh>sZq9aSc&?HT$0-o^
z$pOf%A@+;7^<Jg)K;7F>sD;#}XDf<bd6RIhf<$r$n8s?VsX@f<@!zvJ{uPP3^r~@1
z%ActkQ8N9>{^ukrnW82Cs~OVax4LLSQ8{pxh`$mLS&1<oYM+a+7PekD9+RSilk!D|
z`AZ)k??b773@I8ruw+~(yujyRLs~bw45XAhfq@KUT!xs@On0VwgoQ;!!mMOYLLQt2
z*C=V#d<l07`~z1R<E?(|fAPS^kI!8axbuCF)gljy%<SgnMWbPcmcoFotccp(jO3mZ
zXE=C~vY6n<W9LD~%`%*G(um$3r5oE~cJuKu?vQ*5-QDKc^FP0HN;dku!}Vk1`^((H
zwqge-Xh5)TusDpQ35IyXx&c)(+L(C=n;hXS+a-_vVHxf7QhE3G;&JV1u<m0&aOnZ*
zDT)y`KNh!LZuy%X_dLYJK{{H`6A)E?=*9tpC`a106pwg$O3+?6sN;hA(J3I1OUU1l
zh=uU8XHP>u_m54e!hT}$c&K4veE!fS4`zwL4?+|+j8(>AXi&_=vGWp04;GH!wm#E4
za;EJS;QV?gx`R5>nMf(BT@Ge_o-!z#SY(4P9N(z9jea$*#UcRKIPThzb4QB@vOaeu
zj)#pRmMUWrJ<L`#o42zwJ|FlOx{%D+jflDV&o0}MWUe7_hV@SrCl?p^f-N!QqoLHq
zTHK)9*HPkIViFkqdKACMDQN{F<3;lM$`FsJ)t-DchG__mZ?*_6ZTSU<yo&q-@d2{w
zbi_HSW?C{`yc*(c-M`%{|7`EQRK6@GW^oJH1Z-Nv&BZi|(+`Xaya%rE-}`#W>P}yQ
zD%gQ9BA5ys9vwzqVEvyUL?`h0@PU`O9C|Q+PK!aD=k&kN^Ys}6$6wq-KL7C{08j6~
zcN3FoSt1e6TLYQDJ~RF27)%*;@3H?Xfdl`bDDn>JEdb8D?05RxPxBDOhO1O`_8#rQ
z(Ib7zmv-Iy7bauv!%UVR?o+1U`?{Nt`WbnAW?-KWo^3Q<Wi{9Wp!M_Elld#-fM-v^
z$klKQdmzzIfQ8nhKLHXKRDSbI@FwJK5mipMXJsUw;7ItL?jW&272`X2u+?%NwTDmR
zajfdY4e4cWBNR-Cp91i&6i^RVpvUY4RTpVZISJtqq5|w?V)F9xGBPp}5+}!Kx3hkx
zV(pt%hY}thgJ>+OpJoUzLdbe}8x$bG!rN$DvMjl?)Z65XzrR0)LWvFe^teOsl1>GK
zd|%;eC4qAT5A=cJTyIB_1E82=^D&$aaGD=iW8tHW9Z3F$p5ciKB>^s<ahC#8AGRL0
z<_q0Cl8S!o=Ak~JdnmJ5{jD$bVb8NN3j1+b0u8gr;l7!6q!efqJN>sFw4t<^?~^*1
zI^67q`8^D-rJky?-Q8-B?Pu6}12N^(bT#~&Y3tt?_S>Bk+kzglv}28**s;FCD^mki
z*ahSB6=ekqlT51a>C;kPb3ah;!H^WKEQ}fFsOAdECPxNaK0=$<x1Fer<*jQ+Uv|>a
zP)HHQfuh?dBqHK7k`Rtft56hMv$C>c*+{cbBdJ{!w|!SwXlR1h=z$swq;NGgH4BSx
z*iO9<0I`QvxZ^}EFmu;KDcj7`Lc5DDWVV6KhTbjXG_2Ioe0#A$_3s_OJ?$*|zxO7a
z-vOi>J-gp@2e|d}*DO`~6VMs3p*c|>`e9p^rLJ%_%l+I*M4QZ!z8Ny-+hWgIn^yg`
z8@7@<`us&_9UU8^Fi3eZ>7<=H07JByyH<y75uKDa?G&OVZ;<#2EHu;ae?NCVwN}&t
ziP^7=K|byZ!e4%;J=wQ|SA&e_!E?8aAv*3#jjkUO0GAl`djW7nC&D*8iTZ?(Va;--
zNdMC~J5?>a@lb!ES4BVlMV=wp3Q3g=s?KAu_)7HOUp56Y%N%XTvdLHK^DmaZrJ4LK
zxB)!H9`Fcu!_-#+IQi_Qv*2FJKtz!4QeR!bt5r50w&FG*VjiFiIh32;0wSFt(Sk5w
zob7Kx^ta&UmV<GBFPe3<&!1+q42H57)WJr_w}=ZXyw5$vNC7iW#O`I{zZ=LHjaG&c
z97oOZO6u8SSL5}BO=bLb-1>HmsFHG+Z~uS2QFnYe9?#vcXQzGXTu1X|ChF;Tf{!Vc
zmxyv2Ms~`jb_`C#%0D7jaYz$>Wr44H?Q)x)9#MhgIvmIthmUh33l!##yjR61l+2N1
zqCLs{&jOI_xB{7bhhwfDzPl5>A@!ZT$(x2cBQ>d0strb^w<gblI$3@)xQ?}}waf_h
z7u*)TtLrm9oSSe4s--?Q>K7r9Nf@6tb0Bl>J?dd<DwMZIb<~4affdQE=uE2O#qF=6
z4+N`KAEN4yM^%ldoolb9rAa-9`Qg4*9R(aRH?Bug-vWCRg25?Mk5dET=0={zQ#1!J
zUudT?K6(IIUfY0I^R0d}=1W@!Fj>hL))&wY{Qh(AxmIGG&yeI?BU?EbO_}(Zb<608
z9$BVDU$|@b+4a1Ivx`R=Oh(IxL$9RSsn=LK`Xb*K3GPQ!_tMcZ9VPXgMW=O<tu(|B
zmcXV>5QDHYp$FY$vh$(Xebn*#@YpYmLc4^S;t&uhWV%G>GqLh}og)3c4r^d~cQPfW
z|1Z2Mw_ZoIgsOHMW{00w^U2Hq!L7#Kpw1g8<4MTHUA}*)X?bS!v-(&D_ZDhs{kYrq
zuyC=)WW_9}z1wH;if{Mh2M>DkA4rF82s{%^5aKyB+#j*}qws|XwHCoopl;^_Jdgw6
zSu;Z$3NZf?HkgujUc;L#w+_?0b8n7gR%={7AuZ_ls`tN>(eBzYk-f-8AyV*W;9Cj$
z`}!m=f8j3TU8`%U3dL)<Bd~y-F<4b9fDP2;WA-KEEoAz*yU5D{0oaTwM3p07H>qoe
z37u(tdSrd;Ao69i{Y_zf!e5pC&_vmIiNf5jRrI#;w4;A>l})%-w9Lu2uOj|{zrfaP
zWQ`{ZM)W@`cLlAAb8BET_`+i<w2e>!Hw)4HFE^WG6S*Wo$D{8urOTS8!DqiHUenE~
z<hF}NOqMD3X*)Cji6)lvxfh&N`>S@;d;5z?;(7Z&!t6wUex`pW>Vp}>^lkf)^5_Q3
zr*(pI(n+IhNG)JquYKqx-IvWQ+jaS|R0jc};#zI*gOq|w9@D-UnJf2Y{Os^8AX#>a
z8NsWVjt*<maNk8yzt>P{<HUZNz}7;V<Ep=m^<1`xG+!+p$#eNYL)2o0q;}>V-h8I)
z!DA4c7!N%|qutI!<`><1w$jlnLLs=Y$HV23>V`W4T7+pJ<e#k$iLY~|Z_j*#gaJW8
zCBG>zxZwO~NR?B8WM-KUg<YTM^~Z53vZ2ufnsoV1SM<jmz{CDkOePKp$T-o`Bfyk4
z4QvbX=XSlRFi11iyhDGqp{jQkY0b`T5rXJeiPKf%XPo~N$;z-hc+<V`d8utjR&mQ=
zv_^SNf3(#0HU6oJUf{c-d4DHy_}NL0hB(>%<+A>PH`}yzBWF~O^Apd&=;ZGn)C^XQ
zkgXDqD{nn>k^z$By)uU3j-otWu`CtciRYfPd8J4pZ*w7)Y`vD@oA{n*LYYfu?HZGa
zVn=BwhXG>i`aote(ucx6Mu&?Ht1Xr`NkkKO15P==wcB!U%r&y3N-Xjxgh8e_X1`u-
zoa9rHyiDk?=xYL6&LMj5Mvf_Ja^=tyGN9Ve8M^YF&}ng9cat@l`$zAC9qDvptf1qc
zIi^f**&w`5EPHh4;0lSI7s@A;BF^~jn)z;PB3qSCNBU62Gx&&S;KAwlJN?{1;t~v0
z?+%)-TLi2)N8k|&<yl*WkI4oeH2!&n#?R!^$+e|lijI$WWLF-0cRxxaY?aa<gioxB
zR-@4!e=&x&pWSTc+sm$qM^t}(#rRigjkV+7Aw8j&ve$;PZ9<LhU0~E-n_Y+Qfo$}W
zOUL+s?&ZGH;HqGyvf+i<5{U}lX!o=gZLTmCX9!*lKhQ5}7*=$7*2(;{YTX(?(oyJ>
z`;TNldB1lwnWI`Q<&ECO5<dGx*Q@=Sbt2>UsRlnNiLqPQ8RLdW_p&qEZfxt~Q=PRB
zx6)-Dm|zS&NSP_w3MGJQA5VC`wMRs5x1b5%*+!W#_sN%M-gGcf1$~Ctmm#Jax!+!s
z>Ml+QO2{{i8V`M}V4(7d1Z{tpK)q*}f24S*c3o?6k@UG`sl&h9R}ox@p;eEqXSVP>
z2&XmNI<KJA_2#et99J4WVIh26K;iSf!b8@k7x^^*(V#cj2r5Jy3+(#!#_%ck2L7jO
z`H90+-B_UY9P3++gySb;D>}CM`B3!iXd4uP!S8M3)edc_G+xN9($Ihijy8gZ>FrS$
zNC@Wx8}eZo6mpmla(1P`AKu5o{YjhZ#H@T{Mfv&Pl0j(S6Zg2el&V0ZB#$v^b6GMe
zxjlpL^j}}{!xHhhl!GdB#|limV5I8xKJz~-xb};SWABKCWEAt?AE;?*&Op=znF9ne
zcrsW~=HWyf+zm%D8<}dm)Zc@*y}7X=<^ODssQ|#UG7=%;M2OjwYpG!0Bj<8k1}s;w
zF~h59AjE13XZuD^eD}<icZ9zJ?uY&;<9uI#kRmIYY6!iLj6(dt0Pdja#)hc!iVEzf
z*QP&#@0-xpj{Q5n8UM184<MXwkN{=7;4_4~1)F-7K-;ZMxRxwZcSv9haH{%R?q>Ml
zs3r-0xZPRF)IGb`*KT^#KJL5F^yJZ_N7$X51!DvpvBj@mX^+v;(p%1;0en}<lMY|?
z4HEU+GC&DYq#fgLpw}M;;fS4)=+FzBo0}hXMg6T-451+5B>(S970h2M2I7{Dyz`$y
z8I(*_3!+b1h9?BlQ7N#eX{7}5;E*aM2jp!EWKtgkxS;mhpGwv_Lcf`XWzfkp4sbe9
z_OIiE+MOQi3&Hmi?0s@nxnrVt0e575f}L1%2(l7}9WiKZk$J|T3np%GF05O&z%_a#
zZw244bK_|(a3`@Fd=3mFKfh<zuj9ejFr*qP*mlYBC}V?B_Ft2VPeaOtk(ydHXeRjA
zykL3-vGwKh8+1e#=H@5UjlI9TGBpTiR8pY^7^YUVIviBvr>Aht+EOX3=f@jMA<it-
z9_$7lc>2bij?@Q@k*eELopDsx2tjzkc7}icel6AiD}(Oe6ay&opJtPPrG~#-IR5VS
zK-eRjfcT((w^i)Uf7yPiTQ2_D>p>9N|88C3&4%R!qr>9(fA$Ce|Mv2Ie{x*Y4;`o2
z?s#iUx9{3*KZB!Nzj|;Vc~NOcQeI87Z7==(Y&R>8xc;~`FZ*fg2eqT`pL)%)=@Kc#
zUir2Pjr9q^QTpp*W>@Je>FM>>>nbZ9s#4-D=6X{bb(1hyiCX=8!Fy-Djijr~ncrr!
zZ5L_$PEsdZ3Db(7x01+8_&En{kRa|fz!c;cFq0>8?rkMVwEFt=^mMjBWfvEhiHV7u
zH*XrUttOT^@GuBcoqh4W^73-n^<Ls@XkfUks;UC#+73r;RMc4)7s=LyU#{3_wz+k;
z-3DvI+V2(9t2NaBh`{M9$UH~*g4^2L`T6<7LqaZ?n}du?OGwx)C6)W;P1qQffgu)T
zdFzZ1NJ=8tjE;?QDf)Djmml4;B{Cvn-;h*$dpkA<=82Gq1qo_m;Ks4?UULru?%ulx
zw|{dx2M0%BQcBA0s0`wq-`|Z)<i78rkVlG(eXOltkmIy%;l<<MxpwW^`=g*lh^=A|
zq&#`Hth;{wI!=x)<SiW?8p>)3;&5lfp@{9qzkmP!mal|E{Z?$~)8-2AA=O|nN=k|V
z9o_Z&_Zc6mY$1`jAF3d!=6kN6sG%cv3W$nglc}LT4bgFaVdN)kdH;7KZ*Ol84-a$m
zguJ}G(9q8?Rho;RIePRa9O?xHp01O9^P*JM!f#!j{fe-hTw!LW?ypA7Zhd`Fz<@(u
zP>`09k&&`;8Io2+GAx7G9*~lruITyuWpFU_K^8P*#0HX7#e7ak$d+H8*Kaa%RP)xM
zgtUDA?C$24)W^3O){A`y4miR6r;`j_8y|?hs6z1-6cW<&-Ah{X);f9U5Y1+!aLw~8
za4(Y{YVb9wLJP!B!mUh0-Tvgbmf!gPn#~UlMOrVVCnujcz8dfOah`LEH_pw?C7rOa
zusD49x`!v3e9cOL`negxmGPH|n3x#oo#tjI?3OTlotvHg3xt|@#AP_X!HtH6g&DF@
zX~Kqd9{b;#BH_o590AjbuY@!Be96`pd!a0`3Cq-!dOkYZzx){SYW*^moFn{<{uR$6
z{}s>W{TK9&jg5VLe7wDjRCwW`c64<;c;LW5{vM+jX=!!U)!0th(A1Qf^Y`b~tDgKl
zjM(+L@BC$u&GtrjG(*F}x?m{;6{CFN%9Zia(dyvMoL1J>h&wRgh%<!ySWnMe=OZ#7
z+Q-vaY+ZfV)CbY3&~E6EE(^ojfI-z-E(9XrFuo-Xyh(400Ee}$ZBRhK9F#SQuUraV
zm8$aW5O+Rd9wPXYr-sJZSXf}RO-@VGd?qg@W`|2qLgM#>={7Yr9i=mLb8}k)^|kY1
z!21-Z>-BKL`%J8Ch~ZlOU{!N3J3oBKZ99XjzK@TCJ=%w@9nYUX2b-L%x1F8c3;Snc
zmOR;*m>z|OnqRpBe>QH$`Ud%gk<l_#Y6l~>wP4UKt*i`8OzNF^WKNzv3$C~c-~i!D
z74nrsf`c8wFJto+$`-cEw;HllhGBOSNd211%1e+lI5{~bBqX3nq7rw2Z^Lf&ytMny
zg`E?fy+afAJ@Y3B)gF^BVm(MJKGr+1&NntU$9EOuE2mzcX6NFnKWUopw6f&>`g9>!
zdaS85>)z9_{GS%W{@~}Qg;=qe!k@`f^;PWAkl3D?kx^#$6Qh)sm6c9bTgxhHjAO9L
z>gE5{$hC$;owwmhXHi&bO=&emOS=(8aw_AvPB~PDF%Bz94azV`W4OGTS|xJmAch<>
zql1*g#=EQ(O=4qH4w2J@w2=_K_rHDLPw$tVFLPZO|KI#h&;2~lecwm0qe8;M@Bvp>
z*9{8!>oEq}`><(F-CQmyIc6EwNOCZe3#t*1$BV4W%~g@bABH%mF@LYGmwATqRYn~$
zascD<4Y<e?)6-c-Q9C>C4quLs{~fp84)Rd*B^5ay4rD`$@AAaUmoFpF2U=q=7_R;3
zmCn!4^9aT5tJHjz&#&<4h-vk1Vx4rALvH`}?AbmBqvr12)RFtSPM)6j)RXtQAQUWT
zu~;a;FI@cIIl+qW*f?-pc($(r4ne+NUN@mD6RsNBcF`u!sYsOq(z`Iw+dLrPds!G2
z1eEFQHr7c!y=*?L<IK}4lXKXH<RpE!e{i3*yYAmF_Y6wLcdsh?hlcc6Vi$LJ_uab*
zxpjGY`Eh#YxGJu|!9h@To%=Z+##JHx|Juu!Is1Fu)JF1PdQG5kyPlppRDqP$N5so9
zf_G<z{yT!;AsKg7xkoUhLvBy^@Q{*{LY0<EfebZ?N_ky36%TfIT*Bj~rnuNxm>-sb
zRfU}cKnv5TaR?ycM%Y)kuYk`dd{l%&Ve^2Cat@9bvVRI{pPC(aZw`QiP04{)*)%sA
zOe<=Aimzaq@zHSUKj%Z_mAlm!Nn2e#T2xx<;NVbNQlhJ;cklM?$c4`pwrbe3!JxT^
zhYwX6v}=EPiiwD1v#;uh#0DG<40ONcWA5g5$wgzJZoU|_mi-#3kdE|MCN1O$1V8BO
ze|mApf6tyhOeWJKy)I28vZtW_*=mqlal2X5@WnX!=3M_4(`pA|8Rj$$4X^I1)k3Km
zMi+06&p?YI7K_nBOxwl~+2R7ggtS1b%tB*H7+t;WM?s($G=|MhXpa=CDU!*|7q|V;
zL<03AZX_tNeMeGSS{O!yW)l?MAqTIB4%1hPb;|DD1A7O6xuvIv14)v>Hpg&W|29;*
zW$w@I=N}l?EQtT|ue#Cya=dhH={X77dySRV(x>Lfe9hpS5?RoTCg$wS3_&W#4Ov%b
zHuaMQmEZ|VON0M@!$m{Mw#J{<K{`=T%;j<$*uFZ4nzK2=aw#&cqZYfDkl8(Xf+2{?
zZb&G$_4W2@WkiMt&{r0xOUC=)U*Kj%xHDl-D6d;87J*urFbrNCd92yUteVU{f8Zru
zsV9shV6)^~&K$7rJ*FJ;(be0VKl>Bc)RYR%!S#>dU6Z_15MX%9E4!_7S!I~d`uZ{<
z7jSrs{F$VrB;g00L{xy{Mm)_0nq0o)7F9WGCUYF^*>f9q<$P!jO^itM?WlkBizEaU
zs;iImN%WLg89W$UpuHDw$zEHUT>H|rZ&Xu|$${X;9McwCNJKX!T|5K>U9YHk7XsCt
zI|&Wkb59Qs+s==*i|pQ#A<#;ibv;B8kB(xlHs_%K+h#I-L5kcp75i><^rDq2I2PEx
zhCC%SmE=||!I3?7?3mcWLDbx=O7ZviAGc{!+Q<xNoqRcex9|BrQ%%p!+<V+-7Y@Ge
z>)T7kB9ncUz)331U(J-@dciu3DzBs@=>9R)hS&J;;pr>4LmPowrhANM-h6XN?t|03
z!-Q9!iv}{Z+WK>F?LvP<sM)&I%&ZPx9@S{MLrzlM0H+?Jx(DwuD93tl?(FIv3OjJR
zD=S#uRBqU(5ki#vLhoQnDJd)~?sfVtpZJ4YnTQ?1uVZc1)@%DvX*BYQu4BOnBy&(l
z-MDcB4+6l!b&MVx<KV%=-rg6|(%QQ+tK%~E@-qxr8uK5NC5@pp@?$FCejYcFv$3*D
zNKBMo$GU|XV#2o5&dv^{Kb%Vr)ZWN0ot@jDo^RR^w_LBAIlXZrcv^h}F46^QUdj*0
zD-1O>G_<wfBiI&OL`BUtHd;Yuv3gZo9`NeK#01jMLYkqG5lo1xj2E3>!)7-UN&|v^
zb%p%RH#!LqA45;{=Y!}f@k%o_H8l`U`pjObo(h^C$AkPQK5vOp&0ft*q1)u$&d%;d
zTS$Ui+uk0AG~44qJs03KIazMDz<o`}0BP8s#hOA<5zR}czkk6gy|tv$um7Ny(CFe7
z_L{>a-v5T%B*2%i=!^6xn1sa7N5QEi-orpZCf=)1-@x1dqZ^=~7<+onDI?s>^d1%_
z4Q>Uu_N^hstR6l=M}yDgI8X&5(o`C<dN&#^G9uzdXXnT08Jwa`n>K;$cCtece51|k
z>M&%rzqCE?ogW%;-(Eu%V&V&Aqfv7oj|oyvo;-<*eMzh_oji-g^zq}zkXHo2cfdZV
zL?Fo23%Zt>Ne3H+A&JiG5@GRT(qUTpQ8y^!t*swH%>hgc*3k*d<Hkn)h`)YjC|pTT
zKj7gp+TZ^{7?P5Jj&XH$HP(Wl5Iy(<`N&EFzu5tB0HEVcQz=kSLPf&ia441R_dX1T
z_3PGIQel6&5EQg##R}ydsHy(`Adv+OXF}?Td>Ftc)yA)5)!V$hJlHX|;XERLIEo|Z
z>w5>31^8VQKW%GiNdgjrSaNi<r2AS@lH>mU?Oj6_78c@>5p5GfM^{@5YGhSK#f$p-
zH=M~QP!}!2f@O!pzsLL3aOZS1TsNWX-bCR$9`^D|%F4=u^gSbkE&k*CsVj*Y<9x#X
zl|2U{B=j^@bFU^Qf?fOMS1iFshibh^BswIjkRVCP--jPUOBH58?gFYi8eg=pJB@%5
z2Eru}g|m}Wa#j|@#YOdk6^%xNsX$L>XYpm7ZQIT#fY_IR>y3)#xr?Fy_At%T4M=Wy
z7!67m^<rk`6VW~J%U5Bmm^yTJcG`mvF#c*6g)o|(y^a`)GLGbu*iWC>dU|^K`?knK
ziV_0LRh&L7UhySh+=Rx~Rwv(?V&hy5^idt`?RW0jVH7=E*0A<7SW<-wOG#QWy~PHk
zn0yqG(6-Pr(Ug~@$VtY_@u(^xP(YjW9q(6E;O-09>J9P;I1pH9gqIy{PIS5*72_VA
z$%Wh7R9AQpk4h<W>6}XYhz%>d&(7`%XU-G!Z%9l?EvhmrzQ!?|ykzUEI{qSvoQoQc
zZol+P0^kI+(Yk8Co}5WekX*IO^@p*sG3xcwo;F4oet|};ESifKkrZ|)W)x?bFCs}1
z6$R2|I3AG|6dDkYAEhA55-F(L9kpG%+<x`-b9Y}a3&4Zd5xPANve=(%n(d<T++7#1
z5_;ACAJf6z>1t}aaeC>I&~fa$FT_EO^a%)v02htH=)t2wCxIPvp_=xiZCYB6&w0*q
zk-EBCT5Om&T3ViN-vyAhc=2MO%5s1n!gRLEC*#f)%7x*YX!JUSgc^GCx0aS*lx_HY
zK6(*ww}?No)%H;Rlfl75>(-@vuJZ{DypocF&PgjP*{KN2=j-P;0Fo9;Mlb93dRDXd
zP?58K83+W?ZTU0~=cEY003hjj#Z|?~l-DC8)>IVF9KTyywA<%a#zNN}=gl~h>gtwT
z6)Y_+r>kWK$LK*W5~SfF;`?>uIBv=T`p5J0L1XnpQHk&~sE*KSD{!XU*(J_uSzv2Z
zU7Vb9v|oa*m2oQxz)xCQI!egDe?KDugo@|)O3{oABzFA7{?GIC$jA{j(Dy+L>9Ouc
zlT(Ju%F3FWs6I5+)zyha=MvC+{&~9_6pWx?xeTdfW@ciGB4tLmX!u#K>sh1FVHsIO
z$g!T9nzyGn8iZOsS1iMnm6e5pxD#|j_B&EGgV;uFcR8M_uI?lnX#j4vM|5>`esXXy
ziJUy_<kX5Z$0e7ILId>4LEz04PvdaJ#E^<yBEg<a3^C#rmXz4OZF>%Q9_8BC+}Nm`
zBa8!sVv=K4X{-Vx`tDSxA`oB@T;ffYk>~<vwz55BWOwN5Hsc0>u7S{Raz3pH3VK&r
zS&0j~D2uX`^sP)V%ErAMQ)L-_ef>$pr^qg_F@W!hJ=PUt(^U~RMq{z=QYk1U#&A~*
zVJSij1cE1RZ6AJ}?#5T(6zI*)&X$*zfzT%Cs5*<<$)^A1!4{TZBgsFBD2O!wI3Rsl
X?jTmpRW9M3AmWs@xjj|5*DLlvT_1t=

literal 0
HcmV?d00001

diff --git a/doc/shared/figs/arkode/v98_erk_stab_region.png b/doc/shared/figs/arkode/v98_erk_stab_region.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfbf657c42f16d19e58b8bfa6a0d27193c3c5329
GIT binary patch
literal 24583
zcmdSBc{r7A+dh1ufd;Jz4KkD{bBfHgQkg<1B|{X2GS73RqDf^6izqS_%8;3oj2S{C
z^OPw=D6_tObwBU(KEL<(`?hcUw(a}pb8q+7VqNRH&g;C6^Emcn-}iF`XlWeZxNiG8
zf*>}kC@X0b1f2&#&_1N6#b1)n%^b!*47SQ=9SDMriTXdyrKb%zidgHYa^mRP!F4;B
z#Cgr0yG`OxJdQ`tIO^D#JGz+In-M1t>#83n3v%gRHsd;B;&@rl#@@<7kW0n-g0SqF
zj;%O;7xnlf_GTuI7B<#gx)xW>2(d##nim{}#6-moaP2=JEq*}yfaJF$$1Mqhi%?NI
ztm{ho(c$LF?9}_`r)I>hGpg@X+4W;~tq<POYF}wTx^5GR)S7C4hQ=*s%ii_Z*Hy2}
z8yR7>r5Uh2D`;Q6X|u~_gK_&Us|58vS8-q3yl&<tSG<slx6g(RM;?E_d?5T&|1ZzU
z`io-W^E?NliWYOr`fVjwVVp4$^eOA{FL7hH9i~OmkVgZ*B;GA$z&}opBx!JnFcTks
zX*$}A5BTOOQ}BxxTL3fu8QJy!?T1p8F_@b6JSR2!&D*x!b9iT+?K4%$*U;zh@BjYB
z+OP$o72!>^8(ns;l5rVdT3MWkFaI^#@@IL%C+(`6r``1T8tSi0({&9h!hS=|Dd&ET
ze901Gk){7WKyTSN`8ctB^wgZF6gy)|wQqN>+w}Jztr>bL`dL1IR!U09+<vWByt}Wh
z<?#6N#{JjGui?hQH{~2bdPUyLd6^GLyLfqD806Z=ciNmh`RI#f2*<gU=Ey@fp??R}
zoiLf5SSD)UUlAz3pzJPdTI#<^VM(iP$~Eg^<>N3T_u&>}pHsr^uT4HMYszl+E7XjZ
zb^Eij+|W1Pk)IG3mt%PK$JaLsOOrQdB=_wbzR6}pPi`gGe7wtcsg{y!UK24<{HN1A
zgMs^#xx<HB8$Evi2#<)+Pth0W%$_d(vuyMIQ@D|y$3)@m_CwY`oU*)^7Yy^AYd)+K
zI`@_$>y|$FYxk~Q&z?UYZAt6OcbPcO>DBZ>*vM@lq&7-M!1z=&ne3n4<=y7AKK9**
z_){O$o{gvK^?bbc+HSZZp7%tAtK>HKnW0#NV$G-WQ)(~u(uAv12i6CXN-VQN2dK~F
zU$<{sN<ZItf9rnoXs_#|pr8v9k%o0+8+S;oN+2A*e|qGi|NPj-?9u-3-}$TG+H@6l
z2MfjhXv<EsAE?@6c-Qp81+PE)-|L<lH#i52iHUi(M%>m`p`->GwP>oU^6%ZdcUb7D
z_d?QCe9wp50$q{O(c^t#Bu@_El<h`Lznlu!9Xe>@_lV8d^XFvG2mP=Tz0I39%el`y
z<XCKI{ywoF8i&|W%Q7STpH9&)oUWD8HdM<nueq+{yRy8P@Ztq48{2wrOh>lY;_u&M
zZ89ktS6ap9?VcaI&&14pL+9<osgm^~21TA{-LGWnKXo73$6f04XVG}ytNy{k;>nWr
z#~-jWbaQaJc3&f`Yg`2MQeT~V*{rbgb5ojC(M*FHr_a)xCC8t=AL-U?(8{>1sP*%%
zlz~BxZI8mA`M?=TX=(R`nPIPmnIzpL?UN@@9y?a{`T23gX8cu#D5Yb^R%VO;oU-xS
zs_pFjc4_V-oACw>wLI;QcUUkZ!yy8Cs+tPRGdeA$^TP>Gs{)_;tju?_2w%jb*LI6@
zp6C=3XXli(jX}gWl>GSdBjZwC^Q*Isqs`LJKN6Qz&8(VVJrc3H+V=M9*VnPd1L_(Y
z)*X3SjV1b7mLZud{+oBleOO+e?W%jSf472yvA(>^xItRLG=fyi`%b)C*zeJnx-MF}
z*n6ehgny5B2q<W%s&1FK@?<6l>!kzn)>*iiW7n5zkh@EWBIn_Jn)(yE6pE#CdF)$O
zLtlUY#o^?IfiUCouW$OWCg<np*KXn{a2h?0w>iD%dYs3;ZQOn^(e&dTjw*+lq0gJ-
z=eQ0Wn8upA+W6vxrDbyZ`Xo{>7Q8)O&_~m7Ighu4n}+g=S~TrOnv(9_+b}%*koyQ_
z-6STiLV$129=ZAcpy>78EeSzm7+>Y%J>`L%SQs|*Qv;FWR?TrLK}a_(sfOo_1{Wua
zpGsVfn30r_I6eQ;>hrUs)(Y20v+b7Ve)_CTKi#%%8%CRQE}KK_qVnu`N7TCMYLQ~k
z$@goK8&;5_&b_@d-=w2ixHMJ0$Lm<}gCZ-pxU|c4(Q<BXZX(4?Q@IX<1`0Pz%jvki
zSlY5}!omd4rYlL0T`)C$q4`u;WOhJiR{uK=OgF0zwN?|mSV5AqOFi?(w3Z@Or8@ik
zcp!(YtCsr}iO98#>_aoZkKAUAPe@Svm_Jdp7;(s^Gu1FZ_Q-AiVr}E9(|HbDzN>8)
z2b620<pdNS+`k{PxKDmz==qyBZ|t>Xyq9uB0x~qBq@6~Z><m}RcGy$|Vp=AgWKyGD
zdl`yXcrJJ3{mQ757m#}p7|1Dh(SK&{Tb9+)qenTUA1NT~-enUBeVVGDH4=U)`lnf7
z>RMAIIGqHIjyD&M8yFa5TX&QNavH~yS96z^-QO`-8x<KIK3{)i6Ru~0*|hekTCkrf
zG}1S`kQX=@Jvm>lGv`)FR<6%G%Xv86yk`4+OtwX1nR$lWnX|2j%fBqmPse{TH8oY$
z=fk6Eb*N1`SJx1)W+>BExHz6)B^F%Bnb4xieM!8h;ZSvtZRXXs)868IeB~cnPTkQQ
zw3S@9Zr#G{#KhYx<{9%T*`1GDkeqKUX&V?&>~~`pLyWbZ=^gkRBE+qpJ$pv^EoRj$
zIPe0~GobG_UCOLkQ7rzkaQT_1!b0l6{K9Bj$iPYSA#G0j0ll6$B(xRpL8Iyd#O-5M
z(~MRQ&&k7XHFfff>hmL|0n8!BX^k8qU2hwY&*78H{O9)7UVF#-?gom`-H*Fc*jZRk
zojJ2tB<wilj9_SQuW4P|&+`aPd$*D1l+nc<a*pXUR$c>vDJ1gzSxV<ryF*>2W{r7<
zaYs!QqmsLOUgI^Z`k41$Ug{ZpjEN@<*xA`3I|Mbp@RVIJ5=n`doMrc3ab55zB=6<2
zyLA_lqA?$I_T}l6lh2QN{cgQv?Q?T6L^9>H6`4%NB8WU_@l0JGL4t>zk@;eZ_M$}O
zfU$%|aB<@Ghmt!PZ@2qhl8CIMNbR;6`xJg)DgujkdZ{C{w^54yLA0EQ``&1hX;tvP
zh6pot${v<V%PgZjM-}}p^Nf&#$?6(JiDB=|z)*fD9%J)x<i5pglY8tIR-zWQ%{SfL
zcEJ2zfjL%7h{(tC@@f$wqk=Q@kEia5N7mFt9@11+ei(KprP-!vzHByq-h**f0TI1V
zfXiccybu}8X|#FYriW8!g0H8${6Nj?U)&L5XItvOx!RB-<B}TpD@5VOdRD=QVSGG1
z!84&bIg;~lKAO(g`K<J{lsih3tZ&y;Di~<o+QgaK9z1cpE3I_6FL!WqusmZ+i+~?3
z)1|G$^|3eFI6r^=`t|UQHD+dJl~&_e!?^#dym*x$-ju>4jH@n`-D@rM$hK$GOEVg4
zN(x#^MH*JA4q@ZsR{D~B>d=+1=QCRE?d`Fa_(W_P;sOei()l!u<v$j<P50}C_#8=y
zkFTs|6Fk#Be^=;Zg3j*<-2C)lU3Tl0)vH%mCDUiLdj9yjzq~LY1C_1HaPhI^O%h57
zird0?{zOA#V@SwGwJ_n3X5&1^B>Q4i;(daGpK5BHlI^vO-g{94cr!WEqLEil&I|QE
ztzfF^P?x99Z#uiV$(}5$76kDrBOhelhBu-72FnYzUi&g`msE^>C)3~kX#Z>Eltpg3
zzTw&I!JKTCXUFbux8EQ9(YmuBcfxFXmYv>}rXWJ%sy^=Y=H28|FTIf&i>}1-$T<Ia
zn0-3e-fUp@M@Y+?K@F#eRlktT3W2;3xW&{ZJWw4bGMl&l?#Es=ZI@p6pJxkPe<CkO
zSqeOV{(P_|(q*#yu-U}*p`pueGTuAA(!x&r)XCj`st_HYW5m7Xq2vc;YwOg(&G~)h
zfqJRNd2Tm@@1L!#tZX1BtbZuBBTCBQ*u0Ay3hL;&rpTR1IXP#F76b;<9|<T^Os}1b
zpL49zmhu{_QrOVx+P4wY+nBVoxx7^BLfMA-cvLL6`NWgY<8A^jgs}08G)hFCXmuR;
zwQl@3LOB6INyBDC#WmXna(|U;fN@u@h}m!T`3&CMHfBF>ZP=!*{gW~xpYJ%ltJo2D
z!CC!%LW(p=>p5L>$jWf<%dAjg!x3kSH`XL&S47JRsYeMZr123|Ihz#0fW}kzw~JHc
z)l_UO>SM0m*3@N6pyRH4(SMLGto>!VdB#2~8lUA~dKS6H$Gd(BahM-xlBakuD)`9K
zITey0K9c-!x5hkD!N)s6BdT4Z$lqg;;&y@(CSvS8nv#tm9Q=0t_^v-3_IZSqQ=R3P
z<Pa;G>k^!UsEPe7sIbVK8Wc%xk!>jOEjC$Oo@%r*G$fh!-Pj~=yFgnVEg7=0eTs{R
zyR<&`Nc_#J7lo*&dtG9eHpUiQU-X_atag~2G!bX?`*5LmW>jYO%_ok%*{yG{p1b|Q
zB%_u8R5Fi<V+4ox*#ZtZciDvQZ=?ye)+M>Mv_^#44~OONh!7zWb!FwPKz6_-!8JLk
zfWPf@G=k;)1zD>RG0Xf<#2Cv;OLd)lGL1I{G@8EIz$tH#+VguM6tOwKLpqAl&%Rf4
zz<%Dw@b-t;AGCI3-^49qjgK4mdi2h?k4r5r{S^H8YhA4Gn~|P9yLR;gGkE^|$YujX
zglGNg6>uFDmZ%w-0Dh^cs1#ip>8}hLYs+?7Q2WMq`sEjkBK3i>wKse|M4NoLwT$K@
zjMr{y^24Tlr_tZ@gHNl|7`Gp+NK2WY8xB6S&u;tmY1F{nRAbiDFHcF;>TYwtICXF}
z*?(%FTEN&|hMd@R+?d|v&6)Pjg*~s=mYh0UH2t{h$9rEIIuubpFA8vel&sqnW}BLx
zXDrdqP|Qzgvubku9<9o9Eefs)b5Q(3D_QyJ6J`H}TQic}+&%BE(am<aJk9+1;zT5e
zjI%oZek3XM47m^7f2+Fvi46`8PFMdh|M@uQy!h$D6Oj^GmS6H5ha0}vMBXHQ{P+<m
zq_V2&TalNCO3*5oq58w)R*#~hI*Pm&F%5c2+VNZBv-DFMT85I13f-qJWPjNhFTYR}
zTs4}@huNK(b-zhE+`B>N(W6IEXyn>+r@y|rV2qfZ?ea0!j}8wX?qfCb`gKammWPKY
zE-tPq@g&+8Q=qG<=JxcqF%7l;NaOX~yLRpJT;4#VjYJn0$CD)Gy1ejfu<mJ?41>63
zQ)1lN`>MTt2|;B&s)11>ba(FD=`T+$j-Q&E3f81!so%YO_kgLS*Qyo{k7pZ>8wY#(
z(|K?ige=I+YMF0J)=g?C^l))wYTu(4y7y9$-Nt%69N|-8!iK8fo{x6)(EZxY{E2pN
zLao=raKZq^vCC`L>BrZTs+0!H72eu{0@-<1CG!j^aq%x*=^;l|Rqq6AWnXRkJ=Yhg
z=40~%a5&1P^JM2%9gCs*ScDLojK|U6`}>3UIEI#vp4hMIHAD9?jZ@PnO^<#vPpz#T
zdV}lNuP^)>%`a+7HI$Ls6FjpvQD9)=URu$DYP8@Oa8GpC83O~)nW2+z66X0Gsq7j(
z2ZzKZwY9b5VlHH~@@i1_^4)m+ecjJ@<(hiM-d^)7nn+Totq<oGIZ6gErv_ihzDYt`
z`7_(k8Y@;kbwu86DsE~|Lc(KhPOmyzS1yD3Ur}pIV-DZwFAa~5PNn!YWPN{ypqX-g
z?$YIzy~WAHY|A9AYtHT)Q?e(cJNKk~U#!_FzchJ7Do1wu(}C0=$%U*e?NK0nJnaEH
z8w(4Iq@<)hhV925umeT!(|oz_W-a>Fy`#UISl1;yoluBgF-jxtx^DP%RSLU|^DC5C
z)bw-d7XxJ9r;~Pxh)jIgq!9d+|6F<S^0a|XVA89+AfHQHSXkVmk`3u&f4n*5@LfGO
z>9b|lg81h=5m}#gDvQ6z1{jq3+q|FDd~fL3R2HV0Kv{PEmTA$FW*o-xRNl)SYkEpe
zd(+y1p*u@UOUsM1YJpuof4p)f67L0H_|(|Y(0||}psV&`Oi((z*CtvIF3KErUK%wO
zga%uJ_%y3j5`i95RT9zmAoPEgqA}biWq&cI>O23F)t8a6m(ED3ezVRNm^gK^VT0tJ
zef<2un4wFVju}M)J7rxb1zbGcCgy(j4RGG4E{dmrmJ)7<7<<o~4LEL;l9IxbDYES$
zpItW*rp@kUESyp_JzCz_HOfN1*}PL_Gml2&=JL`~z+DM>`OYNGz;wE~Hk;zH8P=q}
zf~HmjsV&*SAE>N<W*Rl4c)bNINViDO09KCN+F+N*5Nq#m8gq=%ZDosC?jDV1^hBJ+
zZQ7oB01*2GWPAJiZZqzbzFf~WPy$k-a#Y~BE+A@Wp~oT1rV5J$4s&0T;h-wHS)jq^
zuPpD}y{o37fo{+~LRoV>V4~&otN{m~nG}gJaQE${<ytS1jJ3Ou-6IJHPamrkHZFQa
z;ZH<%<@B2Q45)w_C~f{}>+t$8KGt9HS5~6wXheM1YWVESvS>7ae|<He+vUa=_Y1V7
zbV34ykEj=DJU_>jcHzs%!s0`6pSGq^LdAJ`k8vpKG@J{L)uBI`?>yGtZcrEh%a+S?
z-)qlpGowRlvIhFga{q?I{(!^l6H13qcNKYs*hsmIQ`(HaHXI#6)8ml8*^K2;Td4&#
z6OZK~7OS>wO)MRr*Qp53m{#_Dx+87N)7l=}E1d<cNBCy9i(BsHBfEIC4SoH3W+2$r
zOohUD`^Z@-p1XJMXg|mbOX~(;sT;7<4yEgvd?LBLTub*@5)m_&$p*ON$Xnt3<7-c@
zUO;ldf$r6l>Qar#=dfP9uhv_bv->1yhpiU1`wklAz(d*3uWn~cE`Ma<<eZRlT*GfC
zy(G23v?;7v`=6S>oM*(X1SoXW#H0sV;;F~DRJM+AOUk*HvEb_4n>fA4a|bD@v{Oed
zI}6;Z!jey?EVN#FnqpL_Z`3Pcr=QY{yn`~f@1@@2%y8d9A>|k*YFDMxx$5I^v%FF9
zIUj|nezY`LDJ~27vb?<J0E(#xlH=mz_x*Wg^CkJqn+xTh1=aEPG90OM!^6W>UB?(0
z7_i{0^rZ(_+Gn3n<jSV1dU3ILG9`R?Iw8vy(AZ<U_uRvqB%E^gHMKv!wQ<LH_rTD^
z#6(n>ssl2~!IE_6h%`_b&p)kA2j~qk6?PnW)vYl*_fw5vPU!1Y9ajzER|(r$XJePA
z6F*qL?Oo~c<or;zYF=jOc)P=#o65|n`%SI$_U#@<yV%<c+#Jdu>_oSm*)}#%6{4oD
zF8C`)IlrR_D`m$aYuU+nbb)fepBO(sJv}{r;J|?~XAf|VUv|(A=NEd+Ru%t2dY!A4
znFuzsD)N!W=Ntw#lJYMBrct49LyIep21UTi!ty1}*jTDVg=ii74Y~!jI|X>x`qH4Y
zes0t8t{d+-=(9cl)QX#Aw*|6G*?<4EZJ00fY=-%Jb|t2MTBJ6!ix=B-?2gc%Eb^Sk
zLJStr(}?$a&lYRDFhAEf-12K(#BRHVi>Q>;7RdGIvoDs*9TVOyxek{Sq~4t;s?I)p
zuv6xAg2v9P)y!`tNyK^CPY?P(f<U4+IR$D{y&vxioPH(gwcwb*K#A39OwgqAg?I-2
z9{a(YJhHzYNJm4gIkq!_?Z%poRi8eotE+o1|7zKB@Uks{JIdv!$U}9OS*ho;g|~dW
ze)3qI?DW0#*&d)n*Y0=M04FWZ#7&l70~fzOHdT##s47GtJUkpo0E_-4xEvu?HGqw>
z2RqvkHzg${_jeq!G*n!rc=2M~7fXN&FhAYka*F1^@6dk0OTB~hnaLiHgMxPZ<@{M$
zjQW1>a%=j)+pBFk+1K_5AN;)O`n`V*m=Cq(-o1P1$s;^7NR^;xx%@7Fes=TN0Eq8;
zW~Kx_*1KkC4sYJPiK?3H$SH&ei2;Lq(ayUN*Ss3^cRdYKV>TYy{Pf^cSvN6${^Z2O
z3d=0sJ$vHg;&fk~IXU_al=%>`ELoW2`m+~_{Q;)}2OFCn*pEMp#eZa6C%g5Gy}qC~
z1=r}|`h4oxR|o)~RBjw8VRfQJZ`rcNaiUZ1&><Hz%)m22tkIHorjy<8*+h(%kg(5X
zTN^fbFf%cgEVVOvGI-K?(vj(lRu$3w^WTD<`&*Rc_V#vR!@LSR9r~YbT`SHYSIGVd
zWedH7#KL*8@JwM^;&Nc=a3wfj0YBTq_*agNmj>?p6Yqq+Jt7nzO3J;|O?pgv78CQ%
zVm?VHp<fU8)V(dBF$nXzj$6XI{Yh9@f<e*6N~ZZ!kO5rF&Nyj)dwX^9>xDowbMxP5
z;J~OO9FTFpU3%)}jPb8y;V%FUs?SDJOgs>-jyD_gwh%G<%aT1#YH5jH{gw%S3*}wS
z=*g2ObKfIv&}y`N*s(2S4aAo?TBZbj$!y3Ee!7YZ|5hmYP31KR5)=z97P&C$xT$J|
z#DA+5ET03JiB(W4bdTagq;>~-f;dYiUvEC@Ywb6`6tO~;FKpTN(-w6HGW&c^W+eEZ
zaq<!LI78wcZwkTnkJho{-&%+7ouP6D;yT2UWE@!1j3{6e(s!KdR}q)+21Yx2mo-Yx
z<MjReM>bM*6fItGeAMP)xG^DQ{U#3CClpEnQiJ&K94ycN{(fY*mv8J6uTj;Os{Zcx
zH$VWl=GZ-NUVV57WBb?TJQ!(wlZVO!>g{?;ZX$vuu6`>mD|?ZUaLLT<V_6x}KqfLY
z*&l7Lh<@f!Q<4rCHK0m2Xc@s1g@^|%GM67;kyNPUW}0y^qFO}+U4uOsU$Q^glNaQh
z>l#Y%s7`xNfL8(8@EXOaqN3s&-C9(l&q?P27LAZ|fY3R&ZEHnP0GEU2l1gy^gq@k0
z0pWe{%2(Tphuk#Frlc*5iO&K3_1S2MZq5tFd0>$Q{FK$yUZT1?IyzFx01{T)Xmg5H
zODa}%2>+=&_wTciOFw=z1jX)s0sJ>o#$LZfq(~&s8gmDA^-l<ic)iBP#^=wT`B52;
z{Vo;xkw~z}M4;$Ux-8$E@gqS5iB8uAUdcKmXr4h;c^Ztsn?*)OzBIUmBBy;4ZMQZc
zHy}pQujX@PfA9@2|77J3P9&NB(5YtQ(a5s3rtux$y4WCe^xe?VP-f;qi%OK9SEsG;
zF<>B63PB-iH$^h-Ee&XB#Cih-G&eW*<Hr??$^d3QOWbg-{Q!9Qv-;^KAJ%Y}g01Wr
zx5lEDh^*<cr7mT#Qy3vgp^)av+FJY>c@KR2lgx`NOY>xZJmrcuDbKmrtyip@5<i3A
z=Mi#4*H&YGAV9~M8ixqhgwAkv_hr4u<s2SYP!}5dN=r*I?`D@S1#TBlb{MQ}C~0ca
zefcHNszrEs_};byQ`6Jv^o7NX)^lTwauAn*1VxOC+DF;Gf?=)<;ybRSM9+<>k-&2Y
z^_awB^ev~x{M_sFhrtZT?GY)O>vgD;%SHer`CC-JI-7AtqK)sV=dSEN%_pMV`}cni
zeC|(DgjmQTHB_GDz<Ar}Pe>g4_NoMw8CJ3^2<NJsNbB<U{r)qqeP#DQfBt+T;$UuS
z{fiSjxcx*9aQ^zysxzO7Zk_Cp@KDjrw&}9Y(jRy&prWd(ZS7edDztz9eq?jqRP+^f
zt{vj!b-Qm91pRJ}BiG};9e?>H*<kCA9RixEZoneIFHfFqZ8^b$zM#Vpfo9;sC*w2{
z+~lCEvfbMe%-QfT>KnN7@k|X*&w>`i-Eq`Rq8PAi_ijXW0c4<-u()gTX6<vR;S|<y
zW6s=uO*%UC(3k86s#p@747zTTj#F<qT%C7&bF38(>r6LOGc|o?Wp=SO>q;wiol!fC
zgi}mp<wIpl-~>eEP9UN`eWHpS7yCQv)3M%s+160=3X$la!%#R1VXVg7V=&6a!1yu$
z?wcgAxMY9rb_WQePcvJupzD1c2C3BQ_m5VDIe7Ml$KX6!*x2f#Wb};q6cl{W%dCvA
z|Mu(wwA$by$SX#ONf3RtPZbo-zw-q|V%f3<8j(E&5N2NWq0Yj5(lewBEK)-RBf2ZW
z_`1QTKAmCr13Baty8f)p0_g$#Ag_ZxZ)j*p&&cR<?YobJuQqxQm>0b~wRUz`Pc$Vp
zVphSN-ACp(0N-1vdEfW1#;n<l4%VzHIQ+n+sz&bcn(t8Cs&%#>RZ?0i{xeI3Qj%^{
z{h-2o9C{1DO+zVMf%K*xaZp8{Y3I)6-)%O321I-wwIpf9mV^qOTbV0Yc)%g2um6}r
zS?UkcWMr2V)#4-_R$RL~3;Y4n>}A7s#P;W$2}QQUw*r^sPDy6{T|T?4X??l=3fNcw
zTlMDeEgJco_+$7Nkb(dA_y4m((60sGV4QjRGu91V(E!jAH337wDoS%eu0}Z+Yt7*6
zzIpiU--rrlmvt4Dl5#`;NYgb1;WsEKXm+A&Vo|!awY9R%#P;%kc>yXb@3IQ5b2ZUo
zrH<@8JC$<6*@2I;gz3jOCppm&?<#WAq)8V+&MZUl&Jtctfm*M4wDg2u1XSKMC~ttY
z&iREvkH8Ti5+jyIZmws8u!?q<dB+aur_muHEIW3{I1beVVXxx`QYiu;LL_}j(gD~T
zfD~@~&DGm`<=N4@>FMdvTGnjXT91$`{w?e$={Th2?!JIE4XIBOvQ#$b`)O&w6lzQ&
zRX{Zjd720X5pCL6w2>Dt_Jei;?K?D6Mz@wRE+JuXa8NC>5cwGz6?jLzLU$+QVguK1
zUuncsg41S#SlPc6FSC1h-}|+kTgV_j@^LU|6*L*B98>F%99YO`G*C_iq^0vv)u@bg
zIyJFcwV-uDfTKRH<L>S4r8bwIEfB@dA%m~w^qdUfi++7ZknBI(=~0(fSO+cPn<3~O
z5Jx8w`q`cCYV<GxSa!9vLKPxG&fi>>j=4@j<A=(F=izkjtwrMtl}J#5R!AFdh63{*
z$y-;NrtXv`vDOL^^*d4b92^`jT)5EJ*O!rz5x<8|gF>xm=rEwqUa|-Xu7e~GN+E6!
zc!>=C6!Z&s0t34W+%ht4%kFI>`=gRb7mjAN7zKqI6uM`jV<7wE1oJtwA8v1otoe=<
zxr|EEunx;4we`yBGI`@>yGTi};|c2Fke%2W%TYIUff@fH>gNxv<Hpn9eQ5}~isaR1
zhJZ%nd+f9X%YIHia`}Ihhe!XTJQ(DDzYr(~;3qk3hcHMpD#Xe^et-KHG!_;n&|kk;
zc4S$FO&R|D`IB0IscPx(AWiwr<WCf-#`40t2=Qw33@@ZEdznQ)2Ija>yKs@woG<^U
zlGBUZR7q34xztj;vS*fA`NWB<T}6d0H6<=or1$8CH^u#u*zm8XcTq!*9Y21^qM<*J
z3>e@?(qP{4Yv}Wl`Ah&4vOfeL-Q3r9ePtkEP6`hL0Zds?)rIDieCrNr&e<XWPGC)B
z5dK3`s3UuyE~Gy=C+G27R~|yxEmAKYY(pdP7Q#r}y8TS926XH~Yu2I*{Un0ebD+L!
z1C@>5yVpM;z|JcvF;RKG$wK*|uK49F{gCx|?9c#G3>sdYJ&;h-{8DcMte5=wa(k`=
z0G5mUK6!bg`KB<Z_GIn&J5xzB0T;1!997?t{cm%)SB#qX$WU>t3AdP7I_?G~&%sM&
zd%e!F;+2J$jZFC+!W$cZnoXbt>7^Rjx#RB6RV5U?(piV#0;Ni6BqwZnAodqSJ_%%w
zeU3E&AzDRUJ$Oyz+IEO?AO?fg-dcC)=R05JoQ=jrgonFfRaI2v_gut{uB7U$Luj7^
zRp{+qlzs(jws4<$tdfF;@iJ)4^=!hFgP8fsAV}ENP@}92cM;Nx?Mg#K|53NV)tYs!
z08D^&?N7i>2<+WUeLv7+0t2?Q`-#~Y7=V6`o>MDzxLP`X5>mNT$Qal!vo68l#J-u-
z*RO4XnyPkeRenAKl`K<W3-W^7{6H9PTncRiuDxliXpDBeD%3DO&1i%4i<OA5JeLWh
zva#~=asc0-oPXwygBJ&)`8o134TJ&6+Bfp!URdnFNM66b=%J`V4na#c3*B2cQH#oz
zObL6QP1s`OJwJf9Ry|T;>^7%2MnCbhuUuhet`E4I+WDF-9E(xxow4q(cmz@d9urP!
z$IHmLckkZyS^9b0!drwO94}%jbzZ24OF6ud-T4@Z4g?c&WL42m24-H=i$T~n-nL#L
z`>)x!UC_A5K#IO{x>G<m@ik%;9+E(a9HB-hG&H=if}r#7wRs=rq<RVM5>9#+^#{x_
zlD-0PKQMb*@rr({XJC5FjYn*l^GGo>Ra4X6lAG%X#_NidmBHX_L4W#dkGgP&bH1E_
zfPjdIh=jyjTuOs3yLvBx1N2s)4Wv7vj!sm5cesm6OO+C6z9TA*QC$z0K0SfIM<>ll
zu0?NI?o>&C)0D4TEE}lF+L{_eq$=49DS>F%6kT#0Z>L~rdWl+xz1`7>vI^+~<nNSo
zZyH<R(eOE`_oEU<7vxDK$@rYJps*2yiHUnts#n9Sw@*rH9?K9J!D}e?w%CCKaKxO_
z)jfErmOZ7~jGaeA6Gcnd?{a(2PgI8$s!Ik!3)vr_UEXV92~w`J%zYvB?NMk~SOiXg
zik8cN{aO@GE-X%Jzm#-=P`y?<9N>89CVVC)XjCzW^Nmke;E!_#nn4ebCN1sEo08!*
z8#I`hm<-r%xy3^o27(wO7XvK)8f8mN$=yhpJSZJj!BQdhB6tn+93Q=GwrS7#T<r4)
z$r*B}8^~^sPK}&ZitVdP9$FDxH^k@)_@?Ae@tug^5y3-W5=bl9<u``_&D_U|RyS3v
zd^q6XAX!&e7u|A5^|>s|J>!|Vbi_TsyuFHOFf}<a;*`6DVi$0>$jmKTUGmF3zM2T}
zm#~K%KKve~Ik<Wgr@Y{ntK)<gQ!g(%+k{I<8So*zBAEg=Rt=!HVkQSKvu2`=@9{nD
zB!awvG*9I&u*3nMKbU6-8Ri`n5O|5y3Fld3o+A#GM#Mk!oSy<piGcV7842wQkC5lm
z&+;y4n0HtNEYC?0v4Q_I(M5^KaXK%hi8%mU;yV6_-uOSeYIWYA=A#5LM(x*i9rHO8
zL~?^To)Y({HpJwUYfhwH(>4kpVt8kZhMaUczWTvbRYO~46tTe%=OSs@8#ziU4KLU&
zbdoj^(uaFj`4aoX{VI7bolw~~*vI2YE6S?>h32xL?;F+XTSLBwZdS(zeRm=jfZ0j9
zsq<o5*Hn{DbT3qQy1W{xrH>+J0!taVwq6%yY;&sizQ09eBWJq#*@>6qw)Jlr-w_x?
z(=+$(>0`N#@7T(+lWT}}J;QZTx(>AU2blPLiS;!Wdpcg!HH1B+rzchbAnEVbZ-}s#
zI^j8-S-(Dox0<K#pCi+!9=|8gtqH6e8rFF{qhKAH#hKvONg*5`lrqEwk0&)94EMXO
z)GuY9%P2PMvfhlhPD$7F#8r!z5_F_PG>U&PkR@|5hTEbYC$wLr?;#s^p3~;pcsbg^
zc%V{_k0$054)Ap5`z@tZ&wNHD-yu?|+CbvAfr%9pZ}Pr>-d1(CiC+Kl$G}@fn&Bze
z?2-)iEXuWE^p?_?o9^1EdUI{v%OkvplA4>0?p$5VYb~a=)3+8tb8q{OgR48(SaRy5
zh~Vu3%<tqr)H)qZdBNN7c4y9;c;~WNpN;T!j^l21p$%4%>=!&rnNm#sF>^ENN0e&P
z>D4hlO?I><!<`Z8K`QhkV@up$92b~YZ<AO>Wmo)mw!BiQ7YyNY8jZWo?92U7^4es#
z{aU+pb4BHlC`+&V?X66{CjqISKc_J?i#~E`c(AYEhL%`E?p<}S+K?`f>qFwZBSSp@
z;QKPAOEod;J*TDDZt%T^4}CbfN<ICB@P2)I-yZx*$8BX<byYl}Yguxe(5iR-$`oJj
zij15CqRLhpv5gZsm5=DoEAeP34pv0ODiy6Yx4_(Qh5fZY#Uq3F?9nd&NMghN#bi2Z
z$3gR<hN$}7jqb{J$=_#&i$+RM5XX-1<ckrgazC-X{?|JX1&v-_Us3eNj=dW3FG!iO
zqrPeTA3qu<O6YJxx})tpR=4Dh%Qv0OXW+VmyRJXh+?2~S*ca!_tSHHCM;m+Rl?8ot
zFK;=E;@9)9q)Cs*OHY)=jt0-(a(W=(YfIkAM=}jQt23Ie$l}<wisYTxw~BnLk_XGn
zmj1Sn%Q2<B4$*-@<B>!OlM_Xe{vkw>M%#9FZALNQ$s-u3xSJp8@G9cG7VcNarA#nL
zVq;}4Llg&vC}F_>{hzhGXg+$4KaOs+(d!EhsF8Ap%kM9m9&~?_bI$9;%qmiuGDXq0
zvSvu1ZPoVf*L3uHJQ`eQwlH6%B}k{0DJxR8-HJv=(WKr@K65vk&90?tWo=8f?$V3m
zbs~E1mk!@%=F`}~F8LZ(40_a;=T3Gpo2X+yw)b{gzK@wLBSC-R-l^FSsPEp>kzMHP
zh8XP7+#c?o=|Fu0!$xHeEe%OSw=0#}SJeztJ2`o2$eMus_3*8NkF+pk9rCSo%<g-E
z0fb7f5L~gG37RVlEyc%<9z8*kJUMz@aqVT5wZuCHCrW3^nK!!*9B?S{V}SojKWsI3
zU?}pR0aEi(Bco1u1H0g^1LHEk*y-oDs^#Ve`$NfXry{S1>gIGik0?H|+d-7D2Q=O-
zUK$W_&R-tO?h^j!!4TGS1Bviq?ixaDZ^}qC)m{LGV8;P-b@U#Y!t2Rw)Vrz!{NWK2
z5|WUR5EiyZ?rmU-tl^b=7>a^_y*A3^0nXv8$2*=kco-~7yv&9WSdI4x>1Wz5YLm&d
zDI;ah9t*pBd1Xz<X^HE)iaQf7p|=YW5Z@yadG#+R3|?|QH-}sQ=Buh}Qch;!bQ8Fy
zCTc%UcyrV9>vL9R@BAYtcREpsRY|^&j`$WM+=)5l<+*FPy5he2z(xhuyL&!aef+@M
z=SL8G#YZG*j5}(>5&OiF(oVkaj~(AmFynT78)6<XPnO1AIm%~EOK9=)Xv8SF^t}jZ
zy^2rCAwSPvR$ohSX(49YWA^VPd<pOtw$9lMQDvBM+H2Ap-5lCu-^Y$q&rA!-wB4yr
zi<=-wTs#`x5`#G^tAUqkkOBO-aQ+xxCO#C}zlL@{8I(T4@`5vuUzP_inTdJ=-NQTi
zO2VdH9jR}PU}PpE(XA5U?wEG*ljQ-nj+$e<I!GxoVoZD`wQ_P2!$p{#1!W4oh&2;0
z_34B>lHBY(gug02+;30cQ<Cc(M4ge>TIB(v_L}Xhu9tAnwXH$5px;#Mz|D|{laXY3
zG`2pCTz7(c(Zfo;e(yhf;Y>A;Buy?_Q~yRU&BV9i0oEsR88zU8eWSMq^&ZyaV?hq>
zaf>+Q8@FAFFD2iK=@1Q3za@bA*bx`p4tZk$^BN@&X@cOsS;}xEmU<+&e<?$sEi;Z&
zr023L;c72e;|H%rPlK~vi~LN^OrRr3V#*Xz`frW+^I0B^q3FeL>VJ>fhGQ66P^bO2
zGV#sSEYCUq{qr6ivvq730tamXv-`k{pOl~Y#gB)H&+#7h74^?~e}^GW?)6*A35fiA
zkrEW5fA$PW_j$iV^F(ig6K#^iXzJN;em^7_VrVlydzg9)(k$RN9Jyp<7GY{Zi^W22
z0%r|T9prUWo|eg--w22qf9Mxrr_m<|MMjQhde+Ar28UH2r)+X}9XOMjyLcb`yoh05
z6BMj+PM-qcezHFxD*VK^Aw+_91SHdE6D`nsk7uh9&c0MD+=`D>131O2vJ8~K%(7{x
z^g(|95eVq_{rA4veFct44UGp2W*gRPU*)}UD@KiyNGPwq$3FE6@JIuK%V(HkUVhQn
z(s~GqL?x+&8v4ZYF1v*q>+Ci#ho$gQr#YQ1xxTpV5kQ{zL&;?-j{u4SCpepOI;EPa
zEU_C8U16(K|5Naf>fvHX>Gz}aP7{DlF-LgAv^D$6v+K-6jEps%;uFYyJum`6Mb7~q
zgM>h3Se(2{;`OO#@e^$!6xYO`>d=F#1<s(ZstVjn%V=70s*_y_E%ga+r3+}}gQrKN
zaHav26sWz3(9joncL(*|p^X8J`4}7=K_DynqFqhV3+S`)8E8df&P*Ok7J{GNw{IU>
zpPkZ<T-Iy0IoQ$?=QjYI{%~HT8su`MJbquvXno}rP_p{(^%yREkpn4J1JLM4f_oT4
zw{>?y`vegA<(YxWwf#phsx<+P%+zf671qhomoUxKTicZ!4QPFgQbEjA_IGFJNCS>P
z3CwU*rECdsU~yOabAgDXU9ck`nv2><_*!Fq>L+fZCEmGW4Z7XiMoTCT;uSab)w_py
zC3I1ZAnx5R4X8g>OpTbp(g3Z)Z&wlT67i<V-@{0Fbye2`dBBH9!*5kY6Ad9M`d<Q*
z-|u#pmbh<tzR$VrcJVwE`d{8GyR3~GGO0|d=V-<5q6`1tU*pGNExwBIee+N<Hl8Wp
zs-d2d_=`*abEl1;`4cwGujt`kztD<MEHS$Oy6C_5;M5-rh{E!rBAD21=HQ;W)PZIG
z`xMkAq?+{l^<<<?Q8*mkkT}3O4MI>wg9vYB8v12)#Gq`c%|({*ZdD~}9x1s~8JlhG
zaH%eOC!FSBXl2tNT8o1${wpJFr(Bm(QC6;~to(ejCAMx^aN^T4<B{IdHH!T8dcCqf
zD@&mG(97K<LD0o&{Q=S&g$;a^5bNCzYY~3_JXByb{a`(P=BLbt4eMZ9gR}6uv3{-4
zCQSBj%2%u>X;sSEvuEq%W+|j+_yFu?Nw9+q{z@~<r#k3hE}2H(#d>$3;?eH+d*f*b
zL)YT*Y}UAf0Pwoc?v6GDbUG}+(rH+do0*xXK_LI=D*gjXDgXwIVrma#t9i(YlJ~**
z00%W?mjrC|)s0D$*4Ro{?1OZ8$o&KbYX(1NXK7+@vach2?S{qe<l%FtHao59@g3GK
z`6UOSZx1~WT$8IyJ!5=J={_(M#@nHW_m(oGtcSAf%QP%whg}ip=s&|NfX@Pe;Mkmm
ziPHJ(;^i^0d(32Xr%R*8e;V>6si!&86`(`E|6;|%K!uev^!w3~f+e_Y$d30U8@+nB
zkfB=Gq4OmBWBLs8L^hK{E90D?Au85y<F;Ezt>}-y7@U4}W<UBiTyoFG^T+qvD$L3d
zgsAWh9u4YFr%rIP=>A}6fObELJqwo&cg@|XL=cGz_wi^{!haY~^8=J<L!KZmOd=Nt
z9FUhU0_A9JyZ{1ZKXwFhg{{R~d-h9RuF*aIPikzAr<WSHF|QO7HaSn}#IsyT>7&N1
z(Z9m8gQpf2N>C_WId&hq4vn{FBw&DM?Tb_`RoFn%q9G3AB3#sI_s-FwQV2ZKXM48^
z?k7yEcPrdyNF86WcV)Wj5I8xc5jf64M{eJI^2PZ=Fu;c(Ie=SgX!KbgHAWjgKdA7>
zB1^wI{VWC{8k_Lw2zVY<4UHn0BS<BtZ$JS(hXw~$HAO3y441(_VT#6{Dt7>nR%Gnn
z$SygV=Cf>-<dTP7OEh$AAoTwPlpAk|uf||I(edKZt_*AXEI@Am-gAFuv-90YN9bk#
znE+MFW8kjBx!$`V{-+BfzF30E0jrYv(R5$+I90yjkoR<jd`#V~6l#DB427ov<p43x
ziAVXkvm$qZHGtXVcH<5rN%8oyq#0l$c-%(RKk9xd+&>gvwQw;wBEf^>lTbvz!9EUb
zirS!8mg9zPFi8L9Wo1?WEQrRJdLrDVa3NI9VPc4qYtajK{7A-GxIwsFlgIbS$RJ`t
z<tGdPQ7UU{h8cm7@x8S0vTwr+FemG|$BX}X|J_?a_6MJTSqqSZDCD+tpMn*Rft$)r
zBn)WJ)_|mU^UkllsG4)cTTn<ZmHBjF2su_(_WS-p*+92XeZC5(S31Ku?!HcFIsK~}
z)r9O1`XJBii*>e#w};B}^x*0bV{f$g2H!51{Z1L&ALzzDS)O{sFOEOK_QhhU8^lto
zu|j~K-+s{&0bQN`6ND)Px4nZyRH&NDK{4&wE)FaW(vakVWduXGs0kSWS4BWcNy!s>
zs#)t%kaIUlQ%%ug7N4|`4Xe}b{>Dm6X?REom|sb5rGGe>j?R^Yd)eEe;kiiIpP)e8
zC;KC}2HP#-)_WAw0(9;~q83t@o{b20<xRk~3KGc;U>d8bx*8F?*KhCQ*f%8Vl50lg
z$$zG*MacB0`d*NzWQwNTuO>)`-)o};L}bBLBL0d&WF<tqt9~iOTG)ESXjGC4PRbS;
z<}ZJGvLB`X38ZN3z>;<u_XMAV4QXBIGLTa41_UsWaT#JpBh88G5f%~_4z-j%1$l55
zT%&|#(`DQ#@DE&NjJNx+|HT~}KfZK|<IeX#QH?kxJhO*~2aSd)S_*x((n4x?Gn{i?
zjN#BF%3{1Px2-!J7t2ugDMNZYlx}Q`*~81rxI^L<ba(6HFaG?_F5c+<9@meF>nn8w
z+ln2WpaH?U!QwESDiG`i>jqTGC?n=UY;uIRY_}Ztho!g8OXl9+hsU+I-l~`V;N^#;
zXDCM4{8-d_rTK4m-1`U<2kB@%w|`{W;hP5uq6}%*LM;5%X#qQ(!1jx3$EJWlE+c<K
zA{NBY-o5pCT$7tng?&Zi@K8fTdHtYE9?BGkAA~5VAFYVR(4d%!Vdo`~9xNQcZM>&<
zWKY}4!};}IWCwMmGZB(hyBy5=+@(-9vB(CTcYdelHu}}L77IUE<JjwiPVLR^$ogCr
zI36~N7^;j#bTeDhY~Ie!_@e(`=t3fW4<hE)Kf7#)lQ;*#8P+{jm{?rk4YI(DkAzSY
zYf-&UZ+o#%v2j4qn-TmTtEd@(j2FS{BTYP}R(tZbXr@6lzFESwv}G6VbIbD%#`(*n
z(Glk*n`p^&ajJ;3b^ms+{Ik9Ha@n$|sQGPR6R>IZw-!?=j*}P_cn@6RzxVZ$)f~S8
zRj>nJgfr#aKR$xG!1_Nyh<3n<p@Xk*IrLzD9OeT!&zXOp=i76Joqur;`NF4106aba
z-c3xVWr;vIZw+An_T1#3V=!gZy~lp5_z(VrqR2a>wg5Qqw%g@rH_c5D8?I5&*$1=-
z$By<YUEY2BUzm)w7c*IQq*sZ4-<vL8>SyHeng0FWc(ze^m052CfY!%tN9L=D1)e<(
zBUk-x?14l-0Tx=9{v=3TQ29--z?+b_g;zS-oRb!RiX-87x{JgHRgCx0p%#mI)E-{-
zCow9IHl&rh4pT58zVg7ol0ZFJf$p>8R9&Pc`4oghhzhWmiOR{zNlQzMi=P^$-Ol=j
zinVW59*%!>9HOy^UaA4S2*K;&ZIFim3vZ)M@v_9O5-;Pgetv!w3MD4^^OJVn%i84(
za=its75UHiKhy(?bGZ{q_J?AQ&Bt&yz-fL$m4%lwdNAobdWNUUlz6y&#+>s>z1Vu#
zk|%iUXbSqRTZelE@1x9O^|!p#gFVmEFm&>WI2va6BfT?iNGZ@JcKK~RWKC%{+b?-2
zWvIy$^LqqbOC42ZySLR2+t0A|24c$R=_>d)Q`dhe=(9a9x&=LCN&6aK(c`@ZSEu?b
zu?xog8_Eh4Cg~KNGiM|{=O$6_!H^WLEQ}gutK<mEBt-;SJVu+>yPc?r;i+vyUv|pC
zKu`h2fuhqZC@kzf93O^Ft56hMGBYz{*hsU_BB)&ymtALQNJzZr$iZrJq;OSLRde(2
z*iOA40I{1@sQqLOFmvZ4Nt=u_f_n-tX0(FLhTbjhIHcI#bZ4<%<?kK8JL4qszxO7a
z-vgu@K7Y`77r6Dxw@elKlh7Hkp*cYh`eAFPg^o}a%Y&Q=M4R-{-Wf8-yCRQS>lVGW
z8@7_#d;LUa9UK}WF-SR4sl;8{07JAHyH|&95t)!O=@6tPZxH_pEHu;S_aJ9JrAEXa
ziP^W5K`!<x!e4He9oeUyN1cr4!F{ikAu9H2wT>?m0H-MRdjW7n2f{Zjk@|#>W6g3V
zOa0S0J60~ca#MeyS3y7hRgNLZ5=oT|s?L3&=xWs8Up56WOCM{)vdL5I^(&IPt&#LS
zs2)7UUhoLEL)2IPIQi`5bKqV|K}3-5QD0ret5w$SHe%KwVjiLkIh>Q$3?iK%(Sk5w
zob78y^f%+>mP4_BFPeF**N<kiG={Pd)WJrFcZds1yw5erNC7iW#O!0@yBEM1g;s_U
z97pwu3hLQnR^#=!bw%6_-1>HmsDg5Y_rQO>QF~%24$s}UdzW3wTzk_MChF;TfsZMX
z6OVKpLUzibb_|X~N|WKMc1jVxr2(&dY;&3%A5($jIvmIti;r_53l!uGe^9|E6wQ!h
zqCCia&;60?I0Kk_hN7<>xwi|wA@!YoNt*^cA~dK|ss%=+r#jc3I$6HbxQ>;JmGm(6
z7u*)Ti_3FfoSSe0s--?Q>K7r9Nf@6Na{zPBed=MV%9MA8wbX-FffdOq??|lV!R@c2
z4*;uG7p&rkM^%NVonxn|sX;x5*^%B=?fE;UZ{CQYz6JIs7=u%y9;XVz&6PZjr)UOV
zzQ9&_Y~&!ayp}$X#yh<x%$JrlV6vhQtS_J)`26NRaIVBSoh8Y-M6~Q=G-2Xp)+wbU
zx@DLWeBiFxZ`=J2&Ms~xFd5As55JaTr(R>}*vmX0B)G}QuBBt6+KOt~i;n9eT4;z#
zmVm}h5QDHYp&Q*~lGEXs{nYV#bK5P9K)ZyQ;xG^>WV!^WvoUh}93%WZkEmmMcQGZT
z{V%*Kmu`EMxQbRQW`~bQ<LRsa!L7#Lq|O^C;|a*coj!l4X?bSki`r;9*A{AMP2OvL
zRIpfWykeT&*5$o;)u-#p!-w5@52Zpj1e^^b2(fG$u1{F~k@&)c8uOs1P`C2{9?1Ui
zteK(>1(<&Y8%%K<kHIaL+ehf#xHiW!t2Qj3loIfL-SgkcXiv?k@IK_CU`cp0@T~-W
zy}c4wzH$}vtktnlf#NmP9+1z@7^EWU&j#x93Hy@K7BYS8J>+G7e{9ASq{@+R8r3vH
z1<y7-JG#DQ0Qs`X?v@Zf;ip1>c)WD1SblEzDtenZ+L6Dx$~sIlO8QjmH(@`(UtnuC
zviehbL;9Z;y8~Cny4JJlf8{n2+(syan}ulpmz&MDj#v_><JNPY(qT<i=e1iDtM1}Z
zbluG&D#H}>tc{uPWFt%2+)ECs{Z%XSgWaV>vD^cnV0NOvFw-{^`O%bN`i@<2Sya8n
zvswXJsl<^rq-HR$*FW}<9>`>r?!NLwvYmiXalNMJVRC*2w@Gib^wkH_zP9)lkWAZz
z^q^Ht$A&a$xbC5--><K*c4R+8U~3`G36)<)y3X5!o351%=Q@9+A!@KfQaW;vY(881
z@Ck@bjEA0~!FJbSvrDesTj}T(pb%W#>+bwmWy4*5O~NDq^3PWLgf}@-cV@mr!hoQl
zoY$Belz(9)xY99SBBRus!mda3_~E!@nUJV{4Z6I>t9qmM;9>tNCgTVBr5$PM5nzg&
z`nLu9ak<=*AE23P+Mzd6U)i&Yv}RY9FhO)F$Lgr^G0y*qU}e}7wCR4>yyUi{tGHw_
zTEpDNKborh8~#*AE%4sdc(98&^8D1!`dFC*WioyNw_3GyB4(6N@Db0!=;ZAg&<Iiq
zm#GwrEo(V@iUE@3{ZfXZ_QG5p(M)BX@fRMmxg|&;?{XlOY`vcDlkkCiT!~Y9?Hc3o
zA_pl)`+j2U`T%B8(#L{cM*B<ktId}-iANFl{7*Z*v)yuk)Fq<5QZ(Wxgh8fQX5Sty
zoaA$%oOH;qsO$WiPQkkGhmR|0aAwmJ(xBSU8@TYE)NXcJcZ)TNYqICzjx;(^R?zX!
z9g-)uY!F%}nl-X(V1>la1LYG+5l7s1jXc*i5iN>mBD^VL>Ab{q@Zj_Z9Di;gaS8;e
zbp=k>E&^7ZC-8^_bFD1HMr8sH8T~v;<7<5R)Y_7-g(t?^vnr0ie-No2x=Qg6!Y4*q
zv%&DLpD4rHFRs?}ZKYSm!mGZ$X8fzP#@O=hkQ&!b-e*nOHm=I{J|Ob1&8}VNU>17G
zrQ>`*_i<gVcagVL-tf|Ni9`i&w0m0%H<z1;F$67!9qf}Z2raxa>uB~xrFM-k=@|6M
z14px-e%LpXw6jVz`K|7yVqUuhmur0*wZdZ$s0KeMi7{K)8Dob=_OUbCY;5i1RhhL5
zv(#bjA7>0XM42hx3MGJQACG^rwOd$rkAN}nxd!P_w~1G0-?lSQ1$~B?SHULgIp5!q
zYA=loh|ATF7!7_ZXQ1+k1Z`g@f1O9DUxZkQR&7gBq15?h$s@npRuP<tp;b?;X0~uY
z45KyJIxnx-`S!2>99J4SX)bhvU;fMeg2PrOmv}Y)(V#b23&=+q@$dfi*5Db}2EJ!&
z`G_M_-I%}SJnK94_!FmM%G<a3dQ)_5Y3mh$!S8S5(F&=rFj~l|R9A-xjy8gZ>D@7B
zNC+1K>hoY26to`~baJ7=A3nsw{YjhR$gFg8Md`)gl0j(Q7jwV0lp;@~D2Fj=aau4b
zx;}^R^j}}{!xH|aWG7YTj^Q7F$w<}fz2|?Ha~=>A!`=~diAd(ZKTy+Boq(tb@=g%Q
z;K^V`nTHc`U=JL{Y-FnKQg1Kb_Ts{Zl>f6irW^pz(omR)6((j+t)+r}_v|aJ>9AbE
z#tg5bz96dwob4Mu@ZB?4-xGfFxF7msjPt#HfeNf-sv-0NG72$?0o+B?jSW#{<>lB<
zuSI_n-#4M974vs|Gk&GRA3-?XBmv5H!e<C~3pVvEfwo&2cPU<^?vTJ1;1spBTut!7
zQB4whaJ#dTse5*BtljjsZOmt(@#*8okFh&B6UGQQVvAnC)*7XyrMH+t1NgpzI}N_-
zn<VPDWq=Z*NIAsaM6W*t!Vx<o(V-VKH8nl%jQm@z7(zh8N&MfHDww~N^~Ee2c;>%=
zGAN#^5<s7_3{ME8qY_|GlL~R-;b9d@Hpts#$fVx-a6#>}JDsF`lzuY{%YdUtEZ}s2
z%wNX`wL3lB8;tKI*!T39Qu}z%0`AD_Bs;O@Fk~eRJAA;%Jmai>CrsSnTv)ekfot?=
z?h3wN=jO8-;7(!>_#7BUe*Va)TgQ#BVMsBMx9ODSR>B6OtiL7|@A~9%Lsiu(&`j{J
zdBXGxV(aUbx9Et>&CE`v8F_tuZK5B>sHjX0FifpTRT!wo&(GkPwV_g2FHSU+K%7~s
zIn)I_@a(M_9jO-@BUQJhI^(FW5rXi9?F|3?{aUL3R|eg`DF#sFKg}lpN)3OvaQxlt
zfv`t50r5foZmXDG|FZp3w_N<Q*MlIk{@uF5n+?keMu)}m|LhO`|Lx^_|75$Q9X>&^
z+40VXZvXW=zWT?ueskwK`m(~7q_mo5+dldSS+15lWBX#)yy~N=8_<e+aQe;8O_xc*
zc1m}YX{=5PjL_c@HN8e(K~Jx{UPnpsaHS$o5$D^Q$XkT|O62O_3tqeGtR-BW&;B-@
zZM{U}dx|>QikMdXypupy!q0hVg9LH69;P5)|CwCj^Y1D^qSe)<rKPb2C^<VjkB^Vv
zx^>HdZ8fpH6AyzR)!G%^FDom9UGEjXh6aYq%F0S`u5EDCMn;}<c9v*~|K);>W}92~
z*lw^QtbAWHy<S88j|iB)ip+DAH>kC(jgOBnEI9b0nHk8q)cE*4l9D-Z--eD-85m+g
zhNsr(po9c+&B*8|r-FBTS=q6@TOz{4_YX?8wY6b$V6HHUSP-Ws1}+>c=Q;P#|K9!k
zaQip4?cBLDATc@lPGmZ9-uLfDCUWnO5Xd7%Mc!6cFUhf5Ht^!{?OMBb?Sm0eBE(kF
zhms!LTh`sUaRVpE7V_ryc6BAycrm!M;ZVeO<KMr3f6r6Ip}s5D^r>?N_mOI_7bQ8F
zpN{Uvg9nU{l(&#bT#uBIRP#L6k5|(XyZA*!u*uXwkA`T!urU0SwXE-lp_iAJySuxY
zS$uA8Zb--%m@3W0&K^5<3l8=Cd=Hn2-gyzKYT>)C)^0^eR<<A`L+4imX1A^`(7)e4
zH!x7s(9lpxsT4^oJPDRTY!66IOH=Up{VFJk`49^lGGYTsvV1-}IC#r1j~llbcUJM#
zqJ%Vm`Qqm4n%K*`8P<#a2M;>J{imG-T^k>Wxui_-5fBvA_1Q;S^3ptY_%O|8q;QQ3
zD{wE99;x#-sz3|GPQtBBgI#{)*yi8({+i8?41`-QrzItwJh2+@`Es0hj5Er~$swII
zH#a|W<c7NknS9-npZd8O!iDjdu&Agg=$)n}N9>j`eUp=w^$UcWSojq<zQK)#hK3rj
zQE9^ZG;X`!8p2`6j~)fniLZpy|8m*J2793_unEh=gnB+Y+Q0l5@p}C-m7F7d4gVF-
z!v7V|WqlX*jEs!Dy}iA>3YB@_p>}X_Idt$~f8Jihm#L|>RaMwdSl`%~k^T4Q_3Q4u
zy^PrPx&Oiykj-|6cQrynLpxz91Qnxn@#@vFk&&vP%^a3iR){+=;D|GX`)GIfJEx=4
zAKS)KS!`T<*3<>kD${Ogmnsd#+JHgTN;ViG;1Iqg4ZKNDGXG918=F9X|2ZgY;@>#s
zJu6h?*dgwG#yo`cB~1;EvazthXq%Lps_|S-RMZxipajPq0Ml(^VlqN!;OgqS1nO(o
zBmWP{jyLMyg!dj_*$~aS`r)dk9(F$Xj$3yHRsI+o1ADX|TRUF7cmXy!Nq0LtyC?R~
zL@#-;F)=+32{F5R75;48jMYu@NkhYBsMPj`Y-_=wTUc7^8ynX-aZ8^%cMe=}BftT|
zl`7;b1qTH=fM3SuE0is4mv1p(s|dyJB#`>m6&05uXK-+Eh>MFukwhhK2j7O>>ba>8
zoC-R|J9-Ak>$>Mp5-Q!soy2;OR=litVV!SiYKrSD!dFhcIm6D$S$E1L&v9kR?ai42
zu=H3{sa8E_VEI2Ii2cDY&Iqz%F@-&sq3WyHqanUMBR##;^e09sBO@b~q`H<>#0bY=
zlhv#LtC4FBhdOV=lg^^B(wfq0h?aIEisV$rah-Cg3}YNtk{Xm@kj8L%Gqp<O&_N72
zW=01ohmChxDVoH_rW_)t327rCdhdVxzMtMNJ74CyF#f;!ou2!7p8LL!U`K_7h2aCP
zuC5yt^4DVwwD)1toVvMOQgX~PtdZnkBo|a89*-AUm7A*~i$4r;PGkOFUoZ0v<ExB1
zWaI$G<r{F3C#I*fjG}gS+#S9gAOAaUyB*}A=1VGaJRHb|6yN2EmoHyNo)5IfU@%<!
z(JP&wpXU*Z+gGXiDxY8B(Gk<?-NZWSDu>+u?b)+^3`Wh}yQw4hbDcar?Wrg4b3rIr
z&SJ4pfM2-yy>o&U-?4GvxbSRW0~~^Uy}WKhS0-FFvhAWxo>P%31*CUjptpHI!1uB+
zDhMdk*=?+odV1M>SjU;CRVL@K4arIRZvWsuYj@qhU+x){jPG7m^bZZ`vBWO!?(VyH
z6LRbF^77;K%yCs*frEpf=sNdvJdCSC`v0|;FLU<yxT%fg!StFy;dVVeb*KU<tB;76
zV+8Nc4E=Wm!9z0cs&bEDNQc~>?%^RNC50+2l>!-R5|#40ZYmz^?zn`<O-*sJu`oX@
z1FH%<2Y?o)QR5Im!i})6ZeIbPPxz<^g~H|m7v&rrEoA=`)IK#k?%o^#2b+=ut+Huu
zG?-S@`V?QmGUKD+(tpl}$SZfNFOs&pdbFst)WN}_w4_8=Pw(FC+mQ>OD{R%UXM;g=
z4-X%zG-%iU@)Q#h$!1^G4~Y#p8W`w)%g5Z!?UIYeK;3*XXf69SQXw7buS{CV5eR<J
z*Z=h5j{lxLdzeh7M|xeFNMuhz{j=2|wc>WOrs0cm^3A#aEvD5D#4^lj7#d#PRjY+k
zGmI|Y9G`&}Lo61fg_yRDA+p5<fC*`VR+)vyk}$e@*^h!iFK7&#o6sI9R8u6AnJ;ep
zp@{_QN8CtIV*8Gyw6rjc2F)fYx<d|L5gn$l6zi1Ty9f3T0CP)E4+oMYgKduCxc+UZ
zbj#eI+s{8Ru2~TO<zIE9|K)h;+R}3pwD%e-tEErPkNKLxHzl&57fsCBnHhpqjvKPB
z&TQ%@3o5}Al$Hkn{f3K%l5LGYt%G!;pqR_$Hn4ql4mD?Ugym9XT1PE*FCnvg@&rQ=
zmEDj~Z0qao)yjwr51_9sPM3`L!N0)Gig0Jbo={%5R4f9uFku+HIPzGtky$mFd;Y*n
zx>8RVN5E#ux12d(-Fr+q<fE&%H-GjguBj;%nuF^fzq=-Rry#)alvj3J<+92!pY`=+
zLN4I&7Wp$tNlC&FI*F(N#f^BH3pBZW$1SRI)=cI&+Oy|2?8^Dj8k!i9=G#&K=od){
zDpXe=>67RwuQGTrwm^F?-jcnxG`aSrY2T=(Ad>^ZjX9<*wvdQ!O1gLm2D)BR@h$|a
zJ9iQqxaXc89=4qyYZuwQB}1T<H0yeZA|4&ZTy4%l|F_L#`hpa>Yby5L=;%c&Rd6h@
zeGPd^Xe!CASb`&a?AS4}gM+BKS(W1N?>}zSrnHe6&N}&W{%+s%eWse8o4NP6&n_H%
z-PgC5ibW>-DuI(!n7^7S!S#Z57*$?LNznacstvF4;ltBcZihAkwM_RI&%F8OklY8S
zd4~zFJQodQXtnj{;M#@$h)}b2shL?FygaJWa)+FxxB*T*M0F3|V^EIu-rU*MI}~={
zbXQieys6x<Pa}jV_l4fUl2TGwR^03KTR!mzw=xksf?vnls;$@dq0(sN6J5uG5lH5s
zj=FK<1|9@}gX<VQHpan&hrPWoq@}fYWmd;!?B!<|ur%gBC`%ecY2?RL!2LXKAZKG`
zm5`Vyy^eJYGsJ{#r=6W0N`E+)9H_mKT{=6rK|SBJA#S-|H*<R9MDVow23({I(!7)(
zj#n6JXlQ6_zelhwwup+FYizWF%wqMbwmjg~iHQlMpM^9-BO{m)RT(cjzlP0jB$NgO
z{pt$&n{RXy9zKSi=+6hyRpOOqYHDgAob;K!Qau$kJ&p(YPki1Iqnf>%mqNG6yPcig
zi?)yix3;}K3~9E<fqE{$X>zjMY=QfljseoJJ&QGkq9U4?On?7^Q+jJjrC<L+EuqoH
zE9^CgNxc6Jw@H96U(pxoPcR9IpO1o5NxX-FfK0qsp}v8)|3^1KKQZ?7no~x&ndv<&
zOd8w@ZtYt`idj8;f{q5C$#I|xM5L)SWc6+|T4Y4Ti_XrE(K9$jn>K9%+3jS99{5I^
z)zx9hYJX{a-a9`u;=a9xD#XMW$VQ{)J{}XKoIH6F7yFV}V>)>jiRt6Vk0GxJfbW2P
zP>Dd0sTXuDGm{QB3PTc|*CoQ@#iYZu@}q80#9LcGf|>)E7ObNal*f&Y`VoKq%uu+J
zo_@f?W3<2jgD@l|0UhJ&>T0Y7K_PnZ2lA1X1b(vv-~d3!nWj>po`i~o!{JaW+3$TA
z3hURcv!ufQav>;a&59MuIZ#vm{XrrN7|w*$5&1BHO{$Gw$Evq^d3ms7Y{Pj({%{mW
z&e!)2C=2krD1O@3(vk!u1hM4kXi4|Aq$J1v``f#QEG#U<BO}@-gpRJZ7Szb9ii#KY
z^=~+nPoOSZgaykEhkuXvso~D)Xt-`d*S(3tcRcLnm6Vm01?hW623!2c_fuCAGsgLZ
z`zw16L`djqs^(rzOa#03$*)*~jSkg%lSp((R3Sl<lD`i>gqAAIg4_jEcQn3eUw0Y-
zBMgK~APQ$Er{t_GhKq~p1uGhj22+8a&d%b?I@`9LPXMtm|JEB7%X1e)|LtL#r5ljk
z@Gu&bEb7I~%qOCI;Fqt$Rxx$x?Ci7$A7K2|E(&2ZJ9`~56lEOAC9$7AvGw%y^7n0#
zhZH3Qma8~@SiIs(z_<yGt*uVJGsVWa8t9`s*xT>ivBM~Owya_8XRxFS6_%2;VtR`W
zNHO^+BB5=eWuhrBNs*I`m*Y`YLZE;)=R4l7sKDJ9u+<yn5pW=|&<HO(+MMWgJ1WLK
zI+F{xx2dl19v+oa<kC5n_7NLacAuTy6V99`=--f-kXlq_R(y?PHhIa`S9SbF5IGk$
z9Nm8Dmju8GXrp!2emyypoFKVsmFo{<V`J3or9EwoF8l(GSXnd|FCr=IP|PUKFkeKH
zA}R``%Wym*D=0J|96w4ylqFJ7w>xUPcDeoP>*wyiUKW4{uOoDO9AvRS*EHKj<GH&o
zUM2LZ{XeFIyVKRwbmR2WBcbEicVCEu8tD@d5CJY4gVBRWgH8fF=0Y{?N87Zt9G~-?
z<05r+wY1nUakR8N-M$MTYw_a6K$YbHJ%s6Ol~2Z<E0hbvHPPsG2njXx<Zmr4!6@7C
z`F!*u;BFCrWUK9=`X_^fht{o2_gv=_7<eTm1)Y;tR<ctOme1GEZvZ4Ml#E{1?e(l?
z@1Y`R{W1^;qTBLm9L`A*fB`_#@rtX8ktwf7My#nQo;iNEv}m`_t&D}PJI<SNB-Pa|
zw<=g#T25EX435!*TqH=tL&W#%#&O(~1N4vQ=Yz)ThoTbUXHXrX(^lY2x3f!})w00W
zrn)#e<!HYIT`S{O5`dqyv~-k^fB$|)0tgk)@0Fq%8A$B-iT$7F=aG>kYM}3f7Sdzg
zjV7lIm6eq>HBo(Ns;jFLiOwaU_x$sAHz*iE!EzZ=$;`~e7DdX8Zqe|wT-UQkp~Et=
zh>&AFH8pQfZ!`$CdahW8DJv@r1#u_ngzR^uYzDE7*zR&XRbAalG|~XvY>(*b==|j1
zU=lfb*vY9CX^u-S8-)hwlY_vUDW1mRh>0N;xkQ3JnHXZkD=aCoecSdN@I1=3ueq^N
zIY$@=2E`=DtkPHoM)cjOPDLQVAh^VvDkISa&TM6S$jI){)osQN09^y2-{gE+5ft>U
zva%8vc2O2(Dd}68V3dt}Ii|`o`uh5lhEI`QU}FH^6ML*H#-^(xY>dWY-KA1cN{r#I
z7{XG776=4S+S)$+I^B)0z$wt1ot-T&D+8fT&{1_3wUbT%%Y!W}zebXO5>XIo{&7J1
ZvfM$enyXyGJ3+)LYjb<5aIaVFe*n4yfq4J`

literal 0
HcmV?d00001

diff --git a/doc/shared/sundials.bib b/doc/shared/sundials.bib
index af8882cc04..7e9bf27d08 100644
--- a/doc/shared/sundials.bib
+++ b/doc/shared/sundials.bib
@@ -445,9 +445,9 @@ @book{HaWa:91
 address   = {Berlin},
 year      = 1991,
 }
-@book{HaWa:06, 
-author    = {Hairer, Ernst and Wanner, Gerhard and Lubich, Christian}, 
-title     = {{Geometric Numerical Integration, Structure-Preserving Algorithms for Ordinary Differential Equations}}, 
+@book{HaWa:06,
+author    = {Hairer, Ernst and Wanner, Gerhard and Lubich, Christian},
+title     = {{Geometric Numerical Integration, Structure-Preserving Algorithms for Ordinary Differential Equations}},
 publisher = {Springer Series in Computational Mathematics},
 doi       = {10.1007/3-540-30666-8},
 year      = {2006}
@@ -1806,6 +1806,17 @@ @article{HaSo:05
   publisher={SIAM}
 }
 
+@article{FCS:21,
+  author = {Imre Fekete and Sidafa Conde and John N. Shadid},
+  title = {Embedded pairs for optimal explicit strong stability preserving {Runge--Kutta} methods},
+  journal = {Journal of Computational and Applied Mathematics},
+  volume = {412},
+  pages = {114325},
+  year = {2022},
+  issn = {0377-0427},
+  doi = {10.1016/j.cam.2022.114325}
+}
+
 @article{FFKMS:14,
   author  = {Falgout, R.D. and Friedhoff, S. and Kolev, TZ.V. and MacLachlan, S.P. and Schroder, J.B.},
   title   = {Parallel Time Integration with Multigrid},
@@ -1998,6 +2009,18 @@ @article{Shampine:80
   doi     = {10.1137/0901005}
 }
 
+@article{ShOs:88,
+  author = {Chi-Wang Shu and Stanley Osher},
+  title = {Efficient implementation of essentially non-oscillatory shock-capturing schemes},
+  journal = {Journal of Computational Physics},
+  volume = {77},
+  number = {2},
+  pages = {439-471},
+  year = {1988},
+  issn = {0021-9991},
+  doi = {10.1016/0021-9991(88)90177-5}
+}
+
 @article{Sod:98,
   author  = {Soderlind, G.},
   title   = {The automatic control of numerical integration},
@@ -2076,6 +2099,17 @@ @article{Ver:78
   doi     = {10.1137/0715051}
 }
 
+@article{Ver:10,
+  author  = {Verner, J.H},
+  title   = {Numerically optimal {Runge–Kutta} pairs with interpolants},
+  journal = {Numerical Algorithms},
+  volume  = {53},
+  number  = {2},
+  pages   = {383-396},
+  year    = {2010},
+  doi     = {10.1007/s11075-009-9290-3}
+}
+
 @article{Ruth:93,
   title   = {A canonical integration technique},
   author  = {Ruth, Ronald D},
diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
index a4951bb888..361d637e72 100644
--- a/include/arkode/arkode_arkstep.h
+++ b/include/arkode/arkode_arkstep.h
@@ -41,7 +41,9 @@ static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
 static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_ZONNEVELD_5_3_4;
 static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_CASH_KARP_6_4_5;
 static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_8_5_6;
+static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7;
 static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_13_7_8;
+static const int ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9;
 
 /*    implicit */
 static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_SDIRK_2_1_2;
diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h
index 1fa298ae75..cd552f58e3 100644
--- a/include/arkode/arkode_butcher_erk.h
+++ b/include/arkode/arkode_butcher_erk.h
@@ -64,7 +64,7 @@ extern "C" {
 /* DEPRECATED MIN_ERK_NUM: use ARKODE_MIN_ERK_NUM */
 #define MIN_ERK_NUM              0
 /* DEPRECATED MAX_ERK_NUM: use ARKODE_MAX_ERK_NUM */
-#define MAX_ERK_NUM             14
+#define MAX_ERK_NUM             21
 
 typedef enum {
   ARKODE_ERK_NONE = -1, /* ensure enum is signed int */
@@ -86,7 +86,12 @@ typedef enum {
   ARKODE_ARK548L2SAb_ERK_8_4_5,
   ARKODE_ARK2_ERK_3_1_2,
   ARKODE_SOFRONIOU_SPALETTA_5_3_4,
-  ARKODE_MAX_ERK_NUM = ARKODE_SOFRONIOU_SPALETTA_5_3_4
+  ARKODE_SHU_OSHER_3_2_3,
+  ARKODE_VERNER_9_5_6,
+  ARKODE_VERNER_10_6_7,
+  ARKODE_VERNER_13_7_8,
+  ARKODE_VERNER_16_8_9,
+  ARKODE_MAX_ERK_NUM = ARKODE_VERNER_16_8_9
 } ARKODE_ERKTableID;
 
 /* Accessor routine to load built-in ERK table */
diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
index 9f5b56f072..de656604d1 100644
--- a/include/arkode/arkode_erkstep.h
+++ b/include/arkode/arkode_erkstep.h
@@ -36,7 +36,9 @@ static const int ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3;
 static const int ERKSTEP_DEFAULT_4 = ARKODE_ZONNEVELD_5_3_4;
 static const int ERKSTEP_DEFAULT_5 = ARKODE_CASH_KARP_6_4_5;
 static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_8_5_6;
+static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7;
 static const int ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8;
+static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
 
 #ifndef DEFAULT_ERK_2
 /* DEPRECATED DEFAULT_ERK_2: use ERKSTEP_DEFAULT_2 */
diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c
index e1245168e0..ba5e4c3885 100644
--- a/src/arkode/arkode_arkstep.c
+++ b/src/arkode/arkode_arkstep.c
@@ -2031,14 +2031,19 @@ int arkStep_SetButcherTables(ARKodeMem ark_mem)
       etable = ARKSTEP_DEFAULT_ERK_6;
       break;
     case(7):
+      etable = ARKSTEP_DEFAULT_ERK_7;
+      break;
     case(8):
       etable = ARKSTEP_DEFAULT_ERK_8;
       break;
+    case(9):
+      etable = ARKSTEP_DEFAULT_ERK_9;
+      break;
     default:    /* no available method, set default */
       arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep",
                       "arkStep_SetButcherTables",
-                      "No explicit method at requested order, using q=6.");
-      etable = ARKSTEP_DEFAULT_ERK_6;
+                      "No explicit method at requested order, using q=9.");
+      etable = ARKSTEP_DEFAULT_ERK_9;
       break;
     }
 
diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def
index 5cfb3f2af6..ba719b24bc 100644
--- a/src/arkode/arkode_butcher_erk.def
+++ b/src/arkode/arkode_butcher_erk.def
@@ -36,11 +36,12 @@
   are known precisely enough for use in quad precision (128-bit)
   calculations.
 
-     imeth                       QP
-    --------------------------------
+     imeth                              QP
+    --------------------------------------
      ARKODE_HEUN_EULER_2_1_2             Y
      ARKODE_BOGACKI_SHAMPINE_4_2_3       Y
      ARKODE_ARK324L2SA_ERK_4_2_3*        N
+     ARKODE_SHU_OSHER_3_2_3              Y
      ARKODE_SOFRONIOU_SPALETTA_5_3_4     Y
      ARKODE_ZONNEVELD_5_3_4              Y
      ARKODE_ARK436L2SA_ERK_6_3_4*        N
@@ -54,9 +55,13 @@
      ARKODE_VERNER_8_5_6                 Y
      ARKODE_FEHLBERG_13_7_8              Y
      ARKODE_ARK2_ERK_3_1_2               Y
-    --------------------------------
+     ARKODE_VERNER_9_5_6                 Y
+     ARKODE_VERNER_10_6_7                Y
+     ARKODE_VERNER_13_7_8                Y
+     ARKODE_VERNER_16_8_9                Y
+    --------------------------------------
      ARKODE_KNOTH_WOLKE_3_3^             Y
-    --------------------------------
+    --------------------------------------
 */
 
 ARK_BUTCHER_TABLE(ARKODE_ERK_NONE, {
@@ -166,6 +171,29 @@ ARK_BUTCHER_TABLE(ARKODE_ARK324L2SA_ERK_4_2_3, { /* ARK3(2)4L[2]SA-ERK */
     return B;
   })
 
+ARK_BUTCHER_TABLE(ARKODE_SHU_OSHER_3_2_3, { /* Shu-Osher-ERK */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(3, SUNTRUE);
+    B->q = 3;
+    B->p = 2;
+
+    B->A[1][0] = RCONST(1.0);
+    B->A[2][0] = RCONST(1.0)/RCONST(4.0);
+    B->A[2][1] = RCONST(1.0)/RCONST(4.0);
+
+    B->b[0] = RCONST(1.0)/RCONST(6.0);
+    B->b[1] = RCONST(1.0)/RCONST(6.0);
+    B->b[2] = RCONST(2.0)/RCONST(3.0);
+
+    B->d[0] = RCONST(291485418878409.0)/RCONST(1.0e15);
+    B->d[1] = RCONST(291485418878409.0)/RCONST(1.0e15);
+    B->d[2] = RCONST(208514581121591.0)/RCONST(5.0e14);
+
+    B->c[1] = RCONST(1.0);
+    B->c[2] = RCONST(1.0)/RCONST(2.0);
+
+    return B;
+  })
+
 ARK_BUTCHER_TABLE(ARKODE_SOFRONIOU_SPALETTA_5_3_4, { /* Sofroniou-Spaletta-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
@@ -642,6 +670,350 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_8_5_6, { /* Verner-6-5 */
     return B;
   })
 
+ARK_BUTCHER_TABLE(ARKODE_VERNER_9_5_6, { /* Verner-6-5b (DOI: 10.1007/s11075-009-9290-3) */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(9, SUNTRUE);
+    B->q = 6;
+    B->p = 5;
+
+    B->A[1][0] =  RCONST(0.06);
+    B->A[2][0] =  RCONST(0.01923996296296296218408805600574851268902);
+    B->A[2][1] =  RCONST(0.07669337037037037008158080197972594760358);
+    B->A[3][0] =  RCONST(0.035975);
+    B->A[3][2] =  RCONST(0.107925);
+    B->A[4][0] =  RCONST(1.318683415233148359391179837984964251518);
+    B->A[4][2] =  RCONST(-5.042058063628561903612990136025473475456);
+    B->A[4][3] =  RCONST(4.220674648395413619539340288611128926277);
+    B->A[5][0] =  RCONST(-41.87259166432750845388000016100704669952);
+    B->A[5][2] =  RCONST(159.432562163137475863550207577645778656);
+    B->A[5][3] =  RCONST(-122.1192135650100425436903606168925762177);
+    B->A[5][4] =  RCONST(5.531743066200053071668207849143072962761);
+    B->A[6][0] =  RCONST(-54.43015693531650356362661113962531089783);
+    B->A[6][2] =  RCONST(207.0672513650184782818541862070560455322);
+    B->A[6][3] =  RCONST(-158.6108137845899932472093496471643447876);
+    B->A[6][4] =  RCONST(6.99181658595024213553870140458457171917);
+    B->A[6][5] =  RCONST(-0.01859723106220323093906721112489321967587);
+    B->A[7][0] =  RCONST(-54.66374178728197819054912542924284934998);
+    B->A[7][2] =  RCONST(207.9528062553893619224254507571458816528);
+    B->A[7][3] =  RCONST(-159.2889574744995115906931459903717041016);
+    B->A[7][4] =  RCONST(7.018743740796944408089075295720249414444);
+    B->A[7][5] =  RCONST(-0.01833878590504572220210022237552038859576);
+    B->A[7][6] =  RCONST(-0.000511948499788209866745436471546781831421);
+    B->A[8][0] =  RCONST(0.0343895786835703570760713887466408777982);
+    B->A[8][3] =  RCONST(0.2582624555633503682372520415810868144035);
+    B->A[8][4] =  RCONST(0.4209371189673536961528554911637911573052);
+    B->A[8][5] =  RCONST(4.405396469669310199890333024086430668831);
+    B->A[8][6] =  RCONST(-176.4831190242986451721662888303399085999);
+    B->A[8][7] =  RCONST(172.3641334014150743314530700445175170898);
+
+    B->b[0] =  RCONST(0.0343895786835703570760713887466408777982);
+    B->b[3] =  RCONST(0.2582624555633503682372520415810868144035);
+    B->b[4] =  RCONST(0.4209371189673536961528554911637911573052);
+    B->b[5] =  RCONST(4.405396469669310199890333024086430668831);
+    B->b[6] =  RCONST(-176.4831190242986451721662888303399085999);
+    B->b[7] =  RCONST(172.3641334014150743314530700445175170898);
+
+    B->d[0] =  RCONST(0.04909967648382489863179145572757988702506);
+    B->d[3] =  RCONST(0.2251112229516524232408869465871248394251);
+    B->d[4] =  RCONST(0.4694682253029561769253064085205551236868);
+    B->d[5] =  RCONST(0.806579224998886790132246460416354238987);
+    B->d[7] =  RCONST(-0.607119489177795901291290192602900788188);
+    B->d[8] =  RCONST(0.05686113944047568868889186433079885318875);
+
+    B->c[1] =  RCONST(0.06);
+    B->c[2] =  RCONST(0.09593333333333333333333333333333333333333);
+    B->c[3] =  RCONST(0.1439);
+    B->c[4] =  RCONST(0.4973);
+    B->c[5] =  RCONST(0.9725);
+    B->c[6] =  RCONST(0.9995);
+    B->c[7] =  RCONST(1.0);
+    B->c[8] =  RCONST(1.0);
+    return B;
+  })
+
+ARK_BUTCHER_TABLE(ARKODE_VERNER_10_6_7, { /* Verner-7-6 (DOI: 10.1007/s11075-009-9290-3) */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(10, SUNTRUE);
+    B->q = 7;
+    B->p = 6;
+
+    B->A[1][0] =  RCONST(0.005);
+    B->A[2][0] =  RCONST(-1.076790123456790123456790123456790123457);
+    B->A[2][1] =  RCONST(1.185679012345679012345679012345679012346);
+    B->A[3][0] =  RCONST(0.04083333333333333333333333333333333333333);
+    B->A[3][2] =  RCONST(0.1225);
+    B->A[4][0] =  RCONST(0.6389139236255726439495106205868069082499);
+    B->A[4][2] =  RCONST(-2.45567263822365688952231721486896276474);
+    B->A[4][3] =  RCONST(2.272258714598084150537715686368755996227);
+    B->A[5][0] =  RCONST(-2.661577375018756796976049372460693120956);
+    B->A[5][2] =  RCONST(10.80451388645613874928130826447159051895);
+    B->A[5][3] =  RCONST(-8.353914657396199316963247838430106639862);
+    B->A[5][4] =  RCONST(0.8204875949566569071080834874010179191828);
+    B->A[6][0] =  RCONST(6.067741434696771740675558248767629265785);
+    B->A[6][2] =  RCONST(-24.71127363591108760942915978375822305679);
+    B->A[6][3] =  RCONST(20.42751793078889477328630164265632629395);
+    B->A[6][4] =  RCONST(-1.906157978816647169395537275704555213451);
+    B->A[6][5] =  RCONST(1.006172249242067939789535557792987674475);
+    B->A[7][0] =  RCONST(12.05467007625320441377425595419481396675);
+    B->A[7][2] =  RCONST(-49.75478495046898785858502378687262535095);
+    B->A[7][3] =  RCONST(41.14288863860467415634047938510775566101);
+    B->A[7][4] =  RCONST(-4.461760149974003830664059933042153716087);
+    B->A[7][5] =  RCONST(2.042334822239175284863677006796933710575);
+    B->A[7][6] =  RCONST(-0.0983484366540610666085342472797492519021);
+    B->A[8][0] =  RCONST(10.13814652288180795380867493804544210434);
+    B->A[8][2] =  RCONST(-42.64113603171750099818382295779883861542);
+    B->A[8][3] =  RCONST(35.76384003992257021309342235326766967773);
+    B->A[8][4] =  RCONST(-4.348022840392907539808220462873578071594);
+    B->A[8][5] =  RCONST(2.009862268377035743327496675192378461361);
+    B->A[8][6] =  RCONST(0.3487490460338271702767087845131754875183);
+    B->A[8][7] =  RCONST(-0.2714390051048312657577810114162275567651);
+    B->A[9][0] =  RCONST(-45.03007203429867644217665656469762325287);
+    B->A[9][2] =  RCONST(187.3272437654588884470285847783088684082);
+    B->A[9][3] =  RCONST(-154.0288236935018630902050063014030456543);
+    B->A[9][4] =  RCONST(18.56465306347536170505918562412261962891);
+    B->A[9][5] =  RCONST(-7.141809679295079149596858769655227661133);
+    B->A[9][6] =  RCONST(1.3088085781613787439425777847645804286);
+
+    B->b[0] =  RCONST(0.04715561848627222024665783806085528340191);
+    B->b[3] =  RCONST(0.2575056429843415317648691598151344805956);
+    B->b[4] =  RCONST(0.2621665397741262393260797125549288466573);
+    B->b[5] =  RCONST(0.1521609265673855848621798259046045131981);
+    B->b[6] =  RCONST(0.4939969170032484924171001239301403984427);
+    B->b[7] =  RCONST(-0.2943031171403250323415079492406221106648);
+    B->b[8] =  RCONST(0.08131747232495110944139327102675451897085);
+
+    B->d[0] =  RCONST(0.04460860660634117375034080055229424033314);
+    B->d[3] =  RCONST(0.2671640378571372709259890143584925681353);
+    B->d[4] =  RCONST(0.2201018300177293163244485185714438557625);
+    B->d[5] =  RCONST(0.2188431703143156881186115469972719438374);
+    B->d[6] =  RCONST(0.2289871705411202773561285539472009986639);
+    B->d[9] =  RCONST(0.02029518466335628046337546948052477091551);
+
+    B->c[1] =  RCONST(0.005);
+    B->c[2] =  RCONST(0.1088888888888888888888888888888888888889);
+    B->c[3] =  RCONST(0.1633333333333333333333333333333333333333);
+    B->c[4] =  RCONST(0.4555);
+    B->c[5] =  RCONST(0.6095094489978380991601625282783061265945);
+    B->c[6] =  RCONST(0.884);
+    B->c[7] =  RCONST(0.925);
+    B->c[8] =  RCONST(1.0);
+    B->c[9] =  RCONST(1.0);
+    return B;
+  })
+
+ARK_BUTCHER_TABLE(ARKODE_VERNER_13_7_8, { /* Verner-8-7 (DOI: 10.1007/s11075-009-9290-3) */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(13, SUNTRUE);
+    B->q = 8;
+    B->p = 7;
+
+    B->A[1][0] =  RCONST(0.05);
+    B->A[2][0] =  RCONST(-0.006993164062499999597544153573380754096434);
+    B->A[2][1] =  RCONST(0.1135556640625000057731597280508140102029);
+    B->A[3][0] =  RCONST(0.0399609375);
+    B->A[3][2] =  RCONST(0.1198828125);
+    B->A[4][0] =  RCONST(0.3613975628004575391116759419674053788185);
+    B->A[4][2] =  RCONST(-1.341524066700492845427561405813321471214);
+    B->A[4][3] =  RCONST(1.370126503900035208616259296832140535116);
+    B->A[5][0] =  RCONST(0.04904720279720279491053602782812959048897);
+    B->A[5][3] =  RCONST(0.2350972042214404811311112553084967657924);
+    B->A[5][4] =  RCONST(0.1808555929813567275665775468951324000955);
+    B->A[6][0] =  RCONST(0.06169289044289043982827180911954201292247);
+    B->A[6][3] =  RCONST(0.112365683146402772774052891691098921001);
+    B->A[6][4] =  RCONST(-0.03885046071451366683779937716280983295292);
+    B->A[6][5] =  RCONST(0.01979188712522046006414555563424073625356);
+    B->A[7][0] =  RCONST(-1.767630240222326953869469434721395373344);
+    B->A[7][3] =  RCONST(-62.5);
+    B->A[7][4] =  RCONST(-6.061889377376669330033109872601926326752);
+    B->A[7][5] =  RCONST(5.6508231982227634659921022830531001091);
+    B->A[7][6] =  RCONST(65.6216964193762350987526588141918182373);
+    B->A[8][0] =  RCONST(-1.180945066554970779293398663867264986038);
+    B->A[8][3] =  RCONST(-41.50473441114321104805640061385929584503);
+    B->A[8][4] =  RCONST(-4.434438319103724879255423729773610830307);
+    B->A[8][5] =  RCONST(4.26040818858613334896290325559675693512);
+    B->A[8][6] =  RCONST(43.75364022446171219371535698883235454559);
+    B->A[8][7] =  RCONST(0.007871425489912309975126802896738809067756);
+    B->A[9][0] =  RCONST(-1.281405999441488363643770753697026520967);
+    B->A[9][3] =  RCONST(-45.04713996013986587740873801521956920624);
+    B->A[9][4] =  RCONST(-4.731362069449575713520061981398612260818);
+    B->A[9][5] =  RCONST(4.514967016593807613844546722248196601868);
+    B->A[9][6] =  RCONST(47.4490955717298490412758837919682264328);
+    B->A[9][7] =  RCONST(0.01059228297111661047658071055366235668771);
+    B->A[9][8] =  RCONST(-0.005746842263844615696088968803678653785028);
+    B->A[10][0] =  RCONST(-1.724470134262485077059068316884804517031);
+    B->A[10][3] =  RCONST(-60.92349008483054007001555874012410640717);
+    B->A[10][4] =  RCONST(-5.951518376222391992769189528189599514008);
+    B->A[10][5] =  RCONST(5.55652373069845673114741657627746462822);
+    B->A[10][6] =  RCONST(63.98301198033306036450085230171680450439);
+    B->A[10][7] =  RCONST(0.01464202825041496271174512600055095390417);
+    B->A[10][8] =  RCONST(0.06460408772358203211005900357122300192714);
+    B->A[10][9] =  RCONST(-0.07930323169008879347074980614706873893738);
+    B->A[11][0] =  RCONST(-3.30162266774707902072805154602974653244);
+    B->A[11][3] =  RCONST(-118.0112723597525103969019255600869655609);
+    B->A[11][4] =  RCONST(-10.14142238845611210251718148356303572655);
+    B->A[11][5] =  RCONST(9.139311332232058049385159392841160297394);
+    B->A[11][6] =  RCONST(123.3759428284042769519146531820297241211);
+    B->A[11][7] =  RCONST(4.623244378874581173022306757047772407532);
+    B->A[11][8] =  RCONST(-3.383277738068201756505004595965147018433);
+    B->A[11][9] =  RCONST(4.527592100324618229478801367804408073425);
+    B->A[11][10] =  RCONST(-5.828495485811623133542980212951079010963);
+    B->A[12][0] =  RCONST(-3.039515033766308604867845133412629365921);
+    B->A[12][3] =  RCONST(-109.260868089417627402326615992933511734);
+    B->A[12][4] =  RCONST(-9.290642497400291688336437800899147987366);
+    B->A[12][5] =  RCONST(8.43050498176491203139448771253228187561);
+    B->A[12][6] =  RCONST(114.2010010378331372749016736634075641632);
+    B->A[12][7] =  RCONST(-0.9637271342145479202656588313402608036995);
+    B->A[12][8] =  RCONST(-5.034884088802189516798080148873850703239);
+    B->A[12][9] =  RCONST(5.958130824002923375815043982584029436111);
+
+    B->b[0] =  RCONST(0.04427989419007950788742533632103004492819);
+    B->b[5] =  RCONST(0.3541049391724448991425333588267676532269);
+    B->b[6] =  RCONST(0.2479692154956437688539949704136233776808);
+    B->b[7] =  RCONST(-15.69420203883808540012978482991456985474);
+    B->b[8] =  RCONST(25.08406496555856435293208051007241010666);
+    B->b[9] =  RCONST(-31.73836778626027665950459777377545833588);
+    B->b[10] =  RCONST(22.93828327398878386134128959383815526962);
+    B->b[11] =  RCONST(-0.2361324633071542056228508954518474638462);
+
+    B->d[0] =  RCONST(0.04431261522908979538781792939516890328377);
+    B->d[5] =  RCONST(0.3546095642343226606030270886549260467291);
+    B->d[6] =  RCONST(0.2478480431366653080615947146725375205278);
+    B->d[7] =  RCONST(4.448134732475784502980786783155053853989);
+    B->d[8] =  RCONST(19.8468863661187349123338208300992846489);
+    B->d[9] =  RCONST(-23.58162337746561831863800762221217155457);
+    B->d[12] =  RCONST(-0.3601679437289775354003040774841792881489);
+
+    B->c[1] =  RCONST(0.05);
+    B->c[2] =  RCONST(0.1065625);
+    B->c[3] =  RCONST(0.15984375);
+    B->c[4] =  RCONST(0.39);
+    B->c[5] =  RCONST(0.465);
+    B->c[6] =  RCONST(0.155);
+    B->c[7] =  RCONST(0.943);
+    B->c[8] =  RCONST(0.9018020417358569851273841777583584189415);
+    B->c[9] =  RCONST(0.909);
+    B->c[10] =  RCONST(0.94);
+    B->c[11] =  RCONST(1.0);
+    B->c[12] =  RCONST(1.0);
+    return B;
+  })
+
+ARK_BUTCHER_TABLE(ARKODE_VERNER_16_8_9, { /* Verner-9-8 (DOI: 10.1007/s11075-009-9290-3) */
+    ARKodeButcherTable B = ARKodeButcherTable_Alloc(16, SUNTRUE);
+    B->q = 9;
+    B->p = 8;
+
+    B->A[1][0] = RCONST(0.3462e-1);
+    B->A[2][0] = RCONST(-0.389335438857287327017042687229284478532e-1);
+    B->A[2][1] = RCONST(0.1359578945245091786499878854939346230295);
+    B->A[3][0] = RCONST(0.3638413148954266723060635628912731569111e-1);
+    B->A[3][2] = RCONST(0.1091523944686280016918190688673819470733);
+    B->A[4][0] = RCONST(2.025763914393969636805657604282571047511);
+    B->A[4][2] = RCONST(-7.638023836496292020387602153091964592952);
+    B->A[4][3] = RCONST(6.173259922102322383581944548809393545442);
+    B->A[5][0] = RCONST(0.5112275589406060872792270881648288397197e-1);
+    B->A[5][3] = RCONST(0.1770823794555021537929910813839068684087);
+    B->A[5][4] = RCONST(0.80277624092225014536138698108025283759e-3);
+    B->A[6][0] = RCONST(0.1316006357975216279279871693164256985334);
+    B->A[6][3] = RCONST(-0.2957276252669636417685183174672273730699);
+    B->A[6][4] = RCONST(0.878137803564295237421124704053886667082e-1);
+    B->A[6][5] = RCONST(0.6213052975225274774321435005639430026100);
+    B->A[7][0] = RCONST(0.7166666666666666666666666666666666666667e-1);
+    B->A[7][5] = RCONST(0.3305533578915319409260346730051472207728);
+    B->A[7][6] = RCONST(0.2427799754418013924072986603281861125606);
+    B->A[8][0] = RCONST(0.7180664062500000000000000000000000000000e-1);
+    B->A[8][5] = RCONST(0.3294380283228177160744825466257672816401);
+    B->A[8][6] = RCONST(0.1165190029271822839255174533742327183599);
+    B->A[8][7] = RCONST(-0.3401367187500000000000000000000000000000e-1);
+    B->A[9][0] = RCONST(0.4836757646340646986611287718844085773549e-1);
+    B->A[9][5] = RCONST(0.3928989925676163974333190042057047002852e-1);
+    B->A[9][6] = RCONST(0.1054740945890344608263649267140088017604);
+    B->A[9][7] = RCONST(-0.2143865284648312665982642293830533996214e-1);
+    B->A[9][8] = RCONST(-0.1041229174627194437759832813847147895623);
+    B->A[10][0] = RCONST(-0.2664561487201478635337289243849737340534e-1);
+    B->A[10][5] = RCONST(0.3333333333333333333333333333333333333333e-1);
+    B->A[10][6] = RCONST(-0.1631072244872467239162704487554706387141);
+    B->A[10][7] = RCONST(0.3396081684127761199487954930015522928244e-1);
+    B->A[10][8] = RCONST(0.1572319413814626097110769806810024118077);
+    B->A[10][9] = RCONST(0.2152267478031879552303534778794770376960);
+    B->A[11][0] = RCONST(0.3689009248708622334786359863227633989718e-1);
+    B->A[11][5] = RCONST(-0.1465181576725542928653609891758501156785);
+    B->A[11][6] = RCONST(0.2242577768172024345345469822625833796001);
+    B->A[11][7] = RCONST(0.2294405717066072637090897902753790803034e-1);
+    B->A[11][8] = RCONST(-0.35850052905728761357394424889330334334e-2);
+    B->A[11][9] = RCONST(0.8669223316444385506869203619044453906053e-1);
+    B->A[11][10] = RCONST(0.4383840651968337846196219974168630120572);
+    B->A[12][0] = RCONST(-0.4866012215113340846662212357570395295088);
+    B->A[12][5] = RCONST(-6.304602650282852990657772792012007122988);
+    B->A[12][6] = RCONST(-0.281245618289472564778284183790118418111);
+    B->A[12][7] = RCONST(-2.679019236219849057687906597489223155566);
+    B->A[12][8] = RCONST(0.518815663924157511565311164615012522024);
+    B->A[12][9] = RCONST(1.365353187603341710683633635235238678626);
+    B->A[12][10] = RCONST(5.885091088503946585721274891680604830712);
+    B->A[12][11] = RCONST(2.802808786272062889819965117517532194812);
+    B->A[13][0] = RCONST(0.4185367457753471441471025246471931649633);
+    B->A[13][5] = RCONST(6.724547581906459363100870806514855026676);
+    B->A[13][6] = RCONST(-0.425444280164611790606983409697113064616);
+    B->A[13][7] = RCONST(3.343279153001265577811816947557982637749);
+    B->A[13][8] = RCONST(0.617081663117537759528421117507709784737);
+    B->A[13][9] = RCONST(-0.929966123939932833937749523988800852013);
+    B->A[13][10] = RCONST(-6.099948804751010722472962837945508844846);
+    B->A[13][11] = RCONST(-3.002206187889399044804158084895173690015);
+    B->A[13][12] = RCONST(0.2553202529443445472336424602988558373637);
+    B->A[14][0] = RCONST(-0.779374086122884664644623040843840506343);
+    B->A[14][5] = RCONST(-13.93734253810777678786523664804936051203);
+    B->A[14][6] = RCONST(1.252048853379357320949735183924200895136);
+    B->A[14][7] = RCONST(-14.69150040801686878191527989293072091588);
+    B->A[14][8] = RCONST(-0.494705058533141685655191992136962873577);
+    B->A[14][9] = RCONST(2.242974909146236657906984549543692874755);
+    B->A[14][10] = RCONST(13.36789380382864375813864978592679139881);
+    B->A[14][11] = RCONST(14.39665048665068644512236935340272139005);
+    B->A[14][12] = RCONST(-0.7975813331776800379127866056663258667437);
+    B->A[14][13] = RCONST(0.4409353709534277758753793068298041158235);
+    B->A[15][0] = RCONST(2.058051337466886442151242368989994043993);
+    B->A[15][5] = RCONST(22.35793772796803295519317565842520212899);
+    B->A[15][6] = RCONST(0.90949810997556332745009198137971890783);
+    B->A[15][7] = RCONST(35.89110098240264104710550686568482456493);
+    B->A[15][8] = RCONST(-3.442515027624453437985000403608480262211);
+    B->A[15][9] = RCONST(-4.865481358036368826566013387928704014496);
+    B->A[15][10] = RCONST(-18.90980381354342625688427480879773032857);
+    B->A[15][11] = RCONST(-34.26354448030451782929251177395134170515);
+    B->A[15][12] = RCONST(1.264756521695642578827783499806516664686);
+
+    B->b[0] = RCONST(0.1461197685842315252051541915018784713459e-1);
+    B->b[7] = RCONST(-0.3915211862331339089410228267288242030810);
+    B->b[8] = RCONST(0.2310932500289506415909675644868993669908);
+    B->b[9] = RCONST(0.1274766769992852382560589467488989175618);
+    B->b[10] = RCONST(0.2246434176204157731566981937082069688984);
+    B->b[11] = RCONST(0.5684352689748512932705226972873692126743);
+    B->b[12] = RCONST(0.5825871557215827200814768021863420902155e-1);
+    B->b[13] = RCONST(0.1364317403482215641609022744494239843327);
+    B->b[14] = RCONST(0.3057013983082797397721005067920369646664e-1);
+
+    B->d[0] = RCONST(0.1996996514886773085518508418098868756464e-1);
+    B->d[7] = RCONST(2.191499304949330054530747099310837524864);
+    B->d[8] = RCONST(0.8857071848208438030833722031786358862953e-1);
+    B->d[9] = RCONST(0.1140560234865965622484956605091432032674);
+    B->d[10] = RCONST(0.2533163805345107065564577734569651977347);
+    B->d[11] = RCONST(-2.056564386240941011158999594595981300493);
+    B->d[12] = RCONST(0.3408096799013119935160094894224543812830);
+    B->d[15] = RCONST(0.4834231373823958314376726739772871714902e-1);
+
+    B->c[1] = RCONST(0.3462e-1);
+    B->c[2] = RCONST(0.9702435063878044594828361677100617517633e-1);
+    B->c[3] = RCONST(0.1455365259581706689224254251565092627645);
+    B->c[4] = RCONST(0.561);
+    B->c[5] = RCONST(0.2290079115904850126662751771814700052182);
+    B->c[6] = RCONST(0.5449920884095149873337248228185299947818);
+    B->c[7] = RCONST(0.645);
+    B->c[8] = RCONST(0.48375);
+    B->c[9] = RCONST(0.6757e-1);
+    B->c[10] = RCONST(0.25);
+    B->c[11] = RCONST(0.6590650618730998549405331618649220295334);
+    B->c[12] = RCONST(0.8206);
+    B->c[13] = RCONST(0.9012);
+    B->c[14] = RCONST(1.0);
+    B->c[15] = RCONST(1.0);
+    return B;
+  })
+
 ARK_BUTCHER_TABLE(ARKODE_FEHLBERG_13_7_8, { /* Fehlberg-8-7 */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(13, SUNTRUE);
     B->q = 8;
diff --git a/src/arkode/arkode_erkstep.c b/src/arkode/arkode_erkstep.c
index f21aa2602b..ebc413e576 100644
--- a/src/arkode/arkode_erkstep.c
+++ b/src/arkode/arkode_erkstep.c
@@ -957,14 +957,19 @@ int erkStep_SetButcherTable(ARKodeMem ark_mem)
     etable = ERKSTEP_DEFAULT_6;
     break;
   case(7):
+    etable = ERKSTEP_DEFAULT_7;
+    break;
   case(8):
     etable = ERKSTEP_DEFAULT_8;
     break;
+  case(9):
+    etable = ERKSTEP_DEFAULT_9;
+    break;
   default:    /* no available method, set default */
     arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ERKStep",
                     "erkStep_SetButcherTable",
-                    "No explicit method at requested order, using q=6.");
-    etable = ERKSTEP_DEFAULT_6;
+                    "No explicit method at requested order, using q=9.");
+    etable = ERKSTEP_DEFAULT_9;
     break;
   }
 
diff --git a/test/answers b/test/answers
index 8f1d469a42..37f4e6b5b6 160000
--- a/test/answers
+++ b/test/answers
@@ -1 +1 @@
-Subproject commit 8f1d469a426ffb562361ab2aa1702ad15194cb2c
+Subproject commit 37f4e6b5b68e407ea302facba92883126dd39bf7
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.cpp
index 8ad033603d..3bf3f3e4c1 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.cpp
@@ -34,7 +34,9 @@ int main() {
     "ARKODE_ARK436L2SA_ERK_6_3_4", "ARKODE_SAYFY_ABURUB_6_3_4", "ARKODE_CASH_KARP_6_4_5",
     "ARKODE_FEHLBERG_6_4_5", "ARKODE_DORMAND_PRINCE_7_4_5", "ARKODE_ARK548L2SA_ERK_8_4_5",
     "ARKODE_VERNER_8_5_6", "ARKODE_FEHLBERG_13_7_8", "ARKODE_ARK437L2SA_ERK_7_3_4",
-    "ARKODE_ARK548L2SAb_ERK_8_4_5"};
+    "ARKODE_ARK548L2SAb_ERK_8_4_5", "ARKODE_SOFRONIOU_SPALETTA_5_3_4",
+    "ARKODE_SHU_OSHER_3_2_3", "ARKODE_VERNER_9_5_6", "ARKODE_VERNER_10_6_7",
+    "ARKODE_VERNER_13_7_8", "ARKODE_VERNER_16_8_9"};
   std::vector<std::string> Tables_DIRK = {"ARKODE_SDIRK_2_1_2", "ARKODE_ARK2_DIRK_3_1_2",
     "ARKODE_BILLINGTON_3_3_2", "ARKODE_TRBDF2_3_3_2", "ARKODE_KVAERNO_4_2_3",
     "ARKODE_ARK324L2SA_DIRK_4_2_3", "ARKODE_CASH_5_2_4", "ARKODE_CASH_5_3_4",
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out
index 8d7971338b..b7c11bcecf 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out
@@ -22,6 +22,30 @@ ARKodeButcherTable_CheckOrder:
   embedding order = 6
 Testing method ARKODE_ARK437L2SA_ERK_7_3_4:  table matches predicted method/embedding orders of 4/3
 Testing method ARKODE_ARK548L2SAb_ERK_8_4_5:  table matches predicted method/embedding orders of 5/4
+Testing method ARKODE_SOFRONIOU_SPALETTA_5_3_4:  table matches predicted method/embedding orders of 4/3
+Testing method ARKODE_SHU_OSHER_3_2_3:  table matches predicted method/embedding orders of 3/2
+Testing method ARKODE_VERNER_9_5_6:  table matches predicted method/embedding orders of 6/5
+Testing method ARKODE_VERNER_10_6_7:  WARNING:
+ARKodeButcherTable_CheckOrder:
+  method order >= 6; reverting to simplifying assumptions
+  method order = 6
+
+  embedding order >= 6; reverting to simplifying assumptions
+  embedding order = 6
+Testing method ARKODE_VERNER_13_7_8:  WARNING:
+ARKodeButcherTable_CheckOrder:
+  method order >= 6; reverting to simplifying assumptions
+  method order = 6
+
+  embedding order >= 6; reverting to simplifying assumptions
+  embedding order = 6
+Testing method ARKODE_VERNER_16_8_9:  WARNING:
+ARKodeButcherTable_CheckOrder:
+  method order >= 6; reverting to simplifying assumptions
+  method order = 6
+
+  embedding order >= 6; reverting to simplifying assumptions
+  embedding order = 6
 
 Testing individual DIRK methods:
 

From 26317e2396002d5c96ca1d3ae8ce41f04275ebc8 Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Wed, 1 Nov 2023 22:08:44 -0700
Subject: [PATCH 16/35] Bugfix: Remove MPI wtime in profiler (#317)

Updated `SUNProfiler` to note rely on `MPI_WTime`. Fixes #312

---------

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 .github/workflows/windows-latest-mingw.yml    |   2 +-
 .github/workflows/windows-latest.yml          |   2 +-
 CHANGELOG.md                                  |   4 +-
 cmake/SundialsSetupCompilers.cmake            |   7 -
 cmake/macros/SundialsAddLibrary.cmake         |   4 +
 doc/arkode/guide/source/Introduction.rst      |   4 +-
 doc/cvode/guide/source/Introduction.rst       |   3 +
 doc/cvodes/guide/source/Introduction.rst      |   3 +
 doc/ida/guide/source/Introduction.rst         |   3 +
 doc/idas/guide/source/Introduction.rst        |   3 +
 doc/kinsol/guide/source/Introduction.rst      |   3 +
 doc/shared/Install.rst                        |   1 +
 doc/shared/sundials/Profiling.rst             |  30 ++
 include/sundials/sundials_profiler.h          |  61 +--
 include/sundials/sundials_profiler.hpp        |  52 +++
 scripts/shared                                |   2 +
 src/sundials/CMakeLists.txt                   |   1 +
 src/sundials/sundials_profiler.c              | 352 +++++++++++-------
 test/unit_tests/CMakeLists.txt                |   3 +
 .../arkode/CXX_serial/CMakeLists.txt          |  17 +-
 .../CXX_serial/ark_test_analytic_sys_mri.cpp  |   9 +-
 .../CXX_serial/ark_test_dahlquist_mri.cpp     |  17 +-
 .../unit_tests/arkode/C_serial/CMakeLists.txt |  16 +-
 test/unit_tests/profiling/CMakeLists.txt      |  60 +++
 test/unit_tests/profiling/test_profiling.cpp  | 240 ++++++++++++
 25 files changed, 686 insertions(+), 213 deletions(-)
 create mode 100644 include/sundials/sundials_profiler.hpp
 create mode 100644 test/unit_tests/profiling/CMakeLists.txt
 create mode 100644 test/unit_tests/profiling/test_profiling.cpp

diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
index ef1fad6ee2..ab20ea721a 100644
--- a/.github/workflows/windows-latest-mingw.yml
+++ b/.github/workflows/windows-latest-mingw.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+      run: cmake -G "MinGW Makefiles" -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_LOGGING_LEVEL=2 -DSUNDIALS_TEST_UNITTESTS=OFF -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build
       # Build your program with the given configuration
diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml
index fee4f246d9..d640eb6bd2 100644
--- a/.github/workflows/windows-latest.yml
+++ b/.github/workflows/windows-latest.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC_LIBS=OFF
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC_LIBS=OFF -DSUNDIALS_BUILD_WITH_PROFILING=ON -DSUNDIALS_LOGGING_LEVEL=2 -DSUNDIALS_TEST_UNITTESTS=ON -DEXAMPLES_ENABLE_CXX=ON
 
     - name: Build
       # Build your program with the given configuration
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34c8cf9949..8d41c15931 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@ Fixed scaling bug in `SUNMatScaleAddI_Sparse` for non-square matrices.
 Fixed missing soversions in some `SUNLinearSolver` and `SUNNonlinearSolver`
 CMake targets.
 
-Added Fortran support for the LAPACK dense `SUNLinearSolver` implementations.
+Added Fortran support for the LAPACK dense `SUNLinearSolver` implementation.
 
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
@@ -38,6 +38,8 @@ ERK method `ARKODE_SOFRONIOU_SPALETTA_5_3_4`, the sixth order ERK method
 the eighth order ERK method `ARKODE_VERNER_13_7_8`, and the ninth order ERK
 method `ARKODE_VERNER_16_8_9`.
 
+Changed the `SUNProfiler` so that it does not rely on `MPI_WTime` in any case.
+This fixes https://github.com/LLNL/sundials/issues/312. 
 
 ## Changes to SUNDIALS in release 6.6.1
 
diff --git a/cmake/SundialsSetupCompilers.cmake b/cmake/SundialsSetupCompilers.cmake
index 3cd0c055a0..b993ec85f5 100644
--- a/cmake/SundialsSetupCompilers.cmake
+++ b/cmake/SundialsSetupCompilers.cmake
@@ -223,13 +223,6 @@ if(SUNDIALS_POSIX_TIMERS AND POSIX_TIMERS_NEED_POSIX_C_SOURCE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_POSIX_C_SOURCE=${SUNDIALS_POSIX_C_SOURCE}")
 endif()
 
-# Check if profiling is being built with no timers.
-if(SUNDIALS_BUILD_WITH_PROFILING AND
-   (NOT ENABLE_CALIPER) AND
-   (NOT ENABLE_MPI) AND
-   (NOT SUNDIALS_POSIX_TIMERS))
-  message(SEND_ERROR "The SUNDIALS native profiler requires POSIX timers or MPI_Wtime, but neither were found.")
-endif()
 
 # ---------------------------------------------------------------
 # Check for deprecated attribute with message
diff --git a/cmake/macros/SundialsAddLibrary.cmake b/cmake/macros/SundialsAddLibrary.cmake
index 96d71765ec..5bf25ab4b8 100644
--- a/cmake/macros/SundialsAddLibrary.cmake
+++ b/cmake/macros/SundialsAddLibrary.cmake
@@ -152,6 +152,8 @@ macro(sundials_add_library target)
     # create the target for the object library
     add_library(${obj_target} OBJECT ${sources})
 
+    set_target_properties(${obj_target} PROPERTIES FOLDER "obj")
+
     # add all object libraries to object library
     if(sundials_add_library_OBJECT_LIBRARIES)
       target_link_libraries(${obj_target}
@@ -229,6 +231,8 @@ macro(sundials_add_library target)
 
       add_library(${_actual_target_name} ${_libtype} $<TARGET_OBJECTS:${obj_target}>)
 
+      set_target_properties(${_actual_target_name} PROPERTIES FOLDER "src")
+
       # add any object library dependencies
       if(sundials_add_library_OBJECT_LIBRARIES)
         if(${_libtype} MATCHES "STATIC")
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 8a0e8702d2..dd4e67ae9d 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -162,6 +162,9 @@ ERK method ``ARKODE_SOFRONIOU_SPALETTA_5_3_4``, the sixth order ERK method
 the eighth order ERK method ``ARKODE_VERNER_13_7_8``, and the ninth order ERK
 method ``ARKODE_VERNER_16_8_9``.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v5.6.1
@@ -993,7 +996,6 @@ utilize a zero initial guess.
 A bug was fixed in the ARKODE stepper modules where the stop time may be passed
 after resetting the integrator.
 
-
 Changes in v4.7.0
 -----------------
 
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index 7a175c0ca0..b4c2388e34 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -129,6 +129,9 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v6.6.1
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index bb561ccca5..d6ff7db84e 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -132,6 +132,9 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v6.6.1
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 9f54d64a68..369147817e 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -90,6 +90,9 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v6.6.1
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index 0073960dc2..4dc93c7b41 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -107,6 +107,9 @@ Fixed scaling bug in ``SUNMatScaleAddI_Sparse`` for non-square matrices.
 Fixed missing soversions in some ``SUNLinearSolver`` and ``SUNNonlinearSolver``
 CMake targets.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
 Changes in v5.6.1
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index ee33d5a33a..a4c33cc470 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -112,6 +112,9 @@ Updated the Tpetra NVector interface to support Trilinos 14.
 Fixed a memory leak when destroying a CUDA, HIP, SYCL, or system SUNMemoryHelper
 object.
 
+Changed the ``SUNProfiler`` so that it does not rely on ``MPI_WTime`` in any case.
+This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_. 
+
 Changes in v6.6.0
 -----------------
 
diff --git a/doc/shared/Install.rst b/doc/shared/Install.rst
index f6126c9bb0..f132538739 100644
--- a/doc/shared/Install.rst
+++ b/doc/shared/Install.rst
@@ -1022,6 +1022,7 @@ illustration only.
 .. cmakeoption:: SUNDIALS_BUILD_WITH_PROFILING
 
    Build SUNDIALS with capabilties for fine-grained profiling.
+   This requires POSIX timers or the Windows ``profileapi.h`` timers.
 
    Default: OFF
 
diff --git a/doc/shared/sundials/Profiling.rst b/doc/shared/sundials/Profiling.rst
index 4f9e9357df..4695643f29 100644
--- a/doc/shared/sundials/Profiling.rst
+++ b/doc/shared/sundials/Profiling.rst
@@ -48,6 +48,11 @@ If Caliper is enabled, then users should refer to the `Caliper documentation <ht
 for information on getting profiler output. In most cases, this involves
 setting the ``CALI_CONFIG`` environment variable.
 
+
+.. note:: 
+
+   The SUNDIALS profiler requires POSIX timers or the Windows ``profileapi.h`` timers.
+
 .. warning::
 
    While the SUNDIALS profiling scheme is relatively lightweight, enabling
@@ -149,6 +154,31 @@ are available.
       * Returns zero if successful, or non-zero if an error occurred
 
 
+.. c:function:: int SUNProfiler_GetElapsedTime(SUNProfiler p, const char* name, double* time)
+
+   Get the elapsed time for the timer "name" in seconds.
+
+   **Arguments:**
+      * ``p`` -- a ``SUNProfiler`` object
+      * ``name`` -- the name for the profiling region of interest
+      * ``time`` -- upon return, the elapsed time for the timer
+
+   **Returns:**
+      * Returns zero if successful, or non-zero if an error occurred
+
+
+.. c:function:: int SUNProfiler_GetTimerResolution(SUNProfiler p, double* resolution)
+
+   Get the timer resolution in seconds.
+
+   **Arguments:**
+      * ``p`` -- a ``SUNProfiler`` object
+      * ``resolution`` -- upon return, the resolution for the timer
+
+   **Returns:**
+      * Returns zero if successful, or non-zero if an error occurred
+
+
 .. c:function:: int SUNProfiler_Print(SUNProfiler p, FILE* fp)
 
    Prints out a profiling summary. When constructed with an MPI comm the summary
diff --git a/include/sundials/sundials_profiler.h b/include/sundials/sundials_profiler.h
index f50b7b761c..a7a1666736 100644
--- a/include/sundials/sundials_profiler.h
+++ b/include/sundials/sundials_profiler.h
@@ -23,16 +23,21 @@
 #include "caliper/cali.h"
 #endif
 
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
+#ifdef __cplusplus /* wrapper to enable C++ usage */
 extern "C" {
 #endif
 
-typedef struct _SUNProfiler *SUNProfiler;
+typedef struct _SUNProfiler* SUNProfiler;
 
-SUNDIALS_EXPORT int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p);
+SUNDIALS_EXPORT int SUNProfiler_Create(void* comm, const char* title,
+                                       SUNProfiler* p);
 SUNDIALS_EXPORT int SUNProfiler_Free(SUNProfiler* p);
 SUNDIALS_EXPORT int SUNProfiler_Begin(SUNProfiler p, const char* name);
 SUNDIALS_EXPORT int SUNProfiler_End(SUNProfiler p, const char* name);
+SUNDIALS_EXPORT int SUNProfiler_GetTimerResolution(SUNProfiler p,
+                                                   double* resolution);
+SUNDIALS_EXPORT int SUNProfiler_GetElapsedTime(SUNProfiler p, const char* name,
+                                               double* time);
 SUNDIALS_EXPORT int SUNProfiler_Print(SUNProfiler p, FILE* fp);
 SUNDIALS_EXPORT int SUNProfiler_Reset(SUNProfiler p);
 
@@ -42,35 +47,29 @@ SUNDIALS_EXPORT int SUNProfiler_Reset(SUNProfiler p);
 
 #define SUNDIALS_MARK_FUNCTION_END(profobj) CALI_MARK_FUNCTION_END
 
-#define SUNDIALS_WRAP_STATEMENT(profobj, name, stmt) CALI_WRAP_STATEMENT(name, stmt)
+#define SUNDIALS_WRAP_STATEMENT(profobj, name, stmt) \
+  CALI_WRAP_STATEMENT(name, stmt)
 
 #define SUNDIALS_MARK_BEGIN(profobj, name) CALI_MARK_BEGIN(name)
 
 #define SUNDIALS_MARK_END(profobj, name) CALI_MARK_END(name)
 
-#ifdef __cplusplus
-#define SUNDIALS_CXX_MARK_FUNCTION(projobj) CALI_CXX_MARK_FUNCTION
-#endif
-
 #elif defined(SUNDIALS_BUILD_WITH_PROFILING)
 
-#define SUNDIALS_MARK_FUNCTION_BEGIN(profobj) SUNProfiler_Begin(profobj, __func__)
+#define SUNDIALS_MARK_FUNCTION_BEGIN(profobj) \
+  SUNProfiler_Begin(profobj, __func__)
 
 #define SUNDIALS_MARK_FUNCTION_END(profobj) SUNProfiler_End(profobj, __func__)
 
 #define SUNDIALS_WRAP_STATEMENT(profobj, name, stmt) \
-    SUNProfiler_Begin(profobj, (name)); \
-    stmt; \
-    SUNProfiler_End(profobj, (name));
+  SUNProfiler_Begin(profobj, (name));                \
+  stmt;                                              \
+  SUNProfiler_End(profobj, (name));
 
 #define SUNDIALS_MARK_BEGIN(profobj, name) SUNProfiler_Begin(profobj, (name))
 
 #define SUNDIALS_MARK_END(profobj, name) SUNProfiler_End(profobj, (name))
 
-#ifdef __cplusplus
-#define SUNDIALS_CXX_MARK_FUNCTION(profobj) sundials::ProfilerMarkScope __ProfilerMarkScope(profobj, __func__)
-#endif
-
 #else
 
 #define SUNDIALS_MARK_FUNCTION_BEGIN(profobj)
@@ -83,36 +82,14 @@ SUNDIALS_EXPORT int SUNProfiler_Reset(SUNProfiler p);
 
 #define SUNDIALS_MARK_END(profobj, name)
 
-#ifdef __cplusplus
-#define SUNDIALS_CXX_MARK_FUNCTION(profobj)
-#endif
-
 #endif
 
 #ifdef __cplusplus
 }
 
-namespace sundials
-{
-/* Convenience class for C++ codes.
-   Allows for simpler profiler statements using C++ scoping rules. */
-class ProfilerMarkScope
-{
-public:
-  ProfilerMarkScope(SUNProfiler prof, const char* name) {
-    prof_ = prof;
-    name_ = name;
-    SUNProfiler_Begin(prof_, name_);
-  }
-
-  ~ProfilerMarkScope() {
-    SUNProfiler_End(prof_, name_);
-  }
-private:
-  SUNProfiler prof_;
-  const char* name_;
-};
-}
+/* We include this here for backwards compatibility
+   (the contents used to be defined here directly) */
+#include <sundials/sundials_profiler.hpp>
 
 #endif
-#endif /* SUNDIALS_PROFILER_H_ */
+#endif /* SUNDIALS_PROFILER_H */
diff --git a/include/sundials/sundials_profiler.hpp b/include/sundials/sundials_profiler.hpp
new file mode 100644
index 0000000000..81bc95f920
--- /dev/null
+++ b/include/sundials/sundials_profiler.hpp
@@ -0,0 +1,52 @@
+/* -----------------------------------------------------------------
+ * Programmer: Cody J. Balos @ LLNL
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------*/
+
+#ifndef _SUNDIALS_PROFILER_HPP
+#define _SUNDIALS_PROFILER_HPP
+
+#include <cstring>
+#include <sundials/sundials_config.h>
+#include <sundials/sundials_profiler.h>
+
+#if defined(SUNDIALS_BUILD_WITH_PROFILING) && defined(SUNDIALS_CALIPER_ENABLED)
+#define SUNDIALS_CXX_MARK_FUNCTION(projobj) CALI_CXX_MARK_FUNCTION
+#elif defined(SUNDIALS_BUILD_WITH_PROFILING)
+#define SUNDIALS_CXX_MARK_FUNCTION(profobj) \
+  sundials::ProfilerMarkScope __ProfilerMarkScope(profobj, __func__)
+#else
+#define SUNDIALS_CXX_MARK_FUNCTION(profobj)
+#endif
+
+namespace sundials {
+/* Convenience class for C++ codes.
+   Allows for simpler profiler statements using C++ scoping rules. */
+class ProfilerMarkScope
+{
+public:
+  ProfilerMarkScope(SUNProfiler prof, const char* name)
+  {
+    prof_ = prof;
+    name_ = name;
+    SUNProfiler_Begin(prof_, name_);
+  }
+
+  ~ProfilerMarkScope() { SUNProfiler_End(prof_, name_); }
+
+private:
+  SUNProfiler prof_;
+  const char* name_;
+};
+} // namespace sundials
+
+#endif /* SUNDIALS_PROFILER_HPP */
diff --git a/scripts/shared b/scripts/shared
index 74cb6bfbba..1347175464 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -152,6 +152,7 @@ $tar $tarfile $distrobase/include/sundials/sundials_nonlinearsolver.hpp
 $tar $tarfile $distrobase/include/sundials/sundials_nvector_senswrapper.h
 $tar $tarfile $distrobase/include/sundials/sundials_nvector.h
 $tar $tarfile $distrobase/include/sundials/sundials_profiler.h
+$tar $tarfile $distrobase/include/sundials/sundials_profiler.hpp
 $tar $tarfile $distrobase/include/sundials/sundials_sycl_policies.hpp
 $tar $tarfile $distrobase/include/sundials/sundials_types.h
 $tar $tarfile $distrobase/include/sundials/sundials_version.h
@@ -842,3 +843,4 @@ echo "   --- Add unit tests files to $tarfile"
 $tar $tarfile $distrobase/test/unit_tests/CMakeLists.txt
 $tar $tarfile $distrobase/test/unit_tests/reductions
 $tar $tarfile $distrobase/test/unit_tests/sunmemory
+$tar $tarfile $distrobase/test/unit_tests/profiling
diff --git a/src/sundials/CMakeLists.txt b/src/sundials/CMakeLists.txt
index 16dd005cee..08afde2570 100644
--- a/src/sundials/CMakeLists.txt
+++ b/src/sundials/CMakeLists.txt
@@ -42,6 +42,7 @@ set(sundials_HEADERS
   sundials_nvector.h
   sundials_nvector.hpp
   sundials_profiler.h
+  sundials_profiler.hpp
   sundials_logger.h
   sundials_types.h
   sundials_version.h
diff --git a/src/sundials/sundials_profiler.c b/src/sundials/sundials_profiler.c
index 2761b9e3dc..adc2052c2d 100644
--- a/src/sundials/sundials_profiler.c
+++ b/src/sundials/sundials_profiler.c
@@ -15,29 +15,43 @@
 #include <sundials/sundials_config.h>
 
 #if SUNDIALS_MPI_ENABLED
-#include <sundials/sundials_mpi_types.h>
 #include <mpi.h>
-#elif defined(SUNDIALS_HAVE_POSIX_TIMERS)
+#include <sundials/sundials_mpi_types.h>
+#endif
+
+#if defined(SUNDIALS_HAVE_POSIX_TIMERS)
 /* Minimum POSIX version needed for struct timespec and clock_monotonic */
 #if !defined(_POSIX_C_SOURCE) || (_POSIX_C_SOURCE < 199309L)
 #define _POSIX_C_SOURCE 199309L
 #endif
-#include <time.h>
 #include <stddef.h>
+#include <time.h>
 #include <unistd.h>
+#elif defined(WIN32) || defined(_WIN32)
+#include <windows.h>
 #else
-#error Either MPI_Wtime or clock_getttime is required but neither were found
+#error SUNProfiler needs POSIX or Windows timers
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
-
-#include <sundials/sundials_profiler.h>
 #include <sundials/sundials_math.h>
-#include "sundials_hashmap.h"
+#include <sundials/sundials_profiler.h>
+
 #include "sundials_debug.h"
+#include "sundials_hashmap.h"
 
-#define SUNDIALS_ROOT_TIMER ((const char*) "From profiler epoch")
+#define SUNDIALS_ROOT_TIMER ((const char*)"From profiler epoch")
+
+#if defined(SUNDIALS_HAVE_POSIX_TIMERS)
+typedef struct timespec sunTimespec;
+#else
+typedef struct _sunTimespec
+{
+  long int tv_sec;
+  long int tv_nsec;
+} sunTimespec;
+#endif
 
 /* Private functions */
 #if SUNDIALS_MPI_ENABLED
@@ -45,6 +59,7 @@ static int sunCollectTimers(SUNProfiler p);
 #endif
 static void sunPrintTimers(int idx, SUNHashMapKeyValue kv, FILE* fp, void* pvoid);
 static int sunCompareTimes(const void* l, const void* r);
+static int sunclock_gettime_monotonic(sunTimespec* tp);
 
 /*
   sunTimerStruct.
@@ -53,96 +68,78 @@ static int sunCompareTimes(const void* l, const void* r);
 
 struct _sunTimerStruct
 {
-#if SUNDIALS_MPI_ENABLED
-  double tic;
-  double toc;
-#else
-  struct timespec* tic;
-  struct timespec* toc;
-#endif
+  sunTimespec* tic;
+  sunTimespec* toc;
   double average;
   double maximum;
   double elapsed;
-  long   count;
+  long count;
 };
 
 typedef struct _sunTimerStruct sunTimerStruct;
 
 static sunTimerStruct* sunTimerStructNew()
 {
-  sunTimerStruct* ts = (sunTimerStruct*) malloc(sizeof(sunTimerStruct));
-#if SUNDIALS_MPI_ENABLED
-  ts->tic = 0.0;
-  ts->toc = 0.0;
-#else
-  ts->tic = (struct timespec *) malloc(sizeof(struct timespec));
-  ts->toc = (struct timespec *) malloc(sizeof(struct timespec));
-  ts->tic->tv_sec = 0;
-  ts->tic->tv_nsec = 0;
-#endif
-  ts->elapsed = 0.0;
-  ts->average = 0.0;
-  ts->maximum = 0.0;
-  ts->count   = 0;
+  sunTimerStruct* ts = (sunTimerStruct*)malloc(sizeof(sunTimerStruct));
+  ts->tic            = (sunTimespec*)malloc(sizeof(sunTimespec));
+  ts->toc            = (sunTimespec*)malloc(sizeof(sunTimespec));
+  ts->tic->tv_sec    = 0;
+  ts->tic->tv_nsec   = 0;
+  ts->elapsed        = 0.0;
+  ts->average        = 0.0;
+  ts->maximum        = 0.0;
+  ts->count          = 0;
   return ts;
 }
 
 static void sunTimerStructFree(void* TS)
 {
-  sunTimerStruct* ts = (sunTimerStruct*) TS;
+  sunTimerStruct* ts = (sunTimerStruct*)TS;
   if (ts)
   {
-#if !SUNDIALS_MPI_ENABLED
     if (ts->tic) free(ts->tic);
     if (ts->toc) free(ts->toc);
-#endif
     free(ts);
   }
 }
 
 static void sunStartTiming(sunTimerStruct* entry)
 {
-#if SUNDIALS_MPI_ENABLED
-  entry->tic = MPI_Wtime();
-#else
-  clock_gettime(CLOCK_MONOTONIC, entry->tic);
-#endif
+  sunclock_gettime_monotonic(entry->tic);
 }
 
 static void sunStopTiming(sunTimerStruct* entry)
 {
-#if SUNDIALS_MPI_ENABLED
-  entry->toc = MPI_Wtime();
-  entry->elapsed += entry->toc - entry->tic;
-#else
-  clock_gettime(CLOCK_MONOTONIC, entry->toc);
-  entry->elapsed +=
-    ((double) (entry->toc->tv_sec - entry->tic->tv_sec) +
-     (double) (entry->toc->tv_nsec - entry->tic->tv_nsec) * 1e-9);
-#endif
-  /* Initialize to total value */
+  long s_difference  = 0;
+  long ns_difference = 0;
+
+  sunclock_gettime_monotonic(entry->toc);
+
+  s_difference  = entry->toc->tv_sec - entry->tic->tv_sec;
+  ns_difference = entry->toc->tv_nsec - entry->tic->tv_nsec;
+  if (ns_difference < 0)
+  {
+    s_difference--;
+    ns_difference = 1000000000 + entry->toc->tv_nsec - entry->tic->tv_nsec;
+  }
+
+  entry->elapsed += ((double)s_difference) + ((double)ns_difference) * 1e-9;
   entry->average = entry->elapsed;
   entry->maximum = entry->elapsed;
 }
 
 static void sunResetTiming(sunTimerStruct* entry)
 {
-#if SUNDIALS_MPI_ENABLED
-  entry->tic = 0.0;
-  entry->toc = 0.0;
-#else
   entry->tic->tv_sec  = 0;
   entry->tic->tv_nsec = 0;
   entry->toc->tv_sec  = 0;
   entry->toc->tv_nsec = 0;
-#endif
-  entry->elapsed = 0.0;
-  entry->average = 0.0;
-  entry->maximum = 0.0;
-  entry->count   = 0;
+  entry->elapsed      = 0.0;
+  entry->average      = 0.0;
+  entry->maximum      = 0.0;
+  entry->count        = 0;
 }
 
-
 /*
   SUNProfiler.
 
@@ -151,11 +148,11 @@ static void sunResetTiming(sunTimerStruct* entry)
 
 struct _SUNProfiler
 {
-  void*           comm;
-  char*           title;
-  SUNHashMap      map;
+  void* comm;
+  char* title;
+  SUNHashMap map;
   sunTimerStruct* overhead;
-  double          sundials_time;
+  double sundials_time;
 };
 
 int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p)
@@ -164,23 +161,22 @@ int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p)
   int max_entries;
   char* max_entries_env;
 
-  *p = profiler = (SUNProfiler) malloc(sizeof(struct _SUNProfiler));
+  *p = profiler = (SUNProfiler)malloc(sizeof(struct _SUNProfiler));
 
-  if (profiler == NULL)
-    return(-1);
+  if (profiler == NULL) return (-1);
 
   profiler->overhead = sunTimerStructNew();
   if (profiler->overhead == NULL)
   {
     free(profiler);
     *p = profiler = NULL;
-    return(-1);
+    return (-1);
   }
 
   sunStartTiming(profiler->overhead);
 
   /* Check to see if max entries env variable was set, and use if it was. */
-  max_entries = 2560;
+  max_entries     = 2560;
   max_entries_env = getenv("SUNPROFILER_MAX_ENTRIES");
   if (max_entries_env) max_entries = atoi(max_entries_env);
   if (max_entries <= 0) max_entries = 2560;
@@ -188,10 +184,10 @@ int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p)
   /* Create the hashmap used to store the timers */
   if (SUNHashMap_New(max_entries, &profiler->map))
   {
-    sunTimerStructFree((void*) profiler->overhead);
+    sunTimerStructFree((void*)profiler->overhead);
     free(profiler);
     *p = profiler = NULL;
-    return(-1);
+    return (-1);
   }
 
   /* Attach the comm, duplicating it if MPI is used. */
@@ -200,7 +196,7 @@ int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p)
   if (comm != NULL)
   {
     profiler->comm = malloc(sizeof(MPI_Comm));
-    MPI_Comm_dup(*((MPI_Comm*) comm), (MPI_Comm*) profiler->comm);
+    MPI_Comm_dup(*((MPI_Comm*)comm), (MPI_Comm*)profiler->comm);
   }
 #else
   profiler->comm = comm;
@@ -217,19 +213,19 @@ int SUNProfiler_Create(void* comm, const char* title, SUNProfiler* p)
   SUNDIALS_MARK_BEGIN(profiler, SUNDIALS_ROOT_TIMER);
   sunStopTiming(profiler->overhead);
 
-  return(0);
+  return (0);
 }
 
 int SUNProfiler_Free(SUNProfiler* p)
 {
-  if (p == NULL) return(-1);
+  if (p == NULL) return (-1);
 
   SUNDIALS_MARK_END(*p, SUNDIALS_ROOT_TIMER);
 
   if (*p)
   {
     SUNHashMap_Destroy(&(*p)->map, sunTimerStructFree);
-    sunTimerStructFree((void*) (*p)->overhead);
+    sunTimerStructFree((void*)(*p)->overhead);
 #if SUNDIALS_MPI_ENABLED
     if ((*p)->comm)
     {
@@ -242,7 +238,7 @@ int SUNProfiler_Free(SUNProfiler* p)
   }
   *p = NULL;
 
-  return(0);
+  return (0);
 }
 
 int SUNProfiler_Begin(SUNProfiler p, const char* name)
@@ -254,25 +250,27 @@ int SUNProfiler_Begin(SUNProfiler p, const char* name)
   char* errmsg;
 #endif
 
-  if (p == NULL) return(-1);
+  if (p == NULL) return (-1);
   sunStartTiming(p->overhead);
 
-  if (SUNHashMap_GetValue(p->map, name, (void**) &timer))
+  if (SUNHashMap_GetValue(p->map, name, (void**)&timer))
   {
     timer = sunTimerStructNew();
-    ier = SUNHashMap_Insert(p->map, name, (void*) timer);
+    ier   = SUNHashMap_Insert(p->map, name, (void*)timer);
     if (ier)
     {
 #ifdef SUNDIALS_DEBUG
-      slen = strlen(name);
-      errmsg = malloc(slen*sizeof(char));
-      snprintf(errmsg, 128+slen, "(((( [ERROR] in SUNProfilerBegin: SUNHashMapInsert failed with code %d while inserting %s))))\n", ier, name);
+      slen   = strlen(name);
+      errmsg = malloc(slen * sizeof(char));
+      snprintf(errmsg,
+               128 + slen, "(((( [ERROR] in SUNProfilerBegin: SUNHashMapInsert failed with code %d while inserting %s))))\n",
+               ier, name);
       SUNDIALS_DEBUG_PRINT(errmsg);
       free(errmsg);
 #endif
       sunTimerStructFree(timer);
       sunStopTiming(p->overhead);
-      return(-1);
+      return (-1);
     }
   }
 
@@ -280,31 +278,67 @@ int SUNProfiler_Begin(SUNProfiler p, const char* name)
   sunStartTiming(timer);
 
   sunStopTiming(p->overhead);
-  return(0);
+  return (0);
 }
 
 int SUNProfiler_End(SUNProfiler p, const char* name)
 {
   sunTimerStruct* timer;
 
-  if (p == NULL) return(-1);
+  if (p == NULL) return (-1);
   sunStartTiming(p->overhead);
 
-  if (SUNHashMap_GetValue(p->map, name, (void**) &timer))
+  if (SUNHashMap_GetValue(p->map, name, (void**)&timer))
   {
     sunStopTiming(p->overhead);
-    return(-1);
+    return (-1);
   }
 
   sunStopTiming(timer);
 
   sunStopTiming(p->overhead);
-  return(0);
+  return (0);
+}
+
+int SUNProfiler_GetTimerResolution(SUNProfiler p, double* resolution)
+{
+#if defined(SUNDIALS_HAVE_POSIX_TIMERS)
+  sunTimespec spec;
+  clock_getres(CLOCK_MONOTONIC, &spec);
+  *resolution = 1e-9 * ((double)spec.tv_nsec);
+
+  return (0);
+#elif (defined(WIN32) || defined(_WIN32))
+  static LARGE_INTEGER ticks_per_sec;
+
+  if (!ticks_per_sec.QuadPart)
+  {
+    QueryPerformanceFrequency(&ticks_per_sec);
+    if (!ticks_per_sec.QuadPart) { return -1; }
+  }
+
+  *resolution = (double) ticks_per_sec.QuadPart;
+
+  return (0);
+#else
+#error SUNProfiler needs POSIX or Windows timers
+#endif
+}
+
+int SUNProfiler_GetElapsedTime(SUNProfiler p, const char* name, double* time)
+{
+  sunTimerStruct* timer;
+
+  if (SUNHashMap_GetValue(p->map, name, (void**)&timer)) { return (-1); }
+
+  *time = timer->elapsed;
+
+  return (0);
 }
 
 int SUNProfiler_Reset(SUNProfiler p)
 {
-  int i = 0;
+  int i                 = 0;
   sunTimerStruct* timer = NULL;
 
   /* Check for valid input */
@@ -336,26 +370,26 @@ int SUNProfiler_Reset(SUNProfiler p)
 
 int SUNProfiler_Print(SUNProfiler p, FILE* fp)
 {
-  int i = 0;
-  int rank = 0;
-  sunTimerStruct* timer = NULL;
+  int i                      = 0;
+  int rank                   = 0;
+  sunTimerStruct* timer      = NULL;
   SUNHashMapKeyValue* sorted = NULL;
 
-  if (p == NULL) return(-1);
+  if (p == NULL) return (-1);
   sunStartTiming(p->overhead);
 
   /* Get the total SUNDIALS time up to this point */
   SUNDIALS_MARK_END(p, SUNDIALS_ROOT_TIMER);
   SUNDIALS_MARK_BEGIN(p, SUNDIALS_ROOT_TIMER);
 
-  if (SUNHashMap_GetValue(p->map, SUNDIALS_ROOT_TIMER, (void**) &timer))
-    return(-1);
+  if (SUNHashMap_GetValue(p->map, SUNDIALS_ROOT_TIMER, (void**)&timer))
+    return (-1);
   p->sundials_time = timer->elapsed;
 
 #if SUNDIALS_MPI_ENABLED
   if (p->comm)
   {
-    MPI_Comm_rank(*((MPI_Comm*) p->comm), &rank);
+    MPI_Comm_rank(*((MPI_Comm*)p->comm), &rank);
     /* Find the max and average time across all ranks */
     sunCollectTimers(p);
   }
@@ -363,23 +397,29 @@ int SUNProfiler_Print(SUNProfiler p, FILE* fp)
 
   if (rank == 0)
   {
+    double resolution;
     /* Sort the timers in descending order */
-    if (SUNHashMap_Sort(p->map, &sorted, sunCompareTimes))
-      return(-1);
-    fprintf(fp, "\n================================================================================================================\n");
+    if (SUNHashMap_Sort(p->map, &sorted, sunCompareTimes)) return (-1);
+    SUNProfiler_GetTimerResolution(p, &resolution);
+    fprintf(fp, "\n============================================================"
+                "====================================================\n");
     fprintf(fp, "SUNDIALS GIT VERSION: %s\n", SUNDIALS_GIT_VERSION);
     fprintf(fp, "SUNDIALS PROFILER: %s\n", p->title);
-    fprintf(fp, "%-40s\t %% time (inclusive) \t max/rank \t average/rank \t count \n", "Results:");
-    fprintf(fp, "================================================================================================================\n");
+    fprintf(fp, "TIMER RESOLUTION: %gs\n", resolution);
+    fprintf(fp, "%-40s\t %% time (inclusive) \t max/rank \t average/rank \t count \n",
+            "RESULTS:");
+    fprintf(fp, "=============================================================="
+                "==================================================\n");
 
 #if SUNDIALS_MPI_ENABLED
     if (p->comm == NULL)
-      printf("WARNING: no MPI communicator provided, times shown are for rank 0\n");
+      printf(
+        "WARNING: no MPI communicator provided, times shown are for rank 0\n");
 #endif
 
     /* Print all the other timers out */
     for (i = 0; i < p->map->size; i++)
-      if (sorted[i]) sunPrintTimers(i, sorted[i], fp, (void*) p);
+      if (sorted[i]) sunPrintTimers(i, sorted[i], fp, (void*)p);
     free(sorted);
   }
 
@@ -388,24 +428,26 @@ int SUNProfiler_Print(SUNProfiler p, FILE* fp)
   if (rank == 0)
   {
     /* Print out the total time and the profiler overhead */
-    fprintf(fp, "%-40s\t %6.2f%% \t         %.6fs \t -- \t\t -- \n", "Est. profiler overhead",
-            p->overhead->elapsed/p->sundials_time,
+    fprintf(fp, "%-40s\t %6.2f%% \t         %.6fs \t -- \t\t -- \n",
+            "Est. profiler overhead", p->overhead->elapsed / p->sundials_time,
             p->overhead->elapsed);
 
     /* End of output */
     fprintf(fp, "\n");
   }
 
-  return(0);
+  return (0);
 }
 
 #if SUNDIALS_MPI_ENABLED
-static void sunTimerStructReduceMaxAndSum(void* a, void* b, int* len, MPI_Datatype* dType)
+static void sunTimerStructReduceMaxAndSum(void* a, void* b, int* len,
+                                          MPI_Datatype* dType)
 {
-  sunTimerStruct* a_ts = (sunTimerStruct*) a;
-  sunTimerStruct* b_ts = (sunTimerStruct*) b;
+  sunTimerStruct* a_ts = (sunTimerStruct*)a;
+  sunTimerStruct* b_ts = (sunTimerStruct*)b;
   int i;
-  for (i = 0; i < *len; ++i) {
+  for (i = 0; i < *len; ++i)
+  {
     b_ts[i].average += a_ts[i].elapsed;
     b_ts[i].maximum = SUNMAX(a_ts[i].maximum, b_ts[i].maximum);
   }
@@ -416,24 +458,24 @@ int sunCollectTimers(SUNProfiler p)
 {
   int i, rank, nranks;
 
-  MPI_Comm comm = *((MPI_Comm*) p->comm);
+  MPI_Comm comm = *((MPI_Comm*)p->comm);
   MPI_Comm_rank(comm, &rank);
   MPI_Comm_size(comm, &nranks);
 
   sunTimerStruct** values = NULL;
 
   /* Extract the elapsed times from the hash map */
-  SUNHashMap_Values(p->map, (void***) &values, sizeof(sunTimerStruct));
-  sunTimerStruct* reduced = (sunTimerStruct*) malloc(p->map->size*sizeof(sunTimerStruct));
-  for (i = 0; i < p->map->size; ++i)
-    reduced[i] = *values[i];
+  SUNHashMap_Values(p->map, (void***)&values, sizeof(sunTimerStruct));
+  sunTimerStruct* reduced =
+    (sunTimerStruct*)malloc(p->map->size * sizeof(sunTimerStruct));
+  for (i = 0; i < p->map->size; ++i) reduced[i] = *values[i];
 
   /* Register MPI datatype for sunTimerStruct */
   MPI_Datatype tmp_type, MPI_sunTimerStruct;
-  const int block_lens[2] = { 5, 1 };
-  const MPI_Datatype types[2] = { MPI_DOUBLE, MPI_LONG };
-  const MPI_Aint displ[2] = { offsetof(sunTimerStruct, tic),
-                              offsetof(sunTimerStruct, count) };
+  const int block_lens[2]     = {5, 1};
+  const MPI_Datatype types[2] = {MPI_DOUBLE, MPI_LONG};
+  const MPI_Aint displ[2]     = {offsetof(sunTimerStruct, tic),
+                                 offsetof(sunTimerStruct, count)};
   MPI_Aint lb, extent;
 
   MPI_Type_create_struct(2, block_lens, displ, types, &tmp_type);
@@ -464,15 +506,16 @@ int sunCollectTimers(SUNProfiler p)
   MPI_Op_free(&MPI_sunTimerStruct_MAXANDSUM);
 
   /* Update the values that are in this rank's hash map. */
-  for (i = 0; i < p->map->size; ++i) {
-    values[i]->average = reduced[i].average / (realtype) nranks;
+  for (i = 0; i < p->map->size; ++i)
+  {
+    values[i]->average = reduced[i].average / (double)nranks;
     values[i]->maximum = reduced[i].maximum;
   }
 
   free(reduced);
   free(values);
 
-  return(0);
+  return (0);
 }
 #endif
 
@@ -480,13 +523,15 @@ int sunCollectTimers(SUNProfiler p)
    max across ranks, average across ranks, and the timer counter. */
 void sunPrintTimers(int idx, SUNHashMapKeyValue kv, FILE* fp, void* pvoid)
 {
-  SUNProfiler p = (SUNProfiler) pvoid;
-  sunTimerStruct* ts = (sunTimerStruct*) kv->value;
-  double maximum = ts->maximum;
-  double average = ts->average;
-  double percent = strcmp((const char*) kv->key, (const char*) SUNDIALS_ROOT_TIMER) ? maximum / p->sundials_time * 100 : 100;
-  fprintf(fp, "%-40s\t %6.2f%% \t         %.6fs \t %.6fs \t %ld\n",
-          kv->key, percent, maximum, average, ts->count);
+  SUNProfiler p      = (SUNProfiler)pvoid;
+  sunTimerStruct* ts = (sunTimerStruct*)kv->value;
+  double maximum     = ts->maximum;
+  double average     = ts->average;
+  double percent = strcmp((const char*)kv->key, (const char*)SUNDIALS_ROOT_TIMER)
+                     ? maximum / p->sundials_time * 100
+                     : 100;
+  fprintf(fp, "%-40s\t %6.2f%% \t         %.6fs \t %.6fs \t %ld\n", kv->key,
+          percent, maximum, average, ts->count);
 }
 
 /* Comparator for qsort that compares key-value pairs
@@ -496,22 +541,45 @@ int sunCompareTimes(const void* l, const void* r)
   double left_max;
   double right_max;
 
-  const SUNHashMapKeyValue left = *((SUNHashMapKeyValue*) l);
-  const SUNHashMapKeyValue right = *((SUNHashMapKeyValue*) r);
+  const SUNHashMapKeyValue left  = *((SUNHashMapKeyValue*)l);
+  const SUNHashMapKeyValue right = *((SUNHashMapKeyValue*)r);
+
+  if (left == NULL && right == NULL) return (0);
+  if (left == NULL) return (1);
+  if (right == NULL) return (-1);
+
+  left_max  = ((sunTimerStruct*)left->value)->maximum;
+  right_max = ((sunTimerStruct*)right->value)->maximum;
+
+  if (left_max < right_max) return (1);
+  if (left_max > right_max) return (-1);
+  return (0);
+}
+
+int sunclock_gettime_monotonic(sunTimespec* ts)
+{
+#if defined(SUNDIALS_HAVE_POSIX_TIMERS)
+  return clock_gettime(CLOCK_MONOTONIC, ts);
+#elif (defined(WIN32) || defined(_WIN32))
+  static LARGE_INTEGER ticks_per_sec;
+  LARGE_INTEGER ticks;
 
-  if (left == NULL && right == NULL)
-    return(0);
-  if (left == NULL)
-    return(1);
-  if (right == NULL)
-    return(-1);
+  if (!ticks_per_sec.QuadPart)
+  {
+    QueryPerformanceFrequency(&ticks_per_sec);
+    if (!ticks_per_sec.QuadPart) { return -1; }
+  }
 
-  left_max = ((sunTimerStruct*) left->value)->maximum;
-  right_max = ((sunTimerStruct*) right->value)->maximum;
+  QueryPerformanceCounter(&ticks);
 
-  if (left_max < right_max)
-    return(1);
-  if (left_max > right_max)
-    return(-1);
-  return(0);
+  /* QueryPerformanceCounter is ticks in microseconds */
+
+  ts->tv_sec  = (long)(ticks.QuadPart / ticks_per_sec.QuadPart);
+  ts->tv_nsec = (long)(((ticks.QuadPart % ticks_per_sec.QuadPart) * 1000000) /
+                       ticks_per_sec.QuadPart);
+
+  return 0;
+#else 
+#error SUNProfiler needs POSIX or Windows timers
+#endif
 }
diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt
index fce631573e..77cfb20cad 100644
--- a/test/unit_tests/CMakeLists.txt
+++ b/test/unit_tests/CMakeLists.txt
@@ -43,4 +43,7 @@ endif()
 if(CXX_FOUND)
   add_subdirectory(reductions)
   add_subdirectory(sunmemory)
+  if(SUNDIALS_BUILD_WITH_PROFILING)
+    add_subdirectory(profiling)
+  endif()
 endif()
diff --git a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
index 84d040ad24..b0ea386c44 100644
--- a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
@@ -50,12 +50,23 @@ foreach(test_tuple ${unit_tests})
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/src)
 
-    # Libraries to link against
+    # We explicitly choose which object libraries to link to and link in the
+    # arkode objects so that we have access to private functions w/o changing
+    # their visibility in the installed libraries. 
     target_link_libraries(${test_target}
-      sundials_arkode
-      sundials_nvecserial
+      $<TARGET_OBJECTS:sundials_arkode_obj>
+      sundials_sunmemsys_obj
+      sundials_nvecserial_obj
+      sundials_sunlinsolband_obj
+      sundials_sunlinsoldense_obj
+      sundials_sunnonlinsolnewton_obj
+      sundials_sunnonlinsolfixedpoint_obj
       ${EXE_EXTRA_LINK_LIBS})
 
+    # Tell CMake that we depend on the ARKODE library since it does not pick
+    # that up from $<TARGET_OBJECTS:sundials_arkode_obj>.
+    add_dependencies(${test_target} sundials_arkode_obj)
+
   endif()
 
   # Check if test args are provided and set the test name
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
index 4abd91c925..ce0b9bdd04 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
@@ -22,9 +22,10 @@
  *-----------------------------------------------------------------*/
 
 // Header files
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
-#include <string.h>
+#include <cstring>
+#include <string>
 #include <cmath>
 #include <arkode/arkode_arkstep.h>
 #include <arkode/arkode_mristep.h>
@@ -99,8 +100,8 @@ int main(int argc, char* argv[])
 
   // if an argument supplied, set fixedpoint (otherwise use SUNFALSE)
   fixedpoint = SUNFALSE;
-  if (argc > 1)  fixedpoint = stoi(argv[1], NULL);
-  if (argc > 2)  Nt = stoi(argv[2], NULL);
+  if (argc > 1)  fixedpoint = std::stoi(argv[1], NULL);
+  if (argc > 2)  Nt = std::stoi(argv[2], NULL);
 
   // Initial problem output
   cout << "\nAnalytical ODE test problem:\n";
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
index 7f52a88d86..ffb23ec7c1 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
@@ -17,10 +17,11 @@
  * ---------------------------------------------------------------------------*/
 
 // Header files
-#include <stdio.h>
+#include <cstdio>
 #include <iostream>
-#include <string.h>
+#include <cstring>
 #include <cmath>
+#include <string>
 
 #include <arkode/arkode_arkstep.h>
 #include <arkode/arkode_mristep.h>
@@ -91,12 +92,12 @@ int main(int argc, char* argv[])
   UserData udata;
 
   // Check for inputs
-  if (argc > 1) udata.lambda_e = stod(argv[1]);
-  if (argc > 2) udata.lambda_i = stod(argv[2]);
-  if (argc > 3) udata.lambda_f = stod(argv[3]);
-  if (argc > 4) hs = stod(argv[4]);
-  if (argc > 5) hf = stod(argv[5]);
-  if (argc > 5) nsteps = stoi(argv[6]);
+  if (argc > 1) udata.lambda_e = std::stod(argv[1]);
+  if (argc > 2) udata.lambda_i = std::stod(argv[2]);
+  if (argc > 3) udata.lambda_f = std::stod(argv[3]);
+  if (argc > 4) hs = std::stod(argv[4]);
+  if (argc > 5) hf = std::stod(argv[5]);
+  if (argc > 5) nsteps = std::stoi(argv[6]);
 
   // Output problem setup
   cout << "\nDahlquist ODE test problem:\n";
diff --git a/test/unit_tests/arkode/C_serial/CMakeLists.txt b/test/unit_tests/arkode/C_serial/CMakeLists.txt
index 2c4daa7d74..bddff54d88 100644
--- a/test/unit_tests/arkode/C_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/C_serial/CMakeLists.txt
@@ -55,12 +55,22 @@ foreach(test_tuple ${ARKODE_unit_tests})
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/src)
 
-    # libraries to link against
+    # We explicitly choose which object libraries to link to and link in the
+    # arkode objects so that we have access to private functions w/o changing
+    # their visibility in the installed libraries.
     target_link_libraries(${test}
-      sundials_arkode
-      sundials_nvecserial
+      $<TARGET_OBJECTS:sundials_arkode_obj>
+      sundials_sunmemsys_obj
+      sundials_nvecserial_obj
+      sundials_sunlinsolband_obj
+      sundials_sunlinsoldense_obj
+      sundials_sunnonlinsolnewton_obj
       ${EXE_EXTRA_LINK_LIBS})
 
+    # Tell CMake that we depend on the ARKODE library since it does not pick
+    # that up from $<TARGET_OBJECTS:sundials_arkode_obj>.
+    add_dependencies(${test} sundials_arkode_obj)
+
   endif()
 
   # check if test args are provided and set the test name
diff --git a/test/unit_tests/profiling/CMakeLists.txt b/test/unit_tests/profiling/CMakeLists.txt
new file mode 100644
index 0000000000..8c0ce56ea6
--- /dev/null
+++ b/test/unit_tests/profiling/CMakeLists.txt
@@ -0,0 +1,60 @@
+# ------------------------------------------------------------------------------
+# Programmer(s): David J. Gardner @ LLNL
+# ------------------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ------------------------------------------------------------------------------
+
+# List of test tuples of the form "name\;args"
+set(unit_tests "test_profiling\;")
+
+# Add the build and install targets for each test
+foreach(test_tuple ${unit_tests})
+
+  # parse the test tuple
+  list(GET test_tuple 0 test)
+  list(GET test_tuple 1 test_args)
+
+  # check if this test has already been added, only need to add
+  # test source files once for testing with different inputs
+  if(NOT TARGET ${test})
+
+    # test source files
+    add_executable(${test} ${test}.cpp)
+
+    set_target_properties(${test} PROPERTIES FOLDER "unit_tests")
+
+    # include location of public and private header files
+    target_include_directories(${test} PRIVATE
+      $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+      ${CMAKE_SOURCE_DIR}/include
+      ${CMAKE_SOURCE_DIR}/src)
+
+    # libraries to link against
+    target_link_libraries(${test}
+      sundials_generic
+      ${EXE_EXTRA_LINK_LIBS})
+
+  endif()
+
+  # check if test args are provided and set the test name
+  if("${test_args}" STREQUAL "")
+    set(test_name ${test})
+  else()
+    string(REPLACE " " "_" test_name "${test}_${test_args}")
+    string(REPLACE " " ";" test_args "${test_args}")
+  endif()
+
+  # add test to regression tests
+  add_test(NAME ${test_name} COMMAND ${test} ${test_args})
+
+endforeach()
+
+message(STATUS "Added profiling units tests")
diff --git a/test/unit_tests/profiling/test_profiling.cpp b/test/unit_tests/profiling/test_profiling.cpp
new file mode 100644
index 0000000000..7228fd7c9c
--- /dev/null
+++ b/test/unit_tests/profiling/test_profiling.cpp
@@ -0,0 +1,240 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * ---------------------------------------------------------------------------*/
+
+#include <chrono>
+#include <cstdio>
+#include <iostream>
+#include <ostream>
+#include <string>
+#include <thread>
+
+#include "sundials/sundials_math.h"
+#include "sundials/sundials_profiler.h"
+
+int sleep(SUNProfiler prof, int sec, double* chrono)
+{
+  auto begin = std::chrono::steady_clock::now();
+
+  // We dont check the flag returned to avoid introducing extra
+  // overhead which makes it harder to compare the SUNProfiler
+  // time with the chrono time.
+  SUNProfiler_Begin(prof, "sleep");
+  std::this_thread::sleep_for(std::chrono::seconds(sec));
+  SUNProfiler_End(prof, "sleep");
+
+  auto end = std::chrono::steady_clock::now();
+
+  auto elapsed =
+    std::chrono::duration_cast<std::chrono::nanoseconds>(end - begin).count();
+  *chrono = std::chrono::duration<double>(elapsed).count() * 1e-9;
+
+  return 0;
+}
+
+int print_timings(SUNProfiler prof)
+{
+  // Output timing in default (table) format
+  int flag = SUNProfiler_Print(prof, stdout);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_Print returned " << flag << "\n";
+    return 1;
+  }
+
+  return 0;
+}
+
+int main()
+{
+  // -----
+  // Setup
+  // -----
+
+  double chrono;
+
+  std::cout << "Testing SUNProfiler\n";
+
+  SUNProfiler prof = nullptr;
+  int flag         = SUNProfiler_Create(nullptr, "SUNProfiler Test", &prof);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_Create returned " << flag << "\n";
+    return 1;
+  }
+
+  // ------
+  // Test 1
+  // ------
+
+  std::cout << "\nTest 1: sleep 1s, check timings \n";
+
+  flag = sleep(prof, 1, &chrono);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "sleep returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = print_timings(prof);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "print_timings returned " << flag << "\n";
+    return 1;
+  }
+
+  double time       = 0;
+  double resolution = 0;
+  flag              = SUNProfiler_GetElapsedTime(prof, "sleep", &time);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_GetElapsedTime returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = SUNProfiler_GetTimerResolution(prof, &resolution);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_GetTimerResolution returned " << flag << "\n";
+    return 1;
+  }
+
+  if (SUNRCompareTol(time, chrono, 1e-2))
+  {
+    std::cerr << ">>> FAILURE: "
+              << "time recorded was " << time << "s, but expected " << chrono
+              << "s +/- " << 1e-2 << "\n";
+    return 1;
+  }
+
+  // ------
+  // Test 2
+  // ------
+
+  std::cout << "\nTest 2: reset, sleep 2s, print timings\n";
+
+  // Reset timing
+  flag = SUNProfiler_Reset(prof);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_Reset returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = sleep(prof, 2, &chrono);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "sleep returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = print_timings(prof);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "print_timings returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = SUNProfiler_GetElapsedTime(prof, "sleep", &time);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_GetElapsedTime returned " << flag << "\n";
+    return 1;
+  }
+
+  flag = SUNProfiler_GetTimerResolution(prof, &resolution);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_GetTimerResolution returned " << flag << "\n";
+    return 1;
+  }
+
+  if (SUNRCompareTol(time, chrono, 1e-2))
+  {
+    std::cerr << ">>> FAILURE: "
+              << "time recorded was " << time << "s, but expected " << chrono
+              << "s +/- " << 1e-2 << "\n";
+    return 1;
+  }
+
+  // ------
+  // Test 3
+  // ------
+
+  std::cout << "\nTest 3: multiple outputs to a file for plot test\n";
+
+  std::FILE* fout = std::fopen("profiling_test_output.txt", "w");
+  if (fout == nullptr)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "fopen returned a null pointer\n";
+    return 1;
+  }
+
+  for (int i = 1; i < 4; i++)
+  {
+    // Reset timing
+    flag = SUNProfiler_Reset(prof);
+    if (flag)
+    {
+      std::cerr << ">>> FAILURE: "
+                << "SUNProfiler_Reset returned " << flag << "\n";
+      return 1;
+    }
+
+    flag = sleep(prof, i, &chrono);
+    if (flag)
+    {
+      std::cerr << ">>> FAILURE: "
+                << "sleep returned " << flag << "\n";
+      return 1;
+    }
+
+    flag = SUNProfiler_Print(prof, fout);
+    if (flag)
+    {
+      std::cerr << ">>> FAILURE: "
+                << "SUNProfiler_Print returned " << flag << "\n";
+      return 1;
+    }
+  }
+
+  std::fclose(fout);
+
+  // --------
+  // Clean up
+  // --------
+
+  flag = SUNProfiler_Free(&prof);
+  if (flag)
+  {
+    std::cerr << ">>> FAILURE: "
+              << "SUNProfiler_Free returned " << flag << "\n";
+    return 1;
+  }
+
+  std::cout << "\nSUCCESS - test complete\n";
+
+  return 0;
+}

From ebf92dbbd84ce0fbc9f1ce8ddf250fae5d347cc6 Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Thu, 2 Nov 2023 15:00:43 -0600
Subject: [PATCH 17/35] Bugfix: ARKODE ONE_STEP Description (#362)

Fix the description of `ONE_STEP` mode in ARKODE. The solution at the
end of the step is always returned and interpolation is not performed.
---
 .../Usage/ARKStep_c_interface/User_callable.rst       | 11 ++++-------
 .../Usage/ERKStep_c_interface/User_callable.rst       | 11 +++++------
 .../Usage/MRIStep_c_interface/User_callable.rst       | 11 ++++-------
 .../Usage/SPRKStep_c_interface/User_callable.rst      | 11 +++++------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
index df8a32a095..eb1f05979e 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
@@ -726,11 +726,8 @@ the user has set a stop time (with a call to the optional input function
         in :numref:`ARKODE.Mathematics.Interpolation`).
 
         The *ARK_ONE_STEP* option tells the solver to only take a
-        single internal step :math:`y_{n-1} \to y_{n}` and then return
-        control back to the calling program.  If this step will
-        overtake *tout* then the solver will again return an
-        interpolated result; otherwise it will return a copy of the
-        internal solution :math:`y_{n}` in the vector *yout*.
+        single internal step, :math:`y_{n-1} \to y_{n}`, and return the solution
+        at that point, :math:`y_{n}`, in the vector *yout*.
 
    **Return value:**
       * *ARK_SUCCESS* if successful.
@@ -795,8 +792,8 @@ the user has set a stop time (with a call to the optional input function
       only to get the direction and a rough scale of the independent
       variable.
 
-      All failure return values are negative and so testing the return argument for
-      negative values will trap all :c:func:`ARKStepEvolve()` failures.
+      All failure return values are negative and so testing the return argument
+      for negative values will trap all :c:func:`ARKStepEvolve()` failures.
 
       Since interpolation may reduce the accuracy in the reported
       solution, if full method accuracy is desired the user should issue
diff --git a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
index d8782622a6..a14ed89456 100644
--- a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
@@ -352,11 +352,8 @@ has requested rootfinding.
         :numref:`ARKODE.Mathematics.Interpolation`).
 
         The *ARK_ONE_STEP* option tells the solver to only take a
-        single internal step :math:`y_{n-1} \to y_{n}` and then return
-        control back to the calling program.  If this step will
-        overtake *tout* then the solver will again return an
-        interpolated result; otherwise it will return a copy of the
-        internal solution :math:`y_{n}` in the vector *yout*.
+        single internal step, :math:`y_{n-1} \to y_{n}`, and return the solution
+        at that point, :math:`y_{n}`, in the vector *yout*.
 
    **Return value:**
       * *ARK_SUCCESS* if successful.
@@ -399,7 +396,9 @@ has requested rootfinding.
 
       In *ARK_ONE_STEP* mode, *tout* is used only on the first call, and
       only to get the direction and a rough scale of the independent
-      variable. All failure return values are negative and so testing the
+      variable.
+
+      All failure return values are negative and so testing the
       return argument for negative values will trap all
       :c:func:`ERKStepEvolve()` failures.
 
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
index 2daf213487..e39f20bbbf 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
@@ -545,11 +545,8 @@ the user has set a stop time (with a call to the optional input function
         in :numref:`ARKODE.Mathematics.Interpolation`).
 
         The *ARK_ONE_STEP* option tells the solver to only take a
-        single internal step :math:`y_{n-1} \to y_{n}` and then return
-        control back to the calling program.  If this step will
-        overtake *tout* then the solver will again return an
-        interpolated result; otherwise it will return a copy of the
-        internal solution :math:`y_{n}` in the vector *yout*.
+        single internal step, :math:`y_{n-1} \to y_{n}`, and return the solution
+        at that point, :math:`y_{n}`, in the vector *yout*.
 
    **Return value:**
       * *ARK_SUCCESS* if successful.
@@ -604,8 +601,8 @@ the user has set a stop time (with a call to the optional input function
       only to get the direction and a rough scale of the independent
       variable.
 
-      All failure return values are negative and so testing the return argument for
-      negative values will trap all :c:func:`MRIStepEvolve()` failures.
+      All failure return values are negative and so testing the return argument
+      for negative values will trap all :c:func:`MRIStepEvolve()` failures.
 
       Since interpolation may reduce the accuracy in the reported
       solution, if full method accuracy is desired the user should issue
diff --git a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
index 1450ea2c64..28fb2f2ca8 100644
--- a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
@@ -152,11 +152,8 @@ has requested rootfinding.
                  :numref:`ARKODE.Mathematics.Interpolation`).
 
                  The *ARK_ONE_STEP* option tells the solver to only take a
-                 single internal step :math:`y_{n-1} \to y_{n}` and then return
-                 control back to the calling program.  If this step will
-                 overtake *tout* then the solver will again return an
-                 interpolated result; otherwise it will return a copy of the
-                 internal solution :math:`y_{n}` in the vector *yout*.
+                 single internal step, :math:`y_{n-1} \to y_{n}`, and return the
+                 solution at that point, :math:`y_{n}`, in the vector *yout*.
 
    :retval ARK_SUCCESS: if successful.
    :retval ARK_ROOT_RETURN: if :c:func:`SPRKStepEvolve()` succeeded, and
@@ -191,7 +188,9 @@ has requested rootfinding.
 
       In *ARK_ONE_STEP* mode, *tout* is used only on the first call, and
       only to get the direction and a rough scale of the independent
-      variable. All failure return values are negative and so testing the
+      variable.
+
+      All failure return values are negative and so testing the
       return argument for negative values will trap all
       :c:func:`SPRKStepEvolve()` failures.
 

From 15071aeaa2b86ff20e54280351455a8af0c7a03e Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Thu, 2 Nov 2023 22:43:22 -0600
Subject: [PATCH 18/35] CI: Upload only test outputs (#364)

Upload artifact with just output files so the artifact is smaller

---------

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 .github/workflows/double-precision.yml   | 10 +++++++++-
 .github/workflows/extended-precision.yml | 10 +++++++++-
 .github/workflows/single-precision.yml   | 10 +++++++++-
 .github/workflows/spack-develop.yml      | 10 +++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml
index d8b8fbb631..9303af7523 100644
--- a/.github/workflows/double-precision.yml
+++ b/.github/workflows/double-precision.yml
@@ -25,10 +25,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
+      - name: Archive build files from failed build
         uses: actions/upload-artifact@v2.2.4
         if: failure()
         with:
           name: build_files
           path: |
             ${{ github.workspace }}/test/build_*
+            !${{ github.workspace }}/test/build_*/Testing/output
+      - name: Archive output files from failed build
+        uses: actions/upload-artifact@v2.2.4
+        if: failure()
+        with:
+          name: output_files
+          path: |
+            ${{ github.workspace }}/test/build_*/Testing/output
diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml
index 7af3fb6e76..dc6f32e726 100644
--- a/.github/workflows/extended-precision.yml
+++ b/.github/workflows/extended-precision.yml
@@ -24,10 +24,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
+      - name: Archive build files from failed build
         uses: actions/upload-artifact@v2.2.4
         if: failure()
         with:
           name: build_files
           path: |
             ${{ github.workspace }}/test/build_*
+            !${{ github.workspace }}/test/build_*/Testing/output
+      - name: Archive output files from failed build
+        uses: actions/upload-artifact@v2.2.4
+        if: failure()
+        with:
+          name: output_files
+          path: |
+            ${{ github.workspace }}/test/build_*/Testing/output
diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml
index cf5ab5f213..304ae4e3bc 100644
--- a/.github/workflows/single-precision.yml
+++ b/.github/workflows/single-precision.yml
@@ -24,10 +24,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
+      - name: Archive build files from failed build
         uses: actions/upload-artifact@v2.2.4
         if: failure()
         with:
           name: build_files
           path: |
             ${{ github.workspace }}/test/build_*
+            !${{ github.workspace }}/test/build_*/Testing/output
+      - name: Archive output files from failed build
+        uses: actions/upload-artifact@v2.2.4
+        if: failure()
+        with:
+          name: output_files
+          path: |
+            ${{ github.workspace }}/test/build_*/Testing/output
diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml
index 915e38838c..07dce581c2 100644
--- a/.github/workflows/spack-develop.yml
+++ b/.github/workflows/spack-develop.yml
@@ -27,10 +27,18 @@ jobs:
         with:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
-      - name: Archive files from failed build
+      - name: Archive build files from failed build
         uses: actions/upload-artifact@v2.2.4
         if: failure()
         with:
           name: build_files
           path: |
             ${{ github.workspace }}/test/build_*
+            !${{ github.workspace }}/test/build_*/Testing/output
+      - name: Archive output files from failed build
+        uses: actions/upload-artifact@v2.2.4
+        if: failure()
+        with:
+          name: output_files
+          path: |
+            ${{ github.workspace }}/test/build_*/Testing/output

From 37d75e1dca47284aaf99dc3104d4a27032503b08 Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Sun, 5 Nov 2023 22:19:40 -0700
Subject: [PATCH 19/35] Maintenance: Remove unused files (#366)

Remove unused files from the repo
---
 examples/cvode/parhyp/vis.c           | 819 -------------------------
 examples/cvode/serial/cvHeat2D_klu.c  | 829 --------------------------
 examples/ida/serial/idaHeat2D_sps.c   | 767 ------------------------
 examples/ida/serial/idaHeat2D_sps.out |  32 -
 include/cvode/cvode_hypamgpre.h       | 269 ---------
 src/cvode/cvode_hypamgpre.c           | 426 -------------
 src/cvode/cvode_hypamgpre_impl.h      |  94 ---
 7 files changed, 3236 deletions(-)
 delete mode 100644 examples/cvode/parhyp/vis.c
 delete mode 100644 examples/cvode/serial/cvHeat2D_klu.c
 delete mode 100644 examples/ida/serial/idaHeat2D_sps.c
 delete mode 100644 examples/ida/serial/idaHeat2D_sps.out
 delete mode 100644 include/cvode/cvode_hypamgpre.h
 delete mode 100644 src/cvode/cvode_hypamgpre.c
 delete mode 100644 src/cvode/cvode_hypamgpre_impl.h

diff --git a/examples/cvode/parhyp/vis.c b/examples/cvode/parhyp/vis.c
deleted file mode 100644
index c68a9e4dcb..0000000000
--- a/examples/cvode/parhyp/vis.c
+++ /dev/null
@@ -1,819 +0,0 @@
-/* Save a structured n x n mesh of square elements on the unit square into a
-   GLVis mesh file with the given name. */
-void GLVis_PrintGlobalSquareMesh(const char *meshfile, int n)
-{
-   FILE *file;
-
-   int Dim = 2;
-   int NumOfVertices = (n+1)*(n+1);
-   int NumOfElements = n*n;
-
-   int i, j;
-   double x, y;
-   double h = 1.0/n;
-
-   if ((file = fopen(meshfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", meshfile);
-      exit(1);
-   }
-
-   /* mesh header */
-   fprintf(file, "MFEM mesh v1.0\n");
-   fprintf(file, "\ndimension\n");
-   fprintf(file, "%d\n", Dim);
-
-   /* mesh elements */
-   fprintf(file, "\nelements\n");
-   fprintf(file, "%d\n", NumOfElements);
-   for (j = 0; j < n; j++)
-      for (i = 0; i < n; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(n+1), i + 1 +j*(n+1),
-                 i + 1 + (j+1)*(n+1), i + (j+1)*(n+1));
-
-   /* boundary will be generated by GLVis */
-   fprintf(file, "\nboundary\n");
-   fprintf(file, "0\n");
-
-   /* mesh vertices */
-   fprintf(file, "\nvertices\n");
-   fprintf(file, "%d\n", NumOfVertices);
-   fprintf(file, "%d\n", Dim);
-   for (j = 0; j < n+1; j++)
-      for (i = 0; i < n+1; i++)
-      {
-         x = i*h;
-         y = j*h;
-         fprintf(file, "%.14e %.14e\n", x, y);
-      }
-
-   fflush(file);
-   fclose(file);
-}
-
-/* Save a structured nx x ny mesh of square elements of size h, globally
-   translated by (x0,y0), into a GLVis mesh file with the given prefix. */
-void GLVis_PrintLocalSquareMesh(const char *meshfile_prefix, int nx, int ny,
-                                double h, double x0, double y0, int myid)
-{
-   FILE *file;
-   char meshfile[255];
-
-   int Dim = 2;
-   int NumOfVertices = (nx+1)*(ny+1);
-   int NumOfElements = nx*ny;
-
-   int i, j;
-   double x, y;
-
-   sprintf(meshfile, "%s.%06d", meshfile_prefix, myid);
-   if ((file = fopen(meshfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", meshfile);
-      exit(1);
-   }
-
-   /* mesh header */
-   fprintf(file, "MFEM mesh v1.0\n");
-   fprintf(file, "\ndimension\n");
-   fprintf(file, "%d\n", Dim);
-
-   /* mesh elements */
-   fprintf(file, "\nelements\n");
-   fprintf(file, "%d\n", NumOfElements);
-   for (j = 0; j < ny; j++)
-      for (i = 0; i < nx; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(nx+1), i + 1 +j*(nx+1),
-                 i + 1 + (j+1)*(nx+1), i + (j+1)*(nx+1));
-
-   /* boundary will be generated by GLVis */
-   fprintf(file, "\nboundary\n");
-   fprintf(file, "0\n");
-
-   /* mesh vertices */
-   fprintf(file, "\nvertices\n");
-   fprintf(file, "%d\n", NumOfVertices);
-   fprintf(file, "%d\n", Dim);
-   for (j = 0; j < ny+1; j++)
-      for (i = 0; i < nx+1; i++)
-      {
-         x = x0+i*h;
-         y = y0+j*h;
-         fprintf(file, "%.14e %.14e\n", x, y);
-      }
-
-   fflush(file);
-   fclose(file);
-}
-
-/* Save a structured n x n mesh of gamma-angled rhombuses, globally rotated by
-   angle gamma*myid, into a GLVis mesh file with the given prefix. */
-void GLVis_PrintLocalRhombusMesh(const char *meshfile_prefix,
-                                 int n, int myid, double gamma)
-{
-   FILE *file;
-   char meshfile[255];
-
-   int Dim = 2;
-   int NumOfVertices = (n+1)*(n+1);
-   int NumOfElements = n*n;
-
-   int i, j;
-   double x, y;
-   double h = 1.0/n;
-
-   double rho = gamma*myid;
-   double sg  = sin(gamma);
-   double cg  = cos(gamma);
-   double sr  = sin(rho);
-   double cr  = cos(rho);
-
-   sprintf(meshfile, "%s.%06d", meshfile_prefix, myid);
-   if ((file = fopen(meshfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", meshfile);
-      exit(1);
-   }
-
-   /* mesh header */
-   fprintf(file, "MFEM mesh v1.0\n");
-   fprintf(file, "\ndimension\n");
-   fprintf(file, "%d\n", Dim);
-
-   /* mesh elements */
-   fprintf(file, "\nelements\n");
-   fprintf(file, "%d\n", NumOfElements);
-   for (j = 0; j < n; j++)
-      for (i = 0; i < n; i++)
-         fprintf(file, "1 3 %d %d %d %d\n", i + j*(n+1), i + 1 +j*(n+1),
-                 i + 1 + (j+1)*(n+1), i + (j+1)*(n+1));
-
-   /* boundary will be generated by GLVis */
-   fprintf(file, "\nboundary\n");
-   fprintf(file, "0\n");
-
-   /* mesh vertices */
-   fprintf(file, "\nvertices\n");
-   fprintf(file, "%d\n", NumOfVertices);
-   fprintf(file, "%d\n", Dim);
-   for (j = 0; j < n+1; j++)
-      for (i = 0; i < n+1; i++)
-      {
-         x = i*h + cg*j*h;
-         y = sg*j*h;
-         fprintf(file, "%.14e %.14e\n", cr*x - sr*y, sr*x + cr*y);
-      }
-
-   fflush(file);
-   fclose(file);
-}
-
-/* Save a structured nx x ny x nz mesh of cubic elements of size h, globally
-   translated by (x0,y0,z0), into a GLVis mesh file with the given prefix. */
-void GLVis_PrintLocalCubicMesh(const char *meshfile_prefix,
-                               int nx, int ny, int nz, double h,
-                               double x0, double y0, double z0, int myid)
-{
-   FILE *file;
-   char meshfile[255];
-
-   int Dim = 3;
-   int NumOfVertices = (nx+1)*(ny+1)*(nz+1);
-   int NumOfElements = nx*ny*nz;
-
-   int i, j, k;
-   double x, y, z;
-
-   sprintf(meshfile, "%s.%06d", meshfile_prefix, myid);
-   if ((file = fopen(meshfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", meshfile);
-      exit(1);
-   }
-
-   /* mesh header */
-   fprintf(file, "MFEM mesh v1.0\n");
-   fprintf(file, "\ndimension\n");
-   fprintf(file, "%d\n", Dim);
-
-   /* mesh elements */
-   fprintf(file, "\nelements\n");
-   fprintf(file, "%d\n", NumOfElements);
-   for (k = 0; k < nz; k++)
-      for (j = 0; j < ny; j++)
-         for (i = 0; i < nx; i++)
-            fprintf(file, "1 5 %d %d %d %d %d %d %d %d\n",
-                    i + j*(nx+1) + k*(nx+1)*(ny+1),
-                    i + 1 +j*(nx+1) + k*(nx+1)*(ny+1),
-                    i + 1 + (j+1)*(nx+1) + k*(nx+1)*(ny+1),
-                    i + (j+1)*(nx+1) + k*(nx+1)*(ny+1),
-                    i + j*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + 1 +j*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + 1 + (j+1)*(nx+1) + (k+1)*(nx+1)*(ny+1),
-                    i + (j+1)*(nx+1) + (k+1)*(nx+1)*(ny+1));
-
-   /* boundary will be generated by GLVis */
-   fprintf(file, "\nboundary\n");
-   fprintf(file, "0\n");
-
-   /* mesh vertices */
-   fprintf(file, "\nvertices\n");
-   fprintf(file, "%d\n", NumOfVertices);
-   fprintf(file, "%d\n", Dim);
-   for (k = 0; k < nz+1; k++)
-      for (j = 0; j < ny+1; j++)
-         for (i = 0; i < nx+1; i++)
-         {
-            x = x0+i*h;
-            y = y0+j*h;
-            z = z0+k*h;
-            fprintf(file, "%.14e %.14e %.14e\n", x, y, z);
-         }
-
-   fflush(file);
-   fclose(file);
-}
-
-#include "HYPRE_sstruct_mv.h"
-#include "_hypre_sstruct_mv.h"
-
-/* Save a GLVis mesh file with the given prefix corresponding to the input
-   SStruct grid assuming that the cells in each part are the same. The optional
-   trans and origin parameters specify the coordinate transformation for each
-   part, relative to a square Cartesian grid. */
-void GLVis_PrintSStructGrid(HYPRE_SStructGrid grid,
-                            const char *meshfile_prefix, int myid,
-                            double *trans, double *origin)
-{
-   FILE *file;
-   char meshfile[255];
-
-   int dim = ((hypre_SStructGrid *)grid)->ndim;
-   int cellNV = (dim == 2) ? 4 : 8;
-   int elemid = 2*dim-1;
-   int nvert, nelem;
-
-   hypre_StructGrid *part;
-   int p, nparts = ((hypre_SStructGrid *)grid)->nparts;
-   int given_trans = (trans != NULL && origin != NULL);
-   double *T = trans, *O = origin;
-
-   hypre_BoxArray *boxes;
-   hypre_Box *box;
-   int b, ncells;
-
-   nvert = nelem = 0;
-   for (p = 0; p < nparts; p++)
-   {
-      part = ((hypre_SStructGrid *)grid)->pgrids[p]->sgrids[0];
-      boxes = hypre_StructGridBoxes(part);
-      for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-      {
-         box = hypre_BoxArrayBox(boxes, b);
-         ncells = hypre_BoxVolume(box);
-         nvert += ncells*cellNV;
-         nelem += ncells;
-      }
-   }
-
-   {
-      int i, j, k, v, vert;
-      double x0, y0, z0, h;
-
-      sprintf(meshfile, "%s.%06d", meshfile_prefix, myid);
-      if ((file = fopen(meshfile, "w")) == NULL)
-      {
-         printf("Error: can't open output file %s\n", meshfile);
-         exit(1);
-      }
-
-      /* mesh header */
-      fprintf(file, "MFEM mesh v1.0\n");
-      fprintf(file, "\ndimension\n");
-      fprintf(file, "%d\n", dim);
-
-      /* mesh elements */
-      fprintf(file, "\nelements\n");
-      fprintf(file, "%d\n", nelem);
-
-      vert = 0;
-      for (p = 0; p < nparts; p++)
-      {
-         part = ((hypre_SStructGrid *)grid)->pgrids[p]->sgrids[0];
-         boxes = hypre_StructGridBoxes(part);
-         for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-         {
-            box = hypre_BoxArrayBox(boxes, b);
-            for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-               for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-                  for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
-                  {
-                     fprintf(file, "1 %d ", elemid);
-                     for (v = 0; v < cellNV; v++, vert++)
-                        fprintf(file, "%d ", vert);
-                     fprintf(file, "\n");
-                  }
-         }
-      }
-
-      /* boundary will be generated by GLVis */
-      fprintf(file, "\nboundary\n");
-      fprintf(file, "0\n");
-
-      /* mesh vertices */
-      fprintf(file, "\nvertices\n");
-      fprintf(file, "%d\n", nvert);
-      fprintf(file, "%d\n", dim);
-
-      for (p = 0; p < nparts; p++)
-      {
-         part = ((hypre_SStructGrid *)grid)->pgrids[p]->sgrids[0];
-         x0 = y0 = z0 = 0;
-         h = 1.0;
-         boxes = hypre_StructGridBoxes(part);
-         for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-         {
-            box = hypre_BoxArrayBox(boxes, b);
-            for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-               for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-                  for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
-                     if (dim == 2)
-                     {
-                        if (!given_trans)
-                        {
-                           fprintf(file, "%.14e %.14e \n", x0+i*h, y0+j*h);
-                           fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+j*h);
-                           fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h);
-                           fprintf(file, "%.14e %.14e \n", x0+i*h, y0+(j+1)*h);
-                        }
-                        else
-                        {
-                           fprintf(file, "%.14e %.14e \n",
-                                   T[0]*i+T[1]*j+O[0],
-                                   T[2]*i+T[3]*j+O[1]);
-                           fprintf(file, "%.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+O[0],
-                                   T[2]*(i+1)+T[3]*j+O[1]);
-                           fprintf(file, "%.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+O[0],
-                                   T[2]*(i+1)+T[3]*(j+1)+O[1]);
-                           fprintf(file, "%.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+O[0],
-                                   T[2]*i+T[3]*(j+1)+O[1]);
-                        }
-                     }
-                     else
-                     {
-                        if (!given_trans)
-                        {
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+k*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+(k+1)*h);
-                           fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+(k+1)*h);
-                        }
-                        else
-                        {
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*j+T[2]*k+O[0],
-                                   T[3]*i+T[4]*j+T[5]*k+O[1],
-                                   T[6]*i+T[7]*j+T[8]*k+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+T[2]*k+O[0],
-                                   T[3]*(i+1)+T[4]*j+T[5]*k+O[1],
-                                   T[6]*(i+1)+T[7]*j+T[8]*k+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+T[2]*k+O[0],
-                                   T[3]*(i+1)+T[4]*(j+1)+T[5]*k+O[1],
-                                   T[6]*(i+1)+T[7]*(j+1)+T[8]*k+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+T[2]*k+O[0],
-                                   T[3]*i+T[4]*(j+1)+T[5]*k+O[1],
-                                   T[6]*i+T[7]*(j+1)+T[8]*k+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*j+T[2]*(k+1)+O[0],
-                                   T[3]*i+T[4]*j+T[5]*(k+1)+O[1],
-                                   T[6]*i+T[7]*j+T[8]*(k+1)+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*j+T[2]*(k+1)+O[0],
-                                   T[3]*(i+1)+T[4]*j+T[5]*(k+1)+O[1],
-                                   T[6]*(i+1)+T[7]*j+T[8]*(k+1)+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*(i+1)+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                   T[3]*(i+1)+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                   T[6]*(i+1)+T[7]*(j+1)+T[8]*(k+1)+O[2]);
-                           fprintf(file, "%.14e %.14e %.14e \n",
-                                   T[0]*i+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                   T[3]*i+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                   T[6]*i+T[7]*(j+1)+T[8]*(k+1)+O[2]);
-                        }
-                     }
-         }
-
-         if (given_trans)
-         {
-            T += dim*dim;
-            O += dim;
-         }
-      }
-
-      fflush(file);
-      fclose(file);
-   }
-}
-
-/* Save a GLVis grid function (in a file with the given prefix) corresponding to
-   the values of the input SStruct vector restricted to the specified SStruct
-   variable. Currently only CELL and NODE variable types are supported. */
-void GLVis_PrintSStructVector(HYPRE_SStructVector sol,
-                              int var,
-                              const char *solfile_prefix,
-                              int myid)
-{
-   FILE *file;
-   char solfile[255];
-
-   hypre_SStructGrid *grid = ((hypre_SStructVector*)sol)->grid;
-   int dim = grid->ndim;
-
-   hypre_StructGrid *part;
-   int p, nparts = grid->nparts;
-   hypre_BoxArray *boxes;
-   hypre_Box *box;
-   int b;
-
-   int i, j, k, ni, nj, nk;
-   double *values;
-   int ilower[3], iupper[3];
-
-   HYPRE_SStructVariable vartype = grid->pgrids[0]->vartypes[var];
-
-   char fe_coll[100];
-   int var_off;
-
-   sprintf(solfile, "%s.%06d", solfile_prefix, myid);
-   if ((file = fopen(solfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", solfile);
-      exit(1);
-   }
-
-   /* set the finite element collection based on variable type */
-   switch (vartype)
-   {
-      case HYPRE_SSTRUCT_VARIABLE_CELL:
-         sprintf(fe_coll, "%s", "Local_L2_2D_P0");
-         var_off = 0;
-         break;
-      case HYPRE_SSTRUCT_VARIABLE_NODE:
-         sprintf(fe_coll, "%s", "Local_H1_2D_P1");
-         var_off = 1;
-         break;
-      default:
-         printf("Error: unsuported variable type\n");
-         exit(1);
-   }
-
-   /* grid function header */
-   fprintf(file, "FiniteElementSpace\n");
-   fprintf(file, "FiniteElementCollection: %s\n", fe_coll);
-   fprintf(file, "VDim: 1\n");
-   fprintf(file, "Ordering: 0\n\n");
-
-   /* extract and save the vector values on each cell */
-   for (p = 0; p < nparts; p++)
-   {
-      part = grid->pgrids[p]->sgrids[0];
-      boxes = hypre_StructGridBoxes(part);
-      for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-      {
-         box = hypre_BoxArrayBox(boxes, b);
-         ni = hypre_BoxSizeD(box,0);
-         nj = hypre_BoxSizeD(box,1);
-         nk = hypre_BoxSizeD(box,2);
-
-         ilower[0] = hypre_BoxIMinD(box,0) - var_off;
-         ilower[1] = hypre_BoxIMinD(box,1) - var_off;
-         iupper[0] = hypre_BoxIMaxD(box,0);
-         iupper[1] = hypre_BoxIMaxD(box,1);
-
-         if (dim == 2)
-            values = (double*) malloc((ni+var_off)*(nj+var_off)*sizeof(double));
-         else
-         {
-            values = (double*) malloc((ni+var_off)*(nj+var_off)*(nk+var_off)*sizeof(double));
-            ilower[2] = hypre_BoxIMinD(box,2) - var_off;
-            iupper[2] = hypre_BoxIMaxD(box,2);
-         }
-
-         HYPRE_SStructVectorGetBoxValues(sol, p, ilower, iupper, var, values);
-
-         if (vartype == HYPRE_SSTRUCT_VARIABLE_CELL)
-         {
-            for (k = 0; k < nk; k++)
-               for (j = 0; j < nj; j++)
-                  for (i = 0; i < ni; i++)
-                     fprintf(file, "%.14e\n", values[i + j*ni]);
-         }
-         else if (vartype == HYPRE_SSTRUCT_VARIABLE_NODE)
-         {
-            if (dim == 2)
-            {
-               for (j = 0; j < nj; j++)
-                  for (i = 0; i < ni; i++)
-                  {
-                     fprintf(file, "%.14e\n", values[i + j*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i+1 + j*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1)]);
-                     fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1)]);
-                  }
-            }
-            else
-            {
-               for (k = 0; k < nk; k++)
-                  for (j = 0; j < nj; j++)
-                     for (i = 0; i < ni; i++)
-                     {
-                        fprintf(file, "%.14e\n", values[i + j*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + j*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1) + k*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + j*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + j*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i+1 + (j+1)*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                        fprintf(file, "%.14e\n", values[i + (j+1)*(ni+1) + (k+1)*(ni+1)*(nj+1)]);
-                     }
-            }
-         }
-
-         free(values);
-      }
-   }
-
-   fflush(file);
-   fclose(file);
-}
-
-/* Save a GLVis mesh file with the given prefix corresponding to the input
-   Struct grid assuming that the cells are the same. The optional trans and
-   origin parameters specify a coordinate transformation, relative to a square
-   Cartesian grid. */
-void GLVis_PrintStructGrid(HYPRE_StructGrid Grid,
-                           const char *meshfile_prefix, int myid,
-                           double *trans, double *origin)
-{
-   FILE *file;
-   char meshfile[255];
-
-   hypre_StructGrid *grid = (hypre_StructGrid *)Grid;
-   int dim = grid->ndim;
-   int cellNV = (dim == 2) ? 4 : 8;
-   int elemid = 2*dim-1;
-   int nvert, nelem;
-
-   int given_trans = (trans != NULL && origin != NULL);
-   double *T = trans, *O = origin;
-
-   hypre_BoxArray *boxes;
-   hypre_Box *box;
-   int b, ncells;
-
-   nvert = nelem = 0;
-   boxes = hypre_StructGridBoxes(grid);
-   for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-   {
-      box = hypre_BoxArrayBox(boxes, b);
-      ncells = hypre_BoxVolume(box);
-      nvert += ncells*cellNV;
-      nelem += ncells;
-   }
-
-   {
-      int i, j, k, v, vert;
-      double x0, y0, z0, h;
-
-      sprintf(meshfile, "%s.%06d", meshfile_prefix, myid);
-      if ((file = fopen(meshfile, "w")) == NULL)
-      {
-         printf("Error: can't open output file %s\n", meshfile);
-         exit(1);
-      }
-
-      /* mesh header */
-      fprintf(file, "MFEM mesh v1.0\n");
-      fprintf(file, "\ndimension\n");
-      fprintf(file, "%d\n", dim);
-
-      /* mesh elements */
-      fprintf(file, "\nelements\n");
-      fprintf(file, "%d\n", nelem);
-
-      vert = 0;
-
-      boxes = hypre_StructGridBoxes(grid);
-      for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-      {
-         box = hypre_BoxArrayBox(boxes, b);
-         for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-            for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-               for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
-               {
-                  fprintf(file, "1 %d ", elemid);
-                  for (v = 0; v < cellNV; v++, vert++)
-                     fprintf(file, "%d ", vert);
-                  fprintf(file, "\n");
-               }
-      }
-
-      /* boundary will be generated by GLVis */
-      fprintf(file, "\nboundary\n");
-      fprintf(file, "0\n");
-
-      /* mesh vertices */
-      fprintf(file, "\nvertices\n");
-      fprintf(file, "%d\n", nvert);
-      fprintf(file, "%d\n", dim);
-
-      x0 = y0 = z0 = 0;
-      h = 1.0;
-      boxes = hypre_StructGridBoxes(grid);
-      for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-      {
-         box = hypre_BoxArrayBox(boxes, b);
-         for (k = hypre_BoxIMinD(box,2); k <= hypre_BoxIMaxD(box,2); k++)
-            for (j = hypre_BoxIMinD(box,1); j <= hypre_BoxIMaxD(box,1); j++)
-               for (i = hypre_BoxIMinD(box,0); i <= hypre_BoxIMaxD(box,0); i++)
-                  if (dim == 2)
-                  {
-                     if (!given_trans)
-                     {
-                        fprintf(file, "%.14e %.14e \n", x0+i*h, y0+j*h);
-                        fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+j*h);
-                        fprintf(file, "%.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h);
-                        fprintf(file, "%.14e %.14e \n", x0+i*h, y0+(j+1)*h);
-                     }
-                     else
-                     {
-                        fprintf(file, "%.14e %.14e \n",
-                                T[0]*i+T[1]*j+O[0],
-                                T[2]*i+T[3]*j+O[1]);
-                        fprintf(file, "%.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+O[0],
-                                T[2]*(i+1)+T[3]*j+O[1]);
-                        fprintf(file, "%.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+O[0],
-                                T[2]*(i+1)+T[3]*(j+1)+O[1]);
-                        fprintf(file, "%.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+O[0],
-                                T[2]*i+T[3]*(j+1)+O[1]);
-                     }
-                  }
-                  else
-                  {
-                     if (!given_trans)
-                     {
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+k*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+j*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+j*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+(i+1)*h, y0+(j+1)*h, z0+(k+1)*h);
-                        fprintf(file, "%.14e %.14e %.14e \n", x0+i*h, y0+(j+1)*h, z0+(k+1)*h);
-                     }
-                     else
-                     {
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*j+T[2]*k+O[0],
-                                T[3]*i+T[4]*j+T[5]*k+O[1],
-                                T[6]*i+T[7]*j+T[8]*k+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+T[2]*k+O[0],
-                                T[3]*(i+1)+T[4]*j+T[5]*k+O[1],
-                                T[6]*(i+1)+T[7]*j+T[8]*k+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+T[2]*k+O[0],
-                                T[3]*(i+1)+T[4]*(j+1)+T[5]*k+O[1],
-                                T[6]*(i+1)+T[7]*(j+1)+T[8]*k+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+T[2]*k+O[0],
-                                T[3]*i+T[4]*(j+1)+T[5]*k+O[1],
-                                T[6]*i+T[7]*(j+1)+T[8]*k+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*j+T[2]*(k+1)+O[0],
-                                T[3]*i+T[4]*j+T[5]*(k+1)+O[1],
-                                T[6]*i+T[7]*j+T[8]*(k+1)+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*j+T[2]*(k+1)+O[0],
-                                T[3]*(i+1)+T[4]*j+T[5]*(k+1)+O[1],
-                                T[6]*(i+1)+T[7]*j+T[8]*(k+1)+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*(i+1)+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                T[3]*(i+1)+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                T[6]*(i+1)+T[7]*(j+1)+T[8]*(k+1)+O[2]);
-                        fprintf(file, "%.14e %.14e %.14e \n",
-                                T[0]*i+T[1]*(j+1)+T[2]*(k+1)+O[0],
-                                T[3]*i+T[4]*(j+1)+T[5]*(k+1)+O[1],
-                                T[6]*i+T[7]*(j+1)+T[8]*(k+1)+O[2]);
-                     }
-                  }
-
-         if (given_trans)
-         {
-            T += dim*dim;
-            O += dim;
-         }
-      }
-
-      fflush(file);
-      fclose(file);
-   }
-}
-
-/* Save a Q0 GLVis grid function (in a file with the given prefix) corresponding
-   to the values of the input Struct vector. */
-void GLVis_PrintStructVector(HYPRE_StructVector sol,
-                             const char *solfile_prefix,
-                             int myid)
-{
-   FILE *file;
-   char solfile[255];
-
-   hypre_StructGrid *grid = ((hypre_StructVector*)sol)->grid;
-   int dim = grid->ndim;
-
-   hypre_BoxArray *boxes;
-   hypre_Box *box;
-   int b;
-
-   int i, j, k, ni, nj, nk;
-   double *values;
-   int ilower[3], iupper[3];
-
-   sprintf(solfile, "%s.%06d", solfile_prefix, myid);
-   if ((file = fopen(solfile, "w")) == NULL)
-   {
-      printf("Error: can't open output file %s\n", solfile);
-      exit(1);
-   }
-
-   /* grid function header */
-   fprintf(file, "FiniteElementSpace\n");
-   fprintf(file, "FiniteElementCollection: Local_L2_2D_P0\n");
-   fprintf(file, "VDim: 1\n");
-   fprintf(file, "Ordering: 0\n\n");
-
-   /* extract and save the vector values on each cell */
-   boxes = hypre_StructGridBoxes(grid);
-   for (b = 0; b < hypre_BoxArraySize(boxes); b++)
-   {
-      box = hypre_BoxArrayBox(boxes, b);
-      ni = hypre_BoxSizeD(box,0);
-      nj = hypre_BoxSizeD(box,1);
-      nk = hypre_BoxSizeD(box,2);
-
-      ilower[0] = hypre_BoxIMinD(box,0);
-      ilower[1] = hypre_BoxIMinD(box,1);
-      iupper[0] = hypre_BoxIMaxD(box,0);
-      iupper[1] = hypre_BoxIMaxD(box,1);
-
-      if (dim == 2)
-         values = (double*) malloc(ni*nj*sizeof(double));
-      else
-      {
-         values = (double*) malloc(ni*nj*nk*sizeof(double));
-         ilower[2] = hypre_BoxIMinD(box,2);
-         iupper[2] = hypre_BoxIMaxD(box,2);
-      }
-
-      HYPRE_StructVectorGetBoxValues(sol, ilower, iupper, values);
-
-      for (k = 0; k < nk; k++)
-         for (j = 0; j < nj; j++)
-            for (i = 0; i < ni; i++)
-               fprintf(file, "%.14e\n", values[i + j*ni]);
-
-      free(values);
-   }
-
-   fflush(file);
-   fclose(file);
-}
-
-/* Save additional data needed for GLVis visualization (e.g. the number of
-   processors in the run). */
-void GLVis_PrintData(const char *datafile, int myid, int num_procs)
-{
-   FILE *file;
-
-   if (myid == 0)
-   {
-      file = fopen(datafile, "w");
-      fprintf(file, "np %d\n", num_procs);
-      fflush(file);
-      fclose(file);
-   }
-}
diff --git a/examples/cvode/serial/cvHeat2D_klu.c b/examples/cvode/serial/cvHeat2D_klu.c
deleted file mode 100644
index a4f2eff36e..0000000000
--- a/examples/cvode/serial/cvHeat2D_klu.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Chris Nguyen
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Example problem for CVODE: 2D heat equation, serial, sparse.
- * Based on idaHeat2D_klu.c and cvRoberts_klu.c
- *
- * This example solves a discretized 2D heat equation problem.
- * This version uses the KLU sparse solver.
- *
- * The PDE system solved is a spatial discretization of the PDE
- *          du/dt = d^2u/dx^2 + d^2u/dy^2
- * on the unit square. The boundary condition is u = 0 on all edges.
- * Initial conditions are given by u = 16 x (1 - x) y (1 - y).
- * The PDE is treated with central differences on a uniform MGRID x MGRID
- * grid. The values of u at the interior points satisfy ODEs, and
- * equations u = 0 at the boundaries are appended, to form a DAE
- * system of size N = MGRID^2. Here MGRID = 10.
- *
- * The system is solved with CVODE using the direct sparse linear system
- * solver, half-bandwidths equal to M, and default
- * difference-quotient Jacobian.
- * Output is taken at t = 0, .01, .02, .04, ..., 10.24.
- * -----------------------------------------------------------------*/
-
-//////////////////////////////////////////////////////////////////////////
-// Note: was still trying to get case MGRID=3 to work amd convert to
-// CVODE format. Any comments using // were left in for future work notes
-/////////////////////////////////////////////////////////////////////////
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <cvode/cvode.h>                /* prototypes for CVODE fcts., consts.  */
-#include <nvector/nvector_serial.h>     /* access to serial N_Vector            */
-#include <sunmatrix/sunmatrix_sparse.h> /* access to sparse SUNMatrix           */
-#include <sunlinsol/sunlinsol_klu.h>    /* access to KLU sparse direct solver   */
-#include <sundials/sundials_types.h>    /* defs. of realtype, sunindextype      */
-
-/* User-defined vector and matrix accessor macro: Ith */
-
-/* These macros are defined in order to write code which exactly matches
-   the mathematical problem description given above.
-
-   Ith(v,i) references the ith component of the vector v, where i is in
-   the range [1..NEQ] and NEQ is defined below. The Ith macro is defined
-   using the N_VIth macro in nvector.h. N_VIth numbers the components of
-   a vector starting from 0.
-*/
-
-#define Ith(v,i)    NV_Ith_S(v,i-1)       /* Ith numbers components 1..NEQ */
-
-/* Problem Constants */
-/*
-#define NOUT  11
-#define MGRID 10
-#define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.0)
-*/
-#define MGRID 3
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.0)
-#define NEQ   MGRID*MGRID      /* number of equations    */
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.1)      /* first output time      */
-#define TMULT RCONST(2.0)      /* output time factor     */
-#define NOUT  12               /* number of output times */
-#define TOTAL 4*MGRID+8*(MGRID-2)+(MGRID-4)*(MGRID+4*(MGRID-2)) /* total num of nonzero elements */
-
-/* Type: UserData */
-
-typedef struct {
-  sunindextype mm;
-  realtype dx;
-  realtype coeff;
-} *UserData;
-
-/* Prototypes of functions called by CVODE */
-
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-
-static int jacHeat(realtype tt, N_Vector yy, N_Vector fy, SUNMatrix JacMat,
-                   void *user_data, N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
-
-/* Exact same setup as jacHeat. Function needed for special case MGRID=3  */
-static int jacHeat3(realtype tt, N_Vector yy, N_Vector fy, SUNMatrix JacMat,
-                    void *user_data, N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
-
-/* Prototypes of private functions */
-
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
-static void PrintFinalStats(void *cvode_mem);
-static int SetInitialProfile(UserData data, N_Vector uu, N_Vector res);
-
-static int check_retval(void *returnvalue, const char *funcname, int opt);
-
-/*
- *--------------------------------------------------------------------
- * MAIN PROGRAM
- *--------------------------------------------------------------------
- */
-
-int main(void)
-{
-  SUNContext sunctx;
-  void *cvode_mem;
-  UserData data;
-  N_Vector uu, constraints, res;
-  SUNMatrix A;
-  SUNLinearSolver LS;
-  int retval, iout;
-  sunindextype mu, ml, netf, ncfn;
-  realtype rtol, atol, t0, t1, tout, tret;
-
-  int nnz; /* number of non-zeroes  */
-
-  cvode_mem = NULL;
-  data = NULL;
-  uu = constraints = res = NULL;
-  A = NULL;
-  LS = NULL;
-
-  retval = SUNContext_Create(NULL, &sunctx);
-  if(check_retval(&retval, "SUNContext_Create", 1)) return(1);
-
-  /* Create vectors uu, up, res, constraints, id. */
-  uu = N_VNew_Serial(NEQ, sunctx);
-  if(check_retval((void *)uu, "N_VNew_Serial", 0)) return(1);
-  constraints = N_VNew_Serial(NEQ, sunctx);
-  if(check_retval((void *)constraints, "N_VNew_Serial", 0)) return(1);
-  res = N_VNew_Serial(NEQ, sunctx);
-  if(check_retval((void *)res, "N_VNew_Serial", 0)) return(1);
-
-  /* Create and load problem data block. */
-  data = (UserData) malloc(sizeof *data);
-  if(check_retval((void *)data, "malloc", 2)) return(1);
-  data->mm = MGRID;
-  data->dx = ONE/(MGRID - ONE);
-  data->coeff = ONE/( (data->dx) * (data->dx) );
-
-  /* Initialize uu, up. */
-  SetInitialProfile(data, uu, res);
-
-  /* Set constraints to all 1's for nonnegative solution values. */
-  N_VConst(ONE, constraints);
-
-  /* Set remaining input parameters. */
-  t0   = ZERO;
-  t1   = RCONST(0.01);
-  rtol = ZERO;
-  atol = RCONST(1.0e-8);
-
-  /* Call CVodeCreate to create the solver memory and specify the
-   * Backward Differentiation Formula */
-  cvode_mem = CVodeCreate(CV_BDF, sunctx);
-  if(check_retval((void *)cvode_mem, "CVodeCreate", 0)) return(1);
-
-  retval = CVodeSetUserData(cvode_mem, data);
-  if(check_retval(&retval, "CVodeSetUserData", 1)) return(1);
-
-  /*
-  retval = IDASetConstraints(cvode_mem, constraints);
-  if(check_retval(&retval, "IDASetConstraints", 1)) return(1);
-  */
-  N_VDestroy(constraints);
-
-  retval = CVodeInit(cvode_mem, f, t0, uu);
-  if(check_retval(&retval, "CVodeInit", 1)) return(1);
-
-  retval = CVodeSStolerances(cvode_mem, rtol, atol);
-  if(check_retval(&retval, "CVodeSStolerances", 1)) return(1);
-
-  /* Create sparse SUNMatrix for use in linear solves */
-  nnz = NEQ * NEQ;
-  A = SUNSparseMatrix(NEQ, NEQ, nnz, CSC_MAT, sunctx);
-  if(check_retval((void *)A, "SUNSparseMatrix", 0)) return(1);
-
-  /* Create KLU solver object for use by CVode */
-  LS = SUNLinSol_KLU(y, A, sunctx);
-  if(check_retval((void *)LS, "SUNLinSol_KLU", 0)) return(1);
-
-  /* Call CVodeSetLinearSolver to attach the matrix and linear solver to CVode */
-  retval = CVodeSetLinearSolver(cvode_mem, LS, A);
-  if(check_retval(&retval, "CVodeSetLinearSolver", 1)) return(1);
-
-  /* Set the user-supplied Jacobian routine Jac based pm size of Jac */
-  if(MGRID >= 4){
-    retval = CVodeSetJacFn(cvode_mem, jacHeat);
-  }
-  /* special case MGRID=3  */
-  else if(MGRID==3){
-    retval = CVodeSetJacFn(cvode_mem, jacHeat3);
-  }
-  /* MGRID<=2 is pure boundary points, nothing to solve  */
-  else{
-    printf("MGRID size is too small to run.\n");
-    return(1);
-  }
-  if(check_retval(&retval, "CVodeSetJacFn", 1)) return(1);
-
-  /* Print output heading. */
-  PrintHeader(rtol, atol);
-
-  PrintOutput(cvode_mem, t0, uu);
-
-  /* Loop over output times, call CVode, and print results. */
-
-  for (tout = t1, iout = 1; iout <= NOUT; iout++, tout *= TWO) {
-
-    retval = CVode(cvode_mem, tout, uu, &tret, CV_NORMAL);
-    if(check_retval(&retval, "CVode", 1)) return(1);
-
-    PrintOutput(cvode_mem, tret, uu);
-
-  }
-
-  /* Print remaining counters and free memory. */
-  retval = CVodeGetNumErrTestFails(cvode_mem, &netf);
-  check_retval(&retval, "CVodeGetNumErrTestFails", 1);
-  retval = CVodeGetNumNonlinSolvConvFails(cvode_mem, &ncfn);
-  check_retval(&retval, "CVodeGetNumNonlinSolvConvFails", 1);
-  printf("\n netf = %ld,   ncfn = %ld \n", netf, ncfn);
-
-  PrintFinalStats(cvode_mem);
-
-  /* Free memory  */
-
-  CVodeFree(&cvode_mem);
-  SUNLinSolFree(LS);
-  SUNMatDestroy(A);
-  N_VDestroy(uu);
-  N_VDestroy(res);
-  free(data);
-  SUNContext_Free(&sunctx);
-
-  return(0);
-}
-
-/*
- *--------------------------------------------------------------------
- * FUNCTIONS CALLED BY CVODE
- *--------------------------------------------------------------------
- */
-
-/*
- * f routine. Compute function f(t,u).
- */
-/////////////////////////////////////////
-// How to define f for heat equation like
-// in Roberts problem?
-////////////////////////////////////////
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
-{
-  realtype u1, ud1;
-
-  u1 = Ith(u,1);
-
-  ud1 = Ith(udot,1) = RCONST(4)*u1;
-
-  return(0);
-}
-
-/*
-int heatres(realtype tres, N_Vector uu, N_Vector resval,
-            void *user_data)
-{
-  sunindextype mm, i, j, offset, loc;
-  realtype *uv, *resv, coeff;
-  UserData data;
-
-  uv = N_VGetArrayPointer(uu); resv = N_VGetArrayPointer(resval);
-
-  data = (UserData)user_data;
-  mm = data->mm;
-  coeff = data->coeff;
-
-  //Initialize resval to uu, to take care of boundary equations.
-  N_VScale(ZERO, uu, resval);
-
-  //Loop over interior points; set res = up - (central difference).
-  for (j = 1; j < mm-1; j++) {
-    offset = mm*j;
-    for (i = 1; i < mm-1; i++) {
-      loc = offset + i;
-      resv[loc] = upv[loc] - coeff *
-	  (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - RCONST(4.0)*uv[loc]);
-    }
-  }
-
-  return(0);
-
-  }
-*/
-
-/* Jacobian matrix setup for MGRID=3  */
-static int jacHeat3(realtype tt, N_Vector yy, N_Vector fy, SUNMatrix JacMat,
-                    void *user_data, N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
-{
-  realtype *yval;
-  sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JacMat);
-  sunindextype *rowvals = SUNSparseMatrix_IndexValues(JacMat);
-  realtype *data = SUNSparseMatrix_Data(JacMat);
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx);
-
-  yval = N_VGetArrayPointer(yy);
-
-  SUNMatZero(JacMat); // initialize Jacobian matrix
-
-  // set up number of elements in each column
-
-  colptrs[0] = 0;
-  colptrs[1] = 1;
-
-  /*
-  JacMat -> colptrs[0]  = 0;
-  JacMat -> colptrs[1]  = 1;
-  JacMat -> colptrs[2]  = 3;
-  JacMat -> colptrs[3]  = 4;
-  JacMat -> colptrs[4]  = 6;
-  JacMat -> colptrs[5]  = 7;
-  JacMat -> colptrs[6]  = 9;
-  JacMat -> colptrs[7]  = 10;
-  JacMat -> colptrs[8]  = 12;
-  JacMat -> colptrs[9]  = 13;
-  */
-  //set up data and row values stored
-
-  data[0] = TWO*TWO;
-  rowvals[0] = 0;
-
-  /*
-  JacMat -> data[0] = ONE;
-  JacMat -> rowvals[0] = 0;
-  JacMat -> data[1] = ONE;
-  JacMat -> rowvals[1] = 1;
-  JacMat -> data[2] = -ONE/(dx*dx);
-  JacMat -> rowvals[2] = 4;
-  JacMat -> data[3] = ONE;
-  JacMat -> rowvals[3] = 2;
-  JacMat -> data[4] = ONE;
-  JacMat -> rowvals[4] = 3;
-  JacMat -> data[5] = -ONE/(dx*dx);
-  JacMat -> rowvals[5] = 4;
-  JacMat -> data[6] = beta;
-  JacMat -> rowvals[6] = 4;
-  JacMat -> data[7] = -ONE/(dx*dx);
-  JacMat -> rowvals[7] = 4;
-  JacMat -> data[8] = ONE;
-  JacMat -> rowvals[8] = 5;
-  JacMat -> data[9] = ONE;
-  JacMat -> rowvals[9] = 6;
-  JacMat -> data[10] = -ONE/(dx*dx);
-  JacMat -> rowvals[10] = 4;
-  JacMat -> data[11] = ONE;
-  JacMat -> rowvals[11] = 7;
-  JacMat -> data[12] = ONE;
-  JacMat -> rowvals[12] = 8;
-  */
-
-  return(0);
-}
-
-//////////////////////////////////////////////////////////////////
-// Remove boundary points in matrix, redefine without
-//////////////////////////////////////////////////////////////////
-
-/* Jacobian matrix setup for MGRID>=4  */
-static int jacHeat(realtype tt, N_Vector yy, N_Vector fy, SUNMatrix JacMat,
-                   void *user_data, N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
-{
-  realtype *yval;
-  sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
-  sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx);
-  int i,j, repeat=0;
-
-  yval = N_VGetArrayPointer(yy);
-
-  SUNMatZero(JacMat); /* initialize Jacobian matrix  */
-
-  /*
-   *-----------------------------------------------
-   * set up number of elements in each column
-   *-----------------------------------------------
-   */
-
-  /**** first column block ****/
-  colptrs[0] = 0;
-  colptrs[1] = 1;
-  /* count by twos in the middle  */
-  for(i=2;i<MGRID;i++) colptrs[i] = colptrs[i-1]+2;
-  colptrs[MGRID] = 2*MGRID-2;
-
-  /**** second column block ****/
-  colptrs[MGRID+1] = 2*MGRID;
-  colptrs[MGRID+2] = 2*MGRID+3;
-  /* count by fours in the middle */
-  for(i=0;i<MGRID-4;i++) colptrs[MGRID+3+i] = colptrs[MGRID+3+i-1]+4;
-  colptrs[2*MGRID-1] = 2*MGRID+4*(MGRID-2)-2;
-  colptrs[2*MGRID]   = 2*MGRID+4*(MGRID-2);
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  for(i=0;i<MGRID-4;i++){
-    colptrs[2*MGRID+1+repeat]   = (colptrs[2*MGRID+1+repeat-1])+2;
-    colptrs[2*MGRID+1+repeat+1] = (colptrs[2*MGRID+1+repeat])+4;
-
-    /* count by fives in the middle */
-    for(j=0;j<MGRID-4;j++) colptrs[2*MGRID+1+repeat+2+j] = colptrs[2*MGRID+1+repeat+1+j]+5;
-
-    colptrs[2*MGRID+1+repeat+(MGRID-4)+2] = colptrs[2*MGRID+1+repeat+(MGRID-4)+1]+4;
-    colptrs[2*MGRID+1+repeat+(MGRID-4)+3] = colptrs[2*MGRID+1+repeat+(MGRID-4)+2]+2;
-
-    repeat+=MGRID; /* shift that accounts for accumulated number of columns */
-  }
-
-  /**** last-1 column block ****/
-  colptrs[MGRID*MGRID-2*MGRID+1] = TOTAL-2*MGRID-4*(MGRID-2)+2;
-  colptrs[MGRID*MGRID-2*MGRID+2] = TOTAL-2*MGRID-4*(MGRID-2)+5;
-  /* count by fours in the middle */
-  for(i=0;i<MGRID-4;i++) colptrs[MGRID*MGRID-2*MGRID+3+i] = colptrs[MGRID*MGRID-2*MGRID+3+i-1]+4;
-  colptrs[MGRID*MGRID-MGRID-1] = TOTAL-2*MGRID;
-  colptrs[MGRID*MGRID-MGRID]   = TOTAL-2*MGRID+2;
-
-  /**** last column block ****/
-  colptrs[MGRID*MGRID-MGRID+1] = TOTAL-MGRID-(MGRID-2)+1;
-  /* count by twos in the middle */
-  for(i=0;i<MGRID-2;i++) colptrs[MGRID*MGRID-MGRID+2+i] = colptrs[MGRID*MGRID-MGRID+2+i-1]+2;
-  colptrs[MGRID*MGRID-1] = TOTAL-1;
-  colptrs[MGRID*MGRID]   = TOTAL;
-
-
-  /*
-   *-----------------------------------------------
-   * set up data stored
-   *-----------------------------------------------
-   */
-
-  /**** first column block ****/
-  data[0] = ONE;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=1;i<MGRID+(MGRID-2)  ;i+=2) data[i] = ONE;
-  for(i=2;i<MGRID+(MGRID-2)-1;i+=2) data[i] = -ONE/(dx*dx);
-
-  /**** second column block ****/
-  data[MGRID+MGRID-2] = ONE;
-  data[MGRID+MGRID-1] = -ONE/(dx*dx);
-  data[MGRID+MGRID]   = beta;
-  data[MGRID+MGRID+1] = -ONE/(dx*dx);
-  data[MGRID+MGRID+2] = -ONE/(dx*dx);
-  /* middle data elements */
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+3+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+4+4*i] = beta;
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+5+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+6+4*i] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-5] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-4] = beta;
-  data[2*MGRID+4*(MGRID-2)-3] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-2] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-1] = ONE;
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  repeat=0;
-  for(i=0;i<MGRID-4;i++){
-    data[2*MGRID+4*(MGRID-2)+repeat]   = ONE;
-    data[2*MGRID+4*(MGRID-2)+repeat+1] = -ONE/(dx*dx);
-
-    data[2*MGRID+4*(MGRID-2)+repeat+2] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+3] = beta;
-    data[2*MGRID+4*(MGRID-2)+repeat+4] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+5] = -ONE/(dx*dx);
-
-    /* 5 in 5*j chosen since there are 5 elements in each column */
-    /* this column loops MGRID-4 times within the outer loop */
-    for(j=0;j<MGRID-4;j++){
-      data[2*MGRID+4*(MGRID-2)+repeat+6+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+7+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+8+5*j]  = beta;
-      data[2*MGRID+4*(MGRID-2)+repeat+9+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+10+5*j] = -ONE/(dx*dx);
-    }
-
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+6] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+7] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+8] = beta;
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+9] = -ONE/(dx*dx);
-
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+10] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+11] = ONE;
-
-    repeat+=MGRID+4*(MGRID-2); /* shift that accounts for accumulated columns and elements */
-  }
-
-  /**** last-1 column block ****/
-  data[TOTAL-6*(MGRID-2)-4] = ONE;
-  data[TOTAL-6*(MGRID-2)-3] = -ONE/(dx*dx);
-  data[TOTAL-6*(MGRID-2)-2] = -ONE/(dx*dx);
-  data[TOTAL-6*(MGRID-2)-1] = beta;
-  data[TOTAL-6*(MGRID-2)  ] = -ONE/(dx*dx);
-  /* middle data elements */
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+1+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+2+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+3+4*i] = beta;
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+4+4*i] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-7] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-6] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-5] = beta;
-  data[TOTAL-2*(MGRID-2)-4] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-3] = ONE;
-
-  /**** last column block ****/
-  data[TOTAL-2*(MGRID-2)-2] = ONE;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=TOTAL-2*(MGRID-2)-1;i<TOTAL-2;i+=2) data[i] = -ONE/(dx*dx);
-  for(i=TOTAL-2*(MGRID-2)  ;i<TOTAL-1;i+=2) data[i] = ONE;
-  data[TOTAL-1] = ONE;
-
-  /*
-   *-----------------------------------------------
-   * row values
-   *-----------------------------------------------
-   */
-
-  /**** first block ****/
-  rowvals[0] = 0;
-  /* alternating pattern in data, separate loop for each pattern */
-  for(i=1;i<MGRID+(MGRID-2)  ;i+=2) rowvals[i] = (i+1)/2;
-  for(i=2;i<MGRID+(MGRID-2)-1;i+=2) rowvals[i] = i/2+MGRID; // i+1 unnecessary here
-
-  /**** second column block ****/
-  rowvals[MGRID+MGRID-2] = MGRID;
-  rowvals[MGRID+MGRID-1] = MGRID+1;
-  rowvals[MGRID+MGRID]   = MGRID+1;
-  rowvals[MGRID+MGRID+1] = MGRID+2;
-  rowvals[MGRID+MGRID+2] = 2*MGRID+1;
-  /* middle row values */
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+3+4*i] = MGRID+1+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+4+4*i] = MGRID+2+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+5+4*i] = MGRID+3+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+6+4*i] = 2*MGRID+2+i;
-  rowvals[2*MGRID+4*(MGRID-2)-5] = MGRID+(MGRID-2)-1;
-  rowvals[2*MGRID+4*(MGRID-2)-4] = MGRID+(MGRID-2); // starting from here, add two diag patterns
-  rowvals[2*MGRID+4*(MGRID-2)-3] = 2*MGRID+(MGRID-2);
-  rowvals[2*MGRID+4*(MGRID-2)-2] = MGRID+(MGRID-2);
-  rowvals[2*MGRID+4*(MGRID-2)-1] = MGRID+(MGRID-2)+1;
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  repeat=0;
-  for(i=0;i<MGRID-4;i++){
-    rowvals[2*MGRID+4*(MGRID-2)+repeat]   = MGRID+(MGRID-2)+2+MGRID*i;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+1] = MGRID+(MGRID-2)+2+MGRID*i+1;
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+2] = MGRID+(MGRID-2)+2+MGRID*i+1-MGRID;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+3] = MGRID+(MGRID-2)+2+MGRID*i+1;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+4] = MGRID+(MGRID-2)+2+MGRID*i+2; //*this
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+5] = MGRID+(MGRID-2)+2+MGRID*i+1+MGRID;
-
-    /* 5 in 5*j chosen since there are 5 elements in each column */
-    /* column repeats MGRID-4 times within the outer loop */
-    for(j=0;j<MGRID-4;j++){
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+6+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+1-MGRID+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+7+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+8+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+2+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+9+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+2+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+10+5*j] = MGRID+(MGRID-2)+2+MGRID*i+1+MGRID+1+j;
-    }
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+6] = MGRID+(MGRID-2)+2+MGRID*i-2;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+7] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID-1;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+8] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID;//*this+MGRID
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+9] = MGRID+(MGRID-2)+2+MGRID*i-2+2*MGRID;
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+10] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+11] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID+1;
-
-    repeat+=MGRID+4*(MGRID-2); /* shift that accounts for accumulated columns and elements */
-  }
-
-
-  /**** last-1 column block ****/
-  rowvals[TOTAL-6*(MGRID-2)-4] = MGRID*MGRID-1-2*(MGRID-1)-1;
-  rowvals[TOTAL-6*(MGRID-2)-3] = MGRID*MGRID-1-2*(MGRID-1); // starting with this as base
-  rowvals[TOTAL-6*(MGRID-2)-2] = MGRID*MGRID-1-2*(MGRID-1)-MGRID;
-  rowvals[TOTAL-6*(MGRID-2)-1] = MGRID*MGRID-1-2*(MGRID-1);
-  rowvals[TOTAL-6*(MGRID-2)  ] = MGRID*MGRID-1-2*(MGRID-1)+1;
-  /* middle row values */
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+1+4*i] = MGRID*MGRID-1-2*(MGRID-1)-MGRID+1+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+2+4*i] = MGRID*MGRID-1-2*(MGRID-1)+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+3+4*i] = MGRID*MGRID-1-2*(MGRID-1)+1+i;//copied above
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+4+4*i] = MGRID*MGRID-1-2*(MGRID-1)+2+i;
-  rowvals[TOTAL-2*(MGRID-2)-7] = MGRID*MGRID-2*MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-6] = MGRID*MGRID-MGRID-3;
-  rowvals[TOTAL-2*(MGRID-2)-5] = MGRID*MGRID-MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-4] = MGRID*MGRID-MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-3] = MGRID*MGRID-MGRID-1;
-
-  /* last column block */
-  rowvals[TOTAL-2*(MGRID-2)-2] = MGRID*MGRID-MGRID;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=0;i<(MGRID-2);i++) rowvals[TOTAL-2*(MGRID-2)-1+2*i] = MGRID*MGRID-2*MGRID+1+i;
-  for(i=0;i<(MGRID-2);i++) rowvals[TOTAL-2*(MGRID-2)  +2*i] = MGRID*MGRID-MGRID+1+i;
-  rowvals[TOTAL-1] = MGRID*MGRID-1;
-
-  //SUNSparseMatrix_Print(JacMat);
-
-  return(0);
-}
-
-
-/*
- *--------------------------------------------------------------------
- * PRIVATE FUNCTIONS
- *--------------------------------------------------------------------
- */
-
-/*
- * SetInitialProfile: routine to initialize u vector.
- */
-
-static int SetInitialProfile(UserData data, N_Vector uu, N_Vector res)
-{
-  realtype xfact, yfact, *udata;
-  sunindextype mm, mm1, i, j, offset, loc;
-
-  mm = data->mm;
-  mm1 = mm - 1;
-
-  udata = N_VGetArrayPointer(uu);
-
-  /* Initialize uu on all grid points. */
-  for (j = 0; j < mm; j++) {
-    yfact = data->dx * j;
-    offset = mm*j;
-    for (i = 0;i < mm; i++) {
-      xfact = data->dx * i;
-      loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
-    }
-  }
-
-  /* heatres sets res to negative of PDE RHS values at interior points. */
-  heatres(ZERO, uu, res, data);
-
-  /* Finally, set values of u, up, and id at boundary points. */
-  for (j = 0; j < mm; j++) {
-    offset = mm*j;
-    for (i = 0;i < mm; i++) {
-      loc = offset + i;
-      if (j == 0 || j == mm1 || i == 0 || i == mm1 ) {
-        udata[loc] = BVAL;
-      }
-    }
-  }
-
-  return(0);
-
-}
-
-/*
- * Print first lines of output (problem description)
- */
-
-static void PrintHeader(realtype rtol, realtype atol)
-{
-  printf("\ncvHeat2D_klu: Heat equation, serial example problem for CVODE\n");
-  printf("          Discretized heat equation on 2D unit square.\n");
-  printf("          Zero boundary conditions,");
-  printf(" polynomial initial conditions.\n");
-  printf("          Mesh dimensions: %d x %d", MGRID, MGRID);
-  printf("        Total system size: %d\n\n", NEQ);
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf("Tolerance parameters:  rtol = %Lg   atol = %Lg\n", rtol, atol);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf("Tolerance parameters:  rtol = %g   atol = %g\n", rtol, atol);
-#else
-  printf("Tolerance parameters:  rtol = %g   atol = %g\n", rtol, atol);
-#endif
-  printf("Linear solver: CVKLU, sparse direct solver \n");
-  printf("       difference quotient Jacobian \n");
-  /* Print output table heading and initial line of table. */
-  printf("\n   Output Summary (umax = max-norm of solution) \n\n");
-  printf("  time       umax     k  nst  nni  nje   nre     h       \n" );
-  printf(" .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . \n");
-}
-
-/*
- * Print Output
- */
-
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
-{
-  int retval;
-  realtype umax, hused;
-  long int nst, nni, nje, nre, nreLS;
-  int kused;
-
-  umax = N_VMaxNorm(uu);
-
-  retval = CVodeGetLastOrder(mem, &kused);
-  check_retval(&retval, "CVodeGetLastOrder", 1);
-  retval = CVodeGetNumSteps(mem, &nst);
-  check_retval(&retval, "CVodeGetNumSteps", 1);
-  retval = CVodeGetNumNonlinSolvIters(mem, &nni);
-  check_retval(&retval, "CVodeGetNumNonlinSolvIters", 1);
-  //retval = CVodeGetNumResEvals(mem, &nre);
-  //check_retval(&retval, "CVodeGetNumResEvals", 1);
-  retval = CVodeGetLastStep(mem, &hused);
-  check_retval(&retval, "CVodeGetLastStep", 1);
-  retval = CVodeGetNumJacEvals(mem, &nje);
-  check_retval(&retval, "CVodeGetNumJacEvals", 1);
-
-/*
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf(" %5.2Lf %13.5Le  %d  %3ld  %3ld  %3ld  %4ld  %9.2Le \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %4ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#else
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %4ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#endif
-*/
-
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf(" %5.2Lf %13.5Le  %d  %3ld  %3ld  %3ld  %9.2Le \n",
-         t, umax, kused, nst, nni, nje, hused);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, hused);
-#else
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, hused);
-#endif
-
-}
-
-/*
- * Get and print some final statistics
- */
-
-static void PrintFinalStats(void *cvode_mem)
-{
-  long int nst, nfe, nsetups, nje, nni, ncfn, netf, nge;
-  int retval;
-
-  retval = CVodeGetNumSteps(cvode_mem, &nst);
-  check_retval(&retval, "CVodeGetNumSteps", 1);
-  retval = CVodeGetNumRhsEvals(cvode_mem, &nfe);
-  check_retval(&retval, "CVodeGetNumRhsEvals", 1);
-  retval = CVodeGetNumLinSolvSetups(cvode_mem, &nsetups);
-  check_retval(&retval, "CVodeGetNumLinSolvSetups", 1);
-  retval = CVodeGetNumErrTestFails(cvode_mem, &netf);
-  check_retval(&retval, "CVodeGetNumErrTestFails", 1);
-  retval = CVodeGetNumNonlinSolvIters(cvode_mem, &nni);
-  check_retval(&retval, "CVodeGetNumNonlinSolvIters", 1);
-  retval = CVodeGetNumNonlinSolvConvFails(cvode_mem, &ncfn);
-  check_retval(&retval, "CVodeGetNumNonlinSolvConvFails", 1);
-
-  retval = CVodeGetNumJacEvals(cvode_mem, &nje);
-  check_retval(&retval, "CVodeGetNumJacEvals", 1);
-
-  retval = CVodeGetNumGEvals(cvode_mem, &nge);
-  check_retval(&retval, "CVodeGetNumGEvals", 1);
-
-  printf("\nFinal Statistics:\n");
-  printf("nst = %-6ld nfe  = %-6ld nsetups = %-6ld nje = %ld\n",
-	 nst, nfe, nsetups, nje);
-  printf("nni = %-6ld ncfn = %-6ld netf = %-6ld    nge = %ld\n \n",
-	 nni, ncfn, netf, nge);
-}
-
-/*
- * Check function return value...
- *   opt == 0 means SUNDIALS function allocates memory so check if
- *            returned NULL pointer
- *   opt == 1 means SUNDIALS function returns an integer value so check if
- *            retval < 0
- *   opt == 2 means function allocates memory so check if returned
- *            NULL pointer
- */
-
-static int check_retval(void *returnvalue, const char *funcname, int opt)
-{
-  int *retval;
-
-  /* Check if SUNDIALS function returned NULL pointer - no memory allocated */
-  if (opt == 0 && returnvalue == NULL) {
-    fprintf(stderr,
-            "\nSUNDIALS_ERROR: %s() failed - returned NULL pointer\n\n",
-            funcname);
-    return(1);
-  } else if (opt == 1) {
-    /* Check if retval < 0 */
-    retval = (int *) returnvalue;
-    if (*retval < 0) {
-      fprintf(stderr,
-              "\nSUNDIALS_ERROR: %s() failed with retval = %d\n\n",
-              funcname, *retval);
-      return(1);
-    }
-  } else if (opt == 2 && returnvalue == NULL) {
-    /* Check if function returned NULL pointer - no memory allocated */
-    fprintf(stderr,
-            "\nMEMORY_ERROR: %s() failed - returned NULL pointer\n\n",
-            funcname);
-    return(1);
-  }
-
-  return(0);
-}
diff --git a/examples/ida/serial/idaHeat2D_sps.c b/examples/ida/serial/idaHeat2D_sps.c
deleted file mode 100644
index d89c674870..0000000000
--- a/examples/ida/serial/idaHeat2D_sps.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Allan Taylor, Alan Hindmarsh,
- *                Chris Nguyen, Radu Serban @ LLNL
- *                based on idaHeat2D_bnd.c and idaRoberts_sps.c
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Example problem for IDA: 2D heat equation, serial, sparse.
- *
- * This example solves a discretized 2D heat equation problem.
- * This version uses the SuperLUMT solver and IDACalcIC.
- *
- * The DAE system solved is a spatial discretization of the PDE
- *          du/dt = d^2u/dx^2 + d^2u/dy^2
- * on the unit square. The boundary condition is u = 0 on all edges.
- * Initial conditions are given by u = 16 x (1 - x) y (1 - y).
- * The PDE is treated with central differences on a uniform MGRID x MGRID
- * grid. The values of u at the interior points satisfy ODEs, and
- * equations u = 0 at the boundaries are appended, to form a DAE
- * system of size N = MGRID^2. Here MGRID = 10.
- *
- * The system is solved with IDA using the sparse linear system
- * solver and a user supplied Jacobian.
- * For purposes of illustration,
- * IDACalcIC is called to compute correct values at the boundary,
- * given incorrect values as input initial guesses. The constraints
- * u >= 0 are posed for all components. Output is taken at
- * t = 0, .01, .02, .04, ..., 10.24. (Output at t = 0 is for
- * IDACalcIC cost statistics only.)
- * -----------------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <ida/ida.h>                       /* prototypes for IDA fcts., consts.    */
-#include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
-#include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
-#include <sunlinsol/sunlinsol_superlumt.h> /* access to superlumt linear solver    */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
-#include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
-
-/* Problem Constants */
-
-#define NOUT  11
-#define MGRID 10
-#define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.0)
-#define TOTAL 4*MGRID+8*(MGRID-2)+(MGRID-4)*(MGRID+4*(MGRID-2)) /* total num of nonzero elements */
-
-/* Type: UserData */
-
-typedef struct {
-  sunindextype mm;
-  realtype dx;
-  realtype coeff;
-} *UserData;
-
-/* Prototypes of functions called by IDA */
-
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
-
-int jacHeat(realtype tt,  realtype cj,
-            N_Vector yy, N_Vector yp, N_Vector resvec,
-            SUNMatrix JJ, void *user_data,
-            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
-
-/* Exact same setup as jacHeat. Function needed for special case MGRID=3  */
-int jacHeat3(realtype tt,  realtype cj,
-             N_Vector yy, N_Vector yp, N_Vector resvec,
-             SUNMatrix JJ, void *user_data,
-             N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
-
-/* Prototypes of private functions */
-
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector u);
-static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
-                             N_Vector id, N_Vector res);
-
-static int check_retval(void *returnvalue, const char *funcname, int opt);
-
-/*
- *--------------------------------------------------------------------
- * MAIN PROGRAM
- *--------------------------------------------------------------------
- */
-
-int main(void)
-{
-  void *mem;
-  UserData data;
-  N_Vector uu, up, constraints, id, res;
-  int retval, iout;
-  long int netf, ncfn;
-  realtype rtol, atol, t0, t1, tout, tret;
-  SUNMatrix A;
-  SUNLinearSolver LS;
-  sunindextype nnz;
-  SUNContext ctx;
-
-  mem = NULL;
-  data = NULL;
-  uu = up = constraints = id = res = NULL;
-  A = NULL;
-  LS = NULL;
-
-  /* Create the SUNDIALS context object for this simulation */
-  retval = SUNContext_Create(NULL, &ctx);
-  if (check_retval(&retval, "SUNContext_Create", 1)) return 1;
-
-  /* Create vectors uu, up, res, constraints, id. */
-  uu = N_VNew_Serial(NEQ, ctx);
-  if(check_retval((void *)uu, "N_VNew_Serial", 0)) return(1);
-  up = N_VClone(uu);
-  if(check_retval((void *)up, "N_VNew_Serial", 0)) return(1);
-  res = N_VClone(uu);
-  if(check_retval((void *)res, "N_VNew_Serial", 0)) return(1);
-  constraints = N_VClone(uu);
-  if(check_retval((void *)constraints, "N_VNew_Serial", 0)) return(1);
-  id = N_VClone(uu);
-  if(check_retval((void *)id, "N_VNew_Serial", 0)) return(1);
-
-  /* Create and load problem data block. */
-  data = (UserData) malloc(sizeof *data);
-  if(check_retval((void *)data, "malloc", 2)) return(1);
-  data->mm = MGRID;
-  data->dx = ONE/(MGRID - ONE);
-  data->coeff = ONE/( (data->dx) * (data->dx) );
-
-  /* Initialize uu, up, id. */
-  SetInitialProfile(data, uu, up, id, res);
-
-  /* Set constraints to all 1's for nonnegative solution values. */
-  N_VConst(ONE, constraints);
-
-  /* Set remaining input parameters. */
-  t0   = ZERO;
-  t1   = RCONST(0.01);
-  rtol = ZERO;
-  atol = RCONST(1.0e-8);
-
-  /* Call IDACreate and IDAMalloc to initialize solution */
-  mem = IDACreate(ctx);
-  if(check_retval((void *)mem, "IDACreate", 0)) return(1);
-
-  retval = IDASetUserData(mem, data);
-  if(check_retval(&retval, "IDASetUserData", 1)) return(1);
-
-  /* Set which components are algebraic or differential */
-  retval = IDASetId(mem, id);
-  if(check_retval(&retval, "IDASetId", 1)) return(1);
-
-  retval = IDASetConstraints(mem, constraints);
-  if(check_retval(&retval, "IDASetConstraints", 1)) return(1);
-  N_VDestroy(constraints);
-
-  retval = IDAInit(mem, heatres, t0, uu, up);
-  if(check_retval(&retval, "IDAInit", 1)) return(1);
-
-  retval = IDASStolerances(mem, rtol, atol);
-  if(check_retval(&retval, "IDASStolerances", 1)) return(1);
-
-  /* Create sparse SUNMatrix for use in linear solves */
-  nnz = NEQ*NEQ;
-  A = SUNSparseMatrix(NEQ, NEQ, nnz, CSC_MAT, ctx);
-  if(check_retval((void*)A, "SUNSparseMtarix", 0)) return(1);
-
-  /* Create SuperLUMT SUNLinearSolver object (one thread) */
-  LS = SUNLinSol_SuperLUMT(uu, A, 1, ctx);
-  if(check_retval((void *)LS, "SUNLinSol_SuperLUMT", 0)) return(1);
-
-  /* Attach the matrix and linear solver */
-  retval = IDASetLinearSolver(mem, LS, A);
-  if(check_retval(&retval, "IDASetLinearSolver", 1)) return(1);
-
-  /* Set the user-supplied Jacobian routine */
-  if(MGRID >= 4){
-    retval = IDASetJacFn(mem, jacHeat);
-  } else if(MGRID == 3) {
-    retval = IDASetJacFn(mem, jacHeat3);
-  } else {
-    /* MGRID<=2 is pure boundary points, nothing to solve */
-    printf("MGRID size is too small to run.\n");
-    return(1);
-  }
-  if(check_retval(&retval, "IDASetJacFn", 1)) return(1);
-
-  /* Call IDACalcIC to correct the initial values. */
-
-  retval = IDACalcIC(mem, IDA_YA_YDP_INIT, t1);
-  if(check_retval(&retval, "IDACalcIC", 1)) return(1);
-
-  /* Print output heading. */
-  PrintHeader(rtol, atol);
-
-  PrintOutput(mem, t0, uu);
-
-
-  /* Loop over output times, call IDASolve, and print results. */
-
-  for (tout = t1, iout = 1; iout <= NOUT; iout++, tout *= TWO) {
-
-    retval = IDASolve(mem, tout, &tret, uu, up, IDA_NORMAL);
-    if(check_retval(&retval, "IDASolve", 1)) return(1);
-
-    PrintOutput(mem, tret, uu);
-
-  }
-
-  /* Print remaining counters and free memory. */
-  retval = IDAGetNumErrTestFails(mem, &netf);
-  check_retval(&retval, "IDAGetNumErrTestFails", 1);
-  retval = IDAGetNumNonlinSolvConvFails(mem, &ncfn);
-  check_retval(&retval, "IDAGetNumNonlinSolvConvFails", 1);
-  printf("\n netf = %ld,   ncfn = %ld \n", netf, ncfn);
-
-  IDAFree(&mem);
-  SUNLinSolFree(LS);
-  SUNMatDestroy(A);
-  N_VDestroy(uu);
-  N_VDestroy(up);
-  N_VDestroy(id);
-  N_VDestroy(res);
-  free(data);
-  SUNContext_Free(&ctx);
-
-  return(0);
-}
-
-/*
- *--------------------------------------------------------------------
- * FUNCTIONS CALLED BY IDA
- *--------------------------------------------------------------------
- */
-
-/*
- * heatres: heat equation system residual function
- * This uses 5-point central differencing on the interior points, and
- * includes algebraic equations for the boundary values.
- * So for each interior point, the residual component has the form
- *    res_i = u'_i - (central difference)_i
- * while for each boundary point, it is res_i = u_i.
- */
-
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
-            void *user_data)
-{
-  sunindextype mm, i, j, offset, loc;
-  realtype *uv, *upv, *resv, coeff;
-  UserData data;
-
-  uv = N_VGetArrayPointer(uu); upv = N_VGetArrayPointer(up); resv = N_VGetArrayPointer(resval);
-
-  data = (UserData)user_data;
-  mm = data->mm;
-  coeff = data->coeff;
-
-  /* Initialize resval to uu, to take care of boundary equations. */
-  N_VScale(ZERO, uu, resval);
-
-  /* Loop over interior points; set res = up - (central difference). */
-  for (j = 1; j < mm-1; j++) {
-    offset = mm*j;
-    for (i = 1; i < mm-1; i++) {
-      loc = offset + i;
-      resv[loc] = upv[loc] - coeff *
-          (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - RCONST(4.0)*uv[loc]);
-    }
-  }
-
-  return(0);
-
-}
-
-/* Jacobian matrix setup for MGRID=3  */
-int jacHeat3(realtype tt,  realtype cj,
-             N_Vector yy, N_Vector yp, N_Vector resvec,
-             SUNMatrix JJ, void *user_data,
-             N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
-{
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx) + cj;
-
-  sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
-  sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
-
-  SUNMatZero(JJ);
-
-  /*
-   * set up number of elements in each column
-   */
-  colptrs[0]  = 0;
-  colptrs[1]  = 1;
-  colptrs[2]  = 3;
-  colptrs[3]  = 4;
-  colptrs[4]  = 6;
-  colptrs[5]  = 7;
-  colptrs[6]  = 9;
-  colptrs[7]  = 10;
-  colptrs[8]  = 12;
-  colptrs[9]  = 13;
-
-  /*
-   * set up data and row values stored
-   */
-
-  data[0] = ONE;
-  rowvals[0] = 0;
-  data[1] = ONE;
-  rowvals[1] = 1;
-  data[2] = -ONE/(dx*dx);
-  rowvals[2] = 4;
-  data[3] = ONE;
-  rowvals[3] = 2;
-  data[4] = ONE;
-  rowvals[4] = 3;
-  data[5] = -ONE/(dx*dx);
-  rowvals[5] = 4;
-  data[6] = beta;
-  rowvals[6] = 4;
-  data[7] = -ONE/(dx*dx);
-  rowvals[7] = 4;
-  data[8] = ONE;
-  rowvals[8] = 5;
-  data[9] = ONE;
-  rowvals[9] = 6;
-  data[10] = -ONE/(dx*dx);
-  rowvals[10] = 4;
-  data[11] = ONE;
-  rowvals[11] = 7;
-  data[12] = ONE;
-  rowvals[12] = 8;
-
-  return(0);
-}
-
-/* Jacobian matrix setup for MGRID>=4  */
-int jacHeat(realtype tt,  realtype cj,
-            N_Vector yy, N_Vector yp, N_Vector resvec,
-            SUNMatrix JJ, void *user_data,
-            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
-{
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx) + cj;
-  int i,j, repeat=0;
-
-  sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
-  sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
-
-  SUNMatZero(JJ);
-
-  /*
-   *-----------------------------------------------
-   * set up number of elements in each column
-   *-----------------------------------------------
-   */
-
-  /**** first column block ****/
-  colptrs[0] = 0;
-  colptrs[1] = 1;
-  /* count by twos in the middle  */
-  for(i=2;i<MGRID;i++) colptrs[i] = (colptrs[i-1])+2;
-  colptrs[MGRID] = 2*MGRID-2;
-
-  /**** second column block ****/
-  colptrs[MGRID+1] = 2*MGRID;
-  colptrs[MGRID+2] = 2*MGRID+3;
-  /* count by fours in the middle */
-  for(i=0;i<MGRID-4;i++) colptrs[MGRID+3+i] = (colptrs[MGRID+3+i-1])+4;
-  colptrs[2*MGRID-1] = 2*MGRID+4*(MGRID-2)-2;
-  colptrs[2*MGRID] = 2*MGRID+4*(MGRID-2);
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  for(i=0;i<MGRID-4;i++){
-    colptrs[2*MGRID+1+repeat]   = (colptrs[2*MGRID+1+repeat-1])+2;
-    colptrs[2*MGRID+1+repeat+1] = (colptrs[2*MGRID+1+repeat])+4;
-
-    /* count by fives in the middle */
-    for(j=0;j<MGRID-4;j++) colptrs[2*MGRID+1+repeat+2+j] =
-                          (colptrs[2*MGRID+1+repeat+1+j])+5;
-
-    colptrs[2*MGRID+1+repeat+(MGRID-4)+2] = (colptrs[2*MGRID+1+repeat+(MGRID-4)+1])+4;
-    colptrs[2*MGRID+1+repeat+(MGRID-4)+3] = (colptrs[2*MGRID+1+repeat+(MGRID-4)+2])+2;
-
-    repeat+=MGRID; /* shift that accounts for accumulated number of columns */
-  }
-
-  /**** last-1 column block ****/
-  colptrs[MGRID*MGRID-2*MGRID+1] = TOTAL-2*MGRID-4*(MGRID-2)+2;
-  colptrs[MGRID*MGRID-2*MGRID+2] = TOTAL-2*MGRID-4*(MGRID-2)+5;
-  /* count by fours in the middle */
-  for(i=0;i<MGRID-4;i++) colptrs[MGRID*MGRID-2*MGRID+3+i] =
-                        (colptrs[MGRID*MGRID-2*MGRID+3+i-1])+4;
-  colptrs[MGRID*MGRID-MGRID-1] = TOTAL-2*MGRID;
-  colptrs[MGRID*MGRID-MGRID]   = TOTAL-2*MGRID+2;
-
-  /**** last column block ****/
-  colptrs[MGRID*MGRID-MGRID+1] = TOTAL-MGRID-(MGRID-2)+1;
-  /* count by twos in the middle */
-  for(i=0;i<MGRID-2;i++) colptrs[MGRID*MGRID-MGRID+2+i] =
-                        (colptrs[MGRID*MGRID-MGRID+2+i-1])+2;
-  colptrs[MGRID*MGRID-1] = TOTAL-1;
-  colptrs[MGRID*MGRID]   = TOTAL;
-
-
-  /*
-   *-----------------------------------------------
-   * set up data stored
-   *-----------------------------------------------
-   */
-
-  /**** first column block ****/
-  data[0] = ONE;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=1;i<MGRID+(MGRID-2)  ;i+=2) data[i] = ONE;
-  for(i=2;i<MGRID+(MGRID-2)-1;i+=2) data[i] = -ONE/(dx*dx);
-
-  /**** second column block ****/
-  data[MGRID+MGRID-2] = ONE;
-  data[MGRID+MGRID-1] = -ONE/(dx*dx);
-  data[MGRID+MGRID]   = beta;
-  data[MGRID+MGRID+1] = -ONE/(dx*dx);
-  data[MGRID+MGRID+2] = -ONE/(dx*dx);
-  /* middle data elements */
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+3+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+4+4*i] = beta;
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+5+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[MGRID+MGRID+6+4*i] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-5] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-4] = beta;
-  data[2*MGRID+4*(MGRID-2)-3] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-2] = -ONE/(dx*dx);
-  data[2*MGRID+4*(MGRID-2)-1] = ONE;
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  repeat=0;
-  for(i=0;i<MGRID-4;i++){
-    data[2*MGRID+4*(MGRID-2)+repeat]   = ONE;
-    data[2*MGRID+4*(MGRID-2)+repeat+1] = -ONE/(dx*dx);
-
-    data[2*MGRID+4*(MGRID-2)+repeat+2] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+3] = beta;
-    data[2*MGRID+4*(MGRID-2)+repeat+4] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+5] = -ONE/(dx*dx);
-
-    /* 5 in 5*j chosen since there are 5 elements in each column */
-    /* this column loops MGRID-4 times within the outer loop */
-    for(j=0;j<MGRID-4;j++){
-      data[2*MGRID+4*(MGRID-2)+repeat+6+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+7+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+8+5*j]  = beta;
-      data[2*MGRID+4*(MGRID-2)+repeat+9+5*j]  = -ONE/(dx*dx);
-      data[2*MGRID+4*(MGRID-2)+repeat+10+5*j] = -ONE/(dx*dx);
-    }
-
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+6] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+7] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+8] = beta;
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+9] = -ONE/(dx*dx);
-
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+10] = -ONE/(dx*dx);
-    data[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+11] = ONE;
-
-    repeat+=MGRID+4*(MGRID-2); /* shift that accounts for accumulated columns and elements */
-  }
-
-  /**** last-1 column block ****/
-  data[TOTAL-6*(MGRID-2)-4] = ONE;
-  data[TOTAL-6*(MGRID-2)-3] = -ONE/(dx*dx);
-  data[TOTAL-6*(MGRID-2)-2] = -ONE/(dx*dx);
-  data[TOTAL-6*(MGRID-2)-1] = beta;
-  data[TOTAL-6*(MGRID-2)  ] = -ONE/(dx*dx);
-  /* middle data elements */
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+1+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+2+4*i] = -ONE/(dx*dx);
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+3+4*i] = beta;
-  for(i=0;i<(MGRID-4);i++) data[TOTAL-6*(MGRID-2)+4+4*i] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-7] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-6] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-5] = beta;
-  data[TOTAL-2*(MGRID-2)-4] = -ONE/(dx*dx);
-  data[TOTAL-2*(MGRID-2)-3] = ONE;
-
-  /**** last column block ****/
-  data[TOTAL-2*(MGRID-2)-2] = ONE;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=TOTAL-2*(MGRID-2)-1;i<TOTAL-2;i+=2) data[i] = -ONE/(dx*dx);
-  for(i=TOTAL-2*(MGRID-2)  ;i<TOTAL-1;i+=2) data[i] = ONE;
-  data[TOTAL-1] = ONE;
-
-  /*
-   *-----------------------------------------------
-   * row values
-   *-----------------------------------------------
-   */
-
-  /**** first block ****/
-  rowvals[0] = 0;
-  /* alternating pattern in data, separate loop for each pattern */
-  for(i=1;i<MGRID+(MGRID-2)  ;i+=2) rowvals[i] = (i+1)/2;
-  for(i=2;i<MGRID+(MGRID-2)-1;i+=2) rowvals[i] = i/2+MGRID; /* i+1 unnecessary here */
-
-  /**** second column block ****/
-  rowvals[MGRID+MGRID-2] = MGRID;
-  rowvals[MGRID+MGRID-1] = MGRID+1;
-  rowvals[MGRID+MGRID]   = MGRID+1;
-  rowvals[MGRID+MGRID+1] = MGRID+2;
-  rowvals[MGRID+MGRID+2] = 2*MGRID+1;
-  /* middle row values */
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+3+4*i] = MGRID+1+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+4+4*i] = MGRID+2+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+5+4*i] = MGRID+3+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[MGRID+MGRID+6+4*i] = 2*MGRID+2+i;
-  rowvals[2*MGRID+4*(MGRID-2)-5] = MGRID+(MGRID-2)-1;
-  rowvals[2*MGRID+4*(MGRID-2)-4] = MGRID+(MGRID-2); /* starting from here, add two diag patterns */
-  rowvals[2*MGRID+4*(MGRID-2)-3] = 2*MGRID+(MGRID-2);
-  rowvals[2*MGRID+4*(MGRID-2)-2] = MGRID+(MGRID-2);
-  rowvals[2*MGRID+4*(MGRID-2)-1] = MGRID+(MGRID-2)+1;
-
-  /**** repeated (MGRID-4 times) middle column blocks ****/
-  repeat=0;
-  for(i=0;i<MGRID-4;i++){
-    rowvals[2*MGRID+4*(MGRID-2)+repeat]   = MGRID+(MGRID-2)+2+MGRID*i;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+1] = MGRID+(MGRID-2)+2+MGRID*i+1;
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+2] = MGRID+(MGRID-2)+2+MGRID*i+1-MGRID;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+3] = MGRID+(MGRID-2)+2+MGRID*i+1;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+4] = MGRID+(MGRID-2)+2+MGRID*i+2; /* *this */
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+5] = MGRID+(MGRID-2)+2+MGRID*i+1+MGRID;
-
-    /* 5 in 5*j chosen since there are 5 elements in each column */
-    /* column repeats MGRID-4 times within the outer loop */
-    for(j=0;j<MGRID-4;j++){
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+6+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+1-MGRID+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+7+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+8+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+2+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+9+5*j]  = MGRID+(MGRID-2)+2+MGRID*i+2+1+j;
-      rowvals[2*MGRID+4*(MGRID-2)+repeat+10+5*j] = MGRID+(MGRID-2)+2+MGRID*i+1+MGRID+1+j;
-    }
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+6] = MGRID+(MGRID-2)+2+MGRID*i-2;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+7] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID-1;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+8] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID; /* *this+MGRID */
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+9] = MGRID+(MGRID-2)+2+MGRID*i-2+2*MGRID;
-
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+10] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID;
-    rowvals[2*MGRID+4*(MGRID-2)+repeat+(MGRID-4)*5+11] = MGRID+(MGRID-2)+2+MGRID*i-2+MGRID+1;
-
-    repeat+=MGRID+4*(MGRID-2); /* shift that accounts for accumulated columns and elements */
-  }
-
-
-  /**** last-1 column block ****/
-  rowvals[TOTAL-6*(MGRID-2)-4] = MGRID*MGRID-1-2*(MGRID-1)-1;
-  rowvals[TOTAL-6*(MGRID-2)-3] = MGRID*MGRID-1-2*(MGRID-1); /* starting with this as base */
-  rowvals[TOTAL-6*(MGRID-2)-2] = MGRID*MGRID-1-2*(MGRID-1)-MGRID;
-  rowvals[TOTAL-6*(MGRID-2)-1] = MGRID*MGRID-1-2*(MGRID-1);
-  rowvals[TOTAL-6*(MGRID-2)  ] = MGRID*MGRID-1-2*(MGRID-1)+1;
-  /* middle row values */
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+1+4*i] = MGRID*MGRID-1-2*(MGRID-1)-MGRID+1+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+2+4*i] = MGRID*MGRID-1-2*(MGRID-1)+i;
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+3+4*i] = MGRID*MGRID-1-2*(MGRID-1)+1+i;/*copied above*/
-  for(i=0;i<(MGRID-4);i++) rowvals[TOTAL-6*(MGRID-2)+4+4*i] = MGRID*MGRID-1-2*(MGRID-1)+2+i;
-  rowvals[TOTAL-2*(MGRID-2)-7] = MGRID*MGRID-2*MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-6] = MGRID*MGRID-MGRID-3;
-  rowvals[TOTAL-2*(MGRID-2)-5] = MGRID*MGRID-MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-4] = MGRID*MGRID-MGRID-2;
-  rowvals[TOTAL-2*(MGRID-2)-3] = MGRID*MGRID-MGRID-1;
-
-  /* last column block */
-  rowvals[TOTAL-2*(MGRID-2)-2] = MGRID*MGRID-MGRID;
-  /* alternating pattern in data, separate loop for each pattern  */
-  for(i=0;i<(MGRID-2);i++) rowvals[TOTAL-2*(MGRID-2)-1+2*i] = MGRID*MGRID-2*MGRID+1+i;
-  for(i=0;i<(MGRID-2);i++) rowvals[TOTAL-2*(MGRID-2)  +2*i] = MGRID*MGRID-MGRID+1+i;
-  rowvals[TOTAL-1] = MGRID*MGRID-1;
-
-  return(0);
-}
-
-
-/*
- *--------------------------------------------------------------------
- * PRIVATE FUNCTIONS
- *--------------------------------------------------------------------
- */
-
-/*
- * SetInitialProfile: routine to initialize u, up, and id vectors.
- */
-
-static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
-                             N_Vector id, N_Vector res)
-{
-  realtype xfact, yfact, *udata, *updata, *iddata;
-  sunindextype mm, mm1, i, j, offset, loc;
-
-  mm = data->mm;
-  mm1 = mm - 1;
-
-  udata = N_VGetArrayPointer(uu);
-  updata = N_VGetArrayPointer(up);
-  iddata = N_VGetArrayPointer(id);
-
-  /* Initialize id to 1's. */
-  N_VConst(ONE, id);
-
-  /* Initialize uu on all grid points. */
-  for (j = 0; j < mm; j++) {
-    yfact = data->dx * j;
-    offset = mm*j;
-    for (i = 0;i < mm; i++) {
-      xfact = data->dx * i;
-      loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
-    }
-  }
-
-  /* Initialize up vector to 0. */
-  N_VConst(ZERO, up);
-
-  /* heatres sets res to negative of ODE RHS values at interior points. */
-  heatres(ZERO, uu, up, res, data);
-
-  /* Copy -res into up to get correct interior initial up values. */
-  N_VScale(-ONE, res, up);
-
-  /* Finally, set values of u, up, and id at boundary points. */
-  for (j = 0; j < mm; j++) {
-    offset = mm*j;
-    for (i = 0;i < mm; i++) {
-      loc = offset + i;
-      if (j == 0 || j == mm1 || i == 0 || i == mm1 ) {
-        udata[loc] = BVAL; updata[loc] = ZERO; iddata[loc] = ZERO; }
-    }
-  }
-
-  return(0);
-
-}
-
-/*
- * Print first lines of output (problem description)
- */
-
-static void PrintHeader(realtype rtol, realtype atol)
-{
-  printf("\nidaHeat2D_sps: Heat equation, serial example problem for IDA\n");
-  printf("          Discretized heat equation on 2D unit square.\n");
-  printf("          Zero boundary conditions,");
-  printf(" polynomial initial conditions.\n");
-  printf("          Mesh dimensions: %d x %d", MGRID, MGRID);
-  printf("        Total system size: %d\n\n", NEQ);
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf("Tolerance parameters:  rtol = %Lg   atol = %Lg\n", rtol, atol);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf("Tolerance parameters:  rtol = %g   atol = %g\n", rtol, atol);
-#else
-  printf("Tolerance parameters:  rtol = %g   atol = %g\n", rtol, atol);
-#endif
-  printf("Constraints set to force all solution components >= 0. \n");
-  printf("Linear solver: SuperLUMT, sparse direct solver \n");
-  printf("       difference quotient Jacobian\n");
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf("IDACalcIC called with input boundary values = %Lg \n",BVAL);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf("IDACalcIC called with input boundary values = %g \n",BVAL);
-#else
-  printf("IDACalcIC called with input boundary values = %g \n",BVAL);
-#endif
-  /* Print output table heading and initial line of table. */
-  printf("\n   Output Summary (umax = max-norm of solution) \n\n");
-  printf("  time       umax     k  nst  nni  nje   nre     h       \n" );
-  printf(" .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . \n");
-}
-
-/*
- * Print Output
- */
-
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
-{
-  int retval;
-  realtype umax, hused;
-  long int nst, nni, nje, nre;
-  int kused;
-
-  umax = N_VMaxNorm(uu);
-
-  retval = IDAGetLastOrder(mem, &kused);
-  check_retval(&retval, "IDAGetLastOrder", 1);
-  retval = IDAGetNumSteps(mem, &nst);
-  check_retval(&retval, "IDAGetNumSteps", 1);
-  retval = IDAGetNumNonlinSolvIters(mem, &nni);
-  check_retval(&retval, "IDAGetNumNonlinSolvIters", 1);
-  retval = IDAGetNumResEvals(mem, &nre);
-  check_retval(&retval, "IDAGetNumResEvals", 1);
-  retval = IDAGetLastStep(mem, &hused);
-  check_retval(&retval, "IDAGetLastStep", 1);
-  retval = IDAGetNumJacEvals(mem, &nje);
-  check_retval(&retval, "IDAGetNumJacEvals", 1);
-
-#if defined(SUNDIALS_EXTENDED_PRECISION)
-  printf(" %5.2Lf %13.5Le  %d  %3ld  %3ld  %3ld  %4ld  %9.2Le \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#elif defined(SUNDIALS_DOUBLE_PRECISION)
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %4ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#else
-  printf(" %5.2f %13.5e  %d  %3ld  %3ld  %3ld  %4ld  %9.2e \n",
-         t, umax, kused, nst, nni, nje, nre, hused);
-#endif
-
-}
-
-/*
- * Check function return value...
- *   opt == 0 means SUNDIALS function allocates memory so check if
- *            returned NULL pointer
- *   opt == 1 means SUNDIALS function returns an integer value so check if
- *            retval < 0
- *   opt == 2 means function allocates memory so check if returned
- *            NULL pointer
- */
-
-static int check_retval(void *returnvalue, const char *funcname, int opt)
-{
-  int *retval;
-
-  /* Check if SUNDIALS function returned NULL pointer - no memory allocated */
-  if (opt == 0 && returnvalue == NULL) {
-    fprintf(stderr,
-            "\nSUNDIALS_ERROR: %s() failed - returned NULL pointer\n\n",
-            funcname);
-    return(1);
-  } else if (opt == 1) {
-    /* Check if retval < 0 */
-    retval = (int *) returnvalue;
-    if (*retval < 0) {
-      fprintf(stderr,
-              "\nSUNDIALS_ERROR: %s() failed with retval = %d\n\n",
-              funcname, *retval);
-      return(1);
-    }
-  } else if (opt == 2 && returnvalue == NULL) {
-    /* Check if function returned NULL pointer - no memory allocated */
-    fprintf(stderr,
-            "\nMEMORY_ERROR: %s() failed - returned NULL pointer\n\n",
-            funcname);
-    return(1);
-  }
-
-  return(0);
-}
diff --git a/examples/ida/serial/idaHeat2D_sps.out b/examples/ida/serial/idaHeat2D_sps.out
deleted file mode 100644
index 338dd3a511..0000000000
--- a/examples/ida/serial/idaHeat2D_sps.out
+++ /dev/null
@@ -1,32 +0,0 @@
-
-.. Use approximate minimum degree column ordering.
-
-idaHeat2D_sps: Heat equation, serial example problem for IDA
-          Discretized heat equation on 2D unit square.
-          Zero boundary conditions, polynomial initial conditions.
-          Mesh dimensions: 10 x 10        Total system size: 100
-
-Tolerance parameters:  rtol = 0   atol = 1e-08
-Constraints set to force all solution components >= 0. 
-Linear solver: SuperLUMT, sparse direct solver 
-       difference quotient Jacobian 
-IDACalcIC called with input boundary values = 0 
-
-   Output Summary (umax = max-norm of solution) 
-
-  time       umax     k  nst  nni  nje   nre     h       
- .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  . 
-  0.00   9.75461e-01  0    0    0    2     2   5.15e-10 
-  0.01   8.24056e-01  5   53   63   23    65   5.55e-04 
-  0.02   6.88097e-01  5   69   81   24    83   9.99e-04 
-  0.04   4.70961e-01  5   90  106   27   108   1.91e-03 
-  0.08   2.16312e-01  5  113  130   27   132   1.72e-03 
-  0.16   4.53210e-02  5  137  155   28   157   3.43e-03 
-  0.32   1.98923e-03  5  173  193   29   195   6.18e-03 
-  0.64   3.88493e-03  5  211  234   31   236   2.22e-02 
-  1.28   8.16105e-01  4  254  300   48   302   3.71e-03 
-  2.56   6.57902e+01  5  309  366   56   368   4.28e-02 
-  5.12   2.66354e+03  5  374  438   57   440   2.81e-02 
- 10.24   7.75211e+04  5  395  464   62   466   8.98e-01 
-
- netf = 2,   ncfn = 7 
diff --git a/include/cvode/cvode_hypamgpre.h b/include/cvode/cvode_hypamgpre.h
deleted file mode 100644
index ad18281a6f..0000000000
--- a/include/cvode/cvode_hypamgpre.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * -----------------------------------------------------------------
- * $Revision: 4378 $
- * $Date: 2015-02-19 10:55:14 -0800 (Thu, 19 Feb 2015) $
- * ----------------------------------------------------------------- 
- * Programmer(s): Michael Wittman, Alan C. Hindmarsh and
- *                Radu Serban @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * This is the header file for the CVHYPRE_BOOMERAMG module, for a
- * interface to hypre's BoomerAMG preconditioner, for use with CVODE, a CVSPILS linear
- * solver, and the ParHyp implementation of NVECTOR.
- *
- * Summary:
- *
- *
- * The user's calling program should have the following form:
- *
- *   #include <nvector_parhyp.h>
- *   #include <cvode/cvode_hypamgpre.h>
- *   ...
- *   void *cvode_mem;
- *   ...
- *   Set y0
- *   ...
- *   cvode_mem = CVodeCreate(...);
- *   ier = CVodeInit(...);
- *   ...
- *   flag = CVSpgmr(cvode_mem, pretype, maxl);
- *      -or-
- *   flag = CVSpbcg(cvode_mem, pretype, maxl);
- *      -or-
- *   flag = CVSptfqmr(cvode_mem, pretype, maxl);
- *   ...
- *   flag = CVBoomerAMGInit(cvode_mem, );
- *   ...
- *   ier = CVode(...);
- *   ...
- *   CVodeFree(&cvode_mem);
- * 
- *   Free y0
- *
- * The user-supplied routines required are:
- *
- *   f    = function defining the ODE right-hand side f(t,y).
- *
- *   gloc = function defining the approximation g(t,y).
- *
- *   cfn  = function to perform communication need for gloc.
- *
- * Notes:
- *
- * 1) This header file is included by the user for the definition
- *    of the CVBBDData type and for needed function prototypes.
- *
- * 2) The CVBoomerAMGInit call includes half-bandwiths mudq and mldq
- *    to be used in the difference quotient calculation of the
- *    approximate Jacobian. They need not be the true
- *    half-bandwidths of the Jacobian of the local block of g,
- *    when smaller values may provide a greater efficiency.
- *    Also, the half-bandwidths mukeep and mlkeep of the retained
- *    banded approximate Jacobian block may be even smaller,
- *    to reduce storage and computation costs further.
- *    For all four half-bandwidths, the values need not be the
- *    same on every processor.
- *
- * 3) The actual name of the user's f function is passed to
- *    CVodeInit, and the names of the user's gloc and cfn
- *    functions are passed to CVBoomerAMGInit.
- *
- * 4) The pointer to the user-defined data block user_data, which is
- *    set through CVodeSetUserData is also available to the user in
- *    gloc and cfn.
- *
- * 5) Optional outputs specific to this module are available by
- *    way of routines listed below. These include work space sizes
- *    and the cumulative number of gloc calls. The costs
- *    associated with this module also include nsetups banded LU
- *    factorizations, nlinsetups cfn calls, and npsolves banded
- *    backsolve calls, where nlinsetups and npsolves are
- *    integrator/CVSPGMR/CVSPBCG/CVSPTFQMR optional outputs.
- * -----------------------------------------------------------------
- */
-
-#ifndef _CVHYPRE_BOOMERAMG_H
-#define _CVHYPRE_BOOMERAMG_H
-
-#include <sundials/sundials_nvector.h>
-#include <mpi.h>
-#include "_hypre_utilities.h"
-#include "HYPRE_krylov.h"
-#include "HYPRE_parcsr_ls.h"
-#include "HYPRE.h"
-#include "_hypre_utilities.h"
-#include "HYPRE_krylov.h"
-#include "HYPRE_parcsr_ls.h"
-#include "HYPRE.h"
-#include "_hypre_parcsr_mv.h"
-#include <nvector/nvector_parhyp.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*
- * -----------------------------------------------------------------
- * Type: CVParCsrJacFn
- * -----------------------------------------------------------------
- *
- * A dense Jacobian approximation function Jac must be of type 
- * CVDlsDenseJacFn. Its parameters are:
- *
- * N   is the problem size.
- *
- * Jac is the dense matrix (of type SUNDlsMat) that will be loaded
- *     by a CVDlsDenseJacFn with an approximation to the Jacobian 
- *     matrix J = (df_i/dy_j) at the point (t,y). 
- *
- * t   is the current value of the independent variable.
- *
- * y   is the current value of the dependent variable vector,
- *     namely the predicted value of y(t).
- *
- * fy  is the vector f(t,y).
- *
- * user_data is a pointer to user data - the same as the user_data
- *     parameter passed to CVodeSetFdata.
- *
- * tmp1, tmp2, and tmp3 are pointers to memory allocated for
- * vectors of length N which can be used by a CVDlsDenseJacFn
- * as temporary storage or work space.
- *
- * A CVParCsrJacFn should return 0 if successful, a positive 
- * value if a recoverable error occurred, and a negative value if 
- * an unrecoverable error occurred.
- *
- * -----------------------------------------------------------------
- *                                                                
- * NOTE: If the user's Jacobian routine needs other quantities,   
- *     they are accessible as follows: hcur (the current stepsize)
- *     and ewt (the error weight vector) are accessible through   
- *     CVodeGetCurrentStep and CVodeGetErrWeights, respectively 
- *     (see cvode.h). The unit roundoff is available as 
- *     UNIT_ROUNDOFF defined in sundials_types.h.
- *
- * -----------------------------------------------------------------
- */
-  
-  
-typedef int (*CVParCsrJacFn)(sunindextype N, sunindextype ilower, sunindextype iupper, sunindextype jlower, sunindextype jupper, realtype gamma, realtype t,
-			       N_Vector y, N_Vector fy, 
-			       HYPRE_IJMatrix* Jac, void *user_data,
-			       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-typedef int (*CVJacobianIJUpdateFn)(HYPRE_IJMatrix* pointer_A, int ilower, int iupper, int jlower, int jupper, void *jac_data);
-
-/*
- * -----------------------------------------------------------------
- * Function : CVBoomerAMGInit
- * -----------------------------------------------------------------
- * CVBoomerAMGInit allocates and initializes the BBD preconditioner.
- *
- * The parameters of CVBoomerAMGInit are as follows:
- *
- * cvode_mem is the pointer to the integrator memory.
- *
- * Nlocal is the length of the local block of the vectors y etc.
- *        on the current processor.
- *
- * mudq, mldq are the upper and lower half-bandwidths to be used
- *            in the difference quotient computation of the local
- *            Jacobian block.
- *
- * mukeep, mlkeep are the upper and lower half-bandwidths of the
- *                retained banded approximation to the local Jacobian
- *                block.
- *
- * dqrely is an optional input. It is the relative increment
- *        in components of y used in the difference quotient
- *        approximations. To specify the default, pass 0.
- *        The default is dqrely = sqrt(unit roundoff).
- *
- * gloc is the name of the user-supplied function g(t,y) that
- *      approximates f and whose local Jacobian blocks are
- *      to form the preconditioner.
- *
- * cfn is the name of the user-defined function that performs
- *     necessary interprocess communication for the
- *     execution of gloc.
- *
- * The return value of CVBoomerAMGInit is one of:
- *   CVSPILS_SUCCESS if no errors occurred
- *   CVSPILS_MEM_NULL if the integrator memory is NULL
- *   CVSPILS_LMEM_NULL if the linear solver memory is NULL
- *   CVSPILS_ILL_INPUT if an input has an illegal value
- *   CVSPILS_MEM_FAIL if a memory allocation request failed
- * -----------------------------------------------------------------
- */
-
-SUNDIALS_EXPORT int CVBoomerAMGInit(void *cvode_mem, int ilower, int iupper, int jlower, int jupper, int N);
-
-/*
-SUNDIALS_EXPORT int CVBoomerAMGSetup(realtype t, N_Vector y, N_Vector fy, 
-                          booleantype jok, booleantype *jcurPtr, 
-                          realtype gamma, void *bbd_data, 
-                          N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-
-SUNDIALS_EXPORT int CVBoomerAMGSolve(realtype t, N_Vector y, N_Vector fy, 
-                          N_Vector r, N_Vector z, 
-                          realtype gamma, realtype delta,
-                          int lr, void *bbd_data, N_Vector tmp);*/
-
-/*
- * -----------------------------------------------------------------
- * Function : CVBoomerAMGReInit
- * -----------------------------------------------------------------
- * CVBoomerAMGReInit re-initializes the HYPRE_BOOMERAMG module when solving a
- * sequence of problems of the same size with CVSPGMR/CVHYPRE_BOOMERAMG or
- * CVSPBCG/CVHYPRE_BOOMERAMG or CVSPTFQMR/CVHYPRE_BOOMERAMG provided there is no change 
- * in Nlocal, mukeep, or mlkeep. After solving one problem, and after 
- * calling CVodeReInit to re-initialize the integrator for a subsequent 
- * problem, call CVBoomerAMGReInit.
- *
- * All arguments have the same names and meanings as those
- * of CVBoomerAMGInit.
- *
- * The return value of CVBoomerAMGReInit is one of:
- *   CVSPILS_SUCCESS if no errors occurred
- *   CVSPILS_MEM_NULL if the integrator memory is NULL
- *   CVSPILS_LMEM_NULL if the linear solver memory is NULL
- *   CVSPILS_PMEM_NULL if the preconditioner memory is NULL
- * -----------------------------------------------------------------
- */
-
-SUNDIALS_EXPORT int CVBoomerAMGReInit(void *cvode_mem, sunindextype mudq, sunindextype mldq,
-				    realtype dqrely);
-
-/*
- * -----------------------------------------------------------------
- * HYPRE_BOOMERAMG optional output extraction routines
- * -----------------------------------------------------------------
- * CVBoomerAMGGetWorkSpace returns the HYPRE_BOOMERAMG real and integer work space
- *                       sizes.
- * CVBoomerAMGGetNumGfnEvals returns the number of calls to gfn.
- *
- * The return value of CVBoomerAMGGet* is one of:
- *   CVSPILS_SUCCESS if no errors occurred
- *   CVSPILS_MEM_NULL if the integrator memory is NULL
- *   CVSPILS_LMEM_NULL if the linear solver memory is NULL
- *   CVSPILS_PMEM_NULL if the preconditioner memory is NULL
- * -----------------------------------------------------------------
- */
-
-SUNDIALS_EXPORT int CVBoomerAMGGetWorkSpace(void *cvode_mem, long int *lenrwLS, long int *leniwLS);
-SUNDIALS_EXPORT int CVBoomerAMGGetNumGfnEvals(void *cvode_mem, long int *ngevalsBBDP);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/cvode/cvode_hypamgpre.c b/src/cvode/cvode_hypamgpre.c
deleted file mode 100644
index e1545770df..0000000000
--- a/src/cvode/cvode_hypamgpre.c
+++ /dev/null
@@ -1,426 +0,0 @@
-/*
- * -----------------------------------------------------------------
- * $Revision: 4272 $
- * $Date: 2014-12-02 11:19:41 -0800 (Tue, 02 Dec 2014) $
- * ----------------------------------------------------------------- 
- * Programmer(s): Michael Wittman, Alan C. Hindmarsh, Radu Serban,
- *                and Aaron Collier @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * This file contains implementations of routines for an
- * interface to hypre's BoomerAMG preconditioner, for use with CVODE, a CVSPILS linear
- * solver, and the ParHyp implementation of NVECTOR.
- * -----------------------------------------------------------------
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "cvode_impl.h"
-#include "cvode_hypamgpre_impl.h"
-#include "_hypre_utilities.h"
-#include "HYPRE_krylov.h"
-#include "HYPRE_parcsr_ls.h"
-#include "HYPRE.h"
-#include "_hypre_parcsr_mv.h"
-#include <nvector/nvector_parhyp.h>
-#include "cvode_spils_impl.h"
-
-#include <cvode/cvode_sptfqmr.h>
-#include <cvode/cvode_spbcgs.h>
-#include <cvode/cvode_spgmr.h>
-
-#include <sundials/sundials_math.h>
-#include <math.h>
-
-#define MIN_INC_MULT RCONST(1000.0)
-
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-
-/* Prototypes of functions CVBoomerAMGSetup and CVBoomerAMGSolve */
-
-
-static int CVBoomerAMGSetup(realtype t, N_Vector y, N_Vector fy, 
-                          booleantype jok, booleantype *jcurPtr, 
-                          realtype gamma, void *hypamg_data, 
-                          N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-
-static int CVBoomerAMGSolve(realtype t, N_Vector y, N_Vector fy, 
-                          N_Vector r, N_Vector z, 
-                          realtype gamma, realtype delta,
-                          int lr, void *hypamg_data, N_Vector tmp);
-
-/* Prototype for CVBoomerAMGFree */
-static void CVBoomerAMGFree(CVodeMem cv_mem);
-                      
-static int CVParCsrCreateGammaIdentity(HYPRE_IJMatrix* id_mat, realtype gamma, sunindextype ilower, sunindextype iupper);
-
-/*
- * -----------------------------------------------------------------
- * User-Callable Functions: initialization, reinit and free
- * -----------------------------------------------------------------
- */
-
-int CVBoomerAMGInit(void *cvode_mem, int ilower, int iupper, int jlower, int jupper, int N)
-{
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  CVBoomerAMGData pdata;
-  sunindextype muk, mlk, storage_mu;
-  int flag;
-  if (cvode_mem == NULL) {
-    cvProcessError(NULL, CVSPILS_MEM_NULL, "CVHYPRE_BOOMERAMG", "CVBoomerAMGInit", MSGBBD_MEM_NULL);
-    return(CVSPILS_MEM_NULL);
-  }
-  cv_mem = (CVodeMem) cvode_mem;
-  /* Test if a linear solver has been attached */
-  if (cv_mem->cv_lmem == NULL) {
-    cvProcessError(cv_mem, CVSPILS_LMEM_NULL, "CVHYPRE_BOOMERAMG", "CVBoomerAMGInit", MSGBBD_LMEM_NULL);
-    return(CVSPILS_LMEM_NULL);
-  }
-  cvspils_mem = (CVSpilsMem) cv_mem->cv_lmem;
-  /* Test if the NVECTOR package is compatible with the preconditioner */
-  if(NV_HYPRE_PARVEC_PH((cv_mem->cv_tempv)) == NULL) {
-    cvProcessError(cv_mem, CVSPILS_ILL_INPUT, "CVHYPRE_BOOMERAMG", "CVBoomerAMGInit", MSGBBD_BAD_NVECTOR);
-    return(CVSPILS_ILL_INPUT);
-  }
-  /* Allocate data memory */
-  pdata = NULL;
-  pdata = (CVBoomerAMGData) malloc(sizeof *pdata);  
-  if (pdata == NULL) {
-    cvProcessError(cv_mem, CVSPILS_MEM_FAIL, "CVHYPRE_BOOMERAMG", "CVBoomerAMGInit", MSGBBD_MEM_FAIL);
-    return(CVSPILS_MEM_FAIL);
-  }
-  /*  */
-  pdata->cvode_mem = cvode_mem;
-
-  /* Set up solver structures */
- /* Create the matrix.
-      Note that this is a square matrix, so we indicate the row partition
-      size twice (since number of rows = number of cols) */
-  /* set up proper communicator from cvode_mem */
-   HYPRE_IJMatrixCreate(MPI_COMM_WORLD, ilower, iupper, jlower, jupper, &(pdata->A));
-   /* Choose a parallel csr format storage (see the User's Manual) */
-   HYPRE_IJMatrixSetObjectType(pdata->A, HYPRE_PARCSR);
-   /* Initialize before setting coefficients */
-   HYPRE_IJMatrixInitialize(pdata->A);
-/*   pdata->jacfn=jacobian_update;
-   pdata->jacobian_data=jacobian_data;*/
-   pdata->ilower=ilower;
-   pdata->iupper=iupper;
-   pdata->jlower=jlower;
-   pdata->jupper=jupper;
-   pdata->N     =N;
-   
-  /* Create solver */
-//  HYPRE_BoomerAMGCreate(&(pdata->solver));
-
-      /* Now set up the AMG preconditioner and specify any parameters */
-  HYPRE_BoomerAMGCreate(&(pdata->solver));
-  HYPRE_BoomerAMGSetPrintLevel((pdata->solver), 0); /* print amg solution info */
-  HYPRE_BoomerAMGSetCoarsenType((pdata->solver), 6);
-  HYPRE_BoomerAMGSetRelaxType((pdata->solver), 6); /* Sym G.S./Jacobi hybrid */
-  HYPRE_BoomerAMGSetNumSweeps((pdata->solver), 1);
-  HYPRE_BoomerAMGSetTol((pdata->solver), 0.0); /* conv. tolerance zero */
-  HYPRE_BoomerAMGSetMaxIter((pdata->solver), 1); /* do only one iteration! */
-//  HYPRE_BoomerAMGSetMaxRowSum((pdata->solver), .9);
-   
-   /*Calls for using as a solver*/
-  /* Set some parameters (See Reference Manual for more parameters) */
-//  HYPRE_BoomerAMGSetPrintLevel((pdata->solver), );  /* print solve info + parameters */
-//  HYPRE_BoomerAMGSetCoarsenType(pdata->solver, 6); /* Falgout coarsening */
-//  HYPRE_BoomerAMGSetRelaxType(pdata->solver, 3);   /* G-S/Jacobi hybrid relaxation */
-//  HYPRE_BoomerAMGSetNumSweeps(pdata->solver, 1);   /* Sweeeps on each level */
-//  HYPRE_BoomerAMGSetMaxLevels(pdata->solver, 20);  /* maximum number of levels */
-//  HYPRE_BoomerAMGSetTol(pdata->solver, 1e-7);      /* conv. tolerance */   
-  /* Overwrite the P_data field in the SPILS memory */
-  cvspils_mem->s_P_data = pdata;
-
-  /* Attach the pfree function */
-  cvspils_mem->s_pfree = CVBoomerAMGFree;
-
-  /* Attach preconditioner solve and setup functions */
-  flag = CVSpilsSetPreconditioner(cvode_mem, CVBoomerAMGSetup, CVBoomerAMGSolve);
-  return(flag);
-}
-
-/*
- * -----------------------------------------------------------------
- * Function : CVBoomerAMGSetup                                      
- * -----------------------------------------------------------------
- *
- * CVBoomerAMGSetup calculates a new J,if necessary, then calculates
- * P = I - gamma*J, and does an LU factorization of P.
- *
- * The parameters of CVBoomerAMGSetup used here are as follows:
- *
- * t       is the current value of the independent variable.
- *
- * y       is the current value of the dependent variable vector,
- *         namely the predicted value of y(t).
- *
- * fy      is the vector f(t,y).
- *
- * jok     is an input flag indicating whether Jacobian-related
- *         data needs to be recomputed, as follows:
- *           jok == SUNFALSE means recompute Jacobian-related data
- *                  from scratch.
- *           jok == SUNTRUE  means that Jacobian data from the
- *                  previous CVBoomerAMGon call can be reused
- *                  (with the current value of gamma).
- *         A CVBoomerAMG call with jok == SUNTRUE should only occur
- *         after a call with jok == SUNFALSE.
- *         Currently this argument is superflous, since we cannot store a previous J
- *
- * jcurPtr is a pointer to an output integer flag which is
- *         set by CVBoomerAMGon as follows:
- *           *jcurPtr = SUNTRUE if Jacobian data was recomputed.
- *           *jcurPtr = SUNFALSE if Jacobian data was not recomputed,
- *                      but saved data was reused.
- *
- * gamma   is the scalar appearing in the Newton matrix.
- *
- * hypamg_data is a pointer to the preconditioner data set by
- *          CVBoomerAMGInit
- *
- * tmp1, tmp2, and tmp3 are pointers to memory allocated
- *           for NVectors which are be used by CVBoomerAMGSetup
- *           as temporary storage or work space.
- *
- * Return value:
- * The value returned by this CVBoomerAMGSetup function is the int
- *   0  if successful,
- *   1  for a recoverable error (step will be retried).
- * -----------------------------------------------------------------
- */
-
-int CVBoomerAMGSetup(realtype t, N_Vector y, N_Vector fy, 
-                     booleantype jok, booleantype *jcurPtr, 
-                     realtype gamma, void *hypamg_data, 
-                     N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
-{
-  int counter=0;
-  int nnz, i;
-  double values[5];
-  int cols[5];
-//printf("Entered setup\n");
-  long int ier;
-  CVBoomerAMGData pdata;
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  int retval;
-
-  pdata = (CVBoomerAMGData) hypamg_data;
-
-  cv_mem = (CVodeMem) pdata->cvode_mem;
-
-  *jcurPtr = SUNTRUE;
-  
-  /*Consider recomputing P in some Solve iterations if BoomerAMGSetup is much more
-  expensive than computing P*/
-  pdata->jacfn(pdata->N, pdata->ilower, pdata->iupper, pdata->jlower, pdata->jupper, gamma, t, y, fy, &(pdata->A), (void*) (cv_mem->cv_user_data), tmp1, tmp2, tmp3);
-  HYPRE_IJMatrixGetObject(pdata->A, (void**) &(pdata->parcsr_A));
-  
-  pdata->par_b=(HYPRE_ParVector) (NV_HYPRE_PARVEC_PH(y));
-  pdata->par_x=(HYPRE_ParVector) (NV_HYPRE_PARVEC_PH(y));
-  HYPRE_BoomerAMGSetup(pdata->solver, pdata->parcsr_A, pdata->par_b, pdata->par_x);
-
-  /* Return 0 if the LU was complete; otherwise return 1 */
-  if (ier > 0) return(1);
-  return(0);
-}
-
-/*
- * -----------------------------------------------------------------
- * Function : CVBoomerAMGSolve
- * -----------------------------------------------------------------
- * CVBoomerAMGSolve solves a linear system P z = r, with the
- * HYPRE_ParCSRMatrix generated by CVBoomerAMGSetup.
- *
- * The parameters of CVBoomerAMGSolve used here are as follows:
- *
- * r is the right-hand side vector of the linear system.
- *
- * hypamg_data is a pointer to the preconditioner data set by
- *   CVBoomerAMGInit.
- *
- * z is the output vector computed by CVBoomerAMGSolve.
- *
- * The value returned by the CVBoomerAMGSolve function is always 0,
- * indicating success.
- * -----------------------------------------------------------------
- */
-
-int CVBoomerAMGSolve(realtype t, N_Vector y, N_Vector fy, 
-                          N_Vector r, N_Vector z, 
-                          realtype gamma, realtype delta,
-                          int lr, void *hypamg_data, N_Vector tmp)
-{
-  CVBoomerAMGData pdata;
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  
-  pdata = (CVBoomerAMGData) hypamg_data;
-  cv_mem = (CVodeMem) pdata->cvode_mem;
-
-/*  jacfn(N, ilower, iupper, jlower, jupper, gamma, t, y, fy, &A, (void*) jacobian_data, tmp, tmp, tmp);*/
-  pdata->par_b=(HYPRE_ParVector) (NV_HYPRE_PARVEC_PH(r));
-  pdata->par_x=(HYPRE_ParVector) (NV_HYPRE_PARVEC_PH(z));
-  HYPRE_BoomerAMGSolve(pdata->solver, pdata->parcsr_A, pdata->par_b, pdata->par_x);
-
-  return(0);
-}
-
-
-static void CVBoomerAMGFree(CVodeMem cv_mem)
-{
-  CVSpilsMem cvspils_mem;
-  CVBoomerAMGData pdata;
-   int num_iterations;
-   double final_res_norm;
-   int nprocs, myid;
-   int global_size;
-  
-  if (cv_mem->cv_lmem == NULL) return;
-  cvspils_mem = (CVSpilsMem) cv_mem->cv_lmem;
-  
-  if (cvspils_mem->s_P_data == NULL) return;
-  pdata = (CVBoomerAMGData) cvspils_mem->s_P_data;
-
-  /* Need to return solver function so that users can get diagnostics out before CVodeFree()
-  Run info - needed logging turned on */
-/*  MPI_Comm_rank(hypre_ParCSRMatrixComm(parcsr_A),&myid);
-  HYPRE_BoomerAMGGetNumIterations(solver, &num_iterations);
-  HYPRE_BoomerAMGGetFinalRelativeResidualNorm(solver, &final_res_norm);
-  if (myid == 0)
-  {
-     printf("\n");
-     printf("Iterations = %d\n", num_iterations);
-     printf("Final Relative Residual Norm = %e\n", final_res_norm);
-     printf("\n");
-  }*/
-
-  /* Destroy solver */
-  HYPRE_BoomerAMGDestroy(pdata->solver);
-
-  free(pdata);
-  pdata = NULL;
-}
-
-/*
-int JacTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy, void *user_data, N_Vector tmp)
-{
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  CVBoomerAMGData pdata;
-
-  if (user_data->ode_mem == NULL) {
-    cvProcessError(NULL, CVSPILS_MEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_CVMEM_NULL);
-    return(CVSPILS_MEM_NULL);
-  }
-  cv_mem = (CVodeMem) user_data->ode_mem;
-
-  if (cv_mem->cv_lmem == NULL) {
-    cvProcessError(cv_mem, CVSPILS_LMEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_LMEM_NULL);
-    return(CVSPILS_LMEM_NULL);
-  }
-  cvspils_mem = (CVSpilsMem) cv_mem->cv_lmem;
-  pdata = (CVBoomerAMGData) cvspils_mem->s_P_data;
- hypre_ParCSRMatrixMatvec ( 1.0, pdata->parcsr_A, NV_HYPRE_PARVEC_PH(v), 1.0, NV_HYPRE_PARVEC_PH(Jv));
-}*/
-/*
- * -----------------------------------------------------------------
- * CVParCsrSetParCsrJacFn
- * -----------------------------------------------------------------
- */
-
-/*CVSpilsSetParCsrPCFn*/
-int CVSpilsSetParCsrJacFn(void *cvode_mem, CVParCsrJacFn jparcsr)
-{
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  CVBoomerAMGData pdata;
-
-  /* Return immediately if cvode_mem is NULL */
-  if (cvode_mem == NULL) {
-    cvProcessError(NULL, CVSPILS_MEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_CVMEM_NULL);
-    return(CVSPILS_MEM_NULL);
-  }
-  cv_mem = (CVodeMem) cvode_mem;
-
-  if (cv_mem->cv_lmem == NULL) {
-    cvProcessError(cv_mem, CVSPILS_LMEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_LMEM_NULL);
-    return(CVSPILS_LMEM_NULL);
-  }
-  cvspils_mem = (CVSpilsMem) cv_mem->cv_lmem;
-  pdata = (CVBoomerAMGData) cvspils_mem->s_P_data;
-
-  if (jparcsr != NULL) {
-    pdata->jacfn  = jparcsr;
-/*    jtimesDQ = SUNFALSE;*/
-  }/* else {
-    jtimesDQ = SUNTRUE;
-  }*/
-
-  return(CVSPILS_SUCCESS);
-}
-
-int CVParCsrSetSpilsJacTimesVecFn(void *cvode_mem, CVSpilsJacTimesVecFn jparcsr)
-{
-  CVodeMem cv_mem;
-  CVSpilsMem cvspils_mem;
-  CVBoomerAMGData pdata;
-
-  /* Return immediately if cvode_mem is NULL */
-  if (cvode_mem == NULL) {
-    cvProcessError(NULL, CVSPILS_MEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_CVMEM_NULL);
-    return(CVSPILS_MEM_NULL);
-  }
-  cv_mem = (CVodeMem) cvode_mem;
-
-  if (cv_mem->cv_lmem == NULL) {
-    cvProcessError(cv_mem, CVSPILS_LMEM_NULL, "CVSPILS", "CVSpilsSetJacTimesVecFn", MSGS_LMEM_NULL);
-    return(CVSPILS_LMEM_NULL);
-  }
-  cvspils_mem = (CVSpilsMem) cv_mem->cv_lmem;
-  pdata = (CVBoomerAMGData) cvspils_mem->s_P_data;
-
-  if (jparcsr != NULL) {
-    cvspils_mem->s_jtimes  = jparcsr;
-    cvspils_mem->s_jtimesDQ = SUNFALSE;
-  }/* else {
-    jtimesDQ = SUNTRUE;
-  }*/
-
-  return(CVSPILS_SUCCESS);
-}
-
-int CVParCsrCreateGammaIdentity(HYPRE_IJMatrix* id_mat, realtype gamma, sunindextype ilow, sunindextype iup)
-{
-  int nnz, i;
-  double values[5];
-  int cols[5];
-  for (i = ilow; i <= iup; i++)
-      {
-         nnz = 0;
-            
-         cols[nnz] = i;
-         values[nnz] = gamma;
-         nnz++;
-         HYPRE_IJMatrixSetValues(*id_mat, 1, &nnz, &i, cols, values);
-      }
-   
-
-   /* Assemble after setting the coefficients */
-     HYPRE_IJMatrixAssemble(*id_mat);
-}
diff --git a/src/cvode/cvode_hypamgpre_impl.h b/src/cvode/cvode_hypamgpre_impl.h
deleted file mode 100644
index dbed5fbc3f..0000000000
--- a/src/cvode/cvode_hypamgpre_impl.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * -----------------------------------------------------------------
- * $Revision: 4378 $
- * $Date: 2015-02-19 10:55:14 -0800 (Thu, 19 Feb 2015) $
- * ----------------------------------------------------------------- 
- * Programmer(s): Michael Wittman, Alan C. Hindmarsh and
- *                Radu Serban @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Implementation header file for the CVHYPRE_BOOMERAMG module.
- * -----------------------------------------------------------------
- */
-
-#ifndef _CVHYPRE_BOOMERAMG_IMPL_H
-#define _CVHYPRE_BOOMERAMG_IMPL_H
-
-#include <cvode/cvode_hypamgpre.h>
-#include <sundials/sundials_band.h>
-#include "_hypre_utilities.h"
-#include "HYPRE_krylov.h"
-#include "HYPRE_parcsr_ls.h"
-#include "HYPRE.h"
-#include "_hypre_parcsr_mv.h"
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*
- * -----------------------------------------------------------------
- * Type: CVBoomerAMGData
- * -----------------------------------------------------------------
- */
-
-typedef struct CVBoomerAMGDataRec {
-
-  /* passed by user to CVBoomerAMGAlloc and used by PrecSetup/PrecSolve */
-
-  sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype dqrely;
-  CVParCsrJacFn jacfn;
-
-  /* set by CVBoomerAMGAlloc and used by CVBoomerAMGSetup */
-
-  sunindextype n_local;
-
-  /* available for optional output */
-
-  long int rpwsize;
-  long int ipwsize;
-  long int nge;
-  
-  int ilower, iupper, jlower, jupper, N;
-
-  HYPRE_IJMatrix A;
-  HYPRE_ParCSRMatrix parcsr_A;
-  HYPRE_IJVector b;
-  HYPRE_ParVector par_b;
-  HYPRE_IJVector x;
-  HYPRE_ParVector par_x;
-  HYPRE_Solver solver, precond;
-
-  /* pointer to cvode_mem */
-  void *cvode_mem;
-
-} *CVBoomerAMGData;
-
-/*
- * -----------------------------------------------------------------
- * CVHYPRE_BOOMERAMG error messages
- * -----------------------------------------------------------------
- */
-
-#define MSGBBD_MEM_NULL    "Integrator memory is NULL."
-#define MSGBBD_LMEM_NULL   "Linear solver memory is NULL. One of the SPILS linear solvers must be attached."
-#define MSGBBD_MEM_FAIL    "A memory request failed."
-#define MSGBBD_BAD_NVECTOR "A required vector operation is not implemented."
-#define MSGBBD_PMEM_NULL   "BBD peconditioner memory is NULL. CVBoomerAMGInit must be called."
-#define MSGBBD_FUNC_FAILED "The gloc or cfn routine failed in an unrecoverable manner."
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

From 1184484d15f1c7ac5254d251767da2d602b154dc Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Mon, 6 Nov 2023 08:44:58 -0800
Subject: [PATCH 20/35] CI: Update actions (#368)

* Cancel existing workflow on new push
* Add dispatch trigger for all actions
* Upload all outputs from testing directory

---------

Co-authored-by: Cody Balos <cjbalos@gmail.com>
---
 .github/workflows/double-precision.yml     | 12 +++++++++---
 .github/workflows/extended-precision.yml   | 12 +++++++++---
 .github/workflows/macos-latest.yml         |  6 ++++++
 .github/workflows/single-precision.yml     | 12 +++++++++---
 .github/workflows/spack-develop.yml        | 11 ++++++++---
 .github/workflows/ubuntu-clang-latest.yml  |  6 ++++++
 .github/workflows/windows-latest-mingw.yml |  6 ++++++
 .github/workflows/windows-latest.yml       |  6 ++++++
 8 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml
index 9303af7523..31feaf3ffb 100644
--- a/.github/workflows/double-precision.yml
+++ b/.github/workflows/double-precision.yml
@@ -4,6 +4,12 @@ name: double precision build and test with GCC+TPLs (no GPUs)
 on:
   push:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -26,7 +32,7 @@ jobs:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
       - name: Archive build files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: build_files
@@ -34,9 +40,9 @@ jobs:
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: output_files
           path: |
-            ${{ github.workspace }}/test/build_*/Testing/output
+            ${{ github.workspace }}/test/build_*/Testing/
diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml
index dc6f32e726..55d75f7d5d 100644
--- a/.github/workflows/extended-precision.yml
+++ b/.github/workflows/extended-precision.yml
@@ -3,6 +3,12 @@ name: extended precision build and test with GCC+TPLs (no GPUs)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -25,7 +31,7 @@ jobs:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
       - name: Archive build files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: build_files
@@ -33,9 +39,9 @@ jobs:
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: output_files
           path: |
-            ${{ github.workspace }}/test/build_*/Testing/output
+            ${{ github.workspace }}/test/build_*/Testing/
diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml
index 9efb20d976..4d5599295e 100644
--- a/.github/workflows/macos-latest.yml
+++ b/.github/workflows/macos-latest.yml
@@ -2,6 +2,12 @@ name: MacOS short test
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml
index 304ae4e3bc..9a87e7f0bd 100644
--- a/.github/workflows/single-precision.yml
+++ b/.github/workflows/single-precision.yml
@@ -3,6 +3,12 @@ name: single precision build and test with GCC+TPLs (no GPUs)
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build_and_test:
@@ -25,7 +31,7 @@ jobs:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
       - name: Archive build files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: build_files
@@ -33,9 +39,9 @@ jobs:
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: output_files
           path: |
-            ${{ github.workspace }}/test/build_*/Testing/output
+            ${{ github.workspace }}/test/build_*/Testing/
diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml
index 07dce581c2..745a57df7e 100644
--- a/.github/workflows/spack-develop.yml
+++ b/.github/workflows/spack-develop.yml
@@ -3,10 +3,15 @@ name: spack@develop build and test with GCC+TPLs (no GPUs)
 
 on:
   pull_request:
+  merge_group:
   workflow_dispatch:
   schedule:
   - cron: '00 22 * * *'
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build_and_test:
     runs-on: ubuntu-latest
@@ -28,7 +33,7 @@ jobs:
           indexsize: ${{ matrix.indexsize }}
           precision: ${{ matrix.precision }}
       - name: Archive build files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: build_files
@@ -36,9 +41,9 @@ jobs:
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: output_files
           path: |
-            ${{ github.workspace }}/test/build_*/Testing/output
+            ${{ github.workspace }}/test/build_*/Testing/
diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml
index 29da08a417..71f398d30a 100644
--- a/.github/workflows/ubuntu-clang-latest.yml
+++ b/.github/workflows/ubuntu-clang-latest.yml
@@ -2,6 +2,12 @@ name: Ubuntu (clang) short test
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
index ab20ea721a..5289a953da 100644
--- a/.github/workflows/windows-latest-mingw.yml
+++ b/.github/workflows/windows-latest-mingw.yml
@@ -2,6 +2,12 @@ name: Windows (mingw) short test
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml
index d640eb6bd2..66489fe976 100644
--- a/.github/workflows/windows-latest.yml
+++ b/.github/workflows/windows-latest.yml
@@ -2,6 +2,12 @@ name: Windows short test
 
 on:
   pull_request:
+  merge_group:
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)

From 9b01e931f0b915dbd7e588c2cca221bfa03b880f Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Mon, 6 Nov 2023 13:24:59 -0800
Subject: [PATCH 21/35] Maintenance: Remove F77 interface examples (#367)

Remove F77 interface examples from `develop` branch. Once this PR is
merged, a new `archive` branch can be created for easy reference until
#302 is merged and the `archive` branch can be deleted.

---------

Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 doc/arkode/examples/source/index.rst          |   68 +-
 doc/cvode/Makefile                            |    4 +-
 doc/cvode/cv_ex_codes.tex                     |   16 +-
 doc/cvode/cv_ex_intro.tex                     |   50 +-
 doc/cvode/cv_examples.tex                     |    4 +-
 doc/ida/Makefile                              |    4 +-
 doc/ida/ida_ex_codes.tex                      |   14 +-
 doc/ida/ida_ex_intro.tex                      |   40 +-
 doc/ida/ida_examples.tex                      |    4 +-
 doc/kinsol/Makefile                           |    6 +-
 doc/kinsol/kin_ex_codes.tex                   |   16 +-
 doc/kinsol/kin_ex_intro.tex                   |   29 +-
 doc/kinsol/kin_examples.tex                   |    4 +-
 examples/arkode/F77_parallel/CMakeLists.txt   |  143 --
 examples/arkode/F77_parallel/README           |   47 -
 .../arkode/F77_parallel/fark_diag_kry_bbd_p.f |  373 ------
 .../F77_parallel/fark_diag_kry_bbd_p.out      |   87 --
 .../arkode/F77_parallel/fark_diag_non_p.f     |  231 ----
 .../arkode/F77_parallel/fark_diag_non_p.out   |   34 -
 examples/arkode/F77_serial/CMakeLists.txt     |  294 -----
 examples/arkode/F77_serial/README             |   47 -
 .../arkode/F77_serial/fark_diurnal_kry_bp.f   |  413 ------
 .../arkode/F77_serial/fark_diurnal_kry_bp.out |   73 --
 .../arkode/F77_serial/fark_roberts_dnsL.f     |  329 -----
 .../arkode/F77_serial/fark_roberts_dnsL.out   |   34 -
 examples/arkode/F90_parallel/CMakeLists.txt   |  145 --
 examples/arkode/F90_parallel/README           |   52 -
 examples/arkode/F90_parallel/fark_heat2D.f90  |  871 -------------
 examples/arkode/F90_parallel/fark_heat2D.out  |   49 -
 examples/arkode/F90_parallel/plot_heat2D.py   |  134 --
 examples/arkode/F90_serial/CMakeLists.txt     |  300 -----
 examples/arkode/F90_serial/README             |   48 -
 examples/arkode/F90_serial/ark_bruss.f90      |  304 -----
 examples/arkode/F90_serial/ark_bruss.out      |   25 -
 .../arkode/F90_serial/ark_bruss1D_FEM_klu.f90 | 1161 -----------------
 .../arkode/F90_serial/ark_bruss1D_FEM_klu.out |   59 -
 .../F90_serial/plot_brusselator1D_FEM.py      |   73 --
 examples/arkode/F90_serial/plot_sol.py        |   55 -
 examples/cvode/fcmix_parallel/CMakeLists.txt  |  140 --
 examples/cvode/fcmix_parallel/README          |   48 -
 .../cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f  |  336 -----
 .../fcmix_parallel/fcvDiag_kry_bbd_p.out      |   76 --
 examples/cvode/fcmix_parallel/fcvDiag_kry_p.f |  376 ------
 .../cvode/fcmix_parallel/fcvDiag_kry_p.out    |   65 -
 examples/cvode/fcmix_parallel/fcvDiag_non_p.f |  217 ---
 .../cvode/fcmix_parallel/fcvDiag_non_p.out    |   31 -
 examples/cvode/fcmix_serial/CMakeLists.txt    |  288 ----
 examples/cvode/fcmix_serial/README            |   52 -
 examples/cvode/fcmix_serial/fcvAdvDiff_bnd.f  |  316 -----
 .../cvode/fcmix_serial/fcvAdvDiff_bnd.out     |   24 -
 examples/cvode/fcmix_serial/fcvDiurnal_kry.f  | 1028 ---------------
 .../cvode/fcmix_serial/fcvDiurnal_kry.out     |   63 -
 .../cvode/fcmix_serial/fcvDiurnal_kry_bp.f    |  374 ------
 .../cvode/fcmix_serial/fcvDiurnal_kry_bp.out  |   68 -
 examples/cvode/fcmix_serial/fcvRoberts_dns.f  |  270 ----
 .../cvode/fcmix_serial/fcvRoberts_dns.out     |   32 -
 examples/cvode/fcmix_serial/fcvRoberts_dnsL.f |  273 ----
 .../cvode/fcmix_serial/fcvRoberts_dnsL.out    |   32 -
 .../fcmix_serial/fcvRoberts_dns_constraints.f |  288 ----
 .../fcvRoberts_dns_constraints.out            |   32 -
 examples/cvode/fcmix_serial/fcvRoberts_klu.f  |  345 -----
 .../cvode/fcmix_serial/fcvRoberts_klu.out     |   32 -
 examples/cvode/fcmix_serial/fcvRoberts_sps.f  |  355 -----
 .../cvode/fcmix_serial/fcvRoberts_sps.out     |   32 -
 examples/ida/fcmix_openmp/CMakeLists.txt      |  118 --
 examples/ida/fcmix_openmp/README              |   46 -
 .../ida/fcmix_openmp/fidaRoberts_dns_openmp.f |  306 -----
 .../fcmix_openmp/fidaRoberts_dns_openmp.out   |   34 -
 examples/ida/fcmix_parallel/CMakeLists.txt    |  131 --
 examples/ida/fcmix_parallel/README            |   46 -
 .../ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f |  849 ------------
 .../fcmix_parallel/fidaHeat2D_kry_bbd_p.out   |   65 -
 examples/ida/fcmix_pthreads/CMakeLists.txt    |  123 --
 examples/ida/fcmix_pthreads/README            |   47 -
 .../fcmix_pthreads/fidaRoberts_dns_pthreads.f |  306 -----
 .../fidaRoberts_dns_pthreads.out              |   34 -
 examples/ida/fcmix_serial/CMakeLists.txt      |  115 --
 examples/ida/fcmix_serial/README              |   46 -
 examples/ida/fcmix_serial/fidaRoberts_dns.f   |  303 -----
 examples/ida/fcmix_serial/fidaRoberts_dns.out |   34 -
 examples/kinsol/fcmix_parallel/CMakeLists.txt |  132 --
 examples/kinsol/fcmix_parallel/README         |   46 -
 .../kinsol/fcmix_parallel/fkinDiagon_kry_p.f  |  344 -----
 .../fcmix_parallel/fkinDiagon_kry_p.out       |   24 -
 examples/kinsol/fcmix_serial/CMakeLists.txt   |  117 --
 examples/kinsol/fcmix_serial/README           |   46 -
 examples/kinsol/fcmix_serial/fkinDiagon_kry.f |  273 ----
 .../kinsol/fcmix_serial/fkinDiagon_kry.out    |   53 -
 .../templates/cmakelists_parallel_F90_ex.in   |  108 --
 .../templates/cmakelists_serial_F90_ex.in     |  288 ----
 examples/templates/makefile_serial_F90_ex.in  |  110 --
 91 files changed, 130 insertions(+), 14847 deletions(-)
 delete mode 100644 examples/arkode/F77_parallel/CMakeLists.txt
 delete mode 100644 examples/arkode/F77_parallel/README
 delete mode 100644 examples/arkode/F77_parallel/fark_diag_kry_bbd_p.f
 delete mode 100644 examples/arkode/F77_parallel/fark_diag_kry_bbd_p.out
 delete mode 100644 examples/arkode/F77_parallel/fark_diag_non_p.f
 delete mode 100644 examples/arkode/F77_parallel/fark_diag_non_p.out
 delete mode 100644 examples/arkode/F77_serial/CMakeLists.txt
 delete mode 100644 examples/arkode/F77_serial/README
 delete mode 100644 examples/arkode/F77_serial/fark_diurnal_kry_bp.f
 delete mode 100644 examples/arkode/F77_serial/fark_diurnal_kry_bp.out
 delete mode 100644 examples/arkode/F77_serial/fark_roberts_dnsL.f
 delete mode 100644 examples/arkode/F77_serial/fark_roberts_dnsL.out
 delete mode 100644 examples/arkode/F90_parallel/CMakeLists.txt
 delete mode 100644 examples/arkode/F90_parallel/README
 delete mode 100644 examples/arkode/F90_parallel/fark_heat2D.f90
 delete mode 100644 examples/arkode/F90_parallel/fark_heat2D.out
 delete mode 100755 examples/arkode/F90_parallel/plot_heat2D.py
 delete mode 100644 examples/arkode/F90_serial/CMakeLists.txt
 delete mode 100644 examples/arkode/F90_serial/README
 delete mode 100644 examples/arkode/F90_serial/ark_bruss.f90
 delete mode 100644 examples/arkode/F90_serial/ark_bruss.out
 delete mode 100644 examples/arkode/F90_serial/ark_bruss1D_FEM_klu.f90
 delete mode 100644 examples/arkode/F90_serial/ark_bruss1D_FEM_klu.out
 delete mode 100755 examples/arkode/F90_serial/plot_brusselator1D_FEM.py
 delete mode 100755 examples/arkode/F90_serial/plot_sol.py
 delete mode 100644 examples/cvode/fcmix_parallel/CMakeLists.txt
 delete mode 100644 examples/cvode/fcmix_parallel/README
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.out
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_kry_p.f
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_kry_p.out
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_non_p.f
 delete mode 100644 examples/cvode/fcmix_parallel/fcvDiag_non_p.out
 delete mode 100644 examples/cvode/fcmix_serial/CMakeLists.txt
 delete mode 100644 examples/cvode/fcmix_serial/README
 delete mode 100644 examples/cvode/fcmix_serial/fcvAdvDiff_bnd.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvAdvDiff_bnd.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvDiurnal_kry.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvDiurnal_kry.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dns.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dns.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dnsL.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dnsL.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_klu.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_klu.out
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_sps.f
 delete mode 100644 examples/cvode/fcmix_serial/fcvRoberts_sps.out
 delete mode 100644 examples/ida/fcmix_openmp/CMakeLists.txt
 delete mode 100644 examples/ida/fcmix_openmp/README
 delete mode 100644 examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.f
 delete mode 100644 examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.out
 delete mode 100644 examples/ida/fcmix_parallel/CMakeLists.txt
 delete mode 100644 examples/ida/fcmix_parallel/README
 delete mode 100644 examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f
 delete mode 100644 examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.out
 delete mode 100644 examples/ida/fcmix_pthreads/CMakeLists.txt
 delete mode 100644 examples/ida/fcmix_pthreads/README
 delete mode 100644 examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.f
 delete mode 100644 examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.out
 delete mode 100644 examples/ida/fcmix_serial/CMakeLists.txt
 delete mode 100644 examples/ida/fcmix_serial/README
 delete mode 100644 examples/ida/fcmix_serial/fidaRoberts_dns.f
 delete mode 100644 examples/ida/fcmix_serial/fidaRoberts_dns.out
 delete mode 100644 examples/kinsol/fcmix_parallel/CMakeLists.txt
 delete mode 100644 examples/kinsol/fcmix_parallel/README
 delete mode 100644 examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f
 delete mode 100644 examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.out
 delete mode 100644 examples/kinsol/fcmix_serial/CMakeLists.txt
 delete mode 100644 examples/kinsol/fcmix_serial/README
 delete mode 100644 examples/kinsol/fcmix_serial/fkinDiagon_kry.f
 delete mode 100644 examples/kinsol/fcmix_serial/fkinDiagon_kry.out
 delete mode 100644 examples/templates/cmakelists_parallel_F90_ex.in
 delete mode 100644 examples/templates/cmakelists_serial_F90_ex.in
 delete mode 100644 examples/templates/makefile_serial_F90_ex.in

diff --git a/doc/arkode/examples/source/index.rst b/doc/arkode/examples/source/index.rst
index d5970d14d8..c98fa9dcc4 100644
--- a/doc/arkode/examples/source/index.rst
+++ b/doc/arkode/examples/source/index.rst
@@ -45,7 +45,7 @@ B598130 from `Lawrence Livermore National Laboratory
 
 Along with the ARKode solver, we have created a suite of example
 problems demonstrating its usage on applications written in C, C++ and
-Fortran 77 and Fortran 90.  These examples demonstrate a large variety
+Fortran.  These examples demonstrate a large variety
 of ARKode solver options, including explicit, implicit and ImEx
 solvers, root-finding, Newton and fixed-point nonlinear solvers,
 direct and iterative linear solvers, adaptive resize capabilities, and
@@ -60,8 +60,7 @@ The following tables summarize the salient features of each of the
 example problems in this document.  Each example is designed to be
 relatively self-contained, so that you need only study and/or emulate
 the problem that is most closely related to your own.  We group these
-examples according to programming language (C, C++, Fortran 77,
-Fortran 90). 
+examples according to programming language (C, C++, Fortran).
 
 
 ARKode example problems written in C are summarized in the table
@@ -106,35 +105,36 @@ Problem                  Integrator  Nonlinear    Linear  Size           Extras
 =======================  ==========  ===========  ======  =============  =================================
 
 
-ARKode example problems written in Fortran 77 are summarized in the table
-below, and are further described in the chapters :ref:`serial_f77` and
-:ref:`parallel_f77`. 
+..
+   ARKode example problems written in Fortran 77 are summarized in the table
+   below, and are further described in the chapters :ref:`serial_f77` and
+   :ref:`parallel_f77`.
 
-.. cssclass:: table-bordered
+   .. cssclass:: table-bordered
 
-==========================   ==========  ===========  ======  =============  =================================
-Problem                      Integrator  Nonlinear    Linear  Size           Extras
-==========================   ==========  ===========  ======  =============  =================================
-:ref:`fark_diurnal_kry_bp`   DIRK        Newton       SPGMR   10             banded preconditioner
-:ref:`fark_roberts_dnsL`     DIRK        Newton       Dense   3              LAPACK dense solver, rootfinding
-:ref:`fark_diag_kry_bbd_p`   DIRK        Newton       SPGMR   10*NProcs      parallel BBD preconditioner
-:ref:`fark_diag_non_p`       ERK         N.A.         N.A.    10*NProcs      parallel
-==========================   ==========  ===========  ======  =============  =================================
+   ==========================   ==========  ===========  ======  =============  =================================
+   Problem                      Integrator  Nonlinear    Linear  Size           Extras
+   ==========================   ==========  ===========  ======  =============  =================================
+   :ref:`fark_diurnal_kry_bp`   DIRK        Newton       SPGMR   10             banded preconditioner
+   :ref:`fark_roberts_dnsL`     DIRK        Newton       Dense   3              LAPACK dense solver, rootfinding
+   :ref:`fark_diag_kry_bbd_p`   DIRK        Newton       SPGMR   10*NProcs      parallel BBD preconditioner
+   :ref:`fark_diag_non_p`       ERK         N.A.         N.A.    10*NProcs      parallel
+   ==========================   ==========  ===========  ======  =============  =================================
 
 
-ARKode example problems written in Fortran 90 are summarized in the table
-below, and are further described in the chapters :ref:`serial_f90` and
-:ref:`parallel_f90`. 
+   ARKode example problems written in Fortran 90 are summarized in the table
+   below, and are further described in the chapters :ref:`serial_f90` and
+   :ref:`parallel_f90`.
 
-.. cssclass:: table-bordered
+   .. cssclass:: table-bordered
 
-==========================  ==========  =========  ======  =============  ===============================================
-Problem                     Integrator  Nonlinear  Linear  Size           Extras
-==========================  ==========  =========  ======  =============  ===============================================
-:ref:`ark_bruss`            ARK         Newton     Dense   3              
-:ref:`ark_bruss1D_FEM_klu`  DIRK        Newton     KLU     3N             finite-element, :math:`M\ne I`, sparse matrices
-:ref:`fark_heat2D`          DIRK        Newton     PCG     :math:`nx*ny`  parallel
-==========================  ==========  =========  ======  =============  ===============================================
+   ==========================  ==========  =========  ======  =============  ===============================================
+   Problem                     Integrator  Nonlinear  Linear  Size           Extras
+   ==========================  ==========  =========  ======  =============  ===============================================
+   :ref:`ark_bruss`            ARK         Newton     Dense   3
+   :ref:`ark_bruss1D_FEM_klu`  DIRK        Newton     KLU     3N             finite-element, :math:`M\ne I`, sparse matrices
+   :ref:`fark_heat2D`          DIRK        Newton     PCG     :math:`nx*ny`  parallel
+   ==========================  ==========  =========  ======  =============  ===============================================
 
 
 
@@ -154,14 +154,14 @@ Problem                     Integrator  Nonlinear  Linear  Size           Extras
    c_parhyp
    cpp_serial
    cpp_parallel
-   f77_serial
-   f77_parallel
-   f90_serial
-   f90_parallel
-   References           
-   
+   References
+..
+  Remove F77 interface examples
+  f77_serial
+  f77_parallel
+  f90_serial
+  f90_parallel
+
 .. only:: html
 
    * :ref:`search`
-
-
diff --git a/doc/cvode/Makefile b/doc/cvode/Makefile
index b91bc99ff1..00a00a83c0 100644
--- a/doc/cvode/Makefile
+++ b/doc/cvode/Makefile
@@ -22,7 +22,9 @@ cv_ex_intro.tex \
 cv_ex_serial.tex \
 cv_ex_parallel.tex \
 cv_ex_parhyp.tex \
-cv_ex_fortran.tex \
 cv_ex_tests.tex
 
+# Remove F77 example text
+# cv_ex_fortran.tex \
+
 include ../Makefile.in
diff --git a/doc/cvode/cv_ex_codes.tex b/doc/cvode/cv_ex_codes.tex
index d30aabcd91..7b3af9d9ae 100644
--- a/doc/cvode/cv_ex_codes.tex
+++ b/doc/cvode/cv_ex_codes.tex
@@ -30,14 +30,12 @@ \section{Listing of cvDiurnal\_kry\_bbd\_p.c}\label{s:cvDiurnal_bbd_p_c}
 
 %% Fortran examples
 
-\lstset{language=[77]Fortran}
-
-\newpage
-\section{Listing of fcvDiurnal\_kry.f}\label{s:fcvDiurnal_f}
-\includeCode{../../examples/cvode/fcmix_serial/fcvDiurnal_kry.f}
-
-\newpage
-\section{Listing of fcvDiag\_kry\_bbd\_p.f}\label{s:fcvDiag_bbd_p_f}
-\includeCode{../../examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f}
+%% \lstset{language=[77]Fortran}
 
+%% \newpage
+%% \section{Listing of fcvDiurnal\_kry.f}\label{s:fcvDiurnal_f}
+%% \includeCode{../../examples/cvode/fcmix_serial/fcvDiurnal_kry.f}
 
+%% \newpage
+%% \section{Listing of fcvDiag\_kry\_bbd\_p.f}\label{s:fcvDiag_bbd_p_f}
+%% \includeCode{../../examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f}
diff --git a/doc/cvode/cv_ex_intro.tex b/doc/cvode/cv_ex_intro.tex
index f06936ff22..e761486efd 100644
--- a/doc/cvode/cv_ex_intro.tex
+++ b/doc/cvode/cv_ex_intro.tex
@@ -7,9 +7,9 @@ \section{Introduction}\label{s:ex_intro}
 listings, on the example programs supplied with the {\cvode} distribution
 package.
 
-The {\cvode} distribution contains examples of six types: serial
-{\CC} examples, parallel {\CC} examples, serial and parallel {\F}
-examples, an OpenMP example, and a {\hypre} example.
+The {\cvode} distribution contains examples of the following types: serial
+{\CC} examples, parallel {\CC} examples, an OpenMP example, and a {\hypre}
+example.
 %%
 With the exception of ''demo''-type example files, the names of all the examples
 distributed with {\sundials} are of the form \verb![slv][PbName]_[ls]_[prec]_[p]!,
@@ -159,28 +159,28 @@ \section{Introduction}\label{s:ex_intro}
 \id{cvAdvDiff\_non\_p} but with {\hypre} vectors instead of
 {\sundials} parallel vectors.
 
-\vspace{0.2in}\noindent
-As part of the {\fcvode} module, in the directories
-{\em srcdir}\id{/examples/cvode/fcmix\_serial} and
-{\em srcdir}\id{/examples/cvode/fcmix\_parallel}, are the following examples for
-the {\F}-{\CC} interface.  The first five of these are serial, while
-the last three are parallel.
-\begin{itemize}
-\item \id{fcvRoberts\_dns} is a serial chemical kinetics example (\id{BDF}/{\sunlinsoldense})
-  with rootfinding.
-\item \id{fcvRoberts\_dns\_constraints} is the same as \id{fcvRoberts\_dns} but
-  but imposes the constraint $u \geq 0.0$ for all components.
-\item \id{fcvRoberts\_dnsL} is the same as \id{fcvRoberts\_dns} but uses the Lapack
-  implementation of {\sunlinsollapdense}.
-\item \id{fcvAdvDiff\_bnd} is a serial advection-diffusion example (\id{BDF}/{\sunlinsolband}).
-\item \id{fcvDiurnal\_kry} is a serial kinetics-transport example (\id{BDF}/{\sunlinsolspgmr}).
-\item \id{fcvDiurnal\_kry\_bp} is the \id{fcvDiurnal\_kry} example with {\fcvbp}.
-\item \id{fcvDiag\_non\_p} is a nonstiff parallel diagonal ODE example
-  (\id{ADAMS}/\id{FIXEDPOINT}).
-\item \id{fcvDiag\_kry\_p} is a stiff parallel diagonal ODE example (\id{BDF}/{\sunlinsolspgmr}).
-\item \id{fcvDiag\_kry\_bbd\_p} is the same as the \id{fcvDiag\_kry\_p} example
-       but using the {\fcvbbd} module.
-\end{itemize}
+%% \vspace{0.2in}\noindent
+%% As part of the {\fcvode} module, in the directories
+%% {\em srcdir}\id{/examples/cvode/fcmix\_serial} and
+%% {\em srcdir}\id{/examples/cvode/fcmix\_parallel}, are the following examples for
+%% the {\F}-{\CC} interface.  The first five of these are serial, while
+%% the last three are parallel.
+%% \begin{itemize}
+%% \item \id{fcvRoberts\_dns} is a serial chemical kinetics example (\id{BDF}/{\sunlinsoldense})
+%%   with rootfinding.
+%% \item \id{fcvRoberts\_dns\_constraints} is the same as \id{fcvRoberts\_dns} but
+%%   but imposes the constraint $u \geq 0.0$ for all components.
+%% \item \id{fcvRoberts\_dnsL} is the same as \id{fcvRoberts\_dns} but uses the Lapack
+%%   implementation of {\sunlinsollapdense}.
+%% \item \id{fcvAdvDiff\_bnd} is a serial advection-diffusion example (\id{BDF}/{\sunlinsolband}).
+%% \item \id{fcvDiurnal\_kry} is a serial kinetics-transport example (\id{BDF}/{\sunlinsolspgmr}).
+%% \item \id{fcvDiurnal\_kry\_bp} is the \id{fcvDiurnal\_kry} example with {\fcvbp}.
+%% \item \id{fcvDiag\_non\_p} is a nonstiff parallel diagonal ODE example
+%%   (\id{ADAMS}/\id{FIXEDPOINT}).
+%% \item \id{fcvDiag\_kry\_p} is a stiff parallel diagonal ODE example (\id{BDF}/{\sunlinsolspgmr}).
+%% \item \id{fcvDiag\_kry\_bbd\_p} is the same as the \id{fcvDiag\_kry\_p} example
+%%        but using the {\fcvbbd} module.
+%% \end{itemize}
 
 \vspace{0.2in}\noindent
 In the following sections, we give detailed descriptions of some (but
diff --git a/doc/cvode/cv_examples.tex b/doc/cvode/cv_examples.tex
index 0ba4e68c28..51800eb32f 100644
--- a/doc/cvode/cv_examples.tex
+++ b/doc/cvode/cv_examples.tex
@@ -5,7 +5,7 @@
 \externaldocument{install}
 \externaldocument{cv_math}
 \externaldocument{cv_usage}
-\externaldocument{cv_fcmix}
+%\externaldocument{cv_fcmix}
 \externaldocument{cv_nvec}
 \externaldocument{cv_sunmat}
 \externaldocument{cv_sunlinsol}
@@ -40,7 +40,7 @@
 \include{cv_ex_parhyp}
 \include{cv_ex_cuda}
 \include{cv_ex_raja}
-\include{cv_ex_fortran}
+%\include{cv_ex_fortran}
 \include{cv_ex_tests}
 %===============================================================
 % References
diff --git a/doc/ida/Makefile b/doc/ida/Makefile
index add4d56563..ca2372cfd2 100644
--- a/doc/ida/Makefile
+++ b/doc/ida/Makefile
@@ -23,7 +23,9 @@ ida_ex_serial.tex   \
 ida_ex_parallel.tex \
 ida_ex_petsc.tex    \
 ida_ex_trilinos.tex    \
-ida_ex_fortran.tex  \
 ida_ex_codes.tex
 
+# Remove F77 example text
+# ida_ex_fortran.tex  \
+
 include ../Makefile.in
diff --git a/doc/ida/ida_ex_codes.tex b/doc/ida/ida_ex_codes.tex
index dcafb9e401..3cced710d2 100644
--- a/doc/ida/ida_ex_codes.tex
+++ b/doc/ida/ida_ex_codes.tex
@@ -26,12 +26,12 @@ \section{Listing of idaFoodWeb\_kry\_bbd\_p.c}\label{s:idaFoodWeb_bbd_p_c}
 
 %% Fortran examples
 
-\lstset{language=[77]Fortran}
+%% \lstset{language=[77]Fortran}
 
-\newpage
-\section{Listing of fidaRoberts\_dns.f}\label{s:fidaRoberts_f}
-\includeCode{../../examples/ida/fcmix_serial/fidaRoberts_dns.f}
+%% \newpage
+%% \section{Listing of fidaRoberts\_dns.f}\label{s:fidaRoberts_f}
+%% \includeCode{../../examples/ida/fcmix_serial/fidaRoberts_dns.f}
 
-\newpage
-\section{Listing of fidaHeat2D\_kry\_bbd\_p.f}\label{s:fidaHeat2D_bbd_p}
-\includeCode{../../examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f}
+%% \newpage
+%% \section{Listing of fidaHeat2D\_kry\_bbd\_p.f}\label{s:fidaHeat2D_bbd_p}
+%% \includeCode{../../examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f}
diff --git a/doc/ida/ida_ex_intro.tex b/doc/ida/ida_ex_intro.tex
index 2d6acd24f3..5eab9b0a02 100644
--- a/doc/ida/ida_ex_intro.tex
+++ b/doc/ida/ida_ex_intro.tex
@@ -7,9 +7,9 @@ \section{Introduction}\label{s:ex_intro}
 listings, on the example programs supplied with the {\ida} distribution
 package.
 
-The {\ida} distribution contains examples of four types: serial
-{\CC} examples, parallel {\CC} examples, {\F} examples,
-{\petsc} examples, and {\trilinos} examples. 
+The {\ida} distribution contains examples of the following types: serial
+{\CC} examples, parallel {\CC} examples, {\petsc} examples, and {\trilinos}
+examples.
 %%
 With the exception of ``demo''-type example files, the names of all the examples 
 distributed with {\sundials} are of the form \verb![slv][PbName]_[ls]_[prec]_[p]!, 
@@ -131,27 +131,27 @@ \section{Introduction}\label{s:ex_intro}
 
 \end{itemize}
 
-\vspace{0.2in}\noindent
-As part of the {\fida} module, in the four subdirectories \id{fcmix\_serial},
-\id{fcmix\_parallel}, \id{fcmix\_openmp}, and \id{fcmix\_pthreads},
-within the directory {\em srcdir}\id{/examples/ida},
-are the following four examples for the {\F}-{\CC} interface:
-%
-\begin{itemize}
-\item \id{fidaRoberts\_dns} is a serial chemical kinetics example ({\dense})
-       with rootfinding, equivalent to \id{idaRoberts\_dns}.
+%% As part of the {\fida} module, in the subdirectories \id{fcmix\_serial},
+%% \id{fcmix\_parallel}, \id{fcmix\_openmp}, and \id{fcmix\_pthreads},
+%% within the directory {\em srcdir}\id{/examples/ida},
+%% are the following four examples for the {\F}-{\CC} interface:
+%% %
+%% \begin{itemize}
+%% \item \id{fidaRoberts\_dns} is a serial chemical kinetics example ({\dense})
+%%        with rootfinding, equivalent to \id{idaRoberts\_dns}.
 
-\item \id{fidaHeat2D\_kry\_bbd\_p} is a parallel example ({\spgmr}/{\idabbdpre})
-       equivalent to the example \id{idaHeat2D\_kry\_bbd\_p}.
+%% \item \id{fidaHeat2D\_kry\_bbd\_p} is a parallel example ({\spgmr}/{\idabbdpre})
+%%        equivalent to the example \id{idaHeat2D\_kry\_bbd\_p}.
 
-\item \id{fidaRoberts\_dns\_openmp} is the same as \id{fidaRoberts\_dns} but
-       uses the NVECTOR module NVECTOR\_OPENMP.
+%% \item \id{fidaRoberts\_dns\_openmp} is the same as \id{fidaRoberts\_dns} but
+%%        uses the NVECTOR module NVECTOR\_OPENMP.
 
-\item \id{fidaRoberts\_dns\_pthreads} is the same as \id{fidaRoberts\_dns} but
-       uses the NVECTOR module NVECTOR\_PTHREADS.
+%% \item \id{fidaRoberts\_dns\_pthreads} is the same as \id{fidaRoberts\_dns} but
+%%        uses the NVECTOR module NVECTOR\_PTHREADS.
 
-\end{itemize}
-\
+%% \end{itemize}
+%% \
+\vspace{0.2in}\noindent
 Finally, in the subdirectory \id{petsc} of \id{examples/ida} are the
 following examples:
 \begin{itemize}
diff --git a/doc/ida/ida_examples.tex b/doc/ida/ida_examples.tex
index b45aa69fa3..8d93c17d7a 100644
--- a/doc/ida/ida_examples.tex
+++ b/doc/ida/ida_examples.tex
@@ -5,7 +5,7 @@
 \externaldocument{install}
 \externaldocument{ida_math}
 \externaldocument{ida_usage}
-\externaldocument{ida_fcmix}
+%\externaldocument{ida_fcmix}
 \externaldocument{ida_nvec}
 \externaldocument{ida_sunmat}
 \externaldocument{ida_sunlinsol}
@@ -39,7 +39,7 @@
 \include{ida_ex_parallel}
 \include{ida_ex_petsc}
 \include{ida_ex_trilinos}
-\include{ida_ex_fortran}
+%\include{ida_ex_fortran}
 %===============================================================
 % References
 \bibliographystyle{plain}
diff --git a/doc/kinsol/Makefile b/doc/kinsol/Makefile
index 25f4b6e915..9b7a3db8f2 100644
--- a/doc/kinsol/Makefile
+++ b/doc/kinsol/Makefile
@@ -20,7 +20,9 @@ EX_FILES = \
 ${EXAMPLES}.tex \
 kin_ex_intro.tex \
 kin_ex_c.tex \
-kin_ex_cxx.tex \
-kin_ex_fortran.tex
+kin_ex_cxx.tex
+
+# Remove F77 examples
+# kin_ex_fortran.tex
 
 include ../Makefile.in
diff --git a/doc/kinsol/kin_ex_codes.tex b/doc/kinsol/kin_ex_codes.tex
index d97169529e..79a7ff35ac 100644
--- a/doc/kinsol/kin_ex_codes.tex
+++ b/doc/kinsol/kin_ex_codes.tex
@@ -16,14 +16,12 @@ \section{Listing of kinFoodWeb\_kry\_bbd\_p.c}\label{s:kinFoodWeb_kry_bbd_p_c}
 
 %% Fortran examples
 
-\lstset{language=[77]Fortran}
-
-\newpage
-\section{Listing of fkinDiagon\_kry.f}\label{s:fkinDiagon_kry_f}
-\includeCode{../../examples/kinsol/fcmix_serial/fkinDiagon_kry.f}
-
-\newpage
-\section{Listing of fkinDiagon\_kry\_p.f}\label{s:fkinDiagon_kry_p_f}
-\includeCode{../../examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f}
+%% \lstset{language=[77]Fortran}
 
+%% \newpage
+%% \section{Listing of fkinDiagon\_kry.f}\label{s:fkinDiagon_kry_f}
+%% \includeCode{../../examples/kinsol/fcmix_serial/fkinDiagon_kry.f}
 
+%% \newpage
+%% \section{Listing of fkinDiagon\_kry\_p.f}\label{s:fkinDiagon_kry_p_f}
+%% \includeCode{../../examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f}
diff --git a/doc/kinsol/kin_ex_intro.tex b/doc/kinsol/kin_ex_intro.tex
index 89818128d8..f2f3a1be28 100644
--- a/doc/kinsol/kin_ex_intro.tex
+++ b/doc/kinsol/kin_ex_intro.tex
@@ -7,9 +7,8 @@ \section{Introduction}\label{s:ex_intro}
 listings, on the example programs supplied with the {\kinsol} distribution
 package.
 
-The {\kinsol} distribution contains examples of types: serial
-{\CC} examples, parallel {\CC} examples, serial and parallel {\F}
-examples, and an OpenMP example.
+The {\kinsol} distribution contains examples of the following types: serial
+{\CC} examples, parallel {\CC} examples, and an OpenMP example.
 %%
 With the exception of ''demo''-type example files, the names of all the examples
 distributed with {\sundials} are of the form
@@ -92,18 +91,18 @@ \section{Introduction}\label{s:ex_intro}
   using the {\kinbbdpre} module.
 \end{itemize}
 
-\vspace{0.2in}\noindent
-As part of the {\fkinsol} module, in the directories
-{\em srcdir}\id{/examples/kinsol/fcmix\_serial} and
-{\em srcdir}\id{/examples/kinsol/fcmix\_parallel}, respectively, are the
-following examples for the {\F}-{\CC} interface:
-\begin{itemize}
-\item \id{fkinDiagon\_kry}
-  is a serial example, which solves a nonlinear system of the form
-  $u_i^2 = i^2$ using an approximate diagonal preconditioner.
-\item \id{fkinDiagon\_kry\_p}
-  is a parallel implementation of \id{fkinDiagon\_kry}.
-\end{itemize}
+%% \vspace{0.2in}\noindent
+%% As part of the {\fkinsol} module, in the directories
+%% {\em srcdir}\id{/examples/kinsol/fcmix\_serial} and
+%% {\em srcdir}\id{/examples/kinsol/fcmix\_parallel}, respectively, are the
+%% following examples for the {\F}-{\CC} interface:
+%% \begin{itemize}
+%% \item \id{fkinDiagon\_kry}
+%%   is a serial example, which solves a nonlinear system of the form
+%%   $u_i^2 = i^2$ using an approximate diagonal preconditioner.
+%% \item \id{fkinDiagon\_kry\_p}
+%%   is a parallel implementation of \id{fkinDiagon\_kry}.
+%% \end{itemize}
 
 \vspace{0.2in}\noindent
 Supplied in directory {\em srcdir}\id{/examples/kinsol/C\_openmp}
diff --git a/doc/kinsol/kin_examples.tex b/doc/kinsol/kin_examples.tex
index 399a5a723e..6b9fa022ce 100644
--- a/doc/kinsol/kin_examples.tex
+++ b/doc/kinsol/kin_examples.tex
@@ -5,7 +5,7 @@
 \externaldocument{install}
 \externaldocument{kin_math}
 \externaldocument{kin_use}
-\externaldocument{kin_fcmix}
+%\externaldocument{kin_fcmix}
 \externaldocument{kin_nvec}
 \externaldocument{kin_sunmat}
 \externaldocument{kin_sunlinsol}
@@ -35,7 +35,7 @@
 %===============================================================
 \include{kin_ex_intro}
 \include{kin_ex_c}
-\include{kin_ex_fortran}
+%\include{kin_ex_fortran}
 \include{kin_ex_cxx}
 %===============================================================
 % References
diff --git a/examples/arkode/F77_parallel/CMakeLists.txt b/examples/arkode/F77_parallel/CMakeLists.txt
deleted file mode 100644
index b0bc877a68..0000000000
--- a/examples/arkode/F77_parallel/CMakeLists.txt
+++ /dev/null
@@ -1,143 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FARKODE parallel examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;nodes\;tasks\;type" where the
-# type is develop for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FARKODE_examples
-  "fark_diag_non_p\;1\;4\;develop"
-  "fark_diag_kry_bbd_p\;1\;4\;develop"
-  )
-
-# Auxiliary files to install
-set(ARKODE_extras
-  )
-
-if(MPI_Fortran_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_Fortran_COMPILER ${MPI_Fortran_COMPILER})
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-# Specify libraries to link against
-set(ARKODE_LIB sundials_arkode)
-set(NVECP_LIB sundials_nvecparallel)
-set(FNVECP_LIB sundials_fnvecparallel)
-
-# Only static FCMIX libraries are available
-set(FARKODE_LIB sundials_farkode${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FARKODE_LIB} ${ARKODE_LIB} ${FNVECP_LIB} ${NVECP_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each ARKODE example
-foreach(example_tuple ${FARKODE_examples})
-
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 number_of_nodes)
-  list(GET example_tuple 2 number_of_tasks)
-  list(GET example_tuple 3 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    MPI_NPROCS ${number_of_tasks}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  if(NOT MPI_Fortran_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_parallel)
-  endif()
-
-endforeach(example_tuple ${FARKODE_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_parallel)
-
-  # Install the extra files
-  foreach(extrafile ${ARKODE_extras})
-    install(FILES ${extrafile} DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_parallel)
-  endforeach()
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "ARKODE")
-  set(SOLVER_LIB "sundials_arkode")
-  set(SOLVER_FLIB "sundials_farkode")
-
-  examples2string(FARKODE_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_parallel_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/arkode/F77_parallel/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/arkode/F77_parallel/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_parallel
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_parallel_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/arkode/F77_parallel/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/arkode/F77_parallel/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_parallel
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(arkode F77_parallel)
-
-endif()
diff --git a/examples/arkode/F77_parallel/README b/examples/arkode/F77_parallel/README
deleted file mode 100644
index 59f1612df4..0000000000
--- a/examples/arkode/F77_parallel/README
+++ /dev/null
@@ -1,47 +0,0 @@
-List of parallel ARKode F77 examples
-
-  fark_diag_non_p     : diagonal ODE example - non-stiff case (ERK)
-  fark_diag_kry_bbd_p : diagonal ODE example - stiff case (DIRK/SPGMR/FARKBBD)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.f b/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.f
deleted file mode 100644
index c4f50a8a80..0000000000
--- a/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.f
+++ /dev/null
@@ -1,373 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     Diagonal ODE example.  Stiff case, with diagonal preconditioner.
-C     Uses FARKODE interfaces and FARKBBD interfaces.
-C     Solves problem twice -- with left and right preconditioning.
-C
-C     Note that this problem should only work with SUNDIALS configured
-C     to use 'realtype' as 'double' and 'sunindextype' as '64bit'
-C     ----------------------------------------------------------------
-C     
-C     Include MPI-Fortran header file for MPI_COMM_WORLD, MPI types.
-      
-      IMPLICIT NONE
-C
-      INCLUDE "mpif.h"
-C
-      INTEGER*8 NLOCAL
-      PARAMETER (NLOCAL=10)   
-C
-      INTEGER*4 NOUT, MYPE, IER, NPES, METH, IATOL, ITASK, IPRE, IGS
-      INTEGER*4 LLENRW, LLENIW, LNST, LNST_ATT, LNFE, LNFI, LNSETUP
-      INTEGER*4 LNETF, LNNI, LNCF, LLENRWLS, LLENIWLS, LNPE, LNPS, LNLI
-      INTEGER*4 LNCFL, JOUT
-      INTEGER*8 NEQ, I, IPAR(3), IOUT(35), MUDQ, MLDQ, MU, ML, NST
-      INTEGER*8 NST_ATT, NFE, NFI, NPSET, NPE, NPS, NNI, NLI, NCFN, NCFL
-      INTEGER*8 NETF, LENRW, LENIW, LENRWLS, LENIWLS, LENRWBBD, LENIWBBD
-      INTEGER*8 NGEBBD
-      DOUBLE PRECISION Y(1024), ROUT(6), RPAR(1)
-      DOUBLE PRECISION ALPHA, TOUT, ERMAX, AVDIM
-      DOUBLE PRECISION ATOL, ERRI, RTOL, GERMAX, DTOUT, T
-C     
-      DATA ATOL/1.0D-10/, RTOL/1.0D-5/, DTOUT/0.1D0/, NOUT/10/
-      DATA LLENRW/1/, LLENIW/2/, LNST/3/, LNST_ATT/6/, LNFE/7/, LNFI/8/, 
-     1     LNSETUP/9/, LNETF/10/, LNNI/11/, LNCF/12/, LLENRWLS/14/, 
-     1     LLENIWLS/15/, LNPE/21/, LNPS/22/, LNLI/23/, LNCFL/24/
-C
-C     Get NPES and MYPE.  Requires initialization of MPI.
-      CALL MPI_INIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,5) IER
- 5       FORMAT(///' MPI_ERROR: MPI_INIT returned IER = ', I5)
-         STOP
-      ENDIF
-      CALL MPI_COMM_SIZE(MPI_COMM_WORLD, NPES, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,6) IER
- 6       FORMAT(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      CALL MPI_COMM_RANK(MPI_COMM_WORLD, MYPE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,7) IER
- 7       FORMAT(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF      
-C     
-C     Set input arguments.
-      NEQ = NPES * NLOCAL
-      T = 0.0D0
-      METH = 0
-      IATOL = 1
-      ITASK = 1
-      IPRE = 1
-      IGS = 1
-C     Set parameter alpha
-      ALPHA  = 10.0D0
-C
-C     Load IPAR and RPAR
-      IPAR(1) = NLOCAL
-      IPAR(2) = MYPE
-      IPAR(3) = NEQ
-      RPAR(1) = ALPHA
-C     
-      DO I = 1, NLOCAL
-         Y(I) = 1.0D0
-      ENDDO
-C     
-      IF (MYPE .EQ. 0) THEN
-         WRITE(6,15) NEQ, NLOCAL, ALPHA, RTOL, ATOL, NPES
- 15      FORMAT('Diagonal test problem:'//
-     &        ' NEQ = ', I3, /
-     &        ' NLOCAL = ', I3, /
-     &        ' parameter alpha = ', F8.3/
-     &        ' ydot_i = -alpha*i * y_i (i = 1,...,NEQ)'/
-     &        ' RTOL, ATOL = ', 2E10.1/
-     &        ' Method is DIRK/NEWTON/SPGMR'/
-     &        ' Precond is band-block-diagonal, using ARKBBDPRE'
-     &        /' Number of processors = ', I3/)
-      ENDIF
-C     
-      CALL FNVINITP(MPI_COMM_WORLD, 4, NLOCAL, NEQ, IER)
-C     
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
- 20      FORMAT(///' SUNDIALS_ERROR: FNVINITP returned IER = ', I5)
-         CALL MPI_FINALIZE(IER)
-         STOP
-      ENDIF
-C
-C     initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(4, IPRE, 0, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,25) IER
- 25      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      call FSUNSPGMRSETGSTYPE(4, IGS, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,27) IER
- 27      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C     
-      CALL FARKMALLOC(T, Y, METH, IATOL, RTOL, ATOL,
-     &                IOUT, ROUT, IPAR, RPAR, IER)
-C     
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
- 30      FORMAT(///' SUNDIALS_ERROR: FARKMALLOC returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     attach linear solver module to ARKLs interface
-      CALL FARKLSINIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,32) IER
- 32      FORMAT(///' SUNDIALS_ERROR: FARKLSINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     initialize BBD preconditioner (build diagonal preconditioner)
-      MUDQ = 0
-      MLDQ = 0
-      MU = 0
-      ML = 0
-      CALL FARKBBDINIT(NLOCAL, MUDQ, MLDQ, MU, ML, 0.0D0, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,35) IER
- 35      FORMAT(///' SUNDIALS_ERROR: FARKBBDINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IF (MYPE .EQ. 0) WRITE(6,38)
- 38   FORMAT(/'Preconditioning on left'/)
-C     
-C     Looping point for cases IPRE = 1 and 2.
-C     
- 40   CONTINUE
-C     
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 60 JOUT = 1, NOUT
-C     
-         CALL FARKODE(TOUT, T, Y, ITASK, IER)
-C     
-         IF (MYPE .EQ. 0) WRITE(6,45) T, IOUT(LNST), IOUT(LNST_ATT), 
-     &        IOUT(LNFE), IOUT(LNFI)
- 45      FORMAT(' t = ', E10.2, 5X, 'no. steps = ', I5, 
-     &        '   no. attempts = ', I5,'   no. fe-s = ', I5,
-     &        '   no. fi-s = ', I5)
-C     
-         IF (IER .NE. 0) THEN
-            WRITE(6,50) IER, IOUT(16)
- 50         FORMAT(///' SUNDIALS_ERROR: FARKODE returned IER = ', I5, /,
-     &             '                 Linear Solver returned IER = ', I5)
-            CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-            STOP
-         ENDIF
-C     
-         TOUT = TOUT + DTOUT
- 60   CONTINUE
-C     
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 65 I = 1, NLOCAL
-         ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
-         ERMAX = MAX(ERMAX, ABS(ERRI))
- 65   CONTINUE
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     &                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,70) IER
- 70      FORMAT(///' MPI_ERROR: MPI_REDUCE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,75) GERMAX
- 75   FORMAT(/'Max. absolute error is', E10.2/)
-C     
-C     Print final statistics.
-      IF (MYPE .EQ. 0) THEN
-         NST = IOUT(LNST)
-         NST_ATT = IOUT(LNST_ATT)
-         NFE = IOUT(LNFE)
-         NFI = IOUT(LNFI)
-         NPSET = IOUT(LNSETUP)
-         NPE = IOUT(LNPE)
-         NPS = IOUT(LNPS)
-         NNI = IOUT(LNNI)
-         NLI = IOUT(LNLI)
-         AVDIM = DBLE(NLI) / DBLE(NNI)
-         NCFN = IOUT(LNCF)
-         NCFL = IOUT(LNCFL)
-         NETF = IOUT(LNETF)
-         LENRW = IOUT(LLENRW)
-         LENIW = IOUT(LLENIW)
-         LENRWLS = IOUT(LLENRWLS)
-         LENIWLS = IOUT(LLENIWLS)
-         WRITE(6,80) NST, NST_ATT, NFE, NFI, NPSET, NPE, NPS, NNI, NLI,
-     &        AVDIM, NCFN, NCFL, NETF, LENRW, LENIW, LENRWLS, LENIWLS
- 80      FORMAT(/'Final statistics:'//
-     &          ' number of steps        = ', I5/
-     &          ' number of steps att.   = ', I5/
-     &          ' number of fe evals.    = ', I5/
-     &          ' number of fi evals.    = ', I5/
-     &          ' number of prec. setups = ', I5/
-     &          ' number of prec. evals. = ', I5/
-     &          ' number of prec. solves = ', I5/
-     &          ' number of nonl. iters. = ', I5/
-     &          ' number of lin. iters.  = ', I5/
-     &          ' average Krylov subspace dimension (NLI/NNI) = ',F8.4/
-     &          ' number of conv. failures.. nonlinear = ', I3,
-     &          '  linear = ', I3/
-     &          ' number of error test failures = ', I3/
-     &          ' main solver real/int workspace sizes   = ',2I5/
-     &          ' linear solver real/int workspace sizes = ',2I5)
-         CALL FARKBBDOPT(LENRWBBD, LENIWBBD, NGEBBD)
-         WRITE(6,82) LENRWBBD, LENIWBBD, NGEBBD
- 82      FORMAT('In ARKBBDPRE:'/
-     &          ' real/int local workspace = ', 2I5/
-     &          ' number of g evals. = ', I5)
-      ENDIF
-C     
-C     If IPRE = 1, re-initialize T, Y, and the solver, and loop for
-C     case IPRE = 2.  Otherwise jump to final block.
-      IF (IPRE .EQ. 2) GO TO 99
-C
-      T = 0.0D0
-      DO I = 1, NLOCAL
-         Y(I) = 1.0D0
-      ENDDO         
-C
-      CALL FARKREINIT(T, Y, METH, IATOL, RTOL, ATOL, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,91) IER
- 91      FORMAT(///' SUNDIALS_ERROR: FARKREINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IPRE = 2
-C
-      CALL FARKBBDREINIT(MUDQ, MLDQ, 0.0D0, IER) 
-      IF (IER .NE. 0) THEN
-         WRITE(6,92) IER
- 92      FORMAT(///' SUNDIALS_ERROR: FARKBBDREINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      CALL FSUNSPGMRSETPRECTYPE(4, IPRE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,93) IER
- 93      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETPRECTYPE IER =',I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IF (MYPE .EQ. 0) WRITE(6,95)
- 95   FORMAT(//60('-')///'Preconditioning on right'/)
-      GO TO 40
-C     
-C     Free the memory and finalize MPI.
- 99   CALL FARKFREE
-      CALL MPI_FINALIZE(IER)
-C     
-      STOP
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FARKIFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fi
-      IMPLICIT NONE
-C
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      INTEGER*8 MYPE, I, NLOCAL
-      DOUBLE PRECISION ALPHA
-C     
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = -ALPHA * (MYPE * NLOCAL + I) * Y(I)
-      ENDDO
-C     
-      IER = 0
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FARKEFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fe
-      IMPLICIT NONE
-C
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      INTEGER*8 I, NLOCAL
-C     
-      NLOCAL = IPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = 0.D0
-      ENDDO
-C     
-      IER = 0
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FARKGLOCFN(NLOC, T, YLOC, GLOC, IPAR, RPAR, IER)
-C     Routine to define local approximate function g, here the same as fi. 
-      IMPLICIT NONE
-C
-      INTEGER*8 NLOC, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, YLOC(*), GLOC(*), RPAR(*)
-C     
-      CALL FARKIFUN(T, YLOC, GLOC, IPAR, RPAR, IER)
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C      
-      SUBROUTINE FARKCOMMFN(NLOC, T, YLOC, IPAR, RPAR, IER)
-C     Routine to perform communication required for evaluation of g.
-      INTEGER*8 NLOC, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, YLOC(*), RPAR(*)
-      IER = 0
-      RETURN
-      END
diff --git a/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.out b/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.out
deleted file mode 100644
index 88991b3bf9..0000000000
--- a/examples/arkode/F77_parallel/fark_diag_kry_bbd_p.out
+++ /dev/null
@@ -1,87 +0,0 @@
-Diagonal test problem:
-
- NEQ =  40
- NLOCAL =  10
- parameter alpha =   10.000
- ydot_i = -alpha*i * y_i (i = 1,...,NEQ)
- RTOL, ATOL =    0.1E-04   0.1E-09
- Method is DIRK/NEWTON/SPGMR
- Precond is band-block-diagonal, using ARKBBDPRE
- Number of processors =   4
-
-
-Preconditioning on left
-
- t =   0.10E+00     no. steps =   173   no. attempts =   173   no. fe-s =     0   no. fi-s =  1846
- t =   0.20E+00     no. steps =   221   no. attempts =   221   no. fe-s =     0   no. fi-s =  2362
- t =   0.30E+00     no. steps =   248   no. attempts =   248   no. fe-s =     0   no. fi-s =  2650
- t =   0.40E+00     no. steps =   266   no. attempts =   266   no. fe-s =     0   no. fi-s =  2848
- t =   0.50E+00     no. steps =   281   no. attempts =   281   no. fe-s =     0   no. fi-s =  3007
- t =   0.60E+00     no. steps =   291   no. attempts =   291   no. fe-s =     0   no. fi-s =  3116
- t =   0.70E+00     no. steps =   300   no. attempts =   300   no. fe-s =     0   no. fi-s =  3215
- t =   0.80E+00     no. steps =   306   no. attempts =   306   no. fe-s =     0   no. fi-s =  3275
- t =   0.90E+00     no. steps =   312   no. attempts =   312   no. fe-s =     0   no. fi-s =  3335
- t =   0.10E+01     no. steps =   319   no. attempts =   319   no. fe-s =     0   no. fi-s =  3410
-
-Max. absolute error is  0.76E-10
-
-
-Final statistics:
-
- number of steps        =   319
- number of steps att.   =   319
- number of fe evals.    =     0
- number of fi evals.    =  3410
- number of prec. setups =    25
- number of prec. evals. =     6
- number of prec. solves =  3380
- number of nonl. iters. =  1812
- number of lin. iters.  =  1785
- average Krylov subspace dimension (NLI/NNI) =   0.9851
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   0
- main solver real/int workspace sizes   =   861  265
- linear solver real/int workspace sizes =   535  126
-In ARKBBDPRE:
- real/int local workspace =   160   72
- number of g evals. =    12
-
-
-------------------------------------------------------------
-
-
-Preconditioning on right
-
- t =   0.10E+00     no. steps =   173   no. attempts =   173   no. fe-s =     0   no. fi-s =  1846
- t =   0.20E+00     no. steps =   221   no. attempts =   221   no. fe-s =     0   no. fi-s =  2362
- t =   0.30E+00     no. steps =   248   no. attempts =   248   no. fe-s =     0   no. fi-s =  2650
- t =   0.40E+00     no. steps =   266   no. attempts =   266   no. fe-s =     0   no. fi-s =  2848
- t =   0.50E+00     no. steps =   281   no. attempts =   281   no. fe-s =     0   no. fi-s =  3007
- t =   0.60E+00     no. steps =   291   no. attempts =   291   no. fe-s =     0   no. fi-s =  3116
- t =   0.70E+00     no. steps =   300   no. attempts =   300   no. fe-s =     0   no. fi-s =  3215
- t =   0.80E+00     no. steps =   306   no. attempts =   306   no. fe-s =     0   no. fi-s =  3275
- t =   0.90E+00     no. steps =   312   no. attempts =   312   no. fe-s =     0   no. fi-s =  3335
- t =   0.10E+01     no. steps =   319   no. attempts =   319   no. fe-s =     0   no. fi-s =  3410
-
-Max. absolute error is  0.76E-10
-
-
-Final statistics:
-
- number of steps        =   319
- number of steps att.   =   319
- number of fe evals.    =     0
- number of fi evals.    =  3410
- number of prec. setups =    25
- number of prec. evals. =     6
- number of prec. solves =  3380
- number of nonl. iters. =  1812
- number of lin. iters.  =  1785
- average Krylov subspace dimension (NLI/NNI) =   0.9851
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   0
- main solver real/int workspace sizes   =   861  270
- linear solver real/int workspace sizes =   535  126
-In ARKBBDPRE:
- real/int local workspace =   160   72
- number of g evals. =    12
diff --git a/examples/arkode/F77_parallel/fark_diag_non_p.f b/examples/arkode/F77_parallel/fark_diag_non_p.f
deleted file mode 100644
index 22f5fbfada..0000000000
--- a/examples/arkode/F77_parallel/fark_diag_non_p.f
+++ /dev/null
@@ -1,231 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     Diagonal ODE example. Nonstiff case: alpha = 10/NEQ.
-C     ----------------------------------------------------------------
-C
-C     Include MPI-Fortran header file for MPI_COMM_WORLD, MPI types.
-C
-      IMPLICIT NONE
-C
-      INCLUDE "mpif.h"
-      INTEGER*8 NLOCAL
-      PARAMETER (NLOCAL=2)
-C
-      INTEGER*4 IER, MYPE, NPES, NOUT, LNST, LNST_ATT, LNFE, LNFI, LNNI
-      INTEGER*4 LNCF, LNETF, METH, IATOL, ITASK, JOUT
-      INTEGER*8 NEQ, I, NST, NST_ATT, NFE, NFI, NNI, NCFN, NETF
-      INTEGER*8 IOUT(35), IPAR(2)
-      DOUBLE PRECISION Y(128), ROUT(6), RPAR(1)
-      DOUBLE PRECISION ATOL, RTOL, DTOUT, T, ALPHA, TOUT
-      DOUBLE PRECISION ERMAX, ERRI, GERMAX
-C
-      DATA ATOL/1.0D-10/, RTOL/1.0D-5/, DTOUT/0.1D0/, NOUT/10/
-      DATA LNST/3/, LNST_ATT/6/, LNFE/7/, LNFI/8/, LNNI/11/, LNCF/12/, 
-     1     LNETF/10/
-C
-C     Get NPES and MYPE.  Requires initialization of MPI.
-      CALL MPI_INIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,5) IER
- 5       FORMAT(///' MPI_ERROR: MPI_INIT returned IER = ', I5)
-         STOP
-      ENDIF
-      CALL MPI_COMM_SIZE(MPI_COMM_WORLD, NPES, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,6) IER
- 6       FORMAT(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      CALL MPI_COMM_RANK(MPI_COMM_WORLD, MYPE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,7) IER
- 7       FORMAT(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Set input arguments.
-      NEQ = NPES * NLOCAL
-      T = 0.0D0
-      METH = 1
-      IATOL = 1
-      ITASK = 1
-c     Set parameter ALPHA
-      ALPHA  = 10.0D0 / NEQ
-C
-C     Load IPAR and RPAR
-      IPAR(1) = NLOCAL
-      IPAR(2) = MYPE
-      RPAR(1) = ALPHA
-C
-      DO 10 I = 1, NLOCAL
-  10    Y(I) = 1.0D0
-C
-      IF (MYPE .EQ. 0) THEN
-         WRITE(6,11) NEQ, NLOCAL, ALPHA
-  11     FORMAT('Diagonal test problem:'//' NEQ = ', I3, /
-     1        ' NLOCAL = ', I3, /
-     2        ' parameter alpha = ', F8.3)
-         WRITE(6,12)
-  12     FORMAT(' ydot_i = -alpha*i * y_i (i = 1,...,NEQ)')
-         WRITE(6,13) RTOL, ATOL
-  13     FORMAT(' RTOL, ATOL = ', 2E10.1)
-         WRITE(6,14)
-  14     FORMAT(' Method is ERK')
-         WRITE(6,15) NPES
-  15     FORMAT(' Number of processors = ', I3//)
-      ENDIF
-C
-      CALL FNVINITP(MPI_COMM_WORLD, 4, NLOCAL, NEQ, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
-  20     FORMAT(///' SUNDIALS_ERROR: FNVINITP returned IER = ', I5)
-         CALL MPI_FINALIZE(IER)
-         STOP
-      ENDIF
-C
-      CALL FARKMALLOC(T, Y, METH, IATOL, RTOL, ATOL,
-     1                IOUT, ROUT, IPAR, RPAR, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
-  30     FORMAT(///' SUNDIALS_ERROR: FARKMALLOC returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 70 JOUT = 1, NOUT
-C
-        CALL FARKODE(TOUT, T, Y, ITASK, IER)
-C
-        IF (MYPE .EQ. 0) WRITE(6,40) T, IOUT(LNST), IOUT(LNST_ATT), 
-     &       IOUT(LNFE), IOUT(LNFI)
-  40    FORMAT(' t = ', D10.2, 5X, 'steps = ', I5,
-     &         '  (attempted = ', I5, '),  fe = ', I5, 
-     &         '  fi = ', I5)
-C
-        IF (IER .NE. 0) THEN
-           WRITE(6,60) IER, IOUT(16)
-  60       FORMAT(///' SUNDIALS_ERROR: FARKODE returned IER = ', I5, /,
-     &            '                 Linear Solver returned IER = ', I5)
-           CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-           STOP
-        ENDIF
-C
-        TOUT = TOUT + DTOUT
-  70    CONTINUE
-C
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 75 I = 1, NLOCAL
-        ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
-        ERMAX = MAX(ERMAX, ABS(ERRI))
-  75    CONTINUE
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     1                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,80) IER
-  80     FORMAT(///' MPI_ERROR: MPI_REDUCE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,85) GERMAX
-  85  FORMAT(/'Max. absolute error is ', E10.2/)
-C
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NST_ATT = IOUT(LNST_ATT)
-      NFE = IOUT(LNFE)
-      NFI = IOUT(LNFI)
-      NNI = IOUT(LNNI)
-      NCFN = IOUT(LNCF)
-      NETF = IOUT(LNETF)
-      IF (MYPE .EQ. 0) WRITE (6,90) NST, NST_ATT, NFE, NFI, NNI, NCFN, 
-     &     NETF
-  90  FORMAT(/'Final statistics:'//
-     &       ' number of steps = ', I5/
-     &       ' number of step attempts = ', I5/
-     &       ' number of fe evals. = ', I5/
-     &       ' number of fi evals. = ', I5/
-     &       ' number of nonlinear iters. = ', I5/
-     &       ' number of nonlinear conv. failures = ', I3/
-     &       ' number of error test failures = ', I3)
-C
-C     Free the memory and finalize MPI.
-      CALL FARKFREE
-      CALL MPI_FINALIZE(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,95) IER
- 95      FORMAT(///' MPI_ERROR: MPI_FINALIZE returned IER = ', I5)
-         STOP
-      ENDIF
-C
-      STOP
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FARKIFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fi
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      INTEGER*8 NLOCAL, I
-C
-      NLOCAL = IPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = 0.D0
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FARKEFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fe
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      INTEGER*8 MYPE
-      INTEGER*8 NLOCAL, I
-      DOUBLE PRECISION ALPHA
-C
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = -ALPHA * (MYPE * NLOCAL + I) * Y(I)
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/arkode/F77_parallel/fark_diag_non_p.out b/examples/arkode/F77_parallel/fark_diag_non_p.out
deleted file mode 100644
index ea79d61fe3..0000000000
--- a/examples/arkode/F77_parallel/fark_diag_non_p.out
+++ /dev/null
@@ -1,34 +0,0 @@
-Diagonal test problem:
-
- NEQ =   8
- NLOCAL =   2
- parameter alpha =    1.250
- ydot_i = -alpha*i * y_i (i = 1,...,NEQ)
- RTOL, ATOL =    0.1E-04   0.1E-09
- Method is ERK
- Number of processors =   4
-
-
- t =   0.10D+00     steps =    12  (attempted =    12),  fe =    75  fi =     0
- t =   0.20D+00     steps =    21  (attempted =    21),  fe =   129  fi =     0
- t =   0.30D+00     steps =    31  (attempted =    31),  fe =   189  fi =     0
- t =   0.40D+00     steps =    40  (attempted =    40),  fe =   243  fi =     0
- t =   0.50D+00     steps =    50  (attempted =    50),  fe =   303  fi =     0
- t =   0.60D+00     steps =    59  (attempted =    59),  fe =   357  fi =     0
- t =   0.70D+00     steps =    69  (attempted =    69),  fe =   417  fi =     0
- t =   0.80D+00     steps =    78  (attempted =    78),  fe =   471  fi =     0
- t =   0.90D+00     steps =    88  (attempted =    88),  fe =   531  fi =     0
- t =   0.10D+01     steps =    97  (attempted =    97),  fe =   585  fi =     0
-
-Max. absolute error is   0.22E-08
-
-
-Final statistics:
-
- number of steps =    97
- number of step attempts =    97
- number of fe evals. =   585
- number of fi evals. =     0
- number of nonlinear iters. =     0
- number of nonlinear conv. failures =   0
- number of error test failures =   0
diff --git a/examples/arkode/F77_serial/CMakeLists.txt b/examples/arkode/F77_serial/CMakeLists.txt
deleted file mode 100644
index 674e4e85ae..0000000000
--- a/examples/arkode/F77_serial/CMakeLists.txt
+++ /dev/null
@@ -1,294 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-#                David J. Gardner @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FARKODE F77 serial examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FARKODE_examples
-  "fark_diurnal_kry_bp\;develop"
-  )
-
-# Examples using LAPACK linear solvers
-set(FARKODE_examples_BL
-  "fark_roberts_dnsL\;develop"
-  )
-
-# Add sparse solvers examples for 64-bit indextype configurations only,
-# not compatible with 32-bit indextype
-if(SUNDIALS_INDEX_SIZE MATCHES "64")
-
-  # Examples using KLU linear solver
-  set(FARKODE_examples_KLU
-    )
-
-  # Examples using SuperLU_MT linear solver
-  set(FARKODE_examples_SUPERLUMT
-    )
-
-endif()
-
-# Auxiliary files to install
-set(ARKODE_extras
-  )
-
-# Specify libraries to link against
-set(ARKODE_LIB sundials_arkode)
-set(NVECS_LIB sundials_nvecserial)
-set(FNVECS_LIB sundials_fnvecserial)
-
-# Only static FCMIX libraries are available
-set(FARKODE_LIB sundials_farkode${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FARKODE_LIB} ${ARKODE_LIB} ${FNVECS_LIB} ${NVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each FARKODE example
-foreach(example_tuple ${FARKODE_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-  endif()
-
-endforeach(example_tuple ${FARKODE_examples})
-
-
-# Add the build and install targets for each LAPACK example (if needed)
-if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-
-  # Sundials LAPACK linear solver modules
-  set(SUNLINSOLLAPACK_LIBS
-    sundials_sunlinsollapackband
-    sundials_sunlinsollapackdense
-    sundials_fsunlinsollapackband
-    sundials_fsunlinsollapackdense)
-
-  # LAPACK libraries
-  list(APPEND SUNLINSOLLAPACK_LIBS ${LAPACK_LIBRARIES})
-
-  foreach(example_tuple ${FARKODE_examples_BL})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_BL})
-
-endif()
-
-
-# Add the build and install targets for each KLU example (if needed)
-if(BUILD_SUNLINSOL_KLU)
-
-  # Sundials KLU linear solver module
-  set(SUNLINSOLKLU_LIBS
-    sundials_sunlinsolklu
-    sundials_fsunlinsolklu)
-
-  # KLU libraries
-  list(APPEND SUNLINSOLKLU_LIBS)
-
-  foreach(example_tuple ${FARKODE_examples_KLU})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_KLU})
-
-endif()
-
-
-# Add the build and install targets for each SuperLU_MT example (if needed)
-if(BUILD_SUNLINSOL_SUPERLUMT)
-
-  # Sundials SuperLU_MT linear solver module
-  set(SUNLINSOLSLUMT_LIBS
-    sundials_sunlinsolsuperlumt
-    sundials_fsunlinsolsuperlumt)
-
-  # SuperLU_MT libraries
-  list(APPEND SUNLINSOLSLUMT_LIBS ${SUPERLUMT_LIBRARIES})
-
-  foreach(example_tuple ${FARKODE_examples_SUPERLUMT})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_SUPERLUMT})
-
-endif()
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-
-  # Install the extra files
-  foreach(extrafile ${ARKODE_extras})
-    install(FILES ${extrafile} DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial)
-  endforeach()
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "ARKODE")
-  set(SOLVER_LIB "sundials_arkode")
-  set(SOLVER_FLIB "sundials_farkode")
-
-  examples2string(FARKODE_examples EXAMPLES)
-
-  if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-    examples2string(FARKODE_examples_BL EXAMPLES_BL)
-  else()
-    set(EXAMPLES_BL "")
-  endif()
-
-  if(BUILD_SUNLINSOL_KLU)
-    examples2string(FARKODE_examples_KLU EXAMPLES_KLU)
-  else()
-    set(EXAMPLES_KLU "")
-  endif()
-
-  if(BUILD_SUNLINSOL_SUPERLUMT)
-    examples2string(FARKODE_examples_SUPERLUMT EXAMPLES_SLUMT)
-  else()
-    set(EXAMPLES_SLUMT "")
-  endif()
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_serial_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/arkode/F77_serial/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/arkode/F77_serial/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_serial_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/arkode/F77_serial/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/arkode/F77_serial/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F77_serial
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(arkode F77_serial)
-
-endif()
diff --git a/examples/arkode/F77_serial/README b/examples/arkode/F77_serial/README
deleted file mode 100644
index 37cc60c260..0000000000
--- a/examples/arkode/F77_serial/README
+++ /dev/null
@@ -1,47 +0,0 @@
-List of serial ARKODE F77 examples
-
-  fark_diurnal_kry_bp : kinetics-transport example (DIRK/SPGMR/FARKBP)
-  fark_roberts_dnsL   : chemical kinetics example (DIRK/DENSE lapack)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/arkode/F77_serial/fark_diurnal_kry_bp.f b/examples/arkode/F77_serial/fark_diurnal_kry_bp.f
deleted file mode 100644
index 11725b79e6..0000000000
--- a/examples/arkode/F77_serial/fark_diurnal_kry_bp.f
+++ /dev/null
@@ -1,413 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     FARKODE Example Problem: 2D kinetics-transport, 
-C     precond. Krylov solver. 
-C     
-C     An ODE system is generated from the following 2-species diurnal
-C     kinetics advection-diffusion PDE system in 2 space dimensions:
-C     
-C     dc(i)/dt = Kh*(d/dx)**2 c(i) + V*dc(i)/dx + (d/dy)(Kv(y)*dc(i)/dy)
-C                           + Ri(c1,c2,t)      for i = 1,2,   where
-C     R1(c1,c2,t) = -q1*c1*c3 - q2*c1*c2 + 2*q3(t)*c3 + q4(t)*c2 ,
-C     R2(c1,c2,t) =  q1*c1*c3 - q2*c1*c2 - q4(t)*c2 ,
-C     Kv(y) = Kv0*exp(y/5) ,
-C     Kh, V, Kv0, q1, q2, and c3 are constants, and q3(t) and q4(t)
-C     vary diurnally.
-C
-C     The problem is posed on the square
-C     0 .le. x .le. 20,    30 .le. y .le. 50   (all in km),
-C     with homogeneous Neumann boundary conditions, and for time t in
-C     0 .le. t .le. 86400 sec (1 day).
-C
-C     The PDE system is treated by central differences on a uniform
-C     10 x 10 mesh, with simple polynomial initial profiles.
-C     The problem is solved with ARKODE, with the DIRK/GMRES method and
-C     using the FARKBP banded preconditioner.
-C
-C     Note that this problem should only work with SUNDIALS configured
-C     to use 'realtype' as 'double' and 'sunindextype' as '64bit'
-C     
-C     The second and third dimensions of U here must match the values of
-C     MX and MY, for consistency with the output statements below.
-C     ----------------------------------------------------------------
-C
-      IMPLICIT NONE
-      INTEGER*4 MX, MY
-      PARAMETER (MX=10, MY=10)
-      INTEGER*8 NEQ
-      PARAMETER (NEQ=2*MX*MY)
-C
-      INTEGER*4 LNST, LNST_ATT, LNFE, LNFI, LNSETUP, LNNI, LNCF, LNPE
-      INTEGER*4 LNLI, LNPS, LNCFL, LH, LNETF, LLENRW, LLENIW, LLENRWLS
-      INTEGER*4 LLENIWLS, METH, IATOL, ITASK, IER, MAXL, JPRETYPE
-      INTEGER*4 IGSTYPE, JOUT
-      INTEGER*8 IOUT(35), IPAR(4), NST, NST_ATT, NFE, NFI, NPSET, NPE
-      INTEGER*8 NPS, NNI, NLI, NCFN, NCFL, NETF, MU, ML, LENRW, LENIW
-      INTEGER*8 LENRWLS, LENIWLS, LENRWBP, LENIWBP, NFEBP, MXSTEPS
-      DOUBLE PRECISION ATOL, AVDIM, DELT, FLOOR, RTOL, T, TOUT, TWOHR
-      DOUBLE PRECISION ROUT(6), U(2,MX,MY), RPAR(12)
-C
-      DATA TWOHR/7200.0D0/, RTOL/1.0D-5/, FLOOR/100.0D0/,
-     1     JPRETYPE/1/, IGSTYPE/1/, MAXL/0/, DELT/0.0D0/, MXSTEPS/10000/
-      DATA LLENRW/1/, LLENIW/2/, LNST/3/, LNST_ATT/6/, LNFE/7/, LNFI/8/, 
-     1     LNETF/10/, LNCF/12/, LNNI/11/, LNSETUP/9/, LLENRWLS/14/, 
-     1     LLENIWLS/15/, LNPE/21/, LNLI/23/, LNPS/22/, LNCFL/24/
-      DATA LH/2/
-C
-C Load IPAR, RPAR, and initial values
-      CALL INITKX(MX, MY, U, IPAR, RPAR)
-C
-C     Set other input arguments.
-      T = 0.0D0
-      METH = 0
-      IATOL = 1
-      ATOL = RTOL * FLOOR
-      ITASK = 1
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Krylov example problem:'//
-     1       ' Kinetics-transport, NEQ = ', I4/)
-C     
-C     Initialize vector specification
-      CALL FNVINITS(4, NEQ, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
- 20      FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-         STOP
-      ENDIF
-C
-C     initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(4, JPRETYPE, MAXL, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-        STOP
-      ENDIF
-      call FSUNSPGMRSETGSTYPE(4, IGSTYPE, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,27) IER
- 27     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-        STOP
-      ENDIF
-C     
-C     Initialize ARKODE
-      CALL FARKMALLOC(T, U, METH, IATOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
- 30      FORMAT(///' SUNDIALS_ERROR: FARKMALLOC returned IER = ', I5)
-         STOP
-      ENDIF
-C
-      CALL FARKSETIIN('MAX_NSTEPS', MXSTEPS, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FARKSETIIN returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     attach matrix and linear solver modules to ARKLs interface
-      CALL FARKLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FARKLSINIT returned IER = ',I5)
-        CALL FARKFREE
-        STOP
-      ENDIF
-C     
-C     Initialize band preconditioner
-      MU = 2
-      ML = 2
-      CALL FARKBPINIT(NEQ, MU, ML, IER) 
-      IF (IER .NE. 0) THEN
-         WRITE(6,45) IER
- 45      FORMAT(///' SUNDIALS_ERROR: FARKBPINIT returned IER = ', I5)
-         CALL FARKFREE
-         STOP
-      ENDIF
-C     
-C     Loop over output points, call FARKODE, print sample solution values.
-      TOUT = TWOHR
-      DO 70 JOUT = 1, 12
-C
-         CALL FARKODE(TOUT, T, U, ITASK, IER)
-C     
-         WRITE(6,50) T, IOUT(LNST), IOUT(LNST_ATT), ROUT(LH)
- 50      FORMAT(/' t = ', E14.6, 5X, 'no. steps = ', I5, 
-     1        '  no. att. steps = ', I5, '   stepsize = ', E14.6)
-         WRITE(6,55) U(1,1,1), U(1,5,5), U(1,10,10),
-     1               U(2,1,1), U(2,5,5), U(2,10,10)
- 55      FORMAT('  c1 (bot.left/middle/top rt.) = ', 3E14.6/
-     1        '  c2 (bot.left/middle/top rt.) = ', 3E14.6)
-C     
-         IF (IER .NE. 0) THEN
-            WRITE(6,60) IER, IOUT(16)
- 60         FORMAT(///' SUNDIALS_ERROR: FARKODE returned IER = ', I5, /,
-     1             '                 Linear Solver returned IER = ', I5)
-            CALL FARKFREE
-            STOP
-         ENDIF
-C     
-         TOUT = TOUT + TWOHR
- 70   CONTINUE
-      
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NST_ATT = IOUT(LNST_ATT)
-      NFE = IOUT(LNFE)
-      NFI = IOUT(LNFI)
-      NPSET = IOUT(LNSETUP)
-      NPE = IOUT(LNPE)
-      NPS = IOUT(LNPS)
-      NNI = IOUT(LNNI)
-      NLI = IOUT(LNLI)
-      AVDIM = DBLE(NLI) / DBLE(NNI)
-      NCFN = IOUT(LNCF)
-      NCFL = IOUT(LNCFL)
-      NETF = IOUT(LNETF)
-      LENRW = IOUT(LLENRW)
-      LENIW = IOUT(LLENIW)
-      LENRWLS = IOUT(LLENRWLS)
-      LENIWLS = IOUT(LLENIWLS)
-      WRITE(6,80) NST, NST_ATT, NFE, NFI, NPSET, NPE, NPS, NNI, NLI, 
-     1     AVDIM, NCFN, NCFL, NETF, LENRW, LENIW, LENRWLS, LENIWLS
- 80   FORMAT(//'Final statistics:'//
-     &   ' number of steps        = ', I6/
-     &   ' number of step att.    = ', I6/
-     &   ' number of fe evals.    = ', I6/
-     &   ' number of fi evals.    = ', I6/
-     &   ' number of prec. setups = ', I6/
-     &   ' number of prec. evals. = ', I6/
-     &   ' number of prec. solves = ', I6/
-     &   ' number of nonl. iters. = ', I6/
-     &   ' number of lin. iters.  = ', I6/
-     &   ' average Krylov subspace dimension (NLI/NNI) = ', E14.6/
-     &   ' number of conv. failures.. nonlinear =', I3,
-     &   ' linear = ', I3/
-     &   ' number of error test failures = ', I3/
-     &   ' main solver real/int workspace sizes   = ',2I5/
-     &   ' linear solver real/int workspace sizes = ',2I5)
-      CALL FARKBPOPT(LENRWBP, LENIWBP, NFEBP)
-      WRITE(6,82) LENRWBP, LENIWBP, NFEBP
- 82   FORMAT('In ARKBANDPRE:'/
-     &        ' real/int workspace sizes = ', 2I5/
-     &        ' number of f evaluations  = ', I5)
-C     
-      CALL FARKFREE
-C     
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE INITKX(MX, MY, U0, IPAR, RPAR)
-C Routine to set problem constants and initial values
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY
-      INTEGER*8 IPAR(*), NEQ
-      DOUBLE PRECISION RPAR(*)
-C
-      INTEGER*8 MM, JY, JX
-      DOUBLE PRECISION U0
-      DIMENSION U0(2,MX,MY)
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, A3, A4, OM, C3, DY, HDCO
-      DOUBLE PRECISION VDCO, HACO, X, Y
-      DOUBLE PRECISION CX, CY, DKH, DKV0, DX, HALFDA, PI, VEL
-C
-      DATA DKH/4.0D-6/, VEL/0.001D0/, DKV0/1.0D-8/, HALFDA/4.32D4/,
-     1     PI/3.1415926535898D0/
-C
-C Problem constants
-      MM = MX * MY
-      NEQ = 2 * MM
-      Q1 = 1.63D-16
-      Q2 = 4.66D-16
-      Q3 = 0.D0
-      Q4 = 0.D0
-      A3 = 22.62D0
-      A4 = 7.601D0
-      OM = PI / HALFDA
-      C3 = 3.7D16
-      DX = 20.0D0 / (MX - 1.0D0)
-      DY = 20.0D0 / (MY - 1.0D0)
-      HDCO = DKH / DX**2
-      HACO = VEL / (2.0D0 * DX)
-      VDCO = (1.0D0 / DY**2) * DKV0
-C Load constants in IPAR and RPAR
-      IPAR(1) = MX
-      IPAR(2) = MY
-      IPAR(3) = MM
-      IPAR(4) = NEQ
-C
-      RPAR(1)  = Q1
-      RPAR(2)  = Q2
-      RPAR(3)  = Q3
-      RPAR(4)  = Q4
-      RPAR(5)  = A3
-      RPAR(6)  = A4
-      RPAR(7)  = OM
-      RPAR(8)  = C3
-      RPAR(9)  = DY
-      RPAR(10) = HDCO
-      RPAR(11) = VDCO
-      RPAR(12) = HACO
-C
-C Set initial profiles.
-      DO 20 JY = 1, MY
-        Y = 30.0D0 + (JY - 1.0D0) * DY
-        CY = (0.1D0 * (Y - 40.0D0))**2
-        CY = 1.0D0 - CY + 0.5D0 * CY**2
-        DO 10 JX = 1, MX
-          X = (JX - 1.0D0) * DX
-          CX = (0.1D0 * (X - 10.0D0))**2
-          CX = 1.0D0 - CX + 0.5D0 * CX**2
-          U0(1,JX,JY) = 1.0D6 * CX * CY
-          U0(2,JX,JY) = 1.0D12 * CX * CY
- 10       CONTINUE
- 20     CONTINUE
-C
-      RETURN
-      END
-      
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKIFUN(T, U, UDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fi
-      IMPLICIT NONE
-C
-      INTEGER*4 IER
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, U(2,*), UDOT(2,*), RPAR(*)
-C
-      INTEGER*4 ILEFT, IRIGHT
-      INTEGER*8 MX, MY, MM, JY, JX, IBLOK0, IDN, IUP, IBLOK
-      DOUBLE PRECISION Q1,Q2,Q3,Q4, A3, A4, OM, C3, DY, HDCO, VDCO, HACO
-      DOUBLE PRECISION C1, C2, C1DN, C2DN, C1UP, C2UP, C1LT, C2LT
-      DOUBLE PRECISION C1RT, C2RT, CYDN, CYUP, HORD1, HORD2, HORAD1
-      DOUBLE PRECISION HORAD2, QQ1, QQ2, QQ3, QQ4, RKIN1, RKIN2, S
-      DOUBLE PRECISION VERTD1, VERTD2, YDN, YUP
-C
-C     Extract constants from IPAR and RPAR
-      MX = IPAR(1)
-      MY = IPAR(2)
-      MM = IPAR(3)
-C
-      Q1 = RPAR(1)
-      Q2 = RPAR(2)
-      Q3 = RPAR(3)
-      Q4 = RPAR(4)
-      A3 = RPAR(5)
-      A4 = RPAR(6)
-      OM = RPAR(7)
-      C3 = RPAR(8)
-      DY = RPAR(9)
-      HDCO = RPAR(10)
-      VDCO = RPAR(11)
-      HACO = RPAR(12)
-C     
-C     Set diurnal rate coefficients.
-      S = SIN(OM * T)
-      IF (S .GT. 0.0D0) THEN
-         Q3 = EXP(-A3 / S)
-         Q4 = EXP(-A4 / S)
-      ELSE
-         Q3 = 0.0D0
-         Q4 = 0.0D0
-      ENDIF
-C     
-C     Loop over all grid points.
-      DO 20 JY = 1, MY
-         YDN = 30.0D0 + (JY - 1.5D0) * DY
-         YUP = YDN + DY
-         CYDN = VDCO * EXP(0.2D0 * YDN)
-         CYUP = VDCO * EXP(0.2D0 * YUP)
-         IBLOK0 = (JY - 1) * MX
-         IDN = -MX
-         IF (JY .EQ. 1) IDN = MX
-         IUP = MX
-         IF (JY .EQ. MY) IUP = -MX
-         DO 10 JX = 1, MX
-            IBLOK = IBLOK0 + JX
-            C1 = U(1,IBLOK)
-            C2 = U(2,IBLOK)
-C     Set kinetic rate terms.
-            QQ1 = Q1 * C1 * C3
-            QQ2 = Q2 * C1 * C2
-            QQ3 = Q3 * C3
-            QQ4 = Q4 * C2
-            RKIN1 = -QQ1 - QQ2 + 2.0D0 * QQ3 + QQ4
-            RKIN2 = QQ1 - QQ2 - QQ4
-C     Set vertical diffusion terms.
-            C1DN = U(1,IBLOK + IDN)
-            C2DN = U(2,IBLOK + IDN)
-            C1UP = U(1,IBLOK + IUP)
-            C2UP = U(2,IBLOK + IUP)
-            VERTD1 = CYUP * (C1UP - C1) - CYDN * (C1 - C1DN)
-            VERTD2 = CYUP * (C2UP - C2) - CYDN * (C2 - C2DN)
-C     Set horizontal diffusion and advection terms.
-            ILEFT = -1
-            IF (JX .EQ. 1) ILEFT = 1
-            IRIGHT = 1
-            IF (JX .EQ. MX) IRIGHT = -1
-            C1LT = U(1,IBLOK + ILEFT)
-            C2LT = U(2,IBLOK + ILEFT)
-            C1RT = U(1,IBLOK + IRIGHT)
-            C2RT = U(2,IBLOK + IRIGHT)
-            HORD1 = HDCO * (C1RT - 2.0D0 * C1 + C1LT)
-            HORD2 = HDCO * (C2RT - 2.0D0 * C2 + C2LT)
-            HORAD1 = HACO * (C1RT - C1LT)
-            HORAD2 = HACO * (C2RT - C2LT)
-C     Load all terms into UDOT.
-            UDOT(1,IBLOK) = VERTD1 + HORD1 + HORAD1 + RKIN1
-            UDOT(2,IBLOK) = VERTD2 + HORD2 + HORAD2 + RKIN2
- 10      CONTINUE
- 20   CONTINUE
-C
-      IER = 0
-C
-      RETURN
-      END
-      
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKEFUN(T, U, UDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function fe
-      IMPLICIT NONE
-C
-      INTEGER*4 IER
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, U(2,*), UDOT(2,*), RPAR(*)
-C
-      INTEGER*8 MX, MY, JY, JX, IBLOK0, IBLOK
-C
-C     Extract constants from IPAR
-      MX = IPAR(1)
-      MY = IPAR(2)
-C     
-C     Loop over all grid points, setting UDOT to zero
-      DO 20 JY = 1, MY
-         IBLOK0 = (JY - 1) * MX
-         DO 10 JX = 1, MX
-            IBLOK = IBLOK0 + JX
-            UDOT(1,IBLOK) = 0.D0
-            UDOT(2,IBLOK) = 0.D0
- 10      CONTINUE
- 20   CONTINUE
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/arkode/F77_serial/fark_diurnal_kry_bp.out b/examples/arkode/F77_serial/fark_diurnal_kry_bp.out
deleted file mode 100644
index dd807ac51b..0000000000
--- a/examples/arkode/F77_serial/fark_diurnal_kry_bp.out
+++ /dev/null
@@ -1,73 +0,0 @@
-Krylov example problem:
-
- Kinetics-transport, NEQ =  200
-
-
- t =   0.720000E+04     no. steps =   987  no. att. steps =   989   stepsize =   0.306506E+01
-  c1 (bot.left/middle/top rt.) =   0.104683E+05  0.296369E+05  0.111853E+05
-  c2 (bot.left/middle/top rt.) =   0.252673E+12  0.715366E+12  0.269977E+12
-
- t =   0.144000E+05     no. steps =  2737  no. att. steps =  2739   stepsize =   0.689853E+01
-  c1 (bot.left/middle/top rt.) =   0.665902E+07  0.531590E+07  0.730081E+07
-  c2 (bot.left/middle/top rt.) =   0.258191E+12  0.205675E+12  0.283286E+12
-
- t =   0.216000E+05     no. steps =  3539  no. att. steps =  3541   stepsize =   0.104022E+02
-  c1 (bot.left/middle/top rt.) =   0.266497E+08  0.103652E+08  0.293077E+08
-  c2 (bot.left/middle/top rt.) =   0.299279E+12  0.102829E+12  0.331344E+12
-
- t =   0.288000E+05     no. steps =  4697  no. att. steps =  4722   stepsize =   0.477171E+01
-  c1 (bot.left/middle/top rt.) =   0.870214E+07  0.129200E+08  0.965006E+07
-  c2 (bot.left/middle/top rt.) =   0.338037E+12  0.502942E+12  0.375097E+12
-
- t =   0.360000E+05     no. steps =  5937  no. att. steps =  5962   stepsize =   0.255709E+01
-  c1 (bot.left/middle/top rt.) =   0.140404E+05  0.202886E+05  0.156091E+05
-  c2 (bot.left/middle/top rt.) =   0.338679E+12  0.489399E+12  0.376518E+12
-
- t =   0.432000E+05     no. steps =  7127  no. att. steps =  7152   stepsize =   0.283066E+03
-  c1 (bot.left/middle/top rt.) =   0.537446E-07 -0.895486E-05  0.770364E-06
-  c2 (bot.left/middle/top rt.) =   0.338234E+12  0.135516E+12  0.380354E+12
-
- t =   0.504000E+05     no. steps =  7153  no. att. steps =  7179   stepsize =   0.409586E+03
-  c1 (bot.left/middle/top rt.) =   0.943663E-06 -0.118550E-03  0.177095E-04
-  c2 (bot.left/middle/top rt.) =   0.335818E+12  0.493035E+12  0.386446E+12
-
- t =   0.576000E+05     no. steps =  7171  no. att. steps =  7198   stepsize =   0.290889E+03
-  c1 (bot.left/middle/top rt.) =  -0.560472E-07  0.428395E-05  0.972997E-07
-  c2 (bot.left/middle/top rt.) =   0.332033E+12  0.964976E+12  0.390901E+12
-
- t =   0.648000E+05     no. steps =  7185  no. att. steps =  7212   stepsize =   0.645241E+03
-  c1 (bot.left/middle/top rt.) =   0.188431E-15 -0.337015E-12  0.808647E-11
-  c2 (bot.left/middle/top rt.) =   0.331304E+12  0.892178E+12  0.396344E+12
-
- t =   0.720000E+05     no. steps =  7196  no. att. steps =  7223   stepsize =   0.645241E+03
-  c1 (bot.left/middle/top rt.) =   0.494923E-16  0.207489E-11 -0.201885E-12
-  c2 (bot.left/middle/top rt.) =   0.332974E+12  0.618628E+12  0.403886E+12
-
- t =   0.792000E+05     no. steps =  7207  no. att. steps =  7234   stepsize =   0.645241E+03
-  c1 (bot.left/middle/top rt.) =   0.656506E-16 -0.343161E-11 -0.863757E-11
-  c2 (bot.left/middle/top rt.) =   0.333443E+12  0.666905E+12  0.412027E+12
-
- t =   0.864000E+05     no. steps =  7218  no. att. steps =  7245   stepsize =   0.645241E+03
-  c1 (bot.left/middle/top rt.) =   0.577960E-15  0.707844E-12  0.151082E-11
-  c2 (bot.left/middle/top rt.) =   0.335180E+12  0.910620E+12  0.416253E+12
-
-
-Final statistics:
-
- number of steps        =   7218
- number of step att.    =   7245
- number of fe evals.    =      0
- number of fi evals.    =  75812
- number of prec. setups =    441
- number of prec. evals. =    120
- number of prec. solves = 110062
- number of nonl. iters. =  39584
- number of lin. iters.  =  73470
- average Krylov subspace dimension (NLI/NNI) =   0.185605E+01
- number of conv. failures.. nonlinear =  0 linear =   0
- number of error test failures =  27
- main solver real/int workspace sizes   =  3701  131
- linear solver real/int workspace sizes =  2455   42
-In ARKBANDPRE:
- real/int workspace sizes =  2800  622
- number of f evaluations  =   600
diff --git a/examples/arkode/F77_serial/fark_roberts_dnsL.f b/examples/arkode/F77_serial/fark_roberts_dnsL.f
deleted file mode 100644
index 1dd337dbe7..0000000000
--- a/examples/arkode/F77_serial/fark_roberts_dnsL.f
+++ /dev/null
@@ -1,329 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     FARKODE Example Problem: Robertson kinetics, Lapack linear solver
-C                             with dense user Jacobian.
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by ARKODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     employ the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with ARKODE, using the Fortran/C interface routine
-C     package. This solution uses the DIRK method and a user-supplied
-C     Jacobian routine, and prints results at t = .4, 4., ..., 4.e10.
-C     It uses ITOL = 2 and ATOL much smaller for y2 than y1 or y3
-C     because y2 has much smaller values. At the end of the run,
-C     various counters of interest are printed.
-C
-C     Note that this problem should only work with SUNDIALS configured
-C     to use 'realtype' as 'double' and 'sunindextype' as '32bit'
-C     ----------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNST_ATT, LNFE, LNFI, LNSETUP, LNNI, LNCF
-      INTEGER*4 LNETF, LNJE, LNGE, METH, ITOL, ITASK, JOUT, NOUT
-      INTEGER*4 IERROOT, INFO(2)
-      INTEGER*4 I
-      INTEGER*8 NEQ, IOUT(35), IPAR, MXSTEPS, MXNLI, PRED, MXETF
-      DOUBLE PRECISION RTOL, T, T0, TOUT, H0, NLCONV
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(6), RPAR
-C
-      DATA LNST/3/, LNST_ATT/6/, LNFE/7/, LNFI/8/, LNETF/10/, LNCF/12/,
-     1     LNNI/11/, LNSETUP/9/, LNGE/13/, LNJE/18/
-C
-      NEQ = 3
-      MXSTEPS = 10000
-      MXNLI = 8
-      PRED = 1
-      MXETF = 20
-      T0 = 0.0D0
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-      METH = 0
-      ITOL = 2
-      RTOL = 1.0D-4
-      ATOL(1) = 1.0D-8
-      ATOL(2) = 1.0D-11
-      ATOL(3) = 1.0D-8
-      H0 = 1.0D-4 * RTOL
-      NLCONV = 1.0D-7
-      TOUT = 0.4D0
-      ITASK = 1
-      JOUT = 0
-      NOUT = 12
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Dense example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-C
-      CALL FNVINITS(4, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     initialize dense matrix module
-      call FSUNDENSEMATINIT(4, NEQ, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNDENSEMATINIT IER = ', I5)
-        STOP
-      ENDIF
-C
-C     initialize LAPACK dense linear solver module
-      call FSUNLAPACKDENSEINIT(4, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNLAPACKDENSEINIT IER = ', I5)
-        STOP
-      ENDIF
-C
-      CALL FARKMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1                IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FARKMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-C
-      CALL FARKSETRIN('INIT_STEP', H0, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
- 32     FORMAT(///' SUNDIALS_ERROR: FARKSETRIN returned IER = ', I5)
-        STOP
-      ENDIF
-C
-      CALL FARKSETRIN('NLCONV_COEF', NLCONV, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
-        STOP
-      ENDIF
-C
-      CALL FARKSETIIN('MAX_NSTEPS', MXSTEPS, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FARKSETIIN returned IER = ', I5)
-        STOP
-      ENDIF
-C
-      CALL FARKSETIIN('MAX_NITERS', MXNLI, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
-        STOP
-      ENDIF
-C
-      CALL FARKSETIIN('PREDICT_METHOD', PRED, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
-        STOP
-      ENDIF
-C
-      CALL FARKSETIIN('MAX_ERRFAIL', MXETF, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
-        STOP
-      ENDIF
-c
-      CALL FARKROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,38) IER
- 38      FORMAT(///' SUNDIALS_ERROR: FARKROOTINIT returned IER = ', I5)
-         CALL FARKFREE
-         STOP
-      ENDIF
-C
-C     attach matrix and linear solver modules to ARKLs interface
-      CALL FARKLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FARKLSINIT returned IER = ',I5)
-        CALL FARKFREE
-        STOP
-      ENDIF
-C
-      CALL FARKDENSESETJAC(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FARKDENSESETJAC returned IER = ',I5)
-        CALL FARKFREE
-        STOP
-      ENDIF
-C
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FARKODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,50) T, Y(1), Y(2), Y(3)
- 50     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-           WRITE(6,60) IER, IOUT(16)
- 60        FORMAT(///' SUNDIALS_ERROR: FARKODE returned IER = ', I5, /,
-     1            '                 Linear Solver returned IER = ', I5)
-           CALL FARKROOTFREE
-           CALL FARKFREE
-           STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-           CALL FARKROOTINFO(2, INFO, IERROOT)
-           IF (IERROOT .LT. 0) THEN
-              WRITE(6,65) IERROOT
- 65           FORMAT(///' SUNDIALS_ERROR: FARKROOTINFO returned IER = ',
-     1              I5)
-              CALL FARKROOTFREE
-              CALL FARKFREE
-              STOP
-           ENDIF
-           WRITE(6,70) (INFO(I), I = 1, 2)
- 70        FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-           TOUT = TOUT * 10.0D0
-           JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-C
-      CALL FARKDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,80) IER
- 80      FORMAT(///' SUNDIALS_ERROR: FARKDKY returned IER = ', I4)
-         CALL FARKROOTFREE
-         CALL FARKFREE
-         STOP
-      ENDIF
-      WRITE(6,85) Y(1), Y(2), Y(3)
- 85   FORMAT(/'Final value of ydot = ', 3E14.6)
-C
-      WRITE(6,90) IOUT(LNST), IOUT(LNST_ATT), IOUT(LNFE), IOUT(LNFI),
-     1            IOUT(LNJE), IOUT(LNSETUP), IOUT(LNNI), IOUT(LNCF),
-     2            IOUT(LNETF), IOUT(LNGE)
- 90   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, ', attempted = ', I4/
-     2       ' No. fe-s = ', I4, ', No. fi-s = ',I5/
-     3       ' No. J-s = ', I4, ',  No. LU-s = ', I4/
-     4       ' No. nonlinear iterations = ', I5/
-     5       ' No. nonlinear convergence failures = ', I4/
-     6       ' No. error test failures = ', I4/
-     7       ' No. root function evals = ', I4)
-C
-      CALL FARKROOTFREE
-      CALL FARKFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKIFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C Fortran routine for right-hand side function, fi
-      IMPLICIT NONE
-C
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKEFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C Fortran routine for right-hand side function, fe
-      IMPLICIT NONE
-C
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = 0.D0
-      YDOT(3) = 0.D0
-      YDOT(2) = 0.D0
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKROOTFN(T, Y, G, IPAR, RPAR, IER)
-C Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FARKDJAC(N, T, Y, FY, JAC, H, IPAR, RPAR,
-     1                    V1, V2, V3, IER)
-C Fortran routine for dense user-supplied Jacobian.
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, N
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, Y(*), FY(*), JAC(N,*), H, RPAR(*)
-      DOUBLE PRECISION V1(*), V2(*), V3(*)
-C
-      DOUBLE PRECISION  Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JAC(1,1) = -0.04D0
-      JAC(1,2) = 1.0D4 * Y3
-      JAC(1,3) = 1.0D4 * Y2
-      JAC(2,1) =  0.04D0
-      JAC(2,2) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JAC(2,3) = -1.0D4 * Y2
-      JAC(3,3) = 0.0D0
-      JAC(3,2) = 6.0D7 * Y2
-      JAC(3,3) = 0.0D0
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/arkode/F77_serial/fark_roberts_dnsL.out b/examples/arkode/F77_serial/fark_roberts_dnsL.out
deleted file mode 100644
index 9d9525afe6..0000000000
--- a/examples/arkode/F77_serial/fark_roberts_dnsL.out
+++ /dev/null
@@ -1,34 +0,0 @@
-Dense example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2640E+00   y =   0.989965E+00  0.347057E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985172E+00  0.338640E-04  0.147940E-01
-At t =   0.4000E+01   y =   0.905519E+00  0.224048E-04  0.944589E-01
-At t =   0.4000E+02   y =   0.715827E+00  0.918557E-05  0.284164E+00
-At t =   0.4000E+03   y =   0.450519E+00  0.322290E-05  0.549478E+00
-At t =   0.4000E+04   y =   0.183202E+00  0.894236E-06  0.816797E+00
-At t =   0.4000E+05   y =   0.389834E-01  0.162176E-06  0.961016E+00
-At t =   0.4000E+06   y =   0.493820E-02  0.198485E-07  0.995062E+00
-At t =   0.4000E+07   y =   0.516810E-03  0.206832E-08  0.999483E+00
-At t =   0.2080E+08   y =   0.100000E-03  0.399393E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.520314E-04  0.208160E-09  0.999948E+00
-At t =   0.4000E+09   y =   0.520776E-05  0.204359E-10  0.999995E+00
-At t =   0.4000E+10   y =   0.520930E-06  0.207751E-11  0.999999E+00
-At t =   0.4000E+11   y =   0.520789E-07 -0.201843E-12  0.100000E+01
-
-Final value of ydot =  -0.129983E-17 -0.281328E-22  0.129985E-17
-
-
-Final statistics:
-
- No. steps =  996, attempted = 1227
- No. fe-s =    0, No. fi-s = 34120
- No. J-s =   68,  No. LU-s =  597
- No. nonlinear iterations = 28031
- No. nonlinear convergence failures =   17
- No. error test failures =  214
- No. root function evals = 1026
diff --git a/examples/arkode/F90_parallel/CMakeLists.txt b/examples/arkode/F90_parallel/CMakeLists.txt
deleted file mode 100644
index a4d890237b..0000000000
--- a/examples/arkode/F90_parallel/CMakeLists.txt
+++ /dev/null
@@ -1,145 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s):  Daniel R. Reynolds @ SMU
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the ARKODE parallel F90 examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;nodes\;tasks\;type" where the
-# type is develop for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-if(SUNDIALS_PRECISION MATCHES "double")
-  # The fark_heat2D only supports double precision
-  set(FARKODE_examples
-    "fark_heat2D\;1\;2\;develop"
-    )
-  # Auxiliary files to install
-  set(FARKODE_extras
-    plot_heat2D.py
-    )
-endif()
-
-if(MPI_Fortran_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_Fortran_COMPILER ${MPI_Fortran_COMPILER})
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-# Specify libraries to link against
-set(ARKODE_LIB sundials_arkode)
-set(NVECP_LIB sundials_nvecparallel)
-set(FNVECP_LIB sundials_fnvecparallel)
-
-# Only static FCMIX libraries are available
-set(FARKODE_LIB sundials_farkode${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FARKODE_LIB} ${ARKODE_LIB} ${FNVECP_LIB} ${NVECP_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-# Add the build and install targets for each ARKODE example
-foreach(example_tuple ${FARKODE_examples})
-
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 number_of_nodes)
-  list(GET example_tuple 2 number_of_tasks)
-  list(GET example_tuple 3 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f90)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-  set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    MPI_NPROCS ${number_of_tasks}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  if(NOT MPI_Fortran_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f90 ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_parallel)
-  endif()
-
-endforeach(example_tuple ${FARKODE_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_parallel)
-
-  # Install the extra files
-  foreach(extrafile ${FARKODE_extras})
-    install(FILES ${extrafile} DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_parallel)
-  endforeach()
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "ARKODE")
-  set(SOLVER_LIB "sundials_arkode")
-  set(SOLVER_FLIB "sundials_farkode")
-
-  examples2string(FARKODE_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_parallel_F90_ex.in
-    ${PROJECT_BINARY_DIR}/examples/arkode/F90_parallel/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/arkode/F90_parallel/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_parallel
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_parallel_F90_ex.in
-      ${PROJECT_BINARY_DIR}/examples/arkode/F90_parallel/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/arkode/F90_parallel/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_parallel
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(arkode F90_parallel)
-
-endif()
diff --git a/examples/arkode/F90_parallel/README b/examples/arkode/F90_parallel/README
deleted file mode 100644
index 388b44115e..0000000000
--- a/examples/arkode/F90_parallel/README
+++ /dev/null
@@ -1,52 +0,0 @@
-List of parallel ARKODE F90 examples
-
-  fark_heat2D : 2-D diffusion (PCG with Jacobi preconditioner)
-
-Sample results:
-
-  The example output was produced by running with 2 MPI processes:
-
-      mpiexec -n 2 ./fark_heat2D
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/arkode/F90_parallel/fark_heat2D.f90 b/examples/arkode/F90_parallel/fark_heat2D.f90
deleted file mode 100644
index 78b7ed0cf6..0000000000
--- a/examples/arkode/F90_parallel/fark_heat2D.f90
+++ /dev/null
@@ -1,871 +0,0 @@
-!-----------------------------------------------------------------
-! Programmer(s): Daniel R. Reynolds @ SMU
-!-----------------------------------------------------------------
-! SUNDIALS Copyright Start
-! Copyright (c) 2002-2023, Lawrence Livermore National Security
-! and Southern Methodist University.
-! All rights reserved.
-!
-! See the top-level LICENSE and NOTICE files for details.
-!
-! SPDX-License-Identifier: BSD-3-Clause
-! SUNDIALS Copyright End
-!-----------------------------------------------------------------
-! Example problem:
-! 
-! The following test simulates a simple anisotropic 2D heat 
-! equation,
-!    u_t = kx*u_xx + ky*u_yy + h,
-! for t in [0, 10], (x,y) in [0, 1]^2, with initial conditions
-!    u(0,x,y) =  0,
-! stationary boundary conditions, i.e. 
-!    u_t(t,0,y) = u_t(t,1,y) = u_t(t,x,0) = u_t(t,x,1) = 0,
-! and a heat source of the form
-!    h(x,y) = sin(pi*x)*sin(2*pi*y).
-!
-! Under this setup, the problem has an analytical solution:
-!    u(t,x,y) = a(t)*sin(pi*x)*sin(2*pi*y), where
-!    a(t) = (1 - exp(-(kx+4*ky)*pi^2*t)) / ((kx+4*ky)*pi^2).
-! 
-! The spatial derivatives are computed using second-order 
-! centered differences, with the data distributed over nx*ny
-! points on a uniform spatial grid.
-!
-! The spatial grid parameters nx and ny, the parameters kx and ky, 
-! as well as the desired relative and absolute solver tolerances, 
-! are provided in the input file input_heat2D.txt.
-! 
-! This program solves the problem with a DIRK method.  This 
-! employs a Newton iteration with the PCG iterative linear solver, 
-! which itself uses a Jacobi preconditioner.  The example uses the 
-! built-in finite-difference Jacobian-vector product routine, but 
-! supplies both the RHS and preconditioner setup/solve functions.
-!
-! 20 outputs are printed at equal intervals, and run statistics 
-! are printed at the end.
-!-----------------------------------------------------------------
-
-!-----------------------------------------------------------------
-! Main driver program
-!-----------------------------------------------------------------
-module UserData
-  !---------------------------------------------------------------
-  ! Description: 
-  !    Module containing problem-defining parameters, as well as
-  !    data buffers for MPI exchanges with neighboring processes.
-  !    Also contains routines to:
-  !      (a) initialize the module
-  !      (b) perform exchanges
-  !      (c) free module data.
-  !---------------------------------------------------------------
-  implicit none
-  include "sundials/sundials_fconfig.h"
-  save
-
-  integer*8 :: nx          ! global number of x grid points 
-  integer*8 :: ny          ! global number of y grid points 
-  integer*8 :: is          ! global x indices of this subdomain
-  integer*8 :: ie
-  integer*8 :: js          ! global y indices of this subdomain
-  integer*8 :: je
-  integer*8 :: nxl         ! local number of x grid points 
-  integer*8 :: nyl         ! local number of y grid points 
-  real*8    :: dx          ! x-directional mesh spacing 
-  real*8    :: dy          ! y-directional mesh spacing 
-  real*8    :: kx          ! x-directional diffusion coefficient 
-  real*8    :: ky          ! y-directional diffusion coefficient 
-  real(kind=REALTYPE), dimension(:,:), allocatable :: h    ! heat source vector
-  real(kind=REALTYPE), dimension(:,:), allocatable :: d    ! inverse of Jacobian diagonal
-  integer :: comm                             ! communicator object
-  integer :: myid                             ! MPI process ID
-  integer :: nprocs                           ! total number of MPI processes
-  logical :: HaveNbor(2,2)                    ! flags denoting neighbor on boundary
-  real(kind=REALTYPE), dimension(:), allocatable :: Erecv  ! receive buffers for neighbor exchange
-  real(kind=REALTYPE), dimension(:), allocatable :: Wrecv
-  real(kind=REALTYPE), dimension(:), allocatable :: Nrecv
-  real(kind=REALTYPE), dimension(:), allocatable :: Srecv
-  real(kind=REALTYPE), dimension(:), allocatable :: Esend  ! send buffers for neighbor exchange
-  real(kind=REALTYPE), dimension(:), allocatable :: Wsend
-  real(kind=REALTYPE), dimension(:), allocatable :: Nsend
-  real(kind=REALTYPE), dimension(:), allocatable :: Ssend
-
-contains
-
-  !---------------------------------------------------------------
-  ! Initialize memory allocated within Userdata (set to defaults)
-  !---------------------------------------------------------------
-  subroutine InitUserData()
-    implicit none
-    include "mpif.h"
-    nx = 0
-    ny = 0
-    is = 0
-    ie = 0
-    js = 0
-    je = 0
-    nxl = 0
-    nyl = 0
-    dx = 0.d0
-    dy = 0.d0
-    kx = 0.d0
-    ky = 0.d0
-    if (allocated(h))  deallocate(h)
-    if (allocated(d))  deallocate(d)
-    comm = MPI_COMM_WORLD
-    myid = 0
-    nprocs = 0
-    HaveNbor = .false.
-    if (allocated(Erecv))  deallocate(Erecv)
-    if (allocated(Wrecv))  deallocate(Wrecv)
-    if (allocated(Nrecv))  deallocate(Nrecv)
-    if (allocated(Srecv))  deallocate(Srecv)
-    if (allocated(Esend))  deallocate(Esend)
-    if (allocated(Wsend))  deallocate(Wsend)
-    if (allocated(Nsend))  deallocate(Nsend)
-    if (allocated(Ssend))  deallocate(Ssend)
-  end subroutine InitUserData
-  !---------------------------------------------------------------
-
-
-  !---------------------------------------------------------------
-  ! Set up parallel decomposition
-  !---------------------------------------------------------------
-  subroutine SetupDecomp(ierr)
-    ! declarations
-    implicit none
-    include "mpif.h"
-    integer, intent(out) :: ierr
-    integer :: dims(2), periods(2), coords(2)
-    
-    ! internals
-
-    ! check that this has not been called before
-    if (allocated(h) .or. allocated(d)) then
-       write(0,*) "SetupDecomp warning: parallel decomposition already set up"
-       ierr = 1
-       return
-    end if
-
-    ! get suggested parallel decomposition
-    dims = (/0, 0/)
-    call MPI_Comm_size(MPI_COMM_WORLD, nprocs, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Comm_size = " , ierr
-       return
-    end if
-    call MPI_Dims_create(nprocs, 2, dims, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Dims_create = " , ierr
-       return
-    end if
-
-    ! set up 2D Cartesian communicator
-    periods = (/0, 0/)
-    call MPI_Cart_create(MPI_COMM_WORLD, 2, dims, periods, 0, comm, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Cart_create = " , ierr
-       return
-    end if
-    call MPI_Comm_rank(comm, myid, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Comm_rank = " , ierr
-       return
-    end if
-
-    ! determine local extents
-    call MPI_Cart_get(comm, 2, dims, periods, coords, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Cart_get = " , ierr
-       return
-    end if
-    is = nx*coords(1)/dims(1) + 1
-    ie = nx*(coords(1)+1)/dims(1)
-    js = ny*coords(2)/dims(2) + 1
-    je = ny*(coords(2)+1)/dims(2)
-    nxl = ie-is+1
-    nyl = je-js+1
-
-    ! determine if I have neighbors, and allocate exchange buffers
-    HaveNbor(1,1) = (is /= 1)
-    HaveNbor(1,2) = (ie /= nx)
-    HaveNbor(2,1) = (js /= 1)
-    HaveNbor(2,2) = (je /= ny)
-    if (HaveNbor(1,1)) then
-       allocate(Wrecv(nyl))
-       allocate(Wsend(nyl))
-    endif
-    if (HaveNbor(1,2)) then
-       allocate(Erecv(nyl))
-       allocate(Esend(nyl))
-    endif
-    if (HaveNbor(2,1)) then
-       allocate(Srecv(nxl))
-       allocate(Ssend(nxl))
-    endif
-    if (HaveNbor(2,2)) then
-       allocate(Nrecv(nxl))
-       allocate(Nsend(nxl))
-    endif
-
-    ! allocate temporary vectors
-    allocate(h(nxl,nyl))    ! Create vector for heat source
-    allocate(d(nxl,nyl))    ! Create vector for Jacobian diagonal
-    
-    ierr = 0     ! return with success flag
-    return
-  end subroutine SetupDecomp
-  !---------------------------------------------------------------
-
-
-  !---------------------------------------------------------------
-  ! Perform neighbor exchange
-  !---------------------------------------------------------------
-  subroutine Exchange(y, ierr)
-    ! declarations
-    implicit none
-    include "mpif.h"
-    real(kind=REALTYPE),  intent(in)  :: y(nxl,nyl)
-    integer, intent(out) :: ierr
-    integer :: reqSW, reqSE, reqSS, reqSN, reqRW, reqRE, reqRS, reqRN;
-    integer :: stat(MPI_STATUS_SIZE)
-    integer*8 :: i
-    integer :: ipW, ipE, ipS, ipN
-    integer :: coords(2), dims(2), periods(2), nbcoords(2)
-    
-    ! internals
-
-    ! MPI neighborhood information
-    call MPI_Cart_get(comm, 2, dims, periods, coords, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Cart_get = ", ierr
-       return
-    endif
-    if (HaveNbor(1,1)) then
-       nbcoords = (/ coords(1)-1, coords(2) /)
-       call MPI_Cart_rank(comm, nbcoords, ipW, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Cart_rank = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(1,2)) then
-       nbcoords = (/ coords(1)+1, coords(2) /)
-       call MPI_Cart_rank(comm, nbcoords, ipE, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Cart_rank = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,1)) then
-       nbcoords = (/ coords(1), coords(2)-1 /)
-       call MPI_Cart_rank(comm, nbcoords, ipS, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Cart_rank = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,2)) then
-       nbcoords = (/ coords(1), coords(2)+1 /)
-       call MPI_Cart_rank(comm, nbcoords, ipN, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Cart_rank = ", ierr
-          return
-       endif
-    endif
-
-    ! open Irecv buffers
-    if (HaveNbor(1,1)) then
-       call MPI_Irecv(Wrecv, nyl, MPI_DOUBLE_PRECISION, ipW, &
-                      MPI_ANY_TAG, comm, reqRW, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Irecv = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(1,2)) then
-       call MPI_Irecv(Erecv, nyl, MPI_DOUBLE_PRECISION, ipE, &
-                      MPI_ANY_TAG, comm, reqRE, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Irecv = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,1)) then
-       call MPI_Irecv(Srecv, nxl, MPI_DOUBLE_PRECISION, ipS, &
-                      MPI_ANY_TAG, comm, reqRS, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Irecv = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,2)) then
-       call MPI_Irecv(Nrecv, nxl, MPI_DOUBLE_PRECISION, ipN, &
-                      MPI_ANY_TAG, comm, reqRN, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Irecv = ", ierr
-          return
-       endif
-    endif
-
-    ! send data
-    if (HaveNbor(1,1)) then
-       do i=1,nyl
-          Wsend(i) = y(1,i)
-       enddo
-       call MPI_Isend(Wsend, nyl, MPI_DOUBLE_PRECISION, ipW, 0, &
-                      comm, reqSW, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Isend = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(1,2)) then
-       do i=1,nyl
-          Esend(i) = y(nxl,i)
-       enddo
-       call MPI_Isend(Esend, nyl, MPI_DOUBLE_PRECISION, ipE, 1, &
-                      comm, reqSE, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Isend = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,1)) then
-       do i=1,nxl
-          Ssend(i) = y(i,1)
-       enddo
-       call MPI_Isend(Ssend, nxl, MPI_DOUBLE_PRECISION, ipS, 2, &
-                      comm, reqSS, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Isend = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,2)) then
-       do i=1,nxl
-          Nsend(i) = y(i,nyl)
-       enddo
-       call MPI_Isend(Nsend, nxl, MPI_DOUBLE_PRECISION, ipN, 3, &
-                      comm, reqSN, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Isend = ", ierr
-          return
-       endif
-    endif
-
-    ! wait for messages to finish
-    if (HaveNbor(1,1)) then
-       call MPI_Wait(reqRW, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-       call MPI_Wait(reqSW, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(1,2)) then
-       call MPI_Wait(reqRE, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-       call MPI_Wait(reqSE, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,1)) then
-       call MPI_Wait(reqRS, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-       call MPI_Wait(reqSS, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-    endif
-    if (HaveNbor(2,2)) then
-       call MPI_Wait(reqRN, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-       call MPI_Wait(reqSN, stat, ierr)
-       if (ierr /= MPI_SUCCESS) then 
-          write(0,*) "Error in MPI_Wait = ", ierr
-          return
-       endif
-    endif
-
-    ierr = 0     ! return with success flag
-    return
-  end subroutine Exchange
-  !---------------------------------------------------------------
-
-
-  !---------------------------------------------------------------
-  ! Free memory allocated within Userdata
-  !---------------------------------------------------------------
-  subroutine FreeUserData(ierr)
-    implicit none
-    integer, intent(out) :: ierr
-    if (allocated(h))      deallocate(h)
-    if (allocated(d))      deallocate(d)
-    if (allocated(Wrecv))  deallocate(Wrecv)
-    if (allocated(Wsend))  deallocate(Wsend)
-    if (allocated(Erecv))  deallocate(Erecv)
-    if (allocated(Esend))  deallocate(Esend)
-    if (allocated(Srecv))  deallocate(Srecv)
-    if (allocated(Ssend))  deallocate(Ssend)
-    if (allocated(Nrecv))  deallocate(Nrecv)
-    if (allocated(Nsend))  deallocate(Nsend)
-    ierr = 0     ! return with success flag
-    return
-  end subroutine FreeUserData
-  !---------------------------------------------------------------
-
-
-  !---------------------------------------------------------------
-  ! RMS norm function for parallel array data
-  !---------------------------------------------------------------
-  subroutine PRMS(y,yrms,ierr)
-    ! declarations
-    implicit none
-    include "mpif.h"
-    integer, intent(out) :: ierr
-    real(kind=REALTYPE),  intent(in)  :: y(nxl,nyl)
-    real(kind=REALTYPE),  intent(out) :: yrms
-    real(kind=REALTYPE) :: lsum, gsum
-
-    ! internals
-    lsum = sum(y**2)
-    call MPI_Allreduce(lsum, gsum, 1, MPI_DOUBLE_PRECISION, &
-                       MPI_SUM, comm, ierr)
-    if (ierr /= MPI_SUCCESS) then
-       write(0,*) "Error in MPI_Allreduce = ", ierr
-       call MPI_Finalize(ierr)
-    endif
-    yrms = sqrt(gsum/nx/ny)
-
-    ierr = 0     ! return with success flag
-    return
-  end subroutine PRMS
-  !---------------------------------------------------------------
-
-end module UserData
-!-----------------------------------------------------------------
-
-
-!-----------------------------------------------------------------
-! Main driver program
-!-----------------------------------------------------------------
-program driver
-
-  ! inclusions
-  use UserData
-  implicit none
-  include "mpif.h"
-
-  ! Declarations
-  ! general problem parameters
-  real*8,    parameter :: pi = 3.1415926535897932d0
-  integer,   parameter :: Nt = 20           ! total number of output times 
-  integer*8, parameter :: nx_ = 60          ! spatial mesh size
-  integer*8, parameter :: ny_ = 120
-  integer,   parameter :: PCGpretype = 1    ! enable preconditioner
-  integer,   parameter :: PCGmaxl = 20      ! max num. PCG iterations
-  real(kind=REALTYPE), parameter :: T0 = 0.d0        ! initial time 
-  real(kind=REALTYPE), parameter :: Tf = 0.3d0       ! final time 
-  real(kind=REALTYPE), parameter :: rtol = 1.d-5     ! relative and absolute tolerances
-  real(kind=REALTYPE), parameter :: atol = 1.d-10
-  real(kind=REALTYPE), parameter :: kx_ = 0.5d0      ! heat conductivity coefficients
-  real(kind=REALTYPE), parameter :: ky_ = 0.75d0
-  real(kind=REALTYPE), parameter :: nlscoef = 1.d-7  ! nonlinear solver tolerance factor
-
-  ! solution vector and other local variables
-  real(kind=REALTYPE), allocatable :: y(:,:)
-  real(kind=REALTYPE) :: rout(6), rpar, t, dTout, tout, urms
-  integer*8 :: iout(35), ipar, N, Ntot, i, j
-  integer   :: flag, ioutput
-  logical   :: outproc
-  character*100 :: outname
-
-  ! initialize MPI
-  call MPI_Init(flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in MPI_Init = ", flag
-     stop
-  end if
-  call MPI_Comm_rank(MPI_COMM_WORLD, myid, flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in MPI_Comm_rank = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-  ! Initialize UserData module
-  call InitUserData()
-  nx = nx_
-  ny = ny_
-  kx = kx_
-  ky = ky_
-  dx = 1.d0/(nx-1)   ! x mesh spacing 
-  dy = 1.d0/(ny-1)   ! x mesh spacing 
-
-  ! Set up parallel decomposition (computes local mesh sizes)
-  call SetupDecomp(flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in SetupDecomp = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-  ! Initial problem output 
-  outproc = (myid == 0)
-  if (outproc) then
-     write(6,*) "  "
-     write(6,*) "2D Heat PDE test problem:";
-     write(6,'(A,i4)') "   nprocs = " , nprocs
-     write(6,'(A,i4)') "   nx = ", nx
-     write(6,'(A,i4)') "   ny = ", ny
-     write(6,'(A,f5.2)') "   kx = ", kx
-     write(6,'(A,f5.2)') "   ky = ", ky
-     write(6,'(A,es9.2)') "   rtol = ", rtol
-     write(6,'(A,es9.2)') "   atol = ", atol
-     write(6,'(A,i4)') "   nxl (proc 0) = ", nxl
-     write(6,'(A,i4)') "   nyl (proc 0) = ", nyl
-     write(6,*) "  "
-  endif
-
-  ! Initialize data structures 
-  N = nxl*nyl
-  Ntot = nx*ny
-  call FNVInitP(comm, 4, N, Ntot, flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in FNVInitP = ", flag
-     call MPI_Finalize(flag)
-  end if
-  allocate(y(nxl,nyl))         ! Create parallel vector for solution 
-  y = 0.d0                     ! Set initial conditions 
-
-  ! initialize PCG linear solver module
-  call FSunPCGInit(4, PCGpretype, PCGmaxl, flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in FSunPCGInit = ", flag
-     call MPI_Finalize(flag)
-  end if
-  
-  ! Create the solver memory to use DIRK integrator, scalar tolerances
-  call FARKMalloc(T0, y, 0, 1, rtol, atol, iout, rout, ipar, rpar, flag)
-  if (flag /= MPI_SUCCESS) then
-     write(0,*) "Error in FARKMalloc = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-  ! fill in the heat source array
-  do j=1,nyl
-     do i=1,nxl
-        h(i,j) = sin(pi*(is+i-2)*dx) * sin(2.d0*pi*(js+j-2)*dy)
-     enddo
-  enddo
-
-  ! set integrator options
-  call FARKSetRin("NLCONV_COEF", nlscoef, flag)
-  if (flag < 0) then
-     write(0,*) "Error in FARKSetRin = ", flag
-     call MPI_Finalize(flag)
-  end if
-  call FARKSetIin("PREDICT_METHOD", 1_8, flag)
-  if (flag < 0) then
-     write(0,*) "Error in FARKSetIin = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-
-  ! attach linear solver module to ARKLs interface
-  call FARKLsInit(flag)
-  if (flag < 0) then
-     write(0,*) "Error in FARKLsInit = ", flag
-     call MPI_Finalize(flag)
-  end if
-  call FARKLsSetPrec(1, flag)     ! Signal user-supplied preconditioner
-  if (flag < 0) then
-     write(0,*) "Error in FARKLsSetPrec = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-  ! specify that the problem is linearly implicit, but that Jacobian does not depend on time
-  call FARKSetIin("LINEAR", 0_8, flag)
-  if (flag < 0) then
-     write(0,*) "Error in FARKSetIin = ", flag
-     call MPI_Finalize(flag)
-  end if
-
-  ! Each processor outputs subdomain information
-  write(outname,'(16Hheat2d_subdomain,f4.3,4H.txt)') myid/1000.0
-  open(100, file=outname)
-  write(100,'(6(i9,1x))') nx, ny, is, ie, js, je
-  close(100)
-
-  ! Open output streams for results, access data array 
-  write(outname,'(6Hheat2d,f4.3,4H.txt)') myid/1000.0
-  open(101, file=outname)
-
-  ! Output initial condition to disk
-  do j=1,nyl
-     do i=1,nxl
-        write(101,'(es25.16)',advance='no') y(i,j)
-     enddo
-  enddo
-  write(101,*) "  "
-
-  ! Main time-stepping loop: calls ARKode to perform the integration, then
-  ! prints results.  Stops when the final time has been reached
-  t = T0
-  dTout = (Tf-T0)/Nt
-  tout = T0+dTout
-  call PRMS(y, urms, flag)
-  if (outproc) then
-    write(6,*) "        t      ||u||_rms"
-    write(6,*) "   ----------------------"
-    write(6,'(2(2x,f10.6))') t, urms
-  endif
-  do ioutput=1,Nt
-
-     call FARKode(tout, t, y, 1, flag)         ! call integrator 
-     if (flag < 0) then
-        write(0,*) "Error in FARKode = ", flag
-        exit
-     end if
-     
-     call PRMS(y, urms, flag)
-     if (outproc) &
-          write(6,'(2(2x,f10.6))') t, urms     ! print solution stats 
-     if (flag >= 0) then                       ! successful solve: update output time
-        tout = min(tout + dTout, Tf)
-     else                                      ! unsuccessful solve: break 
-        if (outproc) &
-             write(0,*) "Solver failure, stopping integration"
-        exit
-     endif
-
-     ! output results to disk 
-     do j=1,nyl
-        do i=1,nxl
-           write(101,'(es25.16)',advance='no') y(i,j)
-        enddo
-     enddo
-     write(101,*) "  "
-     
-  enddo
-  if (outproc) then
-     write(6,*) "   ----------------------"
-  endif
-  close(101)
-
-  ! Print some final statistics 
-  if (outproc) then
-     write(6,*) "  "
-     write(6,*) "Final Solver Statistics:"
-     write(6,'(2(A,i6),A)') "   Internal solver steps = ", iout(3), &
-          " (attempted = ", iout(6), ")"
-     write(6,'(A,i6,A,i6)') "   Total RHS evals:  Fe = ", iout(7), ",  Fi = ", iout(8)
-     write(6,'(A,i6)') "   Total linear solver setups = ", iout(9)
-     write(6,'(A,i6)') "   Total linear iterations = ", iout(23)
-     write(6,'(A,i6)') "   Total number of Jacobian-vector products = ", iout(20)
-     write(6,'(A,i6)') "   Total number of Preconditioner setups = ", iout(21)
-     write(6,'(A,i6)') "   Total number of Preconditioner solves = ", iout(22)
-     write(6,'(A,i6)') "   Total number of linear solver convergence failures = ", &
-          iout(24)
-     write(6,'(A,i6)') "   Total number of Newton iterations = ", iout(11)
-     write(6,'(A,i6)') "   Total number of nonlinear solver convergence failures = ", &
-          iout(12)
-     write(6,'(A,i6)') "   Total number of error test failures = ", iout(10)
- endif
-
- ! Clean up and return with successful completion 
- if (allocated(y))  deallocate(y)    ! free solution
- call FreeUserData(flag)             ! free user data 
- call FARKFree()                     ! free integrator memory 
- call MPI_Barrier(comm, flag)
- call MPI_Finalize(flag)             ! Finalize MPI
-
-end program driver
-!-----------------------------------------------------------------
-
-
-
-!-----------------------------------------------------------------
-! Functions called by the solver
-!-----------------------------------------------------------------
-
-
-subroutine farkifun(t, y, ydot, ipar, rpar, ierr)
-!-----------------------------------------------------------------
-! f routine to compute the ODE RHS function f(t,y). 
-!-----------------------------------------------------------------
-  ! declarations
-  use UserData
-  implicit none
-  include "mpif.h"
-  real(kind=REALTYPE), intent(in)  :: t, rpar
-  real(kind=REALTYPE), intent(in)  :: y(nxl,nyl)
-  real(kind=REALTYPE), intent(out) :: ydot(nxl,nyl)
-  integer*8, intent(in) :: ipar
-  real(kind=REALTYPE) :: c1, c2, c3
-  integer, intent(out) :: ierr
-  integer*8 :: i, j
-  
-  ! internals
-
-  ! Initialize ydot to zero 
-  ydot = 0.d0
-
-  ! Exchange boundary data with neighbors
-  call Exchange(y, ierr)
-  if (ierr /= MPI_SUCCESS) then
-     write(0,*) "Error in Exchange = " , ierr
-     return
-  end if
-
-  ! iterate over subdomain interior, computing approximation to RHS
-  c1 = kx/dx/dx
-  c2 = ky/dy/dy
-  c3 = -2.d0*(c1 + c2)
-  do j=2,nyl-1
-     do i=2,nxl-1
-        ydot(i,j) = c1*(y(i-1,j)+y(i+1,j)) + c2*(y(i,j-1)+y(i,j+1)) + c3*y(i,j)
-     enddo
-  enddo
-  
-  ! iterate over subdomain boundaries (if not at overall domain boundary)
-  if (HaveNbor(1,1)) then    ! West face
-     i=1
-     do j=2,nyl-1
-        ydot(i,j) = c1*(Wrecv(j)+y(i+1,j)) + c2*(y(i,j-1)+y(i,j+1)) + c3*y(i,j)
-     enddo
-  endif
-  if (HaveNbor(1,2)) then    ! East face
-     i=nxl
-     do j=2,nyl-1
-        ydot(i,j) = c1*(y(i-1,j)+Erecv(j)) + c2*(y(i,j-1)+y(i,j+1)) + c3*y(i,j)
-     enddo
-  endif
-  if (HaveNbor(2,1)) then    ! South face
-     j=1
-     do i=2,nxl-1
-        ydot(i,j) = c1*(y(i-1,j)+y(i+1,j)) + c2*(Srecv(i)+y(i,j+1)) + c3*y(i,j)
-     enddo
-  endif
-  if (HaveNbor(2,2)) then    ! West face
-     j=nyl
-     do i=2,nxl-1
-        ydot(i,j) = c1*(y(i-1,j)+y(i+1,j)) + c2*(y(i,j-1)+Nrecv(i)) + c3*y(i,j)
-     enddo
-  endif
-  if (HaveNbor(1,1) .and. HaveNbor(2,1)) then  ! South-West corner
-     i=1
-     j=1
-     ydot(i,j) = c1*(Wrecv(j)+y(i+1,j)) + c2*(Srecv(i)+y(i,j+1)) + c3*y(i,j)
-  endif
-  if (HaveNbor(1,1) .and. HaveNbor(2,2)) then  ! North-West corner
-     i=1
-     j=nyl
-     ydot(i,j) = c1*(Wrecv(j)+y(i+1,j)) + c2*(y(i,j-1)+Nrecv(i)) + c3*y(i,j)
-  endif
-  if (HaveNbor(1,2) .and. HaveNbor(2,1)) then  ! South-East corner
-     i=nxl 
-     j=1
-     ydot(i,j) = c1*(y(i-1,j)+Erecv(j)) + c2*(Srecv(i)+y(i,j+1)) + c3*y(i,j)
-  endif
-  if (HaveNbor(1,2) .and. HaveNbor(2,2)) then  ! North-East corner
-     i=nxl
-     j=nyl
-     ydot(i,j) = c1*(y(i-1,j)+Erecv(j)) + c2*(y(i,j-1)+Nrecv(i)) + c3*y(i,j)
-  endif
-
-  ydot = ydot + h         ! add in heat source
-
-  ierr = 0                ! Return with success 
-  return
-end subroutine farkifun
-!-----------------------------------------------------------------
-
-
-subroutine farkefun(t, y, ydot, ipar, rpar, ierr)
-!-----------------------------------------------------------------
-! Explicit portion of f routine (empty)
-!-----------------------------------------------------------------
-  ! declarations
-  use UserData
-  implicit none
-  real(kind=REALTYPE), intent(in)  :: t, rpar
-  integer*8, intent(in) :: ipar
-  real(kind=REALTYPE), intent(in)  :: y(nxl,nyl)
-  real(kind=REALTYPE), intent(out) :: ydot(nxl,nyl)
-  integer, intent(out) :: ierr
-  
-  ! internals
-
-  ! Initialize ydot to zero and return with success
-  ydot = 0.d0
-  ierr = 0
-  return
-end subroutine farkefun
-!-----------------------------------------------------------------
-
-
-subroutine farkpset(t, y, fy, jok, jcur, gamma, hcur, ipar, &
-                    rpar, ierr)
-!-----------------------------------------------------------------
-! Preconditioner setup routine (fills inverse of Jacobian diagonal)
-!-----------------------------------------------------------------
-  ! declarations
-  use UserData
-  implicit none
-  real(kind=REALTYPE), intent(in) :: t, gamma, hcur, rpar
-  real(kind=REALTYPE), intent(in) :: y(nxl,nyl), fy(nxl,nyl)
-  integer*8, intent(in) :: ipar
-  integer, intent(in) :: jok
-  integer, intent(out) :: jcur, ierr
-  real(kind=REALTYPE) :: c
-
-  ! internals
-  c = 1.d0 + gamma*2.d0*(kx/dx/dx + ky/dy/dy)
-
-  ! set all entries of d to the inverse of the diagonal values in interior
-  ! (since boundary RHS is 0, set boundary diagonals to the same)
-  d = 1.d0/c
-
-  jcur = 1     ! update jcur flag
-  ierr = 0     ! Return with success 
-  return
-end subroutine farkpset
-
-
-subroutine farkpsol(t, y, fy, r, z, gamma, delta, lr, &
-                    ipar, rpar, ierr)
-!-----------------------------------------------------------------
-! Preconditioner solve routine
-!-----------------------------------------------------------------
-  ! declarations
-  use UserData
-  implicit none
-  real(kind=REALTYPE), intent(in)  :: t, gamma, delta, rpar
-  integer*8, intent(in) :: ipar
-  real(kind=REALTYPE), intent(in)  :: y(nxl,nyl), fy(nxl,nyl), r(nxl,nyl)
-  real(kind=REALTYPE), intent(out) :: z(nxl,nyl)
-  integer, intent(in)  :: lr
-  integer, intent(out) :: ierr
-
-  ! internals
-  z = r*d      ! perform Jacobi iteration (whole array operation)
-  ierr = 0     ! Return with success 
-  return
-end subroutine farkpsol
-!-----------------------------------------------------------------
-
diff --git a/examples/arkode/F90_parallel/fark_heat2D.out b/examples/arkode/F90_parallel/fark_heat2D.out
deleted file mode 100644
index 66a8223921..0000000000
--- a/examples/arkode/F90_parallel/fark_heat2D.out
+++ /dev/null
@@ -1,49 +0,0 @@
-   
- 2D Heat PDE test problem:
-   nprocs =    2
-   nx =   60
-   ny =  120
-   kx =  0.50
-   ky =  0.75
-   rtol =  1.00E-05
-   atol =  1.00E-10
-   nxl (proc 0) =   30
-   nyl (proc 0) =  120
-   
-         t      ||u||_rms
-    ----------------------
-    0.000000    0.000000
-    0.015000    0.005780
-    0.030000    0.009224
-    0.045000    0.011275
-    0.060000    0.012497
-    0.075000    0.013224
-    0.090000    0.013658
-    0.105000    0.013916
-    0.120000    0.014070
-    0.135000    0.014162
-    0.150000    0.014216
-    0.165000    0.014249
-    0.180000    0.014268
-    0.195000    0.014280
-    0.210000    0.014287
-    0.225000    0.014291
-    0.240000    0.014293
-    0.255000    0.014295
-    0.270000    0.014295
-    0.285000    0.014296
-    0.300000    0.014296
-    ----------------------
-   
- Final Solver Statistics:
-   Internal solver steps =     57 (attempted =     59)
-   Total RHS evals:  Fe =      0,  Fi =    594
-   Total linear solver setups =     20
-   Total linear iterations =   5177
-   Total number of Jacobian-vector products =   5177
-   Total number of Preconditioner setups =     20
-   Total number of Preconditioner solves =   5424
-   Total number of linear solver convergence failures =    247
-   Total number of Newton iterations =    295
-   Total number of nonlinear solver convergence failures =      0
-   Total number of error test failures =      2
diff --git a/examples/arkode/F90_parallel/plot_heat2D.py b/examples/arkode/F90_parallel/plot_heat2D.py
deleted file mode 100755
index 70c3e1adb1..0000000000
--- a/examples/arkode/F90_parallel/plot_heat2D.py
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env python
-# ----------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-# ----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ----------------------------------------------------------------
-# matplotlib-based plotting script for heat2D.cpp example
-
-# imports
-import sys
-import numpy as np
-from pylab import *
-from mpl_toolkits.mplot3d import Axes3D
-from matplotlib import cm
-import matplotlib.pyplot as plt
-
-# determine the number of MPI processes used
-nprocs=1
-for i in range(1000):
-    sname = 'heat2d_subdomain.' + repr(i).zfill(3) + '.txt'
-    try:
-        f = open(sname,'r')
-        f.close()
-    except IOError:
-        nprocs = i
-        break
-
-# load subdomain information, store in table
-subdomains = np.zeros((nprocs,4), dtype=np.int)
-for i in range(nprocs):
-    sname = 'heat2d_subdomain.' + repr(i).zfill(3) + '.txt'
-    subd = np.loadtxt(sname, dtype=np.int)
-    if (i == 0):
-        nx = subd[0]
-        ny = subd[1]
-    else:
-        if ((subd[0] != nx) or (subd[1] != ny)):
-            sys.exit("error: subdomain files incompatible (clean up and re-run test)")
-    subdomains[i,:] = subd[2:6]
-    
-# load first processor's data, and determine total number of time steps
-data = np.loadtxt('heat2d.000.txt', dtype=np.double)
-nt = np.shape(data)[0]
-
-# create empty array for all solution data
-results = np.zeros((nt,ny,nx))
-
-# insert first processor's data into results array
-istart = subdomains[0,0]-1
-iend = subdomains[0,1]-1
-jstart = subdomains[0,2]-1
-jend = subdomains[0,3]-1
-nxl = iend-istart+1
-nyl = jend-jstart+1
-for i in range(nt):
-    results[i,jstart:jend+1,istart:iend+1] = np.reshape(data[i,:], (nyl,nxl))
-    
-# iterate over remaining data files, inserting into output
-if (nprocs > 1):
-    for isub in range(1,nprocs):
-        data = np.loadtxt('heat2d.' + repr(isub).zfill(3) + '.txt', dtype=np.double)
-        # check that subdomain has correct number of time steps
-        if (np.shape(data)[0] != nt):
-            sys.exit('error: subdomain ' + isub + ' has an incorrect number of time steps')
-        istart = subdomains[isub,0]-1
-        iend = subdomains[isub,1]-1
-        jstart = subdomains[isub,2]-1
-        jend = subdomains[isub,3]-1
-        nxl = iend-istart+1
-        nyl = jend-jstart+1
-        for i in range(nt):
-            results[i,jstart:jend+1,istart:iend+1] = np.reshape(data[i,:], (nyl,nxl))
-
-# determine extents of plots
-maxtemp = 1.1*results.max()
-mintemp = 0.9*results.min()
-
-# generate plots of results
-kx = 0.5
-ky = 0.75
-kprod = (kx+4.0*ky)*np.pi**2
-dt = 0.015
-for tstep in range(nt):
-
-    # set string constants for output plots, current time, mesh size
-    pname = 'heat2d_surf.' + repr(tstep).zfill(3) + '.png'
-    cname = 'heat2d_err.' + repr(tstep).zfill(3) + '.png'
-    tstr  = repr(tstep)
-    nxstr = repr(nx)
-    nystr = repr(ny)
-
-    # set x and y meshgrid objects
-    xspan = np.linspace(0.0, 1.0, nx)
-    yspan = np.linspace(0.0, 1.0, ny)
-    X,Y = np.meshgrid(xspan,yspan)
-
-    # plot current solution as a surface, and save to disk
-    fig = plt.figure(1)
-    ax = fig.add_subplot(111, projection='3d')
-    ax.plot_surface(X, Y, results[tstep,:,:], rstride=1, cstride=1, 
-                    cmap=cm.jet, linewidth=0, antialiased=True, shade=True)
-    ax.set_xlabel('x')
-    ax.set_ylabel('y')
-    ax.set_zlim((mintemp, maxtemp))
-    ax.view_init(20,45)
-    title('u(x,y) at output ' + tstr + ', mesh = ' + nxstr + 'x' + nystr)
-    savefig(pname)
-    plt.close()
-
-    # plot error in current solution (as a contour, and save to disk)
-    t = tstep*dt;
-    at = (1.0 - np.exp(-t*kprod))/kprod
-    utrue = at*np.sin(np.pi*X)*np.sin(2.0*np.pi*Y);
-    uerr = np.abs(utrue - results[tstep,:,:])
-    plt.contourf(xspan,yspan,uerr,15, cmap=plt.cm.jet)
-    plt.colorbar()
-    plt.xlabel('x')
-    plt.ylabel('y')
-    plt.title('Error at output ' + tstr + ', mesh = ' + nxstr + 'x' + nystr)
-    plt.savefig(cname)
-    plt.close()
-
-
-
-
-##### end of script #####
diff --git a/examples/arkode/F90_serial/CMakeLists.txt b/examples/arkode/F90_serial/CMakeLists.txt
deleted file mode 100644
index a58ee78fbf..0000000000
--- a/examples/arkode/F90_serial/CMakeLists.txt
+++ /dev/null
@@ -1,300 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-#                David J. Gardner @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FARKODE F90 serial examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FARKODE_examples
-  "ark_bruss\;develop"
-  )
-
-# Examples using LAPACK linear solvers
-set(FARKODE_examples_BL
-  )
-
-# Add sparse solvers examples for 64-bit indextype configurations only,
-# not compatible with 32-bit indextype
-if(SUNDIALS_INDEX_SIZE MATCHES "64")
-
-  # Examples using KLU linear solver
-  set(FARKODE_examples_KLU
-    "ark_bruss1D_FEM_klu\;develop"
-    )
-
-  # Examples using SuperLU_MT linear solver
-  set(FARKODE_examples_SUPERLUMT
-    )
-
-endif()
-
-# Auxiliary files to install
-set(ARKODE_extras
-  plot_sol.py
-  plot_brusselator1D_FEM.py
-  )
-
-# Specify libraries to link against
-set(ARKODE_LIB sundials_arkode)
-set(NVECS_LIB sundials_nvecserial)
-set(FNVECS_LIB sundials_fnvecserial)
-
-# Only static FCMIX libraries are available
-set(FARKODE_LIB sundials_farkode${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FARKODE_LIB} ${ARKODE_LIB} ${FNVECS_LIB} ${NVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FARKODE_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f90)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-  set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f90 ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-  endif()
-
-endforeach(example_tuple ${FARKODE_examples})
-
-
-# Add the build and install targets for each LAPACK example (if needed)
-if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-
-  # Sundials LAPACK linear solver modules
-  set(SUNLINSOLLAPACK_LIBS
-    sundials_sunlinsollapackband
-    sundials_sunlinsollapackdense
-    sundials_fsunlinsollapackband
-    sundials_fsunlinsollapackdense)
-
-  # LAPACK libraries
-  list(APPEND SUNLINSOLLAPACK_LIBS ${LAPACK_LIBRARIES})
-
-  foreach(example_tuple ${FARKODE_examples_BL})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f90)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f90 ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_BL})
-
-endif()
-
-
-# Add the build and install targets for each KLU example (if needed)
-if(BUILD_SUNLINSOL_KLU)
-
-  # Sundials KLU linear solver module
-  set(SUNLINSOLKLU_LIBS
-    sundials_sunlinsolklu
-    sundials_fsunlinsolklu)
-
-  # KLU libraries
-  list(APPEND SUNLINSOLKLU_LIBS)
-
-  foreach(example_tuple ${FARKODE_examples_KLU})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f90)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f90 ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_KLU})
-
-endif()
-
-
-# Add the build and install targets for each SuperLU_MT example (if needed)
-if(BUILD_SUNLINSOL_SUPERLUMT)
-
-  # Sundials SuperLU_MT linear solver module
-  set(SUNLINSOLSLUMT_LIBS
-    sundials_sunlinsolsuperlumt
-    sundials_fsunlinsolsuperlumt)
-
-  # SuperLU_MT libraries
-  list(APPEND SUNLINSOLSLUMT_LIBS ${SUPERLUMT_LIBRARIES})
-
-  foreach(example_tuple ${FARKODE_examples_SUPERLUMT})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f90)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-    set_target_properties(${example} PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f90 ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-    endif()
-
-  endforeach(example_tuple ${FARKODE_examples_SUPERLUMT})
-
-endif()
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-
-  # Install the extra files
-  foreach(extrafile ${ARKODE_extras})
-    install(FILES ${extrafile} DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial)
-  endforeach()
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "ARKODE")
-  set(SOLVER_LIB "sundials_arkode")
-  set(SOLVER_FLIB "sundials_farkode")
-
-  examples2string(FARKODE_examples EXAMPLES)
-
-  if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-    examples2string(FARKODE_examples_BL EXAMPLES_BL)
-  else()
-    set(EXAMPLES_BL "")
-  endif()
-
-  if(BUILD_SUNLINSOL_KLU)
-    examples2string(FARKODE_examples_KLU EXAMPLES_KLU)
-  else()
-    set(EXAMPLES_KLU "")
-  endif()
-
-  if(BUILD_SUNLINSOL_SUPERLUMT)
-    examples2string(FARKODE_examples_SUPERLUMT EXAMPLES_SLUMT)
-  else()
-    set(EXAMPLES_SLUMT "")
-  endif()
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_serial_F90_ex.in
-    ${PROJECT_BINARY_DIR}/examples/arkode/F90_serial/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/arkode/F90_serial/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_serial_F90_ex.in
-      ${PROJECT_BINARY_DIR}/examples/arkode/F90_serial/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/arkode/F90_serial/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/arkode/F90_serial
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(arkode F90_serial)
-
-endif()
diff --git a/examples/arkode/F90_serial/README b/examples/arkode/F90_serial/README
deleted file mode 100644
index 6f9fa7bb57..0000000000
--- a/examples/arkode/F90_serial/README
+++ /dev/null
@@ -1,48 +0,0 @@
-List of serial ARKODE F90 examples
-
-  ark_bruss : chemical kinetics example (DIRK/DENSE)
-  ark_bruss1D_FEM_klu : stiff chemical kinetics PDE, with FEM
-                        spatial discretization and CSR Jacobian (DIRK/KLU)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/arkode/F90_serial/ark_bruss.f90 b/examples/arkode/F90_serial/ark_bruss.f90
deleted file mode 100644
index a5e989745d..0000000000
--- a/examples/arkode/F90_serial/ark_bruss.f90
+++ /dev/null
@@ -1,304 +0,0 @@
-!-----------------------------------------------------------------
-! Programmer(s): Daniel R. Reynolds @ SMU
-!-----------------------------------------------------------------
-! SUNDIALS Copyright Start
-! Copyright (c) 2002-2023, Lawrence Livermore National Security
-! and Southern Methodist University.
-! All rights reserved.
-!
-! See the top-level LICENSE and NOTICE files for details.
-!
-! SPDX-License-Identifier: BSD-3-Clause
-! SUNDIALS Copyright End
-!-----------------------------------------------------------------
-! Example problem:
-! 
-! The following test simulates a brusselator problem from chemical 
-! kinetics.  This is an ODE system with 3 components, Y = [u,v,w], 
-! satisfying the equations,
-!    du/dt = a - (w+1)*u + v*u^2
-!    dv/dt = w*u - v*u^2
-!    dw/dt = (b-w)/ep - w*u
-! for t in the interval [0.0, 10.0], with initial conditions 
-! Y0 = [u0,v0,w0].  We use the initial conditions and parameters 
-!    u0=3.9,  v0=1.1,  w0=2.8,  a=1.2,  b=2.5,  ep=1.0e-5
-! Here, all three solution components exhibit a rapid transient 
-! change during the first 0.2 time units, followed by a slow and 
-! smooth evolution.
-! 
-! This program solves a the Fortran ODE test problem using the 
-! FARKODE interface for the ARKode ODE solver module.
-! 
-! This program uses the IMEX ARK solver; here the 
-! implicit systems are solved with a modified Newton iteration
-! with the SUNDENSE linear solver.  The Jacobian routine and 
-! right-hand side routines are supplied.
-!
-! Output is printed 10 times throughout the defined time interval.
-! Run statistics (optional outputs) are printed at the end.
-!-----------------------------------------------------------------
-
-!-----------------------------------------------------------------
-! Main driver program
-!-----------------------------------------------------------------
-program driver
-  ! Declarations
-  implicit none
-  include "sundials/sundials_fconfig.h"
-
-  ! general problem variables
-  integer*8, parameter :: NEQ=3
-  real(kind=REALTYPE), parameter :: T0=0.d0, Tf=10.d0
-  real(kind=REALTYPE) :: dTout, Tout, Tcur, rtol, atol, rout(6)
-  integer   :: it, Nt, ier
-  integer*8 :: iout(35)
-  real(kind=REALTYPE), dimension(NEQ) :: y
-
-  ! real/integer parameters to pass through to supplied functions
-  !    ipar(1) -> unused
-  !    rpar(1) -> "a" parameter
-  !    rpar(2) -> "b" parameter 
-  !    rpar(3) -> "ep" parameter
-  integer*8 :: ipar
-  real(kind=REALTYPE) :: rpar(3)
-
-  ! solver parameters
-  integer :: adapt_method
-  integer*8 :: order
-  real(kind=REALTYPE) :: nlscoef, adapt_params
-
-  !-----------------------
-  ! set some solver parameters
-  order = 3          ! 3rd order method
-  adapt_method = 0   ! PID-controller
-  nlscoef = 1.d-2    ! Newton solver tolerance coefficient
-
-  ! time-stepping information
-  dTout = (Tf-T0)/10.d0    ! output time interval
-  Nt = Tf/dTout + 0.5      ! number of outputs
-
-  ! set initial conditions, problem parameters
-  y(1) = 3.9d0     ! u0
-  y(2) = 1.1d0     ! v0
-  y(3) = 2.8d0     ! w0
-  rpar(1) = 1.2d0  ! a
-  rpar(2) = 2.5d0  ! b
-  rpar(3) = 1.d-5  ! ep
-
-  ! set tolerances according to problem specifications
-  atol = 1.d-10
-  rtol = 1.d-6
-  
-  ! initialize vector module
-  call FNVInitS(4, NEQ, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FNVInitS = ',ier
-     stop
-  endif
-
-  ! initialize dense matrix and dense linear solver modules
-  call FSunDenseMatInit(4, NEQ, NEQ, ier)
-  call FSunDenseLinSolInit(4, ier)
-  
-  ! initialize ARKode solver to use IMEX integrator, scalar tolerances
-  call FARKMalloc(T0, y, 2, 1, rtol, atol, &
-                  iout, rout, ipar, rpar, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKMalloc = ',ier
-     stop
-  endif
-
-  ! set integrator options
-  call FARKSetIin('ORDER', order, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKSetIin = ',ier
-     stop
-  endif
-  call FARKSetRin('NLCONV_COEF', nlscoef, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKSetIin = ',ier
-     stop
-  endif
-  adapt_params = 0.d0
-  call FARKSetAdaptivityMethod(adapt_method, 1, 0, adapt_params, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKSetAdaptMethod = ',ier
-     stop
-  endif
-
-  ! attach matrix and linear solver modules to ARKLs interface
-  call FARKLsInit(ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKLsInit = ',ier
-     stop
-  endif
-  
-  ! notify ARKLs module of user-supplied Jacobian construction routine
-  call FARKDenseSetJac(1, ier)
-  if (ier < 0) then
-     write(0,*) 'Error in FARKDenseSetJac = ',ier
-     stop
-  endif
-
-  ! Open output stream for results, output comment line
-  open(100, file='solution.txt')
-  write(100,*) '# t u v w'
-
-  ! output initial condition to disk 
-  write(100,'(3x,4(es23.16,1x))') T0, y
-
-  ! loop over time outputs
-  Tout = T0
-  Tcur = T0
-  print *, '        t           u           v           w'
-  print *, '  ----------------------------------------------------'
-  print '(3x,4(es12.5,1x))', Tcur, y
-  do it = 1,Nt
-
-     Tout = min(Tout + dTout, Tf)           ! set next output time
-     call FARKode(Tout, Tcur, y, 1, ier)    ! call solver
-     if (ier < 0) then
-        print *, 'Error at step ',it,', FARKode return flag =',ier
-        exit
-     end if
-
-     ! output current solution
-     print '(3x,4(es12.5,1x))', Tcur, y
-     write(100,'(3x,4(es23.16,1x))') Tcur, y
-
-  end do
-  print *, '  ----------------------------------------------------'
-  close(100)
-
-  ! output solver statistics
-  print *, '  '
-  print *, 'Final Solver Statistics:'
-  print '(2(A,i7),A)', '   Internal solver steps =', iout(3), &
-       ' (attempted =', iout(6), ')'
-  print '(2(A,i7))', '   Total RHS evals:  Fe =', iout(7), &
-       ',  Fi =', iout(8)
-  print '(A,i7)', '   Total linear solver setups =', iout(9)
-  print '(A,i7)', '   Total RHS evals for setting up the linear system =', iout(17)
-  print '(A,i7)', '   Total number of Jacobian evaluations =', iout(18)
-  print '(A,i7)', '   Total number of Newton iterations =', iout(11)
-  print '(A,i7)', '   Total number of nonlinear solver convergence failures =', iout(12)
-  print '(A,i7)', '   Total number of error test failures =', iout(10)
-  print *, '  '
-
-  ! clean up
-  call FARKFree()
-
-end program driver
-!-----------------------------------------------------------------
-
-!-----------------------------------------------------------------
-! Required subroutines for FARKODE interface
-!-----------------------------------------------------------------
-
-subroutine farkifun(t, y, ydot, ipar, rpar, ier)
-!-----------------------------------------------------------------
-! Implicit portion of the right-hand side of the ODE system
-!-----------------------------------------------------------------
-
-  ! Declarations
-  implicit none
-  include "sundials/sundials_fconfig.h"
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in) :: t, rpar(3)
-  integer*8, intent(in) :: ipar(1)
-  real(kind=REALTYPE), intent(in)  :: y(3)
-  real(kind=REALTYPE), intent(out) :: ydot(3)
-  integer,   intent(out) :: ier
-
-  ! temporary variables
-  real*8 :: u, v, w, a, b, ep
-
-  ! set temporary values
-  a  = rpar(1)
-  b  = rpar(2)
-  ep = rpar(3)
-  u  = y(1)
-  v  = y(2)
-  w  = y(3)
-
-  ! fill implicit RHS, set success flag
-  ydot(1) = 0.d0
-  ydot(2) = 0.d0
-  ydot(3) = (b-w)/ep
-  ier = 0
-  
-end subroutine farkifun
-!-----------------------------------------------------------------
-
-subroutine farkefun(t, y, ydot, ipar, rpar, ier)
-!-----------------------------------------------------------------
-! Explicit portion of the right-hand side of the ODE system
-!-----------------------------------------------------------------
-
-  ! Declarations
-  implicit none
-  include "sundials/sundials_fconfig.h"
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in)  :: t, rpar(3)
-  integer*8, intent(in) :: ipar(1)
-  real(kind=REALTYPE), intent(in)  :: y(3)
-  real(kind=REALTYPE), intent(out) :: ydot(3)
-  integer,   intent(out) :: ier
-
-  ! temporary variables
-  real*8 :: u, v, w, a, b, ep
-
-  ! set temporary values
-  a  = rpar(1)
-  b  = rpar(2)
-  ep = rpar(3)
-  u  = y(1)
-  v  = y(2)
-  w  = y(3)
-
-  ! fill explicit RHS, set success flag
-  ydot(1) = a - (w+1.d0)*u + v*u*u
-  ydot(2) = w*u - v*u*u
-  ydot(3) = -w*u
-  ier = 0
-  
-end subroutine farkefun
-!-----------------------------------------------------------------
-
-subroutine farkdjac(neq,t,y,fy,DJac,h,ipar,rpar,wk1,wk2,wk3,ier)
-!-----------------------------------------------------------------
-! Jacobian computation routine
-!-----------------------------------------------------------------
-
-  ! Declarations
-  implicit none
-  include "sundials/sundials_fconfig.h"
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in) :: t, h, rpar(3)
-  integer*8, intent(in) :: ipar(1)
-  integer*8, intent(in) :: neq
-  integer,   intent(out) :: ier
-  real(kind=REALTYPE), intent(in), dimension(neq) :: y, fy, wk1, wk2, wk3
-  real(kind=REALTYPE), intent(out) :: DJac(neq,neq)
-
-  ! temporary variables
-  real*8 :: u, v, w, a, b, ep
-
-  ! set temporary values
-  a  = rpar(1)
-  b  = rpar(2)
-  ep = rpar(3)
-  u  = y(1)
-  v  = y(2)
-  w  = y(3)
-
-  ! fill implicit Jacobian, set success flag
-  DJac = 0.d0
-  DJac(3,3) = -1.d0/ep
-  ier = 0
-    
-end subroutine farkdjac
-!-----------------------------------------------------------------
diff --git a/examples/arkode/F90_serial/ark_bruss.out b/examples/arkode/F90_serial/ark_bruss.out
deleted file mode 100644
index cc65b446ea..0000000000
--- a/examples/arkode/F90_serial/ark_bruss.out
+++ /dev/null
@@ -1,25 +0,0 @@
-         t           u           v           w
-   ----------------------------------------------------
-    0.00000E+00  3.90000E+00  1.10000E+00  2.80000E+00
-    1.00000E+00  2.07527E+00  1.05960E+00  2.49993E+00
-    2.00000E+00  1.10046E+00  1.72361E+00  2.49996E+00
-    3.00000E+00  7.89620E-01  2.32667E+00  2.50000E+00
-    4.00000E+00  8.11773E-01  2.72558E+00  2.49996E+00
-    5.00000E+00  1.18700E+00  2.59554E+00  2.49998E+00
-    6.00000E+00  1.88731E+00  1.49410E+00  2.49996E+00
-    7.00000E+00  1.32327E+00  1.61902E+00  2.50001E+00
-    8.00000E+00  9.21787E-01  2.13022E+00  2.50000E+00
-    9.00000E+00  8.49543E-01  2.53947E+00  2.49995E+00
-    1.00000E+01  1.06497E+00  2.59595E+00  2.49994E+00
-   ----------------------------------------------------
-   
- Final Solver Statistics:
-   Internal solver steps =    905 (attempted =    934)
-   Total RHS evals:  Fe =   3739,  Fi =   7529
-   Total linear solver setups =    158
-   Total RHS evals for setting up the linear system =      0
-   Total number of Jacobian evaluations =     28
-   Total number of Newton iterations =   3790
-   Total number of nonlinear solver convergence failures =      0
-   Total number of error test failures =     29
-   
diff --git a/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.f90 b/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.f90
deleted file mode 100644
index 2c54b42ec7..0000000000
--- a/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.f90
+++ /dev/null
@@ -1,1161 +0,0 @@
-!-----------------------------------------------------------------
-! Programmer(s): Daniel R. Reynolds @ SMU
-!-----------------------------------------------------------------
-! SUNDIALS Copyright Start
-! Copyright (c) 2002-2023, Lawrence Livermore National Security
-! and Southern Methodist University.
-! All rights reserved.
-!
-! See the top-level LICENSE and NOTICE files for details.
-!
-! SPDX-License-Identifier: BSD-3-Clause
-! SUNDIALS Copyright End
-!-----------------------------------------------------------------
-! Example problem:
-!
-! The following test simulates a brusselator problem from chemical
-! kinetics.  This is a PDE system with 3 components, Y = [u,v,w],
-! satisfying the equations,
-!    du/dt = du*u_xx + a - (w+1)*u + v*u^2
-!    dv/dt = dv*v_xx + w*u - v*u^2
-!    dw/dt = dw*w_xx + (b-w)/ep - w*u
-! for t in the interval [0, 10], x in [0, 10], with initial
-! conditions
-!    u(0,x) =  a  + 0.1*sin(pi*x),
-!    v(0,x) = b/a + 0.1*sin(pi*x),
-!    w(0,x) =  b  + 0.1*sin(pi*x),
-! and with stationary boundary conditions, i.e.
-!    u_t(t,0) = u_t(t,1) = 0,
-!    v_t(t,0) = v_t(t,1) = 0,
-!    w_t(t,0) = w_t(t,1) = 0.
-!
-! Here, we use a piecewise linear Galerkin finite element
-! discretization in space, where all element-wise integrals are
-! computed using 3-node Gaussian quadrature (since we will have
-! quartic polynomials in the reaction terms for the u_t and v_t
-! equations (including the test function)).  The time derivative
-! terms in this system will include a mass matrix, giving rise to
-! an ODE system of the form
-!      M y_t = L y + R(y),
-! where M is the 3x3 block mass matrix for each component, L is
-! the 3x3 block Laplace operator for each component, and R(y) is
-! comprised of the nonlinear reaction terms for each component.
-! Since it it highly inefficient to rewrite this system as
-!      y_t = M^{-1}(L y + R(y)),
-! we solve this system using FARKODE, with a user-supplied mass
-! matrix.  We therefore provide functions to evaluate the ODE RHS
-!    f(t,y) = L y + R(y),
-! its Jacobian
-!    J(t,y) = L + dR/dy,
-! and the mass matrix, M.
-!
-! We use N=201 spatial nodes, with parameters
-!    a=0.6,  b=2.0,  du=0.025,  dv=0.025,  dw=0.025,  ep=1.d-5
-!
-! This program solves the problem with the DIRK method, using a
-! Newton iteration with the SUNKLU sparse linear solvers for both
-! the system and mass matrices.  These matrices are stored in
-! compressed-sparse-row format.
-!
-! Output is printed 10 times throughout the defined time interval.
-! Run statistics (optional outputs) are printed at the end.
-!-----------------------------------------------------------------
-
-
-! user data structure
-module UserData
-  implicit none
-  include "sundials/sundials_fconfig.h"
-  save
-
-  integer*8 :: N                   ! number of intervals
-  real*8, allocatable :: x(:)      ! mesh node locations
-  real*8 :: a                      ! constant forcing on u
-  real*8 :: b                      ! steady-state value of w
-  real*8 :: du                     ! diffusion coeff for u
-  real*8 :: dv                     ! diffusion coeff for v
-  real*8 :: dw                     ! diffusion coeff for w
-  real*8 :: ep                     ! stiffness parameter
-
-contains
-
-  ! function that maps 2D data into 1D address space
-  ! (0-based since CSR matrix will be sent to C solver)
-  integer(kind=8) function idx(ix,ivar)
-    integer :: ivar, ix
-    idx = 3*(ix-1) + ivar - 1
-  end function idx
-
-end module UserData
-
-
-! finite element basis functions
-module FEM
-
-contains
-
-  ! left/right basis functions
-  double precision function ChiL(xl,xr,x)
-    double precision :: xl, xr, x
-    ChiL = (xr-x)/(xr-xl)
-  end function ChiL
-
-  double precision function ChiR(xl,xr,x)
-    double precision :: xl, xr, x
-    ChiR = (x-xl)/(xr-xl)
-  end function ChiR
-
-  ! derivatives of left/right basis functions
-  double precision function ChiL_x(xl,xr)
-    double precision :: xl, xr
-    ChiL_x = 1.d0/(xl-xr)
-  end function ChiL_X
-
-  double precision function ChiR_x(xl,xr)
-    double precision :: xl, xr
-    ChiR_x = 1.d0/(xr-xl)
-  end function ChiR_x
-
-  ! FEM output evaluation routines: value and derivative
-  double precision function Eval(ul,ur,xl,xr,x)
-    double precision :: ul, ur, xl, xr, x
-    Eval = ul*ChiL(xl,xr,x) + ur*ChiR(xl,xr,x)
-  end function Eval
-
-  double precision function Eval_x(ul,ur,xl,xr)
-    double precision :: ul, ur, xl, xr
-    Eval_x = ul*ChiL_x(xl,xr) + ur*ChiR_x(xl,xr)
-  end function Eval_x
-
-end module FEM
-
-
-! quadrature data
-module Quadrature
-
-contains
-
-  ! nodes
-  double precision function X1(xl,xr)
-    double precision :: xl, xr
-    X1 = 0.5d0*(xl+xr) - 0.5d0*(xr-xl)*0.774596669241483377035853079956d0
-  end function X1
-
-  double precision function X2(xl,xr)
-    double precision :: xl, xr
-    X2 = 0.5d0*(xl+xr)
-  end function X2
-
-  double precision function X3(xl,xr)
-    double precision :: xl, xr
-    X3 = 0.5d0*(xl+xr) + 0.5d0*(xr-xl)*0.774596669241483377035853079956d0
-  end function X3
-
-  ! quadrature
-  double precision function Quad(f1,f2,f3,xl,xr)
-    real*8 :: f1, f2, f3, xl, xr
-    real*8, parameter :: wt1=0.55555555555555555555555555555556d0
-    real*8, parameter :: wt2=0.88888888888888888888888888888889d0
-    real*8, parameter :: wt3=0.55555555555555555555555555555556d0
-    Quad = 0.5d0*(xr-xl)*(wt1*f1 + wt2*f2 + wt3*f3)
-  end function Quad
-
-end module Quadrature
-!-----------------------------------------------------------------
-
-
-
-
-!-----------------------------------------------------------------
-! Main driver program
-!-----------------------------------------------------------------
-program driver
-
-  ! inclusions
-  use UserData
-  implicit none
-
-  ! Declarations
-  ! general problem variables
-  real(kind=REALTYPE), parameter :: T0=0.d0, Tf=10.d0
-  real(kind=REALTYPE) :: rtol, atol, rout(6), Tout, Tcur
-  real*8    :: dTout, pi, h, z
-  integer   :: i, it, Nt, ier, ordering, sparsetype, time_dep
-  integer*8 :: iout(35), NEQ, nnz, Iinput
-  real(kind=REALTYPE), allocatable :: y(:,:), umask(:,:)
-  real(kind=REALTYPE), allocatable :: vmask(:,:), wmask(:,:)
-
-  ! dummy real/integer parameters to pass through to supplied functions
-  integer*8 :: ipar
-  real(kind=REALTYPE) :: rpar
-
-  !-----------------------
-
-  ! set problem parameters (in UserData structure)
-  N = 201                 ! number of intervals
-  a = 0.6d0               ! constant forcing on u
-  b = 2.d0                ! steady-state value of w
-  du = 2.5d-2             ! diffusion coeff for u
-  dv = 2.5d-2             ! diffusion coeff for v
-  dw = 2.5d-2             ! diffusion coeff for w
-  ep = 1.d-5              ! stiffness parameter
-
-  ! set overall problem size, allocate solution/mask/temporary arrays
-  NEQ = 3*N
-  allocate(y(3,N), umask(3,N), vmask(3,N), wmask(3,N))
-
-  ! allocate and set up spatial mesh; this [arbitrarily] clusters
-  ! more intervals near the end points of the interval
-  allocate(x(N))          ! mesh node locations
-  pi = 4.d0*atan(1.d0)
-  h = 10.d0/(N-1)
-  do i=1,N
-     z = -5.d0 + h*(i-1)
-     x(i) = 0.5d0/atan(5.d0)*atan(z) + 0.5d0
-  enddo
-
-  ! output mesh to disk
-  open(200, file='bruss_FEM_mesh.txt')
-  do i=1,N
-     write(200,*) x(i)
-  enddo
-  close(200)
-
-  ! time-stepping information
-  dTout = (Tf-T0)/10.d0
-  Nt = Tf/dTout + 0.5
-
-  ! set initial conditions
-  do i=1,N
-     y(1,i) =  a  + 0.1d0*sin(pi*x(i))   ! u0
-     y(2,i) = b/a + 0.1d0*sin(pi*x(i))   ! v0
-     y(3,i) =  b  + 0.1d0*sin(pi*x(i))   ! w0
-  enddo
-
-  ! set mask values for each solution component
-  umask = 0.d0
-  vmask = 0.d0
-  wmask = 0.d0
-  do i=1,N
-     umask(1,i) = 1.d0
-     vmask(2,i) = 1.d0
-     wmask(3,i) = 1.d0
-  enddo
-
-  ! set tolerances according to problem specifications
-  atol = 1.d-11
-  rtol = 1.d-6
-
-  ! initialize vector module
-  call FNVInitS(4, NEQ, ier)
-
-  ! initialize system and mass matrix modules
-  nnz = 15*NEQ     ! integer number of nonzeros
-  ordering = 0     ! AMD
-  sparsetype = 1   ! CSR
-  call FSunSparseMatInit(4, NEQ, NEQ, nnz, sparsetype, ier)
-  call FSunSparseMassMatInit(NEQ, NEQ, nnz, sparsetype, ier)
-
-  ! initialize KLU system and mass solvers
-  call FSunKLUInit(4, ier)
-  call FSunMassKLUInit(ier)
-
-  ! initialize ARKode solver
-  ipar = 0
-  rpar = 0.0
-  iout = 0
-  rout = 0.0
-  call FARKMalloc(T0, y, 0, 1, rtol, atol, &
-                  iout, rout, ipar, rpar, ier)
-
-  ! set optional inputs
-  Iinput = 1
-  call FARKSetIin('IMPLICIT', Iinput, ier)
-  Iinput = 1000
-  call FARKSetIin('MAX_NSTEPS', Iinput, ier)
-  call FARKSetResTolerance(1, atol, ier)
-
-  ! attach matrix and linear solver objects to ARKLs interfaces
-  time_dep = 0
-  call FARKLsInit(ier)
-  call FARKSparseSetJac(ier)
-  call FARKLsMassInit(time_dep, ier)
-  call FARKSparseSetMass(ier)
-
-  ! Open output stream for results
-  open(501, file='bruss_FEM_u.txt')
-  open(502, file='bruss_FEM_v.txt')
-  open(503, file='bruss_FEM_w.txt')
-
-  ! output initial condition to disk
-  write(501,*) ( y(1,i), i=1,N )
-  write(502,*) ( y(2,i), i=1,N )
-  write(503,*) ( y(3,i), i=1,N )
-
-  ! output solver parameters to screen
-  call FARKWriteParameters(ier)
-
-  ! loop over time outputs
-  Tout = T0
-  Tcur = T0
-  print *, '        t         ||u||_rms    ||v||_rms    ||w||_rms'
-  print *, '  ----------------------------------------------------'
-  print '(3x,4(es12.5,1x))', Tcur, sqrt(sum(y*y*umask)/N), &
-       sqrt(sum(y*y*vmask)/N), sqrt(sum(y*y*wmask)/N)
-  do it = 1,Nt
-
-     ! set next output time
-     Tout = min(Tout + dTout, Tf)
-
-     ! set next output time
-     call FARKSetRin('STOP_TIME', Tout, ier)
-
-     ! call solver
-     call FARKode(Tout, Tcur, y, 1, ier)
-     if (ier < 0) then
-        write(0,*) 'Solver failure, stopping integration'
-        stop
-     end if
-
-     ! output current solution information
-     print '(3x,4(es12.5,1x))', Tcur, sqrt(sum(y*y*umask)/N), &
-          sqrt(sum(y*y*vmask)/N), sqrt(sum(y*y*wmask)/N)
-
-     ! output current results to disk
-     write(501,*) ( y(1,i), i=1,N )
-     write(502,*) ( y(2,i), i=1,N )
-     write(503,*) ( y(3,i), i=1,N )
-
-  end do
-  print *, '  ----------------------------------------------------'
-
-  ! close solution output files
-  close(501)
-  close(502)
-  close(503)
-
-  ! output solver statistics
-  print *, '  '
-  print *, 'Final Solver Statistics:'
-  print *, '   Internal solver steps = ', iout(3),' (attempted =', iout(6), ')'
-  print *, '   Total RHS evals:  Fe = ', iout(7),'  Fi = ', iout(8)
-  print *, '   Total linear solver setups = ', iout(9)
-  print *, '   Total RHS evals for setting up the linear system = ', iout(17)
-  print *, '   Total number of Jacobian evaluations = ', iout(18)
-  print *, '   Total number of nonlinear iterations = ', iout(11)
-  print *, '   Total number of nonlinear solver convergence failures = ',iout(12)
-  print *, '   Total number of error test failures = ', iout(10)
-  print *, '   Total number of mass matrix evaluations = ', iout(28)
-  print *, '  '
-
-  ! clean up
-  deallocate(y, umask, vmask, wmask, x)
-  call FARKFree()
-
-end program driver
-!-----------------------------------------------------------------
-
-
-
-
-!-----------------------------------------------------------------
-! User-supplied subroutines for FARKODE interface
-!-----------------------------------------------------------------
-
-
-subroutine FARKIFun(t, y, ydot, ipar, rpar, ier)
-!-----------------------------------------------------------------
-! Right-hand side of the ODE system
-!-----------------------------------------------------------------
-  use UserData
-  use FEM
-  use Quadrature
-
-  ! Declarations
-  implicit none
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in)  :: t, rpar(1)
-  integer*8, intent(in) :: ipar(1)
-  integer, intent(out)  :: ier
-  real(kind=REALTYPE), intent(in)  :: y(3,N)
-  real(kind=REALTYPE), intent(out) :: ydot(3,N)
-
-  ! Local data
-  integer :: ix
-  logical :: left, right
-  real*8  :: ul, ur, vl, vr, wl, wr, xl, xr, u, v, w, f1, f2, f3
-
-  ! clear out rhs
-  ydot = 0.d0
-
-  ! iterate over intervals, filling in rhs function
-  do ix=1,N-1
-
-     ! set booleans to determine whether equations exist on the left/right */
-     left  = .true.
-     right = .true.
-     if (ix==1)      left  = .false.
-     if (ix==(N-1))  right = .false.
-
-     ! set nodal value shortcuts (interval index aligns with left node)
-     ul = y(1,ix)
-     vl = y(2,ix)
-     wl = y(3,ix)
-     ur = y(1,ix+1)
-     vr = y(2,ix+1)
-     wr = y(3,ix+1)
-
-     ! set mesh shortcuts
-     xl = x(ix)
-     xr = x(ix+1)
-
-     !    left test function
-     if (left) then
-
-        ! u -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = (a - (w+1.d0)*u + v*u*u) * ChiL(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = (a - (w+1.d0)*u + v*u*u) * ChiL(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = (a - (w+1.d0)*u + v*u*u) * ChiL(xl,xr,X3(xl,xr))
-        ydot(1,ix) = ydot(1,ix) + Quad(f1,f2,f3,xl,xr)
-
-        ! u -- diffusion
-        f1 = -du * Eval_x(ul,ur,xl,xr) * ChiL_x(xl,xr)
-        ydot(1,ix) = ydot(1,ix) + Quad(f1,f1,f1,xl,xr)
-
-        ! v -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = (w*u - v*u*u) * ChiL(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = (w*u - v*u*u) * ChiL(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = (w*u - v*u*u) * ChiL(xl,xr,X3(xl,xr))
-        ydot(2,ix) = ydot(2,ix) + Quad(f1,f2,f3,xl,xr)
-
-        ! v -- diffusion
-        f1 = -dv * Eval_x(vl,vr,xl,xr) * ChiL_x(xl,xr)
-        ydot(2,ix) = ydot(2,ix) + Quad(f1,f1,f1,xl,xr)
-
-        ! w -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = ((b-w)/ep - w*u) * ChiL(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = ((b-w)/ep - w*u) * ChiL(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = ((b-w)/ep - w*u) * ChiL(xl,xr,X3(xl,xr))
-        ydot(3,ix) = ydot(3,ix) + Quad(f1,f2,f3,xl,xr)
-
-        ! w -- diffusion
-        f1 = -dw * Eval_x(wl,wr,xl,xr) * ChiL_x(xl,xr)
-        ydot(3,ix) = ydot(3,ix) + Quad(f1,f1,f1,xl,xr)
-
-     end if
-
-     !    right test function
-     if (right) then
-
-        ! u -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = (a - (w+1.d0)*u + v*u*u) * ChiR(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = (a - (w+1.d0)*u + v*u*u) * ChiR(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = (a - (w+1.d0)*u + v*u*u) * ChiR(xl,xr,X3(xl,xr))
-        ydot(1,ix+1) = ydot(1,ix+1) + Quad(f1,f2,f3,xl,xr)
-
-        ! u -- diffusion
-        f1 = -du * Eval_x(ul,ur,xl,xr) * ChiR_x(xl,xr)
-        ydot(1,ix+1) = ydot(1,ix+1) + Quad(f1,f1,f1,xl,xr)
-
-        ! v -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = (w*u - v*u*u) * ChiR(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = (w*u - v*u*u) * ChiR(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = (w*u - v*u*u) * ChiR(xl,xr,X3(xl,xr))
-        ydot(2,ix+1) = ydot(2,ix+1) + Quad(f1,f2,f3,xl,xr)
-
-        ! v -- diffusion
-        f1 = -dv * Eval_x(vl,vr,xl,xr) * ChiR_x(xl,xr)
-        ydot(2,ix+1) = ydot(2,ix+1) + Quad(f1,f1,f1,xl,xr)
-
-        ! w -- reaction
-        u = Eval(ul, ur, xl, xr, X1(xl,xr))
-        v = Eval(vl, vr, xl, xr, X1(xl,xr))
-        w = Eval(wl, wr, xl, xr, X1(xl,xr))
-        f1 = ((b-w)/ep - w*u) * ChiR(xl,xr,X1(xl,xr))
-        u = Eval(ul, ur, xl, xr, X2(xl,xr))
-        v = Eval(vl, vr, xl, xr, X2(xl,xr))
-        w = Eval(wl, wr, xl, xr, X2(xl,xr))
-        f2 = ((b-w)/ep - w*u) * ChiR(xl,xr,X2(xl,xr))
-        u = Eval(ul, ur, xl, xr, X3(xl,xr))
-        v = Eval(vl, vr, xl, xr, X3(xl,xr))
-        w = Eval(wl, wr, xl, xr, X3(xl,xr))
-        f3 = ((b-w)/ep - w*u) * ChiR(xl,xr,X3(xl,xr))
-        ydot(3,ix+1) = ydot(3,ix+1) + Quad(f1,f2,f3,xl,xr)
-
-        ! w -- diffusion
-        f1 = -dw * Eval_x(wl,wr,xl,xr) * ChiR_x(xl,xr)
-        ydot(3,ix+1) = ydot(3,ix+1) + Quad(f1,f1,f1,xl,xr)
-
-     endif
-
-  enddo
-  ier = 0
-
-  return
-
-end subroutine farkifun
-!-----------------------------------------------------------------
-
-
-
-subroutine farkefun(t, y, ydot, ipar, rpar, ier)
-!-----------------------------------------------------------------
-! (unused) Explicit portion of the ODE right-hand function
-!-----------------------------------------------------------------
-  use UserData
-
-  ! Declarations
-  implicit none
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in)  :: t, rpar(1)
-  integer*8, intent(in) :: ipar(1)
-  real(kind=REALTYPE), intent(in)  :: y(3,N)
-  real(kind=REALTYPE), intent(out) :: ydot(3,N)
-  integer, intent(out)  :: ier
-
-  ! return with success (since fully implicit)
-  ydot = 0.d0
-  ier = 0
-
-end subroutine farkefun
-!-----------------------------------------------------------------
-
-
-
-subroutine farkspjac(t, y, fy, neq, nnz, Jdata, Jcolvals, &
-                     Jrowptrs, h, ipar, rpar, wk1, wk2, wk3, ier)
-!-----------------------------------------------------------------
-! Jacobian computation routine -- CSR format
-!-----------------------------------------------------------------
-  use UserData
-  use Quadrature
-  use FEM
-
-  ! Declarations
-  implicit none
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in)  :: t, h, rpar(1)
-  real(kind=REALTYPE), intent(in), dimension(3,N) :: y, fy, wk1, wk2, wk3
-  real(kind=REALTYPE), intent(out) :: Jdata(nnz)
-  integer*8, intent(in)  :: ipar(1), neq, nnz
-  integer(kind=SUNINDEXTYPE), intent(out) :: Jcolvals(nnz)
-  integer(kind=SUNINDEXTYPE), intent(out) :: Jrowptrs(neq+1)
-  integer,   intent(out) :: ier
-
-  ! Local data
-  integer :: ix, nz, Nint
-  real*8  :: ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr
-  real*8  :: u1, u2, u3, v1, v2, v3, w1, w2, w3
-  real*8  :: f1, f2, f3, df1, df2, df3, dQdf1, dQdf2, dQdf3
-  real*8  :: ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3
-  real*8, dimension(3,-1:1) :: Ju, Jv, Jw
-
-  ! check that vector/matrix dimensions match up
-  if ((3*N /= neq) .or. (nnz < 27*(N-2))) then
-     ier = 1
-     return
-  endif
-
-  ! set integer*4 version of N for call to idx()
-  Nint = N
-
-  ! clear out Jacobian matrix data
-  Jdata = 0.d0
-  nz = 0
-
-  ! Dirichlet boundary at left
-  Jrowptrs(idx(1,1)+1) = nz
-  Jrowptrs(idx(1,2)+1) = nz
-  Jrowptrs(idx(1,3)+1) = nz
-
-  ! iterate through nodes, filling in matrix by rows
-  do ix=2,N-1
-
-     ! set nodal value shortcuts (interval index aligns with left node)
-     xl = x(ix-1)
-     ul = y(1,ix-1)
-     vl = y(2,ix-1)
-     wl = y(3,ix-1)
-     xc = x(ix)
-     uc = y(1,ix)
-     vc = y(2,ix)
-     wc = y(3,ix)
-     xr = x(ix+1)
-     ur = y(1,ix+1)
-     vr = y(2,ix+1)
-     wr = y(3,ix+1)
-
-     ! compute entries of all Jacobian rows at node ix
-     Ju = 0.d0
-     Jv = 0.d0
-     Jw = 0.d0
-
-     ! first compute dependence on values to left and center
-
-     !    evaluate relevant variables in left subinterval
-     u1 = Eval(ul, uc, xl, xc, X1(xl,xc))
-     v1 = Eval(vl, vc, xl, xc, X1(xl,xc))
-     w1 = Eval(wl, wc, xl, xc, X1(xl,xc))
-     u2 = Eval(ul, uc, xl, xc, X2(xl,xc))
-     v2 = Eval(vl, vc, xl, xc, X2(xl,xc))
-     w2 = Eval(wl, wc, xl, xc, X2(xl,xc))
-     u3 = Eval(ul, uc, xl, xc, X3(xl,xc))
-     v3 = Eval(vl, vc, xl, xc, X3(xl,xc))
-     w3 = Eval(wl, wc, xl, xc, X3(xl,xc))
-
-     dQdf1 = Quad(1.d0, 0.d0, 0.d0, xl, xc)
-     dQdf2 = Quad(0.d0, 1.d0, 0.d0, xl, xc)
-     dQdf3 = Quad(0.d0, 0.d0, 1.d0, xl, xc)
-
-     ChiL1 = ChiL(xl, xc, X1(xl,xc))
-     ChiL2 = ChiL(xl, xc, X2(xl,xc))
-     ChiL3 = ChiL(xl, xc, X3(xl,xc))
-     ChiR1 = ChiR(xl, xc, X1(xl,xc))
-     ChiR2 = ChiR(xl, xc, X2(xl,xc))
-     ChiR3 = ChiR(xl, xc, X3(xl,xc))
-
-
-     !    compute diffusion Jacobian components
-
-     !    L_u = -du * u_x * ChiR_x
-     !     dL_u/dul
-     Ju(1,-1) = (-du) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiL_x(xl,xc) * ChiR_x(xl,xc)
-     !     dL_u/duc
-     Ju(1,0)  = (-du) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiR_x(xl,xc) * ChiR_x(xl,xc)
-
-     !    L_v = -dv * v_x * ChiR_x
-     !     dL_v/dvl
-     Jv(2,-1) = (-dv) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiL_x(xl,xc) * ChiR_x(xl,xc)
-     !     dL_v/dvc
-     Jv(2,0)  = (-dv) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiR_x(xl,xc) * ChiR_x(xl,xc)
-
-     !    L_w =  -dw * w_x * ChiR_x
-     !     dL_w/dwl
-     Jw(3,-1) = (-dw) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiL_x(xl,xc) * ChiR_x(xl,xc)
-     !     dL_w/dwc
-     Jw(3,0)  = (-dw) * Quad(1.d0,1.d0,1.d0,xl,xc) * ChiR_x(xl,xc) * ChiR_x(xl,xc)
-
-
-     !    compute reaction Jacobian components
-
-     !    R_u = (a - (w+1.d0)*u + v*u*u)
-     !     dR_u/dul
-     df1 = (-(w1+1.d0) + 2.d0*v1*u1) * ChiL1 * ChiR1
-     df2 = (-(w2+1.d0) + 2.d0*v2*u2) * ChiL2 * ChiR2
-     df3 = (-(w3+1.d0) + 2.d0*v3*u3) * ChiL3 * ChiR3
-     Ju(1,-1) = Ju(1,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/duc
-     df1 = (-(w1+1.d0) + 2.d0*v1*u1) * ChiR1 * ChiR1
-     df2 = (-(w2+1.d0) + 2.d0*v2*u2) * ChiR2 * ChiR2
-     df3 = (-(w3+1.d0) + 2.d0*v3*u3) * ChiR3 * ChiR3
-     Ju(1,0) = Ju(1,0)+ dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dvl
-     df1 = (u1*u1) * ChiL1 * ChiR1
-     df2 = (u2*u2) * ChiL2 * ChiR2
-     df3 = (u3*u3) * ChiL3 * ChiR3
-     Ju(2,-1) = Ju(2,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dvc
-     df1 = (u1*u1) * ChiR1 * ChiR1
-     df2 = (u2*u2) * ChiR2 * ChiR2
-     df3 = (u3*u3) * ChiR3 * ChiR3
-     Ju(2,0) = Ju(2,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dwl
-     df1 = (-u1) * ChiL1 * ChiR1
-     df2 = (-u2) * ChiL2 * ChiR2
-     df3 = (-u3) * ChiL3 * ChiR3
-     Ju(3,-1) = Ju(3,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dwc
-     df1 = (-u1) * ChiR1 * ChiR1
-     df2 = (-u2) * ChiR2 * ChiR2
-     df3 = (-u3) * ChiR3 * ChiR3
-     Ju(3,0) = Ju(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     !    R_v = (w*u - v*u*u)
-     !     dR_v/dul
-     df1 = (w1 - 2.d0*v1*u1) * ChiL1 * ChiR1
-     df2 = (w2 - 2.d0*v2*u2) * ChiL2 * ChiR2
-     df3 = (w3 - 2.d0*v3*u3) * ChiL3 * ChiR3
-     Jv(1,-1) = Jv(1,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/duc
-     df1 = (w1 - 2.d0*v1*u1) * ChiR1 * ChiR1
-     df2 = (w2 - 2.d0*v2*u2) * ChiR2 * ChiR2
-     df3 = (w3 - 2.d0*v3*u3) * ChiR3 * ChiR3
-     Jv(1,0) = Jv(1,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dvl
-     df1 = (-u1*u1) * ChiL1 * ChiR1
-     df2 = (-u2*u2) * ChiL2 * ChiR2
-     df3 = (-u3*u3) * ChiL3 * ChiR3
-     Jv(2,-1) = Jv(2,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dvc
-     df1 = (-u1*u1) * ChiR1 * ChiR1
-     df2 = (-u2*u2) * ChiR2 * ChiR2
-     df3 = (-u3*u3) * ChiR3 * ChiR3
-     Jv(2,0) = Jv(2,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dwl
-     df1 = (u1) * ChiL1 * ChiR1
-     df2 = (u2) * ChiL2 * ChiR2
-     df3 = (u3) * ChiL3 * ChiR3
-     Jv(3,-1) = Jv(3,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dwc
-     df1 = (u1) * ChiR1 * ChiR1
-     df2 = (u2) * ChiR2 * ChiR2
-     df3 = (u3) * ChiR3 * ChiR3
-     Jv(3,0) = Jv(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     !    R_w = ((b-w)/ep - w*u)
-     !     dR_w/dul
-     df1 = (-w1) * ChiL1 * ChiR1
-     df2 = (-w2) * ChiL2 * ChiR2
-     df3 = (-w3) * ChiL3 * ChiR3
-     Jw(1,-1) = Jw(1,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/duc
-     df1 = (-w1) * ChiR1 * ChiR1
-     df2 = (-w2) * ChiR2 * ChiR2
-     df3 = (-w3) * ChiR3 * ChiR3
-     Jw(1,0) = Jw(1,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/dwl
-     df1 = (-1.d0/ep - u1) * ChiL1 * ChiR1
-     df2 = (-1.d0/ep - u2) * ChiL2 * ChiR2
-     df3 = (-1.d0/ep - u3) * ChiL3 * ChiR3
-     Jw(3,-1) = Jw(3,-1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/dwc
-     df1 = (-1.d0/ep - u1) * ChiR1 * ChiR1
-     df2 = (-1.d0/ep - u2) * ChiR2 * ChiR2
-     df3 = (-1.d0/ep - u3) * ChiR3 * ChiR3
-     Jw(3,0) = Jw(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     ! second compute dependence on values to center and right
-
-     !    evaluate relevant variables in right subinterval
-     u1 = Eval(uc, ur, xc, xr, X1(xc,xr))
-     v1 = Eval(vc, vr, xc, xr, X1(xc,xr))
-     w1 = Eval(wc, wr, xc, xr, X1(xc,xr))
-     u2 = Eval(uc, ur, xc, xr, X2(xc,xr))
-     v2 = Eval(vc, vr, xc, xr, X2(xc,xr))
-     w2 = Eval(wc, wr, xc, xr, X2(xc,xr))
-     u3 = Eval(uc, ur, xc, xr, X3(xc,xr))
-     v3 = Eval(vc, vr, xc, xr, X3(xc,xr))
-     w3 = Eval(wc, wr, xc, xr, X3(xc,xr))
-
-     dQdf1 = Quad(1.d0, 0.d0, 0.d0, xc, xr)
-     dQdf2 = Quad(0.d0, 1.d0, 0.d0, xc, xr)
-     dQdf3 = Quad(0.d0, 0.d0, 1.d0, xc, xr)
-
-     ChiL1 = ChiL(xc, xr, X1(xc,xr))
-     ChiL2 = ChiL(xc, xr, X2(xc,xr))
-     ChiL3 = ChiL(xc, xr, X3(xc,xr))
-     ChiR1 = ChiR(xc, xr, X1(xc,xr))
-     ChiR2 = ChiR(xc, xr, X2(xc,xr))
-     ChiR3 = ChiR(xc, xr, X3(xc,xr))
-
-
-     !    compute diffusion Jacobian components
-
-     !    L_u = -du * u_x * ChiL_x
-     !     dL_u/duc
-     Ju(1,0) = Ju(1,0) + (-du) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiL_x(xc,xr)
-
-     !     dL_u/dur
-     Ju(1,1) = Ju(1,1) + (-du) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiR_x(xc,xr)
-
-     !    L_v = -dv * v_x * ChiL_x
-     !     dL_v/dvc
-     Jv(2,0) = Jv(2,0) + (-dv) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiL_x(xc,xr)
-
-     !     dL_v/dvr
-     Jv(2,1) = Jv(2,1) + (-dv) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiR_x(xc,xr)
-
-     !    L_w =  -dw * w_x * ChiL_x
-     !     dL_w/dwc
-     Jw(3,0) = Jw(3,0) + (-dw) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiL_x(xc,xr)
-
-     !     dL_w/dwr
-     Jw(3,1) = Jw(3,1) + (-dw) * Quad(1.d0,1.d0,1.d0,xc,xr) * ChiL_x(xc,xr) * ChiR_x(xc,xr)
-
-
-     !    compute reaction Jacobian components
-
-     !    R_u = (a - (w+1.d0)*u + v*u*u)
-     !     dR_u/duc
-     df1 = (-(w1+1.d0) + 2.d0*v1*u1) * ChiL1 * ChiL1
-     df2 = (-(w2+1.d0) + 2.d0*v2*u2) * ChiL2 * ChiL2
-     df3 = (-(w3+1.d0) + 2.d0*v3*u3) * ChiL3 * ChiL3
-     Ju(1,0) = Ju(1,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dur
-     df1 = (-(w1+1.d0) + 2.d0*v1*u1) * ChiL1 * ChiR1
-     df2 = (-(w2+1.d0) + 2.d0*v2*u2) * ChiL2 * ChiR2
-     df3 = (-(w3+1.d0) + 2.d0*v3*u3) * ChiL3 * ChiR3
-     Ju(1,1) = Ju(1,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dvc
-     df1 = (u1*u1) * ChiL1 * ChiL1
-     df2 = (u2*u2) * ChiL2 * ChiL2
-     df3 = (u3*u3) * ChiL3 * ChiL3
-     Ju(2,0) = Ju(2,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dvr
-     df1 = (u1*u1) * ChiL1 * ChiR1
-     df2 = (u2*u2) * ChiL2 * ChiR2
-     df3 = (u3*u3) * ChiL3 * ChiR3
-     Ju(2,1) = Ju(2,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dwc
-     df1 = (-u1) * ChiL1 * ChiL1
-     df2 = (-u2) * ChiL2 * ChiL2
-     df3 = (-u3) * ChiL3 * ChiL3
-     Ju(3,0) = Ju(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_u/dwr
-     df1 = (-u1) * ChiL1 * ChiR1
-     df2 = (-u2) * ChiL2 * ChiR2
-     df3 = (-u3) * ChiL3 * ChiR3
-     Ju(3,1) = Ju(3,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     !    R_v = (w*u - v*u*u)
-     !     dR_v/duc
-     df1 = (w1 - 2.d0*v1*u1) * ChiL1 * ChiL1
-     df2 = (w2 - 2.d0*v2*u2) * ChiL2 * ChiL2
-     df3 = (w3 - 2.d0*v3*u3) * ChiL3 * ChiL3
-     Jv(1,0) = Jv(1,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dur
-     df1 = (w1 - 2.d0*v1*u1) * ChiL1 * ChiR1
-     df2 = (w2 - 2.d0*v2*u2) * ChiL2 * ChiR2
-     df3 = (w3 - 2.d0*v3*u3) * ChiL3 * ChiR3
-     Jv(1,1) = Jv(1,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dvc
-     df1 = (-u1*u1) * ChiL1 * ChiL1
-     df2 = (-u2*u2) * ChiL2 * ChiL2
-     df3 = (-u3*u3) * ChiL3 * ChiL3
-     Jv(2,0) = Jv(2,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dvr
-     df1 = (-u1*u1) * ChiL1 * ChiR1
-     df2 = (-u2*u2) * ChiL2 * ChiR2
-     df3 = (-u3*u3) * ChiL3 * ChiR3
-     Jv(2,1) = Jv(2,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dwc
-     df1 = (u1) * ChiL1 * ChiL1
-     df2 = (u2) * ChiL2 * ChiL2
-     df3 = (u3) * ChiL3 * ChiL3
-     Jv(3,0) = Jv(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_v/dwr
-     df1 = (u1) * ChiL1 * ChiR1
-     df2 = (u2) * ChiL2 * ChiR2
-     df3 = (u3) * ChiL3 * ChiR3
-     Jv(3,1) = Jv(3,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     !    R_w = ((b-w)/ep - w*u)
-     !     dR_w/duc
-     df1 = (-w1) * ChiL1 * ChiL1
-     df2 = (-w2) * ChiL2 * ChiL2
-     df3 = (-w3) * ChiL3 * ChiL3
-     Jw(1,0) = Jw(1,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/dur
-     df1 = (-w1) * ChiL1 * ChiR1
-     df2 = (-w2) * ChiL2 * ChiR2
-     df3 = (-w3) * ChiL3 * ChiR3
-     Jw(1,1) = Jw(1,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/dwc
-     df1 = (-1.d0/ep - u1) * ChiL1 * ChiL1
-     df2 = (-1.d0/ep - u2) * ChiL2 * ChiL2
-     df3 = (-1.d0/ep - u3) * ChiL3 * ChiL3
-     Jw(3,0) = Jw(3,0) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-     !     dR_w/dwr
-     df1 = (-1.d0/ep - u1) * ChiL1 * ChiR1
-     df2 = (-1.d0/ep - u2) * ChiL2 * ChiR2
-     df3 = (-1.d0/ep - u3) * ChiL3 * ChiR3
-     Jw(3,1) = Jw(3,1) + dQdf1*df1 + dQdf2*df2 + dQdf3*df3
-
-
-     ! insert Jacobian entries into CSR matrix structure
-
-     !   Ju row
-     Jrowptrs(idx(ix,1)+1) = nz
-
-     Jdata(nz+1:nz+3) = (/ Ju(1,-1), Ju(2,-1), Ju(3,-1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix-1,1), idx(ix-1,2), idx(ix-1,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Ju(1,0), Ju(2,0), Ju(3,0) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix,1), idx(ix,2), idx(ix,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Ju(1,1), Ju(2,1), Ju(3,1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix+1,1), idx(ix+1,2), idx(ix+1,3) /)
-     nz = nz+3
-
-     !   Jv row
-     Jrowptrs(idx(ix,2)+1) = nz
-
-     Jdata(nz+1:nz+3) = (/ Jv(1,-1), Jv(2,-1), Jv(3,-1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix-1,1), idx(ix-1,2), idx(ix-1,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Jv(1,0), Jv(2,0), Jv(3,0) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix,1), idx(ix,2), idx(ix,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Jv(1,1), Jv(2,1), Jv(3,1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix+1,1), idx(ix+1,2), idx(ix+1,3) /)
-     nz = nz+3
-
-     !   Jw row
-     Jrowptrs(idx(ix,3)+1) = nz
-
-     Jdata(nz+1:nz+3) = (/ Jw(1,-1), Jw(2,-1), Jw(3,-1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix-1,1), idx(ix-1,2), idx(ix-1,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Jw(1,0), Jw(2,0), Jw(3,0) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix,1), idx(ix,2), idx(ix,3) /)
-     nz = nz+3
-
-     Jdata(nz+1:nz+3) = (/ Jw(1,1), Jw(2,1), Jw(3,1) /)
-     Jcolvals(nz+1:nz+3) = (/ idx(ix+1,1), idx(ix+1,2), idx(ix+1,3) /)
-     nz = nz+3
-
-  enddo
-
-  ! Dirichlet boundary at right
-  Jrowptrs(idx(Nint,1)+1) = nz
-  Jrowptrs(idx(Nint,2)+1) = nz
-  Jrowptrs(idx(Nint,3)+1) = nz
-
-  ! signal end of data in CSR matrix
-  Jrowptrs(idx(Nint,3)+2) = nz
-
-  ier = 0
-  return
-
-end subroutine farkspjac
-!-----------------------------------------------------------------
-
-
-
-subroutine farkspmass(t, neq, nnz, Mdata, Mcolvals, Mrowptrs, &
-                      ipar, rpar, wk1, wk2, wk3, ier)
-!-----------------------------------------------------------------
-! Mass matrix computation routine
-!-----------------------------------------------------------------
-  use UserData
-  use Quadrature
-  use FEM
-
-  ! Declarations
-  implicit none
-
-  ! Arguments
-  real(kind=REALTYPE), intent(in)  :: t, rpar(1)
-  real(kind=REALTYPE), intent(in), dimension(3,N) :: wk1, wk2, wk3
-  real(kind=REALTYPE), intent(out) :: Mdata(nnz)
-  integer*8, intent(in) :: ipar(1), neq, nnz
-  integer(kind=SUNINDEXTYPE), intent(out) :: Mcolvals(nnz)
-  integer(kind=SUNINDEXTYPE), intent(out) :: Mrowptrs(neq+1)
-  integer,  intent(out) :: ier
-
-  ! Local data
-  integer :: ix, nz, Nint
-  real*8  :: xl, xc, xr, Ml, Mc, Mr, ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3
-  logical :: left, right
-
-  ! check that vector/matrix dimensions match up
-  if ((3*N /= neq) .or. (nnz /= 15*neq)) then
-     ier = 1
-     return
-  endif
-
-  ! set integer*4 version of N for call to idx()
-  Nint = N
-
-  ! clear out Jacobian matrix data
-  Mdata = 0.d0
-  nz = 0
-
-  ! iterate through nodes, filling in matrix by rows
-  do ix=1,N
-
-     ! set booleans to determine whether intervals exist on the left/right */
-     left  = .true.
-     right = .true.
-     if (ix==1)  left  = .false.
-     if (ix==N)  right = .false.
-
-     ! set nodal value shortcuts (interval index aligns with left node)
-     if (left) then
-        xl = x(ix-1)
-     endif
-     xc = x(ix)
-     if (right) then
-        xr = x(ix+1)
-     endif
-
-     ! compute entries of all mass matrix rows at node ix
-     Ml = 0.d0
-     Mc = 0.d0
-     Mr = 0.d0
-
-     ! first compute dependence on values to left and center
-     if (left) then
-
-        ChiL1 = ChiL(xl, xc, X1(xl,xc))
-        ChiL2 = ChiL(xl, xc, X2(xl,xc))
-        ChiL3 = ChiL(xl, xc, X3(xl,xc))
-        ChiR1 = ChiR(xl, xc, X1(xl,xc))
-        ChiR2 = ChiR(xl, xc, X2(xl,xc))
-        ChiR3 = ChiR(xl, xc, X3(xl,xc))
-
-        Ml = Ml + Quad(ChiL1*ChiR1, ChiL2*ChiR2, ChiL3*ChiR3, xl, xc)
-        Mc = Mc + Quad(ChiR1*ChiR1, ChiR2*ChiR2, ChiR3*ChiR3, xl, xc)
-
-     endif
-
-     ! second compute dependence on values to center and right
-     if (right) then
-
-        ChiL1 = ChiL(xc, xr, X1(xc,xr))
-        ChiL2 = ChiL(xc, xr, X2(xc,xr))
-        ChiL3 = ChiL(xc, xr, X3(xc,xr))
-        ChiR1 = ChiR(xc, xr, X1(xc,xr))
-        ChiR2 = ChiR(xc, xr, X2(xc,xr))
-        ChiR3 = ChiR(xc, xr, X3(xc,xr))
-
-        Mc = Mc + Quad(ChiL1*ChiL1, ChiL2*ChiL2, ChiL3*ChiL3, xc, xr)
-        Mr = Mr + Quad(ChiL1*ChiR1, ChiL2*ChiR2, ChiL3*ChiR3, xc, xr)
-
-     endif
-
-
-     ! insert mass matrix entries into CSR matrix structure
-
-     !   u row
-     Mrowptrs(idx(ix,1)+1) = nz
-     if (left) then
-        nz = nz+1
-        Mdata(nz) = Ml
-        Mcolvals(nz) = idx(ix-1,1)
-     endif
-     nz = nz+1
-     Mdata(nz) = Mc
-     Mcolvals(nz) = idx(ix,1)
-     if (right) then
-        nz = nz+1
-        Mdata(nz) = Mr
-        Mcolvals(nz) = idx(ix+1,1)
-     endif
-
-     !   v row
-     Mrowptrs(idx(ix,2)+1) = nz
-     if (left) then
-        nz = nz+1
-        Mdata(nz) = Ml
-        Mcolvals(nz) = idx(ix-1,2)
-     endif
-     nz = nz+1
-     Mdata(nz) = Mc
-     Mcolvals(nz) = idx(ix,2)
-     if (right) then
-        nz = nz+1
-        Mdata(nz) = Mr
-        Mcolvals(nz) = idx(ix+1,2)
-     endif
-
-     !   w row
-     Mrowptrs(idx(ix,3)+1) = nz
-     if (left) then
-        nz = nz+1
-        Mdata(nz) = Ml
-        Mcolvals(nz) = idx(ix-1,3)
-     endif
-     nz = nz+1
-     Mdata(nz) = Mc
-     Mcolvals(nz) = idx(ix,3)
-     if (right) then
-        nz = nz+1
-        Mdata(nz) = Mr
-        Mcolvals(nz) = idx(ix+1,3)
-     endif
-
-  enddo
-
-  ! signal end of data in CSR matrix
-  Mrowptrs(idx(Nint,3)+2) = nz
-
-  ier = 0
-  return
-
-end subroutine farkspmass
-!-----------------------------------------------------------------
diff --git a/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.out b/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.out
deleted file mode 100644
index e3ad641b77..0000000000
--- a/examples/arkode/F90_serial/ark_bruss1D_FEM_klu.out
+++ /dev/null
@@ -1,59 +0,0 @@
-ARKode solver parameters:
-  Solver relative tolerance = 1e-06
-  Solver absolute tolerance = 1e-11
-  Absolute residual tolerance = 1e-11
-
-  Maximum step increase (first step) = 10000
-  Step reduction factor on multiple error fails = 0.3
-  Minimum error fails before above factor is used = 2
-  Step reduction factor on nonlinear convergence failure = 0.25
-  Explicit safety factor = 0.5
-  Time step adaptivity method 0
-     Safety factor = 0.96
-     Bias factor = 1.5
-     Growth factor = 20
-     Step growth lower bound = 1
-     Step growth upper bound = 1.5
-     k1 = 0.58
-     k2 = 0.21
-     k3 = 0.1
-  Default explicit stability function
-  Maximum number of error test failures = 7
-  Maximum number of convergence test failures = 10
-ARKStep time step module parameters:
-  Method order 4
-  Implicit integrator
-  Implicit predictor method = 0
-  Implicit solver tolerance coefficient = 0.1
-  Maximum number of nonlinear corrections = 3
-  Nonlinear convergence rate constant = 0.3
-  Nonlinear divergence tolerance = 2.3
-  Gamma factor LSetup tolerance = 0.2
-  Number of steps between LSetup calls = 20
-
-         t         ||u||_rms    ||v||_rms    ||w||_rms
-   ----------------------------------------------------
-    0.00000E+00  6.32978E-01  3.36571E+00  2.03247E+00
-    1.00000E+00  6.97285E-01  3.23962E+00  1.99999E+00
-    2.00000E+00  7.89501E-01  3.05139E+00  1.99999E+00
-    3.00000E+00  7.83681E-01  2.93001E+00  1.99999E+00
-    4.00000E+00  6.48122E-01  3.00833E+00  1.99999E+00
-    5.00000E+00  5.52223E-01  3.17028E+00  1.99999E+00
-    6.00000E+00  5.22111E-01  3.30889E+00  1.99999E+00
-    7.00000E+00  5.20869E-01  3.40614E+00  1.99999E+00
-    8.00000E+00  5.30276E-01  3.46669E+00  1.99999E+00
-    9.00000E+00  5.45196E-01  3.49456E+00  1.99999E+00
-    1.00000E+01  5.65426E-01  3.49094E+00  1.99999E+00
-   ----------------------------------------------------
-   
- Final Solver Statistics:
-    Internal solver steps =                   104  (attempted =                  104 )
-    Total RHS evals:  Fe =                     0   Fi =                  1732
-    Total linear solver setups =                    48
-    Total RHS evals for setting up the linear system =                     0
-    Total number of Jacobian evaluations =                    11
-    Total number of nonlinear iterations =                  1209
-    Total number of nonlinear solver convergence failures =                     0
-    Total number of error test failures =                     0
-    Total number of mass matrix evaluations =                     1
-   
diff --git a/examples/arkode/F90_serial/plot_brusselator1D_FEM.py b/examples/arkode/F90_serial/plot_brusselator1D_FEM.py
deleted file mode 100755
index 19be9cbdda..0000000000
--- a/examples/arkode/F90_serial/plot_brusselator1D_FEM.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-# ------------------------------------------------------------
-# Programmer(s):  Daniel R. Reynolds @ SMU
-# ------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ------------------------------------------------------------
-# matplotlib-based plotting script for brusselator1D.c example
-
-# imports
-import sys
-import pylab as plt
-import numpy as np
-
-# load mesh data file
-mesh = np.loadtxt('bruss_FEM_mesh.txt', dtype=np.double)
-
-# load solution data files
-udata = np.loadtxt('bruss_FEM_u.txt', dtype=np.double)
-vdata = np.loadtxt('bruss_FEM_v.txt', dtype=np.double)
-wdata = np.loadtxt('bruss_FEM_w.txt', dtype=np.double)
-
-# determine number of time steps, mesh size
-nt,nx = np.shape(udata)
-
-# determine min/max values
-umin = 0.9*udata.min()
-umax = 1.1*udata.max()
-vmin = 0.9*vdata.min()
-vmax = 1.1*vdata.max()
-wmin = 0.9*wdata.min()
-wmax = 1.1*wdata.max()
-minval = np.array([umin, vmin, wmin]).min()
-maxval = np.array([umax, vmax, wmax]).max()
-
-# plot the mesh
-plt.figure(1)
-plt.plot(mesh,0.0*mesh,'o')
-plt.xlabel('x')
-plt.title('FEM mesh')
-plt.savefig('brusselator1D_FEM_mesh.png')
-
-# generate plots of results
-for tstep in range(nt):
-
-    # set string constants for output plots, current time, mesh size
-    pname = 'brusselator1D_FEM.' + repr(tstep).zfill(3) + '.png'
-    tstr  = repr(tstep)
-    nxstr = repr(nx)
-
-    # plot current solution and save to disk
-    plt.figure(1)
-    plt.plot(mesh,udata[tstep,:],label="u")
-    plt.plot(mesh,vdata[tstep,:],label="v")
-    plt.plot(mesh,wdata[tstep,:],label="w")
-    plt.xlabel('x')
-    plt.ylabel('solution')
-    plt.title('Solutions at output ' + tstr + ', mesh = ' + nxstr)
-    plt.axis((0.0, 1.0, minval, maxval))
-    plt.grid()
-    plt.legend(loc='upper right', shadow=True)
-    plt.savefig(pname)
-    plt.close()
-
-
-##### end of script #####
diff --git a/examples/arkode/F90_serial/plot_sol.py b/examples/arkode/F90_serial/plot_sol.py
deleted file mode 100755
index 1175383218..0000000000
--- a/examples/arkode/F90_serial/plot_sol.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env python
-# ----------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-# ----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ----------------------------------------------------------------
-# matplotlib-based plotting script for ODE examples
-
-# imports
-import sys
-import pylab as plt
-import numpy as np
-
-# load solution data file
-data = np.loadtxt('solution.txt', dtype=np.double)
-
-# determine number of time steps, number of fields
-nt,nv = np.shape(data)
-
-# extract time array
-times = data[:,0]
-
-# parse comment line to determine solution names
-f = open('solution.txt', 'r')
-commentline = f.readline()
-commentsplit = commentline.split()
-names = commentsplit[2:]
-
-# create plot
-plt.figure()
-
-# add curves to figure
-for i in range(nv-1):
-    plt.plot(times,data[:,i+1],label=names[i])
-plt.xlabel('t')
-if (nv > 2):
-    plt.ylabel('solutions')
-else:
-    plt.ylabel('solution')
-plt.legend(loc='upper right', shadow=True)
-plt.grid()
-plt.savefig('solution.png')
-
-
-
-
-##### end of script #####
diff --git a/examples/cvode/fcmix_parallel/CMakeLists.txt b/examples/cvode/fcmix_parallel/CMakeLists.txt
deleted file mode 100644
index f99db2eee2..0000000000
--- a/examples/cvode/fcmix_parallel/CMakeLists.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FCVODE parallel examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;nodes\;tasks\;type" where the
-# type is develop for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FCVODE_examples
-  "fcvDiag_non_p\;1\;2\;develop"
-  "fcvDiag_kry_bbd_p\;1\;2\;develop"
-  "fcvDiag_kry_p\;1\;2\;develop"
-  )
-
-if(MPI_Fortran_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_Fortran_COMPILER ${MPI_Fortran_COMPILER})
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-# Specify libraries to link againstx
-set(FNVECP_LIB sundials_fnvecparallel)
-
-# Only static FCMIX libraries are available
-set(FCVODE_LIB sundials_fcvode${_STATIC_LIB_SUFFIX})
-
-if(SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS)
-  list(APPEND FCVODE_LIB sundials_cvode_fused_stubs)
-endif()
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FCVODE_LIB} ${FNVECP_LIB})
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FCVODE_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 number_of_nodes)
-  list(GET example_tuple 2 number_of_tasks)
-  list(GET example_tuple 3 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    MPI_NPROCS ${number_of_tasks}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS} ${EXE_EXTRA_LINK_LIBS})
-
-  if(NOT MPI_Fortran_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_parallel)
-  endif()
-
-endforeach(example_tuple ${FCVODE_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_parallel)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "CVODE")
-  set(SOLVER_LIB "sundials_cvode")
-  set(SOLVER_FLIB "sundials_fcvode")
-  if(SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS)
-    set(LIBS "-lsundials_cvode_fused_stubs ${LIBS}")
-  endif()
-
-  examples2string(FCVODE_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_parallel_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_parallel/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_parallel/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_parallel
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_parallel_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_parallel/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_parallel/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_parallel
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(cvode fcmix_parallel)
-
-endif()
diff --git a/examples/cvode/fcmix_parallel/README b/examples/cvode/fcmix_parallel/README
deleted file mode 100644
index 14e08e7c87..0000000000
--- a/examples/cvode/fcmix_parallel/README
+++ /dev/null
@@ -1,48 +0,0 @@
-List of parallel CVODE FCMIX examples
-
-  fcvDiag_non_p     : diagonal ODE example - non-stiff case (ADAMS/FIXEDPOINT)
-  fcvDiag_kry_bbd_p : diagonal ODE example - stiff case (BDF/SPGMR/FCVBBD)
-  fcvDiag_kry_p     : diagonal ODE example - stiff case (BDF/SPGMR)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f b/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f
deleted file mode 100644
index c4ea341376..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f
+++ /dev/null
@@ -1,336 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     Diagonal ODE example. Stiff case, with diagonal preconditioner.
-C     Uses FCVODE interfaces and FCVBBD interfaces.
-C     Solves problem twice -- with left and right preconditioning.
-C     --------------------------------------------------------------------
-C
-C     Include MPI-Fortran header file for MPI_COMM_WORLD, MPI types.
-
-      IMPLICIT NONE
-C
-      INCLUDE "mpif.h"
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 NLOCAL, NEQ, I, IOUT(25), IPAR(2), MUDQ, MLDQ, MU, ML
-      PARAMETER (NLOCAL=10)   
-C
-      INTEGER*4 NOUT, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNPE
-      INTEGER*4 LNLI, LNPS, LNCFL, MYPE, IER, NPES, METH
-      INTEGER*4 LLENRW, LLENIW, LLENRWLS, LLENIWLS
-      INTEGER*4 IATOL, ITASK, IPRE, IGS, JOUT
-C The following declaration specification should match C type long int.
-      INTEGER*8 LENRWBBD, LENIWBBD, NGEBBD
-      INTEGER*8 NST, NFE, NPSET, NPE, NPS, NNI, NLI, NCFN, NCFL, NETF
-      INTEGER*8 LENRW, LENIW, LENRWLS, LENIWLS
-      DOUBLE PRECISION Y(1024), ROUT(10), RPAR(1)
-      DOUBLE PRECISION ALPHA, TOUT, ERMAX, AVDIM
-      DOUBLE PRECISION ATOL, ERRI, RTOL, GERMAX, DTOUT, T
-C     
-      DATA ATOL/1.0D-10/, RTOL/1.0D-5/, DTOUT/0.1D0/, NOUT/10/
-      DATA LLENRW/1/, LLENIW/2/, LNST/3/, LNFE/4/, LNETF/5/,  LNCF/6/,
-     1     LNNI/7/, LNSETUP/8/, LLENRWLS/13/, LLENIWLS/14/,
-     1     LNPE/20/, LNLI/22/, LNPS/21/, LNCFL/23/
-C
-C     Get NPES and MYPE.  Requires initialization of MPI.
-      CALL MPI_INIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,5) IER
- 5       FORMAT(///' MPI_ERROR: MPI_INIT returned IER = ', I5)
-         STOP
-      ENDIF
-      CALL MPI_COMM_SIZE(MPI_COMM_WORLD, NPES, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,6) IER
- 6       FORMAT(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      CALL MPI_COMM_RANK(MPI_COMM_WORLD, MYPE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,7) IER
- 7       FORMAT(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Set input arguments.
-      NEQ = NPES * NLOCAL
-      T = 0.0D0
-      METH = 2
-      IATOL = 1
-      ITASK = 1
-      IPRE = 1
-      IGS = 1
-C     Set parameter alpha
-      ALPHA  = 10.0D0
-C
-C     Load IPAR and RPAR
-      IPAR(1) = NLOCAL
-      IPAR(2) = MYPE
-      RPAR(1) = ALPHA
-C     
-      DO I = 1, NLOCAL
-         Y(I) = 1.0D0
-      ENDDO
-C     
-      IF (MYPE .EQ. 0) THEN
-         WRITE(6,15) NEQ, ALPHA, RTOL, ATOL, NPES
- 15      FORMAT('Diagonal test problem:'//' NEQ = ', I3, /
-     &          ' parameter alpha = ', F8.3/
-     &          ' ydot_i = -alpha*i * y_i (i = 1,...,NEQ)'/
-     &          ' RTOL, ATOL = ', 2E10.1/
-     &          ' Method is BDF/NEWTON/SPGMR'/
-     &          ' Preconditioner is band-block-diagonal, using CVBBDPRE'
-     &          /' Number of processors = ', I3/)
-      ENDIF
-C     
-      CALL FNVINITP(MPI_COMM_WORLD, 1, NLOCAL, NEQ, IER)
-C     
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
- 20      FORMAT(///' SUNDIALS_ERROR: FNVINITP returned IER = ', I5)
-         CALL MPI_FINALIZE(IER)
-         STOP
-      ENDIF
-C
-C     initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(1, IPRE, 0, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,25) IER
- 25      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      call FSUNSPGMRSETGSTYPE(1, IGS, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,27) IER
- 27      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C     
-      CALL FCVMALLOC(T, Y, METH, IATOL, RTOL, ATOL,
-     &               IOUT, ROUT, IPAR, RPAR, IER)
-C     
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
- 30      FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     attach linear solver module to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,32) IER
- 32      FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C     
-      MUDQ = 0
-      MLDQ = 0
-      MU = 0
-      ML = 0
-      CALL FCVBBDINIT(NLOCAL, MUDQ, MLDQ, MU, ML, 0.0D0, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,35) IER
- 35      FORMAT(///' SUNDIALS_ERROR: FCVBBDINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IF (MYPE .EQ. 0) WRITE(6,38)
- 38   FORMAT(/'Preconditioning on left'/)
-C     
-C     Looping point for cases IPRE = 1 and 2.
-C     
- 40   CONTINUE
-C     
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 60 JOUT = 1, NOUT
-C     
-         CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C     
-         IF (MYPE .EQ. 0) WRITE(6,45) T, IOUT(LNST), IOUT(LNFE)
- 45      FORMAT(' t = ', E10.2, 5X, 'no. steps = ', I5,
-     &          '   no. f-s = ', I5)
-C     
-         IF (IER .NE. 0) THEN
-            WRITE(6,50) IER, IOUT(15)
- 50         FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     &             '                 Linear Solver returned IER = ', I5)
-            CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-            STOP
-         ENDIF
-C     
-         TOUT = TOUT + DTOUT
- 60   CONTINUE
-C     
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 65 I = 1, NLOCAL
-         ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
-         ERMAX = MAX(ERMAX, ABS(ERRI))
- 65   CONTINUE
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     &                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,70) IER
- 70      FORMAT(///' MPI_ERROR: MPI_REDUCE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,75) GERMAX
- 75   FORMAT(/'Max. absolute error is', E10.2/)
-C     
-C     Print final statistics.
-      IF (MYPE .EQ. 0) THEN
-         NST = IOUT(LNST)
-         NFE = IOUT(LNFE)
-         NPSET = IOUT(LNSETUP)
-         NPE = IOUT(LNPE)
-         NPS = IOUT(LNPS)
-         NNI = IOUT(LNNI)
-         NLI = IOUT(LNLI)
-         AVDIM = DBLE(NLI) / DBLE(NNI)
-         NCFN = IOUT(LNCF)
-         NCFL = IOUT(LNCFL)
-         NETF = IOUT(LNETF)
-         LENRW = IOUT(LLENRW)
-         LENIW = IOUT(LLENIW)
-         LENRWLS = IOUT(LLENRWLS)
-         LENIWLS = IOUT(LLENIWLS)
-         WRITE(6,80) NST, NFE, NPSET, NPE, NPS, NNI, NLI, AVDIM, NCFN,
-     &               NCFL, NETF, LENRW, LENIW, LENRWLS, LENIWLS
- 80      FORMAT(/'Final statistics:'//
-     &          ' number of steps        = ', I5, 4X,
-     &          ' number of f evals.     = ', I5/
-     &          ' number of prec. setups = ', I5/
-     &          ' number of prec. evals. = ', I5, 4X,
-     &          ' number of prec. solves = ', I5/
-     &          ' number of nonl. iters. = ', I5, 4X,
-     &          ' number of lin. iters.  = ', I5/
-     &          ' average Krylov subspace dimension (NLI/NNI) = ',F8.4/
-     &          ' number of conv. failures.. nonlinear = ', I3,
-     &          '  linear = ', I3/
-     &          ' number of error test failures = ', I3/
-     &          ' main solver real/int workspace sizes   = ',2I5/
-     &          ' linear solver real/int workspace sizes = ',2I5)
-         CALL FCVBBDOPT(LENRWBBD, LENIWBBD, NGEBBD)
-         WRITE(6,82) LENRWBBD, LENIWBBD, NGEBBD
- 82      FORMAT('In CVBBDPRE:'/
-     &          ' real/int local workspace = ', 2I5/
-     &          ' number of g evals. = ', I5)
-      ENDIF
-C     
-C     If IPRE = 1, re-initialize T, Y, and the solver, and loop for
-C     case IPRE = 2.  Otherwise jump to final block.
-      IF (IPRE .EQ. 2) GO TO 99
-C
-      T = 0.0D0
-      DO I = 1, NLOCAL
-         Y(I) = 1.0D0
-      ENDDO         
-C
-      CALL FCVREINIT(T, Y, IATOL, RTOL, ATOL, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,91) IER
- 91      FORMAT(///' SUNDIALS_ERROR: FCVREINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IPRE = 2
-C
-      CALL FCVBBDREINIT(MUDQ, MLDQ, 0.0D0, IER) 
-      IF (IER .NE. 0) THEN
-         WRITE(6,92) IER
- 92      FORMAT(///' SUNDIALS_ERROR: FCVBBDREINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      CALL FSUNSPGMRSETPRECTYPE(1, IPRE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,93) IER
- 93      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETPRECTYPE IER = ',I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      IF (MYPE .EQ. 0) WRITE(6,95)
- 95   FORMAT(//60('-')///'Preconditioning on right'/)
-      GO TO 40
-C     
-C     Free the memory and finalize MPI.
- 99   CALL FCVFREE
-      CALL MPI_FINALIZE(IER)
-C     
-      STOP
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function f
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*), MYPE, I, NLOCAL
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-      DOUBLE PRECISION ALPHA
-C
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = -ALPHA * (MYPE * NLOCAL + I) * Y(I)
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVGLOCFN(NLOC, T, YLOC, GLOC, IPAR, RPAR, IER)
-C     Routine to define local approximate function g, here the same as f. 
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 NLOC, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, YLOC(*), GLOC(*), RPAR(*)
-C
-      CALL FCVFUN(T, YLOC, GLOC, IPAR, RPAR, IER)
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVCOMMFN(NLOC, T, YLOC, IPAR, RPAR, IER)
-C     Routine to perform communication required for evaluation of g.
-      INTEGER*8 NLOC, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, YLOC(*), RPAR(*)
-      IER = 0
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.out b/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.out
deleted file mode 100644
index fd707e5064..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.out
+++ /dev/null
@@ -1,76 +0,0 @@
-Diagonal test problem:
-
- NEQ =  20
- parameter alpha =   10.000
- ydot_i = -alpha*i * y_i (i = 1,...,NEQ)
- RTOL, ATOL =    0.1E-04   0.1E-09
- Method is BDF/NEWTON/SPGMR
- Preconditioner is band-block-diagonal, using CVBBDPRE
- Number of processors =   2
-
-
-Preconditioning on left
-
- t =   0.10E+00     no. steps =   174   no. f-s =   213
- t =   0.20E+00     no. steps =   222   no. f-s =   262
- t =   0.30E+00     no. steps =   247   no. f-s =   288
- t =   0.40E+00     no. steps =   265   no. f-s =   307
- t =   0.50E+00     no. steps =   278   no. f-s =   321
- t =   0.60E+00     no. steps =   290   no. f-s =   333
- t =   0.70E+00     no. steps =   300   no. f-s =   344
- t =   0.80E+00     no. steps =   307   no. f-s =   351
- t =   0.90E+00     no. steps =   312   no. f-s =   357
- t =   0.10E+01     no. steps =   317   no. f-s =   362
-
-Max. absolute error is  0.90E-08
-
-
-Final statistics:
-
- number of steps        =   317     number of f evals.     =   362
- number of prec. setups =    33
- number of prec. evals. =     6     number of prec. solves =   644
- number of nonl. iters. =   359     number of lin. iters.  =   322
- average Krylov subspace dimension (NLI/NNI) =   0.8969
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   5
- main solver real/int workspace sizes   =   349   92
- linear solver real/int workspace sizes =   294   78
-In CVBBDPRE:
- real/int local workspace =   100   60
- number of g evals. =    12
-
-
-------------------------------------------------------------
-
-
-Preconditioning on right
-
- t =   0.10E+00     no. steps =   174   no. f-s =   213
- t =   0.20E+00     no. steps =   222   no. f-s =   262
- t =   0.30E+00     no. steps =   247   no. f-s =   288
- t =   0.40E+00     no. steps =   265   no. f-s =   307
- t =   0.50E+00     no. steps =   278   no. f-s =   321
- t =   0.60E+00     no. steps =   290   no. f-s =   333
- t =   0.70E+00     no. steps =   300   no. f-s =   344
- t =   0.80E+00     no. steps =   307   no. f-s =   351
- t =   0.90E+00     no. steps =   312   no. f-s =   357
- t =   0.10E+01     no. steps =   317   no. f-s =   362
-
-Max. absolute error is  0.90E-08
-
-
-Final statistics:
-
- number of steps        =   317     number of f evals.     =   362
- number of prec. setups =    33
- number of prec. evals. =     6     number of prec. solves =   644
- number of nonl. iters. =   359     number of lin. iters.  =   322
- average Krylov subspace dimension (NLI/NNI) =   0.8969
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   5
- main solver real/int workspace sizes   =   349   92
- linear solver real/int workspace sizes =   294   78
-In CVBBDPRE:
- real/int local workspace =   100   60
- number of g evals. =    12
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_kry_p.f b/examples/cvode/fcmix_parallel/fcvDiag_kry_p.f
deleted file mode 100644
index fa9ac18023..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_kry_p.f
+++ /dev/null
@@ -1,376 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     Diagonal ODE example. Stiff case, with BDF/SPGMR, diagonal
-C     preconditioner. Solved with preconditioning on left, then with
-C     preconditioning on right.
-C     --------------------------------------------------------------------
-C
-C     Include MPI-Fortran header file for MPI_COMM_WORLD, MPI types.
-
-      IMPLICIT NONE
-C
-      INCLUDE "mpif.h"
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 NLOCAL, NEQ, I, IOUT(25), IPAR(2)
-      PARAMETER (NLOCAL=10)
-C
-      INTEGER*4 LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNPE, LNLI, LNPS
-      INTEGER*4 LNCFL, NOUT, MYPE, NPES, IER, METH, IATOL
-      INTEGER*4 ITASK, IPRE, IGS, JOUT
-      INTEGER*8 NST, NFE, NPSET, NPE, NPS, NNI, NLI
-      INTEGER*8 NCFL, NETF, NCFN
-      DOUBLE PRECISION Y(1024), ROUT(10), RPAR(1)
-      DOUBLE PRECISION ATOL, DTOUT, T, ALPHA, RTOL, TOUT, ERMAX, ERRI
-      DOUBLE PRECISION GERMAX, AVDIM
-C
-      DATA ATOL/1.0D-10/, RTOL/1.0D-5/, DTOUT/0.1D0/, NOUT/10/
-      DATA LNST/3/, LNFE/4/, LNETF/5/,  LNCF/6/, LNNI/7/, LNSETUP/8/, 
-     1     LNPE/20/, LNLI/22/, LNPS/21/, LNCFL/23/
-C
-C     Get NPES and MYPE.  Requires initialization of MPI.
-      CALL MPI_INIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,5) IER
- 5       FORMAT(///' MPI_ERROR: MPI_INIT returned IER = ', I5)
-         STOP
-      ENDIF
-      CALL MPI_COMM_SIZE(MPI_COMM_WORLD, NPES, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,6) IER
- 6       FORMAT(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      CALL MPI_COMM_RANK(MPI_COMM_WORLD, MYPE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,7) IER
- 7       FORMAT(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Set input arguments.
-      NEQ = NPES * NLOCAL
-      T = 0.0D0
-      METH = 2
-      IATOL = 1
-      ITASK = 1
-      IPRE = 1
-      IGS = 1
-C     Set parameter alpha
-      ALPHA  = 10.0D0
-C
-C     Load IPAR and RPAR
-      IPAR(1) = NLOCAL
-      IPAR(2) = MYPE
-      RPAR(1) = ALPHA
-C
-C     Do remaining initializations for first case: IPRE = 1 (prec. on left).
-C
-      DO 10 I = 1, NLOCAL
-  10    Y(I) = 1.0D0
-C
-      IF (MYPE .EQ. 0) THEN
-        WRITE(6,11) NEQ, ALPHA
-  11    FORMAT('Diagonal test problem:'//' NEQ = ', I3,
-     1         ' parameter alpha = ', F8.3)
-        WRITE(6,12)
-  12    FORMAT(' ydot_i = -alpha*i * y_i (i = 1,...,NEQ)')
-        WRITE(6,13) RTOL, ATOL
-  13    FORMAT(' RTOL, ATOL = ', 2E10.1)
-        WRITE(6,14)
-  14    FORMAT(' Method is BDF/NEWTON/SPGMR'/
-     1         ' Diagonal preconditioner uses approximate Jacobian')
-        WRITE(6,15) NPES
-  15    FORMAT(' Number of processors = ', I3)
-        WRITE(6,16)
-  16    FORMAT(//'Preconditioning on left'/)
-        ENDIF
-C
-      CALL FNVINITP(MPI_COMM_WORLD, 1, NLOCAL, NEQ, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
-  20     FORMAT(///' SUNDIALS_ERROR: FNVINITP returned IER = ', I5)
-         CALL MPI_FINALIZE(IER)
-         STOP
-      ENDIF
-C
-C     initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(1, IPRE, 0, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,25) IER
- 25      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      call FSUNSPGMRSETGSTYPE(1, IGS, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,27) IER
- 27      FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      CALL FCVMALLOC(T, Y, METH, IATOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
-  30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     attach linear solver module to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,32) IER
- 32      FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C     
-C     attach preconditioner to CVLs interface
-      CALL FCVLSSETPREC(1, IER)
-C
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 70 JOUT = 1, NOUT
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        IF (MYPE .EQ. 0) WRITE(6,40) T, IOUT(LNST), IOUT(LNFE)
-  40    FORMAT(' t = ', E10.2, 5X, 'no. steps = ', I5,
-     &         '   no. f-s = ', I5)
-C
-        IF (IER .NE. 0) THEN
-           WRITE(6,60) IER, IOUT(15)
-  60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     &            '                 Linear Solver returned IER = ', I5)
-           CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-           STOP
-        ENDIF
-C
-        TOUT = TOUT + DTOUT
-  70    CONTINUE
-C
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 75 I = 1, NLOCAL
-        ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
-  75    ERMAX = MAX(ERMAX, ABS(ERRI))
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     1                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,80) IER
-  80     FORMAT(///' MPI_ERROR: MPI_REDUCE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,85) GERMAX
-  85  FORMAT(/'Max. absolute error is ', E10.2/)
-C
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NFE = IOUT(LNFE)
-      NPSET = IOUT(LNSETUP)
-      NPE = IOUT(LNPE)
-      NPS = IOUT(LNPS)
-      NNI = IOUT(LNNI)
-      NLI = IOUT(LNLI)
-      AVDIM = DBLE(NLI) / DBLE(NNI)
-      NCFN = IOUT(LNCF)
-      NCFL = IOUT(LNCFL)
-      NETF = IOUT(LNETF)
-      IF (MYPE .EQ. 0)
-     1  WRITE (6,90) NST, NFE, NPSET, NPE, NPS, NNI, NLI, AVDIM, NCFN,
-     &               NCFL, NETF
-  90  FORMAT(/'Final statistics:'//
-     &       ' number of steps        = ', I5, 5X,
-     &       'number of f evals.     =', I5/
-     &       ' number of prec. setups = ', I5/
-     &       ' number of prec. evals. = ', I5, 5X,
-     &       'number of prec. solves = ', I5/
-     &       ' number of nonl. iters. = ', I5, 5X,
-     &       'number of lin. iters.  = ', I5/
-     &       ' average Krylov subspace dimension (NLI/NNI)  = ', F8.4/
-     &       ' number of conv. failures.. nonlinear = ', I3,
-     &       '  linear = ', I3/
-     &       ' number of error test failures = ', I3)
-C
-C     Re-initialize to run second case: IPRE = 2 (prec. on right).
-      IPRE = 2
-      T = 0.0D0
-      DO 110 I = 1, NLOCAL
- 110    Y(I) = 1.0D0
-C
-      IF (MYPE .EQ. 0)  WRITE(6,111) 
- 111  FORMAT(//60('-')///'Preconditioning on right'/)
-C
-      CALL FCVREINIT(T, Y, IATOL, RTOL, ATOL, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,130) IER
- 130     FORMAT(///' SUNDIALS_ERROR: FCVREINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-      CALL FSUNSPGMRSETPRECTYPE(1, IPRE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,140) IER
- 140     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETPRECTYPE IER = ',I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 170 JOUT = 1, NOUT
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        IF (MYPE .EQ. 0) WRITE(6,40) T, IOUT(LNST), IOUT(LNFE)
-C
-        IF (IER .NE. 0) THEN
-           WRITE(6,60) IER
-           CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-           STOP
-        ENDIF
-C
-        TOUT = TOUT + DTOUT
- 170    CONTINUE
-C
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 175 I = 1, NLOCAL
-        ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
- 175    ERMAX = MAX(ERMAX, ABS(ERRI))
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     1                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,80) IER
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,85) GERMAX
-C     
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NFE = IOUT(LNFE)
-      NPSET = IOUT(LNSETUP)
-      NPE = IOUT(LNPE)
-      NPS = IOUT(LNPS)
-      NNI = IOUT(LNNI)
-      NLI = IOUT(LNLI)
-      AVDIM = DBLE(NLI) / DBLE(NNI)
-      NCFN = IOUT(LNCF)
-      NCFL = IOUT(LNCFL)
-      NETF = IOUT(LNETF)
-      IF (MYPE .EQ. 0)
-     1  WRITE (6,90) NST, NFE, NPSET, NPE, NPS, NNI, NLI, AVDIM, NCFN,
-     &               NCFL, NETF
-C
-C     Free the memory and finalize MPI.
-      CALL FCVFREE
-      CALL MPI_FINALIZE(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,195) IER
- 195     FORMAT(///' MPI_ERROR: MPI_FINALIZE returned IER = ', I5)
-         STOP
-      ENDIF
-C
-      STOP
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function f
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*), MYPE, I, NLOCAL
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-      DOUBLE PRECISION ALPHA
-C
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = -ALPHA * (MYPE * NLOCAL + I) * Y(I)
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVPSOL(T, Y, FY, R, Z, GAMMA, DELTA, LR,
-     &                   IPAR, RPAR, IER)
-C     Routine to solve preconditioner linear system
-C     This routine uses a diagonal preconditioner P = I - gamma*J,
-C     where J is a diagonal approximation to the true Jacobian, given by:
-C     J = diag(0, 0, 0, -4*alpha, ..., -N*alpha).
-C     The vector r is copied to z, and the inverse of P (restricted to the
-C     local vector segment) is applied to the vector z.
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*), NLOCAL, I, MYPE, ISTART, IBASE
-      INTEGER*4 IER, LR
-      DOUBLE PRECISION T, Y(*), FY(*), R(*), Z(*)
-      DOUBLE PRECISION GAMMA, DELTA, RPAR(*)
-      DOUBLE PRECISION PSUBI, ALPHA
-C
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         Z(I) = R(I)
-      ENDDO
-C
-      IBASE = MYPE * NLOCAL
-      ISTART = MAX(1, 4 - IBASE)
-      DO I = ISTART, NLOCAL
-         PSUBI = 1.0D0 + GAMMA * ALPHA * (IBASE + I)
-         Z(I) = Z(I) / PSUBI
-      ENDDO
-C
-      RETURN
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVPSET(T, Y, FY, JOK, JCUR, GAMMA, H,
-     &                   IPAR, RPAR, IER)
-C     Empty subroutine. Not needed for the preconditioner, but required
-C     by the FCVODE module.
-      INTEGER*4 IER, JOK, JCUR
-      DOUBLE PRECISION T, Y(*), FY(*), GAMMA, H
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION RPAR(*)
-
-      IER = 0
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_kry_p.out b/examples/cvode/fcmix_parallel/fcvDiag_kry_p.out
deleted file mode 100644
index 342ab32155..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_kry_p.out
+++ /dev/null
@@ -1,65 +0,0 @@
-Diagonal test problem:
-
- NEQ =  20 parameter alpha =   10.000
- ydot_i = -alpha*i * y_i (i = 1,...,NEQ)
- RTOL, ATOL =    0.1E-04   0.1E-09
- Method is BDF/NEWTON/SPGMR
- Diagonal preconditioner uses approximate Jacobian
- Number of processors =   2
-
-
-Preconditioning on left
-
- t =   0.10E+00     no. steps =   174   no. f-s =   213
- t =   0.20E+00     no. steps =   222   no. f-s =   262
- t =   0.30E+00     no. steps =   247   no. f-s =   288
- t =   0.40E+00     no. steps =   265   no. f-s =   307
- t =   0.50E+00     no. steps =   279   no. f-s =   322
- t =   0.60E+00     no. steps =   290   no. f-s =   333
- t =   0.70E+00     no. steps =   300   no. f-s =   344
- t =   0.80E+00     no. steps =   307   no. f-s =   351
- t =   0.90E+00     no. steps =   312   no. f-s =   357
- t =   0.10E+01     no. steps =   317   no. f-s =   362
-
-Max. absolute error is   0.76E-08
-
-
-Final statistics:
-
- number of steps        =   317     number of f evals.     =  362
- number of prec. setups =    33
- number of prec. evals. =     6     number of prec. solves =   649
- number of nonl. iters. =   359     number of lin. iters.  =   327
- average Krylov subspace dimension (NLI/NNI)  =   0.9109
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   5
-
-
-------------------------------------------------------------
-
-
-Preconditioning on right
-
- t =   0.10E+00     no. steps =   174   no. f-s =   213
- t =   0.20E+00     no. steps =   222   no. f-s =   262
- t =   0.30E+00     no. steps =   247   no. f-s =   288
- t =   0.40E+00     no. steps =   265   no. f-s =   307
- t =   0.50E+00     no. steps =   279   no. f-s =   322
- t =   0.60E+00     no. steps =   290   no. f-s =   333
- t =   0.70E+00     no. steps =   300   no. f-s =   344
- t =   0.80E+00     no. steps =   307   no. f-s =   351
- t =   0.90E+00     no. steps =   312   no. f-s =   357
- t =   0.10E+01     no. steps =   317   no. f-s =   362
-
-Max. absolute error is   0.77E-08
-
-
-Final statistics:
-
- number of steps        =   317     number of f evals.     =  362
- number of prec. setups =    33
- number of prec. evals. =     6     number of prec. solves =   649
- number of nonl. iters. =   359     number of lin. iters.  =   327
- average Krylov subspace dimension (NLI/NNI)  =   0.9109
- number of conv. failures.. nonlinear =   0  linear =   0
- number of error test failures =   5
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_non_p.f b/examples/cvode/fcmix_parallel/fcvDiag_non_p.f
deleted file mode 100644
index 95e7432dc5..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_non_p.f
+++ /dev/null
@@ -1,217 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     Diagonal ODE example. Nonstiff case: alpha = 10/NEQ.
-C     --------------------------------------------------------------------
-C
-C     Include MPI-Fortran header file for MPI_COMM_WORLD, MPI types.
-C
-      IMPLICIT NONE
-C
-      INCLUDE "mpif.h"
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 NLOCAL, NEQ, I, IOUT(25), IPAR(2)
-      PARAMETER (NLOCAL=2)
-C
-      INTEGER*4 IER, MYPE, NPES, NOUT, LNST, LNFE, LNNI, LNCF, LNETF
-      INTEGER*4 METH, IATOL, ITASK, JOUT
-      INTEGER*8 NST, NFE, NNI, NCFN, NETF
-      DOUBLE PRECISION Y(128), ROUT(10), RPAR(1)
-      DOUBLE PRECISION ATOL, RTOL, DTOUT, T, ALPHA, TOUT
-      DOUBLE PRECISION ERMAX, ERRI, GERMAX
-C
-      DATA ATOL/1.0D-10/, RTOL/1.0D-5/, DTOUT/0.1D0/, NOUT/10/
-      DATA LNST/3/, LNFE/4/, LNNI/7/, LNCF/6/, LNETF/5/
-C
-C     Get NPES and MYPE.  Requires initialization of MPI.
-      CALL MPI_INIT(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,5) IER
- 5       FORMAT(///' MPI_ERROR: MPI_INIT returned IER = ', I5)
-         STOP
-      ENDIF
-      CALL MPI_COMM_SIZE(MPI_COMM_WORLD, NPES, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,6) IER
- 6       FORMAT(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      CALL MPI_COMM_RANK(MPI_COMM_WORLD, MYPE, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,7) IER
- 7       FORMAT(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Set input arguments.
-      NEQ = NPES * NLOCAL
-      T = 0.0D0
-      METH = 1
-      IATOL = 1
-      ITASK = 1
-c     Set parameter ALPHA
-      ALPHA  = 10.0D0 / NEQ
-C
-C     Load IPAR and RPAR
-      IPAR(1) = NLOCAL
-      IPAR(2) = MYPE
-      RPAR(1) = ALPHA
-C
-      DO 10 I = 1, NLOCAL
-  10    Y(I) = 1.0D0
-C
-      IF (MYPE .EQ. 0) THEN
-         WRITE(6,11) NEQ, ALPHA
-  11     FORMAT('Diagonal test problem:'//' NEQ = ', I3, /
-     1          ' parameter alpha = ', F8.3)
-         WRITE(6,12)
-  12     FORMAT(' ydot_i = -alpha*i * y_i (i = 1,...,NEQ)')
-         WRITE(6,13) RTOL, ATOL
-  13     FORMAT(' RTOL, ATOL = ', 2E10.1)
-         WRITE(6,14)
-  14     FORMAT(' Method is ADAMS/FIXEDPOINT')
-         WRITE(6,15) NPES
-  15     FORMAT(' Number of processors = ', I3//)
-      ENDIF
-C
-      CALL FNVINITP(MPI_COMM_WORLD, 1, NLOCAL, NEQ, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,20) IER
-  20     FORMAT(///' SUNDIALS_ERROR: FNVINITP returned IER = ', I5)
-         CALL MPI_FINALIZE(IER)
-         STOP
-      ENDIF
-C
-      CALL FCVMALLOC(T, Y, METH, IATOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,30) IER
-  30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Create Fixed Point Solver
-      CALL FSUNFIXEDPOINTINIT(1, 0, IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,31) IER
-  31     FORMAT(
-     1   ///' SUNDIALS_ERROR: FSUNFIXEDPOINTINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Attach Fixed Point Solver
-      CALL FCVNLSINIT(IER)
-C
-      IF (IER .NE. 0) THEN
-         WRITE(6,32) IER
-  32     FORMAT(///' SUNDIALS_ERROR: FCVNLSINIT returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-C
-C     Loop through tout values, call solver, print output, test for failure.
-      TOUT = DTOUT
-      DO 70 JOUT = 1, NOUT
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        IF (MYPE .EQ. 0) WRITE(6,40) T, IOUT(LNST), IOUT(LNFE)
-  40    FORMAT(' t = ', D10.2, 5X, 'no. steps = ', I5,
-     &         '   no. f-s = ', I5)
-C
-        IF (IER .NE. 0) THEN
-           WRITE(6,60) IER, IOUT(15)
-  60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     &            '                 Linear Solver returned IER = ', I5)
-           CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-           STOP
-        ENDIF
-C
-        TOUT = TOUT + DTOUT
-  70    CONTINUE
-C
-C     Get max. absolute error in the local vector.
-      ERMAX = 0.0D0
-      DO 75 I = 1, NLOCAL
-        ERRI  = Y(I) - EXP(-ALPHA * (MYPE * NLOCAL + I) * T)
-        ERMAX = MAX(ERMAX, ABS(ERRI))
-  75    CONTINUE
-C     Get global max. error from MPI_REDUCE call.
-      CALL MPI_REDUCE(ERMAX, GERMAX, 1, MPI_DOUBLE_PRECISION, MPI_MAX,
-     1                0, MPI_COMM_WORLD, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,80) IER
-  80     FORMAT(///' MPI_ERROR: MPI_REDUCE returned IER = ', I5)
-         CALL MPI_ABORT(MPI_COMM_WORLD, 1, IER)
-         STOP
-      ENDIF
-      IF (MYPE .EQ. 0) WRITE(6,85) GERMAX
-  85  FORMAT(/'Max. absolute error is ', E10.2/)
-C
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NFE = IOUT(LNFE)
-      NNI = IOUT(LNNI)
-      NCFN = IOUT(LNCF)
-      NETF = IOUT(LNETF)
-      IF (MYPE .EQ. 0) WRITE (6,90) NST, NFE, NNI, NCFN, NETF
-  90  FORMAT(/'Final statistics:'//
-     &       ' number of steps = ', I5, 5X, /,
-     &       ' number of f evals. = ', I5/
-     &       ' number of nonlinear iters. = ', I5/
-     &       ' number of nonlinear conv. failures = ', I3/
-     &       ' number of error test failures = ', I3)
-C
-C     Free the memory and finalize MPI.
-      CALL FCVFREE
-      CALL MPI_FINALIZE(IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6,95) IER
- 95      FORMAT(///' MPI_ERROR: MPI_FINALIZE returned IER = ', I5)
-         STOP
-      ENDIF
-C
-      STOP
-      END
-C
-C     ------------------------------------------------------------------------
-C
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function f
-C
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*), MYPE, I, NLOCAL
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-      DOUBLE PRECISION ALPHA
-C
-      NLOCAL = IPAR(1)
-      MYPE = IPAR(2)
-      ALPHA = RPAR(1)
-C
-      DO I = 1, NLOCAL
-         YDOT(I) = -ALPHA * (MYPE * NLOCAL + I) * Y(I)
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_parallel/fcvDiag_non_p.out b/examples/cvode/fcmix_parallel/fcvDiag_non_p.out
deleted file mode 100644
index 9215a2b642..0000000000
--- a/examples/cvode/fcmix_parallel/fcvDiag_non_p.out
+++ /dev/null
@@ -1,31 +0,0 @@
-Diagonal test problem:
-
- NEQ =   4
- parameter alpha =    2.500
- ydot_i = -alpha*i * y_i (i = 1,...,NEQ)
- RTOL, ATOL =    0.1E-04   0.1E-09
- Method is ADAMS/FIXEDPOINT
- Number of processors =   2
-
-
- t =   0.10D+00     no. steps =    15   no. f-s =    32
- t =   0.20D+00     no. steps =    22   no. f-s =    39
- t =   0.30D+00     no. steps =    30   no. f-s =    47
- t =   0.40D+00     no. steps =    38   no. f-s =    55
- t =   0.50D+00     no. steps =    46   no. f-s =    63
- t =   0.60D+00     no. steps =    54   no. f-s =    71
- t =   0.70D+00     no. steps =    61   no. f-s =    78
- t =   0.80D+00     no. steps =    69   no. f-s =    86
- t =   0.90D+00     no. steps =    77   no. f-s =    94
- t =   0.10D+01     no. steps =    85   no. f-s =   102
-
-Max. absolute error is   0.33E-07
-
-
-Final statistics:
-
- number of steps =    85
- number of f evals. =   102
- number of nonlinear iters. =    99
- number of nonlinear conv. failures =   0
- number of error test failures =   3
diff --git a/examples/cvode/fcmix_serial/CMakeLists.txt b/examples/cvode/fcmix_serial/CMakeLists.txt
deleted file mode 100644
index 91a39cbecf..0000000000
--- a/examples/cvode/fcmix_serial/CMakeLists.txt
+++ /dev/null
@@ -1,288 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-#                David J. Gardner @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FCVODE serial examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FCVODE_examples
-  "fcvAdvDiff_bnd\;develop"
-  "fcvDiurnal_kry_bp\;develop"
-  "fcvDiurnal_kry\;develop"
-  "fcvRoberts_dns\;develop"
-  "fcvRoberts_dns_constraints\;develop"
-  )
-
-# Examples using LAPACK linear solvers
-set(FCVODE_examples_BL
-  "fcvRoberts_dnsL\;develop"
-  )
-
-# Add sparse solvers examples for 64-bit indextype configurations only,
-# not compatible with 32-bit indextype
-if(SUNDIALS_INDEX_SIZE MATCHES "64")
-
-  # Examples using KLU linear solver
-  set(FCVODE_examples_KLU
-    "fcvRoberts_klu\;develop"
-    )
-
-  # Examples using SuperLU_MT linear solver
-  set(FCVODE_examples_SUPERLUMT
-    "fcvRoberts_sps\;develop"
-    )
-
-endif()
-
-# Specify libraries to link against
-set(FNVECS_LIB sundials_fnvecserial)
-
-# Only static FCMIX libraries are available
-set(FCVODE_LIB sundials_fcvode${_STATIC_LIB_SUFFIX})
-
-if(SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS)
-  list(APPEND FCVODE_LIB sundials_cvode_fused_stubs)
-endif()
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FCVODE_LIB} ${FNVECS_LIB})
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FCVODE_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS} ${EXE_EXTRA_LINK_LIBS})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
-  endif()
-
-endforeach(example_tuple ${FCVODE_examples})
-
-
-# Add the build and install targets for each LAPACK example (if needed)
-if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-
-  set(SUNLINSOLLAPACK_LIBS
-    sundials_sunlinsollapackband
-    sundials_sunlinsollapackdense
-    sundials_fsunlinsollapackband
-    sundials_fsunlinsollapackdense)
-
-  # LAPACK libraries
-  list(APPEND SUNLINSOLLAPACK_LIBS ${LAPACK_LIBRARIES})
-
-  foreach(example_tuple ${FCVODE_examples_BL})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLLAPACK_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
-    endif()
-
-  endforeach(example_tuple ${FCVODE_examples_BL})
-
-endif()
-
-
-# Add the build and install targets for each KLU example (if needed)
-if(BUILD_SUNLINSOL_KLU)
-
-  set(SUNLINSOLKLU_LIBS
-    sundials_sunlinsolklu
-    sundials_fsunlinsolklu)
-
-  # KLU libraries
-  list(APPEND SUNLINSOLKLU_LIBS)
-
-  foreach(example_tuple ${FCVODE_examples_KLU})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLKLU_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
-    endif()
-
-  endforeach(example_tuple ${FCVODE_examples_KLU})
-
-endif()
-
-
-# Add the build and install targets for each SuperLU_MT example (if needed)
-if(BUILD_SUNLINSOL_SUPERLUMT)
-
-  set(SUNLINSOLSLUMT_LIBS
-    sundials_sunlinsolsuperlumt
-    sundials_fsunlinsolsuperlumt)
-
-  foreach(example_tuple ${FCVODE_examples_SUPERLUMT})
-
-    # parse the example tuple
-    list(GET example_tuple 0 example)
-    list(GET example_tuple 1 example_type)
-
-    # example source files
-    add_executable(${example} ${example}.f)
-
-    set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-    # add example to regression tests
-    sundials_add_test(${example} ${example}
-      ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-      ANSWER_FILE ${example}.out
-      EXAMPLE_TYPE ${example_type})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBS} ${SUNLINSOLSLUMT_LIBS})
-
-     # install example source and out files
-    if(EXAMPLES_INSTALL)
-      install(FILES ${example}.f ${example}.out
-        DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
-    endif()
-
-  endforeach(example_tuple ${FCVODE_examples_SUPERLUMT})
-
-endif()
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "CVODE")
-  set(SOLVER_LIB "sundials_cvode")
-  set(SOLVER_FLIB "sundials_fcvode")
-  if(SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS)
-    set(LIBS "-lsundials_cvode_fused_stubs ${LIBS}")
-  endif()
-
-  examples2string(FCVODE_examples EXAMPLES)
-
-  if(BUILD_SUNLINSOL_LAPACKBAND AND BUILD_SUNLINSOL_LAPACKDENSE)
-    examples2string(FCVODE_examples_BL EXAMPLES_BL)
-  else()
-    set(EXAMPLES_BL "")
-  endif()
-
-  if(BUILD_SUNLINSOL_KLU)
-    examples2string(FCVODE_examples_KLU EXAMPLES_KLU)
-  else()
-    set(EXAMPLES_KLU "")
-  endif()
-
-  if(BUILD_SUNLINSOL_SUPERLUMT)
-    examples2string(FCVODE_examples_SUPERLUMT EXAMPLES_SLUMT)
-  else()
-    set(EXAMPLES_SLUMT "")
-  endif()
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_serial_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_serial/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_serial/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_serial_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_serial/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/cvode/fcmix_serial/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/cvode/fcmix_serial
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(cvode fcmix_serial)
-
-endif()
diff --git a/examples/cvode/fcmix_serial/README b/examples/cvode/fcmix_serial/README
deleted file mode 100644
index a1c5bb387a..0000000000
--- a/examples/cvode/fcmix_serial/README
+++ /dev/null
@@ -1,52 +0,0 @@
-List of serial CVODE FCMIX examples
-
-  fcvAdvDiff_bnd     : advection-diffusion example (BDF/BAND)
-  fcvDiurnal_kry_bp  : kinetics-transport example (BDF/SPGMR/FCVBP)
-  fcvDiurnal_kry     : kinetics-transport example (BDF/SPGMR/User Prec)
-  fcvRoberts_dns     : chemical kinetics example (BDF/DENSE)
-  fcvRoberts_dnsL    : chemical kinetics example (BDF/DENSE lapack)
-  fcvRoberts_klu     : dense kinetics example with KLU sparse linear solver
-  fcvRoberts_sps     : dense kinetics example with SuperLUMT sparse solver
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.f b/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.f
deleted file mode 100644
index 532caac99d..0000000000
--- a/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.f
+++ /dev/null
@@ -1,316 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: Advection-diffusion, band linear solver
-C                             with banded user Jacobian.
-C
-C     The following is a simple example problem with a banded
-C     Jacobian. The problem is the semi-discrete form of the
-C     advection-diffusion equation in 2D:
-C     du/dt = d^2 u / dx^2 + .5 du/dx + d^2 u / dy^2
-C     on the rectangle 0 <= x <= 2, 0 <= y <= 1, and the time
-C     interval 0 <= t <= 1. Homogeneous Dirichlet boundary conditions
-C     are posed, and the initial condition is the following:
-C     u(x,y,t=0) = x(2-x)y(1-y)exp(5xy) .
-C     The PDE is discretized on a uniform MX+2 by MY+2 grid with
-C     central differencing, and with boundary values eliminated,
-C     leaving an ODE system of size NEQ = MX*MY.
-C     This program solves this problem with CVODE, using the Fortran/C 
-C     interface routine package. This solution uses the BDF method,
-C     a user-supplied banded Jacobian routine, and scalar relative and
-C     absolute tolerances. It prints results at t = .1, .2, ..., 1.0.
-C     At the end of the run, various counters of interest are printed.
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY, MXMY
-      PARAMETER (MX=10, MY=5)
-      PARAMETER (MXMY=MX*MY)
-C     
-      DOUBLE PRECISION XMAX, YMAX
-      DATA XMAX/2.0D0/, YMAX/1.0D0/
-C
-      INTEGER*4 LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE
-      INTEGER*4 IER, METH, IATOL, ITASK, JOUT
-C The following declaration specification should match C type long int.
-      INTEGER*8 NEQ, IOUT(25), IPAR(2), MU, ML
-      DOUBLE PRECISION RTOL, ATOL, T0, T, TOUT, DTOUT, UNORM 
-      DOUBLE PRECISION U(MXMY), ROUT(10), RPAR(5)
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/,  LNCF/6/, LNNI/7/, LNSETUP/8/, 
-     1     LNJE/17/
-C
-      CALL INITBX(XMAX, YMAX, MX, MY, U, IPAR, RPAR)
-C
-      NEQ = MX*MY
-      T0 = 0.0D0
-      METH = 2
-      IATOL = 1
-      RTOL = 0.0D0
-      ATOL = 1.0D-5
-      MU = MY
-      ML = MY
-      DTOUT = 0.1D0
-      ITASK = 1
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Band example problem:'//
-     1       ' Advection-diffusion, NEQ = ', I2//)
-C
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     initialize banded matrix module
-      call FSUNBANDMATINIT(1, NEQ, MU, ML, MU+ML, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNBANDEMATINIT IER = ', I5)
-        STOP
-      ENDIF
-C
-C     initialize banded linear solver module
-      call FSUNBANDLINSOLINIT(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNBANDLINSOLINIT IER = ', I5)
-        STOP
-      ENDIF
-C
-      CALL FCVMALLOC(T0, U, METH, IATOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     attach matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ',I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-C
-      CALL FCVBANDSETJAC(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVDENSESETJAC returned IER = ',I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-C
-      CALL MAXNORM(NEQ, U, UNORM)
-      WRITE(6,48) T0, UNORM
- 48   FORMAT(' At t = ', F6.2, '  max.norm(u) = ', E14.6)
-C
-      TOUT = DTOUT
-      DO 70 JOUT = 1, 10
-C
-        CALL FCVODE(TOUT, T, U, ITASK, IER)
-C
-        CALL MAXNORM(NEQ, U, UNORM)
-        WRITE(6,50) T, UNORM, IOUT(LNST)
- 50     FORMAT(' At t = ', F6.2, '  max.norm(u) = ', E14.6,
-     1         '  NST = ', I4)
-C
-        IF (IER .NE. 0) THEN
-          WRITE(6,60) IER, IOUT(15)
- 60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVFREE
-          STOP
-          ENDIF
-C
-          TOUT = TOUT + DTOUT
- 70    CONTINUE
-C
-      WRITE(6,80) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF)
- 80   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '  No. f-s = ', I4,
-     2       '  No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4)
-C
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE INITBX(XMAX, YMAX, MX, MY, U0, IPAR, RPAR)
-C Load IPAR and RPAR with problem constants and U0 with initial values
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      INTEGER*4 MX, MY
-      DOUBLE PRECISION XMAX, YMAX, U0(MY,MX), RPAR(*)
-C
-      INTEGER*4 I, J
-      DOUBLE PRECISION DX, DY, X, Y, HDCOEF, HACOEF, VDCOEF
-C
-C Problem constants
-      DX = XMAX / (MX + 1)
-      DY = YMAX / (MY + 1)
-      HDCOEF = 1.0D0 / (DX * DX)
-      HACOEF = 0.5D0 / (2.0D0 * DX)
-      VDCOEF = 1.0D0 / (DY * DY)
-C Load constants in IPAR and RPAR
-      IPAR(1) = MX
-      IPAR(2) = MY
-      RPAR(1) = DX
-      RPAR(2) = DY
-      RPAR(3) = HDCOEF
-      RPAR(4) = HACOEF
-      RPAR(5) = VDCOEF
-C
-C Loop over grid and load initial values.
-      DO 20 I = 1, MX
-        X = I * DX
-        DO 10 J = 1, MY
-          Y = J * DY
-          U0(J,I) = X * (XMAX - X) * Y * (YMAX - Y) *
-     *              EXP(5.0D0 * X * Y)
- 10       CONTINUE
- 20     CONTINUE
-C
-      RETURN
-      END
-
-      SUBROUTINE MAXNORM(N, U, UNORM)
-C Compute max-norm of array U
-      IMPLICIT NONE
-C
-      INTEGER*8 I, N
-      DOUBLE PRECISION U(*), UNORM, TEMP
-C
-      TEMP = 0.0D0
-      DO 10 I = 1, N
-         TEMP = MAX(ABS(U(I)), TEMP)
- 10   CONTINUE
-      UNORM = TEMP
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, U, UDOT, IPAR, RPAR, IER)
-C Right-hand side routine
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, U(*), UDOT(*), RPAR(*)
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      INTEGER*4 I, MX, IOFF, MY, J, IJ
-      DOUBLE PRECISION UIJ, UDN, UUP, ULT, URT, HDIFF, HADV, VDIFF
-      DOUBLE PRECISION DX, DY, HDCOEF, HACOEF, VDCOEF
-C
-C Extract constants from IPAR and RPAR
-      MX     = IPAR(1)
-      MY     = IPAR(2)
-      DX     = RPAR(1)
-      DY     = RPAR(2)
-      HDCOEF = RPAR(3)
-      HACOEF = RPAR(4)
-      VDCOEF = RPAR(5)
-C
-C Loop over all grid points.
-      DO 20 I = 1, MX
-        IOFF = (I - 1) * MY
-        DO 10 J = 1, MY
-C
-C Extract u at x_i, y_j and four neighboring points.
-          IJ = J + IOFF
-          UIJ = U(IJ)
-          UDN = 0.0D0
-          IF (J .NE. 1)  UDN = U(IJ - 1)
-          UUP = 0.0D0
-          IF (J .NE. MY) UUP = U(IJ + 1)
-          ULT = 0.0D0
-          IF (I .NE. 1)  ULT = U(IJ - MY)
-          URT = 0.0D0
-          IF (I .NE. MX) URT = U(IJ + MY)
-C
-C Set diffusion and advection terms and load into UDOT.
-          HDIFF = HDCOEF * (ULT - 2.0D0 * UIJ + URT)
-          HADV = HACOEF * (URT - ULT)
-          VDIFF = VDCOEF * (UUP - 2.0D0 * UIJ + UDN)
-          UDOT(IJ) = HDIFF + HADV + VDIFF
- 10       CONTINUE
- 20     CONTINUE
-C
-        IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVBJAC(N, MU, ML, MDIM, T, U, FU,
-     1                   BJAC, H, IPAR, RPAR, V1, V2, V3, IER)
-C Load banded Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 N, MU, ML, MDIM, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, U(*), FU(*), BJAC(MDIM,*), H, RPAR(*)
-      DOUBLE PRECISION V1(*), V2(*), V3(*)
-C
-      INTEGER*4 MBAND, MX, MY
-      INTEGER*4 I, J, K, IOFF, MU1, MU2
-      DOUBLE PRECISION DX, DY, HDCOEF, HACOEF, VDCOEF
-C
-C Extract constants from IPAR and RPAR
-      MX     = IPAR(1)
-      MY     = IPAR(2)
-      DX     = RPAR(1)
-      DY     = RPAR(2)
-      HDCOEF = RPAR(3)
-      HACOEF = RPAR(4)
-      VDCOEF = RPAR(5)
-C
-      MU1 = MU + 1
-      MU2 = MU + 2
-      MBAND = MU + 1 + ML
-C
-C Loop over all grid points.
-      DO 20 I = 1, MX
-        IOFF = (I - 1) * MY
-        DO 10 J = 1, MY
-          K = J + IOFF
-C
-C Set Jacobian elements in column k of Jb.
-          BJAC(MU1,K) = -2.0D0 * (VDCOEF + HDCOEF)
-          IF (I .NE. 1)  BJAC(1,K) = HDCOEF + HACOEF
-          IF (I .NE. MX) BJAC(MBAND,K) = HDCOEF - HACOEF
-          IF (J .NE. 1)  BJAC(MU,K) = VDCOEF
-          IF (J .NE. MY) BJAC(MU2,K) = VDCOEF
-C
- 10       CONTINUE
- 20     CONTINUE
-C
-        IER = 0
-C     
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.out b/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.out
deleted file mode 100644
index 98819b8833..0000000000
--- a/examples/cvode/fcmix_serial/fcvAdvDiff_bnd.out
+++ /dev/null
@@ -1,24 +0,0 @@
-Band example problem:
-
- Advection-diffusion, NEQ = 50
-
-
- At t =   0.00  max.norm(u) =   0.895472E+02
- At t =   0.10  max.norm(u) =   0.413289E+01  NST =   85
- At t =   0.20  max.norm(u) =   0.103929E+01  NST =  103
- At t =   0.30  max.norm(u) =   0.297983E+00  NST =  113
- At t =   0.40  max.norm(u) =   0.876577E-01  NST =  120
- At t =   0.50  max.norm(u) =   0.262564E-01  NST =  126
- At t =   0.60  max.norm(u) =   0.783042E-02  NST =  130
- At t =   0.70  max.norm(u) =   0.232939E-02  NST =  134
- At t =   0.80  max.norm(u) =   0.695343E-03  NST =  137
- At t =   0.90  max.norm(u) =   0.211598E-03  NST =  140
- At t =   1.00  max.norm(u) =   0.655685E-04  NST =  142
-
-
-Final statistics:
-
- No. steps =  142  No. f-s =  173  No. J-s =    3   No. LU-s =   23
- No. nonlinear iterations =  170
- No. nonlinear convergence failures =    0
- No. error test failures =    3
diff --git a/examples/cvode/fcmix_serial/fcvDiurnal_kry.f b/examples/cvode/fcmix_serial/fcvDiurnal_kry.f
deleted file mode 100644
index 56a7c78930..0000000000
--- a/examples/cvode/fcmix_serial/fcvDiurnal_kry.f
+++ /dev/null
@@ -1,1028 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: 2D kinetics-transport, precond. Krylov
-C     solver. 
-C     
-C     An ODE system is generated from the following 2-species diurnal
-C     kinetics advection-diffusion PDE system in 2 space dimensions:
-C     
-C     dc(i)/dt = Kh*(d/dx)**2 c(i) + V*dc(i)/dx + (d/dy)(Kv(y)*dc(i)/dy)
-C                           + Ri(c1,c2,t)      for i = 1,2,   where
-C     R1(c1,c2,t) = -q1*c1*c3 - q2*c1*c2 + 2*q3(t)*c3 + q4(t)*c2 ,
-C     R2(c1,c2,t) =  q1*c1*c3 - q2*c1*c2 - q4(t)*c2 ,
-C     Kv(y) = Kv0*exp(y/5) ,
-C     Kh, V, Kv0, q1, q2, and c3 are constants, and q3(t) and q4(t)
-C     vary diurnally.
-C
-C     The problem is posed on the square
-C     0 .le. x .le. 20,    30 .le. y .le. 50   (all in km),
-C     with homogeneous Neumann boundary conditions, and for time t
-C     in 0 .le. t .le. 86400 sec (1 day).
-C
-C     The PDE system is treated by central differences on a uniform
-C     10 x 10 mesh, with simple polynomial initial profiles.
-C     The problem is solved with CVODE, with the BDF/GMRES method and
-C     the block-diagonal part of the Jacobian as a left
-C     preconditioner.
-C     
-C     Note: this program includes modified (64-bit integer) versions 
-C     of the dense linear solver routines DGEFA and DGESL from LINPACK, 
-C     and BLAS routines DCOPY and DSCAL.
-C     
-C     The second and third dimensions of U here must match the values
-C     of MX and MY, for consistency with the output statements below.
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY
-      PARAMETER (MX=10, MY=10)
-      INTEGER*4 LENIPAR, LENRPAR
-      PARAMETER (LENIPAR=6+2*MX*MY, LENRPAR=12+8*MX*MY)
-C
-      INTEGER*4 METH,IATOL,ITASK,IER,LNCFL,LNPS
-      INTEGER*4 LNST,LNFE,LNSETUP,LNNI,LNCF,LQ,LH,LNPE,LNLI,LNETF
-      INTEGER*4 JOUT,JPRETYPE,IGSTYPE,MAXL
-C The following declaration specification should match C type long int.
-      INTEGER*8 NEQ, IOUT(25), IPAR(LENIPAR)
-      INTEGER*4 NST,NFE,NPSET,NPE,NPS,NNI,NETF
-      INTEGER*4 NLI,NCFN,NCFL
-      DOUBLE PRECISION ATOL,AVDIM,T,TOUT,TWOHR,RTOL,FLOOR,DELT
-      DOUBLE PRECISION U(2,MX,MY),ROUT(10),RPAR(LENRPAR)
-C
-      DATA TWOHR/7200.0D0/, RTOL/1.0D-5/, FLOOR/100.0D0/,
-     &     JPRETYPE/1/, IGSTYPE/1/, MAXL/0/, DELT/0.0D0/
-      DATA LNST/3/, LNFE/4/, LNETF/5/,  LNCF/6/, LNNI/7/, LNSETUP/8/, 
-     &     LQ/9/, LNPE/20/, LNLI/22/, LNPS/21/, LNCFL/23/
-      DATA LH/2/
-C
-C     Load problem constants into IPAR, RPAR, and set initial values
-      CALL INITKX(MX, MY, U, IPAR, RPAR)
-C
-C     Set other input arguments.
-      NEQ = 2*MX*MY
-      T = 0.0D0
-      METH = 2
-      IATOL = 1
-      ATOL = RTOL * FLOOR
-      ITASK = 1
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Krylov example problem:'//
-     &       ' Kinetics-transport, NEQ = ', I4/)
-C
-C     Initialize vector specification
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     Initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(1, JPRETYPE, MAXL, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-        STOP
-      ENDIF
-      call FSUNSPGMRSETGSTYPE(1, IGSTYPE, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,27) IER
- 27     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-        STOP
-      ENDIF
-C     
-C     Initialize CVODE
-      CALL FCVMALLOC(T, U, METH, IATOL, RTOL, ATOL,
-     &     IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     attach linear solver module to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ',I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-C     
-C     attach preconditioner to CVLs interface
-      CALL FCVLSSETPREC(1, IER)
-C
-C Loop over output points, call FCVODE, print sample solution values.
-      TOUT = TWOHR
-      DO JOUT = 1, 12
-C
-         CALL FCVODE(TOUT, T, U, ITASK, IER)
-C
-         WRITE(6,50) T, IOUT(LNST), IOUT(LQ), ROUT(LH)
- 50      FORMAT(/' t = ', E11.3, 3X, 'nst = ', I5,
-     &           '  q = ', I2, '  h = ', E14.6)
-         WRITE(6,55) U(1,1,1), U(1,5,5), U(1,10,10),
-     &               U(2,1,1), U(2,5,5), U(2,10,10)
- 55      FORMAT('  c1 (bot.left/middle/top rt.) = ', 3E14.6/
-     &          '  c2 (bot.left/middle/top rt.) = ', 3E14.6)
-C
-         IF (IER .NE. 0) THEN
-            WRITE(6,60) IER, IOUT(15)
- 60         FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     &             '                 Linear Solver returned IER = ', I5)
-            CALL FCVFREE
-            STOP
-         ENDIF
-C     
-         TOUT = TOUT + TWOHR
-C
-      ENDDO
-
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NFE = IOUT(LNFE)
-      NPSET = IOUT(LNSETUP)
-      NPE = IOUT(LNPE)
-      NPS = IOUT(LNPS)
-      NNI = IOUT(LNNI)
-      NLI = IOUT(LNLI)
-      AVDIM = DBLE(NLI) / DBLE(NNI)
-      NCFN = IOUT(LNCF)
-      NCFL = IOUT(LNCFL)
-      NETF = IOUT(LNETF)
-      WRITE(6,80) NST, NFE, NPSET, NPE, NPS, NNI, NLI, AVDIM, NCFN,
-     &     NCFL, NETF
-  80  FORMAT(//'Final statistics:'//
-     &     ' number of steps        = ', I5, 5X,
-     &     ' number of f evals.     =', I5/
-     &     ' number of prec. setups = ', I5/
-     &     ' number of prec. evals. = ', I5, 5X,
-     &     ' number of prec. solves = ', I5/
-     &     ' number of nonl. iters. = ', I5, 5X,
-     &     ' number of lin. iters.  = ', I5/
-     &     ' average Krylov subspace dimension (NLI/NNI)  = ', E14.6/
-     &     ' number of conv. failures.. nonlinear = ', I3,
-     &     ' linear = ', I3/
-     &     ' number of error test failures = ', I3)
-C     
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE INITKX(MX, MY, U0, IPAR, RPAR)
-C     Routine to set problem constants and initial values
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION RPAR(*)
-C
-      INTEGER*4 MM, JY, JX, P_IPP, P_BD, P_P
-      DOUBLE PRECISION U0
-      DIMENSION U0(2,MX,MY)
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, A3, A4, OM, C3, DY, HDCO
-      DOUBLE PRECISION VDCO, HACO, X, Y
-      DOUBLE PRECISION CX, CY, DKH, DKV0, DX, HALFDA, PI, VEL
-C
-      DATA DKH/4.0D-6/, VEL/0.001D0/, DKV0/1.0D-8/, HALFDA/4.32D4/,
-     1     PI/3.1415926535898D0/
-C
-C     Problem constants
-      MM = MX * MY
-      Q1 = 1.63D-16
-      Q2 = 4.66D-16
-      Q3 = 0.0D0
-      Q4 = 0.0D0
-      A3 = 22.62D0
-      A4 = 7.601D0
-      OM = PI / HALFDA
-      C3 = 3.7D16
-      DX = 20.0D0 / (MX - 1.0D0)
-      DY = 20.0D0 / (MY - 1.0D0)
-      HDCO = DKH / DX**2
-      HACO = VEL / (2.0D0 * DX)
-      VDCO = (1.0D0 / DY**2) * DKV0
-C
-C     Load constants in IPAR and RPAR
-      IPAR(1) = MX
-      IPAR(2) = MY
-      IPAR(3) = MM
-C
-      RPAR(1)  = Q1
-      RPAR(2)  = Q2
-      RPAR(3)  = Q3
-      RPAR(4)  = Q4
-      RPAR(5)  = A3
-      RPAR(6)  = A4
-      RPAR(7)  = OM
-      RPAR(8)  = C3
-      RPAR(9)  = DY
-      RPAR(10) = HDCO
-      RPAR(11) = VDCO
-      RPAR(12) = HACO
-C
-C     Pointers into IPAR and RPAR
-      P_IPP = 7
-      P_BD  = 13
-      P_P   = P_BD + 4*MM
-C     
-      IPAR(4) = P_IPP
-      IPAR(5) = P_BD
-      IPAR(6) = P_P
-C
-C     Set initial profiles.
-      DO JY = 1, MY
-        Y = 30.0D0 + (JY - 1.0D0) * DY
-        CY = (0.1D0 * (Y - 40.0D0))**2
-        CY = 1.0D0 - CY + 0.5D0 * CY**2
-        DO JX = 1, MX
-          X = (JX - 1.0D0) * DX
-          CX = (0.1D0 * (X - 10.0D0))**2
-          CX = 1.0D0 - CX + 0.5D0 * CX**2
-          U0(1,JX,JY) = 1.0D6 * CX * CY
-          U0(2,JX,JY) = 1.0D12 * CX * CY
-         ENDDO
-      ENDDO
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, U, UDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function f
-C
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, U(2,*), UDOT(2,*), RPAR(*)
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      INTEGER*4 ILEFT, IRIGHT
-      INTEGER*4 JX, JY, MX, MY, MM, IBLOK0, IBLOK, IDN, IUP
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, A3, A4, OM, C3, DY, HDCO
-      DOUBLE PRECISION VDCO, HACO
-      DOUBLE PRECISION C1, C2, C1DN, C2DN, C1UP, C2UP, C1LT, C2LT
-      DOUBLE PRECISION C1RT, C2RT, CYDN, CYUP, HORD1, HORD2, HORAD1
-      DOUBLE PRECISION HORAD2, QQ1, QQ2, QQ3, QQ4, RKIN1, RKIN2, S
-      DOUBLE PRECISION VERTD1, VERTD2, YDN, YUP
-C
-C     Extract constants from IPAR and RPAR
-      MX = IPAR(1)
-      MY = IPAR(2)
-      MM = IPAR(3)
-C
-      Q1 = RPAR(1)
-      Q2 = RPAR(2)
-      Q3 = RPAR(3)
-      Q4 = RPAR(4)
-      A3 = RPAR(5)
-      A4 = RPAR(6)
-      OM = RPAR(7)
-      C3 = RPAR(8)
-      DY = RPAR(9)
-      HDCO = RPAR(10)
-      VDCO = RPAR(11)
-      HACO = RPAR(12)
-C
-C     Set diurnal rate coefficients.
-      S = SIN(OM * T)
-      IF (S .GT. 0.0D0) THEN
-         Q3 = EXP(-A3 / S)
-         Q4 = EXP(-A4 / S)
-      ELSE
-         Q3 = 0.0D0
-         Q4 = 0.0D0
-      ENDIF
-      RPAR(3) = Q3
-      RPAR(4) = Q4
-C
-C     Loop over all grid points.
-      DO JY = 1, MY
-         YDN = 30.0D0 + (JY - 1.5D0) * DY
-         YUP = YDN + DY
-         CYDN = VDCO * EXP(0.2D0 * YDN)
-         CYUP = VDCO * EXP(0.2D0 * YUP)
-         IBLOK0 = (JY - 1) * MX
-         IDN = -MX
-         IF (JY .EQ. 1) IDN = MX
-         IUP = MX
-         IF (JY .EQ. MY) IUP = -MX
-         DO JX = 1, MX
-            IBLOK = IBLOK0 + JX
-            C1 = U(1,IBLOK)
-            C2 = U(2,IBLOK)
-C     Set kinetic rate terms.
-            QQ1 = Q1 * C1 * C3
-            QQ2 = Q2 * C1 * C2
-            QQ3 = Q3 * C3
-            QQ4 = Q4 * C2
-            RKIN1 = -QQ1 - QQ2 + 2.0D0 * QQ3 + QQ4
-            RKIN2 = QQ1 - QQ2 - QQ4
-C     Set vertical diffusion terms.
-            C1DN = U(1,IBLOK + IDN)
-            C2DN = U(2,IBLOK + IDN)
-            C1UP = U(1,IBLOK + IUP)
-            C2UP = U(2,IBLOK + IUP)
-            VERTD1 = CYUP * (C1UP - C1) - CYDN * (C1 - C1DN)
-            VERTD2 = CYUP * (C2UP - C2) - CYDN * (C2 - C2DN)
-C     Set horizontal diffusion and advection terms.
-            ILEFT = -1
-            IF (JX .EQ. 1) ILEFT = 1
-            IRIGHT = 1
-            IF (JX .EQ. MX) IRIGHT = -1
-            C1LT = U(1,IBLOK + ILEFT)
-            C2LT = U(2,IBLOK + ILEFT)
-            C1RT = U(1,IBLOK + IRIGHT)
-            C2RT = U(2,IBLOK + IRIGHT)
-            HORD1 = HDCO * (C1RT - 2.0D0 * C1 + C1LT)
-            HORD2 = HDCO * (C2RT - 2.0D0 * C2 + C2LT)
-            HORAD1 = HACO * (C1RT - C1LT)
-            HORAD2 = HACO * (C2RT - C2LT)
-C     Load all terms into UDOT.
-            UDOT(1,IBLOK) = VERTD1 + HORD1 + HORAD1 + RKIN1
-            UDOT(2,IBLOK) = VERTD2 + HORD2 + HORAD2 + RKIN2
-         ENDDO
-      ENDDO
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVPSET(T, U, FU, JOK, JCUR, GAMMA, H,
-     &                   IPAR, RPAR, IER)
-C     Routine to set and preprocess block-diagonal preconditioner.
-C     Note: The dimensions in /BDJ/ below assume at most 100 mesh points.
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, JOK, JCUR
-      DOUBLE PRECISION T, U(2,*), FU(*), GAMMA, H
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION RPAR(*)
-C
-      INTEGER*4 MX, MY, MM, P_IPP, P_BD, P_P
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, C3, DY, HDCO, VDCO
-C
-      IER = 0
-C
-C     Extract constants from IPAR and RPAR
-      MX = IPAR(1)
-      MY = IPAR(2)
-      MM = IPAR(3)
-C
-      Q1 = RPAR(1)
-      Q2 = RPAR(2)
-      Q3 = RPAR(3)
-      Q4 = RPAR(4)
-      C3 = RPAR(8)
-      DY = RPAR(9)
-      HDCO = RPAR(10)
-      VDCO = RPAR(11)
-C
-C     Extract pointers into IPAR and RPAR
-      P_IPP = IPAR(4)
-      P_BD  = IPAR(5)
-      P_P   = IPAR(6)
-C
-C     If needed, recompute BD
-C
-      IF (JOK .EQ. 1) THEN
-C     JOK = 1. Reuse saved BD
-        JCUR = 0
-      ELSE    
-C     JOK = 0. Compute diagonal Jacobian blocks.
-C     (using q4 value computed on last FCVFUN call).
-         CALL PREC_JAC(MX, MY, MM, U, RPAR(P_BD),
-     &        Q1, Q2, Q3, Q4, C3, DY, HDCO, VDCO)
-         JCUR = 1
-      ENDIF
-C
-C     Copy BD to P
-      CALL DCOPY(4*MM, RPAR(P_BD), 1, RPAR(P_P), 1)
-C
-C     Scale P by -GAMMA
-      CALL DSCAL(4*MM, -GAMMA, RPAR(P_P), 1)
-C
-C     Perform LU decomposition
-      CALL PREC_LU(MM, RPAR(P_P), IPAR(P_IPP), IER)
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-      
-      SUBROUTINE FCVPSOL(T, U, FU, R, Z, GAMMA, DELTA, LR,
-     &                   IPAR, RPAR, IER)
-C     Routine to solve preconditioner linear system.
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LR
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION T, U(*), FU(*), R(*), Z(2,*)
-      DOUBLE PRECISION GAMMA, DELTA, RPAR(*)
-C
-      INTEGER*4 MM, P_IPP, P_P
-C
-      IER = 0
-C
-C     Extract constants from IPAR and RPAR
-      MM  = IPAR(3)
-C
-C     Extract pointers into IPAR and RPAR
-      P_IPP = IPAR(4)
-      P_P   = IPAR(6)
-C
-C     Copy RHS into Z
-      CALL DCOPY(2*MM, R, 1, Z, 1)
-C
-C     Solve the block-diagonal system Px = r using LU factors stored in P
-C     and pivot data in IPP, and return the solution in Z.
-      CALL PREC_SOL(MM, RPAR(P_P), IPAR(P_IPP), Z)
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE PREC_JAC(MX, MY, MM, U, BD,
-     &     Q1, Q2, Q3, Q4, C3, DY, HDCO, VDCO)
-C     Routine to compute diagonal Jacobian blocks
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY, MM
-      DOUBLE PRECISION U(2,*), BD(2,2,MM)
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, C3, DY, HDCO, VDCO
-C
-      INTEGER*4 JY, JX, IBLOK, IBLOK0
-      DOUBLE PRECISION C1, C2, CYDN, CYUP, DIAG, YDN, YUP
-C
-      DO JY = 1, MY
-         YDN = 30.0D0 + (JY - 1.5D0) * DY
-         YUP = YDN + DY
-         CYDN = VDCO * EXP(0.2D0 * YDN)
-         CYUP = VDCO * EXP(0.2D0 * YUP)
-         DIAG = -(CYDN + CYUP + 2.0D0 * HDCO)
-         IBLOK0 = (JY - 1) * MX
-         DO JX = 1, MX
-            IBLOK = IBLOK0 + JX
-            C1 = U(1,IBLOK)
-            C2 = U(2,IBLOK)
-            BD(1,1,IBLOK) = (-Q1 * C3 - Q2 * C2) + DIAG
-            BD(1,2,IBLOK) = -Q2 * C1 + Q4
-            BD(2,1,IBLOK) =  Q1 * C3 - Q2 * C2
-            BD(2,2,IBLOK) = (-Q2 * C1 - Q4) + DIAG
-         ENDDO
-      ENDDO
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE PREC_LU(MM, P, IPP, IER)
-C     Routine to perform LU decomposition on (P+I)
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER
-      INTEGER*4 MM
-      INTEGER*8 IPP(2,MM)
-      DOUBLE PRECISION P(2,2,MM)
-C
-      INTEGER*4 I
-C
-C     Add identity matrix and do LU decompositions on blocks, in place.
-      DO I = 1, MM
-         P(1,1,I) = P(1,1,I) + 1.0D0
-         P(2,2,I) = P(2,2,I) + 1.0D0
-         CALL DGEFA(P(1,1,I), 2, 2, IPP(1,I), IER)
-         IF (IER .NE. 0) RETURN
-      ENDDO
-C     
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE PREC_SOL(MM, P, IPP, Z)
-C     Routine for backsolve
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MM
-      INTEGER*8 IPP(2,MM)
-      DOUBLE PRECISION P(2,2,MM), Z(2,MM)
-C      
-      INTEGER*4 I
-C
-      DO I = 1, MM
-         CALL DGESL(P(1,1,I), 2, 2, IPP(1,I), Z(1,I), 0)
-      ENDDO
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      subroutine dgefa(a, lda, n, ipvt, info)
-c
-      implicit none
-c
-      integer info, idamax, j, k, kp1, l, nm1, n
-      integer*4 lda
-      integer*8 ipvt(1)
-      double precision a(lda,1), t
-c
-c     dgefa factors a double precision matrix by gaussian elimination.
-c
-c     dgefa is usually called by dgeco, but it can be called
-c     directly with a saving in time if  rcond  is not needed.
-c     (time for dgeco) = (1 + 9/n)*(time for dgefa) .
-c
-c     on entry
-c
-c        a       double precision(lda, n)
-c                the matrix to be factored.
-c
-c        lda     integer
-c                the leading dimension of the array  a .
-c
-c        n       integer
-c                the order of the matrix  a .
-c
-c     on return
-c
-c        a       an upper triangular matrix and the multipliers
-c                which were used to obtain it.
-c                the factorization can be written  a = l*u  where
-c                l  is a product of permutation and unit lower
-c                triangular matrices and  u  is upper triangular.
-c
-c        ipvt    integer(n)
-c                an integer vector of pivot indices.
-c
-c        info    integer
-c                = 0  normal value.
-c                = k  if  u(k,k) .eq. 0.0 .  this is not an error
-c                     condition for this subroutine, but it does
-c                     indicate that dgesl or dgedi will divide by zero
-c                     if called.  employ  rcond  in dgeco for a reliable
-c                     indication of singularity.
-c
-c     linpack. this version dated 08/14/78 .
-c     cleve moler, university of new mexico, argonne national lab.
-c
-c     subroutines and functions
-c
-c     blas daxpy,dscal,idamax
-c
-c     internal variables
-c
-c     gaussian elimination with partial pivoting
-c
-      info = 0
-      nm1 = n - 1
-      if (nm1 .lt. 1) go to 70
-      do 60 k = 1, nm1
-         kp1 = k + 1
-c
-c        find l = pivot index
-c
-         l = idamax(n - k + 1, a(k,k), 1) + k - 1
-         ipvt(k) = l
-c
-c        zero pivot implies this column already triangularized
-c
-         if (a(l,k) .eq. 0.0d0) go to 40
-c
-c           interchange if necessary
-c
-            if (l .eq. k) go to 10
-               t = a(l,k)
-               a(l,k) = a(k,k)
-               a(k,k) = t
-   10       continue
-c
-c           compute multipliers
-c
-            t = -1.0d0 / a(k,k)
-            call dscal(n - k, t, a(k + 1,k), 1)
-c
-c           row elimination with column indexing
-c
-            do 30 j = kp1, n
-               t = a(l,j)
-               if (l .eq. k) go to 20
-                  a(l,j) = a(k,j)
-                  a(k,j) = t
-   20          continue
-               call daxpy(n - k, t, a(k + 1,k), 1, a(k + 1,j), 1)
-   30       continue
-         go to 50
-   40    continue
-            info = k
-   50    continue
-   60 continue
-   70 continue
-      ipvt(n) = n
-      if (a(n,n) .eq. 0.0d0) info = n
-      return
-      end
-
-C     ----------------------------------------------------------------
-
-      subroutine dgesl(a, lda, n, ipvt, b, job)
-c
-      implicit none
-c
-      integer lda, n, job, k, kb, l, nm1
-      integer*8 ipvt(1)
-      double precision a(lda,1), b(1), ddot, t
-c
-c     dgesl solves the double precision system
-c     a * x = b  or  trans(a) * x = b
-c     using the factors computed by dgeco or dgefa.
-c
-c     on entry
-c
-c        a       double precision(lda, n)
-c                the output from dgeco or dgefa.
-c
-c        lda     integer
-c                the leading dimension of the array  a .
-c
-c        n       integer
-c                the order of the matrix  a .
-c
-c        ipvt    integer(n)
-c                the pivot vector from dgeco or dgefa.
-c
-c        b       double precision(n)
-c                the right hand side vector.
-c
-c        job     integer
-c                = 0         to solve  a*x = b ,
-c                = nonzero   to solve  trans(a)*x = b  where
-c                            trans(a)  is the transpose.
-c
-c     on return
-c
-c        b       the solution vector  x .
-c
-c     error condition
-c
-c        a division by zero will occur if the input factor contains a
-c        zero on the diagonal.  technically this indicates singularity
-c        but it is often caused by improper arguments or improper
-c        setting of lda .  it will not occur if the subroutines are
-c        called correctly and if dgeco has set rcond .gt. 0.0
-c        or dgefa has set info .eq. 0 .
-c
-c     to compute  inverse(a) * c  where  c  is a matrix
-c     with  p  columns
-c           call dgeco(a,lda,n,ipvt,rcond,z)
-c           if (rcond is too small) go to ...
-c           do 10 j = 1, p
-c              call dgesl(a,lda,n,ipvt,c(1,j),0)
-c        10 continue
-c
-c     linpack. this version dated 08/14/78 .
-c     cleve moler, university of new mexico, argonne national lab.
-c
-c     subroutines and functions
-c
-c     blas daxpy,ddot
-c
-c     internal variables
-c
-      nm1 = n - 1
-      if (job .ne. 0) go to 50
-c
-c        job = 0 , solve  a * x = b
-c        first solve  l*y = b
-c
-         if (nm1 .lt. 1) go to 30
-         do 20 k = 1, nm1
-            l = ipvt(k)
-            t = b(l)
-            if (l .eq. k) go to 10
-               b(l) = b(k)
-               b(k) = t
-   10       continue
-            call daxpy(n - k, t, a(k + 1,k), 1, b(k + 1), 1)
-   20    continue
-   30    continue
-c
-c        now solve  u*x = y
-c
-         do 40 kb = 1, n
-            k = n + 1 - kb
-            b(k) = b(k) / a(k,k)
-            t = -b(k)
-            call daxpy(k - 1, t, a(1,k), 1, b(1), 1)
-   40    continue
-      go to 100
-   50 continue
-c
-c        job = nonzero, solve  trans(a) * x = b
-c        first solve  trans(u)*y = b
-c
-         do 60 k = 1, n
-            t = ddot(k - 1, a(1,k), 1, b(1), 1)
-            b(k) = (b(k) - t) / a(k,k)
-   60    continue
-c
-c        now solve trans(l)*x = y
-c
-         if (nm1 .lt. 1) go to 90
-         do 80 kb = 1, nm1
-            k = n - kb
-            b(k) = b(k) + ddot(n - k, a(k + 1,k), 1, b(k + 1), 1)
-            l = ipvt(k)
-            if (l .eq. k) go to 70
-               t = b(l)
-               b(l) = b(k)
-               b(k) = t
-   70       continue
-   80    continue
-   90    continue
-  100 continue
-      return
-      end
-
-C     ----------------------------------------------------------------
-
-      subroutine daxpy(n, da, dx, incx, dy, incy)
-c
-c     constant times a vector plus a vector.
-c     uses unrolled loops for increments equal to one.
-c     jack dongarra, linpack, 3/11/78.
-c
-      implicit none
-c
-      integer i, incx, incy, ix, iy, m, mp1
-      integer*4 n
-      double precision dx(1), dy(1), da
-c
-      if (n .le. 0) return
-      if (da .eq. 0.0d0) return
-      if (incx .eq. 1 .and. incy .eq. 1) go to 20
-c
-c        code for unequal increments or equal increments
-c        not equal to 1
-c
-      ix = 1
-      iy = 1
-      if (incx .lt. 0) ix = (-n + 1) * incx + 1
-      if (incy .lt. 0) iy = (-n + 1) * incy + 1
-      do 10 i = 1, n
-        dy(iy) = dy(iy) + da * dx(ix)
-        ix = ix + incx
-        iy = iy + incy
-   10 continue
-      return
-c
-c        code for both increments equal to 1
-c
-c
-c        clean-up loop
-c
-   20 m = mod(n, 4)
-      if ( m .eq. 0 ) go to 40
-      do 30 i = 1, m
-        dy(i) = dy(i) + da * dx(i)
-   30 continue
-      if ( n .lt. 4 ) return
-   40 mp1 = m + 1
-      do 50 i = mp1, n, 4
-        dy(i) = dy(i) + da * dx(i)
-        dy(i + 1) = dy(i + 1) + da * dx(i + 1)
-        dy(i + 2) = dy(i + 2) + da * dx(i + 2)
-        dy(i + 3) = dy(i + 3) + da * dx(i + 3)
-   50 continue
-      return
-      end
-C     ----------------------------------------------------------------
-
-      subroutine dscal(n, da, dx, incx)
-c
-c     scales a vector by a constant.
-c     uses unrolled loops for increment equal to one.
-c     jack dongarra, linpack, 3/11/78.
-c
-      implicit none
-c
-      integer i, incx, m, mp1, nincx
-      integer*4 n
-      double precision da, dx(1)
-c
-      if (n.le.0) return
-      if (incx .eq. 1) go to 20
-c
-c        code for increment not equal to 1
-c
-      nincx = n * incx
-      do 10 i = 1, nincx, incx
-        dx(i) = da * dx(i)
-   10 continue
-      return
-c
-c        code for increment equal to 1
-c
-c
-c        clean-up loop
-c
-   20 m = mod(n, 5)
-      if ( m .eq. 0 ) go to 40
-      do 30 i = 1, m
-        dx(i) = da * dx(i)
-   30 continue
-      if ( n .lt. 5 ) return
-   40 mp1 = m + 1
-      do 50 i = mp1, n, 5
-        dx(i) = da * dx(i)
-        dx(i + 1) = da * dx(i + 1)
-        dx(i + 2) = da * dx(i + 2)
-        dx(i + 3) = da * dx(i + 3)
-        dx(i + 4) = da * dx(i + 4)
-   50 continue
-      return
-      end
-
-C     ----------------------------------------------------------------
-
-      double precision function ddot(n, dx, incx, dy, incy)
-c
-c     forms the dot product of two vectors.
-c     uses unrolled loops for increments equal to one.
-c     jack dongarra, linpack, 3/11/78.
-c
-      implicit none
-c
-      integer i, incx, incy, ix, iy, m, mp1
-      integer*4 n
-      double precision dx(1), dy(1), dtemp
-c
-      ddot = 0.0d0
-      dtemp = 0.0d0
-      if (n .le. 0) return
-      if (incx .eq. 1 .and. incy .eq. 1) go to 20
-c
-c        code for unequal increments or equal increments
-c          not equal to 1
-c
-      ix = 1
-      iy = 1
-      if (incx .lt. 0) ix = (-n + 1) * incx + 1
-      if (incy .lt. 0) iy = (-n + 1) * incy + 1
-      do 10 i = 1, n
-        dtemp = dtemp + dx(ix) * dy(iy)
-        ix = ix + incx
-        iy = iy + incy
-   10 continue
-      ddot = dtemp
-      return
-c
-c        code for both increments equal to 1
-c
-c
-c        clean-up loop
-c
-   20 m = mod(n, 5)
-      if ( m .eq. 0 ) go to 40
-      do 30 i = 1,m
-        dtemp = dtemp + dx(i) * dy(i)
-   30 continue
-      if ( n .lt. 5 ) go to 60
-   40 mp1 = m + 1
-      do 50 i = mp1, n, 5
-        dtemp = dtemp + dx(i) * dy(i) + dx(i + 1) * dy(i + 1) +
-     *          dx(i + 2) * dy(i + 2) + dx(i + 3) * dy(i + 3) +
-     *          dx(i + 4) * dy(i + 4)
-   50 continue
-   60 ddot = dtemp
-      return
-      end
-
-C     ----------------------------------------------------------------
-
-      integer function idamax(n, dx, incx)
-c
-c     finds the index of element having max. absolute value.
-c     jack dongarra, linpack, 3/11/78.
-c
-      implicit none
-c
-      integer i, incx, ix
-      integer*4 n
-      double precision dx(1), dmax
-c
-      idamax = 0
-      if (n .lt. 1) return
-      idamax = 1
-      if (n .eq. 1) return
-      if (incx .eq. 1) go to 20
-c
-c        code for increment not equal to 1
-c
-      ix = 1
-      dmax = abs(dx(1))
-      ix = ix + incx
-      do 10 i = 2, n
-         if (abs(dx(ix)) .le. dmax) go to 5
-         idamax = i
-         dmax = abs(dx(ix))
-    5    ix = ix + incx
-   10 continue
-      return
-c
-c        code for increment equal to 1
-c
-   20 dmax = abs(dx(1))
-      do 30 i = 2, n
-         if (abs(dx(i)) .le. dmax) go to 30
-         idamax = i
-         dmax = abs(dx(i))
-   30 continue
-      return
-      end
-
-C     ----------------------------------------------------------------
-
-      subroutine  dcopy(n, dx, incx, dy, incy)
-c
-c     copies a vector, x, to a vector, y.
-c     uses unrolled loops for increments equal to one.
-c     jack dongarra, linpack, 3/11/78.
-c
-      implicit none
-c
-      integer i, incx, incy, ix, iy, m, mp1
-      integer*4 n
-      double precision dx(1), dy(1)
-c
-      if (n .le. 0) return
-      if (incx .eq. 1 .and. incy .eq. 1) go to 20
-c
-c        code for unequal increments or equal increments
-c          not equal to 1
-c
-      ix = 1
-      iy = 1
-      if (incx .lt. 0) ix = (-n + 1) * incx + 1
-      if (incy .lt. 0) iy = (-n + 1) * incy + 1
-      do 10 i = 1, n
-        dy(iy) = dx(ix)
-        ix = ix + incx
-        iy = iy + incy
-   10 continue
-      return
-c
-c        code for both increments equal to 1
-c
-c
-c        clean-up loop
-c
-   20 m = mod(n, 7)
-      if ( m .eq. 0 ) go to 40
-      do 30 i = 1, m
-        dy(i) = dx(i)
-   30 continue
-      if ( n .lt. 7 ) return
-   40 mp1 = m + 1
-      do 50 i = mp1, n, 7
-        dy(i) = dx(i)
-        dy(i + 1) = dx(i + 1)
-        dy(i + 2) = dx(i + 2)
-        dy(i + 3) = dx(i + 3)
-        dy(i + 4) = dx(i + 4)
-        dy(i + 5) = dx(i + 5)
-        dy(i + 6) = dx(i + 6)
-   50 continue
-      return
-      end
diff --git a/examples/cvode/fcmix_serial/fcvDiurnal_kry.out b/examples/cvode/fcmix_serial/fcvDiurnal_kry.out
deleted file mode 100644
index 2afa39a024..0000000000
--- a/examples/cvode/fcmix_serial/fcvDiurnal_kry.out
+++ /dev/null
@@ -1,63 +0,0 @@
-Krylov example problem:
-
- Kinetics-transport, NEQ =  200
-
-
- t =   0.720E+04   nst =   219  q =  5  h =   0.158696E+03
-  c1 (bot.left/middle/top rt.) =   0.104683E+05  0.296373E+05  0.111853E+05
-  c2 (bot.left/middle/top rt.) =   0.252672E+12  0.715376E+12  0.269977E+12
-
- t =   0.144E+05   nst =   251  q =  5  h =   0.377205E+03
-  c1 (bot.left/middle/top rt.) =   0.665902E+07  0.531602E+07  0.730081E+07
-  c2 (bot.left/middle/top rt.) =   0.258192E+12  0.205680E+12  0.283286E+12
-
- t =   0.216E+05   nst =   277  q =  5  h =   0.274584E+03
-  c1 (bot.left/middle/top rt.) =   0.266498E+08  0.103636E+08  0.293077E+08
-  c2 (bot.left/middle/top rt.) =   0.299279E+12  0.102810E+12  0.331344E+12
-
- t =   0.288E+05   nst =   307  q =  4  h =   0.201171E+03
-  c1 (bot.left/middle/top rt.) =   0.870209E+07  0.129197E+08  0.965002E+07
-  c2 (bot.left/middle/top rt.) =   0.338035E+12  0.502929E+12  0.375096E+12
-
- t =   0.360E+05   nst =   336  q =  5  h =   0.101863E+03
-  c1 (bot.left/middle/top rt.) =   0.140404E+05  0.202903E+05  0.156090E+05
-  c2 (bot.left/middle/top rt.) =   0.338677E+12  0.489443E+12  0.376516E+12
-
- t =   0.432E+05   nst =   385  q =  4  h =   0.456580E+03
-  c1 (bot.left/middle/top rt.) =   0.522615E-07 -0.607462E-05  0.871309E-07
-  c2 (bot.left/middle/top rt.) =   0.338233E+12  0.135487E+12  0.380352E+12
-
- t =   0.504E+05   nst =   403  q =  4  h =   0.277279E+03
-  c1 (bot.left/middle/top rt.) =  -0.266960E-07 -0.450968E-05 -0.267202E-07
-  c2 (bot.left/middle/top rt.) =   0.335816E+12  0.493033E+12  0.386445E+12
-
- t =   0.576E+05   nst =   419  q =  5  h =   0.344023E+03
-  c1 (bot.left/middle/top rt.) =  -0.114670E-08 -0.587145E-07 -0.219472E-08
-  c2 (bot.left/middle/top rt.) =   0.332031E+12  0.964981E+12  0.390900E+12
-
- t =   0.648E+05   nst =   431  q =  5  h =   0.949533E+03
-  c1 (bot.left/middle/top rt.) =   0.379212E-09  0.190141E-07  0.719619E-09
-  c2 (bot.left/middle/top rt.) =   0.331303E+12  0.892184E+12  0.396342E+12
-
- t =   0.720E+05   nst =   441  q =  5  h =   0.700864E+03
-  c1 (bot.left/middle/top rt.) =  -0.187184E-10 -0.936079E-09 -0.355015E-10
-  c2 (bot.left/middle/top rt.) =   0.332972E+12  0.618617E+12  0.403885E+12
-
- t =   0.792E+05   nst =   451  q =  5  h =   0.700864E+03
-  c1 (bot.left/middle/top rt.) =   0.136509E-12  0.673869E-11  0.258515E-12
-  c2 (bot.left/middle/top rt.) =   0.333441E+12  0.666904E+12  0.412026E+12
-
- t =   0.864E+05   nst =   461  q =  5  h =   0.700864E+03
-  c1 (bot.left/middle/top rt.) =   0.414351E-13  0.207247E-11  0.786247E-13
-  c2 (bot.left/middle/top rt.) =   0.335178E+12  0.910668E+12  0.416250E+12
-
-
-Final statistics:
-
- number of steps        =   461      number of f evals.     =  597
- number of prec. setups =    78
- number of prec. evals. =     8      number of prec. solves =  1176
- number of nonl. iters. =   594      number of lin. iters.  =   636
- average Krylov subspace dimension (NLI/NNI)  =   0.107071E+01
- number of conv. failures.. nonlinear =   0 linear =   0
- number of error test failures =  27
diff --git a/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.f b/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.f
deleted file mode 100644
index 037f968a80..0000000000
--- a/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.f
+++ /dev/null
@@ -1,374 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: 2D kinetics-transport, precond. Krylov
-C     solver. 
-C     
-C     An ODE system is generated from the following 2-species diurnal
-C     kinetics advection-diffusion PDE system in 2 space dimensions:
-C     
-C     dc(i)/dt = Kh*(d/dx)**2 c(i) + V*dc(i)/dx + (d/dy)(Kv(y)*dc(i)/dy)
-C                           + Ri(c1,c2,t)      for i = 1,2,   where
-C     R1(c1,c2,t) = -q1*c1*c3 - q2*c1*c2 + 2*q3(t)*c3 + q4(t)*c2 ,
-C     R2(c1,c2,t) =  q1*c1*c3 - q2*c1*c2 - q4(t)*c2 ,
-C     Kv(y) = Kv0*exp(y/5) ,
-C     Kh, V, Kv0, q1, q2, and c3 are constants, and q3(t) and q4(t)
-C     vary diurnally.
-C
-C     The problem is posed on the square
-C     0 .le. x .le. 20,    30 .le. y .le. 50   (all in km),
-C     with homogeneous Neumann boundary conditions, and for time t
-C     in 0 .le. t .le. 86400 sec (1 day).
-C
-C     The PDE system is treated by central differences on a uniform
-C     10 x 10 mesh, with simple polynomial initial profiles.
-C     The problem is solved with CVODE, with the BDF/GMRES method and
-C     using the FCVBP banded preconditioner.
-C     
-C     The second and third dimensions of U here must match the values
-C     of MX and MY, for consistency with the output statements below.
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY
-      PARAMETER (MX=10, MY=10)
-C
-      INTEGER*4 LNST, LNFE, LNSETUP, LNNI, LNCF, LNPE, LNLI, LNPS
-      INTEGER*4 LNCFL, LH, LQ, METH, IATOL, ITASK
-      INTEGER*4 LNETF, IER, MAXL, JPRETYPE, IGSTYPE, JOUT
-      INTEGER*4 LLENRW, LLENIW, LLENRWLS, LLENIWLS
-C The following declaration specification should match C type long int.
-      INTEGER*8 NEQ, IOUT(25), IPAR(4)
-      INTEGER*4 NST, NFE, NPSET, NPE, NPS, NNI
-      INTEGER*4 NLI, NCFN, NCFL, NETF
-      INTEGER*4 LENRW, LENIW, LENRWLS, LENIWLS
-C The following declaration specification should match C type long int.
-      INTEGER*8 MU, ML, LENRWBP, LENIWBP, NFEBP
-      DOUBLE PRECISION ATOL, AVDIM, DELT, FLOOR, RTOL, T, TOUT, TWOHR
-      DOUBLE PRECISION ROUT(10), U(2,MX,MY), RPAR(12)
-C
-      DATA TWOHR/7200.0D0/, RTOL/1.0D-5/, FLOOR/100.0D0/,
-     1     JPRETYPE/1/, IGSTYPE/1/, MAXL/0/, DELT/0.0D0/
-      DATA LLENRW/1/, LLENIW/2/, LNST/3/, LNFE/4/, LNETF/5/,  LNCF/6/,
-     1     LNNI/7/, LNSETUP/8/, LQ/9/, LLENRWLS/13/, LLENIWLS/14/,
-     1     LNPE/20/, LNLI/22/, LNPS/21/, LNCFL/23/
-      DATA LH/2/
-C
-C     Load problem constants into IPAR, RPAR, and set initial values
-      CALL INITKX(MX, MY, U, IPAR, RPAR)
-C
-C     Set other input arguments.
-      NEQ = 2*MX*MY
-      T = 0.0D0
-      METH = 2
-      IATOL = 1
-      ATOL = RTOL * FLOOR
-      ITASK = 1
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Krylov example problem:'//
-     1       ' Kinetics-transport, NEQ = ', I4/)
-C     
-C     Initialize vector specification
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     Initialize SPGMR linear solver module
-      call FSUNSPGMRINIT(1, JPRETYPE, MAXL, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRINIT IER = ', I5)
-        STOP
-      ENDIF
-      call FSUNSPGMRSETGSTYPE(1, IGSTYPE, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,27) IER
- 27     FORMAT(///' SUNDIALS_ERROR: FSUNSPGMRSETGSTYPE IER = ', I5)
-        STOP
-      ENDIF
-C     
-C     Initialize CVODE
-      CALL FCVMALLOC(T, U, METH, IATOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-C
-C     attach linear solver module to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ',I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-C     
-C     Initialize band preconditioner
-      MU = 2
-      ML = 2
-      CALL FCVBPINIT(NEQ, MU, ML, IER) 
-      IF (IER .NE. 0) THEN
-         WRITE(6,45) IER
- 45      FORMAT(///' SUNDIALS_ERROR: FCVBPINIT returned IER = ', I5)
-         CALL FCVFREE
-         STOP
-      ENDIF
-C     
-C     Loop over output points, call FCVODE, print sample solution values.
-      TOUT = TWOHR
-      DO 70 JOUT = 1, 12
-C
-         CALL FCVODE(TOUT, T, U, ITASK, IER)
-C     
-         WRITE(6,50) T, IOUT(LNST), IOUT(LQ), ROUT(LH)
- 50      FORMAT(/' t = ', E14.6, 5X, 'no. steps = ', I5,
-     1           '   order = ', I3, '   stepsize = ', E14.6)
-         WRITE(6,55) U(1,1,1), U(1,5,5), U(1,10,10),
-     1               U(2,1,1), U(2,5,5), U(2,10,10)
- 55      FORMAT('  c1 (bot.left/middle/top rt.) = ', 3E14.6/
-     1          '  c2 (bot.left/middle/top rt.) = ', 3E14.6)
-C
-         IF (IER .NE. 0) THEN
-            WRITE(6,60) IER, IOUT(15)
- 60         FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1             '                 Linear Solver returned IER = ', I5)
-            CALL FCVFREE
-            STOP
-         ENDIF
-C     
-         TOUT = TOUT + TWOHR
- 70   CONTINUE
-      
-C     Print final statistics.
-      NST = IOUT(LNST)
-      NFE = IOUT(LNFE)
-      NPSET = IOUT(LNSETUP)
-      NPE = IOUT(LNPE)
-      NPS = IOUT(LNPS)
-      NNI = IOUT(LNNI)
-      NLI = IOUT(LNLI)
-      AVDIM = DBLE(NLI) / DBLE(NNI)
-      NCFN = IOUT(LNCF)
-      NCFL = IOUT(LNCFL)
-      NETF = IOUT(LNETF)
-      LENRW = IOUT(LLENRW)
-      LENIW = IOUT(LLENIW)
-      LENRWLS = IOUT(LLENRWLS)
-      LENIWLS = IOUT(LLENIWLS)
-      WRITE(6,80) NST, NFE, NPSET, NPE, NPS, NNI, NLI, AVDIM, NCFN,
-     1     NCFL, NETF, LENRW, LENIW, LENRWLS, LENIWLS
- 80   FORMAT(//'Final statistics:'//
-     &   ' number of steps        = ', I5, 4X,
-     &   ' number of f evals.     = ', I5/
-     &   ' number of prec. setups = ', I5/
-     &   ' number of prec. evals. = ', I5, 4X,
-     &   ' number of prec. solves = ', I5/
-     &   ' number of nonl. iters. = ', I5, 4X,
-     &   ' number of lin. iters.  = ', I5/
-     &   ' average Krylov subspace dimension (NLI/NNI) = ', E14.6/
-     &   ' number of conv. failures.. nonlinear =', I3,
-     &   ' linear = ', I3/
-     &   ' number of error test failures = ', I3/
-     &   ' main solver real/int workspace sizes   = ',2I7/
-     &   ' linear solver real/int workspace sizes = ',2I5)
-      CALL FCVBPOPT(LENRWBP, LENIWBP, NFEBP)
-      WRITE(6,82) LENRWBP, LENIWBP, NFEBP
- 82   FORMAT('In CVBANDPRE:'/
-     &        ' real/int workspace sizes = ', 2I7/
-     &        ' number of f evaluations  = ', I5)
-C     
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE INITKX(MX, MY, U0, IPAR, RPAR)
-C     Routine to set problem constants and initial values
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 MX, MY
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      DOUBLE PRECISION RPAR(*)
-C
-      INTEGER*8 MM, JY, JX, NEQ
-      DOUBLE PRECISION U0
-      DIMENSION U0(2,MX,MY)
-      DOUBLE PRECISION Q1, Q2, Q3, Q4, A3, A4, OM, C3, DY, HDCO
-      DOUBLE PRECISION VDCO, HACO, X, Y
-      DOUBLE PRECISION CX, CY, DKH, DKV0, DX, HALFDA, PI, VEL
-C
-      DATA DKH/4.0D-6/, VEL/0.001D0/, DKV0/1.0D-8/, HALFDA/4.32D4/,
-     1     PI/3.1415926535898D0/
-C
-C     Problem constants
-      MM = MX * MY
-      NEQ = 2 * MM
-      Q1 = 1.63D-16
-      Q2 = 4.66D-16
-      Q3 = 0.0D0
-      Q4 = 0.0D0
-      A3 = 22.62D0
-      A4 = 7.601D0
-      OM = PI / HALFDA
-      C3 = 3.7D16
-      DX = 20.0D0 / (MX - 1.0D0)
-      DY = 20.0D0 / (MY - 1.0D0)
-      HDCO = DKH / DX**2
-      HACO = VEL / (2.0D0 * DX)
-      VDCO = (1.0D0 / DY**2) * DKV0
-C
-C     Load constants in IPAR and RPAR
-      IPAR(1) = MX
-      IPAR(2) = MY
-      IPAR(3) = MM
-      IPAR(4) = NEQ
-C
-      RPAR(1)  = Q1
-      RPAR(2)  = Q2
-      RPAR(3)  = Q3
-      RPAR(4)  = Q4
-      RPAR(5)  = A3
-      RPAR(6)  = A4
-      RPAR(7)  = OM
-      RPAR(8)  = C3
-      RPAR(9)  = DY
-      RPAR(10) = HDCO
-      RPAR(11) = VDCO
-      RPAR(12) = HACO
-C
-C     Set initial profiles.
-      DO 20 JY = 1, MY
-        Y = 30.0D0 + (JY - 1.0D0) * DY
-        CY = (0.1D0 * (Y - 40.0D0))**2
-        CY = 1.0D0 - CY + 0.5D0 * CY**2
-        DO 10 JX = 1, MX
-          X = (JX - 1.0D0) * DX
-          CX = (0.1D0 * (X - 10.0D0))**2
-          CX = 1.0D0 - CX + 0.5D0 * CX**2
-          U0(1,JX,JY) = 1.0D6 * CX * CY
-          U0(2,JX,JY) = 1.0D12 * CX * CY
- 10       CONTINUE
- 20     CONTINUE
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, U, UDOT, IPAR, RPAR, IER)
-C     Routine for right-hand side function f
-C
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int.
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, U(2,*), UDOT(2,*), RPAR(*)
-C
-      INTEGER*4 ILEFT, IRIGHT
-      INTEGER*8 MX, MY, MM, JY, JX, IBLOK0, IDN, IUP, IBLOK
-      DOUBLE PRECISION Q1,Q2,Q3,Q4, A3, A4, OM, C3, DY, HDCO, VDCO, HACO
-      DOUBLE PRECISION C1, C2, C1DN, C2DN, C1UP, C2UP, C1LT, C2LT
-      DOUBLE PRECISION C1RT, C2RT, CYDN, CYUP, HORD1, HORD2, HORAD1
-      DOUBLE PRECISION HORAD2, QQ1, QQ2, QQ3, QQ4, RKIN1, RKIN2, S
-      DOUBLE PRECISION VERTD1, VERTD2, YDN, YUP
-C
-C     Extract constants from IPAR and RPAR
-      MX = IPAR(1)
-      MY = IPAR(2)
-      MM = IPAR(3)
-C
-      Q1 = RPAR(1)
-      Q2 = RPAR(2)
-      Q3 = RPAR(3)
-      Q4 = RPAR(4)
-      A3 = RPAR(5)
-      A4 = RPAR(6)
-      OM = RPAR(7)
-      C3 = RPAR(8)
-      DY = RPAR(9)
-      HDCO = RPAR(10)
-      VDCO = RPAR(11)
-      HACO = RPAR(12)
-C
-C     Set diurnal rate coefficients.
-      S = SIN(OM * T)
-      IF (S .GT. 0.0D0) THEN
-         Q3 = EXP(-A3 / S)
-         Q4 = EXP(-A4 / S)
-      ELSE
-         Q3 = 0.0D0
-         Q4 = 0.0D0
-      ENDIF
-C     
-C     Loop over all grid points.
-      DO 20 JY = 1, MY
-         YDN = 30.0D0 + (JY - 1.5D0) * DY
-         YUP = YDN + DY
-         CYDN = VDCO * EXP(0.2D0 * YDN)
-         CYUP = VDCO * EXP(0.2D0 * YUP)
-         IBLOK0 = (JY - 1) * MX
-         IDN = -MX
-         IF (JY .EQ. 1) IDN = MX
-         IUP = MX
-         IF (JY .EQ. MY) IUP = -MX
-         DO 10 JX = 1, MX
-            IBLOK = IBLOK0 + JX
-            C1 = U(1,IBLOK)
-            C2 = U(2,IBLOK)
-C     Set kinetic rate terms.
-            QQ1 = Q1 * C1 * C3
-            QQ2 = Q2 * C1 * C2
-            QQ3 = Q3 * C3
-            QQ4 = Q4 * C2
-            RKIN1 = -QQ1 - QQ2 + 2.0D0 * QQ3 + QQ4
-            RKIN2 = QQ1 - QQ2 - QQ4
-C     Set vertical diffusion terms.
-            C1DN = U(1,IBLOK + IDN)
-            C2DN = U(2,IBLOK + IDN)
-            C1UP = U(1,IBLOK + IUP)
-            C2UP = U(2,IBLOK + IUP)
-            VERTD1 = CYUP * (C1UP - C1) - CYDN * (C1 - C1DN)
-            VERTD2 = CYUP * (C2UP - C2) - CYDN * (C2 - C2DN)
-C     Set horizontal diffusion and advection terms.
-            ILEFT = -1
-            IF (JX .EQ. 1) ILEFT = 1
-            IRIGHT = 1
-            IF (JX .EQ. MX) IRIGHT = -1
-            C1LT = U(1,IBLOK + ILEFT)
-            C2LT = U(2,IBLOK + ILEFT)
-            C1RT = U(1,IBLOK + IRIGHT)
-            C2RT = U(2,IBLOK + IRIGHT)
-            HORD1 = HDCO * (C1RT - 2.0D0 * C1 + C1LT)
-            HORD2 = HDCO * (C2RT - 2.0D0 * C2 + C2LT)
-            HORAD1 = HACO * (C1RT - C1LT)
-            HORAD2 = HACO * (C2RT - C2LT)
-C     Load all terms into UDOT.
-            UDOT(1,IBLOK) = VERTD1 + HORD1 + HORAD1 + RKIN1
-            UDOT(2,IBLOK) = VERTD2 + HORD2 + HORAD2 + RKIN2
- 10      CONTINUE
- 20   CONTINUE
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.out b/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.out
deleted file mode 100644
index 9227652d19..0000000000
--- a/examples/cvode/fcmix_serial/fcvDiurnal_kry_bp.out
+++ /dev/null
@@ -1,68 +0,0 @@
-Krylov example problem:
-
- Kinetics-transport, NEQ =  200
-
-
- t =   0.720000E+04     no. steps =   190   order =   5   stepsize =   0.160965E+03
-  c1 (bot.left/middle/top rt.) =   0.104683E+05  0.296373E+05  0.111853E+05
-  c2 (bot.left/middle/top rt.) =   0.252672E+12  0.715377E+12  0.269977E+12
-
- t =   0.144000E+05     no. steps =   221   order =   5   stepsize =   0.382687E+03
-  c1 (bot.left/middle/top rt.) =   0.665902E+07  0.531602E+07  0.730081E+07
-  c2 (bot.left/middle/top rt.) =   0.258192E+12  0.205680E+12  0.283286E+12
-
- t =   0.216000E+05     no. steps =   246   order =   5   stepsize =   0.278111E+03
-  c1 (bot.left/middle/top rt.) =   0.266497E+08  0.103640E+08  0.293077E+08
-  c2 (bot.left/middle/top rt.) =   0.299279E+12  0.102815E+12  0.331344E+12
-
- t =   0.288000E+05     no. steps =   298   order =   3   stepsize =   0.132506E+03
-  c1 (bot.left/middle/top rt.) =   0.870208E+07  0.129196E+08  0.965000E+07
-  c2 (bot.left/middle/top rt.) =   0.338035E+12  0.502926E+12  0.375095E+12
-
- t =   0.360000E+05     no. steps =   341   order =   4   stepsize =   0.631280E+02
-  c1 (bot.left/middle/top rt.) =   0.140403E+05  0.202899E+05  0.156090E+05
-  c2 (bot.left/middle/top rt.) =   0.338677E+12  0.489433E+12  0.376516E+12
-
- t =   0.432000E+05     no. steps =   402   order =   4   stepsize =   0.448032E+03
-  c1 (bot.left/middle/top rt.) =   0.191468E-06 -0.613018E-05  0.439513E-06
-  c2 (bot.left/middle/top rt.) =   0.338232E+12  0.135498E+12  0.380352E+12
-
- t =   0.504000E+05     no. steps =   422   order =   4   stepsize =   0.317295E+03
-  c1 (bot.left/middle/top rt.) =  -0.774603E-10 -0.307315E-07 -0.351244E-10
-  c2 (bot.left/middle/top rt.) =   0.335816E+12  0.493029E+12  0.386444E+12
-
- t =   0.576000E+05     no. steps =   436   order =   5   stepsize =   0.358251E+03
-  c1 (bot.left/middle/top rt.) =   0.180088E-10  0.717698E-08  0.858836E-11
-  c2 (bot.left/middle/top rt.) =   0.332031E+12  0.964978E+12  0.390899E+12
-
- t =   0.648000E+05     no. steps =   449   order =   5   stepsize =   0.594794E+03
-  c1 (bot.left/middle/top rt.) =  -0.284457E-13 -0.106311E-10 -0.138218E-13
-  c2 (bot.left/middle/top rt.) =   0.331302E+12  0.892183E+12  0.396341E+12
-
- t =   0.720000E+05     no. steps =   461   order =   5   stepsize =   0.594794E+03
-  c1 (bot.left/middle/top rt.) =   0.271046E-15  0.101114E-12  0.130660E-15
-  c2 (bot.left/middle/top rt.) =   0.332972E+12  0.618623E+12  0.403884E+12
-
- t =   0.792000E+05     no. steps =   473   order =   5   stepsize =   0.594794E+03
-  c1 (bot.left/middle/top rt.) =   0.569757E-15  0.205829E-12  0.268970E-15
-  c2 (bot.left/middle/top rt.) =   0.333441E+12  0.666892E+12  0.412025E+12
-
- t =   0.864000E+05     no. steps =   485   order =   5   stepsize =   0.594794E+03
-  c1 (bot.left/middle/top rt.) =   0.270665E-15  0.189895E-16  0.215568E-14
-  c2 (bot.left/middle/top rt.) =   0.335178E+12  0.910637E+12  0.416250E+12
-
-
-Final statistics:
-
- number of steps        =   485     number of f evals.     =   616
- number of prec. setups =    85
- number of prec. evals. =     9     number of prec. solves =  1134
- number of nonl. iters. =   613     number of lin. iters.  =   597
- average Krylov subspace dimension (NLI/NNI) =   0.973899E+00
- number of conv. failures.. nonlinear =  0 linear =   0
- number of error test failures =  28
- main solver real/int workspace sizes   =    2689     53
- linear solver real/int workspace sizes =  2454   42
-In CVBANDPRE:
- real/int workspace sizes =    2800    622
- number of f evaluations  =    45
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dns.f b/examples/cvode/fcmix_serial/fcvRoberts_dns.f
deleted file mode 100644
index c55caa7dc0..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dns.f
+++ /dev/null
@@ -1,270 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: Robertson kinetics, direct linear solver
-C                             with dense user Jacobian.
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by CVODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     enable the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with CVODE, using the Fortran/C interface routine
-C     package. This solution uses the BDF method and a user-supplied
-C     Jacobian routine, and prints results at t = .4, 4., ..., 4.e10.
-C     It uses ITOL = 2 and ATOL much smaller for y2 than y1 or y3
-C     because y2 has much smaller values. At the end of the run,
-C     various counters of interest are printed.
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE, LNGE
-      INTEGER*4 METH, ITOL, ITASK, JOUT, NOUT, IERROOT
-      INTEGER*4 INFO(2)
-      INTEGER*4 I
-C The following declaration specification should match C type long int
-      INTEGER*8 NEQ, IPAR, IOUT(25)
-      DOUBLE PRECISION RTOL, T, T0, TOUT
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(10), RPAR
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/, LNCF/6/, LNNI/7/, LNSETUP/8/,
-     1     LNGE/12/, LNJE/17/
-C
-      NEQ = 3
-      T0 = 0.0D0
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-      METH = 2
-      ITOL = 2
-      RTOL = 1.0D-4
-      ATOL(1) = 1.0D-8
-      ATOL(2) = 1.0D-14
-      ATOL(3) = 1.0D-6
-      TOUT = 0.4D0
-      ITASK = 1
-      JOUT = 0
-      NOUT = 12
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Dense example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-
-C     create serial vector
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     initialize dense matrix module
-      CALL FSUNDENSEMATINIT(1, NEQ, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNDENSEMATINIT returned IER = ',
-     1         I5)
-        STOP
-      ENDIF
-
-C     initialize dense linear solver module
-      CALL FSUNDENSELINSOLINIT(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNDENSELINSOLINIT returned IER = '
-     1         , I5)
-        STOP
-      ENDIF
-
-C     Call FCVMALLOC to create the solver memory and specify the 
-C     Backward Differentiation Formula
-      CALL FCVMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Call FCVROOTINIT to specify the root function g with 2 components
-      CALL FCVROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FCVROOTINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     attach the matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     indicate a dense Jacobian function is provided
-      CALL FCVDENSESETJAC(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVDENSESETJAC returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,50) T, Y(1), Y(2), Y(3)
- 50     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-          WRITE(6,60) IER, IOUT(15)
- 60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVROOTFREE
-          CALL FCVFREE
-          STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-          CALL FCVROOTINFO(2, INFO, IERROOT)
-          IF (IERROOT .LT. 0) THEN
-            WRITE(6,65) IERROOT
- 65         FORMAT(///' SUNDIALS_ERROR: FCVROOTINFO returned IER = ',
-     1             I5)
-            CALL FCVROOTFREE
-            CALL FCVFREE
-            STOP
-          ENDIF
-          WRITE(6,70) (INFO(I), I = 1, 2)
- 70       FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-          TOUT = TOUT * 10.0D0
-          JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-C
-      CALL FCVDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,80) IER
- 80     FORMAT(///' SUNDIALS_ERROR: FCVDKY returned IER = ', I4)
-        CALL FCVROOTFREE
-        CALL FCVFREE
-        STOP
-      ENDIF
-      WRITE(6,85) Y(1), Y(2), Y(3)
- 85   FORMAT(/'Final value of ydot = ', 3E14.6)
-C
-      WRITE(6,90) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF), IOUT(LNGE)
- 90   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '   No. f-s = ', I4,
-     2       '   No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4/
-     6       ' No. root function evals = ', I4)
-C
-      CALL FCVROOTFREE
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Fortran routine for right-hand side function
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVROOTFN(T, Y, G, IPAR, RPAR, IER)
-C     Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVDJAC(N, T, Y, FY, JAC, H, IPAR, RPAR, 
-     1                   V1, V2, V3, IER)
-C     Fortran routine for dense user-supplied Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 N, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), FY(*), JAC(N,*), H, RPAR(*)
-      DOUBLE PRECISION V1(*), V2(*), V3(*)
-C
-      DOUBLE PRECISION Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JAC(1,1) = -0.04D0
-      JAC(1,2) = 1.0D4 * Y3
-      JAC(1,3) = 1.0D4 * Y2
-      JAC(2,1) =  0.04D0
-      JAC(2,2) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JAC(2,3) = -1.0D4 * Y2
-      JAC(3,3) = 0.0D0
-      JAC(3,2) = 6.0D7 * Y2
-      JAC(3,3) = 0.0D0
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dns.out b/examples/cvode/fcmix_serial/fcvRoberts_dns.out
deleted file mode 100644
index 22d163cf9f..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dns.out
+++ /dev/null
@@ -1,32 +0,0 @@
-Dense example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2639E+00   y =   0.989965E+00  0.347056E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985164E+00  0.338624E-04  0.148020E-01
-At t =   0.4000E+01   y =   0.905510E+00  0.224034E-04  0.944679E-01
-At t =   0.4000E+02   y =   0.715802E+00  0.918504E-05  0.284189E+00
-At t =   0.4000E+03   y =   0.450536E+00  0.322327E-05  0.549461E+00
-At t =   0.4000E+04   y =   0.183230E+00  0.894438E-06  0.816769E+00
-At t =   0.4000E+05   y =   0.389890E-01  0.162201E-06  0.961011E+00
-At t =   0.4000E+06   y =   0.493638E-02  0.198422E-07  0.995064E+00
-At t =   0.4000E+07   y =   0.516809E-03  0.206829E-08  0.999483E+00
-At t =   0.2079E+08   y =   0.100000E-03  0.400040E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.520244E-04  0.208108E-09  0.999948E+00
-At t =   0.4000E+09   y =   0.520106E-05  0.208044E-10  0.999995E+00
-At t =   0.4000E+10   y =   0.525860E-06  0.210344E-11  0.999999E+00
-At t =   0.4000E+11   y =   0.693451E-07  0.277380E-12  0.100000E+01
-
-Final value of ydot =  -0.276733E-18 -0.110693E-23  0.276734E-18
-
-
-Final statistics:
-
- No. steps =  542   No. f-s =  754   No. J-s =   11   No. LU-s =  107
- No. nonlinear iterations =  751
- No. nonlinear convergence failures =    0
- No. error test failures =   22
- No. root function evals =  570
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dnsL.f b/examples/cvode/fcmix_serial/fcvRoberts_dnsL.f
deleted file mode 100644
index b952682760..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dnsL.f
+++ /dev/null
@@ -1,273 +0,0 @@
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: Robertson kinetics, Lapack linear solver
-C                             with dense user Jacobian.
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by CVODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     enable the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with CVODE, using the Fortran/C interface routine
-C     package. This solution uses the BDF method and a user-supplied
-C     Jacobian routine, and prints results at t = .4, 4., ..., 4.e10.
-C     It uses ITOL = 2 and ATOL much smaller for y2 than y1 or y3
-C     because y2 has much smaller values. At the end of the run,
-C     various counters of interest are printed.
-C
-C     Note that this problem should only work with SUNDIALS configured
-C     to use 'realtype' as 'double' and 'sunindextype' as '32bit'
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE, LNGE
-      INTEGER*4 METH, ITOL, ITASK, JOUT, NOUT, IERROOT
-      INTEGER*4 INFO(2)
-      INTEGER*4 I
-C The following declaration specification should match C type long int.
-      INTEGER*8 NEQ, IPAR, IOUT(25)
-      DOUBLE PRECISION RTOL, T, T0, TOUT
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(10), RPAR
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/, LNCF/6/, LNNI/7/, LNSETUP/8/,
-     1     LNGE/12/, LNJE/17/
-C
-      NEQ = 3
-      T0 = 0.0D0
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-      METH = 2
-      ITOL = 2
-      RTOL = 1.0D-4
-      ATOL(1) = 1.0D-8
-      ATOL(2) = 1.0D-14
-      ATOL(3) = 1.0D-6
-      TOUT = 0.4D0
-      ITASK = 1
-      JOUT = 0
-      NOUT = 12
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Dense example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-
-C     create serial vector
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     initialize dense matrix module
-      CALL FSUNDENSEMATINIT(1, NEQ, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNDENSEMATINIT returned IER = ',
-     1         I5)
-        STOP
-      ENDIF
-
-C     initialize LAPACK dense linear solver module
-      CALL FSUNLAPACKDENSEINIT(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNLAPACKDENSEINIT returned IER = '
-     1         , I5)
-        STOP
-      ENDIF
-
-C     Call FCVMALLOC to create the solver memory and specify the
-C     Backward Differentiation Formula
-      CALL FCVMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Call FCVROOTINIT to specify the root function g with 2 components
-      CALL FCVROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FCVROOTINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     attach the matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     indicate a dense Jacobian function is provided
-      CALL FCVDENSESETJAC(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVDENSESETJAC returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,50) T, Y(1), Y(2), Y(3)
- 50     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-          WRITE(6,60) IER, IOUT(15)
- 60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVROOTFREE
-          CALL FCVFREE
-          STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-          CALL FCVROOTINFO(2, INFO, IERROOT)
-          IF (IERROOT .LT. 0) THEN
-            WRITE(6,65) IERROOT
- 65         FORMAT(///' SUNDIALS_ERROR: FCVROOTINFO returned IER = ',
-     1             I5)
-            CALL FCVROOTFREE
-            CALL FCVFREE
-            STOP
-          ENDIF
-          WRITE(6,70) (INFO(I), I = 1, 2)
- 70       FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-          TOUT = TOUT * 10.0D0
-          JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-C
-      CALL FCVDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,80) IER
- 80     FORMAT(///' SUNDIALS_ERROR: FCVDKY returned IER = ', I4)
-        CALL FCVROOTFREE
-        CALL FCVFREE
-        STOP
-      ENDIF
-      WRITE(6,85) Y(1), Y(2), Y(3)
- 85   FORMAT(/'Final value of ydot = ', 3E14.6)
-C
-      WRITE(6,90) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF), IOUT(LNGE)
- 90   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '   No. f-s = ', I4,
-     2       '   No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4/
-     6       ' No. root function evals = ', I4)
-C
-      CALL FCVROOTFREE
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Fortran routine for right-hand side function
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVROOTFN(T, Y, G, IPAR, RPAR, IER)
-C     Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVDJAC(N, T, Y, FY, JAC, H, IPAR, RPAR,
-     1                   V1, V2, V3, IER)
-C     Fortran routine for dense user-supplied Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 N, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), FY(*), JAC(N,*), H, RPAR(*)
-      DOUBLE PRECISION V1(*), V2(*), V3(*)
-C
-      DOUBLE PRECISION Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JAC(1,1) = -0.04D0
-      JAC(1,2) = 1.0D4 * Y3
-      JAC(1,3) = 1.0D4 * Y2
-      JAC(2,1) =  0.04D0
-      JAC(2,2) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JAC(2,3) = -1.0D4 * Y2
-      JAC(3,3) = 0.0D0
-      JAC(3,2) = 6.0D7 * Y2
-      JAC(3,3) = 0.0D0
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dnsL.out b/examples/cvode/fcmix_serial/fcvRoberts_dnsL.out
deleted file mode 100644
index 22d163cf9f..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dnsL.out
+++ /dev/null
@@ -1,32 +0,0 @@
-Dense example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2639E+00   y =   0.989965E+00  0.347056E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985164E+00  0.338624E-04  0.148020E-01
-At t =   0.4000E+01   y =   0.905510E+00  0.224034E-04  0.944679E-01
-At t =   0.4000E+02   y =   0.715802E+00  0.918504E-05  0.284189E+00
-At t =   0.4000E+03   y =   0.450536E+00  0.322327E-05  0.549461E+00
-At t =   0.4000E+04   y =   0.183230E+00  0.894438E-06  0.816769E+00
-At t =   0.4000E+05   y =   0.389890E-01  0.162201E-06  0.961011E+00
-At t =   0.4000E+06   y =   0.493638E-02  0.198422E-07  0.995064E+00
-At t =   0.4000E+07   y =   0.516809E-03  0.206829E-08  0.999483E+00
-At t =   0.2079E+08   y =   0.100000E-03  0.400040E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.520244E-04  0.208108E-09  0.999948E+00
-At t =   0.4000E+09   y =   0.520106E-05  0.208044E-10  0.999995E+00
-At t =   0.4000E+10   y =   0.525860E-06  0.210344E-11  0.999999E+00
-At t =   0.4000E+11   y =   0.693451E-07  0.277380E-12  0.100000E+01
-
-Final value of ydot =  -0.276733E-18 -0.110693E-23  0.276734E-18
-
-
-Final statistics:
-
- No. steps =  542   No. f-s =  754   No. J-s =   11   No. LU-s =  107
- No. nonlinear iterations =  751
- No. nonlinear convergence failures =    0
- No. error test failures =   22
- No. root function evals =  570
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.f b/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.f
deleted file mode 100644
index 7b4073971b..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.f
+++ /dev/null
@@ -1,288 +0,0 @@
-C     --------------------------------------------------------------------
-C     Programmer(s): Jimmy Almgren-Bell @ LLNL
-C     Based on prior version by: Scott D. Cohen, Alan C. Hindmarsh and
-C                                Radu Serban @ LLNL
-C     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     --------------------------------------------------------------------
-C     FCVODE Example Problem: Robertson kinetics, direct linear solver
-C                             with dense user Jacobian.
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by CVODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     enable the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with CVODE, using the Fortran/C interface routine
-C     package. This solution uses the BDF method and a user-supplied
-C     Jacobian routine, and prints results at t = .4, 4., ..., 4.e10.
-C     It uses ITOL = 2 and ATOL much smaller for y2 than y1 or y3
-C     because y2 has much smaller values. The constraint y_i >= 0
-C     is posed for all components. At the end of the run,
-C     various counters of interest are printed.
-C     --------------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE, LNGE
-      INTEGER*4 METH, ITOL, ITASK, JOUT, NOUT, IERROOT
-      INTEGER*4 INFO(2)
-      INTEGER*4 I
-      DOUBLE PRECISION CONSTR(3)
-C The following declaration specification should match C type long int
-      INTEGER*8 NEQ, IPAR, IOUT(25)
-      DOUBLE PRECISION RTOL, T, T0, TOUT
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(10), RPAR
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/, LNCF/6/, LNNI/7/, LNSETUP/8/,
-     1     LNGE/12/, LNJE/17/
-C
-      NEQ = 3
-      T0 = 0.0D0
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-      METH = 2
-      ITOL = 2
-      RTOL = 1.0D-4
-      ATOL(1) = 1.0D-6
-      ATOL(2) = 1.0D-11
-      ATOL(3) = 1.0D-5
-      TOUT = 0.4D0
-      ITASK = 1
-      JOUT = 0
-      NOUT = 12
-      CONSTR(1) = 1.0D0
-      CONSTR(2) = 1.0D0
-      CONSTR(3) = 1.0D0
-C
-      WRITE(6,10) NEQ
- 10   FORMAT('Dense example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-
-C     create serial vector
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     initialize dense matrix module
-      CALL FSUNDENSEMATINIT(1, NEQ, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNDENSEMATINIT returned IER = ',
-     1         I5)
-        STOP
-      ENDIF
-
-C     initialize dense linear solver module
-      CALL FSUNDENSELINSOLINIT(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNDENSELINSOLINIT returned IER = '
-     1         , I5)
-        STOP
-      ENDIF
-
-C     Call FCVMALLOC to create the solver memory and specify the 
-C     Backward Differentiation Formula
-      CALL FCVMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Call FCVROOTINIT to specify the root function g with 2 components
-      CALL FCVROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FCVROOTINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     attach the matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     indicate a dense Jacobian function is provided
-      CALL FCVDENSESETJAC(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVDENSESETJAC returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     initialize constraints
-      CALL FCVSETVIN("CONSTR_VEC", CONSTR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,50) IER
- 50     FORMAT(///' SUNDIALS_ERROR: FCVSETVIN return IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,55) T, Y(1), Y(2), Y(3)
- 55     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-          WRITE(6,65) IER, IOUT(15)
- 65       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVROOTFREE
-          CALL FCVFREE
-          STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-          CALL FCVROOTINFO(2, INFO, IERROOT)
-          IF (IERROOT .LT. 0) THEN
-            WRITE(6,70) IERROOT
- 70         FORMAT(///' SUNDIALS_ERROR: FCVROOTINFO returned IER = ',
-     1             I5)
-            CALL FCVROOTFREE
-            CALL FCVFREE
-            STOP
-          ENDIF
-          WRITE(6,75) (INFO(I), I = 1, 2)
- 75       FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-          TOUT = TOUT * 10.0D0
-          JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-C
-      CALL FCVDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,85) IER
- 85     FORMAT(///' SUNDIALS_ERROR: FCVDKY returned IER = ', I4)
-        CALL FCVROOTFREE
-        CALL FCVFREE
-        STOP
-      ENDIF
-      WRITE(6,90) Y(1), Y(2), Y(3)
- 90   FORMAT(/'Final value of ydot = ', 3E14.6)
-C
-      WRITE(6,95) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF), IOUT(LNGE)
- 95   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '   No. f-s = ', I4,
-     2       '   No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4/
-     6       ' No. root function evals = ', I4)
-C
-      CALL FCVROOTFREE
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Fortran routine for right-hand side function
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVROOTFN(T, Y, G, IPAR, RPAR, IER)
-C     Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVDJAC(N, T, Y, FY, JAC, H, IPAR, RPAR, 
-     1                   V1, V2, V3, IER)
-C     Fortran routine for dense user-supplied Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 N, IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), FY(*), JAC(N,*), H, RPAR(*)
-      DOUBLE PRECISION V1(*), V2(*), V3(*)
-C
-      DOUBLE PRECISION Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JAC(1,1) = -0.04D0
-      JAC(1,2) = 1.0D4 * Y3
-      JAC(1,3) = 1.0D4 * Y2
-      JAC(2,1) =  0.04D0
-      JAC(2,2) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JAC(2,3) = -1.0D4 * Y2
-      JAC(3,3) = 0.0D0
-      JAC(3,2) = 6.0D7 * Y2
-      JAC(3,3) = 0.0D0
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.out b/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.out
deleted file mode 100644
index fc19df9cd5..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_dns_constraints.out
+++ /dev/null
@@ -1,32 +0,0 @@
-Dense example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2639E+00   y =   0.989965E+00  0.347056E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985165E+00  0.338627E-04  0.148011E-01
-At t =   0.4000E+01   y =   0.905528E+00  0.224062E-04  0.944493E-01
-At t =   0.4000E+02   y =   0.715866E+00  0.918722E-05  0.284125E+00
-At t =   0.4000E+03   y =   0.450547E+00  0.322302E-05  0.549450E+00
-At t =   0.4000E+04   y =   0.183226E+00  0.894390E-06  0.816773E+00
-At t =   0.4000E+05   y =   0.389863E-01  0.162191E-06  0.961014E+00
-At t =   0.4000E+06   y =   0.493403E-02  0.198330E-07  0.995066E+00
-At t =   0.4000E+07   y =   0.516524E-03  0.206719E-08  0.999483E+00
-At t =   0.1980E+08   y =   0.100000E-03  0.400071E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.477176E-04  0.190880E-09  0.999952E+00
-At t =   0.4000E+09   y =   0.360970E-05  0.144391E-10  0.999996E+00
-At t =   0.4000E+10   y =   0.889920E-06  0.355968E-11  0.999999E+00
-At t =   0.4000E+11   y =   0.635210E-07  0.254084E-12  0.100000E+01
-
-Final value of ydot =  -0.115031E-17 -0.460125E-23  0.272393E-17
-
-
-Final statistics:
-
- No. steps =  399   No. f-s =  567   No. J-s =   12   No. LU-s =   98
- No. nonlinear iterations =  564
- No. nonlinear convergence failures =    2
- No. error test failures =   15
- No. root function evals =  429
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_klu.f b/examples/cvode/fcmix_serial/fcvRoberts_klu.f
deleted file mode 100644
index de37f6a2c4..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_klu.f
+++ /dev/null
@@ -1,345 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Ting Yan @ SMU
-C          Based on cvRoberts_klu.c and modified to Fortran 77
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     FCVODE Example Problem: Robertson kinetics
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by CVODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     enable the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with CVODE, using the Fortran/C interface routine
-C     package. This solution uses the BDF method, Newton iteration with
-C     the the KLU sparse direct linear solver, and a user-supplied
-C     Jacobian routine.
-C     It uses a scalar relative tolerance and a vector absolute
-C     tolerance. Output is printed in decades from t = .4 to t = 4.e10.
-C     Run statistics (optional outputs) are printed at the end.
-C     ----------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE, LNGE
-      INTEGER*4 METH, ITOL, ITASK, JOUT, NOUT, IERROOT
-      INTEGER*4 INFO(2)
-      INTEGER*4 I
-C The following declaration specification should match C type long int
-      INTEGER*8 NEQ, IPAR, IOUT(22), IVAL, MXNLI, MXETF, NNZ
-      INTEGER*4 SPARSETYPE
-      DOUBLE PRECISION RTOL, T, T0, TOUT, H0, NLCONV
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(6), RPAR
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/, LNCF/6/, LNNI/7/, LNSETUP/8/,
-     1     LNGE/12/, LNJE/17/
-C
-C     Problem constants
-C     number of equations
-      NEQ = 3
-C     initial time
-      T0 = 0.0D0
-C     initial y components
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-C     basic integration method, 2 for BDF
-      METH = 2
-C     type for absolute tolerance, 2 for array
-      ITOL = 2
-C     scalar relative tolerance
-      RTOL = 1.0D-4
-C     vector absolute tolerance components
-      ATOL(1) = 1.0D-6
-      ATOL(2) = 1.0D-12
-      ATOL(3) = 1.0D-4
-C     first output time
-      TOUT = 0.4D0
-C     call CVODE in normal mode
-      ITASK = 1
-      JOUT = 0
-C     number of output times
-      NOUT = 12
-C
-      WRITE(6, 10) NEQ
- 10   FORMAT('Klu example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-
-C     create serial vector
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     initialize sparse matrix module
-C     maximum number of nonzeros in the sparse Jac
-      NNZ = NEQ * NEQ
-C     CSC
-      SPARSETYPE = 0
-      CALL FSUNSPARSEMATINIT(1, NEQ, NEQ, NNZ, SPARSETYPE, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNSPARSEMATINIT returned IER = ',
-     1         I5)
-        STOP
-      ENDIF
-
-C     initialize KLU sparse direct linear solver module
-      CALL FSUNKLUINIT(1, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNKLUINIT returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Call FCVMALLOC to create the solver memory and specify the 
-C     Backward Differentiation Formula
-      CALL FCVMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Set the FCVODE input
-C     max no. of internal steps before t_out
-      IVAL = 1000
-      CALL FCVSETIIN('MAX_NSTEPS', IVAL, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,31) IER
- 31     FORMAT(///' SUNDIALS_ERROR: FCVSETIIN returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     max no. of error test failures
-      MXETF = 20
-      CALL FCVSETIIN('MAX_ERRFAIL', MXETF, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,31) IER
-        STOP
-      ENDIF
-      
-C     initial step size
-      H0 = 1.0D-4 * RTOL
-      CALL FCVSETRIN('INIT_STEP', H0, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
- 32     FORMAT(///' SUNDIALS_ERROR: FCVSETRIN returned IER = ', I5)
-        STOP
-      ENDIF
-      
-C     coefficient in the nonlinear convergence test
-      NLCONV = 1.0D-4
-      CALL FCVSETRIN('NLCONV_COEF', NLCONV, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
-        STOP
-      ENDIF
-
-C     Call FCVROOTINIT to specify the root function g with 2 components
-      CALL FCVROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FCVROOTINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     attach the matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     indicate a sparse Jacobian function is provided
-      CALL FCVSPARSESETJAC(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVSPARSESETJAC returned IER = ',
-     1         I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     In loop, call FCVODE, print results, and test for error.
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,50) T, Y(1), Y(2), Y(3)
- 50     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-          WRITE(6,60) IER, IOUT(15)
- 60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVROOTFREE
-          CALL FCVFREE
-          STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-          CALL FCVROOTINFO(2, INFO, IERROOT)
-          IF (IERROOT .LT. 0) THEN
-            WRITE(6,65) IERROOT
- 65         FORMAT(///' SUNDIALS_ERROR: FCVROOTINFO returned IER = ',
-     1             I5)
-            CALL FCVROOTFREE
-            CALL FCVFREE
-            STOP
-          ENDIF
-          WRITE(6,70) (INFO(I), I = 1, 2)
- 70       FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-          TOUT = TOUT * 10.0D0
-          JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-
-C     obtain a derivative of the solution
-      CALL FCVDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,80) IER
- 80     FORMAT(///' SUNDIALS_ERROR: FCVDKY returned IER = ', I4)
-        CALL FCVROOTFREE
-        CALL FCVFREE
-        STOP
-      ENDIF
-      WRITE(6,85) Y(1), Y(2), Y(3)
- 85   FORMAT(/'Final value of ydot = ', 3E14.6)
-
-C     output run statistics
-      WRITE(6,90) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF), IOUT(LNGE)
- 90   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '   No. f-s = ', I4,
-     2       '   No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4/
-     6       ' No. root function evals = ', I4)
-C
-      CALL FCVROOTFREE
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Fortran routine for right-hand side function
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVROOTFN(T, Y, G, IPAR, RPAR, IER)
-C     Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVSPJAC(T, Y, FY, N, NNZ, JDATA, JRVALS,
-     1                    JCPTRS, H, IPAR, RPAR, WK1, WK2, WK3, IER)
-C     Fortran routine for user-supplied CSC format Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 N, NNZ, IPAR(*)
-      INTEGER*8 JRVALS(NNZ), JCPTRS(N+1)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), FY(*), H, RPAR(*)
-      DOUBLE PRECISION JDATA(NNZ)
-      DOUBLE PRECISION WK1(*), WK2(*), WK3(*)
-C
-      DOUBLE PRECISION Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JCPTRS(1) = 0
-      JCPTRS(2) = 3
-      JCPTRS(3) = 6
-      JCPTRS(4) = 9
-
-      JDATA(1) = -0.04D0
-      JRVALS(1) = 0
-      JDATA(2) = 0.04D0
-      JRVALS(2) = 1
-      JDATA(3) = 0.0D0
-      JRVALS(3) = 2
-
-      JDATA(4) = 1.0D4 * Y3
-      JRVALS(4) = 0
-      JDATA(5) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JRVALS(5) = 1
-      JDATA(6) = 6.0D7 * Y2
-      JRVALS(6) = 2
-      
-      JDATA(7) = 1.0D4 * Y2
-      JRVALS(7) = 0
-      JDATA(8) = -1.0D4 * Y2
-      JRVALS(8) = 1
-      JDATA(9) = 0.0D0
-      JRVALS(9) = 2
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_klu.out b/examples/cvode/fcmix_serial/fcvRoberts_klu.out
deleted file mode 100644
index ce95e335aa..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_klu.out
+++ /dev/null
@@ -1,32 +0,0 @@
-Klu example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2636E+00   y =   0.989965E+00  0.347052E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985144E+00  0.338588E-04  0.148222E-01
-At t =   0.4000E+01   y =   0.905426E+00  0.223942E-04  0.945515E-01
-At t =   0.4000E+02   y =   0.715830E+00  0.918572E-05  0.284160E+00
-At t =   0.4000E+03   y =   0.450560E+00  0.322342E-05  0.549437E+00
-At t =   0.4000E+04   y =   0.183240E+00  0.894461E-06  0.816759E+00
-At t =   0.4000E+05   y =   0.389806E-01  0.162165E-06  0.961019E+00
-At t =   0.4000E+06   y =   0.493776E-02  0.198479E-07  0.995062E+00
-At t =   0.4000E+07   y =   0.515949E-03  0.206485E-08  0.999484E+00
-At t =   0.2082E+08   y =   0.100000E-03  0.400040E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.514789E-04  0.205926E-09  0.999949E+00
-At t =   0.4000E+09   y =   0.542638E-05  0.217056E-10  0.999995E+00
-At t =   0.4000E+10   y =   0.464797E-06  0.185919E-11  0.100000E+01
-At t =   0.4000E+11   y =   0.486207E-07  0.194483E-12  0.100000E+01
-
-Final value of ydot =  -0.876832E-18 -0.350733E-23  0.876835E-18
-
-
-Final statistics:
-
- No. steps =  317   No. f-s =  941   No. J-s =   40   No. LU-s =  117
- No. nonlinear iterations =  940
- No. nonlinear convergence failures =    2
- No. error test failures =   11
- No. root function evals =  356
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_sps.f b/examples/cvode/fcmix_serial/fcvRoberts_sps.f
deleted file mode 100644
index e2a9818d5a..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_sps.f
+++ /dev/null
@@ -1,355 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Ting Yan @ SMU
-C          Based on cvRoberts_sps.c and modified to Fortran 77
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-C     ----------------------------------------------------------------
-C     FCVODE Example Problem: Robertson kinetics
-C
-C     The following is a simple example problem, with the coding
-C     needed for its solution by CVODE. The problem is from chemical
-C     kinetics, and consists of the following three rate equations:
-C
-C     dy1/dt = -.04*y1 + 1.e4*y2*y3
-C     dy2/dt = .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-C     dy3/dt = 3.e7*y2**2
-C
-C     on the interval from t = 0.0 to t = 4.e10, with initial
-C     conditions:
-C
-C     y1 = 1.0, y2 = y3 = 0.
-C
-C     The problem is stiff. While integrating the system, we also
-C     enable the root finding feature to find the points at which
-C     y1 = 1.e-4 or at which y3 = 0.01. The following coding solves
-C     this problem with CVODE, using the Fortran/C interface routine
-C     package. This solution uses the BDF method, Newton iteration with
-C     the the SUPERLUMT sparse direct linear solver, and a user-supplied
-C     Jacobian routine.
-C     It uses a scalar relative tolerance and a vector absolute
-C     tolerance. Output is printed in decades from t = .4 to t = 4.e10.
-C     Run statistics (optional outputs) are printed at the end.
-C     ----------------------------------------------------------------
-C
-      IMPLICIT NONE
-C
-      INTEGER*4 IER, LNST, LNFE, LNSETUP, LNNI, LNCF, LNETF, LNJE, LNGE
-      INTEGER*4 METH, ITOL, ITASK, JOUT, NOUT, IERROOT
-      INTEGER*4 INFO(2)
-      INTEGER*4 I
-C The following declaration specification should match C type long int
-      INTEGER*8 NEQ, IPAR, IOUT(25), IVAL, MXNLI, MXETF, NNZ
-      INTEGER*4 SPARSETYPE, NTHREADS
-      DOUBLE PRECISION RTOL, T, T0, TOUT, H0, NLCONV
-      DOUBLE PRECISION Y(3), ATOL(3), ROUT(10), RPAR
-C
-      DATA LNST/3/, LNFE/4/, LNETF/5/, LNCF/6/, LNNI/7/, LNSETUP/8/,
-     1     LNGE/12/, LNJE/17/
-C
-C     Problem constants
-C     number of equations
-      NEQ = 3
-C     initial time
-      T0 = 0.0D0
-C     initial y components
-      Y(1) = 1.0D0
-      Y(2) = 0.0D0
-      Y(3) = 0.0D0
-C     basic integration method, 2 for BDF
-      METH = 2
-C     type for absolute tolerance, 2 for array
-      ITOL = 2
-C     scalar relative tolerance
-      RTOL = 1.0D-4
-C     vector absolute tolerance components
-      ATOL(1) = 1.0D-8
-      ATOL(2) = 1.0D-14
-      ATOL(3) = 1.0D-6
-C     first output time
-      TOUT = 0.4D0
-C     call CVODE in normal mode
-      ITASK = 1
-      JOUT = 0
-C     number of output times
-      NOUT = 12
-C
-      WRITE(6, 10) NEQ
- 10   FORMAT('Superlu_mt example problem:'//
-     1       ' Robertson kinetics, NEQ = ', I2//)
-
-C     create serial vector
-      CALL FNVINITS(1, NEQ, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,20) IER
- 20     FORMAT(///' SUNDIALS_ERROR: FNVINITS returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     initialize sparse matrix module
-C     maximum number of nonzeros in the sparse Jac
-      NNZ = NEQ * NEQ
-C     CSC
-      SPARSETYPE = 0
-      CALL FSUNSPARSEMATINIT(1, NEQ, NEQ, NNZ, SPARSETYPE, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,25) IER
- 25     FORMAT(///' SUNDIALS_ERROR: FSUNSPARSEMATINIT returned IER = ',
-     1         I5)
-        STOP
-      ENDIF
-
-C     initialize KLU sparse direct linear solver module
-C     number of threads to use in factorization
-      NTHREADS = 1
-      CALL FSUNSUPERLUMTINIT(1, NTHREADS, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,28) IER
- 28     FORMAT(///' SUNDIALS_ERROR: FSUNKLUINIT returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Call FCVMALLOC to create the solver memory and specify the 
-C     Backward Differentiation Formula
-      CALL FCVMALLOC(T0, Y, METH, ITOL, RTOL, ATOL,
-     1               IOUT, ROUT, IPAR, RPAR, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,30) IER
- 30     FORMAT(///' SUNDIALS_ERROR: FCVMALLOC returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     Set the FCVODE input
-C     max no. of internal steps before t_out
-      IVAL = 900000
-      CALL FCVSETIIN('MAX_NSTEPS', IVAL, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,31) IER
- 31     FORMAT(///' SUNDIALS_ERROR: FCVSETIIN returned IER = ', I5)
-        STOP
-      ENDIF
-
-C     max no. of iterations
-      MXNLI = 8
-      CALL FCVSETIIN('MAX_NITERS', MXNLI, IER)
-      IF (IER .NE. 0) THEN
-         WRITE(6, 31) IER
-         STOP
-      ENDIF
-
-C     max no. of error test failures
-      MXETF = 20
-      CALL FCVSETIIN('MAX_ERRFAIL', MXETF, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,31) IER
-        STOP
-      ENDIF
-      
-C     initial step size
-      H0 = 1.0D-4 * RTOL
-      CALL FCVSETRIN('INIT_STEP', H0, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
- 32     FORMAT(///' SUNDIALS_ERROR: FCVSETRIN returned IER = ', I5)
-        STOP
-      ENDIF
-      
-C     coefficient in the nonlinear convergence test
-      NLCONV = 1.0D-7
-      CALL FCVSETRIN('NLCONV_COEF', NLCONV, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,32) IER
-        STOP
-      ENDIF
-
-C     Call FCVROOTINIT to specify the root function g with 2 components
-      CALL FCVROOTINIT(2, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,35) IER
- 35     FORMAT(///' SUNDIALS_ERROR: FCVROOTINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     attach the matrix and linear solver modules to CVLs interface
-      CALL FCVLSINIT(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,40) IER
- 40     FORMAT(///' SUNDIALS_ERROR: FCVLSINIT returned IER = ', I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     indicate a sparse Jacobian function is provided
-      CALL FCVSPARSESETJAC(IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,45) IER
- 45     FORMAT(///' SUNDIALS_ERROR: FCVSPARSESETJAC returned IER = ',
-     1         I5)
-        CALL FCVFREE
-        STOP
-      ENDIF
-
-C     In loop, call FCVODE, print results, and test for error.
-      DO WHILE(JOUT .LT. NOUT)
-C
-        CALL FCVODE(TOUT, T, Y, ITASK, IER)
-C
-        WRITE(6,50) T, Y(1), Y(2), Y(3)
- 50     FORMAT('At t = ', E12.4, '   y = ', 3E14.6)
-C
-        IF (IER .LT. 0) THEN
-          WRITE(6,60) IER, IOUT(15)
- 60       FORMAT(///' SUNDIALS_ERROR: FCVODE returned IER = ', I5, /,
-     1           '                 Linear Solver returned IER = ', I5)
-          CALL FCVROOTFREE
-          CALL FCVFREE
-          STOP
-        ENDIF
-C
-        IF (IER .EQ. 2) THEN
-          CALL FCVROOTINFO(2, INFO, IERROOT)
-          IF (IERROOT .LT. 0) THEN
-            WRITE(6,65) IERROOT
- 65         FORMAT(///' SUNDIALS_ERROR: FCVROOTINFO returned IER = ',
-     1             I5)
-            CALL FCVROOTFREE
-            CALL FCVFREE
-            STOP
-          ENDIF
-          WRITE(6,70) (INFO(I), I = 1, 2)
- 70       FORMAT(5X, 'Above is a root, INFO() = ', 2I3)
-        ENDIF
-C
-        IF (IER .EQ. 0) THEN
-          TOUT = TOUT * 10.0D0
-          JOUT = JOUT + 1
-        ENDIF
-C
-      ENDDO
-
-C     obtain a derivative of the solution
-      CALL FCVDKY(T, 1, Y, IER)
-      IF (IER .NE. 0) THEN
-        WRITE(6,80) IER
- 80     FORMAT(///' SUNDIALS_ERROR: FCVDKY returned IER = ', I4)
-        CALL FCVROOTFREE
-        CALL FCVFREE
-        STOP
-      ENDIF
-      WRITE(6,85) Y(1), Y(2), Y(3)
- 85   FORMAT(/'Final value of ydot = ', 3E14.6)
-
-C     output run statistics
-      WRITE(6,90) IOUT(LNST), IOUT(LNFE), IOUT(LNJE), IOUT(LNSETUP),
-     1            IOUT(LNNI), IOUT(LNCF), IOUT(LNETF), IOUT(LNGE)
- 90   FORMAT(//'Final statistics:'//
-     1       ' No. steps = ', I4, '   No. f-s = ', I4,
-     2       '   No. J-s = ', I4, '   No. LU-s = ', I4/
-     3       ' No. nonlinear iterations = ', I4/
-     4       ' No. nonlinear convergence failures = ', I4/
-     5       ' No. error test failures = ', I4/
-     6       ' No. root function evals = ', I4)
-C
-      CALL FCVROOTFREE
-      CALL FCVFREE
-C
-      STOP
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVFUN(T, Y, YDOT, IPAR, RPAR, IER)
-C     Fortran routine for right-hand side function
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), YDOT(*), RPAR(*)
-C
-      YDOT(1) = -0.04D0 * Y(1) + 1.0D4 * Y(2) * Y(3)
-      YDOT(3) = 3.0D7 * Y(2) * Y(2)
-      YDOT(2) = -YDOT(1) - YDOT(3)
-C
-      IER = 0
-C
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVROOTFN(T, Y, G, IPAR, RPAR, IER)
-C     Fortran routine for root finding
-      IMPLICIT NONE
-C
-      DOUBLE PRECISION T, Y(*), G(*), RPAR(*)
-C The following declaration specification should match C type long int
-      INTEGER*8 IPAR(*)
-      INTEGER*4 IER
-C
-      G(1) = Y(1) - 1.0D-4
-      G(2) = Y(3) - 1.0D-2
-C
-      IER = 0
-
-      RETURN
-      END
-
-C     ----------------------------------------------------------------
-
-      SUBROUTINE FCVSPJAC(T, Y, FY, N, NNZ, JDATA, JRVALS,
-     1                    JCPTRS, H, IPAR, RPAR, WK1, WK2, WK3, IER)
-C     Fortran routine for user-supplied CSC format Jacobian
-      IMPLICIT NONE
-C
-C The following declaration specification should match C type long int
-      INTEGER*8 N, NNZ, IPAR(*)
-      INTEGER*8 JRVALS(NNZ), JCPTRS(N+1)
-      INTEGER*4 IER
-      DOUBLE PRECISION T, Y(*), FY(*), H, RPAR(*)
-      DOUBLE PRECISION JDATA(NNZ)
-      DOUBLE PRECISION WK1(*), WK2(*), WK3(*)
-C
-      DOUBLE PRECISION Y1, Y2, Y3
-C
-      Y1 = Y(1)
-      Y2 = Y(2)
-      Y3 = Y(3)
-      JCPTRS(1) = 0
-      JCPTRS(2) = 3
-      JCPTRS(3) = 6
-      JCPTRS(4) = 9
-
-      JDATA(1) = -0.04D0
-      JRVALS(1) = 0
-      JDATA(2) = 0.04D0
-      JRVALS(2) = 1
-      JDATA(3) = 0.0D0
-      JRVALS(3) = 2
-
-      JDATA(4) = 1.0D4 * Y3
-      JRVALS(4) = 0
-      JDATA(5) = -1.0D4 * Y3 - 6.0D7 * Y2
-      JRVALS(5) = 1
-      JDATA(6) = 6.0D7 * Y2
-      JRVALS(6) = 2
-      
-      JDATA(7) = 1.0D4 * Y2
-      JRVALS(7) = 0
-      JDATA(8) = -1.0D4 * Y2
-      JRVALS(8) = 1
-      JDATA(9) = 0.0D0
-      JRVALS(9) = 2
-C
-      IER = 0
-C
-      RETURN
-      END
diff --git a/examples/cvode/fcmix_serial/fcvRoberts_sps.out b/examples/cvode/fcmix_serial/fcvRoberts_sps.out
deleted file mode 100644
index 613fe9b2de..0000000000
--- a/examples/cvode/fcmix_serial/fcvRoberts_sps.out
+++ /dev/null
@@ -1,32 +0,0 @@
-Superlu_mt example problem:
-
- Robertson kinetics, NEQ =  3
-
-
-At t =   0.2640E+00   y =   0.989965E+00  0.347056E-04  0.100000E-01
-     Above is a root, INFO() =   0  1
-At t =   0.4000E+00   y =   0.985172E+00  0.338640E-04  0.147938E-01
-At t =   0.4000E+01   y =   0.905507E+00  0.224034E-04  0.944710E-01
-At t =   0.4000E+02   y =   0.715840E+00  0.918606E-05  0.284150E+00
-At t =   0.4000E+03   y =   0.450575E+00  0.322362E-05  0.549422E+00
-At t =   0.4000E+04   y =   0.183242E+00  0.894472E-06  0.816757E+00
-At t =   0.4000E+05   y =   0.389931E-01  0.162219E-06  0.961007E+00
-At t =   0.4000E+06   y =   0.493709E-02  0.198451E-07  0.995063E+00
-At t =   0.4000E+07   y =   0.516765E-03  0.206812E-08  0.999483E+00
-At t =   0.2078E+08   y =   0.100000E-03  0.400040E-09  0.999900E+00
-     Above is a root, INFO() =  -1  0
-At t =   0.4000E+08   y =   0.519865E-04  0.207957E-09  0.999948E+00
-At t =   0.4000E+09   y =   0.519161E-05  0.207666E-10  0.999995E+00
-At t =   0.4000E+10   y =   0.520292E-06  0.208117E-11  0.999999E+00
-At t =   0.4000E+11   y =   0.590048E-07  0.236019E-12  0.100000E+01
-
-Final value of ydot =  -0.166627E-17 -0.666508E-23  0.166628E-17
-
-
-Final statistics:
-
- No. steps =  364   No. f-s = 2056   No. J-s =   18   No. LU-s =   98
- No. nonlinear iterations = 2055
- No. nonlinear convergence failures =    0
- No. error test failures =   13
- No. root function evals =  394
diff --git a/examples/ida/fcmix_openmp/CMakeLists.txt b/examples/ida/fcmix_openmp/CMakeLists.txt
deleted file mode 100644
index f8aef13813..0000000000
--- a/examples/ida/fcmix_openmp/CMakeLists.txt
+++ /dev/null
@@ -1,118 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for FIDA opemp examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;args\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FIDA_examples
-  "fidaRoberts_dns_openmp\;\;develop"
-  )
-
-# Specify libraries to link against
-set(FNVECS_LIB sundials_fnvecopenmp)
-
-# Only static FCMIX libraries are available
-set(FIDA_LIB sundials_fida${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FIDA_LIB} ${FNVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FIDA_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_args)
-  list(GET example_tuple 2 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    TEST_ARGS ${example_args}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp)
-  endif()
-
-endforeach(example_tuple ${FIDA_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "IDA")
-  set(SOLVER_LIB "sundials_ida")
-  set(SOLVER_FLIB "sundials_fida")
-
-  examples2string(FIDA_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_openmp_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/ida/fcmix_openmp/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_openmp/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_openmp_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/ida/fcmix_openmp/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_openmp/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_openmp
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(ida fcmix_openmp)
-
-endif()
diff --git a/examples/ida/fcmix_openmp/README b/examples/ida/fcmix_openmp/README
deleted file mode 100644
index 12a2f1d732..0000000000
--- a/examples/ida/fcmix_openmp/README
+++ /dev/null
@@ -1,46 +0,0 @@
-List of OpenMP IDA FCMIX examples
-
-  fidaRoberts_dns_openmp : 3-species Robertson kinetics system with OpenMP
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.f b/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.f
deleted file mode 100644
index 76e2d1dd15..0000000000
--- a/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.f
+++ /dev/null
@@ -1,306 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C                 Steve Smith, Eddy Banks and Alan C. Hindmarsh @ LLNL      
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     ----------------------------------------------------------------
-c     This simple example problem for FIDA, due to Robertson, is from 
-c     chemical kinetics, and consists of the following three equations:
-c
-c          dy1/dt = -.04*y1 + 1.e4*y2*y3
-c          dy2/dt =  .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-c             0   = y1 + y2 + y3 - 1
-c
-c     on the interval from t = 0.0 to t = 4.e10, with initial
-c     conditions: y1 = 1, y2 = y3 = 0.
-c
-c     While integrating the system, we also employ the rootfinding feature
-c     to find the points at which y1 = 1.e-4 or at which y3 = 0.01.
-c
-c     The problem is solved using a dense linear solver, with a
-c     user-supplied Jacobian. Output is printed at
-c     t = .4, 4, 40, ..., 4e10.
-c     ----------------------------------------------------------------
-c
-      program fidaRoberts_dns
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, iout(25), ipar
-      integer ier, ierroot, info(2)
-      double precision rout(10), rpar
-      integer iatol, nout, jout, itask
-      integer nst, kused, hused, i
-      double precision t0, t1, rtol, tout, tret
-      double precision y(3), yp(3), atol(3)
-c
-      data nst/3/, kused/9/, hused/2/
-
-      integer nthreads
-      nthreads = 4
-c
-c Initialize variables
-c
-      neq = 3
-      nout = 12
-      rtol = 1.0d-4
-      t0 = 0.0d0
-      t1 = 0.4d0
-      iatol = 2
-      itask = 1
-c
-      y(1) = 1.0d0
-      y(2) = 0.0d0
-      y(3) = 0.0d0
-c
-      yp(1) = -0.04d0
-      yp(2) = 0.04d0
-      yp(3) = 0.0d0
-c
-      atol(1) = 1.0d-6
-      atol(2) = 1.0d-10
-      atol(3) = 1.0d-6
-c
-c Initialize IDA vector environment
-c
-      call fnvinitomp(2, neq, nthreads, ier)
-      if (ier .ne. 0) then
-         write(6,10) ier
- 10      format(///' SUNDIALS_ERROR: FNVINITS returned IER = ', i5)
-         stop
-      endif
-c
-      call fidamalloc(t0, y, yp, iatol, rtol, atol, 
-     &                iout, rout, ipar, rpar, ier)
-      if (ier .ne. 0) then
-         write(6,20) ier
- 20      format(///' SUNDIALS_ERROR: FIDAMALLOC returned IER = ', i5)
-         stop
-      endif
-c
-c Initialize rootfinding problem
-
-      call fidarootinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,25) ier
- 25      format(///' SUNDIALS_ERROR: FIDAROOTINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Attach dense matrix and linear solver
-c
-      call fsundensematinit(2, neq, neq, ier)
-      if (ier .ne. 0) then
-         write(6,30) ier
- 30      format(///' SUNDIALS_ERROR: FSUNDENSEMATINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fsundenselinsolinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,33) ier
- 33      format(///' SUNDIALS_ERROR: FSUNDENSELINSOLINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidalsinit(ier)
-      if (ier .ne. 0) then
-         write(6,35) ier
- 35      format(///' SUNDIALS_ERROR: FIDALSINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidadensesetjac(1, ier)
-      if (ier .ne. 0) then
-         write(6,37) ier
- 37      format(///' SUNDIALS_ERROR: FIDADENSESETJAC IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Print header
-c
-      call prntintro(rtol, atol, y)
-c
-      tout = t1
-c
-c
-      jout = 1
-      do while(jout .le. nout)
-c
-        call fidasolve(tout, tret, y, yp, itask, ier)
-c
-        write(6,40) tret, (y(i), i = 1,3), iout(nst), iout(kused),
-     &              rout(hused)
- 40     format(e10.4, 3(1x,e12.4), i5, i3, e12.4)
-c
-        if (ier .lt. 0) then
-           write(6,50) ier, iout(15)
- 50        format(///' SUNDIALS_ERROR: FIDASOLVE returned IER = ',i5,/,
-     1            '                 Linear Solver returned IER = ',i5)
-           call fidarootfree
-           call fidafree
-           stop
-        endif
-c
-        if (ier .eq. 2) then
-          call fidarootinfo(2, info, ierroot)
-          if (ierroot .lt. 0) then
-            write(6,55) ierroot
- 55         format(///' SUNDIALS_ERROR: FIDAROOTINFO returned IER = ',
-     1             i5)
-            call fidarootfree
-            call fidafree
-            stop
-          endif
-          write(6,60) (info(i), i = 1,2)
- 60       format(5x, 'Above is a root, INFO() = ', 2i3)
-        endif                   
-c
-        if (ier .eq. 0) then
-           tout = tout * 10.0d0
-           jout = jout + 1
-        endif
-c
-      ENDDO
-c
-c Print final statistics
-c
-      call prntstats(iout)
-c
-c Free IDA memory
-c
-      call fidarootfree
-      call fidafree
-c
-      stop
-      end
-c
-c ==========
-c
-      subroutine fidaresfun(tres, y, yp, res, ipar, rpar, reserr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer reserr
-      double precision tres, rpar(*)
-      double precision y(*), yp(*), res(*)
-c
-      res(1) = -0.04d0*y(1)+1.0d4*y(2)*y(3)
-      res(2) = -res(1)-3.0d7*y(2)*y(2)-yp(2)
-      res(1) = res(1)-yp(1)
-      res(3) = y(1)+y(2)+y(3)-1.0d0
-c
-      reserr = 0
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidadjac(neq, t, y, yp, r, jac, cj, ewt, h,
-     1                    ipar, rpar, wk1, wk2, wk3, djacerr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, ipar(*)
-      integer djacerr
-      double precision t, h, cj, rpar(*)
-      double precision y(*), yp(*), r(*), ewt(*), jac(neq,neq)
-      double precision wk1(*), wk2(*), wk3(*)
-c
-      jac(1,1) = -0.04d0-cj
-      jac(2,1) = 0.04d0
-      jac(3,1) = 1.0d0
-      jac(1,2) = 1.0d4*y(3)
-      jac(2,2) = -1.0d4*y(3)-6.0d7*y(2)-cj
-      jac(3,2) = 1.0d0
-      jac(1,3) = 1.0d4*y(2)
-      jac(2,3) = -1.0d4*y(2)
-      jac(3,3) = 1.0d0
-c
-      djacerr = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine fidarootfn(t, y, yp, g, ipar, rpar, ier)
-c Fortran routine for rootfinding
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer ier
-      double precision t, y(*), yp(*), g(*), rpar(*)
-c
-      g(1) = y(1) - 1.0d-4
-      g(2) = y(3) - 1.0d-2
-
-      ier = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine prntintro(rtol, atol, y)
-c
-      implicit none
-c
-      integer i
-      double precision rtol, atol(*), y(*)
-c
-      write(6,60) rtol, (atol(i), i = 1,3), (y(i), i = 1,3)
- 60   format(/'fidaRoberts_dns: Robertson kinetics DAE serial example',
-     &       'problem for IDA', /,'          Three equation chemical',
-     &       'kinetics problem.', //,
-     &       'Tolerance parameters:  rtol = ', e8.2,
-     &       '   atol = ', 3(1x,e8.2), /,
-     &       'Initial conditions y0 = (', 3(1x,e8.2), ')', //,
-     &       '  t            y1           y2           y3        nst',
-     &       '  k    h')
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntstats(iout)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 iout(25)
-      integer nst, reseval, jaceval, nni, ncf, netf, nge
-c
-      data nst/3/, reseval/4/, jaceval/17/, nni/7/, netf/5/,
-     &     ncf/6/, nge/12/
-c
-      write(6,70) iout(nst), iout(reseval), iout(jaceval),
-     &             iout(nni), iout(netf), iout(ncf), iout(nge)
- 70   format(/'Final Run Statistics:', //,
-     &         'Number of steps                    = ', i3, /,
-     &         'Number of residual evaluations     = ', i3, /,
-     &         'Number of Jacobian evaluations     = ', i3, /,
-     &         'Number of nonlinear iterations     = ', i3, /,
-     &         'Number of error test failures      = ', i3, /,
-     &         'Number of nonlinear conv. failures = ', i3, /,
-     &         'Number of root function evals.     = ', i3)
-c
-      return
-      end
diff --git a/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.out b/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.out
deleted file mode 100644
index 7809e8ac6a..0000000000
--- a/examples/ida/fcmix_openmp/fidaRoberts_dns_openmp.out
+++ /dev/null
@@ -1,34 +0,0 @@
-
-fidaRoberts_dns: Robertson kinetics DAE serial exampleproblem for IDA
-          Three equation chemicalkinetics problem.
-
-Tolerance parameters:  rtol = 0.10E-03   atol =  0.10E-05 0.10E-09 0.10E-05
-Initial conditions y0 = ( 0.10E+01 0.00E+00 0.00E+00)
-
-  t            y1           y2           y3        nst  k    h
-0.2640E+00   0.9900E+00   0.3471E-04   0.1000E-01   75  2  0.5716E-01
-     Above is a root, INFO() =   0  1
-0.4000E+00   0.9852E+00   0.3386E-04   0.1480E-01   77  3  0.1143E+00
-0.4000E+01   0.9055E+00   0.2240E-04   0.9447E-01   91  4  0.3704E+00
-0.4000E+02   0.7158E+00   0.9185E-05   0.2842E+00  127  4  0.2963E+01
-0.4000E+03   0.4505E+00   0.3223E-05   0.5495E+00  177  3  0.1241E+02
-0.4000E+04   0.1832E+00   0.8940E-06   0.8168E+00  228  3  0.2765E+03
-0.4000E+05   0.3899E-01   0.1622E-06   0.9610E+00  278  5  0.2614E+04
-0.4000E+06   0.4939E-02   0.1985E-07   0.9951E+00  324  5  0.2770E+05
-0.4000E+07   0.5176E-03   0.2072E-08   0.9995E+00  355  4  0.3979E+06
-0.2075E+08   0.1000E-03   0.4000E-09   0.9999E+00  374  4  0.1592E+07
-     Above is a root, INFO() =  -1  0
-0.4000E+08   0.5191E-04   0.2076E-09   0.9999E+00  380  3  0.6366E+07
-0.4000E+09   0.5882E-05   0.2353E-10   0.1000E+01  394  1  0.9167E+08
-0.4000E+10   0.7054E-06   0.2822E-11   0.1000E+01  402  1  0.1467E+10
-0.4000E+11  -0.7300E-06  -0.2920E-11   0.1000E+01  407  1  0.2347E+11
-
-Final Run Statistics:
-
-Number of steps                    = 407
-Number of residual evaluations     = 557
-Number of Jacobian evaluations     =  65
-Number of nonlinear iterations     = 557
-Number of error test failures      =   6
-Number of nonlinear conv. failures =   0
-Number of root function evals.     = 445
diff --git a/examples/ida/fcmix_parallel/CMakeLists.txt b/examples/ida/fcmix_parallel/CMakeLists.txt
deleted file mode 100644
index d965269669..0000000000
--- a/examples/ida/fcmix_parallel/CMakeLists.txt
+++ /dev/null
@@ -1,131 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FIDA parallel examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;nodes\;tasks\;type" where the
-# type is develop for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FIDA_examples
-  "fidaHeat2D_kry_bbd_p\;1\;4\;develop"
-  )
-
-if(MPI_Fortran_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_Fortran_COMPILER ${MPI_Fortran_COMPILER})
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-# Specify libraries to link against
-set(FNVECP_LIB sundials_fnvecparallel)
-
-# Only static FCMIX libraries are available
-set(FIDA_LIB sundials_fida${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FIDA_LIB} ${FNVECP_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FIDA_examples})
-
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 number_of_nodes)
-  list(GET example_tuple 2 number_of_tasks)
-  list(GET example_tuple 3 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    MPI_NPROCS ${number_of_tasks}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  if(NOT MPI_Fortran_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_parallel)
-  endif()
-
-endforeach(example_tuple ${FIDA_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_parallel)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "IDA")
-  set(SOLVER_LIB "sundials_ida")
-  set(SOLVER_FLIB "sundials_fida")
-
-  examples2string(FIDA_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_parallel_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/ida/fcmix_parallel/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_parallel/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_parallel
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_parallel_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/ida/fcmix_parallel/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_parallel/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_parallel
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(ida fcmix_parallel)
-
-endif()
diff --git a/examples/ida/fcmix_parallel/README b/examples/ida/fcmix_parallel/README
deleted file mode 100644
index 2b90b2de0a..0000000000
--- a/examples/ida/fcmix_parallel/README
+++ /dev/null
@@ -1,46 +0,0 @@
-List of parallel IDA FCMIX examples
-
-  fidaHeat2D_kry_bbd_p : 2D heat equation (SPGMR w/FIDABBD preconditioner)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f b/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f
deleted file mode 100644
index 5a40d0f666..0000000000
--- a/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.f
+++ /dev/null
@@ -1,849 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C                 Radu Serban and Alan C. Hindmarsh @ LLNL      
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     ----------------------------------------------------------------
-c     Example problem for FIDA: 2D heat equation, parallel, GMRES,
-c     IDABBDPRE.
-c
-c     This example solves a discretized 2D heat equation problem.
-c     This version uses the Krylov solver SUNSPGMR and BBD
-c     preconditioning.
-c
-c     The DAE system solved is a spatial discretization of the PDE
-c              du/dt = d^2u/dx^2 + d^2u/dy^2
-c     on the unit square. The boundary condition is u = 0 on all edges.
-c     Initial conditions are given by u = 16 x (1 - x) y (1 - y). The
-c     PDE is treated with central differences on a uniform MX x MY
-c     grid. The values of u at the interior points satisfy ODEs, and
-c     equations u = 0 at the boundaries are appended, to form a DAE
-c     system of size N = MX * MY. Here MX = MY = 10.
-c
-c     The system is actually implemented on submeshes, processor by
-c     processor, with an MXSUB by MYSUB mesh on each of NPEX * NPEY
-c     processors.
-c
-c     The system is solved with FIDA using the Krylov linear solver
-c     SUNSPGMR in conjunction with the preconditioner module IDABBDPRE.
-c     The preconditioner uses a tridiagonal approximation
-c     (half-bandwidths = 1). The constraints u >= 0 are posed for all
-c     components. Local error testing on the boundary values is
-c     suppressed. Output is taken at t = 0, .01, .02, .04, ..., 10.24.
-c     ----------------------------------------------------------------
-c
-      program fidaHeat2D_kry_bbd_p
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 mudq, mldq, mukeep, mlkeep, iout(25), ipar(1)
-      double precision rout(10), rpar(1)
-      integer nout, ier
-      parameter (nout = 11)
-      integer npes, inopt, maxl, maxrs, itask, iatol
-      integer nlocalg
-      parameter (nlocalg = mxsubg*mysubg)
-      double precision t0, t1, tout, tret, dqrely
-      double precision atol, rtol
-      double precision constr(nlocalg), uu(nlocalg), up(nlocalg)
-      double precision res(nlocalg), id(nlocalg)
-c
-      data atol/1.0d-3/, rtol/0.0d0/
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-c Initialize variables
-c
-      npex = 2
-      npey = 2
-      mxsub = 5
-      mysub = 5
-      mx = npex*mxsub
-      my = npey*mysub
-      neq = mx*my
-      nlocal = mxsub*mysub
-      inopt = 1
-      t0 = 0.0d0
-      t1 = 0.01d0
-      mudq = mxsub
-      mldq = mxsub
-      mukeep = 1
-      mlkeep = 1
-      dqrely = 0.0d0
-      maxl = 0
-      maxrs = 0
-      itask = 1
-      iatol = 1
-c
-c Initialize MPI environment
-c
-      call mpi_init(ier)
-      if (ier .ne. 0) then
-         write(*,2) ier
- 2       format(///' MPI_ERROR: MPI_INIT returned IER = ', i5)
-         stop
-      endif
-c
-      call mpi_comm_size(mpi_comm_world, npes, ier)
-      if (ier .ne. 0) then
-         write(*,3) ier
- 3       format(///' MPI_ERROR: MPI_COMM_SIZE returned IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-      call mpi_comm_rank(mpi_comm_world, thispe, ier)
-      if (ier .ne. 0) then
-         write(*,4) ier
- 4       format(///' MPI_ERROR: MPI_COMM_RANK returned IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-      if (npes .ne. npex*npey) then
-         if (thispe .eq. 0) then
-            write(*,5) npes, npex*npey
- 5          format(///' MPI_ERROR: npes = ', i5, ' is not equal to ',
-     &                'NPEX*NPEY = ', i5)
-            call mpi_finalize(ier)
-            stop
-         endif
-      endif
-c
-      call fnvinitp(mpi_comm_world, 2, nlocal, neq, ier)
-      if (ier .ne. 0) then
-         write(*,6) ier
- 6       format(///' SUNDIALS_ERROR: FNVINITP returned IER = ', i5)
-         call mpi_finalize(ier)
-         stop
-      endif
-c
-      jysub = int(thispe/npex)
-      ixsub = thispe-jysub*npex
-c
-c Initialize problem data
-c
-      call setinitprofile(uu, up, id, res, constr, ipar, rpar)
-c
-c Initialize IDA environment
-c
-      call fidamalloc(t0, uu, up, iatol, rtol, atol, 
-     &     iout, rout, ipar, rpar, ier)
-      if (ier .ne. 0) then
-         write(*,7) ier
- 7       format(///' SUNDIALS_ERROR: FIDAMALLOC returned IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c     Set optional inputs
-c
-      call fidasetiin('SUPPRESS_ALG', 1, ier)
-      call fidasetvin('ID_VEC', id, ier)
-      call fidasetvin('CONSTR_VEC', constr, ier)
-c
-c Initialize and attach SUNSPGMR solver
-c
-      call fsunspgmrinit(2, 1, maxl, ier)
-      if (ier .ne. 0) then
-         write(*,8) ier
- 8       format(///' SUNDIALS_ERROR: FSUNSPGMRINIT returned IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-      call fsunspgmrsetmaxrs(2, 5, ier)
-      if (ier .ne. 0) then
-         write(*,9) ier
- 9       format(///' SUNDIALS_ERROR: FSUNSPGMRSETMAXRS IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-      call fidalsinit(ier)
-      if (ier .ne. 0) then
-         write(*,10) ier
- 10       format(///' SUNDIALS_ERROR: FIDALSINIT IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Initialize and attach BBD preconditioner module
-c
-      call fidabbdinit(nlocal, mudq, mldq, mukeep, mlkeep, dqrely, ier)
-      if (ier .ne. 0) then
-         write(*,11) ier
- 11       format(///' SUNDIALS_ERROR: FIDABBDINIT returned IER = ', i5)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Print header
-c
-      if (thispe .eq. 0) then
-         call prntintro(rtol, atol)
-         call prntcase(1, mudq, mukeep)
-      endif
-c
-      tout = t1
-      do 12 jout = 1, nout
-c
-         call fidasolve(tout, tret, uu, up, itask, ier)
-c
-         call prntoutput(tret, uu, iout, rout)
-c
-         if (ier .ne. 0) then
-            write(*,13) ier
- 13         format(///' SUNDIALS_ERROR: FIDASOLVE returned IER = ', i5)
-            call fidafree
-            stop
-         endif
-c
-         tout = tout*2.0d0
-c
- 12   continue
-c
-c Print statistics
-c
-      if (thispe .eq. 0) then
-         call prntfinalstats(iout)
-      endif
-c
-c Reinitialize variables and data for second problem
-c
-      mudq = 1
-      mldq = 1
-c
-      call setinitprofile(uu, up, id, res, constr, ipar, rpar)
-c
-      call fidareinit(t0, uu, up, iatol, rtol, atol, ier)
-      if (ier .ne. 0) then
-         write(*,43) ier
- 43      format(///' SUNDIALS_ERROR: FIDAREINIT returned IER = ', i5)
-      endif
-c
-      call fidabbdreinit(nlocal, mudq, mldq, dqrely, ier)
-      if (ier .ne. 0) then
-         write(*,44) ier
- 44      format(///' SUNDIALS_ERROR: FIDABBDREINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Print header
-c
-      if (thispe .eq. 0) then
-         call prntcase(2, mudq, mukeep)
-      endif
-c
-      tout = t1
-      do 14 jout = 1, nout
-c
-         call fidasolve(tout, tret, uu, up, itask, ier)
-c
-         call prntoutput(tret, uu, iout, rout)
-c
-         if (ier .ne. 0) then
-            write(*,15) ier
- 15         format(///' SUNDIALS_ERROR: FIDASOLVE returned IER = ', i5)
-            call fidafree
-            stop
-         endif
-c
-         tout = tout*2.0d0
-c
- 14   continue
-c
-c Print statistics
-c
-      if (thispe .eq. 0) then
-         call prntfinalstats(iout)
-      endif
-c
-c Free memory
-c
-      call fidafree
-c
-      call mpi_finalize(ier)
-c
-      stop
-      end
-c
-c ==========
-c
-      subroutine setinitprofile(uu, up, id, res, constr, ipar, rpar)
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy, rpar(*)
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer i, iloc, j, jloc, offset, loc
-      integer ixbegin, ixend, jybegin, jyend
-      integer reserr
-      double precision xfact, yfact
-      double precision uu(*), up(*), id(*), res(*), constr(*)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-c Initialize variables
-c
-      dx = 1.0d0/dble(mx-1)
-      dy = 1.0d0/dble(my-1)
-      coeffx = 1.0d0/(dx*dx)
-      coeffy = 1.0d0/(dy*dy)
-      coeffxy = 2.0d0/(dx*dx)+2.0d0/(dy*dy)
-      ixbegin = mxsub*ixsub
-      ixend = mxsub*(ixsub+1)-1
-      jybegin = mysub*jysub
-      jyend = mysub*(jysub+1)-1
-c
-      do 16 i = 1, nlocal
-         id(i) = 1.0d0
- 16   continue
-c
-      jloc = 0
-      do 17 j = jybegin, jyend
-         yfact = dy*dble(j)
-         offset = jloc*mxsub
-         iloc = 0
-         do 18 i = ixbegin, ixend
-            xfact = dx*dble(i)
-            loc = offset+iloc
-            uu(loc+1) = 16.0d0*xfact*(1.0d0-xfact)*yfact*(1.0d0-yfact)
-            if (i .eq. 0 .or. i .eq. mx-1) then
-               id(loc+1) = 0.0d0
-            endif
-            if (j .eq. 0 .or. j .eq. my-1) then
-               id(loc+1) = 0.0d0
-            endif
-            iloc = iloc+1
- 18      continue
-         jloc = jloc+1
- 17   continue
-c
-      do 19 i = 1, nlocal
-         up(i) = 0.0d0
-         constr(i) = 1.0d0
- 19   continue
-c
-      call fidaresfun(0.0d0, uu, up, res, ipar, rpar, reserr)
-c
-      do 20 i = 1, nlocal
-         up(i) = -1.0d0*res(i)
- 20   continue
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidaresfun(tres, u, up, res, ipar, rpar, reserr)
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy, rpar(*)
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer reserr
-      double precision tres
-      double precision u(*), up(*), res(*)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      call fidacommfn(nlocal, tres, u, up, ipar, rpar, reserr)
-c
-      call fidaglocfn(nlocal, tres, u, up, res, ipar, rpar, reserr)
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidacommfn(nloc, tres, u, up, ipar, rpar, reserr)
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy, rpar(*)
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nloc, ipar(*)
-      integer reserr
-      double precision tres, u(*), up(*)
-c
-      integer request(mpi_status_size)
-      double precision buffer(2*mysub)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      call brecvpost(request, mxsub, mysub, buffer)
-c
-      call bsend(mxsub, mysub, u)
-c
-      call brecvwait(request, mxsub, buffer)
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidaglocfn(nloc, tres, u, up, res, ipar, rpar, reserr)
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy, rpar(*)
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nloc, ipar(*)
-      integer reserr
-      double precision tres, u(*), up(*), res(*)
-c
-      integer i, lx, ly, offsetu, offsetue, locu, locue
-      integer ixbegin, ixend, jybegin, jyend, mxsub2
-      double precision termx, termy, termctr
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      mxsub2 = mxsub+2
-c
-      do 21 i = 1, nlocal
-         res(i) = u(i)
- 21   continue
-c
-      offsetu = 0
-      offsetue = mxsub2+1
-      do 22 ly = 0, mysub-1
-         do 23 lx = 0, mxsub-1
-            uext(offsetue+lx+1) = u(offsetu+lx+1)
- 23      continue
-         offsetu = offsetu+mxsub
-         offsetue = offsetue+mxsub2
- 22   continue
-c
-      ixbegin = 0
-      ixend = mxsub-1
-      jybegin = 0
-      jyend = mysub-1
-      if (ixsub .eq. 0) then
-         ixbegin = ixbegin+1
-      endif
-      if (ixsub .eq. npex-1) then
-         ixend = ixend-1
-      endif
-      if (jysub .eq. 0) then
-         jybegin = jybegin+1
-      endif
-      if (jysub .eq. npey-1) then
-         jyend = jyend-1
-      endif
-c
-      do 24 ly = jybegin, jyend
-         do 25 lx = ixbegin, ixend
-            locu = lx+ly*mxsub
-            locue = (lx+1)+(ly+1)*mxsub2
-            termx = coeffx*(uext(locue)+uext(locue+2))
-            termy = coeffy*(uext(locue-mxsub2+1)+uext(locue+mxsub2+1))
-            termctr = coeffxy*uext(locue+1)
-            res(locu+1) = up(locu+1)-(termx+termy-termctr)
- 25      continue
- 24   continue
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine bsend(dsizex, dsizey, uarray)
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-      integer dsizex, dsizey
-      double precision uarray(*)
-c
-      integer ier, offsetu
-      double precision bufleft(mysub), bufright(mysub)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      if (jysub .ne. 0) then
-         call mpi_send(uarray(1), dsizex, mpi_double_precision,
-     &                 thispe-npex, 0, mpi_comm_world, ier)
-      endif
-c
-      if (jysub .ne. npey-1) then
-         offsetu = (mysub-1)*dsizex
-         call mpi_send(uarray(offsetu+1), dsizex, mpi_double_precision,
-     &                 thispe+npex, 0, mpi_comm_world, ier)
-      endif
-c
-      if (ixsub .ne. 0) then
-         do 26 ly = 0, mysub-1
-            offsetu = ly*dsizex
-            bufleft(ly+1) = uarray(offsetu+1)
- 26      continue
-         call mpi_send(bufleft(1), dsizey, mpi_double_precision,
-     &                 thispe-1, 0, mpi_comm_world, ier)
-      endif
-c
-      if (ixsub .ne. npex-1) then
-         do 27 ly = 0, mysub-1
-            offsetu = ly*mxsub+(mxsub-1)
-            bufright(ly+1) = uarray(offsetu+1)
- 27      continue
-         call mpi_send(bufright(1), dsizey, mpi_double_precision,
-     &                 thispe+1, 0, mpi_comm_world, ier)
-      endif
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine brecvpost(request, dsizex, dsizey, buffer)
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-      integer dsizex, dsizey
-      integer request(*)
-      double precision buffer(*)
-      integer ier
-      integer offsetue
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      if (jysub .ne. 0) then
-         call mpi_irecv(uext(2), dsizex, mpi_double_precision,
-     &                  thispe-npex, 0, mpi_comm_world, request(1),
-     &                  ier)
-      endif
-c
-      if (jysub .ne. npey-1) then
-         offsetue = (1+(mysub+1)*(mxsub+2))
-         call mpi_irecv(uext(offsetue+1), dsizex, mpi_double_precision,
-     &                  thispe+npex, 0, mpi_comm_world, request(2),
-     &                  ier)
-      endif
-c
-      if (ixsub .ne. 0) then
-         call mpi_irecv(buffer(1), dsizey, mpi_double_precision,
-     &                  thispe-1, 0, mpi_comm_world, request(3),
-     &                  ier)
-      endif
-c
-      if (ixsub .ne. npex-1) then
-         call mpi_irecv(buffer(1+mysub), dsizey, mpi_double_precision,
-     &                  thispe+1, 0, mpi_comm_world, request(4),
-     &                  ier)
-      endif
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine brecvwait(request, dsizex, buffer)
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-      integer request(*)
-      integer dsizex
-      double precision buffer(*)
-      integer ly, dsizex2, offsetue
-      integer ier, status(mpi_status_size)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      dsizex2 = dsizex+2
-c
-      if (jysub .ne. 0) then
-         call mpi_wait(request(1), status, ier)
-      endif
-c
-      if (jysub .ne. npey-1) then
-         call mpi_wait(request(2), status, ier)
-      endif
-c
-      if (ixsub .ne. 0) then
-         call mpi_wait(request(3), status, ier)
-         do 28 ly = 0, mysub-1
-            offsetue = (ly+1)*dsizex2
-            uext(offsetue+1) = buffer(ly+1)
- 28      continue
-      endif
-c
-      if (ixsub .ne. npex-1) then
-         call mpi_wait(request(4), status, ier)
-         do 29 ly = 0, mysub-1
-            offsetue = (ly+2)*dsizex2-1
-            uext(offsetue+1) = buffer(ly+mysub+1)
- 29      continue
-      endif
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntoutput(tret, u, iout, rout)
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c  local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 iout(*), lenrwbbd, leniwbbd, ngebbd
-      double precision tret, umax, u(*), rout(*)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      call maxnorm(u, umax)
-c
-      if (thispe .eq. 0) then
-         call fidabbdopt(lenrwbbd, leniwbbd, ngebbd)
-         write(*,30) tret, umax, iout(9), iout(3), iout(7),
-     &               iout(22), iout(4), iout(16), ngebbd, rout(2),
-     &               iout(20), iout(21)
- 30      format(' ', e10.4, ' ', e13.5, '  ', i1, '  ', i2,
-     &          '  ', i3, '  ', i3, '  ', i2,'+',i2, '  ',
-     &          i3, '  ', e9.2, '  ', i2, '  ', i3)
-      endif
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine maxnorm(u, unorm)
-c
-      include "mpif.h"
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-      integer i, ier
-      double precision temp, unorm, u(*)
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      temp = 0.0d0
-c
-      do 31 i = 1, nlocal
-         temp = max(abs(u(i)), temp)
- 31   continue
-c
-      call mpi_allreduce(temp, unorm, 1, mpi_double_precision,
-     &                   mpi_max, mpi_comm_world, ier)
-c
-c      unorm = temp
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntintro(rtol, atol)
-c
-c global variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 nlocal, neq
-      integer npex, npey, mxsub, mysub, mx, my, ixsub, jysub
-      integer thispe, mxsubg, mysubg
-      parameter (mxsubg = 5, mysubg = 5)
-      double precision dx, dy, coeffx, coeffy, coeffxy
-      double precision uext((mxsubg+2)*(mysubg+2))
-c
-c local variables
-c
-      double precision rtol, atol
-c
-      common /pcom/ dx, dy, coeffx, coeffy, coeffxy, uext,
-     &              nlocal, neq, mx, my, mxsub, mysub, npex, npey,
-     &              ixsub, jysub, thispe
-c
-      write(*,32) mx, my, neq, mxsub, mysub, npex, npey, rtol, atol
- 32   format(/'fidaHeat2D_kry_bbd_p: Heat equation, parallel example',
-     &     ' for FIDA', /, 16x,'Discretized heat equation',
-     &     ' on 2D unit square.', /, 16x,'Zero boundary',
-     &     ' conditions, polynomial conditions.', /,
-     &     16x,'Mesh dimensions: ', i2, ' x ', i2,
-     &     '         Total system size: ', i3, //,
-     &     'Subgrid dimensions: ', i2, ' x ', i2,
-     &     '           Processor array: ', i2, ' x ', i2, /,
-     &     'Tolerance parameters: rtol = ', e8.2, '   atol = ',
-     &     e8.2, /, 'Constraints set to force all solution',
-     &     ' components >= 0.', /, 'SUPPRESSALG = SUNTRUE to remove',
-     &     ' boundary components from the error test.', /,
-     &     'Linear solver: SPGMR.    Preconditioner: BBDPRE - ',
-     &     'Banded-block-diagonal.')
-c     
-      return
-      end
-c
-c ==========
-c
-      subroutine prntcase(num, mudq, mukeep)
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 mudq, mukeep
-      integer num
-c
-      write(*,33) num, mudq, mukeep
- 33   format(//, 'Case ', i2, /, '  Difference quotient half-',
-     &     'bandwidths =', i2, /, '  Retained matrix half-bandwidths =',
-     &     i2, //, 'Output Summary',/,'  umax = max-norm of solution',
-     &     /,'  nre = nre + nreLS (total number of RES evals.)',
-     &     //, '   time         umax       k nst  nni  nli   nre',
-     &     '   nge      h     npe  nps', /,
-     &     '-------------------------------------------------------',
-     &     '-------------------')
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntfinalstats(iout)
-c
-c local variables
-c
-c The following declaration specification should match C type long int.
-      integer*8 iout(*)
-c
-      write(*,34) iout(5), iout(6), iout(23)
- 34   format(/, 'Error test failures            =', i3, /,
-     &     'Nonlinear convergence failures =', i3, /,
-     &     'Linear convergence failures    =', i3)
-c
-      return
-      end
diff --git a/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.out b/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.out
deleted file mode 100644
index de2abb3b4e..0000000000
--- a/examples/ida/fcmix_parallel/fidaHeat2D_kry_bbd_p.out
+++ /dev/null
@@ -1,65 +0,0 @@
-
-fidaHeat2D_kry_bbd_p: Heat equation, parallel example for FIDA
-                Discretized heat equation on 2D unit square.
-                Zero boundary conditions, polynomial conditions.
-                Mesh dimensions: 10 x 10         Total system size: 100
-
-Subgrid dimensions:  5 x  5           Processor array:  2 x  2
-Tolerance parameters: rtol = 0.00E+00   atol = 0.10E-02
-Constraints set to force all solution components >= 0.
-SUPPRESSALG = SUNTRUE to remove boundary components from the error test.
-Linear solver: SPGMR.    Preconditioner: BBDPRE - Banded-block-diagonal.
-
-
-Case  1
-  Difference quotient half-bandwidths = 5
-  Retained matrix half-bandwidths = 1
-
-Output Summary
-  umax = max-norm of solution
-  nre = nre + nreLS (total number of RES evals.)
-
-   time         umax       k nst  nni  nli   nre   nge      h     npe  nps
---------------------------------------------------------------------------
- 0.1000E-01   0.82411E+00  2  12   14    7  14+ 7   96   0.26E-02   8   21
- 0.2000E-01   0.68812E+00  3  15   18   12  18+12   96   0.51E-02   8   30
- 0.4000E-01   0.47075E+00  3  18   24   22  24+22  108   0.66E-02   9   46
- 0.8000E-01   0.21660E+00  3  22   29   30  29+30  108   0.13E-01   9   59
- 0.1600E+00   0.45659E-01  4  28   37   43  37+43  120   0.26E-01  10   80
- 0.3200E+00   0.21095E-02  4  35   45   59  45+59  120   0.24E-01  10  104
- 0.6400E+00   0.34044E-04  1  40   54   71  54+71  156   0.19E+00  13  125
- 0.1280E+01   0.36151E-18  1  42   56   71  56+71  180   0.76E+00  15  127
- 0.2560E+01   0.81974E-20  1  43   57   71  57+71  192   0.15E+01  16  128
- 0.5120E+01   0.17133E-19  1  44   58   71  58+71  204   0.30E+01  17  129
- 0.1024E+02   0.36660E-19  1  45   59   71  59+71  216   0.61E+01  18  130
-
-Error test failures            =  1
-Nonlinear convergence failures =  0
-Linear convergence failures    =  0
-
-
-Case  2
-  Difference quotient half-bandwidths = 1
-  Retained matrix half-bandwidths = 1
-
-Output Summary
-  umax = max-norm of solution
-  nre = nre + nreLS (total number of RES evals.)
-
-   time         umax       k nst  nni  nli   nre   nge      h     npe  nps
---------------------------------------------------------------------------
- 0.1000E-01   0.82411E+00  2  12   14    7  14+ 7   32   0.26E-02   8   21
- 0.2000E-01   0.68812E+00  3  15   18   12  18+12   32   0.51E-02   8   30
- 0.4000E-01   0.47093E+00  3  19   23   20  23+20   36   0.10E-01   9   43
- 0.8000E-01   0.21655E+00  3  23   27   32  27+32   36   0.10E-01   9   59
- 0.1600E+00   0.45225E-01  4  27   33   44  33+44   40   0.20E-01  10   77
- 0.3200E+00   0.21868E-02  3  34   41   67  41+67   44   0.41E-01  11  108
- 0.6400E+00   0.79056E-20  1  39   49   86  49+86   52   0.16E+00  13  135
- 0.1280E+01   0.18819E-19  1  41   51   86  51+86   60   0.66E+00  15  137
- 0.2560E+01   0.20662E-18  1  42   52   86  52+86   64   0.13E+01  16  138
- 0.5120E+01   0.20095E-17  1  43   53   86  53+86   68   0.26E+01  17  139
- 0.1024E+02   0.12941E-16  1  44   54   86  54+86   72   0.52E+01  18  140
-
-Error test failures            =  0
-Nonlinear convergence failures =  0
-Linear convergence failures    =  0
diff --git a/examples/ida/fcmix_pthreads/CMakeLists.txt b/examples/ida/fcmix_pthreads/CMakeLists.txt
deleted file mode 100644
index e8c19b9f25..0000000000
--- a/examples/ida/fcmix_pthreads/CMakeLists.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for FIDA PThread examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;args\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Only include tests if Pthreads is enabled
-if(PTHREADS_FOUND)
-
-  # Examples using SUNDIALS linear solvers
-  set(FIDA_examples
-    "fidaRoberts_dns_pthreads\;\;develop"
-    )
-
-endif()
-
-# Specify libraries to link against
-set(FNVECS_LIB sundials_fnvecpthreads)
-
-# Only static FCMIX libraries are available
-set(FIDA_LIB sundials_fida${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FIDA_LIB} ${FNVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FIDA_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_args)
-  list(GET example_tuple 2 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    TEST_ARGS ${example_args}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS} ${CMAKE_THREAD_LIBS_INIT})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads)
-  endif()
-
-endforeach(example_tuple ${FIDA_examples})
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "IDA")
-  set(SOLVER_LIB "sundials_ida")
-  set(SOLVER_FLIB "sundials_fida")
-
-  examples2string(FIDA_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_pthreads_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/ida/fcmix_pthreads/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_pthreads/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_pthreads_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/ida/fcmix_pthreads/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_pthreads/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_pthreads
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(ida fcmix_pthreads)
-
-endif()
diff --git a/examples/ida/fcmix_pthreads/README b/examples/ida/fcmix_pthreads/README
deleted file mode 100644
index 8b834eeb0a..0000000000
--- a/examples/ida/fcmix_pthreads/README
+++ /dev/null
@@ -1,47 +0,0 @@
-List of Pthreads IDA FCMIX examples
-
-  fidaRoberts_dns_pthreads : 3-species Robertson kinetics system with Pthreads
-
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.f b/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.f
deleted file mode 100644
index 47e861a470..0000000000
--- a/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.f
+++ /dev/null
@@ -1,306 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C                 Steve Smith, Eddy Banks and Alan C. Hindmarsh @ LLNL      
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     ----------------------------------------------------------------
-c     This simple example problem for FIDA, due to Robertson, is from 
-c     chemical kinetics, and consists of the following three equations:
-c
-c          dy1/dt = -.04*y1 + 1.e4*y2*y3
-c          dy2/dt =  .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-c             0   = y1 + y2 + y3 - 1
-c
-c     on the interval from t = 0.0 to t = 4.e10, with initial
-c     conditions: y1 = 1, y2 = y3 = 0.
-c
-c     While integrating the system, we also employ the rootfinding feature
-c     to find the points at which y1 = 1.e-4 or at which y3 = 0.01.
-c
-c     The problem is solved using a dense linear solver, with a
-c     user-supplied Jacobian. Output is printed at
-c     t = .4, 4, 40, ..., 4e10.
-c     ----------------------------------------------------------------
-c
-      program fidaRoberts_dns
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, iout(25), ipar
-      integer ier, ierroot, info(2)
-      double precision rout(10), rpar
-      integer iatol, nout, jout, itask
-      integer nst, kused, hused, i
-      double precision t0, t1, rtol, tout, tret
-      double precision y(3), yp(3), atol(3)
-c
-      data nst/3/, kused/9/, hused/2/
-
-      integer nthreads
-      nthreads = 4
-c
-c Initialize variables
-c
-      neq = 3
-      nout = 12
-      rtol = 1.0d-4
-      t0 = 0.0d0
-      t1 = 0.4d0
-      iatol = 2
-      itask = 1
-c
-      y(1) = 1.0d0
-      y(2) = 0.0d0
-      y(3) = 0.0d0
-c
-      yp(1) = -0.04d0
-      yp(2) = 0.04d0
-      yp(3) = 0.0d0
-c
-      atol(1) = 1.0d-6
-      atol(2) = 1.0d-10
-      atol(3) = 1.0d-6
-c
-c Initialize IDA vector environment
-c
-      call fnvinitpts(2, neq, nthreads, ier)
-      if (ier .ne. 0) then
-         write(6,10) ier
- 10      format(///' SUNDIALS_ERROR: FNVINITS returned IER = ', i5)
-         stop
-      endif
-c
-      call fidamalloc(t0, y, yp, iatol, rtol, atol, 
-     &                iout, rout, ipar, rpar, ier)
-      if (ier .ne. 0) then
-         write(6,20) ier
- 20      format(///' SUNDIALS_ERROR: FIDAMALLOC returned IER = ', i5)
-         stop
-      endif
-c
-c Initialize rootfinding problem
-
-      call fidarootinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,25) ier
- 25      format(///' SUNDIALS_ERROR: FIDAROOTINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Attach dense matrix and linear solver
-c
-      call fsundensematinit(2, neq, neq, ier)
-      if (ier .ne. 0) then
-         write(6,30) ier
- 30      format(///' SUNDIALS_ERROR: FSUNDENSEMATINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fsundenselinsolinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,33) ier
- 33      format(///' SUNDIALS_ERROR: FSUNDENSELINSOLINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidalsinit(ier)
-      if (ier .ne. 0) then
-         write(6,35) ier
- 35      format(///' SUNDIALS_ERROR: FIDALSINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidadensesetjac(1, ier)
-      if (ier .ne. 0) then
-         write(6,37) ier
- 37      format(///' SUNDIALS_ERROR: FIDADENSESETJAC IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Print header
-c
-      call prntintro(rtol, atol, y)
-c
-      tout = t1
-c
-c
-      jout = 1
-      do while(jout .le. nout)
-c
-        call fidasolve(tout, tret, y, yp, itask, ier)
-c
-        write(6,40) tret, (y(i), i = 1,3), iout(nst), iout(kused),
-     &              rout(hused)
- 40     format(e10.4, 3(1x,e12.4), i5, i3, e12.4)
-c
-        if (ier .lt. 0) then
-           write(6,50) ier, iout(15)
- 50        format(///' SUNDIALS_ERROR: FIDASOLVE returned IER = ',i5,/,
-     1            '                 Linear Solver returned IER = ',i5)
-           call fidarootfree
-           call fidafree
-           stop
-        endif
-c
-        if (ier .eq. 2) then
-          call fidarootinfo(2, info, ierroot)
-          if (ierroot .lt. 0) then
-            write(6,55) ierroot
- 55         format(///' SUNDIALS_ERROR: FIDAROOTINFO returned IER = ',
-     1             i5)
-            call fidarootfree
-            call fidafree
-            stop
-          endif
-          write(6,60) (info(i), i = 1,2)
- 60       format(5x, 'Above is a root, INFO() = ', 2i3)
-        endif                   
-c
-        if (ier .eq. 0) then
-           tout = tout * 10.0d0
-           jout = jout + 1
-        endif
-c
-      ENDDO
-c
-c Print final statistics
-c
-      call prntstats(iout)
-c
-c Free IDA memory
-c
-      call fidarootfree
-      call fidafree
-c
-      stop
-      end
-c
-c ==========
-c
-      subroutine fidaresfun(tres, y, yp, res, ipar, rpar, reserr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer reserr
-      double precision tres, rpar(*)
-      double precision y(*), yp(*), res(*)
-c
-      res(1) = -0.04d0*y(1)+1.0d4*y(2)*y(3)
-      res(2) = -res(1)-3.0d7*y(2)*y(2)-yp(2)
-      res(1) = res(1)-yp(1)
-      res(3) = y(1)+y(2)+y(3)-1.0d0
-c
-      reserr = 0
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidadjac(neq, t, y, yp, r, jac, cj, ewt, h,
-     1                    ipar, rpar, wk1, wk2, wk3, djacerr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, ipar(*)
-      integer djacerr
-      double precision t, h, cj, rpar(*)
-      double precision y(*), yp(*), r(*), ewt(*), jac(neq,neq)
-      double precision wk1(*), wk2(*), wk3(*)
-c
-      jac(1,1) = -0.04d0-cj
-      jac(2,1) = 0.04d0
-      jac(3,1) = 1.0d0
-      jac(1,2) = 1.0d4*y(3)
-      jac(2,2) = -1.0d4*y(3)-6.0d7*y(2)-cj
-      jac(3,2) = 1.0d0
-      jac(1,3) = 1.0d4*y(2)
-      jac(2,3) = -1.0d4*y(2)
-      jac(3,3) = 1.0d0
-c
-      djacerr = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine fidarootfn(t, y, yp, g, ipar, rpar, ier)
-c Fortran routine for rootfinding
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer ier
-      double precision t, y(*), yp(*), g(*), rpar(*)
-c
-      g(1) = y(1) - 1.0d-4
-      g(2) = y(3) - 1.0d-2
-
-      ier = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine prntintro(rtol, atol, y)
-c
-      implicit none
-c
-      integer i
-      double precision rtol, atol(*), y(*)
-c
-      write(6,60) rtol, (atol(i), i = 1,3), (y(i), i = 1,3)
- 60   format(/'fidaRoberts_dns: Robertson kinetics DAE serial example',
-     &       'problem for IDA', /,'          Three equation chemical',
-     &       'kinetics problem.', //,
-     &       'Tolerance parameters:  rtol = ', e8.2,
-     &       '   atol = ', 3(1x,e8.2), /,
-     &       'Initial conditions y0 = (', 3(1x,e8.2), ')', //,
-     &       '  t            y1           y2           y3        nst',
-     &       '  k    h')
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntstats(iout)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 iout(25)
-      integer nst, reseval, jaceval, nni, ncf, netf, nge
-c
-      data nst/3/, reseval/4/, jaceval/17/, nni/7/, netf/5/,
-     &     ncf/6/, nge/12/
-c
-      write(6,70) iout(nst), iout(reseval), iout(jaceval),
-     &             iout(nni), iout(netf), iout(ncf), iout(nge)
- 70   format(/'Final Run Statistics:', //,
-     &         'Number of steps                    = ', i3, /,
-     &         'Number of residual evaluations     = ', i3, /,
-     &         'Number of Jacobian evaluations     = ', i3, /,
-     &         'Number of nonlinear iterations     = ', i3, /,
-     &         'Number of error test failures      = ', i3, /,
-     &         'Number of nonlinear conv. failures = ', i3, /,
-     &         'Number of root function evals.     = ', i3)
-c
-      return
-      end
diff --git a/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.out b/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.out
deleted file mode 100644
index 7809e8ac6a..0000000000
--- a/examples/ida/fcmix_pthreads/fidaRoberts_dns_pthreads.out
+++ /dev/null
@@ -1,34 +0,0 @@
-
-fidaRoberts_dns: Robertson kinetics DAE serial exampleproblem for IDA
-          Three equation chemicalkinetics problem.
-
-Tolerance parameters:  rtol = 0.10E-03   atol =  0.10E-05 0.10E-09 0.10E-05
-Initial conditions y0 = ( 0.10E+01 0.00E+00 0.00E+00)
-
-  t            y1           y2           y3        nst  k    h
-0.2640E+00   0.9900E+00   0.3471E-04   0.1000E-01   75  2  0.5716E-01
-     Above is a root, INFO() =   0  1
-0.4000E+00   0.9852E+00   0.3386E-04   0.1480E-01   77  3  0.1143E+00
-0.4000E+01   0.9055E+00   0.2240E-04   0.9447E-01   91  4  0.3704E+00
-0.4000E+02   0.7158E+00   0.9185E-05   0.2842E+00  127  4  0.2963E+01
-0.4000E+03   0.4505E+00   0.3223E-05   0.5495E+00  177  3  0.1241E+02
-0.4000E+04   0.1832E+00   0.8940E-06   0.8168E+00  228  3  0.2765E+03
-0.4000E+05   0.3899E-01   0.1622E-06   0.9610E+00  278  5  0.2614E+04
-0.4000E+06   0.4939E-02   0.1985E-07   0.9951E+00  324  5  0.2770E+05
-0.4000E+07   0.5176E-03   0.2072E-08   0.9995E+00  355  4  0.3979E+06
-0.2075E+08   0.1000E-03   0.4000E-09   0.9999E+00  374  4  0.1592E+07
-     Above is a root, INFO() =  -1  0
-0.4000E+08   0.5191E-04   0.2076E-09   0.9999E+00  380  3  0.6366E+07
-0.4000E+09   0.5882E-05   0.2353E-10   0.1000E+01  394  1  0.9167E+08
-0.4000E+10   0.7054E-06   0.2822E-11   0.1000E+01  402  1  0.1467E+10
-0.4000E+11  -0.7300E-06  -0.2920E-11   0.1000E+01  407  1  0.2347E+11
-
-Final Run Statistics:
-
-Number of steps                    = 407
-Number of residual evaluations     = 557
-Number of Jacobian evaluations     =  65
-Number of nonlinear iterations     = 557
-Number of error test failures      =   6
-Number of nonlinear conv. failures =   0
-Number of root function evals.     = 445
diff --git a/examples/ida/fcmix_serial/CMakeLists.txt b/examples/ida/fcmix_serial/CMakeLists.txt
deleted file mode 100644
index 812d0686ec..0000000000
--- a/examples/ida/fcmix_serial/CMakeLists.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FIDA serial examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FIDA_examples
-  "fidaRoberts_dns\;develop"
-  )
-
-# Specify libraries to link against
-set(FNVECS_LIB sundials_fnvecserial)
-
-# Only static FCMIX libraries are available
-set(FIDA_LIB sundials_fida${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FIDA_LIB} ${FNVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FIDA_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial)
-  endif()
-
-endforeach(example_tuple ${FIDA_examples})
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "IDA")
-  set(SOLVER_LIB "sundials_ida")
-  set(SOLVER_FLIB "sundials_fida")
-
-  examples2string(FIDA_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_serial_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/ida/fcmix_serial/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_serial/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_serial_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/ida/fcmix_serial/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/ida/fcmix_serial/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/ida/fcmix_serial
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(ida fcmix_serial)
-
-endif()
diff --git a/examples/ida/fcmix_serial/README b/examples/ida/fcmix_serial/README
deleted file mode 100644
index 9f8719e398..0000000000
--- a/examples/ida/fcmix_serial/README
+++ /dev/null
@@ -1,46 +0,0 @@
-List of serial IDA FCMIX examples
-
-  fidaRoberts_dns : chemical kinetics example (DENSE)
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/ida/fcmix_serial/fidaRoberts_dns.f b/examples/ida/fcmix_serial/fidaRoberts_dns.f
deleted file mode 100644
index be6b1f672c..0000000000
--- a/examples/ida/fcmix_serial/fidaRoberts_dns.f
+++ /dev/null
@@ -1,303 +0,0 @@
-C     ----------------------------------------------------------------
-C     Programmer(s): Daniel R. Reynolds @ SMU
-C                    Alan C. Hindmarsh and Radu Serban @ LLNL      
-C     ----------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     ----------------------------------------------------------------
-c     This simple example problem for FIDA, due to Robertson, is from 
-c     chemical kinetics, and consists of the following three equations:
-c
-c          dy1/dt = -.04*y1 + 1.e4*y2*y3
-c          dy2/dt =  .04*y1 - 1.e4*y2*y3 - 3.e7*y2**2
-c             0   = y1 + y2 + y3 - 1
-c
-c     on the interval from t = 0.0 to t = 4.e10, with initial
-c     conditions: y1 = 1, y2 = y3 = 0.
-c
-c     While integrating the system, we also employ the rootfinding feature
-c     to find the points at which y1 = 1.e-4 or at which y3 = 0.01.
-c
-c     The problem is solved using a dense linear solver, with a
-c     user-supplied Jacobian. Output is printed at
-c     t = .4, 4, 40, ..., 4e10.
-c     ----------------------------------------------------------------
-c
-      program fidaRoberts_dns
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, iout(25), ipar
-      integer ier, ierroot, info(2)
-      double precision rout(10), rpar
-      integer iatol, nout, jout, itask
-      integer nst, kused, hused, i
-      double precision t0, t1, rtol, tout, tret
-      double precision y(3), yp(3), atol(3)
-c
-      data nst/3/, kused/9/, hused/2/
-c
-c Initialize variables
-c
-      neq = 3
-      nout = 12
-      rtol = 1.0d-4
-      t0 = 0.0d0
-      t1 = 0.4d0
-      iatol = 2
-      itask = 1
-c
-      y(1) = 1.0d0
-      y(2) = 0.0d0
-      y(3) = 0.0d0
-c
-      yp(1) = -0.04d0
-      yp(2) = 0.04d0
-      yp(3) = 0.0d0
-c
-      atol(1) = 1.0d-6
-      atol(2) = 1.0d-10
-      atol(3) = 1.0d-6
-c
-c Initialize IDA vector environment
-c
-      call fnvinits(2, neq, ier)
-      if (ier .ne. 0) then
-         write(6,10) ier
- 10      format(///' SUNDIALS_ERROR: FNVINITS returned IER = ', i5)
-         stop
-      endif
-c
-      call fidamalloc(t0, y, yp, iatol, rtol, atol, 
-     &                iout, rout, ipar, rpar, ier)
-      if (ier .ne. 0) then
-         write(6,20) ier
- 20      format(///' SUNDIALS_ERROR: FIDAMALLOC returned IER = ', i5)
-         stop
-      endif
-c
-c Initialize rootfinding problem
-
-      call fidarootinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,25) ier
- 25      format(///' SUNDIALS_ERROR: FIDAROOTINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Attach dense matrix and linear solver
-c
-      call fsundensematinit(2, neq, neq, ier)
-      if (ier .ne. 0) then
-         write(6,30) ier
- 30      format(///' SUNDIALS_ERROR: FSUNDENSEMATINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fsundenselinsolinit(2, ier)
-      if (ier .ne. 0) then
-         write(6,33) ier
- 33      format(///' SUNDIALS_ERROR: FSUNDENSELINSOLINIT IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidalsinit(ier)
-      if (ier .ne. 0) then
-         write(6,35) ier
- 35      format(///' SUNDIALS_ERROR: FIDALSINIT returned IER = ', i5)
-         call fidafree
-         stop
-      endif
-      call fidadensesetjac(1, ier)
-      if (ier .ne. 0) then
-         write(6,37) ier
- 37      format(///' SUNDIALS_ERROR: FIDADENSESETJAC IER = ', i5)
-         call fidafree
-         stop
-      endif
-c
-c Print header
-c
-      call prntintro(rtol, atol, y)
-c
-      tout = t1
-c
-c
-      jout = 1
-      do while(jout .le. nout)
-c
-        call fidasolve(tout, tret, y, yp, itask, ier)
-c
-        write(6,40) tret, (y(i), i = 1,3), iout(nst), iout(kused),
-     &              rout(hused)
- 40     format(e10.4, 3(1x,e12.4), i5, i3, e12.4)
-c
-        if (ier .lt. 0) then
-           write(6,50) ier, iout(15)
- 50        format(///' SUNDIALS_ERROR: FIDASOLVE returned IER = ',i5,/,
-     1            '                 Linear Solver returned IER = ',i5)
-           call fidarootfree
-           call fidafree
-           stop
-        endif
-c
-        if (ier .eq. 2) then
-          call fidarootinfo(2, info, ierroot)
-          if (ierroot .lt. 0) then
-            write(6,55) ierroot
- 55         format(///' SUNDIALS_ERROR: FIDAROOTINFO returned IER = ',
-     1             i5)
-            call fidarootfree
-            call fidafree
-            stop
-          endif
-          write(6,60) (info(i), i = 1,2)
- 60       format(5x, 'Above is a root, INFO() = ', 2i3)
-        endif                   
-c
-        if (ier .eq. 0) then
-           tout = tout * 10.0d0
-           jout = jout + 1
-        endif
-c
-      ENDDO
-c
-c Print final statistics
-c
-      call prntstats(iout)
-c
-c Free IDA memory
-c
-      call fidarootfree
-      call fidafree
-c
-      stop
-      end
-c
-c ==========
-c
-      subroutine fidaresfun(tres, y, yp, res, ipar, rpar, reserr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer reserr
-      double precision tres, rpar(*)
-      double precision y(*), yp(*), res(*)
-c
-      res(1) = -0.04d0*y(1)+1.0d4*y(2)*y(3)
-      res(2) = -res(1)-3.0d7*y(2)*y(2)-yp(2)
-      res(1) = res(1)-yp(1)
-      res(3) = y(1)+y(2)+y(3)-1.0d0
-c
-      reserr = 0
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine fidadjac(neq, t, y, yp, r, jac, cj, ewt, h,
-     1                    ipar, rpar, wk1, wk2, wk3, djacerr)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 neq, ipar(*)
-      integer djacerr
-      double precision t, h, cj, rpar(*)
-      double precision y(*), yp(*), r(*), ewt(*), jac(neq,neq)
-      double precision wk1(*), wk2(*), wk3(*)
-c
-      jac(1,1) = -0.04d0-cj
-      jac(2,1) = 0.04d0
-      jac(3,1) = 1.0d0
-      jac(1,2) = 1.0d4*y(3)
-      jac(2,2) = -1.0d4*y(3)-6.0d7*y(2)-cj
-      jac(3,2) = 1.0d0
-      jac(1,3) = 1.0d4*y(2)
-      jac(2,3) = -1.0d4*y(2)
-      jac(3,3) = 1.0d0
-c
-      djacerr = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine fidarootfn(t, y, yp, g, ipar, rpar, ier)
-c Fortran routine for rootfinding
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 ipar(*)
-      integer ier
-      double precision t, y(*), yp(*), g(*), rpar(*)
-c
-      g(1) = y(1) - 1.0d-4
-      g(2) = y(3) - 1.0d-2
-
-      ier = 0
-
-      return
-      end
-c
-c ==========
-c
-      subroutine prntintro(rtol, atol, y)
-c
-      implicit none
-c
-      integer i
-      double precision rtol, atol(*), y(*)
-c
-      write(6,60) rtol, (atol(i), i = 1,3), (y(i), i = 1,3)
- 60   format(/'fidaRoberts_dns: Robertson kinetics DAE serial example',
-     &       'problem for IDA', /,'          Three equation chemical',
-     &       'kinetics problem.', //,
-     &       'Tolerance parameters:  rtol = ', e8.2,
-     &       '   atol = ', 3(1x,e8.2), /,
-     &       'Initial conditions y0 = (', 3(1x,e8.2), ')', //,
-     &       '  t            y1           y2           y3        nst',
-     &       '  k    h')
-c
-      return
-      end
-c
-c ==========
-c
-      subroutine prntstats(iout)
-c
-      implicit none
-c
-c The following declaration specification should match C type long int.
-      integer*8 iout(25)
-      integer nst, reseval, jaceval, nni, ncf, netf, nge
-c
-      data nst/3/, reseval/4/, jaceval/17/, nni/7/, netf/5/,
-     &     ncf/6/, nge/12/
-c
-      write(6,70) iout(nst), iout(reseval), iout(jaceval),
-     &             iout(nni), iout(netf), iout(ncf), iout(nge)
- 70   format(/'Final Run Statistics:', //,
-     &         'Number of steps                    = ', i3, /,
-     &         'Number of residual evaluations     = ', i3, /,
-     &         'Number of Jacobian evaluations     = ', i3, /,
-     &         'Number of nonlinear iterations     = ', i3, /,
-     &         'Number of error test failures      = ', i3, /,
-     &         'Number of nonlinear conv. failures = ', i3, /,
-     &         'Number of root function evals.     = ', i3)
-c
-      return
-      end
diff --git a/examples/ida/fcmix_serial/fidaRoberts_dns.out b/examples/ida/fcmix_serial/fidaRoberts_dns.out
deleted file mode 100644
index 549e24f9d8..0000000000
--- a/examples/ida/fcmix_serial/fidaRoberts_dns.out
+++ /dev/null
@@ -1,34 +0,0 @@
-
-fidaRoberts_dns: Robertson kinetics DAE serial exampleproblem for IDA
-          Three equation chemicalkinetics problem.
-
-Tolerance parameters:  rtol = 0.10E-03   atol =  0.10E-05 0.10E-09 0.10E-05
-Initial conditions y0 = ( 0.10E+01 0.00E+00 0.00E+00)
-
-  t            y1           y2           y3        nst  k    h
-0.2640E+00   0.9900E+00   0.3471E-04   0.1000E-01   75  2  0.5716E-01
-     Above is a root, INFO() =   0  1
-0.4000E+00   0.9852E+00   0.3386E-04   0.1480E-01   77  3  0.1143E+00
-0.4000E+01   0.9055E+00   0.2240E-04   0.9447E-01   91  4  0.3704E+00
-0.4000E+02   0.7158E+00   0.9185E-05   0.2842E+00  127  4  0.2963E+01
-0.4000E+03   0.4505E+00   0.3223E-05   0.5495E+00  177  3  0.1241E+02
-0.4000E+04   0.1832E+00   0.8940E-06   0.8168E+00  228  3  0.2765E+03
-0.4000E+05   0.3899E-01   0.1622E-06   0.9610E+00  278  5  0.2614E+04
-0.4000E+06   0.4939E-02   0.1985E-07   0.9951E+00  324  5  0.2770E+05
-0.4000E+07   0.5176E-03   0.2072E-08   0.9995E+00  355  4  0.3979E+06
-0.2075E+08   0.1000E-03   0.4000E-09   0.9999E+00  374  4  0.1592E+07
-     Above is a root, INFO() =  -1  0
-0.4000E+08   0.5191E-04   0.2076E-09   0.9999E+00  380  3  0.6366E+07
-0.4000E+09   0.5882E-05   0.2353E-10   0.1000E+01  394  1  0.9167E+08
-0.4000E+10   0.7054E-06   0.2822E-11   0.1000E+01  402  1  0.1467E+10
-0.4000E+11  -0.7300E-06  -0.2920E-11   0.1000E+01  407  1  0.2347E+11
-
-Final Run Statistics:
-
-Number of steps                    = 407
-Number of residual evaluations     = 557
-Number of Jacobian evaluations     =  65
-Number of nonlinear iterations     = 557
-Number of error test failures      =   6
-Number of nonlinear conv. failures =   0
-Number of root function evals.     = 437
diff --git a/examples/kinsol/fcmix_parallel/CMakeLists.txt b/examples/kinsol/fcmix_parallel/CMakeLists.txt
deleted file mode 100644
index 988bc4bc2d..0000000000
--- a/examples/kinsol/fcmix_parallel/CMakeLists.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FKINSOL parallel examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;nodes\;tasks\;type" where the
-# type is develop for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FKINSOL_examples
-  "fkinDiagon_kry_p\;1\;4\;develop"
-  )
-
-if(MPI_Fortran_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_Fortran_COMPILER ${MPI_Fortran_COMPILER})
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-# Specify libraries to link against
-set(FNVECP_LIB sundials_fnvecparallel)
-
-# Only static FCMIX libraries are available
-set(FKINSOL_LIB sundials_fkinsol${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FKINSOL_LIB} ${FNVECP_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FKINSOL_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 number_of_nodes)
-  list(GET example_tuple 2 number_of_tasks)
-  list(GET example_tuple 3 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    MPI_NPROCS ${number_of_tasks}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-  if(NOT MPI_Fortran_COMPILER)
-    target_link_libraries(${example} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-  endif()
-
-  # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_parallel)
-  endif()
-
-endforeach(example_tuple ${FKINSOL_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_parallel)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "KINSOL")
-  set(SOLVER_LIB "sundials_kinsol")
-  set(SOLVER_FLIB "sundials_fkinsol")
-
-  examples2string(FKINSOL_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_parallel_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_parallel/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_parallel/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_parallel
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_parallel_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_parallel/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_parallel/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_parallel
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(kinsol fcmix_parallel)
-
-endif()
diff --git a/examples/kinsol/fcmix_parallel/README b/examples/kinsol/fcmix_parallel/README
deleted file mode 100644
index 5ca04cc4f1..0000000000
--- a/examples/kinsol/fcmix_parallel/README
+++ /dev/null
@@ -1,46 +0,0 @@
-List of parallel KINSOL FCMIX examples
-
-  fkinDiagon_kry_p: simple diagonal test with Fortran interface
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f b/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f
deleted file mode 100644
index 1a9ac5f708..0000000000
--- a/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.f
+++ /dev/null
@@ -1,344 +0,0 @@
-      program fkinDiagon_kry_p
-c     --------------------------------------------------------------------
-c     Programmer(s): Allan G. Taylor, Alan C. Hindmarsh and
-c                    Radu Serban @ LLNL
-c     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     --------------------------------------------------------------------
-c     Simple diagonal test with Fortran interface, using user-supplied
-c     preconditioner setup and solve routines (supplied in Fortran).
-c
-c     This example does a basic test of the solver by solving the
-c     system:
-c               f(u) = 0  for
-c               f(u) = u(i)^2 - i^2
-c
-c     No scaling is done.
-c     An approximate diagonal preconditioner is used.
-c
-c      Execution command: mpirun -np 4 fkinDiagon_kry_p
-c     --------------------------------------------------------------------
-c
-      implicit none
-
-      include "mpif.h"
-
-      integer localsize
-      parameter(localsize=32)
-      integer baseadd, i, ii
-      integer size, rank, mype, npes
-c The following declaration specification should match C type long int.
-      integer*8 neq, nlocal, iout(16), msbpre
-      integer ier, globalstrat, prectype, maxl, maxlrst
-      double precision pp, fnormtol, scsteptol
-      double precision rout(2), uu(localsize), scale(localsize)
-      double precision constr(localsize)
-
-      common /pcom/ pp(localsize), nlocal, mype, npes, baseadd
-
-      nlocal = localsize
-      neq = 4 * nlocal
-      globalstrat = 0
-      fnormtol = 1.0d-5
-      scsteptol = 1.0d-4
-      prectype = 2
-      maxl = 10
-      maxlrst = 2
-      msbpre  = 5
-
-c     The user MUST call mpi_init, Fortran binding, for the fkinsol package
-c     to work. The communicator, MPI_COMM_WORLD, is the only one common 
-c     between the Fortran and C bindings. So in the following, the communicator
-c     MPI_COMM_WORLD is used in calls to mpi_comm_size and mpi_comm_rank
-c     to determine the total number of processors and the rank (0 ... size-1) 
-c     number of this process.
-      
-      call mpi_init(ier)
-      if (ier .ne. 0) then
-         write(6,1210) ier
- 1210    format('MPI_ERROR: MPI_INIT returned IER = ', i4)
-         stop
-      endif
-
-      call fnvinitp(mpi_comm_world, 3, nlocal, neq, ier)
-      if (ier .ne. 0) then
-         write(6,1220) ier
- 1220    format('SUNDIALS_ERROR: FNVINITP returned IER = ', i4)
-         call mpi_finalize(ier)
-         stop
-      endif
-      
-      call mpi_comm_size(mpi_comm_world, size, ier)
-      if (ier .ne. 0) then
-         write(6,1222) ier
- 1222    format('MPI_ERROR: MPI_COMM_SIZE returned IER = ', i4)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-      
-      if (size .ne. 4) then
-         write(6,1223)
- 1223    format('MPI_ERROR: must use 4 processes')
-         call mpi_finalize(ier)
-         stop
-      endif
-      npes = size
-
-      call mpi_comm_rank(mpi_comm_world, rank, ier)
-      if (ier .ne. 0) then
-         write(6,1224) ier
- 1224    format('MPI_ERROR: MPI_COMM_RANK returned IER = ', i4)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      mype = rank
-      baseadd = mype * nlocal
-
-      do 20 ii = 1, nlocal
-         i = ii + baseadd
-         uu(ii) = 2.0d0 * i
-         scale(ii) = 1.0d0
-         constr(ii) = 0.0d0
- 20   continue
-      
-      call fkincreate(ier)
-      if (ier .ne. 0) then
-         write(6,1230) ier
- 1230    format('SUNDIALS_ERROR: FKINCREATE returned IER = ', i4)
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      call fkinsetiin('MAX_SETUPS', msbpre, ier)
-      if (ier .ne. 0) then
-         write(6,1231) ier
- 1231    format('SUNDIALS_ERROR: FKINSETIIN returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      call fkinsetrin('FNORM_TOL', fnormtol, ier)
-      if (ier .ne. 0) then
-         write(6,1232) ier
- 1232    format('SUNDIALS_ERROR: FKINSETRIN returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      call fkinsetrin('SSTEP_TOL', scsteptol, ier)
-      if (ier .ne. 0) then
-         write(6,1232) ier
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      call fkinsetvin('CONSTR_VEC', constr, ier)
-      if (ier .ne. 0) then
-         write(6,1233) ier
- 1233    format('SUNDIALS_ERROR: FKINSETVIN returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Initialize KINSOL
-c
-      call fkininit(iout, rout, ier)
-      if (ier .ne. 0) then
-         write(6,1234) ier
- 1234    format('SUNDIALS_ERROR: FKININIT returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Initialize SPGMR linear solver module with right preconditioning
-c and maximum Krylov dimension maxl
-c
-      call fsunspgmrinit(3, prectype, maxl, ier)
-      if (ier .ne. 0) then
-         write(6,1235) ier
- 1235    format('SUNDIALS_ERROR: FSUNSPGMRLINSOLINIT returned IER = ',
-     1          i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Attach SPGMR linear solver module to KINSOL
-c
-      call fkinlsinit(ier)
-      if (ier .ne. 0) then
-         write(6,1236) ier
- 1236    format('SUNDIALS_ERROR: FKINLSINIT returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Set the maximum number of SPGMR restarts to maxlrst
-c
-      call fsunspgmrsetmaxrs(3, maxlrst, ier)
-      if (ier .ne. 0) then
-         write(6,1237) ier
- 1237    format('SUNDIALS_ERROR: FSUNSPGRM_SETMATRS returned IER = ',
-     1          i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-c
-c Set preconditioner routines
-c
-      call fkinlssetprec(1, ier)
-      if (ier .ne. 0) then
-         write(6,1238) ier
- 1238    format('SUNDIALS_ERROR: FKINLSSETPREC returned IER = ',
-     1          i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      if (mype .eq. 0) write(6,1240)
- 1240 format('Example program fkinDiagon_kry_p:'//
-     1       ' This FKINSOL example',
-     2       ' solves a 128 eqn diagonal algebraic system.'/
-     3       ' Its purpose is to demonstrate the use of the Fortran',
-     4       ' interface'/' in a parallel environment.')
-
-      call fkinsol(uu, globalstrat, scale, scale, ier)
-      if (ier .lt. 0) then
-         write(6,1242) ier, iout(9)
- 1242    format('SUNDIALS_ERROR: FKINSOL returned IER = ', i4, /,
-     1          '                Linear Solver returned IER = ', i4)
-         call fkinfree
-         call mpi_abort(mpi_comm_world, 1, ier)
-         stop
-      endif
-
-      if (mype .eq. 0) write(6,1245) ier
- 1245 format(/' FKINSOL return code is ', i4)
-
-      if (mype .eq. 0) write(6,1246)
- 1246 format(/' The resultant values of uu (process 0) are:'/)
-
-      do 30 i = 1, nlocal, 4
-         if(mype .eq. 0) write(6,1256) i + baseadd, uu(i), uu(i+1),
-     1                                 uu(i+2), uu(i+3)
- 1256    format(i4, 4(1x, f10.6))
- 30   continue
-
-      if (mype .eq. 0) write(6,1267) iout(3), iout(15), iout(4),
-     1                               iout(13), iout(14), iout(16)
- 1267 format(/'Final statistics:'//
-     1     '  nni = ', i3, ',  nli  = ', i3, /,
-     2     '  nfe = ', i3, ',  npe  = ', i3, /,
-     3     '  nps = ', i3, ',  ncfl = ', i3)
-
-      call fkinfree
-
-c     An explicit call to mpi_finalize (Fortran binding) is required by
-c     the constructs used in fkinsol.
-      call mpi_finalize(ier)
-
-      stop
-      end
-      
-
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The function defining the system f(u) = 0 must be defined by a Fortran
-c     function with the following name and form.
-      
-      subroutine fkfun(uu, fval, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 nlocal
-      integer mype, npes, baseadd
-      integer localsize
-      parameter(localsize=32)
-      double precision pp
-      double precision fval(*), uu(*)
-
-      common /pcom/ pp(localsize), nlocal, mype, npes, baseadd
-
-      do 10 i = 1, nlocal
- 10      fval(i) = uu(i) * uu(i) - (i + baseadd) * (i + baseadd)
-
-      ier = 0
-
-      return
-      end
-      
-      
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The routine kpreco is the preconditioner setup routine. It must have
-c     that specific name be used in order that the c code can find and link
-c     to it.  The argument list must also be as illustrated below:
-      
-      subroutine fkpset(udata, uscale, fdata, fscale, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 nlocal
-      integer mype, npes, baseadd
-      integer localsize
-      parameter(localsize=32)
-      double precision pp
-      double precision udata(*), uscale(*), fdata(*), fscale(*)
-
-      common /pcom/ pp(localsize), nlocal, mype, npes, baseadd
-
-      do 10 i = 1, nlocal
- 10      pp(i) = 0.5d0 / (udata(i) + 5.0d0)
-
-      ier = 0
-
-      return
-      end
-      
-      
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The routine kpsol is the preconditioner solve routine. It must have
-c     that specific name be used in order that the c code can find and link
-c     to it.  The argument list must also be as illustrated below:
-      
-      subroutine fkpsol(udata, uscale, fdata, fscale, vv, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 nlocal
-      integer mype, npes, baseadd
-      integer localsize
-      parameter(localsize=32)
-      double precision pp
-      double precision udata(*), uscale(*), fdata(*), fscale(*), vv(*)
-
-      common /pcom/ pp(localsize), nlocal, mype, npes, baseadd
-
-      do 10 i = 1, nlocal
- 10      vv(i) = vv(i) * pp(i)
-
-      ier = 0
-
-      return
-      end
diff --git a/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.out b/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.out
deleted file mode 100644
index 9a8f8ee542..0000000000
--- a/examples/kinsol/fcmix_parallel/fkinDiagon_kry_p.out
+++ /dev/null
@@ -1,24 +0,0 @@
-Example program fkinDiagon_kry_p:
-
- This FKINSOL example solves a 128 eqn diagonal algebraic system.
- Its purpose is to demonstrate the use of the Fortran interface
- in a parallel environment.
-
- FKINSOL return code is    0
-
- The resultant values of uu (process 0) are:
-
-   1   1.000000   2.000000   3.000000   4.000000
-   5   5.000000   6.000000   7.000000   8.000000
-   9   9.000000  10.000000  11.000000  12.000000
-  13  13.000000  14.000000  15.000000  16.000000
-  17  17.000000  18.000000  19.000000  20.000000
-  21  21.000000  22.000000  23.000000  24.000000
-  25  25.000000  26.000000  27.000000  28.000000
-  29  29.000000  30.000000  31.000000  32.000000
-
-Final statistics:
-
-  nni =   7,  nli  =  21
-  nfe =   8,  npe  =   2
-  nps =  28,  ncfl =   0
diff --git a/examples/kinsol/fcmix_serial/CMakeLists.txt b/examples/kinsol/fcmix_serial/CMakeLists.txt
deleted file mode 100644
index b8ed342084..0000000000
--- a/examples/kinsol/fcmix_serial/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-# ---------------------------------------------------------------
-# Programmer(s): Radu Serban @ LLNL
-# ---------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# ---------------------------------------------------------------
-# CMakeLists.txt file for the FKINSOL serial examples
-# ---------------------------------------------------------------
-
-# Example lists are tuples "name\;type" where the type is
-# 'develop' for examples excluded from 'make test' in releases
-
-# Examples using SUNDIALS linear solvers
-set(FKINSOL_examples
-  "fkinDiagon_kry\;develop"
-  )
-
-# Specify libraries to link against
-set(FNVECS_LIB sundials_fnvecserial)
-
-# Only static FCMIX libraries are available
-set(FKINSOL_LIB sundials_fkinsol${_STATIC_LIB_SUFFIX})
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${FKINSOL_LIB} ${FNVECS_LIB} ${EXE_EXTRA_LINK_LIBS})
-
-
-# Add the build and install targets for each example
-foreach(example_tuple ${FKINSOL_examples})
-
-  # parse the example tuple
-  list(GET example_tuple 0 example)
-  list(GET example_tuple 1 example_type)
-
-  # example source files
-  add_executable(${example} ${example}.f)
-
-  set_target_properties(${example} PROPERTIES FOLDER "Examples")
-
-  # add example to regression tests
-  sundials_add_test(${example} ${example}
-    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
-    ANSWER_FILE ${example}.out
-    EXAMPLE_TYPE ${example_type})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBS})
-
-   # install example source and out files
-  if(EXAMPLES_INSTALL)
-    install(FILES ${example}.f ${example}.out
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial)
-  endif()
-
-endforeach(example_tuple ${FKINSOL_examples})
-
-
-# create Makfile and CMakeLists.txt for examples
-if(EXAMPLES_INSTALL)
-
-  # Install the README file
-  install(FILES README DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial)
-
-  # Prepare substitution variables for Makefile and/or CMakeLists templates
-  set(SOLVER "KINSOL")
-  set(SOLVER_LIB "sundials_kinsol")
-  set(SOLVER_FLIB "sundials_fkinsol")
-
-  examples2string(FKINSOL_examples EXAMPLES)
-
-  # Regardless of the platform we're on, we will generate and install
-  # CMakeLists.txt file for building the examples. This file  can then
-  # be used as a template for the user's own programs.
-
-  # generate CMakelists.txt in the binary directory
-  configure_file(
-    ${PROJECT_SOURCE_DIR}/examples/templates/cmakelists_serial_F77_ex.in
-    ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_serial/CMakeLists.txt
-    @ONLY
-    )
-
-  # install CMakelists.txt
-  install(
-    FILES ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_serial/CMakeLists.txt
-    DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial
-    )
-
-  # On UNIX-type platforms, we also  generate and install a makefile for
-  # building the examples. This makefile can then be used as a template
-  # for the user's own programs.
-
-  if(UNIX)
-    # generate Makefile and place it in the binary dir
-    configure_file(
-      ${PROJECT_SOURCE_DIR}/examples/templates/makefile_serial_F77_ex.in
-      ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_serial/Makefile_ex
-      @ONLY
-      )
-    # install the configured Makefile_ex as Makefile
-    install(
-      FILES ${PROJECT_BINARY_DIR}/examples/kinsol/fcmix_serial/Makefile_ex
-      DESTINATION ${EXAMPLES_INSTALL_PATH}/kinsol/fcmix_serial
-      RENAME Makefile
-      )
-  endif()
-
-  # add test_install target
-  sundials_add_test_install(kinsol fcmix_serial)
-
-endif()
diff --git a/examples/kinsol/fcmix_serial/README b/examples/kinsol/fcmix_serial/README
deleted file mode 100644
index 7a780fb7d5..0000000000
--- a/examples/kinsol/fcmix_serial/README
+++ /dev/null
@@ -1,46 +0,0 @@
-List of serial KINSOL FCMIX examples
-
-  fkinDiagon_kry: simple diagonal test with Fortran interface
-
-
-The following CMake command was used to configure SUNDIALS:
-
- cmake \
--DCMAKE_BUILD_TYPE=DEBUG \
--DBUILD_ARKODE=ON \
--DBUILD_CVODE=ON \
--DBUILD_CVODES=ON \
--DBUILD_IDA=ON \
--DBUILD_IDAS=ON \
--DBUILD_KINSOL=ON \
--DCMAKE_INSTALL_PREFIX=/home/user1/sundials/build/install \
--DEXAMPLES_INSTALL_PATH=/home/user1/sundials/build/install/examples \
--DBUILD_SHARED_LIBS=OFF \
--DBUILD_STATIC_LIBS=ON \
--DEXAMPLES_ENABLE_C=ON \
--DEXAMPLES_ENABLE_CXX=ON \
--DEXAMPLES_INSTALL=ON \
--DENABLE_MPI=ON \
--DENABLE_LAPACK=ON \
--DENABLE_KLU=ON \
--DKLU_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/include \
--DKLU_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/suitesparse/4.5.3/lib \
--DENABLE_HYPRE=ON \
--DHYPRE_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/hypre/2.11.1/include \
--DHYPRE_LIBRARY=/usr/casc/sundials/apps/rh6/hypre/2.11.1/lib/libHYPRE.a \
--DENABLE_OPENMP=ON \
--DENABLE_PTHREAD=ON \
--DENABLE_SUPERLUMT=ON \
--DSUPERLUMT_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/SRC \
--DSUPERLUMT_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/superlu_mt/SuperLU_MT_3.1/lib \
--DSUPERLUMT_THREAD_TYPE=Pthread \
--DENABLE_PETSC=ON \
--DPETSC_INCLUDE_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/include \
--DPETSC_LIBRARY_DIR=/usr/casc/sundials/apps/rh6/petsc/3.7.2/lib \
-../sundials
-
-  System Architecture: x86_64
-  Processor Type: Intel(R) Xeon(R) CPU E31230 @ 3.20GHz
-  Operating System: Red Hat 6.8
-  C/Fortran Compilers: gcc/gfortran v4.4.7
-  MPI: Open MPI v1.8.8
diff --git a/examples/kinsol/fcmix_serial/fkinDiagon_kry.f b/examples/kinsol/fcmix_serial/fkinDiagon_kry.f
deleted file mode 100644
index ade4258753..0000000000
--- a/examples/kinsol/fcmix_serial/fkinDiagon_kry.f
+++ /dev/null
@@ -1,273 +0,0 @@
-      program fkinDiagon_kry
-c     --------------------------------------------------------------------
-c     Programmer(s): Allan G. Taylor, Alan C. Hindmarsh and
-c                    Radu Serban @ LLNL
-c     --------------------------------------------------------------------
-C     SUNDIALS Copyright Start
-C     Copyright (c) 2002-2023, Lawrence Livermore National Security
-C     and Southern Methodist University.
-C     All rights reserved.
-C
-C     See the top-level LICENSE and NOTICE files for details.
-C
-C     SPDX-License-Identifier: BSD-3-Clause
-C     SUNDIALS Copyright End
-c     --------------------------------------------------------------------
-c     Simple diagonal test with Fortran interface, using user-supplied
-c     preconditioner setup and solve routines (supplied in Fortran).
-c
-c     This example does a basic test of the solver by solving the
-c     system:
-c               f(u) = 0  for
-c               f(u) = u(i)^2 - i^2
-c
-c     No scaling is done.
-c     An approximate diagonal preconditioner is used.
-c
-c     --------------------------------------------------------------------
-c
-      implicit none
-
-      integer PROBSIZE
-      parameter(PROBSIZE=128)
-c The following declaration specification should match C type long int.
-      integer*8 neq, iout(16), msbpre
-      integer ier, globalstrat, prectype, maxl, maxlrst, i
-      double precision pp, fnormtol, scsteptol
-      double precision rout(2), uu(PROBSIZE), scale(PROBSIZE)
-      double precision constr(PROBSIZE)
-
-      common /pcom/ pp(PROBSIZE)
-      common /psize/ neq
-
-      neq = PROBSIZE
-      globalstrat = 0
-      fnormtol = 1.0d-5
-      scsteptol = 1.0d-4
-      prectype = 2
-      maxl = 10
-      maxlrst = 2
-      msbpre  = 5
-
-c * * * * * * * * * * * * * * * * * * * * * *
-
-      call fnvinits(3, neq, ier)
-      if (ier .ne. 0) then
-         write(6,1220) ier
- 1220    format('SUNDIALS_ERROR: FNVINITS returned IER = ', i4)
-         stop
-      endif
-
-      do 20 i = 1, neq
-         uu(i) = 2.0d0 * i
-         scale(i) = 1.0d0
-         constr(i) = 0.0d0
-  20  continue
-
-      call fkincreate(ier)
-      if (ier .ne. 0) then
-         write(6,1230) ier
- 1230    format('SUNDIALS_ERROR: FKINCREATE returned IER = ', i4)
-         stop
-      endif
-
-      call fkinsetiin('MAX_SETUPS', msbpre, ier)
-      if (ier .ne. 0) then
-         write(6,1231) ier
- 1231    format('SUNDIALS_ERROR: FKINSETIIN returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-
-      call fkinsetrin('FNORM_TOL', fnormtol, ier)
-      if (ier .ne. 0) then
-         write(6,1232) ier
- 1232    format('SUNDIALS_ERROR: FKINSETRIN returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-
-      call fkinsetrin('SSTEP_TOL', scsteptol, ier)
-      if (ier .ne. 0) then
-         write(6,1232) ier
-         call fkinfree
-         stop
-      endif
-
-      call fkinsetvin('CONSTR_VEC', constr, ier)
-      if (ier .ne. 0) then
-         write(6,1233) ier
- 1233    format('SUNDIALS_ERROR: FKINSETVIN returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-c
-c Initialize KINSOL
-c
-      call fkininit(iout, rout, ier)
-      if (ier .ne. 0) then
-         write(6,1234) ier
- 1234    format('SUNDIALS_ERROR: FKININIT returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-c
-c Initialize SPGMR linear solver module with right preconditioning
-c and maximum Krylov dimension maxl
-c
-      call fsunspgmrinit(3, prectype, maxl, ier)
-      if (ier .ne. 0) then
-         write(6,1235) ier
- 1235    format('SUNDIALS_ERROR: FSUNSPGMRLINSOLINIT returned IER = ',
-     1          i4)
-         call fkinfree
-         stop
-      endif
-c
-c Attach SPGMR linear solver module to KINSOL
-c
-      call fkinlsinit(ier)
-      if (ier .ne. 0) then
-         write(6,1236) ier
- 1236    format('SUNDIALS_ERROR: FKINLSINIT returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-c
-c Set the maximum number of SPGMR restarts to maxlrst
-c
-      call fsunspgmrsetmaxrs(3, maxlrst, ier)
-      if (ier .ne. 0) then
-         write(6,1237) ier
- 1237    format('SUNDIALS_ERROR: FSUNSPGRM_SETMATRS returned IER = ',
-     1          i4)
-         call fkinfree
-         stop
-      endif
-c
-c Set preconditioner routines
-c
-      call fkinlssetprec(1, ier)
-      if (ier .ne. 0) then
-         write(6,1238) ier
- 1238    format('SUNDIALS_ERROR: FKINLSSETPREC returned IER = ',
-     1          i4)
-         call fkinfree
-         stop
-      endif
-
-      write(6,1240)
- 1240 format('Example program fkinDiagon_kry:'//' This FKINSOL example',
-     1       ' solves a 128 eqn diagonal algebraic system.'/
-     2       ' Its purpose is to demonstrate the use of the Fortran',
-     3       ' interface'/' in a serial environment.'///
-     4       ' globalstrategy = KIN_NONE')
-
-      call fkinsol(uu, globalstrat, scale, scale, ier)
-      if (ier .lt. 0) then
-         write(6,1242) ier, iout(9)
- 1242    format('SUNDIALS_ERROR: FKINSOL returned IER = ', i4, /,
-     1          '                Linear Solver returned IER = ', i4)
-         call fkinfree
-         stop
-      endif
-
-      write(6,1245) ier
- 1245 format(/' FKINSOL return code is ', i4)
-
-      write(6,1246)
- 1246 format(//' The resultant values of uu are:'/)
-
-      do 30 i = 1, neq, 4
-         write(6,1256) i, uu(i), uu(i+1), uu(i+2), uu(i+3)
- 1256    format(i4, 4(1x, f10.6))
- 30   continue
-
-      write(6,1267) iout(3), iout(15), iout(4), iout(13), iout(14),
-     1              iout(16)
- 1267 format(//'Final statistics:'//
-     1     '  nni = ', i3, ',  nli  = ', i3, /,
-     2     '  nfe = ', i3, ',  npe  = ', i3, /,
-     3     '  nps = ', i3, ',  ncfl = ', i3)
-
-      call fkinfree
-
-      stop
-      end
-      
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The function defining the system f(u) = 0 must be defined by a Fortran
-c     function with the following name and form.
-      
-      subroutine fkfun(uu, fval, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 neq
-      double precision fval(*), uu(*)
-
-      common /psize/ neq
-
-      do 10 i = 1, neq
- 10      fval(i) = uu(i) * uu(i) - i * i
-
-      ier = 0
-
-      return
-      end
-      
-      
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The routine kpreco is the preconditioner setup routine. It must have
-c     that specific name be used in order that the c code can find and link
-c     to it.  The argument list must also be as illustrated below:
-      
-      subroutine fkpset(udata, uscale, fdata, fscale, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 neq
-      double precision pp
-      double precision udata(*), uscale(*), fdata(*), fscale(*)
-
-      common /pcom/ pp(128)
-      common /psize/ neq
-
-      do 10 i = 1, neq
- 10      pp(i) = 0.5d0 / (udata(i) + 5.0d0)
-
-      ier = 0
-
-      return
-      end
-      
-      
-c * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-c     The routine kpsol is the preconditioner solve routine. It must have
-c     that specific name be used in order that the c code can find and link
-c     to it.  The argument list must also be as illustrated below:
-      
-      subroutine fkpsol(udata, uscale, fdata, fscale, vv, ier)
-
-      implicit none
-
-      integer ier, i
-c The following declaration specification should match C type long int.
-      integer*8 neq
-      double precision pp
-      double precision udata(*), uscale(*), fdata(*), fscale(*), vv(*)
-
-      common /pcom/ pp(128)
-      common /psize/ neq
-
-      do 10 i = 1, neq
- 10      vv(i) = vv(i) * pp(i)
-
-      ier = 0
-
-      return
-      end
diff --git a/examples/kinsol/fcmix_serial/fkinDiagon_kry.out b/examples/kinsol/fcmix_serial/fkinDiagon_kry.out
deleted file mode 100644
index 27dd57d354..0000000000
--- a/examples/kinsol/fcmix_serial/fkinDiagon_kry.out
+++ /dev/null
@@ -1,53 +0,0 @@
-Example program fkinDiagon_kry:
-
- This FKINSOL example solves a 128 eqn diagonal algebraic system.
- Its purpose is to demonstrate the use of the Fortran interface
- in a serial environment.
-
-
- globalstrategy = KIN_NONE
-
- FKINSOL return code is   0
-
-
- The resultant values of uu are:
-
-   1   1.000000   2.000000   3.000000   4.000000
-   5   5.000000   6.000000   7.000000   8.000000
-   9   9.000000  10.000000  11.000000  12.000000
-  13  13.000000  14.000000  15.000000  16.000000
-  17  17.000000  18.000000  19.000000  20.000000
-  21  21.000000  22.000000  23.000000  24.000000
-  25  25.000000  26.000000  27.000000  28.000000
-  29  29.000000  30.000000  31.000000  32.000000
-  33  33.000000  34.000000  35.000000  36.000000
-  37  37.000000  38.000000  39.000000  40.000000
-  41  41.000000  42.000000  43.000000  44.000000
-  45  45.000000  46.000000  47.000000  48.000000
-  49  49.000000  50.000000  51.000000  52.000000
-  53  53.000000  54.000000  55.000000  56.000000
-  57  57.000000  58.000000  59.000000  60.000000
-  61  61.000000  62.000000  63.000000  64.000000
-  65  65.000000  66.000000  67.000000  68.000000
-  69  69.000000  70.000000  71.000000  72.000000
-  73  73.000000  74.000000  75.000000  76.000000
-  77  77.000000  78.000000  79.000000  80.000000
-  81  81.000000  82.000000  83.000000  84.000000
-  85  85.000000  86.000000  87.000000  88.000000
-  89  89.000000  90.000000  91.000000  92.000000
-  93  93.000000  94.000000  95.000000  96.000000
-  97  97.000000  98.000000  99.000000 100.000000
- 101 101.000000 102.000000 103.000000 104.000000
- 105 105.000000 106.000000 107.000000 108.000000
- 109 109.000000 110.000000 111.000000 112.000000
- 113 113.000000 114.000000 115.000000 116.000000
- 117 117.000000 118.000000 119.000000 120.000000
- 121 121.000000 122.000000 123.000000 124.000000
- 125 125.000000 126.000000 127.000000 128.000000
-
-
-Final statistics:
-
-  nni =   7,  nli  =  21
-  nfe =   8,  npe  =   2
-  nps =  28,  ncfl =   0
diff --git a/examples/templates/cmakelists_parallel_F90_ex.in b/examples/templates/cmakelists_parallel_F90_ex.in
deleted file mode 100644
index da650a7b5b..0000000000
--- a/examples/templates/cmakelists_parallel_F90_ex.in
+++ /dev/null
@@ -1,108 +0,0 @@
-# -----------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-# -----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# -----------------------------------------------------------------
-# CMakeLists.txt for @SOLVER@ Fortran MPI examples
-#
-# This file is generated from a template using variables
-# set at configuration time. It can be used as a template for
-# other user CMakeLists configuration files.
-# -----------------------------------------------------------------
-
-cmake_minimum_required(VERSION @CMAKE_VERSION@)
-
-# Set cache variables for compilers and flags
-set(CMAKE_Fortran_COMPILER
-  @MPI_Fortran_COMPILER@
-  CACHE FILEPATH "MPI Fortran compiler")
-
-set(CMAKE_Fortran_FLAGS
-  "@CMAKE_Fortran_FLAGS@"
-  CACHE STRING "Fortran compiler flags")
-
-# Specify project name and languages
-project(@SOLVER@_F90_parallel_examples Fortran)
-
-# Enable testing
-include(CTest)
-
-# ------------------------------------------------------------------------------
-
-# Specify the path to SUNDIALS header files
-set(SUNDIALS_INCLUDE_DIR
-  @CMAKE_INSTALL_PREFIX@/include
-  CACHE PATH "Location of SUNDIALS header files")
-
-# Specify the path to SUNDIALS libraries
-set(SUNDIALS_LIBRARY_DIR
-  @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-  CACHE PATH "Location of SUNDIALS libraries")
-
-# Find the SUNDIALS libraries
-find_library(SUNDIALS_SOLVER_LIB
-  @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
-  DOC "@SOLVER@ library")
-
-find_library(SUNDIALS_SOLVER_FLIB
-  @SOLVER_FLIB@ ${SUNDIALS_LIBRARY_DIR}
-  DOC "@SOLVER@ Fortran-C library")
-
-find_library(SUNDIALS_NVEC_LIB
-  sundials_nvecparallel ${SUNDIALS_LIBRARY_DIR}
-  DOC "NVECTOR_PARALLEL library")
-
-find_library(SUNDIALS_NVEC_FLIB
-  sundials_fnvecparallel ${SUNDIALS_LIBRARY_DIR}
-  DOC "NVECTOR Fortran-C library")
-
-# Set additional libraries
-set(SUNDIALS_EXTRA_LIBS @LIBS@ CACHE STRING "Additional libraries")
-
-# For SUNDIALS module examples the solver library is not needed
-if(NOT SUNDIALS_SOLVER_LIB)
-  set(SUNDIALS_SOLVER_LIB "")
-endif()
-
-# List of SUNDIALS libraries
-set(SUNDIALS_LIBRARIES
-  -L${SUNDIALS_LIBRARY_DIR}
-  ${SUNDIALS_SOLVER_FLIB}
-  ${SUNDIALS_SOLVER_LIB}
-  ${SUNDIALS_NVEC_FLIB}
-  ${SUNDIALS_NVEC_LIB}
-  ${SUNDIALS_EXTRA_LIBS})
-
-# ------------------------------------------------------------------------------
-
-# Set the names of the examples to be built and their dependencies
-set(examples @EXAMPLES@)
-set(examples_dependencies @EXAMPLES_DEPENDENCIES@)
-if(examples)
-  list(REMOVE_DUPLICATES examples)
-endif()
-
-# Create targets for each example
-foreach(example ${examples})
-
-  # example source files
-  add_executable(${example} ${example}.f90 ${examples_dependencies})
-
-  # directories to include
-  target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
-
-  # add the example to ctest
-  add_test(NAME ${example} COMMAND ${example})
-
-endforeach()
diff --git a/examples/templates/cmakelists_serial_F90_ex.in b/examples/templates/cmakelists_serial_F90_ex.in
deleted file mode 100644
index c08f0aef2b..0000000000
--- a/examples/templates/cmakelists_serial_F90_ex.in
+++ /dev/null
@@ -1,288 +0,0 @@
-# -----------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-#                David J. Gardner @ LLNL
-# -----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# -----------------------------------------------------------------
-# CMakeLists.txt for @SOLVER@ Fortran 90 serial examples.
-#
-# This file is generated from a template using variables
-# set at configuration time. It can be used as a template for
-# other user CMakeLists configuration files.
-# -----------------------------------------------------------------
-
-cmake_minimum_required(VERSION @CMAKE_VERSION@)
-
-# Set cache variables for compilers and flags
-set(CMAKE_Fortran_COMPILER
-  @_EXAMPLES_Fortran_COMPILER@
-  CACHE FILEPATH "Fortran compiler")
-
-set(CMAKE_Fortran_FLAGS
-  "@CMAKE_Fortran_FLAGS@"
-  CACHE STRING "Fortran compiler flags")
-
-# Specify project name and languages
-project(@SOLVER@_F90_serial_examples Fortran)
-
-# Enable testing
-include(CTest)
-
-# ------------------------------------------------------------------------------
-
-# Specify the path to SUNDIALS header files
-set(SUNDIALS_INCLUDE_DIR
-  @CMAKE_INSTALL_PREFIX@/include
-  CACHE PATH "Location of SUNDIALS header files")
-
-# Specify the path to SUNDIALS libraries
-set(SUNDIALS_LIBRARY_DIR
-  @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@
-  CACHE PATH "Location of SUNDIALS libraries")
-
-# Find the SUNDIALS libraries
-find_library(SUNDIALS_SOLVER_LIB
-  @SOLVER_LIB@ ${SUNDIALS_LIBRARY_DIR}
-  DOC "@SOLVER@ library")
-
-find_library(SUNDIALS_SOLVER_FLIB
-  @SOLVER_FLIB@ ${SUNDIALS_LIBRARY_DIR}
-  DOC "@SOLVER@ Fortran-C library")
-
-find_library(SUNDIALS_NVEC_LIB
-  sundials_nvecserial ${SUNDIALS_LIBRARY_DIR}
-  DOC "NVECTOR_SERIAL library")
-
-find_library(SUNDIALS_NVEC_FLIB
-  sundials_fnvecserial ${SUNDIALS_LIBRARY_DIR}
-  DOC "NVECTOR_SERIAL Fortran-C library")
-
-# Set additional libraries
-set(SUNDIALS_EXTRA_LIBS @LIBS@ CACHE STRING "Additional libraries")
-
-# For SUNDIALS module examples the solver library is not needed
-if(NOT SUNDIALS_SOLVER_LIB)
-  set(SUNDIALS_SOLVER_LIB "")
-endif()
-
-# List of SUNDIALS libraries
-set(SUNDIALS_LIBRARIES
-  -L${SUNDIALS_LIBRARY_DIR}
-  ${SUNDIALS_SOLVER_FLIB}
-  ${SUNDIALS_SOLVER_LIB}
-  ${SUNDIALS_NVEC_FLIB}
-  ${SUNDIALS_NVEC_LIB}
-  ${SUNDIALS_EXTRA_LIBS})
-
-# ------------------------------------------------------------------------------
-
-# Set the names of the examples to be built and their dependencies
-set(examples @EXAMPLES@)
-set(examples_dependencies @EXAMPLES_DEPENDENCIES@)
-if(examples)
-  list(REMOVE_DUPLICATES examples)
-endif()
-
-# Create targets for each example
-foreach(example ${examples})
-
-  # example source files
-  add_executable(${example} ${example}.f90 ${examples_dependencies})
-
-  # directories to include
-  target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
-
-  # libraries to link against
-  target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
-
-  # add the example to ctest
-  add_test(NAME ${example} COMMAND ${example})
-
-endforeach()
-
-# ------------------------------------------------------------------------------
-
-# Set LAPACK libraries
-set(LAPACK_LIBRARIES
-  @LAPACK_LIBS@
-  CACHE STRING "Lapack libraries")
-
-# Set the names of the examples to be built and their dependencies
-set(examples_bl @EXAMPLES_BL@)
-set(examples_dependencies_bl @EXAMPLES_DEPENDENCIES_BL@)
-if(examples_bl)
-  list(REMOVE_DUPLICATES examples_bl)
-endif()
-
-if(LAPACK_LIBRARIES AND examples_bl)
-
-  # Find the SUNDIALS linear solver libraries
-  find_library(SUNDIALS_SUNLINSOLLAPACKBAND_LIB
-    sundials_sunlinsollapackband ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS banded LAPACK linear solver library")
-
-  find_library(SUNDIALS_SUNLINSOLLAPACKBAND_FLIB
-    sundials_fsunlinsollapackband ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS banded LAPACK linear solver Fortran-C library")
-
-  find_library(SUNDIALS_SUNLINSOLLAPACKDENSE_LIB
-    sundials_sunlinsollapackdense ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS dense LAPACK linear solver library")
-
-  find_library(SUNDIALS_SUNLINSOLLAPACKDENSE_FLIB
-    sundials_fsunlinsollapackdense ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS dense LAPACK linear solver Fortran-C library")
-
-  # Create targets for each example
-  foreach(example ${examples_bl})
-
-    # example source files
-    add_executable(${example} ${example}.f90 ${examples_dependencies_bl})
-
-    # directories to include
-    target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLLAPACKBAND_FLIB})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLLAPACKDENSE_FLIB})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLLAPACKBAND_LIB})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLLAPACKDENSE_LIB})
-    target_link_libraries(${example} ${LAPACK_LIBRARIES})
-
-    # add the example to ctest
-    add_test(NAME ${example} COMMAND ${example})
-
-  endforeach()
-
-endif()
-
-# ------------------------------------------------------------------------------
-
-# KLU include directory and libraries
-set(KLU_INCLUDE_DIR
-  @KLU_INCLUDE_DIR@
-  CACHE PATH "Location of KLU header files")
-
-set(KLU_LIBRARIES
-  @KLU_LIBRARIES@
-  CACHE STRING "KLU libraries")
-
-# Set the names of the examples to be built and their dependencies
-set(examples_klu @EXAMPLES_KLU@)
-set(examples_dependencies_klu @EXAMPLES_DEPENDENCIES_KLU@)
-if(examples_klu)
-  list(REMOVE_DUPLICATES examples_klu)
-endif()
-
-if(KLU_LIBRARIES AND examples_klu)
-
-  # Find the SUNDIALS linear solver libraries
-  find_library(SUNDIALS_SUNLINSOLKLU_LIB
-    sundials_sunlinsolklu ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS KLU linear solver library")
-
-  find_library(SUNDIALS_SUNLINSOLKLU_FLIB
-    sundials_fsunlinsolklu ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS KLU linear solver Fortran-C library")
-
-  # Create targets for each example
-  foreach(example ${examples_klu})
-
-    # example source files
-    add_executable(${example} ${example}.f90 ${examples_dependencies_klu})
-
-    # directories to include
-    target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
-    target_include_directories(${example} PRIVATE ${KLU_INCLUDE_DIR})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLKLU_FLIB})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLKLU_LIB})
-    target_link_libraries(${example} ${KLU_LIBRARIES})
-
-    # add the example to ctest
-    add_test(NAME ${example} COMMAND ${example})
-
-  endforeach()
-
-endif()
-
-# ------------------------------------------------------------------------------
-
-# SuperLU_MT include directory, libraries, and threading type
-set(SUPERLUMT_INCLUDE_DIR
-  @SUPERLUMT_INCLUDE_DIR@
-  CACHE PATH "Location of SuperLU_MT KLU header files")
-
-set(SUPERLUMT_LIBRARIES
-  @SUPERLUMT_LIBRARY@ @SUPERLUMT_LIBRARIES@
-  CACHE STRING "SuperLU_MT libraries")
-
-set(SUPERLUMT_THREAD_TYPE
-  @SUPERLUMT_THREAD_TYPE@
-  CACHE STRING "SuperLU_MT Threading")
-
-# Set the names of the examples to be built and their dependencies
-set(examples_slumt @EXAMPLES_SLUMT@)
-set(examples_dependencies_slumt @EXAMPLES_DEPENDENCIES_SLUMT@)
-if(examples_slumt)
-  list(REMOVE_DUPLICATES examples_slumt)
-endif()
-
-if(SUPERLUMT_LIBRARIES AND examples_slumt)
-
-  # Find the SUNDIALS linear solver libraries
-  find_library(SUNDIALS_SUNLINSOLSLUMT_LIB
-    sundials_sunlinsolsuperlumt ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS SuperLU_MT linear solver library")
-
-  find_library(SUNDIALS_SUNLINSOLSLUMT_FLIB
-    sundials_fsunlinsolsuperlumt ${SUNDIALS_LIBRARY_DIR}
-    DOC "SUNDIALS SuperLU_MT linear solver Fortran-C library")
-
-  if(SUPERLUMT_THREAD_TYPE STREQUAL "OPENMP")
-    find_package(OpenMP REQUIRED)
-    # Update C compiler and linker flags
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_C_FLAGS}")
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} ${OpenMP_Fortran_FLAGS}")
-  else(SUPERLUMT_THREAD_TYPE STREQUAL "PTHREAD")
-    find_package(Threads REQUIRED)
-  endif()
-
-  # Create targets for each example
-  foreach(example ${examples_slumt})
-
-    # example source files
-    add_executable(${example} ${example}.f90 ${examples_dependencies_slumt})
-
-    # directories to include
-    target_include_directories(${example} PRIVATE ${SUNDIALS_INCLUDE_DIR})
-    target_include_directories(${example} PRIVATE ${SUPERLUMT_INCLUDE_DIR})
-
-    # libraries to link against
-    target_link_libraries(${example} ${SUNDIALS_LIBRARIES})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLSLUMT_FLIB})
-    target_link_libraries(${example} ${SUNDIALS_SUNLINSOLSLUMT_LIB})
-    target_link_libraries(${example} ${SUPERLUMT_LIBRARIES})
-
-    if(SUPERLUMT_THREAD_TYPE STREQUAL "PTHREAD")
-      target_link_libraries(${example} Threads::Threads)
-    endif()
-
-    # add the example to ctest
-    add_test(NAME ${example} COMMAND ${example})
-
-  endforeach()
-
-endif()
diff --git a/examples/templates/makefile_serial_F90_ex.in b/examples/templates/makefile_serial_F90_ex.in
deleted file mode 100644
index affcdd4e13..0000000000
--- a/examples/templates/makefile_serial_F90_ex.in
+++ /dev/null
@@ -1,110 +0,0 @@
-# -*- mode: makefile -*-
-# -----------------------------------------------------------------
-# Programmer(s): Daniel R. Reynolds @ SMU
-#                David J. Gardner @ LLNL
-# -----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# -----------------------------------------------------------------
-# Makefile for @SOLVER@ Fortran90 serial examples
-#
-# This file is generated from a template using variables
-# set at configuration time. It can be used as a template for
-# other user Makefiles.
-# -----------------------------------------------------------------
-
-SHELL = @SHELL@
-
-prefix       = @prefix@
-exec_prefix  = @exec_prefix@
-includedir   = @includedir@
-libdir       = @libdir@
-
-F90         = @F90@
-F90FLAGS    = @F90FLAGS@
-F90_LDFLAGS = @F90_LDFLAGS@
-F90_LIBS    = @F90_LIBS@
-
-LINKFLAGS = -Wl,-rpath,@libdir@
-
-# -----------------------------------------------------------------------------------------
-
-LIBRARIES_LAPACK = -lsundials_fsunlinsollapackdense -lsundials_fsunlinsollapackband -lsundials_sunlinsollapackdense -lsundials_sunlinsollapackband @LAPACK_LIBS@
-LINKFLAGS_LAPACK = ${LINKFLAGS}:@LAPACK_LIBRARY_DIR@
-
-INCLUDES_KLU  = @KLU_INCLUDE_DIR@
-LIBRARIES_KLU = -lsundials_fsunlinsolklu -lsundials_sunlinsolklu @KLU_LIBS@
-LINKFLAGS_KLU = ${LINKFLAGS}:@KLU_LIBRARY_DIR@
-
-INCLUDES_SLUMT  = @SUPERLUMT_INCLUDE_DIR@
-LIBRARIES_SLUMT = -lsundials_fsunlinsolsuperlumt -lsundials_sunlinsolsuperlumt @SUPERLUMT_LIBS@
-LINKFLAGS_SLUMT = ${LINKFLAGS}:@SUPERLUMT_LIBRARY_DIR@
-
-TMP_INCS  = ${includedir} ${INCLUDES_SLUMT} ${INCLUDES_KLU}
-INCLUDES  = $(addprefix -I, ${TMP_INCS})
-LIBRARIES = -l@SOLVER_FLIB@ -l@SOLVER_LIB@ -lsundials_fnvecserial -lsundials_nvecserial ${LIBS}
-
-# -----------------------------------------------------------------------------------------
-
-EXAMPLES = @EXAMPLES@
-OBJECTS  = ${EXAMPLES:=.o}
-
-# LAPACK Examples
-EXAMPLES_BL = @EXAMPLES_BL@
-OBJECTS_BL  = ${EXAMPLES_BL:=.o}
-
-# KLU Examples
-EXAMPLES_KLU = @EXAMPLES_KLU@
-OBJECTS_KLU  = ${EXAMPLES_KLU:=.o}
-
-# SuperLU_MT Examples
-EXAMPLES_SLUMT = @EXAMPLES_SLUMT@
-OBJECTS_SLUMT  = ${EXAMPLES_SLUMT:=.o}
-
-# -----------------------------------------------------------------------------------------
-
-.SUFFIXES : .o .f90
-
-.f90.o :
-	${F90} ${F90FLAGS} ${INCLUDES} -c $<
-
-# -----------------------------------------------------------------------------------------
-
-all: examples examples_bl examples_klu examples_slumt
-
-examples: ${OBJECTS}
-	@for i in ${EXAMPLES} ; do \
-	  echo "${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LINKFLAGS}" ; \
-	  ${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LINKFLAGS} ; \
-	done
-
-examples_bl: ${OBJECTS_BL}
-	@for i in ${EXAMPLES_BL} ; do \
-	  echo "${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_LAPACK} ${LINKFLAGS_LAPACK}" ; \
-	  ${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_LAPACK} ${LINKFLAGS_LAPACK} ; \
-	done
-
-examples_klu: ${OBJECTS_KLU}
-	@for i in ${EXAMPLES_KLU} ; do \
-	  echo "${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_KLU} ${LINKFLAGS_KLU}" ; \
-	  ${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_KLU} ${LINKFLAGS_KLU} ; \
-	done
-
-examples_slumt: ${OBJECTS_SLUMT}
-	@for i in ${EXAMPLES_SLUMT} ; do \
-	  echo "${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_SLUMT} ${LINKFLAGS_SLUMT}" ; \
-	  ${F90} -o $${i} $${i}.o ${F90_LDFLAGS} ${F90_LIBS} ${INCLUDES} -L${libdir} ${LIBRARIES} ${LIBRARIES_SLUMT} ${LINKFLAGS_SLUMT} ; \
-	done
-
-clean:
-	rm -f ${OBJECTS} ${OBJECTS_BL} ${OBJECTS_KLU} ${OBJECTS_SLUMT}
-	rm -f ${EXAMPLES} ${EXAMPLES_BL} ${EXAMPLES_KLU} ${EXAMPLES_SLUMT}
-
-# -----------------------------------------------------------------------------------------

From 4e5de4c054c658adae5326e7d08d9f6ad570ca88 Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Mon, 6 Nov 2023 15:41:27 -0800
Subject: [PATCH 22/35] Maintenance: Simplify tarscripts (#365)

Simplify tarscript to include directories rather than individual files

---------

Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 scripts/arkode    | 354 +--------------------
 scripts/cvode     | 239 +-------------
 scripts/cvodes    | 157 +--------
 scripts/ida       | 129 +-------
 scripts/idas      | 118 +------
 scripts/kinsol    | 112 +------
 scripts/shared    | 789 ++--------------------------------------------
 scripts/tarscript |  46 +--
 8 files changed, 84 insertions(+), 1860 deletions(-)

diff --git a/scripts/arkode b/scripts/arkode
index 6df8c34b75..c94a649672 100755
--- a/scripts/arkode
+++ b/scripts/arkode
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,357 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/arkode/guide/Makefile
 $tar $tarfile $distrobase/doc/arkode/guide/source
 
-$tar $tarfile $distrobase/include/arkode/arkode.h
-$tar $tarfile $distrobase/include/arkode/arkode_arkstep.h
-$tar $tarfile $distrobase/include/arkode/arkode_bandpre.h
-$tar $tarfile $distrobase/include/arkode/arkode_bbdpre.h
-$tar $tarfile $distrobase/include/arkode/arkode_butcher.h
-$tar $tarfile $distrobase/include/arkode/arkode_butcher_dirk.h
-$tar $tarfile $distrobase/include/arkode/arkode_butcher_erk.h
-$tar $tarfile $distrobase/include/arkode/arkode_erkstep.h
-$tar $tarfile $distrobase/include/arkode/arkode_ls.h
-$tar $tarfile $distrobase/include/arkode/arkode_mristep.h
-$tar $tarfile $distrobase/include/arkode/arkode_xbraid.h
-$tar $tarfile $distrobase/include/arkode/arkode_sprkstep.h
-$tar $tarfile $distrobase/include/arkode/arkode_sprk.h
+echo "   --- Add arkode include files to $tarfile"
+$tar $tarfile $distrobase/include/arkode
 
-$tar $tarfile $distrobase/src/arkode/LICENSE
-$tar $tarfile $distrobase/src/arkode/NOTICE
-$tar $tarfile $distrobase/src/arkode/README.md
-$tar $tarfile $distrobase/src/arkode/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/arkode/arkode.c
-$tar $tarfile $distrobase/src/arkode/arkode_adapt.c
-$tar $tarfile $distrobase/src/arkode/arkode_adapt_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_arkstep.c
-$tar $tarfile $distrobase/src/arkode/arkode_arkstep_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_arkstep_io.c
-$tar $tarfile $distrobase/src/arkode/arkode_arkstep_nls.c
-$tar $tarfile $distrobase/src/arkode/arkode_bandpre.c
-$tar $tarfile $distrobase/src/arkode/arkode_bandpre_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_bbdpre.c
-$tar $tarfile $distrobase/src/arkode/arkode_bbdpre_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_butcher.c
-$tar $tarfile $distrobase/src/arkode/arkode_butcher_dirk.c
-$tar $tarfile $distrobase/src/arkode/arkode_butcher_dirk.def
-$tar $tarfile $distrobase/src/arkode/arkode_butcher_erk.c
-$tar $tarfile $distrobase/src/arkode/arkode_butcher_erk.def
-$tar $tarfile $distrobase/src/arkode/arkode_erkstep.c
-$tar $tarfile $distrobase/src/arkode/arkode_erkstep_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_erkstep_io.c
-$tar $tarfile $distrobase/src/arkode/arkode_sprk.c
-$tar $tarfile $distrobase/src/arkode/arkode_sprkstep.c
-$tar $tarfile $distrobase/src/arkode/arkode_sprkstep_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_sprkstep_io.c
-$tar $tarfile $distrobase/src/arkode/arkode_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_interp.c
-$tar $tarfile $distrobase/src/arkode/arkode_interp_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_io.c
-$tar $tarfile $distrobase/src/arkode/arkode_ls.c
-$tar $tarfile $distrobase/src/arkode/arkode_ls_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_mri_tables.c
-$tar $tarfile $distrobase/src/arkode/arkode_mri_tables.def
-$tar $tarfile $distrobase/src/arkode/arkode_mri_tables_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_mristep.c
-$tar $tarfile $distrobase/src/arkode/arkode_mristep_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_mristep_io.c
-$tar $tarfile $distrobase/src/arkode/arkode_mristep_nls.c
-$tar $tarfile $distrobase/src/arkode/arkode_relaxation.c
-$tar $tarfile $distrobase/src/arkode/arkode_relaxation_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_root.c
-$tar $tarfile $distrobase/src/arkode/arkode_root_impl.h
-$tar $tarfile $distrobase/src/arkode/arkode_types_impl.h
-
-$tar $tarfile $distrobase/src/arkode/xbraid/CMakeLists.txt
-$tar $tarfile $distrobase/src/arkode/xbraid/arkode_xbraid.c
-$tar $tarfile $distrobase/src/arkode/xbraid/arkode_xbraid_impl.h
-
-echo "   --- Add arkode F2003 interface to $tarfile"
-
-$tar $tarfile $distrobase/src/arkode/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_mod.c
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_mod.f90
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_arkstep_mod.c
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_arkstep_mod.f90
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_erkstep_mod.c
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_erkstep_mod.f90
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_mristep_mod.c
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_mristep_mod.f90
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_sprkstep_mod.c
-$tar $tarfile $distrobase/src/arkode/fmod/farkode_sprkstep_mod.f90
+echo "   --- Add arkode source files to $tarfile"
+$tar $tarfile $distrobase/src/arkode
 
 echo "   --- Add arkode examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/arkode/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/arkode/C_manyvector/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_manyvector/README
-$tar $tarfile $distrobase/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.c
-$tar $tarfile $distrobase/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out
-$tar $tarfile $distrobase/examples/arkode/C_manyvector/plot_brusselator1D.py
-
-$tar $tarfile $distrobase/examples/arkode/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_openmp/README
-$tar $tarfile $distrobase/examples/arkode/C_openmp/ark_brusselator1D_omp.c
-$tar $tarfile $distrobase/examples/arkode/C_openmp/ark_brusselator1D_omp.out
-$tar $tarfile $distrobase/examples/arkode/C_openmp/plot_brusselator1D.py
-$tar $tarfile $distrobase/examples/arkode/C_openmp/ark_heat1D_omp.c
-$tar $tarfile $distrobase/examples/arkode/C_openmp/ark_heat1D_omp.out
-
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/README
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.c
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.out
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.out
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_heat1D_ompdev.c
-$tar $tarfile $distrobase/examples/arkode/C_openmpdev/ark_heat1D_ompdev.out
-
-basedir=$distrobase/examples/arkode/C_parallel
-$tar $tarfile $basedir/README
-$tar $tarfile $basedir/plot_brusselator1D.py
-$tar $tarfile $basedir/CMakeLists.txt
-$tar $tarfile $basedir/ark_diurnal_kry_p.out
-$tar $tarfile $basedir/ark_diurnal_kry_p.c
-$tar $tarfile $basedir/ark_diurnal_kry_bbd_p.out
-$tar $tarfile $basedir/ark_diurnal_kry_bbd_p.c
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls.c
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor_--explicit_--tf_3.out
-
-$tar $tarfile $distrobase/examples/arkode/C_parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_parhyp/README
-$tar $tarfile $distrobase/examples/arkode/C_parhyp/ark_diurnal_kry_ph.c
-$tar $tarfile $distrobase/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
-
-$tar $tarfile $distrobase/examples/arkode/C_petsc/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_petsc/README
-$tar $tarfile $distrobase/examples/arkode/C_petsc/ark_petsc_ex25.c
-$tar $tarfile $distrobase/examples/arkode/C_petsc/ark_petsc_ex25.out
-
-$tar $tarfile $distrobase/examples/arkode/C_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/C_serial/README
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic_mels.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic_mels.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic_nonlin.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic_nonlin.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_analytic_nonlin_stats.csv
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_0_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_2_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_3_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_4_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_5_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_6_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_imexmri_7_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_klu.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator1D_klu.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_fp.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_fp.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_fp_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_1D_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_brusselator_1D_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_conserved_exp_entropy_ark.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_conserved_exp_entropy_erk.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_dissipated_exp_entropy.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_heat1D.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_heat1D.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_heat1D_adapt.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_heat1D_adapt.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler.h
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_4_4_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_RUTH_3_3_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_YOSHIDA_6_8_--tf_50_--check-order_--nout_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kepler_plot.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_harmonic_symplectic.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_harmonic_symplectic.h
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_harmonic_symplectic.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_damped_harmonic_symplectic.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_damped_harmonic_symplectic.h
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_damped_harmonic_symplectic.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_0_0.002.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_1_0.002.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_2_0.005.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_3_0.01.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_4_0.002.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_5_0.002.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_6_0.005.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_7_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_7_0.001_-100_100_0.5_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_8_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_8_0.001_-100_100_0.5_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_kpr_mri_9_0.001_-100_100_0.5_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_KrylovDemo_prec.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_KrylovDemo_prec.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_onewaycouple_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_onewaycouple_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_reaction_diffusion_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_reaction_diffusion_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_reaction_diffusion_mri_fast_stats.csv
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_reaction_diffusion_mri_slow_stats.csv
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson_stats.csv
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson_constraints.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson_constraints.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson_root.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_robertson_root.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_twowaycouple_mri.c
-$tar $tarfile $distrobase/examples/arkode/C_serial/ark_twowaycouple_mri.out
-$tar $tarfile $distrobase/examples/arkode/C_serial/bruss_plots.m
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_brusselator1D.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_brusselator1D_FEM.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_heat1D.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_heat1D_adapt.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_sol.py
-$tar $tarfile $distrobase/examples/arkode/C_serial/plot_sol_log.py
-
-basedir=$distrobase/examples/arkode/CXX_parallel
-$tar $tarfile $basedir/CMakeLists.txt
-$tar $tarfile $basedir/README
-$tar $tarfile $basedir/plot_heat2D_p.py
-$tar $tarfile $basedir/ark_heat2D_p.cpp
-$tar $tarfile $basedir/ark_heat2D_p_--np_2_2.out
-$tar $tarfile $basedir/plot_brusselator1D.py
-$tar $tarfile $basedir/ark_brusselator1D.h
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls.cpp
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls_--monitor_--explicit_--tf_1.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls.USE_CUDA_NVEC_--monitor.out
-$tar $tarfile $basedir/ark_brusselator1D_task_local_nls.USE_CUDA_NVEC_--monitor_--global-nls.out
-$tar $tarfile $basedir/ark_diffusion_reaction_p.cpp
-$tar $tarfile $basedir/ark_diffusion_reaction_p_--np_2_2_--imex.out
-$tar $tarfile $basedir/ark_diffusion_reaction_p_--np_2_2_--mri-arkstep.out
-$tar $tarfile $basedir/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out
-$tar $tarfile $basedir/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out
-
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/README
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex_--np_2_2.out
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out
-$tar $tarfile $distrobase/examples/arkode/CXX_parhyp/plot_heat2D_p.py
-
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/README
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_analytic_sys.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_analytic_sys.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_heat2D.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_heat2D.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_2_-5_0_-10.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_pendulum.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/ark_pendulum.out
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/plot_heat2D.py
-$tar $tarfile $distrobase/examples/arkode/CXX_serial/plot_sol.py
-
-$tar $tarfile $distrobase/examples/arkode/CXX_superludist/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/CXX_superludist/README
-$tar $tarfile $distrobase/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out
-
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/README.md
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out
-$tar $tarfile $distrobase/examples/arkode/CXX_xbraid/plot_heat2D.py
-
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/README
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/ark_analytic_complex_f2003.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/ark_analytic_complex_f2003.out
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/ark_brusselator1D_f2003.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/ark_brusselator1D_f2003.out
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/fnvector_complex_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/fnvector_fortran_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/fsunlinsol_fortran_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/fsunmatrix_fortran_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/test_fnvector_complex_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/test_fnvector_fortran_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/test_fsunlinsol_fortran_mod.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_custom/test_fsunmatrix_fortran_mod.f90
-
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/README
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor.out
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--explicit_--tf_3.out
-$tar $tarfile $distrobase/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--global-nls.out
-
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/README
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_analytic_f2003.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_analytic_f2003.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003.f90
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_0_0.002.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_1_0.002.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_2_0.005.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_3_0.01.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_4_0.002.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_5_0.002.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_6_0.005.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_7_0.001.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_8_0.001.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/ark_kpr_mri_f2003_9_0.001.out
-$tar $tarfile $distrobase/examples/arkode/F2003_serial/test_ark_butcher_f2003.f90
+$tar $tarfile $distrobase/examples/arkode
 
 echo "   --- Add arkode unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/arkode
diff --git a/scripts/cvode b/scripts/cvode
index 2f83eb3ebf..9735618a9a 100755
--- a/scripts/cvode
+++ b/scripts/cvode
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,242 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/cvode/guide/Makefile
 $tar $tarfile $distrobase/doc/cvode/guide/source
 
-$tar $tarfile $distrobase/include/cvode/cvode.h
-$tar $tarfile $distrobase/include/cvode/cvode_bandpre.h
-$tar $tarfile $distrobase/include/cvode/cvode_bbdpre.h
-$tar $tarfile $distrobase/include/cvode/cvode_diag.h
-$tar $tarfile $distrobase/include/cvode/cvode_direct.h
-$tar $tarfile $distrobase/include/cvode/cvode_ls.h
-$tar $tarfile $distrobase/include/cvode/cvode_proj.h
-$tar $tarfile $distrobase/include/cvode/cvode_spils.h
+echo "   --- Add cvode include files to $tarfile"
+$tar $tarfile $distrobase/include/cvode
 
-$tar $tarfile $distrobase/src/cvode/LICENSE
-$tar $tarfile $distrobase/src/cvode/NOTICE
-$tar $tarfile $distrobase/src/cvode/README.md
-$tar $tarfile $distrobase/src/cvode/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/cvode/cvode.c
-$tar $tarfile $distrobase/src/cvode/cvode_fused_stubs.c
-$tar $tarfile $distrobase/src/cvode/cvode_fused_gpu.cpp
-$tar $tarfile $distrobase/src/cvode/cvode_bandpre.c
-$tar $tarfile $distrobase/src/cvode/cvode_bandpre_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_bbdpre.c
-$tar $tarfile $distrobase/src/cvode/cvode_bbdpre_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_diag.c
-$tar $tarfile $distrobase/src/cvode/cvode_diag_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_direct.c
-$tar $tarfile $distrobase/src/cvode/cvode_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_io.c
-$tar $tarfile $distrobase/src/cvode/cvode_ls.c
-$tar $tarfile $distrobase/src/cvode/cvode_ls_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_nls.c
-$tar $tarfile $distrobase/src/cvode/cvode_proj.c
-$tar $tarfile $distrobase/src/cvode/cvode_proj_impl.h
-$tar $tarfile $distrobase/src/cvode/cvode_spils.c
-
-echo "   --- Add cvode F2003 interface to $tarfile"
-
-$tar $tarfile $distrobase/src/cvode/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/cvode/fmod/fcvode_mod.c
-$tar $tarfile $distrobase/src/cvode/fmod/fcvode_mod.f90
+echo "   --- Add cvode source files to $tarfile"
+$tar $tarfile $distrobase/src/cvode
 
 echo "   --- Add cvode examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/cvode/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/cvode/serial/README
-$tar $tarfile $distrobase/examples/cvode/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/serial/cvAdvDiff_bnd.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvAdvDiff_bndL.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvAdvDiff_bndL.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvAdvDiff_bnd.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvAnalytic_mels.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvAnalytic_mels.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvDirectDemo_ls.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvDirectDemo_ls.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvDisc_dns.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvDisc_dns.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvDiurnal_kry_bp.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvDiurnal_kry_bp.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvDiurnal_kry.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvDiurnal_kry.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_ls.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_ls.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_ls_1.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_ls_2.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_ls_0_1.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_prec.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvKrylovDemo_prec.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvParticle_dns.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvParticle_dns.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvPendulum_dns.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvPendulum_dns.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_stats.csv
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_constraints.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_constraints.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dnsL.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dnsL.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_uw.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_uw.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_negsol.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_dns_negsol.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_klu.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_klu.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_block_klu.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_block_klu.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_sps.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRoberts_sps.out
-$tar $tarfile $distrobase/examples/cvode/serial/cvRocket_dns.c
-$tar $tarfile $distrobase/examples/cvode/serial/cvRocket_dns.out
-$tar $tarfile $distrobase/examples/cvode/serial/plot_cvParticle.py
-$tar $tarfile $distrobase/examples/cvode/serial/plot_cvPendulum.py
-
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/README
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_fp_f2003.f90
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_fp_f2003.out
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_dns_f2003.f90
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_dns_f2003.out
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_dns_jac_f2003.f90
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_dns_jac_f2003.out
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_klu_f2003.f90
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_analytic_sys_klu_f2003.out
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_brusselator_dns_f2003.f90
-$tar $tarfile $distrobase/examples/cvode/F2003_serial/cv_brusselator_dns_f2003.out
-
-$tar $tarfile $distrobase/examples/cvode/C_openmp/README
-$tar $tarfile $distrobase/examples/cvode/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c
-$tar $tarfile $distrobase/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.out
-
-$tar $tarfile $distrobase/examples/cvode/C_openmpdev/README
-$tar $tarfile $distrobase/examples/cvode/C_openmpdev/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c
-$tar $tarfile $distrobase/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.out
-
-$tar $tarfile $distrobase/examples/cvode/parallel/README
-$tar $tarfile $distrobase/examples/cvode/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/parallel/cvAdvDiff_non_p.c
-$tar $tarfile $distrobase/examples/cvode/parallel/cvAdvDiff_non_p.out
-$tar $tarfile $distrobase/examples/cvode/parallel/cvAdvDiff_diag_p.c
-$tar $tarfile $distrobase/examples/cvode/parallel/cvAdvDiff_diag_p.out
-$tar $tarfile $distrobase/examples/cvode/parallel/cvDiurnal_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/cvode/parallel/cvDiurnal_kry_p.c
-$tar $tarfile $distrobase/examples/cvode/parallel/cvDiurnal_kry_p.out
-
-$tar $tarfile $distrobase/examples/cvode/superludist/README
-$tar $tarfile $distrobase/examples/cvode/superludist/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/superludist/cvAdvDiff_sludist.cpp
-$tar $tarfile $distrobase/examples/cvode/superludist/cvAdvDiff_sludist_32.out
-$tar $tarfile $distrobase/examples/cvode/superludist/cvAdvDiff_sludist_64.out
-
-$tar $tarfile $distrobase/examples/cvode/parhyp/README
-$tar $tarfile $distrobase/examples/cvode/parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/parhyp/cvAdvDiff_non_ph.c
-$tar $tarfile $distrobase/examples/cvode/parhyp/cvAdvDiff_non_ph.out
-
-$tar $tarfile $distrobase/examples/cvode/petsc/README
-$tar $tarfile $distrobase/examples/cvode/petsc/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/petsc/cv_petsc_ex7.c
-$tar $tarfile $distrobase/examples/cvode/petsc/cv_petsc_ex7.out
-$tar $tarfile $distrobase/examples/cvode/petsc/cvAdvDiff_petsc.c
-$tar $tarfile $distrobase/examples/cvode/petsc/cvAdvDiff_petsc.out
-
-$tar $tarfile $distrobase/examples/cvode/C_mpimanyvector/README
-$tar $tarfile $distrobase/examples/cvode/C_mpimanyvector/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.c
-$tar $tarfile $distrobase/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out
-
-$tar $tarfile $distrobase/examples/cvode/cuda/README
-$tar $tarfile $distrobase/examples/cvode/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_diag_cuda.cu
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_diag_cuda_0_0.out
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_diag_cuda_0_1.out
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_diag_cuda_1_1.out
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_kry_cuda.cu
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_kry_cuda.out
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.cu
-$tar $tarfile $distrobase/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.out
-$tar $tarfile $distrobase/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.cu
-$tar $tarfile $distrobase/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.out
-
-$tar $tarfile $distrobase/examples/cvode/ginkgo/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_heat2D_ginkgo.CUDA.out
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_heat2D_ginkgo.OMP.out
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_heat2D_ginkgo.REF.out
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_kpr_ginkgo.cpp
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_kpr_ginkgo.hpp
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_kpr_ginkgo.OMP.out
-$tar $tarfile $distrobase/examples/cvode/ginkgo/cv_kpr_ginkgo.REF.out
-
-$tar $tarfile $distrobase/examples/cvode/hip/README
-$tar $tarfile $distrobase/examples/cvode/hip/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_diag_hip.cpp
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_diag_hip_0_0.out
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_diag_hip_0_1.out
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_diag_hip_1_1.out
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_kry_hip.cpp
-$tar $tarfile $distrobase/examples/cvode/hip/cvAdvDiff_kry_hip.out
-
-$tar $tarfile $distrobase/examples/cvode/kokkos/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos.cpp
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos.CUDA.out
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos.OPENMP.out
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos.SERIAL.out
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.cpp
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.CUDA.out
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.OPENMP.out
-$tar $tarfile $distrobase/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.SERIAL.out
-
-$tar $tarfile $distrobase/examples/cvode/magma/README
-$tar $tarfile $distrobase/examples/cvode/magma/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/magma/cv_bruss_batched_magma.cpp
-$tar $tarfile $distrobase/examples/cvode/magma/cv_bruss_batched_magma.out
-
-$tar $tarfile $distrobase/examples/cvode/raja/README
-$tar $tarfile $distrobase/examples/cvode/raja/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/raja/cvAdvDiff_kry_raja.cpp
-$tar $tarfile $distrobase/examples/cvode/raja/cvAdvDiff_kry_raja.out
-
-$tar $tarfile $distrobase/examples/cvode/CXX_onemkl/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/CXX_onemkl/README
-$tar $tarfile $distrobase/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.out
-
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/README
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_heat2D.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_heat2D.hpp
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_heat2D.out
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_kpr.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_kpr.hpp
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/cv_kpr.out
-$tar $tarfile $distrobase/examples/cvode/CXX_serial/plot_heat2D.py
-
-$tar $tarfile $distrobase/examples/cvode/CXX_parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/CXX_parallel/README
-$tar $tarfile $distrobase/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_parallel/cv_heat2D_p_--np_2_2.out
-$tar $tarfile $distrobase/examples/cvode/CXX_parallel/plot_heat2D_p.py
-
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/README
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls_--np_2_2.out
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg_--np_2_2.out
-$tar $tarfile $distrobase/examples/cvode/CXX_parhyp/plot_heat2D_p.py
-
-$tar $tarfile $distrobase/examples/cvode/CXX_sycl/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvode/CXX_sycl/README
-$tar $tarfile $distrobase/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp
-$tar $tarfile $distrobase/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.out
+$tar $tarfile $distrobase/examples/cvode
 
 echo "   --- Add cvode unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/cvode
diff --git a/scripts/cvodes b/scripts/cvodes
index cab37658ee..7b7c44b939 100755
--- a/scripts/cvodes
+++ b/scripts/cvodes
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,160 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/cvodes/guide/Makefile
 $tar $tarfile $distrobase/doc/cvodes/guide/source
 
-$tar $tarfile $distrobase/include/cvodes/cvodes.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_bandpre.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_bbdpre.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_diag.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_direct.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_ls.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_proj.h
-$tar $tarfile $distrobase/include/cvodes/cvodes_spils.h
+echo "   --- Add cvodes include files to $tarfile"
+$tar $tarfile $distrobase/include/cvodes
 
-$tar $tarfile $distrobase/src/cvodes/LICENSE
-$tar $tarfile $distrobase/src/cvodes/NOTICE
-$tar $tarfile $distrobase/src/cvodes/README.md
-$tar $tarfile $distrobase/src/cvodes/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/cvodes/cvodea.c
-$tar $tarfile $distrobase/src/cvodes/cvodea_io.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_bandpre.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_bandpre_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes_bbdpre.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_bbdpre_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_diag.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_diag_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes_direct.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes_io.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_ls.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_ls_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes_nls.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_nls_sim.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_nls_stg.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_nls_stg1.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_proj.c
-$tar $tarfile $distrobase/src/cvodes/cvodes_proj_impl.h
-$tar $tarfile $distrobase/src/cvodes/cvodes_spils.c
-
-$tar $tarfile $distrobase/src/cvodes/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/cvodes/fmod/fcvodes_mod.c
-$tar $tarfile $distrobase/src/cvodes/fmod/fcvodes_mod.f90
+echo "   --- Add cvodes source files to $tarfile"
+$tar $tarfile $distrobase/src/cvodes
 
 echo "   --- Add cvodes examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/cvodes/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/cvodes/serial/README
-$tar $tarfile $distrobase/examples/cvodes/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_bnd.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_bndL.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_bndL.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_bnd.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_FSA_non.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_FSA_non_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAdvDiff_FSA_non_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAnalytic_mels.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsAnalytic_mels.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDirectDemo_ls.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDirectDemo_ls.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_FSA_kry.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_kry_bp.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_kry_bp.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_kry.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsDiurnal_kry.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsHessian_ASA_FSA.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsHessian_ASA_FSA.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_ls.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_ls.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_ls_1.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_ls_2.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_prec.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsKrylovDemo_prec.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsParticle_dns.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsParticle_dns.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsPendulum_dns.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsPendulum_dns.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns_bkw1_stats.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns_bkw2_stats.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns_fwd_stats.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns_stats.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns_constraints.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns_constraints.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dnsL.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dnsL.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_klu.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_klu.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_sps.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_ASAi_sps.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns_uw.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_dns_uw.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_stats_-sensi_sim_t.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_stats_-sensi_stg1_t.csv
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_stg1_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints_-sensi_stg1_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_klu.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_klu_-sensi_stg1_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_sps.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_FSA_sps_-sensi_stg1_t.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_klu.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_klu.out
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_sps.c
-$tar $tarfile $distrobase/examples/cvodes/serial/cvsRoberts_sps.out
-$tar $tarfile $distrobase/examples/cvodes/serial/plot_cvsParticle.py
-$tar $tarfile $distrobase/examples/cvodes/serial/plot_cvsPendulum.py
-
-$tar $tarfile $distrobase/examples/cvodes/C_openmp/README
-$tar $tarfile $distrobase/examples/cvodes/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c
-$tar $tarfile $distrobase/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.out
-
-$tar $tarfile $distrobase/examples/cvodes/parallel/README
-$tar $tarfile $distrobase/examples/cvodes/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_non_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAdvDiff_non_p.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_kry_p.c
-$tar $tarfile $distrobase/examples/cvodes/parallel/cvsDiurnal_kry_p.out
-
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/README
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.f90
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.out
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvsAdvDiff_FSA_non_f2003.f90
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvsAdvDiff_FSA_non_f2003_-sensi_sim_t.out
-$tar $tarfile $distrobase/examples/cvodes/F2003_serial/cvsAdvDiff_FSA_non_f2003_-sensi_stg_t.out
+$tar $tarfile $distrobase/examples/cvodes
 
 echo "   --- Add cvodes unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/cvodes
diff --git a/scripts/ida b/scripts/ida
index cc320c286b..06cd3a4fec 100755
--- a/scripts/ida
+++ b/scripts/ida
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,132 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/ida/guide/Makefile
 $tar $tarfile $distrobase/doc/ida/guide/source
 
-$tar $tarfile $distrobase/include/ida/ida_bbdpre.h
-$tar $tarfile $distrobase/include/ida/ida_direct.h
-$tar $tarfile $distrobase/include/ida/ida.h
-# $tar $tarfile $distrobase/include/ida/ida_petsc.h
-$tar $tarfile $distrobase/include/ida/ida_ls.h
-$tar $tarfile $distrobase/include/ida/ida_spils.h
+echo "   --- Add ida include files to $tarfile"
+$tar $tarfile $distrobase/include/ida
 
-$tar $tarfile $distrobase/src/ida/LICENSE
-$tar $tarfile $distrobase/src/ida/NOTICE
-$tar $tarfile $distrobase/src/ida/README.md
-$tar $tarfile $distrobase/src/ida/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/ida/ida_bbdpre.c
-$tar $tarfile $distrobase/src/ida/ida_bbdpre_impl.h
-$tar $tarfile $distrobase/src/ida/ida.c
-$tar $tarfile $distrobase/src/ida/ida_direct.c
-$tar $tarfile $distrobase/src/ida/ida_ic.c
-$tar $tarfile $distrobase/src/ida/ida_impl.h
-$tar $tarfile $distrobase/src/ida/ida_io.c
-# $tar $tarfile $distrobase/src/ida/ida_petsc.c
-# $tar $tarfile $distrobase/src/ida/ida_petsc_impl.h
-$tar $tarfile $distrobase/src/ida/ida_ls.c
-$tar $tarfile $distrobase/src/ida/ida_ls_impl.h
-$tar $tarfile $distrobase/src/ida/ida_nls.c
-$tar $tarfile $distrobase/src/ida/ida_spils.c
-
-echo "   --- Add ida F2003 interface to $tarfile"
-
-$tar $tarfile $distrobase/src/ida/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/ida/fmod/fida_mod.c
-$tar $tarfile $distrobase/src/ida/fmod/fida_mod.f90
+echo "   --- Add ida source files to $tarfile"
+$tar $tarfile $distrobase/src/ida
 
 echo "   --- Add ida examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/ida/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/ida/serial/README
-$tar $tarfile $distrobase/examples/ida/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/serial/idaAnalytic_mels.c
-$tar $tarfile $distrobase/examples/ida/serial/idaAnalytic_mels.out
-$tar $tarfile $distrobase/examples/ida/serial/idaFoodWeb_bnd.c
-$tar $tarfile $distrobase/examples/ida/serial/idaFoodWeb_bnd.out
-$tar $tarfile $distrobase/examples/ida/serial/idaFoodWeb_kry.c
-$tar $tarfile $distrobase/examples/ida/serial/idaFoodWeb_kry.out
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_bnd.c
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_bnd.out
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_kry.c
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_kry.out
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_klu.c
-$tar $tarfile $distrobase/examples/ida/serial/idaHeat2D_klu.out
-$tar $tarfile $distrobase/examples/ida/serial/idaKrylovDemo_ls.c
-$tar $tarfile $distrobase/examples/ida/serial/idaKrylovDemo_ls.out
-$tar $tarfile $distrobase/examples/ida/serial/idaKrylovDemo_ls_1.out
-$tar $tarfile $distrobase/examples/ida/serial/idaKrylovDemo_ls_2.out
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_dns.c
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_dns.out
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_dns_stats.csv
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_klu.c
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_klu.out
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_sps.c
-$tar $tarfile $distrobase/examples/ida/serial/idaRoberts_sps.out
-$tar $tarfile $distrobase/examples/ida/serial/idaSlCrank_dns.c
-$tar $tarfile $distrobase/examples/ida/serial/idaSlCrank_dns.out
-
-$tar $tarfile $distrobase/examples/ida/C_openmp/README
-$tar $tarfile $distrobase/examples/ida/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/C_openmp/idaFoodWeb_bnd_omp.c
-$tar $tarfile $distrobase/examples/ida/C_openmp/idaFoodWeb_bnd_omp.out
-$tar $tarfile $distrobase/examples/ida/C_openmp/idaFoodWeb_kry_omp.c
-$tar $tarfile $distrobase/examples/ida/C_openmp/idaFoodWeb_kry_omp.out
-
-$tar $tarfile $distrobase/examples/ida/petsc/README
-$tar $tarfile $distrobase/examples/ida/petsc/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_spgmr.c
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_spgmr.out
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_snes.c
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_snes.out
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_snes_-pre.out
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_snes_-jac.out
-$tar $tarfile $distrobase/examples/ida/petsc/idaHeat2D_petsc_snes_-jac_-pre.out
-
-$tar $tarfile $distrobase/examples/ida/parallel/README
-$tar $tarfile $distrobase/examples/ida/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/parallel/idaFoodWeb_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/ida/parallel/idaFoodWeb_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/ida/parallel/idaFoodWeb_kry_p.c
-$tar $tarfile $distrobase/examples/ida/parallel/idaFoodWeb_kry_p.out
-$tar $tarfile $distrobase/examples/ida/parallel/idaHeat2D_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/ida/parallel/idaHeat2D_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/ida/parallel/idaHeat2D_kry_p.c
-$tar $tarfile $distrobase/examples/ida/parallel/idaHeat2D_kry_p.out
-
-$tar $tarfile $distrobase/examples/ida/cuda/README
-$tar $tarfile $distrobase/examples/ida/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/cuda/idaHeat2D_kry_cuda.cu
-$tar $tarfile $distrobase/examples/ida/cuda/idaHeat2D_kry_cuda.out
-
-$tar $tarfile $distrobase/examples/ida/mpicuda/README
-$tar $tarfile $distrobase/examples/ida/mpicuda/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu
-$tar $tarfile $distrobase/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.out
-
-$tar $tarfile $distrobase/examples/ida/raja/README
-$tar $tarfile $distrobase/examples/ida/raja/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/raja/idaHeat2D_kry_raja.cpp
-$tar $tarfile $distrobase/examples/ida/raja/idaHeat2D_kry_raja.out
-
-$tar $tarfile $distrobase/examples/ida/mpiraja/README
-$tar $tarfile $distrobase/examples/ida/mpiraja/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp
-$tar $tarfile $distrobase/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.out
-
-$tar $tarfile $distrobase/examples/ida/trilinos/README
-$tar $tarfile $distrobase/examples/ida/trilinos/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.cpp
-$tar $tarfile $distrobase/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.out
-$tar $tarfile $distrobase/examples/ida/trilinos/idaHeat2D_kry_tpetra.cpp
-$tar $tarfile $distrobase/examples/ida/trilinos/idaHeat2D_kry_tpetra.out
-
-$tar $tarfile $distrobase/examples/ida/F2003_serial/README
-$tar $tarfile $distrobase/examples/ida/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/ida/F2003_serial/idaHeat2D_kry_f2003.f90
-$tar $tarfile $distrobase/examples/ida/F2003_serial/idaHeat2D_kry_f2003.out
-$tar $tarfile $distrobase/examples/ida/F2003_serial/idaRoberts_dns_f2003.f90
-$tar $tarfile $distrobase/examples/ida/F2003_serial/idaRoberts_dns_f2003.out
+$tar $tarfile $distrobase/examples/ida
 
 echo "   --- Add ida unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/ida
diff --git a/scripts/idas b/scripts/idas
index 7604bb5983..2c312bcc9f 100755
--- a/scripts/idas
+++ b/scripts/idas
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,121 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/idas/guide/Makefile
 $tar $tarfile $distrobase/doc/idas/guide/source
 
-$tar $tarfile $distrobase/include/idas/idas.h
-$tar $tarfile $distrobase/include/idas/idas_bbdpre.h
-$tar $tarfile $distrobase/include/idas/idas_direct.h
-$tar $tarfile $distrobase/include/idas/idas_ls.h
-$tar $tarfile $distrobase/include/idas/idas_spils.h
+echo "   --- Add idas include files to $tarfile"
+$tar $tarfile $distrobase/include/idas
 
-$tar $tarfile $distrobase/src/idas/LICENSE
-$tar $tarfile $distrobase/src/idas/NOTICE
-$tar $tarfile $distrobase/src/idas/README.md
-$tar $tarfile $distrobase/src/idas/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/idas/idaa.c
-$tar $tarfile $distrobase/src/idas/idaa_io.c
-$tar $tarfile $distrobase/src/idas/idas.c
-$tar $tarfile $distrobase/src/idas/idas_bbdpre.c
-$tar $tarfile $distrobase/src/idas/idas_bbdpre_impl.h
-$tar $tarfile $distrobase/src/idas/idas_direct.c
-$tar $tarfile $distrobase/src/idas/idas_ic.c
-$tar $tarfile $distrobase/src/idas/idas_impl.h
-$tar $tarfile $distrobase/src/idas/idas_io.c
-$tar $tarfile $distrobase/src/idas/idas_ls.c
-$tar $tarfile $distrobase/src/idas/idas_ls_impl.h
-$tar $tarfile $distrobase/src/idas/idas_nls.c
-$tar $tarfile $distrobase/src/idas/idas_nls_sim.c
-$tar $tarfile $distrobase/src/idas/idas_nls_stg.c
-$tar $tarfile $distrobase/src/idas/idas_spils.c
-
-$tar $tarfile $distrobase/src/idas/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/idas/fmod/fidas_mod.c
-$tar $tarfile $distrobase/src/idas/fmod/fidas_mod.f90
+echo "   --- Add idas source files to $tarfile"
+$tar $tarfile $distrobase/src/idas
 
 echo "   --- Add idas examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/idas/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/idas/serial/README
-$tar $tarfile $distrobase/examples/idas/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/idas/serial/idasAkzoNob_ASAi_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasAkzoNob_ASAi_dns.out
-$tar $tarfile $distrobase/examples/idas/serial/idasAkzoNob_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasAkzoNob_dns.out
-$tar $tarfile $distrobase/examples/idas/serial/idasAnalytic_mels.c
-$tar $tarfile $distrobase/examples/idas/serial/idasAnalytic_mels.out
-$tar $tarfile $distrobase/examples/idas/serial/idasFoodWeb_bnd.c
-$tar $tarfile $distrobase/examples/idas/serial/idasFoodWeb_bnd.out
-$tar $tarfile $distrobase/examples/idas/serial/idasHeat2D_bnd.c
-$tar $tarfile $distrobase/examples/idas/serial/idasHeat2D_bnd.out
-$tar $tarfile $distrobase/examples/idas/serial/idasHeat2D_kry.c
-$tar $tarfile $distrobase/examples/idas/serial/idasHeat2D_kry.out
-$tar $tarfile $distrobase/examples/idas/serial/idasHessian_ASA_FSA.c
-$tar $tarfile $distrobase/examples/idas/serial/idasHessian_ASA_FSA.out
-$tar $tarfile $distrobase/examples/idas/serial/idasKrylovDemo_ls.c
-$tar $tarfile $distrobase/examples/idas/serial/idasKrylovDemo_ls.out
-$tar $tarfile $distrobase/examples/idas/serial/idasKrylovDemo_ls_1.out
-$tar $tarfile $distrobase/examples/idas/serial/idasKrylovDemo_ls_2.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_dns.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_dns_bkw1_stats.csv
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_dns_fwd_stats.csv
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_klu.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_klu.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_sps.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_ASAi_sps.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_dns.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_dns_stats.csv
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_dns_stats_-sensi_stg_t.csv
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_dns_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_klu.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_klu_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_sps.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_FSA_sps_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_klu.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_klu.out
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_sps.c
-$tar $tarfile $distrobase/examples/idas/serial/idasRoberts_sps.out
-$tar $tarfile $distrobase/examples/idas/serial/idasSlCrank_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasSlCrank_dns.out
-$tar $tarfile $distrobase/examples/idas/serial/idasSlCrank_FSA_dns.c
-$tar $tarfile $distrobase/examples/idas/serial/idasSlCrank_FSA_dns.out
-
-$tar $tarfile $distrobase/examples/idas/C_openmp/README
-$tar $tarfile $distrobase/examples/idas/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/idas/C_openmp/idasFoodWeb_bnd_omp.c
-$tar $tarfile $distrobase/examples/idas/C_openmp/idasFoodWeb_bnd_omp.out
-$tar $tarfile $distrobase/examples/idas/C_openmp/idasFoodWeb_kry_omp.c
-$tar $tarfile $distrobase/examples/idas/C_openmp/idasFoodWeb_kry_omp.out
-
-$tar $tarfile $distrobase/examples/idas/parallel/README
-$tar $tarfile $distrobase/examples/idas/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasBruss_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasFoodWeb_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasFoodWeb_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasFoodWeb_kry_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasFoodWeb_kry_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p_-sensi_stg_t.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_kry_p.c
-$tar $tarfile $distrobase/examples/idas/parallel/idasHeat2D_kry_p.out
-
-$tar $tarfile $distrobase/examples/idas/F2003_serial/README
-$tar $tarfile $distrobase/examples/idas/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/idas/F2003_serial/idasAkzoNob_ASAi_dns_f2003.f90
-$tar $tarfile $distrobase/examples/idas/F2003_serial/idasAkzoNob_ASAi_dns_f2003.out
-$tar $tarfile $distrobase/examples/idas/F2003_serial/idasHeat2D_kry_f2003.f90
-$tar $tarfile $distrobase/examples/idas/F2003_serial/idasHeat2D_kry_f2003.out
+$tar $tarfile $distrobase/examples/idas
 
 echo "   --- Add idas unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/idas
diff --git a/scripts/kinsol b/scripts/kinsol
index c7bf7dc752..68c730876a 100755
--- a/scripts/kinsol
+++ b/scripts/kinsol
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -34,115 +35,14 @@ fi
 $tar $tarfile $distrobase/doc/kinsol/guide/Makefile
 $tar $tarfile $distrobase/doc/kinsol/guide/source
 
-$tar $tarfile $distrobase/include/kinsol/kinsol.h
-$tar $tarfile $distrobase/include/kinsol/kinsol_bbdpre.h
-$tar $tarfile $distrobase/include/kinsol/kinsol_direct.h
-$tar $tarfile $distrobase/include/kinsol/kinsol_ls.h
-$tar $tarfile $distrobase/include/kinsol/kinsol_spils.h
+echo "   --- Add kinsol include files to $tarfile"
+$tar $tarfile $distrobase/include/kinsol
 
-$tar $tarfile $distrobase/src/kinsol/LICENSE
-$tar $tarfile $distrobase/src/kinsol/NOTICE
-$tar $tarfile $distrobase/src/kinsol/README.md
-$tar $tarfile $distrobase/src/kinsol/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/kinsol/kinsol.c
-$tar $tarfile $distrobase/src/kinsol/kinsol_bbdpre.c
-$tar $tarfile $distrobase/src/kinsol/kinsol_bbdpre_impl.h
-$tar $tarfile $distrobase/src/kinsol/kinsol_direct.c
-$tar $tarfile $distrobase/src/kinsol/kinsol_impl.h
-$tar $tarfile $distrobase/src/kinsol/kinsol_io.c
-$tar $tarfile $distrobase/src/kinsol/kinsol_ls.c
-$tar $tarfile $distrobase/src/kinsol/kinsol_ls_impl.h
-$tar $tarfile $distrobase/src/kinsol/kinsol_spils.c
-
-echo "   --- Add kinsol F2003 interface to $tarfile"
-
-$tar $tarfile $distrobase/src/kinsol/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/kinsol/fmod/fkinsol_mod.c
-$tar $tarfile $distrobase/src/kinsol/fmod/fkinsol_mod.f90
+echo "   --- Add kinsol source files to $tarfile"
+$tar $tarfile $distrobase/src/kinsol
 
 echo "   --- Add kinsol examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/kinsol/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/kinsol/serial/README
-$tar $tarfile $distrobase/examples/kinsol/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--damping_fp_0.5.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2_--damping_aa_0.5.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2_--delay_aa_2.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2_--orth_aa_1.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2_--orth_aa_2.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinAnalytic_fp_--m_aa_2_--orth_aa_3.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFerTron_dns.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFerTron_dns.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFerTron_klu.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFerTron_klu.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFoodWeb_kry.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinFoodWeb_kry.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinKrylovDemo_ls.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinKrylovDemo_ls.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_bnd.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_bnd.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_picard_bnd.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_picard_bnd.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_picard_kry.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinLaplace_picard_kry.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoboKin_dns.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoboKin_dns.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoboKin_dns_stats.csv
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoboKin_slu.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoboKin_slu.out
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoberts_fp.c
-$tar $tarfile $distrobase/examples/kinsol/serial/kinRoberts_fp.out
-
-$tar $tarfile $distrobase/examples/kinsol/C_openmp/README
-$tar $tarfile $distrobase/examples/kinsol/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c
-$tar $tarfile $distrobase/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.out
-
-$tar $tarfile $distrobase/examples/kinsol/parallel/README
-$tar $tarfile $distrobase/examples/kinsol/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.out
-$tar $tarfile $distrobase/examples/kinsol/parallel/kinFoodWeb_kry_p.c
-$tar $tarfile $distrobase/examples/kinsol/parallel/kinFoodWeb_kry_p.out
-
-$tar $tarfile $distrobase/examples/kinsol/CUDA_mpi/README
-$tar $tarfile $distrobase/examples/kinsol/CUDA_mpi/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu
-$tar $tarfile $distrobase/examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp
-$tar $tarfile $distrobase/examples/kinsol/CUDA_mpi/kin_em_mpicuda.out
-
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/README
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_em_p.cpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_em_p.hpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_em_p.out
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.hpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.cpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p_--np_2_2.out
-
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/README
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg_--np_2_2.out
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
-$tar $tarfile $distrobase/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg_--np_2_2.out
-
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/README
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinRoboKin_dns_f2003.f90
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinRoboKin_dns_f2003.out
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinLaplace_bnd_f2003.f90
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinLaplace_bnd_f2003.out
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.f90
-$tar $tarfile $distrobase/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.out
+$tar $tarfile $distrobase/examples/kinsol
 
 echo "   --- Add kinsol unit tests to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/kinsol
diff --git a/scripts/shared b/scripts/shared
index 1347175464..11634ec73f 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -16,6 +16,7 @@
 # ------------------------------------------------------------------------------
 
 set -e
+set -o pipefail
 
 tarfile=$1
 distrobase=$2
@@ -56,791 +57,45 @@ $tar $tarfile $distrobase/doc/shared
 $tar $tarfile $distrobase/doc/requirements.txt
 
 echo "   --- Add benchmark files to $tarfile"
-
 $tar $tarfile $distrobase/benchmarks
 
 echo "   --- Add configuration files to $tarfile"
+$tar $tarfile $distrobase/cmake
 
-$tar $tarfile $distrobase/cmake/SUNDIALSConfig.cmake.in
-$tar $tarfile $distrobase/cmake/SundialsDeprecated.cmake
-$tar $tarfile $distrobase/cmake/SundialsBuildOptionsPre.cmake
-$tar $tarfile $distrobase/cmake/SundialsBuildOptionsPost.cmake
-$tar $tarfile $distrobase/cmake/SundialsExampleOptions.cmake
-$tar $tarfile $distrobase/cmake/SundialsIndexSize.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupCompilers.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupConfig.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupCuda.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupHIP.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupCXX.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupFortran.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupTPLs.cmake
-$tar $tarfile $distrobase/cmake/SundialsSetupTesting.cmake
-$tar $tarfile $distrobase/cmake/SundialsTPLOptions.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddBenchmark.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddExamplesGinkgo.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddExecutable.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddLibrary.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddTest.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsAddTestInstall.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsInstallExamples.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsInstallExamplesGinkgo.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsCMakeMacros.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsOption.cmake
-$tar $tarfile $distrobase/cmake/macros/SundialsTryCompileExecute.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindHYPRE.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindKLU.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindMAGMA.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindPETSC.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindSUPERLUMT.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindSUPERLUDIST.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindTrilinos.cmake
-$tar $tarfile $distrobase/cmake/tpl/FindXBRAID.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsAdiak.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsCaliper.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsGinkgo.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsHypre.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsKLU.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsKokkos.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsKokkosKernels.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsLapack.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsMAGMA.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsMPI.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsONEMKL.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsOpenMP.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsPETSC.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsPOSIXTimers.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsPthread.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsRAJA.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsSuperLUDIST.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsSuperLUMT.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsTrilinos.cmake
-$tar $tarfile $distrobase/cmake/tpl/SundialsXBRAID.cmake
-
-echo "   --- Add include files to $tarfile"
-
-$tar $tarfile $distrobase/include/sundials/sundials_band.h
-$tar $tarfile $distrobase/include/sundials/sundials_base.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_config.in
-$tar $tarfile $distrobase/include/sundials/sundials_context.h
-$tar $tarfile $distrobase/include/sundials/sundials_context.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_convertibleto.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_cuda_policies.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_hip_policies.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_types.h
-$tar $tarfile $distrobase/include/sundials/sundials_mpi_types.h
-$tar $tarfile $distrobase/include/sundials/sundials_matrix.h
-$tar $tarfile $distrobase/include/sundials/sundials_matrix.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_linearsolver.h
-$tar $tarfile $distrobase/include/sundials/sundials_linearsolver.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_math.h
-$tar $tarfile $distrobase/include/sundials/sundials_nvector.h
-$tar $tarfile $distrobase/include/sundials/sundials_nvector.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_dense.h
-$tar $tarfile $distrobase/include/sundials/sundials_direct.h
-$tar $tarfile $distrobase/include/sundials/sundials_futils.h
-$tar $tarfile $distrobase/include/sundials/sundials_iterative.h
-$tar $tarfile $distrobase/include/sundials/sundials_lapack.h
-$tar $tarfile $distrobase/include/sundials/sundials_linearsolver.h
-$tar $tarfile $distrobase/include/sundials/sundials_logger.h
-$tar $tarfile $distrobase/include/sundials/sundials_math.h
-$tar $tarfile $distrobase/include/sundials/sundials_matrix.h
-$tar $tarfile $distrobase/include/sundials/sundials_memory.h
-$tar $tarfile $distrobase/include/sundials/sundials_memory.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_mpi_types.h
-$tar $tarfile $distrobase/include/sundials/sundials_nonlinearsolver.h
-$tar $tarfile $distrobase/include/sundials/sundials_nonlinearsolver.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_nvector_senswrapper.h
-$tar $tarfile $distrobase/include/sundials/sundials_nvector.h
-$tar $tarfile $distrobase/include/sundials/sundials_profiler.h
-$tar $tarfile $distrobase/include/sundials/sundials_profiler.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_sycl_policies.hpp
-$tar $tarfile $distrobase/include/sundials/sundials_types.h
-$tar $tarfile $distrobase/include/sundials/sundials_version.h
-$tar $tarfile $distrobase/include/sundials/sundials_xbraid.h
-
-$tar $tarfile $distrobase/include/nvector/nvector_cuda.h
-$tar $tarfile $distrobase/include/nvector/nvector_hip.h
-$tar $tarfile $distrobase/include/nvector/nvector_kokkos.hpp
-$tar $tarfile $distrobase/include/nvector/nvector_manyvector.h
-$tar $tarfile $distrobase/include/nvector/nvector_mpimanyvector.h
-$tar $tarfile $distrobase/include/nvector/nvector_mpiplusx.h
-$tar $tarfile $distrobase/include/nvector/nvector_openmp.h
-$tar $tarfile $distrobase/include/nvector/nvector_openmpdev.h
-$tar $tarfile $distrobase/include/nvector/nvector_parallel.h
-$tar $tarfile $distrobase/include/nvector/nvector_parhyp.h
-$tar $tarfile $distrobase/include/nvector/nvector_petsc.h
-$tar $tarfile $distrobase/include/nvector/nvector_pthreads.h
-$tar $tarfile $distrobase/include/nvector/nvector_raja.h
-$tar $tarfile $distrobase/include/nvector/nvector_serial.h
-$tar $tarfile $distrobase/include/nvector/nvector_sycl.h
-$tar $tarfile $distrobase/include/nvector/nvector_trilinos.h
-$tar $tarfile $distrobase/include/nvector/trilinos/SundialsTpetraVectorInterface.hpp
-$tar $tarfile $distrobase/include/nvector/trilinos/SundialsTpetraVectorKernels.hpp
-
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_band.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_cusparse.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_dense.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_ginkgo.hpp
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_kokkosdense.hpp
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_magmadense.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_onemkldense.h
-#$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_diagonal.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_sparse.h
-$tar $tarfile $distrobase/include/sunmatrix/sunmatrix_slunrloc.h
-
-$tar $tarfile $distrobase/include/sunmemory/sunmemory_cuda.h
-$tar $tarfile $distrobase/include/sunmemory/sunmemory_hip.h
-$tar $tarfile $distrobase/include/sunmemory/sunmemory_sycl.h
-$tar $tarfile $distrobase/include/sunmemory/sunmemory_system.h
-
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_cusolversp_batchqr.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_band.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_dense.h
-#$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_diagonal.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_ginkgo.hpp
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_klu.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_kokkosdense.hpp
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_lapackband.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_lapackdense.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_magmadense.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_onemkldense.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_pcg.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_spbcgs.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_spfgmr.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_spgmr.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_sptfqmr.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_superlumt.h
-$tar $tarfile $distrobase/include/sunlinsol/sunlinsol_superludist.h
-
-$tar $tarfile $distrobase/include/sunnonlinsol/sunnonlinsol_newton.h
-$tar $tarfile $distrobase/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
-$tar $tarfile $distrobase/include/sunnonlinsol/sunnonlinsol_petscsnes.h
+echo "   --- Add shared include files to $tarfile"
+$tar $tarfile $distrobase/include/nvector
+$tar $tarfile $distrobase/include/sundials
+$tar $tarfile $distrobase/include/sunlinsol
+$tar $tarfile $distrobase/include/sunmatrix
+$tar $tarfile $distrobase/include/sunmemory
+$tar $tarfile $distrobase/include/sunnonlinsol
 
 echo "   --- Add scripts to $tarfile"
-
 $tar $tarfile $distrobase/scripts/sundials_csv.py
 
 echo "   --- Add shared source files to $tarfile"
-
 $tar $tarfile $distrobase/src/CMakeLists.txt
-$tar $tarfile $distrobase/src/sundials/CMakeLists.txt
-$tar $tarfile $distrobase/src/sundials/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_context_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_context_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_futils_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_futils_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_linearsolver_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_linearsolver_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_logger_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_logger_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_matrix_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_matrix_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_nonlinearsolver_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_nonlinearsolver_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_nvector_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_nvector_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_profiler_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_profiler_mod.f90
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_types_mod.c
-$tar $tarfile $distrobase/src/sundials/fmod/fsundials_types_mod.f90
-$tar $tarfile $distrobase/src/sundials/sundials_band.c
-$tar $tarfile $distrobase/src/sundials/sundials_context_impl.h
-$tar $tarfile $distrobase/src/sundials/sundials_context.c
-$tar $tarfile $distrobase/src/sundials/sundials_cuda.h
-$tar $tarfile $distrobase/src/sundials/sundials_cusolver.h
-$tar $tarfile $distrobase/src/sundials/sundials_cusparse.h
-$tar $tarfile $distrobase/src/sundials/sundials_cuda_kernels.cuh
-$tar $tarfile $distrobase/src/sundials/sundials_debug.h
-$tar $tarfile $distrobase/src/sundials/sundials_dense.c
-$tar $tarfile $distrobase/src/sundials/sundials_direct.c
-$tar $tarfile $distrobase/src/sundials/sundials_futils.c
-$tar $tarfile $distrobase/src/sundials/sundials_hashmap.h
-$tar $tarfile $distrobase/src/sundials/sundials_hip.h
-$tar $tarfile $distrobase/src/sundials/sundials_hip_kernels.hip.hpp
-$tar $tarfile $distrobase/src/sundials/sundials_iterative_impl.h
-$tar $tarfile $distrobase/src/sundials/sundials_iterative.c
-$tar $tarfile $distrobase/src/sundials/sundials_lapack_defs.h
-$tar $tarfile $distrobase/src/sundials/sundials_linearsolver.c
-$tar $tarfile $distrobase/src/sundials/sundials_logger_impl.h
-$tar $tarfile $distrobase/src/sundials/sundials_logger.c
-$tar $tarfile $distrobase/src/sundials/sundials_math.c
-$tar $tarfile $distrobase/src/sundials/sundials_matrix.c
-$tar $tarfile $distrobase/src/sundials/sundials_memory.c
-$tar $tarfile $distrobase/src/sundials/sundials_nonlinearsolver.c
-$tar $tarfile $distrobase/src/sundials/sundials_nvector.c
-$tar $tarfile $distrobase/src/sundials/sundials_nvector_senswrapper.c
-$tar $tarfile $distrobase/src/sundials/sundials_profiler.c
-$tar $tarfile $distrobase/src/sundials/sundials_reductions.hpp
-$tar $tarfile $distrobase/src/sundials/sundials_sycl.h
-$tar $tarfile $distrobase/src/sundials/sundials_utils.h
-$tar $tarfile $distrobase/src/sundials/sundials_version.c
-$tar $tarfile $distrobase/src/sundials/sundials_xbraid.c
-
-echo "   --- Add nvector modules to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/CMakeLists.txt
-
-echo "   --- Add nvector/serial module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/serial/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/serial/nvector_serial.c
-$tar $tarfile $distrobase/src/nvector/serial/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/serial/fmod/fnvector_serial_mod.c
-$tar $tarfile $distrobase/src/nvector/serial/fmod/fnvector_serial_mod.f90
-
-echo "   --- Add nvector/parallel module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/parallel/nvector_parallel.c
-$tar $tarfile $distrobase/src/nvector/parallel/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/parallel/fmod/fnvector_parallel_mod.c
-$tar $tarfile $distrobase/src/nvector/parallel/fmod/fnvector_parallel_mod.f90
-
-echo "   --- Add nvector/parhyp module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/parhyp/nvector_parhyp.c
-
-echo "   --- Add nvector/petsc module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/petsc/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/petsc/nvector_petsc.c
-
-echo "   --- Add nvecopenmpdev module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/openmpdev/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/openmpdev/nvector_openmpdev.c
-
-echo "   --- Add nvector/openmp module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/openmp/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/openmp/nvector_openmp.c
-$tar $tarfile $distrobase/src/nvector/openmp/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/openmp/fmod/fnvector_openmp_mod.c
-$tar $tarfile $distrobase/src/nvector/openmp/fmod/fnvector_openmp_mod.f90
-
-echo "   --- Add nvector/pthreads module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/pthreads/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/pthreads/nvector_pthreads.c
-$tar $tarfile $distrobase/src/nvector/pthreads/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
-$tar $tarfile $distrobase/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90
-
-echo "   --- Add nvector/cuda module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/cuda/nvector_cuda.cu
-$tar $tarfile $distrobase/src/nvector/cuda/VectorKernels.cuh
-$tar $tarfile $distrobase/src/nvector/cuda/VectorArrayKernels.cuh
-
-echo "   --- Add nvector/hip module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/hip/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/hip/nvector_hip.hip.cpp
-$tar $tarfile $distrobase/src/nvector/hip/VectorKernels.hip.hpp
-$tar $tarfile $distrobase/src/nvector/hip/VectorArrayKernels.hip.hpp
-
-echo "   --- Add nvector/raja module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/raja/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/raja/nvector_raja.cpp
-
-echo "   --- Add nvector/sycl module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/sycl/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/sycl/nvector_sycl.cpp
-
-echo "   --- Add nvector/trilinos module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/trilinos/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/trilinos/nvector_trilinos.cpp
-
-echo "   --- Add nvector/manyvector module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/manyvector/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/manyvector/nvector_manyvector.c
-$tar $tarfile $distrobase/src/nvector/manyvector/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c
-$tar $tarfile $distrobase/src/nvector/manyvector/fmod/fnvector_manyvector_mod.f90
-$tar $tarfile $distrobase/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c
-$tar $tarfile $distrobase/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.f90
-
-echo "   --- Add nvector/mpiplusx module to $tarfile"
-
-$tar $tarfile $distrobase/src/nvector/mpiplusx/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/mpiplusx/nvector_mpiplusx.c
-$tar $tarfile $distrobase/src/nvector/mpiplusx/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c
-$tar $tarfile $distrobase/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.f90
-
-echo "   --- Add sunmatrix modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/CMakeLists.txt
-
-echo "   --- Add sunmatrix/band module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/band/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/band/sunmatrix_band.c
-$tar $tarfile $distrobase/src/sunmatrix/band/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/band/fmod/fsunmatrix_band_mod.c
-$tar $tarfile $distrobase/src/sunmatrix/band/fmod/fsunmatrix_band_mod.f90
-
-echo "   --- Add sunmatrix/cusparse module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/cusparse/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
-$tar $tarfile $distrobase/src/sunmatrix/cusparse/cusparse_kernels.cuh
-
-echo "   --- Add sunmatrix/dense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/dense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/dense/sunmatrix_dense.c
-$tar $tarfile $distrobase/src/sunmatrix/dense/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.c
-$tar $tarfile $distrobase/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.f90
-
-echo "   --- Add sunmatrix/sparse module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/sparse/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/sparse/sunmatrix_sparse.c
-$tar $tarfile $distrobase/src/sunmatrix/sparse/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.c
-$tar $tarfile $distrobase/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.f90
-
-echo "   --- Add sunmatrix/slunrloc module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/slunrloc/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/slunrloc/sunmatrix_slunrloc.c
-
-echo "   --- Add sunmatrix/magmadense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/magmadense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/magmadense/sunmatrix_magmadense.cpp
-$tar $tarfile $distrobase/src/sunmatrix/magmadense/dense_cuda_kernels.cuh
-$tar $tarfile $distrobase/src/sunmatrix/magmadense/dense_hip_kernels.hip.hpp
-
-echo "   --- Add sunmatrix/onemkldense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmatrix/onemkldense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmatrix/onemkldense/sunmatrix_onemkldense.cpp
-
-echo "   --- Add sunmemory modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmemory/CMakeLists.txt
-
-echo "   --- Add sunmemory/cuda modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmemory/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmemory/cuda/sundials_cuda_memory.cu
-
-echo "   --- Add sunmemory/hip modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmemory/hip/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmemory/hip/sundials_hip_memory.hip.cpp
-
-echo "   --- Add sunmemory/sycl modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmemory/sycl/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmemory/sycl/sundials_sycl_memory.cpp
-
-echo "   --- Add sunmemory/system modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunmemory/system/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunmemory/system/sundials_system_memory.c
-
-echo "   --- Add sunlinsol modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/CMakeLists.txt
-
-echo "   --- Add sunlinsol/band module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/band/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/band/sunlinsol_band.c
-$tar $tarfile $distrobase/src/sunlinsol/band/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/band/fmod/fsunlinsol_band_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/band/fmod/fsunlinsol_band_mod.f90
-
-echo "   --- Add sunlinsol/cusolversp module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/cusolversp/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
-
-echo "   --- Add sunlinsol/dense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/dense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/dense/sunlinsol_dense.c
-$tar $tarfile $distrobase/src/sunlinsol/dense/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.f90
-
-echo "   --- Add sunlinsol/klu module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/klu/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/klu/sunlinsol_klu.c
-$tar $tarfile $distrobase/src/sunlinsol/klu/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.f90
-
-echo "   --- Add sunlinsol/lapackband module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/lapackband/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/lapackband/sunlinsol_lapackband.c
-
-echo "   --- Add sunlinsol/lapackdense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/lapackdense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c
-$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.f90
-
-echo "   --- Add sunlinsol/magmadense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/magmadense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/magmadense/sunlinsol_magmadense.cpp
-
-echo "   --- Add sunlinsol/onemkldense module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/onemkldense/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/onemkldense/sunlinsol_onemkldense.cpp
-
-echo "   --- Add sunlinsol/pcg module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/pcg/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/pcg/sunlinsol_pcg.c
-$tar $tarfile $distrobase/src/sunlinsol/pcg/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90
-
-echo "   --- Add sunlinsol/spbcgs module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/spbcgs/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
-$tar $tarfile $distrobase/src/sunlinsol/spbcgs/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.f90
-
-echo "   --- Add sunlinsol/spfgmr module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/spfgmr/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
-$tar $tarfile $distrobase/src/sunlinsol/spfgmr/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.f90
-
-echo "   --- Add sunlinsol/spgmr module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/spgmr/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spgmr/sunlinsol_spgmr.c
-$tar $tarfile $distrobase/src/sunlinsol/spgmr/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.f90
-
-echo "   --- Add sunlinsol/sptfqmr module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/sptfqmr/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
-$tar $tarfile $distrobase/src/sunlinsol/sptfqmr/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
-$tar $tarfile $distrobase/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90
-
-echo "   --- Add sunlinsol/superludist module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/superludist/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/superludist/sunlinsol_superludist.c
-
-echo "   --- Add sunlinsol/superlumt module to $tarfile"
-
-$tar $tarfile $distrobase/src/sunlinsol/superlumt/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunlinsol/superlumt/sunlinsol_superlumt.c
-
-echo "   --- Add sunnonlinsol modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunnonlinsol/CMakeLists.txt
-
-echo "   --- Add sunnonlinsol/newton modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunnonlinsol/newton/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunnonlinsol/newton/sunnonlinsol_newton.c
-$tar $tarfile $distrobase/src/sunnonlinsol/newton/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
-$tar $tarfile $distrobase/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.f90
-
-echo "   --- Add sunnonlinsol/fixedpoint modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunnonlinsol/fixedpoint/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
-$tar $tarfile $distrobase/src/sunnonlinsol/fixedpoint/fmod/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
-$tar $tarfile $distrobase/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.f90
-
-echo "   --- Add sunnonlinsol/petscsnes modules to $tarfile"
-
-$tar $tarfile $distrobase/src/sunnonlinsol/petscsnes/CMakeLists.txt
-$tar $tarfile $distrobase/src/sunnonlinsol/petscsnes/sunnonlinsol_petscsnes.c
+$tar $tarfile $distrobase/src/nvector
+$tar $tarfile $distrobase/src/sundials
+$tar $tarfile $distrobase/src/sunlinsol
+$tar $tarfile $distrobase/src/sunmatrix
+$tar $tarfile $distrobase/src/sunmemory
+$tar $tarfile $distrobase/src/sunnonlinsol
 
 echo "   --- Add examples to $tarfile"
-
 $tar $tarfile $distrobase/examples/CMakeLists.txt
-
-echo "   --- Add examples utilities to $tarfile"
-
-$tar $tarfile $distrobase/examples/utilities/custom_memory_helper_gpu.h
-$tar $tarfile $distrobase/examples/utilities/custom_memory_helper_sycl.h
-$tar $tarfile $distrobase/examples/utilities/example_utilities.hpp
-$tar $tarfile $distrobase/examples/utilities/test_utilities.f90
-$tar $tarfile $distrobase/examples/utilities/plot_data_2d.py
-
-echo "   --- Add nvector examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/nvector/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/test_nvector.f90
-
-$tar $tarfile $distrobase/examples/nvector/C_openmp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/C_openmp/test_fnvector_openmp_mod.f90
-$tar $tarfile $distrobase/examples/nvector/C_openmp/test_nvector_openmp.c
-$tar $tarfile $distrobase/examples/nvector/cuda/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/cuda/test_nvector_cuda.cu
-$tar $tarfile $distrobase/examples/nvector/hip/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/hip/test_nvector_hip.cpp
-$tar $tarfile $distrobase/examples/nvector/kokkos/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/kokkos/test_nvector_kokkos.cpp
-$tar $tarfile $distrobase/examples/nvector/manyvector/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/manyvector/test_fnvector_manyvector_mod.f90
-$tar $tarfile $distrobase/examples/nvector/manyvector/test_nvector_manyvector.c
-$tar $tarfile $distrobase/examples/nvector/mpicuda/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/mpicuda/test_nvector_mpicuda.cu
-$tar $tarfile $distrobase/examples/nvector/mpimanyvector/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/mpimanyvector/test_fnvector_mpimanyvector_mod.f90
-$tar $tarfile $distrobase/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel1.c
-$tar $tarfile $distrobase/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel2.c
-$tar $tarfile $distrobase/examples/nvector/mpiplusx/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/mpiplusx/test_fnvector_mpiplusx_mod.f90
-$tar $tarfile $distrobase/examples/nvector/mpiplusx/test_nvector_mpiplusx.c
-$tar $tarfile $distrobase/examples/nvector/mpiraja/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/mpiraja/test_nvector_mpiraja.cpp
-$tar $tarfile $distrobase/examples/nvector/openmpdev/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/openmpdev/test_nvector_openmpdev.c
-$tar $tarfile $distrobase/examples/nvector/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/parallel/test_fnvector_parallel_mod.f90
-$tar $tarfile $distrobase/examples/nvector/parallel/test_nvector_mpi.c
-$tar $tarfile $distrobase/examples/nvector/parhyp/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/parhyp/test_nvector_parhyp.c
-$tar $tarfile $distrobase/examples/nvector/petsc/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/petsc/test_nvector_petsc.c
-$tar $tarfile $distrobase/examples/nvector/pthreads/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/pthreads/test_fnvector_pthreads_mod.f90
-$tar $tarfile $distrobase/examples/nvector/pthreads/test_nvector_pthreads.c
-$tar $tarfile $distrobase/examples/nvector/raja/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/raja/test_nvector_raja.cpp
-$tar $tarfile $distrobase/examples/nvector/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/serial/test_fnvector_serial_mod.f90
-$tar $tarfile $distrobase/examples/nvector/serial/test_nvector_serial.c
-$tar $tarfile $distrobase/examples/nvector/sycl/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/sycl/test_nvector_sycl.cpp
-$tar $tarfile $distrobase/examples/nvector/test_mpinvector.c
-$tar $tarfile $distrobase/examples/nvector/test_nvector.c
-$tar $tarfile $distrobase/examples/nvector/test_nvector.h
-$tar $tarfile $distrobase/examples/nvector/trilinos/CMakeLists.txt
-$tar $tarfile $distrobase/examples/nvector/trilinos/test_nvector_trilinos.cpp
-
-echo "   --- Add sunmatrix examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/sunmatrix/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/band/test_sunmatrix_band.c
-$tar $tarfile $distrobase/examples/sunmatrix/band/test_fsunmatrix_band_mod.f90
-$tar $tarfile $distrobase/examples/sunmatrix/band/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/cusparse/test_sunmatrix_cusparse.cu
-$tar $tarfile $distrobase/examples/sunmatrix/cusparse/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/dense/test_sunmatrix_dense.c
-$tar $tarfile $distrobase/examples/sunmatrix/dense/test_fsunmatrix_dense_mod.f90
-$tar $tarfile $distrobase/examples/sunmatrix/dense/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
-$tar $tarfile $distrobase/examples/sunmatrix/ginkgo/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/kokkos/test_sunmatrix_kokkosdense.cpp
-$tar $tarfile $distrobase/examples/sunmatrix/kokkos/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/magmadense/test_sunmatrix_magmadense.cpp
-$tar $tarfile $distrobase/examples/sunmatrix/magmadense/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/onemkldense/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunmatrix/onemkldense/test_sunmatrix_onemkldense.cpp
-
-$tar $tarfile $distrobase/examples/sunmatrix/sparse/test_sunmatrix_sparse.c
-$tar $tarfile $distrobase/examples/sunmatrix/sparse/test_fsunmatrix_sparse_mod.f90
-$tar $tarfile $distrobase/examples/sunmatrix/sparse/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/slunrloc/test_sunmatrix_slunrloc.cpp
-$tar $tarfile $distrobase/examples/sunmatrix/slunrloc/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunmatrix/dreadrb.c
-$tar $tarfile $distrobase/examples/sunmatrix/dreadrb.h
-
-$tar $tarfile $distrobase/examples/sunmatrix/test_sunmatrix.f90
-$tar $tarfile $distrobase/examples/sunmatrix/test_sunmatrix.c
-$tar $tarfile $distrobase/examples/sunmatrix/test_sunmatrix.h
-
-echo "   --- Add sunlinsol examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/sunlinsol/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunlinsol/test_sunlinsol.f90
-$tar $tarfile $distrobase/examples/sunlinsol/test_sunlinsol.c
-$tar $tarfile $distrobase/examples/sunlinsol/test_sunlinsol.h
-
-$tar $tarfile $distrobase/examples/sunlinsol/band/test_sunlinsol_band.c
-$tar $tarfile $distrobase/examples/sunlinsol/band/test_fsunlinsol_band_mod.f90
-$tar $tarfile $distrobase/examples/sunlinsol/band/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/cusolversp/test_sunlinsol_cusolversp_batchqr.cu
-$tar $tarfile $distrobase/examples/sunlinsol/cusolversp/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/dense/test_sunlinsol_dense.c
-$tar $tarfile $distrobase/examples/sunlinsol/dense/test_fsunlinsol_dense_mod.f90
-$tar $tarfile $distrobase/examples/sunlinsol/dense/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp
-$tar $tarfile $distrobase/examples/sunlinsol/ginkgo/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/klu/test_sunlinsol_klu.c
-$tar $tarfile $distrobase/examples/sunlinsol/klu/test_fsunlinsol_klu_mod.f90
-$tar $tarfile $distrobase/examples/sunlinsol/klu/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/kokkos/test_sunlinsol_kokkosdense.cpp
-$tar $tarfile $distrobase/examples/sunlinsol/kokkos/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c
-$tar $tarfile $distrobase/examples/sunlinsol/lapackband/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c
-$tar $tarfile $distrobase/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
-$tar $tarfile $distrobase/examples/sunlinsol/lapackdense/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp
-$tar $tarfile $distrobase/examples/sunlinsol/magmadense/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/onemkldense/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunlinsol/onemkldense/test_sunlinsol_onemkldense.cpp
-
-$tar $tarfile $distrobase/examples/sunlinsol/pcg/parallel/test_sunlinsol_pcg_parallel.c
-$tar $tarfile $distrobase/examples/sunlinsol/pcg/parallel/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/pcg/serial/test_sunlinsol_pcg_serial.c
-$tar $tarfile $distrobase/examples/sunlinsol/pcg/serial/test_fsunlinsol_pcg_mod_serial.f90
-$tar $tarfile $distrobase/examples/sunlinsol/pcg/serial/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/spbcgs/parallel/test_sunlinsol_spbcgs_parallel.c
-$tar $tarfile $distrobase/examples/sunlinsol/spbcgs/parallel/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/spbcgs/serial/test_sunlinsol_spbcgs_serial.c
-$tar $tarfile $distrobase/examples/sunlinsol/spbcgs/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunlinsol/spbcgs/serial/test_fsunlinsol_spbcgs_mod_serial.f90
-
-$tar $tarfile $distrobase/examples/sunlinsol/spfgmr/parallel/test_sunlinsol_spfgmr_parallel.c
-$tar $tarfile $distrobase/examples/sunlinsol/spfgmr/parallel/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/spfgmr/serial/test_sunlinsol_spfgmr_serial.c
-$tar $tarfile $distrobase/examples/sunlinsol/spfgmr/serial/test_fsunlinsol_spfgmr_mod_serial.f90
-$tar $tarfile $distrobase/examples/sunlinsol/spfgmr/serial/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/spgmr/parallel/test_sunlinsol_spgmr_parallel.c
-$tar $tarfile $distrobase/examples/sunlinsol/spgmr/parallel/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/spgmr/serial/test_sunlinsol_spgmr_serial.c
-$tar $tarfile $distrobase/examples/sunlinsol/spgmr/serial/test_fsunlinsol_spgmr_mod_serial.f90
-$tar $tarfile $distrobase/examples/sunlinsol/spgmr/serial/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/sptfqmr/parallel/test_sunlinsol_sptfqmr_parallel.c
-$tar $tarfile $distrobase/examples/sunlinsol/sptfqmr/parallel/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/sptfqmr/serial/test_sunlinsol_sptfqmr_serial.c
-$tar $tarfile $distrobase/examples/sunlinsol/sptfqmr/serial/test_fsunlinsol_sptfqmr_mod_serial.f90
-$tar $tarfile $distrobase/examples/sunlinsol/sptfqmr/serial/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/superludist/test_sunlinsol_superludist.cpp
-$tar $tarfile $distrobase/examples/sunlinsol/superludist/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunlinsol/superlumt/test_sunlinsol_superlumt.c
-$tar $tarfile $distrobase/examples/sunlinsol/superlumt/CMakeLists.txt
-
-echo "   --- Add sunnonlinsol examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/sunnonlinsol/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/sunnonlinsol/newton/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunnonlinsol/newton/test_sunnonlinsol_newton.c
-$tar $tarfile $distrobase/examples/sunnonlinsol/newton/test_fsunnonlinsol_newton_mod.f90
-
-$tar $tarfile $distrobase/examples/sunnonlinsol/fixedpoint/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunnonlinsol/fixedpoint/test_sunnonlinsol_fixedpoint.c
-$tar $tarfile $distrobase/examples/sunnonlinsol/fixedpoint/test_fsunnonlinsol_fixedpoint_mod.f90
-
-$tar $tarfile $distrobase/examples/sunnonlinsol/petsc/CMakeLists.txt
-$tar $tarfile $distrobase/examples/sunnonlinsol/petsc/test_sunnonlinsol_petscsnes.c
-
-echo "   --- Add directory with example Makefile templates to $tarfile"
-
-$tar $tarfile $distrobase/examples/templates/cmakelists_parallel_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parallel_F2003_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parallel_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parallel_CUDA_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parallel_RAJA_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parhyp_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_parhyp_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_petsc_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_C_MPI_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_CXX_ginkgo_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_CXX_MPI_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_CUDA_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_CUDA_MPI_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_HIP_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_HIP_MPI_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_MPI_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_serial_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_serial_F2003_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_serial_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_serial_CUDA_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_serial_RAJA_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_openmp_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_openmpdev_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_pthreads_C_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_trilinos_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/cmakelists_xbraid_CXX_ex.in
-
-$tar $tarfile $distrobase/examples/templates/makefile_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parallel_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parallel_F2003_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parallel_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parallel_CUDA_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parallel_RAJA_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parhyp_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_parhyp_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_petsc_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_serial_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_serial_F2003_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_serial_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_serial_CUDA_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_serial_RAJA_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_openmp_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_openmpdev_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_pthreads_C_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_trilinos_CXX_ex.in
-$tar $tarfile $distrobase/examples/templates/makefile_xbraid_CXX_ex.in
-
+$tar $tarfile $distrobase/examples/nvector
+$tar $tarfile $distrobase/examples/sunlinsol
+$tar $tarfile $distrobase/examples/sunmatrix
+$tar $tarfile $distrobase/examples/sunnonlinsol
+$tar $tarfile $distrobase/examples/templates
+$tar $tarfile $distrobase/examples/utilities
 
 echo "   --- Add testing files to $tarfile"
-
 $tar $tarfile $distrobase/test/testRunner
 
 echo "   --- Add unit tests files to $tarfile"
-
 $tar $tarfile $distrobase/test/unit_tests/CMakeLists.txt
+$tar $tarfile $distrobase/test/unit_tests/profiling
 $tar $tarfile $distrobase/test/unit_tests/reductions
 $tar $tarfile $distrobase/test/unit_tests/sunmemory
-$tar $tarfile $distrobase/test/unit_tests/profiling
diff --git a/scripts/tarscript b/scripts/tarscript
index d0cfd79f78..be1f8083d2 100755
--- a/scripts/tarscript
+++ b/scripts/tarscript
@@ -17,6 +17,7 @@
 
 # Exit immediately if a command fails
 set -e
+set -o pipefail
 
 #==============================================================================
 #
@@ -199,6 +200,8 @@ echo -e "\n--- Create temporary directory ---"
 echo "copy $sundialsdir to $rootdir/$tmpdir"
 rm -rf $tmpdir
 mkdir $tmpdir
+mkdir $tmpdir/benchmarks
+mkdir $tmpdir/cmake
 mkdir $tmpdir/doc
 mkdir $tmpdir/examples
 mkdir $tmpdir/include
@@ -220,16 +223,6 @@ cp $sundialsdir/NOTICE $tmpdir/
 cp $sundialsdir/README.md $tmpdir/
 cp $sundialsdir/.readthedocs.yaml $tmpdir/
 
-# Make install guide and copy to $tmpdir
-if [ $doc = "T" ]; then
-    echo -e "--- SUNDIALS Common Installation documentation"
-    cd $sundialsdir/doc/install_guide
-    make clean
-    make latexpdf
-    cp build/latex/INSTALL_GUIDE.pdf $tmpdir/INSTALL_GUIDE.pdf
-    cd -
-fi
-
 cp -r $sundialsdir/benchmarks $tmpdir/
 cp -r $sundialsdir/cmake $tmpdir/
 
@@ -265,11 +258,29 @@ cp -r $sundialsdir/src/sunnonlinsol $tmpdir/src/
 cp    $sundialsdir/test/testRunner $tmpdir/test/
 cp -r $sundialsdir/test/unit_tests $tmpdir/test/
 
-# Don't release MATLAB until brought current with new version(s)
-#if [ $do_sundials = "T" ]; then
-#    cp -r $sundialsdir/sundialsTB $tmpdir/
-#    cp -r $sundialsdir/sundialsTB/doc $tmpdir/doc/sundialsTB
-#fi
+# Clean up tmpdir
+rm -rf $tmpdir/doc/shared/__pycache__
+find $tmpdir -name "*~" -delete
+find $tmpdir -name "*.orig" -delete
+find $tmpdir -name "#*#" -delete
+find $tmpdir -name ".DS_Store" -delete
+
+# Remove ignored or untracked files that may have been added
+cd $sundialsdir
+for f in $(git ls-files --others --directory benchmarks cmake doc examples include scripts src test); do
+    rm -rf $tmpdir/$f
+done
+cd -
+
+# Make install guide and copy to $tmpdir
+if [ $doc = "T" ]; then
+    echo -e "--- SUNDIALS Common Installation documentation"
+    cd $sundialsdir/doc/install_guide
+    make clean
+    make latexpdf
+    cp build/latex/INSTALL_GUIDE.pdf $tmpdir/INSTALL_GUIDE.pdf
+    cd -
+fi
 
 if [ $do_sundials = "T" -o $do_arkode = "T" ]; then
     cp -r $sundialsdir/include/arkode $tmpdir/include/
@@ -317,11 +328,6 @@ do
     fi
 done
 
-# Clean up tmpdir
-rm -r $tmpdir/doc/shared/__pycache__
-find $tmpdir -name "*~" -delete
-find $tmpdir -name "*.orig" -delete
-
 #---------------------------
 # Create tar files
 #---------------------------

From da23565f8240a78999e8c0e253afb8f3fab85b77 Mon Sep 17 00:00:00 2001
From: David Gardner <gardner48@llnl.gov>
Date: Tue, 7 Nov 2023 19:52:47 -0500
Subject: [PATCH 23/35] Feature: Update Full RHS Calls  (#324)

Fixed a bug in ERKStep where methods with `c[s-1] = 1` but `a[s-1,j] !=
b[j]` were incorrectly treated as having the first same as last (FSAL)
property.

Fixed a bug in `MRIStepCoupling_Write` where explicit coupling tables
were not written to the output file pointer.

ARKStep, ERKStep, MRIStep, and SPRKStep were updated to remove a
potentially unnecessary right-hand side evaluation at the end of an
integration. ARKStep was additionally updated to remove extra right-hand
side evaluations when using an explicit method or an implicit method
with an explicit first stage.

The `MRIStepInnerStepper` class in MRIStep was updated to make supplying
an `MRIStepInnerFullRhsFn` optional.

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Cody Balos <balos1@llnl.gov>
---
 CHANGELOG.md                                  |   14 +
 doc/README.md                                 |   10 +
 .../guide/source/ARKodeButcherTable.rst       |   69 +-
 doc/arkode/guide/source/Introduction.rst      |   15 +
 doc/arkode/guide/source/Mathematics.rst       |   69 +-
 .../Custom_Inner_Stepper/Description.rst      |   11 +-
 .../Usage/SPRKStep_c_interface/index.rst      |    8 +-
 doc/sundials_developers/source/conf.py        |    3 +-
 doc/sundials_developers/source/index.rst      |    1 +
 .../source/packages/ARKODE.rst                |  283 +++
 .../source/packages/index.rst                 |   23 +
 .../source/style_guide/Documentation.rst      |    2 +-
 .../CXX_parallel/ark_diffusion_reaction_p.cpp |    2 +-
 ...k_diffusion_reaction_p_--np_2_2_--imex.out |   64 +-
 ...sion_reaction_p_--np_2_2_--mri-arkstep.out |   62 +-
 ...reaction_p_--np_2_2_--mri-cvode-global.out |   60 +-
 ..._reaction_p_--np_2_2_--mri-cvode-local.out |   56 +-
 examples/arkode/CXX_parallel/ark_heat2D_p.cpp |    2 +-
 .../CXX_parallel/ark_heat2D_p_--np_2_2.out    |   70 +-
 .../ark_heat2D_hypre_ls_--np_2_2.out          |   44 +-
 .../ark_heat2D_hypre_pfmg_--np_2_2.out        |   44 +-
 .../ark_heat2D_hypre_pfmg_imex_--np_2_2.out   |   20 +-
 .../ark_heat2D_hypre_pfmg_mri_--np_2_2.out    |   24 +-
 .../ark_advection_diffusion_reaction.out      |   22 +-
 examples/arkode/CXX_serial/ark_heat2D.cpp     |    2 +-
 examples/arkode/CXX_serial/ark_heat2D.out     |   70 +-
 examples/arkode/CXX_serial/ark_kpr_Mt.cpp     |    2 +
 .../arkode/CXX_serial/ark_kpr_Mt_0_-4.out     |    8 +-
 .../CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out     |  216 +-
 .../ark_kpr_Mt_0_4_0_-10_0_10_1.out           |  216 +-
 .../ark_kpr_Mt_0_4_0_-10_1_10_1.out           |  222 +-
 .../arkode/CXX_serial/ark_kpr_Mt_0_4_1.out    |  208 +-
 examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out |  222 +-
 .../CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out    |    2 +-
 .../arkode/CXX_serial/ark_kpr_Mt_1_-5.out     |   14 +-
 examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out |  220 +-
 .../CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out     |    6 +-
 .../CXX_serial/ark_kpr_Mt_2_8_0_-10.out       |  206 +-
 examples/arkode/CXX_serial/ark_pendulum.cpp   |    3 +
 examples/arkode/CXX_serial/ark_pendulum.out   |   34 +-
 .../ark_brusselator1D_FEM_sludist.out         |  116 +-
 ...mg_xbraid_--np_2_1_2_--x_print_level_0.out |    4 +-
 ..._p_xbraid_--np_2_1_2_--x_print_level_0.out |   14 +-
 .../ark_heat2D_xbraid_--x_print_level_0.out   |   14 +-
 .../ark_brusselator1D_manyvec.out             |   24 +-
 .../arkode/C_openmp/ark_brusselator1D_omp.out |   88 +-
 .../arkode/C_parallel/ark_diurnal_kry_bbd_p.c |    4 +
 .../C_parallel/ark_diurnal_kry_bbd_p.out      |  126 +-
 .../arkode/C_parallel/ark_diurnal_kry_p.c     |    4 +
 .../arkode/C_parallel/ark_diurnal_kry_p.out   |   62 +-
 .../arkode/C_parhyp/ark_diurnal_kry_ph.out    |   60 +-
 .../arkode/C_serial/ark_KrylovDemo_prec.out   |  322 +--
 .../arkode/C_serial/ark_KrylovDemo_prec_1.out |  326 +--
 .../arkode/C_serial/ark_KrylovDemo_prec_2.out |  328 +--
 .../arkode/C_serial/ark_brusselator1D.out     |   88 +-
 .../C_serial/ark_brusselator1D_FEM_slu.out    |  116 +-
 .../ark_brusselator1D_imexmri_0_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_2_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_3_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_4_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_5_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_6_0.001.out     |    2 +-
 .../ark_brusselator1D_imexmri_7_0.001.out     |    2 +-
 .../arkode/C_serial/ark_brusselator1D_klu.out |   10 +-
 .../C_serial/ark_brusselator_1D_mri.out       |   58 +-
 .../arkode/C_serial/ark_brusselator_fp.out    |    6 +-
 .../arkode/C_serial/ark_brusselator_fp_1.out  |    6 +-
 .../arkode/C_serial/ark_brusselator_mri.out   |    2 +-
 .../C_serial/ark_conserved_exp_entropy_ark.c  |    4 +
 .../ark_conserved_exp_entropy_ark_1_0.out     |   18 +-
 .../ark_conserved_exp_entropy_ark_1_1.out     |   72 +-
 .../ark_conserved_exp_entropy_erk_1.out       |   18 +-
 .../ark_damped_harmonic_symplectic.out        |    4 +-
 .../C_serial/ark_dissipated_exp_entropy.c     |    4 +
 .../ark_dissipated_exp_entropy_1_0.out        |    8 +-
 .../ark_dissipated_exp_entropy_1_1.out        |   83 +-
 .../C_serial/ark_harmonic_symplectic.out      |    4 +-
 examples/arkode/C_serial/ark_heat1D.out       |   10 +-
 examples/arkode/C_serial/ark_heat1D_adapt.out |  277 +--
 examples/arkode/C_serial/ark_kepler.out       |    4 +-
 ...kepler_--stepper_ERK_--step-mode_adapt.out |    2 +-
 ...r_ERK_--step-mode_fixed_--count-orbits.out |    2 +-
 ..._--count-orbits_--use-compensated-sums.out |    4 +-
 ...LER_1_1_--tf_50_--check-order_--nout_1.out |   34 +-
 ...ROG_2_2_--tf_50_--check-order_--nout_1.out |   34 +-
 ...LAN_2_2_--tf_50_--check-order_--nout_1.out |   34 +-
 ...LAN_3_3_--tf_50_--check-order_--nout_1.out |   34 +-
 ...LAN_4_4_--tf_50_--check-order_--nout_1.out |   34 +-
 ...LAN_5_6_--tf_50_--check-order_--nout_1.out |   34 +-
 ...ROG_2_2_--tf_50_--check-order_--nout_1.out |   34 +-
 ...UTH_3_3_--tf_50_--check-order_--nout_1.out |   34 +-
 ...IDA_6_8_--tf_50_--check-order_--nout_1.out |   34 +-
 examples/arkode/C_serial/ark_kpr_mri.out      |    2 +-
 .../arkode/C_serial/ark_kpr_mri_0_0.002.out   |    4 +-
 .../arkode/C_serial/ark_kpr_mri_1_0.002.out   |    2 +-
 .../arkode/C_serial/ark_kpr_mri_3_0.01.out    |    2 +-
 .../arkode/C_serial/ark_kpr_mri_4_0.002.out   |    2 +-
 .../arkode/C_serial/ark_kpr_mri_5_0.002.out   |   66 +-
 .../arkode/C_serial/ark_kpr_mri_6_0.005.out   |   20 +-
 .../arkode/C_serial/ark_kpr_mri_7_0.001.out   |    2 +-
 .../ark_kpr_mri_7_0.001_-100_100_0.5_1.out    |    6 +-
 .../arkode/C_serial/ark_kpr_mri_8_0.001.out   |   14 +-
 .../ark_kpr_mri_8_0.001_-100_100_0.5_1.out    |    6 +-
 .../arkode/C_serial/ark_kpr_mri_9_0.001.out   |   94 +-
 .../ark_kpr_mri_9_0.001_-100_100_0.5_1.out    |   88 +-
 .../arkode/C_serial/ark_onewaycouple_mri.out  |    2 +-
 .../C_serial/ark_reaction_diffusion_mri.out   |    2 +-
 examples/arkode/C_serial/ark_robertson.out    |  228 +-
 .../C_serial/ark_robertson_constraints.out    |  218 +-
 .../arkode/C_serial/ark_robertson_root.out    |   38 +-
 .../arkode/C_serial/ark_twowaycouple_mri.out  |    2 +-
 .../ark_analytic_complex_f2003.out            |    2 +-
 .../F2003_custom/ark_brusselator1D_f2003.out  |    4 +-
 .../F2003_serial/ark_analytic_f2003.f90       |    6 +
 .../F2003_serial/ark_analytic_f2003.out       |   20 +-
 .../arkode/F2003_serial/ark_kpr_mri_f2003.out |  116 +-
 .../ark_kpr_mri_f2003_0_0.002.out             |  106 +-
 .../ark_kpr_mri_f2003_1_0.002.out             |  106 +-
 .../F2003_serial/ark_kpr_mri_f2003_3_0.01.out |  106 +-
 .../ark_kpr_mri_f2003_4_0.002.out             |  106 +-
 .../ark_kpr_mri_f2003_5_0.002.out             |  106 +-
 .../ark_kpr_mri_f2003_6_0.005.out             |  106 +-
 .../ark_kpr_mri_f2003_7_0.001.out             |  106 +-
 .../ark_kpr_mri_f2003_8_0.001.out             |  106 +-
 .../ark_kpr_mri_f2003_9_0.001.out             |  106 +-
 examples/nvector/test_nvector.c               |    2 +-
 include/arkode/arkode_butcher.h               |    1 +
 scripts/updateOutFiles.py                     |   62 +-
 src/arkode/arkode.c                           |  131 +-
 src/arkode/arkode_arkstep.c                   |  967 +++++---
 src/arkode/arkode_arkstep_impl.h              |    7 +-
 src/arkode/arkode_arkstep_io.c                |    4 +-
 src/arkode/arkode_butcher.c                   |   14 +
 src/arkode/arkode_erkstep.c                   |  170 +-
 src/arkode/arkode_erkstep_impl.h              |    1 -
 src/arkode/arkode_erkstep_io.c                |    4 +-
 src/arkode/arkode_impl.h                      |   43 +-
 src/arkode/arkode_interp.c                    |   67 +-
 src/arkode/arkode_interp_impl.h               |    4 -
 src/arkode/arkode_io.c                        |   14 +-
 src/arkode/arkode_mri_tables.c                |   10 +-
 src/arkode/arkode_mristep.c                   |  286 ++-
 src/arkode/arkode_relaxation.c                |   36 +-
 src/arkode/arkode_relaxation_impl.h           |   15 +-
 src/arkode/arkode_root.c                      |   21 +-
 src/arkode/arkode_sprkstep.c                  |   48 +-
 src/sundials/sundials_context.c               |    2 +-
 test/answers                                  |    2 +-
 .../arkode/CXX_parallel/CMakeLists.txt        |   63 +-
 .../CXX_parallel/ark_test_heat2D_mri.cpp      |   18 +-
 .../CXX_parallel/ark_test_heat2D_mri_0.out    |   40 +
 .../CXX_parallel/ark_test_heat2D_mri_1.out    |   40 +
 .../arkode/CXX_serial/CMakeLists.txt          |    8 +
 .../CXX_serial/ark_test_analytic_sys_mri.cpp  |   14 +-
 .../ark_test_analytic_sys_mri_0.out           |    2 +-
 .../ark_test_analytic_sys_mri_1.out           |    2 +-
 .../CXX_serial/ark_test_dahlquist_ark.cpp     |  956 ++++++++
 .../CXX_serial/ark_test_dahlquist_ark.out     | 1972 +++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_0_0.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_0_1.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_1_0.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_1_1.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_2_0.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_ark_2_1.out | 2182 +++++++++++++++++
 .../CXX_serial/ark_test_dahlquist_erk.cpp     |  529 ++++
 .../CXX_serial/ark_test_dahlquist_erk.out     |  609 +++++
 .../CXX_serial/ark_test_dahlquist_erk_0.out   |  819 +++++++
 .../CXX_serial/ark_test_dahlquist_erk_1.out   |  819 +++++++
 .../CXX_serial/ark_test_dahlquist_mri.cpp     |   31 +-
 .../CXX_serial/ark_test_dahlquist_mri.out     |  319 ++-
 .../unit_tests/arkode/C_serial/CMakeLists.txt |    1 +
 .../arkode/C_serial/ark_test_innerstepper.c   |  155 ++
 172 files changed, 24263 insertions(+), 4278 deletions(-)
 create mode 100644 doc/README.md
 create mode 100644 doc/sundials_developers/source/packages/ARKODE.rst
 create mode 100644 doc/sundials_developers/source/packages/index.rst
 create mode 100644 test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out
 create mode 100644 test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out
 create mode 100644 test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out
 create mode 100644 test/unit_tests/arkode/C_serial/ark_test_innerstepper.c

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d41c15931..f7e7870f60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,20 @@ the stop time. Additionally, with ARKODE, CVODE, and CVODES this fix removes an
 unnecessary interpolation of the solution at the stop time that could occur in
 this case.
 
+Fixed a bug in ERKStep where methods with `c[s-1] = 1` but `a[s-1,j] != b[j]`
+were incorrectly treated as having the first same as last (FSAL) property.
+
+Fixed a bug in `MRIStepCoupling_Write` where explicit coupling tables were not
+written to the output file pointer.
+
+ARKStep, ERKStep, MRIStep, and SPRKStep were updated to remove a potentially
+unnecessary right-hand side evaluation at the end of an integration. ARKStep was
+additionally updated to remove extra right-hand side evaluations when using an
+explicit method or an implicit method with an explicit first stage.
+
+The `MRIStepInnerStepper` class in MRIStep was updated to make supplying an
+`MRIStepInnerFullRhsFn` optional.
+
 ## Changes to SUNDIALS in release 6.6.0
 
 A new time-stepping module, `SPRKStep`, was added to ARKODE. This time-stepper
diff --git a/doc/README.md b/doc/README.md
new file mode 100644
index 0000000000..3fe743f033
--- /dev/null
+++ b/doc/README.md
@@ -0,0 +1,10 @@
+# SUNDIALS Documentation
+
+The SUNDIALS documentation is written using reStructuredText and
+[Sphinx](https://www.sphinx-doc.org/).
+
+To build the documentation with Sphinx you will need Python 3.9+. Sphinx and the
+necessary extensions can be installed using the requirements file i.e.,
+`pip install -r requirements.txt`. Additionally, building the developer
+documentation requires [Graphviz](https://graphviz.org/) for generating
+flowcharts.
diff --git a/doc/arkode/guide/source/ARKodeButcherTable.rst b/doc/arkode/guide/source/ARKodeButcherTable.rst
index 8e6ea6acbc..86a13a15e4 100644
--- a/doc/arkode/guide/source/ARKodeButcherTable.rst
+++ b/doc/arkode/guide/source/ARKodeButcherTable.rst
@@ -76,33 +76,35 @@ ARKodeButcherTable functions
 .. _ARKodeButcherTable.FunctionsTable:
 .. table:: ARKodeButcherTable functions
 
-   +----------------------------------------------+------------------------------------------------------------+
-   | **Function name**                            | **Description**                                            |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_LoadERK()`       | Retrieve a given explicit Butcher table by its unique ID   |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_LoadERKByName()` | Retrieve a given explicit Butcher table by its unique name |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_LoadDIRK()`      | Retrieve a given implicit Butcher table by its unique ID   |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_LoadDIRKByName()`| Retrieve a given implicit Butcher table by its unique name |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Alloc()`         | Allocate an empty Butcher table                            |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Create()`        | Create a new Butcher table                                 |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Copy()`          | Create a copy of a Butcher table                           |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Space()`         | Get the Butcher table real and integer workspace size      |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Free()`          | Deallocate a Butcher table                                 |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_Write()`         | Write the Butcher table to an output file                  |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_CheckOrder()`    | Check the order of a Butcher table                         |
-   +----------------------------------------------+------------------------------------------------------------+
-   | :c:func:`ARKodeButcherTable_CheckARKOrder()` | Check the order of an ARK pair of Butcher tables           |
-   +----------------------------------------------+------------------------------------------------------------+
+   +--------------------------------------------------+------------------------------------------------------------+
+   | **Function name**                                | **Description**                                            |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_LoadERK()`           | Retrieve a given explicit Butcher table by its unique ID   |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_LoadERKByName()`     | Retrieve a given explicit Butcher table by its unique name |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_LoadDIRK()`          | Retrieve a given implicit Butcher table by its unique ID   |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_LoadDIRKByName()`    | Retrieve a given implicit Butcher table by its unique name |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Alloc()`             | Allocate an empty Butcher table                            |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Create()`            | Create a new Butcher table                                 |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Copy()`              | Create a copy of a Butcher table                           |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Space()`             | Get the Butcher table real and integer workspace size      |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Free()`              | Deallocate a Butcher table                                 |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_Write()`             | Write the Butcher table to an output file                  |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_IsStifflyAccurate()` | Determine if ``A[stages - 1][i] == b[i]``                  |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_CheckOrder()`        | Check the order of a Butcher table                         |
+   +--------------------------------------------------+------------------------------------------------------------+
+   | :c:func:`ARKodeButcherTable_CheckARKOrder()`     | Check the order of an ARK pair of Butcher tables           |
+   +--------------------------------------------------+------------------------------------------------------------+
 
 .. c:function:: ARKodeButcherTable ARKodeButcherTable_LoadERK(ARKODE_ERKTableID emethod)
 
@@ -252,6 +254,19 @@ ARKodeButcherTable functions
       The *outfile* argument can be ``stdout`` or ``stderr``, or it
       may point to a specific file created using ``fopen``.
 
+.. c:function:: void ARKodeButcherTable_IsStifflyAccurate(ARKodeButcherTable B)
+
+   Determine if the table satisfies ``A[stages - 1][i] == b[i]``
+
+   **Arguments:**
+      * *B* -- the Butcher table.
+
+   **Returns**
+      * ``SUNTRUE`` if the method is "stiffly accurate", otherwise returns
+        ``SUNFALSE``
+
+   .. versionadded:: vX.X.X
+
 .. c:function:: int ARKodeButcherTable_CheckOrder(ARKodeButcherTable B, int* q, int* p, FILE* outfile)
 
    Determine the analytic order of accuracy for the specified Butcher
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index dd4e67ae9d..736b7ddc18 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -180,6 +180,21 @@ requested output time is the same as the stop time. Additionally, this fix
 removes an unnecessary interpolation of the solution at the stop time that could
 occur in this case.
 
+Fixed a bug in ERKStep where methods with :math:`c_s = 1` but
+:math:`a_{s,j} \neq b_j` were incorrectly treated as having the first same as
+last (FSAL) property.
+
+Fixed a bug in :c:func:`MRIStepCoupling_Write` where explicit coupling tables
+were not written to the output file pointer.
+
+ARKStep, ERKStep, MRIStep, and SPRKStep were updated to remove a potentially
+unnecessary right-hand side evaluation at the end of an integration. ARKStep was
+additionally updated to remove extra right-hand side evaluations when using an
+explicit method or an implicit method with an explicit first stage.
+
+The :c:type:`MRIStepInnerStepper` class in MRIStep was updated to make supplying
+an :c:func:`MRIStepInnerFullRhsFn` optional.
+
 Changes in v5.6.0
 -----------------
 
diff --git a/doc/arkode/guide/source/Mathematics.rst b/doc/arkode/guide/source/Mathematics.rst
index 6c9b7ec4e2..135bf33f4c 100644
--- a/doc/arkode/guide/source/Mathematics.rst
+++ b/doc/arkode/guide/source/Mathematics.rst
@@ -466,39 +466,41 @@ than the more general form :eq:`ARKODE_IVP_simple_explicit`.
 SPRKStep -- Symplectic Partitioned Runge--Kutta methods
 =======================================================
 
-The SPRKStep time-stepping module in ARKODE is designed for IVPs of the form
+The SPRKStep time-stepping module in ARKODE is designed for problems where the
+state vector is partitioned as
 
 .. math::
-   \dot{p} = f_1(t, q) = \frac{\partial V(t, q)}{\partial q}, \quad
-   \dot{q} = f_2(t, p) = \frac{\partial T(t, p)}{\partial p},
-   \qquad p(t_0) = p_0,\quad q(t_0) = q_0,
-   :label: ARKODE_IVP_Hamiltonian
+   y(t) =
+   \begin{bmatrix}
+     p(t) \\
+     q(t)
+   \end{bmatrix}
 
-where the system Hamiltonian
+and the component partitioned IVP is given by
 
 .. math::
-   H(t, p, q) = T(t, p) + V(t, q)
+   \dot{p} &= f_1(t, q), \qquad p(t_0) = p_0 \\
+   \dot{q} &= f_2(t, p), \qquad q(t_0) = q_0.
+   :label: ARKODE_IVP_SPRK
 
-**is separable**. When *H* is autonomous, then *H* is a conserved quantity.
-Often this correponds to the conservation of energy (for example, in *n*-body
-problems). For non-autonomous *H*, the invariants are no longer directly
-obtainable from the Hamiltonian :cite:p:`Struckmeier:02`.
+The right-hand side functions :math:`f_1(t,p)` and :math:`f_2(t,q)` typically
+arise from the **separable** Hamiltonian system
 
-In solving the IVP :eq:`ARKODE_IVP_Hamiltonian`, we consider the problem in the form
+.. math::
+   H(t, p, q) = T(t, p) + V(t, q)
+
+where
 
 .. math::
-   \dot{y} =
-      \begin{bmatrix}
-         f_1(t, q) \\
-         f_2(t, p)
-      \end{bmatrix}, \qquad
-      y(t_0) =
-      \begin{bmatrix}
-         p_0\\
-         q_0
-      \end{bmatrix}.
+   f_1(t, q) \equiv \frac{\partial V(t, q)}{\partial q}, \qquad
+   f_2(t, p) \equiv \frac{\partial T(t, p)}{\partial p}.
+
+When *H* is autonomous, then *H* is a conserved quantity. Often this corresponds
+to the conservation of energy (for example, in *n*-body problems). For
+non-autonomous *H*, the invariants are no longer directly obtainable from the
+Hamiltonian :cite:p:`Struckmeier:02`.
 
-In practice, the ordering  of the variables does not matter and is determined by the user.
+In practice, the ordering of the variables does not matter and is determined by the user.
 SPRKStep utilizes Symplectic Partitioned Runge-Kutta (SPRK) methods represented by the pair
 of explicit and diagonally implicit Butcher tableaux,
 
@@ -529,17 +531,18 @@ schemes with order of accuracy and conservation equal to
 the default methods used are given in the section :numref:`Butcher.sprk`.
 
 In the default case, the algorithm for a single time-step is as follows
-(for autonomous Hamiltonian systems the times provided to :math:`f1` and :math:`f2`
+(for autonomous Hamiltonian systems the times provided to :math:`f_1` and
+:math:`f_2`
 can be ignored).
 
-#. Set :math:`P_0 = p_n, Q_1 = q_n`
+#. Set :math:`P_0 = p_{n-1}, Q_1 = q_{n-1}`
 
 #. For :math:`i = 1,\ldots,s` do:
 
-   #. :math:`P_i = P_{i-1} + h_{n+1} \hat{a}_i f_1(t_n + \hat{c}_i h, Q_i)`
-   #. :math:`Q_{i+1} = Q_i + h_{n+1} a_i f_2(t_n + c_i h, P_i)`
+   #. :math:`P_i = P_{i-1} + h_n \hat{a}_i f_1(t_{n-1} + \hat{c}_i h_n, Q_i)`
+   #. :math:`Q_{i+1} = Q_i + h_n a_i f_2(t_{n-1} + c_i h_n, P_i)`
 
-#. Set :math:`p_{n+1} = P_s, q_{n+1} = Q_{s+1}`
+#. Set :math:`p_n = P_s, q_n = Q_{s+1}`
 
 .. _ARKODE.Mathematics.SPRKStep.Compensated:
 
@@ -554,12 +557,12 @@ form is used to compute a time step:
 
 #. For :math:`i = 1,\ldots,s` do:
 
-   #. :math:`\Delta P_i = \Delta P_{i-1} + h_{n+1} \hat{a}_i f_1(t_n + \hat{c}_i h, q_n + \Delta Q_i)`
-   #. :math:`\Delta Q_{i+1} = \Delta Q_i + h_{n+1} a_i f_2(t_n + c_i h, p_n + \Delta P_i)`
+   #. :math:`\Delta P_i = \Delta P_{i-1} + h_n \hat{a}_i f_1(t_{n-1} + \hat{c}_i h_n, q_{n-1} + \Delta Q_i)`
+   #. :math:`\Delta Q_{i+1} = \Delta Q_i + h_n a_i f_2(t_{n-1} + c_i h_n, p_{n-1} + \Delta P_i)`
 
-#. Set :math:`\Delta p_{n+1} = \Delta P_s, \Delta q_{n+1} = \Delta Q_{s+1}`
+#. Set :math:`\Delta p_n = \Delta P_s, \Delta q_n = \Delta Q_{s+1}`
 
-#. Using compensated summation, set :math:`p_{n+1} = p_n + \Delta p_{n+1}, q_{n+1} = q_n + \Delta Q_{s+1}`
+#. Using compensated summation, set :math:`p_n = p_{n-1} + \Delta p_n, q_n = q_{n-1} + \Delta q_n`
 
 Since temporal error based adaptive time-stepping is known to ruin the
 conservation property :cite:p:`HaWa:06`,  SPRKStep employs a fixed time-step size.
@@ -706,7 +709,7 @@ characterized by nonzero values on or above the diagonal of the matrices
 :math:`\Gamma^{\{k\}}`. Typically, MRI-GARK and IMEX-MRI-GARK methods are at
 most diagonally-implicit (i.e., :math:`\gamma_{i,j}^{\{k\}}=0` for all
 :math:`j>i`). Furthermore, diagonally-implicit stages are characterized as being
-"solve-decoupled" if :math:`\Delta c_i^S = 0` when `\gamma_{i,i}^{\{k\}} \ne 0`,
+"solve-decoupled" if :math:`\Delta c_i^S = 0` when :math:`\gamma_{i,i}^{\{k\}} \ne 0`,
 in which case the stage is computed as standard ARK or DIRK update. Alternately,
 a diagonally-implicit stage :math:`i` is considered "solve-coupled" if
 :math:`\Delta c^S_i \gamma_{i,j}^{\{k\}} \ne 0`, in which
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
index 4fd6f14b53..33fa9edbc7 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
@@ -365,6 +365,11 @@ member functions:
    **Example codes:**
       * ``examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp``
 
+Optional Member Functions
+"""""""""""""""""""""""""
+
+An :c:type:`MRIStepInnerStepper` *may* provide implementations of any of the
+following member functions:
 
 .. c:type:: int (*MRIStepInnerFullRhsFn)(MRIStepInnerStepper stepper, realtype t, N_Vector v, N_Vector f, int mode)
 
@@ -393,11 +398,9 @@ member functions:
    **Example codes:**
       * ``examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp``
 
-Optional Member Functions
-"""""""""""""""""""""""""
+   .. versionchanged:: vX.X.X
 
-An :c:type:`MRIStepInnerStepper` *may* provide implementations of any of the
-following member functions:
+      Supplying a full right-hand side function was made optional.
 
 .. c:type:: int (*MRIStepInnerResetFn)(MRIStepInnerStepper stepper, realtype tR, N_Vector vR)
 
diff --git a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/index.rst b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/index.rst
index dc35fb2030..ed65b70324 100644
--- a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/index.rst
+++ b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/index.rst
@@ -17,19 +17,19 @@ Using the SPRKStep time-stepping module
 ==========================================
 
 This chapter is concerned with the use of the SPRKStep time-stepping module for
-the solution of Hamiltonian initial value problems (IVPs) of the form
-:eq:`ARKODE_IVP_Hamiltonian` in a C or C++ language setting. The following sections
+the solution of initial value problems (IVPs) of the form
+:eq:`ARKODE_IVP_SPRK` in a C or C++ language setting. The following sections
 discuss the header files and the layout of the user's main program, and provide
 descriptions of the SPRKStep user-callable functions and user-supplied functions.
 
-The example programs located in the source code ``examples/arkode`` folder, may 
+The example programs located in the source code ``examples/arkode`` folder, may
 be helpful as templates for new codes. In particular,
 
 * ``examples/arkode/C_serial/ark_harmonic_symplectic.c``
 * ``examples/arkode/C_serial/ark_damped_harmonic_symplectic.c``, and
 * ``examples/arkode/C_serial/ark_kepler.c``
 
-demonstrate ``SPRKStep`` usage. 
+demonstrate ``SPRKStep`` usage.
 
 SPRKStep uses the input and output constants from the shared ARKODE infrastructure.
 These are defined as needed in this chapter, but for convenience the full list is
diff --git a/doc/sundials_developers/source/conf.py b/doc/sundials_developers/source/conf.py
index 24e5e80f31..05d04cde08 100644
--- a/doc/sundials_developers/source/conf.py
+++ b/doc/sundials_developers/source/conf.py
@@ -34,7 +34,8 @@ def setup(app: Sphinx):
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx_rtd_theme', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
-              'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex', 'sphinx_copybutton']
+              'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex',
+              'sphinx_copybutton', 'sphinx.ext.graphviz']
 
 # References
 bibtex_bibfiles = ['../../shared/sundials.bib']
diff --git a/doc/sundials_developers/source/index.rst b/doc/sundials_developers/source/index.rst
index 901544a729..6fb64c1b28 100644
--- a/doc/sundials_developers/source/index.rst
+++ b/doc/sundials_developers/source/index.rst
@@ -28,5 +28,6 @@ SUNDIALS Developers Guide
    benchmarks/index
    pull_requests/index
    releases/index
+   packages/index
    appendix/index
    references
diff --git a/doc/sundials_developers/source/packages/ARKODE.rst b/doc/sundials_developers/source/packages/ARKODE.rst
new file mode 100644
index 0000000000..7f51198df8
--- /dev/null
+++ b/doc/sundials_developers/source/packages/ARKODE.rst
@@ -0,0 +1,283 @@
+..
+   Author(s): David J. Gardner @ LLNL
+   -----------------------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   -----------------------------------------------------------------------------
+
+.. _ARKODE.ERKFullRHS:
+
+ERKStep Full RHS
+================
+
+.. digraph:: erk_fullrhs
+
+   node [shape=box]
+   splines=ortho
+
+   // -----------------
+   // Before first step
+   // -----------------
+
+   init    [label="Initialize integrator\lCopy t0, y0 to tn, yn\l"]
+   f0cur   [label="Set fn_is_current to False", style=filled, fillcolor=tomato1]
+   h0      [label="Is h0 provided?", target="_top"]
+   f0_q1   [label="Has f(tn, yn) been computed?"]
+   eval1   [label="Evaluate f(tn, yn)\lStore in F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=lightskyblue]
+   fcur1   [label="Set fn_is_current to True", style=filled, fillcolor=lightgreen]
+   h0_comp [label="Compute h0"]
+   start   [label="Start Step"]
+
+   init    -> f0cur -> h0
+   h0      -> start   [taillabel="Yes", labeldistance=2, labelangle=45]
+   h0      -> f0_q1   [taillabel="No", labeldistance=2, labelangle=-45]
+   f0_q1   -> h0_comp [taillabel="Yes", labeldistance=2, labelangle=-45]
+   f0_q1   -> eval1   [taillabel="No", labeldistance=2, labelangle=-45]
+   eval1   -> fcur1
+   fcur1   -> h0_comp
+   h0_comp -> start
+
+   // ----------
+   // First step
+   // ----------
+
+   f0q2     [label="Has f(tn, yn) been computed?"]
+   step_q   [label="Is this the first step after initial setup?"]
+   eval2    [label="Evaluate f(tn, yn)\lStore in F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=lightskyblue]
+   fsal     [label="Is the method FSAL?", style=filled, fillcolor=slateblue1]
+   eval3    [label="Evaluate f(tn, yn)\lStore in F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=slateblue1]
+   copy1    [label="Copy F[s-1] to F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=slateblue1]
+   fcur2    [label="Set fn_is_current to True", style=filled, fillcolor=lightgreen]
+   stages1  [label="Compute Stages"]
+   complete [label="Complete Step"]
+
+   start   -> f0q2
+   f0q2    -> stages1  [taillabel="Yes", labeldistance=2, labelangle=45]
+   f0q2    -> step_q   [taillabel="No", labeldistance=2, labelangle=-45]
+   step_q  -> eval2    [taillabel="Yes", labeldistance=2, labelangle=45]
+   eval2   -> fcur2
+   step_q  -> fsal     [taillabel="No", labeldistance=2, labelangle=-45]
+   fsal    -> eval3    [taillabel="No", labeldistance=2, labelangle=-45]
+   eval3   -> fcur2
+   fsal    -> copy1    [taillabel="Yes", labeldistance=2, labelangle=45]
+   copy1   -> fcur2
+   fcur2   -> stages1 -> complete
+
+   // -------------
+   // Complete step
+   // -------------
+
+   interp_update [label="Interpolation enabled?"]
+   interp_type1  [label="Using Hermite interpolation?"]
+   f0q3          [label="Has f(tn, yn) been computed?"]
+   update_yn     [label="Copy tcur, ycur to tn, yn"]
+   fcur3         [label="Set fn_is_current to False", style=filled, fillcolor=tomato1]
+
+   complete      -> interp_update
+   interp_update -> update_yn     [taillabel="No", labeldistance=2, labelangle=45]
+   interp_update -> interp_type1  [taillabel="Yes", labeldistance=2, labelangle=-45]
+   interp_type1  -> update_yn     [taillabel="No", labeldistance=2, labelangle=45]
+   interp_type1  -> f0q3          [taillabel="Yes", labeldistance=2, labelangle=-45]
+   f0q3          -> update_yn     [taillabel="Yes", labeldistance=2, labelangle=45]
+   update_yn     -> fcur3
+
+   // ----------
+   // After step
+   // ----------
+
+   interp_eval  [label="Evaluate interpolant?"]
+   interp_type2 [label="Using Hermite interpolation?"]
+   f1q1         [label="Has f(tn, yn) been computed?"]
+   fsal1        [label="Is the method FSAL?", style=filled, fillcolor=slateblue1]
+   eval4        [label="Evaluate f(tn, yn)\lStore in F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=slateblue1]
+   copy2        [label="Copy F[s-1] to F[0]\lCopy F[0] to fn\l", style=filled, fillcolor=slateblue1]
+   fcur4        [label="Set fn_is_current to True", style=filled, fillcolor=lightgreen]
+   interp_yout  [label="Compute yout"]
+   step2        [label="Start Next Step"]
+
+   fcur3        -> interp_eval
+   interp_eval  -> step2        [taillabel="No", labeldistance=2, labelangle=45]
+   interp_eval  -> interp_type2 [taillabel="Yes", labeldistance=2, labelangle=-45]
+   interp_type2 -> interp_yout  [taillabel="No", labeldistance=2, labelangle=45]
+   interp_type2 -> f1q1         [taillabel="Yes", labeldistance=2, labelangle=-45]
+   f1q1         -> fsal1        [taillabel="No", labeldistance=2, labelangle=45]
+   fsal1        -> eval4        [taillabel="No", labeldistance=2, labelangle=-45]
+   eval4        -> fcur4
+   fsal1        -> copy2        [taillabel="Yes", labeldistance=2, labelangle=45]
+   copy2        -> fcur4
+   fcur4        -> interp_yout -> step2
+
+
+ARKStep Full RHS
+================
+
+.. digraph:: ark_fullrhs_start
+   :caption: ARKStep Full RHS Start
+
+   node [shape=box, style=filled, fillcolor=white]
+   splines=ortho
+   bgcolor=lightskyblue
+
+   // --------------
+   // Full RHS Start
+   // --------------
+
+   fcur   [label="Has f(tn, yn) been computed?"]
+   eval   [label="Evaluate fe(tn, yn), fi(tn,yn)\lStore in Fe[0], Fi[0]\l"]
+   mass_a [label="Is there a mass matrix?"]
+   mass_b [label="Is M time dependent?"]
+   mass_c [label="Solve M(t) u = Fe[0], M(t) v = Fi[0]\lStore u, v in Fe[0], Fi[0]\lCopy Fe[0] + Fi[0] to f\l"]
+   mass_d [label="Copy Fe[0] + Fi[0] to f\lSolve M x = f\lCopy x to f\l"]
+   copy   [label="Copy Fe[0] + Fi[0] to f"]
+   return [label="Set fn_is_current to True", style=filled, fillcolor=lightgreen]
+
+   fcur   -> copy   [taillabel="Yes", labeldistance=2, labelangle=45]
+   fcur   -> eval   [taillabel="No", labeldistance=2, labelangle=45]
+   eval   -> mass_a
+   mass_a -> copy   [taillabel="No", labeldistance=2, labelangle=45]
+   copy   -> return
+   mass_a -> mass_b [taillabel="Yes", labeldistance=2, labelangle=-45]
+   mass_b -> mass_c [taillabel="Yes", labeldistance=2, labelangle=-45]
+   mass_c -> return
+   mass_b -> mass_d [taillabel="No", labeldistance=2, labelangle=45]
+   mass_d -> return
+
+.. digraph:: ark_fullrhs_start
+   :caption: ARKStep Full RHS End
+
+   node [shape=box, style=filled, fillcolor=white]
+   splines=ortho
+   bgcolor=slateblue1
+
+   // ------------
+   // Full RHS End
+   // ------------
+
+   fcur    [label="Has f(tn, yn) been computed?"]
+   sa      [label="Is the method stiffly accurate?"]
+   eval    [label="Evaluate fe(tn, yn), fi(tn, yn)\lStore in Fe[0], Fi[0]\l"]
+   mass_a1 [label="Is there a mass matrix?"]
+   mass_a2 [label="Is there a mass matrix?"]
+   mass_b1 [label="Is M time dependent?"]
+   mass_b2 [label="Is M time dependent?"]
+   mass_c  [label="Solve M(t) u = Fe[0], M(t) v = Fi[0]\lStore u, v in Fe[0], Fi[0]\lCopy Fe[0] + Fi[0] to fn\l"]
+   mass_d1 [label="Solve M x = fn\lCopy x to fn\l"]
+   mass_d2 [label="Copy Fe[0] + Fi[0] to fn\lSolve M x = fn\lCopy x to fn\l"]
+   copy_1  [label="Copy Fe[0] + Fi[0] to fn"]
+   copy_2  [label="Copy Fe[s-1], Fi[s-1] to Fe[0], Fi[0]\lCopy Fe[0] + Fi[0] to fn\l"]
+   return  [label="Set fn_is_current to True", style=filled, fillcolor=lightgreen]
+
+   fcur         -> copy_1       [taillabel="Yes", labeldistance=2, labelangle=45]
+   fcur         -> sa           [taillabel="No", labeldistance=2, labelangle=45]
+   sa           -> copy_2       [taillabel="Yes", labeldistance=2, labelangle=45]
+   copy_2       -> mass_a1
+   mass_a1      -> return       [taillabel="No", labeldistance=2, labelangle=-45]
+   mass_a1      -> mass_b1      [taillabel="Yes", labeldistance=2, labelangle=45]
+   mass_b1      -> mass_d1      [taillabel="No", labeldistance=2, labelangle=-45]
+   mass_d1      -> return
+   mass_b1      -> return       [taillabel="Yes", labeldistance=2, labelangle=45]
+   sa           -> eval         [taillabel="No", labeldistance=2, labelangle=-45]
+   eval         -> mass_a2
+   mass_a2      -> copy_1       [taillabel="No", labeldistance=2, labelangle=45]
+   copy_1       -> return
+   mass_a2      -> mass_b2      [taillabel="Yes", labeldistance=2, labelangle=-45]
+   mass_b2      -> mass_c       [taillabel="Yes", labeldistance=2, labelangle=-45]
+   mass_c       -> return
+   mass_b2      -> mass_d2      [taillabel="No", labeldistance=2, labelangle=45]
+   mass_d2      -> return
+
+
+.. digraph:: ark_fullrhs
+
+   node [shape=box]
+   splines=ortho
+
+   // -----------------
+   // Before first step
+   // -----------------
+
+   init    [label="Initialize integrator\lCopy t0, y0 to tn, yn\l"]
+   f0cur   [label="Set fn_is_current to False", style=filled, fillcolor=tomato1]
+   h0      [label="Is h0 provided?"]
+   f0_q    [label="Has f(tn, yn) been computed?"]
+   rhs_1   [label="Call Full RHS Start", style=filled, fillcolor=lightskyblue]
+   h0_comp [label="Compute h0"]
+   start   [label="Start Step"]
+
+   init -> f0cur -> h0
+   h0      -> start   [taillabel="Yes", labeldistance=2, labelangle=45]
+   h0      -> f0_q    [taillabel="No", labeldistance=2, labelangle=-45]
+   f0_q    -> h0_comp [taillabel="Yes", labeldistance=2, labelangle=45]
+   f0_q    -> rhs_1 [taillabel="No", labeldistance=2, labelangle=-45]
+   rhs_1   -> h0_comp
+   h0_comp -> start
+
+   // ----------
+   // Start step
+   // ----------
+
+   method_q [label="Is the first stage explicit?\nor\nIs the method stiffly accurate and Hermite interpolation is used?"]
+   step_q   [label="Is this the first step after initial setup?"]
+   fn_q     [label="Has f(tn, yn) been computed?"]
+   rhs_2    [label="Call Full RHS Start", style=filled, fillcolor=lightskyblue]
+   rhs_3    [label="Call Full RHS End", style=filled, fillcolor=slateblue1]
+   stages   [label="Compute Stages"]
+   complete [label="Complete Step"]
+
+   start    -> method_q
+   method_q -> stages   [taillabel="No", labeldistance=2, labelangle=45]
+   method_q -> fn_q     [taillabel="Yes", labeldistance=2, labelangle=-45]
+   fn_q -> stages       [taillabel="Yes", labeldistance=2, labelangle=-45]
+   fn_q -> step_q       [taillabel="No", labeldistance=2, labelangle=-45]
+   step_q -> rhs_2      [taillabel="Yes", labeldistance=2, labelangle=-45]
+   step_q -> rhs_3      [taillabel="No", labeldistance=2, labelangle=-45]
+   rhs_2 -> stages
+   rhs_3 -> stages
+   stages -> complete
+
+   // -------------
+   // Complete step
+   // -------------
+
+   interp_update [label="Interpolation enabled?"]
+   interp_type1  [label="Using Hermite interpolation?"]
+   f0q3          [label="Has f(tn, yn) been computed?"]
+   rhs3          [label="Call Full RHS Start", style=filled, fillcolor=lightskyblue]
+   update_yn     [label="Copy tcur, ycur to tn, yn"]
+   fcur1         [label="Set fn_is_current to False", style=filled, fillcolor=tomato1]
+
+   complete      -> interp_update
+   interp_update -> update_yn     [taillabel="No", labeldistance=2, labelangle=45]
+   interp_update -> interp_type1  [taillabel="Yes", labeldistance=2, labelangle=-45]
+   interp_type1  -> update_yn     [taillabel="No", labeldistance=2, labelangle=45]
+   interp_type1  -> f0q3          [taillabel="Yes", labeldistance=2, labelangle=-45]
+   f0q3          -> update_yn     [taillabel="Yes", labeldistance=2, labelangle=45]
+   f0q3          -> rhs3          [taillabel="No", labeldistance=2, labelangle=-45]
+   rhs3          -> update_yn -> fcur1
+
+   // ----------
+   // After step
+   // ----------
+
+   interp_eval  [label="Evaluate interpolant?"]
+   interp_type2 [label="Using Hermite interpolation?"]
+   f1q1         [label="Has f(tn, yn) been computed?"]
+   rhs4         [label="Call Full RHS End", style=filled, fillcolor=slateblue1]
+   interp_yout  [label="Compute yout"]
+   return       [label="Start Next Step"]
+
+   fcur1        -> interp_eval
+   interp_eval  -> return       [taillabel="No", labeldistance=2, labelangle=45]
+   interp_eval  -> interp_type2 [taillabel="Yes", labeldistance=2, labelangle=-45]
+   interp_type2 -> interp_yout  [taillabel="No", labeldistance=2, labelangle=45]
+   interp_type2 -> f1q1         [taillabel="Yes", labeldistance=2, labelangle=-45]
+   f1q1         -> interp_yout  [taillabel="Yes", labeldistance=2, labelangle=45]
+   f1q1         -> rhs4         [taillabel="No", labeldistance=2, labelangle=45]
+   rhs4         -> interp_yout -> return
diff --git a/doc/sundials_developers/source/packages/index.rst b/doc/sundials_developers/source/packages/index.rst
new file mode 100644
index 0000000000..372543ead6
--- /dev/null
+++ b/doc/sundials_developers/source/packages/index.rst
@@ -0,0 +1,23 @@
+..
+   Author(s): David J. Gardner @ LLNL
+   -----------------------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   -----------------------------------------------------------------------------
+
+.. _Packages:
+
+Packages
+===========
+
+.. toctree::
+   :maxdepth: 2
+
+   ARKODE
diff --git a/doc/sundials_developers/source/style_guide/Documentation.rst b/doc/sundials_developers/source/style_guide/Documentation.rst
index 9aae3bfdc7..2041405fb6 100644
--- a/doc/sundials_developers/source/style_guide/Documentation.rst
+++ b/doc/sundials_developers/source/style_guide/Documentation.rst
@@ -18,7 +18,7 @@
 Documentation Style
 *******************
 
-Style guide for RestructuredText with Sphinx. For the most part, we attempt
+Style guide for reStructuredText with Sphinx. For the most part, we attempt
 to follow the Python developer's guide commentary on documentation (where relevant):
 https://devguide.python.org/documenting/#style-guide.
 
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
index 15fac77098..1a5c98eeab 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
@@ -307,7 +307,7 @@ struct UserData
   bool     pcg      = true;   // use PCG (true) or GMRES (false)
   bool     prec     = true;   // preconditioner on/off
   bool     lsinfo   = false;  // output residual history
-  int      liniters = 5;      // number of linear iterations
+  int      liniters = 10;     // number of linear iterations
   int      msbp     = 0;      // preconditioner setup frequency (0 = default)
   realtype epslin   = ZERO;   // linear solver tolerance factor (ZERO = default)
   N_Vector diag     = NULL;   // inverse of Jacobian diagonal
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--imex.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--imex.out
index b7c7a5805c..06735a9ae5 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--imex.out
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--imex.out
@@ -37,7 +37,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 5
+  lin iters      = 10
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -48,45 +48,45 @@
           t                     ||u||_rms      
  ----------------------------------------------
  0.000000000000000e+00    3.172144385112383e+00
- 5.000000000000000e-01    3.136781978966371e+00
- 1.000000000000000e+00    3.125095500559746e+00
- 1.500000000000000e+00    3.152620956520280e+00
- 2.000000000000000e+00    3.252033049944731e+00
- 2.500000000000000e+00    3.404813950977549e+00
- 3.000000000000000e+00    3.570162567428832e+00
- 3.500000000000000e+00    3.699962132487487e+00
- 4.000000000000000e+00    3.694761763072449e+00
- 4.500000000000000e+00    3.628565769394313e+00
- 5.000000000000000e+00    3.475500510795411e+00
- 5.500000000000000e+00    3.344032274118367e+00
- 6.000000000000000e+00    3.233949925729428e+00
- 6.500000000000000e+00    3.082058120794513e+00
- 7.000000000000000e+00    2.890442427981788e+00
- 7.500000000000000e+00    2.837091032458512e+00
- 8.000000000000000e+00    2.898054545259084e+00
- 8.500000000000000e+00    3.139933622385019e+00
- 9.000000000000000e+00    3.442183323454377e+00
- 9.500000000000000e+00    3.740380013622370e+00
- 1.000000000000000e+01    4.014473424455050e+00
+ 5.000000000000000e-01    3.136697189650961e+00
+ 1.000000000000000e+00    3.125045556354785e+00
+ 1.500000000000000e+00    3.152624763885952e+00
+ 2.000000000000000e+00    3.252110216645144e+00
+ 2.500000000000000e+00    3.404844617318184e+00
+ 3.000000000000000e+00    3.570312084328844e+00
+ 3.500000000000000e+00    3.700253327108766e+00
+ 4.000000000000000e+00    3.694878484122721e+00
+ 4.500000000000000e+00    3.628319195038670e+00
+ 5.000000000000000e+00    3.475278388464473e+00
+ 5.500000000000000e+00    3.343897893358916e+00
+ 6.000000000000000e+00    3.233978972947007e+00
+ 6.500000000000000e+00    3.082324512637206e+00
+ 7.000000000000000e+00    2.890530860599866e+00
+ 7.500000000000000e+00    2.837258314564151e+00
+ 8.000000000000000e+00    2.898203339016268e+00
+ 8.500000000000000e+00    3.140063067933301e+00
+ 9.000000000000000e+00    3.442273509340489e+00
+ 9.500000000000000e+00    3.740451074463314e+00
+ 1.000000000000000e+01    4.014529388100347e+00
  ----------------------------------------------
 
 Final integrator statistics:
   Steps            = 105
-  Step attempts    = 111
-  Error test fails = 6
-  RHS reaction     = 447
-  RHS diffusion    = 780
-  NLS iters        = 333
+  Step attempts    = 112
+  Error test fails = 7
+  RHS reaction     = 443
+  RHS diffusion    = 779
+  NLS iters        = 336
   NLS fails        = 0
-  LS iters         = 1638
-  LS fails         = 300
+  LS iters         = 2697
+  LS fails         = 87
   LS setups        = 0
-  LS RHS evals     = 1638
-  Jv products      = 1638
+  LS RHS evals     = 2697
+  Jv products      = 2697
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 4.918919
+  Avg LS iters per NLS iter      = 8.026786
 
   Preconditioner setups = 0
-  Preconditioner solves = 1638
+  Preconditioner solves = 2697
 
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-arkstep.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-arkstep.out
index 44e9ca39ad..ae206aafd4 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-arkstep.out
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-arkstep.out
@@ -40,7 +40,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 5
+  lin iters      = 10
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -51,49 +51,49 @@
           t                     ||u||_rms      
  ----------------------------------------------
  0.000000000000000e+00    3.172144385112383e+00
- 5.000000000000000e-01    3.136741760177363e+00
- 1.000000000000000e+00    3.125063288126960e+00
- 1.500000000000000e+00    3.152612100930424e+00
- 2.000000000000000e+00    3.252042400952964e+00
- 2.500000000000000e+00    3.404761539326434e+00
- 3.000000000000000e+00    3.570183798164206e+00
- 3.500000000000000e+00    3.699958243267201e+00
- 4.000000000000000e+00    3.694644394786519e+00
- 4.500000000000000e+00    3.628182390566946e+00
- 5.000000000000000e+00    3.475214313463735e+00
- 5.500000000000000e+00    3.343937480671038e+00
- 6.000000000000000e+00    3.234080840699362e+00
- 6.500000000000000e+00    3.082501265216459e+00
- 7.000000000000000e+00    2.890793620590566e+00
- 7.500000000000000e+00    2.837373326530296e+00
- 8.000000000000000e+00    2.898190808646831e+00
- 8.500000000000000e+00    3.139962981781891e+00
- 9.000000000000000e+00    3.442134760530028e+00
- 9.500000000000000e+00    3.740312877536207e+00
- 1.000000000000000e+01    4.014396629231554e+00
+ 5.000000000000000e-01    3.136741760652088e+00
+ 1.000000000000000e+00    3.125063175301122e+00
+ 1.500000000000000e+00    3.152612863029649e+00
+ 2.000000000000000e+00    3.252046438757223e+00
+ 2.500000000000000e+00    3.404770336275880e+00
+ 3.000000000000000e+00    3.570197843463192e+00
+ 3.500000000000000e+00    3.699979298705992e+00
+ 4.000000000000000e+00    3.694673743577147e+00
+ 4.500000000000000e+00    3.628192807357139e+00
+ 5.000000000000000e+00    3.475181871691853e+00
+ 5.500000000000000e+00    3.343883541753708e+00
+ 6.000000000000000e+00    3.234020189727759e+00
+ 6.500000000000000e+00    3.082396969215168e+00
+ 7.000000000000000e+00    2.890645348225157e+00
+ 7.500000000000000e+00    2.837264086636537e+00
+ 8.000000000000000e+00    2.898204389104409e+00
+ 8.500000000000000e+00    3.140043837970826e+00
+ 9.000000000000000e+00    3.442234882231944e+00
+ 9.500000000000000e+00    3.740410418605710e+00
+ 1.000000000000000e+01    4.014486526389547e+00
  ----------------------------------------------
 
 Final integrator statistics:
 
 Slow Integrator:
   Steps            = 132
-  RHS diffusion    = 793
+  RHS diffusion    = 792
   NLS iters        = 396
   NLS fails        = 0
-  LS iters         = 1958
-  LS fails         = 360
+  LS iters         = 2633
+  LS fails         = 1
   LS setups        = 0
-  LS RHS evals     = 1958
-  Jv products      = 1958
+  LS RHS evals     = 2633
+  Jv products      = 2633
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 4.944444
+  Avg LS iters per NLS iter      = 6.648990
 
   Preconditioner setups = 0
-  Preconditioner solves = 1958
+  Preconditioner solves = 2633
 
 Fast Integrator:
-  Steps            = 472
-  Step attempts    = 472
+  Steps            = 470
+  Step attempts    = 470
   Error test fails = 0
-  RHS reaction     = 2419
+  RHS reaction     = 1827
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out
index 7db0c6bb47..eb6c3b2f7a 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out
@@ -40,7 +40,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 5
+  lin iters      = 10
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -52,50 +52,50 @@
  ----------------------------------------------
  0.000000000000000e+00    3.172144385112383e+00
  5.000000000000000e-01    3.136722629465066e+00
- 1.000000000000000e+00    3.125057666159531e+00
- 1.500000000000000e+00    3.152636290021100e+00
- 2.000000000000000e+00    3.252083347119256e+00
- 2.500000000000000e+00    3.404787326260405e+00
- 3.000000000000000e+00    3.570169612064414e+00
- 3.500000000000000e+00    3.699861041719807e+00
- 4.000000000000000e+00    3.694342711292659e+00
- 4.500000000000000e+00    3.627870941932435e+00
- 5.000000000000000e+00    3.474902190560723e+00
- 5.500000000000000e+00    3.343695434939634e+00
- 6.000000000000000e+00    3.233894498163541e+00
- 6.500000000000000e+00    3.082341713678574e+00
- 7.000000000000000e+00    2.890723917928596e+00
- 7.500000000000000e+00    2.837417967150272e+00
- 8.000000000000000e+00    2.898409418371463e+00
- 8.500000000000000e+00    3.140209829663979e+00
- 9.000000000000000e+00    3.442357276093309e+00
- 9.500000000000000e+00    3.740503273636440e+00
- 1.000000000000000e+01    4.014544572497562e+00
+ 1.000000000000000e+00    3.125057552024107e+00
+ 1.500000000000000e+00    3.152636979017849e+00
+ 2.000000000000000e+00    3.252085784090209e+00
+ 2.500000000000000e+00    3.404791619294692e+00
+ 3.000000000000000e+00    3.570175845435155e+00
+ 3.500000000000000e+00    3.699871659893790e+00
+ 4.000000000000000e+00    3.694354186527817e+00
+ 4.500000000000000e+00    3.627867393042675e+00
+ 5.000000000000000e+00    3.474857085470333e+00
+ 5.500000000000000e+00    3.343640002216232e+00
+ 6.000000000000000e+00    3.233844046127571e+00
+ 6.500000000000000e+00    3.082251062694838e+00
+ 7.000000000000000e+00    2.890585369424622e+00
+ 7.500000000000000e+00    2.837315452756236e+00
+ 8.000000000000000e+00    2.898424893363213e+00
+ 8.500000000000000e+00    3.140291028418725e+00
+ 9.000000000000000e+00    3.442457327275146e+00
+ 9.500000000000000e+00    3.740600281636448e+00
+ 1.000000000000000e+01    4.014633157708740e+00
  ----------------------------------------------
 
 Final integrator statistics:
 
 Slow Integrator:
   Steps            = 132
-  RHS diffusion    = 793
+  RHS diffusion    = 792
   NLS iters        = 396
   NLS fails        = 0
-  LS iters         = 1958
-  LS fails         = 361
+  LS iters         = 2640
+  LS fails         = 0
   LS setups        = 0
-  LS RHS evals     = 1958
-  Jv products      = 1958
+  LS RHS evals     = 2640
+  Jv products      = 2640
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 4.944444
+  Avg LS iters per NLS iter      = 6.666667
 
   Preconditioner setups = 0
-  Preconditioner solves = 1958
+  Preconditioner solves = 2640
 
 Fast Integrator:
-  Steps            = 2058
+  Steps            = 2057
   Error test fails = 392
-  RHS reaction     = 4992
-  NLS iters        = 3804
+  RHS reaction     = 4991
+  NLS iters        = 3803
   NLS fails        = 0
 
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out
index f2aee774c9..2069d3daf0 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out
@@ -40,7 +40,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 5
+  lin iters      = 10
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -51,46 +51,46 @@
           t                     ||u||_rms      
  ----------------------------------------------
  0.000000000000000e+00    3.172144385112383e+00
- 5.000000000000000e-01    3.136728159494494e+00
- 1.000000000000000e+00    3.125054277650959e+00
- 1.500000000000000e+00    3.152604392883360e+00
- 2.000000000000000e+00    3.252018267648228e+00
- 2.500000000000000e+00    3.404688232954761e+00
- 3.000000000000000e+00    3.570039091260456e+00
- 3.500000000000000e+00    3.699700617638115e+00
- 4.000000000000000e+00    3.694127992765750e+00
- 4.500000000000000e+00    3.627693732995581e+00
- 5.000000000000000e+00    3.474745808958595e+00
- 5.500000000000000e+00    3.343638848927724e+00
- 6.000000000000000e+00    3.233956510132078e+00
- 6.500000000000000e+00    3.082497090887950e+00
- 7.000000000000000e+00    2.890880779320601e+00
- 7.500000000000000e+00    2.837548720834195e+00
- 8.000000000000000e+00    2.898444607824460e+00
- 8.500000000000000e+00    3.140194708467158e+00
- 9.000000000000000e+00    3.442324814047467e+00
- 9.500000000000000e+00    3.740458273532059e+00
- 1.000000000000000e+01    4.014484356709024e+00
+ 5.000000000000000e-01    3.136728141568442e+00
+ 1.000000000000000e+00    3.125054078969537e+00
+ 1.500000000000000e+00    3.152605475501787e+00
+ 2.000000000000000e+00    3.252022913428429e+00
+ 2.500000000000000e+00    3.404698680378851e+00
+ 3.000000000000000e+00    3.570053730764652e+00
+ 3.500000000000000e+00    3.699720763396807e+00
+ 4.000000000000000e+00    3.694157931241854e+00
+ 4.500000000000000e+00    3.627712125668464e+00
+ 5.000000000000000e+00    3.474734466021550e+00
+ 5.500000000000000e+00    3.343606933034505e+00
+ 6.000000000000000e+00    3.233915506336244e+00
+ 6.500000000000000e+00    3.082406527906669e+00
+ 7.000000000000000e+00    2.890736516064352e+00
+ 7.500000000000000e+00    2.837432528460552e+00
+ 8.000000000000000e+00    2.898441248594821e+00
+ 8.500000000000000e+00    3.140256919387213e+00
+ 9.000000000000000e+00    3.442407086783334e+00
+ 9.500000000000000e+00    3.740539247790086e+00
+ 1.000000000000000e+01    4.014559182532612e+00
  ----------------------------------------------
 
 Final integrator statistics:
 
 Slow Integrator:
   Steps            = 132
-  RHS diffusion    = 793
+  RHS diffusion    = 792
   NLS iters        = 396
   NLS fails        = 0
-  LS iters         = 1965
-  LS fails         = 358
+  LS iters         = 2630
+  LS fails         = 0
   LS setups        = 0
-  LS RHS evals     = 1965
-  Jv products      = 1965
+  LS RHS evals     = 2630
+  Jv products      = 2630
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 4.962121
+  Avg LS iters per NLS iter      = 6.641414
 
   Preconditioner setups = 0
-  Preconditioner solves = 1965
+  Preconditioner solves = 2630
 
 Fast Integrator:
   Steps            = 2002
diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
index 32623f530c..485c1115ff 100644
--- a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
@@ -1347,7 +1347,7 @@ static int InitUserData(UserData *udata)
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
   udata->lsinfo    = false;      // output residual history
-  udata->liniters  = 20;         // max linear iterations
+  udata->liniters  = 40;         // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
 
diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out
index 5a9b81eb98..7ab208a80b 100644
--- a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out
+++ b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out
@@ -26,7 +26,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 20
+  lin iters      = 40
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -37,45 +37,45 @@
           t                     ||u||_rms                max error      
  -----------------------------------------------------------------------
  0.000000000000000e+00    3.632812500000001e-01    0.000000000000000e+00
- 5.000000000000000e-02    3.551986504206954e-01    2.454704268845198e-03
- 1.000000000000000e-01    3.296221522563136e-01    2.894351312350718e-03
- 1.500000000000000e-01    2.894445052045986e-01    2.833234860738609e-03
- 2.000000000000000e-01    2.387097405487202e-01    2.521351471365452e-03
- 2.500000000000000e-01    1.824253004688915e-01    2.077548067353219e-03
- 3.000000000000000e-01    1.261158186733340e-01    1.577622926918210e-03
- 3.500000000000000e-01    7.529892942993587e-02    1.082586631952070e-03
- 4.000000000000000e-01    3.495153500642601e-02    6.466745969102711e-04
- 4.500000000000000e-01    9.023447459645315e-03    3.130355812321628e-04
- 4.999999999999999e-01    5.513862655620992e-05    1.155536642670245e-04
- 5.499999999999999e-01    8.918873554259306e-03    7.364539806451950e-05
- 6.000000000000000e-01    3.475277433850531e-02    1.915331682145610e-04
- 6.500000000000000e-01    7.502605966973638e-02    4.576681070362631e-04
- 7.000000000000001e-01    1.257964113977601e-01    8.457898377413064e-04
- 7.500000000000001e-01    1.820944185535271e-01    1.318767636581897e-03
- 8.000000000000002e-01    2.384087203852070e-01    1.828962145097535e-03
- 8.500000000000002e-01    2.892272171327287e-01    2.327446157641688e-03
- 9.000000000000002e-01    3.295754296203942e-01    2.765080717683888e-03
- 9.500000000000003e-01    3.555038632193712e-01    3.099435546668361e-03
- 1.000000000000000e+00    3.644741937247666e-01    3.297054597400817e-03
+ 5.000000000000000e-02    3.551988422773351e-01    2.455482033533629e-03
+ 1.000000000000000e-01    3.296234292363186e-01    2.897896070159778e-03
+ 1.500000000000000e-01    2.894441908882201e-01    2.832303715537221e-03
+ 2.000000000000000e-01    2.387114782162635e-01    2.525801964766261e-03
+ 2.500000000000000e-01    1.824256478587985e-01    2.078269197756610e-03
+ 3.000000000000000e-01    1.261168083661019e-01    1.580109403207297e-03
+ 3.500000000000000e-01    7.529981277589509e-02    1.084790395311314e-03
+ 4.000000000000000e-01    3.495180900127044e-02    6.472682226835030e-04
+ 4.500000000000000e-01    9.023693954928847e-03    3.135810291332412e-04
+ 4.999999999999999e-01    5.528701553701492e-05    1.158664422041093e-04
+ 5.499999999999999e-01    8.918915917846342e-03    7.372606743541107e-05
+ 6.000000000000000e-01    3.475275192986246e-02    1.914158585883952e-04
+ 6.500000000000000e-01    7.502609251530372e-02    4.577116765183409e-04
+ 7.000000000000001e-01    1.257965751119296e-01    8.461653253856172e-04
+ 7.500000000000001e-01    1.820941861384917e-01    1.318095298729283e-03
+ 8.000000000000002e-01    2.384093995726680e-01    1.830603288722976e-03
+ 8.500000000000002e-01    2.892274536259308e-01    2.327914434912759e-03
+ 9.000000000000002e-01    3.295751200296289e-01    2.764242715472154e-03
+ 9.500000000000003e-01    3.555039203503529e-01    3.099492697821171e-03
+ 1.000000000000000e+00    3.644737419510748e-01    3.296010382116465e-03
  -----------------------------------------------------------------------
 
 Final integrator statistics:
-  Steps            = 201
-  Step attempts    = 225
-  Error test fails = 24
-  RHS evals        = 1578
-  NLS iters        = 675
+  Steps            = 124
+  Step attempts    = 125
+  Error test fails = 1
+  RHS evals        = 753
+  NLS iters        = 375
   NLS fails        = 0
-  LS iters         = 13075
-  LS fails         = 623
-  LS setups        = 82
-  LS RHS evals     = 13075
-  Jv products      = 13075
+  LS iters         = 12925
+  LS fails         = 36
+  LS setups        = 56
+  LS RHS evals     = 12925
+  Jv products      = 12925
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 19.370370
+  Avg LS iters per NLS iter      = 34.466667
 
-  Preconditioner setups = 26
-  Preconditioner solves = 13075
+  Preconditioner setups = 4
+  Preconditioner solves = 12925
 
-  Max error = 3.297054597400817e-03
+  Max error = 3.296010382116465e-03
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out
index 995ecf1103..caced8662d 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out
@@ -39,33 +39,33 @@
           t                     ||u||_rms                max error      
  -----------------------------------------------------------------------
  0.000000000000000e+00    3.691406249999997e-01    0.000000000000000e+00
- 5.000000000000000e-02    3.603048616851151e-01    5.947581797283163e-04
- 1.000000000000000e-01    3.341442212572840e-01    7.029487839260717e-04
- 1.500000000000000e-01    2.933129364211772e-01    6.872104501928211e-04
- 2.000000000000000e-01    2.418371827909151e-01    6.138967488541480e-04
- 2.500000000000000e-01    1.847632280527681e-01    5.043531323443151e-04
- 3.000000000000000e-01    1.276840002010777e-01    3.835930211336658e-04
- 3.500000000000000e-01    7.618719033675811e-02    2.636045435802092e-04
- 4.000000000000000e-01    3.531419593151618e-02    1.573064662659523e-04
- 4.500000000000000e-01    9.066519343283548e-03    7.648430090645419e-05
- 4.999999999999999e-01    1.366001184678036e-05    2.823151530294188e-05
- 5.499999999999999e-01    9.040623250818201e-03    1.797011524983308e-05
- 6.000000000000000e-01    3.526521493345149e-02    4.668317652109510e-05
- 6.500000000000000e-01    7.611978800433235e-02    1.113065341032948e-04
- 7.000000000000001e-01    1.276052139912309e-01    2.055078043680103e-04
- 7.500000000000001e-01    1.846816872673240e-01    3.198179447260197e-04
- 8.000000000000002e-01    2.417622665681260e-01    4.436012109942933e-04
- 8.500000000000002e-01    2.932595626602583e-01    5.646811622962433e-04
- 9.000000000000002e-01    3.341325736101829e-01    6.709854988270481e-04
- 9.500000000000003e-01    3.603805168277087e-01    7.524532455107646e-04
- 1.000000000000000e+00    3.694333172773836e-01    7.994041692465093e-04
+ 5.000000000000000e-02    3.603048616826305e-01    5.947581725728179e-04
+ 1.000000000000000e-01    3.341442212752840e-01    7.029488321168564e-04
+ 1.500000000000000e-01    2.933129364265377e-01    6.872104657476008e-04
+ 2.000000000000000e-01    2.418371828053933e-01    6.138967875570778e-04
+ 2.500000000000000e-01    1.847632280574957e-01    5.043531454586581e-04
+ 3.000000000000000e-01    1.276840002086280e-01    3.835930415112543e-04
+ 3.500000000000000e-01    7.618719032747635e-02    2.636045188839364e-04
+ 4.000000000000000e-01    3.531419592900913e-02    1.573064596348678e-04
+ 4.500000000000000e-01    9.066519339379787e-03    7.648429036438351e-05
+ 4.999999999999999e-01    1.366001182955177e-05    2.823151525618881e-05
+ 5.499999999999999e-01    9.040623249804479e-03    1.797011257123962e-05
+ 6.000000000000000e-01    3.526521493542883e-02    4.668318201425659e-05
+ 6.500000000000000e-01    7.611978800168785e-02    1.113065272947134e-04
+ 7.000000000000001e-01    1.276052139795591e-01    2.055077733625899e-04
+ 7.500000000000001e-01    1.846816872915430e-01    3.198180091384950e-04
+ 8.000000000000002e-01    2.417622665897318e-01    4.436012686822588e-04
+ 8.500000000000002e-01    2.932595626759321e-01    5.646812043804683e-04
+ 9.000000000000002e-01    3.341325736187308e-01    6.709855218931526e-04
+ 9.500000000000003e-01    3.603805168237891e-01    7.524532351810276e-04
+ 1.000000000000000e+00    3.694333172786589e-01    7.994041731159696e-04
  -----------------------------------------------------------------------
 
 Final integrator statistics:
   Steps            = 134
   Step attempts    = 135
   Error test fails = 1
-  RHS evals        = 948
+  RHS evals        = 813
   NLS iters        = 405
   NLS fails        = 0
   LS iters         = 2925
@@ -76,4 +76,4 @@ Final integrator statistics:
   Avg NLS iters per step attempt = 3.000000
   Avg LS iters per NLS iter      = 7.222222
 
-  Max error = 7.994041692465093e-04
+  Max error = 7.994041731159696e-04
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out
index 72c9868caa..3aa6089418 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out
@@ -40,33 +40,33 @@
           t                     ||u||_rms                max error      
  -----------------------------------------------------------------------
  0.000000000000000e+00    3.691406249999997e-01    0.000000000000000e+00
- 5.000000000000000e-02    3.603048619327799e-01    5.947588761685552e-04
- 1.000000000000000e-01    3.341442198324603e-01    7.029449875427529e-04
- 1.500000000000000e-01    2.933129359408688e-01    6.872090865805980e-04
- 2.000000000000000e-01    2.418371816114719e-01    6.138936173949450e-04
- 2.500000000000000e-01    1.847632276987459e-01    5.043521686299290e-04
- 3.000000000000000e-01    1.276839996709629e-01    3.835916125021210e-04
- 3.500000000000000e-01    7.618719090432620e-02    2.636060692945696e-04
- 4.000000000000000e-01    3.531419605764338e-02    1.573068055824300e-04
- 4.500000000000000e-01    9.066519483453687e-03    7.648468362444691e-05
- 4.999999999999999e-01    1.366000934602030e-05    2.823150954460473e-05
- 5.499999999999999e-01    9.040623272556180e-03    1.797017413211754e-05
- 6.000000000000000e-01    3.526521486171871e-02    4.668298506418922e-05
- 6.500000000000000e-01    7.611978811657902e-02    1.113068278075224e-04
- 7.000000000000001e-01    1.276052146286863e-01    2.055095081313074e-04
- 7.500000000000001e-01    1.846816856478577e-01    3.198136633395521e-04
- 8.000000000000002e-01    2.417622647584950e-01    4.435963861751935e-04
- 8.500000000000002e-01    2.932595610245435e-01    5.646767564563282e-04
- 9.000000000000002e-01    3.341325725110011e-01    6.709825281477899e-04
- 9.500000000000003e-01    3.603805174370124e-01    7.524548362450867e-04
- 1.000000000000000e+00    3.694333171114552e-01    7.994036412738437e-04
+ 5.000000000000000e-02    3.603048619753333e-01    5.947590016540660e-04
+ 1.000000000000000e-01    3.341442195764323e-01    7.029443280297532e-04
+ 1.500000000000000e-01    2.933129358633914e-01    6.872088817982958e-04
+ 2.000000000000000e-01    2.418371813857269e-01    6.138930097124851e-04
+ 2.500000000000000e-01    1.847632276239268e-01    5.043519623673109e-04
+ 3.000000000000000e-01    1.276839995499893e-01    3.835912864304514e-04
+ 3.500000000000000e-01    7.618719105489918e-02    2.636064591631515e-04
+ 4.000000000000000e-01    3.531419609803035e-02    1.573069173000513e-04
+ 4.500000000000000e-01    9.066519524079126e-03    7.648478735214695e-05
+ 4.999999999999999e-01    1.366000892977262e-05    2.823150845772370e-05
+ 5.499999999999999e-01    9.040623278407151e-03    1.797019017690110e-05
+ 6.000000000000000e-01    3.526521486057654e-02    4.668298068317978e-05
+ 6.500000000000000e-01    7.611978811031622e-02    1.113068150605245e-04
+ 7.000000000000001e-01    1.276052145445968e-01    2.055092828922023e-04
+ 7.500000000000001e-01    1.846816859443554e-01    3.198144283996229e-04
+ 8.000000000000002e-01    2.417622651778854e-01    4.435975267760295e-04
+ 8.500000000000002e-01    2.932595614654954e-01    5.646779628073473e-04
+ 9.000000000000002e-01    3.341325728392148e-01    6.709834145076643e-04
+ 9.500000000000003e-01    3.603805172400869e-01    7.524543311739906e-04
+ 1.000000000000000e+00    3.694333171606730e-01    7.994038031826634e-04
  -----------------------------------------------------------------------
 
 Final integrator statistics:
   Steps            = 134
   Step attempts    = 135
   Error test fails = 1
-  RHS evals        = 948
+  RHS evals        = 813
   NLS iters        = 405
   NLS fails        = 0
   LS iters         = 2482
@@ -82,4 +82,4 @@ Final integrator statistics:
   Preconditioner solves = 2482
   PFMG iters            = 2482
 
-  Max error = 7.994036412738437e-04
+  Max error = 7.994038031826634e-04
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex_--np_2_2.out
index 370707799c..66fc95aae1 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex_--np_2_2.out
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex_--np_2_2.out
@@ -40,15 +40,15 @@
           t                     ||u||_rms      
  ----------------------------------------------
  0.000000000000000e+00    3.691406249999997e-01
- 1.000000000000000e-01    5.162013648736323e-02
- 2.000000000000000e-01    7.426103375907699e-03
- 3.000000000000000e-01    1.067221964126028e-03
- 4.000000000000000e-01    1.533639279173463e-04
- 5.000000000000000e-01    2.203893657177772e-05
- 6.000000000000000e-01    3.167052399497521e-06
- 7.000000000000000e-01    4.550960415372650e-07
- 7.999999999999999e-01    6.537285820788082e-08
- 8.999999999999999e-01    9.413914309992992e-09
+ 1.000000000000000e-01    5.162013561953564e-02
+ 2.000000000000000e-01    7.426103216931702e-03
+ 3.000000000000000e-01    1.067221955570474e-03
+ 4.000000000000000e-01    1.533639242649863e-04
+ 5.000000000000000e-01    2.203893152743892e-05
+ 6.000000000000000e-01    3.167052161936452e-06
+ 7.000000000000000e-01    4.550959197622963e-07
+ 7.999999999999999e-01    6.537253782319481e-08
+ 8.999999999999999e-01    9.573763963251624e-09
  1.000000000000000e+00    1.326291426916513e-09
  ----------------------------------------------
 
@@ -56,7 +56,7 @@ Final fast integrator statistics:
   Steps            = 722
   Step attempts    = 722
   Error test fails = 0
-  RHS evals        = 5445
+  RHS evals        = 5444
   NLS iters        = 2554
   NLS fails        = 0
   LS iters         = 8545
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out
index 0473af4ffa..5c1a518ea8 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out
@@ -42,21 +42,21 @@
           t                     ||u||_rms      
  ----------------------------------------------
  0.000000000000000e+00    3.691406249999997e-01
- 1.000000000000000e-01    5.162012484063394e-02
- 2.000000000000000e-01    7.426100623733855e-03
- 3.000000000000000e-01    1.067221389928324e-03
- 4.000000000000000e-01    1.533638122100311e-04
- 5.000000000000000e-01    2.203890106093356e-05
- 6.000000000000000e-01    3.167064486065304e-06
- 7.000000000000000e-01    4.551179117995729e-07
- 7.999999999999999e-01    6.540200053027528e-08
- 8.999999999999999e-01    9.398526428504205e-09
- 1.000000000000000e+00    1.350608973293624e-09
+ 1.000000000000000e-01    5.162014241947240e-02
+ 2.000000000000000e-01    7.426100187263422e-03
+ 3.000000000000000e-01    1.067221316468460e-03
+ 4.000000000000000e-01    1.533638016722887e-04
+ 5.000000000000000e-01    2.203889954704845e-05
+ 6.000000000000000e-01    3.167064268518253e-06
+ 7.000000000000000e-01    4.551178805373316e-07
+ 7.999999999999999e-01    6.540199603778498e-08
+ 8.999999999999999e-01    9.398525782915539e-09
+ 1.000000000000000e+00    1.350608880519736e-09
  ----------------------------------------------
 
 Final slow integrator statistics:
   Steps            = 1000
-  RHS evals        = 7356
+  RHS evals        = 7355
   NLS iters        = 3355
   NLS fails        = 0
   LS iters         = 10603
@@ -74,7 +74,7 @@ Final fast integrator statistics:
   Steps            = 3003
   Step attempts    = 3003
   Error test fails = 0
-  RHS evals        = 33857
+  RHS evals        = 29862
   NLS iters        = 17842
   NLS fails        = 0
   LS iters         = 10048
diff --git a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.out b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.out
index 06a9c9284d..ea8c1ea7d6 100644
--- a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.out
+++ b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.out
@@ -31,15 +31,15 @@ Problem parameters and options:
           t                     ||y||_rms      
  ----------------------------------------------
  0.000000000000000e+00    4.029895706298216e+00
- 3.000000000000000e-01    3.942279347418077e+00
- 6.000000000000000e-01    3.877431469116385e+00
- 8.999999999999999e-01    3.793649083180712e+00
- 1.200000000000000e+00    3.689067746332020e+00
- 1.500000000000000e+00    3.567028985343041e+00
- 1.800000000000000e+00    3.439281992076554e+00
- 2.100000000000000e+00    3.320144385200880e+00
- 2.400000000000000e+00    3.219721039168443e+00
- 2.700000000000000e+00    3.146930769180139e+00
+ 3.000000000000000e-01    3.942280121135499e+00
+ 6.000000000000000e-01    3.877434662389668e+00
+ 8.999999999999999e-01    3.793654006700049e+00
+ 1.200000000000000e+00    3.689067718768748e+00
+ 1.500000000000000e+00    3.567028830880791e+00
+ 1.800000000000000e+00    3.439281683889970e+00
+ 2.100000000000000e+00    3.320143971224290e+00
+ 2.400000000000000e+00    3.219720187221883e+00
+ 2.700000000000000e+00    3.146931515115551e+00
  3.000000000000000e+00    3.110922385062612e+00
  ----------------------------------------------
 
@@ -47,8 +47,8 @@ Final integrator statistics:
   Steps              = 23
   Step attempts      = 24
   Error test fails   = 0
-  Explicit RHS evals = 96
-  Implicit RHS evals = 288
+  Explicit RHS evals = 94
+  Implicit RHS evals = 286
   NLS iters          = 192
   NLS fails          = 7
   LS setups          = 16
diff --git a/examples/arkode/CXX_serial/ark_heat2D.cpp b/examples/arkode/CXX_serial/ark_heat2D.cpp
index 3a78042a25..ae654ff5d0 100644
--- a/examples/arkode/CXX_serial/ark_heat2D.cpp
+++ b/examples/arkode/CXX_serial/ark_heat2D.cpp
@@ -691,7 +691,7 @@ static int InitUserData(UserData *udata)
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
   udata->lsinfo    = false;      // output residual history
-  udata->liniters  = 20;         // max linear iterations
+  udata->liniters  = 40;         // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
 
diff --git a/examples/arkode/CXX_serial/ark_heat2D.out b/examples/arkode/CXX_serial/ark_heat2D.out
index 78a569fc79..07fbd3c159 100644
--- a/examples/arkode/CXX_serial/ark_heat2D.out
+++ b/examples/arkode/CXX_serial/ark_heat2D.out
@@ -20,7 +20,7 @@
   linear         = 1
  --------------------------------- 
   linear solver  = PCG
-  lin iters      = 20
+  lin iters      = 40
   eps lin        = 0
   prec           = 1
   msbp           = 0
@@ -31,45 +31,45 @@
           t                     ||u||_rms                max error      
  -----------------------------------------------------------------------
  0.000000000000000e+00    3.632812500000000e-01    0.000000000000000e+00
- 5.000000000000000e-02    3.551986506970737e-01    2.454708334354683e-03
- 1.000000000000000e-01    3.296221524496879e-01    2.894333980192343e-03
- 1.500000000000000e-01    2.894444182004682e-01    2.832987149069655e-03
- 2.000000000000000e-01    2.387098264599945e-01    2.521582136275402e-03
- 2.500000000000000e-01    1.824252212041233e-01    2.077346466104524e-03
- 3.000000000000000e-01    1.261157381228246e-01    1.577424243514536e-03
- 3.500000000000000e-01    7.529904383258686e-02    1.082876471873273e-03
- 4.000000000000000e-01    3.495155701826252e-02    6.467375369675482e-04
- 4.500000000000000e-01    9.023496104529438e-03    3.131515037812990e-04
- 4.999999999999999e-01    5.514776992824374e-05    1.155729556710013e-04
- 5.499999999999999e-01    8.918881510806801e-03    7.366549900058444e-05
- 6.000000000000000e-01    3.475274602119641e-02    1.914543241995081e-04
- 6.500000000000000e-01    7.502608870114677e-02    4.577447220200370e-04
- 7.000000000000001e-01    1.257965457940830e-01    8.461313384890978e-04
- 7.500000000000001e-01    1.820944007923683e-01    1.318710942714962e-03
- 8.000000000000002e-01    2.384087154352889e-01    1.828963073706169e-03
- 8.500000000000002e-01    2.892273973706390e-01    2.327791690218795e-03
- 9.000000000000002e-01    3.295756160298886e-01    2.765521979463892e-03
- 9.500000000000003e-01    3.555038689873394e-01    3.099441273207049e-03
- 1.000000000000000e+00    3.644742066608401e-01    3.297074883238493e-03
+ 5.000000000000000e-02    3.551988422792973e-01    2.455482048598578e-03
+ 1.000000000000000e-01    3.296234292110422e-01    2.897895995286115e-03
+ 1.500000000000000e-01    2.894441909302122e-01    2.832303854545248e-03
+ 2.000000000000000e-01    2.387114783517686e-01    2.525802321085235e-03
+ 2.500000000000000e-01    1.824256479734333e-01    2.078269488693274e-03
+ 3.000000000000000e-01    1.261168083293890e-01    1.580109287144749e-03
+ 3.500000000000000e-01    7.529981275357446e-02    1.084790334542951e-03
+ 4.000000000000000e-01    3.495180902992235e-02    6.472683008614116e-04
+ 4.500000000000000e-01    9.023693952669724e-03    3.135810223303982e-04
+ 4.999999999999999e-01    5.528701552159280e-05    1.158664421454541e-04
+ 5.499999999999999e-01    8.918915918112386e-03    7.372606746483198e-05
+ 6.000000000000000e-01    3.475275193284167e-02    1.914158675670324e-04
+ 6.500000000000000e-01    7.502609250656343e-02    4.577116535290637e-04
+ 7.000000000000001e-01    1.257965751177328e-01    8.461653470575592e-04
+ 7.500000000000001e-01    1.820941861469086e-01    1.318095315867573e-03
+ 8.000000000000002e-01    2.384093995809592e-01    1.830603315116197e-03
+ 8.500000000000002e-01    2.892274536079913e-01    2.327914393411401e-03
+ 9.000000000000002e-01    3.295751199857850e-01    2.764242599605837e-03
+ 9.500000000000003e-01    3.555039203642584e-01    3.099492771073020e-03
+ 1.000000000000000e+00    3.644737419562301e-01    3.296010393803339e-03
  -----------------------------------------------------------------------
 
 Final integrator statistics:
-  Steps            = 198
-  Step attempts    = 220
-  Error test fails = 22
-  RHS evals        = 1543
-  NLS iters        = 660
+  Steps            = 124
+  Step attempts    = 125
+  Error test fails = 1
+  RHS evals        = 753
+  NLS iters        = 375
   NLS fails        = 0
-  LS iters         = 12758
-  LS fails         = 609
-  LS setups        = 77
-  LS RHS evals     = 12758
-  Jv products      = 12758
+  LS iters         = 12926
+  LS fails         = 37
+  LS setups        = 56
+  LS RHS evals     = 12926
+  Jv products      = 12926
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 19.330303
+  Avg LS iters per NLS iter      = 34.469333
 
-  Preconditioner setups = 24
-  Preconditioner solves = 12758
+  Preconditioner setups = 4
+  Preconditioner solves = 12926
 
-  Max error = 3.297074883238493e-03
+  Max error = 3.296010393803339e-03
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt.cpp b/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
index 53a6e56ec5..83e549c031 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
@@ -631,6 +631,8 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
     if (check_retval(&retval, "ARKStepSetLSetupFrequency", 1)) return 1;
     retval = ARKStepSetMaxNonlinIters(arkode_mem, 20);
     if (check_retval(&retval, "ARKStepSetMaxNonlinIters", 1)) return 1;
+    retval = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+    if (check_retval(&retval, "ARKStepSetNonlinConvCoef", 1)) return 1;
   }
 
   // Set array of fixed step sizes to use, storage for corresponding errors/orders
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out
index 28232c62c7..8a2bebd177 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out
@@ -16,8 +16,8 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
    h = 1.250e-01,  error = 1.367e-05,  order = 1.54
    h = 6.250e-02,  error = 3.085e-06,  order = 2.15
    h = 3.125e-02,  error = 4.714e-07,  order = 2.71
-   h = 1.562e-02,  error = 5.336e-08,  order = 3.14
-   h = 7.812e-03,  error = 4.819e-09,  order = 3.47
-   h = 3.906e-03,  error = 3.726e-10,  order = 3.69
+   h = 1.562e-02,  error = 5.337e-08,  order = 3.14
+   h = 7.812e-03,  error = 4.828e-09,  order = 3.47
+   h = 3.906e-03,  error = 3.726e-10,  order = 3.70
  -----------------------------------------------------
- Order: max = 3.69,  avg = 2.53,  overall = 2.57 [SUCCESS]
+ Order: max = 3.70,  avg = 2.53,  overall = 2.57 [SUCCESS]
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out
index f38ae7c147..e3c31815e3 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_3_0_-10_0.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717671    1.324640  3.70e-04  2.29e-03
-   -2.800000    0.727992    1.287515  7.44e-04  2.84e-03
-   -2.700000    0.741092    1.251460  8.46e-04  2.58e-03
-   -2.600000    0.757028    1.216006  1.01e-03  2.39e-03
-   -2.500000    0.775576    1.181098  1.35e-03  2.76e-03
-   -2.400000    0.795610    1.149093  1.06e-03  1.79e-03
-   -2.300000    0.818403    1.117287  1.79e-03  2.67e-03
-   -2.200000    0.842494    1.088504  2.40e-03  3.06e-03
-   -2.100000    0.867789    1.062951  3.16e-03  3.25e-03
-   -2.000000    0.890243    1.044103  3.40e-04  2.64e-04
-   -1.900000    0.918743    1.024377  3.13e-03  2.12e-03
-   -1.800000    0.944502    1.011651  3.01e-03  1.34e-03
-   -1.700000    0.967983    1.003922  7.30e-04  2.37e-04
-   -1.600000    0.996105    0.999928  3.43e-03  2.85e-04
-   -1.500000    1.019955    1.001656  2.42e-03  4.05e-04
-   -1.400000    1.043204    1.007716  1.58e-03  4.68e-04
-   -1.300000    1.068074    1.019878  3.30e-03  1.82e-03
-   -1.200000    1.088381    1.034712  1.56e-03  1.29e-03
-   -1.100000    1.109643    1.054948  2.03e-03  1.96e-03
-   -1.000000    1.129780    1.079804  2.77e-03  3.45e-03
-   -0.900000    1.145536    1.104049  6.32e-04  1.02e-03
-   -0.800000    1.163216    1.136066  2.03e-03  3.53e-03
-   -0.700000    1.177736    1.168573  1.97e-03  4.19e-03
-   -0.600000    1.188627    1.198295  7.04e-05  2.31e-04
-   -0.500000    1.201096    1.237762  1.60e-03  4.65e-03
-   -0.400000    1.209605    1.273093  1.08e-03  4.01e-03
-   -0.300000    1.215977    1.307261  3.83e-04  1.70e-03
-   -0.200000    1.221524    1.347217  8.55e-04  5.08e-03
-   -0.100000    1.224023    1.381573  2.99e-04  3.11e-03
-    0.000000    1.224915    1.417046  1.70e-04  2.83e-03
-    0.100000    1.223682    1.453905  4.31e-05  4.83e-03
-    0.200000    1.220491    1.484604  1.78e-04  1.81e-03
-    0.300000    1.215142    1.518474  4.52e-04  3.38e-03
-    0.400000    1.207613    1.549792  9.12e-04  4.02e-03
-    0.500000    1.199317    1.575083  1.79e-04  4.64e-04
-    0.600000    1.187241    1.604738  1.32e-03  3.29e-03
-    0.700000    1.174195    1.628977  1.57e-03  2.87e-03
-    0.800000    1.160798    1.649024  3.88e-04  5.83e-04
-    0.900000    1.142674    1.670977  2.23e-03  2.65e-03
-    1.000000    1.125149    1.687306  1.86e-03  1.64e-03
-    1.100000    1.106375    1.701281  1.23e-03  9.26e-04
-    1.200000    1.083821    1.713934  3.00e-03  1.61e-03
-    1.300000    1.063098    1.722088  1.68e-03  5.89e-04
-    1.400000    1.039432    1.728436  2.19e-03  5.91e-04
-    1.500000    1.014086    1.731733  3.44e-03  4.05e-04
-    1.600000    0.991678    1.731904  9.96e-04  2.36e-05
-    1.700000    0.961426    1.728911  5.83e-03  7.32e-04
-    1.800000    0.935542    1.723129  5.95e-03  1.36e-03
-    1.900000    0.909675    1.714513  5.94e-03  1.97e-03
-    2.000000    0.884086    1.703125  5.82e-03  2.54e-03
-    2.100000    0.859058    1.689043  5.57e-03  3.06e-03
-    2.200000    0.835574    1.672856  4.52e-03  3.00e-03
-    2.300000    0.814580    1.655404  2.04e-03  1.61e-03
-    2.400000    0.792171    1.633239  2.37e-03  2.45e-03
-    2.500000    0.771823    1.609184  2.40e-03  2.79e-03
-    2.600000    0.753719    1.582648  2.29e-03  3.38e-03
-    2.700000    0.739155    1.555902  1.09e-03  2.10e-03
-    2.800000    0.726876    1.527066  3.71e-04  1.00e-03
-    2.900000    0.717091    1.495571  2.10e-04  8.41e-04
-    3.000000    0.710388    1.461718  2.48e-04  1.54e-03
-    3.100000    0.707227    1.426224  1.85e-04  2.62e-03
-    3.200000    0.707774    1.389871  6.43e-05  3.55e-03
-    3.300000    0.711937    1.353272  4.17e-04  4.02e-03
-    3.400000    0.719482    1.316831  7.32e-04  3.95e-03
-    3.500000    0.730101    1.280910  8.74e-04  3.31e-03
-    3.600000    0.743437    1.245871  7.25e-04  2.12e-03
-    3.700000    0.759104    1.212075  1.91e-04  4.28e-04
-    3.800000    0.778229    1.176840  7.22e-04  1.35e-03
-    3.900000    0.799673    1.143027  1.53e-03  2.50e-03
-    4.000000    0.822611    1.111958  2.14e-03  3.03e-03
-    4.100000    0.846613    1.084064  2.46e-03  3.01e-03
-    4.200000    0.872616    1.058537  3.78e-03  3.74e-03
-    4.300000    0.896759    1.038903  2.56e-03  2.17e-03
-    4.400000    0.922654    1.022357  2.69e-03  1.56e-03
-    4.500000    0.949804    1.009423  3.97e-03  1.75e-03
-    4.600000    0.971677    1.003131  1.20e-04  1.84e-05
-    4.700000    1.000881    0.999978  3.98e-03  6.03e-05
-    4.800000    1.024123    1.002244  2.48e-03  3.28e-04
-    4.900000    1.048218    1.009872  2.63e-03  1.14e-03
-    5.000000    1.072193    1.022451  3.63e-03  2.12e-03
-    5.100000    1.090618    1.036650  2.10e-04  2.21e-04
-    5.200000    1.114344    1.060263  3.37e-03  3.60e-03
-    5.300000    1.132066    1.083037  1.94e-03  2.42e-03
-    5.400000    1.149808    1.111129  2.05e-03  3.32e-03
-    5.500000    1.166384    1.142517  2.62e-03  4.77e-03
-    5.600000    1.178247    1.170493  2.05e-04  5.64e-04
-    5.700000    1.192675    1.209460  2.15e-03  5.58e-03
-    5.800000    1.202249    1.242415  1.10e-03  3.30e-03
-    5.900000    1.210920    1.279453  1.07e-03  4.26e-03
-    6.000000    1.217779    1.317297  1.19e-03  5.59e-03
-    6.100000    1.221394    1.349080  6.94e-05  8.08e-04
-    6.200000    1.224584    1.390348  5.45e-04  5.82e-03
-    6.300000    1.224861    1.423309  1.45e-04  3.16e-03
-    6.400000    1.223197    1.458922  1.55e-04  4.09e-03
-    6.500000    1.219541    1.493333  4.15e-04  5.01e-03
-    6.600000    1.214349    1.521229  1.94e-04  8.53e-04
-    6.700000    1.205961    1.555583  1.18e-03  4.82e-03
-    6.800000    1.197025    1.581689  7.64e-04  2.41e-03
-    6.900000    1.185091    1.608881  1.44e-03  3.13e-03
-    7.000000    1.171483    1.633589  1.95e-03  3.56e-03
+   -2.900000    0.717316    1.326932  1.47e-05  9.30e-07
+   -2.800000    0.727263    1.290352  1.55e-05  1.41e-06
+   -2.700000    0.740260    1.254041  1.37e-05  9.10e-07
+   -2.600000    0.756026    1.218399  1.32e-05  1.28e-06
+   -2.500000    0.774239    1.183861  1.16e-05  8.00e-07
+   -2.400000    0.794556    1.150884  9.86e-06  9.51e-07
+   -2.300000    0.816624    1.119952  8.14e-06  5.76e-07
+   -2.200000    0.840096    1.091559  7.49e-06  1.29e-06
+   -2.100000    0.864636    1.066203  1.09e-05  9.87e-07
+   -2.000000    0.889911    1.044366  8.52e-06  1.42e-06
+   -1.900000    0.915620    1.026500  2.77e-06  1.52e-06
+   -1.800000    0.941486    1.012993  1.33e-06  1.21e-06
+   -1.700000    0.967247    1.004162  5.58e-06  2.92e-06
+   -1.600000    0.992663    1.000217  1.08e-05  3.99e-06
+   -1.500000    1.017517    1.001257  1.39e-05  5.41e-06
+   -1.400000    1.041608    1.007254  1.72e-05  5.39e-06
+   -1.300000    1.064756    1.018066  2.11e-05  7.67e-06
+   -1.200000    1.086799    1.033429  2.13e-05  6.93e-06
+   -1.100000    1.107583    1.053000  2.60e-05  8.00e-06
+   -1.000000    1.126983    1.076359  2.70e-05  9.49e-06
+   -0.900000    1.144876    1.103036  2.80e-05  7.01e-06
+   -0.800000    1.161155    1.132548  3.11e-05  9.47e-06
+   -0.700000    1.175735    1.164388  2.88e-05  7.11e-06
+   -0.600000    1.188524    1.198072  3.31e-05  7.78e-06
+   -0.500000    1.199463    1.233124  3.29e-05  8.30e-06
+   -0.400000    1.208491    1.269093  3.27e-05  5.77e-06
+   -0.300000    1.215559    1.305564  3.51e-05  7.20e-06
+   -0.200000    1.220638    1.342141  3.14e-05  4.88e-06
+   -0.100000    1.223689    1.378471  3.53e-05  5.22e-06
+    0.000000    1.224711    1.414219  3.42e-05  5.14e-06
+    0.100000    1.223691    1.449083  3.33e-05  3.29e-06
+    0.200000    1.220634    1.482795  3.50e-05  3.94e-06
+    0.300000    1.215563    1.515100  3.04e-05  2.14e-06
+    0.400000    1.208490    1.545777  3.36e-05  2.28e-06
+    0.500000    1.199464    1.574621  3.18e-05  2.03e-06
+    0.600000    1.188527    1.601451  3.02e-05  1.01e-06
+    0.700000    1.175733    1.626106  3.09e-05  1.39e-06
+    0.800000    1.161160    1.648441  2.58e-05  1.18e-07
+    0.900000    1.144876    1.668331  2.78e-05  4.44e-08
+    1.000000    1.126984    1.685666  2.53e-05  3.97e-07
+    1.100000    1.107586    1.700354  2.29e-05  1.20e-06
+    1.200000    1.086798    1.712318  2.23e-05  1.40e-06
+    1.300000    1.064760    1.721497  1.71e-05  2.15e-06
+    1.400000    1.041608    1.727843  1.70e-05  2.44e-06
+    1.500000    1.017517    1.731325  1.39e-05  2.90e-06
+    1.600000    0.992663    1.731924  1.02e-05  3.31e-06
+    1.700000    0.967239    1.729638  1.35e-05  4.84e-06
+    1.800000    0.941479    1.724478  8.60e-06  7.09e-06
+    1.900000    0.915621    1.716469  3.16e-06  9.53e-06
+    2.000000    0.889921    1.705654  1.84e-05  1.20e-05
+    2.100000    0.864659    1.692088  3.40e-05  1.40e-05
+    2.200000    0.840134    1.675842  4.55e-05  1.50e-05
+    2.300000    0.816667    1.657002  5.04e-05  1.46e-05
+    2.400000    0.794592    1.635671  4.58e-05  1.29e-05
+    2.500000    0.774269    1.611965  4.20e-05  1.31e-05
+    2.600000    0.756048    1.586022  3.55e-05  1.15e-05
+    2.700000    0.740280    1.557994  3.41e-05  1.07e-05
+    2.800000    0.727280    1.528057  3.23e-05  1.03e-05
+    2.900000    0.717332    1.496403  3.06e-05  9.62e-06
+    3.000000    0.710665    1.463248  2.89e-05  8.97e-06
+    3.100000    0.707440    1.428831  2.71e-05  8.29e-06
+    3.200000    0.707734    1.393415  2.51e-05  7.67e-06
+    3.300000    0.711545    1.357289  2.59e-05  7.84e-06
+    3.400000    0.718776    1.320772  2.60e-05  7.74e-06
+    3.500000    0.729252    1.284211  2.51e-05  7.39e-06
+    3.600000    0.742735    1.247983  2.31e-05  6.80e-06
+    3.700000    0.758934    1.212497  2.04e-05  6.03e-06
+    3.800000    0.777524    1.178189  1.72e-05  5.18e-06
+    3.900000    0.798158    1.145523  1.38e-05  4.36e-06
+    4.000000    0.820485    1.114984  1.07e-05  3.81e-06
+    4.100000    0.844158    1.087067  8.91e-06  4.05e-06
+    4.200000    0.868842    1.062267  9.49e-06  5.94e-06
+    4.300000    0.894213    1.041069  8.96e-06  4.31e-06
+    4.400000    0.919966    1.023913  2.07e-06  3.47e-07
+    4.500000    0.945831    1.011172  3.41e-06  8.05e-07
+    4.600000    0.971546    1.003152  1.12e-05  2.18e-06
+    4.700000    0.996883    1.000042  1.55e-05  3.97e-06
+    4.800000    1.021617    1.001922  2.33e-05  6.45e-06
+    4.900000    1.045562    1.008742  2.69e-05  6.55e-06
+    5.000000    1.068534    1.020341  3.13e-05  1.03e-05
+    5.100000    1.090371    1.036440  3.70e-05  1.06e-05
+    5.200000    1.110937    1.056675  3.46e-05  8.26e-06
+    5.300000    1.130084    1.080630  4.28e-05  1.37e-05
+    5.400000    1.147713    1.107817  4.42e-05  1.06e-05
+    5.500000    1.163715    1.137755  4.38e-05  1.22e-05
+    5.600000    1.177993    1.169941  4.89e-05  1.25e-05
+    5.700000    1.190483    1.203883  4.46e-05  8.51e-06
+    5.800000    1.201100    1.239124  4.97e-05  1.20e-05
+    5.900000    1.209801    1.275204  4.99e-05  8.96e-06
+    6.000000    1.216540    1.311719  4.73e-05  8.93e-06
+    6.100000    1.221273    1.348281  5.21e-05  8.85e-06
+    6.200000    1.223992    1.384531  4.65e-05  5.55e-06
+    6.300000    1.224665    1.420153  5.12e-05  7.47e-06
+    6.400000    1.223303    1.454842  5.01e-05  5.07e-06
+    6.500000    1.219909    1.488333  4.71e-05  4.73e-06
+    6.600000    1.214493    1.520380  5.05e-05  4.31e-06
+    6.700000    1.207098    1.550760  4.38e-05  1.96e-06
+    6.800000    1.197742    1.579279  4.76e-05  2.86e-06
+    6.900000    1.186489    1.605753  4.51e-05  1.14e-06
+    7.000000    1.173394    1.630027  4.15e-05  6.93e-07
    ------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 168 (attempted = 168)
+   Internal solver steps = 167 (attempted = 167)
    Total number of error test failures = 0
-   Total RHS evals:  Fe = 675,  Fi = 1698
-   Total mass matrix setups = 508
-   Total mass matrix solves = 1515
-   Total mass times evals = 1191
-   Total number of Jacobian evaluations = 18
+   Total RHS evals:  Fe = 671,  Fi = 1763
+   Total mass matrix setups = 504
+   Total mass matrix solves = 1340
+   Total mass times evals = 1259
+   Total number of Jacobian evaluations = 7
    Total linear solver setups = 18
-   Total number of Nonlinear iterations = 1023
+   Total number of Nonlinear iterations = 1092
    Total number of Nonlinear convergence failures = 5
-   Errors: u = 0.00224481, v = 0.0027708, total = 0.00252156
+   Errors: u = 3.02996e-05, v = 6.97389e-06, total = 2.19852e-05
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out
index 0966765b36..25d972ace0 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717019    1.329852  2.82e-04  2.92e-03
-   -2.800000    0.727128    1.291781  1.19e-04  1.43e-03
-   -2.700000    0.740964    1.252385  7.18e-04  1.66e-03
-   -2.600000    0.756983    1.216059  9.70e-04  2.34e-03
-   -2.500000    0.773350    1.185766  8.78e-04  1.90e-03
-   -2.400000    0.793611    1.152873  9.34e-04  1.99e-03
-   -2.300000    0.817253    1.119332  6.37e-04  6.21e-04
-   -2.200000    0.841717    1.089568  1.63e-03  1.99e-03
-   -2.100000    0.864011    1.066886  6.14e-04  6.82e-04
-   -2.000000    0.892474    1.042263  2.57e-03  2.10e-03
-   -1.900000    0.917602    1.025755  1.98e-03  7.44e-04
-   -1.800000    0.937390    1.016647  4.10e-03  3.65e-03
-   -1.700000    0.971792    1.003765  4.54e-03  3.94e-04
-   -1.600000    0.989541    1.001911  3.13e-03  1.70e-03
-   -1.500000    1.020109    1.001600  2.58e-03  3.48e-04
-   -1.400000    1.041436    1.008886  1.89e-04  1.64e-03
-   -1.300000    1.062303    1.017039  2.47e-03  1.02e-03
-   -1.200000    1.089683    1.036317  2.86e-03  2.90e-03
-   -1.100000    1.105577    1.052294  2.03e-03  6.98e-04
-   -1.000000    1.126083    1.075316  9.26e-04  1.03e-03
-   -0.900000    1.147001    1.106761  2.10e-03  3.73e-03
-   -0.800000    1.159860    1.131459  1.33e-03  1.08e-03
-   -0.700000    1.174024    1.161179  1.74e-03  3.20e-03
-   -0.600000    1.190189    1.202272  1.63e-03  4.21e-03
-   -0.500000    1.199459    1.234387  3.74e-05  1.27e-03
-   -0.400000    1.206986    1.264980  1.54e-03  4.11e-03
-   -0.300000    1.215711    1.306063  1.17e-04  5.06e-04
-   -0.200000    1.221127    1.346177  4.58e-04  4.04e-03
-   -0.100000    1.223082    1.376940  6.43e-04  1.53e-03
-    0.000000    1.224285    1.409999  4.59e-04  4.21e-03
-    0.100000    1.223699    1.452499  2.62e-05  3.42e-03
-    0.200000    1.220132    1.484766  5.37e-04  1.98e-03
-    0.300000    1.215566    1.511788  2.80e-05  3.31e-03
-    0.400000    1.208854    1.543863  3.30e-04  1.91e-03
-    0.500000    1.198305    1.577949  1.19e-03  3.33e-03
-    0.600000    1.188064    1.601091  4.93e-04  3.59e-04
-    0.700000    1.177002    1.622831  1.24e-03  3.27e-03
-    0.800000    1.160467    1.649540  7.19e-04  1.10e-03
-    0.900000    1.143024    1.669900  1.88e-03  1.57e-03
-    1.000000    1.127703    1.684083  6.93e-04  1.58e-03
-    1.100000    1.109563    1.698647  1.95e-03  1.71e-03
-    1.200000    1.084375    1.713548  2.45e-03  1.23e-03
-    1.300000    1.063451    1.721352  1.33e-03  1.47e-04
-    1.400000    1.043958    1.726670  2.33e-03  1.18e-03
-    1.500000    1.018212    1.731200  6.81e-04  1.28e-04
-    1.600000    0.989541    1.731687  3.13e-03  2.41e-04
-    1.700000    0.967594    1.729038  3.42e-04  6.05e-04
-    1.800000    0.945779    1.724938  4.29e-03  4.53e-04
-    1.900000    0.913122    1.714408  2.50e-03  2.07e-03
-    2.000000    0.892727    1.706653  2.82e-03  9.87e-04
-    2.100000    0.863079    1.690005  1.55e-03  2.10e-03
-    2.200000    0.842837    1.677421  2.75e-03  1.56e-03
-    2.300000    0.813660    1.654059  2.96e-03  2.96e-03
-    2.400000    0.796357    1.636543  1.81e-03  8.59e-04
-    2.500000    0.776495    1.614269  2.27e-03  2.29e-03
-    2.600000    0.754401    1.583710  1.61e-03  2.32e-03
-    2.700000    0.738886    1.554989  1.36e-03  3.02e-03
-    2.800000    0.727154    1.526628  9.33e-05  1.44e-03
-    2.900000    0.717938    1.496740  6.37e-04  3.28e-04
-    3.000000    0.711417    1.464762  7.80e-04  1.51e-03
-    3.100000    0.708036    1.430991  6.24e-04  2.15e-03
-    3.200000    0.708079    1.395889  3.70e-04  2.47e-03
-    3.300000    0.711619    1.359926  9.94e-05  2.63e-03
-    3.400000    0.718581    1.323519  1.69e-04  2.74e-03
-    3.500000    0.728792    1.287040  4.35e-04  2.82e-03
-    3.600000    0.742019    1.250864  6.93e-04  2.87e-03
-    3.700000    0.757977    1.215395  9.37e-04  2.89e-03
-    3.800000    0.776344    1.181065  1.16e-03  2.87e-03
-    3.900000    0.796778    1.148333  1.37e-03  2.81e-03
-    4.000000    0.818928    1.117683  1.55e-03  2.69e-03
-    4.100000    0.842446    1.089606  1.70e-03  2.53e-03
-    4.200000    0.866998    1.064597  1.83e-03  2.32e-03
-    4.300000    0.892261    1.043136  1.94e-03  2.06e-03
-    4.400000    0.916058    1.027104  3.91e-03  3.19e-03
-    4.500000    0.949013    1.011415  3.18e-03  2.42e-04
-    4.600000    0.967871    1.004821  3.69e-03  1.67e-03
-    4.700000    1.000576    1.000388  3.68e-03  3.49e-04
-    4.800000    1.019516    1.003159  2.12e-03  1.24e-03
-    4.900000    1.045822    1.008812  2.34e-04  7.65e-05
-    5.000000    1.070392    1.022564  1.83e-03  2.23e-03
-    5.100000    1.087297    1.034966  3.11e-03  1.46e-03
-    5.200000    1.112850    1.058594  1.88e-03  1.93e-03
-    5.300000    1.131091    1.082926  9.64e-04  2.31e-03
-    5.400000    1.145267    1.104991  2.49e-03  2.82e-03
-    5.500000    1.164313    1.138717  5.54e-04  9.74e-04
-    5.600000    1.179397    1.173602  1.35e-03  3.67e-03
-    5.700000    1.189228    1.201963  1.30e-03  1.91e-03
-    5.800000    1.199849    1.235675  1.30e-03  3.44e-03
-    5.900000    1.210965    1.279516  1.11e-03  4.32e-03
-    6.000000    1.216453    1.313042  1.34e-04  1.33e-03
-    6.100000    1.220283    1.344121  1.04e-03  4.15e-03
-    6.200000    1.224013    1.384363  2.59e-05  1.62e-04
-    6.300000    1.224687    1.424123  2.89e-05  3.98e-03
-    6.400000    1.222879    1.453549  4.74e-04  1.29e-03
-    6.500000    1.220024    1.484232  6.72e-05  4.10e-03
-    6.600000    1.214102    1.523276  4.41e-04  2.90e-03
-    6.700000    1.206270    1.552659  8.72e-04  1.90e-03
-    6.800000    1.198139    1.576403  3.50e-04  2.87e-03
-    6.900000    1.187244    1.603789  7.10e-04  1.96e-03
-    7.000000    1.171735    1.632792  1.70e-03  2.77e-03
+   -2.900000    0.717301    1.326933  2.70e-07  3.73e-08
+   -2.800000    0.727249    1.290351  1.13e-06  1.93e-06
+   -2.700000    0.740247    1.254036  1.07e-06  5.17e-06
+   -2.600000    0.756014    1.218395  7.58e-07  4.79e-06
+   -2.500000    0.774228    1.183857  4.73e-07  4.46e-06
+   -2.400000    0.794546    1.150881  3.10e-07  4.15e-06
+   -2.300000    0.816616    1.119949  1.90e-07  3.86e-06
+   -2.200000    0.840089    1.091557  7.29e-08  3.57e-06
+   -2.100000    0.864625    1.066201  5.01e-08  3.31e-06
+   -2.000000    0.889902    1.044364  2.51e-07  2.98e-06
+   -1.900000    0.915617    1.026496  7.41e-07  2.44e-06
+   -1.800000    0.941484    1.012992  3.21e-06  4.66e-07
+   -1.700000    0.967244    1.004159  8.82e-06  3.48e-08
+   -1.600000    0.992667    1.000213  5.91e-06  1.67e-07
+   -1.500000    1.017525    1.001250  6.01e-06  1.73e-06
+   -1.400000    1.041618    1.007250  7.55e-06  6.60e-07
+   -1.300000    1.064770    1.018056  7.07e-06  1.39e-06
+   -1.200000    1.086812    1.033423  8.15e-06  1.14e-06
+   -1.100000    1.107603    1.052993  6.37e-06  1.16e-06
+   -1.000000    1.127003    1.076350  6.54e-06  5.97e-07
+   -0.900000    1.144897    1.103030  7.12e-06  1.12e-06
+   -0.800000    1.161181    1.132540  5.65e-06  1.73e-06
+   -0.700000    1.175759    1.164384  5.09e-06  3.04e-06
+   -0.600000    1.188551    1.198067  6.35e-06  3.20e-06
+   -0.500000    1.199490    1.233118  5.85e-06  1.93e-06
+   -0.400000    1.208519    1.269088  5.00e-06  5.89e-07
+   -0.300000    1.215588    1.305555  6.04e-06  2.25e-06
+   -0.200000    1.220662    1.342131  6.84e-06  5.78e-06
+   -0.100000    1.223719    1.378457  6.01e-06  7.95e-06
+    0.000000    1.224739    1.414204  5.62e-06  9.85e-06
+    0.100000    1.223718    1.449068  7.07e-06  1.25e-05
+    0.200000    1.220662    1.482778  6.74e-06  1.28e-05
+    0.300000    1.215588    1.515084  5.72e-06  1.31e-05
+    0.400000    1.208518    1.545760  5.96e-06  1.46e-05
+    0.500000    1.199489    1.574603  6.91e-06  1.62e-05
+    0.600000    1.188551    1.601433  6.09e-06  1.67e-05
+    0.700000    1.175759    1.626088  5.28e-06  1.69e-05
+    0.800000    1.161180    1.648423  5.98e-06  1.75e-05
+    0.900000    1.144898    1.668313  5.87e-06  1.77e-05
+    1.000000    1.127005    1.685649  4.85e-06  1.72e-05
+    1.100000    1.107605    1.700338  4.37e-06  1.67e-05
+    1.200000    1.086816    1.712303  4.71e-06  1.64e-05
+    1.300000    1.064773    1.721483  3.98e-06  1.56e-05
+    1.400000    1.041622    1.727831  3.10e-06  1.45e-05
+    1.500000    1.017528    1.731314  2.71e-06  1.35e-05
+    1.600000    0.992671    1.731915  2.16e-06  1.23e-05
+    1.700000    0.967251    1.729632  1.35e-06  1.10e-05
+    1.800000    0.941487    1.724475  4.26e-07  9.77e-06
+    1.900000    0.915622    1.716469  5.05e-06  1.00e-05
+    2.000000    0.889909    1.705658  6.21e-06  8.62e-06
+    2.100000    0.864636    1.692092  1.05e-05  1.02e-05
+    2.200000    0.840099    1.675847  1.03e-05  9.88e-06
+    2.300000    0.816629    1.657008  1.24e-05  9.44e-06
+    2.400000    0.794555    1.635676  9.06e-06  8.49e-06
+    2.500000    0.774235    1.611970  7.64e-06  7.70e-06
+    2.600000    0.756021    1.586026  7.63e-06  7.67e-06
+    2.700000    0.740253    1.557998  6.87e-06  7.15e-06
+    2.800000    0.727253    1.528060  5.82e-06  7.10e-06
+    2.900000    0.717306    1.496405  4.89e-06  7.26e-06
+    3.000000    0.710640    1.463249  4.17e-06  7.32e-06
+    3.100000    0.707416    1.428831  3.60e-06  7.55e-06
+    3.200000    0.707712    1.393413  3.07e-06  8.92e-06
+    3.300000    0.711522    1.357287  2.62e-06  9.53e-06
+    3.400000    0.718752    1.320772  2.24e-06  7.95e-06
+    3.500000    0.729229    1.284212  1.93e-06  6.49e-06
+    3.600000    0.742713    1.247985  1.62e-06  5.13e-06
+    3.700000    0.758915    1.212499  1.32e-06  3.88e-06
+    3.800000    0.777507    1.178192  1.01e-06  2.73e-06
+    3.900000    0.798145    1.145526  7.18e-07  1.69e-06
+    4.000000    0.820475    1.114987  4.41e-07  7.68e-07
+    4.100000    0.844149    1.087071  1.85e-07  3.81e-08
+    4.200000    0.868832    1.062274  5.04e-08  7.17e-07
+    4.300000    0.894204    1.041075  2.64e-07  1.26e-06
+    4.400000    0.919963    1.023915  9.20e-07  2.28e-06
+    4.500000    0.945828    1.011177  6.19e-06  4.81e-06
+    4.600000    0.971553    1.003152  4.72e-06  1.97e-06
+    4.700000    0.996891    1.000041  7.14e-06  2.29e-06
+    4.800000    1.021634    1.001919  6.39e-06  3.05e-06
+    4.900000    1.045581    1.008736  7.54e-06  9.35e-07
+    5.000000    1.068557    1.020334  7.55e-06  2.47e-06
+    5.100000    1.090402    1.036431  5.68e-06  1.83e-06
+    5.200000    1.110965    1.056670  7.01e-06  2.46e-06
+    5.300000    1.130120    1.080619  6.62e-06  2.63e-06
+    5.400000    1.147752    1.107809  5.22e-06  2.51e-06
+    5.500000    1.163753    1.137747  5.96e-06  3.76e-06
+    5.600000    1.178036    1.169935  6.19e-06  6.46e-06
+    5.700000    1.190523    1.203881  5.11e-06  5.99e-06
+    5.800000    1.201144    1.239116  4.94e-06  4.32e-06
+    5.900000    1.209845    1.275199  6.25e-06  3.31e-06
+    6.000000    1.216582    1.311713  5.78e-06  2.19e-06
+    6.100000    1.221320    1.348274  4.88e-06  1.47e-06
+    6.200000    1.224033    1.384526  5.58e-06  8.06e-07
+    6.300000    1.224710    1.420146  6.33e-06  9.33e-08
+    6.400000    1.223348    1.454836  5.45e-06  7.00e-07
+    6.500000    1.219952    1.488327  4.87e-06  1.03e-06
+    6.600000    1.214538    1.520374  6.04e-06  1.49e-06
+    6.700000    1.207136    1.550752  6.18e-06  5.85e-06
+    6.800000    1.197784    1.579267  5.34e-06  8.88e-06
+    6.900000    1.186528    1.605740  5.46e-06  1.20e-05
+    7.000000    1.173429    1.630011  6.48e-06  1.55e-05
    ------------------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 80 (attempted = 82)
    Total number of error test failures = 2
-   Total RHS evals:  Fe = 495,  Fi = 1086
-   Total mass matrix setups = 416
-   Total mass matrix solves = 657
-   Total mass times evals = 1081
-   Total number of Jacobian evaluations = 21
+   Total RHS evals:  Fe = 493,  Fi = 1082
+   Total mass matrix setups = 413
+   Total mass matrix solves = 574
+   Total mass times evals = 1079
+   Total number of Jacobian evaluations = 12
    Total linear solver setups = 21
-   Total number of Nonlinear iterations = 1001
-   Total number of Nonlinear convergence failures = 13
-   Errors: u = 0.00178101, v = 0.00231678, total = 0.00206634
+   Total number of Nonlinear iterations = 999
+   Total number of Nonlinear convergence failures = 11
+   Errors: u = 5.44891e-06, v = 7.96021e-06, total = 6.82113e-06
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out
index 2d97a74e97..e28c955d6b 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717211    1.328223  8.99e-05  1.29e-03
-   -2.800000    0.728269    1.287692  1.02e-03  2.66e-03
-   -2.700000    0.739164    1.256719  1.08e-03  2.68e-03
-   -2.600000    0.757034    1.216907  1.02e-03  1.49e-03
-   -2.500000    0.773721    1.184656  5.07e-04  7.94e-04
-   -2.400000    0.794153    1.151722  3.93e-04  8.37e-04
-   -2.300000    0.818329    1.118100  1.71e-03  1.85e-03
-   -2.200000    0.837303    1.094451  2.79e-03  2.89e-03
-   -2.100000    0.862921    1.067619  1.70e-03  1.41e-03
-   -2.000000    0.890741    1.043833  8.39e-04  5.34e-04
-   -1.900000    0.917113    1.027334  1.50e-03  8.36e-04
-   -1.800000    0.937132    1.014893  4.36e-03  1.90e-03
-   -1.700000    0.971264    1.004558  4.01e-03  3.99e-04
-   -1.600000    0.989148    1.001512  3.53e-03  1.30e-03
-   -1.500000    1.019857    1.001974  2.33e-03  7.23e-04
-   -1.400000    1.041333    1.009018  2.92e-04  1.77e-03
-   -1.300000    1.062133    1.016423  2.64e-03  1.64e-03
-   -1.200000    1.089269    1.036935  2.45e-03  3.51e-03
-   -1.100000    1.105611    1.051822  2.00e-03  1.17e-03
-   -1.000000    1.126373    1.075348  6.37e-04  1.00e-03
-   -0.900000    1.146348    1.106984  1.44e-03  3.96e-03
-   -0.800000    1.159966    1.130930  1.22e-03  1.61e-03
-   -0.700000    1.174625    1.161225  1.14e-03  3.16e-03
-   -0.600000    1.189605    1.202473  1.05e-03  4.41e-03
-   -0.500000    1.199275    1.233916  2.21e-04  8.00e-04
-   -0.400000    1.207551    1.264783  9.73e-04  4.30e-03
-   -0.300000    1.215744    1.306771  1.50e-04  1.21e-03
-   -0.200000    1.220747    1.345850  7.74e-05  3.71e-03
-   -0.100000    1.223304    1.376541  4.20e-04  1.92e-03
-    0.000000    1.224655    1.410336  9.03e-05  3.88e-03
-    0.100000    1.223464    1.452678  2.60e-04  3.60e-03
-    0.200000    1.220141    1.484317  5.28e-04  1.53e-03
-    0.300000    1.215820    1.511673  2.26e-04  3.42e-03
-    0.400000    1.208782    1.544565  2.58e-04  1.21e-03
-    0.500000    1.198262    1.577820  1.23e-03  3.20e-03
-    0.600000    1.188266    1.600763  2.91e-04  6.87e-04
-    0.700000    1.177064    1.622917  1.30e-03  3.19e-03
-    0.800000    1.160152    1.650027  1.03e-03  1.59e-03
-    0.900000    1.143163    1.669738  1.74e-03  1.41e-03
-    1.000000    1.127953    1.683870  9.43e-04  1.80e-03
-    1.100000    1.109344    1.698839  1.74e-03  1.52e-03
-    1.200000    1.084126    1.713713  2.69e-03  1.39e-03
-    1.300000    1.063729    1.721220  1.05e-03  2.79e-04
-    1.400000    1.044265    1.726551  2.64e-03  1.29e-03
-    1.500000    1.017322    1.731363  2.09e-04  3.55e-05
-    1.600000    0.989409    1.731682  3.26e-03  2.45e-04
-    1.700000    0.968115    1.729005  8.62e-04  6.38e-04
-    1.800000    0.945780    1.724905  4.29e-03  4.21e-04
-    1.900000    0.913350    1.714227  2.27e-03  2.25e-03
-    2.000000    0.891914    1.706373  2.01e-03  7.06e-04
-    2.100000    0.863536    1.689964  1.09e-03  2.14e-03
-    2.200000    0.842451    1.677230  2.36e-03  1.37e-03
-    2.300000    0.813595    1.653718  3.02e-03  3.30e-03
-    2.400000    0.797036    1.637090  2.49e-03  1.41e-03
-    2.500000    0.776409    1.614316  2.18e-03  2.34e-03
-    2.600000    0.753957    1.582797  2.06e-03  3.24e-03
-    2.700000    0.739018    1.554652  1.23e-03  3.35e-03
-    2.800000    0.727507    1.526918  2.60e-04  1.15e-03
-    2.900000    0.718202    1.497373  9.00e-04  9.61e-04
-    3.000000    0.711511    1.465459  8.75e-04  2.20e-03
-    3.100000    0.707986    1.431691  5.73e-04  2.85e-03
-    3.200000    0.707904    1.396535  1.95e-04  3.11e-03
-    3.300000    0.711361    1.360512  1.59e-04  3.21e-03
-    3.400000    0.718242    1.324028  5.08e-04  3.25e-03
-    3.500000    0.728403    1.287440  8.23e-04  3.22e-03
-    3.600000    0.741598    1.251148  1.11e-03  3.16e-03
-    3.700000    0.757545    1.215559  1.37e-03  3.06e-03
-    3.800000    0.775921    1.181111  1.59e-03  2.92e-03
-    3.900000    0.796382    1.148270  1.76e-03  2.74e-03
-    4.000000    0.818578    1.117520  1.90e-03  2.53e-03
-    4.100000    0.842160    1.089361  1.99e-03  2.29e-03
-    4.200000    0.866788    1.064291  2.04e-03  2.02e-03
-    4.300000    0.892141    1.042793  2.06e-03  1.72e-03
-    4.400000    0.915470    1.026651  4.49e-03  2.74e-03
-    4.500000    0.949956    1.010481  4.12e-03  6.92e-04
-    4.600000    0.969819    1.004919  1.74e-03  1.77e-03
-    4.700000    0.995171    0.999962  1.73e-03  7.62e-05
-    4.800000    1.024036    1.003989  2.40e-03  2.07e-03
-    4.900000    1.042057    1.008020  3.53e-03  7.16e-04
-    5.000000    1.070886    1.022350  2.32e-03  2.02e-03
-    5.100000    1.090463    1.038105  5.51e-05  1.68e-03
-    5.200000    1.108350    1.053723  2.62e-03  2.94e-03
-    5.300000    1.131978    1.084116  1.85e-03  3.50e-03
-    5.400000    1.147773    1.109311  1.62e-05  1.50e-03
-    5.500000    1.161934    1.133924  1.83e-03  3.82e-03
-    5.600000    1.178681    1.171971  6.39e-04  2.04e-03
-    5.700000    1.191085    1.207296  5.57e-04  3.42e-03
-    5.800000    1.200245    1.236544  9.04e-04  2.57e-03
-    5.900000    1.209250    1.271951  6.01e-04  3.24e-03
-    6.000000    1.217002    1.316051  4.15e-04  4.34e-03
-    6.100000    1.221052    1.349146  2.73e-04  8.74e-04
-    6.200000    1.223662    1.380339  3.76e-04  4.19e-03
-    6.300000    1.224706    1.420575  1.02e-05  4.30e-04
-    6.400000    1.222895    1.458395  4.58e-04  3.56e-03
-    6.500000    1.219734    1.486790  2.23e-04  1.54e-03
-    6.600000    1.215038    1.516684  4.95e-04  3.69e-03
-    6.700000    1.206372    1.553655  7.70e-04  2.90e-03
-    6.800000    1.196854    1.580760  9.35e-04  1.48e-03
-    6.900000    1.187218    1.602951  6.84e-04  2.80e-03
-    7.000000    1.174139    1.628591  7.03e-04  1.44e-03
+   -2.900000    0.717302    1.326933  5.18e-07  6.29e-08
+   -2.800000    0.727249    1.290354  1.76e-06  3.00e-07
+   -2.700000    0.740248    1.254042  1.77e-06  6.52e-07
+   -2.600000    0.756015    1.218401  2.05e-06  1.18e-06
+   -2.500000    0.774229    1.183863  1.80e-06  1.67e-06
+   -2.400000    0.794548    1.150887  1.78e-06  2.26e-06
+   -2.300000    0.816618    1.119956  1.73e-06  2.88e-06
+   -2.200000    0.840091    1.091561  2.35e-06  9.16e-07
+   -2.100000    0.864627    1.066206  1.41e-06  1.78e-06
+   -2.000000    0.889903    1.044369  7.08e-07  1.83e-06
+   -1.900000    0.915617    1.026506  8.72e-08  7.10e-06
+   -1.800000    0.941487    1.013000  3.27e-07  8.36e-06
+   -1.700000    0.967250    1.004167  2.68e-06  8.25e-06
+   -1.600000    0.992670    1.000223  3.57e-06  9.84e-06
+   -1.500000    1.017527    1.001259  3.97e-06  7.51e-06
+   -1.400000    1.041619    1.007259  6.46e-06  9.78e-06
+   -1.300000    1.064772    1.018066  5.08e-06  8.29e-06
+   -1.200000    1.086813    1.033430  7.23e-06  8.10e-06
+   -1.100000    1.107603    1.053000  6.59e-06  8.19e-06
+   -1.000000    1.127004    1.076357  5.43e-06  7.25e-06
+   -0.900000    1.144897    1.103036  7.08e-06  7.19e-06
+   -0.800000    1.161180    1.132545  6.46e-06  6.66e-06
+   -0.700000    1.175759    1.164387  5.27e-06  6.15e-06
+   -0.600000    1.188551    1.198070  6.33e-06  6.04e-06
+   -0.500000    1.199489    1.233121  6.80e-06  5.48e-06
+   -0.400000    1.208518    1.269092  5.71e-06  4.92e-06
+   -0.300000    1.215588    1.305562  5.38e-06  4.74e-06
+   -0.200000    1.220662    1.342141  6.93e-06  4.44e-06
+   -0.100000    1.223718    1.378469  6.52e-06  3.81e-06
+    0.000000    1.224739    1.414217  5.45e-06  3.44e-06
+    0.100000    1.223719    1.449083  6.01e-06  3.25e-06
+    0.200000    1.220662    1.482794  6.90e-06  2.72e-06
+    0.300000    1.215588    1.515100  5.89e-06  2.20e-06
+    0.400000    1.208519    1.545776  5.12e-06  1.91e-06
+    0.500000    1.199490    1.574621  6.23e-06  1.56e-06
+    0.600000    1.188551    1.601451  5.98e-06  9.90e-07
+    0.700000    1.175759    1.626106  4.83e-06  5.92e-07
+    0.800000    1.161182    1.648441  4.59e-06  3.18e-07
+    0.900000    1.144899    1.668330  5.22e-06  1.80e-07
+    1.000000    1.127005    1.685666  4.37e-06  6.52e-07
+    1.100000    1.107606    1.700354  3.45e-06  9.25e-07
+    1.200000    1.086817    1.712319  3.52e-06  1.26e-06
+    1.300000    1.064774    1.721497  3.17e-06  1.75e-06
+    1.400000    1.041623    1.727843  2.27e-06  2.05e-06
+    1.500000    1.017529    1.731325  1.62e-06  2.23e-06
+    1.600000    0.992672    1.731925  1.09e-06  2.62e-06
+    1.700000    0.967252    1.729640  2.98e-07  2.96e-06
+    1.800000    0.941488    1.724482  3.06e-07  3.07e-06
+    1.900000    0.915619    1.716476  1.21e-06  3.20e-06
+    2.000000    0.889905    1.705663  2.67e-06  3.54e-06
+    2.100000    0.864629    1.692098  3.20e-06  3.66e-06
+    2.200000    0.840092    1.675853  3.55e-06  3.60e-06
+    2.300000    0.816622    1.657013  5.76e-06  3.73e-06
+    2.400000    0.794553    1.635680  7.17e-06  3.89e-06
+    2.500000    0.774234    1.611974  6.62e-06  3.74e-06
+    2.600000    0.756019    1.586030  6.45e-06  3.52e-06
+    2.700000    0.740253    1.558002  7.30e-06  3.40e-06
+    2.800000    0.727255    1.528064  7.08e-06  3.25e-06
+    2.900000    0.717306    1.496410  4.96e-06  2.49e-06
+    3.000000    0.710640    1.463255  3.65e-06  1.95e-06
+    3.100000    0.707417    1.428837  4.78e-06  1.61e-06
+    3.200000    0.707713    1.393421  3.79e-06  1.41e-06
+    3.300000    0.711524    1.357296  4.13e-06  1.09e-06
+    3.400000    0.718753    1.320779  3.08e-06  9.90e-07
+    3.500000    0.729230    1.284218  3.50e-06  7.02e-07
+    3.600000    0.742714    1.247989  2.37e-06  7.15e-07
+    3.700000    0.758915    1.212502  9.93e-07  1.30e-06
+    3.800000    0.777507    1.178192  2.56e-07  1.98e-06
+    3.900000    0.798144    1.145525  2.27e-07  2.69e-06
+    4.000000    0.820474    1.114984  5.91e-07  3.44e-06
+    4.100000    0.844148    1.087067  8.85e-07  4.17e-06
+    4.200000    0.868831    1.062268  1.12e-06  4.90e-06
+    4.300000    0.894202    1.041068  1.31e-06  5.58e-06
+    4.400000    0.919963    1.023910  1.35e-06  3.31e-06
+    4.500000    0.945833    1.011171  9.17e-07  1.79e-06
+    4.600000    0.971554    1.003150  2.99e-06  5.83e-07
+    4.700000    0.996895    1.000039  2.92e-06  8.52e-07
+    4.800000    1.021636    1.001916  4.52e-06  5.99e-07
+    4.900000    1.045583    1.008738  5.49e-06  2.78e-06
+    5.000000    1.068560    1.020333  4.65e-06  1.94e-06
+    5.100000    1.090401    1.036432  6.80e-06  2.61e-06
+    5.200000    1.110966    1.056670  6.28e-06  3.13e-06
+    5.300000    1.130122    1.080620  5.31e-06  2.82e-06
+    5.400000    1.147750    1.107810  6.97e-06  3.23e-06
+    5.500000    1.163752    1.137746  6.56e-06  3.16e-06
+    5.600000    1.178037    1.169932  5.39e-06  3.04e-06
+    5.700000    1.190522    1.203878  6.25e-06  3.28e-06
+    5.800000    1.201142    1.239115  6.96e-06  3.08e-06
+    5.900000    1.209845    1.275198  5.92e-06  2.78e-06
+    6.000000    1.216582    1.311713  5.43e-06  2.82e-06
+    6.100000    1.221318    1.348275  6.97e-06  2.77e-06
+    6.200000    1.224032    1.384528  6.70e-06  2.33e-06
+    6.300000    1.224710    1.420148  5.59e-06  2.09e-06
+    6.400000    1.223347    1.454839  5.89e-06  2.04e-06
+    6.500000    1.219950    1.488330  6.96e-06  1.68e-06
+    6.600000    1.214538    1.520377  6.02e-06  1.24e-06
+    6.700000    1.207137    1.550759  5.14e-06  1.04e-06
+    6.800000    1.197783    1.579277  6.12e-06  7.99e-07
+    6.900000    1.186528    1.605752  6.04e-06  3.04e-07
+    7.000000    1.173431    1.630027  4.89e-06  4.45e-08
    ------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 82 (attempted = 84)
-   Total number of error test failures = 2
-   Total RHS evals:  Fe = 507,  Fi = 1758
-   Total mass matrix setups = 426
-   Total mass matrix solves = 673
-   Total mass times evals = 1753
-   Total number of Jacobian evaluations = 153
-   Total linear solver setups = 153
-   Total number of Nonlinear iterations = 1671
-   Total number of Nonlinear convergence failures = 146
-   Errors: u = 0.00176018, v = 0.00238235, total = 0.0020945
+   Internal solver steps = 83 (attempted = 83)
+   Total number of error test failures = 0
+   Total RHS evals:  Fe = 501,  Fi = 1738
+   Total mass matrix setups = 418
+   Total mass matrix solves = 585
+   Total mass times evals = 1735
+   Total number of Jacobian evaluations = 145
+   Total linear solver setups = 150
+   Total number of Nonlinear iterations = 1652
+   Total number of Nonlinear convergence failures = 144
+   Errors: u = 4.76925e-06, v = 3.83012e-06, total = 4.32525e-06
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out
index e2be8b2242..b27df8ddb3 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717289    1.326981  1.22e-05  4.87e-05
-   -2.800000    0.727288    1.290237  4.09e-05  1.17e-04
-   -2.700000    0.740297    1.253927  5.15e-05  1.15e-04
-   -2.600000    0.756075    1.218287  6.16e-05  1.13e-04
-   -2.500000    0.774294    1.183760  6.63e-05  1.02e-04
-   -2.400000    0.794465    1.150991  8.04e-05  1.06e-04
-   -2.300000    0.816591    1.119982  2.54e-05  2.88e-05
-   -2.200000    0.839974    1.091671  1.15e-04  1.11e-04
-   -2.100000    0.864501    1.066305  1.25e-04  1.01e-04
-   -2.000000    0.889952    1.044335  4.99e-05  3.23e-05
-   -1.900000    0.915478    1.026570  1.40e-04  7.14e-05
-   -1.800000    0.941493    1.012996  5.06e-06  4.44e-06
-   -1.700000    0.967415    1.004136  1.62e-04  2.32e-05
-   -1.600000    0.992703    1.000214  2.93e-05  1.23e-06
-   -1.500000    1.017014    1.001151  5.16e-04  1.01e-04
-   -1.400000    1.041533    1.007206  9.20e-05  4.25e-05
-   -1.300000    1.064795    1.018071  1.80e-05  1.30e-05
-   -1.200000    1.086754    1.033357  6.67e-05  6.51e-05
-   -1.100000    1.107534    1.052895  7.53e-05  9.68e-05
-   -1.000000    1.127009    1.076351  3.43e-07  8.07e-07
-   -0.900000    1.144852    1.102926  5.16e-05  1.03e-04
-   -0.800000    1.161168    1.132493  1.86e-05  4.54e-05
-   -0.700000    1.175722    1.164256  4.22e-05  1.25e-04
-   -0.600000    1.188552    1.198047  5.27e-06  1.75e-05
-   -0.500000    1.199515    1.233200  1.89e-05  8.43e-05
-   -0.400000    1.208522    1.269075  2.42e-06  1.17e-05
-   -0.300000    1.215578    1.305441  1.55e-05  1.17e-04
-   -0.200000    1.220681    1.342266  1.14e-05  1.29e-04
-   -0.100000    1.223722    1.378393  3.13e-06  7.23e-05
-    0.000000    1.224745    1.414086  1.48e-07  1.28e-04
-    0.100000    1.223729    1.448982  4.45e-06  9.83e-05
-    0.200000    1.220673    1.482752  3.61e-06  3.94e-05
-    0.300000    1.215597    1.515075  3.25e-06  2.20e-05
-    0.400000    1.208502    1.545874  2.24e-05  9.94e-05
-    0.500000    1.199516    1.574554  1.92e-05  6.55e-05
-    0.600000    1.188518    1.601549  3.87e-05  9.88e-05
-    0.700000    1.175761    1.626111  2.75e-06  5.57e-06
-    0.800000    1.161205    1.648410  1.86e-05  3.00e-05
-    0.900000    1.144846    1.668405  5.80e-05  7.45e-05
-    1.000000    1.127053    1.685621  4.32e-05  4.52e-05
-    1.100000    1.107589    1.700371  2.04e-05  1.55e-05
-    1.200000    1.086897    1.712271  7.69e-05  4.83e-05
-    1.300000    1.064768    1.721502  8.56e-06  3.00e-06
-    1.400000    1.041562    1.727865  6.34e-05  1.99e-05
-    1.500000    1.016979    1.731422  5.52e-04  9.44e-05
-    1.600000    0.992455    1.731939  2.18e-04  1.18e-05
-    1.700000    0.967255    1.729643  2.52e-06  1.22e-07
-    1.800000    0.941270    1.724450  2.17e-04  3.51e-05
-    1.900000    0.915449    1.716434  1.69e-04  4.49e-05
-    2.000000    0.889997    1.705701  9.49e-05  3.43e-05
-    2.100000    0.864509    1.692044  1.17e-04  5.82e-05
-    2.200000    0.840053    1.675834  3.55e-05  2.29e-05
-    2.300000    0.816625    1.657023  8.96e-06  5.95e-06
-    2.400000    0.794637    1.635769  9.09e-05  8.47e-05
-    2.500000    0.774242    1.611994  1.46e-05  1.59e-05
-    2.600000    0.756072    1.586117  5.87e-05  8.37e-05
-    2.700000    0.740248    1.558009  2.12e-06  3.87e-06
-    2.800000    0.727215    1.527988  3.21e-05  7.88e-05
-    2.900000    0.717284    1.496348  1.74e-05  6.40e-05
-    3.000000    0.710627    1.463197  9.55e-06  5.99e-05
-    3.100000    0.707416    1.428919  3.99e-06  7.98e-05
-    3.200000    0.707704    1.393517  5.54e-06  9.49e-05
-    3.300000    0.711505    1.357381  1.41e-05  8.48e-05
-    3.400000    0.718731    1.320849  1.80e-05  6.91e-05
-    3.500000    0.729200    1.284292  2.71e-05  7.41e-05
-    3.600000    0.742748    1.247913  3.58e-05  7.72e-05
-    3.700000    0.758982    1.212381  6.88e-05  1.22e-04
-    3.800000    0.777446    1.178286  6.03e-05  9.15e-05
-    3.900000    0.798166    1.145500  2.24e-05  2.78e-05
-    4.000000    0.820371    1.115102  1.04e-04  1.14e-04
-    4.100000    0.844171    1.087051  2.16e-05  2.02e-05
-    4.200000    0.868963    1.062173  1.30e-04  1.00e-04
-    4.300000    0.894283    1.041024  7.92e-05  4.92e-05
-    4.400000    0.920076    1.023865  1.12e-04  4.82e-05
-    4.500000    0.945936    1.011146  1.02e-04  2.64e-05
-    4.600000    0.970923    1.003241  6.35e-04  9.12e-05
-    4.700000    0.996888    1.000082  9.99e-06  4.35e-05
-    4.800000    1.022163    1.002075  5.22e-04  1.59e-04
-    4.900000    1.045496    1.008688  9.33e-05  4.76e-05
-    5.000000    1.068614    1.020369  4.90e-05  3.76e-05
-    5.100000    1.090360    1.036381  4.73e-05  4.80e-05
-    5.200000    1.110916    1.056593  5.59e-05  7.42e-05
-    5.300000    1.130183    1.080712  5.58e-05  9.51e-05
-    5.400000    1.147723    1.107737  3.42e-05  6.99e-05
-    5.500000    1.163719    1.137644  3.97e-05  9.93e-05
-    5.600000    1.178039    1.169920  3.34e-06  8.82e-06
-    5.700000    1.190563    1.204006  3.50e-05  1.31e-04
-    5.800000    1.201123    1.238990  2.66e-05  1.22e-04
-    5.900000    1.209871    1.275316  2.03e-05  1.20e-04
-    6.000000    1.216589    1.311725  1.53e-06  1.48e-05
-    6.100000    1.221314    1.348140  1.10e-05  1.33e-04
-    6.200000    1.224040    1.384556  1.20e-06  3.07e-05
-    6.300000    1.224715    1.420276  1.45e-06  1.30e-04
-    6.400000    1.223358    1.454743  4.94e-06  9.31e-05
-    6.500000    1.219962    1.488272  5.90e-06  5.59e-05
-    6.600000    1.214545    1.520364  1.61e-06  1.17e-05
-    6.700000    1.207127    1.550821  1.50e-05  6.31e-05
-    6.800000    1.197802    1.579235  1.25e-05  4.12e-05
-    6.900000    1.186493    1.605851  4.03e-05  9.91e-05
-    7.000000    1.173431    1.630035  4.42e-06  8.62e-06
+   -2.900000    0.717301    1.326933  4.49e-10  2.27e-12
+   -2.800000    0.727247    1.290353  4.71e-10  2.40e-12
+   -2.700000    0.740246    1.254042  4.75e-10  2.42e-12
+   -2.600000    0.756013    1.218400  4.81e-10  2.45e-12
+   -2.500000    0.774227    1.183861  4.86e-10  2.53e-12
+   -2.400000    0.794546    1.150885  4.63e-10  2.35e-12
+   -2.300000    0.816616    1.119953  4.77e-10  2.40e-12
+   -2.200000    0.840089    1.091560  4.63e-10  2.28e-12
+   -2.100000    0.864625    1.066204  4.49e-10  1.91e-12
+   -2.000000    0.889903    1.044367  4.35e-10  2.22e-12
+   -1.900000    0.915617    1.026499  1.65e-10  5.44e-12
+   -1.800000    0.941488    1.012992  2.06e-09  3.81e-11
+   -1.700000    0.967253    1.004159  8.28e-10  5.15e-12
+   -1.600000    0.992673    1.000213  2.51e-08  1.04e-10
+   -1.500000    1.017531    1.001252  7.18e-08  1.15e-09
+   -1.400000    1.041625    1.007249  7.22e-10  3.60e-11
+   -1.300000    1.064777    1.018058  7.17e-10  3.30e-11
+   -1.200000    1.086821    1.033422  6.98e-10  2.85e-11
+   -1.100000    1.107609    1.052992  7.02e-10  2.53e-11
+   -1.000000    1.127010    1.076350  7.44e-10  2.17e-11
+   -0.900000    1.144904    1.103029  7.25e-10  1.91e-11
+   -0.800000    1.161186    1.132539  7.50e-10  1.63e-11
+   -0.700000    1.175764    1.164381  7.38e-10  1.40e-11
+   -0.600000    1.188557    1.198064  7.71e-10  1.19e-11
+   -0.500000    1.199496    1.233116  8.00e-10  9.72e-12
+   -0.400000    1.208524    1.269087  7.82e-10  8.43e-12
+   -0.300000    1.215594    1.305557  7.61e-10  6.91e-12
+   -0.200000    1.220669    1.342137  8.22e-10  5.38e-12
+   -0.100000    1.223725    1.378465  1.64e-07  8.46e-10
+    0.000000    1.224745    1.414214  7.74e-08  3.69e-10
+    0.100000    1.223724    1.449080  1.98e-07  9.71e-10
+    0.200000    1.220669    1.482791  2.35e-07  1.13e-09
+    0.300000    1.215594    1.515097  2.41e-07  1.12e-09
+    0.400000    1.208524    1.545774  8.88e-10  9.81e-11
+    0.500000    1.199496    1.574619  7.62e-10  8.75e-11
+    0.600000    1.188557    1.601450  8.07e-10  7.72e-11
+    0.700000    1.175764    1.626105  7.70e-10  6.85e-11
+    0.800000    1.161186    1.648441  7.48e-10  6.09e-11
+    0.900000    1.144904    1.668331  7.79e-10  5.39e-11
+    1.000000    1.127010    1.685666  7.17e-10  4.84e-11
+    1.100000    1.107609    1.700355  7.31e-10  4.30e-11
+    1.200000    1.086821    1.712320  6.79e-10  3.86e-11
+    1.300000    1.064777    1.721499  6.92e-10  3.44e-11
+    1.400000    1.041625    1.727845  2.04e-08  6.72e-11
+    1.500000    1.017530    1.731328  1.59e-07  7.12e-10
+    1.600000    0.992673    1.731928  6.88e-08  2.91e-10
+    1.700000    0.967253    1.729643  8.70e-08  3.76e-10
+    1.800000    0.941488    1.724485  5.13e-10  5.69e-11
+    1.900000    0.915617    1.716479  8.67e-10  5.85e-11
+    2.000000    0.889903    1.705666  6.33e-10  5.28e-11
+    2.100000    0.864625    1.692102  6.31e-10  4.83e-11
+    2.200000    0.840089    1.675857  5.82e-10  4.42e-11
+    2.300000    0.816616    1.657017  5.51e-10  4.05e-11
+    2.400000    0.794546    1.635684  5.15e-10  3.71e-11
+    2.500000    0.774227    1.611978  5.14e-10  3.44e-11
+    2.600000    0.756013    1.586033  4.88e-10  3.16e-11
+    2.700000    0.740246    1.558005  4.89e-10  2.93e-11
+    2.800000    0.727247    1.528067  4.90e-10  2.73e-11
+    2.900000    0.717301    1.496412  4.79e-10  2.54e-11
+    3.000000    0.710636    1.463257  4.70e-10  2.36e-11
+    3.100000    0.707412    1.428839  9.20e-08  4.46e-10
+    3.200000    0.707710    1.393422  1.09e-07  5.62e-10
+    3.300000    0.711520    1.357297  5.27e-10  1.53e-11
+    3.400000    0.718750    1.320780  4.47e-10  1.41e-11
+    3.500000    0.729227    1.284218  4.49e-10  1.32e-11
+    3.600000    0.742712    1.247990  4.72e-10  1.26e-11
+    3.700000    0.758914    1.212503  4.83e-10  1.20e-11
+    3.800000    0.777506    1.178194  4.61e-10  1.13e-11
+    3.900000    0.798144    1.145528  4.83e-10  1.07e-11
+    4.000000    0.820474    1.114988  4.63e-10  9.99e-12
+    4.100000    0.844149    1.087071  4.86e-10  9.55e-12
+    4.200000    0.868832    1.062273  4.87e-10  8.65e-12
+    4.300000    0.894204    1.041074  4.18e-10  8.16e-12
+    4.400000    0.919964    1.023913  7.04e-12  4.13e-12
+    4.500000    0.945834    1.011173  1.24e-09  1.30e-11
+    4.600000    0.971557    1.003150  2.19e-08  6.19e-10
+    4.700000    0.996898    1.000038  1.43e-07  2.28e-09
+    4.800000    1.021640    1.001916  1.99e-07  1.27e-09
+    4.900000    1.045589    1.008736  6.84e-10  3.85e-11
+    5.000000    1.068565    1.020331  7.31e-10  3.42e-11
+    5.100000    1.090408    1.036429  7.07e-10  2.95e-11
+    5.200000    1.110972    1.056667  7.11e-10  2.61e-11
+    5.300000    1.130127    1.080617  7.73e-10  2.25e-11
+    5.400000    1.147757    1.107807  7.36e-10  1.98e-11
+    5.500000    1.163759    1.137743  7.37e-10  1.71e-11
+    5.600000    1.178042    1.169929  7.67e-10  1.46e-11
+    5.700000    1.190528    1.203875  8.07e-10  1.21e-11
+    5.800000    1.201149    1.239112  7.52e-10  1.06e-11
+    5.900000    1.209851    1.275195  8.14e-10  8.47e-12
+    6.000000    1.216587    1.311711  7.93e-10  7.30e-12
+    6.100000    1.221325    1.348272  7.60e-10  6.06e-12
+    6.200000    1.224039    1.384525  2.32e-07  1.19e-09
+    6.300000    1.224716    1.420146  1.87e-07  9.24e-10
+    6.400000    1.223353    1.454836  2.45e-07  1.21e-09
+    6.500000    1.219956    1.488328  2.34e-07  1.12e-09
+    6.600000    1.214543    1.520375  2.43e-07  1.12e-09
+    6.700000    1.207142    1.550758  8.17e-10  9.47e-11
+    6.800000    1.197789    1.579276  7.68e-10  8.41e-11
+    6.900000    1.186534    1.605752  8.06e-10  7.42e-11
+    7.000000    1.173436    1.630027  7.70e-10  6.59e-11
    ------------------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 2271 (attempted = 3401)
    Total number of error test failures = 0
-   Total RHS evals:  Fe = 14917,  Fi = 51629
-   Total mass matrix setups = 13777
-   Total mass matrix solves = 68814
+   Total RHS evals:  Fe = 13787,  Fi = 50499
+   Total mass matrix setups = 12646
+   Total mass matrix solves = 64284
    Total mass times evals = 2271
    Total number of Jacobian evaluations = 0
    Total linear solver setups = 0
    Total number of Nonlinear iterations = 36712
    Total number of Nonlinear convergence failures = 1130
-   Errors: u = 0.000128202, v = 7.56396e-05, total = 0.000105255
+   Errors: u = 7.56688e-08, v = 4.52391e-10, total = 5.35069e-08
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out
index 0e4c7017ec..7f9417757d 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717388    1.327299  8.73e-05  3.66e-04
-   -2.800000    0.728314    1.288641  1.07e-03  1.71e-03
-   -2.700000    0.741339    1.252148  1.09e-03  1.89e-03
-   -2.600000    0.755772    1.218919  2.41e-04  5.19e-04
-   -2.500000    0.775163    1.183340  9.36e-04  5.22e-04
-   -2.400000    0.796592    1.149044  2.05e-03  1.84e-03
-   -2.300000    0.817654    1.120075  1.04e-03  1.22e-04
-   -2.200000    0.843176    1.090371  3.09e-03  1.19e-03
-   -2.100000    0.868704    1.064378  4.08e-03  1.83e-03
-   -2.000000    0.893196    1.042908  3.29e-03  1.46e-03
-   -1.900000    0.916762    1.026017  1.15e-03  4.82e-04
-   -1.800000    0.945436    1.012933  3.95e-03  5.90e-05
-   -1.700000    0.980666    1.004097  1.34e-02  6.16e-05
-   -1.600000    0.998761    1.000587  6.09e-03  3.73e-04
-   -1.500000    1.017448    1.000988  8.25e-05  2.63e-04
-   -1.400000    1.042940    1.007750  1.32e-03  5.01e-04
-   -1.300000    1.071766    1.020789  6.99e-03  2.73e-03
-   -1.200000    1.096158    1.037591  9.34e-03  4.17e-03
-   -1.100000    1.116122    1.057371  8.51e-03  4.38e-03
-   -1.000000    1.133776    1.080322  6.77e-03  3.97e-03
-   -0.900000    1.150174    1.106624  5.27e-03  3.59e-03
-   -0.800000    1.165496    1.136147  4.31e-03  3.61e-03
-   -0.700000    1.179450    1.168433  3.69e-03  4.05e-03
-   -0.600000    1.191803    1.202813  3.25e-03  4.75e-03
-   -0.500000    1.202130    1.238472  2.63e-03  5.36e-03
-   -0.400000    1.210436    1.274789  1.91e-03  5.70e-03
-   -0.300000    1.216680    1.310633  1.09e-03  5.08e-03
-   -0.200000    1.221032    1.345104  3.63e-04  2.97e-03
-   -0.100000    1.223727    1.378032  2.80e-06  4.33e-04
-    0.000000    1.224604    1.412721  1.41e-04  1.49e-03
-    0.100000    1.223128    1.449128  5.97e-04  4.77e-05
-    0.200000    1.219267    1.485113  1.40e-03  2.32e-03
-    0.300000    1.213399    1.519147  2.19e-03  4.05e-03
-    0.400000    1.206050    1.550292  2.47e-03  4.52e-03
-    0.500000    1.197696    1.577986  1.80e-03  3.37e-03
-    0.600000    1.188182    1.602312  3.75e-04  8.61e-04
-    0.700000    1.175839    1.625020  7.53e-05  1.08e-03
-    0.800000    1.159254    1.648147  1.93e-03  2.94e-04
-    0.900000    1.140173    1.669602  4.73e-03  1.27e-03
-    1.000000    1.120421    1.687986  6.59e-03  2.32e-03
-    1.100000    1.101290    1.702694  6.32e-03  2.34e-03
-    1.200000    1.083051    1.713755  3.77e-03  1.43e-03
-    1.300000    1.064474    1.721636  3.03e-04  1.38e-04
-    1.400000    1.041492    1.727466  1.33e-04  3.79e-04
-    1.500000    1.013536    1.731237  3.99e-03  9.08e-05
-    1.600000    0.984457    1.731961  8.22e-03  3.28e-05
-    1.700000    0.957111    1.729388  1.01e-02  2.55e-04
-    1.800000    0.932874    1.723796  8.61e-03  6.88e-04
-    1.900000    0.911325    1.715739  4.29e-03  7.40e-04
-    2.000000    0.890114    1.705753  2.11e-04  8.67e-05
-    2.100000    0.864107    1.692643  5.18e-04  5.41e-04
-    2.200000    0.835391    1.675464  4.70e-03  3.93e-04
-    2.300000    0.808511    1.654919  8.10e-03  2.10e-03
-    2.400000    0.785914    1.632068  8.63e-03  3.62e-03
-    2.500000    0.768154    1.608069  6.07e-03  3.91e-03
-    2.600000    0.754531    1.584376  1.48e-03  1.66e-03
-    2.700000    0.740261    1.559180  1.56e-05  1.18e-03
-    2.800000    0.724434    1.524972  2.81e-03  3.09e-03
-    2.900000    0.715918    1.492839  1.38e-03  3.57e-03
-    3.000000    0.710611    1.463290  2.53e-05  3.29e-05
-    3.100000    0.707311    1.424683  1.01e-04  4.16e-03
-    3.200000    0.708518    1.392506  8.09e-04  9.17e-04
-    3.300000    0.711954    1.355294  4.34e-04  2.00e-03
-    3.400000    0.721526    1.317145  2.78e-03  3.63e-03
-    3.500000    0.729040    1.285553  1.87e-04  1.33e-03
-    3.600000    0.746590    1.243533  3.88e-03  4.46e-03
-    3.700000    0.761014    1.212342  2.10e-03  1.61e-04
-    3.800000    0.779555    1.175901  2.05e-03  2.29e-03
-    3.900000    0.803501    1.142951  5.36e-03  2.58e-03
-    4.000000    0.819925    1.115851  5.49e-04  8.63e-04
-    4.100000    0.850182    1.084064  6.03e-03  3.01e-03
-    4.200000    0.870689    1.062493  1.86e-03  2.20e-04
-    4.300000    0.897346    1.039678  3.14e-03  1.40e-03
-    4.400000    0.925196    1.023112  5.23e-03  8.01e-04
-    4.500000    0.945438    1.011315  3.96e-04  1.43e-04
-    4.600000    0.975016    1.003205  3.46e-03  5.53e-05
-    4.700000    1.000787    1.000237  3.89e-03  1.98e-04
-    4.800000    1.023771    1.002064  2.13e-03  1.48e-04
-    4.900000    1.049731    1.010069  4.14e-03  1.33e-03
-    5.000000    1.069597    1.020192  1.03e-03  1.39e-04
-    5.100000    1.094382    1.038873  3.97e-03  2.44e-03
-    5.200000    1.111245    1.056062  2.73e-04  6.05e-04
-    5.300000    1.133607    1.083908  3.48e-03  3.29e-03
-    5.400000    1.147625    1.106806  1.32e-04  1.00e-03
-    5.500000    1.166537    1.141480  2.78e-03  3.74e-03
-    5.600000    1.177807    1.168831  2.35e-04  1.10e-03
-    5.700000    1.192487    1.207635  1.96e-03  3.76e-03
-    5.800000    1.201013    1.238372  1.36e-04  7.40e-04
-    5.900000    1.211002    1.278614  1.15e-03  3.42e-03
-    6.000000    1.216618    1.311855  3.03e-05  1.45e-04
-    6.100000    1.221705    1.351089  3.80e-04  2.82e-03
-    6.200000    1.224097    1.385673  5.79e-05  1.15e-03
-    6.300000    1.224433    1.422213  2.83e-04  2.07e-03
-    6.400000    1.223202    1.456776  1.51e-04  1.94e-03
-    6.500000    1.219174    1.489612  7.82e-04  1.28e-03
-    6.600000    1.213915    1.522834  6.29e-04  2.46e-03
-    6.700000    1.206078    1.551321  1.06e-03  5.63e-04
-    6.800000    1.196415    1.581959  1.37e-03  2.68e-03
-    6.900000    1.185452    1.605738  1.08e-03  1.44e-05
-    7.000000    1.171096    1.632645  2.34e-03  2.62e-03
+   -2.900000    0.717299    1.326933  2.17e-06  2.61e-08
+   -2.800000    0.727242    1.290353  5.02e-06  4.87e-08
+   -2.700000    0.740244    1.254041  2.34e-06  1.64e-08
+   -2.600000    0.756012    1.218400  1.45e-06  5.75e-08
+   -2.500000    0.774224    1.183861  3.66e-06  4.59e-08
+   -2.400000    0.794544    1.150885  1.97e-06  5.84e-08
+   -2.300000    0.816613    1.119953  3.48e-06  1.01e-07
+   -2.200000    0.840087    1.091560  2.43e-06  1.14e-09
+   -2.100000    0.864618    1.066204  7.08e-06  2.30e-09
+   -2.000000    0.889895    1.044367  7.59e-06  3.97e-08
+   -1.900000    0.915607    1.026499  1.06e-05  1.44e-07
+   -1.800000    0.941492    1.012991  4.02e-06  4.95e-07
+   -1.700000    0.967257    1.004158  4.11e-06  4.82e-07
+   -1.600000    0.992683    1.000213  9.89e-06  6.54e-07
+   -1.500000    1.017558    1.001251  2.75e-05  1.04e-06
+   -1.400000    1.041689    1.007247  6.33e-05  1.54e-06
+   -1.300000    1.064815    1.018056  3.81e-05  1.54e-06
+   -1.200000    1.086836    1.033420  1.52e-05  1.52e-06
+   -1.100000    1.107689    1.052990  8.03e-05  2.09e-06
+   -1.000000    1.127096    1.076348  8.61e-05  2.22e-06
+   -0.900000    1.144923    1.103027  1.91e-05  1.84e-06
+   -0.800000    1.161242    1.132537  5.54e-05  2.09e-06
+   -0.700000    1.175875    1.164378  1.11e-04  2.44e-06
+   -0.600000    1.188617    1.198062  5.95e-05  2.11e-06
+   -0.500000    1.199513    1.233114  1.68e-05  1.88e-06
+   -0.400000    1.208606    1.269084  8.23e-05  2.98e-06
+   -0.300000    1.215709    1.305554  1.16e-04  3.26e-06
+   -0.200000    1.220692    1.342134  2.30e-05  2.71e-06
+   -0.100000    1.223796    1.378462  7.12e-05  3.08e-06
+    0.000000    1.224877    1.414210  1.32e-04  3.54e-06
+    0.100000    1.223793    1.449077  6.82e-05  3.15e-06
+    0.200000    1.220698    1.482788  2.92e-05  3.17e-06
+    0.300000    1.215709    1.515093  1.16e-04  4.03e-06
+    0.400000    1.208659    1.545770  1.35e-04  4.24e-06
+    0.500000    1.199523    1.574616  2.67e-05  3.55e-06
+    0.600000    1.188625    1.601447  6.77e-05  3.55e-06
+    0.700000    1.175888    1.626102  1.24e-04  3.24e-06
+    0.800000    1.161245    1.648438  5.90e-05  2.46e-06
+    0.900000    1.144927    1.668329  2.33e-05  1.85e-06
+    1.000000    1.127103    1.685665  9.32e-05  1.66e-06
+    1.100000    1.107692    1.700354  8.25e-05  1.18e-06
+    1.200000    1.086835    1.712319  1.40e-05  5.65e-07
+    1.300000    1.064818    1.721499  4.17e-05  2.90e-07
+    1.400000    1.041691    1.727845  6.55e-05  2.56e-09
+    1.500000    1.017558    1.731328  2.73e-05  4.16e-07
+    1.600000    0.992682    1.731928  8.66e-06  7.34e-07
+    1.700000    0.967276    1.729644  2.38e-05  1.04e-06
+    1.800000    0.941500    1.724486  1.27e-05  1.33e-06
+    1.900000    0.915618    1.716480  6.40e-07  1.48e-06
+    2.000000    0.889865    1.705668  3.74e-05  1.97e-06
+    2.100000    0.864463    1.692105  1.63e-04  2.89e-06
+    2.200000    0.839771    1.675861  3.18e-04  3.84e-06
+    2.300000    0.816292    1.657021  3.24e-04  3.84e-06
+    2.400000    0.794423    1.635687  1.23e-04  2.71e-06
+    2.500000    0.774078    1.611980  1.50e-04  2.70e-06
+    2.600000    0.755825    1.586036  1.88e-04  3.00e-06
+    2.700000    0.740043    1.558009  2.03e-04  3.71e-06
+    2.800000    0.727119    1.528070  1.28e-04  3.62e-06
+    2.900000    0.717266    1.496415  3.55e-05  3.11e-06
+    3.000000    0.710497    1.463260  1.40e-04  3.72e-06
+    3.100000    0.707393    1.428842  1.94e-05  3.00e-06
+    3.200000    0.707605    1.393426  1.04e-04  3.48e-06
+    3.300000    0.711478    1.357300  4.12e-05  3.10e-06
+    3.400000    0.718691    1.320783  5.83e-05  3.23e-06
+    3.500000    0.729151    1.284222  7.60e-05  3.36e-06
+    3.600000    0.742697    1.247993  1.45e-05  2.83e-06
+    3.700000    0.758850    1.212506  6.40e-05  2.82e-06
+    3.800000    0.777488    1.178197  1.79e-05  2.37e-06
+    3.900000    0.798113    1.145530  3.15e-05  2.20e-06
+    4.000000    0.820445    1.114990  2.97e-05  1.96e-06
+    4.100000    0.844142    1.087072  7.54e-06  1.64e-06
+    4.200000    0.868812    1.062275  1.99e-05  1.45e-06
+    4.300000    0.894201    1.041075  2.88e-06  1.19e-06
+    4.400000    0.919960    1.023914  3.54e-06  9.65e-07
+    4.500000    0.945847    1.011173  1.29e-05  6.70e-07
+    4.600000    0.971568    1.003150  1.10e-05  4.18e-07
+    4.700000    0.996908    1.000039  9.91e-06  1.68e-07
+    4.800000    1.021690    1.001916  4.99e-05  3.06e-07
+    4.900000    1.045717    1.008735  1.28e-04  9.66e-07
+    5.000000    1.068798    1.020329  2.33e-04  1.82e-06
+    5.100000    1.090687    1.036427  2.79e-04  2.26e-06
+    5.200000    1.111265    1.056665  2.93e-04  2.47e-06
+    5.300000    1.130409    1.080614  2.82e-04  2.48e-06
+    5.400000    1.148027    1.107804  2.70e-04  2.45e-06
+    5.500000    1.164021    1.137741  2.62e-04  2.42e-06
+    5.600000    1.178250    1.169926  2.08e-04  2.55e-06
+    5.700000    1.190798    1.203872  2.71e-04  2.75e-06
+    5.800000    1.201390    1.239109  2.40e-04  2.93e-06
+    5.900000    1.210030    1.275192  1.79e-04  2.93e-06
+    6.000000    1.216691    1.311708  1.03e-04  2.78e-06
+    6.100000    1.221360    1.348269  3.51e-05  2.63e-06
+    6.200000    1.224072    1.384523  3.32e-05  2.86e-06
+    6.300000    1.224817    1.420142  1.01e-04  3.52e-06
+    6.400000    1.223526    1.454832  1.73e-04  4.16e-06
+    6.500000    1.220166    1.488323  2.09e-04  4.52e-06
+    6.600000    1.214751    1.520371  2.07e-04  4.43e-06
+    6.700000    1.207326    1.550753  1.84e-04  4.55e-06
+    6.800000    1.197850    1.579273  6.10e-05  3.22e-06
+    6.900000    1.186555    1.605750  2.16e-05  2.46e-06
+    7.000000    1.173507    1.630024  7.15e-05  2.08e-06
    ------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 149 (attempted = 150)
-   Total number of error test failures = 0
-   Total RHS evals:  Fe = 1299,  Fi = 4690
-   Total mass matrix setups = 1249
-   Total mass matrix solves = 2644
-   Total mass times evals = 3540
-   Total number of Jacobian evaluations = 183
-   Total linear solver setups = 183
-   Total number of Nonlinear iterations = 3391
-   Total number of Nonlinear convergence failures = 174
-   Errors: u = 0.00385864, v = 0.00235449, total = 0.0031963
+   Internal solver steps = 144 (attempted = 146)
+   Total number of error test failures = 1
+   Total RHS evals:  Fe = 1265,  Fi = 4680
+   Total mass matrix setups = 1121
+   Total mass matrix solves = 2428
+   Total mass times evals = 3559
+   Total number of Jacobian evaluations = 204
+   Total linear solver setups = 214
+   Total number of Nonlinear iterations = 3415
+   Total number of Nonlinear convergence failures = 203
+   Errors: u = 0.000119634, v = 2.45689e-06, total = 8.46118e-05
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out
index b3ee50ac25..848d98ebc4 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out
@@ -18,6 +18,6 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
    h = 3.125e-02,  error = 1.482e-07,  order = 2.90
    h = 1.562e-02,  error = 1.929e-08,  order = 2.94
    h = 7.812e-03,  error = 2.467e-09,  order = 2.97
-   h = 3.906e-03,  error = 3.121e-10,  order = 2.98
+   h = 3.906e-03,  error = 3.124e-10,  order = 2.98
  -----------------------------------------------------
  Order: max = 2.98,  avg = 2.89,  overall = 2.89 [SUCCESS]
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out
index 0dd082d2db..5c1b0cbb31 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out
@@ -13,11 +13,11 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
  -----------------------------------------------------
    h = 5.000e-01,  error = 1.725e-05
    h = 2.500e-01,  error = 2.900e-06,  order = 2.57
-   h = 1.250e-01,  error = 3.630e-07,  order = 3.00
-   h = 6.250e-02,  error = 2.784e-08,  order = 3.70
-   h = 3.125e-02,  error = 1.198e-09,  order = 4.54
-   h = 1.562e-02,  error = 4.518e-11,  order = 4.73
-   h = 7.812e-03,  error = 1.355e-11,  order = 1.74
-   h = 3.906e-03,  error = 1.389e-10,  order = -3.36
+   h = 1.250e-01,  error = 3.629e-07,  order = 3.00
+   h = 6.250e-02,  error = 2.782e-08,  order = 3.71
+   h = 3.125e-02,  error = 1.209e-09,  order = 4.52
+   h = 1.562e-02,  error = 3.841e-11,  order = 4.98
+   h = 7.812e-03,  error = 5.907e-11,  order = -0.62
+   h = 3.906e-03,  error = 5.812e-10,  order = -3.30
  -----------------------------------------------------
- Order: max = 4.73,  avg = 2.42,  overall = 2.98 [SUCCESS]
+ Order: max = 4.98,  avg = 2.12,  overall = 2.69 [SUCCESS]
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out
index f50c73b72e..8f2cfc2057 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out
@@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.717208    1.327305  9.30e-05  3.72e-04
-   -2.800000    0.727268    1.290371  2.03e-05  1.72e-05
-   -2.700000    0.740425    1.253644  1.79e-04  3.98e-04
-   -2.600000    0.755801    1.218831  2.12e-04  4.31e-04
-   -2.500000    0.774699    1.183143  4.72e-04  7.18e-04
-   -2.400000    0.794073    1.151533  4.73e-04  6.47e-04
-   -2.300000    0.817175    1.119339  5.59e-04  6.14e-04
-   -2.200000    0.839499    1.092138  5.90e-04  5.78e-04
-   -2.100000    0.864212    1.066598  4.13e-04  3.94e-04
-   -2.000000    0.889032    1.044976  8.71e-04  6.09e-04
-   -1.900000    0.914718    1.026973  9.00e-04  4.74e-04
-   -1.800000    0.940179    1.013455  1.31e-03  4.63e-04
-   -1.700000    0.968083    1.004047  8.31e-04  1.12e-04
-   -1.600000    0.993909    1.000388  1.24e-03  1.75e-04
-   -1.500000    1.017654    1.001477  1.23e-04  2.25e-04
-   -1.400000    1.040934    1.007085  6.92e-04  1.64e-04
-   -1.300000    1.063961    1.017604  8.15e-04  4.54e-04
-   -1.200000    1.086272    1.033016  5.49e-04  4.06e-04
-   -1.100000    1.107659    1.053203  4.94e-05  2.11e-04
-   -1.000000    1.127623    1.077435  6.13e-04  1.08e-03
-   -0.900000    1.144846    1.102917  5.76e-05  1.13e-04
-   -0.800000    1.161002    1.132205  1.85e-04  3.34e-04
-   -0.700000    1.176043    1.165234  2.79e-04  8.53e-04
-   -0.600000    1.188410    1.197657  1.47e-04  4.07e-04
-   -0.500000    1.199588    1.233521  9.12e-05  4.05e-04
-   -0.400000    1.208528    1.269280  4.29e-06  1.93e-04
-   -0.300000    1.215451    1.304558  1.42e-04  9.99e-04
-   -0.200000    1.220755    1.343310  8.63e-05  1.17e-03
-   -0.100000    1.223670    1.377830  5.45e-05  6.35e-04
-    0.000000    1.224746    1.413828  1.30e-06  3.86e-04
-    0.100000    1.223656    1.450033  6.83e-05  9.53e-04
-    0.200000    1.220713    1.482092  4.42e-05  6.99e-04
-    0.300000    1.215653    1.514717  5.94e-05  3.81e-04
-    0.400000    1.208303    1.546650  2.21e-04  8.76e-04
-    0.500000    1.199626    1.574073  1.30e-04  5.46e-04
-    0.600000    1.188765    1.600906  2.08e-04  5.44e-04
-    0.700000    1.175362    1.626884  4.02e-04  7.79e-04
-    0.800000    1.160968    1.648722  2.18e-04  2.81e-04
-    0.900000    1.145114    1.667998  2.10e-04  3.33e-04
-    1.000000    1.127514    1.685113  5.04e-04  5.53e-04
-    1.100000    1.108159    1.699899  5.49e-04  4.56e-04
-    1.200000    1.087142    1.712119  3.22e-04  2.01e-04
-    1.300000    1.064531    1.721612  2.45e-04  1.13e-04
-    1.400000    1.040958    1.728047  6.67e-04  2.01e-04
-    1.500000    1.016725    1.731456  8.05e-04  1.29e-04
-    1.600000    0.991983    1.731941  6.91e-04  1.35e-05
-    1.700000    0.966874    1.729586  3.79e-04  5.72e-05
-    1.800000    0.940784    1.724279  7.04e-04  2.06e-04
-    1.900000    0.915877    1.716442  2.59e-04  3.71e-05
-    2.000000    0.890471    1.705877  5.68e-04  2.10e-04
-    2.100000    0.863219    1.691310  1.41e-03  7.92e-04
-    2.200000    0.840201    1.675797  1.12e-04  5.96e-05
-    2.300000    0.816737    1.657004  1.21e-04  1.31e-05
-    2.400000    0.793668    1.634786  8.78e-04  8.98e-04
-    2.500000    0.774939    1.612776  7.11e-04  7.98e-04
-    2.600000    0.755378    1.585094  6.35e-04  9.39e-04
-    2.700000    0.739812    1.557192  4.34e-04  8.13e-04
-    2.800000    0.727481    1.528628  2.34e-04  5.61e-04
-    2.900000    0.717491    1.496927  1.90e-04  5.15e-04
-    3.000000    0.710508    1.462255  1.29e-04  1.00e-03
-    3.100000    0.707466    1.429783  5.39e-05  9.44e-04
-    3.200000    0.707793    1.392653  8.38e-05  7.69e-04
-    3.300000    0.711356    1.358368  1.64e-04  1.07e-03
-    3.400000    0.719043    1.319780  2.93e-04  9.99e-04
-    3.500000    0.728867    1.285263  3.60e-04  1.04e-03
-    3.600000    0.743163    1.247040  4.51e-04  9.50e-04
-    3.700000    0.759125    1.212182  2.12e-04  3.21e-04
-    3.800000    0.777005    1.178985  5.01e-04  7.90e-04
-    3.900000    0.797903    1.145840  2.41e-04  3.12e-04
-    4.000000    0.821085    1.114325  6.11e-04  6.63e-04
-    4.100000    0.844766    1.086520  6.17e-04  5.50e-04
-    4.200000    0.869296    1.061916  4.64e-04  3.57e-04
-    4.300000    0.894280    1.041111  7.58e-05  3.77e-05
-    4.400000    0.919226    1.024310  7.38e-04  3.97e-04
-    4.500000    0.947241    1.010826  1.41e-03  3.47e-04
-    4.600000    0.972517    1.003182  9.60e-04  3.27e-05
-    4.700000    0.996899    1.000222  6.87e-07  1.84e-04
-    4.800000    1.020790    1.001834  8.50e-04  8.23e-05
-    4.900000    1.044488    1.008269  1.10e-03  4.67e-04
-    5.000000    1.067577    1.019650  9.88e-04  6.81e-04
-    5.100000    1.089592    1.035682  8.16e-04  7.47e-04
-    5.200000    1.110689    1.056427  2.83e-04  2.40e-04
-    5.300000    1.130590    1.081510  4.63e-04  8.94e-04
-    5.400000    1.148014    1.108349  2.57e-04  5.43e-04
-    5.500000    1.163471    1.137100  2.88e-04  6.43e-04
-    5.600000    1.178297    1.170732  2.55e-04  8.03e-04
-    5.700000    1.190803    1.204950  2.75e-04  1.08e-03
-    5.800000    1.201254    1.239702  1.04e-04  5.91e-04
-    5.900000    1.209788    1.274961  6.34e-05  2.35e-04
-    6.000000    1.216453    1.310771  1.35e-04  9.40e-04
-    6.100000    1.221238    1.347205  8.70e-05  1.07e-03
-    6.200000    1.224075    1.385740  3.64e-05  1.21e-03
-    6.300000    1.224694    1.421145  2.19e-05  9.99e-04
-    6.400000    1.223290    1.455612  6.29e-05  7.75e-04
-    6.500000    1.219880    1.488778  7.64e-05  4.50e-04
-    6.600000    1.214417    1.521008  1.26e-04  6.32e-04
-    6.700000    1.206981    1.551430  1.61e-04  6.72e-04
-    6.800000    1.197968    1.578698  1.79e-04  5.78e-04
-    6.900000    1.186755    1.605158  2.21e-04  5.94e-04
-    7.000000    1.173344    1.630149  9.14e-05  1.23e-04
+   -2.900000    0.717303    1.326933  1.41e-06  9.00e-08
+   -2.800000    0.727250    1.290353  3.05e-06  3.67e-07
+   -2.700000    0.740247    1.254042  1.58e-06  3.07e-07
+   -2.600000    0.756016    1.218400  3.34e-06  3.18e-07
+   -2.500000    0.774229    1.183863  1.87e-06  1.42e-06
+   -2.400000    0.794549    1.150887  2.92e-06  1.67e-06
+   -2.300000    0.816618    1.119956  2.05e-06  3.01e-06
+   -2.200000    0.840090    1.091564  8.04e-07  3.49e-06
+   -2.100000    0.864626    1.066208  5.07e-07  4.62e-06
+   -2.000000    0.889905    1.044373  2.49e-06  5.91e-06
+   -1.900000    0.915619    1.026506  1.67e-06  6.92e-06
+   -1.800000    0.941488    1.013000  1.28e-07  8.31e-06
+   -1.700000    0.967252    1.004167  7.11e-07  7.62e-06
+   -1.600000    0.992671    1.000220  1.97e-06  6.97e-06
+   -1.500000    1.017528    1.001258  2.21e-06  6.34e-06
+   -1.400000    1.041624    1.007259  1.57e-06  1.01e-05
+   -1.300000    1.064775    1.018068  1.63e-06  1.00e-05
+   -1.200000    1.086819    1.033433  1.64e-06  1.08e-05
+   -1.100000    1.107607    1.053004  1.91e-06  1.16e-05
+   -1.000000    1.127008    1.076363  2.23e-06  1.36e-05
+   -0.900000    1.144902    1.103043  1.90e-06  1.35e-05
+   -0.800000    1.161180    1.132551  6.58e-06  1.21e-05
+   -0.700000    1.175761    1.164391  2.88e-06  1.06e-05
+   -0.600000    1.188555    1.198075  1.66e-06  1.09e-05
+   -0.500000    1.199494    1.233127  2.39e-06  1.14e-05
+   -0.400000    1.208523    1.269100  1.54e-06  1.29e-05
+   -0.300000    1.215593    1.305570  2.94e-07  1.28e-05
+   -0.200000    1.220668    1.342149  8.50e-07  1.20e-05
+   -0.100000    1.223723    1.378476  2.01e-06  1.09e-05
+    0.000000    1.224741    1.414224  3.73e-06  1.05e-05
+    0.100000    1.223723    1.449092  1.20e-06  1.21e-05
+    0.200000    1.220668    1.482803  1.21e-06  1.17e-05
+    0.300000    1.215591    1.515108  2.74e-06  1.08e-05
+    0.400000    1.208522    1.545785  1.90e-06  1.03e-05
+    0.500000    1.199492    1.574629  3.97e-06  1.02e-05
+    0.600000    1.188555    1.601458  1.74e-06  8.35e-06
+    0.700000    1.175761    1.626112  2.87e-06  7.30e-06
+    0.800000    1.161184    1.648447  2.00e-06  6.59e-06
+    0.900000    1.144903    1.668335  8.98e-07  4.56e-06
+    1.000000    1.127005    1.685670  5.32e-06  4.04e-06
+    1.100000    1.107608    1.700357  8.68e-07  2.08e-06
+    1.200000    1.086818    1.712321  2.45e-06  1.14e-06
+    1.300000    1.064776    1.721498  4.33e-07  5.31e-07
+    1.400000    1.041624    1.727843  1.76e-06  1.91e-06
+    1.500000    1.017530    1.731324  3.22e-07  3.31e-06
+    1.600000    0.992672    1.731923  7.91e-07  5.08e-06
+    1.700000    0.967252    1.729637  7.00e-07  6.26e-06
+    1.800000    0.941487    1.724472  2.93e-07  1.28e-05
+    1.900000    0.915617    1.716467  4.48e-08  1.16e-05
+    2.000000    0.889904    1.705655  1.90e-06  1.08e-05
+    2.100000    0.864611    1.692092  1.40e-05  9.99e-06
+    2.200000    0.840090    1.675847  1.09e-06  9.68e-06
+    2.300000    0.816618    1.657006  2.22e-06  1.06e-05
+    2.400000    0.794547    1.635674  1.39e-06  1.03e-05
+    2.500000    0.774228    1.611967  3.25e-07  1.09e-05
+    2.600000    0.756014    1.586021  1.04e-06  1.22e-05
+    2.700000    0.740245    1.557992  7.23e-07  1.32e-05
+    2.800000    0.727249    1.528053  1.66e-06  1.38e-05
+    2.900000    0.717302    1.496399  8.11e-07  1.32e-05
+    3.000000    0.710637    1.463243  6.86e-07  1.39e-05
+    3.100000    0.707415    1.428826  2.59e-06  1.25e-05
+    3.200000    0.707710    1.393410  6.94e-07  1.21e-05
+    3.300000    0.711521    1.357285  1.53e-06  1.14e-05
+    3.400000    0.718751    1.320770  1.60e-06  1.01e-05
+    3.500000    0.729226    1.284209  5.55e-07  9.40e-06
+    3.600000    0.742716    1.247982  3.92e-06  8.60e-06
+    3.700000    0.758914    1.212497  4.97e-07  5.99e-06
+    3.800000    0.777505    1.178189  1.74e-06  5.18e-06
+    3.900000    0.798150    1.145523  5.73e-06  4.63e-06
+    4.000000    0.820475    1.114985  1.79e-07  2.61e-06
+    4.100000    0.844150    1.087070  2.82e-07  1.21e-06
+    4.200000    0.868833    1.062273  5.41e-07  1.95e-07
+    4.300000    0.894211    1.041074  7.05e-06  7.71e-07
+    4.400000    0.919971    1.023914  6.81e-06  1.43e-06
+    4.500000    0.945834    1.011175  5.80e-08  2.53e-06
+    4.600000    0.971556    1.003152  1.08e-06  2.89e-06
+    4.700000    0.996895    1.000042  2.64e-06  3.95e-06
+    4.800000    1.021638    1.001920  2.63e-06  4.28e-06
+    4.900000    1.045585    1.008740  3.46e-06  4.07e-06
+    5.000000    1.068562    1.020337  3.07e-06  5.68e-06
+    5.100000    1.090405    1.036435  2.52e-06  6.24e-06
+    5.200000    1.110969    1.056675  2.42e-06  7.46e-06
+    5.300000    1.130132    1.080627  4.44e-06  1.01e-05
+    5.400000    1.147758    1.107819  5.47e-07  1.21e-05
+    5.500000    1.163763    1.137757  3.73e-06  1.39e-05
+    5.600000    1.178041    1.169944  1.24e-06  1.55e-05
+    5.700000    1.190526    1.203890  2.00e-06  1.57e-05
+    5.800000    1.201147    1.239128  1.86e-06  1.64e-05
+    5.900000    1.209851    1.275211  1.54e-07  1.56e-05
+    6.000000    1.216587    1.311725  4.24e-07  1.49e-05
+    6.100000    1.221324    1.348286  9.63e-07  1.37e-05
+    6.200000    1.224037    1.384538  2.29e-06  1.25e-05
+    6.300000    1.224713    1.420159  3.01e-06  1.36e-05
+    6.400000    1.223352    1.454851  1.10e-06  1.45e-05
+    6.500000    1.219953    1.488343  3.87e-06  1.52e-05
+    6.600000    1.214543    1.520390  4.21e-07  1.50e-05
+    6.700000    1.207142    1.550771  1.08e-07  1.28e-05
+    6.800000    1.197791    1.579287  1.50e-06  1.09e-05
+    6.900000    1.186533    1.605761  3.49e-07  9.24e-06
+    7.000000    1.173440    1.630034  3.90e-06  7.57e-06
    ------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 286 (attempted = 289)
+   Internal solver steps = 284 (attempted = 287)
    Total number of error test failures = 3
-   Total RHS evals:  Fe = 0,  Fi = 5808
-   Total mass matrix setups = 1448
-   Total mass matrix solves = 1734
-   Total mass times evals = 4646
-   Total number of Jacobian evaluations = 154
-   Total linear solver setups = 167
-   Total number of Nonlinear iterations = 4360
-   Total number of Nonlinear convergence failures = 153
-   Errors: u = 0.000511077, v = 0.000617033, total = 0.000566538
+   Total RHS evals:  Fe = 0,  Fi = 5758
+   Total mass matrix setups = 1438
+   Total mass matrix solves = 1438
+   Total mass times evals = 4604
+   Total number of Jacobian evaluations = 152
+   Total linear solver setups = 166
+   Total number of Nonlinear iterations = 4320
+   Total number of Nonlinear convergence failures = 151
+   Errors: u = 2.75875e-06, v = 9.68052e-06, total = 7.1177e-06
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out b/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out
index 0cb940ef35..54a56620ba 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out
@@ -116,8 +116,8 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
 Final Solver Statistics:
    Internal solver steps = 165 (attempted = 168)
    Total number of error test failures = 3
-   Total RHS evals:  Fe = 1008,  Fi = 0
-   Total mass matrix setups = 676
-   Total mass matrix solves = 1008
+   Total RHS evals:  Fe = 840,  Fi = 0
+   Total mass matrix setups = 672
+   Total mass matrix solves = 840
    Total mass times evals = 165
    Errors: u = 3.7533e-06, v = 2.61601e-07, total = 2.66042e-06
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out b/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out
index 8de30f8bb8..09b1fd9f98 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out
@@ -11,113 +11,113 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix:
         t           u           v       uerr      verr
    ------------------------------------------------------
    -3.000000    0.710636    1.363407  0.00e+00  0.00e+00
-   -2.900000    0.718045    1.326475  7.44e-04  4.58e-04
-   -2.800000    0.728085    1.289925  8.38e-04  4.28e-04
-   -2.700000    0.741158    1.253650  9.13e-04  3.92e-04
-   -2.600000    0.756981    1.218051  9.68e-04  3.49e-04
-   -2.500000    0.775232    1.183562  1.00e-03  3.00e-04
-   -2.400000    0.795569    1.150641  1.02e-03  2.45e-04
-   -2.300000    0.817640    1.119769  1.02e-03  1.84e-04
-   -2.200000    0.841097    1.091440  1.01e-03  1.20e-04
-   -2.100000    0.865605    1.066152  9.79e-04  5.20e-05
-   -2.000000    0.890841    1.044384  9.38e-04  1.73e-05
-   -1.900000    0.916505    1.026585  8.87e-04  8.65e-05
-   -1.800000    0.942316    1.013145  8.29e-04  1.54e-04
-   -1.700000    0.968017    1.004376  7.65e-04  2.17e-04
-   -1.600000    0.993371    1.000487  6.98e-04  2.74e-04
-   -1.500000    1.018160    1.001576  6.29e-04  3.24e-04
-   -1.400000    1.042187    1.007615  5.62e-04  3.66e-04
-   -1.300000    1.065272    1.018458  4.95e-04  4.00e-04
-   -1.200000    1.087252    1.033847  4.32e-04  4.25e-04
-   -1.100000    1.107980    1.053435  3.71e-04  4.43e-04
-   -1.000000    1.127323    1.076803  3.13e-04  4.53e-04
-   -0.900000    1.145162    1.103486  2.58e-04  4.57e-04
-   -0.800000    1.161392    1.132995  2.06e-04  4.56e-04
-   -0.700000    1.175919    1.164832  1.55e-04  4.51e-04
-   -0.600000    1.188664    1.198507  1.07e-04  4.43e-04
-   -0.500000    1.199556    1.233548  5.93e-05  4.32e-04
-   -0.400000    1.208537    1.269506  1.25e-05  4.19e-04
-   -0.300000    1.215560    1.305961  3.40e-05  4.04e-04
-   -0.200000    1.220588    1.342524  8.09e-05  3.87e-04
-   -0.100000    1.223596    1.378834  1.28e-04  3.69e-04
-    0.000000    1.224568    1.414564  1.77e-04  3.50e-04
-    0.100000    1.223499    1.449410  2.26e-04  3.30e-04
-    0.200000    1.220392    1.483100  2.77e-04  3.09e-04
-    0.300000    1.215265    1.515385  3.29e-04  2.87e-04
-    0.400000    1.208143    1.546038  3.81e-04  2.64e-04
-    0.500000    1.199061    1.574859  4.35e-04  2.39e-04
-    0.600000    1.188067    1.601664  4.90e-04  2.14e-04
-    0.700000    1.175220    1.626292  5.44e-04  1.87e-04
-    0.800000    1.160588    1.648599  5.98e-04  1.59e-04
-    0.900000    1.144254    1.668459  6.50e-04  1.29e-04
-    1.000000    1.126309    1.685764  7.01e-04  9.76e-05
-    1.100000    1.106861    1.700420  7.49e-04  6.49e-05
-    1.200000    1.086028    1.712351  7.92e-04  3.09e-05
-    1.300000    1.063946    1.721494  8.31e-04  4.52e-06
-    1.400000    1.040763    1.727804  8.63e-04  4.11e-05
-    1.500000    1.016643    1.731249  8.87e-04  7.87e-05
-    1.600000    0.991770    1.731811  9.03e-04  1.17e-04
-    1.700000    0.966344    1.729487  9.09e-04  1.56e-04
-    1.800000    0.940584    1.724289  9.03e-04  1.95e-04
-    1.900000    0.914733    1.716245  8.85e-04  2.34e-04
-    2.000000    0.889050    1.705393  8.52e-04  2.73e-04
-    2.100000    0.863821    1.691792  8.05e-04  3.11e-04
-    2.200000    0.839347    1.675510  7.42e-04  3.47e-04
-    2.300000    0.815954    1.656637  6.62e-04  3.80e-04
-    2.400000    0.793979    1.635273  5.67e-04  4.12e-04
-    2.500000    0.773771    1.611538  4.56e-04  4.40e-04
-    2.600000    0.755681    1.585570  3.32e-04  4.64e-04
-    2.700000    0.740050    1.557522  1.96e-04  4.83e-04
-    2.800000    0.727196    1.527569  5.13e-05  4.97e-04
-    2.900000    0.717399    1.495906  9.79e-05  5.06e-04
-    3.000000    0.710883    1.462748  2.47e-04  5.09e-04
-    3.100000    0.707805    1.428334  3.92e-04  5.05e-04
-    3.200000    0.708238    1.392928  5.29e-04  4.94e-04
-    3.300000    0.712172    1.356819  6.53e-04  4.77e-04
-    3.400000    0.719510    1.320326  7.61e-04  4.53e-04
-    3.500000    0.730078    1.283796  8.52e-04  4.22e-04
-    3.600000    0.743635    1.247605  9.23e-04  3.85e-04
-    3.700000    0.759889    1.212162  9.76e-04  3.41e-04
-    3.800000    0.778515    1.177904  1.01e-03  2.91e-04
-    3.900000    0.799168    1.145293  1.02e-03  2.35e-04
-    4.000000    0.821496    1.114814  1.02e-03  1.74e-04
-    4.100000    0.845154    1.086962  1.00e-03  1.09e-04
-    4.200000    0.869806    1.062233  9.73e-04  4.04e-05
-    4.300000    0.895134    1.041103  9.30e-04  2.90e-05
-    4.400000    0.920842    1.024011  8.78e-04  9.80e-05
-    4.500000    0.946652    1.011337  8.18e-04  1.65e-04
-    4.600000    0.972311    1.003376  7.54e-04  2.27e-04
-    4.700000    0.997584    1.000322  6.86e-04  2.83e-04
-    4.800000    1.022259    1.002248  6.18e-04  3.32e-04
-    4.900000    1.046139    1.009108  5.50e-04  3.73e-04
-    5.000000    1.069050    1.020736  4.85e-04  4.05e-04
-    5.100000    1.090829    1.036858  4.21e-04  4.29e-04
-    5.200000    1.111333    1.057112  3.61e-04  4.45e-04
-    5.300000    1.130431    1.081071  3.04e-04  4.54e-04
-    5.400000    1.148006    1.108264  2.49e-04  4.57e-04
-    5.500000    1.163956    1.138199  1.97e-04  4.56e-04
-    5.600000    1.178189    1.170379  1.47e-04  4.50e-04
-    5.700000    1.190627    1.204316  9.87e-05  4.41e-04
-    5.800000    1.201201    1.239542  5.14e-05  4.30e-04
-    5.900000    1.209856    1.275612  4.71e-06  4.16e-04
-    6.000000    1.216546    1.312111  4.19e-05  4.01e-04
-    6.100000    1.221236    1.348656  8.88e-05  3.84e-04
-    6.200000    1.223902    1.384891  1.36e-04  3.66e-04
-    6.300000    1.224531    1.420493  1.85e-04  3.47e-04
-    6.400000    1.223118    1.455163  2.35e-04  3.27e-04
-    6.500000    1.219671    1.488633  2.85e-04  3.06e-04
-    6.600000    1.214206    1.520659  3.37e-04  2.83e-04
-    6.700000    1.206751    1.551018  3.90e-04  2.60e-04
-    6.800000    1.197345    1.579511  4.44e-04  2.35e-04
-    6.900000    1.186035    1.605962  4.99e-04  2.09e-04
-    7.000000    1.172883    1.630209  5.53e-04  1.82e-04
+   -2.900000    0.717301    1.326933  4.07e-08  3.12e-09
+   -2.800000    0.727247    1.290353  3.42e-08  2.79e-09
+   -2.700000    0.740246    1.254042  2.54e-08  2.29e-09
+   -2.600000    0.756013    1.218400  1.63e-08  1.73e-09
+   -2.500000    0.774227    1.183861  8.20e-09  1.12e-09
+   -2.400000    0.794546    1.150885  1.46e-09  4.54e-10
+   -2.300000    0.816616    1.119953  3.85e-09  2.91e-10
+   -2.200000    0.840089    1.091560  7.86e-09  1.15e-09
+   -2.100000    0.864625    1.066204  1.08e-08  2.15e-09
+   -2.000000    0.889903    1.044367  1.29e-08  3.28e-09
+   -1.900000    0.915617    1.026499  1.44e-08  4.47e-09
+   -1.800000    0.941488    1.012992  1.53e-08  5.61e-09
+   -1.700000    0.967253    1.004159  1.58e-08  6.53e-09
+   -1.600000    0.992673    1.000213  1.58e-08  7.07e-09
+   -1.500000    1.017531    1.001252  1.55e-08  7.11e-09
+   -1.400000    1.041625    1.007249  1.48e-08  6.62e-09
+   -1.300000    1.064777    1.018058  1.40e-08  5.67e-09
+   -1.200000    1.086821    1.033422  1.30e-08  4.42e-09
+   -1.100000    1.107609    1.052992  1.21e-08  3.06e-09
+   -1.000000    1.127010    1.076350  1.13e-08  1.77e-09
+   -0.900000    1.144904    1.103029  1.06e-08  6.58e-10
+   -0.800000    1.161186    1.132539  1.00e-08  2.11e-10
+   -0.700000    1.175764    1.164381  9.60e-09  8.29e-10
+   -0.600000    1.188557    1.198064  9.28e-09  1.22e-09
+   -0.500000    1.199496    1.233116  9.06e-09  1.44e-09
+   -0.400000    1.208524    1.269087  8.91e-09  1.52e-09
+   -0.300000    1.215594    1.305557  8.81e-09  1.51e-09
+   -0.200000    1.220669    1.342137  8.75e-09  1.43e-09
+   -0.100000    1.223725    1.378465  8.72e-09  1.33e-09
+    0.000000    1.224745    1.414214  8.70e-09  1.21e-09
+    0.100000    1.223725    1.449080  8.70e-09  1.09e-09
+    0.200000    1.220669    1.482791  8.71e-09  9.72e-10
+    0.300000    1.215594    1.515097  8.74e-09  8.62e-10
+    0.400000    1.208524    1.545774  8.78e-09  7.62e-10
+    0.500000    1.199496    1.574619  8.83e-09  6.73e-10
+    0.600000    1.188557    1.601450  8.91e-09  5.94e-10
+    0.700000    1.175764    1.626105  9.01e-09  5.23e-10
+    0.800000    1.161186    1.648441  9.14e-09  4.60e-10
+    0.900000    1.144904    1.668331  9.30e-09  4.04e-10
+    1.000000    1.127010    1.685666  9.50e-09  3.53e-10
+    1.100000    1.107609    1.700355  9.75e-09  3.06e-10
+    1.200000    1.086821    1.712320  1.00e-08  2.63e-10
+    1.300000    1.064777    1.721499  1.04e-08  2.23e-10
+    1.400000    1.041625    1.727845  1.07e-08  1.85e-10
+    1.500000    1.017531    1.731328  1.11e-08  1.52e-10
+    1.600000    0.992673    1.731928  1.14e-08  1.24e-10
+    1.700000    0.967253    1.729643  1.16e-08  1.06e-10
+    1.800000    0.941488    1.724485  1.16e-08  1.01e-10
+    1.900000    0.915617    1.716479  1.13e-08  1.16e-10
+    2.000000    0.889903    1.705666  1.05e-08  1.63e-10
+    2.100000    0.864625    1.692102  8.92e-09  2.52e-10
+    2.200000    0.840089    1.675857  6.33e-09  3.98e-10
+    2.300000    0.816616    1.657017  2.42e-09  6.17e-10
+    2.400000    0.794546    1.635684  3.04e-09  9.19e-10
+    2.500000    0.774227    1.611978  1.02e-08  1.31e-09
+    2.600000    0.756013    1.586033  1.88e-08  1.79e-09
+    2.700000    0.740246    1.558005  2.85e-08  2.31e-09
+    2.800000    0.727247    1.528067  3.83e-08  2.85e-09
+    2.900000    0.717301    1.496412  4.71e-08  3.33e-09
+    3.000000    0.710636    1.463257  5.36e-08  3.70e-09
+    3.100000    0.707413    1.428839  5.66e-08  3.88e-09
+    3.200000    0.707709    1.393422  5.57e-08  3.86e-09
+    3.300000    0.711520    1.357297  5.10e-08  3.64e-09
+    3.400000    0.718750    1.320780  4.34e-08  3.27e-09
+    3.500000    0.729227    1.284218  3.41e-08  2.78e-09
+    3.600000    0.742712    1.247990  2.43e-08  2.23e-09
+    3.700000    0.758914    1.212503  1.50e-08  1.64e-09
+    3.800000    0.777506    1.178194  7.03e-09  1.01e-09
+    3.900000    0.798144    1.145528  4.85e-10  3.38e-10
+    4.000000    0.820474    1.114988  4.60e-09  4.26e-10
+    4.100000    0.844149    1.087071  8.42e-09  1.31e-09
+    4.200000    0.868832    1.062273  1.12e-08  2.33e-09
+    4.300000    0.894204    1.041074  1.32e-08  3.48e-09
+    4.400000    0.919964    1.023913  1.46e-08  4.67e-09
+    4.500000    0.945834    1.011173  1.54e-08  5.78e-09
+    4.600000    0.971557    1.003150  1.58e-08  6.65e-09
+    4.700000    0.996898    1.000038  1.58e-08  7.12e-09
+    4.800000    1.021641    1.001916  1.54e-08  7.06e-09
+    4.900000    1.045589    1.008736  1.47e-08  6.49e-09
+    5.000000    1.068565    1.020331  1.38e-08  5.47e-09
+    5.100000    1.090408    1.036429  1.29e-08  4.19e-09
+    5.200000    1.110972    1.056667  1.20e-08  2.84e-09
+    5.300000    1.130127    1.080617  1.12e-08  1.57e-09
+    5.400000    1.147757    1.107807  1.05e-08  4.94e-10
+    5.500000    1.163759    1.137743  9.95e-09  3.32e-10
+    5.600000    1.178042    1.169929  9.54e-09  9.10e-10
+    5.700000    1.190528    1.203875  9.24e-09  1.27e-09
+    5.800000    1.201149    1.239112  9.03e-09  1.46e-09
+    5.900000    1.209851    1.275195  8.89e-09  1.52e-09
+    6.000000    1.216587    1.311711  8.80e-09  1.50e-09
+    6.100000    1.221325    1.348272  8.75e-09  1.42e-09
+    6.200000    1.224039    1.384525  8.72e-09  1.31e-09
+    6.300000    1.224716    1.420146  8.70e-09  1.19e-09
+    6.400000    1.223353    1.454836  8.70e-09  1.07e-09
+    6.500000    1.219956    1.488328  8.72e-09  9.53e-10
+    6.600000    1.214544    1.520375  8.74e-09  8.44e-10
+    6.700000    1.207142    1.550758  8.78e-09  7.47e-10
+    6.800000    1.197789    1.579276  8.84e-09  6.59e-10
+    6.900000    1.186534    1.605752  8.92e-09  5.81e-10
+    7.000000    1.173436    1.630027  9.03e-09  5.12e-10
    ------------------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 103 (attempted = 103)
    Total number of error test failures = 0
    Total RHS evals:  Fe = 1742,  Fi = 0
-   Total mass matrix setups = 1539
-   Total mass matrix solves = 1845
+   Total mass matrix setups = 1439
+   Total mass matrix solves = 1742
    Total mass times evals = 103
-   Errors: u = 0.000634856, v = 0.000337591, total = 0.000508434
+   Errors: u = 1.83418e-08, v = 2.86413e-09, total = 1.31268e-08
diff --git a/examples/arkode/CXX_serial/ark_pendulum.cpp b/examples/arkode/CXX_serial/ark_pendulum.cpp
index d56ee752b8..a0a0cf3090 100644
--- a/examples/arkode/CXX_serial/ark_pendulum.cpp
+++ b/examples/arkode/CXX_serial/ark_pendulum.cpp
@@ -209,6 +209,9 @@ int main(int argc, char* argv[])
     if (check_flag(flag, "ARKStepSetFixedStep")) return 1;
   }
 
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+  if (check_flag(flag, "ARKStepSetNonlinConvCoef")) return 1;
+
   /* --------------- *
    * Advance in Time *
    * --------------- */
diff --git a/examples/arkode/CXX_serial/ark_pendulum.out b/examples/arkode/CXX_serial/ark_pendulum.out
index dca1a58ccb..94c4259cfd 100644
--- a/examples/arkode/CXX_serial/ark_pendulum.out
+++ b/examples/arkode/CXX_serial/ark_pendulum.out
@@ -7,29 +7,29 @@ Nonlinear Pendulum problem:
     step                      t                      u                      v                      e                  e err
 ---------------------------------------------------------------------------------------------------------------------------
        0  0.000000000000000e+00  1.500000000000000e+00  1.000000000000000e+00  5.846976941318602e-01  0.000000000000000e+00
-    1000  1.226511879534299e+00  3.458488320982976e-01  2.123384535074106e+00  5.846976941318555e-01 -4.773959005888173e-15
-    2000  2.398784336118560e+00 -6.416442371616857e-01  1.959343228667432e+00  5.846976941318377e-01 -2.253752739989068e-14
-    3000  3.618483293504332e+00 -1.718124366999066e+00  4.706406225355917e-01  5.846976941318435e-01 -1.676436767183986e-14
-    4000  4.580865391430372e+00 -1.411700239944070e+00 -1.146421559917496e+00  5.846976941318369e-01 -2.331468351712829e-14
-    5000  5.877850661141863e+00 -2.026377125271683e-01 -2.170219947005763e+00  5.846976941318408e-01 -1.942890293094024e-14
-    6000  7.079795692175875e+00  8.320973704310155e-01 -1.811622127832077e+00  5.846976941318234e-01 -3.685940441755520e-14
-    7000  8.313428698722841e+00  1.777791699609239e+00 -9.412012907795819e-02  5.846976941318288e-01 -3.141931159689193e-14
-    8000  9.289846347799413e+00  1.192220279192671e+00  1.444463648145965e+00  5.846976941318289e-01 -3.130828929442941e-14
+    1000  1.225851562364904e+00  3.464109129286753e-01  2.123155979647627e+00  5.846976941318590e-01 -1.221245327087672e-15
+    2000  2.418923205034655e+00 -6.603311992497419e-01  1.946233242793910e+00  5.846976941317269e-01 -1.333377852574813e-13
+    3000  3.660149066899992e+00 -1.735668411457896e+00  3.986787133040775e-01  5.846976941317225e-01 -1.377786773559819e-13
+    4000  4.623294832907320e+00 -1.372538839057398e+00 -1.205491805789652e+00  5.846976941317235e-01 -1.367794766338193e-13
+    5000  5.934005658137125e+00 -1.564401075076330e-01 -2.180300444219520e+00  5.846976941317296e-01 -1.306732499983809e-13
+    6000  7.123567932980419e+00  8.747899699484564e-01 -1.774266316025390e+00  5.846976941316223e-01 -2.379207941771710e-13
+    7000  8.350624078669346e+00  1.780060261145096e+00 -2.794469129917746e-02  5.846976941316284e-01 -2.318145675417327e-13
+    8000  9.285790680382140e+00  1.196242389800009e+00  1.439620221946003e+00  5.846976941316235e-01 -2.366995488500834e-13
 ---------------------------------------------------------------------------------------------------------------------------
 
 Final Solver Statistics:
-  Internal solver steps = 8518 (attempted = 8528)
+  Internal solver steps = 8552 (attempted = 8562)
   Total number of error test failures = 10
-  Total RHS evals:  Fe = 0,  Fi = 50909
-  Total number of Newton iterations = 25332
-  Total number of linear solver convergence failures = 5
-  Total linear solver setups = 459
-  Total number of Jacobian evaluations = 146
+  Total RHS evals:  Fe = 0,  Fi = 52696
+  Total number of Newton iterations = 27018
+  Total number of linear solver convergence failures = 11
+  Total linear solver setups = 471
+  Total number of Jacobian evaluations = 150
   Total RHS evals for setting up the linear system = 0
-  Total Relaxation Fn evals    = 25494
-  Total Relaxation Jac evals   = 25494
+  Total Relaxation Fn evals    = 25424
+  Total Relaxation Jac evals   = 25424
   Total Relaxation fails       = 0
   Total Relaxation bound fails = 0
   Total Relaxation NLS fails   = 0
-  Total Relaxation NLS iters   = 8438
+  Total Relaxation NLS iters   = 8300
 
diff --git a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out
index 1cf56e4da4..61563dca16 100644
--- a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out
+++ b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out
@@ -12,68 +12,68 @@
     0.300000    0.648532    3.334867    1.999989
     0.400000    0.654362    3.323350    1.999989
     0.500000    0.660542    3.311172    1.999988
-    0.600000    0.667093    3.298310    1.999988
-    0.700000    0.674031    3.284739    1.999988
+    0.600000    0.667093    3.298309    1.999988
+    0.700000    0.674031    3.284739    1.999989
     0.800000    0.681370    3.270442    1.999988
     0.900000    0.689121    3.255404    1.999988
-    1.000000    0.697285    3.239620    1.999988
-    1.100000    0.705854    3.223093    1.999987
+    1.000000    0.697284    3.239620    1.999988
+    1.100000    0.705853    3.223093    1.999987
     1.200000    0.714805    3.205842    1.999987
-    1.300000    0.724099    3.187902    1.999987
-    1.400000    0.733671    3.169332    1.999987
-    1.500000    0.743429    3.150211    1.999987
-    1.600000    0.753249    3.130653    1.999987
-    1.700000    0.762974    3.110800    1.999986
-    1.800000    0.772412    3.090827    1.999986
-    1.900000    0.781337    3.070944    1.999986
-    2.000000    0.789501    3.051388    1.999986
-    2.100000    0.796639    3.032420    1.999986
-    2.200000    0.802490    3.014317    1.999986
-    2.300000    0.806810    2.997358    1.999986
-    2.400000    0.809386    2.981818    1.999986
-    2.500000    0.810060    2.967949    1.999986
-    2.600000    0.808729    2.955977    1.999986
-    2.700000    0.805360    2.946085    1.999986
-    2.800000    0.799989    2.938410    1.999986
-    2.900000    0.792711    2.933039    1.999986
-    3.000000    0.783680    2.930010    1.999986
-    3.100000    0.773095    2.929307    1.999986
-    3.200000    0.761187    2.930873    1.999986
-    3.300000    0.748207    2.934612    1.999987
-    3.400000    0.734416    2.940393    1.999987
-    3.500000    0.720073    2.948062    1.999987
+    1.300000    0.724098    3.187903    1.999987
+    1.400000    0.733670    3.169332    1.999987
+    1.500000    0.743428    3.150212    1.999987
+    1.600000    0.753248    3.130655    1.999987
+    1.700000    0.762974    3.110801    1.999986
+    1.800000    0.772411    3.090829    1.999986
+    1.900000    0.781336    3.070946    1.999986
+    2.000000    0.789499    3.051390    1.999986
+    2.100000    0.796638    3.032422    1.999986
+    2.200000    0.802489    3.014319    1.999986
+    2.300000    0.806808    2.997360    1.999986
+    2.400000    0.809386    2.981819    1.999986
+    2.500000    0.810059    2.967951    1.999986
+    2.600000    0.808728    2.955979    1.999986
+    2.700000    0.805361    2.946086    1.999986
+    2.800000    0.799988    2.938411    1.999986
+    2.900000    0.792711    2.933041    1.999986
+    3.000000    0.783681    2.930010    1.999986
+    3.100000    0.773096    2.929307    1.999986
+    3.200000    0.761187    2.930874    1.999986
+    3.300000    0.748207    2.934613    1.999987
+    3.400000    0.734416    2.940394    1.999987
+    3.500000    0.720074    2.948062    1.999987
     3.600000    0.705429    2.957444    1.999987
-    3.700000    0.690714    2.968354    1.999988
+    3.700000    0.690715    2.968354    1.999988
     3.800000    0.676141    2.980600    1.999988
-    3.900000    0.661891    2.993989    1.999988
-    4.000000    0.648122    3.008331    1.999989
-    4.100000    0.634961    3.023445    1.999989
+    3.900000    0.661892    2.993989    1.999988
+    4.000000    0.648123    3.008331    1.999989
+    4.100000    0.634962    3.023445    1.999989
     4.200000    0.622506    3.039157    1.999989
     4.300000    0.610828    3.055308    1.999989
-    4.400000    0.599972    3.071752    1.999989
+    4.400000    0.599972    3.071751    1.999989
     4.500000    0.589962    3.088356    1.999990
     4.600000    0.580801    3.105007    1.999990
-    4.700000    0.572477    3.121603    1.999990
-    4.800000    0.564964    3.138059    1.999990
+    4.700000    0.572477    3.121602    1.999990
+    4.800000    0.564964    3.138058    1.999990
     4.900000    0.558227    3.154303    1.999990
-    5.000000    0.552224    3.170278    1.999990
+    5.000000    0.552224    3.170277    1.999990
     5.100000    0.546907    3.185935    1.999991
-    5.200000    0.542228    3.201239    1.999991
-    5.300000    0.538137    3.216162    1.999991
-    5.400000    0.534585    3.230683    1.999991
+    5.200000    0.542229    3.201239    1.999991
+    5.300000    0.538138    3.216162    1.999991
+    5.400000    0.534586    3.230682    1.999991
     5.500000    0.531525    3.244788    1.999991
-    5.600000    0.528910    3.258469    1.999991
-    5.700000    0.526699    3.271720    1.999991
+    5.600000    0.528910    3.258468    1.999991
+    5.700000    0.526699    3.271719    1.999991
     5.800000    0.524852    3.284539    1.999991
     5.900000    0.523334    3.296928    1.999991
-    6.000000    0.522111    3.308889    1.999991
-    6.100000    0.521154    3.320427    1.999991
+    6.000000    0.522112    3.308889    1.999991
+    6.100000    0.521154    3.320426    1.999991
     6.200000    0.520436    3.331545    1.999991
-    6.300000    0.519932    3.342251    1.999991
+    6.300000    0.519932    3.342250    1.999991
     6.400000    0.519621    3.352549    1.999991
-    6.500000    0.519484    3.362447    1.999991
-    6.600000    0.519503    3.371950    1.999991
-    6.700000    0.519664    3.381065    1.999991
+    6.500000    0.519484    3.362446    1.999991
+    6.600000    0.519503    3.371949    1.999991
+    6.700000    0.519664    3.381064    1.999991
     6.800000    0.519953    3.389797    1.999991
     6.900000    0.520358    3.398153    1.999991
     7.000000    0.520869    3.406139    1.999991
@@ -86,37 +86,37 @@
     7.700000    0.526775    3.452091    1.999991
     7.800000    0.527887    3.457288    1.999991
     7.900000    0.529055    3.462154    1.999991
-    8.000000    0.530276    3.466693    1.999991
-    8.100000    0.531549    3.470907    1.999991
+    8.000000    0.530276    3.466692    1.999991
+    8.100000    0.531549    3.470906    1.999991
     8.200000    0.532872    3.474798    1.999991
     8.300000    0.534244    3.478370    1.999991
     8.400000    0.535665    3.481625    1.999991
-    8.500000    0.537133    3.484563    1.999991
+    8.500000    0.537133    3.484564    1.999991
     8.600000    0.538649    3.487188    1.999991
     8.700000    0.540213    3.489499    1.999991
-    8.800000    0.541825    3.491497    1.999991
-    8.900000    0.543486    3.493184    1.999991
+    8.800000    0.541825    3.491498    1.999991
+    8.900000    0.543486    3.493185    1.999991
     9.000000    0.545196    3.494560    1.999991
     9.100000    0.546957    3.495624    1.999991
     9.200000    0.548771    3.496375    1.999991
     9.300000    0.550638    3.496814    1.999990
-    9.400000    0.552562    3.496938    1.999990
+    9.400000    0.552561    3.496938    1.999990
     9.500000    0.554543    3.496746    1.999990
-    9.600000    0.556585    3.496235    1.999990
+    9.600000    0.556585    3.496236    1.999990
     9.700000    0.558691    3.495404    1.999990
-    9.800000    0.560864    3.494247    1.999990
+    9.800000    0.560864    3.494248    1.999990
     9.900000    0.563108    3.492763    1.999990
    10.000000    0.565426    3.490945    1.999990
    ----------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 95 (attempted = 95)
-   Total RHS evals:  Fe = 0,  Fi = 1605
+   Total RHS evals:  Fe = 0,  Fi = 1596
    Total mass matrix setups = 1
-   Total mass matrix solves = 288
-   Total mass times evals = 1697
+   Total mass matrix solves = 193
+   Total mass times evals = 1688
    Total linear solver setups = 31
    Total number of Jacobian evaluations = 11
-   Total number of Newton iterations = 1127
+   Total number of Newton iterations = 1118
    Total number of nonlinear solver convergence failures = 10
    Total number of error test failures = 0
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out
index bd7bba7149..978c7d9928 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out
@@ -45,13 +45,13 @@
   output         = 1
  --------------------------------- 
 
-  Max error = 3.297223456216303e-03
+  Max error = 3.297223495382084e-03
 
 Final max integrator statistics:
   Steps            = 1780
   Step attempts    = 1780
   Error test fails = 450
-  RHS evals        = 14240
+  RHS evals        = 12460
   NLS iters        = 5340
   NLS fails        = 0
   LS iters         = 30510
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out
index 4e2d372699..744747849a 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out
@@ -42,24 +42,24 @@
   output         = 1
  --------------------------------- 
 
-  Max error = 3.297223517807257e-03
+  Max error = 3.297223330406052e-03
 
 Final max integrator statistics:
   Steps            = 1780
   Step attempts    = 1780
   Error test fails = 450
-  RHS evals        = 14240
+  RHS evals        = 12460
   NLS iters        = 5340
   NLS fails        = 0
-  LS iters         = 189634
+  LS iters         = 188622
   LS fails         = 0
   LS setups        = 1780
-  LS RHS evals     = 189634
-  Jv products      = 189634
+  LS RHS evals     = 188622
+  Jv products      = 188622
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 35.511985
+  Avg LS iters per NLS iter      = 35.322472
 
   Preconditioner setups = 1780
-  Preconditioner solves = 189634
+  Preconditioner solves = 188622
 
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out
index f9de301b00..90b4dedf7a 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out
@@ -37,24 +37,24 @@
   output         = 1
  --------------------------------- 
 
-  Max error = 3.297223770518998e-03
+  Max error = 3.297223425028251e-03
 
 Final max integrator statistics:
   Steps            = 895
   Step attempts    = 895
   Error test fails = 324
-  RHS evals        = 7160
+  RHS evals        = 6265
   NLS iters        = 2685
   NLS fails        = 0
-  LS iters         = 98385
+  LS iters         = 97779
   LS fails         = 0
   LS setups        = 895
-  LS RHS evals     = 98385
-  Jv products      = 98385
+  LS RHS evals     = 97779
+  Jv products      = 97779
 
   Avg NLS iters per step attempt = 3.000000
-  Avg LS iters per NLS iter      = 36.642458
+  Avg LS iters per NLS iter      = 36.416760
 
   Preconditioner setups = 895
-  Preconditioner solves = 98385
+  Preconditioner solves = 97779
 
diff --git a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out
index ab197185fe..6366fd534c 100644
--- a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out
+++ b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out
@@ -32,7 +32,7 @@
     2.300000    1.178983    2.282911    1.999977
     2.400000    1.156873    2.248486    1.999978
     2.500000    1.128176    2.220852    1.999978
-    2.600000    1.094311    2.199774    1.999979
+    2.600000    1.094311    2.199774    1.999978
     2.700000    1.056614    2.184957    1.999979
     2.800000    1.016284    2.176069    1.999980
     2.900000    0.974366    2.172745    1.999981
@@ -64,7 +64,7 @@
     5.500000    0.354771    2.869085    1.999993
     5.600000    0.349641    2.900573    1.999993
     5.700000    0.345224    2.931786    1.999993
-    5.800000    0.341455    2.962716    1.999994
+    5.800000    0.341455    2.962716    1.999993
     5.900000    0.338270    2.993362    1.999994
     6.000000    0.335614    3.023721    1.999994
     6.100000    0.333434    3.053792    1.999994
@@ -82,9 +82,9 @@
     7.300000    0.331130    3.392178    1.999994
     7.400000    0.332202    3.418486    1.999994
     7.500000    0.333401    3.444494    1.999994
-    7.600000    0.334721    3.470197    1.999994
-    7.700000    0.336154    3.495592    1.999994
-    7.800000    0.337695    3.520673    1.999994
+    7.600000    0.334721    3.470197    1.999993
+    7.700000    0.336154    3.495592    1.999993
+    7.800000    0.337695    3.520673    1.999993
     7.900000    0.339341    3.545436    1.999993
     8.000000    0.341088    3.569873    1.999993
     8.100000    0.342934    3.593980    1.999993
@@ -100,18 +100,18 @@
     9.100000    0.366830    3.814901    1.999993
     9.200000    0.369812    3.834729    1.999993
     9.300000    0.372919    3.854085    1.999993
-    9.400000    0.376159    3.872952    1.999993
-    9.500000    0.379540    3.891308    1.999993
-    9.600000    0.383069    3.909132    1.999993
+    9.400000    0.376159    3.872952    1.999992
+    9.500000    0.379540    3.891308    1.999992
+    9.600000    0.383069    3.909132    1.999992
     9.700000    0.386758    3.926398    1.999992
-    9.800000    0.390617    3.943079    1.999992
-    9.900000    0.394659    3.959146    1.999992
-   10.000000    0.398900    3.974566    1.999992
+    9.800000    0.390617    3.943079    1.999993
+    9.900000    0.394659    3.959146    1.999993
+   10.000000    0.398900    3.974566    1.999993
    ----------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 395 (attempted = 422)
-   Total RHS evals:  Fe = 2535,  Fi = 7165
+   Total RHS evals:  Fe = 2508,  Fi = 7138
    Total linear solver setups = 0
    Total linear iterations = 15143
    Total linear convergence failures = 0
diff --git a/examples/arkode/C_openmp/ark_brusselator1D_omp.out b/examples/arkode/C_openmp/ark_brusselator1D_omp.out
index 1c209cc20f..9d254eaac0 100644
--- a/examples/arkode/C_openmp/ark_brusselator1D_omp.out
+++ b/examples/arkode/C_openmp/ark_brusselator1D_omp.out
@@ -9,102 +9,102 @@
         t      ||u||_rms   ||v||_rms   ||w||_rms
    ----------------------------------------------
     0.100000    0.673914    3.377329    1.999987
-    0.200000    0.684316    3.356619    1.999987
+    0.200000    0.684316    3.356619    1.999986
     0.300000    0.695306    3.334633    1.999986
     0.400000    0.706918    3.311313    1.999986
     0.500000    0.719185    3.286601    1.999986
     0.600000    0.732137    3.260442    1.999986
     0.700000    0.745798    3.232787    1.999985
     0.800000    0.760185    3.203596    1.999985
-    0.900000    0.775303    3.172839    1.999985
+    0.900000    0.775302    3.172839    1.999985
     1.000000    0.791135    3.140510    1.999984
     1.100000    0.807648    3.106624    1.999984
     1.200000    0.824771    3.071233    1.999984
     1.300000    0.842402    3.034426    1.999983
     1.400000    0.860384    2.996350    1.999983
-    1.500000    0.878514    2.957206    1.999983
+    1.500000    0.878514    2.957207    1.999983
     1.600000    0.896525    2.917266    1.999982
     1.700000    0.914089    2.876873    1.999982
     1.800000    0.930823    2.836438    1.999982
     1.900000    0.946292    2.796446    1.999982
-    2.000000    0.960033    2.757430    1.999981
-    2.100000    0.971576    2.719962    1.999981
-    2.200000    0.980475    2.684623    1.999981
+    2.000000    0.960034    2.757430    1.999981
+    2.100000    0.971577    2.719961    1.999981
+    2.200000    0.980476    2.684622    1.999981
     2.300000    0.986338    2.651980    1.999981
-    2.400000    0.988852    2.622560    1.999981
-    2.500000    0.987815    2.596818    1.999981
-    2.600000    0.983141    2.575128    1.999981
-    2.700000    0.974858    2.557766    1.999981
-    2.800000    0.963114    2.544903    1.999981
-    2.900000    0.948154    2.536611    1.999981
-    3.000000    0.930299    2.532868    1.999982
-    3.100000    0.909930    2.533567    1.999982
-    3.200000    0.887464    2.538529    1.999983
-    3.300000    0.863335    2.547515    1.999983
-    3.400000    0.837978    2.560241    1.999983
+    2.400000    0.988853    2.622559    1.999981
+    2.500000    0.987816    2.596818    1.999981
+    2.600000    0.983141    2.575127    1.999981
+    2.700000    0.974859    2.557765    1.999981
+    2.800000    0.963115    2.544902    1.999981
+    2.900000    0.948155    2.536610    1.999981
+    3.000000    0.930300    2.532867    1.999982
+    3.100000    0.909931    2.533566    1.999982
+    3.200000    0.887464    2.538528    1.999983
+    3.300000    0.863335    2.547514    1.999983
+    3.400000    0.837978    2.560240    1.999983
     3.500000    0.811818    2.576391    1.999984
     3.600000    0.785255    2.595624    1.999984
-    3.700000    0.758659    2.617587    1.999985
-    3.800000    0.732363    2.641922    1.999986
+    3.700000    0.758658    2.617586    1.999985
+    3.800000    0.732363    2.641921    1.999986
     3.900000    0.706662    2.668274    1.999986
     4.000000    0.681809    2.696300    1.999986
-    4.100000    0.658012    2.725670    1.999987
+    4.100000    0.658011    2.725670    1.999987
     4.200000    0.635435    2.756075    1.999987
-    4.300000    0.614205    2.787228    1.999988
+    4.300000    0.614204    2.787228    1.999988
     4.400000    0.594404    2.818869    1.999988
     4.500000    0.576082    2.850764    1.999989
-    4.600000    0.559255    2.882710    1.999989
+    4.600000    0.559254    2.882710    1.999989
     4.700000    0.543909    2.914529    1.999989
     4.800000    0.530011    2.946071    1.999990
-    4.900000    0.517506    2.977209    1.999990
+    4.900000    0.517506    2.977210    1.999990
     5.000000    0.506326    3.007843    1.999990
-    5.100000    0.496394    3.037889    1.999990
-    5.200000    0.487626    3.067283    1.999990
+    5.100000    0.496393    3.037889    1.999990
+    5.200000    0.487625    3.067283    1.999990
     5.300000    0.479935    3.095976    1.999991
     5.400000    0.473237    3.123932    1.999991
-    5.500000    0.467445    3.151125    1.999991
+    5.500000    0.467445    3.151126    1.999991
     5.600000    0.462480    3.177540    1.999991
     5.700000    0.458264    3.203165    1.999991
     5.800000    0.454726    3.227997    1.999991
-    5.900000    0.451800    3.252035    1.999991
+    5.900000    0.451799    3.252035    1.999991
     6.000000    0.449425    3.275283    1.999991
-    6.100000    0.447546    3.297744    1.999991
+    6.100000    0.447546    3.297745    1.999991
     6.200000    0.446115    3.319428    1.999991
-    6.300000    0.445086    3.340340    1.999991
-    6.400000    0.444419    3.360491    1.999991
-    6.500000    0.444079    3.379890    1.999991
+    6.300000    0.445085    3.340341    1.999991
+    6.400000    0.444419    3.360492    1.999991
+    6.500000    0.444079    3.379891    1.999991
     6.600000    0.444034    3.398547    1.999991
     6.700000    0.444257    3.416470    1.999991
     6.800000    0.444722    3.433669    1.999991
     6.900000    0.445409    3.450154    1.999991
-    7.000000    0.446297    3.465934    1.999991
+    7.000000    0.446297    3.465935    1.999991
     7.100000    0.447370    3.481018    1.999991
-    7.200000    0.448614    3.495414    1.999991
+    7.200000    0.448614    3.495415    1.999991
     7.300000    0.450016    3.509131    1.999991
     7.400000    0.451564    3.522176    1.999991
     7.500000    0.453249    3.534557    1.999991
     7.600000    0.455064    3.546280    1.999991
     7.700000    0.457000    3.557353    1.999991
     7.800000    0.459052    3.567781    1.999991
-    7.900000    0.461216    3.577571    1.999991
-    8.000000    0.463486    3.586728    1.999991
+    7.900000    0.461215    3.577572    1.999991
+    8.000000    0.463486    3.586729    1.999991
     8.100000    0.465860    3.595257    1.999991
     8.200000    0.468335    3.603162    1.999991
     8.300000    0.470909    3.610447    1.999991
     8.400000    0.473582    3.617116    1.999991
-    8.500000    0.476352    3.623171    1.999991
+    8.500000    0.476352    3.623172    1.999991
     8.600000    0.479220    3.628616    1.999991
     8.700000    0.482186    3.633451    1.999991
     8.800000    0.485250    3.637679    1.999990
     8.900000    0.488416    3.641299    1.999990
-    9.000000    0.491684    3.644311    1.999990
-    9.100000    0.495058    3.646715    1.999990
-    9.200000    0.498540    3.648509    1.999990
-    9.300000    0.502134    3.649691    1.999990
-    9.400000    0.505844    3.650257    1.999990
-    9.500000    0.509675    3.650202    1.999990
-    9.600000    0.513632    3.649521    1.999990
-    9.700000    0.517722    3.648209    1.999990
+    9.000000    0.491684    3.644312    1.999990
+    9.100000    0.495058    3.646716    1.999990
+    9.200000    0.498539    3.648510    1.999990
+    9.300000    0.502133    3.649691    1.999990
+    9.400000    0.505843    3.650257    1.999990
+    9.500000    0.509674    3.650202    1.999990
+    9.600000    0.513632    3.649522    1.999990
+    9.700000    0.517722    3.648210    1.999990
     9.800000    0.521951    3.646257    1.999990
     9.900000    0.526326    3.643656    1.999990
    10.000000    0.530857    3.640396    1.999990
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
index 7c8bba1278..8143a128c0 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
@@ -246,6 +246,10 @@ int main(int argc, char *argv[])
                         mukeep, mlkeep, ZERO, flocal, NULL);
   if(check_flag(&flag, "ARKBBDPrecInit", 1, my_pe)) MPI_Abort(comm, 1);
 
+  /* Tighten nonlinear solver tolerance */
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+  if(check_flag(&flag, "ARKStepSetNonlinConvCoef", 1, my_pe)) MPI_Abort(comm, 1);
+
   /* Print heading */
   if (my_pe == 0) PrintIntro(npes, mudq, mldq, mukeep, mlkeep);
 
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
index 5d53186f79..280069d4a3 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
@@ -7,53 +7,53 @@
 
 Preconditioner type is:  jpre = SUN_PREC_LEFT
 
-t = 7.20e+03   no. steps = 979   stepsize = 3.07e+00
+t = 7.20e+03   no. steps = 980   stepsize = 3.07e+00
 At bottom left:  c1, c2 =    1.047e+04    2.527e+11 
 At top right:    c1, c2 =    1.119e+04    2.700e+11 
 
-t = 1.44e+04   no. steps = 2738   stepsize = 6.94e+00
+t = 1.44e+04   no. steps = 2730   stepsize = 6.90e+00
 At bottom left:  c1, c2 =    6.659e+06    2.582e+11 
 At top right:    c1, c2 =    7.301e+06    2.833e+11 
 
-t = 2.16e+04   no. steps = 3535   stepsize = 1.05e+01
+t = 2.16e+04   no. steps = 3533   stepsize = 1.04e+01
 At bottom left:  c1, c2 =    2.665e+07    2.993e+11 
 At top right:    c1, c2 =    2.931e+07    3.313e+11 
 
-t = 2.88e+04   no. steps = 4683   stepsize = 4.46e+00
+t = 2.88e+04   no. steps = 4681   stepsize = 4.32e+00
 At bottom left:  c1, c2 =    8.702e+06    3.380e+11 
 At top right:    c1, c2 =    9.650e+06    3.751e+11 
 
-t = 3.60e+04   no. steps = 5959   stepsize = 2.55e+00
+t = 3.60e+04   no. steps = 5975   stepsize = 2.55e+00
 At bottom left:  c1, c2 =    1.404e+04    3.387e+11 
 At top right:    c1, c2 =    1.561e+04    3.765e+11 
 
-t = 4.32e+04   no. steps = 7152   stepsize = 3.93e+02
-At bottom left:  c1, c2 =   -1.202e-09    3.382e+11 
-At top right:    c1, c2 =    1.624e-07    3.804e+11 
+t = 4.32e+04   no. steps = 7163   stepsize = 4.64e+02
+At bottom left:  c1, c2 =    2.125e-08    3.382e+11 
+At top right:    c1, c2 =    4.245e-08    3.804e+11 
 
-t = 5.04e+04   no. steps = 7171   stepsize = 3.76e+02
-At bottom left:  c1, c2 =    5.092e-08    3.358e+11 
-At top right:    c1, c2 =   -4.835e-07    3.864e+11 
+t = 5.04e+04   no. steps = 7179   stepsize = 4.64e+02
+At bottom left:  c1, c2 =   -4.072e-07    3.358e+11 
+At top right:    c1, c2 =    4.005e-11    3.864e+11 
 
-t = 5.76e+04   no. steps = 7188   stepsize = 2.94e+02
-At bottom left:  c1, c2 =   -3.248e-10    3.320e+11 
-At top right:    c1, c2 =    7.269e-08    3.909e+11 
+t = 5.76e+04   no. steps = 7195   stepsize = 3.44e+02
+At bottom left:  c1, c2 =    3.487e-08    3.320e+11 
+At top right:    c1, c2 =    3.658e-18    3.909e+11 
 
-t = 6.48e+04   no. steps = 7212   stepsize = 5.52e+02
-At bottom left:  c1, c2 =   -1.079e-09    3.313e+11 
-At top right:    c1, c2 =   -2.660e-07    3.963e+11 
+t = 6.48e+04   no. steps = 7210   stepsize = 5.15e+02
+At bottom left:  c1, c2 =    2.253e-07    3.313e+11 
+At top right:    c1, c2 =   -2.680e-19    3.963e+11 
 
-t = 7.20e+04   no. steps = 7225   stepsize = 5.52e+02
-At bottom left:  c1, c2 =    4.318e-08    3.330e+11 
-At top right:    c1, c2 =   -4.973e-07    4.039e+11 
+t = 7.20e+04   no. steps = 7224   stepsize = 5.15e+02
+At bottom left:  c1, c2 =    8.966e-08    3.330e+11 
+At top right:    c1, c2 =   -1.036e-18    4.039e+11 
 
-t = 7.92e+04   no. steps = 7238   stepsize = 5.52e+02
-At bottom left:  c1, c2 =   -1.398e-08    3.334e+11 
-At top right:    c1, c2 =    7.657e-08    4.120e+11 
+t = 7.92e+04   no. steps = 7238   stepsize = 5.15e+02
+At bottom left:  c1, c2 =    2.038e-08    3.334e+11 
+At top right:    c1, c2 =   -2.330e-18    4.120e+11 
 
-t = 8.64e+04   no. steps = 7252   stepsize = 5.52e+02
-At bottom left:  c1, c2 =    1.764e-07    3.352e+11 
-At top right:    c1, c2 =   -4.190e-08    4.163e+11 
+t = 8.64e+04   no. steps = 7252   stepsize = 5.15e+02
+At bottom left:  c1, c2 =   -3.746e-21    3.352e+11 
+At top right:    c1, c2 =   -2.537e-27    4.163e+11 
 
 
 Final Statistics: 
@@ -61,14 +61,14 @@ Final Statistics:
 lenrw   =  3901     leniw   =   267
 lenrwls =  2455     leniwls =   126
 nst     =  7252     nfe     =     0
-nfe     = 76109     nfels   = 82856
-nni     = 39711     nli     = 82856
-nsetups =   437     netf    =    27
-npe     =   121     nps     = 120385
+nfe     = 76929     nfels   = 102816
+nni     = 40521     nli     = 102816
+nsetups =   439     netf    =    29
+npe     =   122     nps     = 140398
 ncfn    =     0     ncfl    =     0
 
 In ARKBBDPRE: real/integer local work space sizes = 1300, 192
-             no. flocal evals. = 2662
+             no. flocal evals. = 2684
 
 
 -------------------------------------------------------------------
@@ -76,11 +76,11 @@ In ARKBBDPRE: real/integer local work space sizes = 1300, 192
 
 Preconditioner type is:  jpre = SUN_PREC_RIGHT
 
-t = 7.20e+03   no. steps = 981   stepsize = 3.07e+00
+t = 7.20e+03   no. steps = 980   stepsize = 3.07e+00
 At bottom left:  c1, c2 =    1.047e+04    2.527e+11 
 At top right:    c1, c2 =    1.119e+04    2.700e+11 
 
-t = 1.44e+04   no. steps = 2731   stepsize = 6.90e+00
+t = 1.44e+04   no. steps = 2730   stepsize = 6.90e+00
 At bottom left:  c1, c2 =    6.659e+06    2.582e+11 
 At top right:    c1, c2 =    7.301e+06    2.833e+11 
 
@@ -88,53 +88,53 @@ t = 2.16e+04   no. steps = 3533   stepsize = 1.04e+01
 At bottom left:  c1, c2 =    2.665e+07    2.993e+11 
 At top right:    c1, c2 =    2.931e+07    3.313e+11 
 
-t = 2.88e+04   no. steps = 4692   stepsize = 3.80e+00
+t = 2.88e+04   no. steps = 4705   stepsize = 3.57e+00
 At bottom left:  c1, c2 =    8.702e+06    3.380e+11 
 At top right:    c1, c2 =    9.650e+06    3.751e+11 
 
-t = 3.60e+04   no. steps = 6087   stepsize = 2.55e+00
+t = 3.60e+04   no. steps = 6160   stepsize = 2.56e+00
 At bottom left:  c1, c2 =    1.404e+04    3.387e+11 
 At top right:    c1, c2 =    1.561e+04    3.765e+11 
 
-t = 4.32e+04   no. steps = 7275   stepsize = 4.76e+02
-At bottom left:  c1, c2 =    1.722e-10    3.382e+11 
-At top right:    c1, c2 =    1.593e-09    3.804e+11 
+t = 4.32e+04   no. steps = 7347   stepsize = 4.30e+02
+At bottom left:  c1, c2 =    4.255e-12    3.382e+11 
+At top right:    c1, c2 =   -2.358e-07    3.804e+11 
 
-t = 5.04e+04   no. steps = 7291   stepsize = 3.75e+02
-At bottom left:  c1, c2 =    1.309e-09    3.358e+11 
-At top right:    c1, c2 =   -1.367e-09    3.864e+11 
+t = 5.04e+04   no. steps = 7364   stepsize = 4.81e+02
+At bottom left:  c1, c2 =   -1.312e-17    3.358e+11 
+At top right:    c1, c2 =    2.130e-11    3.864e+11 
 
-t = 5.76e+04   no. steps = 7308   stepsize = 2.92e+02
-At bottom left:  c1, c2 =   -2.110e-07    3.320e+11 
-At top right:    c1, c2 =   -3.069e-07    3.909e+11 
+t = 5.76e+04   no. steps = 7380   stepsize = 2.39e+02
+At bottom left:  c1, c2 =   -6.762e-21    3.320e+11 
+At top right:    c1, c2 =   -4.330e-12    3.909e+11 
 
-t = 6.48e+04   no. steps = 7323   stepsize = 4.87e+02
-At bottom left:  c1, c2 =    2.224e-07    3.313e+11 
-At top right:    c1, c2 =    2.684e-07    3.963e+11 
+t = 6.48e+04   no. steps = 7393   stepsize = 6.42e+02
+At bottom left:  c1, c2 =   -3.898e-25    3.313e+11 
+At top right:    c1, c2 =   -4.918e-07    3.963e+11 
 
-t = 7.20e+04   no. steps = 7338   stepsize = 4.87e+02
-At bottom left:  c1, c2 =    6.820e-08    3.330e+11 
-At top right:    c1, c2 =   -2.132e-06    4.039e+11 
+t = 7.20e+04   no. steps = 7405   stepsize = 6.42e+02
+At bottom left:  c1, c2 =    5.173e-25    3.330e+11 
+At top right:    c1, c2 =   -1.031e-06    4.039e+11 
 
-t = 7.92e+04   no. steps = 7353   stepsize = 4.87e+02
-At bottom left:  c1, c2 =    1.134e-09    3.334e+11 
-At top right:    c1, c2 =   -2.341e-07    4.120e+11 
+t = 7.92e+04   no. steps = 7416   stepsize = 6.42e+02
+At bottom left:  c1, c2 =    5.441e-26    3.334e+11 
+At top right:    c1, c2 =   -1.290e-06    4.120e+11 
 
-t = 8.64e+04   no. steps = 7364   stepsize = 7.33e+02
-At bottom left:  c1, c2 =    4.331e-07    3.352e+11 
-At top right:    c1, c2 =   -6.607e-08    4.163e+11 
+t = 8.64e+04   no. steps = 7427   stepsize = 6.42e+02
+At bottom left:  c1, c2 =    1.538e-27    3.352e+11 
+At top right:    c1, c2 =   -5.134e-07    4.163e+11 
 
 
 Final Statistics: 
 
 lenrw   =  3901     leniw   =   272
 lenrwls =  2455     leniwls =   126
-nst     =  7364     nfe     =     0
-nfe     = 77457     nfels   = 101131
-nni     = 40469     nli     = 101131
-nsetups =   457     netf    =    33
-npe     =   124     nps     = 138172
-ncfn    =     0     ncfl    =     0
+nst     =  7427     nfe     =     0
+nfe     = 78794     nfels   = 111450
+nni     = 41511     nli     = 111450
+nsetups =   453     netf    =    29
+npe     =   125     nps     = 149218
+ncfn    =     0     ncfl    =    38
 
 In ARKBBDPRE: real/integer local work space sizes = 1300, 192
-             no. flocal evals. = 2728
+             no. flocal evals. = 2750
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.c b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
index 1946966c76..b17ed5f283 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_p.c
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
@@ -262,6 +262,10 @@ int main(int argc, char *argv[])
   flag = ARKStepSetPreconditioner(arkode_mem, Precond, PSolve);
   if (check_flag(&flag, "ARKStepSetPreconditioner", 1, my_pe)) MPI_Abort(comm, 1);
 
+  /* Tighten nonlinear solver tolerance */
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+  if(check_flag(&flag, "ARKStepSetNonlinConvCoef", 1, my_pe)) MPI_Abort(comm, 1);
+
   /* Print heading */
   if (my_pe == 0)
     printf("\n2-species diurnal advection-diffusion problem\n\n");
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_p.out
index 97f07c3221..3e509d403e 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_p.out
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.out
@@ -1,11 +1,11 @@
 
 2-species diurnal advection-diffusion problem
 
-t = 7.20e+03   no. steps = 979   stepsize = 3.07e+00
+t = 7.20e+03   no. steps = 980   stepsize = 3.07e+00
 At bottom left:  c1, c2 =    1.047e+04    2.527e+11 
 At top right:    c1, c2 =    1.119e+04    2.700e+11 
 
-t = 1.44e+04   no. steps = 2733   stepsize = 6.92e+00
+t = 1.44e+04   no. steps = 2730   stepsize = 6.90e+00
 At bottom left:  c1, c2 =    6.659e+06    2.582e+11 
 At top right:    c1, c2 =    7.301e+06    2.833e+11 
 
@@ -13,51 +13,51 @@ t = 2.16e+04   no. steps = 3533   stepsize = 1.04e+01
 At bottom left:  c1, c2 =    2.665e+07    2.993e+11 
 At top right:    c1, c2 =    2.931e+07    3.313e+11 
 
-t = 2.88e+04   no. steps = 4559   stepsize = 4.56e+00
+t = 2.88e+04   no. steps = 4695   stepsize = 3.50e+00
 At bottom left:  c1, c2 =    8.702e+06    3.380e+11 
 At top right:    c1, c2 =    9.650e+06    3.751e+11 
 
-t = 3.60e+04   no. steps = 5822   stepsize = 2.55e+00
+t = 3.60e+04   no. steps = 6172   stepsize = 2.55e+00
 At bottom left:  c1, c2 =    1.404e+04    3.387e+11 
 At top right:    c1, c2 =    1.561e+04    3.765e+11 
 
-t = 4.32e+04   no. steps = 7012   stepsize = 4.38e+02
-At bottom left:  c1, c2 =   -2.534e-08    3.382e+11 
-At top right:    c1, c2 =    2.458e-08    3.804e+11 
+t = 4.32e+04   no. steps = 7361   stepsize = 5.00e+02
+At bottom left:  c1, c2 =    3.855e-13    3.382e+11 
+At top right:    c1, c2 =   -1.439e-12    3.804e+11 
 
-t = 5.04e+04   no. steps = 7031   stepsize = 3.01e+02
-At bottom left:  c1, c2 =    6.320e-07    3.358e+11 
-At top right:    c1, c2 =   -7.802e-07    3.864e+11 
+t = 5.04e+04   no. steps = 7379   stepsize = 3.71e+02
+At bottom left:  c1, c2 =   -4.407e-14    3.358e+11 
+At top right:    c1, c2 =    1.551e-13    3.864e+11 
 
-t = 5.76e+04   no. steps = 7052   stepsize = 2.39e+02
-At bottom left:  c1, c2 =   -2.953e-15    3.320e+11 
-At top right:    c1, c2 =   -6.467e-15    3.909e+11 
+t = 5.76e+04   no. steps = 7394   stepsize = 1.90e+02
+At bottom left:  c1, c2 =    2.370e-12    3.320e+11 
+At top right:    c1, c2 =   -4.013e-12    3.909e+11 
 
-t = 6.48e+04   no. steps = 7067   stepsize = 6.00e+02
-At bottom left:  c1, c2 =   -2.940e-18    3.313e+11 
-At top right:    c1, c2 =   -9.232e-17    3.963e+11 
+t = 6.48e+04   no. steps = 7409   stepsize = 5.59e+02
+At bottom left:  c1, c2 =    1.301e-12    3.313e+11 
+At top right:    c1, c2 =   -4.849e-12    3.963e+11 
 
-t = 7.20e+04   no. steps = 7079   stepsize = 6.00e+02
-At bottom left:  c1, c2 =    2.299e-17    3.330e+11 
-At top right:    c1, c2 =   -1.240e-16    4.039e+11 
+t = 7.20e+04   no. steps = 7421   stepsize = 5.59e+02
+At bottom left:  c1, c2 =   -1.797e-23    3.330e+11 
+At top right:    c1, c2 =   -3.890e-22    4.039e+11 
 
-t = 7.92e+04   no. steps = 7091   stepsize = 6.00e+02
-At bottom left:  c1, c2 =    2.598e-17    3.334e+11 
-At top right:    c1, c2 =   -6.124e-17    4.120e+11 
+t = 7.92e+04   no. steps = 7434   stepsize = 5.59e+02
+At bottom left:  c1, c2 =   -2.819e-27    3.334e+11 
+At top right:    c1, c2 =   -1.209e-25    4.120e+11 
 
-t = 8.64e+04   no. steps = 7103   stepsize = 6.00e+02
-At bottom left:  c1, c2 =    1.059e-27    3.352e+11 
-At top right:    c1, c2 =    1.567e-26    4.163e+11 
+t = 8.64e+04   no. steps = 7447   stepsize = 5.59e+02
+At bottom left:  c1, c2 =   -2.334e-27    3.352e+11 
+At top right:    c1, c2 =   -8.983e-26    4.163e+11 
 
 
 Final Statistics: 
 
 lenrw   =  3301     leniw   =   243
 lenrwls =  2455     leniwls =   126
-nst     =  7103     nfe     =     0
-nfi     = 74602     nfels   = 87206
-nni     = 38944     nli     = 87206
-nsetups =   431     netf    =    28
-npe     =   120     nps     = 123894
-ncfn    =     0     ncfl    =     0
+nst     =  7447     nfe     =     0
+nfi     = 79041     nfels   = 108536
+nni     = 41643     nli     = 108536
+nsetups =   456     netf    =    32
+npe     =   125     nps     = 147035
+ncfn    =     0     ncfl    =    83
 
diff --git a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
index 411f0a09fc..2d806c7252 100644
--- a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
+++ b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
@@ -5,59 +5,59 @@ t = 7.20e+03   no. steps = 979   stepsize = 3.07e+00
 At bottom left:  c1, c2 =    1.047e+04    2.527e+11 
 At top right:    c1, c2 =    1.119e+04    2.700e+11 
 
-t = 1.44e+04   no. steps = 2733   stepsize = 6.92e+00
+t = 1.44e+04   no. steps = 2733   stepsize = 6.93e+00
 At bottom left:  c1, c2 =    6.659e+06    2.582e+11 
 At top right:    c1, c2 =    7.301e+06    2.833e+11 
 
-t = 2.16e+04   no. steps = 3533   stepsize = 1.04e+01
+t = 2.16e+04   no. steps = 3532   stepsize = 1.04e+01
 At bottom left:  c1, c2 =    2.665e+07    2.993e+11 
 At top right:    c1, c2 =    2.931e+07    3.313e+11 
 
-t = 2.88e+04   no. steps = 4558   stepsize = 3.77e+00
+t = 2.88e+04   no. steps = 4588   stepsize = 4.86e+00
 At bottom left:  c1, c2 =    8.702e+06    3.380e+11 
 At top right:    c1, c2 =    9.650e+06    3.751e+11 
 
-t = 3.60e+04   no. steps = 5961   stepsize = 2.55e+00
+t = 3.60e+04   no. steps = 5824   stepsize = 2.55e+00
 At bottom left:  c1, c2 =    1.404e+04    3.387e+11 
 At top right:    c1, c2 =    1.561e+04    3.765e+11 
 
-t = 4.32e+04   no. steps = 7161   stepsize = 5.16e+02
-At bottom left:  c1, c2 =    4.611e-12    3.382e+11 
-At top right:    c1, c2 =   -1.475e-11    3.804e+11 
+t = 4.32e+04   no. steps = 7026   stepsize = 5.12e+02
+At bottom left:  c1, c2 =    1.334e-12    3.382e+11 
+At top right:    c1, c2 =   -4.825e-12    3.804e+11 
 
-t = 5.04e+04   no. steps = 7175   stepsize = 5.05e+02
-At bottom left:  c1, c2 =    1.182e-11    3.358e+11 
-At top right:    c1, c2 =   -2.617e-11    3.864e+11 
+t = 5.04e+04   no. steps = 7041   stepsize = 5.36e+02
+At bottom left:  c1, c2 =    1.415e-13    3.358e+11 
+At top right:    c1, c2 =   -1.712e-12    3.864e+11 
 
-t = 5.76e+04   no. steps = 7190   stepsize = 2.44e+02
-At bottom left:  c1, c2 =   -1.051e-11    3.320e+11 
-At top right:    c1, c2 =   -9.200e-11    3.909e+11 
+t = 5.76e+04   no. steps = 7055   stepsize = 2.34e+02
+At bottom left:  c1, c2 =   -2.533e-12    3.320e+11 
+At top right:    c1, c2 =   -5.401e-12    3.909e+11 
 
-t = 6.48e+04   no. steps = 7203   stepsize = 6.40e+02
-At bottom left:  c1, c2 =    1.286e-10    3.313e+11 
-At top right:    c1, c2 =   -4.357e-10    3.963e+11 
+t = 6.48e+04   no. steps = 7068   stepsize = 6.40e+02
+At bottom left:  c1, c2 =   -4.169e-12    3.313e+11 
+At top right:    c1, c2 =    1.665e-11    3.963e+11 
 
-t = 7.20e+04   no. steps = 7215   stepsize = 6.40e+02
-At bottom left:  c1, c2 =   -1.814e-11    3.330e+11 
-At top right:    c1, c2 =   -9.120e-11    4.039e+11 
+t = 7.20e+04   no. steps = 7080   stepsize = 6.40e+02
+At bottom left:  c1, c2 =   -3.839e-12    3.330e+11 
+At top right:    c1, c2 =   -3.434e-11    4.039e+11 
 
-t = 7.92e+04   no. steps = 7226   stepsize = 6.40e+02
-At bottom left:  c1, c2 =   -1.291e-21    3.334e+11 
-At top right:    c1, c2 =   -1.937e-20    4.120e+11 
+t = 7.92e+04   no. steps = 7091   stepsize = 6.40e+02
+At bottom left:  c1, c2 =    2.289e-26    3.334e+11 
+At top right:    c1, c2 =    4.220e-25    4.120e+11 
 
-t = 8.64e+04   no. steps = 7237   stepsize = 6.40e+02
-At bottom left:  c1, c2 =   -3.534e-21    3.352e+11 
-At top right:    c1, c2 =   -4.442e-20    4.163e+11 
+t = 8.64e+04   no. steps = 7102   stepsize = 6.40e+02
+At bottom left:  c1, c2 =   -5.225e-26    3.352e+11 
+At top right:    c1, c2 =   -5.452e-25    4.163e+11 
 
 
 Final Statistics: 
 
 lenrw   =  3301     leniw   =   243
 lenrwls =  2455     leniwls =   126
-nst     =  7237     nfe     =     0
-nfi     = 75881     nfels   = 88695
-nni     = 39568     nli     = 88695
-nsetups =   431     netf    =    25
-npe     =   121     nps     = 126028
+nst     =  7102     nfe     =     0
+nfi     = 74579     nfels   = 87090
+nni     = 38921     nli     = 87090
+nsetups =   429     netf    =    29
+npe     =   119     nps     = 123765
 ncfn    =     0     ncfl    =     0
 
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec.out b/examples/arkode/C_serial/ark_KrylovDemo_prec.out
index 3a63a46785..a3f589f739 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec.out
@@ -190,18 +190,18 @@ Species 6
 297691    307208    319252    319264    307245    297749    
 297229    297691    298276    298276    297692    297231    
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2489  nni = 1716  hu =    6.84e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
 c values at t = 1:
 
 Species 1
-1.58851   1.59924   1.62152   1.64764   1.67036   1.68149   
+1.58851   1.59924   1.62152   1.64765   1.67036   1.68149   
 1.58533   1.59503   1.61548   1.63952   1.66033   1.67036   
-1.57757   1.58547   1.60239   1.62235   1.63952   1.64764   
+1.57757   1.58547   1.60239   1.62235   1.63952   1.64765   
 1.5682    1.57412   1.58706   1.60239   1.61548   1.62152   
 1.56048   1.56463   1.57412   1.58547   1.59503   1.59924   
 1.55733   1.56048   1.5682    1.57757   1.58533   1.58851   
@@ -210,7 +210,7 @@ Species 2
 1.59067   1.60141   1.62371   1.64987   1.67261   1.68375   
 1.58748   1.5972    1.61766   1.64173   1.66257   1.67261   
 1.57971   1.58763   1.60457   1.62454   1.64173   1.64987   
-1.57034   1.57626   1.58921   1.60457   1.61766   1.62371   
+1.57034   1.57626   1.58922   1.60457   1.61766   1.62371   
 1.56261   1.56676   1.57626   1.58763   1.5972    1.60141   
 1.55945   1.56261   1.57034   1.57971   1.58748   1.59067   
 
@@ -223,34 +223,34 @@ Species 3
 1.56146   1.56462   1.57236   1.58174   1.58951   1.5927    
 
 Species 4
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 5
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 6
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
-t =   2.00e+00  nst = 165  nfe = 0  nfi = 2661  nni = 1833  hu =    4.14e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 177  nfe = 0  nfi = 2848  nni = 1960  hu =    1.08e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 187  nfe = 0  nfi = 3013  nni = 2073  hu =    1.23e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
 c values at t = 4:
 
@@ -280,33 +280,33 @@ Species 3
 
 Species 4
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 5
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 6
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
-t =   5.00e+00  nst = 198  nfe = 0  nfi = 3179  nni = 2182  hu =    9.99e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 207  nfe = 0  nfi = 3336  nni = 2284  hu =    9.66e-02
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 216  nfe = 0  nfi = 3477  nni = 2375  hu =    1.51e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.87e-01
 
 c values at t = 7:
 
@@ -335,34 +335,34 @@ Species 3
 1.16363   1.16614   1.17231   1.1798    1.18601   1.18854   
 
 Species 4
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 5
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 6
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
-t =   8.00e+00  nst = 232  nfe = 0  nfi = 3780  nni = 2567  hu =    1.06e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 249  nfe = 0  nfi = 4075  nni = 2742  hu =    8.61e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 266  nfe = 0  nfi = 4394  nni = 2941  hu =    8.37e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 c values at t = 10:
 
@@ -391,27 +391,27 @@ Species 3
 1.16347   1.16598   1.17215   1.17964   1.18585   1.18838   
 
 Species 4
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 5
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 6
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 
@@ -422,20 +422,20 @@ Species 6
  ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  266 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4394 
- Number of f-s (SPGMR)                 = 8980 
- Number of f-s (TOTAL)                 = 8980 
- Number of setups                      =  121 
- Number of nonlinear iterations        = 2941 
- Number of linear iterations           = 8980 
- Number of preconditioner evaluations  =  121 
- Number of preconditioner solves       = 11819 
- Number of error test failures         =   23 
- Number of nonlinear conv. failures    =   17 
- Number of linear convergence failures =  509 
- Average Krylov subspace dimension     = 3.053 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6097 
+ Number of f-s (TOTAL)                 = 6097 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6097 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8080 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.943 
 
 
 ----------------------------------------------------------------------------
@@ -459,29 +459,29 @@ t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
 t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.51e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2491  nni = 1718  hu =    7.60e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
-t =   2.00e+00  nst = 169  nfe = 0  nfi = 2746  nni = 1896  hu =    8.04e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 181  nfe = 0  nfi = 2950  nni = 2036  hu =    1.01e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 189  nfe = 0  nfi = 3073  nni = 2119  hu =    1.33e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
-t =   5.00e+00  nst = 199  nfe = 0  nfi = 3242  nni = 2227  hu =    9.38e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 211  nfe = 0  nfi = 3442  nni = 2352  hu =    1.13e-01
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 220  nfe = 0  nfi = 3612  nni = 2457  hu =    1.07e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.86e-01
 
-t =   8.00e+00  nst = 229  nfe = 0  nfi = 3747  nni = 2537  hu =    1.33e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 239  nfe = 0  nfi = 3897  nni = 2622  hu =    8.98e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 251  nfe = 0  nfi = 4101  nni = 2746  hu =    7.09e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 
 
@@ -491,20 +491,20 @@ t =   1.00e+01  nst = 251  nfe = 0  nfi = 4101  nni = 2746  hu =    7.09e-02
  ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  251 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4101 
- Number of f-s (SPGMR)                 = 8880 
- Number of f-s (TOTAL)                 = 8880 
- Number of setups                      =   91 
- Number of nonlinear iterations        = 2746 
- Number of linear iterations           = 8880 
- Number of preconditioner evaluations  =   91 
- Number of preconditioner solves       = 11537 
- Number of error test failures         =   18 
- Number of nonlinear conv. failures    =   13 
- Number of linear convergence failures =  597 
- Average Krylov subspace dimension     = 3.234 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6096 
+ Number of f-s (TOTAL)                 = 6096 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6096 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8079 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.942 
 
 
 ----------------------------------------------------------------------------
@@ -526,31 +526,31 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3550  nni = 2460  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4111  nni = 2846  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4472  nni = 3092  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4851  nni = 3346  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5117  nni = 3522  hu =    6.88e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5302  nni = 3642  hu =    8.22e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 338  nfe = 0  nfi = 5441  nni = 3731  hu =    8.52e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.18e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5592  nni = 3827  hu =    1.11e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5722  nni = 3907  hu =    1.35e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
@@ -560,20 +560,20 @@ t =   1.00e+01  nst = 359  nfe = 0  nfi = 5722  nni = 3907  hu =    1.35e-01
  ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5722 
- Number of f-s (SPGMR)                 = 12904 
- Number of f-s (TOTAL)                 = 12904 
- Number of setups                      =  253 
- Number of nonlinear iterations        = 3907 
- Number of linear iterations           = 12904 
- Number of preconditioner evaluations  =  253 
- Number of preconditioner solves       = 16594 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  117 
- Number of linear convergence failures = 1072 
- Average Krylov subspace dimension     = 3.303 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  977 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
@@ -595,54 +595,54 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3556  nni = 2465  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4117  nni = 2851  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4478  nni = 3097  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4857  nni = 3351  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5123  nni = 3527  hu =    6.89e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5308  nni = 3647  hu =    9.31e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 339  nfe = 0  nfi = 5464  nni = 3748  hu =    9.70e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.19e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5598  nni = 3832  hu =    1.12e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5728  nni = 3912  hu =    1.31e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  146
+ ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5728 
- Number of f-s (SPGMR)                 = 12934 
- Number of f-s (TOTAL)                 = 12934 
- Number of setups                      =  254 
- Number of nonlinear iterations        = 3912 
- Number of linear iterations           = 12934 
- Number of preconditioner evaluations  =  254 
- Number of preconditioner solves       = 16627 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  118 
- Number of linear convergence failures = 1076 
- Average Krylov subspace dimension     = 3.306 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  976 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
index 58b34e703d..a3f589f739 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
@@ -190,18 +190,18 @@ Species 6
 297691    307208    319252    319264    307245    297749    
 297229    297691    298276    298276    297692    297231    
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2489  nni = 1716  hu =    6.84e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
 c values at t = 1:
 
 Species 1
-1.58851   1.59924   1.62152   1.64764   1.67036   1.68149   
+1.58851   1.59924   1.62152   1.64765   1.67036   1.68149   
 1.58533   1.59503   1.61548   1.63952   1.66033   1.67036   
-1.57757   1.58547   1.60239   1.62235   1.63952   1.64764   
+1.57757   1.58547   1.60239   1.62235   1.63952   1.64765   
 1.5682    1.57412   1.58706   1.60239   1.61548   1.62152   
 1.56048   1.56463   1.57412   1.58547   1.59503   1.59924   
 1.55733   1.56048   1.5682    1.57757   1.58533   1.58851   
@@ -210,7 +210,7 @@ Species 2
 1.59067   1.60141   1.62371   1.64987   1.67261   1.68375   
 1.58748   1.5972    1.61766   1.64173   1.66257   1.67261   
 1.57971   1.58763   1.60457   1.62454   1.64173   1.64987   
-1.57034   1.57626   1.58921   1.60457   1.61766   1.62371   
+1.57034   1.57626   1.58922   1.60457   1.61766   1.62371   
 1.56261   1.56676   1.57626   1.58763   1.5972    1.60141   
 1.55945   1.56261   1.57034   1.57971   1.58748   1.59067   
 
@@ -223,34 +223,34 @@ Species 3
 1.56146   1.56462   1.57236   1.58174   1.58951   1.5927    
 
 Species 4
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 5
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 6
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
-t =   2.00e+00  nst = 165  nfe = 0  nfi = 2661  nni = 1833  hu =    4.14e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 177  nfe = 0  nfi = 2848  nni = 1960  hu =    1.08e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 187  nfe = 0  nfi = 3013  nni = 2073  hu =    1.23e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
 c values at t = 4:
 
@@ -280,33 +280,33 @@ Species 3
 
 Species 4
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 5
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 6
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
-t =   5.00e+00  nst = 198  nfe = 0  nfi = 3179  nni = 2182  hu =    9.99e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 207  nfe = 0  nfi = 3336  nni = 2284  hu =    9.66e-02
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 216  nfe = 0  nfi = 3477  nni = 2375  hu =    1.51e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.87e-01
 
 c values at t = 7:
 
@@ -335,34 +335,34 @@ Species 3
 1.16363   1.16614   1.17231   1.1798    1.18601   1.18854   
 
 Species 4
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 5
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 6
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
-t =   8.00e+00  nst = 232  nfe = 0  nfi = 3780  nni = 2567  hu =    1.06e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 249  nfe = 0  nfi = 4075  nni = 2742  hu =    8.61e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 266  nfe = 0  nfi = 4394  nni = 2941  hu =    8.37e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 c values at t = 10:
 
@@ -391,27 +391,27 @@ Species 3
 1.16347   1.16598   1.17215   1.17964   1.18585   1.18838   
 
 Species 4
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 5
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 6
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 
@@ -422,20 +422,20 @@ Species 6
  ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  266 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4394 
- Number of f-s (SPGMR)                 = 8980 
- Number of f-s (TOTAL)                 = 8980 
- Number of setups                      =  121 
- Number of nonlinear iterations        = 2941 
- Number of linear iterations           = 8980 
- Number of preconditioner evaluations  =  121 
- Number of preconditioner solves       = 11819 
- Number of error test failures         =   23 
- Number of nonlinear conv. failures    =   17 
- Number of linear convergence failures =  509 
- Average Krylov subspace dimension     = 3.053 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6097 
+ Number of f-s (TOTAL)                 = 6097 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6097 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8080 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.943 
 
 
 ----------------------------------------------------------------------------
@@ -459,52 +459,52 @@ t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
 t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.51e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2491  nni = 1718  hu =    7.60e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
-t =   2.00e+00  nst = 169  nfe = 0  nfi = 2746  nni = 1896  hu =    8.04e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 181  nfe = 0  nfi = 2950  nni = 2036  hu =    1.01e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 189  nfe = 0  nfi = 3073  nni = 2119  hu =    1.33e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
-t =   5.00e+00  nst = 199  nfe = 0  nfi = 3242  nni = 2227  hu =    9.38e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 211  nfe = 0  nfi = 3442  nni = 2352  hu =    1.13e-01
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 220  nfe = 0  nfi = 3612  nni = 2457  hu =    1.07e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.86e-01
 
-t =   8.00e+00  nst = 229  nfe = 0  nfi = 3747  nni = 2537  hu =    1.33e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 239  nfe = 0  nfi = 3897  nni = 2622  hu =    8.98e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 251  nfe = 0  nfi = 4101  nni = 2746  hu =    7.09e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  136
+ ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  251 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4101 
- Number of f-s (SPGMR)                 = 8880 
- Number of f-s (TOTAL)                 = 8880 
- Number of setups                      =   91 
- Number of nonlinear iterations        = 2746 
- Number of linear iterations           = 8880 
- Number of preconditioner evaluations  =   91 
- Number of preconditioner solves       = 11537 
- Number of error test failures         =   18 
- Number of nonlinear conv. failures    =   13 
- Number of linear convergence failures =  597 
- Average Krylov subspace dimension     = 3.234 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6096 
+ Number of f-s (TOTAL)                 = 6096 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6096 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8079 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.942 
 
 
 ----------------------------------------------------------------------------
@@ -526,54 +526,54 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3550  nni = 2460  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4111  nni = 2846  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4472  nni = 3092  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4851  nni = 3346  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5117  nni = 3522  hu =    6.88e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5302  nni = 3642  hu =    8.22e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 338  nfe = 0  nfi = 5441  nni = 3731  hu =    8.52e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.18e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5592  nni = 3827  hu =    1.11e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5722  nni = 3907  hu =    1.35e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  141
+ ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5722 
- Number of f-s (SPGMR)                 = 12904 
- Number of f-s (TOTAL)                 = 12904 
- Number of setups                      =  253 
- Number of nonlinear iterations        = 3907 
- Number of linear iterations           = 12904 
- Number of preconditioner evaluations  =  253 
- Number of preconditioner solves       = 16594 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  117 
- Number of linear convergence failures = 1072 
- Average Krylov subspace dimension     = 3.303 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  977 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
@@ -595,54 +595,54 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3556  nni = 2465  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4117  nni = 2851  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4478  nni = 3097  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4857  nni = 3351  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5123  nni = 3527  hu =    6.89e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5308  nni = 3647  hu =    9.31e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 339  nfe = 0  nfi = 5464  nni = 3748  hu =    9.70e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.19e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5598  nni = 3832  hu =    1.12e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5728  nni = 3912  hu =    1.31e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  146
+ ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5728 
- Number of f-s (SPGMR)                 = 12934 
- Number of f-s (TOTAL)                 = 12934 
- Number of setups                      =  254 
- Number of nonlinear iterations        = 3912 
- Number of linear iterations           = 12934 
- Number of preconditioner evaluations  =  254 
- Number of preconditioner solves       = 16627 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  118 
- Number of linear convergence failures = 1076 
- Average Krylov subspace dimension     = 3.306 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  976 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
index 1af6fb8046..a3f589f739 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
@@ -190,18 +190,18 @@ Species 6
 297691    307208    319252    319264    307245    297749    
 297229    297691    298276    298276    297692    297231    
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2489  nni = 1716  hu =    6.84e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
 c values at t = 1:
 
 Species 1
-1.58851   1.59924   1.62152   1.64764   1.67036   1.68149   
+1.58851   1.59924   1.62152   1.64765   1.67036   1.68149   
 1.58533   1.59503   1.61548   1.63952   1.66033   1.67036   
-1.57757   1.58547   1.60239   1.62235   1.63952   1.64764   
+1.57757   1.58547   1.60239   1.62235   1.63952   1.64765   
 1.5682    1.57412   1.58706   1.60239   1.61548   1.62152   
 1.56048   1.56463   1.57412   1.58547   1.59503   1.59924   
 1.55733   1.56048   1.5682    1.57757   1.58533   1.58851   
@@ -210,7 +210,7 @@ Species 2
 1.59067   1.60141   1.62371   1.64987   1.67261   1.68375   
 1.58748   1.5972    1.61766   1.64173   1.66257   1.67261   
 1.57971   1.58763   1.60457   1.62454   1.64173   1.64987   
-1.57034   1.57626   1.58921   1.60457   1.61766   1.62371   
+1.57034   1.57626   1.58922   1.60457   1.61766   1.62371   
 1.56261   1.56676   1.57626   1.58763   1.5972    1.60141   
 1.55945   1.56261   1.57034   1.57971   1.58748   1.59067   
 
@@ -223,34 +223,34 @@ Species 3
 1.56146   1.56462   1.57236   1.58174   1.58951   1.5927    
 
 Species 4
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 5
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
 Species 6
-47718.3   48040.3   48709     49493.5   50175.5   50509.4   
+47718.4   48040.3   48709     49493.5   50175.5   50509.4   
 47622.8   47914     48527.8   49249.6   49874.4   50175.5   
-47389.7   47627     48134.9   48734.2   49249.6   49493.5   
-47108.5   47286     47674.6   48134.9   48527.8   48709     
-46876.6   47001.2   47286     47627     47914     48040.3   
-46781.9   46876.6   47108.5   47389.7   47622.8   47718.3   
+47389.7   47627     48135     48734.2   49249.6   49493.5   
+47108.5   47286.1   47674.6   48135     48527.8   48709     
+46876.6   47001.1   47286.1   47627     47914     48040.3   
+46781.9   46876.6   47108.5   47389.7   47622.8   47718.4   
 
-t =   2.00e+00  nst = 165  nfe = 0  nfi = 2661  nni = 1833  hu =    4.14e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 177  nfe = 0  nfi = 2848  nni = 1960  hu =    1.08e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 187  nfe = 0  nfi = 3013  nni = 2073  hu =    1.23e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
 c values at t = 4:
 
@@ -280,33 +280,33 @@ Species 3
 
 Species 4
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 5
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
 Species 6
 35860.6   36110.2   36632.4   37246.4   37779.5   38038.7   
-35784.2   36010.4   36490.4   37056.3   37545.3   37779.5   
+35784.2   36010.4   36490.4   37056.3   37545.4   37779.5   
 35597.2   35782     36180.5   36651.6   37056.3   37246.4   
-35371.4   35510.4   35816.7   36180.5   36490.4   36632.4   
-35185.4   35283.8   35510.4   35782     36010.4   36110.2   
-35109.7   35185.4   35371.4   35597.2   35784.2   35860.6   
+35371.4   35510.3   35816.7   36180.5   36490.4   36632.4   
+35185.4   35283.8   35510.3   35782     36010.4   36110.2   
+35109.8   35185.4   35371.4   35597.2   35784.2   35860.6   
 
-t =   5.00e+00  nst = 198  nfe = 0  nfi = 3179  nni = 2182  hu =    9.99e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 207  nfe = 0  nfi = 3336  nni = 2284  hu =    9.66e-02
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 216  nfe = 0  nfi = 3477  nni = 2375  hu =    1.51e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.87e-01
 
 c values at t = 7:
 
@@ -335,34 +335,34 @@ Species 3
 1.16363   1.16614   1.17231   1.1798    1.18601   1.18854   
 
 Species 4
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 5
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
 Species 6
-35656.3   35903.1   36424.2   37033.8   37564.6   37822.3   
-35578.4   35804.9   36281.3   36845.5   37330.9   37564.6   
-35393.9   35575.9   35974.4   36441.4   36845.5   37033.8   
-35167.5   35307.4   35610.6   35974.4   36281.3   36424.2   
-34984.3   35080.2   35307.4   35575.9   35804.9   35903.1   
-34907.5   34984.3   35167.5   35393.9   35578.4   35656.3   
+35655.3   35903.6   36423.2   37034.1   37564.4   37822.3   
+35579.3   35804.3   36281.9   36844.9   37331.5   37564.4   
+35393.1   35577     35973.5   36442.3   36844.9   37034.1   
+35168.4   35306.6   35611.5   35973.5   36281.9   36423.2   
+34983.3   35081.1   35306.6   35577     35804.3   35903.6   
+34907.9   34983.3   35168.4   35393.1   35579.3   35655.3   
 
-t =   8.00e+00  nst = 232  nfe = 0  nfi = 3780  nni = 2567  hu =    1.06e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 249  nfe = 0  nfi = 4075  nni = 2742  hu =    8.61e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 266  nfe = 0  nfi = 4394  nni = 2941  hu =    8.37e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 c values at t = 10:
 
@@ -391,27 +391,27 @@ Species 3
 1.16347   1.16598   1.17215   1.17964   1.18585   1.18838   
 
 Species 4
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 5
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 Species 6
-35650.6   35898.8   36418.4   37029.2   37559.5   37817.3   
+35650.6   35898.8   36418.3   37029.2   37559.5   37817.3   
 35574.5   35799.5   36277.1   36840     37326.6   37559.5   
-35388.4   35572.3   35968.8   36437.5   36840     37029.2   
-35163.7   35302     35606.7   35968.8   36277.1   36418.4   
-34978.6   35076.5   35302     35572.3   35799.5   35898.8   
+35388.4   35572.3   35968.7   36437.4   36840     37029.2   
+35163.7   35301.9   35606.7   35968.7   36277.1   36418.3   
+34978.6   35076.5   35301.9   35572.3   35799.5   35898.8   
 34903.3   34978.6   35163.7   35388.4   35574.5   35650.6   
 
 
@@ -419,23 +419,23 @@ Species 6
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  131
+ ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  266 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4394 
- Number of f-s (SPGMR)                 = 8980 
- Number of f-s (TOTAL)                 = 8980 
- Number of setups                      =  121 
- Number of nonlinear iterations        = 2941 
- Number of linear iterations           = 8980 
- Number of preconditioner evaluations  =  121 
- Number of preconditioner solves       = 11819 
- Number of error test failures         =   23 
- Number of nonlinear conv. failures    =   17 
- Number of linear convergence failures =  509 
- Average Krylov subspace dimension     = 3.053 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6097 
+ Number of f-s (TOTAL)                 = 6097 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6097 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8080 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.943 
 
 
 ----------------------------------------------------------------------------
@@ -459,52 +459,52 @@ t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
 t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.51e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.46e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.43e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2024  nni = 1386  hu =    1.28e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.25e-02
 
-t =   1.00e+00  nst = 154  nfe = 0  nfi = 2491  nni = 1718  hu =    7.60e-02
+t =   1.00e+00  nst = 153  nfe = 0  nfi = 2474  nni = 1706  hu =    6.52e-02
 
-t =   2.00e+00  nst = 169  nfe = 0  nfi = 2746  nni = 1896  hu =    8.04e-02
+t =   2.00e+00  nst = 164  nfe = 0  nfi = 2647  nni = 1824  hu =    1.58e-01
 
-t =   3.00e+00  nst = 181  nfe = 0  nfi = 2950  nni = 2036  hu =    1.01e-01
+t =   3.00e+00  nst = 170  nfe = 0  nfi = 2737  nni = 1884  hu =    1.58e-01
 
-t =   4.00e+00  nst = 189  nfe = 0  nfi = 3073  nni = 2119  hu =    1.33e-01
+t =   4.00e+00  nst = 176  nfe = 0  nfi = 2843  nni = 1955  hu =    1.85e-01
 
-t =   5.00e+00  nst = 199  nfe = 0  nfi = 3242  nni = 2227  hu =    9.38e-02
+t =   5.00e+00  nst = 181  nfe = 0  nfi = 2911  nni = 1998  hu =    2.46e-01
 
-t =   6.00e+00  nst = 211  nfe = 0  nfi = 3442  nni = 2352  hu =    1.13e-01
+t =   6.00e+00  nst = 184  nfe = 0  nfi = 2950  nni = 2022  hu =    3.05e-01
 
-t =   7.00e+00  nst = 220  nfe = 0  nfi = 3612  nni = 2457  hu =    1.07e-01
+t =   7.00e+00  nst = 186  nfe = 0  nfi = 2975  nni = 2037  hu =    4.86e-01
 
-t =   8.00e+00  nst = 229  nfe = 0  nfi = 3747  nni = 2537  hu =    1.33e-01
+t =   8.00e+00  nst = 188  nfe = 0  nfi = 3003  nni = 2055  hu =    7.64e-01
 
-t =   9.00e+00  nst = 239  nfe = 0  nfi = 3897  nni = 2622  hu =    8.98e-02
+t =   9.00e+00  nst = 189  nfe = 0  nfi = 3015  nni = 2062  hu =    7.64e-01
 
-t =   1.00e+01  nst = 251  nfe = 0  nfi = 4101  nni = 2746  hu =    7.09e-02
+t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  136
+ ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  251 
+ Number of steps                       =  190 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 4101 
- Number of f-s (SPGMR)                 = 8880 
- Number of f-s (TOTAL)                 = 8880 
- Number of setups                      =   91 
- Number of nonlinear iterations        = 2746 
- Number of linear iterations           = 8880 
- Number of preconditioner evaluations  =   91 
- Number of preconditioner solves       = 11537 
- Number of error test failures         =   18 
- Number of nonlinear conv. failures    =   13 
- Number of linear convergence failures =  597 
- Average Krylov subspace dimension     = 3.234 
+ Number of f-s (implicit)              = 3030 
+ Number of f-s (SPGMR)                 = 6096 
+ Number of f-s (TOTAL)                 = 6096 
+ Number of setups                      =   38 
+ Number of nonlinear iterations        = 2072 
+ Number of linear iterations           = 6096 
+ Number of preconditioner evaluations  =   38 
+ Number of preconditioner solves       = 8079 
+ Number of error test failures         =    1 
+ Number of nonlinear conv. failures    =    0 
+ Number of linear convergence failures =  182 
+ Average Krylov subspace dimension     = 2.942 
 
 
 ----------------------------------------------------------------------------
@@ -526,54 +526,54 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3550  nni = 2460  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4111  nni = 2846  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4472  nni = 3092  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4851  nni = 3346  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5117  nni = 3522  hu =    6.88e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5302  nni = 3642  hu =    8.22e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 338  nfe = 0  nfi = 5441  nni = 3731  hu =    8.52e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.18e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5592  nni = 3827  hu =    1.11e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5722  nni = 3907  hu =    1.35e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  141
+ ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5722 
- Number of f-s (SPGMR)                 = 12904 
- Number of f-s (TOTAL)                 = 12904 
- Number of setups                      =  253 
- Number of nonlinear iterations        = 3907 
- Number of linear iterations           = 12904 
- Number of preconditioner evaluations  =  253 
- Number of preconditioner solves       = 16594 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  117 
- Number of linear convergence failures = 1072 
- Average Krylov subspace dimension     = 3.303 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  977 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
@@ -595,54 +595,54 @@ t =   1.00e-05  nst = 27  nfe = 0  nfi = 407  nni = 269  hu =    4.79e-07
 
 t =   1.00e-04  nst = 106  nfe = 0  nfi = 1688  nni = 1155  hu =    1.70e-05
 
-t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.50e-03
+t =   1.00e-03  nst = 110  nfe = 0  nfi = 1750  nni = 1197  hu =    1.49e-03
 
-t =   1.00e-02  nst = 113  nfe = 0  nfi = 1797  nni = 1229  hu =    3.42e-03
+t =   1.00e-02  nst = 113  nfe = 0  nfi = 1799  nni = 1231  hu =    3.79e-03
 
-t =   1.00e-01  nst = 127  nfe = 0  nfi = 2023  nni = 1385  hu =    1.23e-02
+t =   1.00e-01  nst = 127  nfe = 0  nfi = 2028  nni = 1390  hu =    1.32e-02
 
-t =   1.00e+00  nst = 166  nfe = 0  nfi = 2714  nni = 1875  hu =    2.40e-02
+t =   1.00e+00  nst = 164  nfe = 0  nfi = 2669  nni = 1844  hu =    4.98e-02
 
-t =   2.00e+00  nst = 214  nfe = 0  nfi = 3556  nni = 2465  hu =    2.34e-02
+t =   2.00e+00  nst = 213  nfe = 0  nfi = 3526  nni = 2444  hu =    2.37e-02
 
-t =   3.00e+00  nst = 249  nfe = 0  nfi = 4117  nni = 2851  hu =    3.57e-02
+t =   3.00e+00  nst = 248  nfe = 0  nfi = 4087  nni = 2830  hu =    3.53e-02
 
-t =   4.00e+00  nst = 272  nfe = 0  nfi = 4478  nni = 3097  hu =    5.08e-02
+t =   4.00e+00  nst = 272  nfe = 0  nfi = 4465  nni = 3088  hu =    3.22e-02
 
-t =   5.00e+00  nst = 297  nfe = 0  nfi = 4857  nni = 3351  hu =    5.14e-02
+t =   5.00e+00  nst = 299  nfe = 0  nfi = 4876  nni = 3363  hu =    3.94e-02
 
-t =   6.00e+00  nst = 315  nfe = 0  nfi = 5123  nni = 3527  hu =    6.89e-02
+t =   6.00e+00  nst = 316  nfe = 0  nfi = 5130  nni = 3532  hu =    6.86e-02
 
-t =   7.00e+00  nst = 328  nfe = 0  nfi = 5308  nni = 3647  hu =    9.31e-02
+t =   7.00e+00  nst = 329  nfe = 0  nfi = 5315  nni = 3652  hu =    8.22e-02
 
-t =   8.00e+00  nst = 339  nfe = 0  nfi = 5464  nni = 3748  hu =    9.70e-02
+t =   8.00e+00  nst = 339  nfe = 0  nfi = 5455  nni = 3742  hu =    1.19e-01
 
-t =   9.00e+00  nst = 349  nfe = 0  nfi = 5598  nni = 3832  hu =    1.12e-01
+t =   9.00e+00  nst = 345  nfe = 0  nfi = 5536  nni = 3793  hu =    2.11e-01
 
-t =   1.00e+01  nst = 359  nfe = 0  nfi = 5728  nni = 3912  hu =    1.31e-01
+t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
 
 
  Final statistics for this run:
 
  ARKStep real workspace length         = 3557 
- ARKStep integer workspace length      =  146
+ ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
- Number of steps                       =  359 
+ Number of steps                       =  349 
  Number of f-s (explicit)              =    0 
- Number of f-s (implicit)              = 5728 
- Number of f-s (SPGMR)                 = 12934 
- Number of f-s (TOTAL)                 = 12934 
- Number of setups                      =  254 
- Number of nonlinear iterations        = 3912 
- Number of linear iterations           = 12934 
- Number of preconditioner evaluations  =  254 
- Number of preconditioner solves       = 16627 
+ Number of f-s (implicit)              = 5589 
+ Number of f-s (SPGMR)                 = 12378 
+ Number of f-s (TOTAL)                 = 12378 
+ Number of setups                      =  244 
+ Number of nonlinear iterations        = 3826 
+ Number of linear iterations           = 12378 
+ Number of preconditioner evaluations  =  244 
+ Number of preconditioner solves       = 15957 
  Number of error test failures         =    0 
- Number of nonlinear conv. failures    =  118 
- Number of linear convergence failures = 1076 
- Average Krylov subspace dimension     = 3.306 
+ Number of nonlinear conv. failures    =  113 
+ Number of linear convergence failures =  976 
+ Average Krylov subspace dimension     = 3.235 
 
 
 ----------------------------------------------------------------------------
diff --git a/examples/arkode/C_serial/ark_brusselator1D.out b/examples/arkode/C_serial/ark_brusselator1D.out
index abe61d1f47..fed3032856 100644
--- a/examples/arkode/C_serial/ark_brusselator1D.out
+++ b/examples/arkode/C_serial/ark_brusselator1D.out
@@ -8,102 +8,102 @@
         t      ||u||_rms   ||v||_rms   ||w||_rms
    ----------------------------------------------
     0.100000    0.673914    3.377329    1.999987
-    0.200000    0.684316    3.356619    1.999987
+    0.200000    0.684316    3.356619    1.999986
     0.300000    0.695306    3.334633    1.999986
     0.400000    0.706918    3.311313    1.999986
     0.500000    0.719185    3.286601    1.999986
     0.600000    0.732137    3.260442    1.999986
     0.700000    0.745798    3.232787    1.999985
     0.800000    0.760185    3.203596    1.999985
-    0.900000    0.775303    3.172839    1.999985
+    0.900000    0.775302    3.172839    1.999985
     1.000000    0.791135    3.140510    1.999984
     1.100000    0.807648    3.106624    1.999984
     1.200000    0.824771    3.071233    1.999984
     1.300000    0.842402    3.034426    1.999983
     1.400000    0.860384    2.996350    1.999983
-    1.500000    0.878514    2.957206    1.999983
+    1.500000    0.878514    2.957207    1.999983
     1.600000    0.896525    2.917266    1.999982
     1.700000    0.914089    2.876873    1.999982
     1.800000    0.930823    2.836438    1.999982
     1.900000    0.946292    2.796446    1.999982
-    2.000000    0.960033    2.757430    1.999981
-    2.100000    0.971576    2.719962    1.999981
-    2.200000    0.980475    2.684623    1.999981
+    2.000000    0.960034    2.757430    1.999981
+    2.100000    0.971577    2.719961    1.999981
+    2.200000    0.980476    2.684622    1.999981
     2.300000    0.986338    2.651980    1.999981
-    2.400000    0.988852    2.622560    1.999981
-    2.500000    0.987815    2.596818    1.999981
-    2.600000    0.983141    2.575128    1.999981
-    2.700000    0.974858    2.557766    1.999981
-    2.800000    0.963114    2.544903    1.999981
-    2.900000    0.948154    2.536611    1.999981
-    3.000000    0.930299    2.532868    1.999982
-    3.100000    0.909930    2.533567    1.999982
-    3.200000    0.887464    2.538529    1.999983
-    3.300000    0.863335    2.547515    1.999983
-    3.400000    0.837978    2.560241    1.999983
+    2.400000    0.988853    2.622559    1.999981
+    2.500000    0.987816    2.596818    1.999981
+    2.600000    0.983141    2.575127    1.999981
+    2.700000    0.974859    2.557765    1.999981
+    2.800000    0.963115    2.544902    1.999981
+    2.900000    0.948155    2.536610    1.999981
+    3.000000    0.930300    2.532867    1.999982
+    3.100000    0.909931    2.533566    1.999982
+    3.200000    0.887464    2.538528    1.999983
+    3.300000    0.863335    2.547514    1.999983
+    3.400000    0.837978    2.560240    1.999983
     3.500000    0.811818    2.576391    1.999984
     3.600000    0.785255    2.595624    1.999984
-    3.700000    0.758659    2.617587    1.999985
-    3.800000    0.732363    2.641922    1.999986
+    3.700000    0.758658    2.617586    1.999985
+    3.800000    0.732363    2.641921    1.999986
     3.900000    0.706662    2.668274    1.999986
     4.000000    0.681809    2.696300    1.999986
-    4.100000    0.658012    2.725670    1.999987
+    4.100000    0.658011    2.725670    1.999987
     4.200000    0.635435    2.756075    1.999987
-    4.300000    0.614205    2.787228    1.999988
+    4.300000    0.614204    2.787228    1.999988
     4.400000    0.594404    2.818869    1.999988
     4.500000    0.576082    2.850764    1.999989
-    4.600000    0.559255    2.882710    1.999989
+    4.600000    0.559254    2.882710    1.999989
     4.700000    0.543909    2.914529    1.999989
     4.800000    0.530011    2.946071    1.999990
-    4.900000    0.517506    2.977209    1.999990
+    4.900000    0.517506    2.977210    1.999990
     5.000000    0.506326    3.007843    1.999990
-    5.100000    0.496394    3.037889    1.999990
-    5.200000    0.487626    3.067283    1.999990
+    5.100000    0.496393    3.037889    1.999990
+    5.200000    0.487625    3.067283    1.999990
     5.300000    0.479935    3.095976    1.999991
     5.400000    0.473237    3.123932    1.999991
-    5.500000    0.467445    3.151125    1.999991
+    5.500000    0.467445    3.151126    1.999991
     5.600000    0.462480    3.177540    1.999991
     5.700000    0.458264    3.203165    1.999991
     5.800000    0.454726    3.227997    1.999991
-    5.900000    0.451800    3.252035    1.999991
+    5.900000    0.451799    3.252035    1.999991
     6.000000    0.449425    3.275283    1.999991
-    6.100000    0.447546    3.297744    1.999991
+    6.100000    0.447546    3.297745    1.999991
     6.200000    0.446115    3.319428    1.999991
-    6.300000    0.445086    3.340340    1.999991
-    6.400000    0.444419    3.360491    1.999991
-    6.500000    0.444079    3.379890    1.999991
+    6.300000    0.445085    3.340341    1.999991
+    6.400000    0.444419    3.360492    1.999991
+    6.500000    0.444079    3.379891    1.999991
     6.600000    0.444034    3.398547    1.999991
     6.700000    0.444257    3.416470    1.999991
     6.800000    0.444722    3.433669    1.999991
     6.900000    0.445409    3.450154    1.999991
-    7.000000    0.446297    3.465934    1.999991
+    7.000000    0.446297    3.465935    1.999991
     7.100000    0.447370    3.481018    1.999991
-    7.200000    0.448614    3.495414    1.999991
+    7.200000    0.448614    3.495415    1.999991
     7.300000    0.450016    3.509131    1.999991
     7.400000    0.451564    3.522176    1.999991
     7.500000    0.453249    3.534557    1.999991
     7.600000    0.455064    3.546280    1.999991
     7.700000    0.457000    3.557353    1.999991
     7.800000    0.459052    3.567781    1.999991
-    7.900000    0.461216    3.577571    1.999991
-    8.000000    0.463486    3.586728    1.999991
+    7.900000    0.461215    3.577572    1.999991
+    8.000000    0.463486    3.586729    1.999991
     8.100000    0.465860    3.595257    1.999991
     8.200000    0.468335    3.603162    1.999991
     8.300000    0.470909    3.610447    1.999991
     8.400000    0.473582    3.617116    1.999991
-    8.500000    0.476352    3.623171    1.999991
+    8.500000    0.476352    3.623172    1.999991
     8.600000    0.479220    3.628616    1.999991
     8.700000    0.482186    3.633451    1.999991
     8.800000    0.485250    3.637679    1.999990
     8.900000    0.488416    3.641299    1.999990
-    9.000000    0.491684    3.644311    1.999990
-    9.100000    0.495058    3.646715    1.999990
-    9.200000    0.498540    3.648509    1.999990
-    9.300000    0.502134    3.649691    1.999990
-    9.400000    0.505844    3.650257    1.999990
-    9.500000    0.509675    3.650202    1.999990
-    9.600000    0.513632    3.649521    1.999990
-    9.700000    0.517722    3.648209    1.999990
+    9.000000    0.491684    3.644312    1.999990
+    9.100000    0.495058    3.646716    1.999990
+    9.200000    0.498539    3.648510    1.999990
+    9.300000    0.502133    3.649691    1.999990
+    9.400000    0.505843    3.650257    1.999990
+    9.500000    0.509674    3.650202    1.999990
+    9.600000    0.513632    3.649522    1.999990
+    9.700000    0.517722    3.648210    1.999990
     9.800000    0.521951    3.646257    1.999990
     9.900000    0.526326    3.643656    1.999990
    10.000000    0.530857    3.640396    1.999990
diff --git a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out
index 28851a7ed1..863032a717 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out
@@ -13,68 +13,68 @@
     0.300000    0.648532    3.334867    1.999989
     0.400000    0.654362    3.323350    1.999989
     0.500000    0.660542    3.311172    1.999988
-    0.600000    0.667093    3.298310    1.999988
-    0.700000    0.674031    3.284739    1.999988
+    0.600000    0.667093    3.298309    1.999988
+    0.700000    0.674031    3.284739    1.999989
     0.800000    0.681370    3.270442    1.999988
     0.900000    0.689121    3.255404    1.999988
-    1.000000    0.697285    3.239620    1.999988
-    1.100000    0.705854    3.223093    1.999987
+    1.000000    0.697284    3.239620    1.999988
+    1.100000    0.705853    3.223093    1.999987
     1.200000    0.714805    3.205842    1.999987
-    1.300000    0.724099    3.187902    1.999987
-    1.400000    0.733671    3.169332    1.999987
-    1.500000    0.743429    3.150211    1.999987
-    1.600000    0.753249    3.130653    1.999987
-    1.700000    0.762974    3.110800    1.999986
-    1.800000    0.772412    3.090827    1.999986
-    1.900000    0.781337    3.070944    1.999986
-    2.000000    0.789501    3.051388    1.999986
-    2.100000    0.796639    3.032420    1.999986
-    2.200000    0.802490    3.014317    1.999986
-    2.300000    0.806810    2.997358    1.999986
-    2.400000    0.809386    2.981818    1.999986
-    2.500000    0.810060    2.967949    1.999986
-    2.600000    0.808729    2.955977    1.999986
-    2.700000    0.805360    2.946085    1.999986
-    2.800000    0.799989    2.938410    1.999986
-    2.900000    0.792711    2.933039    1.999986
-    3.000000    0.783680    2.930010    1.999986
-    3.100000    0.773095    2.929307    1.999986
-    3.200000    0.761187    2.930873    1.999986
-    3.300000    0.748207    2.934612    1.999987
-    3.400000    0.734416    2.940393    1.999987
-    3.500000    0.720073    2.948062    1.999987
+    1.300000    0.724098    3.187903    1.999987
+    1.400000    0.733670    3.169332    1.999987
+    1.500000    0.743428    3.150212    1.999987
+    1.600000    0.753248    3.130655    1.999987
+    1.700000    0.762974    3.110801    1.999986
+    1.800000    0.772411    3.090829    1.999986
+    1.900000    0.781336    3.070946    1.999986
+    2.000000    0.789499    3.051390    1.999986
+    2.100000    0.796638    3.032422    1.999986
+    2.200000    0.802489    3.014319    1.999986
+    2.300000    0.806808    2.997360    1.999986
+    2.400000    0.809386    2.981819    1.999986
+    2.500000    0.810059    2.967951    1.999986
+    2.600000    0.808728    2.955979    1.999986
+    2.700000    0.805361    2.946086    1.999986
+    2.800000    0.799988    2.938411    1.999986
+    2.900000    0.792711    2.933041    1.999986
+    3.000000    0.783681    2.930010    1.999986
+    3.100000    0.773096    2.929307    1.999986
+    3.200000    0.761187    2.930874    1.999986
+    3.300000    0.748207    2.934613    1.999987
+    3.400000    0.734416    2.940394    1.999987
+    3.500000    0.720074    2.948062    1.999987
     3.600000    0.705429    2.957444    1.999987
-    3.700000    0.690714    2.968354    1.999988
+    3.700000    0.690715    2.968354    1.999988
     3.800000    0.676141    2.980600    1.999988
-    3.900000    0.661891    2.993989    1.999988
-    4.000000    0.648122    3.008331    1.999989
-    4.100000    0.634961    3.023445    1.999989
+    3.900000    0.661892    2.993989    1.999988
+    4.000000    0.648123    3.008331    1.999989
+    4.100000    0.634962    3.023445    1.999989
     4.200000    0.622506    3.039157    1.999989
     4.300000    0.610828    3.055308    1.999989
-    4.400000    0.599972    3.071752    1.999989
+    4.400000    0.599972    3.071751    1.999989
     4.500000    0.589962    3.088356    1.999990
     4.600000    0.580801    3.105007    1.999990
-    4.700000    0.572477    3.121603    1.999990
-    4.800000    0.564964    3.138059    1.999990
+    4.700000    0.572477    3.121602    1.999990
+    4.800000    0.564964    3.138058    1.999990
     4.900000    0.558227    3.154303    1.999990
-    5.000000    0.552224    3.170278    1.999990
+    5.000000    0.552224    3.170277    1.999990
     5.100000    0.546907    3.185935    1.999991
-    5.200000    0.542228    3.201239    1.999991
-    5.300000    0.538137    3.216162    1.999991
-    5.400000    0.534585    3.230683    1.999991
+    5.200000    0.542229    3.201239    1.999991
+    5.300000    0.538138    3.216162    1.999991
+    5.400000    0.534586    3.230682    1.999991
     5.500000    0.531525    3.244788    1.999991
-    5.600000    0.528910    3.258469    1.999991
-    5.700000    0.526699    3.271720    1.999991
+    5.600000    0.528910    3.258468    1.999991
+    5.700000    0.526699    3.271719    1.999991
     5.800000    0.524852    3.284539    1.999991
     5.900000    0.523334    3.296928    1.999991
-    6.000000    0.522111    3.308889    1.999991
-    6.100000    0.521154    3.320427    1.999991
+    6.000000    0.522112    3.308889    1.999991
+    6.100000    0.521154    3.320426    1.999991
     6.200000    0.520436    3.331545    1.999991
-    6.300000    0.519932    3.342251    1.999991
+    6.300000    0.519932    3.342250    1.999991
     6.400000    0.519621    3.352549    1.999991
-    6.500000    0.519484    3.362447    1.999991
-    6.600000    0.519503    3.371950    1.999991
-    6.700000    0.519664    3.381065    1.999991
+    6.500000    0.519484    3.362446    1.999991
+    6.600000    0.519503    3.371949    1.999991
+    6.700000    0.519664    3.381064    1.999991
     6.800000    0.519953    3.389797    1.999991
     6.900000    0.520358    3.398153    1.999991
     7.000000    0.520869    3.406139    1.999991
@@ -87,37 +87,37 @@
     7.700000    0.526775    3.452091    1.999991
     7.800000    0.527887    3.457288    1.999991
     7.900000    0.529055    3.462154    1.999991
-    8.000000    0.530276    3.466693    1.999991
-    8.100000    0.531549    3.470907    1.999991
+    8.000000    0.530276    3.466692    1.999991
+    8.100000    0.531549    3.470906    1.999991
     8.200000    0.532872    3.474798    1.999991
     8.300000    0.534244    3.478370    1.999991
     8.400000    0.535665    3.481625    1.999991
-    8.500000    0.537133    3.484563    1.999991
+    8.500000    0.537133    3.484564    1.999991
     8.600000    0.538649    3.487188    1.999991
     8.700000    0.540213    3.489499    1.999991
-    8.800000    0.541825    3.491497    1.999991
-    8.900000    0.543486    3.493184    1.999991
+    8.800000    0.541825    3.491498    1.999991
+    8.900000    0.543486    3.493185    1.999991
     9.000000    0.545196    3.494560    1.999991
     9.100000    0.546957    3.495624    1.999991
     9.200000    0.548771    3.496375    1.999991
     9.300000    0.550638    3.496814    1.999990
-    9.400000    0.552562    3.496938    1.999990
+    9.400000    0.552561    3.496938    1.999990
     9.500000    0.554543    3.496746    1.999990
-    9.600000    0.556585    3.496235    1.999990
+    9.600000    0.556585    3.496236    1.999990
     9.700000    0.558691    3.495404    1.999990
-    9.800000    0.560864    3.494247    1.999990
+    9.800000    0.560864    3.494248    1.999990
     9.900000    0.563108    3.492763    1.999990
    10.000000    0.565426    3.490945    1.999990
    ----------------------------------------------
 
 Final Solver Statistics:
    Internal solver steps = 95 (attempted = 95)
-   Total RHS evals:  Fe = 0,  Fi = 1605
+   Total RHS evals:  Fe = 0,  Fi = 1596
    Total mass matrix setups = 1
-   Total mass matrix solves = 288
-   Total mass times evals = 1697
+   Total mass matrix solves = 193
+   Total mass times evals = 1688
    Total linear solver setups = 31
    Total number of Jacobian evaluations = 11
-   Total number of Newton iterations = 1127
+   Total number of Newton iterations = 1118
    Total number of nonlinear solver convergence failures = 10
    Total number of error test failures = 0
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_0_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_0_0.001.out
index 6dd1721d1b..cadd7e5310 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_0_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_0_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 120012
-   Total RHS evals:  Fs = 30004,  Ff = 994988
+   Total RHS evals:  Fs = 30004,  Ff = 864983
    Fast Newton iters = 504937
    Fast Newton conv fails = 0
    Fast Jacobian evals = 2308
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_2_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_2_0.001.out
index 1fa9294fa1..d8f1801e46 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_2_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_2_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 120012
-   Total RHS evals:  Fs = 68887,  Ff = 400041
+   Total RHS evals:  Fs = 68887,  Ff = 360046
    Slow Newton iters = 38883
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_3_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_3_0.001.out
index 89fe3e2cc0..0e3c13961a 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_3_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_3_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 120012
-   Total RHS evals:  Fs = 68887,  Ff = 1000128
+   Total RHS evals:  Fs = 68887,  Ff = 840121
    Slow Newton iters = 38883
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_4_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_4_0.001.out
index 65c7a6f99b..7059273d48 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_4_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_4_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 110011
-   Total RHS evals:  Fse = 40005, Fsi = 78888,  Ff = 370038
+   Total RHS evals:  Fse = 40005, Fsi = 78888,  Ff = 330043
    Slow Newton iters = 38883
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_5_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_5_0.001.out
index cc8fb37508..827c560b02 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_5_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_5_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 110011
-   Total RHS evals:  Fse = 40005, Fsi = 78888,  Ff = 1174341
+   Total RHS evals:  Fse = 40005, Fsi = 78888,  Ff = 1024335
    Slow Newton iters = 38883
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_6_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_6_0.001.out
index b567a7e624..79287bd749 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_6_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_6_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 130013
-   Total RHS evals:  Fse = 60007, Fsi = 118894,  Ff = 580059
+   Total RHS evals:  Fse = 60007, Fsi = 118894,  Ff = 520062
    Slow Newton iters = 58887
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri_7_0.001.out b/examples/arkode/C_serial/ark_brusselator1D_imexmri_7_0.001.out
index 0ebb4a0a14..c8dd757582 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri_7_0.001.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri_7_0.001.out
@@ -30,7 +30,7 @@
 Final Solver Statistics:
    Slow Steps: nsts = 10001
    Fast Steps: nstf = 130013
-   Total RHS evals:  Fse = 60007, Fsi = 118894,  Ff = 1946003
+   Total RHS evals:  Fse = 60007, Fsi = 118894,  Ff = 1936011
    Slow Newton iters = 58887
    Slow Newton conv fails = 0
    Slow Jacobian evals = 501
diff --git a/examples/arkode/C_serial/ark_brusselator1D_klu.out b/examples/arkode/C_serial/ark_brusselator1D_klu.out
index 7e6bc33063..453cd212f8 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_klu.out
+++ b/examples/arkode/C_serial/ark_brusselator1D_klu.out
@@ -8,14 +8,14 @@
         t      ||u||_rms   ||v||_rms   ||w||_rms
    ----------------------------------------------
     1.000000    0.791135    3.140510    1.999984
-    2.000000    0.960033    2.757430    1.999981
-    3.000000    0.930299    2.532868    1.999982
+    2.000000    0.960034    2.757430    1.999981
+    3.000000    0.930300    2.532867    1.999982
     4.000000    0.681809    2.696300    1.999986
     5.000000    0.506326    3.007843    1.999990
     6.000000    0.449425    3.275283    1.999991
-    7.000000    0.446297    3.465934    1.999991
-    8.000000    0.463486    3.586728    1.999991
-    9.000000    0.491684    3.644311    1.999990
+    7.000000    0.446297    3.465935    1.999991
+    8.000000    0.463486    3.586729    1.999991
+    9.000000    0.491684    3.644312    1.999990
    10.000000    0.530857    3.640396    1.999990
    ----------------------------------------------
 
diff --git a/examples/arkode/C_serial/ark_brusselator_1D_mri.out b/examples/arkode/C_serial/ark_brusselator_1D_mri.out
index 2c61e45ad1..b1968f6e9d 100644
--- a/examples/arkode/C_serial/ark_brusselator_1D_mri.out
+++ b/examples/arkode/C_serial/ark_brusselator_1D_mri.out
@@ -16,18 +16,18 @@
     0.700000    1.351462    3.164033    3.499995
     0.800000    1.423123    3.067751    3.499995
     0.900000    1.497639    2.964524    3.499995
-    1.000000    1.568626    2.859012    3.499995
+    1.000000    1.568626    2.859013    3.499995
     1.100000    1.628547    2.756573    3.499994
     1.200000    1.671110    2.661914    3.499994
-    1.300000    1.693135    2.578240    3.499994
+    1.300000    1.693135    2.578241    3.499994
     1.400000    1.694728    2.507261    3.499994
-    1.500000    1.678186    2.449677    3.499994
+    1.500000    1.678185    2.449678    3.499994
     1.600000    1.646706    2.405676    3.499994
     1.700000    1.603527    2.375228    3.499994
     1.800000    1.551521    2.358213    3.499995
     1.900000    1.493097    2.354426    3.499995
     2.000000    1.430225    2.363536    3.499995
-    2.100000    1.364513    2.385031    3.499995
+    2.100000    1.364513    2.385032    3.499995
     2.200000    1.297276    2.418172    3.499995
     2.300000    1.229586    2.461974    3.499996
     2.400000    1.162306    2.515228    3.499996
@@ -37,14 +37,14 @@
     2.800000    0.908402    2.794764    3.499997
     2.900000    0.850317    2.874565    3.499997
     3.000000    0.794740    2.956151    3.499997
-    3.100000    0.741797    3.038762    3.499998
+    3.100000    0.741798    3.038762    3.499998
     3.200000    0.691633    3.121815    3.499998
     3.300000    0.644408    3.204867    3.499998
     3.400000    0.600305    3.287588    3.499998
     3.500000    0.559517    3.369729    3.499998
     3.600000    0.522228    3.451100    3.499998
     3.700000    0.488593    3.531554    3.499998
-    3.800000    0.458712    3.610979    3.499998
+    3.800000    0.458713    3.610979    3.499998
     3.900000    0.432611    3.689292    3.499999
     4.000000    0.410222    3.766440    3.499999
     4.100000    0.391383    3.842396    3.499999
@@ -60,7 +60,7 @@
     5.100000    0.331684    4.544600    3.499999
     5.200000    0.332605    4.610297    3.499999
     5.300000    0.334109    4.675326    3.499999
-    5.400000    0.336121    4.739695    3.499999
+    5.400000    0.336121    4.739694    3.499999
     5.500000    0.338588    4.803402    3.499999
     5.600000    0.341472    4.866439    3.499999
     5.700000    0.344747    4.928787    3.499999
@@ -86,33 +86,33 @@
     7.700000    0.571996    5.870367    3.499998
     7.800000    0.615233    5.869891    3.499998
     7.900000    0.674190    5.850430    3.499998
-    8.000000    0.760486    5.800612    3.499997
-    8.100000    0.900806    5.696886    3.499997
-    8.200000    1.168701    5.483555    3.499996
-    8.300000    1.788983    5.030862    3.499994
-    8.400000    2.907583    4.325491    3.499991
-    8.500000    3.613526    3.702356    3.499989
-    8.600000    3.894341    3.130135    3.499987
-    8.700000    4.022608    2.516756    3.499987
-    8.800000    4.111043    1.781192    3.499986
-    8.900000    4.178068    1.047217    3.499985
-    9.000000    3.999350    0.887627    3.499986
-    9.100000    3.670986    0.942791    3.499987
-    9.200000    3.345964    1.020200    3.499988
-    9.300000    3.043896    1.105109    3.499990
-    9.400000    2.764752    1.196143    3.499990
-    9.500000    2.506590    1.293161    3.499991
-    9.600000    2.267456    1.396103    3.499992
-    9.700000    2.045656    1.504786    3.499993
-    9.800000    1.839810    1.618829    3.499994
-    9.900000    1.648872    1.737602    3.499994
-   10.000000    1.472127    1.860205    3.499995
+    8.000000    0.760485    5.800612    3.499997
+    8.100000    0.900804    5.696888    3.499997
+    8.200000    1.168696    5.483559    3.499996
+    8.300000    1.788966    5.030873    3.499994
+    8.400000    2.907564    4.325501    3.499991
+    8.500000    3.613521    3.702362    3.499989
+    8.600000    3.894340    3.130139    3.499987
+    8.700000    4.022609    2.516760    3.499987
+    8.800000    4.111045    1.781195    3.499986
+    8.900000    4.178071    1.047218    3.499985
+    9.000000    3.999353    0.887627    3.499986
+    9.100000    3.670989    0.942790    3.499987
+    9.200000    3.345967    1.020198    3.499988
+    9.300000    3.043900    1.105107    3.499990
+    9.400000    2.764755    1.196140    3.499990
+    9.500000    2.506593    1.293158    3.499991
+    9.600000    2.267459    1.396100    3.499992
+    9.700000    2.045658    1.504783    3.499993
+    9.800000    1.839812    1.618826    3.499994
+    9.900000    1.648874    1.737600    3.499994
+   10.000000    1.472129    1.860203    3.499995
    ----------------------------------------------
 
 Final Solver Statistics:
    Slow Steps: nsts = 1001
    Fast Steps: nstf = 3171 (attempted = 3171)
-   Total RHS evals:  Fs = 3004,  Ff = 34684
+   Total RHS evals:  Fs = 3004,  Ff = 30611
    Total number of fast error test failures = 0
    Total linear solver setups = 3118
    Total RHS evals for setting up the linear system = 0
diff --git a/examples/arkode/C_serial/ark_brusselator_fp.out b/examples/arkode/C_serial/ark_brusselator_fp.out
index 041ebe3d2a..ed5ca0e6f3 100644
--- a/examples/arkode/C_serial/ark_brusselator_fp.out
+++ b/examples/arkode/C_serial/ark_brusselator_fp.out
@@ -9,8 +9,8 @@ Brusselator ODE test problem, fixed-point solver:
     1.000000    1.897255    1.274939    2.997155
     2.000000    0.346125    2.366448    2.999481
     3.000000    0.147442    2.862061    2.999781
-    4.000000    0.140733    3.226731    2.999788
-    5.000000    0.142659    3.583206    2.999788
+    4.000000    0.140733    3.226731    2.999780
+    5.000000    0.142659    3.583206    2.999789
     6.000000    0.145095    3.936910    2.999782
     7.000000    0.147720    4.287893    2.999780
     8.000000    0.150542    4.635957    2.999775
@@ -20,7 +20,7 @@ Brusselator ODE test problem, fixed-point solver:
 
 Final Solver Statistics:
    Internal solver steps = 729 (attempted = 730)
-   Total RHS evals:  Fe = 4383,  Fi = 18793
+   Total RHS evals:  Fe = 4382,  Fi = 18792
    Total number of fixed-point iterations = 14410
    Total number of nonlinear solver convergence failures = 0
    Total number of error test failures = 1
diff --git a/examples/arkode/C_serial/ark_brusselator_fp_1.out b/examples/arkode/C_serial/ark_brusselator_fp_1.out
index 041ebe3d2a..ed5ca0e6f3 100644
--- a/examples/arkode/C_serial/ark_brusselator_fp_1.out
+++ b/examples/arkode/C_serial/ark_brusselator_fp_1.out
@@ -9,8 +9,8 @@ Brusselator ODE test problem, fixed-point solver:
     1.000000    1.897255    1.274939    2.997155
     2.000000    0.346125    2.366448    2.999481
     3.000000    0.147442    2.862061    2.999781
-    4.000000    0.140733    3.226731    2.999788
-    5.000000    0.142659    3.583206    2.999788
+    4.000000    0.140733    3.226731    2.999780
+    5.000000    0.142659    3.583206    2.999789
     6.000000    0.145095    3.936910    2.999782
     7.000000    0.147720    4.287893    2.999780
     8.000000    0.150542    4.635957    2.999775
@@ -20,7 +20,7 @@ Brusselator ODE test problem, fixed-point solver:
 
 Final Solver Statistics:
    Internal solver steps = 729 (attempted = 730)
-   Total RHS evals:  Fe = 4383,  Fi = 18793
+   Total RHS evals:  Fe = 4382,  Fi = 18792
    Total number of fixed-point iterations = 14410
    Total number of nonlinear solver convergence failures = 0
    Total number of error test failures = 1
diff --git a/examples/arkode/C_serial/ark_brusselator_mri.out b/examples/arkode/C_serial/ark_brusselator_mri.out
index 7cfb07b9cf..602c2e4177 100644
--- a/examples/arkode/C_serial/ark_brusselator_mri.out
+++ b/examples/arkode/C_serial/ark_brusselator_mri.out
@@ -31,4 +31,4 @@ Brusselator ODE test problem:
 
 Final Solver Statistics:
    Steps: nsts = 81, nstf = 2187
-   Total RHS evals:  Fs = 244,  Ff = 8831
+   Total RHS evals:  Fs = 244,  Ff = 6581
diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark.c b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark.c
index 9064c56987..359f458f17 100644
--- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark.c
+++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark.c
@@ -264,6 +264,10 @@ int main(int argc, char* argv[])
     flag = ARKStepSetTableName(arkode_mem, "ARKODE_ARK2_DIRK_3_1_2",
                                "ARKODE_ERK_NONE");
     if (check_flag(flag, "ARKStepSetTableName")) return 1;
+
+    /* Tighten nonlinear solver tolerance */
+    flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+    if (check_flag(flag, "ARKStepSetNonlinConvCoef")) return 1;
   }
 
   if (fixed_h > SUN_RCONST(0.0))
diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out
index 05f6b3f4ce..76cfdd2a7e 100644
--- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out
+++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out
@@ -8,18 +8,18 @@ Conserved Exponential Entropy problem:
  step   t              u              v              e              delta e
  -------------------------------------------------------------------------------
     0   0.000000e+00   1.000000e+00   5.000000e-01   4.367003e+00   0.000000e+00
-   40   6.911091e-01  -1.121528e+00   1.396547e+00   4.367003e+00  -1.776357e-15
-   80   1.946408e+00  -6.526227e+00   1.473742e+00   4.367003e+00   4.440892e-15
+   40   7.671134e-01  -1.432143e+00   1.417843e+00   4.367003e+00   5.329071e-15
+   80   2.733674e+00  -9.963899e+00   1.474066e+00   4.367003e+00   8.881784e-15
  -------------------------------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 99 (attempted = 124)
+   Internal solver steps = 86 (attempted = 86)
    Total number of error test failures = 0
-   Total RHS evals:  Fe = 722,  Fi = 0
-   Total Relaxation Fn evals    = 622
-   Total Relaxation Jac evals   = 1019
-   Total Relaxation fails       = 25
+   Total RHS evals:  Fe = 432,  Fi = 0
+   Total Relaxation Fn evals    = 266
+   Total Relaxation Jac evals   = 524
+   Total Relaxation fails       = 0
    Total Relaxation bound fails = 0
-   Total Relaxation NLS fails   = 25
-   Total Relaxation NLS iters   = 399
+   Total Relaxation NLS fails   = 0
+   Total Relaxation NLS iters   = 94
 
diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out
index 77742dc2bd..8ab099ceb4 100644
--- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out
+++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out
@@ -8,46 +8,40 @@ Conserved Exponential Entropy problem:
  step   t              u              v              e              delta e
  -------------------------------------------------------------------------------
     0   0.000000e+00   1.000000e+00   5.000000e-01   4.367003e+00   0.000000e+00
-   40   4.754706e-02   9.164641e-01   6.241023e-01   4.367003e+00   8.881784e-16
-   80   8.098591e-02   8.514226e-01   7.050883e-01   4.367003e+00   0.000000e+00
-  120   1.285350e-01   7.498036e-01   8.111164e-01   4.367003e+00   1.776357e-15
-  160   1.711613e-01   6.495637e-01   8.970255e-01   4.367003e+00   8.881784e-16
-  200   2.117650e-01   5.461535e-01   9.709320e-01   4.367003e+00   5.329071e-15
-  240   2.453290e-01   4.549914e-01   1.026344e+00   4.367003e+00   0.000000e+00
-  280   2.845614e-01   3.421715e-01   1.084852e+00   4.367003e+00   1.776357e-15
-  320   3.187813e-01   2.385199e-01   1.130639e+00   4.367003e+00   1.776357e-15
-  360   3.470183e-01   1.495118e-01   1.164942e+00   4.367003e+00   4.440892e-15
-  400   3.679487e-01   8.161060e-02   1.188444e+00   4.367003e+00   1.776357e-15
-  440   3.849834e-01   2.519301e-02   1.206417e+00   4.367003e+00   7.105427e-15
-  480   3.919101e-01   1.965927e-03   1.213438e+00   4.367003e+00   3.552714e-15
-  520   3.949458e-01  -8.265002e-03   1.216465e+00   4.367003e+00   2.664535e-15
-  560   4.054406e-01  -4.387006e-02   1.226690e+00   4.367003e+00  -1.776357e-15
-  600   4.224627e-01  -1.023806e-01   1.242516e+00   4.367003e+00   0.000000e+00
-  640   4.483804e-01  -1.931947e-01   1.264884e+00   4.367003e+00  -1.776357e-15
-  680   4.858087e-01  -3.277677e-01   1.293760e+00   4.367003e+00   1.776357e-15
-  720   5.292378e-01  -4.885049e-01   1.322678e+00   4.367003e+00  -4.440892e-15
-  760   5.861685e-01  -7.057075e-01   1.354092e+00   4.367003e+00  -6.217249e-15
-  800   6.559300e-01  -9.802131e-01   1.384235e+00   4.367003e+00  -2.664535e-15
-  840   7.351394e-01  -1.300674e+00   1.409682e+00   4.367003e+00   8.881784e-16
-  880   8.653344e-01  -1.841818e+00   1.437100e+00   4.367003e+00  -8.881784e-16
-  920   1.014019e+00  -2.473635e+00   1.454590e+00   4.367003e+00   8.881784e-16
-  960   1.342023e+00  -3.891227e+00   1.469390e+00   4.367003e+00   3.552714e-15
- 1000   2.028294e+00  -6.883726e+00   1.473842e+00   4.367003e+00   5.329071e-15
+   40   4.817852e-02   9.152845e-01   6.256803e-01   4.367003e+00   3.552714e-15
+   80   9.764003e-02   8.170556e-01   7.434499e-01   4.367003e+00   7.105427e-15
+  120   1.471282e-01   7.071386e-01   8.496481e-01   4.367003e+00   8.881784e-15
+  160   1.965497e-01   5.857982e-01   9.441311e-01   4.367003e+00   8.881784e-15
+  200   2.457811e-01   4.537292e-01   1.027056e+00   4.367003e+00   2.753353e-14
+  240   2.947183e-01   3.119036e-01   1.098939e+00   4.367003e+00   4.440892e-14
+  280   3.389142e-01   1.753685e-01   1.155408e+00   4.367003e+00   4.973799e-14
+  320   3.715233e-01   6.985629e-02   1.192300e+00   4.367003e+00   4.618528e-14
+  360   3.897050e-01   9.378019e-03   1.211221e+00   4.367003e+00   4.973799e-14
+  400   3.941218e-01  -5.484616e-03   1.215646e+00   4.367003e+00   6.306067e-14
+  440   4.041300e-01  -3.940365e-02   1.225433e+00   4.367003e+00   5.861978e-14
+  480   4.249355e-01  -1.109566e-01   1.244738e+00   4.367003e+00   6.394885e-14
+  520   4.567105e-01  -2.228060e-01   1.271650e+00   4.367003e+00   7.283063e-14
+  560   5.018939e-01  -3.867565e-01   1.305016e+00   4.367003e+00   8.082424e-14
+  600   5.637002e-01  -6.191770e-01   1.342503e+00   4.367003e+00   8.526513e-14
+  640   6.475411e-01  -9.467796e-01   1.381034e+00   4.367003e+00   9.148238e-14
+  680   7.633005e-01  -1.416410e+00   1.416925e+00   4.367003e+00   9.769963e-14
+  720   9.297484e-01  -2.114173e+00   1.446041e+00   4.367003e+00   1.039169e-13
+  760   1.217690e+00  -3.351631e+00   1.466024e+00   4.367003e+00   1.145750e-13
+  800   2.256864e+00  -7.881740e+00   1.473991e+00   4.367003e+00   1.207923e-13
  -------------------------------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 1024 (attempted = 1376)
-   Total number of error test failures = 86
-   Total RHS evals:  Fe = 0,  Fi = 9934
-   Total number of Newton iterations = 5803
-   Total number of linear solver convergence failures = 37
-   Total linear solver setups = 844
-   Total number of Jacobian evaluations = 304
+   Internal solver steps = 814 (attempted = 832)
+   Total number of error test failures = 3
+   Total RHS evals:  Fe = 0,  Fi = 6827
+   Total number of Newton iterations = 4347
+   Total number of linear solver convergence failures = 117
+   Total linear solver setups = 195
+   Total number of Jacobian evaluations = 136
    Total RHS evals for setting up the linear system = 0
-   Total Relaxation Fn evals    = 7023
-   Total Relaxation Jac evals   = 8651
-   Total Relaxation fails       = 266
-   Total Relaxation bound fails = 14
-   Total Relaxation NLS fails   = 252
-   Total Relaxation NLS iters   = 4523
-
+   Total Relaxation Fn evals    = 2689
+   Total Relaxation Jac evals   = 3521
+   Total Relaxation fails       = 15
+   Total Relaxation bound fails = 15
+   Total Relaxation NLS fails   = 0
+   Total Relaxation NLS iters   = 1025
diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out
index 9e1649f48e..e39d0b1160 100644
--- a/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out
+++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out
@@ -8,18 +8,18 @@ Conserved Exponential Entropy problem:
  step   t              u              v              e              delta e
  -------------------------------------------------------------------------------
     0   0.000000e+00   1.000000e+00   5.000000e-01   4.367003e+00   0.000000e+00
-   40   6.759227e-01  -1.060311e+00   1.391445e+00   4.367003e+00  -1.776357e-15
-   80   1.694830e+00  -5.428257e+00   1.473071e+00   4.367003e+00  -8.881784e-16
+   40   6.829631e-01  -1.088653e+00   1.393849e+00   4.367003e+00   7.993606e-15
+   80   3.316326e+00  -1.250833e+01   1.474076e+00   4.367003e+00   1.332268e-14
  -------------------------------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 95 (attempted = 121)
+   Internal solver steps = 83 (attempted = 85)
    Total number of error test failures = 2
-   Total RHS evals = 582
-   Total Relaxation Fn evals    = 608
-   Total Relaxation Jac evals   = 995
-   Total Relaxation fails       = 24
+   Total RHS evals = 425
+   Total Relaxation Fn evals    = 267
+   Total Relaxation Jac evals   = 522
+   Total Relaxation fails       = 0
    Total Relaxation bound fails = 0
-   Total Relaxation NLS fails   = 24
-   Total Relaxation NLS iters   = 390
+   Total Relaxation NLS fails   = 0
+   Total Relaxation NLS iters   = 97
 
diff --git a/examples/arkode/C_serial/ark_damped_harmonic_symplectic.out b/examples/arkode/C_serial/ark_damped_harmonic_symplectic.out
index 943d2875e7..f7c3c21208 100644
--- a/examples/arkode/C_serial/ark_damped_harmonic_symplectic.out
+++ b/examples/arkode/C_serial/ark_damped_harmonic_symplectic.out
@@ -22,5 +22,5 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 0.0009908169824406335
 Current step size            = 0.001
-f1 RHS fn evals              = 125665
-f2 RHS fn evals              = 125665
+f1 RHS fn evals              = 125664
+f2 RHS fn evals              = 125664
diff --git a/examples/arkode/C_serial/ark_dissipated_exp_entropy.c b/examples/arkode/C_serial/ark_dissipated_exp_entropy.c
index 76da27a0c1..dbb62ec83e 100644
--- a/examples/arkode/C_serial/ark_dissipated_exp_entropy.c
+++ b/examples/arkode/C_serial/ark_dissipated_exp_entropy.c
@@ -244,6 +244,10 @@ int main(int argc, char* argv[])
     flag = ARKStepSetTableName(arkode_mem, "ARKODE_ARK2_DIRK_3_1_2",
                                "ARKODE_ERK_NONE");
     if (check_flag(flag, "ARKStepSetTableName")) return 1;
+
+    /* Tighten nonlinear solver tolerance */
+    flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(0.01));
+    if (check_flag(flag, "ARKStepSetNonlinConvCoef")) return 1;
   }
 
   if (fixed_h > SUN_RCONST(0.0))
diff --git a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out
index 90df8380be..35872dff8b 100644
--- a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out
+++ b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out
@@ -16,11 +16,11 @@ Dissipated Exponential Entropy problem:
 Final Solver Statistics:
    Internal solver steps = 130 (attempted = 130)
    Total number of error test failures = 0
-   Total RHS evals:  Fe = 783,  Fi = 0
-   Total Relaxation Fn evals    = 392
-   Total Relaxation Jac evals   = 782
+   Total RHS evals:  Fe = 652,  Fi = 0
+   Total Relaxation Fn evals    = 391
+   Total Relaxation Jac evals   = 781
    Total Relaxation fails       = 0
    Total Relaxation bound fails = 0
    Total Relaxation NLS fails   = 0
-   Total Relaxation NLS iters   = 132
+   Total Relaxation NLS iters   = 131
 
diff --git a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out
index 49be4a5967..176dffd2b8 100644
--- a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out
+++ b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out
@@ -8,52 +8,51 @@ Dissipated Exponential Entropy problem:
  step   t              u              e              u_err          delta e
  -------------------------------------------------------------------------------
     0   0.000000e+00   1.000000e+00   2.718282e+00   0.000000e+00   0.000000e+00
-   40   5.532834e-02   8.598921e-01   2.362906e+00   1.272595e+00  -3.553760e-01
-   80   1.097061e-01   7.390122e-01   2.093866e+00   1.072757e+00  -6.244157e-01
-  120   1.621192e-01   6.348810e-01   1.886798e+00   8.980007e-01  -8.314842e-01
-  160   2.128767e-01   5.434247e-01   1.721894e+00   7.425986e-01  -9.963881e-01
-  200   2.816359e-01   4.315291e-01   1.539610e+00   5.501251e-01  -1.178672e+00
-  240   3.484648e-01   3.335947e-01   1.395977e+00   3.796434e-01  -1.322305e+00
-  280   4.133160e-01   2.469303e-01   1.280090e+00   2.272780e-01  -1.438192e+00
-  320   4.764552e-01   1.692067e-01   1.184365e+00   8.948479e-02  -1.533917e+00
-  360   5.342836e-01   1.029604e-01   1.108447e+00  -2.878187e-02  -1.609834e+00
-  400   5.805889e-01   5.290718e-02   1.054332e+00  -1.186227e-01  -1.663950e+00
-  440   6.131438e-01   1.915938e-02   1.019344e+00  -1.794246e-01  -1.698938e+00
-  480   6.301872e-01   1.935497e-03   1.001937e+00  -2.105255e-01  -1.716344e+00
-  520   6.350100e-01  -2.884950e-03   9.971192e-01  -2.192380e-01  -1.721163e+00
-  560   6.468882e-01  -1.465940e-02   9.854475e-01  -2.405343e-01  -1.732834e+00
-  600   6.693569e-01  -3.655950e-02   9.641007e-01  -2.802015e-01  -1.754181e+00
-  640   7.021244e-01  -6.766195e-02   9.345763e-01  -3.366619e-01  -1.783705e+00
-  680   7.450858e-01  -1.070275e-01   8.985009e-01  -4.083288e-01  -1.819781e+00
-  720   8.015384e-01  -1.565058e-01   8.551265e-01  -4.987252e-01  -1.863155e+00
-  760   8.754911e-01  -2.178256e-01   8.042657e-01  -6.112329e-01  -1.914016e+00
-  800   9.627556e-01  -2.856560e-01   7.515211e-01  -7.362769e-01  -1.966761e+00
-  840   1.068726e+00  -3.622828e-01   6.960855e-01  -8.782493e-01  -2.022196e+00
-  880   1.205356e+00  -4.531342e-01   6.356328e-01  -1.047503e+00  -2.082649e+00
-  920   1.360691e+00  -5.472947e-01   5.785127e-01  -1.223917e+00  -2.139769e+00
-  960   1.555080e+00  -6.538651e-01   5.200319e-01  -1.424719e+00  -2.198250e+00
- 1000   1.799105e+00  -7.733362e-01   4.614709e-01  -1.651150e+00  -2.256811e+00
- 1040   2.083363e+00  -8.965948e-01   4.079565e-01  -1.886097e+00  -2.310325e+00
- 1080   2.428941e+00  -1.028483e+00   3.575490e-01  -2.138850e+00  -2.360733e+00
- 1120   2.880022e+00  -1.178008e+00   3.078913e-01  -2.426922e+00  -2.410391e+00
- 1160   3.423853e+00  -1.332822e+00   2.637319e-01  -2.726684e+00  -2.454550e+00
- 1200   4.082008e+00  -1.492878e+00   2.247249e-01  -3.037999e+00  -2.493557e+00
- 1240   4.890808e+00  -1.659881e+00   1.901617e-01  -3.364145e+00  -2.528120e+00
+   40   5.537896e-02   8.597725e-01   2.362623e+00   1.272399e+00  -3.556587e-01
+   80   1.099922e-01   7.384132e-01   2.092612e+00   1.071758e+00  -6.256694e-01
+  120   1.627168e-01   6.337541e-01   1.884673e+00   8.960967e-01  -8.336092e-01
+  160   2.138163e-01   5.418080e-01   1.719112e+00   7.398360e-01  -9.991696e-01
+  200   2.785993e-01   4.362152e-01   1.546842e+00   5.582361e-01  -1.171440e+00
+  240   3.461651e-01   3.368102e-01   1.400473e+00   3.852698e-01  -1.317809e+00
+  280   4.117847e-01   2.488924e-01   1.282604e+00   2.307427e-01  -1.435678e+00
+  320   4.756921e-01   1.701108e-01   1.185436e+00   9.109375e-02  -1.532846e+00
+  360   5.336712e-01   1.036393e-01   1.109200e+00  -2.756595e-02  -1.609081e+00
+  400   5.801378e-01   5.338279e-02   1.054833e+00  -1.177670e-01  -1.663448e+00
+  440   6.128657e-01   1.944281e-02   1.019633e+00  -1.789132e-01  -1.698649e+00
+  480   6.300899e-01   2.032891e-03   1.002035e+00  -2.103494e-01  -1.716247e+00
+  520   6.349961e-01  -2.871232e-03   9.971329e-01  -2.192131e-01  -1.721149e+00
+  560   6.468398e-01  -1.461180e-02   9.854944e-01  -2.404481e-01  -1.732787e+00
+  600   6.694857e-01  -3.668376e-02   9.639809e-01  -2.804267e-01  -1.754301e+00
+  640   7.021782e-01  -6.771235e-02   9.345293e-01  -3.367534e-01  -1.783753e+00
+  680   7.458296e-01  -1.076957e-01   8.979008e-01  -4.095471e-01  -1.820381e+00
+  720   8.007409e-01  -1.558236e-01   8.557101e-01  -4.974764e-01  -1.862572e+00
+  760   8.752295e-01  -2.176153e-01   8.044349e-01  -6.108460e-01  -1.913847e+00
+  800   9.636774e-01  -2.863486e-01   7.510007e-01  -7.375568e-01  -1.967281e+00
+  840   1.066491e+00  -3.607260e-01   6.971700e-01  -8.753575e-01  -2.021112e+00
+  880   1.204472e+00  -4.525718e-01   6.359904e-01  -1.046452e+00  -2.082291e+00
+  920   1.362583e+00  -5.483883e-01   5.778804e-01  -1.225972e+00  -2.140401e+00
+  960   1.551610e+00  -6.520589e-01   5.209720e-01  -1.421306e+00  -2.197310e+00
+ 1000   1.797284e+00  -7.724956e-01   4.618590e-01  -1.649553e+00  -2.256423e+00
+ 1040   2.083087e+00  -8.964821e-01   4.080024e-01  -1.885881e+00  -2.310279e+00
+ 1080   2.422755e+00  -1.026269e+00   3.583415e-01  -2.134596e+00  -2.359940e+00
+ 1120   2.874633e+00  -1.176348e+00   3.084029e-01  -2.423715e+00  -2.409879e+00
+ 1160   3.418118e+00  -1.331309e+00   2.641313e-01  -2.723747e+00  -2.454151e+00
+ 1200   4.078701e+00  -1.492135e+00   2.248921e-01  -3.036550e+00  -2.493390e+00
+ 1240   4.884676e+00  -1.658714e+00   1.903836e-01  -3.361862e+00  -2.527898e+00
  -------------------------------------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 1244 (attempted = 1246)
-   Total number of error test failures = 2
-   Total RHS evals:  Fe = 0,  Fi = 9633
-   Total number of Newton iterations = 5892
-   Total number of linear solver convergence failures = 81
-   Total linear solver setups = 149
-   Total number of Jacobian evaluations = 93
+   Internal solver steps = 1245 (attempted = 1246)
+   Total number of error test failures = 1
+   Total RHS evals:  Fe = 0,  Fi = 10907
+   Total number of Newton iterations = 7168
+   Total number of linear solver convergence failures = 111
+   Total linear solver setups = 179
+   Total number of Jacobian evaluations = 125
    Total RHS evals for setting up the linear system = 0
-   Total Relaxation Fn evals    = 3773
-   Total Relaxation Jac evals   = 5019
+   Total Relaxation Fn evals    = 4403
+   Total Relaxation Jac evals   = 5649
    Total Relaxation fails       = 0
    Total Relaxation bound fails = 0
    Total Relaxation NLS fails   = 0
-   Total Relaxation NLS iters   = 1281
-
+   Total Relaxation NLS iters   = 1911
diff --git a/examples/arkode/C_serial/ark_harmonic_symplectic.out b/examples/arkode/C_serial/ark_harmonic_symplectic.out
index 60e081223b..6033ea1668 100644
--- a/examples/arkode/C_serial/ark_harmonic_symplectic.out
+++ b/examples/arkode/C_serial/ark_harmonic_symplectic.out
@@ -22,5 +22,5 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 0.0003981633971861239
 Current step size            = 0.001
-f1 RHS fn evals              = 25153
-f2 RHS fn evals              = 25153
+f1 RHS fn evals              = 25152
+f2 RHS fn evals              = 25152
diff --git a/examples/arkode/C_serial/ark_heat1D.out b/examples/arkode/C_serial/ark_heat1D.out
index 2f33b506c3..4b1068888c 100644
--- a/examples/arkode/C_serial/ark_heat1D.out
+++ b/examples/arkode/C_serial/ark_heat1D.out
@@ -18,12 +18,12 @@
    -------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 191 (attempted = 191)
-   Total RHS evals:  Fe = 0,  Fi = 1913
+   Internal solver steps = 190 (attempted = 190)
+   Total RHS evals:  Fe = 0,  Fi = 1903
    Total linear solver setups = 0
-   Total linear iterations = 18265
-   Total number of Jacobian-vector products = 18265
+   Total linear iterations = 17826
+   Total number of Jacobian-vector products = 17826
    Total number of linear solver convergence failures = 0
-   Total number of Newton iterations = 955
+   Total number of Newton iterations = 950
    Total number of nonlinear solver convergence failures = 0
    Total number of error test failures = 0
diff --git a/examples/arkode/C_serial/ark_heat1D_adapt.out b/examples/arkode/C_serial/ark_heat1D_adapt.out
index 4eb02c8a18..8135e3df32 100644
--- a/examples/arkode/C_serial/ark_heat1D_adapt.out
+++ b/examples/arkode/C_serial/ark_heat1D_adapt.out
@@ -6,154 +6,135 @@
  ----------------------------------------------------------------------------------------
     0  0.000000000000000e+00  0.000000000000000e+00  0.000000000000000e+00  21    0    0
     1  3.629021901461023e-12  7.505751048377368e-09  2.979166031180459e-12  21    5    5
-    2  7.505751048377368e-09  1.501150209675474e-07  6.164657920191316e-09  21    5    5
-    3  1.501150209675474e-07  3.002300419350948e-06  1.293969127944767e-07  21    5   10
-    4  3.002300419350948e-06  6.004600838701896e-05  2.593514282990854e-06  21    5   10
-    5  6.004600838701896e-05  2.853823712852094e-04  5.166758334560010e-05  21    5   20
-    6  2.853823712852094e-04  2.575255578901065e-04  2.798555766932917e-04  21    5   25
-    7  2.575255578901065e-04  4.094541218029253e-04  4.794249606742115e-04  21    5   25
-    8  4.094541218029253e-04  4.094541218029253e-04  7.863858593533243e-04  21    5   29
-    9  4.094541218029253e-04  6.522910582302937e-04  1.082809153607867e-03  21    5   29
-   10  6.522910582302937e-04  5.699097250687579e-04  1.606859000290955e-03  23    5   40
-   11  5.699097250687579e-04  1.007836408495680e-03  2.005669608336064e-03  23    5   35
-   12  1.007836408495680e-03  1.007836408495680e-03  2.683041089905320e-03  23    5   40
-   13  1.007836408495680e-03  8.453991987969423e-04  3.678394954727681e-03  25    5   40
-   14  8.453991987969423e-04  1.990429430223850e-03  4.265068071685453e-03  25    5   34
-   15  1.990429430223850e-03  1.990429430223850e-03  5.574933877447707e-03  25    5   41
-   16  1.990429430223850e-03  3.606540539819520e-03  6.798364735960519e-03  25    5   35
-   17  4.980839747684550e-04  4.980839747684550e-04  6.927003506629248e-03  27   15  180
-   18  4.980839747684550e-04  4.980839747684550e-04  7.441563625964739e-03  29    5   30
-   19  4.980839747684550e-04  1.668131272315291e-03  7.722574952892512e-03  29    5   29
-   20  1.668131272315291e-03  3.659992327983156e-03  8.637136102347247e-03  29    5   44
-   21  3.659992327983156e-03  7.226886812998415e-03  1.050785838365518e-02  29    5   65
-   22  2.276503454413033e-04  2.223970105833804e-04  1.033577924663066e-02  32   20  250
-   23  2.223970105833804e-04  4.397896042992326e-04  1.092271235598801e-02  34    5   24
-   24  4.397896042992326e-04  1.023105619938674e-03  1.113382898409555e-02  34    5   33
-   25  1.023105619938674e-03  1.023105619938674e-03  1.161589583401345e-02  34    5   36
-   26  1.023105619938674e-03  3.930141141574615e-03  1.208588377404162e-02  34    5   38
-   27  3.930141141574615e-03  3.871064201787735e-03  1.378515153788083e-02  34    5   84
-   28  3.871064201787735e-03  1.255329001281564e-02  1.530995222029954e-02  34    5   59
-   29  1.601537140384145e-03  1.457835824294224e-03  1.581392684966786e-02  36   15  234
-   30  1.457835824294224e-03  3.743501735515000e-03  1.633976217518591e-02  36    5   29
-   31  2.870420514795557e-03  2.465672685089582e-03  1.732506340515539e-02  38   10  143
-   32  5.515562262925350e-04  5.470070369949626e-04  1.714361637592621e-02  40   15  253
-   33  5.470070369949626e-04  9.932912795468831e-04  1.731823052548390e-02  40    5   43
-   34  9.932912795468831e-04  2.851877222558192e-03  1.763020341932926e-02  40    5   47
-   35  2.851877222558192e-03  8.592060762682407e-03  1.849017614042958e-02  40    5   96
-   36  1.753358828184278e-03  1.753358828184278e-03  1.899364054123662e-02  40   15  259
-   37  1.753358828184278e-03  8.066441335477586e-03  1.947884133485359e-02  40    5   60
-   38  6.367831766622205e-04  6.367831766622205e-04  1.897985914604649e-02  44   15  269
-   39  6.367831766622205e-04  1.262468320666752e-03  1.914535124132059e-02  44    5   47
-   40  1.262468320666752e-03  3.587735441717919e-03  1.946692075971101e-02  44    5   62
-   41  2.843421467160759e-03  2.408215671837289e-03  1.976846530535780e-02  46   10  199
-   42  2.408215671837289e-03  4.077980222533944e-03  2.031687522001488e-02  46    5   72
-   43  4.077980222533944e-03  1.071890797618786e-02  2.118660808690947e-02  46    5   88
-   44  1.071890797618786e-02  1.071890797618786e-02  2.316134512731487e-02  46    5  105
-   45  2.694639841378283e-03  2.650454280532623e-03  2.346008222533597e-02  48   10  208
-   46  5.834157269803085e-04  5.834157269803085e-04  2.328708620673918e-02  50   15  268
-   47  5.834157269803085e-04  1.193846932419712e-03  2.337621483760628e-02  50    5   55
-   48  1.193846932419712e-03  3.258366515093616e-03  2.355525946951272e-02  50    5   66
-   49  3.258366515093616e-03  6.418173913904015e-03  2.402308335632452e-02  50    5  104
-   50  3.844477373368192e-03  3.844477373368192e-03  2.453874392666302e-02  50   10  210
-   51  3.844477373368192e-03  1.778266602162782e-02  2.501810350379247e-02  50    5   91
-   52  4.165560835571891e-03  4.165560835571891e-03  2.549975323954108e-02  50   10  209
-   53  4.165560835571891e-03  4.165560835571891e-03  2.594523957554863e-02  50    5  105
-   54  4.165560835571891e-03  1.187099370779400e-02  2.635751897001287e-02  50    5  103
-   55  7.990286205672150e-03  7.990286205672150e-03  2.706496621836213e-02  50   10  210
-   56  7.990286205672150e-03  7.366258582155646e-03  2.767656709536814e-02  50    5  105
-   57  3.192957423660317e-03  2.690992361017143e-03  2.898705700684332e-02  54   10  210
-   58  2.690992361017143e-03  4.595411828908103e-03  2.916901398660043e-02  54    5  103
-   59  4.595411828908103e-03  1.148959244582437e-02  2.946060998170889e-02  54    5  105
-   60  3.392951963605576e-03  3.392951963605576e-03  2.934282134054850e-02  56   10  210
-   61  3.392951963605576e-03  1.266181052388950e-02  2.953044118771774e-02  56    5   75
-   62  1.266181052388950e-02  2.070977380726893e-02  3.014157400043279e-02  56    5  105
-   63  4.582873894130091e-03  4.582873894130091e-03  2.988631128376999e-02  58   10  210
-   64  4.582873894130091e-03  9.607054797980071e-03  2.957561272951538e-02  60    5  105
-   65  9.607054797980071e-03  1.949020745582244e-02  2.989673188100094e-02  60    5  105
-   66  1.054807485438376e-02  1.054807485438376e-02  3.019699587646915e-02  60   10  210
-   67  2.168783293816825e-03  2.168783293816825e-03  3.025284168346583e-02  60   10  210
-   68  2.168783293816825e-03  2.168783293816825e-03  3.030686555035694e-02  60    5  104
-   69  2.168783293816825e-03  9.519769922039302e-03  3.035913346641964e-02  60    5   79
-   70  9.519769922039302e-03  3.689745921797256e-02  3.056948236696047e-02  60    5  105
-   71  5.027376845883330e-03  5.027376845883330e-03  3.066924792565106e-02  60   10  210
-   72  5.027376845883330e-03  1.680323823916145e-02  3.076207689001887e-02  60    5   84
-   73  1.190695511366464e-02  1.190695511366464e-02  3.095765596831891e-02  60   10  210
-   74  8.824020991017463e-03  8.824020991017463e-03  3.108370439289872e-02  60   10  210
-   75  8.824020991017463e-03  7.492138529693538e-03  3.119630288799381e-02  60    5  105
-   76  7.492138529693538e-03  1.126027020832041e-02  3.128267383642943e-02  60    5  105
-   77  7.641572371714925e-03  7.641572371714925e-03  3.136324481005783e-02  60   10  210
-   78  7.641572371714925e-03  1.384651466179487e-02  3.143706333937704e-02  60    5  105
-   79  1.384651466179487e-02  1.168352852310369e-02  3.155622058156962e-02  60    5  105
-   80  7.186697995423493e-03  6.679717823882544e-03  3.161160219834706e-02  60   10  210
-   81  6.679717823882544e-03  6.679717823882544e-03  3.165979180134944e-02  60    5  105
-   82  6.679717823882544e-03  1.036597822978498e-02  3.170495968309999e-02  60    5  105
-   83  1.036597822978498e-02  2.078683878676566e-02  3.176988825989206e-02  60    5  105
-   84  9.416934538800317e-03  9.416934538800317e-03  3.182402943647551e-02  60   10  210
-   85  9.416934538800317e-03  2.931003455946657e-02  3.187416014076831e-02  60    5  105
-   86  2.931003455946657e-02  2.522099385522949e-02  3.200899311332644e-02  60    5  105
-   87  9.855600599572635e-04  8.688271778628972e-04  3.201326296052575e-02  60   20  384
-   88  8.688271778628972e-04  1.468146563475753e-03  3.201682378904077e-02  60    5   52
-   89  1.468146563475753e-03  4.343969048002700e-03  3.202279095225564e-02  60    5   74
-   90  4.343969048002700e-03  1.055819789459882e-02  3.204011973102326e-02  60    5  105
-   91  1.055819789459882e-02  2.209065533222391e-02  3.208023614326307e-02  60    5  105
-   92  2.386319631553004e-03  2.386319631553004e-03  3.208893412153121e-02  60   10  201
-   93  2.386319631553004e-03  1.364130552312118e-02  3.209750202157599e-02  60    5   55
-   94  1.364130552312118e-02  3.804643259996037e-02  3.214413129385055e-02  60    5  105
-   95  1.350012470133744e-02  1.350012470133744e-02  3.218665147855618e-02  60   10  210
-   96  9.639737373424729e-03  9.639737373424729e-03  3.221511600193919e-02  60   10  210
-   97  9.639737373424729e-03  1.590630674910340e-02  3.224203283811158e-02  60    5  105
-   98  9.367414453891131e-03  9.367414453891131e-03  3.226685525508665e-02  60   10  210
-   99  9.367414453891131e-03  9.367414453891131e-03  3.229047473304966e-02  60    5  105
-  100  9.367414453891131e-03  9.367414453891131e-03  3.231292205847536e-02  60    5  105
-  101  9.367414453891131e-03  9.367414453891131e-03  3.233430846708617e-02  60    5  105
-  102  9.367414453891131e-03  1.668718345780916e-02  3.235467947113296e-02  60    5  105
-  103  5.906021531128903e-03  5.906021531128903e-03  3.236703325098769e-02  60   10  210
-  104  5.906021531128903e-03  2.471346837871190e-02  3.237901834705667e-02  60    5   96
-  105  2.471346837871190e-02  2.201998950790008e-02  3.242549498508623e-02  60    5  105
-  106  3.894024974675171e-04  3.761680700537104e-04  3.242617044596968e-02  60   20  349
-  107  3.761680700537104e-04  7.748843143493643e-04  3.242683007682674e-02  60    5   46
-  108  7.748843143493643e-04  1.939359550616336e-03  3.242818962548284e-02  60    5   48
-  109  1.939359550616336e-03  3.113184611872983e-03  3.243157178567092e-02  60    5   97
-  110  3.113184611872983e-03  1.134238283346586e-02  3.243693386177211e-02  60    5   56
-  111  1.134238283346586e-02  1.796931919942777e-02  3.245578846135799e-02  60    5  105
-  112  1.796931919942777e-02  1.796931919942777e-02  3.248360322275518e-02  60    5  105
-  113  8.830774846120172e-03  8.830774846120172e-03  3.249636376759852e-02  60   10  210
-  114  8.830774846120172e-03  1.498507899698427e-02  3.250861147195047e-02  60    5  105
-  115  1.498507899698427e-02  2.400192116112091e-02  3.252822783037751e-02  60    5  105
-  116  1.834491808739763e-02  1.623377394364994e-02  3.255035322145888e-02  60   10  210
-  117  3.788212246854621e-03  3.773941147494160e-03  3.255469746916730e-02  60   15  315
-  118  3.773941147494160e-03  7.682030983754903e-03  3.255893334479040e-02  60    5  102
-  119  7.682030983754903e-03  2.180723185927965e-02  3.256732024800101e-02  60    5  105
-  120  2.180723185927965e-02  2.180723185927965e-02  3.258952126393384e-02  60    5  105
-  121  7.835737782770146e-03  7.835737782770146e-03  3.259691115681246e-02  60   10  210
-  122  7.835737782770146e-03  7.835737782770146e-03  3.260403532591830e-02  60    5  105
-  123  7.835737782770146e-03  1.521701267403009e-02  3.261090627152081e-02  60    5  105
-  124  1.521701267403009e-02  1.453434366415250e-02  3.262350907909189e-02  60    5  105
-  125  8.703052343239644e-03  8.703052343239644e-03  3.263033111822743e-02  60   10  210
-  126  8.703052343239644e-03  1.579670548089376e-02  3.263681960135667e-02  60    5  105
-  127  1.579670548089376e-02  1.579670548089376e-02  3.264798736584679e-02  60    5  105
-  128  1.579670548089376e-02  1.579670548089376e-02  3.265832267481519e-02  60    5  105
-  129  1.579670548089376e-02  1.579670548089376e-02  3.266783834117996e-02  60    5  105
-  130  1.579670548089376e-02  1.579670548089376e-02  3.267678702878758e-02  60    5  105
-  131  1.579670548089376e-02  1.579670548089376e-02  3.268496551666714e-02  60    5  105
-  132  1.579670548089376e-02  1.579670548089376e-02  3.269259030998119e-02  60    5  105
-  133  1.579670548089376e-02  1.579670548089376e-02  3.269967993118440e-02  60    5  105
-  134  9.442981671750042e-03  9.442981671750042e-03  3.270354813120258e-02  60   10  210
-  135  9.442981671750042e-03  1.498194099824085e-02  3.270736206011246e-02  60    5  105
-  136  1.498194099824085e-02  1.498194099824085e-02  3.271299843859180e-02  60    5  105
-  137  1.498194099824085e-02  1.498194099824085e-02  3.271824887923226e-02  60    5  105
-  138  1.498194099824085e-02  1.498194099824085e-02  3.272312899128821e-02  60    5  105
-  139  1.498194099824085e-02  1.498194099824085e-02  3.272766675941034e-02  60    5  105
-  140  1.498194099824085e-02  2.323511524381186e-02  3.273188003348305e-02  60    5  105
-  141  2.323511524381186e-02  2.323511524381186e-02  3.273782698896385e-02  60    5  105
-  142  2.323511524381186e-02  2.323511524381186e-02  3.274312637533745e-02  60    5  105
-  143  2.323511524381186e-02  2.042949136658555e-02  3.274788476870443e-02  60    5  105
-  144  2.042949136658555e-02  2.042949136658555e-02  3.275161072878752e-02  60    5  105
-  145  2.042949136658555e-02  1.314912365010589e-02  3.275500884737036e-02  60    5  105
-  146  1.314912365010589e-02  1.314912365010589e-02  3.275701308437982e-02  60    5  105
+    2  7.505751048377368e-09  1.501150209675474e-07  6.164657920190889e-09  21    5    5
+    3  1.501150209675474e-07  3.002300419350948e-06  1.293969127943737e-07  21    5   10
+    4  3.002300419350948e-06  6.004600838701896e-05  2.593514282988711e-06  21    5   10
+    5  6.004600838701896e-05  2.853823679832573e-04  5.166758334555005e-05  21    5   20
+    6  2.853823679832573e-04  2.575255434332890e-04  2.798555740976005e-04  21    5   25
+    7  2.575255434332890e-04  4.094541134469988e-04  4.794249470975060e-04  21    5   25
+    8  4.094541134469988e-04  4.094541134469988e-04  7.863858401326194e-04  21    5   29
+    9  4.094541134469988e-04  6.522908622655267e-04  1.082809129037782e-03  21    5   29
+   10  6.522908622655267e-04  5.699096897079724e-04  1.606858836596097e-03  23    5   40
+   11  5.699096897079724e-04  1.007836116841849e-03  2.005669425160000e-03  23    5   35
+   12  1.007836116841849e-03  1.007836116841849e-03  2.683040723903781e-03  23    5   40
+   13  1.007836116841849e-03  8.453991367856834e-04  3.678394364905319e-03  25    5   40
+   14  8.453991367856834e-04  1.990429632970147e-03  4.265067457277110e-03  25    5   34
+   15  1.990429632970147e-03  1.990429632970147e-03  5.574933430469675e-03  25    5   41
+   16  1.990429632970147e-03  3.606542084539227e-03  6.798364394830465e-03  25    5   35
+   17  4.980841065373463e-04  4.980841065373463e-04  6.927003185856736e-03  27   15  180
+   18  4.980841065373463e-04  4.980841065373463e-04  7.441563969778088e-03  29    5   30
+   19  4.980841065373463e-04  1.669338950987901e-03  7.722575172690612e-03  29    5   29
+   20  1.669338950987901e-03  3.660363409600048e-03  8.637783681073969e-03  29    5   44
+   21  3.660363409600048e-03  7.228866504893484e-03  1.050862732430420e-02  29    5   66
+   22  2.277066494413550e-04  2.223939246469188e-04  1.033655098852881e-02  32   20  250
+   23  2.223939246469188e-04  4.398048897676356e-04  1.092351423512213e-02  34    5   24
+   24  4.398048897676356e-04  1.023058876200847e-03  1.113462885573467e-02  34    5   33
+   25  1.023058876200847e-03  1.023058876200847e-03  1.161665279683433e-02  34    5   36
+   26  1.023058876200847e-03  3.919845082560766e-03  1.208659994169145e-02  34    5   38
+   27  3.919845082560766e-03  3.863020439217562e-03  1.378155752244160e-02  34    5   81
+   28  3.863020439217562e-03  1.257825200903444e-02  1.530364032030464e-02  34    5   59
+   29  1.533031872906549e-03  1.436302440195315e-03  1.578270750227194e-02  36   15  221
+   30  1.436302440195315e-03  3.755629101798260e-03  1.630186567569052e-02  36    5   31
+   31  2.870300468364886e-03  2.460481648357659e-03  1.728893354958566e-02  38   10  144
+   32  5.484132002743671e-04  5.448534872232822e-04  1.710787102567137e-02  40   15  251
+   33  5.448534872232822e-04  9.911472786863407e-04  1.728222131772621e-02  40    5   43
+   34  9.911472786863407e-04  2.853828564040550e-03  1.759429056441933e-02  40    5   47
+   35  2.853828564040550e-03  8.346188420319504e-03  1.845696364866320e-02  40    5   98
+   36  4.184969207140296e-03  4.184969207140296e-03  1.963139612674647e-02  40   10  209
+   37  7.891664187375526e-04  7.780072216640708e-04  1.916618790361855e-02  44   15  270
+   38  7.780072216640708e-04  1.432006588296146e-03  1.936507264204106e-02  44    5   51
+   39  1.432006588296146e-03  1.432006588296146e-03  1.933721559864914e-02  46    5   63
+   40  1.432006588296146e-03  2.920150155413109e-03  1.967900635018854e-02  46    5   59
+   41  2.920150155413109e-03  8.021410496618760e-03  2.034576732622878e-02  46    5   91
+   42  8.021410496618760e-03  8.021410496618760e-03  2.198707476731612e-02  46    5  105
+   43  8.021410496618760e-03  8.021410496618760e-03  2.338592734070328e-02  46    5  105
+   44  7.749248836531081e-04  7.712524403928612e-04  2.311665583789623e-02  50   15  273
+   45  7.712524403928612e-04  1.454207673515780e-03  2.323643927854141e-02  50    5   59
+   46  1.454207673515780e-03  3.893553595468784e-03  2.345743682946040e-02  50    5   75
+   47  3.893553595468784e-03  8.577785831996225e-03  2.401981148625224e-02  50    5  105
+   48  3.583582798475919e-03  3.583582798475919e-03  2.450182832136591e-02  50   10  210
+   49  3.583582798475919e-03  1.225842385200837e-02  2.495216274153317e-02  50    5   88
+   50  4.962462241849634e-03  4.962462241849634e-03  2.552759545114530e-02  50   10  208
+   51  4.962462241849634e-03  1.668087632819629e-02  2.605197291673569e-02  50    5   95
+   52  4.505316812294505e-03  4.505316812294505e-03  2.648793970156092e-02  50   10  201
+   53  4.505316812294505e-03  2.222468245231715e-02  2.688916611820219e-02  50    5  101
+   54  4.746858164506530e-03  4.746858164506530e-03  2.727761588174917e-02  50   15  298
+   55  4.746858164506530e-03  4.349218756600245e-03  2.848305395101498e-02  52    5  105
+   56  4.349218756600245e-03  4.349218756600245e-03  2.902306824658978e-02  54    5  105
+   57  4.349218756600245e-03  1.066724741463221e-02  2.931026262297523e-02  54    5  105
+   58  6.268748418325634e-03  6.268748418325634e-03  2.936878001655390e-02  56   10  210
+   59  6.268748418325634e-03  1.161381148923531e-02  2.970425918866458e-02  56    5  105
+   60  1.161381148923531e-02  1.028179098818762e-02  2.979356337650783e-02  58    5  105
+   61  1.028179098818762e-02  1.028179098818762e-02  2.969467522937706e-02  60    5  105
+   62  1.028179098818762e-02  3.106655738625877e-02  3.001826469123505e-02  60    5  105
+   63  1.471496945828350e-02  1.469024921725142e-02  3.039908149974539e-02  60   10  210
+   64  1.085599032570171e-02  1.085599032570171e-02  3.063067318046183e-02  60   10  210
+   65  1.085599032570171e-02  1.085599032570171e-02  3.082863809383847e-02  60    5  105
+   66  1.085599032570171e-02  1.085599032570171e-02  3.099902977389579e-02  60    5  105
+   67  7.618142079252098e-03  7.618142079252098e-03  3.110458948722743e-02  60   10  210
+   68  7.618142079252098e-03  3.289115457484437e-02  3.120052296435948e-02  60    5  105
+   69  3.289115457484437e-02  2.984967095026484e-02  3.153119483133013e-02  60    5  105
+   70  7.462417737566209e-03  7.462417737566209e-03  3.159027055714576e-02  60    6  126
+   71  7.462417737566209e-03  1.532601802900749e-02  3.164512521044466e-02  60    5  105
+   72  5.317294174445867e-03  5.317294174445867e-03  3.168191671045904e-02  60   10  210
+   73  5.317294174445867e-03  1.637705260014558e-02  3.171694897858042e-02  60    5  105
+   74  1.637705260014558e-02  5.597209894014091e-02  3.181506419526589e-02  60    5  105
+   75  9.763057448204533e-03  9.763057448204533e-03  3.186752063019930e-02  60   10  210
+   76  9.763057448204533e-03  3.404927513904092e-02  3.191613054349100e-02  60    5  105
+   77  3.404927513904092e-02  2.968548341756130e-02  3.206067821894520e-02  60    5  105
+   78  1.178500969634106e-02  1.178500969634106e-02  3.210368406300197e-02  60   10  210
+   79  1.178500969634106e-02  2.585117047072884e-02  3.214367493868805e-02  60    5  105
+   80  1.411007380226322e-02  1.411007380226322e-02  3.218801588316333e-02  60   10  210
+   81  1.411007380226322e-02  1.411007380226322e-02  3.222893682105193e-02  60    5  105
+   82  1.411007380226322e-02  1.401864440990195e-02  3.226656117886238e-02  60    5  105
+   83  1.401864440990195e-02  1.401864440990195e-02  3.230147951662023e-02  60    5  105
+   84  1.401864440990195e-02  1.303768352877046e-02  3.233369732860109e-02  60    5  105
+   85  7.810676399949200e-03  7.810676399949200e-03  3.235074731143681e-02  60   10  210
+   86  7.810676399949200e-03  7.810676399949200e-03  3.236714343315446e-02  60    5  105
+   87  7.810676399949200e-03  1.411979073878545e-02  3.238290227600748e-02  60    5  105
+   88  1.411979073878545e-02  3.418255178001077e-02  3.240986169975903e-02  60    5  105
+   89  1.683729734872759e-02  1.683729734872759e-02  3.243961052649499e-02  60   10  210
+   90  5.293743003823701e-03  5.293743003823701e-03  3.244847429329385e-02  60   10  210
+   91  5.293743003823701e-03  8.291768498653825e-03  3.245709535299850e-02  60    5  105
+   92  8.291768498653825e-03  1.880612123267676e-02  3.247017621575291e-02  60    5  105
+   93  1.173402792581162e-02  1.173402792581162e-02  3.248779528914644e-02  60   10  209
+   94  1.173402792581162e-02  1.173402792581162e-02  3.250442716997714e-02  60    5  105
+   95  1.173402792581162e-02  3.281754406804230e-02  3.252013886269631e-02  60    5  105
+   96  6.424707662957514e-03  6.424707662957514e-03  3.252836644102348e-02  60   10  197
+   97  6.424707662957514e-03  4.714988041054190e-02  3.253634036181408e-02  60    5   72
+   98  4.714988041054191e-03  4.714988041054191e-03  3.254203651909890e-02  60   10  171
+   99  4.714988041054191e-03  4.282144720721703e-02  3.254760362002126e-02  60    5   56
+  100  4.282144720721703e-02  3.592705003681280e-02  3.259281046463217e-02  60    5  105
+  101  7.349314806790228e-03  7.349314806790228e-03  3.259965013816767e-02  60   15  315
+  102  7.349314806790228e-03  3.112322123785429e-02  3.260625388050781e-02  60    5   96
+  103  3.112322123785429e-02  3.112322123785429e-02  3.263174602069833e-02  60    5  105
+  104  6.839739280813347e-03  6.839739280813347e-03  3.263685222363544e-02  60   15  315
+  105  6.839739280813347e-03  3.638819250655535e-02  3.264179137178386e-02  60    5   77
+  106  3.638819250655535e-02  3.638819250655535e-02  3.266544357612065e-02  60    5  105
+  107  1.812430795718352e-02  1.812430795718352e-02  3.267571852602801e-02  60   10  210
+  108  3.325944651421952e-03  3.325944651421952e-03  3.267751436841327e-02  60   15  315
+  109  3.325944651421952e-03  1.705033487710399e-02  3.267928353707002e-02  60    5   79
+  110  4.262583719275997e-03  4.262583719275997e-03  3.268151038658581e-02  60    6  118
+  111  4.262583719275997e-03  1.551192985487607e-02  3.268369082817933e-02  60    5   87
+  112  1.551192985487607e-02  2.477145186640316e-02  3.269122491441458e-02  60    5  105
+  113  1.660178108793211e-02  1.660178108793211e-02  3.269867454817608e-02  60   10  210
+  114  1.660178108793211e-02  1.660178108793211e-02  3.270557188991038e-02  60    5  105
+  115  1.660178108793211e-02  1.660178108793211e-02  3.271192363723516e-02  60    5  105
+  116  1.660178108793211e-02  3.371605679577483e-02  3.271779428194488e-02  60    5  105
+  117  1.522144924734310e-02  1.522144924734310e-02  3.272271516928414e-02  60   10  210
+  118  1.522144924734310e-02  1.396058321278275e-02  3.272735805276025e-02  60    5  105
+  119  1.396058321278275e-02  2.708386296373138e-02  3.273131056482627e-02  60    5  105
+  120  1.784278714797101e-02  1.559390397930733e-02  3.273593683845105e-02  60   10  210
+  121  1.108547745869386e-02  1.108547745869386e-02  3.273862071549129e-02  60   10  210
+  122  1.108547745869386e-02  3.935975276857615e-02  3.274118608200519e-02  60    5  105
+  123  9.839938192144036e-03  9.839938192144036e-03  3.274329592751463e-02  60    6  126
+  124  9.839938192144036e-03  3.408840272553354e-02  3.274535508616430e-02  60    5  105
+  125  2.571312978993083e-02  2.384800532128622e-02  3.274985374478378e-02  60   10  210
+  126  2.384800532128622e-02  1.550804686753758e-02  3.275393582150888e-02  60    5  105
+  127  1.550804686753758e-02  1.550804686753758e-02  3.275635661747035e-02  60    5  105
  ----------------------------------------------------------------------------------------
  Final solver statistics:
-   Total number of time steps = 146
-   Total nonlinear iterations = 980
-   Total linear iterations    = 17015
+   Total number of time steps = 127
+   Total nonlinear iterations = 868
+   Total linear iterations    = 15028
 
diff --git a/examples/arkode/C_serial/ark_kepler.out b/examples/arkode/C_serial/ark_kepler.out
index dd1e2f7f21..1ed58346ac 100644
--- a/examples/arkode/C_serial/ark_kepler.out
+++ b/examples/arkode/C_serial/ark_kepler.out
@@ -72,5 +72,5 @@ Inequality constraint fails  = 0
 Initial step size            = 0.01
 Last step size               = 0.009999999998981926
 Current step size            = 0.01
-f1 RHS fn evals              = 40001
-f2 RHS fn evals              = 40001
+f1 RHS fn evals              = 40000
+f2 RHS fn evals              = 40000
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out b/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out
index 36873efa02..845e6dbb9b 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_adapt.out
@@ -72,7 +72,7 @@ Inequality constraint fails  = 0
 Initial step size            = 1.836231979046091e-06
 Last step size               = 0.2400202274108805
 Current step size            = 0.2400202274108805
-Explicit RHS fn evals        = 2564
+Explicit RHS fn evals        = 2125
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out b/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out
index 617c413a32..a53c7f1542 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_ERK_--step-mode_fixed_--count-orbits.out
@@ -135,7 +135,7 @@ Initial step size            = 0.01
 Last step size               = 0.009999999998981926
 Current step size            = 0.01
 Root fn evals                = 10288
-Explicit RHS fn evals        = 60001
+Explicit RHS fn evals        = 50000
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out
index c63591e498..4ac4c1c821 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out
@@ -135,5 +135,5 @@ Initial step size            = 0.01
 Last step size               = 0.01
 Current step size            = 0.01
 Root fn evals                = 10297
-f1 RHS fn evals              = 40032
-f2 RHS fn evals              = 40032
+f1 RHS fn evals              = 40031
+f2 RHS fn evals              = 40031
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out
index 3a5b411e29..d32b06fb11 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_EULER_1_1_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-f1 RHS fn evals              = 50002
-f2 RHS fn evals              = 50002
+f1 RHS fn evals              = 50001
+f2 RHS fn evals              = 50001
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0005
 Last step size               = 0.0004999999432868658
 Current step size            = 0.0005
-f1 RHS fn evals              = 100001
-f2 RHS fn evals              = 100001
+f1 RHS fn evals              = 100000
+f2 RHS fn evals              = 100000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00025
 Last step size               = 0.0002499998522722533
 Current step size            = 0.00025
-f1 RHS fn evals              = 200001
-f2 RHS fn evals              = 200001
+f1 RHS fn evals              = 200000
+f2 RHS fn evals              = 200000
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.000125
 Last step size               = 3.183586727573126e-10
 Current step size            = 0.000125
-f1 RHS fn evals              = 400002
-f2 RHS fn evals              = 400002
+f1 RHS fn evals              = 400001
+f2 RHS fn evals              = 400001
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 6.25e-05
 Last step size               = 7.503473398173804e-10
 Current step size            = 6.25e-05
-f1 RHS fn evals              = 800002
-f2 RHS fn evals              = 800002
+f1 RHS fn evals              = 800001
+f2 RHS fn evals              = 800001
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 3.125e-05
 Last step size               = 9.66345226061093e-10
 Current step size            = 3.125e-05
-f1 RHS fn evals              = 1600002
-f2 RHS fn evals              = 1600002
+f1 RHS fn evals              = 1600001
+f2 RHS fn evals              = 1600001
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 1.5625e-05
 Last step size               = 1.562198162474714e-05
 Current step size            = 1.5625e-05
-f1 RHS fn evals              = 3200001
-f2 RHS fn evals              = 3200001
+f1 RHS fn evals              = 3200000
+f2 RHS fn evals              = 3200000
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 7.8125e-06
 Last step size               = 7.805897645596353e-06
 Current step size            = 7.8125e-06
-f1 RHS fn evals              = 6400001
-f2 RHS fn evals              = 6400001
+f1 RHS fn evals              = 6400000
+f2 RHS fn evals              = 6400000
 
 Order of accuracy wrt solution:    expected = 1, max = 1.6317,  avg = 1.0843,  overall = 1.0418
 Order of accuracy wrt Hamiltonian: expected = 1, max = 0.9999,  avg = 0.9979,  overall = 0.9983
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
index 7a3cc7e234..f6270cd29f 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-f1 RHS fn evals              = 100003
-f2 RHS fn evals              = 100003
+f1 RHS fn evals              = 100002
+f2 RHS fn evals              = 100002
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0005
 Last step size               = 0.0004999999432868658
 Current step size            = 0.0005
-f1 RHS fn evals              = 200001
-f2 RHS fn evals              = 200001
+f1 RHS fn evals              = 200000
+f2 RHS fn evals              = 200000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00025
 Last step size               = 0.0002499998522722533
 Current step size            = 0.00025
-f1 RHS fn evals              = 400001
-f2 RHS fn evals              = 400001
+f1 RHS fn evals              = 400000
+f2 RHS fn evals              = 400000
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.000125
 Last step size               = 3.183586727573126e-10
 Current step size            = 0.000125
-f1 RHS fn evals              = 800003
-f2 RHS fn evals              = 800003
+f1 RHS fn evals              = 800002
+f2 RHS fn evals              = 800002
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 6.25e-05
 Last step size               = 7.503473398173804e-10
 Current step size            = 6.25e-05
-f1 RHS fn evals              = 1600003
-f2 RHS fn evals              = 1600003
+f1 RHS fn evals              = 1600002
+f2 RHS fn evals              = 1600002
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 3.125e-05
 Last step size               = 9.66345226061093e-10
 Current step size            = 3.125e-05
-f1 RHS fn evals              = 3200003
-f2 RHS fn evals              = 3200003
+f1 RHS fn evals              = 3200002
+f2 RHS fn evals              = 3200002
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 1.5625e-05
 Last step size               = 1.562198162474714e-05
 Current step size            = 1.5625e-05
-f1 RHS fn evals              = 6400001
-f2 RHS fn evals              = 6400001
+f1 RHS fn evals              = 6400000
+f2 RHS fn evals              = 6400000
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 7.8125e-06
 Last step size               = 7.805897645596353e-06
 Current step size            = 7.8125e-06
-f1 RHS fn evals              = 12800001
-f2 RHS fn evals              = 12800001
+f1 RHS fn evals              = 12800000
+f2 RHS fn evals              = 12800000
 
 Order of accuracy wrt solution:    expected = 2, max = 2.0097,  avg = 1.8616,  overall = 1.9108
 Order of accuracy wrt Hamiltonian: expected = 2, max = 2.0636,  avg = 2.0087,  overall = 2.0051
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out
index 3749e79c62..588a1cd511 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_2_2_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-f1 RHS fn evals              = 100003
-f2 RHS fn evals              = 100003
+f1 RHS fn evals              = 100002
+f2 RHS fn evals              = 100002
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0005
 Last step size               = 0.0004999999432868658
 Current step size            = 0.0005
-f1 RHS fn evals              = 200001
-f2 RHS fn evals              = 200001
+f1 RHS fn evals              = 200000
+f2 RHS fn evals              = 200000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00025
 Last step size               = 0.0002499998522722533
 Current step size            = 0.00025
-f1 RHS fn evals              = 400001
-f2 RHS fn evals              = 400001
+f1 RHS fn evals              = 400000
+f2 RHS fn evals              = 400000
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.000125
 Last step size               = 3.183586727573126e-10
 Current step size            = 0.000125
-f1 RHS fn evals              = 800003
-f2 RHS fn evals              = 800003
+f1 RHS fn evals              = 800002
+f2 RHS fn evals              = 800002
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 6.25e-05
 Last step size               = 7.503473398173804e-10
 Current step size            = 6.25e-05
-f1 RHS fn evals              = 1600003
-f2 RHS fn evals              = 1600003
+f1 RHS fn evals              = 1600002
+f2 RHS fn evals              = 1600002
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 3.125e-05
 Last step size               = 9.66345226061093e-10
 Current step size            = 3.125e-05
-f1 RHS fn evals              = 3200003
-f2 RHS fn evals              = 3200003
+f1 RHS fn evals              = 3200002
+f2 RHS fn evals              = 3200002
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 1.5625e-05
 Last step size               = 1.562198162474714e-05
 Current step size            = 1.5625e-05
-f1 RHS fn evals              = 6400001
-f2 RHS fn evals              = 6400001
+f1 RHS fn evals              = 6400000
+f2 RHS fn evals              = 6400000
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 7.8125e-06
 Last step size               = 7.805897645596353e-06
 Current step size            = 7.8125e-06
-f1 RHS fn evals              = 12800001
-f2 RHS fn evals              = 12800001
+f1 RHS fn evals              = 12800000
+f2 RHS fn evals              = 12800000
 
 Order of accuracy wrt solution:    expected = 2, max = 2.0069,  avg = 1.8941,  overall = 1.9322
 Order of accuracy wrt Hamiltonian: expected = 2, max = 2.0006,  avg = 1.9998,  overall = 1.9999
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out
index 369230aab9..defe328ece 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_3_3_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.1
 Last step size               = 0.0999999999995608
 Current step size            = 0.1
-f1 RHS fn evals              = 1501
-f2 RHS fn evals              = 1501
+f1 RHS fn evals              = 1500
+f2 RHS fn evals              = 1500
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.05
 Last step size               = 0.05
 Current step size            = 0.05
-f1 RHS fn evals              = 3001
-f2 RHS fn evals              = 3001
+f1 RHS fn evals              = 3000
+f2 RHS fn evals              = 3000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.025
 Last step size               = 1.769251412042648e-12
 Current step size            = 0.025
-f1 RHS fn evals              = 6004
-f2 RHS fn evals              = 6004
+f1 RHS fn evals              = 6003
+f2 RHS fn evals              = 6003
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0125
 Last step size               = 0.01249999999719619
 Current step size            = 0.0125
-f1 RHS fn evals              = 12001
-f2 RHS fn evals              = 12001
+f1 RHS fn evals              = 12000
+f2 RHS fn evals              = 12000
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00625
 Last step size               = 0.006249999992917305
 Current step size            = 0.00625
-f1 RHS fn evals              = 24001
-f2 RHS fn evals              = 24001
+f1 RHS fn evals              = 24000
+f2 RHS fn evals              = 24000
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.003125
 Last step size               = 1.124078607972478e-11
 Current step size            = 0.003125
-f1 RHS fn evals              = 48004
-f2 RHS fn evals              = 48004
+f1 RHS fn evals              = 48003
+f2 RHS fn evals              = 48003
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0015625
 Last step size               = 2.835776058418557e-11
 Current step size            = 0.0015625
-f1 RHS fn evals              = 96004
-f2 RHS fn evals              = 96004
+f1 RHS fn evals              = 96003
+f2 RHS fn evals              = 96003
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00078125
 Last step size               = 0.0007812499550681189
 Current step size            = 0.00078125
-f1 RHS fn evals              = 192001
-f2 RHS fn evals              = 192001
+f1 RHS fn evals              = 192000
+f2 RHS fn evals              = 192000
 
 Order of accuracy wrt solution:    expected = 3, max = 3.9687,  avg = 3.7860,  overall = 3.8206
 Order of accuracy wrt Hamiltonian: expected = 3, max = 3.1635,  avg = 3.0431,  overall = 3.0566
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_4_4_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_4_4_--tf_50_--check-order_--nout_1.out
index 0984d2b7c2..f87244403c 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_4_4_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_4_4_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.1
 Last step size               = 0.0999999999995608
 Current step size            = 0.1
-f1 RHS fn evals              = 2001
-f2 RHS fn evals              = 2001
+f1 RHS fn evals              = 2000
+f2 RHS fn evals              = 2000
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.05
 Last step size               = 0.05
 Current step size            = 0.05
-f1 RHS fn evals              = 4001
-f2 RHS fn evals              = 4001
+f1 RHS fn evals              = 4000
+f2 RHS fn evals              = 4000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.025
 Last step size               = 1.769251412042648e-12
 Current step size            = 0.025
-f1 RHS fn evals              = 8005
-f2 RHS fn evals              = 8005
+f1 RHS fn evals              = 8004
+f2 RHS fn evals              = 8004
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0125
 Last step size               = 0.01249999999719619
 Current step size            = 0.0125
-f1 RHS fn evals              = 16001
-f2 RHS fn evals              = 16001
+f1 RHS fn evals              = 16000
+f2 RHS fn evals              = 16000
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00625
 Last step size               = 0.006249999992917305
 Current step size            = 0.00625
-f1 RHS fn evals              = 32001
-f2 RHS fn evals              = 32001
+f1 RHS fn evals              = 32000
+f2 RHS fn evals              = 32000
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.003125
 Last step size               = 1.124078607972478e-11
 Current step size            = 0.003125
-f1 RHS fn evals              = 64005
-f2 RHS fn evals              = 64005
+f1 RHS fn evals              = 64004
+f2 RHS fn evals              = 64004
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0015625
 Last step size               = 2.835776058418557e-11
 Current step size            = 0.0015625
-f1 RHS fn evals              = 128005
-f2 RHS fn evals              = 128005
+f1 RHS fn evals              = 128004
+f2 RHS fn evals              = 128004
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00078125
 Last step size               = 0.0007812499550681189
 Current step size            = 0.00078125
-f1 RHS fn evals              = 256001
-f2 RHS fn evals              = 256001
+f1 RHS fn evals              = 256000
+f2 RHS fn evals              = 256000
 
 Order of accuracy wrt solution:    expected = 4, max = 3.9974,  avg = 3.5943,  overall = 3.7564
 Order of accuracy wrt Hamiltonian: expected = 4, max = 4.2742,  avg = 3.8327,  overall = 3.8935
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out
index a421b8dc9b..78f14dd179 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.1
 Last step size               = 0.0999999999995608
 Current step size            = 0.1
-f1 RHS fn evals              = 3001
-f2 RHS fn evals              = 3001
+f1 RHS fn evals              = 3000
+f2 RHS fn evals              = 3000
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.05
 Last step size               = 0.05
 Current step size            = 0.05
-f1 RHS fn evals              = 6001
-f2 RHS fn evals              = 6001
+f1 RHS fn evals              = 6000
+f2 RHS fn evals              = 6000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.025
 Last step size               = 1.769251412042648e-12
 Current step size            = 0.025
-f1 RHS fn evals              = 12007
-f2 RHS fn evals              = 12007
+f1 RHS fn evals              = 12006
+f2 RHS fn evals              = 12006
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0125
 Last step size               = 0.01249999999719619
 Current step size            = 0.0125
-f1 RHS fn evals              = 24001
-f2 RHS fn evals              = 24001
+f1 RHS fn evals              = 24000
+f2 RHS fn evals              = 24000
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00625
 Last step size               = 0.006249999992917305
 Current step size            = 0.00625
-f1 RHS fn evals              = 48001
-f2 RHS fn evals              = 48001
+f1 RHS fn evals              = 48000
+f2 RHS fn evals              = 48000
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.003125
 Last step size               = 1.124078607972478e-11
 Current step size            = 0.003125
-f1 RHS fn evals              = 96007
-f2 RHS fn evals              = 96007
+f1 RHS fn evals              = 96006
+f2 RHS fn evals              = 96006
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0015625
 Last step size               = 2.835776058418557e-11
 Current step size            = 0.0015625
-f1 RHS fn evals              = 192007
-f2 RHS fn evals              = 192007
+f1 RHS fn evals              = 192006
+f2 RHS fn evals              = 192006
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00078125
 Last step size               = 0.0007812499550681189
 Current step size            = 0.00078125
-f1 RHS fn evals              = 384001
-f2 RHS fn evals              = 384001
+f1 RHS fn evals              = 384000
+f2 RHS fn evals              = 384000
 
 Order of accuracy wrt solution:    expected = 5, max = 5.9898,  avg = 3.4143,  overall = 3.7927
 Order of accuracy wrt Hamiltonian: expected = 5, max = 5.8607,  avg = 3.9728,  overall = 4.4560
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
index b32d0a4fa9..1289fd72b9 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-f1 RHS fn evals              = 100003
-f2 RHS fn evals              = 100003
+f1 RHS fn evals              = 100002
+f2 RHS fn evals              = 100002
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0005
 Last step size               = 0.0004999999432868658
 Current step size            = 0.0005
-f1 RHS fn evals              = 200001
-f2 RHS fn evals              = 200001
+f1 RHS fn evals              = 200000
+f2 RHS fn evals              = 200000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00025
 Last step size               = 0.0002499998522722533
 Current step size            = 0.00025
-f1 RHS fn evals              = 400001
-f2 RHS fn evals              = 400001
+f1 RHS fn evals              = 400000
+f2 RHS fn evals              = 400000
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.000125
 Last step size               = 3.183586727573126e-10
 Current step size            = 0.000125
-f1 RHS fn evals              = 800003
-f2 RHS fn evals              = 800003
+f1 RHS fn evals              = 800002
+f2 RHS fn evals              = 800002
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 6.25e-05
 Last step size               = 7.503473398173804e-10
 Current step size            = 6.25e-05
-f1 RHS fn evals              = 1600003
-f2 RHS fn evals              = 1600003
+f1 RHS fn evals              = 1600002
+f2 RHS fn evals              = 1600002
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 3.125e-05
 Last step size               = 9.66345226061093e-10
 Current step size            = 3.125e-05
-f1 RHS fn evals              = 3200003
-f2 RHS fn evals              = 3200003
+f1 RHS fn evals              = 3200002
+f2 RHS fn evals              = 3200002
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 1.5625e-05
 Last step size               = 1.562198162474714e-05
 Current step size            = 1.5625e-05
-f1 RHS fn evals              = 6400001
-f2 RHS fn evals              = 6400001
+f1 RHS fn evals              = 6400000
+f2 RHS fn evals              = 6400000
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 7.8125e-06
 Last step size               = 7.805897645596353e-06
 Current step size            = 7.8125e-06
-f1 RHS fn evals              = 12800001
-f2 RHS fn evals              = 12800001
+f1 RHS fn evals              = 12800000
+f2 RHS fn evals              = 12800000
 
 Order of accuracy wrt solution:    expected = 2, max = 2.0019,  avg = 1.9630,  overall = 1.9766
 Order of accuracy wrt Hamiltonian: expected = 2, max = 2.0012,  avg = 2.0000,  overall = 2.0001
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_RUTH_3_3_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_RUTH_3_3_--tf_50_--check-order_--nout_1.out
index 28a629e3c0..eca72a0654 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_RUTH_3_3_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_RUTH_3_3_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.1
 Last step size               = 0.0999999999995608
 Current step size            = 0.1
-f1 RHS fn evals              = 1501
-f2 RHS fn evals              = 1501
+f1 RHS fn evals              = 1500
+f2 RHS fn evals              = 1500
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.05
 Last step size               = 0.05
 Current step size            = 0.05
-f1 RHS fn evals              = 3001
-f2 RHS fn evals              = 3001
+f1 RHS fn evals              = 3000
+f2 RHS fn evals              = 3000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.025
 Last step size               = 1.769251412042648e-12
 Current step size            = 0.025
-f1 RHS fn evals              = 6004
-f2 RHS fn evals              = 6004
+f1 RHS fn evals              = 6003
+f2 RHS fn evals              = 6003
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0125
 Last step size               = 0.01249999999719619
 Current step size            = 0.0125
-f1 RHS fn evals              = 12001
-f2 RHS fn evals              = 12001
+f1 RHS fn evals              = 12000
+f2 RHS fn evals              = 12000
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00625
 Last step size               = 0.006249999992917305
 Current step size            = 0.00625
-f1 RHS fn evals              = 24001
-f2 RHS fn evals              = 24001
+f1 RHS fn evals              = 24000
+f2 RHS fn evals              = 24000
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.003125
 Last step size               = 1.124078607972478e-11
 Current step size            = 0.003125
-f1 RHS fn evals              = 48004
-f2 RHS fn evals              = 48004
+f1 RHS fn evals              = 48003
+f2 RHS fn evals              = 48003
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0015625
 Last step size               = 2.835776058418557e-11
 Current step size            = 0.0015625
-f1 RHS fn evals              = 96004
-f2 RHS fn evals              = 96004
+f1 RHS fn evals              = 96003
+f2 RHS fn evals              = 96003
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00078125
 Last step size               = 0.0007812499550681189
 Current step size            = 0.00078125
-f1 RHS fn evals              = 192001
-f2 RHS fn evals              = 192001
+f1 RHS fn evals              = 192000
+f2 RHS fn evals              = 192000
 
 Order of accuracy wrt solution:    expected = 3, max = 4.0232,  avg = 3.9269,  overall = 3.9563
 Order of accuracy wrt Hamiltonian: expected = 3, max = 5.1799,  avg = 3.3283,  overall = 3.1911
diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_YOSHIDA_6_8_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_YOSHIDA_6_8_--tf_50_--check-order_--nout_1.out
index d01c6cbeef..f2651ffd39 100644
--- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_YOSHIDA_6_8_--tf_50_--check-order_--nout_1.out
+++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_YOSHIDA_6_8_--tf_50_--check-order_--nout_1.out
@@ -23,7 +23,7 @@ Inequality constraint fails  = 0
 Initial step size            = 0.001
 Last step size               = 2.582822844487962e-11
 Current step size            = 0.001
-Explicit RHS fn evals        = 400009
+Explicit RHS fn evals        = 400008
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
@@ -54,8 +54,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.1
 Last step size               = 0.0999999999995608
 Current step size            = 0.1
-f1 RHS fn evals              = 4001
-f2 RHS fn evals              = 4001
+f1 RHS fn evals              = 4000
+f2 RHS fn evals              = 4000
 
 
    Begin Kepler Problem
@@ -82,8 +82,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.05
 Last step size               = 0.05
 Current step size            = 0.05
-f1 RHS fn evals              = 8001
-f2 RHS fn evals              = 8001
+f1 RHS fn evals              = 8000
+f2 RHS fn evals              = 8000
 
 
    Begin Kepler Problem
@@ -110,8 +110,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.025
 Last step size               = 1.769251412042648e-12
 Current step size            = 0.025
-f1 RHS fn evals              = 16009
-f2 RHS fn evals              = 16009
+f1 RHS fn evals              = 16008
+f2 RHS fn evals              = 16008
 
 
    Begin Kepler Problem
@@ -138,8 +138,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0125
 Last step size               = 0.01249999999719619
 Current step size            = 0.0125
-f1 RHS fn evals              = 32001
-f2 RHS fn evals              = 32001
+f1 RHS fn evals              = 32000
+f2 RHS fn evals              = 32000
 
 
    Begin Kepler Problem
@@ -166,8 +166,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00625
 Last step size               = 0.006249999992917305
 Current step size            = 0.00625
-f1 RHS fn evals              = 64001
-f2 RHS fn evals              = 64001
+f1 RHS fn evals              = 64000
+f2 RHS fn evals              = 64000
 
 
    Begin Kepler Problem
@@ -194,8 +194,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.003125
 Last step size               = 1.124078607972478e-11
 Current step size            = 0.003125
-f1 RHS fn evals              = 128009
-f2 RHS fn evals              = 128009
+f1 RHS fn evals              = 128008
+f2 RHS fn evals              = 128008
 
 
    Begin Kepler Problem
@@ -222,8 +222,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.0015625
 Last step size               = 2.835776058418557e-11
 Current step size            = 0.0015625
-f1 RHS fn evals              = 256009
-f2 RHS fn evals              = 256009
+f1 RHS fn evals              = 256008
+f2 RHS fn evals              = 256008
 
 
    Begin Kepler Problem
@@ -250,8 +250,8 @@ Inequality constraint fails  = 0
 Initial step size            = 0.00078125
 Last step size               = 0.0007812499550681189
 Current step size            = 0.00078125
-f1 RHS fn evals              = 512001
-f2 RHS fn evals              = 512001
+f1 RHS fn evals              = 512000
+f2 RHS fn evals              = 512000
 
 Order of accuracy wrt solution:    expected = 6, max = 5.9959,  avg = 3.9792,  overall = 4.5039
 Order of accuracy wrt Hamiltonian: expected = 6, max = 6.2667,  avg = 4.6429,  overall = 4.9135
diff --git a/examples/arkode/C_serial/ark_kpr_mri.out b/examples/arkode/C_serial/ark_kpr_mri.out
index 5f8ee0f5d8..e551c2cee3 100644
--- a/examples/arkode/C_serial/ark_kpr_mri.out
+++ b/examples/arkode/C_serial/ark_kpr_mri.out
@@ -66,4 +66,4 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 501, nstf = 50601
    u error = 7.941e-07, v error = 8.255e-08, total error = 5.646e-07
-   Total RHS evals:  Fs = 1504,  Ff = 152306
+   Total RHS evals:  Fs = 1504,  Ff = 151853
diff --git a/examples/arkode/C_serial/ark_kpr_mri_0_0.002.out b/examples/arkode/C_serial/ark_kpr_mri_0_0.002.out
index 4957509c74..ef1ab12278 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_0_0.002.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_0_0.002.out
@@ -65,5 +65,5 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 
 Final Solver Statistics:
    Steps: nsts = 2501, nstf = 252601
-   u error = 4.670e-09, v error = 5.638e-10, total error = 3.327e-09
-   Total RHS evals:  Fs = 7504,  Ff = 760306
+   u error = 4.671e-09, v error = 5.638e-10, total error = 3.327e-09
+   Total RHS evals:  Fs = 7504,  Ff = 757853
diff --git a/examples/arkode/C_serial/ark_kpr_mri_1_0.002.out b/examples/arkode/C_serial/ark_kpr_mri_1_0.002.out
index 40ed2fe4b3..2cb8b8d4ff 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_1_0.002.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_1_0.002.out
@@ -66,4 +66,4 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 2501, nstf = 252601
    u error = 3.156e-13, v error = 1.909e-12, total error = 1.368e-12
-   Total RHS evals:  Fs = 5003,  Ff = 760306
+   Total RHS evals:  Fs = 5003,  Ff = 757853
diff --git a/examples/arkode/C_serial/ark_kpr_mri_3_0.01.out b/examples/arkode/C_serial/ark_kpr_mri_3_0.01.out
index bb74cbef2d..9504b4c524 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_3_0.01.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_3_0.01.out
@@ -65,4 +65,4 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 501, nstf = 50601
    u error = 5.052e-05, v error = 7.684e-04, total error = 5.445e-04
-   Total RHS evals:  Fs = 1504,  Ff = 152306
+   Total RHS evals:  Fs = 1504,  Ff = 151853
diff --git a/examples/arkode/C_serial/ark_kpr_mri_4_0.002.out b/examples/arkode/C_serial/ark_kpr_mri_4_0.002.out
index 5177842335..9f53b0e3b4 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_4_0.002.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_4_0.002.out
@@ -66,7 +66,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 2501, nstf = 250100
    u error = 3.482e-06, v error = 9.535e-04, total error = 6.742e-04
-   Total RHS evals:  Fs = 7143,  Ff = 755303
+   Total RHS evals:  Fs = 7143,  Ff = 750350
    Slow Newton iters = 4641
    Slow Newton conv fails = 0
    Slow Jacobian evals = 126
diff --git a/examples/arkode/C_serial/ark_kpr_mri_5_0.002.out b/examples/arkode/C_serial/ark_kpr_mri_5_0.002.out
index 654cb30f41..1a38aa16e6 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_5_0.002.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_5_0.002.out
@@ -23,47 +23,47 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     1.000000    1.127010    1.691839  1.33e-10  6.94e-11
     1.100000    1.107609    1.000489  1.23e-10  7.12e-11
     1.200000    1.086821    1.677552  1.12e-10  7.21e-11
-    1.300000    1.064777    1.277775  9.90e-11  7.21e-11
+    1.300000    1.064777    1.277775  9.89e-11  7.21e-11
     1.400000    1.041625    1.342455  8.49e-11  7.13e-11
     1.500000    1.017531    1.642940  6.94e-11  6.96e-11
     1.600000    0.992673    1.012112  5.24e-11  6.69e-11
     1.700000    0.967253    1.714058  3.37e-11  6.34e-11
     1.800000    0.941488    1.183867  1.32e-11  5.89e-11
-    1.900000    0.915617    1.437465  9.12e-12  5.33e-11
+    1.900000    0.915617    1.437465  9.11e-12  5.33e-11
     2.000000    0.889903    1.577082  3.33e-11  4.69e-11
-    2.100000    0.864625    1.056467  5.94e-11  3.62e-11
-    2.200000    0.840089    1.730920  8.72e-11  3.20e-11
-    2.300000    0.816616    1.101047  1.16e-10  1.85e-11
-    2.400000    0.794546    1.525051  1.47e-10  1.05e-11
-    2.500000    0.774227    1.496993  1.78e-10  1.19e-12
-    2.600000    0.756013    1.126857  2.08e-10  1.60e-11
-    2.700000    0.740246    1.727536  2.36e-10  2.55e-11
-    2.800000    0.727247    1.038393  2.62e-10  4.36e-11
-    2.900000    0.717301    1.600759  2.83e-10  5.41e-11
-    3.000000    0.710636    1.406380  2.99e-10  6.92e-11
-    3.100000    0.707412    1.214353  3.07e-10  8.37e-11
-    3.200000    0.707709    1.704026  3.08e-10  9.30e-11
+    2.100000    0.864625    1.056467  5.94e-11  3.57e-11
+    2.200000    0.840089    1.730920  8.72e-11  3.22e-11
+    2.300000    0.816616    1.101047  1.16e-10  1.97e-11
+    2.400000    0.794546    1.525051  1.47e-10  7.75e-12
+    2.500000    0.774227    1.496993  1.78e-10  2.45e-12
+    2.600000    0.756013    1.126857  2.08e-10  1.99e-11
+    2.700000    0.740246    1.727536  2.36e-10  2.32e-11
+    2.800000    0.727247    1.038393  2.62e-10  4.19e-11
+    2.900000    0.717301    1.600759  2.83e-10  5.92e-11
+    3.000000    0.710636    1.406380  2.99e-10  6.19e-11
+    3.100000    0.707412    1.214353  3.07e-10  9.20e-11
+    3.200000    0.707709    1.704026  3.08e-10  8.71e-11
     3.300000    0.711520    1.004391  3.02e-10  1.08e-10
-    3.400000    0.718750    1.661225  2.88e-10  1.14e-10
-    3.500000    0.729227    1.310102  2.68e-10  1.23e-10
-    3.600000    0.742712    1.310080  2.43e-10  1.28e-10
-    3.700000    0.758914    1.661237  2.15e-10  1.29e-10
-    3.800000    0.777506    1.004387  1.85e-10  1.34e-10
-    3.900000    0.798144    1.704019  1.54e-10  1.28e-10
-    4.000000    0.820474    1.214374  1.24e-10  1.28e-10
-    4.100000    0.844149    1.406358  9.39e-11  1.22e-10
-    4.200000    0.868832    1.600774  6.55e-11  1.14e-10
-    4.300000    0.894204    1.038382  3.88e-11  1.10e-10
-    4.400000    0.919964    1.727533  1.40e-11  9.70e-11
-    4.500000    0.945834    1.126875  8.93e-12  9.14e-11
-    4.600000    0.971557    1.496974  3.00e-11  7.93e-11
-    4.700000    0.996898    1.525070  4.92e-11  6.88e-11
-    4.800000    1.021641    1.101030  6.67e-11  6.10e-11
-    4.900000    1.045589    1.730922  8.26e-11  4.65e-11
-    5.000000    1.068565    1.056480  9.70e-11  4.02e-11
+    3.400000    0.718750    1.661225  2.88e-10  1.19e-10
+    3.500000    0.729227    1.310102  2.68e-10  1.13e-10
+    3.600000    0.742712    1.310080  2.43e-10  1.41e-10
+    3.700000    0.758914    1.661237  2.15e-10  1.18e-10
+    3.800000    0.777506    1.004387  1.85e-10  1.38e-10
+    3.900000    0.798144    1.704019  1.54e-10  1.31e-10
+    4.000000    0.820474    1.214374  1.24e-10  1.16e-10
+    4.100000    0.844149    1.406358  9.39e-11  1.38e-10
+    4.200000    0.868832    1.600774  6.55e-11  9.88e-11
+    4.300000    0.894204    1.038382  3.88e-11  1.20e-10
+    4.400000    0.919964    1.727533  1.40e-11  9.58e-11
+    4.500000    0.945834    1.126875  8.93e-12  8.01e-11
+    4.600000    0.971557    1.496974  3.00e-11  9.82e-11
+    4.700000    0.996898    1.525070  4.92e-11  4.94e-11
+    4.800000    1.021641    1.101030  6.67e-11  7.79e-11
+    4.900000    1.045589    1.730922  8.26e-11  3.90e-11
+    5.000000    1.068565    1.056480  9.70e-11  3.19e-11
    ------------------------------------------------------
 
 Final Solver Statistics:
    Steps: nsts = 2501, nstf = 250100
-   u error = 1.665e-10, v error = 7.685e-11, total error = 1.296e-10
-   Total RHS evals:  Fs = 12506,  Ff = 1002903
+   u error = 1.665e-10, v error = 7.714e-11, total error = 1.297e-10
+   Total RHS evals:  Fs = 12506,  Ff = 1000450
diff --git a/examples/arkode/C_serial/ark_kpr_mri_6_0.005.out b/examples/arkode/C_serial/ark_kpr_mri_6_0.005.out
index b89492c708..7929d73e39 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_6_0.005.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_6_0.005.out
@@ -33,10 +33,10 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     2.000000    0.889903    1.577082  1.50e-09  1.98e-09
     2.100000    0.864625    1.056467  2.68e-09  1.66e-09
     2.200000    0.840089    1.730920  3.94e-09  1.30e-09
-    2.300000    0.816616    1.101047  5.27e-09  8.99e-10
-    2.400000    0.794546    1.525051  6.65e-09  4.49e-10
-    2.500000    0.774227    1.496993  8.05e-09  4.16e-11
-    2.600000    0.756013    1.126857  9.42e-09  5.71e-10
+    2.300000    0.816616    1.101047  5.27e-09  9.00e-10
+    2.400000    0.794546    1.525051  6.65e-09  4.47e-10
+    2.500000    0.774227    1.496993  8.05e-09  3.94e-11
+    2.600000    0.756013    1.126857  9.42e-09  5.73e-10
     2.700000    0.740246    1.727536  1.07e-08  1.13e-09
     2.800000    0.727247    1.038393  1.19e-08  1.71e-09
     2.900000    0.717301    1.600759  1.29e-08  2.31e-09
@@ -44,13 +44,13 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     3.100000    0.707412    1.214353  1.40e-08  3.46e-09
     3.200000    0.707709    1.704026  1.40e-08  3.98e-09
     3.300000    0.711520    1.004391  1.37e-08  4.45e-09
-    3.400000    0.718750    1.661225  1.31e-08  4.84e-09
+    3.400000    0.718750    1.661225  1.31e-08  4.85e-09
     3.500000    0.729227    1.310102  1.22e-08  5.15e-09
-    3.600000    0.742712    1.310080  1.11e-08  5.37e-09
-    3.700000    0.758914    1.661237  9.81e-09  5.50e-09
+    3.600000    0.742712    1.310080  1.11e-08  5.38e-09
+    3.700000    0.758914    1.661237  9.81e-09  5.49e-09
     3.800000    0.777506    1.004387  8.45e-09  5.53e-09
     3.900000    0.798144    1.704019  7.04e-09  5.47e-09
-    4.000000    0.820474    1.214374  5.64e-09  5.34e-09
+    4.000000    0.820474    1.214374  5.64e-09  5.33e-09
     4.100000    0.844149    1.406358  4.29e-09  5.13e-09
     4.200000    0.868832    1.600774  3.00e-09  4.86e-09
     4.300000    0.894204    1.038382  1.78e-09  4.54e-09
@@ -58,7 +58,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     4.500000    0.945834    1.126875  3.93e-10  3.79e-09
     4.600000    0.971557    1.496974  1.35e-09  3.38e-09
     4.700000    0.996898    1.525070  2.23e-09  2.94e-09
-    4.800000    1.021641    1.101030  3.02e-09  2.50e-09
+    4.800000    1.021641    1.101030  3.02e-09  2.51e-09
     4.900000    1.045589    1.730922  3.75e-09  2.06e-09
     5.000000    1.068565    1.056480  4.40e-09  1.61e-09
    ------------------------------------------------------
@@ -66,4 +66,4 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 1001, nstf = 100100
    u error = 7.569e-09, v error = 3.238e-09, total error = 5.821e-09
-   Total RHS evals:  Fs = 5006,  Ff = 301303
+   Total RHS evals:  Fs = 5006,  Ff = 300350
diff --git a/examples/arkode/C_serial/ark_kpr_mri_7_0.001.out b/examples/arkode/C_serial/ark_kpr_mri_7_0.001.out
index c635bf99a5..460bf53318 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_7_0.001.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_7_0.001.out
@@ -66,7 +66,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
    u error = 3.803e-10, v error = 3.943e-10, total error = 3.874e-10
-   Total RHS evals:  Fs = 45313,  Ff = 1550001
+   Total RHS evals:  Fs = 45313,  Ff = 1530050
    Slow Newton iters = 30312
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_kpr_mri_7_0.001_-100_100_0.5_1.out b/examples/arkode/C_serial/ark_kpr_mri_7_0.001_-100_100_0.5_1.out
index d70f3bcd8a..38dc23acf1 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_7_0.001_-100_100_0.5_1.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_7_0.001_-100_100_0.5_1.out
@@ -27,7 +27,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     1.400000    1.041625    1.342455  1.95e-10  3.59e-10
     1.500000    1.017531    1.642940  1.58e-10  3.46e-10
     1.600000    0.992673    1.012112  1.21e-10  3.37e-10
-    1.700000    0.967253    1.714058  7.80e-11  3.14e-10
+    1.700000    0.967253    1.714058  7.81e-11  3.14e-10
     1.800000    0.941488    1.183867  3.34e-11  2.95e-10
     1.900000    0.915617    1.437465  1.78e-11  2.65e-10
     2.000000    0.889903    1.577082  7.23e-11  2.30e-10
@@ -51,7 +51,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     3.800000    0.777506    1.004387  4.21e-10  6.69e-10
     3.900000    0.798144    1.704019  3.62e-10  6.66e-10
     4.000000    0.820474    1.214374  2.84e-10  6.45e-10
-    4.100000    0.844149    1.406358  3.44e-10  6.14e-10
+    4.100000    0.844149    1.406358  3.43e-10  6.14e-10
     4.200000    0.868832    1.600774  1.51e-10  5.74e-10
     4.300000    0.894204    1.038382  9.08e-11  5.56e-10
     4.400000    0.919964    1.727533  4.15e-11  5.08e-10
@@ -66,7 +66,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
    u error = 3.764e-10, v error = 3.952e-10, total error = 3.859e-10
-   Total RHS evals:  Fs = 35313,  Ff = 1550001
+   Total RHS evals:  Fs = 35313,  Ff = 1530050
    Slow Newton iters = 30312
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_kpr_mri_8_0.001.out b/examples/arkode/C_serial/ark_kpr_mri_8_0.001.out
index 094d1b1024..f96e203514 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_8_0.001.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_8_0.001.out
@@ -25,17 +25,17 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     1.200000    1.086821    1.677552  1.17e-10  1.57e-10
     1.300000    1.064777    1.277775  1.10e-10  1.55e-10
     1.400000    1.041625    1.342455  9.08e-11  1.53e-10
-    1.500000    1.017531    1.642940  6.97e-11  1.52e-10
+    1.500000    1.017531    1.642940  6.96e-11  1.52e-10
     1.600000    0.992673    1.012112  5.33e-11  1.42e-10
     1.700000    0.967253    1.714058  3.20e-11  1.38e-10
     1.800000    0.941488    1.183867  1.63e-11  1.24e-10
     1.900000    0.915617    1.437465  1.06e-11  1.13e-10
     2.000000    0.889903    1.577082  3.61e-11  9.93e-11
     2.100000    0.864625    1.056467  6.56e-11  7.88e-11
-    2.200000    0.840089    1.730920  9.96e-11  6.38e-11
+    2.200000    0.840089    1.730920  9.97e-11  6.38e-11
     2.300000    0.816616    1.101047  1.27e-10  3.80e-11
     2.400000    0.794546    1.525051  1.59e-10  1.69e-11
-    2.500000    0.774227    1.496993  1.88e-10  9.37e-12
+    2.500000    0.774227    1.496993  1.88e-10  9.36e-12
     2.600000    0.756013    1.126857  2.24e-10  3.98e-11
     2.700000    0.740246    1.727536  2.59e-10  6.53e-11
     2.800000    0.727247    1.038393  2.83e-10  1.00e-10
@@ -52,12 +52,12 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     3.900000    0.798144    1.704019  1.58e-10  2.78e-10
     4.000000    0.820474    1.214374  1.33e-10  2.73e-10
     4.100000    0.844149    1.406358  9.74e-11  2.68e-10
-    4.200000    0.868832    1.600774  6.65e-11  2.60e-10
+    4.200000    0.868832    1.600774  6.64e-11  2.60e-10
     4.300000    0.894204    1.038382  3.79e-11  2.21e-10
-    4.400000    0.919964    1.727533  9.38e-12  2.25e-10
+    4.400000    0.919964    1.727533  9.36e-12  2.25e-10
     4.500000    0.945834    1.126875  1.03e-11  1.82e-10
     4.600000    0.971557    1.496974  3.35e-11  1.74e-10
-    4.700000    0.996898    1.525070  5.02e-11  1.52e-10
+    4.700000    0.996898    1.525070  5.03e-11  1.52e-10
     4.800000    1.021641    1.101030  7.16e-11  1.11e-10
     4.900000    1.045589    1.730922  9.30e-11  1.12e-10
     5.000000    1.068565    1.056480  1.05e-10  6.39e-11
@@ -66,7 +66,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
    u error = 1.795e-10, v error = 1.678e-10, total error = 1.737e-10
-   Total RHS evals:  Fse = 20001, Fsi = 50342,  Ff = 1550001
+   Total RHS evals:  Fse = 20001, Fsi = 50342,  Ff = 1530050
    Slow Newton iters = 30341
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_kpr_mri_8_0.001_-100_100_0.5_1.out b/examples/arkode/C_serial/ark_kpr_mri_8_0.001_-100_100_0.5_1.out
index 2d69932a6a..f9d68539de 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_8_0.001_-100_100_0.5_1.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_8_0.001_-100_100_0.5_1.out
@@ -54,8 +54,8 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     4.100000    0.844149    1.406358  9.48e-11  2.67e-10
     4.200000    0.868832    1.600774  6.42e-11  2.59e-10
     4.300000    0.894204    1.038382  3.58e-11  2.20e-10
-    4.400000    0.919964    1.727533  9.15e-12  2.25e-10
-    4.500000    0.945834    1.126875  1.30e-11  1.82e-10
+    4.400000    0.919964    1.727533  9.16e-12  2.25e-10
+    4.500000    0.945834    1.126875  1.29e-11  1.82e-10
     4.600000    0.971557    1.496974  3.55e-11  1.73e-10
     4.700000    0.996898    1.525070  5.41e-11  1.52e-10
     4.800000    1.021641    1.101030  7.39e-11  1.11e-10
@@ -66,7 +66,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
    u error = 1.860e-10, v error = 1.672e-10, total error = 1.769e-10
-   Total RHS evals:  Fse = 20001, Fsi = 35342,  Ff = 1550001
+   Total RHS evals:  Fse = 20001, Fsi = 35342,  Ff = 1530050
    Slow Newton iters = 30341
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out b/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out
index 0d0c029141..8da07cba27 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out
@@ -11,62 +11,62 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
         t           u           v       uerr      verr
    ------------------------------------------------------
     0.000000    1.224745    1.732051  0.00e+00  0.00e+00
-    0.100000    1.223725    1.077464  1.63e-11  6.37e-13
+    0.100000    1.223725    1.077464  1.63e-11  6.38e-13
     0.200000    1.220669    1.551800  1.60e-11  6.83e-13
     0.300000    1.215594    1.467737  1.52e-11  9.61e-13
-    0.400000    1.208524    1.154583  1.51e-11  9.21e-13
-    0.500000    1.199496    1.721908  1.60e-11  1.72e-12
+    0.400000    1.208524    1.154583  1.51e-11  9.22e-13
+    0.500000    1.199496    1.721908  1.60e-11  1.73e-12
     0.600000    1.188557    1.023517  1.48e-11  3.43e-12
     0.700000    1.175764    1.622751  1.36e-11  2.17e-12
     0.800000    1.161186    1.374632  1.23e-11  2.77e-12
-    0.900000    1.144904    1.245763  1.13e-11  3.12e-12
-    1.000000    1.127010    1.691839  1.30e-11  2.17e-12
-    1.100000    1.107609    1.000489  1.11e-11  1.99e-12
-    1.200000    1.086821    1.677552  9.53e-12  2.46e-12
-    1.300000    1.064777    1.277775  7.58e-12  8.15e-14
-    1.400000    1.041625    1.342455  5.18e-12  6.19e-13
-    1.500000    1.017531    1.642940  6.00e-12  2.62e-12
-    1.600000    0.992673    1.012112  3.78e-12  1.37e-12
-    1.700000    0.967253    1.714058  3.29e-12  3.05e-12
-    1.800000    0.941488    1.183867  2.33e-13  3.64e-13
-    1.900000    0.915617    1.437465  3.31e-12  1.16e-12
-    2.000000    0.889903    1.577082  6.58e-12  1.93e-12
-    2.100000    0.864625    1.056467  7.90e-12  1.61e-12
-    2.200000    0.840089    1.730920  6.75e-12  2.46e-12
-    2.300000    0.816616    1.101047  1.18e-11  1.79e-12
-    2.400000    0.794546    1.525051  1.53e-11  5.67e-13
-    2.500000    0.774227    1.496993  1.85e-11  6.68e-14
-    2.600000    0.756013    1.126857  2.18e-11  2.74e-12
-    2.700000    0.740246    1.727536  2.05e-11  7.31e-13
-    2.800000    0.727247    1.038393  2.46e-11  4.05e-12
-    2.900000    0.717301    1.600759  2.68e-11  9.31e-13
-    3.000000    0.710636    1.406380  2.78e-11  2.59e-12
-    3.100000    0.707412    1.214353  2.85e-11  4.24e-12
-    3.200000    0.707709    1.704026  2.85e-11  1.49e-12
-    3.300000    0.711520    1.004391  2.77e-11  6.31e-12
-    3.400000    0.718750    1.661225  2.60e-11  2.42e-12
-    3.500000    0.729227    1.310102  2.41e-11  4.83e-12
-    3.600000    0.742712    1.310080  2.08e-11  5.02e-12
-    3.700000    0.758914    1.661237  1.99e-11  2.84e-12
-    3.800000    0.777506    1.004387  1.62e-11  7.00e-12
-    3.900000    0.798144    1.704019  1.39e-11  2.46e-12
-    4.000000    0.820474    1.214374  1.04e-11  5.40e-12
-    4.100000    0.844149    1.406358  6.45e-12  8.29e-12
-    4.200000    0.868832    1.600774  3.62e-12  1.13e-11
-    4.300000    0.894204    1.038382  1.62e-12  2.54e-13
-    4.400000    0.919964    1.727533  2.31e-12  1.24e-11
-    4.500000    0.945834    1.126875  2.27e-12  7.51e-13
-    4.600000    0.971557    1.496974  5.17e-12  6.90e-12
-    4.700000    0.996898    1.525070  8.51e-12  6.90e-12
-    4.800000    1.021641    1.101030  8.53e-12  1.57e-12
-    4.900000    1.045589    1.730922  6.09e-12  9.55e-12
-    5.000000    1.068565    1.056480  9.98e-12  3.37e-12
+    0.900000    1.144904    1.245763  1.12e-11  3.13e-12
+    1.000000    1.127010    1.691839  1.31e-11  2.17e-12
+    1.100000    1.107609    1.000489  1.11e-11  2.12e-12
+    1.200000    1.086821    1.677552  9.50e-12  1.93e-12
+    1.300000    1.064777    1.277775  7.58e-12  1.91e-12
+    1.400000    1.041625    1.342455  5.18e-12  2.57e-12
+    1.500000    1.017531    1.642940  6.04e-12  5.82e-12
+    1.600000    0.992673    1.012112  3.77e-12  3.35e-12
+    1.700000    0.967253    1.714058  3.32e-12  2.74e-12
+    1.800000    0.941488    1.183867  2.38e-13  3.75e-12
+    1.900000    0.915617    1.437465  3.30e-12  5.77e-12
+    2.000000    0.889903    1.577082  6.57e-12  8.88e-12
+    2.100000    0.864625    1.056467  7.88e-12  7.37e-12
+    2.200000    0.840089    1.730920  6.75e-12  4.53e-12
+    2.300000    0.816616    1.101047  1.18e-11  3.00e-12
+    2.400000    0.794546    1.525051  1.53e-11  8.93e-12
+    2.500000    0.774227    1.496993  1.85e-11  1.08e-11
+    2.600000    0.756013    1.126857  2.18e-11  1.35e-11
+    2.700000    0.740246    1.727536  2.05e-11  6.87e-12
+    2.800000    0.727247    1.038393  2.46e-11  7.76e-13
+    2.900000    0.717301    1.600759  2.68e-11  1.11e-11
+    3.000000    0.710636    1.406380  2.78e-11  1.14e-11
+    3.100000    0.707412    1.214353  2.85e-11  2.04e-11
+    3.200000    0.707709    1.704026  2.85e-11  9.74e-12
+    3.300000    0.711520    1.004391  2.77e-11  7.12e-12
+    3.400000    0.718750    1.661225  2.60e-11  1.06e-11
+    3.500000    0.729227    1.310102  2.41e-11  1.14e-11
+    3.600000    0.742712    1.310080  2.08e-11  2.60e-11
+    3.700000    0.758914    1.661237  1.99e-11  1.39e-11
+    3.800000    0.777506    1.004387  1.62e-11  1.43e-11
+    3.900000    0.798144    1.704019  1.39e-11  5.96e-12
+    4.000000    0.820474    1.214374  1.04e-11  1.12e-11
+    4.100000    0.844149    1.406358  6.45e-12  2.95e-11
+    4.200000    0.868832    1.600774  3.65e-12  5.01e-12
+    4.300000    0.894204    1.038382  1.63e-12  9.96e-12
+    4.400000    0.919964    1.727533  2.33e-12  1.06e-11
+    4.500000    0.945834    1.126875  2.28e-12  5.45e-12
+    4.600000    0.971557    1.496974  5.15e-12  1.52e-11
+    4.700000    0.996898    1.525070  8.52e-12  7.66e-13
+    4.800000    1.021641    1.101030  8.55e-12  1.92e-12
+    4.900000    1.045589    1.730922  6.11e-12  8.80e-12
+    5.000000    1.068565    1.056480  9.97e-12  3.37e-12
    ------------------------------------------------------
 
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
-   u error = 1.532e-11, v error = 4.194e-12, total error = 1.123e-11
-   Total RHS evals:  Fse = 30001, Fsi = 82555,  Ff = 2070001
+   u error = 1.532e-11, v error = 9.496e-12, total error = 1.274e-11
+   Total RHS evals:  Fse = 30001, Fsi = 82555,  Ff = 2040050
    Slow Newton iters = 52554
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_kpr_mri_9_0.001_-100_100_0.5_1.out b/examples/arkode/C_serial/ark_kpr_mri_9_0.001_-100_100_0.5_1.out
index 3ca62f46fd..a227a0db6a 100644
--- a/examples/arkode/C_serial/ark_kpr_mri_9_0.001_-100_100_0.5_1.out
+++ b/examples/arkode/C_serial/ark_kpr_mri_9_0.001_-100_100_0.5_1.out
@@ -11,7 +11,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
         t           u           v       uerr      verr
    ------------------------------------------------------
     0.000000    1.224745    1.732051  0.00e+00  0.00e+00
-    0.100000    1.223725    1.077464  1.63e-11  6.37e-13
+    0.100000    1.223725    1.077464  1.64e-11  6.38e-13
     0.200000    1.220669    1.551800  1.61e-11  6.85e-13
     0.300000    1.215594    1.467737  1.58e-11  9.70e-13
     0.400000    1.208524    1.154583  1.55e-11  9.37e-13
@@ -19,54 +19,54 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     0.600000    1.188557    1.023517  1.50e-11  3.45e-12
     0.700000    1.175764    1.622751  1.40e-11  2.20e-12
     0.800000    1.161186    1.374632  1.20e-11  2.83e-12
-    0.900000    1.144904    1.245763  1.22e-11  3.18e-12
+    0.900000    1.144904    1.245763  1.23e-11  3.18e-12
     1.000000    1.127010    1.691839  1.28e-11  2.23e-12
-    1.100000    1.107609    1.000489  1.13e-11  1.92e-12
-    1.200000    1.086821    1.677552  9.93e-12  2.55e-12
-    1.300000    1.064777    1.277775  7.67e-12  1.72e-13
-    1.400000    1.041625    1.342455  6.64e-12  7.05e-13
-    1.500000    1.017531    1.642940  6.42e-12  2.73e-12
-    1.600000    0.992673    1.012112  4.49e-12  1.25e-12
-    1.700000    0.967253    1.714058  3.11e-12  3.19e-12
-    1.800000    0.941488    1.183867  5.46e-14  2.23e-13
-    1.900000    0.915617    1.437465  1.89e-12  1.29e-12
-    2.000000    0.889903    1.577082  4.66e-12  2.09e-12
-    2.100000    0.864625    1.056467  6.54e-12  1.44e-12
-    2.200000    0.840089    1.730920  7.40e-12  2.63e-12
-    2.300000    0.816616    1.101047  1.16e-11  1.62e-12
-    2.400000    0.794546    1.525051  1.48e-11  7.29e-13
-    2.500000    0.774227    1.496993  1.92e-11  2.39e-13
-    2.600000    0.756013    1.126857  2.04e-11  2.58e-12
-    2.700000    0.740246    1.727536  2.11e-11  8.85e-13
-    2.800000    0.727247    1.038393  2.44e-11  3.90e-12
-    2.900000    0.717301    1.600759  2.66e-11  7.90e-13
-    3.000000    0.710636    1.406380  2.78e-11  2.46e-12
-    3.100000    0.707412    1.214353  2.84e-11  4.12e-12
-    3.200000    0.707709    1.704026  2.84e-11  1.38e-12
-    3.300000    0.711520    1.004391  2.77e-11  6.21e-12
-    3.400000    0.718750    1.661225  2.61e-11  2.34e-12
-    3.500000    0.729227    1.310102  2.42e-11  4.77e-12
-    3.600000    0.742712    1.310080  2.16e-11  4.95e-12
-    3.700000    0.758914    1.661237  1.99e-11  2.79e-12
-    3.800000    0.777506    1.004387  1.67e-11  6.97e-12
-    3.900000    0.798144    1.704019  1.39e-11  2.45e-12
-    4.000000    0.820474    1.214374  1.05e-11  5.41e-12
-    4.100000    0.844149    1.406358  7.58e-12  8.30e-12
-    4.200000    0.868832    1.600774  5.05e-12  1.14e-11
-    4.300000    0.894204    1.038382  2.82e-12  3.26e-13
-    4.400000    0.919964    1.727533  1.81e-12  1.24e-11
-    4.500000    0.945834    1.126875  1.90e-12  8.41e-13
-    4.600000    0.971557    1.496974  3.74e-12  6.99e-12
-    4.700000    0.996898    1.525070  5.90e-12  7.03e-12
-    4.800000    1.021641    1.101030  7.15e-12  1.43e-12
-    4.900000    1.045589    1.730922  6.82e-12  9.68e-12
-    5.000000    1.068565    1.056480  9.36e-12  3.23e-12
+    1.100000    1.107609    1.000489  1.13e-11  2.05e-12
+    1.200000    1.086821    1.677552  9.92e-12  2.03e-12
+    1.300000    1.064777    1.277775  7.66e-12  2.00e-12
+    1.400000    1.041625    1.342455  6.65e-12  2.48e-12
+    1.500000    1.017531    1.642940  6.42e-12  5.92e-12
+    1.600000    0.992673    1.012112  4.49e-12  3.23e-12
+    1.700000    0.967253    1.714058  3.11e-12  2.87e-12
+    1.800000    0.941488    1.183867  5.85e-14  3.89e-12
+    1.900000    0.915617    1.437465  1.88e-12  5.63e-12
+    2.000000    0.889903    1.577082  4.65e-12  9.04e-12
+    2.100000    0.864625    1.056467  6.53e-12  7.20e-12
+    2.200000    0.840089    1.730920  7.39e-12  4.70e-12
+    2.300000    0.816616    1.101047  1.16e-11  3.16e-12
+    2.400000    0.794546    1.525051  1.48e-11  8.77e-12
+    2.500000    0.774227    1.496993  1.92e-11  1.10e-11
+    2.600000    0.756013    1.126857  2.04e-11  1.34e-11
+    2.700000    0.740246    1.727536  2.11e-11  7.02e-12
+    2.800000    0.727247    1.038393  2.44e-11  6.36e-13
+    2.900000    0.717301    1.600759  2.66e-11  1.09e-11
+    3.000000    0.710636    1.406380  2.78e-11  1.16e-11
+    3.100000    0.707412    1.214353  2.84e-11  2.03e-11
+    3.200000    0.707709    1.704026  2.84e-11  9.85e-12
+    3.300000    0.711520    1.004391  2.77e-11  7.02e-12
+    3.400000    0.718750    1.661225  2.61e-11  1.05e-11
+    3.500000    0.729227    1.310102  2.42e-11  1.14e-11
+    3.600000    0.742712    1.310080  2.16e-11  2.60e-11
+    3.700000    0.758914    1.661237  1.99e-11  1.39e-11
+    3.800000    0.777506    1.004387  1.67e-11  1.43e-11
+    3.900000    0.798144    1.704019  1.39e-11  5.96e-12
+    4.000000    0.820474    1.214374  1.05e-11  1.12e-11
+    4.100000    0.844149    1.406358  7.58e-12  2.96e-11
+    4.200000    0.868832    1.600774  5.04e-12  4.97e-12
+    4.300000    0.894204    1.038382  2.82e-12  1.00e-11
+    4.400000    0.919964    1.727533  1.81e-12  1.06e-11
+    4.500000    0.945834    1.126875  1.89e-12  5.36e-12
+    4.600000    0.971557    1.496974  3.73e-12  1.53e-11
+    4.700000    0.996898    1.525070  5.90e-12  8.98e-13
+    4.800000    1.021641    1.101030  7.16e-12  2.06e-12
+    4.900000    1.045589    1.730922  6.81e-12  8.94e-12
+    5.000000    1.068565    1.056480  9.34e-12  3.23e-12
    ------------------------------------------------------
 
 Final Solver Statistics:
    Steps: nsts = 5000, nstf = 510000
-   u error = 1.533e-11, v error = 4.203e-12, total error = 1.124e-11
-   Total RHS evals:  Fse = 30001, Fsi = 57555,  Ff = 2070001
+   u error = 1.533e-11, v error = 9.500e-12, total error = 1.275e-11
+   Total RHS evals:  Fse = 30001, Fsi = 57555,  Ff = 2040050
    Slow Newton iters = 52554
    Slow Newton conv fails = 0
    Slow Jacobian evals = 250
diff --git a/examples/arkode/C_serial/ark_onewaycouple_mri.out b/examples/arkode/C_serial/ark_onewaycouple_mri.out
index 99d72a08ca..3769f0e775 100644
--- a/examples/arkode/C_serial/ark_onewaycouple_mri.out
+++ b/examples/arkode/C_serial/ark_onewaycouple_mri.out
@@ -20,4 +20,4 @@ One way coupling ODE test problem:
 
 Final Solver Statistics:
    Steps: nsts = 1000, nstf = 12000
-   Total RHS evals:  Fs = 3001,  Ff = 49002
+   Total RHS evals:  Fs = 3001,  Ff = 36010
diff --git a/examples/arkode/C_serial/ark_reaction_diffusion_mri.out b/examples/arkode/C_serial/ark_reaction_diffusion_mri.out
index 52fcbe0fad..f8cd47dfdc 100644
--- a/examples/arkode/C_serial/ark_reaction_diffusion_mri.out
+++ b/examples/arkode/C_serial/ark_reaction_diffusion_mri.out
@@ -68,7 +68,7 @@ Inequality constraint fails  = 0
 Initial step size            = 2e-05
 Last step size               = 9.999999998289147e-06
 Current step size            = 2e-05
-Explicit RHS fn evals        = 615207
+Explicit RHS fn evals        = 459183
 Implicit RHS fn evals        = 0
 NLS iters                    = 0
 NLS fails                    = 0
diff --git a/examples/arkode/C_serial/ark_robertson.out b/examples/arkode/C_serial/ark_robertson.out
index 1aea595ee5..f4774b096c 100644
--- a/examples/arkode/C_serial/ark_robertson.out
+++ b/examples/arkode/C_serial/ark_robertson.out
@@ -4,127 +4,127 @@ Robertson ODE test problem:
         t           u           v           w
    --------------------------------------------------
    0.000e+00   1.00000e+00   0.00000e+00   0.00000e+00
-   1.000e+09   2.08324e-06   8.34276e-12   9.99998e-01
-   2.000e+09   1.04164e-06   4.17283e-12   9.99999e-01
-   3.000e+09   6.94437e-07   2.78375e-12   9.99999e-01
-   4.000e+09   5.20830e-07   2.05394e-12   9.99999e-01
-   5.000e+09   4.16667e-07   1.66756e-12   1.00000e+00
-   6.000e+09   3.47220e-07   1.38545e-12   1.00000e+00
-   7.000e+09   2.97617e-07   1.17655e-12   1.00000e+00
-   8.000e+09   2.60409e-07   1.02537e-12   1.00000e+00
-   9.000e+09   2.31480e-07   9.41190e-13   1.00000e+00
-   1.000e+10   2.08335e-07   8.36764e-13   1.00000e+00
-   1.100e+10   1.89395e-07   7.64332e-13   1.00000e+00
-   1.200e+10   1.73606e-07   6.70149e-13   1.00000e+00
-   1.300e+10   1.60258e-07   6.41057e-13   1.00000e+00
-   1.400e+10   1.48808e-07   6.17193e-13   1.00000e+00
-   1.500e+10   1.38890e-07   5.48220e-13   1.00000e+00
-   1.600e+10   1.30203e-07   4.86507e-13   1.00000e+00
-   1.700e+10   1.22547e-07   4.67931e-13   1.00000e+00
-   1.800e+10   1.15742e-07   4.70245e-13   1.00000e+00
-   1.900e+10   1.09647e-07   4.55585e-13   1.00000e+00
-   2.000e+10   1.04167e-07   4.24475e-13   1.00000e+00
-   2.100e+10   9.92072e-08   3.90746e-13   1.00000e+00
-   2.200e+10   9.46966e-08   3.68978e-13   1.00000e+00
-   2.300e+10   9.05806e-08   3.58503e-13   1.00000e+00
-   2.400e+10   8.68057e-08   3.53926e-13   1.00000e+00
-   2.500e+10   8.33309e-08   3.44650e-13   1.00000e+00
-   2.600e+10   8.01259e-08   3.30901e-13   1.00000e+00
-   2.700e+10   7.71607e-08   3.13931e-13   1.00000e+00
-   2.800e+10   7.44057e-08   2.95253e-13   1.00000e+00
-   2.900e+10   7.18388e-08   2.78961e-13   1.00000e+00
-   3.000e+10   6.94438e-08   2.67061e-13   1.00000e+00
-   3.100e+10   6.72046e-08   2.60762e-13   1.00000e+00
-   3.200e+10   6.51052e-08   2.61201e-13   1.00000e+00
-   3.300e+10   6.31308e-08   2.61658e-13   1.00000e+00
-   3.400e+10   6.12720e-08   2.57843e-13   1.00000e+00
-   3.500e+10   5.95204e-08   2.50778e-13   1.00000e+00
-   3.600e+10   5.78677e-08   2.41487e-13   1.00000e+00
-   3.700e+10   5.63054e-08   2.30992e-13   1.00000e+00
-   3.800e+10   5.48254e-08   2.20317e-13   1.00000e+00
-   3.900e+10   5.34196e-08   2.10724e-13   1.00000e+00
-   4.000e+10   5.20833e-08   2.03599e-13   1.00000e+00
-   4.100e+10   5.08123e-08   1.98476e-13   1.00000e+00
-   4.200e+10   4.96023e-08   1.94720e-13   1.00000e+00
-   4.300e+10   4.84493e-08   1.91698e-13   1.00000e+00
-   4.400e+10   4.73490e-08   1.88774e-13   1.00000e+00
-   4.500e+10   4.62972e-08   1.85299e-13   1.00000e+00
-   4.600e+10   4.52907e-08   1.78904e-13   1.00000e+00
-   4.700e+10   4.43271e-08   1.74761e-13   1.00000e+00
-   4.800e+10   4.34036e-08   1.75489e-13   1.00000e+00
-   4.900e+10   4.25178e-08   1.67760e-13   1.00000e+00
-   5.000e+10   4.16674e-08   1.68504e-13   1.00000e+00
-   5.100e+10   4.08503e-08   1.72673e-13   1.00000e+00
-   5.200e+10   4.00645e-08   1.71906e-13   1.00000e+00
-   5.300e+10   3.93085e-08   1.67608e-13   1.00000e+00
-   5.400e+10   3.85807e-08   1.61181e-13   1.00000e+00
-   5.500e+10   3.78794e-08   1.54027e-13   1.00000e+00
-   5.600e+10   3.72030e-08   1.47521e-13   1.00000e+00
-   5.700e+10   3.65500e-08   1.42263e-13   1.00000e+00
-   5.800e+10   3.59194e-08   1.38124e-13   1.00000e+00
-   5.900e+10   3.53102e-08   1.34960e-13   1.00000e+00
-   6.000e+10   3.47215e-08   1.32628e-13   1.00000e+00
-   6.100e+10   3.41523e-08   1.30983e-13   1.00000e+00
-   6.200e+10   3.36017e-08   1.29882e-13   1.00000e+00
-   6.300e+10   3.30688e-08   1.29180e-13   1.00000e+00
-   6.400e+10   3.25525e-08   1.28734e-13   1.00000e+00
-   6.500e+10   3.20519e-08   1.28399e-13   1.00000e+00
-   6.600e+10   3.15661e-08   1.28511e-13   1.00000e+00
-   6.700e+10   3.10945e-08   1.29667e-13   1.00000e+00
-   6.800e+10   3.06366e-08   1.31575e-13   1.00000e+00
-   6.900e+10   3.01919e-08   1.33923e-13   1.00000e+00
-   7.000e+10   2.97600e-08   1.36404e-13   1.00000e+00
-   7.100e+10   2.93405e-08   1.38706e-13   1.00000e+00
-   7.200e+10   2.89328e-08   1.40520e-13   1.00000e+00
-   7.300e+10   2.85365e-08   1.41536e-13   1.00000e+00
-   7.400e+10   2.81511e-08   1.41445e-13   1.00000e+00
-   7.500e+10   2.77762e-08   1.39937e-13   1.00000e+00
-   7.600e+10   2.74113e-08   1.36702e-13   1.00000e+00
-   7.700e+10   2.70559e-08   1.31431e-13   1.00000e+00
-   7.800e+10   2.67096e-08   1.23813e-13   1.00000e+00
-   7.900e+10   2.63719e-08   1.13538e-13   1.00000e+00
-   8.000e+10   2.60423e-08   1.00933e-13   1.00000e+00
-   8.100e+10   2.57208e-08   9.31863e-14   1.00000e+00
-   8.200e+10   2.54071e-08   9.21249e-14   1.00000e+00
-   8.300e+10   2.51010e-08   9.73996e-14   1.00000e+00
-   8.400e+10   2.48022e-08   1.03740e-13   1.00000e+00
-   8.500e+10   2.45104e-08   1.01400e-13   1.00000e+00
-   8.600e+10   2.42254e-08   9.65651e-14   1.00000e+00
-   8.700e+10   2.39469e-08   9.61320e-14   1.00000e+00
-   8.800e+10   2.36747e-08   9.68559e-14   1.00000e+00
-   8.900e+10   2.34087e-08   9.44562e-14   1.00000e+00
-   9.000e+10   2.31485e-08   9.00151e-14   1.00000e+00
-   9.100e+10   2.28941e-08   8.46151e-14   1.00000e+00
-   9.200e+10   2.26453e-08   7.93387e-14   1.00000e+00
-   9.300e+10   2.24018e-08   7.52684e-14   1.00000e+00
-   9.400e+10   2.21635e-08   7.34866e-14   1.00000e+00
-   9.500e+10   2.19303e-08   7.50757e-14   1.00000e+00
-   9.600e+10   2.17019e-08   8.11182e-14   1.00000e+00
-   9.700e+10   2.14781e-08   9.01508e-14   1.00000e+00
-   9.800e+10   2.12589e-08   9.22475e-14   1.00000e+00
-   9.900e+10   2.10442e-08   8.92813e-14   1.00000e+00
-   1.000e+11   2.08338e-08   8.47365e-14   1.00000e+00
+   1.000e+09   2.08319e-06   8.28673e-12   9.99998e-01
+   2.000e+09   1.04165e-06   4.16315e-12   9.99999e-01
+   3.000e+09   6.94436e-07   2.79812e-12   9.99999e-01
+   4.000e+09   5.20822e-07   2.09671e-12   9.99999e-01
+   5.000e+09   4.16653e-07   1.65358e-12   1.00000e+00
+   6.000e+09   3.47215e-07   1.38790e-12   1.00000e+00
+   7.000e+09   2.97617e-07   1.19569e-12   1.00000e+00
+   8.000e+09   2.60418e-07   1.03823e-12   1.00000e+00
+   9.000e+09   2.31478e-07   9.17074e-13   1.00000e+00
+   1.000e+10   2.08331e-07   8.40189e-13   1.00000e+00
+   1.100e+10   1.89393e-07   7.61696e-13   1.00000e+00
+   1.200e+10   1.73605e-07   6.83245e-13   1.00000e+00
+   1.300e+10   1.60257e-07   6.52283e-13   1.00000e+00
+   1.400e+10   1.48808e-07   6.03096e-13   1.00000e+00
+   1.500e+10   1.38890e-07   5.53757e-13   1.00000e+00
+   1.600e+10   1.30208e-07   5.02107e-13   1.00000e+00
+   1.700e+10   1.22550e-07   5.05848e-13   1.00000e+00
+   1.800e+10   1.15741e-07   4.81445e-13   1.00000e+00
+   1.900e+10   1.09650e-07   4.30685e-13   1.00000e+00
+   2.000e+10   1.04164e-07   4.00365e-13   1.00000e+00
+   2.100e+10   9.92051e-08   3.87356e-13   1.00000e+00
+   2.200e+10   9.46982e-08   3.79643e-13   1.00000e+00
+   2.300e+10   9.05793e-08   3.59181e-13   1.00000e+00
+   2.400e+10   8.68052e-08   3.35291e-13   1.00000e+00
+   2.500e+10   8.33344e-08   3.30550e-13   1.00000e+00
+   2.600e+10   8.01274e-08   3.33613e-13   1.00000e+00
+   2.700e+10   7.71569e-08   3.13668e-13   1.00000e+00
+   2.800e+10   7.44011e-08   2.86383e-13   1.00000e+00
+   2.900e+10   7.18380e-08   2.67839e-13   1.00000e+00
+   3.000e+10   6.94456e-08   2.74115e-13   1.00000e+00
+   3.100e+10   6.72046e-08   2.89954e-13   1.00000e+00
+   3.200e+10   6.51032e-08   2.82625e-13   1.00000e+00
+   3.300e+10   6.31303e-08   2.63498e-13   1.00000e+00
+   3.400e+10   6.12746e-08   2.44356e-13   1.00000e+00
+   3.500e+10   5.95249e-08   2.36979e-13   1.00000e+00
+   3.600e+10   5.78710e-08   2.38699e-13   1.00000e+00
+   3.700e+10   5.63063e-08   2.34238e-13   1.00000e+00
+   3.800e+10   5.48245e-08   2.25989e-13   1.00000e+00
+   3.900e+10   5.34192e-08   2.16535e-13   1.00000e+00
+   4.000e+10   5.20842e-08   2.08459e-13   1.00000e+00
+   4.100e+10   5.08134e-08   2.01687e-13   1.00000e+00
+   4.200e+10   4.96024e-08   1.93815e-13   1.00000e+00
+   4.300e+10   4.84479e-08   1.85739e-13   1.00000e+00
+   4.400e+10   4.73465e-08   1.78395e-13   1.00000e+00
+   4.500e+10   4.62947e-08   1.72720e-13   1.00000e+00
+   4.600e+10   4.52893e-08   1.69648e-13   1.00000e+00
+   4.700e+10   4.43267e-08   1.70114e-13   1.00000e+00
+   4.800e+10   4.34036e-08   1.74964e-13   1.00000e+00
+   4.900e+10   4.25175e-08   1.78828e-13   1.00000e+00
+   5.000e+10   4.16666e-08   1.78796e-13   1.00000e+00
+   5.100e+10   4.08492e-08   1.75793e-13   1.00000e+00
+   5.200e+10   4.00636e-08   1.70743e-13   1.00000e+00
+   5.300e+10   3.93079e-08   1.64571e-13   1.00000e+00
+   5.400e+10   3.85805e-08   1.58202e-13   1.00000e+00
+   5.500e+10   3.78794e-08   1.52559e-13   1.00000e+00
+   5.600e+10   3.72031e-08   1.48433e-13   1.00000e+00
+   5.700e+10   3.65504e-08   1.45182e-13   1.00000e+00
+   5.800e+10   3.59202e-08   1.42852e-13   1.00000e+00
+   5.900e+10   3.53114e-08   1.42011e-13   1.00000e+00
+   6.000e+10   3.47228e-08   1.43770e-13   1.00000e+00
+   6.100e+10   3.41536e-08   1.42505e-13   1.00000e+00
+   6.200e+10   3.36028e-08   1.31615e-13   1.00000e+00
+   6.300e+10   3.30693e-08   1.21361e-13   1.00000e+00
+   6.400e+10   3.25524e-08   1.16679e-13   1.00000e+00
+   6.500e+10   3.20514e-08   1.16007e-13   1.00000e+00
+   6.600e+10   3.15658e-08   1.17783e-13   1.00000e+00
+   6.700e+10   3.10947e-08   1.20445e-13   1.00000e+00
+   6.800e+10   3.06376e-08   1.22430e-13   1.00000e+00
+   6.900e+10   3.01937e-08   1.22179e-13   1.00000e+00
+   7.000e+10   2.97624e-08   1.18554e-13   1.00000e+00
+   7.100e+10   2.93432e-08   1.19564e-13   1.00000e+00
+   7.200e+10   2.89357e-08   1.20819e-13   1.00000e+00
+   7.300e+10   2.85393e-08   1.12238e-13   1.00000e+00
+   7.400e+10   2.81536e-08   1.08409e-13   1.00000e+00
+   7.500e+10   2.77782e-08   1.11242e-13   1.00000e+00
+   7.600e+10   2.74127e-08   1.08952e-13   1.00000e+00
+   7.700e+10   2.70567e-08   1.02106e-13   1.00000e+00
+   7.800e+10   2.67098e-08   1.03189e-13   1.00000e+00
+   7.900e+10   2.63717e-08   1.10597e-13   1.00000e+00
+   8.000e+10   2.60421e-08   1.05448e-13   1.00000e+00
+   8.100e+10   2.57206e-08   1.03702e-13   1.00000e+00
+   8.200e+10   2.54069e-08   1.04168e-13   1.00000e+00
+   8.300e+10   2.51008e-08   1.00603e-13   1.00000e+00
+   8.400e+10   2.48020e-08   9.77251e-14   1.00000e+00
+   8.500e+10   2.45102e-08   9.82338e-14   1.00000e+00
+   8.600e+10   2.42252e-08   9.64282e-14   1.00000e+00
+   8.700e+10   2.39467e-08   9.59624e-14   1.00000e+00
+   8.800e+10   2.36746e-08   9.45243e-14   1.00000e+00
+   8.900e+10   2.34086e-08   9.10474e-14   1.00000e+00
+   9.000e+10   2.31485e-08   9.02954e-14   1.00000e+00
+   9.100e+10   2.28941e-08   9.57143e-14   1.00000e+00
+   9.200e+10   2.26452e-08   1.00341e-13   1.00000e+00
+   9.300e+10   2.24017e-08   1.03006e-13   1.00000e+00
+   9.400e+10   2.21634e-08   1.03573e-13   1.00000e+00
+   9.500e+10   2.19301e-08   1.01905e-13   1.00000e+00
+   9.600e+10   2.17016e-08   9.78643e-14   1.00000e+00
+   9.700e+10   2.14779e-08   9.13138e-14   1.00000e+00
+   9.800e+10   2.12588e-08   8.23720e-14   1.00000e+00
+   9.900e+10   2.10440e-08   7.45584e-14   1.00000e+00
+   1.000e+11   2.08334e-08   6.88517e-14   1.00000e+00
    --------------------------------------------------
 
 Final Statistics:
-Current time                 = 100509725868.0247
-Steps                        = 990
-Step attempts                = 1170
+Current time                 = 115949571244.6344
+Steps                        = 740
+Step attempts                = 784
 Stability limited steps      = 0
-Accuracy limited steps       = 1167
-Error test fails             = 177
-NLS step fails               = 3
+Accuracy limited steps       = 779
+Error test fails             = 39
+NLS step fails               = 5
 Inequality constraint fails  = 0
 Initial step size            = 1e-08
-Last step size               = 4072648616.470474
-Current step size            = 4072648616.470474
+Last step size               = 18264803707.2694
+Current step size            = 18264803707.2694
 Explicit RHS fn evals        = 0
-Implicit RHS fn evals        = 33161
-NLS iters                    = 27313
+Implicit RHS fn evals        = 25084
+NLS iters                    = 21171
 NLS fails                    = 46
-NLS iters per step           = 27.58888888888889
-LS setups                    = 517
-Jac fn evals                 = 56
+NLS iters per step           = 28.60945945945946
+LS setups                    = 208
+Jac fn evals                 = 52
 LS RHS fn evals              = 0
 Prec setup evals             = 0
 Prec solves                  = 0
@@ -133,5 +133,5 @@ LS fails                     = 0
 Jac-times setups             = 0
 Jac-times evals              = 0
 LS iters per NLS iter        = 0
-Jac evals per NLS iter       = 0.002050305715227181
+Jac evals per NLS iter       = 0.002456190071323981
 Prec evals per NLS iter      = 0
diff --git a/examples/arkode/C_serial/ark_robertson_constraints.out b/examples/arkode/C_serial/ark_robertson_constraints.out
index e28ffe18c9..a5abcd3dfd 100644
--- a/examples/arkode/C_serial/ark_robertson_constraints.out
+++ b/examples/arkode/C_serial/ark_robertson_constraints.out
@@ -4,116 +4,116 @@ Robertson ODE test problem:
         t           u           v           w
    --------------------------------------------------
    0.000e+00   1.00000e+00   0.00000e+00   0.00000e+00
-   1.000e+09   2.07857e-06  -1.09385e-10   9.99998e-01
-   2.000e+09   1.04202e-06   4.21741e-12   9.99999e-01
-   3.000e+09   6.94597e-07   2.66732e-12   9.99999e-01
-   4.000e+09   5.20918e-07   2.08504e-12   9.99999e-01
-   5.000e+09   4.16721e-07   1.50113e-12   1.00000e+00
-   6.000e+09   3.47261e-07   3.09313e-12   1.00000e+00
-   7.000e+09   2.97649e-07   1.12013e-12   1.00000e+00
-   8.000e+09   2.60438e-07   1.30410e-12   1.00000e+00
-   9.000e+09   2.31501e-07   6.01213e-15   1.00000e+00
-   1.000e+10   2.08348e-07   8.07940e-13   1.00000e+00
-   1.100e+10   1.89407e-07   5.27220e-13   1.00000e+00
-   1.200e+10   1.73622e-07   5.67013e-13   1.00000e+00
-   1.300e+10   1.60265e-07   6.62046e-13   1.00000e+00
-   1.400e+10   1.48820e-07  -1.96317e-12   1.00000e+00
-   1.500e+10   1.38895e-07   1.17103e-12   1.00000e+00
-   1.600e+10   1.30214e-07   3.98260e-13   1.00000e+00
-   1.700e+10   1.22554e-07   6.36369e-13   1.00000e+00
-   1.800e+10   1.15747e-07  -6.66047e-13   1.00000e+00
-   1.900e+10   1.09653e-07   4.39347e-13   1.00000e+00
-   2.000e+10   1.04171e-07   3.61443e-13   1.00000e+00
-   2.100e+10   9.92098e-08   5.00251e-13   1.00000e+00
-   2.200e+10   9.47001e-08   4.91884e-13   1.00000e+00
-   2.300e+10   9.05822e-08   8.71476e-13   1.00000e+00
-   2.400e+10   8.68083e-08   3.63347e-13   1.00000e+00
-   2.500e+10   8.33363e-08  -4.58969e-15   1.00000e+00
-   2.600e+10   8.01306e-08   3.78826e-13   1.00000e+00
-   2.700e+10   7.71624e-08   6.09154e-13   1.00000e+00
-   2.800e+10   7.44070e-08   2.04226e-13   1.00000e+00
-   2.900e+10   7.18410e-08   3.71843e-13   1.00000e+00
-   3.000e+10   6.94465e-08   4.86116e-14   1.00000e+00
-   3.100e+10   6.72060e-08   2.63403e-13   1.00000e+00
-   3.200e+10   6.51057e-08   3.32928e-13   1.00000e+00
-   3.300e+10   6.31329e-08   2.79447e-13   1.00000e+00
-   3.400e+10   6.12760e-08   2.69539e-13   1.00000e+00
-   3.500e+10   5.95252e-08   2.37903e-13   1.00000e+00
-   3.600e+10   5.78717e-08   2.27549e-13   1.00000e+00
-   3.700e+10   5.63075e-08   2.16412e-13   1.00000e+00
-   3.800e+10   5.48258e-08   2.20845e-13   1.00000e+00
-   3.900e+10   5.34200e-08   1.80732e-13   1.00000e+00
-   4.000e+10   5.20844e-08   2.07741e-13   1.00000e+00
-   4.100e+10   5.08141e-08   2.02952e-13   1.00000e+00
-   4.200e+10   4.96042e-08   1.74303e-13   1.00000e+00
-   4.300e+10   4.84505e-08   2.18218e-13   1.00000e+00
-   4.400e+10   4.73494e-08   1.66929e-13   1.00000e+00
-   4.500e+10   4.62972e-08   1.38049e-13   1.00000e+00
-   4.600e+10   4.52908e-08   1.08118e-13   1.00000e+00
-   4.700e+10   4.43271e-08   1.76051e-13   1.00000e+00
-   4.800e+10   4.34036e-08   1.70607e-13   1.00000e+00
-   4.900e+10   4.25178e-08   1.81842e-13   1.00000e+00
-   5.000e+10   4.16676e-08  -1.13757e-14   1.00000e+00
-   5.100e+10   4.08507e-08  -2.05065e-13   1.00000e+00
-   5.200e+10   4.00651e-08  -1.78624e-13   1.00000e+00
-   5.300e+10   3.93089e-08   1.41307e-13   1.00000e+00
-   5.400e+10   3.85809e-08   1.37592e-13   1.00000e+00
-   5.500e+10   3.78794e-08   1.22696e-13   1.00000e+00
-   5.600e+10   3.72032e-08  -1.10452e-13   1.00000e+00
-   5.700e+10   3.65501e-08   3.36533e-13   1.00000e+00
-   5.800e+10   3.59205e-08  -2.61161e-13   1.00000e+00
-   5.900e+10   3.53190e-08  -7.59722e-12   1.00000e+00
-   6.000e+10   3.47227e-08   1.85374e-13   1.00000e+00
-   6.100e+10   3.41536e-08   9.39629e-14   1.00000e+00
-   6.200e+10   3.36021e-08   7.25389e-13   1.00000e+00
-   6.300e+10   3.30696e-08  -1.63630e-13   1.00000e+00
-   6.400e+10   3.25554e-08  -2.65856e-12   1.00000e+00
-   6.500e+10   3.20517e-08   1.30711e-13   1.00000e+00
-   6.600e+10   3.15661e-08   1.26194e-13   1.00000e+00
-   6.700e+10   3.10950e-08   1.40543e-13   1.00000e+00
-   6.800e+10   3.06377e-08   1.09899e-13   1.00000e+00
-   6.900e+10   3.01937e-08   1.22297e-13   1.00000e+00
-   7.000e+10   2.97623e-08   1.43754e-13   1.00000e+00
-   7.100e+10   2.93432e-08   9.00254e-14   1.00000e+00
-   7.200e+10   2.89356e-08   1.09983e-13   1.00000e+00
-   7.300e+10   2.85392e-08   1.07976e-13   1.00000e+00
-   7.400e+10   2.81535e-08   1.10593e-13   1.00000e+00
-   7.500e+10   2.77782e-08   1.05388e-13   1.00000e+00
-   7.600e+10   2.74134e-08  -6.45069e-13   1.00000e+00
-   7.700e+10   2.70583e-08  -1.58650e-12   1.00000e+00
-   7.800e+10   2.67111e-08  -1.22796e-12   1.00000e+00
-   7.900e+10   2.63717e-08   8.74686e-14   1.00000e+00
-   8.000e+10   2.60420e-08   9.65943e-14   1.00000e+00
-   8.100e+10   2.57204e-08   1.41528e-13   1.00000e+00
-   8.200e+10   2.54068e-08   1.61138e-13   1.00000e+00
-   8.300e+10   2.51008e-08  -4.32908e-15   1.00000e+00
-   8.400e+10   2.48019e-08   6.26448e-14   1.00000e+00
-   8.500e+10   2.45101e-08   1.00567e-13   1.00000e+00
-   8.600e+10   2.42251e-08   9.76438e-14   1.00000e+00
-   8.700e+10   2.39466e-08   1.01689e-13   1.00000e+00
-   8.800e+10   2.36745e-08   1.26632e-13   1.00000e+00
-   8.900e+10   2.34085e-08   1.35620e-13   1.00000e+00
-   9.000e+10   2.31484e-08   8.73805e-14   1.00000e+00
-   9.100e+10   2.28938e-08   3.36553e-13   1.00000e+00
-   9.200e+10   2.26446e-08   7.21253e-13   1.00000e+00
-   9.300e+10   2.24013e-08   5.28310e-13   1.00000e+00
-   9.400e+10   2.21668e-08  -3.34767e-12   1.00000e+00
-   9.500e+10   2.19300e-08   1.72230e-13   1.00000e+00
-   9.600e+10   2.17016e-08   7.81589e-14   1.00000e+00
-   9.700e+10   2.14779e-08   1.07435e-13   1.00000e+00
-   9.800e+10   2.12602e-08  -1.41747e-12   1.00000e+00
-   9.900e+10   2.10435e-08   6.16285e-13   1.00000e+00
-   1.000e+11   2.08336e-08   8.08491e-14   1.00000e+00
+   1.000e+09   2.08372e-06   1.28623e-11   9.99998e-01
+   2.000e+09   1.04177e-06   4.17962e-12   9.99999e-01
+   3.000e+09   6.94491e-07   1.08662e-12   9.99999e-01
+   4.000e+09   5.20859e-07   2.11202e-12   9.99999e-01
+   5.000e+09   4.16681e-07   2.67597e-12   1.00000e+00
+   6.000e+09   3.47234e-07   1.32035e-12   1.00000e+00
+   7.000e+09   2.97625e-07   9.17289e-13   1.00000e+00
+   8.000e+09   2.60423e-07   1.34317e-12   1.00000e+00
+   9.000e+09   2.31483e-07   1.77831e-13   1.00000e+00
+   1.000e+10   2.08336e-07   8.66411e-14   1.00000e+00
+   1.100e+10   1.89400e-07  -1.20076e-12   1.00000e+00
+   1.200e+10   1.73615e-07   6.95917e-13   1.00000e+00
+   1.300e+10   1.60260e-07   6.35488e-13   1.00000e+00
+   1.400e+10   1.48812e-07   6.62922e-13   1.00000e+00
+   1.500e+10   1.38889e-07   9.89014e-13   1.00000e+00
+   1.600e+10   1.30210e-07   4.44922e-13   1.00000e+00
+   1.700e+10   1.22549e-07   1.72526e-12   1.00000e+00
+   1.800e+10   1.15739e-07   3.90984e-12   1.00000e+00
+   1.900e+10   1.09651e-07   4.44476e-13   1.00000e+00
+   2.000e+10   1.04167e-07   1.31808e-12   1.00000e+00
+   2.100e+10   9.92075e-08   7.65928e-13   1.00000e+00
+   2.200e+10   9.46989e-08  -1.16031e-13   1.00000e+00
+   2.300e+10   9.05834e-08  -2.00950e-12   1.00000e+00
+   2.400e+10   8.68068e-08   3.52748e-13   1.00000e+00
+   2.500e+10   8.33341e-08   4.86598e-13   1.00000e+00
+   2.600e+10   8.01289e-08   5.62896e-13   1.00000e+00
+   2.700e+10   7.71612e-08   6.08319e-13   1.00000e+00
+   2.800e+10   7.44056e-08   4.14818e-13   1.00000e+00
+   2.900e+10   7.18402e-08   6.98424e-14   1.00000e+00
+   3.000e+10   6.94449e-08   6.23385e-13   1.00000e+00
+   3.100e+10   6.72051e-08   2.68162e-13   1.00000e+00
+   3.200e+10   6.51049e-08   2.53517e-13   1.00000e+00
+   3.300e+10   6.31320e-08   2.53703e-13   1.00000e+00
+   3.400e+10   6.12751e-08   2.53682e-13   1.00000e+00
+   3.500e+10   5.95243e-08   2.90151e-13   1.00000e+00
+   3.600e+10   5.78709e-08   2.74982e-13   1.00000e+00
+   3.700e+10   5.63068e-08   2.31075e-13   1.00000e+00
+   3.800e+10   5.48248e-08   4.05480e-13   1.00000e+00
+   3.900e+10   5.34193e-08   2.94098e-13   1.00000e+00
+   4.000e+10   5.20839e-08   1.94391e-13   1.00000e+00
+   4.100e+10   5.08135e-08   2.15900e-13   1.00000e+00
+   4.200e+10   4.96037e-08   1.41126e-13   1.00000e+00
+   4.300e+10   4.84501e-08   1.79785e-13   1.00000e+00
+   4.400e+10   4.73464e-08   2.69369e-12   1.00000e+00
+   4.500e+10   4.62850e-08   1.18598e-11   1.00000e+00
+   4.600e+10   4.52825e-08   7.90431e-12   1.00000e+00
+   4.700e+10   4.43266e-08   1.76122e-13   1.00000e+00
+   4.800e+10   4.34029e-08   2.26422e-13   1.00000e+00
+   4.900e+10   4.25172e-08   1.84214e-13   1.00000e+00
+   5.000e+10   4.16669e-08   1.23287e-13   1.00000e+00
+   5.100e+10   4.08543e-08  -4.28961e-12   1.00000e+00
+   5.200e+10   4.00729e-08  -8.50417e-12   1.00000e+00
+   5.300e+10   3.93110e-08  -2.57802e-12   1.00000e+00
+   5.400e+10   3.85804e-08   1.47943e-13   1.00000e+00
+   5.500e+10   3.78772e-08   1.86930e-12   1.00000e+00
+   5.600e+10   3.72025e-08   1.31732e-13   1.00000e+00
+   5.700e+10   3.65494e-08   5.66584e-13   1.00000e+00
+   5.800e+10   3.59196e-08   1.78679e-13   1.00000e+00
+   5.900e+10   3.53112e-08  -1.92694e-13   1.00000e+00
+   6.000e+10   3.47222e-08   2.42813e-13   1.00000e+00
+   6.100e+10   3.41531e-08   1.50415e-13   1.00000e+00
+   6.200e+10   3.36022e-08   1.34708e-13   1.00000e+00
+   6.300e+10   3.30690e-08  -7.92804e-16   1.00000e+00
+   6.400e+10   3.25522e-08   1.27438e-13   1.00000e+00
+   6.500e+10   3.20515e-08   3.49793e-14   1.00000e+00
+   6.600e+10   3.15669e-08  -1.02211e-12   1.00000e+00
+   6.700e+10   3.10946e-08   1.41439e-13   1.00000e+00
+   6.800e+10   3.06374e-08   7.27249e-14   1.00000e+00
+   6.900e+10   3.01894e-08   4.00333e-12   1.00000e+00
+   7.000e+10   2.97602e-08   1.87205e-12   1.00000e+00
+   7.100e+10   2.93428e-08   1.30225e-13   1.00000e+00
+   7.200e+10   2.89354e-08   1.31656e-14   1.00000e+00
+   7.300e+10   2.85437e-08  -4.70269e-12   1.00000e+00
+   7.400e+10   2.81625e-08  -9.20849e-12   1.00000e+00
+   7.500e+10   2.77780e-08  -5.78693e-14   1.00000e+00
+   7.600e+10   2.74119e-08   5.68095e-13   1.00000e+00
+   7.700e+10   2.70563e-08   1.53510e-13   1.00000e+00
+   7.800e+10   2.67092e-08   3.61374e-13   1.00000e+00
+   7.900e+10   2.63714e-08   9.53870e-14   1.00000e+00
+   8.000e+10   2.60417e-08   1.04868e-13   1.00000e+00
+   8.100e+10   2.57202e-08   9.19696e-14   1.00000e+00
+   8.200e+10   2.54065e-08   1.04617e-13   1.00000e+00
+   8.300e+10   2.51004e-08   1.17459e-13   1.00000e+00
+   8.400e+10   2.48017e-08   4.24962e-14   1.00000e+00
+   8.500e+10   2.45107e-08  -7.68506e-13   1.00000e+00
+   8.600e+10   2.42268e-08  -1.88041e-12   1.00000e+00
+   8.700e+10   2.39489e-08  -2.44492e-12   1.00000e+00
+   8.800e+10   2.36760e-08  -1.61373e-12   1.00000e+00
+   8.900e+10   2.34086e-08  -2.03789e-13   1.00000e+00
+   9.000e+10   2.31474e-08   8.50587e-13   1.00000e+00
+   9.100e+10   2.28938e-08   1.36755e-13   1.00000e+00
+   9.200e+10   2.26451e-08  -2.32772e-14   1.00000e+00
+   9.300e+10   2.24015e-08   8.00906e-14   1.00000e+00
+   9.400e+10   2.21631e-08   8.59755e-14   1.00000e+00
+   9.500e+10   2.19305e-08  -5.14361e-13   1.00000e+00
+   9.600e+10   2.17023e-08  -7.48165e-13   1.00000e+00
+   9.700e+10   2.14796e-08  -1.80243e-12   1.00000e+00
+   9.800e+10   2.12586e-08   5.56097e-14   1.00000e+00
+   9.900e+10   2.10438e-08   1.05420e-13   1.00000e+00
+   1.000e+11   2.08333e-08   9.66856e-14   1.00000e+00
    --------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 372 (attempted = 563)
-   Total RHS evals:  Fe = 0,  Fi = 14565
-   Total linear solver setups = 581
+   Internal solver steps = 353 (attempted = 519)
+   Total RHS evals:  Fe = 0,  Fi = 13780
+   Total linear solver setups = 545
    Total RHS evals for setting up the linear system = 0
-   Total number of Jacobian evaluations = 391
-   Total number of Newton iterations = 12497
-   Total number of nonlinear solver convergence failures = 376
-   Total number of error test failures = 1
-   Total number of constraint test failures = 14
-   Total number of failed steps from solver failure = 176
+   Total number of Jacobian evaluations = 366
+   Total number of Newton iterations = 11842
+   Total number of nonlinear solver convergence failures = 363
+   Total number of error test failures = 0
+   Total number of constraint test failures = 2
+   Total number of failed steps from solver failure = 164
diff --git a/examples/arkode/C_serial/ark_robertson_root.out b/examples/arkode/C_serial/ark_robertson_root.out
index 236a53d64b..f67f8d34a9 100644
--- a/examples/arkode/C_serial/ark_robertson_root.out
+++ b/examples/arkode/C_serial/ark_robertson_root.out
@@ -7,27 +7,27 @@ Robertson ODE test problem (with rootfinding):
    2.64019e-01   9.89965e-01   3.47058e-05   1.00000e-02
       rootsfound[] =   0   1
    4.00000e+00   9.05519e-01   2.24048e-05   9.44589e-02
-   4.00000e+01   7.15827e-01   9.18557e-06   2.84164e-01
-   4.00000e+02   4.50519e-01   3.22289e-06   5.49478e-01
-   4.00000e+03   1.83202e-01   8.94239e-07   8.16797e-01
-   4.00000e+04   3.89834e-02   1.62177e-07   9.61016e-01
-   4.00000e+05   4.93828e-03   1.98499e-08   9.95062e-01
-   4.00000e+06   5.16810e-04   2.06836e-09   9.99483e-01
-   2.07955e+07   1.00000e-04   4.00913e-10   9.99900e-01
+   4.00000e+01   7.15827e-01   9.18550e-06   2.84164e-01
+   4.00000e+02   4.50519e-01   3.22290e-06   5.49478e-01
+   4.00000e+03   1.83202e-01   8.94213e-07   8.16797e-01
+   4.00000e+04   3.89834e-02   1.62170e-07   9.61016e-01
+   4.00000e+05   4.93828e-03   1.98505e-08   9.95062e-01
+   4.00000e+06   5.16811e-04   2.06833e-09   9.99483e-01
+   2.07956e+07   1.00000e-04   4.00054e-10   9.99900e-01
       rootsfound[] =  -1   0
-   4.00000e+08   5.20777e-06   2.07144e-11   9.99995e-01
-   4.00000e+09   5.20870e-07   2.07803e-12   9.99999e-01
-   4.00000e+10   5.20800e-08   4.22489e-13   1.00000e+00
+   4.00000e+08   5.20672e-06   2.05159e-11   9.99995e-01
+   4.00000e+09   5.20802e-07   1.54856e-12   9.99999e-01
+   4.00000e+10   5.20846e-08   2.09189e-13   1.00000e+00
    -----------------------------------------------------
 
 Final Solver Statistics:
-   Internal solver steps = 1070 (attempted = 1298)
-   Total RHS evals:  Fe = 0,  Fi = 36412
-   Total linear solver setups = 590
+   Internal solver steps = 748 (attempted = 813)
+   Total RHS evals:  Fe = 0,  Fi = 25698
+   Total linear solver setups = 263
    Total RHS evals for setting up the linear system = 0
-   Total number of Jacobian evaluations = 66
-   Total number of Newton iterations = 29962
-   Total root-function g evals = 1104
-   Total number of nonlinear solver convergence failures = 55
-   Total number of error test failures = 213
-   Total number of failed steps from solver failure = 15
+   Total number of Jacobian evaluations = 65
+   Total number of Newton iterations = 21684
+   Total root-function g evals = 776
+   Total number of nonlinear solver convergence failures = 59
+   Total number of error test failures = 47
+   Total number of failed steps from solver failure = 18
diff --git a/examples/arkode/C_serial/ark_twowaycouple_mri.out b/examples/arkode/C_serial/ark_twowaycouple_mri.out
index ef4f3fa787..8aee3f02b7 100644
--- a/examples/arkode/C_serial/ark_twowaycouple_mri.out
+++ b/examples/arkode/C_serial/ark_twowaycouple_mri.out
@@ -30,4 +30,4 @@ Two way coupling ODE test problem:
 
 Final Solver Statistics:
    Steps: nsts = 2001, nstf = 102051
-   Total RHS evals:  Fs = 6004,  Ff = 410207
+   Total RHS evals:  Fs = 6004,  Ff = 306173
diff --git a/examples/arkode/F2003_custom/ark_analytic_complex_f2003.out b/examples/arkode/F2003_custom/ark_analytic_complex_f2003.out
index 32bd53e57b..a783d31eef 100644
--- a/examples/arkode/F2003_custom/ark_analytic_complex_f2003.out
+++ b/examples/arkode/F2003_custom/ark_analytic_complex_f2003.out
@@ -20,7 +20,7 @@
   
  Final Solver Statistics:
     Internal solver steps =  664, (attempted =  664)
-    Total RHS evals =  3987
+    Total RHS evals =  3323
     Total number of error test failures =    0
     Error: max =  7.87E-04, rms =  4.99E-04
   
diff --git a/examples/arkode/F2003_custom/ark_brusselator1D_f2003.out b/examples/arkode/F2003_custom/ark_brusselator1D_f2003.out
index 11c3e92817..a0a5d2c6e9 100644
--- a/examples/arkode/F2003_custom/ark_brusselator1D_f2003.out
+++ b/examples/arkode/F2003_custom/ark_brusselator1D_f2003.out
@@ -6,7 +6,7 @@
     reltol =  1.0E-06,  abstol =  1.0E-10
          t      ||u||_rms   ||v||_rms   ||w||_rms
     ----------------------------------------------
-    0.100000    0.675713    3.378369    1.999987
+    0.100000    0.675713    3.378369    1.999986
     0.200000    0.688538    3.357681    1.999986
     0.300000    0.702687    3.334519    1.999986
     0.400000    0.718330    3.308631    1.999986
@@ -110,7 +110,7 @@
   
  Final Solver Statistics:
     Internal solver steps =       407, (attempted =       504)
-    Total RHS evals: Fe =      3027,  Fi =      8587
+    Total RHS evals: Fe =      2930,  Fi =      8490
     Total linear solver setups    =      269
     Total RHS evals for setting up the linear system =        0
     Total number of Jacobian evaluations =       30
diff --git a/examples/arkode/F2003_serial/ark_analytic_f2003.f90 b/examples/arkode/F2003_serial/ark_analytic_f2003.f90
index 9de6e47616..d8603bb118 100644
--- a/examples/arkode/F2003_serial/ark_analytic_f2003.f90
+++ b/examples/arkode/F2003_serial/ark_analytic_f2003.f90
@@ -192,6 +192,12 @@ program main
      stop 1
   end if
 
+  ierr = FARKStepSetNonlinConvCoef(arkode_mem, 0.01d0)
+  if (ierr /= 0) then
+     write(*,*) 'Error in FARKStepSetNonlinConvCoef, ierr = ', ierr, '; halting'
+     stop 1
+  end if
+
   ! Start time stepping
   print *, '   '
   print *, 'Finished initialization, starting time steps'
diff --git a/examples/arkode/F2003_serial/ark_analytic_f2003.out b/examples/arkode/F2003_serial/ark_analytic_f2003.out
index fa22d69806..6bd9ca6971 100644
--- a/examples/arkode/F2003_serial/ark_analytic_f2003.out
+++ b/examples/arkode/F2003_serial/ark_analytic_f2003.out
@@ -16,15 +16,15 @@
    1.00000E+01  1.47113E+00
   
   General Solver Stats:
-    Total internal steps taken    =      412
-    Total internal steps attempts =      416
-    Total rhs function calls      =     4944
-    Num lin solver setup calls    =       38
-    Num error test failures       =        4
+    Total internal steps taken    =      413
+    Total internal steps attempts =      419
+    Total rhs function calls      =     4983
+    Num lin solver setup calls    =       43
+    Num error test failures       =        6
     First internal step size      = 6.10352E-12
-    Last internal step size       = 7.85712E-02
-    Next internal step size       = 7.85712E-02
-    Current internal time         = 1.00544E+01
-    Num nonlinear solver iters    =     2861
-    Num nonlinear solver fails    =        3
+    Last internal step size       = 5.69650E-02
+    Next internal step size       = 5.69650E-02
+    Current internal time         = 1.00344E+01
+    Num nonlinear solver iters    =     2885
+    Num nonlinear solver fails    =        4
   
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003.out
index af17291b06..9bdbea5dcb 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003.out
@@ -1,66 +1,66 @@
  Multirate nonlinear Kvaerno-Prothero-Robinson test problem:
     time domain: (0.00, 5.00]
-    hs =       0.0100
-    hf =       0.0001
-     G =    -100.0000
-     w =     100.0000
-     e =       0.5000
+    hs =   0.1000E-01
+    hf =   0.1000E-03
+     G =  -0.1000E+03
+     w =   0.1000E+03
+     e =   0.5000E+00
     solver: exp-3/exp-3 (standard MIS)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223726    1.077464  0.85E-06  0.88E-08
-     0.200000    1.220670    1.551800  0.84E-06  0.20E-07
-     0.300000    1.215595    1.467737  0.83E-06  0.31E-07
-     0.400000    1.208525    1.154583  0.82E-06  0.40E-07
-     0.500000    1.199497    1.721908  0.80E-06  0.48E-07
-     0.600000    1.188558    1.023517  0.78E-06  0.56E-07
-     0.700000    1.175765    1.622751  0.75E-06  0.62E-07
-     0.800000    1.161187    1.374632  0.72E-06  0.67E-07
-     0.900000    1.144905    1.245763  0.68E-06  0.71E-07
-     1.000000    1.127010    1.691839  0.64E-06  0.74E-07
-     1.100000    1.107610    1.000490  0.59E-06  0.76E-07
-     1.200000    1.086821    1.677552  0.53E-06  0.77E-07
-     1.300000    1.064777    1.277775  0.47E-06  0.78E-07
-     1.400000    1.041626    1.342455  0.41E-06  0.77E-07
-     1.500000    1.017531    1.642940  0.33E-06  0.75E-07
-     1.600000    0.992674    1.012112  0.25E-06  0.73E-07
-     1.700000    0.967253    1.714058  0.16E-06  0.69E-07
-     1.800000    0.941488    1.183867  0.63E-07  0.65E-07
-     1.900000    0.915617    1.437465  0.43E-07  0.59E-07
-     2.000000    0.889902    1.577082  0.16E-06  0.52E-07
-     2.100000    0.864625    1.056467  0.28E-06  0.45E-07
-     2.200000    0.840089    1.730920  0.42E-06  0.36E-07
-     2.300000    0.816616    1.101047  0.56E-06  0.26E-07
-     2.400000    0.794545    1.525051  0.70E-06  0.14E-07
-     2.500000    0.774227    1.496993  0.85E-06  0.21E-08
-     2.600000    0.756012    1.126857  0.99E-06  0.11E-07
-     2.700000    0.740245    1.727536  0.11E-05  0.25E-07
-     2.800000    0.727246    1.038393  0.13E-05  0.40E-07
-     2.900000    0.717300    1.600759  0.14E-05  0.55E-07
-     3.000000    0.710635    1.406379  0.14E-05  0.70E-07
-     3.100000    0.707411    1.214353  0.15E-05  0.85E-07
-     3.200000    0.707708    1.704026  0.15E-05  0.99E-07
-     3.300000    0.711518    1.004391  0.14E-05  0.11E-06
-     3.400000    0.718748    1.661225  0.14E-05  0.12E-06
-     3.500000    0.729225    1.310102  0.13E-05  0.13E-06
-     3.600000    0.742711    1.310080  0.12E-05  0.14E-06
-     3.700000    0.758913    1.661237  0.10E-05  0.14E-06
-     3.800000    0.777505    1.004387  0.88E-06  0.14E-06
-     3.900000    0.798143    1.704018  0.73E-06  0.14E-06
-     4.000000    0.820474    1.214374  0.59E-06  0.14E-06
-     4.100000    0.844149    1.406358  0.45E-06  0.13E-06
-     4.200000    0.868832    1.600774  0.31E-06  0.13E-06
-     4.300000    0.894204    1.038382  0.18E-06  0.12E-06
-     4.400000    0.919964    1.727533  0.66E-07  0.11E-06
-     4.500000    0.945834    1.126875  0.43E-07  0.99E-07
-     4.600000    0.971558    1.496973  0.14E-06  0.89E-07
-     4.700000    0.996898    1.525070  0.23E-06  0.78E-07
-     4.800000    1.021641    1.101030  0.32E-06  0.66E-07
-     4.900000    1.045589    1.730922  0.39E-06  0.55E-07
-     5.000000    1.068565    1.056480  0.46E-06  0.44E-07
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223726    1.077464   0.85E-06   0.88E-08
+     0.200000    1.220670    1.551800   0.84E-06   0.20E-07
+     0.300000    1.215595    1.467737   0.83E-06   0.31E-07
+     0.400000    1.208525    1.154583   0.82E-06   0.40E-07
+     0.500000    1.199497    1.721908   0.80E-06   0.48E-07
+     0.600000    1.188558    1.023517   0.78E-06   0.56E-07
+     0.700000    1.175765    1.622751   0.75E-06   0.62E-07
+     0.800000    1.161187    1.374632   0.72E-06   0.67E-07
+     0.900000    1.144905    1.245763   0.68E-06   0.71E-07
+     1.000000    1.127010    1.691839   0.64E-06   0.74E-07
+     1.100000    1.107610    1.000490   0.59E-06   0.76E-07
+     1.200000    1.086821    1.677552   0.53E-06   0.77E-07
+     1.300000    1.064777    1.277775   0.47E-06   0.78E-07
+     1.400000    1.041626    1.342455   0.41E-06   0.77E-07
+     1.500000    1.017531    1.642940   0.33E-06   0.75E-07
+     1.600000    0.992674    1.012112   0.25E-06   0.73E-07
+     1.700000    0.967253    1.714058   0.16E-06   0.69E-07
+     1.800000    0.941488    1.183867   0.63E-07   0.65E-07
+     1.900000    0.915617    1.437465   0.43E-07   0.59E-07
+     2.000000    0.889902    1.577082   0.16E-06   0.52E-07
+     2.100000    0.864625    1.056467   0.28E-06   0.45E-07
+     2.200000    0.840089    1.730920   0.42E-06   0.36E-07
+     2.300000    0.816616    1.101047   0.56E-06   0.26E-07
+     2.400000    0.794545    1.525051   0.70E-06   0.14E-07
+     2.500000    0.774227    1.496993   0.85E-06   0.21E-08
+     2.600000    0.756012    1.126857   0.99E-06   0.11E-07
+     2.700000    0.740245    1.727536   0.11E-05   0.25E-07
+     2.800000    0.727246    1.038393   0.13E-05   0.40E-07
+     2.900000    0.717300    1.600759   0.14E-05   0.55E-07
+     3.000000    0.710635    1.406379   0.14E-05   0.70E-07
+     3.100000    0.707411    1.214353   0.15E-05   0.85E-07
+     3.200000    0.707708    1.704026   0.15E-05   0.99E-07
+     3.300000    0.711518    1.004391   0.14E-05   0.11E-06
+     3.400000    0.718748    1.661225   0.14E-05   0.12E-06
+     3.500000    0.729225    1.310102   0.13E-05   0.13E-06
+     3.600000    0.742711    1.310080   0.12E-05   0.14E-06
+     3.700000    0.758913    1.661237   0.10E-05   0.14E-06
+     3.800000    0.777505    1.004387   0.88E-06   0.14E-06
+     3.900000    0.798143    1.704018   0.73E-06   0.14E-06
+     4.000000    0.820474    1.214374   0.59E-06   0.14E-06
+     4.100000    0.844149    1.406358   0.45E-06   0.13E-06
+     4.200000    0.868832    1.600774   0.31E-06   0.13E-06
+     4.300000    0.894204    1.038382   0.18E-06   0.12E-06
+     4.400000    0.919964    1.727533   0.66E-07   0.11E-06
+     4.500000    0.945834    1.126875   0.43E-07   0.99E-07
+     4.600000    0.971558    1.496973   0.14E-06   0.89E-07
+     4.700000    0.996898    1.525070   0.23E-06   0.78E-07
+     4.800000    1.021641    1.101030   0.32E-06   0.66E-07
+     4.900000    1.045589    1.730922   0.39E-06   0.55E-07
+     5.000000    1.068565    1.056480   0.46E-06   0.44E-07
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =     501, nstf =   50601
-   u error = 0.794E-06, v error = 0.825E-07, total error = 0.565E-06
-   Total RHS evals: Fs =    1504, Ff =  152306
+   u error =  0.794E-06, v error =  0.825E-07, total error =  0.565E-06
+   Total RHS evals: Fs =    1504, Ff =  151853
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_0_0.002.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_0_0.002.out
index 5f383b5beb..c5001c9ed2 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_0_0.002.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_0_0.002.out
@@ -8,59 +8,59 @@
     solver: exp-3/exp-3 (standard MIS)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.50E-08  0.63E-10
-     0.200000    1.220669    1.551800  0.50E-08  0.14E-09
-     0.300000    1.215594    1.467737  0.49E-08  0.21E-09
-     0.400000    1.208524    1.154583  0.48E-08  0.28E-09
-     0.500000    1.199496    1.721908  0.47E-08  0.33E-09
-     0.600000    1.188557    1.023517  0.46E-08  0.38E-09
-     0.700000    1.175764    1.622751  0.44E-08  0.42E-09
-     0.800000    1.161186    1.374632  0.42E-08  0.46E-09
-     0.900000    1.144904    1.245763  0.40E-08  0.49E-09
-     1.000000    1.127010    1.691839  0.37E-08  0.51E-09
-     1.100000    1.107609    1.000489  0.34E-08  0.52E-09
-     1.200000    1.086821    1.677552  0.31E-08  0.53E-09
-     1.300000    1.064777    1.277775  0.28E-08  0.53E-09
-     1.400000    1.041625    1.342455  0.24E-08  0.52E-09
-     1.500000    1.017531    1.642940  0.19E-08  0.51E-09
-     1.600000    0.992673    1.012112  0.15E-08  0.49E-09
-     1.700000    0.967253    1.714058  0.93E-09  0.47E-09
-     1.800000    0.941488    1.183867  0.35E-09  0.44E-09
-     1.900000    0.915617    1.437465  0.27E-09  0.40E-09
-     2.000000    0.889903    1.577082  0.96E-09  0.36E-09
-     2.100000    0.864625    1.056467  0.17E-08  0.30E-09
-     2.200000    0.840089    1.730920  0.25E-08  0.24E-09
-     2.300000    0.816616    1.101047  0.33E-08  0.17E-09
-     2.400000    0.794546    1.525051  0.42E-08  0.93E-10
-     2.500000    0.774227    1.496993  0.50E-08  0.88E-11
-     2.600000    0.756013    1.126857  0.59E-08  0.80E-10
-     2.700000    0.740246    1.727536  0.67E-08  0.18E-09
-     2.800000    0.727247    1.038393  0.74E-08  0.28E-09
-     2.900000    0.717301    1.600759  0.80E-08  0.38E-09
-     3.000000    0.710636    1.406380  0.84E-08  0.49E-09
-     3.100000    0.707412    1.214353  0.86E-08  0.58E-09
-     3.200000    0.707709    1.704026  0.86E-08  0.68E-09
-     3.300000    0.711520    1.004391  0.85E-08  0.76E-09
-     3.400000    0.718750    1.661225  0.81E-08  0.83E-09
-     3.500000    0.729227    1.310102  0.75E-08  0.89E-09
-     3.600000    0.742712    1.310080  0.68E-08  0.93E-09
-     3.700000    0.758914    1.661237  0.60E-08  0.96E-09
-     3.800000    0.777506    1.004387  0.52E-08  0.96E-09
-     3.900000    0.798144    1.704019  0.43E-08  0.96E-09
-     4.000000    0.820474    1.214374  0.34E-08  0.93E-09
-     4.100000    0.844149    1.406358  0.26E-08  0.90E-09
-     4.200000    0.868832    1.600774  0.18E-08  0.86E-09
-     4.300000    0.894204    1.038382  0.11E-08  0.80E-09
-     4.400000    0.919964    1.727533  0.37E-09  0.74E-09
-     4.500000    0.945834    1.126875  0.27E-09  0.67E-09
-     4.600000    0.971557    1.496974  0.86E-09  0.60E-09
-     4.700000    0.996898    1.525070  0.14E-08  0.53E-09
-     4.800000    1.021641    1.101030  0.19E-08  0.45E-09
-     4.900000    1.045589    1.730922  0.23E-08  0.37E-09
-     5.000000    1.068565    1.056480  0.27E-08  0.29E-09
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.50E-08   0.63E-10
+     0.200000    1.220669    1.551800   0.50E-08   0.14E-09
+     0.300000    1.215594    1.467737   0.49E-08   0.21E-09
+     0.400000    1.208524    1.154583   0.48E-08   0.28E-09
+     0.500000    1.199496    1.721908   0.47E-08   0.33E-09
+     0.600000    1.188557    1.023517   0.46E-08   0.38E-09
+     0.700000    1.175764    1.622751   0.44E-08   0.42E-09
+     0.800000    1.161186    1.374632   0.42E-08   0.46E-09
+     0.900000    1.144904    1.245763   0.40E-08   0.49E-09
+     1.000000    1.127010    1.691839   0.37E-08   0.51E-09
+     1.100000    1.107609    1.000489   0.34E-08   0.52E-09
+     1.200000    1.086821    1.677552   0.31E-08   0.53E-09
+     1.300000    1.064777    1.277775   0.28E-08   0.53E-09
+     1.400000    1.041625    1.342455   0.24E-08   0.52E-09
+     1.500000    1.017531    1.642940   0.19E-08   0.51E-09
+     1.600000    0.992673    1.012112   0.15E-08   0.49E-09
+     1.700000    0.967253    1.714058   0.93E-09   0.47E-09
+     1.800000    0.941488    1.183867   0.35E-09   0.44E-09
+     1.900000    0.915617    1.437465   0.27E-09   0.40E-09
+     2.000000    0.889903    1.577082   0.96E-09   0.36E-09
+     2.100000    0.864625    1.056467   0.17E-08   0.30E-09
+     2.200000    0.840089    1.730920   0.25E-08   0.24E-09
+     2.300000    0.816616    1.101047   0.33E-08   0.17E-09
+     2.400000    0.794546    1.525051   0.42E-08   0.93E-10
+     2.500000    0.774227    1.496993   0.50E-08   0.88E-11
+     2.600000    0.756013    1.126857   0.59E-08   0.80E-10
+     2.700000    0.740246    1.727536   0.67E-08   0.18E-09
+     2.800000    0.727247    1.038393   0.74E-08   0.28E-09
+     2.900000    0.717301    1.600759   0.80E-08   0.38E-09
+     3.000000    0.710636    1.406380   0.84E-08   0.49E-09
+     3.100000    0.707412    1.214353   0.86E-08   0.58E-09
+     3.200000    0.707709    1.704026   0.86E-08   0.68E-09
+     3.300000    0.711520    1.004391   0.85E-08   0.76E-09
+     3.400000    0.718750    1.661225   0.81E-08   0.83E-09
+     3.500000    0.729227    1.310102   0.75E-08   0.89E-09
+     3.600000    0.742712    1.310080   0.68E-08   0.93E-09
+     3.700000    0.758914    1.661237   0.60E-08   0.96E-09
+     3.800000    0.777506    1.004387   0.52E-08   0.96E-09
+     3.900000    0.798144    1.704019   0.43E-08   0.96E-09
+     4.000000    0.820474    1.214374   0.34E-08   0.93E-09
+     4.100000    0.844149    1.406358   0.26E-08   0.90E-09
+     4.200000    0.868832    1.600774   0.18E-08   0.86E-09
+     4.300000    0.894204    1.038382   0.11E-08   0.80E-09
+     4.400000    0.919964    1.727533   0.37E-09   0.74E-09
+     4.500000    0.945834    1.126875   0.27E-09   0.67E-09
+     4.600000    0.971557    1.496974   0.86E-09   0.60E-09
+     4.700000    0.996898    1.525070   0.14E-08   0.53E-09
+     4.800000    1.021641    1.101030   0.19E-08   0.45E-09
+     4.900000    1.045589    1.730922   0.23E-08   0.37E-09
+     5.000000    1.068565    1.056480   0.27E-08   0.29E-09
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    2501, nstf =  252601
-   u error = 0.467E-08, v error = 0.564E-09, total error = 0.333E-08
-   Total RHS evals: Fs =    7504, Ff =  760306
+   u error =  0.467E-08, v error =  0.564E-09, total error =  0.333E-08
+   Total RHS evals: Fs =    7504, Ff =  757853
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_1_0.002.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_1_0.002.out
index d0dcc20c8d..c84e3cde4b 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_1_0.002.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_1_0.002.out
@@ -8,59 +8,59 @@
     solver: none/exp-3 (no slow, explicit fast)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.51E-12  0.19E-12
-     0.200000    1.220669    1.551800  0.36E-12  0.49E-13
-     0.300000    1.215594    1.467737  0.20E-12  0.25E-12
-     0.400000    1.208524    1.154583  0.95E-13  0.56E-12
-     0.500000    1.199496    1.721908  0.21E-12  0.43E-13
-     0.600000    1.188557    1.023517  0.47E-12  0.61E-12
-     0.700000    1.175764    1.622751  0.36E-12  0.32E-13
-     0.800000    1.161186    1.374632  0.31E-12  0.22E-12
-     0.900000    1.144904    1.245763  0.20E-12  0.37E-12
-     1.000000    1.127010    1.691839  0.13E-12  0.13E-12
-     1.100000    1.107609    1.000489  0.35E-12  0.31E-11
-     1.200000    1.086821    1.677552  0.37E-12  0.73E-13
-     1.300000    1.064777    1.277775  0.38E-12  0.16E-11
-     1.400000    1.041625    1.342455  0.29E-12  0.12E-11
-     1.500000    1.017531    1.642940  0.59E-13  0.24E-12
-     1.600000    0.992673    1.012112  0.20E-12  0.25E-11
-     1.700000    0.967253    1.714058  0.34E-12  0.72E-12
-     1.800000    0.941488    1.183867  0.45E-12  0.16E-11
-     1.900000    0.915617    1.437465  0.34E-12  0.38E-12
-     2.000000    0.889903    1.577082  0.35E-13  0.32E-12
-     2.100000    0.864625    1.056467  0.95E-13  0.36E-11
-     2.200000    0.840089    1.730920  0.28E-12  0.98E-12
-     2.300000    0.816616    1.101047  0.53E-12  0.31E-11
-     2.400000    0.794546    1.525051  0.35E-12  0.14E-12
-     2.500000    0.774227    1.496993  0.17E-12  0.15E-12
-     2.600000    0.756013    1.126857  0.56E-13  0.28E-11
-     2.700000    0.740246    1.727536  0.23E-12  0.16E-11
-     2.800000    0.727247    1.038393  0.49E-12  0.33E-11
-     2.900000    0.717301    1.600759  0.38E-12  0.90E-12
-     3.000000    0.710636    1.406380  0.27E-12  0.37E-12
-     3.100000    0.707412    1.214353  0.18E-12  0.19E-11
-     3.200000    0.707709    1.704026  0.17E-12  0.19E-11
-     3.300000    0.711520    1.004391  0.40E-12  0.36E-11
-     3.400000    0.718750    1.661225  0.39E-12  0.17E-11
-     3.500000    0.729227    1.310102  0.36E-12  0.82E-12
-     3.600000    0.742712    1.310080  0.28E-12  0.92E-12
-     3.700000    0.758914    1.661237  0.98E-13  0.20E-11
-     3.800000    0.777506    1.004387  0.26E-12  0.38E-11
-     3.900000    0.798144    1.704019  0.37E-12  0.23E-11
-     4.000000    0.820474    1.214374  0.44E-12  0.15E-11
-     4.100000    0.844149    1.406358  0.34E-12  0.18E-13
-     4.200000    0.868832    1.600774  0.67E-15  0.17E-11
-     4.300000    0.894204    1.038382  0.11E-12  0.36E-11
-     4.400000    0.919964    1.727533  0.33E-12  0.28E-11
-     4.500000    0.945834    1.126875  0.50E-12  0.24E-11
-     4.600000    0.971557    1.496974  0.38E-12  0.91E-12
-     4.700000    0.996898    1.525070  0.11E-12  0.13E-11
-     4.800000    1.021641    1.101030  0.31E-13  0.30E-11
-     4.900000    1.045589    1.730922  0.28E-12  0.30E-11
-     5.000000    1.068565    1.056480  0.50E-12  0.34E-11
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.51E-12   0.19E-12
+     0.200000    1.220669    1.551800   0.36E-12   0.49E-13
+     0.300000    1.215594    1.467737   0.20E-12   0.25E-12
+     0.400000    1.208524    1.154583   0.95E-13   0.56E-12
+     0.500000    1.199496    1.721908   0.21E-12   0.43E-13
+     0.600000    1.188557    1.023517   0.47E-12   0.61E-12
+     0.700000    1.175764    1.622751   0.36E-12   0.32E-13
+     0.800000    1.161186    1.374632   0.31E-12   0.22E-12
+     0.900000    1.144904    1.245763   0.20E-12   0.37E-12
+     1.000000    1.127010    1.691839   0.13E-12   0.13E-12
+     1.100000    1.107609    1.000489   0.35E-12   0.31E-11
+     1.200000    1.086821    1.677552   0.37E-12   0.73E-13
+     1.300000    1.064777    1.277775   0.38E-12   0.16E-11
+     1.400000    1.041625    1.342455   0.29E-12   0.12E-11
+     1.500000    1.017531    1.642940   0.59E-13   0.24E-12
+     1.600000    0.992673    1.012112   0.20E-12   0.25E-11
+     1.700000    0.967253    1.714058   0.34E-12   0.72E-12
+     1.800000    0.941488    1.183867   0.45E-12   0.16E-11
+     1.900000    0.915617    1.437465   0.34E-12   0.38E-12
+     2.000000    0.889903    1.577082   0.35E-13   0.32E-12
+     2.100000    0.864625    1.056467   0.95E-13   0.36E-11
+     2.200000    0.840089    1.730920   0.28E-12   0.98E-12
+     2.300000    0.816616    1.101047   0.53E-12   0.31E-11
+     2.400000    0.794546    1.525051   0.35E-12   0.14E-12
+     2.500000    0.774227    1.496993   0.17E-12   0.15E-12
+     2.600000    0.756013    1.126857   0.56E-13   0.28E-11
+     2.700000    0.740246    1.727536   0.23E-12   0.16E-11
+     2.800000    0.727247    1.038393   0.49E-12   0.33E-11
+     2.900000    0.717301    1.600759   0.38E-12   0.90E-12
+     3.000000    0.710636    1.406380   0.27E-12   0.37E-12
+     3.100000    0.707412    1.214353   0.18E-12   0.19E-11
+     3.200000    0.707709    1.704026   0.17E-12   0.19E-11
+     3.300000    0.711520    1.004391   0.40E-12   0.36E-11
+     3.400000    0.718750    1.661225   0.39E-12   0.17E-11
+     3.500000    0.729227    1.310102   0.36E-12   0.82E-12
+     3.600000    0.742712    1.310080   0.28E-12   0.92E-12
+     3.700000    0.758914    1.661237   0.98E-13   0.20E-11
+     3.800000    0.777506    1.004387   0.26E-12   0.38E-11
+     3.900000    0.798144    1.704019   0.37E-12   0.23E-11
+     4.000000    0.820474    1.214374   0.44E-12   0.15E-11
+     4.100000    0.844149    1.406358   0.34E-12   0.18E-13
+     4.200000    0.868832    1.600774   0.67E-15   0.17E-11
+     4.300000    0.894204    1.038382   0.11E-12   0.36E-11
+     4.400000    0.919964    1.727533   0.33E-12   0.28E-11
+     4.500000    0.945834    1.126875   0.50E-12   0.24E-11
+     4.600000    0.971557    1.496974   0.38E-12   0.91E-12
+     4.700000    0.996898    1.525070   0.11E-12   0.13E-11
+     4.800000    1.021641    1.101030   0.31E-13   0.30E-11
+     4.900000    1.045589    1.730922   0.28E-12   0.30E-11
+     5.000000    1.068565    1.056480   0.50E-12   0.34E-11
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    2501, nstf =  252601
-   u error = 0.316E-12, v error = 0.191E-11, total error = 0.137E-11
-   Total RHS evals: Fs =    5003, Ff =  760306
+   u error =  0.316E-12, v error =  0.191E-11, total error =  0.137E-11
+   Total RHS evals: Fs =    5003, Ff =  757853
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_3_0.01.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_3_0.01.out
index c77af2546d..fb98664760 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_3_0.01.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_3_0.01.out
@@ -8,59 +8,59 @@
     solver: exp-3/none (explicit slow, no fast)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223763    1.078830  0.38E-04  0.14E-02
-     0.200000    1.220621    1.551459  0.48E-04  0.34E-03
-     0.300000    1.215670    1.468283  0.77E-04  0.55E-03
-     0.400000    1.208470    1.153553  0.54E-04  0.10E-02
-     0.500000    1.199503    1.721912  0.72E-05  0.45E-05
-     0.600000    1.188562    1.024685  0.52E-05  0.12E-02
-     0.700000    1.175722    1.622394  0.42E-04  0.36E-03
-     0.800000    1.161273    1.375492  0.87E-04  0.86E-03
-     0.900000    1.144848    1.244851  0.56E-04  0.91E-03
-     1.000000    1.127033    1.692049  0.23E-04  0.21E-03
-     1.100000    1.107588    1.000787  0.21E-04  0.30E-03
-     1.200000    1.086786    1.677292  0.34E-04  0.26E-03
-     1.300000    1.064866    1.278796  0.89E-04  0.10E-02
-     1.400000    1.041569    1.341623  0.57E-04  0.83E-03
-     1.500000    1.017571    1.643329  0.41E-04  0.39E-03
-     1.600000    0.992634    1.011394  0.39E-04  0.72E-03
-     1.700000    0.967229    1.714025  0.24E-04  0.33E-04
-     1.800000    0.941564    1.184983  0.76E-04  0.11E-02
-     1.900000    0.915563    1.436882  0.55E-04  0.58E-03
-     2.000000    0.889959    1.577469  0.57E-04  0.39E-03
-     2.100000    0.864576    1.055284  0.50E-04  0.12E-02
-     2.200000    0.840077    1.730958  0.12E-04  0.37E-04
-     2.300000    0.816664    1.102379  0.48E-04  0.13E-02
-     2.400000    0.794495    1.524701  0.51E-04  0.35E-03
-     2.500000    0.774298    1.497468  0.71E-04  0.47E-03
-     2.600000    0.755958    1.125772  0.55E-04  0.11E-02
-     2.700000    0.740246    1.727533  0.49E-06  0.36E-05
-     2.800000    0.727261    1.039718  0.14E-04  0.13E-02
-     2.900000    0.717255    1.600423  0.46E-04  0.34E-03
-     3.000000    0.710718    1.407151  0.82E-04  0.77E-03
-     3.100000    0.707355    1.213428  0.58E-04  0.92E-03
-     3.200000    0.707725    1.704161  0.15E-04  0.13E-03
-     3.300000    0.711504    1.005042  0.15E-04  0.65E-03
-     3.400000    0.718710    1.660915  0.39E-04  0.31E-03
-     3.500000    0.729315    1.311097  0.88E-04  0.10E-02
-     3.600000    0.742653    1.309213  0.59E-04  0.87E-03
-     3.700000    0.758947    1.661594  0.33E-04  0.36E-03
-     3.800000    0.777471    1.003977  0.35E-04  0.41E-03
-     3.900000    0.798115    1.703919  0.29E-04  0.10E-03
-     4.000000    0.820556    1.215451  0.82E-04  0.11E-02
-     4.100000    0.844093    1.405680  0.57E-04  0.68E-03
-     4.200000    0.868883    1.601174  0.51E-04  0.40E-03
-     4.300000    0.894157    1.037277  0.47E-04  0.11E-02
-     4.400000    0.919948    1.727576  0.16E-04  0.42E-04
-     4.500000    0.945893    1.128134  0.59E-04  0.13E-02
-     4.600000    0.971505    1.496571  0.52E-04  0.40E-03
-     4.700000    0.996965    1.525489  0.67E-04  0.42E-03
-     4.800000    1.021588    1.099882  0.52E-04  0.11E-02
-     4.900000    1.045586    1.730924  0.28E-05  0.26E-05
-     5.000000    1.068592    1.057870  0.27E-04  0.14E-02
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223763    1.078830   0.38E-04   0.14E-02
+     0.200000    1.220621    1.551459   0.48E-04   0.34E-03
+     0.300000    1.215670    1.468283   0.77E-04   0.55E-03
+     0.400000    1.208470    1.153553   0.54E-04   0.10E-02
+     0.500000    1.199503    1.721912   0.72E-05   0.45E-05
+     0.600000    1.188562    1.024685   0.52E-05   0.12E-02
+     0.700000    1.175722    1.622394   0.42E-04   0.36E-03
+     0.800000    1.161273    1.375492   0.87E-04   0.86E-03
+     0.900000    1.144848    1.244851   0.56E-04   0.91E-03
+     1.000000    1.127033    1.692049   0.23E-04   0.21E-03
+     1.100000    1.107588    1.000787   0.21E-04   0.30E-03
+     1.200000    1.086786    1.677292   0.34E-04   0.26E-03
+     1.300000    1.064866    1.278796   0.89E-04   0.10E-02
+     1.400000    1.041569    1.341623   0.57E-04   0.83E-03
+     1.500000    1.017571    1.643329   0.41E-04   0.39E-03
+     1.600000    0.992634    1.011394   0.39E-04   0.72E-03
+     1.700000    0.967229    1.714025   0.24E-04   0.33E-04
+     1.800000    0.941564    1.184983   0.76E-04   0.11E-02
+     1.900000    0.915563    1.436882   0.55E-04   0.58E-03
+     2.000000    0.889959    1.577469   0.57E-04   0.39E-03
+     2.100000    0.864576    1.055284   0.50E-04   0.12E-02
+     2.200000    0.840077    1.730958   0.12E-04   0.37E-04
+     2.300000    0.816664    1.102379   0.48E-04   0.13E-02
+     2.400000    0.794495    1.524701   0.51E-04   0.35E-03
+     2.500000    0.774298    1.497468   0.71E-04   0.47E-03
+     2.600000    0.755958    1.125772   0.55E-04   0.11E-02
+     2.700000    0.740246    1.727533   0.49E-06   0.36E-05
+     2.800000    0.727261    1.039718   0.14E-04   0.13E-02
+     2.900000    0.717255    1.600423   0.46E-04   0.34E-03
+     3.000000    0.710718    1.407151   0.82E-04   0.77E-03
+     3.100000    0.707355    1.213428   0.58E-04   0.92E-03
+     3.200000    0.707725    1.704161   0.15E-04   0.13E-03
+     3.300000    0.711504    1.005042   0.15E-04   0.65E-03
+     3.400000    0.718710    1.660915   0.39E-04   0.31E-03
+     3.500000    0.729315    1.311097   0.88E-04   0.10E-02
+     3.600000    0.742653    1.309213   0.59E-04   0.87E-03
+     3.700000    0.758947    1.661594   0.33E-04   0.36E-03
+     3.800000    0.777471    1.003977   0.35E-04   0.41E-03
+     3.900000    0.798115    1.703919   0.29E-04   0.10E-03
+     4.000000    0.820556    1.215451   0.82E-04   0.11E-02
+     4.100000    0.844093    1.405680   0.57E-04   0.68E-03
+     4.200000    0.868883    1.601174   0.51E-04   0.40E-03
+     4.300000    0.894157    1.037277   0.47E-04   0.11E-02
+     4.400000    0.919948    1.727576   0.16E-04   0.42E-04
+     4.500000    0.945893    1.128134   0.59E-04   0.13E-02
+     4.600000    0.971505    1.496571   0.52E-04   0.40E-03
+     4.700000    0.996965    1.525489   0.67E-04   0.42E-03
+     4.800000    1.021588    1.099882   0.52E-04   0.11E-02
+     4.900000    1.045586    1.730924   0.28E-05   0.26E-05
+     5.000000    1.068592    1.057870   0.27E-04   0.14E-02
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =     501, nstf =   50601
-   u error = 0.505E-04, v error = 0.768E-03, total error = 0.545E-03
-   Total RHS evals: Fs =    1504, Ff =  152306
+   u error =  0.505E-04, v error =  0.768E-03, total error =  0.545E-03
+   Total RHS evals: Fs =    1504, Ff =  151853
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_4_0.002.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_4_0.002.out
index 973afbc8c9..22fca6299a 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_4_0.002.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_4_0.002.out
@@ -9,62 +9,62 @@
     reltol:   0.4000E-05 abstol:   0.1000E-10
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223734    1.079428  0.94E-05  0.20E-02
-     0.200000    1.220669    1.551975  0.32E-06  0.17E-03
-     0.300000    1.215599    1.468008  0.55E-05  0.27E-03
-     0.400000    1.208526    1.155919  0.22E-05  0.13E-02
-     0.500000    1.199497    1.721561  0.88E-06  0.35E-03
-     0.600000    1.188564    1.025537  0.74E-05  0.20E-02
-     0.700000    1.175763    1.622485  0.12E-05  0.27E-03
-     0.800000    1.161186    1.374900  0.25E-06  0.27E-03
-     0.900000    1.144904    1.246450  0.11E-06  0.69E-03
-     1.000000    1.127010    1.691322  0.54E-06  0.52E-03
-     1.100000    1.107615    1.002500  0.54E-05  0.20E-02
-     1.200000    1.086818    1.677003  0.21E-05  0.55E-03
-     1.300000    1.064782    1.278198  0.55E-05  0.42E-03
-     1.400000    1.041624    1.342655  0.14E-05  0.20E-03
-     1.500000    1.017531    1.642375  0.74E-06  0.56E-03
-     1.600000    0.992677    1.013911  0.34E-05  0.18E-02
-     1.700000    0.967249    1.713353  0.35E-05  0.71E-03
-     1.800000    0.941493    1.184579  0.54E-05  0.71E-03
-     1.900000    0.915615    1.437305  0.24E-05  0.16E-03
-     2.000000    0.889904    1.576564  0.13E-05  0.52E-03
-     2.100000    0.864627    1.057868  0.15E-05  0.14E-02
-     2.200000    0.840087    1.730117  0.24E-05  0.80E-03
-     2.300000    0.816622    1.102136  0.58E-05  0.11E-02
-     2.400000    0.794543    1.524625  0.31E-05  0.43E-03
-     2.500000    0.774230    1.496597  0.22E-05  0.40E-03
-     2.600000    0.756013    1.127800  0.77E-07  0.94E-03
-     2.700000    0.740244    1.726696  0.18E-05  0.84E-03
-     2.800000    0.727253    1.039861  0.53E-05  0.15E-02
-     2.900000    0.717298    1.600138  0.32E-05  0.62E-03
-     3.000000    0.710633    1.406200  0.30E-05  0.18E-03
-     3.100000    0.707411    1.214845  0.12E-05  0.49E-03
-     3.200000    0.707708    1.703196  0.12E-05  0.83E-03
-     3.300000    0.711524    1.006102  0.44E-05  0.17E-02
-     3.400000    0.718746    1.660466  0.34E-05  0.76E-03
-     3.500000    0.729231    1.310194  0.41E-05  0.93E-04
-     3.600000    0.742710    1.310190  0.22E-05  0.11E-03
-     3.700000    0.758913    1.660462  0.47E-06  0.77E-03
-     3.800000    0.777509    1.006087  0.31E-05  0.17E-02
-     3.900000    0.798140    1.703188  0.39E-05  0.83E-03
-     4.000000    0.820479    1.214819  0.46E-05  0.45E-03
-     4.100000    0.844147    1.406163  0.28E-05  0.20E-03
-     4.200000    0.868833    1.600102  0.42E-06  0.67E-03
-     4.300000    0.894205    1.039813  0.15E-05  0.14E-02
-     4.400000    0.919961    1.726651  0.28E-05  0.88E-03
-     4.500000    0.945839    1.127737  0.53E-05  0.86E-03
-     4.600000    0.971554    1.496541  0.33E-05  0.43E-03
-     4.700000    0.996899    1.524547  0.14E-05  0.52E-03
-     4.800000    1.021641    1.102066  0.86E-07  0.10E-02
-     4.900000    1.045587    1.730025  0.20E-05  0.90E-03
-     5.000000    1.068570    1.057773  0.53E-05  0.13E-02
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223734    1.079428   0.94E-05   0.20E-02
+     0.200000    1.220669    1.551975   0.32E-06   0.17E-03
+     0.300000    1.215599    1.468008   0.55E-05   0.27E-03
+     0.400000    1.208526    1.155919   0.22E-05   0.13E-02
+     0.500000    1.199497    1.721561   0.88E-06   0.35E-03
+     0.600000    1.188564    1.025537   0.74E-05   0.20E-02
+     0.700000    1.175763    1.622485   0.12E-05   0.27E-03
+     0.800000    1.161186    1.374900   0.25E-06   0.27E-03
+     0.900000    1.144904    1.246450   0.11E-06   0.69E-03
+     1.000000    1.127010    1.691322   0.54E-06   0.52E-03
+     1.100000    1.107615    1.002500   0.54E-05   0.20E-02
+     1.200000    1.086818    1.677003   0.21E-05   0.55E-03
+     1.300000    1.064782    1.278198   0.55E-05   0.42E-03
+     1.400000    1.041624    1.342655   0.14E-05   0.20E-03
+     1.500000    1.017531    1.642375   0.74E-06   0.56E-03
+     1.600000    0.992677    1.013911   0.34E-05   0.18E-02
+     1.700000    0.967249    1.713353   0.35E-05   0.71E-03
+     1.800000    0.941493    1.184579   0.54E-05   0.71E-03
+     1.900000    0.915615    1.437305   0.24E-05   0.16E-03
+     2.000000    0.889904    1.576564   0.13E-05   0.52E-03
+     2.100000    0.864627    1.057868   0.15E-05   0.14E-02
+     2.200000    0.840087    1.730117   0.24E-05   0.80E-03
+     2.300000    0.816622    1.102136   0.58E-05   0.11E-02
+     2.400000    0.794543    1.524625   0.31E-05   0.43E-03
+     2.500000    0.774230    1.496597   0.22E-05   0.40E-03
+     2.600000    0.756013    1.127800   0.77E-07   0.94E-03
+     2.700000    0.740244    1.726696   0.18E-05   0.84E-03
+     2.800000    0.727253    1.039861   0.53E-05   0.15E-02
+     2.900000    0.717298    1.600138   0.32E-05   0.62E-03
+     3.000000    0.710633    1.406200   0.30E-05   0.18E-03
+     3.100000    0.707411    1.214845   0.12E-05   0.49E-03
+     3.200000    0.707708    1.703196   0.12E-05   0.83E-03
+     3.300000    0.711524    1.006102   0.44E-05   0.17E-02
+     3.400000    0.718746    1.660466   0.34E-05   0.76E-03
+     3.500000    0.729231    1.310194   0.41E-05   0.93E-04
+     3.600000    0.742710    1.310190   0.22E-05   0.11E-03
+     3.700000    0.758913    1.660462   0.47E-06   0.77E-03
+     3.800000    0.777509    1.006087   0.31E-05   0.17E-02
+     3.900000    0.798140    1.703188   0.39E-05   0.83E-03
+     4.000000    0.820479    1.214819   0.46E-05   0.45E-03
+     4.100000    0.844147    1.406163   0.28E-05   0.20E-03
+     4.200000    0.868833    1.600102   0.42E-06   0.67E-03
+     4.300000    0.894205    1.039813   0.15E-05   0.14E-02
+     4.400000    0.919961    1.726651   0.28E-05   0.88E-03
+     4.500000    0.945839    1.127737   0.53E-05   0.86E-03
+     4.600000    0.971554    1.496541   0.33E-05   0.43E-03
+     4.700000    0.996899    1.524547   0.14E-05   0.52E-03
+     4.800000    1.021641    1.102066   0.86E-07   0.10E-02
+     4.900000    1.045587    1.730025   0.20E-05   0.90E-03
+     5.000000    1.068570    1.057773   0.53E-05   0.13E-02
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    2501, nstf =  250100
-   u error = 0.348E-05, v error = 0.953E-03, total error = 0.674E-03
-   Total RHS evals: Fs =    7143, Ff =  755303
+   u error =  0.348E-05, v error =  0.953E-03, total error =  0.674E-03
+   Total RHS evals: Fs =    7143, Ff =  750350
    Slow Newton iters =    4641
    Slow Newton conv fails =       0
    Slow Jacobian evals =     126
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_5_0.002.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_5_0.002.out
index 8cac37fa66..48dd3ab5e5 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_5_0.002.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_5_0.002.out
@@ -8,59 +8,59 @@
     solver: exp-4/exp-4 (MRI-GARK-ERK45a / ERK-4-4)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.18E-09  0.11E-10
-     0.200000    1.220669    1.551800  0.18E-09  0.21E-10
-     0.300000    1.215594    1.467737  0.17E-09  0.31E-10
-     0.400000    1.208524    1.154583  0.17E-09  0.39E-10
-     0.500000    1.199496    1.721908  0.17E-09  0.47E-10
-     0.600000    1.188557    1.023517  0.16E-09  0.53E-10
-     0.700000    1.175764    1.622751  0.16E-09  0.59E-10
-     0.800000    1.161186    1.374632  0.15E-09  0.63E-10
-     0.900000    1.144904    1.245763  0.14E-09  0.66E-10
-     1.000000    1.127010    1.691839  0.13E-09  0.69E-10
-     1.100000    1.107609    1.000489  0.12E-09  0.71E-10
-     1.200000    1.086821    1.677552  0.11E-09  0.72E-10
-     1.300000    1.064777    1.277775  0.99E-10  0.72E-10
-     1.400000    1.041625    1.342455  0.85E-10  0.71E-10
-     1.500000    1.017531    1.642940  0.69E-10  0.70E-10
-     1.600000    0.992673    1.012112  0.52E-10  0.67E-10
-     1.700000    0.967253    1.714058  0.34E-10  0.63E-10
-     1.800000    0.941488    1.183867  0.13E-10  0.59E-10
-     1.900000    0.915617    1.437465  0.91E-11  0.53E-10
-     2.000000    0.889903    1.577082  0.33E-10  0.47E-10
-     2.100000    0.864625    1.056467  0.59E-10  0.36E-10
-     2.200000    0.840089    1.730920  0.87E-10  0.32E-10
-     2.300000    0.816616    1.101047  0.12E-09  0.19E-10
-     2.400000    0.794546    1.525051  0.15E-09  0.11E-10
-     2.500000    0.774227    1.496993  0.18E-09  0.12E-11
-     2.600000    0.756013    1.126857  0.21E-09  0.16E-10
-     2.700000    0.740246    1.727536  0.24E-09  0.25E-10
-     2.800000    0.727247    1.038393  0.26E-09  0.44E-10
-     2.900000    0.717301    1.600759  0.28E-09  0.54E-10
-     3.000000    0.710636    1.406380  0.30E-09  0.69E-10
-     3.100000    0.707412    1.214353  0.31E-09  0.84E-10
-     3.200000    0.707709    1.704026  0.31E-09  0.93E-10
-     3.300000    0.711520    1.004391  0.30E-09  0.11E-09
-     3.400000    0.718750    1.661225  0.29E-09  0.11E-09
-     3.500000    0.729227    1.310102  0.27E-09  0.12E-09
-     3.600000    0.742712    1.310080  0.24E-09  0.13E-09
-     3.700000    0.758914    1.661237  0.22E-09  0.13E-09
-     3.800000    0.777506    1.004387  0.19E-09  0.13E-09
-     3.900000    0.798144    1.704019  0.15E-09  0.13E-09
-     4.000000    0.820474    1.214374  0.12E-09  0.13E-09
-     4.100000    0.844149    1.406358  0.94E-10  0.12E-09
-     4.200000    0.868832    1.600774  0.65E-10  0.11E-09
-     4.300000    0.894204    1.038382  0.39E-10  0.11E-09
-     4.400000    0.919964    1.727533  0.14E-10  0.97E-10
-     4.500000    0.945834    1.126875  0.89E-11  0.91E-10
-     4.600000    0.971557    1.496974  0.30E-10  0.79E-10
-     4.700000    0.996898    1.525070  0.49E-10  0.69E-10
-     4.800000    1.021641    1.101030  0.67E-10  0.61E-10
-     4.900000    1.045589    1.730922  0.83E-10  0.47E-10
-     5.000000    1.068565    1.056480  0.97E-10  0.40E-10
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.18E-09   0.11E-10
+     0.200000    1.220669    1.551800   0.18E-09   0.21E-10
+     0.300000    1.215594    1.467737   0.17E-09   0.31E-10
+     0.400000    1.208524    1.154583   0.17E-09   0.39E-10
+     0.500000    1.199496    1.721908   0.17E-09   0.47E-10
+     0.600000    1.188557    1.023517   0.16E-09   0.53E-10
+     0.700000    1.175764    1.622751   0.16E-09   0.59E-10
+     0.800000    1.161186    1.374632   0.15E-09   0.63E-10
+     0.900000    1.144904    1.245763   0.14E-09   0.66E-10
+     1.000000    1.127010    1.691839   0.13E-09   0.69E-10
+     1.100000    1.107609    1.000489   0.12E-09   0.71E-10
+     1.200000    1.086821    1.677552   0.11E-09   0.72E-10
+     1.300000    1.064777    1.277775   0.99E-10   0.72E-10
+     1.400000    1.041625    1.342455   0.85E-10   0.71E-10
+     1.500000    1.017531    1.642940   0.69E-10   0.70E-10
+     1.600000    0.992673    1.012112   0.52E-10   0.67E-10
+     1.700000    0.967253    1.714058   0.34E-10   0.63E-10
+     1.800000    0.941488    1.183867   0.13E-10   0.59E-10
+     1.900000    0.915617    1.437465   0.91E-11   0.53E-10
+     2.000000    0.889903    1.577082   0.33E-10   0.47E-10
+     2.100000    0.864625    1.056467   0.59E-10   0.36E-10
+     2.200000    0.840089    1.730920   0.87E-10   0.32E-10
+     2.300000    0.816616    1.101047   0.12E-09   0.20E-10
+     2.400000    0.794546    1.525051   0.15E-09   0.78E-11
+     2.500000    0.774227    1.496993   0.18E-09   0.25E-11
+     2.600000    0.756013    1.126857   0.21E-09   0.20E-10
+     2.700000    0.740246    1.727536   0.24E-09   0.23E-10
+     2.800000    0.727247    1.038393   0.26E-09   0.42E-10
+     2.900000    0.717301    1.600759   0.28E-09   0.59E-10
+     3.000000    0.710636    1.406380   0.30E-09   0.62E-10
+     3.100000    0.707412    1.214353   0.31E-09   0.92E-10
+     3.200000    0.707709    1.704026   0.31E-09   0.87E-10
+     3.300000    0.711520    1.004391   0.30E-09   0.11E-09
+     3.400000    0.718750    1.661225   0.29E-09   0.12E-09
+     3.500000    0.729227    1.310102   0.27E-09   0.11E-09
+     3.600000    0.742712    1.310080   0.24E-09   0.14E-09
+     3.700000    0.758914    1.661237   0.22E-09   0.12E-09
+     3.800000    0.777506    1.004387   0.19E-09   0.14E-09
+     3.900000    0.798144    1.704019   0.15E-09   0.13E-09
+     4.000000    0.820474    1.214374   0.12E-09   0.12E-09
+     4.100000    0.844149    1.406358   0.94E-10   0.14E-09
+     4.200000    0.868832    1.600774   0.65E-10   0.99E-10
+     4.300000    0.894204    1.038382   0.39E-10   0.12E-09
+     4.400000    0.919964    1.727533   0.14E-10   0.96E-10
+     4.500000    0.945834    1.126875   0.89E-11   0.80E-10
+     4.600000    0.971557    1.496974   0.30E-10   0.98E-10
+     4.700000    0.996898    1.525070   0.49E-10   0.49E-10
+     4.800000    1.021641    1.101030   0.67E-10   0.78E-10
+     4.900000    1.045589    1.730922   0.83E-10   0.39E-10
+     5.000000    1.068565    1.056480   0.97E-10   0.32E-10
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    2501, nstf =  250100
-   u error = 0.166E-09, v error = 0.768E-10, total error = 0.130E-09
-   Total RHS evals: Fs =   12506, Ff = 1002903
+   u error =  0.166E-09, v error =  0.771E-10, total error =  0.130E-09
+   Total RHS evals: Fs =   12506, Ff = 1000450
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_6_0.005.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_6_0.005.out
index 865cfee2de..fa764c5633 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_6_0.005.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_6_0.005.out
@@ -8,59 +8,59 @@
     solver: exp-4/exp-3 (MRI-GARK-ERK45a / ERK-3-3)
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.81E-08  0.46E-09
-     0.200000    1.220669    1.551800  0.80E-08  0.90E-09
-     0.300000    1.215594    1.467737  0.79E-08  0.13E-08
-     0.400000    1.208524    1.154583  0.78E-08  0.17E-08
-     0.500000    1.199496    1.721908  0.76E-08  0.20E-08
-     0.600000    1.188557    1.023517  0.74E-08  0.22E-08
-     0.700000    1.175764    1.622751  0.71E-08  0.25E-08
-     0.800000    1.161186    1.374632  0.68E-08  0.27E-08
-     0.900000    1.144904    1.245763  0.65E-08  0.28E-08
-     1.000000    1.127010    1.691839  0.61E-08  0.29E-08
-     1.100000    1.107609    1.000489  0.56E-08  0.30E-08
-     1.200000    1.086821    1.677552  0.51E-08  0.30E-08
-     1.300000    1.064777    1.277775  0.45E-08  0.30E-08
-     1.400000    1.041625    1.342455  0.39E-08  0.30E-08
-     1.500000    1.017531    1.642940  0.32E-08  0.29E-08
-     1.600000    0.992673    1.012112  0.24E-08  0.28E-08
-     1.700000    0.967253    1.714058  0.15E-08  0.27E-08
-     1.800000    0.941488    1.183867  0.61E-09  0.25E-08
-     1.900000    0.915617    1.437465  0.40E-09  0.23E-08
-     2.000000    0.889903    1.577082  0.15E-08  0.20E-08
-     2.100000    0.864625    1.056467  0.27E-08  0.17E-08
-     2.200000    0.840089    1.730920  0.39E-08  0.13E-08
-     2.300000    0.816616    1.101047  0.53E-08  0.90E-09
-     2.400000    0.794546    1.525051  0.67E-08  0.45E-09
-     2.500000    0.774227    1.496993  0.80E-08  0.42E-10
-     2.600000    0.756013    1.126857  0.94E-08  0.57E-09
-     2.700000    0.740246    1.727536  0.11E-07  0.11E-08
-     2.800000    0.727247    1.038393  0.12E-07  0.17E-08
-     2.900000    0.717301    1.600759  0.13E-07  0.23E-08
-     3.000000    0.710636    1.406380  0.14E-07  0.29E-08
-     3.100000    0.707412    1.214353  0.14E-07  0.35E-08
-     3.200000    0.707709    1.704026  0.14E-07  0.40E-08
-     3.300000    0.711520    1.004391  0.14E-07  0.44E-08
-     3.400000    0.718750    1.661225  0.13E-07  0.48E-08
-     3.500000    0.729227    1.310102  0.12E-07  0.52E-08
-     3.600000    0.742712    1.310080  0.11E-07  0.54E-08
-     3.700000    0.758914    1.661237  0.98E-08  0.55E-08
-     3.800000    0.777506    1.004387  0.84E-08  0.55E-08
-     3.900000    0.798144    1.704019  0.70E-08  0.55E-08
-     4.000000    0.820474    1.214374  0.56E-08  0.53E-08
-     4.100000    0.844149    1.406358  0.43E-08  0.51E-08
-     4.200000    0.868832    1.600774  0.30E-08  0.49E-08
-     4.300000    0.894204    1.038382  0.18E-08  0.45E-08
-     4.400000    0.919964    1.727533  0.65E-09  0.42E-08
-     4.500000    0.945834    1.126875  0.39E-09  0.38E-08
-     4.600000    0.971557    1.496974  0.14E-08  0.34E-08
-     4.700000    0.996898    1.525070  0.22E-08  0.29E-08
-     4.800000    1.021641    1.101030  0.30E-08  0.25E-08
-     4.900000    1.045589    1.730922  0.37E-08  0.21E-08
-     5.000000    1.068565    1.056480  0.44E-08  0.16E-08
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.81E-08   0.46E-09
+     0.200000    1.220669    1.551800   0.80E-08   0.90E-09
+     0.300000    1.215594    1.467737   0.79E-08   0.13E-08
+     0.400000    1.208524    1.154583   0.78E-08   0.17E-08
+     0.500000    1.199496    1.721908   0.76E-08   0.20E-08
+     0.600000    1.188557    1.023517   0.74E-08   0.22E-08
+     0.700000    1.175764    1.622751   0.71E-08   0.25E-08
+     0.800000    1.161186    1.374632   0.68E-08   0.27E-08
+     0.900000    1.144904    1.245763   0.65E-08   0.28E-08
+     1.000000    1.127010    1.691839   0.61E-08   0.29E-08
+     1.100000    1.107609    1.000489   0.56E-08   0.30E-08
+     1.200000    1.086821    1.677552   0.51E-08   0.30E-08
+     1.300000    1.064777    1.277775   0.45E-08   0.30E-08
+     1.400000    1.041625    1.342455   0.39E-08   0.30E-08
+     1.500000    1.017531    1.642940   0.32E-08   0.29E-08
+     1.600000    0.992673    1.012112   0.24E-08   0.28E-08
+     1.700000    0.967253    1.714058   0.15E-08   0.27E-08
+     1.800000    0.941488    1.183867   0.61E-09   0.25E-08
+     1.900000    0.915617    1.437465   0.40E-09   0.23E-08
+     2.000000    0.889903    1.577082   0.15E-08   0.20E-08
+     2.100000    0.864625    1.056467   0.27E-08   0.17E-08
+     2.200000    0.840089    1.730920   0.39E-08   0.13E-08
+     2.300000    0.816616    1.101047   0.53E-08   0.90E-09
+     2.400000    0.794546    1.525051   0.67E-08   0.45E-09
+     2.500000    0.774227    1.496993   0.80E-08   0.39E-10
+     2.600000    0.756013    1.126857   0.94E-08   0.57E-09
+     2.700000    0.740246    1.727536   0.11E-07   0.11E-08
+     2.800000    0.727247    1.038393   0.12E-07   0.17E-08
+     2.900000    0.717301    1.600759   0.13E-07   0.23E-08
+     3.000000    0.710636    1.406380   0.14E-07   0.29E-08
+     3.100000    0.707412    1.214353   0.14E-07   0.35E-08
+     3.200000    0.707709    1.704026   0.14E-07   0.40E-08
+     3.300000    0.711520    1.004391   0.14E-07   0.44E-08
+     3.400000    0.718750    1.661225   0.13E-07   0.48E-08
+     3.500000    0.729227    1.310102   0.12E-07   0.52E-08
+     3.600000    0.742712    1.310080   0.11E-07   0.54E-08
+     3.700000    0.758914    1.661237   0.98E-08   0.55E-08
+     3.800000    0.777506    1.004387   0.84E-08   0.55E-08
+     3.900000    0.798144    1.704019   0.70E-08   0.55E-08
+     4.000000    0.820474    1.214374   0.56E-08   0.53E-08
+     4.100000    0.844149    1.406358   0.43E-08   0.51E-08
+     4.200000    0.868832    1.600774   0.30E-08   0.49E-08
+     4.300000    0.894204    1.038382   0.18E-08   0.45E-08
+     4.400000    0.919964    1.727533   0.65E-09   0.42E-08
+     4.500000    0.945834    1.126875   0.39E-09   0.38E-08
+     4.600000    0.971557    1.496974   0.14E-08   0.34E-08
+     4.700000    0.996898    1.525070   0.22E-08   0.29E-08
+     4.800000    1.021641    1.101030   0.30E-08   0.25E-08
+     4.900000    1.045589    1.730922   0.37E-08   0.21E-08
+     5.000000    1.068565    1.056480   0.44E-08   0.16E-08
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    1001, nstf =  100100
-   u error = 0.757E-08, v error = 0.324E-08, total error = 0.582E-08
-   Total RHS evals: Fs =    5006, Ff =  301303
+   u error =  0.757E-08, v error =  0.324E-08, total error =  0.582E-08
+   Total RHS evals: Fs =    5006, Ff =  300350
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_7_0.001.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_7_0.001.out
index 003c14af6c..925d9c3474 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_7_0.001.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_7_0.001.out
@@ -9,62 +9,62 @@
     reltol:   0.1000E-08 abstol:   0.1000E-10
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.40E-09  0.57E-10
-     0.200000    1.220669    1.551800  0.41E-09  0.11E-09
-     0.300000    1.215594    1.467737  0.39E-09  0.16E-09
-     0.400000    1.208524    1.154583  0.39E-09  0.20E-09
-     0.500000    1.199496    1.721908  0.38E-09  0.24E-09
-     0.600000    1.188557    1.023517  0.38E-09  0.27E-09
-     0.700000    1.175764    1.622751  0.35E-09  0.30E-09
-     0.800000    1.161186    1.374632  0.34E-09  0.32E-09
-     0.900000    1.144904    1.245763  0.32E-09  0.34E-09
-     1.000000    1.127010    1.691839  0.30E-09  0.36E-09
-     1.100000    1.107609    1.000489  0.28E-09  0.37E-09
-     1.200000    1.086821    1.677552  0.25E-09  0.37E-09
-     1.300000    1.064777    1.277775  0.23E-09  0.37E-09
-     1.400000    1.041625    1.342455  0.20E-09  0.36E-09
-     1.500000    1.017531    1.642940  0.16E-09  0.35E-09
-     1.600000    0.992673    1.012112  0.12E-09  0.34E-09
-     1.700000    0.967253    1.714058  0.78E-10  0.32E-09
-     1.800000    0.941488    1.183867  0.35E-10  0.30E-09
-     1.900000    0.915617    1.437465  0.17E-10  0.27E-09
-     2.000000    0.889903    1.577082  0.70E-10  0.23E-09
-     2.100000    0.864625    1.056467  0.13E-09  0.20E-09
-     2.200000    0.840089    1.730920  0.20E-09  0.15E-09
-     2.300000    0.816616    1.101047  0.26E-09  0.10E-09
-     2.400000    0.794546    1.525051  0.33E-09  0.45E-10
-     2.500000    0.774227    1.496993  0.40E-09  0.20E-10
-     2.600000    0.756013    1.126857  0.47E-09  0.82E-10
-     2.700000    0.740246    1.727536  0.54E-09  0.15E-09
-     2.800000    0.727247    1.038393  0.59E-09  0.22E-09
-     2.900000    0.717301    1.600759  0.75E-09  0.30E-09
-     3.000000    0.710636    1.406380  0.67E-09  0.37E-09
-     3.100000    0.707412    1.214353  0.69E-09  0.43E-09
-     3.200000    0.707709    1.704026  0.70E-09  0.50E-09
-     3.300000    0.711520    1.004391  0.68E-09  0.55E-09
-     3.400000    0.718750    1.661225  0.65E-09  0.60E-09
-     3.500000    0.729227    1.310102  0.60E-09  0.63E-09
-     3.600000    0.742712    1.310080  0.55E-09  0.65E-09
-     3.700000    0.758914    1.661237  0.50E-09  0.68E-09
-     3.800000    0.777506    1.004387  0.42E-09  0.67E-09
-     3.900000    0.798144    1.704019  0.35E-09  0.67E-09
-     4.000000    0.820474    1.214374  0.29E-09  0.65E-09
-     4.100000    0.844149    1.406358  0.26E-09  0.62E-09
-     4.200000    0.868832    1.600774  0.15E-09  0.58E-09
-     4.300000    0.894204    1.038382  0.92E-10  0.56E-09
-     4.400000    0.919964    1.727533  0.36E-10  0.49E-09
-     4.500000    0.945834    1.126875  0.14E-10  0.47E-09
-     4.600000    0.971557    1.496974  0.63E-10  0.40E-09
-     4.700000    0.996898    1.525070  0.10E-09  0.35E-09
-     4.800000    1.021641    1.101030  0.15E-09  0.31E-09
-     4.900000    1.045589    1.730922  0.19E-09  0.23E-09
-     5.000000    1.068565    1.056480  0.39E-10  0.21E-09
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.40E-09   0.57E-10
+     0.200000    1.220669    1.551800   0.41E-09   0.11E-09
+     0.300000    1.215594    1.467737   0.39E-09   0.16E-09
+     0.400000    1.208524    1.154583   0.39E-09   0.20E-09
+     0.500000    1.199496    1.721908   0.38E-09   0.24E-09
+     0.600000    1.188557    1.023517   0.38E-09   0.27E-09
+     0.700000    1.175764    1.622751   0.35E-09   0.30E-09
+     0.800000    1.161186    1.374632   0.34E-09   0.32E-09
+     0.900000    1.144904    1.245763   0.32E-09   0.34E-09
+     1.000000    1.127010    1.691839   0.30E-09   0.36E-09
+     1.100000    1.107609    1.000489   0.28E-09   0.37E-09
+     1.200000    1.086821    1.677552   0.25E-09   0.37E-09
+     1.300000    1.064777    1.277775   0.23E-09   0.37E-09
+     1.400000    1.041625    1.342455   0.20E-09   0.36E-09
+     1.500000    1.017531    1.642940   0.16E-09   0.35E-09
+     1.600000    0.992673    1.012112   0.12E-09   0.34E-09
+     1.700000    0.967253    1.714058   0.78E-10   0.32E-09
+     1.800000    0.941488    1.183867   0.35E-10   0.30E-09
+     1.900000    0.915617    1.437465   0.17E-10   0.27E-09
+     2.000000    0.889903    1.577082   0.70E-10   0.23E-09
+     2.100000    0.864625    1.056467   0.13E-09   0.20E-09
+     2.200000    0.840089    1.730920   0.20E-09   0.15E-09
+     2.300000    0.816616    1.101047   0.26E-09   0.10E-09
+     2.400000    0.794546    1.525051   0.33E-09   0.45E-10
+     2.500000    0.774227    1.496993   0.40E-09   0.20E-10
+     2.600000    0.756013    1.126857   0.47E-09   0.82E-10
+     2.700000    0.740246    1.727536   0.54E-09   0.15E-09
+     2.800000    0.727247    1.038393   0.59E-09   0.22E-09
+     2.900000    0.717301    1.600759   0.75E-09   0.30E-09
+     3.000000    0.710636    1.406380   0.67E-09   0.37E-09
+     3.100000    0.707412    1.214353   0.69E-09   0.43E-09
+     3.200000    0.707709    1.704026   0.70E-09   0.50E-09
+     3.300000    0.711520    1.004391   0.68E-09   0.55E-09
+     3.400000    0.718750    1.661225   0.65E-09   0.60E-09
+     3.500000    0.729227    1.310102   0.60E-09   0.63E-09
+     3.600000    0.742712    1.310080   0.55E-09   0.65E-09
+     3.700000    0.758914    1.661237   0.50E-09   0.68E-09
+     3.800000    0.777506    1.004387   0.42E-09   0.67E-09
+     3.900000    0.798144    1.704019   0.35E-09   0.67E-09
+     4.000000    0.820474    1.214374   0.29E-09   0.65E-09
+     4.100000    0.844149    1.406358   0.26E-09   0.62E-09
+     4.200000    0.868832    1.600774   0.15E-09   0.58E-09
+     4.300000    0.894204    1.038382   0.92E-10   0.56E-09
+     4.400000    0.919964    1.727533   0.36E-10   0.49E-09
+     4.500000    0.945834    1.126875   0.14E-10   0.47E-09
+     4.600000    0.971557    1.496974   0.63E-10   0.40E-09
+     4.700000    0.996898    1.525070   0.10E-09   0.35E-09
+     4.800000    1.021641    1.101030   0.15E-09   0.31E-09
+     4.900000    1.045589    1.730922   0.19E-09   0.23E-09
+     5.000000    1.068565    1.056480   0.39E-10   0.21E-09
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    5000, nstf =  510000
-   u error = 0.380E-09, v error = 0.394E-09, total error = 0.387E-09
-   Total RHS evals: Fs =   45313, Ff = 1550001
+   u error =  0.380E-09, v error =  0.394E-09, total error =  0.387E-09
+   Total RHS evals: Fs =   45313, Ff = 1530050
    Slow Newton iters =   30312
    Slow Newton conv fails =       0
    Slow Jacobian evals =     250
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_8_0.001.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_8_0.001.out
index f008ab179f..bd101638aa 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_8_0.001.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_8_0.001.out
@@ -9,62 +9,62 @@
     reltol:   0.1000E-08 abstol:   0.1000E-10
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.28E-09  0.26E-10
-     0.200000    1.220669    1.551800  0.18E-09  0.48E-10
-     0.300000    1.215594    1.467737  0.19E-09  0.69E-10
-     0.400000    1.208524    1.154583  0.18E-09  0.88E-10
-     0.500000    1.199496    1.721908  0.18E-09  0.10E-09
-     0.600000    1.188557    1.023517  0.17E-09  0.12E-09
-     0.700000    1.175764    1.622751  0.17E-09  0.13E-09
-     0.800000    1.161186    1.374632  0.16E-09  0.14E-09
-     0.900000    1.144904    1.245763  0.15E-09  0.15E-09
-     1.000000    1.127010    1.691839  0.14E-09  0.15E-09
-     1.100000    1.107609    1.000489  0.13E-09  0.15E-09
-     1.200000    1.086821    1.677552  0.12E-09  0.16E-09
-     1.300000    1.064777    1.277775  0.11E-09  0.15E-09
-     1.400000    1.041625    1.342455  0.91E-10  0.15E-09
-     1.500000    1.017531    1.642940  0.70E-10  0.15E-09
-     1.600000    0.992673    1.012112  0.53E-10  0.14E-09
-     1.700000    0.967253    1.714058  0.32E-10  0.14E-09
-     1.800000    0.941488    1.183867  0.16E-10  0.12E-09
-     1.900000    0.915617    1.437465  0.11E-10  0.11E-09
-     2.000000    0.889903    1.577082  0.36E-10  0.99E-10
-     2.100000    0.864625    1.056467  0.66E-10  0.79E-10
-     2.200000    0.840089    1.730920  0.10E-09  0.64E-10
-     2.300000    0.816616    1.101047  0.13E-09  0.38E-10
-     2.400000    0.794546    1.525051  0.16E-09  0.17E-10
-     2.500000    0.774227    1.496993  0.19E-09  0.94E-11
-     2.600000    0.756013    1.126857  0.22E-09  0.40E-10
-     2.700000    0.740246    1.727536  0.26E-09  0.65E-10
-     2.800000    0.727247    1.038393  0.28E-09  0.10E-09
-     2.900000    0.717301    1.600759  0.30E-09  0.13E-09
-     3.000000    0.710636    1.406380  0.32E-09  0.16E-09
-     3.100000    0.707412    1.214353  0.33E-09  0.19E-09
-     3.200000    0.707709    1.704026  0.33E-09  0.21E-09
-     3.300000    0.711520    1.004391  0.32E-09  0.24E-09
-     3.400000    0.718750    1.661225  0.30E-09  0.25E-09
-     3.500000    0.729227    1.310102  0.29E-09  0.27E-09
-     3.600000    0.742712    1.310080  0.26E-09  0.28E-09
-     3.700000    0.758914    1.661237  0.22E-09  0.28E-09
-     3.800000    0.777506    1.004387  0.19E-09  0.29E-09
-     3.900000    0.798144    1.704019  0.16E-09  0.28E-09
-     4.000000    0.820474    1.214374  0.13E-09  0.27E-09
-     4.100000    0.844149    1.406358  0.97E-10  0.27E-09
-     4.200000    0.868832    1.600774  0.66E-10  0.26E-09
-     4.300000    0.894204    1.038382  0.38E-10  0.22E-09
-     4.400000    0.919964    1.727533  0.94E-11  0.23E-09
-     4.500000    0.945834    1.126875  0.10E-10  0.18E-09
-     4.600000    0.971557    1.496974  0.33E-10  0.17E-09
-     4.700000    0.996898    1.525070  0.50E-10  0.15E-09
-     4.800000    1.021641    1.101030  0.72E-10  0.11E-09
-     4.900000    1.045589    1.730922  0.93E-10  0.11E-09
-     5.000000    1.068565    1.056480  0.11E-09  0.64E-10
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.28E-09   0.26E-10
+     0.200000    1.220669    1.551800   0.18E-09   0.48E-10
+     0.300000    1.215594    1.467737   0.19E-09   0.69E-10
+     0.400000    1.208524    1.154583   0.18E-09   0.88E-10
+     0.500000    1.199496    1.721908   0.18E-09   0.10E-09
+     0.600000    1.188557    1.023517   0.17E-09   0.12E-09
+     0.700000    1.175764    1.622751   0.17E-09   0.13E-09
+     0.800000    1.161186    1.374632   0.16E-09   0.14E-09
+     0.900000    1.144904    1.245763   0.15E-09   0.15E-09
+     1.000000    1.127010    1.691839   0.14E-09   0.15E-09
+     1.100000    1.107609    1.000489   0.13E-09   0.15E-09
+     1.200000    1.086821    1.677552   0.12E-09   0.16E-09
+     1.300000    1.064777    1.277775   0.11E-09   0.15E-09
+     1.400000    1.041625    1.342455   0.91E-10   0.15E-09
+     1.500000    1.017531    1.642940   0.70E-10   0.15E-09
+     1.600000    0.992673    1.012112   0.53E-10   0.14E-09
+     1.700000    0.967253    1.714058   0.32E-10   0.14E-09
+     1.800000    0.941488    1.183867   0.16E-10   0.12E-09
+     1.900000    0.915617    1.437465   0.11E-10   0.11E-09
+     2.000000    0.889903    1.577082   0.36E-10   0.99E-10
+     2.100000    0.864625    1.056467   0.66E-10   0.79E-10
+     2.200000    0.840089    1.730920   0.10E-09   0.64E-10
+     2.300000    0.816616    1.101047   0.13E-09   0.38E-10
+     2.400000    0.794546    1.525051   0.16E-09   0.17E-10
+     2.500000    0.774227    1.496993   0.19E-09   0.94E-11
+     2.600000    0.756013    1.126857   0.22E-09   0.40E-10
+     2.700000    0.740246    1.727536   0.26E-09   0.65E-10
+     2.800000    0.727247    1.038393   0.28E-09   0.10E-09
+     2.900000    0.717301    1.600759   0.30E-09   0.13E-09
+     3.000000    0.710636    1.406380   0.32E-09   0.16E-09
+     3.100000    0.707412    1.214353   0.33E-09   0.19E-09
+     3.200000    0.707709    1.704026   0.33E-09   0.21E-09
+     3.300000    0.711520    1.004391   0.32E-09   0.24E-09
+     3.400000    0.718750    1.661225   0.30E-09   0.25E-09
+     3.500000    0.729227    1.310102   0.29E-09   0.27E-09
+     3.600000    0.742712    1.310080   0.26E-09   0.28E-09
+     3.700000    0.758914    1.661237   0.22E-09   0.28E-09
+     3.800000    0.777506    1.004387   0.19E-09   0.29E-09
+     3.900000    0.798144    1.704019   0.16E-09   0.28E-09
+     4.000000    0.820474    1.214374   0.13E-09   0.27E-09
+     4.100000    0.844149    1.406358   0.97E-10   0.27E-09
+     4.200000    0.868832    1.600774   0.66E-10   0.26E-09
+     4.300000    0.894204    1.038382   0.38E-10   0.22E-09
+     4.400000    0.919964    1.727533   0.94E-11   0.23E-09
+     4.500000    0.945834    1.126875   0.10E-10   0.18E-09
+     4.600000    0.971557    1.496974   0.34E-10   0.17E-09
+     4.700000    0.996898    1.525070   0.50E-10   0.15E-09
+     4.800000    1.021641    1.101030   0.72E-10   0.11E-09
+     4.900000    1.045589    1.730922   0.93E-10   0.11E-09
+     5.000000    1.068565    1.056480   0.11E-09   0.64E-10
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    5000, nstf =  510000
-   u error = 0.179E-09, v error = 0.168E-09, total error = 0.174E-09
-   Total RHS evals: Fse =   20001, Fsi =   50342, Ff = 1550001
+   u error =  0.179E-09, v error =  0.168E-09, total error =  0.174E-09
+   Total RHS evals: Fse =   20001, Fsi =   50342, Ff = 1530050
    Slow Newton iters =   30341
    Slow Newton conv fails =       0
    Slow Jacobian evals =     250
diff --git a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_9_0.001.out b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_9_0.001.out
index 0c898eea9d..6e504b619b 100644
--- a/examples/arkode/F2003_serial/ark_kpr_mri_f2003_9_0.001.out
+++ b/examples/arkode/F2003_serial/ark_kpr_mri_f2003_9_0.001.out
@@ -9,62 +9,62 @@
     reltol:   0.1000E-11 abstol:   0.1000E-13
          t           u           v       uerr      verr
     ------------------------------------------------------
-     0.000000    1.224745    1.732051  0.00E+00  0.00E+00
-     0.100000    1.223725    1.077464  0.16E-10  0.64E-12
-     0.200000    1.220669    1.551800  0.16E-10  0.68E-12
-     0.300000    1.215594    1.467737  0.15E-10  0.96E-12
-     0.400000    1.208524    1.154583  0.15E-10  0.92E-12
-     0.500000    1.199496    1.721908  0.16E-10  0.17E-11
-     0.600000    1.188557    1.023517  0.15E-10  0.34E-11
-     0.700000    1.175764    1.622751  0.14E-10  0.22E-11
-     0.800000    1.161186    1.374632  0.12E-10  0.28E-11
-     0.900000    1.144904    1.245763  0.11E-10  0.31E-11
-     1.000000    1.127010    1.691839  0.13E-10  0.22E-11
-     1.100000    1.107609    1.000489  0.11E-10  0.20E-11
-     1.200000    1.086821    1.677552  0.95E-11  0.25E-11
-     1.300000    1.064777    1.277775  0.76E-11  0.81E-13
-     1.400000    1.041625    1.342455  0.52E-11  0.62E-12
-     1.500000    1.017531    1.642940  0.60E-11  0.26E-11
-     1.600000    0.992673    1.012112  0.38E-11  0.14E-11
-     1.700000    0.967253    1.714058  0.33E-11  0.30E-11
-     1.800000    0.941488    1.183867  0.23E-12  0.36E-12
-     1.900000    0.915617    1.437465  0.33E-11  0.12E-11
-     2.000000    0.889903    1.577082  0.66E-11  0.19E-11
-     2.100000    0.864625    1.056467  0.79E-11  0.16E-11
-     2.200000    0.840089    1.730920  0.67E-11  0.25E-11
-     2.300000    0.816616    1.101047  0.12E-10  0.18E-11
-     2.400000    0.794546    1.525051  0.15E-10  0.57E-12
-     2.500000    0.774227    1.496993  0.18E-10  0.67E-13
-     2.600000    0.756013    1.126857  0.22E-10  0.27E-11
-     2.700000    0.740246    1.727536  0.20E-10  0.73E-12
-     2.800000    0.727247    1.038393  0.25E-10  0.40E-11
-     2.900000    0.717301    1.600759  0.27E-10  0.93E-12
-     3.000000    0.710636    1.406380  0.28E-10  0.26E-11
-     3.100000    0.707412    1.214353  0.29E-10  0.42E-11
-     3.200000    0.707709    1.704026  0.28E-10  0.15E-11
-     3.300000    0.711520    1.004391  0.28E-10  0.63E-11
-     3.400000    0.718750    1.661225  0.26E-10  0.24E-11
-     3.500000    0.729227    1.310102  0.24E-10  0.48E-11
-     3.600000    0.742712    1.310080  0.21E-10  0.50E-11
-     3.700000    0.758914    1.661237  0.20E-10  0.28E-11
-     3.800000    0.777506    1.004387  0.16E-10  0.70E-11
-     3.900000    0.798144    1.704019  0.14E-10  0.25E-11
-     4.000000    0.820474    1.214374  0.10E-10  0.54E-11
-     4.100000    0.844149    1.406358  0.65E-11  0.83E-11
-     4.200000    0.868832    1.600774  0.36E-11  0.11E-10
-     4.300000    0.894204    1.038382  0.16E-11  0.25E-12
-     4.400000    0.919964    1.727533  0.23E-11  0.12E-10
-     4.500000    0.945834    1.126875  0.23E-11  0.75E-12
-     4.600000    0.971557    1.496974  0.52E-11  0.69E-11
-     4.700000    0.996898    1.525070  0.85E-11  0.69E-11
-     4.800000    1.021641    1.101030  0.85E-11  0.16E-11
-     4.900000    1.045589    1.730922  0.61E-11  0.95E-11
-     5.000000    1.068565    1.056480  0.10E-10  0.34E-11
+     0.000000    1.224745    1.732051   0.00E+00   0.00E+00
+     0.100000    1.223725    1.077464   0.16E-10   0.64E-12
+     0.200000    1.220669    1.551800   0.16E-10   0.68E-12
+     0.300000    1.215594    1.467737   0.15E-10   0.96E-12
+     0.400000    1.208524    1.154583   0.15E-10   0.92E-12
+     0.500000    1.199496    1.721908   0.16E-10   0.17E-11
+     0.600000    1.188557    1.023517   0.15E-10   0.34E-11
+     0.700000    1.175764    1.622751   0.14E-10   0.22E-11
+     0.800000    1.161186    1.374632   0.12E-10   0.28E-11
+     0.900000    1.144904    1.245763   0.11E-10   0.31E-11
+     1.000000    1.127010    1.691839   0.13E-10   0.22E-11
+     1.100000    1.107609    1.000489   0.11E-10   0.21E-11
+     1.200000    1.086821    1.677552   0.95E-11   0.19E-11
+     1.300000    1.064777    1.277775   0.76E-11   0.19E-11
+     1.400000    1.041625    1.342455   0.52E-11   0.26E-11
+     1.500000    1.017531    1.642940   0.60E-11   0.58E-11
+     1.600000    0.992673    1.012112   0.38E-11   0.34E-11
+     1.700000    0.967253    1.714058   0.33E-11   0.27E-11
+     1.800000    0.941488    1.183867   0.24E-12   0.38E-11
+     1.900000    0.915617    1.437465   0.33E-11   0.58E-11
+     2.000000    0.889903    1.577082   0.66E-11   0.89E-11
+     2.100000    0.864625    1.056467   0.79E-11   0.74E-11
+     2.200000    0.840089    1.730920   0.67E-11   0.45E-11
+     2.300000    0.816616    1.101047   0.12E-10   0.30E-11
+     2.400000    0.794546    1.525051   0.15E-10   0.89E-11
+     2.500000    0.774227    1.496993   0.18E-10   0.11E-10
+     2.600000    0.756013    1.126857   0.22E-10   0.14E-10
+     2.700000    0.740246    1.727536   0.20E-10   0.69E-11
+     2.800000    0.727247    1.038393   0.25E-10   0.78E-12
+     2.900000    0.717301    1.600759   0.27E-10   0.11E-10
+     3.000000    0.710636    1.406380   0.28E-10   0.11E-10
+     3.100000    0.707412    1.214353   0.29E-10   0.20E-10
+     3.200000    0.707709    1.704026   0.28E-10   0.97E-11
+     3.300000    0.711520    1.004391   0.28E-10   0.71E-11
+     3.400000    0.718750    1.661225   0.26E-10   0.11E-10
+     3.500000    0.729227    1.310102   0.24E-10   0.11E-10
+     3.600000    0.742712    1.310080   0.21E-10   0.26E-10
+     3.700000    0.758914    1.661237   0.20E-10   0.14E-10
+     3.800000    0.777506    1.004387   0.16E-10   0.14E-10
+     3.900000    0.798144    1.704019   0.14E-10   0.60E-11
+     4.000000    0.820474    1.214374   0.10E-10   0.11E-10
+     4.100000    0.844149    1.406358   0.65E-11   0.30E-10
+     4.200000    0.868832    1.600774   0.36E-11   0.50E-11
+     4.300000    0.894204    1.038382   0.16E-11   0.10E-10
+     4.400000    0.919964    1.727533   0.23E-11   0.11E-10
+     4.500000    0.945834    1.126875   0.23E-11   0.55E-11
+     4.600000    0.971557    1.496974   0.52E-11   0.15E-10
+     4.700000    0.996898    1.525070   0.85E-11   0.77E-12
+     4.800000    1.021641    1.101030   0.85E-11   0.19E-11
+     4.900000    1.045589    1.730922   0.61E-11   0.88E-11
+     5.000000    1.068565    1.056480   0.10E-10   0.34E-11
     ------------------------------------------------------
  Final Solver Statistics:
    Steps: nsts =    5000, nstf =  510000
-   u error = 0.153E-10, v error = 0.419E-11, total error = 0.112E-10
-   Total RHS evals: Fse =   30001, Fsi =   82555, Ff = 2070001
+   u error =  0.153E-10, v error =  0.950E-11, total error =  0.127E-10
+   Total RHS evals: Fse =   30001, Fsi =   82555, Ff = 2040050
    Slow Newton iters =   52554
    Slow Newton conv fails =       0
    Slow Jacobian evals =     250
diff --git a/examples/nvector/test_nvector.c b/examples/nvector/test_nvector.c
index ea25cd569a..76cf153945 100644
--- a/examples/nvector/test_nvector.c
+++ b/examples/nvector/test_nvector.c
@@ -378,7 +378,7 @@ int Test_N_VGetArrayPointer(N_Vector W, sunindextype local_length, int myid)
   start_time = get_time();
   Wdata = N_VGetArrayPointer(W);
   stop_time = get_time();
-  Wdata++; Wdata=NULL; /* Do something with pointer to surpress warning */
+  Wdata[0] = ONE; /* Do something with pointer to surpress warning */
 
   /* check vector data */
   if (!has_data(W)) {
diff --git a/include/arkode/arkode_butcher.h b/include/arkode/arkode_butcher.h
index 1c842ebd40..6f3f5ae8ba 100644
--- a/include/arkode/arkode_butcher.h
+++ b/include/arkode/arkode_butcher.h
@@ -60,6 +60,7 @@ SUNDIALS_EXPORT void ARKodeButcherTable_Space(ARKodeButcherTable B,
 SUNDIALS_EXPORT void ARKodeButcherTable_Free(ARKodeButcherTable B);
 SUNDIALS_EXPORT void ARKodeButcherTable_Write(ARKodeButcherTable B,
                                               FILE *outfile);
+SUNDIALS_EXPORT sunbooleantype ARKodeButcherTable_IsStifflyAccurate(ARKodeButcherTable B);
 SUNDIALS_EXPORT int ARKodeButcherTable_CheckOrder(ARKodeButcherTable B, int *q,
                                                   int *p, FILE *outfile);
 SUNDIALS_EXPORT int ARKodeButcherTable_CheckARKOrder(ARKodeButcherTable B1,
diff --git a/scripts/updateOutFiles.py b/scripts/updateOutFiles.py
index dfcca35c3f..fd09a4edaf 100755
--- a/scripts/updateOutFiles.py
+++ b/scripts/updateOutFiles.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -----------------------------------------------------------------------------
 # Programmer(s): David J. Gardner @ LLNL
 # -----------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 # Script to update example output files for failed tests
 #
 # Example usage:
-#   $ ./updateOutFiles.py sundials/build sundials/examples
+#   $ ./updateOutFiles.py ../build ../.
 # -----------------------------------------------------------------------------
 
 # -----------------------------------------------------------------------------
@@ -28,13 +28,15 @@ def main():
 
     parser = argparse.ArgumentParser(description='Update output files')
 
-    parser.add_argument('build', type=str,
-                        help='Full path to build directory to read from')
-    parser.add_argument('examples', type=str,
-                        help='Full path to examples directory to write to')
+    parser.add_argument('source', type=str,
+                        help='Full path of build directory to read files from')
+    parser.add_argument('destination', type=str,
+                        help='Full path of sundials location to write files to')
     parser.add_argument('--all','-a', action='store_true',
                         help='Update all output files')
-    parser.add_argument('--verbose','-v', action='store_true',
+    parser.add_argument('--copy','-c', action='store_true',
+                        help='Copy file to destination if not found')
+    parser.add_argument('--verbose','-v', action='count', default=0,
                         help='Enable verbose output')
 
 
@@ -42,18 +44,18 @@ def main():
     args = parser.parse_args()
 
     # check inputs
-    if (not os.path.isdir(args.examples)):
-        print("Error: could not find {}".format(args.examples))
+    if (not os.path.isdir(args.source)):
+        print(f"Error: could not find {args.source}")
         return -1
 
-    if (not os.path.isdir(args.build)):
-        print("Error: could not find {}".format(args.build))
+    if (not os.path.isdir(args.destination)):
+        print(f"Error: could not find {args.destination}")
         return -1
 
     # check that the output directory exists
-    output = os.path.join(args.build, "Testing", "output")
+    output = os.path.join(args.source, "Testing", "output")
     if (not os.path.isdir(output)):
-        print("Error: could not find {}".format(output))
+        print(f"Error: could not find {output}")
         return -1
 
     # create a list of all test run or just the failed tests
@@ -65,7 +67,7 @@ def main():
             if f.endswith(".out"):
                 tests.append(f)
     else:
-        failed = os.path.join(args.build, "Testing", "Temporary", "LastTestsFailed.log")
+        failed = os.path.join(args.source, "Testing", "Temporary", "LastTestsFailed.log")
 
         # extract test names from list and append .out
         with open(failed, 'r') as f:
@@ -74,17 +76,35 @@ def main():
 
     # if failed tests were found update the output files
     if tests:
+        paths = [os.path.join(args.destination, "examples"),
+                 os.path.join(args.destination, "test", "unit_tests"),
+                 args.destination]
         for t in tests:
+            if (args.verbose > 0):
+                print(f"Searching for {t}")
             found = False
-            for root, dirs, files in os.walk(args.examples):
-                if t in files:
-                    if (args.verbose):
-                        print("Updating: {}".format(t))
-                    shutil.copy(os.path.join(output, t), os.path.join(root, t))
-                    found = True
+            for p in paths:
+                if (args.verbose == 2):
+                    print(f"  Looking in {p}")
+                for root, dirs, files in os.walk(p):
+                    if (args.verbose == 3):
+                        print(f"  Looking in {root}")
+                    if t in files:
+                        if (args.verbose == 1):
+                            print(f"  Found file in {root}")
+                        if (args.verbose > 1):
+                            print("  Found file")
+                        shutil.copy(os.path.join(output, t), os.path.join(root, t))
+                        found = True
+                        break
+                if found:
                     break
             if not found:
-                print("Warning: did not find {}".format(t))
+                if args.copy:
+                    print(f"Warning: did not find {t}, copying to {args.destination}")
+                    shutil.copy(os.path.join(output, t), os.path.join(args.destination, t))
+                else:
+                    print(f"Warning: did not find {t}")
 
 # -----------------------------------------------------------------------------
 # run the main routine
diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c
index 601abca7ae..d86cf7021c 100644
--- a/src/arkode/arkode.c
+++ b/src/arkode/arkode.c
@@ -135,13 +135,14 @@ ARKodeMem arkCreate(SUNContext sunctx)
 
   /* Initialize the interpolation structure to NULL */
   ark_mem->interp = NULL;
+  ark_mem->interp_type = -1;
 
   /* Initially, rwt should point to ewt */
   ark_mem->rwt_is_ewt = SUNTRUE;
 
-  /* Indicate that evaluation of the full RHS is not required after each step,
-     this flag is updated to SUNTRUE by the interpolation module initialization
-     function and/or the stepper initialization function in arkInitialSetup */
+  /* Indicate that calling the full RHS function is not required, this flag is
+     updated to SUNTRUE by the interpolation module initialization function
+     and/or the stepper initialization function in arkInitialSetup */
   ark_mem->call_fullrhs = SUNFALSE;
 
   /* Indicate that the problem needs to be initialized */
@@ -286,6 +287,7 @@ int arkResize(ARKodeMem ark_mem, N_Vector y0, realtype hscale,
 
   /* Copy y0 into ark_yn to set the current solution */
   N_VScale(ONE, y0, ark_mem->yn);
+  ark_mem->fn_is_current = SUNFALSE;
 
   /* Disable constraints */
   ark_mem->constraintsSet = SUNFALSE;
@@ -852,11 +854,11 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
            >0 => step encountered recoverable failure; reduce step if possible
            <0 => step encountered unrecoverable failure */
       kflag = ark_mem->step((void*) ark_mem, &dsm, &nflag);
-      if (kflag < 0)  break;
+      if (kflag < 0) break;
 
       /* handle solver convergence failures */
       kflag = arkCheckConvergence(ark_mem, &nflag, &ncf);
-      if (kflag < 0)  break;
+      if (kflag < 0) break;
 
       /* Perform relaxation:
            - computes relaxation parameter
@@ -979,7 +981,14 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
             SUNRabs(tout - ark_mem->tstop) <= troundoff)
         {
           if (ark_mem->tstopinterp) {
-            (void) arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
+            retval = arkGetDky(ark_mem, ark_mem->tstop, 0, yout);
+            if (retval != ARK_SUCCESS)
+            {
+              arkProcessError(ark_mem, retval, "ARKODE", "arkEvolve",
+                              MSG_ARK_INTERPOLATION_FAIL, ark_mem->tstop);
+              istate = retval;
+              break;
+            }
           } else {
             N_VScale(ONE, ark_mem->yn, yout);
           }
@@ -1000,11 +1009,19 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
 
     /* In NORMAL mode, check if tout reached */
     if ( (itask == ARK_NORMAL) &&
-         (ark_mem->tcur-tout)*ark_mem->h >= ZERO ) {
-      istate = ARK_SUCCESS;
+         (ark_mem->tcur-tout)*ark_mem->h >= ZERO )
+    {
+      retval = arkGetDky(ark_mem, tout, 0, yout);
+      if (retval != ARK_SUCCESS)
+      {
+        arkProcessError(ark_mem, retval, "ARKODE", "arkEvolve",
+                        MSG_ARK_INTERPOLATION_FAIL, tout);
+        istate = retval;
+        break;
+      }
       ark_mem->tretlast = *tret = tout;
-      (void) arkGetDky(ark_mem, tout, 0, yout);
       ark_mem->next_h = ark_mem->hprime;
+      istate = ARK_SUCCESS;
       break;
     }
 
@@ -1118,6 +1135,7 @@ void arkFree(void **arkode_mem)
   if (ark_mem->interp != NULL) {
     arkInterpFree(ark_mem, ark_mem->interp);
     ark_mem->interp = NULL;
+    ark_mem->interp_type = -1;
   }
 
   /* free the root-finding module */
@@ -1305,11 +1323,15 @@ int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
     }
 
     /* Create default Hermite interpolation module */
-    ark_mem->interp = arkInterpCreate_Hermite(ark_mem, ARK_INTERP_MAX_DEGREE);
-    if (ark_mem->interp == NULL) {
-      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkInit",
-                      "Unable to allocate interpolation module");
-      return(ARK_MEM_FAIL);
+    if (!(ark_mem->interp))
+    {
+      ark_mem->interp = arkInterpCreate_Hermite(ark_mem, ARK_INTERP_MAX_DEGREE);
+      if (ark_mem->interp == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkInit",
+                        "Unable to allocate interpolation module");
+        return(ARK_MEM_FAIL);
+      }
+      ark_mem->interp_type = ARK_INTERP_HERMITE;
     }
 
     /* All allocations are complete */
@@ -1325,6 +1347,7 @@ int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
 
   /* Initialize yn */
   N_VScale(ONE, y0, ark_mem->yn);
+  ark_mem->fn_is_current = SUNFALSE;
 
   /* Clear any previous 'tstop' */
   ark_mem->tstopset = SUNFALSE;
@@ -1358,9 +1381,9 @@ int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
     ark_mem->hadapt_mem->hhist[0] = ZERO;
     ark_mem->hadapt_mem->hhist[1] = ZERO;
 
-    /* Indicate that evaluation of the full RHS is not required after each step,
-       this flag is updated to SUNTRUE by the interpolation module initialization
-       function and/or the stepper initialization function in arkInitialSetup */
+    /* Indicate that calling the full RHS function is not required, this flag is
+       updated to SUNTRUE by the interpolation module initialization function
+       and/or the stepper initialization function in arkInitialSetup */
     ark_mem->call_fullrhs = SUNFALSE;
 
     /* Indicate that initialization has not been done before */
@@ -1490,8 +1513,7 @@ booleantype arkCheckTimestepper(ARKodeMem ark_mem)
 {
   if ( (ark_mem->step_init    == NULL) ||
        (ark_mem->step         == NULL) ||
-       (ark_mem->step_mem     == NULL) ||
-       (ark_mem->step_fullrhs == NULL) )
+       (ark_mem->step_mem     == NULL) )
     return(SUNFALSE);
   return(SUNTRUE);
 }
@@ -1697,10 +1719,6 @@ booleantype arkAllocVectors(ARKodeMem ark_mem, N_Vector tmpl)
   if (!arkAllocVec(ark_mem, tmpl, &ark_mem->yn))
     return(SUNFALSE);
 
-  /* Allocate fn if needed */
-  if (!arkAllocVec(ark_mem, tmpl, &ark_mem->fn))
-    return(SUNFALSE);
-
   /* Allocate tempv1 if needed */
   if (!arkAllocVec(ark_mem, tmpl, &ark_mem->tempv1))
     return(SUNFALSE);
@@ -1921,22 +1939,33 @@ int arkInitialSetup(ARKodeMem ark_mem, realtype tout)
     }
   }
 
-  /* If necessary, temporarily set h as it is used to compute the tolerance in a
-     potential mass matrix solve when computing the full rhs */
-  if (ark_mem->h == ZERO) ark_mem->h = ONE;
-
-  /* Call fullrhs (used in estimating initial step, explicit steppers, Hermite
-     interpolation module, and possibly (but not always) arkRootCheck1) */
-  retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tcur, ark_mem->yn,
-                                 ark_mem->fn, ARK_FULLRHS_START);
-  if (retval != 0) return(ARK_RHSFUNC_FAIL);
-
   /* Fill initial interpolation data (if needed) */
   if (ark_mem->interp != NULL) {
     retval = arkInterpInit(ark_mem, ark_mem->interp, ark_mem->tcur);
     if (retval != 0)  return(retval);
   }
 
+  /* If fullrhs will be called (to estimate initial step, explicit steppers, Hermite
+     interpolation module, and possibly (but not always) arkRootCheck1), then
+     ensure that it is provided, and space is allocated for fn. */
+  if (ark_mem->call_fullrhs || (ark_mem->h0u == ZERO && ark_mem->hin == ZERO)
+      || ark_mem->root_mem)
+  {
+    if (!ark_mem->step_fullrhs)
+    {
+      arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                      "arkInitialSetup", MSG_ARK_MISSING_FULLRHS);
+      return ARK_ILL_INPUT;
+    }
+
+    if (!arkAllocVec(ark_mem, ark_mem->yn, &ark_mem->fn))
+    {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE",
+                      "arkInitialSetup", MSG_ARK_MEM_FAIL);
+      return(ARK_MEM_FAIL);
+    }
+  }
+
   /* initialization complete */
   ark_mem->initialized = SUNTRUE;
 
@@ -2052,11 +2081,11 @@ int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
       /* Shortcut to roots found in previous step */
       irfndp = ark_mem->root_mem->irfnd;
 
-      /* If the full rhs was not computed in the last call to arkCompleteStep
+      /* If the full RHS was not computed in the last call to arkCompleteStep
          and roots were found in the previous step, then compute the full rhs
          for possible use in arkRootCheck2 (not always necessary) */
-      if (!(ark_mem->call_fullrhs) && irfndp != 0) {
-        retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tcur, ark_mem->yn,
+      if (!(ark_mem->fn_is_current) && irfndp != 0) {
+        retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
                                        ark_mem->fn, ARK_FULLRHS_END);
         if (retval != 0) {
           arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE", "arkStopTests",
@@ -2064,6 +2093,7 @@ int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
           *ier = ARK_RHSFUNC_FAIL;
           return(1);
         }
+        ark_mem->fn_is_current = SUNTRUE;
       }
 
       retval = arkRootCheck2((void*) ark_mem);
@@ -2233,6 +2263,19 @@ int arkHin(ARKodeMem ark_mem, realtype tout)
 
   if (tdist < TWO*tround) return(ARK_TOO_CLOSE);
 
+  /* call full RHS if needed */
+  if (!(ark_mem->fn_is_current))
+  {
+    /* NOTE: The step size (h) is used in setting the tolerance in a potential
+       mass matrix solve when computing the full RHS. Before calling arkHin, h
+       is set to |tout - tcur| or 1 and so we do not need to guard against
+       h == 0 here before calling the full RHS. */
+    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
+                                   ark_mem->fn, ARK_FULLRHS_START);
+    if (retval) { return ARK_RHSFUNC_FAIL; }
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
   /* Set lower and upper bounds on h0, and take geometric mean
      as first trial value.
      Exit with this value if the bounds cross each other. */
@@ -2399,7 +2442,7 @@ int arkYddNorm(ARKodeMem ark_mem, realtype hg, realtype *yddnrm)
   ---------------------------------------------------------------*/
 int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
 {
-  int retval, mode;
+  int retval;
   realtype troundoff;
 
   /* Set current time to the end of the step (in case the last
@@ -2438,22 +2481,18 @@ int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
     if (retval != 0) return(ARK_POSTPROCESS_STEP_FAIL);
   }
 
-  /* update interpolation structure */
+  /* update interpolation structure
+
+     NOTE: This must be called before updating yn with ycur as the interpolation
+     module may need to save tn, yn from the start of this step */
   if (ark_mem->interp != NULL) {
     retval = arkInterpUpdate(ark_mem, ark_mem->interp, ark_mem->tcur);
     if (retval != ARK_SUCCESS)  return(retval);
   }
 
-  /* call fullrhs if needed */
-  if (ark_mem->call_fullrhs) {
-    mode = (ark_mem->ProcessStep != NULL) ? ARK_FULLRHS_START : ARK_FULLRHS_END;
-    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tcur, ark_mem->ycur,
-                                   ark_mem->fn, mode);
-    if (retval != 0) return(ARK_RHSFUNC_FAIL);
-  }
-
   /* update yn to current solution */
   N_VScale(ONE, ark_mem->ycur, ark_mem->yn);
+  ark_mem->fn_is_current = SUNFALSE;
 
   /* Update step size and error history arrays */
   ark_mem->hadapt_mem->ehist[1] = ark_mem->hadapt_mem->ehist[0];
diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c
index ba5e4c3885..a3d22e2dee 100644
--- a/src/arkode/arkode_arkstep.c
+++ b/src/arkode/arkode_arkstep.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "arkode/arkode_butcher.h"
 #include "arkode_impl.h"
 #include "arkode_arkstep_impl.h"
 #include "arkode_interp_impl.h"
@@ -713,6 +714,21 @@ void ARKStepFree(void **arkode_mem)
     }
     step_mem->nfusedopvecs = 0;
 
+    /* free work arrays for MRI forcing */
+    if (step_mem->stage_times)
+    {
+      free(step_mem->stage_times);
+      step_mem->stage_times = NULL;
+      ark_mem->lrw -= step_mem->stages;
+    }
+
+    if (step_mem->stage_coefs)
+    {
+      free(step_mem->stage_coefs);
+      step_mem->stage_coefs = NULL;
+      ark_mem->lrw -= step_mem->stages;
+    }
+
     /* free the time stepper module itself */
     free(ark_mem->step_mem);
     ark_mem->step_mem = NULL;
@@ -1208,6 +1224,27 @@ int arkStep_Init(void* arkode_mem, int init_type)
       ark_mem->liw += step_mem->nfusedopvecs;   /* pointers */
     }
 
+    /* Allocate workspace for MRI forcing -- need to allocate here as the
+       number of stages may not bet set before this point and we assume
+       SetInnerForcing has been called before the first step i.e., methods
+       start with a fast integration */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      if (!(step_mem->stage_times))
+      {
+        step_mem->stage_times = (realtype*) calloc(step_mem->stages,
+                                                   sizeof(realtype));
+        ark_mem->lrw += step_mem->stages;
+      }
+
+      if (!(step_mem->stage_coefs))
+      {
+        step_mem->stage_coefs = (realtype*) calloc(step_mem->stages,
+                                                   sizeof(realtype));
+        ark_mem->lrw += step_mem->stages;
+      }
+    }
+
     /* Limit max interpolant degree (negative input only overwrites the current
        interpolant degree if it is greater than abs(input). */
     if (ark_mem->interp != NULL)
@@ -1237,10 +1274,6 @@ int arkStep_Init(void* arkode_mem, int init_type)
     if (step_mem->mass_type != MASS_IDENTITY)
       if ((step_mem->predictor == 4) || (step_mem->predictor == 5))
         step_mem->predictor = 0;
-
-    /* If the bootstrap predictor is enabled, signal to shared arkode module that
-       fullrhs is required after each step */
-    if (step_mem->predictor == 4)  ark_mem->call_fullrhs = SUNTRUE;
   }
 
   /* set appropriate TakeStep routine based on problem configuration */
@@ -1303,11 +1336,14 @@ int arkStep_Init(void* arkode_mem, int init_type)
     }
   }
 
+  /* Signal to shared arkode module that full RHS evaluations are required */
+  ark_mem->call_fullrhs = SUNTRUE;
+
   return(ARK_SUCCESS);
 }
 
 
-/*---------------------------------------------------------------
+/*------------------------------------------------------------------------------
   arkStep_FullRHS:
 
   Rewriting the problem
@@ -1318,24 +1354,30 @@ int arkStep_Init(void* arkode_mem, int init_type)
     f = M^{-1}*[ fe(t,y) + fi(t,y) ]
 
   This will be called in one of three 'modes':
-    ARK_FULLRHS_START -> called at the beginning of a simulation
-                         or after post processing at step
-    ARK_FULLRHS_END   -> called at the end of a successful step
-    ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
-
-  If it is called in ARK_FULLRHS_START mode, we store the vectors
-  fe(t,y) and fi(t,y) in Fe[0] and Fi[0] for possible reuse in the
-  first stage of the subsequent time step.
-
-  If it is called in ARK_FULLRHS_END mode and the ARK method
-  coefficients support it, we may just copy vectors Fe[stages] and
-  Fi[stages] to fill f instead of calling fe() and fi().
-
-  ARK_FULLRHS_OTHER mode is only called for dense output in-between
-  steps, or when estimating the initial time step size, so we strive to
-  store the intermediate parts so that they do not interfere
-  with the other two modes.
-  ---------------------------------------------------------------*/
+
+     ARK_FULLRHS_START -> called at the beginning of a simulation i.e., at
+                          (tn, yn) = (t0, y0) or (tR, yR)
+
+     ARK_FULLRHS_END   -> called at the end of a successful step i.e, at
+                          (tcur, ycur) or the start of the subsequent step i.e.,
+                          at (tn, yn) = (tcur, ycur) from the end of the last
+                          step
+
+     ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
+
+  If this function is called in ARK_FULLRHS_START or ARK_FULLRHS_END mode and
+  evaluating the RHS functions is necessary, we store the vectors fe(t,y) and
+  fi(t,y) in Fe[0] and Fi[0] for possible reuse in the first stage of the
+  subsequent time step.
+
+  In ARK_FULLRHS_END mode we check if the method is stiffly accurate and, if
+  appropriate, copy the vectors Fe[stages - 1] and Fi[stages - 1] to Fe[0] and
+  Fi[0] for possible reuse in the first stage of the subsequent time step.
+
+  ARK_FULLRHS_OTHER mode is only called for dense output in-between steps, or
+  when estimating the initial time step size, so we strive to store the
+  intermediate parts so that they do not interfere with the other two modes.
+  ----------------------------------------------------------------------------*/
 int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                     int mode)
 {
@@ -1345,6 +1387,7 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   booleantype recomputeRHS;
   realtype* cvals;
   N_Vector* Xvecs;
+  realtype stage_coefs = ONE;
 
   /* access ARKodeARKStepMem structure */
   retval = arkStep_AccessStepMem(arkode_mem, "arkStep_FullRHS",
@@ -1365,138 +1408,246 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   /* perform RHS functions contingent on 'mode' argument */
   switch(mode) {
 
-  /* ARK_FULLRHS_START: called at the beginning of a simulation
-     Store the vectors fe(t,y) and fi(t,y) in Fe[0] and Fi[0] for
-     possible reuse in the first stage of the subsequent time step */
   case ARK_FULLRHS_START:
 
-    /* call fe if the problem has an explicit component */
-    if (step_mem->explicit) {
-      retval = step_mem->fe(t, y, step_mem->Fe[0], ark_mem->user_data);
-      step_mem->nfe++;
-      if (retval != 0) {
-        arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
-                        "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-        return(ARK_RHSFUNC_FAIL);
-      }
-      /* apply external polynomial forcing */
-      if (step_mem->expforcing) {
-        cvals[0] = ONE;
-        Xvecs[0] = step_mem->Fe[0];
-        nvec     = 1;
-        arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-        N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fe[0]);
-      }
-    }
+    /* compute the full RHS */
+    if (!(ark_mem->fn_is_current))
+    {
+      /* compute the explicit component */
+      if (step_mem->explicit)
+      {
+        retval = step_mem->fe(t, y, step_mem->Fe[0], ark_mem->user_data);
+        step_mem->nfe++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
+                          "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
 
-    /* call fi if the problem has an implicit component */
-    if (step_mem->implicit) {
-      retval = step_mem->fi(t, y, step_mem->Fi[0], ark_mem->user_data);
-      step_mem->nfi++;
-      if (retval != 0) {
-        arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
-                        "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-        return(ARK_RHSFUNC_FAIL);
+        /* compute and store M(t)^{-1} fe */
+        if (step_mem->mass_type == MASS_TIMEDEP)
+        {
+          retval = step_mem->msolve((void *) ark_mem, step_mem->Fe[0],
+                                    step_mem->nlscoef / ark_mem->h);
+          if (retval)
+          {
+            arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                            "arkStep_FullRHS", "Mass matrix solver failure");
+            return ARK_MASSSOLVE_FAIL;
+          }
+        }
       }
-      /* apply external polynomial forcing */
-      if (step_mem->impforcing) {
-        cvals[0] = ONE;
-        Xvecs[0] = step_mem->Fi[0];
-        nvec     = 1;
-        arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-        N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fi[0]);
+
+      /* compute the implicit component */
+      if (step_mem->implicit)
+      {
+        retval = step_mem->fi(t, y, step_mem->Fi[0], ark_mem->user_data);
+        step_mem->nfi++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
+                          "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
+
+        /* compute and store M(t)^{-1} fi */
+        if (step_mem->mass_type == MASS_TIMEDEP)
+        {
+          retval = step_mem->msolve((void *) ark_mem, step_mem->Fi[0],
+                                    step_mem->nlscoef / ark_mem->h);
+          if (retval)
+          {
+            arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                            "arkStep_FullRHS", "Mass matrix solver failure");
+            return ARK_MASSSOLVE_FAIL;
+          }
+        }
       }
     }
 
     /* combine RHS vector(s) into output */
-    if (step_mem->explicit && step_mem->implicit) { /* ImEx */
+    if (step_mem->explicit && step_mem->implicit)
+    {
+      /* ImEx */
       N_VLinearSum(ONE, step_mem->Fi[0], ONE, step_mem->Fe[0], f);
-    } else if (step_mem->implicit) {                   /* implicit */
+    }
+    else if (step_mem->implicit)
+    {
+      /* implicit */
       N_VScale(ONE, step_mem->Fi[0], f);
-    } else {                                           /* explicit */
+    }
+    else
+    {
+      /* explicit */
       N_VScale(ONE, step_mem->Fe[0], f);
     }
 
-    break;
+    /* compute M^{-1} f for output but do not store */
+    if (step_mem->mass_type == MASS_FIXED)
+    {
+      retval = step_mem->msolve((void *) ark_mem, f,
+                                step_mem->nlscoef / ark_mem->h);
+      if (retval)
+      {
+        arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                        "arkStep_FullRHS", "Mass matrix solver failure");
+        return ARK_MASSSOLVE_FAIL;
+      }
+    }
+
+    /* apply external polynomial (MRI) forcing (M = I required) */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      cvals[0] = ONE;
+      Xvecs[0] = f;
+      nvec     = 1;
+      arkStep_ApplyForcing(step_mem, &t, &stage_coefs, 1, &nvec);
+      N_VLinearCombination(nvec, cvals, Xvecs, f);
+    }
 
+    break;
 
-  /* ARK_FULLRHS_END: called at the end of a successful step
-     If the ARK method coefficients support it, we just copy the last stage RHS
-     vectors to fill f instead of calling fe() and fi().
-     Copy the results to Fe[0] and Fi[0] if the ARK coefficients support it. */
   case ARK_FULLRHS_END:
 
-    /* determine if explicit/implicit RHS functions need to be recomputed */
-    recomputeRHS = SUNFALSE;
-    if ( step_mem->explicit && (SUNRabs(step_mem->Be->c[step_mem->stages-1]-ONE)>TINY) )
-      recomputeRHS = SUNTRUE;
-    if ( step_mem->implicit && (SUNRabs(step_mem->Bi->c[step_mem->stages-1]-ONE)>TINY) )
-      recomputeRHS = SUNTRUE;
-
-    /* base RHS calls on recomputeRHS argument */
-    if (recomputeRHS) {
+    /* compute the full RHS */
+    if (!(ark_mem->fn_is_current))
+    {
+      /* determine if RHS functions need to be recomputed */
+      recomputeRHS = SUNFALSE;
 
-      /* call fe if the problem has an explicit component */
-      if (step_mem->explicit) {
-        retval = step_mem->fe(t, y, step_mem->Fe[0], ark_mem->user_data);
-        step_mem->nfe++;
-        if (retval != 0) {
-          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
-                          "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-          return(ARK_RHSFUNC_FAIL);
+      if (step_mem->explicit)
+      {
+        if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Be))
+        {
+          recomputeRHS = SUNTRUE;
         }
-        /* apply external polynomial forcing */
-        if (step_mem->expforcing) {
-          cvals[0] = ONE;
-          Xvecs[0] = step_mem->Fe[0];
-          nvec     = 1;
-          arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-          N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fe[0]);
+      }
+
+      if (step_mem->implicit)
+      {
+        if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Bi))
+        {
+          recomputeRHS = SUNTRUE;
         }
       }
 
-      /* call fi if the problem has an implicit component */
-      if (step_mem->implicit) {
-        retval = step_mem->fi(t, y, step_mem->Fi[0], ark_mem->user_data);
-        step_mem->nfi++;
-        if (retval != 0) {
-          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
-                          "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-          return(ARK_RHSFUNC_FAIL);
+      /* Stiffly Accurate methods are not SA when relaxation is enabled */
+      if (ark_mem->relax_enabled) { recomputeRHS = SUNTRUE; }
+
+      /* recompute RHS functions */
+      if (recomputeRHS)
+      {
+        /* compute the explicit component */
+        if (step_mem->explicit)
+        {
+          retval = step_mem->fe(t, y, step_mem->Fe[0], ark_mem->user_data);
+          step_mem->nfe++;
+          if (retval != 0)
+          {
+            arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
+                            "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+            return(ARK_RHSFUNC_FAIL);
+          }
+
+          /* compute and store M(t)^{-1} fi */
+          if (step_mem->mass_type == MASS_TIMEDEP)
+          {
+            retval = step_mem->msolve((void *) ark_mem, step_mem->Fe[0],
+                                      step_mem->nlscoef / ark_mem->h);
+            if (retval)
+            {
+              arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                              "arkStep_FullRHS", "Mass matrix solver failure");
+              return ARK_MASSSOLVE_FAIL;
+            }
+          }
         }
-        /* apply external polynomial forcing */
-        if (step_mem->impforcing) {
-          cvals[0] = ONE;
-          Xvecs[0] = step_mem->Fi[0];
-          nvec     = 1;
-          arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-          N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fi[0]);
+
+        /* compute the implicit component */
+        if (step_mem->implicit)
+        {
+          retval = step_mem->fi(t, y, step_mem->Fi[0], ark_mem->user_data);
+          step_mem->nfi++;
+          if (retval != 0)
+          {
+            arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ARKStep",
+                            "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+            return(ARK_RHSFUNC_FAIL);
+          }
+
+          /* compute and store M(t)^{-1} fi */
+          if (step_mem->mass_type == MASS_TIMEDEP)
+          {
+            retval = step_mem->msolve((void *) ark_mem, step_mem->Fi[0],
+                                      step_mem->nlscoef / ark_mem->h);
+            if (retval)
+            {
+              arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                              "arkStep_FullRHS", "Mass matrix solver failure");
+              return ARK_MASSSOLVE_FAIL;
+            }
+          }
+        }
+      }
+      else
+      {
+        if (step_mem->explicit)
+        {
+          N_VScale(ONE, step_mem->Fe[step_mem->stages-1], step_mem->Fe[0]);
+        }
+        if (step_mem->implicit)
+        {
+          N_VScale(ONE, step_mem->Fi[step_mem->stages-1], step_mem->Fi[0]);
         }
       }
-    } else {
-      if (step_mem->explicit)
-        N_VScale(ONE, step_mem->Fe[step_mem->stages-1], step_mem->Fe[0]);
-      if (step_mem->implicit)
-        N_VScale(ONE, step_mem->Fi[step_mem->stages-1], step_mem->Fi[0]);
     }
 
     /* combine RHS vector(s) into output */
-    if (step_mem->explicit && step_mem->implicit) { /* ImEx */
+    if (step_mem->explicit && step_mem->implicit)
+    {
+      /* ImEx */
       N_VLinearSum(ONE, step_mem->Fi[0], ONE, step_mem->Fe[0], f);
-    } else if (step_mem->implicit) {                   /* implicit */
+    }
+    else if (step_mem->implicit)
+    {
+      /* implicit */
       N_VScale(ONE, step_mem->Fi[0], f);
-    } else {                                           /* explicit */
+    }
+    else
+    {
+      /* explicit */
       N_VScale(ONE, step_mem->Fe[0], f);
     }
 
+    /* compute M^{-1} f for output but do not store */
+    if (step_mem->mass_type == MASS_FIXED)
+    {
+      retval = step_mem->msolve((void *) ark_mem, f,
+                                step_mem->nlscoef / ark_mem->h);
+      if (retval)
+      {
+        arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                        "arkStep_FullRHS", "Mass matrix solver failure");
+        return ARK_MASSSOLVE_FAIL;
+      }
+    }
+
+    /* apply external polynomial (MRI) forcing (M = I required) */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      cvals[0] = ONE;
+      Xvecs[0] = f;
+      nvec     = 1;
+      arkStep_ApplyForcing(step_mem, &t, &stage_coefs, 1, &nvec);
+      N_VLinearCombination(nvec, cvals, Xvecs, f);
+    }
+
     break;
 
-  /* ARK_FULLRHS_OTHER: called for dense output in-between steps or for
-     estimation of the initial time step size, store the intermediate
-     calculations in such a way as to not interfere with the other two modes */
   case ARK_FULLRHS_OTHER:
 
-    /* call fe if the problem has an explicit component (store in ark_tempv2) */
+    /* compute the explicit component and store in ark_tempv2 */
     if (step_mem->explicit) {
       retval = step_mem->fe(t, y, ark_mem->tempv2, ark_mem->user_data);
       step_mem->nfe++;
@@ -1505,17 +1656,9 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                         "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
         return(ARK_RHSFUNC_FAIL);
       }
-      /* apply external polynomial forcing */
-      if (step_mem->expforcing) {
-        cvals[0] = ONE;
-        Xvecs[0] = ark_mem->tempv2;
-        nvec     = 1;
-        arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-        N_VLinearCombination(nvec, cvals, Xvecs, ark_mem->tempv2);
-      }
     }
 
-    /* call fi if the problem has an implicit component (store in sdata) */
+    /* compute the implicit component and store in sdata */
     if (step_mem->implicit) {
       retval = step_mem->fi(t, y, step_mem->sdata, ark_mem->user_data);
       step_mem->nfi++;
@@ -1524,14 +1667,6 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                         "arkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
         return(ARK_RHSFUNC_FAIL);
       }
-      /* apply external polynomial forcing */
-      if (step_mem->impforcing) {
-        cvals[0] = ONE;
-        Xvecs[0] = step_mem->sdata;
-        nvec     = 1;
-        arkStep_ApplyForcing(step_mem, t, ONE, &nvec);
-        N_VLinearCombination(nvec, cvals, Xvecs, step_mem->sdata);
-      }
     }
 
     /* combine RHS vector(s) into output */
@@ -1543,6 +1678,29 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
       N_VScale(ONE, ark_mem->tempv2, f);
     }
 
+    /* compute M^{-1} f for output but do not store */
+    if (step_mem->mass_type != MASS_IDENTITY)
+    {
+      retval = step_mem->msolve((void *) ark_mem, f,
+                                step_mem->nlscoef / ark_mem->h);
+      if (retval)
+      {
+        arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
+                        "arkStep_FullRHS", "Mass matrix solver failure");
+        return ARK_MASSSOLVE_FAIL;
+      }
+    }
+
+    /* apply external polynomial (MRI) forcing (M = I required) */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      cvals[0] = ONE;
+      Xvecs[0] = f;
+      nvec     = 1;
+      arkStep_ApplyForcing(step_mem, &t, &stage_coefs, 1, &nvec);
+      N_VLinearCombination(nvec, cvals, Xvecs, f);
+    }
+
     break;
 
   default:
@@ -1552,17 +1710,6 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
     return(ARK_RHSFUNC_FAIL);
   }
 
-  /* if M != I, then update f = M^{-1}*f */
-  if (step_mem->mass_type != MASS_IDENTITY) {
-    retval = step_mem->msolve((void *) ark_mem, f,
-                              step_mem->nlscoef/ark_mem->h);
-    if (retval != ARK_SUCCESS) {
-      arkProcessError(ark_mem, ARK_MASSSOLVE_FAIL, "ARKODE::ARKStep",
-                      "arkStep_FullRHS", "Mass matrix solver failure");
-      return(ARK_MASSSOLVE_FAIL);
-    }
-  }
-
   return(ARK_SUCCESS);
 }
 
@@ -1595,24 +1742,20 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   ---------------------------------------------------------------*/
 int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 {
-  int retval, is, nvec;
+  int retval, is, is_start, mode;
   booleantype implicit_stage;
   booleantype deduce_stage;
+  booleantype save_stages;
+  booleantype stiffly_accurate;
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   N_Vector zcor0;
-  realtype* cvals;
-  N_Vector* Xvecs;
 
   /* access ARKodeARKStepMem structure */
   retval = arkStep_AccessStepMem(arkode_mem, "arkStep_TakeStep_Z",
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS)  return(retval);
 
-  /* local shortcuts for use with fused vector operations */
-  cvals = step_mem->cvals;
-  Xvecs = step_mem->Xvecs;
-
   /* if problem will involve no algebraic solvers, initialize nflagPtr to success */
   if ((!step_mem->implicit) && (step_mem->mass_type == MASS_IDENTITY))
     *nflagPtr = ARK_SUCCESS;
@@ -1627,8 +1770,100 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
       if (retval > 0) return(ARK_NLS_SETUP_RECVR);
     }
 
+  /* check if we need to store stage values */
+  save_stages = SUNFALSE;
+  if (ark_mem->relax_enabled && (step_mem->implicit ||
+                                 step_mem->mass_type == MASS_FIXED))
+  {
+    save_stages = SUNTRUE;
+  }
+
+  /* check for implicit method with explicit first stage */
+  implicit_stage = SUNFALSE;
+  is_start = 1;
+  if (step_mem->implicit)
+  {
+    if (SUNRabs(step_mem->Bi->A[0][0]) > TINY)
+    {
+      implicit_stage = SUNTRUE;
+      is_start = 0;
+    }
+  }
+
+  /* explicit first stage -- store stage if necessary for relaxation */
+  if (is_start == 1 && save_stages)
+  {
+    N_VScale(ONE, ark_mem->yn, step_mem->z[0]);
+  }
+
+  /* check if the method is Stiffly Accurate (SA) */
+  stiffly_accurate = SUNTRUE;
+  if (step_mem->explicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Be))
+    {
+      stiffly_accurate = SUNFALSE;
+    }
+  }
+
+  if (step_mem->implicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Bi))
+    {
+      stiffly_accurate = SUNFALSE;
+    }
+  }
+
+  /* Call the full RHS if needed e.g., an explicit first stage. If this is the
+     first step then we may need to evaluate or copy the RHS values from an
+     earlier evaluation (e.g., to compute h0). For subsequent steps treat this
+     RHS evaluation as an evaluation at the end of the just completed step to
+     potentially reuse (FSAL methods) or save (stiffly accurate methods with an
+     implicit first stage using Hermite interpolation) RHS evaluations from the
+     end of the last step. */
+
+  if ((!implicit_stage || (stiffly_accurate && ark_mem->interp_type == ARK_INTERP_HERMITE))
+      && !(ark_mem->fn_is_current))
+  {
+    mode = (ark_mem->initsetup) ? ARK_FULLRHS_START : ARK_FULLRHS_END;
+    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
+                                   ark_mem->fn, mode);
+    if (retval) { return ARK_RHSFUNC_FAIL; }
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
+  if (is_start == 1)
+  {
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+                       "ARKODE::arkStep_TakeStep_Z", "start-stage",
+                       "step = %li, stage = %i, implicit = %i, h = %"RSYM", tcur = %"RSYM,
+                       ark_mem->nst, 0, implicit_stage, ark_mem->h, ark_mem->tcur);
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                       "ARKODE::arkStep_TakeStep_Z", "explicit stage",
+                       "z[%i] =", 0);
+    N_VPrintFile(ark_mem->ycur, ARK_LOGGER->debug_fp);
+    if (step_mem->implicit)
+    {
+      SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                         "ARKODE::arkStep_TakeStep_Z", "implicit RHS",
+                         "Fi[%i] =", 0);
+      N_VPrintFile(step_mem->Fi[0], ARK_LOGGER->debug_fp);
+    }
+    if (step_mem->explicit)
+    {
+      SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                         "ARKODE::arkStep_TakeStep_Z", "explicit RHS",
+                         "Fe[%i] =", 0);
+      N_VPrintFile(step_mem->Fe[0], ARK_LOGGER->debug_fp);
+    }
+#endif
+  }
+#endif
+
   /* loop over internal stages to the step */
-  for (is=0; is<step_mem->stages; is++) {
+  for (is = is_start; is < step_mem->stages; is++) {
 
     /* store current stage index */
     step_mem->istage = is;
@@ -1758,8 +1993,7 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
     /* successful stage solve */
 
     /*    store stage (if necessary for relaxation) */
-    if (ark_mem->relax_enabled && (step_mem->implicit ||
-                                   step_mem->mass_type == MASS_FIXED))
+    if (save_stages)
     {
       N_VScale(ONE, ark_mem->ycur, step_mem->z[is]);
     }
@@ -1790,40 +2024,23 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 
       if (retval < 0)  return(ARK_RHSFUNC_FAIL);
       if (retval > 0)  return(ARK_UNREC_RHSFUNC_ERR);
-      /* apply external polynomial forcing */
-      if (step_mem->impforcing) {
-        cvals[0] = ONE;
-        Xvecs[0] = step_mem->Fi[is];
-        nvec     = 1;
-        arkStep_ApplyForcing(step_mem, ark_mem->tcur, ONE, &nvec);
-        N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fi[is]);
-      }
     }
 
     /*    store explicit RHS */
     if (step_mem->explicit) {
-        retval = step_mem->fe(ark_mem->tn + step_mem->Be->c[is]*ark_mem->h,
-                              ark_mem->ycur, step_mem->Fe[is], ark_mem->user_data);
-        step_mem->nfe++;
+      retval = step_mem->fe(ark_mem->tn + step_mem->Be->c[is]*ark_mem->h,
+                            ark_mem->ycur, step_mem->Fe[is], ark_mem->user_data);
+      step_mem->nfe++;
 
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
-        SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
-                           "ARKODE::arkStep_TakeStep_Z", "explicit RHS",
-                           "Fe[%i] =", is);
-        N_VPrintFile(step_mem->Fe[is], ARK_LOGGER->debug_fp);
+      SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                         "ARKODE::arkStep_TakeStep_Z", "explicit RHS",
+                         "Fe[%i] =", is);
+      N_VPrintFile(step_mem->Fe[is], ARK_LOGGER->debug_fp);
 #endif
 
-        if (retval < 0)  return(ARK_RHSFUNC_FAIL);
-        if (retval > 0)  return(ARK_UNREC_RHSFUNC_ERR);
-        /* apply external polynomial forcing */
-        if (step_mem->expforcing) {
-          cvals[0] = ONE;
-          Xvecs[0] = step_mem->Fe[is];
-          nvec     = 1;
-          arkStep_ApplyForcing(step_mem, ark_mem->tn+step_mem->Be->c[is]*ark_mem->h,
-                               ONE, &nvec);
-          N_VLinearCombination(nvec, cvals, Xvecs, step_mem->Fe[is]);
-        }
+      if (retval < 0)  return(ARK_RHSFUNC_FAIL);
+      if (retval > 0)  return(ARK_UNREC_RHSFUNC_ERR);
     }
 
     /* if using a time-dependent mass matrix, update Fe[is] and/or Fi[is] with M(t)^{-1} */
@@ -1831,10 +2048,22 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
       /* If the implicit stage was deduced, it already includes M(t)^{-1} */
       if (step_mem->implicit && !deduce_stage) {
         *nflagPtr = step_mem->msolve((void *) ark_mem, step_mem->Fi[is], step_mem->nlscoef);
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+        SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                           "ARKODE::arkStep_TakeStep_Z", "M^{-1} implicit RHS",
+                           "Fi[%i] =", is);
+        N_VPrintFile(step_mem->Fi[is], ARK_LOGGER->debug_fp);
+#endif
         if (*nflagPtr != ARK_SUCCESS)  return(TRY_AGAIN);
       }
       if (step_mem->explicit) {
         *nflagPtr = step_mem->msolve((void *) ark_mem, step_mem->Fe[is], step_mem->nlscoef);
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+        SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                           "ARKODE::arkStep_TakeStep_Z", "M^{-1} explicit RHS",
+                           "Fe[%i] =", is);
+        N_VPrintFile(step_mem->Fe[is], ARK_LOGGER->debug_fp);
+#endif
         if (*nflagPtr != ARK_SUCCESS)  return(TRY_AGAIN);
       }
     }
@@ -1845,15 +2074,12 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
      This can fail recoverably due to nonconvergence of the mass matrix solve,
      so handle that appropriately. */
   if (step_mem->mass_type == MASS_FIXED) {
-    retval = arkStep_ComputeSolutions_MassFixed(ark_mem, dsmPtr);
+    *nflagPtr = arkStep_ComputeSolutions_MassFixed(ark_mem, dsmPtr);
   } else {
-    retval = arkStep_ComputeSolutions(ark_mem, dsmPtr);
-  }
-  if (retval < 0)  return(retval);
-  if (retval > 0) {
-    *nflagPtr = retval;
-    return(TRY_AGAIN);
+    *nflagPtr = arkStep_ComputeSolutions(ark_mem, dsmPtr);
   }
+  if (*nflagPtr < 0) return(*nflagPtr);
+  if (*nflagPtr > 0) return(TRY_AGAIN);
 
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
@@ -1869,9 +2095,9 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
-                     "ARKODE::arkStep_TakeStep_Z", "error-test",
-                     "step = %li, h = %"RSYM", dsm = %"RSYM,
-                     ark_mem->nst, ark_mem->h, *dsmPtr);
+                     "ARKODE::arkStep_TakeStep_Z", "end-step",
+                     "step = %li, h = %"RSYM", dsm = %"RSYM", nflag = %d",
+                     ark_mem->nst, ark_mem->h, *dsmPtr, *nflagPtr);
 #endif
 
   return(ARK_SUCCESS);
@@ -2486,7 +2712,9 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
 {
   /* local data */
   ARKodeARKStepMem step_mem;
-  int retval, i, j, nvec;
+  int retval, i, j, jmax, nvec;
+  sunrealtype*  cj;
+  sunrealtype** Aij;
   realtype* cvals;
   N_Vector* Xvecs;
 
@@ -2501,12 +2729,6 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
   /* Set shortcut to current stage index */
   i = step_mem->istage;
 
-  /* If this is the first stage, and explicit, just set sdata=0 and return */
-  if (!implicit && (i==0)) {
-    N_VConst(ZERO, step_mem->sdata);
-    return (ARK_SUCCESS);
-  }
-
   /* local shortcuts for fused vector operations */
   cvals = step_mem->cvals;
   Xvecs = step_mem->Xvecs;
@@ -2527,7 +2749,12 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
     /* apply external polynomial forcing (updates nvec, cvals, Xvecs) */
     if (step_mem->impforcing) {
       nvec = 0;
-      arkStep_ApplyForcing(step_mem, ark_mem->tcur, step_mem->gamma, &nvec);
+
+      step_mem->stage_times[0] = ark_mem->tcur;
+      step_mem->stage_coefs[0] = step_mem->gamma;
+
+      arkStep_ApplyForcing(step_mem, step_mem->stage_times,
+                           step_mem->stage_coefs, 1, &nvec);
       retval = N_VLinearCombination(nvec, cvals, Xvecs, step_mem->sdata);
       if (retval != 0) return(ARK_VECTOROP_ERR);
     } else {
@@ -2570,10 +2797,30 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
     }
   }
 
-  /* apply external polynomial forcing (updates nvec, cvals, Xvecs) */
-  if (step_mem->impforcing) {
-    arkStep_ApplyForcing(step_mem, ark_mem->tcur,
-                         ark_mem->h * step_mem->Bi->A[i][i], &nvec);
+  /* apply external polynomial (MRI) forcing (M = I required) */
+  if (step_mem->expforcing || step_mem->impforcing)
+  {
+    if (step_mem->expforcing)
+    {
+      jmax = i;
+      Aij  = step_mem->Be->A;
+      cj   = step_mem->Be->c;
+    }
+    else
+    {
+      jmax = i + 1;
+      Aij  = step_mem->Bi->A;
+      cj   = step_mem->Bi->c;
+    }
+
+    for (j = 0; j < jmax; j++)
+    {
+      step_mem->stage_times[j] = ark_mem->tn + cj[j] * ark_mem->h;
+      step_mem->stage_coefs[j] = ark_mem->h * Aij[i][j];
+    }
+
+    arkStep_ApplyForcing(step_mem, step_mem->stage_times, step_mem->stage_coefs,
+                         jmax, &nvec);
   }
 
   /* call fused vector operation to do the work */
@@ -2604,6 +2851,10 @@ int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
   /* local data */
   int retval, j, nvec;
   N_Vector y, yerr;
+  sunrealtype* cj;
+  sunrealtype* bj;
+  sunrealtype* dj;
+  booleantype stiffly_accurate;
   realtype* cvals;
   N_Vector* Xvecs;
   ARKodeARKStepMem step_mem;
@@ -2627,27 +2878,75 @@ int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
   /* initialize output */
   *dsmPtr = ZERO;
 
-  /* Compute time step solution */
-  /*   set arrays for fused vector operation */
-  cvals[0] = ONE;
-  Xvecs[0] = ark_mem->yn;
-  nvec = 1;
-  for (j=0; j<step_mem->stages; j++) {
-    if (step_mem->explicit) {      /* Explicit pieces */
-      cvals[nvec] = ark_mem->h * step_mem->Be->b[j];
-      Xvecs[nvec] = step_mem->Fe[j];
-      nvec += 1;
+  /* check if the method is stiffly accurate */
+  stiffly_accurate = SUNTRUE;
+
+  if (step_mem->explicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Be))
+    {
+      stiffly_accurate = SUNFALSE;
     }
-    if (step_mem->implicit) {      /* Implicit pieces */
-      cvals[nvec] = ark_mem->h * step_mem->Bi->b[j];
-      Xvecs[nvec] = step_mem->Fi[j];
-      nvec += 1;
+  }
+
+  if (step_mem->implicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Bi))
+    {
+      stiffly_accurate = SUNFALSE;
     }
   }
 
-  /*   call fused vector operation to do the work */
-  retval = N_VLinearCombination(nvec, cvals, Xvecs, y);
-  if (retval != 0) return(ARK_VECTOROP_ERR);
+  /* If the method is stiffly accurate, ycur is already the new solution */
+
+  if (!stiffly_accurate)
+  {
+    /* Compute time step solution (if necessary) */
+    /*   set arrays for fused vector operation */
+    cvals[0] = ONE;
+    Xvecs[0] = ark_mem->yn;
+    nvec = 1;
+    for (j=0; j<step_mem->stages; j++) {
+      if (step_mem->explicit) {      /* Explicit pieces */
+        cvals[nvec] = ark_mem->h * step_mem->Be->b[j];
+        Xvecs[nvec] = step_mem->Fe[j];
+        nvec += 1;
+      }
+      if (step_mem->implicit) {      /* Implicit pieces */
+        cvals[nvec] = ark_mem->h * step_mem->Bi->b[j];
+        Xvecs[nvec] = step_mem->Fi[j];
+        nvec += 1;
+      }
+    }
+
+    /* apply external polynomial (MRI) forcing (M = I required) */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      if (step_mem->expforcing)
+      {
+        cj = step_mem->Be->c;
+        bj = step_mem->Be->b;
+      }
+      else
+      {
+        cj = step_mem->Bi->c;
+        bj = step_mem->Bi->b;
+      }
+
+      for (j = 0; j < step_mem->stages; j++)
+      {
+        step_mem->stage_times[j] = ark_mem->tn + cj[j] * ark_mem->h;
+        step_mem->stage_coefs[j] = ark_mem->h * bj[j];
+      }
+
+      arkStep_ApplyForcing(step_mem, step_mem->stage_times, step_mem->stage_coefs,
+                           step_mem->stages, &nvec);
+    }
+
+    /*   call fused vector operation to do the work */
+    retval = N_VLinearCombination(nvec, cvals, Xvecs, y);
+    if (retval != 0) return(ARK_VECTOROP_ERR);
+  }
 
   /* Compute yerr (if step adaptivity enabled) */
   if (!ark_mem->fixedstep) {
@@ -2667,6 +2966,32 @@ int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
       }
     }
 
+    /* apply external polynomial (MRI) forcing (M = I required) */
+    if (step_mem->expforcing || step_mem->impforcing)
+    {
+      if (step_mem->expforcing)
+      {
+        cj = step_mem->Be->c;
+        bj = step_mem->Be->b;
+        dj = step_mem->Be->d;
+      }
+      else
+      {
+        cj = step_mem->Bi->c;
+        bj = step_mem->Bi->b;
+        dj = step_mem->Bi->d;
+      }
+
+      for (j = 0; j < step_mem->stages; j++)
+      {
+        step_mem->stage_times[j] = ark_mem->tn + cj[j] * ark_mem->h;
+        step_mem->stage_coefs[j] = ark_mem->h * (bj[j] - dj[j]);
+      }
+
+      arkStep_ApplyForcing(step_mem, step_mem->stage_times,
+                           step_mem->stage_coefs, step_mem->stages, &nvec);
+    }
+
     /* call fused vector operation to do the work */
     retval = N_VLinearCombination(nvec, cvals, Xvecs, yerr);
     if (retval != 0) return(ARK_VECTOROP_ERR);
@@ -2697,6 +3022,7 @@ int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsmPtr)
   /* local data */
   int retval, j, nvec;
   N_Vector y, yerr;
+  booleantype stiffly_accurate;
   realtype* cvals;
   N_Vector* Xvecs;
   ARKodeARKStepMem step_mem;
@@ -2720,37 +3046,60 @@ int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsmPtr)
   /* initialize output */
   *dsmPtr = ZERO;
 
-  /* compute y RHS (store in y) */
-  /*   set arrays for fused vector operation */
-  nvec = 0;
-  for (j=0; j<step_mem->stages; j++) {
-    if (step_mem->explicit) {      /* Explicit pieces */
-      cvals[nvec] = ark_mem->h * step_mem->Be->b[j];
-      Xvecs[nvec] = step_mem->Fe[j];
-      nvec += 1;
+  /* check if the method is stiffly accurate */
+  stiffly_accurate = SUNTRUE;
+
+  if (step_mem->explicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Be))
+    {
+      stiffly_accurate = SUNFALSE;
     }
-    if (step_mem->implicit) {      /* Implicit pieces */
-      cvals[nvec] = ark_mem->h * step_mem->Bi->b[j];
-      Xvecs[nvec] = step_mem->Fi[j];
-      nvec += 1;
+  }
+
+  if (step_mem->implicit)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(step_mem->Bi))
+    {
+      stiffly_accurate = SUNFALSE;
     }
   }
 
-  /*   call fused vector operation to compute RHS */
-  retval = N_VLinearCombination(nvec, cvals, Xvecs, y);
-  if (retval != 0) return(ARK_VECTOROP_ERR);
+  /* If the method is stiffly accurate, ycur is already the new solution */
 
-  /* solve for y update (stored in y) */
-  retval = step_mem->msolve((void *) ark_mem, y, step_mem->nlscoef);
-  if (retval < 0) {
-    *dsmPtr = RCONST(2.0);   /* indicate too much error, step with smaller step */
-    N_VScale(ONE, ark_mem->yn, y);      /* place old solution into y */
-    return(CONV_FAIL);
-  }
+  if (!stiffly_accurate)
+  {
+    /* compute y RHS (store in y) */
+    /*   set arrays for fused vector operation */
+    nvec = 0;
+    for (j=0; j<step_mem->stages; j++) {
+      if (step_mem->explicit) {      /* Explicit pieces */
+        cvals[nvec] = ark_mem->h * step_mem->Be->b[j];
+        Xvecs[nvec] = step_mem->Fe[j];
+        nvec += 1;
+      }
+      if (step_mem->implicit) {      /* Implicit pieces */
+        cvals[nvec] = ark_mem->h * step_mem->Bi->b[j];
+        Xvecs[nvec] = step_mem->Fi[j];
+        nvec += 1;
+      }
+    }
+
+    /*   call fused vector operation to compute RHS */
+    retval = N_VLinearCombination(nvec, cvals, Xvecs, y);
+    if (retval != 0) return(ARK_VECTOROP_ERR);
 
-  /* compute y = yn + update */
-  N_VLinearSum(ONE, ark_mem->yn, ONE, y, y);
+    /* solve for y update (stored in y) */
+    retval = step_mem->msolve((void *) ark_mem, y, step_mem->nlscoef);
+    if (retval < 0) {
+      *dsmPtr = RCONST(2.0);   /* indicate too much error, step with smaller step */
+      N_VScale(ONE, ark_mem->yn, y);      /* place old solution into y */
+      return(CONV_FAIL);
+    }
 
+    /* compute y = yn + update */
+    N_VLinearSum(ONE, ark_mem->yn, ONE, y, y);
+  }
 
   /* compute yerr (if step adaptivity enabled) */
   if (!ark_mem->fixedstep) {
@@ -2933,34 +3282,62 @@ int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, realtype tR,
 /*------------------------------------------------------------------------------
   arkStep_ApplyForcing
 
-  Determines the linear combination coefficients and vectors to apply forcing
-  at a given value of the independent variable (t).  This occurs through
-  appending coefficients and N_Vector pointers to the underlying cvals and Xvecs
-  arrays in the step_mem structure.  The dereferenced input *nvec should indicate
-  the next available entry in the cvals/Xvecs arrays.  The input 's' is a
-  scaling factor that should be applied to each of these coefficients.
+  Determines the scaling values and vectors necessary for the MRI polynomial
+  forcing terms. This occurs through appending scaling values and N_Vector
+  pointers to the underlying cvals and Xvecs arrays in the step_mem structure.
+
+  stage_times -- The times at which to evaluate the forcing.
+
+  stage_coefs -- Scaling factors (method A, b, or b - d coefficients) applied to
+  forcing vectors.
+
+  jmax -- the number of values in stage_times and stage_coefs (the stage index
+  for explicit methods or the index + 1 for implicit methods).
+
+  nvec -- On input, nvec is the next available entry in the cvals/Xvecs arrays.
+  This value is incremented for each value/vector appended to the cvals/Xvecs
+  arrays so on return it is the total number of values/vectors in the linear
+  combination.
   ----------------------------------------------------------------------------*/
 
-void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype t,
-                          realtype s, int *nvec)
+void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype* stage_times,
+                          realtype* stage_coefs, int jmax, int* nvec)
 {
   realtype tau, taui;
-  int i;
+  int j, k;
+
+  /* Shortcuts to step_mem data */
+  realtype* vals     = step_mem->cvals;
+  N_Vector* vecs     = step_mem->Xvecs;
+  realtype  tshift   = step_mem->tshift;
+  realtype  tscale   = step_mem->tscale;
+  int       nforcing = step_mem->nforcing;
+  N_Vector* forcing  = step_mem->forcing;
 
-  /* always append the constant forcing term */
-  step_mem->cvals[*nvec] = s;
-  step_mem->Xvecs[*nvec] = step_mem->forcing[0];
-  (*nvec) += 1;
+  /* Offset into vals and vecs arrays */
+  int offset = *nvec;
 
-  /* compute normalized time tau and initialize tau^i */
-  tau  = (t - step_mem->tshift) / (step_mem->tscale);
-  taui = tau;
-  for (i=1; i<step_mem->nforcing; i++) {
-    step_mem->cvals[*nvec] = s*taui;
-    step_mem->Xvecs[*nvec] = step_mem->forcing[i];
-    taui *= tau;
-    (*nvec) += 1;
+  /* Initialize scaling values, set vectors */
+  for (k = 0; k < nforcing; k++)
+  {
+    vals[offset + k] = ZERO;
+    vecs[offset + k] = forcing[k];
   }
+
+  for (j = 0; j < jmax; j++)
+  {
+    tau  = (stage_times[j] - tshift) / tscale;
+    taui = ONE;
+
+    for (k = 0; k < nforcing; k++)
+    {
+      vals[offset + k] += stage_coefs[j] * taui;
+      taui *= tau;
+    }
+  }
+
+  /* Update vector count for linear combination */
+  *nvec += nforcing;
 }
 
 /*------------------------------------------------------------------------------
@@ -3057,64 +3434,6 @@ int arkStep_SetInnerForcing(void* arkode_mem, realtype tshift, realtype tscale,
   return(0);
 }
 
-/* -----------------------------------------------------------------------------
- * arkStep_RelaxDeltaY
- *
- * Computes the RK update to yn for use in relaxation methods
- * ---------------------------------------------------------------------------*/
-
-int arkStep_RelaxDeltaY(ARKodeMem ark_mem, N_Vector delta_y)
-{
-  int i, nvec, retval;
-  realtype* cvals;
-  N_Vector* Xvecs;
-  ARKodeARKStepMem step_mem;
-
-  /* Access the stepper memory structure */
-  if (!(ark_mem->step_mem))
-  {
-    arkProcessError(ark_mem, ARK_MEM_NULL, "ARKODE::ARKStep",
-                    "arkStep_RelaxDeltaY", MSG_ARKSTEP_NO_MEM);
-    return ARK_MEM_NULL;
-  }
-  step_mem = (ARKodeARKStepMem)(ark_mem->step_mem);
-
-  /* Set arrays for fused vector operation */
-  cvals = step_mem->cvals;
-  Xvecs = step_mem->Xvecs;
-
-  nvec = 0;
-  for (i = 0; i < step_mem->stages; i++)
-  {
-    /* Explicit pieces */
-    if (step_mem->explicit)
-    {
-      cvals[nvec] = ark_mem->h * step_mem->Be->b[i];
-      Xvecs[nvec] = step_mem->Fe[i];
-      nvec++;
-    }
-    /* Implicit pieces */
-    if (step_mem->implicit)
-    {
-      cvals[nvec] = ark_mem->h * step_mem->Bi->b[i];
-      Xvecs[nvec] = step_mem->Fi[i];
-      nvec++;
-    }
-  }
-
-  /* Compute time step update (delta_y) */
-  retval = N_VLinearCombination(nvec, cvals, Xvecs, delta_y);
-  if (retval) return ARK_VECTOROP_ERR;
-
-  if (step_mem->mass_type == MASS_FIXED)
-  {
-    /* Solve to compute update M^{-1} h * sum_j Ae[i,j] Fe[j] + Ai[i,j] Fi[j] */
-    retval = step_mem->msolve((void *) ark_mem, delta_y, step_mem->nlscoef);
-    if (retval) { return ARK_MASSSOLVE_FAIL; }
-  }
-
-  return ARK_SUCCESS;
-}
 
 /* -----------------------------------------------------------------------------
  * arkStep_RelaxDeltaE
diff --git a/src/arkode/arkode_arkstep_impl.h b/src/arkode/arkode_arkstep_impl.h
index 91ff0e6489..9121140da1 100644
--- a/src/arkode/arkode_arkstep_impl.h
+++ b/src/arkode/arkode_arkstep_impl.h
@@ -156,6 +156,8 @@ typedef struct ARKodeARKStepMemRec {
   realtype    tscale;      /* time normalization scaling  */
   N_Vector*   forcing;     /* array of forcing vectors    */
   int         nforcing;    /* number of forcing vectors   */
+  realtype*   stage_times;  /* workspace for applying forcing */
+  realtype*   stage_coefs;  /* workspace for applying forcing */
 
 } *ARKodeARKStepMem;
 
@@ -205,8 +207,8 @@ int arkStep_NlsInit(ARKodeMem ark_mem);
 int arkStep_Nls(ARKodeMem ark_mem, int nflag);
 int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsm);
 int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsm);
-void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype t,
-                          realtype s, int *nvec);
+void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype* stage_times,
+                          realtype* stage_coefs, int jmax, int *nvec);
 
 /* private functions passed to nonlinear solver */
 int arkStep_NlsResidual_MassIdent(N_Vector zcor, N_Vector r, void* arkode_mem);
@@ -231,7 +233,6 @@ int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, realtype tR,
                               N_Vector yR);
 
 /* private functions for relaxation */
-int arkStep_RelaxDeltaY(ARKodeMem ark_mem, N_Vector delta_y);
 int arkStep_RelaxDeltaE(ARKodeMem ark_mem, ARKRelaxJacFn relax_jac_fn,
                         long int* relax_jac_fn_evals, sunrealtype* delta_e_out);
 int arkStep_GetOrder(ARKodeMem ark_mem);
diff --git a/src/arkode/arkode_arkstep_io.c b/src/arkode/arkode_arkstep_io.c
index fc2df26f98..1151afd1bc 100644
--- a/src/arkode/arkode_arkstep_io.c
+++ b/src/arkode/arkode_arkstep_io.c
@@ -268,8 +268,8 @@ char *ARKStepGetLinReturnFlagName(long int flag) {
 
 int ARKStepSetRelaxFn(void* arkode_mem, ARKRelaxFn rfn, ARKRelaxJacFn rjac)
 {
-  return arkRelaxCreate(arkode_mem, rfn, rjac, arkStep_RelaxDeltaY,
-                        arkStep_RelaxDeltaE, arkStep_GetOrder);
+  return arkRelaxCreate(arkode_mem, rfn, rjac, arkStep_RelaxDeltaE,
+                        arkStep_GetOrder);
 }
 
 int ARKStepSetRelaxEtaFail(void* arkode_mem, sunrealtype eta_rf)
diff --git a/src/arkode/arkode_butcher.c b/src/arkode/arkode_butcher.c
index e16191fcb5..61a7cb342f 100644
--- a/src/arkode/arkode_butcher.c
+++ b/src/arkode/arkode_butcher.c
@@ -304,6 +304,20 @@ void ARKodeButcherTable_Write(ARKodeButcherTable B, FILE *outfile)
 }
 
 
+sunbooleantype ARKodeButcherTable_IsStifflyAccurate(ARKodeButcherTable B)
+{
+  int i;
+  for (i = 0; i < B->stages; i++)
+  {
+    if (SUNRabs(B->b[i] - B->A[B->stages - 1][i]) > 100 * SUN_UNIT_ROUNDOFF)
+    {
+      return SUNFALSE;
+    }
+  }
+  return SUNTRUE;
+}
+
+
 /*---------------------------------------------------------------
   Routine to determine the analytical order of accuracy for a
   specified Butcher table.  We check the analytical [necessary]
diff --git a/src/arkode/arkode_erkstep.c b/src/arkode/arkode_erkstep.c
index ebc413e576..4f1265358b 100644
--- a/src/arkode/arkode_erkstep.c
+++ b/src/arkode/arkode_erkstep.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "arkode/arkode_butcher.h"
 #include "arkode_impl.h"
 #include "arkode_erkstep_impl.h"
 #include "arkode_interp_impl.h"
@@ -593,37 +594,42 @@ int erkStep_Init(void* arkode_mem, int init_type)
     }
   }
 
-  /* Signal to shared arkode module that fullrhs is required after each step */
+  /* Signal to shared arkode module that full RHS evaluations are required */
   ark_mem->call_fullrhs = SUNTRUE;
 
   return(ARK_SUCCESS);
 }
 
 
-/*---------------------------------------------------------------
+/*------------------------------------------------------------------------------
   erkStep_FullRHS:
 
-  This is just a wrapper to call the user-supplied RHS function,
-  f(t,y).
+  This is just a wrapper to call the user-supplied RHS function, f(t,y).
 
   This will be called in one of three 'modes':
-    ARK_FULLRHS_START -> called at the beginning of a simulation
-                         or after post processing at step
-    ARK_FULLRHS_END   -> called at the end of a successful step
-    ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
-
-  If it is called in ARK_FULLRHS_START mode, we store the vectors
-  f(t,y) in F[0] for possible reuse in the first stage of the
-  subsequent time step.
-
-  If it is called in ARK_FULLRHS_END mode and the method coefficients
-  support it, we may just copy vectors F[stages] to fill f instead
-  of calling f().
-
-  ARK_FULLRHS_OTHER mode is only called for dense output in-between
-  steps, so we strive to store the intermediate parts so that they
-  do not interfere with the other two modes.
-  ---------------------------------------------------------------*/
+
+     ARK_FULLRHS_START -> called at the beginning of a simulation i.e., at
+                          (tn, yn) = (t0, y0) or (tR, yR)
+
+     ARK_FULLRHS_END   -> called at the end of a successful step i.e, at
+                          (tcur, ycur) or the start of the subsequent step i.e.,
+                          at (tn, yn) = (tcur, ycur) from the end of the last
+                          step
+
+     ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
+
+  If this function is called in ARK_FULLRHS_START or ARK_FULLRHS_END mode and
+  evaluating the RHS functions is necessary, we store the vector f(t,y) in Fe[0]
+  for reuse in the first stage of the subsequent time step.
+
+  In ARK_FULLRHS_END mode we check if the method is "stiffly accurate" and, if
+  appropriate, copy the vector F[stages - 1] to F[0] for reuse in the first
+  stage of the subsequent time step.
+
+  ARK_FULLRHS_OTHER mode is only called for dense output in-between steps, or
+  when estimating the initial time step size, so we strive to store the
+  intermediate parts so that they do not interfere with the other two modes.
+  ----------------------------------------------------------------------------*/
 int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                     int mode)
 {
@@ -640,18 +646,19 @@ int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   /* perform RHS functions contingent on 'mode' argument */
   switch(mode) {
 
-  /* ARK_FULLRHS_START: called at the beginning of a simulation
-     Store the vectors f(t,y) in F[0] for possible reuse
-     in the first stage of the subsequent time step */
   case ARK_FULLRHS_START:
 
-    /* call f */
-    retval = step_mem->f(t, y, step_mem->F[0], ark_mem->user_data);
-    step_mem->nfe++;
-    if (retval != 0) {
-      arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ERKStep",
-                      "erkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-      return(ARK_RHSFUNC_FAIL);
+    /* compute the RHS */
+    if (!(ark_mem->fn_is_current))
+    {
+      retval = step_mem->f(t, y, step_mem->F[0], ark_mem->user_data);
+      step_mem->nfe++;
+      if (retval != 0)
+      {
+        arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ERKStep",
+                        "erkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+        return(ARK_RHSFUNC_FAIL);
+      }
     }
 
     /* copy RHS vector into output */
@@ -659,32 +666,33 @@ int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
 
     break;
 
-
-  /* ARK_FULLRHS_END: called at the end of a successful step
-     If the method coefficients support it, we just copy the last stage RHS
-     vectors to fill f instead of calling f(t,y).
-     Copy the results to F[0] if the coefficients support it. */
   case ARK_FULLRHS_END:
 
-    /* determine if explicit RHS function needs to be recomputed */
-    recomputeRHS = SUNFALSE;
-    if (SUNRabs(step_mem->B->c[step_mem->stages - 1] - ONE) > TINY)
-      recomputeRHS = SUNTRUE;
+    /* determine if RHS function needs to be recomputed */
+    if (!(ark_mem->fn_is_current))
+    {
+      recomputeRHS = !ARKodeButcherTable_IsStifflyAccurate(step_mem->B);
 
-    /* base RHS calls on recomputeRHS argument */
-    if (recomputeRHS) {
+      /* First Same As Last methods are not FSAL when relaxation is enabled */
+      if (ark_mem->relax_enabled) { recomputeRHS = SUNTRUE; }
 
-      /* call f */
-      retval = step_mem->f(t, y, step_mem->F[0], ark_mem->user_data);
-      step_mem->nfe++;
-      if (retval != 0) {
-        arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ERKStep",
+      /* base RHS calls on recomputeRHS argument */
+      if (recomputeRHS)
+      {
+        /* call f */
+        retval = step_mem->f(t, y, step_mem->F[0], ark_mem->user_data);
+        step_mem->nfe++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::ERKStep",
                         "erkStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-        return(ARK_RHSFUNC_FAIL);
+          return(ARK_RHSFUNC_FAIL);
+        }
+      }
+      else
+      {
+        N_VScale(ONE, step_mem->F[step_mem->stages-1], step_mem->F[0]);
       }
-
-    } else {
-      N_VScale(ONE, step_mem->F[step_mem->stages-1], step_mem->F[0]);
     }
 
     /* copy RHS vector into output */
@@ -692,9 +700,6 @@ int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
 
     break;
 
-  /*  ARK_FULLRHS_OTHER: called for dense output in-between steps
-      store the intermediate calculations in such a way as to not
-      interfere with the other two modes */
   case ARK_FULLRHS_OTHER:
 
     /* call f */
@@ -741,7 +746,7 @@ int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   ---------------------------------------------------------------*/
 int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 {
-  int retval, is, js, nvec;
+  int retval, is, js, nvec, mode;
   realtype* cvals;
   N_Vector* Xvecs;
   ARKodeMem ark_mem;
@@ -777,6 +782,21 @@ int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
   N_VPrintFile(step_mem->F[0], ARK_LOGGER->debug_fp);
 #endif
 
+  /* Call the full RHS if needed. If this is the first step then we may need to
+     evaluate or copy the RHS values from an  earlier evaluation (e.g., to
+     compute h0). For subsequent steps treat this RHS evaluation as an
+     evaluation at the end of the just completed step to potentially reuse
+     (FSAL methods) RHS evaluations from the end of the last step. */
+
+  if (!(ark_mem->fn_is_current))
+  {
+    mode = (ark_mem->initsetup) ? ARK_FULLRHS_START : ARK_FULLRHS_END;
+    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
+                                   ark_mem->fn, mode);
+    if (retval) { return ARK_RHSFUNC_FAIL; }
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
   /* Loop over internal stages to the step; since the method is explicit
      the first stage RHS is just the full RHS from the start of the step */
   for (is=1; is<step_mem->stages; is++) {
@@ -1174,46 +1194,6 @@ int erkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
   return(ARK_SUCCESS);
 }
 
-/* -----------------------------------------------------------------------------
- * erkStep_RelaxDeltaY
- *
- * Computes the RK update to yn for use in relaxation methods
- * ---------------------------------------------------------------------------*/
-
-int erkStep_RelaxDeltaY(ARKodeMem ark_mem, N_Vector delta_y)
-{
-  int i, nvec, retval;
-  realtype* cvals;
-  N_Vector* Xvecs;
-  ARKodeERKStepMem step_mem;
-
-  /* Access the stepper memory structure */
-  if (!(ark_mem->step_mem))
-  {
-    arkProcessError(ark_mem, ARK_MEM_NULL, "ARKODE::ERKStep",
-                    "erkStep_RelaxDeltaY", MSG_ERKSTEP_NO_MEM);
-    return ARK_MEM_NULL;
-  }
-  step_mem = (ARKodeERKStepMem)(ark_mem->step_mem);
-
-  /* Set arrays for fused vector operation */
-  cvals = step_mem->cvals;
-  Xvecs = step_mem->Xvecs;
-
-  nvec = 0;
-  for (i = 0; i < step_mem->stages; i++)
-  {
-    cvals[nvec] = ark_mem->h * step_mem->B->b[i];
-    Xvecs[nvec] = step_mem->F[i];
-    nvec++;
-  }
-
-  /* Compute time step update (delta_y) */
-  retval = N_VLinearCombination(nvec, cvals, Xvecs, delta_y);
-  if (retval) return ARK_VECTOROP_ERR;
-
-  return ARK_SUCCESS;
-}
 
 /* -----------------------------------------------------------------------------
  * erkStep_RelaxDeltaE
diff --git a/src/arkode/arkode_erkstep_impl.h b/src/arkode/arkode_erkstep_impl.h
index f3684d9d39..236e1779ac 100644
--- a/src/arkode/arkode_erkstep_impl.h
+++ b/src/arkode/arkode_erkstep_impl.h
@@ -84,7 +84,6 @@ int erkStep_CheckButcherTable(ARKodeMem ark_mem);
 int erkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsm);
 
 /* private functions for relaxation */
-int erkStep_RelaxDeltaY(ARKodeMem ark_mem, N_Vector delta_y);
 int erkStep_RelaxDeltaE(ARKodeMem ark_mem, ARKRelaxJacFn relax_jac_fn,
                         long int* relax_jac_fn_evals, sunrealtype* delta_e_out);
 int erkStep_GetOrder(ARKodeMem ark_mem);
diff --git a/src/arkode/arkode_erkstep_io.c b/src/arkode/arkode_erkstep_io.c
index 34bb7d46c2..15845101cc 100644
--- a/src/arkode/arkode_erkstep_io.c
+++ b/src/arkode/arkode_erkstep_io.c
@@ -159,8 +159,8 @@ char *ERKStepGetReturnFlagName(long int flag) {
 
 int ERKStepSetRelaxFn(void* arkode_mem, ARKRelaxFn rfn, ARKRelaxJacFn rjac)
 {
-  return arkRelaxCreate(arkode_mem, rfn, rjac, erkStep_RelaxDeltaY,
-                        erkStep_RelaxDeltaE, erkStep_GetOrder);
+  return arkRelaxCreate(arkode_mem, rfn, rjac, erkStep_RelaxDeltaE,
+                        erkStep_GetOrder);
 }
 
 int ERKStepSetRelaxEtaFail(void* arkode_mem, sunrealtype eta_rf)
diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
index 32c73219ee..e4285b6120 100644
--- a/src/arkode/arkode_impl.h
+++ b/src/arkode/arkode_impl.h
@@ -330,15 +330,17 @@ struct ARKodeMemRec
   void                       *step_mem;
 
   /* N_Vector storage */
-  N_Vector ewt;           /* error weight vector                             */
-  N_Vector rwt;           /* residual weight vector                          */
-  booleantype rwt_is_ewt; /* SUNTRUE if rwt is a pointer to ewt              */
-  N_Vector ycur;          /* pointer to user-provided solution memory; used
-                             as evolving solution by the timestepper modules */
-  N_Vector yn;            /* solution from the last successful step          */
-  N_Vector fn;            /* full IVP right-hand side from last step         */
-  N_Vector tempv1;        /* temporary storage vectors (for local use and by */
-  N_Vector tempv2;        /* time-stepping modules)                          */
+  N_Vector ewt;                 /* error weight vector                        */
+  N_Vector rwt;                 /* residual weight vector                     */
+  booleantype rwt_is_ewt;       /* SUNTRUE if rwt is a pointer to ewt         */
+  N_Vector ycur;                /* pointer to user-provided solution memory;
+                                   used as evolving solution by the time stepper
+                                   modules */
+  N_Vector yn;                  /* solution from the last successful step     */
+  N_Vector fn;                  /* full IVP right-hand side from last step    */
+  sunbooleantype fn_is_current; /* SUNTRUE if fn has been evaluated at yn     */
+  N_Vector tempv1;              /* temporary storage vectors (for local use   */
+  N_Vector tempv2;              /* and by time-stepping modules)              */
   N_Vector tempv3;
   N_Vector tempv4;
 
@@ -346,6 +348,7 @@ struct ARKodeMemRec
 
   /* Temporal interpolation module */
   ARKInterp interp;
+  int interp_type;
 
   /* Tstop information */
   booleantype tstopset;
@@ -409,7 +412,7 @@ struct ARKodeMemRec
   int         init_type;    /* initialization type (see constants above)  */
   booleantype firststage;   /* denotes first stage in simulation          */
   booleantype initialized;  /* denotes arkInitialSetup has been done      */
-  booleantype call_fullrhs; /* denotes fn needs updating after each step  */
+  booleantype call_fullrhs; /* denotes the full RHS fn will be called     */
 
   /* Error handler function and error ouput file */
   ARKErrHandlerFn ehfun;    /* error messages are handled by ehfun        */
@@ -804,13 +807,29 @@ struct ARKodeMemRec
   ODE RHS function supplied (e.g. ERK, DIRK, IRK), or it may be
   the sum of many ODE RHS functions (e.g. ARK, MRI).  The 'mode'
   indicates where this routine is called:
+
      ARK_FULLRHS_START -> called at the beginning of a simulation
-     ARK_FULLRHS_END   -> called at the end of a successful step
+                          i.e., at (tn, yn) = (t0, y0) or (tR, yR)
+
+     ARK_FULLRHS_END   -> called at the end of a successful step i.e,
+                          at (tcur, ycur) or the start of the subsequent
+                          step i.e., at (tn, yn) = (tcur, ycur) from
+                          the end of the last step
+
      ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
+
   It is recommended that the stepper use the mode information to
   maximize reuse between calls to this function and RHS
   evaluations inside the stepper itself.
 
+  This routine is only required to be supplied to ARKODE if:
+  * ARKODE's initial time step selection algorithm is used,
+  * the user requests temporal root-finding,
+  * the Hermite interpolation module is used, or
+  * the user requests the "bootstrap" implicit predictor.
+  Note that any stepper can itself require that this routine
+  exist for its own internal business (e.g., ERKStep).
+
   This routine should return 0 if successful, and a negative value
   otherwise.  If an error does occur, an appropriate message
   should be sent to the error handler function.
@@ -1154,6 +1173,8 @@ int arkGetLastKFlag(void *arkode_mem, int *last_kflag);
 #define MSG_ARK_POSTPROCESS_STAGE_FAIL "At " MSG_TIME ", the stage postprocessing routine failed in an unrecoverable manner."
 #define MSG_ARK_NULL_SUNCTX "sunctx = NULL illegal."
 #define MSG_ARK_CONTEXT_MISMATCH "Outer and inner steppers have different contexts."
+#define MSG_ARK_MISSING_FULLRHS "Time-stepping module missing fullrhs routine (required by requested solver configuration)."
+#define MSG_ARK_INTERPOLATION_FAIL "At " MSG_TIME ", interpolating the solution failed."
 
 #ifdef __cplusplus
 }
diff --git a/src/arkode/arkode_interp.c b/src/arkode/arkode_interp.c
index 30ee7aece8..9854194c3f 100644
--- a/src/arkode/arkode_interp.c
+++ b/src/arkode/arkode_interp.c
@@ -150,10 +150,6 @@ ARKInterp arkInterpCreate_Hermite(void* arkode_mem, int degree)
   /* set maximum interpolant degree */
   content->degree = SUNMIN(ARK_INTERP_MAX_DEGREE, degree);
 
-  /* set ynew and fnew pointers to ark_mem->yn and ark_mem->fn, respectively */
-  content->ynew = ark_mem->yn;
-  content->fnew = ark_mem->fn;
-
   /* update workspace sizes */
   ark_mem->lrw += 2;
   ark_mem->liw += 5;
@@ -202,10 +198,6 @@ int arkInterpResize_Hermite(void* arkode_mem, ARKInterp interp,
                     liw_diff, y0, &HINT_FB(interp)))
     return(ARK_MEM_FAIL);
 
-  /* update ynew and fnew pointers */
-  HINT_YNEW(interp) = ark_mem->yn;
-  HINT_FNEW(interp) = ark_mem->fn;
-
   /* reinitialize time values */
   HINT_TOLD(interp) = ark_mem->tcur;
   HINT_TNEW(interp) = ark_mem->tcur;
@@ -286,12 +278,8 @@ void arkInterpPrintMem_Hermite(ARKInterp interp, FILE *outfile)
 #ifdef SUNDIALS_DEBUG_PRINTVEC
     fprintf(outfile, "arkode_interp (Hermite): fold:\n");
     N_VPrintFile(HINT_FOLD(interp), outfile);
-    fprintf(outfile, "arkode_interp (Hermite): fnew:\n");
-    N_VPrintFile(HINT_FNEW(interp), outfile);
     fprintf(outfile, "arkode_interp (Hermite): yold:\n");
     N_VPrintFile(HINT_YOLD(interp), outfile);
-    fprintf(outfile, "arkode_interp (Hermite): ynew:\n");
-    N_VPrintFile(HINT_YNEW(interp), outfile);
     fprintf(outfile, "arkode_interp (Hermite): fa:\n");
     N_VPrintFile(HINT_FA(interp), outfile);
     fprintf(outfile, "arkode_interp (Hermite): fb:\n");
@@ -402,13 +390,7 @@ int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
     }
   }
 
-  /* copy current solution into yold */
-  N_VScale(ONE, ark_mem->yn, HINT_YOLD(interp));
-
-  /* copy fnew into fold */
-  N_VScale(ONE, HINT_FNEW(interp), HINT_FOLD(interp));
-
-  /* signal that fullrhs is required after each step */
+  /* signal that a full RHS data is required for interpolation */
   ark_mem->call_fullrhs = SUNTRUE;
 
   /* return with success */
@@ -424,15 +406,26 @@ int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
   ---------------------------------------------------------------*/
 int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, realtype tnew)
 {
+  int retval;
   ARKodeMem ark_mem;
 
   /* access ARKodeMem structure */
   if (arkode_mem == NULL)  return(ARK_MEM_NULL);
   ark_mem = (ARKodeMem) arkode_mem;
 
+  /* call full RHS if needed -- called just BEFORE the end of a step, so yn has
+     NOT been updated to ycur yet */
+  if (!(ark_mem->fn_is_current))
+  {
+    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
+                                   ark_mem->fn, ARK_FULLRHS_START);
+    if (retval) { return ARK_RHSFUNC_FAIL; }
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
   /* copy ynew and fnew into yold and fold, respectively */
-  N_VScale(ONE, HINT_YNEW(interp), HINT_YOLD(interp));
-  N_VScale(ONE, HINT_FNEW(interp), HINT_FOLD(interp));
+  N_VScale(ONE, ark_mem->yn, HINT_YOLD(interp));
+  N_VScale(ONE, ark_mem->fn, HINT_FOLD(interp));
 
   /* update time values */
   HINT_TOLD(interp) = HINT_TNEW(interp);
@@ -510,6 +503,16 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
                      "tau = %"RSYM", d = %i, q = %i", tau, d, q);
 #endif
 
+  /* call full RHS if needed -- called just AFTER the end of a step, so yn has
+     been updated to ycur */
+  if (!(ark_mem->fn_is_current))
+  {
+    retval = ark_mem->step_fullrhs(ark_mem, ark_mem->tn, ark_mem->yn,
+                                   ark_mem->fn, ARK_FULLRHS_END);
+    if (retval) { return ARK_RHSFUNC_FAIL; }
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
   /* error on illegal d */
   if (d < 0) {
     arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
@@ -528,7 +531,7 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
   switch (q) {
 
   case(0):    /* constant interpolant, yout = 0.5*(yn+yp) */
-    N_VLinearSum(HALF, HINT_YOLD(interp), HALF, HINT_YNEW(interp), yout);
+    N_VLinearSum(HALF, HINT_YOLD(interp), HALF, ark_mem->yn, yout);
     break;
 
   case(1):    /* linear interpolant */
@@ -539,7 +542,7 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
       a0 = -ONE/h;
       a1 =  ONE/h;
     }
-    N_VLinearSum(a0, HINT_YOLD(interp), a1, HINT_YNEW(interp), yout);
+    N_VLinearSum(a0, HINT_YOLD(interp), a1, ark_mem->yn, yout);
     break;
 
   case(2):    /* quadratic interpolant */
@@ -557,8 +560,8 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
       a[2] = TWO/h;
     }
     X[0] = HINT_YOLD(interp);
-    X[1] = HINT_YNEW(interp);
-    X[2] = HINT_FNEW(interp);
+    X[1] = ark_mem->yn;
+    X[2] = ark_mem->fn;
     retval = N_VLinearCombination(3, a, X, yout);
     if (retval != 0)  return(ARK_VECTOROP_ERR);
     break;
@@ -586,9 +589,9 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
       a[3] = SIX/h2;
     }
     X[0] = HINT_YOLD(interp);
-    X[1] = HINT_YNEW(interp);
+    X[1] = ark_mem->yn;
     X[2] = HINT_FOLD(interp);
-    X[3] = HINT_FNEW(interp);
+    X[3] = ark_mem->fn;
     retval = N_VLinearCombination(4, a, X, yout);
     if (retval != 0) return(ARK_VECTOROP_ERR);
    break;
@@ -639,9 +642,9 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
       a[4] = -RCONST(162.0)/h3;
     }
     X[0] = HINT_YOLD(interp);
-    X[1] = HINT_YNEW(interp);
+    X[1] = ark_mem->yn;
     X[2] = HINT_FOLD(interp);
-    X[3] = HINT_FNEW(interp);
+    X[3] = ark_mem->fn;
     X[4] = HINT_FA(interp);
     retval = N_VLinearCombination(5, a, X, yout);
     if (retval != 0) return(ARK_VECTOROP_ERR);
@@ -716,9 +719,9 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
       a[5] = a[4];
     }
     X[0] = HINT_YOLD(interp);
-    X[1] = HINT_YNEW(interp);
+    X[1] = ark_mem->yn;
     X[2] = HINT_FOLD(interp);
-    X[3] = HINT_FNEW(interp);
+    X[3] = ark_mem->fn;
     X[4] = HINT_FA(interp);
     X[5] = HINT_FB(interp);
     retval = N_VLinearCombination(6, a, X, yout);
@@ -1052,7 +1055,7 @@ int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp I,
     }
   }
 
-  /* update allocated size if necesary */
+  /* update allocated size if necessary */
   if (LINT_NMAX(I) > LINT_NMAXALLOC(I))
     LINT_NMAXALLOC(I) = LINT_NMAX(I);
 
diff --git a/src/arkode/arkode_interp_impl.h b/src/arkode/arkode_interp_impl.h
index 75a4696704..7c8794ff82 100644
--- a/src/arkode/arkode_interp_impl.h
+++ b/src/arkode/arkode_interp_impl.h
@@ -47,9 +47,7 @@ extern "C" {
 struct _ARKInterpContent_Hermite {
   int      degree;  /* maximum interpolant degree to use           */
   N_Vector fold;    /* f(t,y) at beginning of last successful step */
-  N_Vector fnew;    /* f(t,y) at end of last successful step       */
   N_Vector yold;    /* y at beginning of last successful step      */
-  N_Vector ynew;    /* y at end of last successful step            */
   N_Vector fa;      /* f(t,y) used in higher-order interpolation   */
   N_Vector fb;      /* f(t,y) used in higher-order interpolation   */
   realtype told;    /* t at beginning of last successful step      */
@@ -65,9 +63,7 @@ typedef struct _ARKInterpContent_Hermite *ARKInterpContent_Hermite;
 #define HINT_CONTENT(I)     ( (ARKInterpContent_Hermite)(I->content) )
 #define HINT_DEGREE(I)      ( HINT_CONTENT(I)->degree )
 #define HINT_FOLD(I)        ( HINT_CONTENT(I)->fold )
-#define HINT_FNEW(I)        ( HINT_CONTENT(I)->fnew )
 #define HINT_YOLD(I)        ( HINT_CONTENT(I)->yold )
-#define HINT_YNEW(I)        ( HINT_CONTENT(I)->ynew )
 #define HINT_FA(I)          ( HINT_CONTENT(I)->fa )
 #define HINT_FB(I)          ( HINT_CONTENT(I)->fb )
 #define HINT_TOLD(I)        ( HINT_CONTENT(I)->told )
diff --git a/src/arkode/arkode_io.c b/src/arkode/arkode_io.c
index 60e6d04187..af230fb8e0 100644
--- a/src/arkode/arkode_io.c
+++ b/src/arkode/arkode_io.c
@@ -158,12 +158,20 @@ int arkSetInterpolantType(void *arkode_mem, int itype)
 
   /* create requested interpolation module, initially specifying
      the maximum possible interpolant degree. */
-  if (itype == ARK_INTERP_HERMITE) {
+  if (itype == ARK_INTERP_HERMITE)
+  {
     ark_mem->interp = arkInterpCreate_Hermite(arkode_mem, ARK_INTERP_MAX_DEGREE);
-  } else if (itype == ARK_INTERP_LAGRANGE) {
+    ark_mem->interp_type = ARK_INTERP_HERMITE;
+  }
+  else if (itype == ARK_INTERP_LAGRANGE)
+  {
     ark_mem->interp = arkInterpCreate_Lagrange(arkode_mem, ARK_INTERP_MAX_DEGREE);
-  } else {
+    ark_mem->interp_type = ARK_INTERP_LAGRANGE;
+  }
+  else
+  {
     ark_mem->interp = NULL;
+    ark_mem->interp_type = -1;
   }
   if (ark_mem->interp == NULL) {
     arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetInterpolantType",
diff --git a/src/arkode/arkode_mri_tables.c b/src/arkode/arkode_mri_tables.c
index b1fc0723d6..5552ec6cbf 100644
--- a/src/arkode/arkode_mri_tables.c
+++ b/src/arkode/arkode_mri_tables.c
@@ -62,8 +62,8 @@ MRIStepCoupling MRIStepCoupling_LoadTableByName(const char *method)
 #undef ARK_MRI_TABLE
 
   arkProcessError(NULL, ARK_ILL_INPUT, "ARKODE",
-	   "MRIStepCoupling_LoadTable",
-	   "Unknown coupling table");
+           "MRIStepCoupling_LoadTable",
+           "Unknown coupling table");
 
   return NULL;
 }
@@ -461,7 +461,8 @@ void MRIStepCoupling_Write(MRIStepCoupling MRIC, FILE *outfile)
 
   /* check for vaild coupling structure */
   if (!MRIC) return;
-  if (!(MRIC->G)) return;
+  if (!(MRIC->W) && !(MRIC->G)) return;
+  if (!(MRIC->c)) return;
 
   if (MRIC->W) {
     for (i = 0; i < MRIC->nmat; i++) {
@@ -479,13 +480,10 @@ void MRIStepCoupling_Write(MRIStepCoupling MRIC, FILE *outfile)
     }
   }
 
-  if (!(MRIC->c)) return;
-
   fprintf(outfile, "  nmat = %i\n", MRIC->nmat);
   fprintf(outfile, "  stages = %i\n", MRIC->stages);
   fprintf(outfile, "  method order (q) = %i\n", MRIC->q);
   fprintf(outfile, "  embedding order (p) = %i\n", MRIC->p);
-
   fprintf(outfile, "  c = ");
   for (i = 0; i < MRIC->stages; i++)
     fprintf(outfile, "%"RSYM"  ", MRIC->c[i]);
diff --git a/src/arkode/arkode_mristep.c b/src/arkode/arkode_mristep.c
index 11e74e86a5..f6af65c193 100644
--- a/src/arkode/arkode_mristep.c
+++ b/src/arkode/arkode_mristep.c
@@ -965,7 +965,6 @@ int mriStep_GetGammas(void* arkode_mem, realtype *gamma,
   - sets/checks the ARK Butcher tables to be used
   - allocates any memory that depends on the number of ARK
     stages, method order, or solver options
-  - sets the call_fullrhs flag
 
   With other initialization types, this routine does nothing.
   ---------------------------------------------------------------*/
@@ -1207,37 +1206,39 @@ int mriStep_Init(void* arkode_mem, int init_type)
     }
   }
 
-  /* Signal to shared arkode module that fullrhs is required after each step */
-  ark_mem->call_fullrhs = SUNTRUE;
-
   return(ARK_SUCCESS);
 }
 
 
-/*---------------------------------------------------------------
+/*------------------------------------------------------------------------------
   mriStep_FullRHS:
 
   This is just a wrapper to call the user-supplied RHS functions,
   f(t,y) = fse(t,y) + fsi(t,y)  + ff(t,y).
 
   This will be called in one of three 'modes':
-    ARK_FULLRHS_START -> called at the beginning of a simulation
-                         or after post processing at step
-    ARK_FULLRHS_END   -> called at the end of a successful step
-    ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
 
-  If it is called in ARK_FULLRHS_START mode, we store the vectors
-  f(t,y) in F[0] for possible reuse in the first stage of the
+     ARK_FULLRHS_START -> called at the beginning of a simulation i.e., at
+                          (tn, yn) = (t0, y0) or (tR, yR)
+
+     ARK_FULLRHS_END   -> called at the end of a successful step i.e, at
+                          (tcur, ycur) or the start of the subsequent step i.e.,
+                          at (tn, yn) = (tcur, ycur) from the end of the last
+                          step
+
+     ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
+
+  If this function is called in ARK_FULLRHS_START or ARK_FULLRHS_END mode and
+  evaluating the RHS functions is necessary, we store the vectors fse(t,y) and
+  fsi(t,y) in Fse[0] and Fsi[0] for possible reuse in the first stage of the
   subsequent time step.
 
-  If it is called in ARK_FULLRHS_END mode, we reevauate f(t,y). At
-  this time no checks are made to see if the method coefficient
-  support copying vectors F[stages] to fill f instead of calling f().
+  ARK_FULLRHS_OTHER mode is only called for dense output in-between steps, or
+  when estimating the initial time step size, so we strive to store the
+  intermediate parts so that they do not interfere with the other two modes.
 
-  ARK_FULLRHS_OTHER mode is only called for dense output in-between
-  steps, so we strive to store the intermediate parts so that they
-  do not interfere with the other two modes.
-  ---------------------------------------------------------------*/
+  Presently ff(t,y) is always called with ARK_FULLRHS_OTHER mode.
+  ----------------------------------------------------------------------------*/
 int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                     int mode)
 {
@@ -1250,115 +1251,144 @@ int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS) return(retval);
 
+  /* ensure that inner stepper provides fullrhs function */
+  if (!(step_mem->stepper->ops->fullrhs))
+  {
+    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::MRIStep",
+                    "mriStep_FullRHS", MSG_ARK_MISSING_FULLRHS);
+    return ARK_ILL_INPUT;
+  }
+
   /* perform RHS functions contingent on 'mode' argument */
   switch(mode) {
 
-  /* ARK_FULLRHS_START: called at the beginning of a simulation
-     Store the vector fs(t,y) in F[0] for possible reuse
-     in the first stage of the subsequent time step */
   case ARK_FULLRHS_START:
 
-    /* call fse if the problem has an explicit component */
-    if (step_mem->explicit_rhs) {
-      retval = step_mem->fse(t, y, step_mem->Fse[0], ark_mem->user_data);
-      step_mem->nfse++;
-      if (retval != 0) {
-         arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
-                         "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-         return(ARK_RHSFUNC_FAIL);
+    /* compute the full RHS */
+    if (!(ark_mem->fn_is_current))
+    {
+      /* compute the explicit component */
+      if (step_mem->explicit_rhs)
+      {
+        retval = step_mem->fse(t, y, step_mem->Fse[0], ark_mem->user_data);
+        step_mem->nfse++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
+                          "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
       }
-    }
 
-    /* call fsi if the problem has an implicit component */
-    if (step_mem->implicit_rhs) {
-      retval = step_mem->fsi(t, y, step_mem->Fsi[0], ark_mem->user_data);
-      step_mem->nfsi++;
-      if (retval != 0) {
+      /* compute the implicit component */
+      if (step_mem->implicit_rhs)
+      {
+        retval = step_mem->fsi(t, y, step_mem->Fsi[0], ark_mem->user_data);
+        step_mem->nfsi++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
+                          "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
+      }
+
+      /* compute the fast component (force new RHS computation) */
+      retval = mriStepInnerStepper_FullRhs(step_mem->stepper, t, y, f,
+                                           ARK_FULLRHS_OTHER);
+      if (retval != ARK_SUCCESS)
+      {
         arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
                         "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
         return(ARK_RHSFUNC_FAIL);
       }
     }
 
-    /* call ff (force new RHS computation) */
-    retval = mriStepInnerStepper_FullRhs(step_mem->stepper, t, y, f,
-                                         ARK_FULLRHS_OTHER);
-    if (retval != ARK_SUCCESS) {
-      arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
-                      "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-      return(ARK_RHSFUNC_FAIL);
-    }
-
     /* combine RHS vectors into output */
-    if (step_mem->explicit_rhs && step_mem->implicit_rhs) { /* ImEx */
+    if (step_mem->explicit_rhs && step_mem->implicit_rhs)
+    {
+      /* ImEx */
       N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
       N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
-    } else {
-      if (step_mem->implicit_rhs) {         /* implicit */
-        N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
-      } else {                          /* explicit */
-        N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
-      }
+    }
+    else if (step_mem->implicit_rhs)
+    {
+      /* implicit */
+      N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
+    }
+    else
+    {
+      /* explicit */
+      N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
     }
 
     break;
 
-
-  /* ARK_FULLRHS_END: called at the end of a successful step
-     This always recomputes the full RHS (i.e., this is the
-     same as case 0). */
   case ARK_FULLRHS_END:
 
-    /* call fse if the problem has an explicit component */
-    if (step_mem->explicit_rhs) {
-      retval = step_mem->fse(t, y, step_mem->Fse[0], ark_mem->user_data);
-      step_mem->nfse++;
-      if (retval != 0) {
-        arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
-                        "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-        return(ARK_RHSFUNC_FAIL);
+    /* compute the full RHS */
+    if (!(ark_mem->fn_is_current))
+    {
+      /* compute the explicit component */
+      if (step_mem->explicit_rhs)
+      {
+        retval = step_mem->fse(t, y, step_mem->Fse[0], ark_mem->user_data);
+        step_mem->nfse++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
+                          "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
       }
-    }
 
-    /* call fsi if the problem has an implicit component */
-    if (step_mem->implicit_rhs) {
-      retval = step_mem->fsi(t, y, step_mem->Fsi[0], ark_mem->user_data);
-      step_mem->nfsi++;
-      if (retval != 0) {
+      /* compute the implicit component */
+      if (step_mem->implicit_rhs)
+      {
+        retval = step_mem->fsi(t, y, step_mem->Fsi[0], ark_mem->user_data);
+        step_mem->nfsi++;
+        if (retval != 0)
+        {
+          arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
+                          "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
+          return(ARK_RHSFUNC_FAIL);
+        }
+      }
+
+      /* compute the fast component (force new RHS computation) */
+      retval = mriStepInnerStepper_FullRhs(step_mem->stepper, t, y, f,
+                                           ARK_FULLRHS_OTHER);
+      if (retval != ARK_SUCCESS)
+      {
         arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
                         "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
         return(ARK_RHSFUNC_FAIL);
       }
     }
 
-    /* call ff (force new RHS computation) */
-    retval = mriStepInnerStepper_FullRhs(step_mem->stepper, t, y, f,
-                                         ARK_FULLRHS_OTHER);
-    if (retval != ARK_SUCCESS) {
-      arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, "ARKODE::MRIStep",
-                      "mriStep_FullRHS", MSG_ARK_RHSFUNC_FAILED, t);
-      return(ARK_RHSFUNC_FAIL);
-    }
-
     /* combine RHS vectors into output */
-    if (step_mem->explicit_rhs && step_mem->implicit_rhs) { /* ImEx */
+    if (step_mem->explicit_rhs && step_mem->implicit_rhs)
+    {
+      /* ImEx */
       N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
       N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
-    } else {
-      if (step_mem->implicit_rhs) {         /* implicit */
-        N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
-      } else {                          /* explicit */
-        N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
-      }
     }
+    else if (step_mem->implicit_rhs)
+    {
+      /* implicit */
+      N_VLinearSum(ONE, step_mem->Fsi[0], ONE, f, f);
+    }
+    else
+    {
+      /* explicit */
+      N_VLinearSum(ONE, step_mem->Fse[0], ONE, f, f);
+    }
+
     break;
 
-  /*  ARK_FULLRHS_OTHER: called for dense output in-between steps
-      store the intermediate calculations in such a way as to not
-      interfere with the other two modes */
   case ARK_FULLRHS_OTHER:
 
-    /* call fse if the problem has an explicit component (store in ark_tempv2) */
+    /* compute the explicit component and store in ark_tempv2 */
     if (step_mem->explicit_rhs) {
       retval = step_mem->fse(t, y, ark_mem->tempv2, ark_mem->user_data);
       step_mem->nfse++;
@@ -1369,7 +1399,7 @@ int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
       }
     }
 
-    /* call fsi if the problem has an implicit component (store in sdata) */
+    /* compute the implicit component and store in sdata */
     if (step_mem->implicit_rhs) {
       retval = step_mem->fsi(t, y, step_mem->sdata, ark_mem->user_data);
       step_mem->nfsi++;
@@ -1381,7 +1411,7 @@ int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
     }
 
 
-    /* call ff (force new RHS computation) */
+    /* compute the fast component (force new RHS computation) */
     retval = mriStepInnerStepper_FullRhs(step_mem->stepper, t, y, f,
                                          ARK_FULLRHS_OTHER);
     if (retval != ARK_SUCCESS) {
@@ -1391,15 +1421,21 @@ int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
     }
 
     /* combine RHS vectors into output */
-    if (step_mem->explicit_rhs && step_mem->implicit_rhs) { /* ImEx */
+    if (step_mem->explicit_rhs && step_mem->implicit_rhs)
+    {
+      /* ImEx */
       N_VLinearSum(ONE, ark_mem->tempv2, ONE, f, f);
       N_VLinearSum(ONE, step_mem->sdata, ONE, f, f);
-    } else {                   /* implicit */
-      if (step_mem->implicit_rhs) {
-        N_VLinearSum(ONE, step_mem->sdata, ONE, f, f);
-      } else {                                           /* explicit */
-        N_VLinearSum(ONE, ark_mem->tempv2, ONE, f, f);
-      }
+    }
+    else if (step_mem->implicit_rhs)
+    {
+      /* implicit */
+      N_VLinearSum(ONE, step_mem->sdata, ONE, f, f);
+    }
+    else
+    {
+      /* explicit */
+      N_VLinearSum(ONE, ark_mem->tempv2, ONE, f, f);
     }
 
     break;
@@ -1457,6 +1493,45 @@ int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS) return(retval);
 
+  /* call nonlinear solver setup if it exists */
+  if (step_mem->NLS)
+  {
+    if ((step_mem->NLS)->ops->setup) {
+      N_VConst(ZERO, ark_mem->tempv3);   /* set guess to 0 for predictor-corrector form */
+      retval = SUNNonlinSolSetup(step_mem->NLS, ark_mem->tempv3, ark_mem);
+      if (retval < 0) return(ARK_NLS_SETUP_FAIL);
+      if (retval > 0) return(ARK_NLS_SETUP_RECVR);
+    }
+  }
+
+  /* Evaluate the slow RHS functions if needed. NOTE: We do not use the full RHS
+     function here (unlike ERKStep and ARKStep) since it does not need to check
+     for FSAL or SA methods and thus avoids potentially unnecessary evaluations
+     of the inner (fast) RHS function */
+
+  if (!(ark_mem->fn_is_current))
+  {
+    /* compute the explicit component */
+    if (step_mem->explicit_rhs)
+    {
+      retval = step_mem->fse(ark_mem->tn, ark_mem->yn, step_mem->Fse[0],
+                             ark_mem->user_data);
+      step_mem->nfse++;
+      if (retval) { return ARK_RHSFUNC_FAIL; }
+    }
+
+    /* compute the implicit component */
+    if (step_mem->implicit_rhs)
+    {
+      retval = step_mem->fsi(ark_mem->tn, ark_mem->yn, step_mem->Fsi[0],
+                             ark_mem->user_data);
+      step_mem->nfsi++;
+      if (retval) { return ARK_RHSFUNC_FAIL; }
+    }
+
+    ark_mem->fn_is_current = SUNTRUE;
+  }
+
 #ifdef SUNDIALS_DEBUG
   printf("    MRIStep step %li,  stage 0,  h = %"RSYM",  t_n = %"RSYM"\n",
          ark_mem->nst, ark_mem->h, ark_mem->tcur);
@@ -1484,15 +1559,6 @@ int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
   }
 #endif
 
-  /* call nonlinear solver setup if it exists */
-  if (step_mem->NLS)
-    if ((step_mem->NLS)->ops->setup) {
-      N_VConst(ZERO, ark_mem->tempv3);   /* set guess to 0 for predictor-corrector form */
-      retval = SUNNonlinSolSetup(step_mem->NLS, ark_mem->tempv3, ark_mem);
-      if (retval < 0) return(ARK_NLS_SETUP_FAIL);
-      if (retval > 0) return(ARK_NLS_SETUP_RECVR);
-    }
-
   /* The first stage is the previous time-step solution, so its RHS
      is the [already-computed] slow RHS from the start of the step */
 
@@ -1510,8 +1576,8 @@ int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
                        "ARKODE::mriStep_TakeStep", "start-stage",
-                       "step = %li, stage = %i, h = %"RSYM", tcur = %"RSYM,
-                       ark_mem->nst, is, ark_mem->h, ark_mem->tcur);
+                       "step = %li, stage = %i, stage type = %d, h = %"RSYM", tcur = %"RSYM,
+                       ark_mem->nst, is, step_mem->stagetypes[is], ark_mem->h, ark_mem->tcur);
 #endif
 
     /* Determine current stage type, and call corresponding routine; the
@@ -2729,7 +2795,7 @@ int mriStepInnerStepper_HasRequiredOps(MRIStepInnerStepper stepper)
   if (stepper == NULL) return ARK_ILL_INPUT;
   if (stepper->ops == NULL) return ARK_ILL_INPUT;
 
-  if (stepper->ops->evolve && stepper->ops->fullrhs)
+  if (stepper->ops->evolve)
     return ARK_SUCCESS;
   else
     return ARK_ILL_INPUT;
diff --git a/src/arkode/arkode_relaxation.c b/src/arkode/arkode_relaxation.c
index cc9fb5d0b8..4badc7cb70 100644
--- a/src/arkode/arkode_relaxation.c
+++ b/src/arkode/arkode_relaxation.c
@@ -122,6 +122,13 @@ static int arkRelaxNewtonSolve(ARKodeMem ark_mem)
                               ark_mem);
     if (retval) return retval;
 
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                       "ARKODE::arkRelaxNewtonSolve", "residual",
+                       "iter = %i, relax_param = %"RSYM", residual = %"RSYM,
+                       i, relax_mem->relax_param, relax_mem->res);
+#endif
+
     /* Check for convergence */
     if (SUNRabs(relax_mem->res) < relax_mem->res_tol) { return ARK_SUCCESS; }
 
@@ -344,9 +351,21 @@ int arkRelaxSolve(ARKodeMem ark_mem, ARKodeRelaxMem relax_mem,
                                  &(relax_mem->delta_e));
   if (retval) return retval;
 
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                     "ARKODE::arkRelaxSolve", "compute delta e",
+                     "delta_e = %"RSYM, relax_mem->delta_e);
+#endif
+
   /* Get the change in state (delta_y = tempv2) */
-  retval = relax_mem->delta_y_fn(ark_mem, ark_mem->tempv2);
-  if (retval) return retval;
+  N_VLinearSum(ONE, ark_mem->ycur, -ONE, ark_mem->yn, ark_mem->tempv2);
+
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                     "ARKODE::arkRelaxSolve", "compute delta y",
+                     "delta_y =", "");
+  N_VPrintFile(ark_mem->tempv2, ARK_LOGGER->debug_fp);
+#endif
 
   /* Store the current relaxation function value */
   retval = relax_mem->relax_fn(ark_mem->yn, &(relax_mem->e_old),
@@ -355,6 +374,12 @@ int arkRelaxSolve(ARKodeMem ark_mem, ARKodeRelaxMem relax_mem,
   if (retval < 0) { return ARK_RELAX_FUNC_FAIL; }
   if (retval > 0) { return ARK_RELAX_FUNC_RECV; }
 
+#ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
+                     "ARKODE::arkRelaxSolve", "compute old e",
+                     "e_old = %"RSYM, relax_mem->e_old);
+#endif
+
   /* Initial guess for relaxation parameter */
   relax_mem->relax_param = relax_mem->relax_param_prev;
 
@@ -683,8 +708,8 @@ int arkRelaxPrintAllStats(void* arkode_mem, FILE* outfile, SUNOutputFormat fmt)
 
 /* Constructor called by stepper */
 int arkRelaxCreate(void* arkode_mem, ARKRelaxFn relax_fn,
-                   ARKRelaxJacFn relax_jac_fn, ARKRelaxDeltaYFn delta_y_fn,
-                   ARKRelaxDeltaEFn delta_e_fn, ARKRelaxGetOrderFn get_order_fn)
+                   ARKRelaxJacFn relax_jac_fn, ARKRelaxDeltaEFn delta_e_fn,
+                   ARKRelaxGetOrderFn get_order_fn)
 {
   ARKodeMem ark_mem;
 
@@ -720,7 +745,7 @@ int arkRelaxCreate(void* arkode_mem, ARKRelaxFn relax_fn,
   }
 
   /* Ensure stepper supplied inputs are provided */
-  if (!delta_y_fn || !delta_e_fn || !get_order_fn)
+  if (!delta_e_fn || !get_order_fn)
   {
     arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkRelaxCreate",
                     "The Delta y, Delta e, or get order function is NULL.");
@@ -756,7 +781,6 @@ int arkRelaxCreate(void* arkode_mem, ARKRelaxFn relax_fn,
   /* Set function pointers */
   ark_mem->relax_mem->relax_fn     = relax_fn;
   ark_mem->relax_mem->relax_jac_fn = relax_jac_fn;
-  ark_mem->relax_mem->delta_y_fn   = delta_y_fn;
   ark_mem->relax_mem->delta_e_fn   = delta_e_fn;
   ark_mem->relax_mem->get_order_fn = get_order_fn;
 
diff --git a/src/arkode/arkode_relaxation_impl.h b/src/arkode/arkode_relaxation_impl.h
index 9a6e5b4c38..1b62416d50 100644
--- a/src/arkode/arkode_relaxation_impl.h
+++ b/src/arkode/arkode_relaxation_impl.h
@@ -30,7 +30,7 @@
  * ---------------------------------------------------------------------------*/
 
 #define ARK_RELAX_DEFAULT_MAX_FAILS   10
-#define ARK_RELAX_DEFAULT_RES_TOL     (4 * SUN_UNIT_ROUNDOFF)
+#define ARK_RELAX_DEFAULT_RES_TOL     (10 * SUN_UNIT_ROUNDOFF)
 #define ARK_RELAX_DEFAULT_REL_TOL     (4 * SUN_UNIT_ROUNDOFF)
 #define ARK_RELAX_DEFAULT_ABS_TOL     SUN_RCONST(1.0e-14)
 #define ARK_RELAX_DEFAULT_MAX_ITERS   10
@@ -42,17 +42,14 @@
  * Relaxation Private Return Values (see arkode/arkode.h for public values)
  * ---------------------------------------------------------------------------*/
 
-#define ARK_RELAX_FUNC_RECV  1;
-#define ARK_RELAX_JAC_RECV   2;
-#define ARK_RELAX_SOLVE_RECV 3;
+#define ARK_RELAX_FUNC_RECV  1
+#define ARK_RELAX_JAC_RECV   2
+#define ARK_RELAX_SOLVE_RECV 3
 
 /* -----------------------------------------------------------------------------
  * Stepper Supplied Relaxation Functions
  * ---------------------------------------------------------------------------*/
 
-/* Compute the change in state for the current step y_new = y_old + delta_y */
-typedef int (*ARKRelaxDeltaYFn)(ARKodeMem ark_mem, N_Vector delta_y);
-
 /* Compute the estimated change in entropy for this step delta_e */
 typedef int (*ARKRelaxDeltaEFn)(ARKodeMem ark_mem, ARKRelaxJacFn relax_jac_fn,
                                 long int* evals_out, sunrealtype* delta_e_out);
@@ -69,7 +66,6 @@ struct ARKodeRelaxMemRec
   /* user-supplied and stepper supplied functions */
   ARKRelaxFn relax_fn;             /* user relaxation function ("entropy") */
   ARKRelaxJacFn relax_jac_fn;      /* user relaxation Jacobian             */
-  ARKRelaxDeltaYFn delta_y_fn;     /* get delta y from stepper             */
   ARKRelaxDeltaEFn delta_e_fn;     /* get delta entropy from stepper       */
   ARKRelaxGetOrderFn get_order_fn; /* get the method order                 */
 
@@ -105,8 +101,7 @@ struct ARKodeRelaxMemRec
 
 /* Driver and Stepper Functions */
 int arkRelaxCreate(void* arkode_mem, ARKRelaxFn relax_fn,
-                   ARKRelaxJacFn relax_jac_fn, ARKRelaxDeltaYFn delta_y_fn,
-                   ARKRelaxDeltaEFn delta_e_fn,
+                   ARKRelaxJacFn relax_jac_fn, ARKRelaxDeltaEFn delta_e_fn,
                    ARKRelaxGetOrderFn get_order_fn);
 int arkRelaxDestroy(ARKodeRelaxMem relax_mem);
 int arkRelax(ARKodeMem ark_mem, int* relax_fails, sunrealtype* dsm_inout,
diff --git a/src/arkode/arkode_root.c b/src/arkode/arkode_root.c
index 7c0b49df81..ff0682ac34 100644
--- a/src/arkode/arkode_root.c
+++ b/src/arkode/arkode_root.c
@@ -30,7 +30,8 @@
 
   arkRootInit initializes a rootfinding problem to be solved
   during the integration of the ODE system.  It loads the root
-  function pointer and the number of root functions, and allocates
+  function pointer and the number of root functions, notifies
+  ARKODE that the "fullrhs" function is required, and allocates
   workspace memory.  The return value is ARK_SUCCESS = 0 if no
   errors occurred, or a negative value otherwise.
   ---------------------------------------------------------------*/
@@ -46,6 +47,24 @@ int arkRootInit(ARKodeMem ark_mem, int nrtfn, ARKRootFn g)
   }
   nrt = (nrtfn < 0) ? 0 : nrtfn;
 
+  /* Ensure that stepper provides fullrhs function */
+  if (nrt > 0)
+  {
+    if (!(ark_mem->step_fullrhs))
+    {
+      arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                      "arkRootInit", MSG_ARK_MISSING_FULLRHS);
+      return ARK_ILL_INPUT;
+    }
+
+    if (!arkAllocVec(ark_mem, ark_mem->yn, &ark_mem->fn))
+    {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE",
+                      "arkInitialSetup", MSG_ARK_MEM_FAIL);
+      return(ARK_MEM_FAIL);
+    }
+  }
+
   /* If unallocated, allocate rootfinding structure, set defaults, update space */
   if (ark_mem->root_mem == NULL) {
     ark_mem->root_mem = (ARKodeRootMem) malloc(sizeof(struct ARKodeRootMemRec));
diff --git a/src/arkode/arkode_sprkstep.c b/src/arkode/arkode_sprkstep.c
index 5d6219e98e..f2968ffef3 100644
--- a/src/arkode/arkode_sprkstep.c
+++ b/src/arkode/arkode_sprkstep.c
@@ -143,6 +143,10 @@ void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0, N_Vector y0,
   /* Zero yerr for compensated summation */
   if (ark_mem->use_compensated_sums) { N_VConst(ZERO, step_mem->yerr); }
 
+  /* SPRKStep uses Lagrange interpolation by default, since Hermite is
+     less compatible with these methods. */
+  arkSetInterpolantType(ark_mem, ARK_INTERP_LAGRANGE);
+
   /* Initialize main ARKODE infrastructure */
   retval = arkInit(ark_mem, t0, y0, FIRST_INIT);
   if (retval != ARK_SUCCESS)
@@ -153,10 +157,6 @@ void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0, N_Vector y0,
     return (NULL);
   }
 
-  /* SPRKStep uses Lagrange interpolation by default, since Hermite is
-     less compatible with these methods. */
-  arkSetInterpolantType(ark_mem, ARK_INTERP_LAGRANGE);
-
   return ((void*)ark_mem);
 }
 
@@ -459,10 +459,6 @@ int sprkStep_Init(void* arkode_mem, int init_type)
     }
   }
 
-  /* Signal to shared arkode module that fullrhs is not required after each step
-   */
-  ark_mem->call_fullrhs = SUNFALSE;
-
   return (ARK_SUCCESS);
 }
 
@@ -500,30 +496,27 @@ int sprkStep_f2(ARKodeSPRKStepMem step_mem, sunrealtype tcur, N_Vector ycur,
   return retval;
 }
 
-/*---------------------------------------------------------------
+/*------------------------------------------------------------------------------
   sprkStep_FullRHS:
 
   This is just a wrapper to call the user-supplied RHS,
   f1(t,y) + f2(t,y).
 
   This will be called in one of three 'modes':
-    ARK_FULLRHS_START -> called at the beginning of a simulation
-                         or after post processing at step
-    ARK_FULLRHS_END   -> called at the end of a successful step
-    ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
-
-  If it is called in ARK_FULLRHS_START mode, we store the vectors
-  f1(t,y) and f2(t,y) in sdata for possible reuse in the first stage
-  of the subsequent time step.
-
-  If it is called in ARK_FULLRHS_END mode and the method coefficients
-  support it, we may just copy the stage vectors to fill f instead
-  of calling f().
-
-  ARK_FULLRHS_OTHER mode is only called for dense output in-between
-  steps, so we strive to store the intermediate parts so that they
-  do not interfere with the other two modes.
-  ---------------------------------------------------------------*/
+
+     ARK_FULLRHS_START -> called at the beginning of a simulation i.e., at
+                          (tn, yn) = (t0, y0) or (tR, yR)
+
+     ARK_FULLRHS_END   -> called at the end of a successful step i.e, at
+                          (tcur, ycur) or the start of the subsequent step i.e.,
+                          at (tn, yn) = (tcur, ycur) from the end of the last
+                          step
+
+     ARK_FULLRHS_OTHER -> called elsewhere (e.g. for dense output)
+
+  Since RHS values are not stored in SPRKStep we evaluate the RHS functions for
+  all modes.
+  ----------------------------------------------------------------------------*/
 int sprkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                      int mode)
 {
@@ -543,6 +536,9 @@ int sprkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
   case ARK_FULLRHS_END:
   case ARK_FULLRHS_OTHER:
 
+    /* Since f1 and f2 do not have overlapping outputs and so the f vector is
+       passed to both RHS functions. */
+
     retval = sprkStep_f1(step_mem, t, y, f, ark_mem->user_data);
     if (retval != 0)
     {
diff --git a/src/sundials/sundials_context.c b/src/sundials/sundials_context.c
index 94f90301b8..9ff4204da7 100644
--- a/src/sundials/sundials_context.c
+++ b/src/sundials/sundials_context.c
@@ -339,4 +339,4 @@ void sunAdiakCollectMetadata() {
 #endif
 
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/test/answers b/test/answers
index 37f4e6b5b6..a63bd8022c 160000
--- a/test/answers
+++ b/test/answers
@@ -1 +1 @@
-Subproject commit 37f4e6b5b68e407ea302facba92883126dd39bf7
+Subproject commit a63bd8022ca4e772744769d7b6d5a371d5fb6429
diff --git a/test/unit_tests/arkode/CXX_parallel/CMakeLists.txt b/test/unit_tests/arkode/CXX_parallel/CMakeLists.txt
index bf238501f6..d86cd29f31 100644
--- a/test/unit_tests/arkode/CXX_parallel/CMakeLists.txt
+++ b/test/unit_tests/arkode/CXX_parallel/CMakeLists.txt
@@ -16,73 +16,68 @@
 
 # List of test tuples of the form "name\;tasks\;args"
 if (NOT SUNDIALS_PRECISION MATCHES "SINGLE")
-  set(ARKODE_unit_tests
-    "ark_test_heat2D_mri\;2\;0"
-    "ark_test_heat2D_mri\;4\;1"
+  set(unit_tests
+    "ark_test_heat2D_mri.cpp\;2\;0"
+    "ark_test_heat2D_mri.cpp\;4\;1"
     )
 endif()
 
-if(MPI_CXX_COMPILER)
-  # use MPI wrapper as the compiler
-  set(CMAKE_CXX_COMPILER ${MPI_CXX_COMPILER})
-
-  # disable C++ extensions (for known wrappers)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -DLAM_BUILDING")
-else()
-  # add MPI_INCLUDE_PATH to include directories
-  include_directories(${MPI_INCLUDE_PATH})
-endif()
-
-set(ARKODE_LIB sundials_arkode)
-set(NVECP_LIB sundials_nvecparallel)
-
-# Set-up linker flags and link libraries
-set(SUNDIALS_LIBS ${ARKODE_LIB} ${NVECP_LIB} ${EXE_EXTRA_LINK_LIBS})
-
 # Add the build and install targets for each test
-foreach(test_tuple ${ARKODE_unit_tests})
+foreach(test_tuple ${unit_tests})
 
   # parse the test tuple
   list(GET test_tuple 0 test)
   list(GET test_tuple 1 number_of_tasks)
   list(GET test_tuple 2 test_args)
 
+  # Extract the file name without extension
+  get_filename_component(test_target ${test} NAME_WE)
+
   # check if this test has already been added, only need to add
   # test source files once for testing with different inputs
-  if(NOT TARGET ${test})
+  if(NOT TARGET ${test_target})
 
     # test source files
-    add_executable(${test} ${test}.cpp)
+    add_executable(${test_target} ${test})
 
-    set_target_properties(${test} PROPERTIES FOLDER "unit_tests")
+    set_target_properties(${test_target} PROPERTIES FOLDER "unit_tests")
 
     # include location of public and private header files
-    target_include_directories(${test} PRIVATE
+    target_include_directories(${test_target} PRIVATE
       $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
       ${CMAKE_SOURCE_DIR}/include
       ${CMAKE_SOURCE_DIR}/src)
 
     # libraries to link against
-    target_link_libraries(${test} ${SUNDIALS_LIBS})
-
-    if(NOT MPI_CXX_COMPILER)
-      target_link_libraries(${test} ${MPI_LIBRARY} ${MPI_EXTRA_LIBRARIES})
-    endif()
+    target_link_libraries(${test_target}
+      MPI::MPI_CXX
+      sundials_arkode
+      sundials_nvecparallel
+      ${EXE_EXTRA_LINK_LIBS})
 
   endif()
 
   # check if test args are provided and set the test name
   if("${test_args}" STREQUAL "")
-    set(test_name ${test})
+    set(test_name ${test_target})
   else()
-    string(REGEX REPLACE " " "_" test_name ${test}_${test_args})
+    string(REGEX REPLACE " " "_" test_name "${test_target}_${test_args}")
+  endif()
+
+  if(SUNDIALS_PRECISION MATCHES "DOUBLE")
+    set(diff_output "")
+  else()
+    set(diff_output "NODIFF")
   endif()
 
   # add test to regression tests
-  sundials_add_test(${test_name} ${test}
+  sundials_add_test(${test_name} ${test_target}
     TEST_ARGS ${test_args}
+    ANSWER_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+    ANSWER_FILE ${test_name}.out
     MPI_NPROCS ${number_of_tasks}
-    NODIFF)
+    ${diff_output})
+
 endforeach()
 
 message(STATUS "Added ARKODE CXX parallel unit tests")
diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
index 85ee27e410..479524e8e4 100644
--- a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
+++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
@@ -103,6 +103,8 @@ static int SetupDecomp(UserData *udata);
 static int Exchange(N_Vector y, UserData *udata);
 //    frees memory allocated within UserData
 static int FreeUserData(UserData *udata);
+//    check if relative difference is within tolerance
+static bool Compare(long int a, long int b, sunrealtype tol);
 
 // Main Program
 int main(int argc, char* argv[]) {
@@ -386,7 +388,7 @@ int main(int argc, char* argv[]) {
     if (outproc)
       cout << "  Internal solver steps error: " << ark_nst << " vs " << mri_nst << "\n";
   }
-  if ((ark_nfi - ark_nst) != mri_nfsi) {
+  if (ark_nfi != mri_nfsi) {
     numfails += 1;
     if (outproc)
       cout << "  RHS evals error: " << ark_nfi << " vs " << mri_nfsi << "\n";
@@ -396,17 +398,17 @@ int main(int argc, char* argv[]) {
     if (outproc)
       cout << "  Linear solver setups error: " << ark_nsetups << " vs " << mri_nsetups << "\n";
   }
-  if (ark_nli < mri_nli) {
+  if (!Compare(ark_nli, mri_nli, ONE)) {
     numfails += 1;
     if (outproc)
       cout << "  Linear iterations error: " << ark_nli << " vs " << mri_nli << "\n";
   }
-  if (ark_nJv < mri_nJv) {
+  if (!Compare(ark_nJv, mri_nJv, ONE)) {
     numfails += 1;
     if (outproc)
       cout << "  Jacobian-vector products error: " << ark_nJv << " vs " << mri_nJv << "\n";
   }
-  if (ark_nps < mri_nps) {
+  if (!Compare(ark_nps, mri_nps, ONE)) {
     numfails += 1;
     if (outproc)
       cout << "  Preconditioner solves error: " << ark_nps << " vs " << mri_nps << "\n";
@@ -943,5 +945,13 @@ static int FreeUserData(UserData *udata)
   return 0;     // return with success flag
 }
 
+// Check if relative difference of a and b is less than tolerance
+static bool Compare(long int a, long int b, sunrealtype tol)
+{
+  sunrealtype rel_diff = SUN_RCONST(100.0) *
+    abs(static_cast<sunrealtype>(a - b) / static_cast<sunrealtype>(a));
+
+  return (rel_diff > tol) ? false : true;
+}
 
 //---- end of file ----
diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out
new file mode 100644
index 0000000000..a78e16c9fd
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out
@@ -0,0 +1,40 @@
+
+2D Heat PDE test problem:
+   nprocs = 2
+   nx = 60
+   ny = 120
+   kx = 0.5
+   ky = 0.75
+   rtol = 1e-05
+   atol = 1e-10
+   nxl (proc 0) = 30
+   nyl (proc 0) = 120
+   Nonlinear implicit solver
+
+
+ARKStep Solver Statistics:
+   Internal solver steps = 1000
+   Total RHS evals:  Fe = 0,  Fi = 2769
+   Total linear solver setups = 50
+   Total linear iterations = 6231
+   Total number of Jacobian-vector products = 6231
+   Total number of Preconditioner setups = 17
+   Total number of Preconditioner solves = 6231
+   Total number of linear solver convergence failures = 0
+   Total number of Newton iterations = 1768
+   Total number of nonlinear solver convergence failures = 0
+
+MRIStep Solver Statistics:
+   Internal solver steps = 1000
+   Total RHS evals:  Fe = 2769
+   Total linear solver setups = 50
+   Total linear iterations = 6250
+   Total number of Jacobian-vector products = 6250
+   Total number of Preconditioner setups = 50
+   Total number of Preconditioner solves = 6250
+   Total number of linear solver convergence failures = 0
+   Total number of Newton iterations = 1768
+   Total number of nonlinear solver convergence failures = 0
+
+Comparing Solver Statistics:
+All tests pass!
diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out
new file mode 100644
index 0000000000..bbf3267c89
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out
@@ -0,0 +1,40 @@
+
+2D Heat PDE test problem:
+   nprocs = 4
+   nx = 60
+   ny = 120
+   kx = 0.5
+   ky = 0.75
+   rtol = 1e-05
+   atol = 1e-10
+   nxl (proc 0) = 30
+   nyl (proc 0) = 60
+   Linearly implicit solver
+
+
+ARKStep Solver Statistics:
+   Internal solver steps = 1000
+   Total RHS evals:  Fe = 0,  Fi = 2001
+   Total linear solver setups = 1
+   Total linear iterations = 4711
+   Total number of Jacobian-vector products = 4711
+   Total number of Preconditioner setups = 1
+   Total number of Preconditioner solves = 4711
+   Total number of linear solver convergence failures = 0
+   Total number of Newton iterations = 1000
+   Total number of nonlinear solver convergence failures = 0
+
+MRIStep Solver Statistics:
+   Internal solver steps = 1000
+   Total RHS evals:  Fe = 2001
+   Total linear solver setups = 1
+   Total linear iterations = 4731
+   Total number of Jacobian-vector products = 4731
+   Total number of Preconditioner setups = 1
+   Total number of Preconditioner solves = 4731
+   Total number of linear solver convergence failures = 0
+   Total number of Newton iterations = 1000
+   Total number of nonlinear solver convergence failures = 0
+
+Comparing Solver Statistics:
+All tests pass!
diff --git a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
index b0ea386c44..6367e502e4 100644
--- a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
@@ -18,6 +18,14 @@
 set(unit_tests
   "ark_test_analytic_sys_mri.cpp\;0"
   "ark_test_analytic_sys_mri.cpp\;1"
+  "ark_test_dahlquist_ark.cpp\;0 0"
+  "ark_test_dahlquist_ark.cpp\;1 0"
+  "ark_test_dahlquist_ark.cpp\;2 0"
+  "ark_test_dahlquist_ark.cpp\;0 1"
+  "ark_test_dahlquist_ark.cpp\;1 1"
+  "ark_test_dahlquist_ark.cpp\;2 1"
+  "ark_test_dahlquist_erk.cpp\;0"
+  "ark_test_dahlquist_erk.cpp\;1"
   "ark_test_dahlquist_mri.cpp\;"
   "ark_test_butcher.cpp\;"
   "ark_test_getjac.cpp\;"
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
index ce0b9bdd04..ecb951f6c0 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
@@ -62,6 +62,9 @@ static int dense_MM(SUNMatrix A, SUNMatrix B, SUNMatrix C);
 // Private function to check function return values
 static int check_flag(void *flagvalue, const string funcname, int opt);
 
+//    check if relative difference is within tolerance
+static bool Compare(long int a, long int b, sunrealtype tol);
+
 // SUNContext for the simulation
 static SUNContext sunctx = NULL;
 
@@ -312,11 +315,11 @@ int main(int argc, char* argv[])
     numfails += 1;
     cout << "  Internal solver steps error: " << ark_nst << " vs " << mri_nst << "\n";
   }
-  if ((ark_nfi - ark_nst) != mri_nfsi) {
+  if (!Compare(ark_nfi, mri_nfsi, ONE)) {
     numfails += 1;
     cout << "  RHS evals error: " << ark_nfi << " vs " << mri_nfsi << "\n";
   }
-  if (ark_nni != mri_nni) {
+  if (!Compare(ark_nni, mri_nni, ONE)) {
     numfails += 1;
     cout << "  Nonlinear iterations error: " << ark_nni << " vs " << mri_nni << "\n";
   }
@@ -535,6 +538,13 @@ static int check_flag(void *flagvalue, const string funcname, int opt)
   return 0;
 }
 
+// Check if relative difference of a and b is less than tolerance
+static bool Compare(long int a, long int b, sunrealtype tol)
+{
+  sunrealtype rel_diff = SUN_RCONST(100.0) *
+    abs(static_cast<sunrealtype>(a - b) / static_cast<sunrealtype>(a));
 
+  return (rel_diff > tol) ? false : true;
+}
 
 //---- end of file ----
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_0.out
index a5976da941..384859a985 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_0.out
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_0.out
@@ -10,7 +10,7 @@ ARKStep Solver Statistics:
    Return time = 0.05
    Internal final time = 0.05
    Internal solver steps = 1000
-   Total RHS evals:  Fe = 0,  Fi = 3001
+   Total RHS evals:  Fe = 0,  Fi = 2001
    Total number of nonlinear iterations = 1000
    Total number of nonlinear solver convergence failures = 0
    Total linear solver setups = 1
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_1.out
index 7ab9908ef6..bd5acb803f 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_1.out
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri_1.out
@@ -10,7 +10,7 @@ ARKStep Solver Statistics:
    Return time = 0.05
    Internal final time = 0.05
    Internal solver steps = 1000
-   Total RHS evals:  Fe = 0,  Fi = 4946
+   Total RHS evals:  Fe = 0,  Fi = 3946
    Total number of nonlinear iterations = 2945
    Total number of nonlinear solver convergence failures = 0
 
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
new file mode 100644
index 0000000000..6cc8f27c24
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.cpp
@@ -0,0 +1,956 @@
+/* ---------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * ---------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * ---------------------------------------------------------------------------
+ * IMEX Dahlquist problem:
+ *
+ * 1) y' = lambda_e * y + lambda_i * y
+ * 2) M y' = M (lambda_e * y + lambda_i * y)
+ * 3) M(t) y' = M(t) (lambda_e * y + lambda_i * y)
+ * ---------------------------------------------------------------------------*/
+
+// Header files
+#include <cmath>
+#include <cstdio>
+#include <iomanip>
+#include <iostream>
+#include <string>
+
+#include <arkode/arkode_arkstep.h>
+#include <nvector/nvector_serial.h>
+#include <sunlinsol/sunlinsol_dense.h>
+#include <sunmatrix/sunmatrix_dense.h>
+#include "arkode/arkode_butcher.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#define ESYM "Le"
+#define FSYM "Lf"
+#else
+#define GSYM "g"
+#define ESYM "e"
+#define FSYM "f"
+#endif
+
+// Constants
+#define NEG_ONE SUN_RCONST(-1.0)
+#define ZERO    SUN_RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+
+// Method types
+enum class prob_type
+{
+  identity,
+  fixed_mass_matrix,
+  time_dependent_mass_matrix
+};
+
+enum class method_type
+{
+  expl,
+  impl,
+  imex
+};
+
+enum class interp_type
+{
+  hermite,
+  lagrange
+};
+
+// Problem parameters
+struct ProblemData
+{
+  sunrealtype lambda_e = NEG_ONE;
+  sunrealtype lambda_i = NEG_ONE;
+  prob_type   p_type   = prob_type::identity;
+};
+
+// Problem options
+struct ProblemOptions
+{
+  // Initial time
+  sunrealtype t0 = ZERO;
+
+  // Relative and absolute tolerances
+  sunrealtype reltol = SUN_RCONST(1.0e-4);
+  sunrealtype abstol = SUN_RCONST(1.0e-6);
+
+  // Step size
+  sunrealtype h = SUN_RCONST(0.01);
+
+  // Interpolant type
+  // 0 = Hermite
+  // 1 = Lagrange
+  interp_type i_type = interp_type::hermite;
+};
+
+// User-supplied Functions called by the solver
+int fe(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data);
+int fi(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data);
+int Ji(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data,
+       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data, N_Vector tmp1,
+               N_Vector tmp2, N_Vector tmp3);
+
+// Private function to check function return values
+int check_flag(void* flagvalue, const std::string funcname, int opt);
+
+// Test drivers
+int run_tests(ARKodeButcherTable Be, ARKodeButcherTable Bi,
+              ProblemData& prob_data, ProblemOptions& prob_opts,
+              sundials::Context& sunctx);
+
+int get_method_properties(ARKodeButcherTable Be, ARKodeButcherTable Bi,
+                          int& stages, int& order, bool& explicit_first_stage,
+                          bool& stiffly_accurate, bool& fsal);
+
+int expected_rhs_evals(method_type m_type, interp_type i_type, int stages,
+                       bool explicit_first_stage, bool stiffly_accurate,
+                       bool fsal, void* arkstep_mem, long int& nfe_expected,
+                       long int& nfi_expected);
+
+int check_rhs_evals(method_type m_type, void* arkstep_mem,
+                    long int nfe_expected, long int nfi_expected);
+
+// -----------------------------------------------------------------------------
+// Main Program
+// -----------------------------------------------------------------------------
+
+int main(int argc, char* argv[])
+{
+  // Problem data and options structures
+  ProblemData prob_data;
+  ProblemOptions prob_opts;
+
+  // Check for inputs
+  if (argc > 1)
+  {
+    if (std::stoi(argv[1]) == 1)
+    {
+      prob_data.p_type = prob_type::fixed_mass_matrix;
+    }
+    else if (std::stoi(argv[1]) == 2)
+    {
+      prob_data.p_type = prob_type::time_dependent_mass_matrix;
+    }
+    else
+    {
+      prob_data.p_type = prob_type::identity;
+    }
+  }
+
+  if (argc > 2)
+  {
+    if (std::stoi(argv[2]) == 1)
+    {
+      prob_opts.i_type = interp_type::lagrange;
+    }
+    else
+    {
+      prob_opts.i_type = interp_type::hermite;
+    }
+  }
+
+  // Output problem setup
+  std::cout << "\nDahlquist ODE test problem:\n";
+  if (prob_data.p_type == prob_type::identity)
+  {
+    std::cout << "  problem type = Identity\n";
+  }
+  else if (prob_data.p_type == prob_type::fixed_mass_matrix)
+  {
+    std::cout << "  problem type = Fixed mass matrix\n";
+  }
+  else
+  {
+    std::cout << "  problem type = Time-dependent mass matrix\n";
+  }
+  std::cout << "  lambda expl  = " << prob_data.lambda_e << "\n"
+            << "  lambda impl  = " << prob_data.lambda_i << "\n"
+            << "  step size    = " << prob_opts.h << "\n"
+            << "  relative tol = " << prob_opts.reltol << "\n"
+            << "  absolute tol = " << prob_opts.abstol << "\n";
+  if (prob_opts.i_type == interp_type::hermite)
+  {
+    std::cout << "  interp type  = Hermite\n";
+  }
+  else
+  {
+    std::cout << "  interp type  = Lagrange\n";
+  }
+
+  // Create SUNDIALS context
+  sundials::Context sunctx;
+
+  // Test methods
+  int flag, numfails = 0;
+
+  ARKodeButcherTable Be = nullptr;
+  ARKodeButcherTable Bi = nullptr;
+
+  int stages, order;
+  bool explicit_first_stage, stiffly_accurate, fsal;
+
+  // --------
+  // Explicit
+  // --------
+
+  std::cout << "\n========================\n"
+            << "Test explicit RK methods\n"
+            << "========================\n";
+
+  Be          = ARKodeButcherTable_Alloc(1, SUNFALSE);
+  Be->A[0][0] = ZERO;
+  Be->b[0]    = ONE;
+  Be->c[0]    = ZERO;
+  Be->q       = 1;
+
+  flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  std::cout << "\n========================" << std::endl;
+  std::cout << "Explicit Euler" << std::endl;
+  std::cout << "  stages:             " << stages << std::endl;
+  std::cout << "  order:              " << order << std::endl;
+  std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+  std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+  std::cout << "  first same as last: " << fsal << std::endl;
+  std::cout << "========================" << std::endl;
+
+  numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+  ARKodeButcherTable_Free(Be);
+  Be = nullptr;
+
+  for (int i = ARKODE_MIN_ERK_NUM; i <= ARKODE_MAX_ERK_NUM; i++)
+  {
+    Be = ARKodeButcherTable_LoadERK(static_cast<ARKODE_ERKTableID>(i));
+    flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                                 stiffly_accurate, fsal);
+    if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+    std::cout << "\n========================" << std::endl;
+    std::cout << "ERK Table ID " << i << std::endl;
+    std::cout << "  stages:             " << stages << std::endl;
+    std::cout << "  order:              " << order << std::endl;
+    std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+    std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+    std::cout << "  first same as last: " << fsal << std::endl;
+    std::cout << "========================" << std::endl;
+
+    numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+    ARKodeButcherTable_Free(Be);
+    Be = nullptr;
+  }
+
+  // --------
+  // Implicit
+  // --------
+
+  std::cout << "\n========================\n"
+            << "Test implicit RK methods\n"
+            << "========================\n";
+
+  Bi          = ARKodeButcherTable_Alloc(1, SUNFALSE);
+  Bi->A[0][0] = ONE;
+  Bi->b[0]    = ONE;
+  Bi->c[0]    = ONE;
+  Bi->q       = 1;
+
+  flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  std::cout << "\n========================" << std::endl;
+  std::cout << "Implicit Euler" << std::endl;
+  std::cout << "  stages:             " << stages << std::endl;
+  std::cout << "  order:              " << order << std::endl;
+  std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+  std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+  std::cout << "  first same as last: " << fsal << std::endl;
+  std::cout << "========================" << std::endl;
+
+  numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+  ARKodeButcherTable_Free(Bi);
+  Bi = nullptr;
+
+  for (int i = ARKODE_MIN_DIRK_NUM; i <= ARKODE_MAX_DIRK_NUM; i++)
+  {
+    Bi = ARKodeButcherTable_LoadDIRK(static_cast<ARKODE_DIRKTableID>(i));
+    flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                                 stiffly_accurate, fsal);
+    if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+    std::cout << "\n========================" << std::endl;
+    std::cout << "DIRK Table ID " << i << std::endl;
+    std::cout << "  stages:             " << stages << std::endl;
+    std::cout << "  order:              " << order << std::endl;
+    std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+    std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+    std::cout << "  first same as last: " << fsal << std::endl;
+    std::cout << "========================" << std::endl;
+
+    numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+    ARKodeButcherTable_Free(Bi);
+    Bi = nullptr;
+  }
+
+  // ----
+  // IMEX
+  // ----
+
+  std::cout << "\n=====================\n"
+            << "Test IMEX ARK methods\n"
+            << "=====================\n";
+
+  Be          = ARKodeButcherTable_Alloc(2, SUNFALSE);
+  Be->A[1][0] = ONE;
+  Be->b[0]    = ONE;
+  Be->c[1]    = ONE;
+  Be->q       = 1;
+
+  Bi          = ARKodeButcherTable_Alloc(2, SUNFALSE);
+  Bi->A[1][1] = ONE;
+  Bi->b[1]    = ONE;
+  Bi->c[1]    = ONE;
+  Bi->q       = 1;
+
+  flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  std::cout << "\n========================" << std::endl;
+  std::cout << "IMEX Euler" << std::endl;
+  std::cout << "  stages:             " << stages << std::endl;
+  std::cout << "  order:              " << order << std::endl;
+  std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+  std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+  std::cout << "  first same as last: " << fsal << std::endl;
+  std::cout << "========================" << std::endl;
+
+  numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+  ARKodeButcherTable_Free(Be);
+  ARKodeButcherTable_Free(Bi);
+  Be = nullptr;
+  Bi = nullptr;
+
+  const char* ark_methods_erk[6] =
+    {"ARKODE_ARK2_ERK_3_1_2",
+     "ARKODE_ARK324L2SA_ERK_4_2_3",
+     "ARKODE_ARK436L2SA_ERK_6_3_4",
+     "ARKODE_ARK437L2SA_ERK_7_3_4",
+     "ARKODE_ARK548L2SA_ERK_8_4_5",
+     "ARKODE_ARK548L2SAb_ERK_8_4_5"};
+
+  const char* ark_methods_dirk[6] =
+    {"ARKODE_ARK2_DIRK_3_1_2",
+     "ARKODE_ARK324L2SA_DIRK_4_2_3",
+     "ARKODE_ARK436L2SA_DIRK_6_3_4",
+     "ARKODE_ARK437L2SA_DIRK_7_3_4",
+     "ARKODE_ARK548L2SA_ERK_8_4_5",
+     "ARKODE_ARK548L2SAb_ERK_8_4_5"};
+
+  for (int i = 0; i < 6; i++)
+  {
+    Be = ARKodeButcherTable_LoadERKByName(ark_methods_erk[0]);
+    Bi = ARKodeButcherTable_LoadDIRKByName(ark_methods_dirk[0]);
+
+    flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                                 stiffly_accurate, fsal);
+    if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+    std::cout << "\n========================" << std::endl;
+    std::cout << "IMEX Table ID " << i << std::endl;
+    std::cout << "  stages:             " << stages << std::endl;
+    std::cout << "  order:              " << order << std::endl;
+    std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+    std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+    std::cout << "  first same as last: " << fsal << std::endl;
+    std::cout << "========================" << std::endl;
+
+    numfails += run_tests(Be, Bi, prob_data, prob_opts, sunctx);
+
+    ARKodeButcherTable_Free(Be);
+    ARKodeButcherTable_Free(Bi);
+    Be = nullptr;
+    Bi = nullptr;
+  }
+
+  if (numfails) { std::cout << "\n\nFailed " << numfails << " tests!\n"; }
+  else { std::cout << "\n\nAll tests passed!\n"; }
+
+  // Return test status
+  return numfails;
+}
+
+// -----------------------------------------------------------------------------
+// Test drivers
+// -----------------------------------------------------------------------------
+
+int run_tests(ARKodeButcherTable Be, ARKodeButcherTable Bi,
+              ProblemData& prob_data, ProblemOptions& prob_opts,
+              sundials::Context& sunctx)
+{
+  // Reusable error-checking flag
+  int flag;
+
+  // Test failure counter
+  int numfails = 0;
+
+  // Determine method type
+  method_type m_type;
+  if (Be && !Bi) { m_type = method_type::expl; }
+  else if (!Be && Bi) { m_type = method_type::impl; }
+  else if (Be && Bi) { m_type = method_type::imex; }
+  else
+  {
+    std::cerr << "ERROR: Both Butcher tables are NULL" << std::endl;
+    return 1;
+  }
+
+  // Get method properties
+  int stages, order;
+  bool explicit_first_stage, stiffly_accurate, fsal;
+  flag = get_method_properties(Be, Bi, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  // Create initial condition vector
+  N_Vector y = N_VNew_Serial(1, sunctx);
+  if (check_flag((void*)y, "N_VNew_Serial", 0)) return 1;
+
+  N_VConst(SUN_RCONST(1.0), y);
+
+  // -----------------
+  // Create integrator
+  // -----------------
+
+  // Create integrator based on type
+  void* arkstep_mem = nullptr;
+
+  if (m_type == method_type::expl)
+  {
+    arkstep_mem = ARKStepCreate(fe, nullptr, prob_opts.t0, y, sunctx);
+  }
+  else if (m_type == method_type::impl)
+  {
+    arkstep_mem = ARKStepCreate(nullptr, fi, prob_opts.t0, y, sunctx);
+  }
+  else
+  {
+    arkstep_mem = ARKStepCreate(fe, fi, prob_opts.t0, y, sunctx);
+  }
+  if (check_flag((void*)arkstep_mem, "ARKStepCreate", 0)) return 1;
+
+  // Set user data
+  flag = ARKStepSetUserData(arkstep_mem, &prob_data);
+  if (check_flag(&flag, "ARKStepSetUserData", 1)) return 1;
+
+  // Specify tolerances
+  flag = ARKStepSStolerances(arkstep_mem, prob_opts.reltol, prob_opts.abstol);
+  if (check_flag(&flag, "ARKStepSStolerances", 1)) return 1;
+
+  // Specify fixed time step size
+  flag = ARKStepSetFixedStep(arkstep_mem, prob_opts.h);
+  if (check_flag(&flag, "ARKStepSetFixedStep", 1)) return 1;
+
+  // Attach Butcher tables <<<<<<< correct method order?
+  flag = ARKStepSetTables(arkstep_mem, 1, 0, Bi, Be);
+  if (check_flag(&flag, "ARKStepSetTables", 1)) return 1;
+
+  // Lagrange interpolant (removes additional RHS evaluation with DIRK methods)
+  if (prob_opts.i_type == interp_type::lagrange)
+  {
+    flag = ARKStepSetInterpolantType(arkstep_mem, ARK_INTERP_LAGRANGE);
+    if (check_flag(&flag, "ARKStepSetInterpolantType", 1)) return 1;
+  }
+
+  // Create matrix and linear solver (if necessary)
+  SUNMatrix A        = nullptr;
+  SUNLinearSolver LS = nullptr;
+
+  if (m_type == method_type::impl || m_type == method_type::imex)
+  {
+    // Initialize dense matrix data structures and solvers
+    A = SUNDenseMatrix(1, 1, sunctx);
+    if (check_flag((void*)A, "SUNDenseMatrix", 0)) return 1;
+
+    LS = SUNLinSol_Dense(y, A, sunctx);
+    if (check_flag((void*)LS, "SUNLinSol_Dense", 0)) return 1;
+
+    // Attach linear solver
+    flag = ARKStepSetLinearSolver(arkstep_mem, LS, A);
+    if (check_flag(&flag, "ARKStepSetLinearSolver", 1)) return 1;
+
+    // Set Jacobian function
+    flag = ARKStepSetJacFn(arkstep_mem, Ji);
+    if (check_flag(&flag, "ARKStepSetJacFn", 1)) return 1;
+
+    // Specify linearly implicit RHS, with non-time-dependent Jacobian
+    flag = ARKStepSetLinear(arkstep_mem, 0);
+    if (check_flag(&flag, "ARKStepSetLinear", 1)) return 1;
+  }
+
+  // Create mass matrix and linear solver (if necessary)
+  SUNMatrix M = nullptr;
+  SUNLinearSolver MLS = nullptr;
+
+  if (prob_data.p_type == prob_type::fixed_mass_matrix ||
+      prob_data.p_type == prob_type::time_dependent_mass_matrix)
+  {
+    M = SUNDenseMatrix(1, 1, sunctx);
+    if (check_flag((void *)M, "SUNDenseMatrix", 0)) return 1;
+
+    MLS = SUNLinSol_Dense(y, M, sunctx);
+    if (check_flag((void *)MLS, "SUNLinSol_Dense", 0)) return 1;
+
+    int time_dep = 0;
+    if (prob_data.p_type == prob_type::time_dependent_mass_matrix)
+      time_dep = 1;
+
+    flag = ARKStepSetMassLinearSolver(arkstep_mem, MLS, M, time_dep);
+    if (check_flag(&flag, "ARKStepSetMassLinearSolver", 1)) return 1;
+
+    flag = ARKStepSetMassFn(arkstep_mem, MassMatrix);
+    if (check_flag(&flag, "ARKStepSetMassFn", 1)) return 1;
+  }
+
+  // --------------
+  // Evolve in time
+  // --------------
+
+  sunrealtype t_ret = prob_opts.t0;
+  sunrealtype t_out = 3 * prob_opts.h;
+
+  long int nfe_expected, nfi_expected;
+
+  for (int i = 0; i < 3; i++)
+  {
+    std::cout << "--------------------" << std::endl;
+
+    // Advance in time
+    flag = ARKStepEvolve(arkstep_mem, t_out, y, &t_ret, ARK_ONE_STEP);
+    if (check_flag(&flag, "ARKStepEvolve", 1)) return 1;
+
+    // Update output time
+    t_out += prob_opts.h;
+
+    // Check statistics
+    flag = expected_rhs_evals(m_type, prob_opts.i_type, stages,
+                              explicit_first_stage, stiffly_accurate, fsal,
+                              arkstep_mem,nfe_expected, nfi_expected);
+    if (check_flag(&flag, "expected_rhs_evals", 1)) return 1;
+
+    numfails += check_rhs_evals(m_type, arkstep_mem, nfe_expected, nfi_expected);
+
+    if (numfails)
+    {
+      std::cout << "Failed " << numfails << " checks\n";
+      break;
+    }
+  }
+
+  // ----------------
+  // Get dense output
+  // ----------------
+
+  long int extra_fe_evals = 0;
+  long int extra_fi_evals = 0;
+
+  if (numfails == 0)
+  {
+    std::cout << "--------------------" << std::endl;
+    std::cout << "Dense Output" << std::endl;
+
+    sunrealtype h_last;
+    flag = ARKStepGetLastStep(arkstep_mem, &h_last);
+    if (check_flag(&flag, "ARKStepGetLastStep", 1)) return 1;
+
+    flag = ARKStepGetDky(arkstep_mem, t_ret - h_last / TWO, 0, y);
+    if (check_flag(&flag, "ARKStepGetDky", 1)) return 1;
+
+    // Stiffly accurate (and FSAL) methods do not require an additional RHS
+    // evaluation to get the new RHS value at the end of a step for dense
+    // output. However, for methods with an explicit first stage this evaluation
+    // can be used at the start of the next step. For methods with an implicit
+    // first stage that are not stiffly accurate this evaluation replaces one
+    // that would happen at the end of the next step (this is accounted for in
+    // expected_rhs_evals after the next step is taken below).
+    if (prob_opts.i_type == interp_type::hermite && !stiffly_accurate)
+    {
+      if (m_type == method_type::expl || m_type == method_type::imex)
+      {
+        nfe_expected++;
+      }
+      if (m_type == method_type::impl || m_type == method_type::imex)
+      {
+        nfi_expected++;
+      }
+    }
+
+    // Higher order methods require additional RHS evaluations for dense output
+    // with the Hermite interpolant (note default degree is order - 1, except
+    // for first order where the degree is 1. These are not accounted for in
+    // explicit_rhs_evals and must be carried forward.
+    int degree = (order == 1) ? 1 : order - 1;
+    if (prob_opts.i_type == interp_type::hermite && degree > 3)
+    {
+      if (m_type == method_type::expl || m_type == method_type::imex)
+      {
+        extra_fe_evals += (degree == 4) ? 1 : 4;
+      }
+      if (m_type == method_type::impl || m_type == method_type::imex)
+      {
+        extra_fi_evals += (degree == 4) ? 1 : 4;
+      }
+    }
+
+    numfails += check_rhs_evals(m_type, arkstep_mem,
+                                nfe_expected + extra_fe_evals,
+                                nfi_expected + extra_fi_evals);
+
+    std::cout << "--------------------" << std::endl;
+  }
+
+  // --------------------
+  // Additional time step
+  // --------------------
+
+  if (numfails == 0)
+  {
+    // Advance in time
+    flag = ARKStepEvolve(arkstep_mem, t_out, y, &t_ret, ARK_ONE_STEP);
+    if (check_flag(&flag, "ARKStepEvolve", 1)) return 1;
+
+    // Update output time
+    t_out += prob_opts.h;
+
+    // Check statistics
+    flag = expected_rhs_evals(m_type, prob_opts.i_type, stages,
+                              explicit_first_stage, stiffly_accurate, fsal,
+                              arkstep_mem, nfe_expected, nfi_expected);
+    if (check_flag(&flag, "expected_rhs_evals", 1)) return 1;
+
+    numfails += check_rhs_evals(m_type, arkstep_mem,
+                                nfe_expected + extra_fe_evals,
+                                nfi_expected + extra_fi_evals);
+
+    std::cout << "--------------------" << std::endl;
+  }
+
+  // --------
+  // Clean up
+  // --------
+
+  ARKStepFree(&arkstep_mem);
+  SUNLinSolFree(LS);
+  SUNMatDestroy(A);
+  SUNLinSolFree(MLS);
+  SUNMatDestroy(M);
+  N_VDestroy(y);
+
+  return numfails;
+}
+
+int get_method_properties(ARKodeButcherTable Be, ARKodeButcherTable Bi,
+                          int& stages, int& order, bool& explicit_first_stage,
+                          bool& stiffly_accurate, bool& fsal)
+{
+  stages = 0;
+  if (Bi) { stages = Bi->stages; }
+  else if (Be) { stages = Be->stages; }
+  else
+  {
+    std::cerr << "ERROR: Both Butcher tables are NULL!" << std::endl;
+    return 1;
+  }
+
+  // Built-in ARK methods have the same order for Bi and Be
+  order = 0;
+  if (Bi) { order = Bi->q; }
+  else if (Be) { order= Be->q; }
+  else
+  {
+    std::cerr << "ERROR: Both Butcher tables are NULL!" << std::endl;
+    return 1;
+  }
+
+  // Check for explicit first stage
+  explicit_first_stage = true;
+  if (Bi)
+  {
+    if (std::abs(Bi->A[0][0]) > ZERO) { explicit_first_stage = false; }
+  }
+  if (Be)
+  {
+    if (std::abs(Be->A[0][0]) > ZERO) { explicit_first_stage = false; }
+  }
+
+  // Check for stiffly accurate method
+  stiffly_accurate = true;
+  if (Bi)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(Bi))
+    {
+      stiffly_accurate = false;
+    }
+  }
+  if (Be)
+  {
+    if (!ARKodeButcherTable_IsStifflyAccurate(Be))
+    {
+      stiffly_accurate = false;
+    }
+  }
+
+  // Check for first same as last (FSAL) property
+  fsal = explicit_first_stage && stiffly_accurate;
+
+  return 0;
+}
+
+int expected_rhs_evals(method_type m_type, interp_type i_type, int stages,
+                       bool explicit_first_stage, bool stiffly_accurate,
+                       bool fsal, void* arkstep_mem,
+                       long int& nfe_expected, long int& nfi_expected)
+{
+  int flag = 0;
+
+  // Get number of steps and nonlinear solver iterations
+  long int nst = 0;
+  flag         = ARKStepGetNumSteps(arkstep_mem, &nst);
+  if (check_flag(&flag, "ARKStepGetNumSteps", 1)) return 1;
+
+  long int nni = 0;
+  if (m_type == method_type::impl || m_type == method_type::imex)
+  {
+    flag = ARKStepGetNumNonlinSolvIters(arkstep_mem, &nni);
+    if (check_flag(&flag, "ARKStepGetNumNonlinSolvIters", 1)) return 1;
+  }
+
+  // Expected number of explicit functions evaluations
+  nfe_expected = 0;
+  if (m_type == method_type::expl || m_type == method_type::imex)
+  {
+    if (fsal)
+    {
+      // Save one function evaluation after first step
+      nfe_expected = stages + (stages - 1) * (nst - 1);
+    }
+    else
+    {
+      nfe_expected = stages * nst;
+    }
+
+    if (i_type == interp_type::hermite && !explicit_first_stage)
+    {
+      if (stiffly_accurate)
+      {
+        // One extra evaluation in the first step only
+        nfe_expected++;
+      }
+      else
+      {
+        // One extra evaluation in each step
+        nfe_expected += nst;
+      }
+    }
+  }
+
+  // Expected number of implicit functions evaluations
+  nfi_expected = 0;
+  if (m_type == method_type::impl || m_type == method_type::imex)
+  {
+    if (fsal)
+    {
+      // Save one function evaluation after first step
+      nfi_expected = stages + (stages - 1) * (nst - 1) + nni;
+    }
+    else
+    {
+      nfi_expected = stages * nst + nni;
+    }
+
+    if (i_type == interp_type::hermite && !explicit_first_stage)
+    {
+      if (stiffly_accurate)
+      {
+        // One extra evaluation in the first step only
+        nfi_expected++;
+      }
+      else
+      {
+        // One extra evaluation in each step
+        nfi_expected += nst;
+      }
+    }
+  }
+
+  std::cout << "Steps: " << nst << std::endl;
+
+  if (m_type == method_type::impl || m_type == method_type::imex)
+  {
+    std::cout << "NLS iters: " << nni << std::endl;
+  }
+
+  return 0;
+}
+
+int check_rhs_evals(method_type m_type, void* arkstep_mem,
+                    long int nfe_expected, long int nfi_expected)
+{
+  int flag = 0;
+
+  long int nst = 0;
+  flag         = ARKStepGetNumSteps(arkstep_mem, &nst);
+  if (check_flag(&flag, "ARKStepGetNumSteps", 1)) return 1;
+
+  long int nfe, nfi;
+  flag = ARKStepGetNumRhsEvals(arkstep_mem, &nfe, &nfi);
+  if (check_flag(&flag, "ARKStepGetNumRhsEvals", 1)) return 1;
+
+
+  if (m_type == method_type::expl || m_type == method_type::imex)
+  {
+    std::cout << "Fe RHS evals:\n"
+              << "  actual:   " << nfe << "\n"
+              << "  expected: " << nfe_expected << "\n";
+  }
+  if (m_type == method_type::impl || m_type == method_type::imex)
+  {
+    std::cout << "Fi RHS evals:\n"
+              << "  actual:   " << nfi << "\n"
+              << "  expected: " << nfi_expected << "\n";
+  }
+
+  if (nfe != nfe_expected || nfi != nfi_expected)
+  {
+    std::cout << ">>> Check failed <<<" << std::endl;
+    return 1;
+  }
+
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+// Functions called by the solver
+// -----------------------------------------------------------------------------
+
+// Explicit ODE RHS function fe(t,y)
+int fe(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
+{
+  sunrealtype* y_data    = N_VGetArrayPointer(y);
+  sunrealtype* yd_data   = N_VGetArrayPointer(ydot);
+  ProblemData* prob_data = static_cast<ProblemData*>(user_data);
+
+  yd_data[0] = prob_data->lambda_e * y_data[0];
+
+  if (prob_data->p_type == prob_type::fixed_mass_matrix)
+  {
+    yd_data[0] *= TWO;
+  }
+  else if (prob_data->p_type == prob_type::time_dependent_mass_matrix)
+  {
+    yd_data[0] *= TWO + std::cos(t);
+  }
+
+  return 0;
+}
+
+// Implicit ODE RHS function fi(t,y)
+int fi(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
+{
+  sunrealtype* y_data    = N_VGetArrayPointer(y);
+  sunrealtype* yd_data   = N_VGetArrayPointer(ydot);
+  ProblemData* prob_data = static_cast<ProblemData*>(user_data);
+
+  yd_data[0] = prob_data->lambda_i * y_data[0];
+
+  if (prob_data->p_type == prob_type::fixed_mass_matrix)
+  {
+    yd_data[0] *= TWO;
+  }
+  else if (prob_data->p_type == prob_type::time_dependent_mass_matrix)
+  {
+    yd_data[0] *= TWO + std::cos(t);
+  }
+
+  return 0;
+}
+
+// Jacobian routine to compute J(t,y) = dfi/dy.
+int Ji(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data,
+       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+{
+  sunrealtype* J_data    = SUNDenseMatrix_Data(J);
+  ProblemData* prob_data = static_cast<ProblemData*>(user_data);
+
+  J_data[0] = prob_data->lambda_i;
+
+  return 0;
+}
+
+int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data, N_Vector tmp1,
+               N_Vector tmp2, N_Vector tmp3)
+{
+  sunrealtype* M_data    = SUNDenseMatrix_Data(M);
+  ProblemData* prob_data = static_cast<ProblemData*>(user_data);
+
+  if (prob_data->p_type == prob_type::fixed_mass_matrix)
+  {
+    M_data[0] = TWO;
+  }
+  else
+  {
+    M_data[0] = TWO + std::cos(t);
+  }
+
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+// Utility functions
+// -----------------------------------------------------------------------------
+
+// Check function return value
+int check_flag(void* flagvalue, const std::string funcname, int opt)
+{
+  int* errflag;
+
+  // Check if function returned NULL pointer - no memory allocated
+  if (opt == 0 && flagvalue == nullptr)
+  {
+    std::cerr << "\nMEMORY_ERROR: " << funcname
+              << " failed - returned NULL pointer\n\n";
+    return 1;
+  }
+  // Check if flag < 0
+  else if (opt == 1)
+  {
+    errflag = (int*)flagvalue;
+    if (*errflag < 0)
+    {
+      std::cerr << "\nSUNDIALS_ERROR: " << funcname
+                << " failed with flag = " << *errflag << "\n\n";
+      return 1;
+    }
+  }
+
+  return 0;
+}
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.out
new file mode 100644
index 0000000000..92d1e73a20
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark.out
@@ -0,0 +1,1972 @@
+
+Dahlquist ODE test problem:
+  problem type = Identity
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0.out
new file mode 100644
index 0000000000..beedca56db
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Identity
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   35
+  expected: 35
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   53
+  expected: 53
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   68
+  expected: 68
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1.out
new file mode 100644
index 0000000000..215d59d55e
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Identity
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Lagrange
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   64
+  expected: 64
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0.out
new file mode 100644
index 0000000000..b2d194bc1e
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Fixed mass matrix
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   35
+  expected: 35
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   53
+  expected: 53
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   68
+  expected: 68
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1.out
new file mode 100644
index 0000000000..0f7bb5584a
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Fixed mass matrix
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Lagrange
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   64
+  expected: 64
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0.out
new file mode 100644
index 0000000000..0d00667042
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Time-dependent mass matrix
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   35
+  expected: 35
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   53
+  expected: 53
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   68
+  expected: 68
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   58
+  expected: 58
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   38
+  expected: 38
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   50
+  expected: 50
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1.out
new file mode 100644
index 0000000000..b48ee0df1d
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1.out
@@ -0,0 +1,2182 @@
+
+Dahlquist ODE test problem:
+  problem type = Time-dependent mass matrix
+  lambda expl  = -1
+  lambda impl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Lagrange
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   64
+  expected: 64
+--------------------
+
+========================
+Test implicit RK methods
+========================
+
+========================
+Implicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fi RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+DIRK Table ID 100
+  stages:             2
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+DIRK Table ID 101
+  stages:             3
+  order:              2
+  explicit 1st stage: 0
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+DIRK Table ID 102
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+DIRK Table ID 103
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 104
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 105
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 106
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 107
+  stages:             5
+  order:              4
+  explicit 1st stage: 0
+  stiffly accurate:   1
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+DIRK Table ID 108
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 109
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 110
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 111
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 112
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 113
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 7
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 2
+NLS iters: 14
+Fi RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 3
+NLS iters: 21
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   43
+  expected: 43
+--------------------
+Steps: 4
+NLS iters: 28
+Fi RHS evals:
+  actual:   57
+  expected: 57
+--------------------
+
+========================
+DIRK Table ID 114
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 3
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+NLS iters: 9
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+DIRK Table ID 115
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 116
+  stages:             5
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+NLS iters: 16
+Fi RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+DIRK Table ID 117
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 118
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 119
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 5
+Fi RHS evals:
+  actual:   11
+  expected: 11
+--------------------
+Steps: 2
+NLS iters: 10
+Fi RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 3
+NLS iters: 15
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   31
+  expected: 31
+--------------------
+Steps: 4
+NLS iters: 20
+Fi RHS evals:
+  actual:   41
+  expected: 41
+--------------------
+
+========================
+DIRK Table ID 120
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 121
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 122
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+NLS iters: 12
+Fi RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 3
+NLS iters: 18
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+Steps: 4
+NLS iters: 24
+Fi RHS evals:
+  actual:   49
+  expected: 49
+--------------------
+
+========================
+DIRK Table ID 123
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+NLS iters: 6
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fi RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+NLS iters: 8
+Fi RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+=====================
+Test IMEX ARK methods
+=====================
+
+========================
+IMEX Euler
+  stages:             2
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+NLS iters: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+Fi RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 3
+NLS iters: 3
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+Fi RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+NLS iters: 4
+Fe RHS evals:
+  actual:   5
+  expected: 5
+Fi RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+
+========================
+IMEX Table ID 0
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 1
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 2
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 3
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 4
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+IMEX Table ID 5
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+NLS iters: 2
+Fe RHS evals:
+  actual:   3
+  expected: 3
+Fi RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+NLS iters: 4
+Fe RHS evals:
+  actual:   6
+  expected: 6
+Fi RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+NLS iters: 6
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+Fi RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+NLS iters: 8
+Fe RHS evals:
+  actual:   12
+  expected: 12
+Fi RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
new file mode 100644
index 0000000000..ec10883eeb
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.cpp
@@ -0,0 +1,529 @@
+/* ---------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * ---------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * ---------------------------------------------------------------------------
+ * Dahlquist problem:
+ *
+ * y' = lambda_e * y
+ * ---------------------------------------------------------------------------*/
+
+// Header files
+#include <cmath>
+#include <cstdio>
+#include <iomanip>
+#include <iostream>
+#include <string>
+
+#include <arkode/arkode_erkstep.h>
+#include <nvector/nvector_serial.h>
+#include "arkode/arkode_butcher.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#define ESYM "Le"
+#define FSYM "Lf"
+#else
+#define GSYM "g"
+#define ESYM "e"
+#define FSYM "f"
+#endif
+
+// Constants
+#define NEG_ONE SUN_RCONST(-1.0)
+#define ZERO    SUN_RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+
+enum class interp_type
+{
+  hermite,
+  lagrange
+};
+
+// Problem parameters
+struct ProblemData
+{
+  sunrealtype lambda_e = NEG_ONE;
+  sunrealtype lambda_i = NEG_ONE;
+};
+
+// Problem options
+struct ProblemOptions
+{
+  // Initial time
+  sunrealtype t0 = ZERO;
+
+  // Relative and absolute tolerances
+  sunrealtype reltol = SUN_RCONST(1.0e-4);
+  sunrealtype abstol = SUN_RCONST(1.0e-6);
+
+  // Step size
+  sunrealtype h = SUN_RCONST(0.01);
+
+  // Interpolant type
+  // 0 = Hermite
+  // 1 = Lagrange
+  interp_type i_type = interp_type::hermite;
+};
+
+// User-supplied Functions called by the solver
+int fe(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data);
+
+// Private function to check function return values
+int check_flag(void* flagvalue, const std::string funcname, int opt);
+
+// Test drivers
+int run_tests(ARKodeButcherTable Be, ProblemData& prob_data,
+              ProblemOptions& prob_opts, sundials::Context& sunctx);
+
+int get_method_properties(ARKodeButcherTable Be, int& stages, int& order,
+                          bool& explicit_first_stage, bool& stiffly_accurate,
+                          bool& fsal);
+
+int expected_rhs_evals(interp_type i_type, int stages,
+                       bool explicit_first_stage, bool stiffly_accurate,
+                       bool fsal, void* erkstep_mem, long int& nfe_expected);
+
+int check_rhs_evals(void* erkstep_mem, long int nfe_expected);
+
+// -----------------------------------------------------------------------------
+// Main Program
+// -----------------------------------------------------------------------------
+
+int main(int argc, char* argv[])
+{
+  // Problem data and options structures
+  ProblemData prob_data;
+  ProblemOptions prob_opts;
+
+  // Check for inputs
+  if (argc > 1)
+  {
+    if (std::stoi(argv[1]) == 0)
+    {
+      prob_opts.i_type = interp_type::hermite;
+    }
+    else
+    {
+      prob_opts.i_type = interp_type::lagrange;
+    }
+  }
+
+  // Output problem setup
+  std::cout << "\nDahlquist ODE test problem:\n"
+            << "  lambda expl  = " << prob_data.lambda_e << "\n"
+            << "  step size    = " << prob_opts.h << "\n"
+            << "  relative tol = " << prob_opts.reltol << "\n"
+            << "  absolute tol = " << prob_opts.abstol << "\n";
+  if (prob_opts.i_type == interp_type::hermite)
+  {
+    std::cout << "  interp type  = Hermite\n";
+  }
+  else
+  {
+    std::cout << "  interp type  = Lagrange\n";
+  }
+
+  // Create SUNDIALS context
+  sundials::Context sunctx;
+
+  // Test methods
+  int flag, numfails = 0;
+
+  ARKodeButcherTable Be = nullptr;
+
+  int stages, order;
+  bool explicit_first_stage, stiffly_accurate, fsal;
+
+  // --------
+  // Explicit
+  // --------
+
+  std::cout << "\n========================\n"
+            << "Test explicit RK methods\n"
+            << "========================\n";
+
+  Be          = ARKodeButcherTable_Alloc(1, SUNFALSE);
+  Be->A[0][0] = ZERO;
+  Be->b[0]    = ONE;
+  Be->c[0]    = ZERO;
+  Be->q       = 1;
+
+  flag = get_method_properties(Be, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  std::cout << "\n========================" << std::endl;
+  std::cout << "Explicit Euler" << std::endl;
+  std::cout << "  stages:             " << stages << std::endl;
+  std::cout << "  order:              " << order << std::endl;
+  std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+  std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+  std::cout << "  first same as last: " << fsal << std::endl;
+  std::cout << "========================" << std::endl;
+
+  numfails += run_tests(Be, prob_data, prob_opts, sunctx);
+
+  ARKodeButcherTable_Free(Be);
+  Be = nullptr;
+
+  for (int i = ARKODE_MIN_ERK_NUM; i <= ARKODE_MAX_ERK_NUM; i++)
+  {
+    Be = ARKodeButcherTable_LoadERK(static_cast<ARKODE_ERKTableID>(i));
+    flag = get_method_properties(Be, stages, order, explicit_first_stage,
+                                 stiffly_accurate, fsal);
+    if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+    std::cout << "\n========================" << std::endl;
+    std::cout << "ERK Table ID " << i << std::endl;
+    std::cout << "  stages:             " << stages << std::endl;
+    std::cout << "  order:              " << order << std::endl;
+    std::cout << "  explicit 1st stage: " << explicit_first_stage << std::endl;
+    std::cout << "  stiffly accurate:   " << stiffly_accurate << std::endl;
+    std::cout << "  first same as last: " << fsal << std::endl;
+    std::cout << "========================" << std::endl;
+
+    numfails += run_tests(Be, prob_data, prob_opts, sunctx);
+
+    ARKodeButcherTable_Free(Be);
+    Be = nullptr;
+  }
+
+  if (numfails) { std::cout << "\n\nFailed " << numfails << " tests!\n"; }
+  else { std::cout << "\n\nAll tests passed!\n"; }
+
+  // Return test status
+  return numfails;
+}
+
+// -----------------------------------------------------------------------------
+// Test drivers
+// -----------------------------------------------------------------------------
+
+int run_tests(ARKodeButcherTable Be, ProblemData& prob_data,
+              ProblemOptions& prob_opts, sundials::Context& sunctx)
+{
+  // Reusable error-checking flag
+  int flag;
+
+  // Test failure counter
+  int numfails = 0;
+
+  // Get method properties
+  int stages, order;
+  bool explicit_first_stage, stiffly_accurate, fsal;
+  flag = get_method_properties(Be, stages, order, explicit_first_stage,
+                               stiffly_accurate, fsal);
+  if (check_flag(&flag, "get_method_properties", 1)) return 1;
+
+  // Create initial condition vector
+  N_Vector y = N_VNew_Serial(1, sunctx);
+  if (check_flag((void*)y, "N_VNew_Serial", 0)) return 1;
+
+  N_VConst(SUN_RCONST(1.0), y);
+
+  // -----------------
+  // Create integrator
+  // -----------------
+
+  // Create integrator based on type
+  void* erkstep_mem = nullptr;
+
+  erkstep_mem = ERKStepCreate(fe, prob_opts.t0, y, sunctx);
+  if (check_flag((void*)erkstep_mem, "ERKStepCreate", 0)) return 1;
+
+  // Set user data
+  flag = ERKStepSetUserData(erkstep_mem, &prob_data);
+  if (check_flag(&flag, "ERKStepSetUserData", 1)) return 1;
+
+  // Specify tolerances
+  flag = ERKStepSStolerances(erkstep_mem, prob_opts.reltol, prob_opts.abstol);
+  if (check_flag(&flag, "ERKStepSStolerances", 1)) return 1;
+
+  // Specify fixed time step size
+  flag = ERKStepSetFixedStep(erkstep_mem, prob_opts.h);
+  if (check_flag(&flag, "ERKStepSetFixedStep", 1)) return 1;
+
+  // Lagrange interpolant (removes additional RHS evaluation with DIRK methods)
+  if (prob_opts.i_type == interp_type::lagrange)
+  {
+    flag = ERKStepSetInterpolantType(erkstep_mem, ARK_INTERP_LAGRANGE);
+    if (check_flag(&flag, "ERKStepSetInterpolantType", 1)) return 1;
+  }
+
+  // Attach Butcher tables
+  flag = ERKStepSetTable(erkstep_mem, Be);
+  if (check_flag(&flag, "ERKStepSetTables", 1)) return 1;
+
+  // --------------
+  // Evolve in time
+  // --------------
+
+  sunrealtype t_ret = prob_opts.t0;
+  sunrealtype t_out = 3 * prob_opts.h;
+
+  long int nfe_expected;
+
+  for (int i = 0; i < 3; i++)
+  {
+    std::cout << "--------------------" << std::endl;
+
+    // Advance in time
+    flag = ERKStepEvolve(erkstep_mem, t_out, y, &t_ret, ARK_ONE_STEP);
+    if (check_flag(&flag, "ERKStepEvolve", 1)) return 1;
+
+    // Update output time
+    t_out += prob_opts.h;
+
+    // Check statistics
+    flag = expected_rhs_evals(prob_opts.i_type, stages,
+                              explicit_first_stage, stiffly_accurate, fsal,
+                              erkstep_mem,nfe_expected);
+    if (check_flag(&flag, "expected_rhs_evals", 1)) return 1;
+
+    numfails += check_rhs_evals(erkstep_mem, nfe_expected);
+
+    if (numfails)
+    {
+      std::cout << "Failed " << numfails << " checks\n";
+      break;
+    }
+  }
+
+  // ----------------
+  // Get dense output
+  // ----------------
+
+  long int extra_fe_evals = 0;
+
+  if (numfails == 0)
+  {
+    std::cout << "--------------------" << std::endl;
+    std::cout << "Dense Output" << std::endl;
+
+    sunrealtype h_last;
+    flag = ERKStepGetLastStep(erkstep_mem, &h_last);
+    if (check_flag(&flag, "ERKStepGetLastStep", 1)) return 1;
+
+    flag = ERKStepGetDky(erkstep_mem, t_ret - h_last / TWO, 0, y);
+    if (check_flag(&flag, "ERKStepGetDky", 1)) return 1;
+
+    // Stiffly accurate (and FSAL) methods do not require an additional RHS
+    // evaluation to get the new RHS value at the end of a step for dense
+    // output. However, for methods with an explicit first stage this evaluation
+    // can be used at the start of the next step. For methods with an implicit
+    // first stage that are not stiffly accurate this evaluation replaces one
+    // that would happen at the end of the next step (this is accounted for in
+    // expected_rhs_evals after the next step is taken below).
+    if (prob_opts.i_type == interp_type::hermite && !stiffly_accurate)
+    {
+      nfe_expected++;
+    }
+
+    // Higher order methods require additional RHS evaluations for dense output
+    // with the Hermite interpolant (note default degree is order - 1, except
+    // for first order where the degree is 1. These are not accounted for in
+    // explicit_rhs_evals and must be carried forward.
+    int degree = (order == 1) ? 1 : order - 1;
+    if (prob_opts.i_type == interp_type::hermite && degree > 3)
+    {
+      extra_fe_evals += (degree == 4) ? 1 : 4;
+    }
+
+    numfails += check_rhs_evals(erkstep_mem,
+                                nfe_expected + extra_fe_evals);
+
+    std::cout << "--------------------" << std::endl;
+  }
+
+  // --------------------
+  // Additional time step
+  // --------------------
+
+  if (numfails == 0)
+  {
+    // Advance in time
+    flag = ERKStepEvolve(erkstep_mem, t_out, y, &t_ret, ARK_ONE_STEP);
+    if (check_flag(&flag, "ERKStepEvolve", 1)) return 1;
+
+    // Update output time
+    t_out += prob_opts.h;
+
+    // Check statistics
+    flag = expected_rhs_evals(prob_opts.i_type, stages,
+                              explicit_first_stage, stiffly_accurate, fsal,
+                              erkstep_mem, nfe_expected);
+    if (check_flag(&flag, "expected_rhs_evals", 1)) return 1;
+
+    numfails += check_rhs_evals(erkstep_mem,
+                                nfe_expected + extra_fe_evals);
+
+    std::cout << "--------------------" << std::endl;
+  }
+
+  // --------
+  // Clean up
+  // --------
+
+  ERKStepFree(&erkstep_mem);
+  N_VDestroy(y);
+
+  return numfails;
+}
+
+int get_method_properties(ARKodeButcherTable Be, int& stages, int& order,
+                          bool& explicit_first_stage, bool& stiffly_accurate,
+                          bool& fsal)
+{
+  stages = 0;
+  if (Be) { stages = Be->stages; }
+  else
+  {
+    std::cerr << "ERROR: Butcher table is NULL!" << std::endl;
+    return 1;
+  }
+
+  order = 0;
+  if (Be) { order= Be->q; }
+  else
+  {
+    std::cerr << "ERROR: Both Butcher tables are NULL!" << std::endl;
+    return 1;
+  }
+
+  // Check for explicit first stage
+  explicit_first_stage = true;
+  if (std::abs(Be->A[0][0]) > ZERO) { explicit_first_stage = false; }
+
+  // Check for stiffly accurate method
+  stiffly_accurate = ARKodeButcherTable_IsStifflyAccurate(Be);
+
+  // Check for first same as last (FSAL) property
+  fsal = explicit_first_stage && stiffly_accurate;
+
+  return 0;
+}
+
+int expected_rhs_evals(interp_type i_type, int stages,
+                       bool explicit_first_stage, bool stiffly_accurate,
+                       bool fsal, void* erkstep_mem,
+                       long int& nfe_expected)
+{
+  int flag = 0;
+
+  // Get number of steps and nonlinear solver iterations
+  long int nst = 0;
+  flag         = ERKStepGetNumSteps(erkstep_mem, &nst);
+  if (check_flag(&flag, "ERKStepGetNumSteps", 1)) return 1;
+
+  // Expected number of explicit functions evaluations
+  nfe_expected = 0;
+  if (fsal)
+  {
+    // Save one function evaluation after first step
+    nfe_expected = stages + (stages - 1) * (nst - 1);
+  }
+  else
+  {
+    nfe_expected = stages * nst;
+  }
+
+  if (i_type == interp_type::hermite && !explicit_first_stage)
+  {
+    if (stiffly_accurate)
+    {
+      // One extra evaluation in the first step only
+      nfe_expected++;
+    }
+    else
+    {
+      // One extra evaluation in each step
+      nfe_expected += nst;
+    }
+  }
+
+  std::cout << "Steps: " << nst << std::endl;
+
+  return 0;
+}
+
+int check_rhs_evals(void* erkstep_mem, long int nfe_expected)
+{
+  int flag = 0;
+
+  long int nst = 0;
+  flag         = ERKStepGetNumSteps(erkstep_mem, &nst);
+  if (check_flag(&flag, "ERKStepGetNumSteps", 1)) return 1;
+
+  long int nfe;
+  flag = ERKStepGetNumRhsEvals(erkstep_mem, &nfe);
+  if (check_flag(&flag, "ERKStepGetNumRhsEvals", 1)) return 1;
+
+  std::cout << "Fe RHS evals:\n"
+            << "  actual:   " << nfe << "\n"
+            << "  expected: " << nfe_expected << "\n";
+
+  if (nfe != nfe_expected)
+  {
+    std::cout << ">>> Check failed <<<" << std::endl;
+    return 1;
+  }
+
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+// Functions called by the solver
+// -----------------------------------------------------------------------------
+
+// Explicit ODE RHS function fe(t,y)
+int fe(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
+{
+  sunrealtype* y_data    = N_VGetArrayPointer(y);
+  sunrealtype* yd_data   = N_VGetArrayPointer(ydot);
+  ProblemData* prob_data = static_cast<ProblemData*>(user_data);
+
+  yd_data[0] = prob_data->lambda_e * y_data[0];
+
+  return 0;
+}
+
+// -----------------------------------------------------------------------------
+// Utility functions
+// -----------------------------------------------------------------------------
+
+// Check function return value
+int check_flag(void* flagvalue, const std::string funcname, int opt)
+{
+  int* errflag;
+
+  // Check if function returned NULL pointer - no memory allocated
+  if (opt == 0 && flagvalue == nullptr)
+  {
+    std::cerr << "\nMEMORY_ERROR: " << funcname
+              << " failed - returned NULL pointer\n\n";
+    return 1;
+  }
+  // Check if flag < 0
+  else if (opt == 1)
+  {
+    errflag = (int*)flagvalue;
+    if (*errflag < 0)
+    {
+      std::cerr << "\nSUNDIALS_ERROR: " << funcname
+                << " failed with flag = " << *errflag << "\n\n";
+      return 1;
+    }
+  }
+
+  return 0;
+}
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.out
new file mode 100644
index 0000000000..d4900dcca0
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk.out
@@ -0,0 +1,609 @@
+
+Dahlquist ODE test problem:
+  lambda expl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out
new file mode 100644
index 0000000000..7e2256037c
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out
@@ -0,0 +1,819 @@
+
+Dahlquist ODE test problem:
+  lambda expl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Hermite
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   36
+  expected: 36
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   22
+  expected: 22
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   29
+  expected: 29
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   37
+  expected: 37
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   35
+  expected: 35
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   44
+  expected: 44
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   56
+  expected: 56
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   53
+  expected: 53
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   68
+  expected: 68
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out
new file mode 100644
index 0000000000..74bc1b6a8d
--- /dev/null
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out
@@ -0,0 +1,819 @@
+
+Dahlquist ODE test problem:
+  lambda expl  = -1
+  step size    = 0.01
+  relative tol = 0.0001
+  absolute tol = 1e-06
+  interp type  = Lagrange
+
+========================
+Test explicit RK methods
+========================
+
+========================
+Explicit Euler
+  stages:             1
+  order:              1
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   1
+  expected: 1
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+
+========================
+ERK Table ID 0
+  stages:             2
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   2
+  expected: 2
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+
+========================
+ERK Table ID 1
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+
+========================
+ERK Table ID 2
+  stages:             4
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   4
+  expected: 4
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+
+========================
+ERK Table ID 3
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   15
+  expected: 15
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+
+========================
+ERK Table ID 4
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 5
+  stages:             6
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 6
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 7
+  stages:             6
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   18
+  expected: 18
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+
+========================
+ERK Table ID 8
+  stages:             7
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   19
+  expected: 19
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+
+========================
+ERK Table ID 9
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 10
+  stages:             8
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 11
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 12
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 13
+  stages:             7
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   7
+  expected: 7
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   14
+  expected: 14
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   21
+  expected: 21
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   28
+  expected: 28
+--------------------
+
+========================
+ERK Table ID 14
+  stages:             8
+  order:              5
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   8
+  expected: 8
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   24
+  expected: 24
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+
+========================
+ERK Table ID 15
+  stages:             3
+  order:              2
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 16
+  stages:             5
+  order:              4
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   5
+  expected: 5
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+
+========================
+ERK Table ID 17
+  stages:             3
+  order:              3
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   3
+  expected: 3
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   6
+  expected: 6
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   12
+  expected: 12
+--------------------
+
+========================
+ERK Table ID 18
+  stages:             9
+  order:              6
+  explicit 1st stage: 1
+  stiffly accurate:   1
+  first same as last: 1
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   9
+  expected: 9
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   17
+  expected: 17
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   25
+  expected: 25
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   33
+  expected: 33
+--------------------
+
+========================
+ERK Table ID 19
+  stages:             10
+  order:              7
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   10
+  expected: 10
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   20
+  expected: 20
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   30
+  expected: 30
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   40
+  expected: 40
+--------------------
+
+========================
+ERK Table ID 20
+  stages:             13
+  order:              8
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   13
+  expected: 13
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   26
+  expected: 26
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   39
+  expected: 39
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   52
+  expected: 52
+--------------------
+
+========================
+ERK Table ID 21
+  stages:             16
+  order:              9
+  explicit 1st stage: 1
+  stiffly accurate:   0
+  first same as last: 0
+========================
+--------------------
+Steps: 1
+Fe RHS evals:
+  actual:   16
+  expected: 16
+--------------------
+Steps: 2
+Fe RHS evals:
+  actual:   32
+  expected: 32
+--------------------
+Steps: 3
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Dense Output
+Fe RHS evals:
+  actual:   48
+  expected: 48
+--------------------
+Steps: 4
+Fe RHS evals:
+  actual:   64
+  expected: 64
+--------------------
+
+
+All tests passed!
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
index ffb23ec7c1..0e491eb229 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
@@ -18,6 +18,7 @@
 
 // Header files
 #include <cstdio>
+#include <iomanip>
 #include <iostream>
 #include <cstring>
 #include <cmath>
@@ -268,9 +269,9 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     num_methods = 3;
     methods = new ARKODE_MRITableID[num_methods];
 
-    methods[0] = ARKODE_MRI_GARK_ERK45a;
+    methods[0] = ARKODE_MIS_KW3;
     methods[1] = ARKODE_MRI_GARK_ERK33a;
-    methods[2] = ARKODE_MIS_KW3;
+    methods[2] = ARKODE_MRI_GARK_ERK45a;
   }
   else if (type == MRISTEP_IMPLICIT)
   {
@@ -282,13 +283,13 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     methods = new ARKODE_MRITableID[num_methods];
     stiffly_accurate = new bool[num_methods];
 
-    methods[0] = ARKODE_MRI_GARK_ESDIRK46a;
+    methods[0] = ARKODE_MRI_GARK_IRK21a;
     stiffly_accurate[0] = true;
 
     methods[1] = ARKODE_MRI_GARK_ESDIRK34a;
     stiffly_accurate[1] = true;
 
-    methods[2] = ARKODE_MRI_GARK_IRK21a;
+    methods[2] = ARKODE_MRI_GARK_ESDIRK46a;
     stiffly_accurate[2] = true;
   }
   else if (type == MRISTEP_IMEX)
@@ -301,13 +302,13 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     methods = new ARKODE_MRITableID[num_methods];
     stiffly_accurate = new bool[num_methods];
 
-    methods[0] = ARKODE_IMEX_MRI_GARK4;
+    methods[0] = ARKODE_IMEX_MRI_GARK3a;
     stiffly_accurate[0] = false;
 
     methods[1] = ARKODE_IMEX_MRI_GARK3b;
     stiffly_accurate[1] = false;
 
-    methods[2] = ARKODE_IMEX_MRI_GARK3a;
+    methods[2] = ARKODE_IMEX_MRI_GARK4;
     stiffly_accurate[2] = false;
   }
   else
@@ -433,7 +434,7 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     long int fe_evals = 0;
     if (type == MRISTEP_EXPLICIT || type == MRISTEP_IMEX)
     {
-      fe_evals = mri_nst * nstages_stored + 1;
+      fe_evals = mri_nst * nstages_stored;
     }
 
     if (mri_nfse != fe_evals)
@@ -445,8 +446,20 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     long int fi_evals = 0;
     if (type == MRISTEP_IMPLICIT || type == MRISTEP_IMEX)
     {
-      fi_evals = mri_nst * nstages_stored + mri_nni;
-      if (stiffly_accurate && !stiffly_accurate[i]) fi_evals++;
+      if (stiffly_accurate[i])
+      {
+        // The last stage is implicit so it does not correspond to a column of
+        // zeros in the coupling matrix and is counted in "nstages_stored"
+        // however we do not evaluate the RHS functions after the solve since
+        // the methods is "FSAL" (the index map value and allocated space is
+        // used in the nonlinear for this stage). The RHS functions will be
+        // evaluated and stored at the start of the next step.
+        fi_evals = mri_nst * (nstages_stored - 1) + mri_nni;
+      }
+      else
+      {
+        fi_evals = mri_nst * nstages_stored + mri_nni;
+      }
     }
 
     if (mri_nfsi != fi_evals)
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.out
index ed079b7511..5e7243e3e8 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.out
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.out
@@ -13,21 +13,49 @@ Test explicit MRI methods
 =========================
 
 Testing method 0
-  Stored stages = 5
+  nmat = 1
+  stages = 4
+  method order (q) = 3
+  embedding order (p) = 0
+  c = 0  0.3333333333333333  0.75  1  
+  W[0] = 
+                            0                        0                        0                        0  
+           0.3333333333333333                        0                        0                        0  
+          -0.5208333333333333                   0.9375                        0                        0  
+           0.3541666666666666                  -0.6375       0.5333333333333333                        0  
+
+  Stored stages = 3
 
 MRIStep Statistics:
    Time        = 0.01
    y(t)        = 0.980199
    y_n         = 0.980199
-   Error       = -5.31519e-12
+   Error       = 1.86014e-09
    Steps       = 1
-   Fe evals    = 6
+   Fe evals    = 3
    Fi evals    = 0
 
 Comparing Solver Statistics:
 All checks passed
 
 Testing method 1
+  nmat = 2
+  stages = 4
+  method order (q) = 3
+  embedding order (p) = 0
+  c = 0  0.3333333333333333  0.6666666666666666  1  
+  W[0] = 
+                            0                        0                        0                        0  
+           0.3333333333333333                        0                        0                        0  
+          -0.3333333333333333       0.6666666666666666                        0                        0  
+                            0      -0.6666666666666666                        1                        0  
+
+  W[1] = 
+                            0                        0                        0                        0  
+                            0                        0                        0                        0  
+                            0                        0                        0                        0  
+                          0.5                        0                     -0.5                        0  
+
   Stored stages = 3
 
 MRIStep Statistics:
@@ -36,22 +64,43 @@ MRIStep Statistics:
    y_n         = 0.980199
    Error       = 1.7757e-09
    Steps       = 1
-   Fe evals    = 4
+   Fe evals    = 3
    Fi evals    = 0
 
 Comparing Solver Statistics:
 All checks passed
 
 Testing method 2
-  Stored stages = 3
+  nmat = 2
+  stages = 6
+  method order (q) = 4
+  embedding order (p) = 0
+  c = 0  0.2  0.4  0.6  0.8  1  
+  W[0] = 
+                            0                        0                        0                        0                        0                        0  
+                          0.2                        0                        0                        0                        0                        0  
+                      -3.3125                   3.5125                        0                        0                        0                        0  
+          -0.5121234603937985        1.955496920787597       -1.243373460393798                        0                        0                        0  
+          -0.1068927211587161       -4.656693056981116        3.994968532757531       0.9686172453823019                        0                        0  
+            0.911960843690752      -0.1837327083772207       -1.193926866090864       -2.611983006811319        3.277681737588653                        0  
+
+  W[1] = 
+                            0                        0                        0                        0                        0                        0  
+                            0                        0                        0                        0                        0                        0  
+                       6.2875                  -6.2875                        0                        0                        0                        0  
+          -0.0382530792124029       0.6952561584248058      -0.6570030792124029                        0                        0                        0  
+             1.87616694642529        3.003768197383342                       -3       -1.879935143808632                        0                        0  
+           -2.423803191489362                        2                        1                        5       -5.576196808510638                        0  
+
+  Stored stages = 5
 
 MRIStep Statistics:
    Time        = 0.01
    y(t)        = 0.980199
    y_n         = 0.980199
-   Error       = 1.86014e-09
+   Error       = -5.3153e-12
    Steps       = 1
-   Fe evals    = 4
+   Fe evals    = 5
    Fi evals    = 0
 
 Comparing Solver Statistics:
@@ -62,6 +111,70 @@ Test implicit MRI methods
 =========================
 
 Testing method 0
+  nmat = 1
+  stages = 3
+  method order (q) = 2
+  embedding order (p) = 0
+  c = 0  1  1  
+  G[0] = 
+                            0                        0                        0  
+                            1                        0                        0  
+                         -0.5                        0                      0.5  
+
+  Stored stages = 2
+
+MRIStep Statistics:
+   Time        = 0.01
+   y(t)        = 0.980199
+   y_n         = 0.980199
+   Error       = -8.22598e-10
+   Steps       = 1
+   Fe evals    = 0
+   Fi evals    = 2
+   NLS iters   = 1
+   NLS fails   = 0
+   LS setups   = 1
+   LS Fi evals = 0
+   Ji evals    = 1
+
+Comparing Solver Statistics:
+All checks passed
+
+Testing method 1
+  nmat = 1
+  stages = 7
+  method order (q) = 3
+  embedding order (p) = 0
+  c = 0  0.3333333333333333  0.3333333333333333  0.6666666666666666  0.6666666666666666  1  1  
+  G[0] = 
+                            0                        0                        0                        0                        0                        0                        0  
+           0.3333333333333333                        0                        0                        0                        0                        0                        0  
+           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0  
+          -0.3045790611944505                        0       0.6379123945277838                        0                        0                        0                        0  
+           0.2116913105640267                        0      -0.6475578320724856                        0        0.435866521508459                        0                        0  
+           0.4454209388055495                        0       0.8813784805616198                        0       -0.993466086033836                        0                        0  
+           -0.435866521508459                        0                        0                        0                        0                        0        0.435866521508459  
+
+  Stored stages = 4
+
+MRIStep Statistics:
+   Time        = 0.01
+   y(t)        = 0.980199
+   y_n         = 0.980199
+   Error       = 1.40689e-10
+   Steps       = 1
+   Fe evals    = 0
+   Fi evals    = 6
+   NLS iters   = 3
+   NLS fails   = 0
+   LS setups   = 1
+   LS Fi evals = 0
+   Ji evals    = 1
+
+Comparing Solver Statistics:
+All checks passed
+
+Testing method 2
   nmat = 2
   stages = 11
   method order (q) = 4
@@ -99,10 +212,10 @@ MRIStep Statistics:
    Time        = 0.01
    y(t)        = 0.980199
    y_n         = 0.980199
-   Error       = 1.36091e-12
+   Error       = 1.36036e-12
    Steps       = 1
    Fe evals    = 0
-   Fi evals    = 11
+   Fi evals    = 10
    NLS iters   = 5
    NLS fails   = 0
    LS setups   = 1
@@ -112,30 +225,45 @@ MRIStep Statistics:
 Comparing Solver Statistics:
 All checks passed
 
-Testing method 1
+=====================
+Test IMEX MRI methods
+=====================
+
+Testing method 0
   nmat = 1
-  stages = 7
+  stages = 8
   method order (q) = 3
   embedding order (p) = 0
-  c = 0  0.3333333333333333  0.3333333333333333  0.6666666666666666  0.6666666666666666  1  1  
+  c = 0  0.435866521508459  0.435866521508459  0.7179332607542295  0.7179332607542295  1  1  1  
+  W[0] = 
+                            0                        0                        0                        0                        0                        0                        0                        0  
+            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
+                            0                        0                        0                        0                        0                        0                        0                        0  
+          -0.5688715801234401                        0       0.8509383193692106                        0                        0                        0                        0                        0  
+           0.4542839446436089                        0      -0.4542839446436089                        0                        0                        0                        0                        0  
+          -0.4271371821005074                        0       0.1562747733103381                        0       0.5529291480359398                        0                        0                        0  
+                            0                        0                        0                        0                        0                        0                        0                        0  
+           0.1058582960718796                        0       0.6555675011400702                        0       -1.197292318720409                        0        0.435866521508459                        0  
+
   G[0] = 
-                            0                        0                        0                        0                        0                        0                        0  
-           0.3333333333333333                        0                        0                        0                        0                        0                        0  
-           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0  
-          -0.3045790611944505                        0       0.6379123945277838                        0                        0                        0                        0  
-           0.2116913105640267                        0      -0.6475578320724856                        0        0.435866521508459                        0                        0  
-           0.4454209388055495                        0       0.8813784805616198                        0       -0.993466086033836                        0                        0  
-           -0.435866521508459                        0                        0                        0                        0                        0        0.435866521508459  
+                            0                        0                        0                        0                        0                        0                        0                        0  
+            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
+           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0                        0  
+          -0.4103336962288525                        0        0.692400435474623                        0                        0                        0                        0                        0  
+           0.4103336962288525                        0      -0.8462002177373115                        0        0.435866521508459                        0                        0                        0  
+            0.435866521508459                        0       0.9264299099302395                        0       -1.080229692192928                        0                        0                        0  
+           -0.435866521508459                        0                        0                        0                        0                        0        0.435866521508459                        0  
+                            0                        0                        0                        0                        0                        0                        0                        0  
 
   Stored stages = 4
 
 MRIStep Statistics:
    Time        = 0.01
-   y(t)        = 0.980199
-   y_n         = 0.980199
-   Error       = 1.40689e-10
+   y(t)        = 0.970446
+   y_n         = 0.970446
+   Error       = 2.79396e-10
    Steps       = 1
-   Fe evals    = 0
+   Fe evals    = 4
    Fi evals    = 7
    NLS iters   = 3
    NLS fails   = 0
@@ -146,28 +274,43 @@ MRIStep Statistics:
 Comparing Solver Statistics:
 All checks passed
 
-Testing method 2
+Testing method 1
   nmat = 1
-  stages = 3
-  method order (q) = 2
+  stages = 8
+  method order (q) = 3
   embedding order (p) = 0
-  c = 0  1  1  
+  c = 0  0.435866521508459  0.435866521508459  0.7179332607542295  0.7179332607542295  1  1  1  
+  W[0] = 
+                            0                        0                        0                        0                        0                        0                        0                        0  
+            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
+                            0                        0                        0                        0                        0                        0                        0                        0  
+          -0.1750145285570468                        0       0.4570812678028173                        0                        0                        0                        0                        0  
+          0.06042689307721552                        0     -0.06042689307721552                        0                        0                        0                        0                        0  
+           0.1195213959425454                        0       -1.843725226689662                        0        2.006270569992887                        0                        0                        0  
+          -0.5466585780430528                        0                        2                        0       -1.453341421956947                        0                        0                        0  
+           0.1058582960718796                        0       0.6555675011400702                        0       -1.197292318720409                        0        0.435866521508459                        0  
+
   G[0] = 
-                            0                        0                        0  
-                            1                        0                        0  
-                         -0.5                        0                      0.5  
+                            0                        0                        0                        0                        0                        0                        0                        0  
+            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
+           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0                        0  
+          0.04142737535644148                        0        0.240639363889329                        0                        0                        0                        0                        0  
+         -0.04142737535644148                        0      -0.3944391461520175                        0        0.435866521508459                        0                        0                        0  
+           0.1123373143006048                        0        1.051807513648115                        0      -0.8820780887029493                        0                        0                        0  
+          -0.1123373143006048                        0      -0.1253776037178755                        0      -0.1981516034899788                        0        0.435866521508459                        0  
+                            0                        0                        0                        0                        0                        0                        0                        0  
 
-  Stored stages = 2
+  Stored stages = 4
 
 MRIStep Statistics:
    Time        = 0.01
-   y(t)        = 0.980199
-   y_n         = 0.980199
-   Error       = -8.22598e-10
+   y(t)        = 0.970446
+   y_n         = 0.970446
+   Error       = -3.9875e-09
    Steps       = 1
-   Fe evals    = 0
-   Fi evals    = 3
-   NLS iters   = 1
+   Fe evals    = 4
+   Fi evals    = 7
+   NLS iters   = 3
    NLS fails   = 0
    LS setups   = 1
    LS Fi evals = 0
@@ -176,11 +319,7 @@ MRIStep Statistics:
 Comparing Solver Statistics:
 All checks passed
 
-=====================
-Test IMEX MRI methods
-=====================
-
-Testing method 0
+Testing method 2
   nmat = 2
   stages = 12
   method order (q) = 4
@@ -248,10 +387,10 @@ MRIStep Statistics:
    Time        = 0.01
    y(t)        = 0.970446
    y_n         = 0.970446
-   Error       = -2.09771e-11
+   Error       = -2.09769e-11
    Steps       = 1
-   Fe evals    = 7
-   Fi evals    = 12
+   Fe evals    = 6
+   Fi evals    = 11
    NLS iters   = 5
    NLS fails   = 0
    LS setups   = 1
@@ -261,95 +400,5 @@ MRIStep Statistics:
 Comparing Solver Statistics:
 All checks passed
 
-Testing method 1
-  nmat = 1
-  stages = 8
-  method order (q) = 3
-  embedding order (p) = 0
-  c = 0  0.435866521508459  0.435866521508459  0.7179332607542295  0.7179332607542295  1  1  1  
-  W[0] = 
-                            0                        0                        0                        0                        0                        0                        0                        0  
-            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
-                            0                        0                        0                        0                        0                        0                        0                        0  
-          -0.1750145285570468                        0       0.4570812678028173                        0                        0                        0                        0                        0  
-          0.06042689307721552                        0     -0.06042689307721552                        0                        0                        0                        0                        0  
-           0.1195213959425454                        0       -1.843725226689662                        0        2.006270569992887                        0                        0                        0  
-          -0.5466585780430528                        0                        2                        0       -1.453341421956947                        0                        0                        0  
-           0.1058582960718796                        0       0.6555675011400702                        0       -1.197292318720409                        0        0.435866521508459                        0  
-
-  G[0] = 
-                            0                        0                        0                        0                        0                        0                        0                        0  
-            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
-           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0                        0  
-          0.04142737535644148                        0        0.240639363889329                        0                        0                        0                        0                        0  
-         -0.04142737535644148                        0      -0.3944391461520175                        0        0.435866521508459                        0                        0                        0  
-           0.1123373143006048                        0        1.051807513648115                        0      -0.8820780887029493                        0                        0                        0  
-          -0.1123373143006048                        0      -0.1253776037178755                        0      -0.1981516034899788                        0        0.435866521508459                        0  
-                            0                        0                        0                        0                        0                        0                        0                        0  
-
-  Stored stages = 4
-
-MRIStep Statistics:
-   Time        = 0.01
-   y(t)        = 0.970446
-   y_n         = 0.970446
-   Error       = -3.9875e-09
-   Steps       = 1
-   Fe evals    = 5
-   Fi evals    = 8
-   NLS iters   = 3
-   NLS fails   = 0
-   LS setups   = 1
-   LS Fi evals = 0
-   Ji evals    = 1
-
-Comparing Solver Statistics:
-All checks passed
-
-Testing method 2
-  nmat = 1
-  stages = 8
-  method order (q) = 3
-  embedding order (p) = 0
-  c = 0  0.435866521508459  0.435866521508459  0.7179332607542295  0.7179332607542295  1  1  1  
-  W[0] = 
-                            0                        0                        0                        0                        0                        0                        0                        0  
-            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
-                            0                        0                        0                        0                        0                        0                        0                        0  
-          -0.5688715801234401                        0       0.8509383193692106                        0                        0                        0                        0                        0  
-           0.4542839446436089                        0      -0.4542839446436089                        0                        0                        0                        0                        0  
-          -0.4271371821005074                        0       0.1562747733103381                        0       0.5529291480359398                        0                        0                        0  
-                            0                        0                        0                        0                        0                        0                        0                        0  
-           0.1058582960718796                        0       0.6555675011400702                        0       -1.197292318720409                        0        0.435866521508459                        0  
-
-  G[0] = 
-                            0                        0                        0                        0                        0                        0                        0                        0  
-            0.435866521508459                        0                        0                        0                        0                        0                        0                        0  
-           -0.435866521508459                        0        0.435866521508459                        0                        0                        0                        0                        0  
-          -0.4103336962288525                        0        0.692400435474623                        0                        0                        0                        0                        0  
-           0.4103336962288525                        0      -0.8462002177373115                        0        0.435866521508459                        0                        0                        0  
-            0.435866521508459                        0       0.9264299099302395                        0       -1.080229692192928                        0                        0                        0  
-           -0.435866521508459                        0                        0                        0                        0                        0        0.435866521508459                        0  
-                            0                        0                        0                        0                        0                        0                        0                        0  
-
-  Stored stages = 4
-
-MRIStep Statistics:
-   Time        = 0.01
-   y(t)        = 0.970446
-   y_n         = 0.970446
-   Error       = 2.79396e-10
-   Steps       = 1
-   Fe evals    = 5
-   Fi evals    = 8
-   NLS iters   = 3
-   NLS fails   = 0
-   LS setups   = 1
-   LS Fi evals = 0
-   Ji evals    = 1
-
-Comparing Solver Statistics:
-All checks passed
-
 
 All tests passed!
diff --git a/test/unit_tests/arkode/C_serial/CMakeLists.txt b/test/unit_tests/arkode/C_serial/CMakeLists.txt
index bddff54d88..5fc081c930 100644
--- a/test/unit_tests/arkode/C_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/C_serial/CMakeLists.txt
@@ -26,6 +26,7 @@ set(ARKODE_unit_tests
   "ark_test_arkstepsetforcing\;1 3 2.0 10.0 2.0 8.0"
   "ark_test_arkstepsetforcing\;1 3 2.0 10.0 1.0 5.0"
   "ark_test_getuserdata\;"
+  "ark_test_innerstepper\;"
   "ark_test_interp\;-100"
   "ark_test_interp\;-10000"
   "ark_test_interp\;-1000000"
diff --git a/test/unit_tests/arkode/C_serial/ark_test_innerstepper.c b/test/unit_tests/arkode/C_serial/ark_test_innerstepper.c
new file mode 100644
index 0000000000..330a2ed817
--- /dev/null
+++ b/test/unit_tests/arkode/C_serial/ark_test_innerstepper.c
@@ -0,0 +1,155 @@
+/* -----------------------------------------------------------------------------
+ * Programmer(s): David J. Gardner @ LLNL
+ * -----------------------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------------------
+ * Unit test for creating a minimal MRIStepInnerStepper using the multirate
+ * Dahlquist problem problem y' = lambda_s y + lambda_f y and a custom explicit
+ * Euler inner stepper.
+ * ---------------------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "arkode/arkode.h"
+#include "nvector/nvector_serial.h"
+#include "arkode/arkode_mristep.h"
+
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+#define GSYM "Lg"
+#else
+#define GSYM "g"
+#endif
+
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+
+int ode_slow_rhs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
+{
+  sunrealtype* y_data    = N_VGetArrayPointer(ydot);
+  sunrealtype* ydot_data = N_VGetArrayPointer(ydot);
+  ydot_data[0] = -ONE * y_data[0];
+  return 0;
+}
+
+int fast_evolve(MRIStepInnerStepper fast_mem, sunrealtype t0, sunrealtype tf,
+                N_Vector y)
+{
+  int          i      = 0;
+  sunrealtype  h_fast = (t0 - tf) / SUN_RCONST(10.0);
+  sunrealtype* y_data = N_VGetArrayPointer(y);
+
+  for (i = 0; i < 10; i++)
+  {
+    y_data[0] += (h_fast * -ONE * y_data[0]);
+  }
+
+  return 0;
+}
+
+int main(int argc, char *argv[])
+{
+  SUNContext          sunctx     = NULL;
+  N_Vector            y          = NULL;
+  void*               arkode_mem = NULL;
+  MRIStepInnerStepper fast_mem   = NULL;
+
+  int         flag        = 0;
+  int         arkode_flag = 0;
+  sunrealtype tout        = SUN_RCONST(0.10);
+  sunrealtype tret        = ZERO;
+
+  /* --------------
+   * Create context
+   * -------------- */
+
+  flag = SUNContext_Create(NULL, &sunctx);
+  if (flag) { return 1; }
+
+  /* -----------------------
+   * Setup initial condition
+   * ----------------------- */
+
+  y = N_VNew_Serial(1, sunctx);
+  if (!y) { return 1; }
+  N_VConst(ONE, y);
+
+  /* ---------------------
+   * Setup fast integrator
+   * --------------------- */
+
+  flag = MRIStepInnerStepper_Create(sunctx, &fast_mem);
+  if (flag) { return 1; }
+
+  flag = MRIStepInnerStepper_SetEvolveFn(fast_mem, fast_evolve);
+  if (flag) { return 1; }
+
+  /* ---------------------
+   * Setup slow integrator
+   * --------------------- */
+
+  arkode_mem = MRIStepCreate(ode_slow_rhs, NULL, ZERO, y, fast_mem, sunctx);
+  if (!arkode_mem) { return 1; }
+
+  flag = MRIStepSetFixedStep(arkode_mem, SUN_RCONST(0.01));
+  if (flag) { return 1; }
+
+  flag = MRIStepSetInterpolantType(arkode_mem, ARK_INTERP_HERMITE);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  /* Evolve should return a failure when using Hermite interpolation */
+  arkode_flag = MRIStepEvolve(arkode_mem, tout, y, &tret, ARK_NORMAL);
+  printf("MRIStepEvolve returned %i\n", arkode_flag);
+  if (arkode_flag != ARK_RHSFUNC_FAIL) { return 1; }
+
+  /* -----------------------
+   * Reinitialize integrator
+   * ----------------------- */
+
+  N_VConst(ONE, y);
+
+  flag = MRIStepReInit(arkode_mem, ode_slow_rhs, NULL, ZERO, y);
+  if (flag) { return 1; }
+
+  flag = MRIStepSetInterpolantType(arkode_mem, ARK_INTERP_LAGRANGE);
+  if (flag) { return 1; }
+
+  /* ---------------
+   * Advance in time
+   * --------------- */
+
+  /* Evolve should succeed when using Lagrange interpolation */
+  arkode_flag = MRIStepEvolve(arkode_mem, tout, y, &tret, ARK_NORMAL);
+  printf("MRIStepEvolve returned %i\n", arkode_flag);
+  if (arkode_flag != ARK_SUCCESS) { return 1; }
+
+  /* --------
+   * Clean up
+   * -------- */
+
+  MRIStepInnerStepper_Free(&fast_mem);
+  MRIStepFree(&arkode_mem);
+  N_VDestroy(y);
+  SUNContext_Free(&sunctx);
+
+  if (!flag)
+  {
+    printf("SUCCESS\n");
+  }
+
+  return flag;
+}
+
+/*---- end of file ----*/

From 110a6d9852858d9273ff8b1894de857ac0420117 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Wed, 8 Nov 2023 19:23:37 -0600
Subject: [PATCH 24/35] Feature/oo adaptivity2 (#358)

New object-oriented infrastructure for time step adaptivity controllers.

---------

Co-authored-by: David J. Gardner <gardner48@llnl.gov>
Co-authored-by: Balos, Cody, J <balos1@llnl.gov>
Co-authored-by: Cody Balos <cjbalos@gmail.com>
---
 CHANGELOG.md                                  |  15 +
 cmake/macros/SundialsAddLibrary.cmake         |   9 +
 doc/arkode/guide/source/Constants.rst         |   2 +
 doc/arkode/guide/source/Introduction.rst      |  15 +
 doc/arkode/guide/source/Mathematics.rst       | 147 +----
 .../ARKStep_c_interface/User_callable.rst     | 104 +++-
 .../ERKStep_c_interface/User_callable.rst     | 129 +++-
 doc/arkode/guide/source/index.rst             |   3 +-
 .../SUNAdaptController_links.rst              |  15 +
 .../guide/source/sunadaptcontroller/index.rst |  29 +
 .../SUNAdaptController_Description.rst        | 338 ++++++++++
 .../SUNAdaptController_ImExGus.rst            | 128 ++++
 .../SUNAdaptController_Soderlind.rst          | 315 ++++++++++
 doc/superbuild/source/arkode/index.rst        |   2 +
 doc/superbuild/source/index.rst               |   1 +
 .../SUNAdaptController_links.rst              |  15 +
 .../source/sunadaptcontroller/index.rst       |  31 +
 .../CXX_parallel/ark_diffusion_reaction_p.cpp |  50 +-
 examples/arkode/CXX_parallel/ark_heat2D_p.cpp |  15 +-
 .../arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp |  15 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg.cpp      |  15 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp |  15 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp  |  15 +-
 .../ark_advection_diffusion_reaction.cpp      |  56 +-
 .../ark_advection_diffusion_reaction.hpp      |   6 +-
 examples/arkode/CXX_serial/ark_heat2D.cpp     |  15 +-
 .../ark_heat2D_hypre_pfmg_xbraid.cpp          |  26 +-
 .../arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp |  26 +-
 .../arkode/CXX_xbraid/ark_heat2D_xbraid.cpp   |  42 +-
 .../C_openmpdev/ark_heat1D_adapt_ompdev.c     |   8 +
 .../C_parallel/ark_diurnal_kry_bbd_p.out      |   4 +-
 .../arkode/C_parallel/ark_diurnal_kry_p.out   |   8 +-
 .../arkode/C_parhyp/ark_diurnal_kry_ph.out    |   9 +-
 examples/arkode/C_petsc/ark_petsc_ex25.c      |   8 +-
 .../arkode/C_serial/ark_KrylovDemo_prec.out   |   8 +-
 .../arkode/C_serial/ark_KrylovDemo_prec_1.out |   8 +-
 .../arkode/C_serial/ark_KrylovDemo_prec_2.out |   8 +-
 .../F2003_serial/ark_analytic_f2003.f90       |  28 +-
 .../F2003_serial/ark_analytic_f2003.out       |  16 +-
 include/arkode/arkode.h                       |   1 +
 include/arkode/arkode_arkstep.h               |  22 +-
 include/arkode/arkode_erkstep.h               |  22 +-
 .../sunadaptcontroller_imexgus.h              |  77 +++
 .../sunadaptcontroller_soderlind.h            | 111 ++++
 include/sundials/sundials_adaptcontroller.h   | 159 +++++
 scripts/shared                                |   2 +
 scripts/tarscript                             |   2 +
 src/CMakeLists.txt                            |   1 +
 src/arkode/CMakeLists.txt                     |   3 +
 src/arkode/arkode.c                           |  70 ++-
 src/arkode/arkode_adapt.c                     | 274 +--------
 src/arkode/arkode_adapt_impl.h                |  62 +-
 src/arkode/arkode_arkstep_io.c                | 207 +++++--
 src/arkode/arkode_erkstep_io.c                |  81 ++-
 src/arkode/arkode_impl.h                      |   3 +
 src/arkode/arkode_io.c                        | 557 ++++++++++++-----
 src/arkode/arkode_user_controller.c           | 155 +++++
 src/arkode/arkode_user_controller.h           |  72 +++
 src/arkode/fmod/CMakeLists.txt                |   2 +
 src/arkode/fmod/farkode_arkstep_mod.c         |  28 +
 src/arkode/fmod/farkode_arkstep_mod.f90       |  55 ++
 src/arkode/fmod/farkode_erkstep_mod.c         |  28 +
 src/arkode/fmod/farkode_erkstep_mod.f90       |  55 ++
 src/arkode/fmod/farkode_mod.f90               |  15 +-
 src/arkode/fmod/farkode_mristep_mod.f90       |   1 +
 src/arkode/fmod/farkode_sprkstep_mod.f90      |   1 +
 src/sunadaptcontroller/CMakeLists.txt         |  19 +
 src/sunadaptcontroller/imexgus/CMakeLists.txt |  29 +
 .../imexgus/fmod/CMakeLists.txt               |  25 +
 .../fmod/fsunadaptcontroller_imexgus_mod.c    | 359 +++++++++++
 .../fmod/fsunadaptcontroller_imexgus_mod.f90  | 315 ++++++++++
 .../imexgus/sunadaptcontroller_imexgus.c      | 230 +++++++
 .../soderlind/CMakeLists.txt                  |  29 +
 .../soderlind/fmod/CMakeLists.txt             |  25 +
 .../fmod/fsunadaptcontroller_soderlind_mod.c  | 501 +++++++++++++++
 .../fsunadaptcontroller_soderlind_mod.f90     | 579 ++++++++++++++++++
 .../soderlind/sunadaptcontroller_soderlind.c  | 444 ++++++++++++++
 src/sundials/CMakeLists.txt                   |  12 +-
 src/sundials/fmod/CMakeLists.txt              |   4 +-
 .../fmod/fsundials_adaptcontroller_mod.c      | 333 ++++++++++
 .../fmod/fsundials_adaptcontroller_mod.f90    | 313 ++++++++++
 src/sundials/fmod/fsundials_profiler_mod.c    |  30 +
 src/sundials/fmod/fsundials_profiler_mod.f90  |  58 ++
 src/sundials/sundials_adaptcontroller.c       | 175 ++++++
 swig/Makefile                                 |  17 +-
 swig/arkode/farkode_mod.i                     |   1 +
 swig/sunadaptcontroller/fsunadaptcontroller.i |  30 +
 .../fsunadaptcontroller_imexgus_mod.i         |  29 +
 .../fsunadaptcontroller_soderlind_mod.i       |  29 +
 swig/sundials/fsundials.i                     |   1 +
 swig/sundials/fsundials_adaptcontroller_mod.i |  28 +
 test/answers                                  |   2 +-
 .../arkode/CXX_serial/CMakeLists.txt          |   4 +-
 .../unit_tests/arkode/C_serial/CMakeLists.txt |   2 +
 94 files changed, 6517 insertions(+), 871 deletions(-)
 create mode 100644 doc/arkode/guide/source/sunadaptcontroller/SUNAdaptController_links.rst
 create mode 100644 doc/arkode/guide/source/sunadaptcontroller/index.rst
 create mode 100644 doc/shared/sunadaptcontroller/SUNAdaptController_Description.rst
 create mode 100644 doc/shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst
 create mode 100644 doc/shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst
 create mode 100644 doc/superbuild/source/sunadaptcontroller/SUNAdaptController_links.rst
 create mode 100644 doc/superbuild/source/sunadaptcontroller/index.rst
 create mode 100644 include/sunadaptcontroller/sunadaptcontroller_imexgus.h
 create mode 100644 include/sunadaptcontroller/sunadaptcontroller_soderlind.h
 create mode 100644 include/sundials/sundials_adaptcontroller.h
 create mode 100644 src/arkode/arkode_user_controller.c
 create mode 100644 src/arkode/arkode_user_controller.h
 create mode 100644 src/sunadaptcontroller/CMakeLists.txt
 create mode 100644 src/sunadaptcontroller/imexgus/CMakeLists.txt
 create mode 100644 src/sunadaptcontroller/imexgus/fmod/CMakeLists.txt
 create mode 100644 src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.c
 create mode 100644 src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
 create mode 100644 src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
 create mode 100644 src/sunadaptcontroller/soderlind/CMakeLists.txt
 create mode 100644 src/sunadaptcontroller/soderlind/fmod/CMakeLists.txt
 create mode 100644 src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.c
 create mode 100644 src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
 create mode 100644 src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
 create mode 100644 src/sundials/fmod/fsundials_adaptcontroller_mod.c
 create mode 100644 src/sundials/fmod/fsundials_adaptcontroller_mod.f90
 create mode 100644 src/sundials/sundials_adaptcontroller.c
 create mode 100644 swig/sunadaptcontroller/fsunadaptcontroller.i
 create mode 100644 swig/sunadaptcontroller/fsunadaptcontroller_imexgus_mod.i
 create mode 100644 swig/sunadaptcontroller/fsunadaptcontroller_soderlind_mod.i
 create mode 100644 swig/sundials/fsundials_adaptcontroller_mod.i

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7e7870f60..48b6a0b1b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,21 @@
 
 ## Changes to SUNDIALS in release X.X.X
 
+Added the `SUNAdaptController` base class, ported ARKODE's internal
+implementations of time step controllers into implementations of this class,
+and updated ARKODE to use these objects instead of its own implementations.
+Added `ARKStepSetAdaptController` and `ERKStepSetAdaptController` routines
+so that users can modify controller parameters, or even provide custom
+implementations.
+
+Added the routines `ARKStepSetAdaptivityAdjustment` and
+`ERKStepSetAdaptivityAdjustment`, that allow users to adjust the
+value for the method order supplied to the temporal adaptivity controllers.
+The ARKODE default for this adjustment has been -1 since its initial
+release, but for some applications a value of 0 is more appropriate.
+Users who notice that their simulations encounter a large number of
+temporal error test failures may want to experiment with adjusting this value.
+
 Fixed a regression introduced by the stop time bug fix in v6.6.1 where ARKODE,
 CVODE, CVODES, IDA, and IDAS would return at the stop time rather than the
 requested output time if the stop time was reached in the same step in which the
diff --git a/cmake/macros/SundialsAddLibrary.cmake b/cmake/macros/SundialsAddLibrary.cmake
index 5bf25ab4b8..2717e66bf8 100644
--- a/cmake/macros/SundialsAddLibrary.cmake
+++ b/cmake/macros/SundialsAddLibrary.cmake
@@ -176,6 +176,15 @@ macro(sundials_add_library target)
       target_link_libraries(${obj_target} ${_all_libs})
     endif()
 
+    if(SUNDIALS_BUILD_WITH_PROFILING)
+      if(ENABLE_CALIPER)
+        target_link_libraries(${obj_target} PUBLIC caliper)
+      endif()
+      if(ENABLE_ADIAK)
+        target_link_libraries(${obj_target} PUBLIC adiak::adiak ${CMAKE_DL_LIBS})
+      endif()
+    endif()
+
     # add includes to object library
     target_include_directories(${obj_target}
       PUBLIC
diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst
index 9510f656a0..833a061251 100644
--- a/doc/arkode/guide/source/Constants.rst
+++ b/doc/arkode/guide/source/Constants.rst
@@ -468,6 +468,8 @@ contains the ARKODE output constants.
    | :index:`ARK_RELAX_JAC_FAIL`         | -46  | The relaxation Jacobian function returned an unrecoverable |
    |                                     |      | error                                                      |
    +-------------------------------------+------+------------------------------------------------------------+
+   | :index:`ARK_CONTROLLER_ERR`         | -47  | An error with a SUNAdaptController object was encountered. |
+   +-------------------------------------+------+------------------------------------------------------------+
    | :index:`ARK_UNRECOGNIZED_ERROR`     | -99  | An unknown error was encountered.                          |
    +-------------------------------------+------+------------------------------------------------------------+
    |                                                                                                         |
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 736b7ddc18..6eaf50a9ec 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,6 +133,21 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+Added the :c:type:`SUNAdaptController` base class, ported ARKODE's internal
+implementations of time step controllers into implementations of this class,
+and updated ARKODE to use these objects instead of its own implementations.  Added
+:c:func:`ARKStepSetAdaptController` and :c:func:`ERKStepSetAdaptController`
+routines so that users can modify controller parameters, or even provide custom
+implementations.
+
+Added the routines :c:func:`ARKStepSetAdaptivityAdjustment` and
+:c:func:`ERKStepSetAdaptivityAdjustment`, that allow users to adjust the
+value for the method order supplied to the temporal adaptivity controllers.
+The ARKODE default for this adjustment has been :math:`-1` since its initial
+release, but for some applications a value of :math:`0` is more appropriate.
+Users who notice that their simulations encounter a large number of
+temporal error test failures may want to experiment with adjusting this value.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/arkode/guide/source/Mathematics.rst b/doc/arkode/guide/source/Mathematics.rst
index 135bf33f4c..aa8b389dc8 100644
--- a/doc/arkode/guide/source/Mathematics.rst
+++ b/doc/arkode/guide/source/Mathematics.rst
@@ -906,147 +906,24 @@ steps, :math:`t_{n-3} \to t_{n-2} \to t_{n-1} \to t_n`.  These local
 error history values are all initialized to 1 upon program
 initialization, to accommodate the few initial time steps of a
 calculation where some of these error estimates have not yet been
-computed.  With these estimates, ARKODE supports a variety of error
-control algorithms, as specified in the subsections below.
+computed.  With these estimates, ARKODE supports one of two approaches
+for temporal error control.
 
+First, any valid implementation of the SUNAdaptController class
+:numref:`SUNAdaptController.Description` may be used by ARKODE's adaptive
+time-stepping modules to provide a candidate error-based prospective step
+size :math:`h'`.
 
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.PID:
-
-PID controller
------------------
-
-This is the default time adaptivity controller used by the ARKStep and
-ERKStep modules.  It derives from those found in :cite:p:`KenCarp:03`, :cite:p:`Sod:98`, :cite:p:`Sod:03` and
-:cite:p:`Sod:06`, and uses all three of the local error estimates
-:math:`\varepsilon_n`, :math:`\varepsilon_{n-1}` and
-:math:`\varepsilon_{n-2}` in determination of a prospective step size,
-
-.. math::
-   h' \;=\; h_n\; \varepsilon_n^{-k_1/p}\; \varepsilon_{n-1}^{k_2/p}\;
-        \varepsilon_{n-2}^{-k_3/p},
-
-where the constants :math:`k_1`, :math:`k_2` and :math:`k_3` default
-to 0.58, 0.21 and 0.1, respectively, and may be modified by the user.
-In this estimate, a floor of :math:`\varepsilon > 10^{-10}` is
-enforced to avoid division-by-zero errors.
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.PI:
-
-PI controller
-----------------------
-
-Like with the previous method, the PI controller derives from those
-found in :cite:p:`KenCarp:03`, :cite:p:`Sod:98`, :cite:p:`Sod:03` and :cite:p:`Sod:06`, but it differs in
-that it only uses the two most recent step sizes in its adaptivity
-algorithm,
-
-.. math::
-   h' \;=\; h_n\; \varepsilon_n^{-k_1/p}\; \varepsilon_{n-1}^{k_2/p}.
-
-Here, the default values of :math:`k_1` and :math:`k_2` default
-to 0.8 and 0.31, respectively, though they may be changed by the user.
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.I:
-
-I controller
-----------------------
-
-This is the standard time adaptivity control algorithm in use by most
-publicly-available ODE solver codes.  It bases the prospective time step
-estimate entirely off of the current local error estimate,
-
-.. math::
-   h' \;=\; h_n\; \varepsilon_n^{-k_1/p}.
-
-By default, :math:`k_1=1`, but that may be modified by the user.
-
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.eGus:
-
-Explicit Gustafsson controller
----------------------------------
-
-This step adaptivity algorithm was proposed in :cite:p:`Gust:91`, and
-is primarily useful with explicit Runge--Kutta methods.
-In the notation of our earlier controllers, it has the form
-
-.. math::
-   h' \;=\; \begin{cases}
-      h_1\; \varepsilon_1^{-1/p}, &\quad\text{on the first step}, \\
-      h_n\; \varepsilon_n^{-k_1/p}\;
-        \left(\dfrac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{k_2/p}, &
-      \quad\text{on subsequent steps}.
-   \end{cases}
-   :label: ARKODE_expGus
-
-The default values of :math:`k_1` and :math:`k_2` are 0.367 and 0.268,
-respectively, and may be modified by the user.
-
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.iGus:
-
-Implicit Gustafsson controller
----------------------------------
-
-A version of the above controller suitable for implicit Runge--Kutta
-methods was introduced in :cite:p:`Gust:94`, and has the form
-
-.. math::
-   h' = \begin{cases}
-      h_1 \varepsilon_1^{-1/p}, &\quad\text{on the first step}, \\
-      h_n \left(\dfrac{h_n}{h_{n-1}}\right) \varepsilon_n^{-k_1/p}
-        \left(\dfrac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{-k_2/p}, &
-      \quad\text{on subsequent steps}.
-   \end{cases}
-   :label: ARKODE_impGus
-
-The algorithm parameters default to :math:`k_1 = 0.98` and
-:math:`k_2 = 0.95`, but may be modified by the user.
-
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.ieGus:
-
-ImEx Gustafsson controller
----------------------------------
-
-An ImEx version of these two preceding controllers is also available.
-This approach computes the estimates :math:`h'_1` arising from
-equation :eq:`ARKODE_expGus` and the estimate :math:`h'_2` arising from
-equation :eq:`ARKODE_impGus`, and selects
-
-.. math::
-   h' = \frac{h}{|h|}\min\left\{|h'_1|, |h'_2|\right\}.
-
-Here, equation :eq:`ARKODE_expGus` uses :math:`k_1` and
-:math:`k_2` with default values of 0.367 and 0.268, while equation
-:eq:`ARKODE_impGus` sets both parameters to the input :math:`k_3` that
-defaults to 0.95.  All of these values may be modified by the user.
-
-
-
-.. _ARKODE.Mathematics.Adaptivity.ErrorControl.User:
-
-User-supplied controller
----------------------------------
-
-Finally, ARKODE's time-stepping modules allow the user to define their
-own time step adaptivity function,
+Second, ARKODE's adaptive time-stepping modules currently still allow the
+user to define their own time step adaptivity function,
 
 .. math::
    h' = H(y, t, h_n, h_{n-1}, h_{n-2}, \varepsilon_n, \varepsilon_{n-1}, \varepsilon_{n-2}, q, p),
 
-to allow for problem-specific choices, or for continued
-experimentation with temporal error controllers.
+allowing for problem-specific choices, or for continued
+experimentation with temporal error controllers.  We note that this
+support has been deprecated in favor of the SUNAdaptController class,
+and will be removed in a future release.
 
 
 
diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
index eb1f05979e..8db35e2510 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
@@ -1107,8 +1107,9 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
       :c:func:`ARKStepSetMaxGrowth()`,
       :c:func:`ARKStepSetMinReduction()`,
       :c:func:`ARKStepSetSafetyFactor()`,
-      :c:func:`ARKStepSetSmallNumEFails()` and
-      :c:func:`ARKStepSetStabilityFn()`
+      :c:func:`ARKStepSetSmallNumEFails()`,
+      :c:func:`ARKStepSetStabilityFn()`, and
+      :c:func:`ARKStepSetAdaptController()`
       will be ignored, since temporal adaptivity is disabled.
 
       If both :c:func:`ARKStepSetFixedStep()` and
@@ -1688,26 +1689,44 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 .. cssclass:: table-bordered
 
-========================================================   ======================================  ========
-Optional input                                             Function name                           Default
-========================================================   ======================================  ========
-Set a custom time step adaptivity function                 :c:func:`ARKStepSetAdaptivityFn()`      internal
-Choose an existing time step adaptivity method             :c:func:`ARKStepSetAdaptivityMethod()`  0
-Explicit stability safety factor                           :c:func:`ARKStepSetCFLFraction()`       0.5
-Time step error bias factor                                :c:func:`ARKStepSetErrorBias()`         1.5
-Bounds determining no change in step size                  :c:func:`ARKStepSetFixedStepBounds()`   1.0  1.5
-Maximum step growth factor on convergence fail             :c:func:`ARKStepSetMaxCFailGrowth()`    0.25
-Maximum step growth factor on error test fail              :c:func:`ARKStepSetMaxEFailGrowth()`    0.3
-Maximum first step growth factor                           :c:func:`ARKStepSetMaxFirstGrowth()`    10000.0
-Maximum allowed general step growth factor                 :c:func:`ARKStepSetMaxGrowth()`         20.0
-Minimum allowed step reduction factor on error test fail   :c:func:`ARKStepSetMinReduction()`      0.1
-Time step safety factor                                    :c:func:`ARKStepSetSafetyFactor()`      0.96
-Error fails before MaxEFailGrowth takes effect             :c:func:`ARKStepSetSmallNumEFails()`    2
-Explicit stability function                                :c:func:`ARKStepSetStabilityFn()`       none
-========================================================   ======================================  ========
+=========================================================   ==========================================  ========
+Optional input                                              Function name                               Default
+=========================================================   ==========================================  ========
+Provide a :c:type:`SUNAdaptController` for ARKStep to use   :c:func:`ARKStepSetAdaptController()`       PID
+Set a custom time step adaptivity function                  :c:func:`ARKStepSetAdaptivityFn()`          internal
+Choose an existing time step adaptivity method              :c:func:`ARKStepSetAdaptivityMethod()`      0
+Adjust the method order used in the controller              :c:func:`ERKStepSetAdaptivityAdjustment()`  -1
+Explicit stability safety factor                            :c:func:`ARKStepSetCFLFraction()`           0.5
+Time step error bias factor                                 :c:func:`ARKStepSetErrorBias()`             1.5
+Bounds determining no change in step size                   :c:func:`ARKStepSetFixedStepBounds()`       1.0  1.5
+Maximum step growth factor on convergence fail              :c:func:`ARKStepSetMaxCFailGrowth()`        0.25
+Maximum step growth factor on error test fail               :c:func:`ARKStepSetMaxEFailGrowth()`        0.3
+Maximum first step growth factor                            :c:func:`ARKStepSetMaxFirstGrowth()`        10000.0
+Maximum allowed general step growth factor                  :c:func:`ARKStepSetMaxGrowth()`             20.0
+Minimum allowed step reduction factor on error test fail    :c:func:`ARKStepSetMinReduction()`          0.1
+Time step safety factor                                     :c:func:`ARKStepSetSafetyFactor()`          0.96
+Error fails before MaxEFailGrowth takes effect              :c:func:`ARKStepSetSmallNumEFails()`        2
+Explicit stability function                                 :c:func:`ARKStepSetStabilityFn()`           none
+=========================================================   ==========================================  ========
 
 
 
+.. c:function:: int ARKStepSetAdaptController(void* arkode_mem, SUNAdaptController C)
+
+   Sets a user-supplied time-step controller object.
+
+   **Arguments:**
+      * *arkode_mem* -- pointer to the ARKStep memory block.
+      * *C* -- user-supplied time adaptivity controller.  If ``NULL`` then the PID controller will be created (see :numref:`SUNAdaptController.Soderlind`).
+
+   **Return value:**
+      * *ARK_SUCCESS* if successful
+      * *ARK_MEM_NULL* if the ARKStep memory is ``NULL``
+      * *ARK_MEM_FAIL* if *C* was ``NULL`` and the PID controller could not be allocated.
+
+   .. versionadded:: x.x.x
+
+
 .. c:function:: int ARKStepSetAdaptivityFn(void* arkode_mem, ARKAdaptFn hfun, void* h_data)
 
    Sets a user-supplied time-step adaptivity function.
@@ -1729,6 +1748,11 @@ Explicit stability function                                :c:func:`ARKStepSetSt
       :c:func:`ARKStepSetStabilityFn()` should be used instead.
 
 
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
+
+
 
 .. c:function:: int ARKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, realtype* adapt_params)
 
@@ -1744,7 +1768,8 @@ Explicit stability function                                :c:func:`ARKStepSetSt
         parameters (1), or that they will be supplied in the
         *adapt_params* argument (0).
       * *pq* -- flag denoting whether to use the embedding order of
-        accuracy *p* (0) or the method order of accuracy *q* (1)
+        accuracy *p* (0), the method order of accuracy *q* (1), or the
+        minimum of the two (any input not equal to 0 or 1)
         within the adaptivity algorithm.  *p* is the default.
       * *adapt_params[0]* -- :math:`k_1` parameter within accuracy-based adaptivity algorithms.
       * *adapt_params[1]* -- :math:`k_2` parameter within accuracy-based adaptivity algorithms.
@@ -1761,8 +1786,40 @@ Explicit stability function                                :c:func:`ARKStepSetSt
       parameter values are desired, it is recommended to instead provide
       a custom function through a call to :c:func:`ARKStepSetAdaptivityFn()`.
 
+      .. versionchanged:: x.x.x
+         
+         Prior to version x.x.x, any nonzero value for *pq* would result in use of the
+         embedding order of accuracy.
+
+
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
 
 
+
+.. c:function:: int ARKStepSetAdaptivityAdjustment(void* arkode_mem, int adjust)
+
+   Called by a user to adjust the method order supplied to the temporal adaptivity
+   controller.  For example, if the user expects order reduction due to problem stiffness,
+   they may request that the controller assume a reduced order of accuracy for the method
+   by specifying a value :math:`adjust < 0`.
+
+   **Arguments:**
+      * *arkode_mem* -- pointer to the ARKStep memory block.
+      * *adjust* -- adjustment factor (default is -1).
+
+   **Return value:**
+      * *ARK_SUCCESS* if successful
+      * *ARK_MEM_NULL* if the ARKStep memory is ``NULL``
+      * *ARK_ILL_INPUT* if an argument has an illegal value
+
+   **Notes:**
+      This should be called prior to calling :c:func:`ARKStepEvolve()`, and can only be
+      reset following a call to :c:func:`ARKStepReInit()`.
+
+   .. versionadded:: x.x.x
+
 .. c:function:: int ARKStepSetCFLFraction(void* arkode_mem, realtype cfl_frac)
 
    Specifies the fraction of the estimated explicitly stable step to use.
@@ -1800,6 +1857,13 @@ Explicit stability function                                :c:func:`ARKStepSetSt
    **Notes:**
       Any value below 1.0 will imply a reset to the default value.
 
+      If both this and one of :c:func:`ARKStepSetAdaptivityMethod` or
+      :c:func:`ARKStepSetAdaptController` will be called, then this routine must be called
+      *second*.
+
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
 
 
 .. c:function:: int ARKStepSetFixedStepBounds(void* arkode_mem, realtype lb, realtype ub)
diff --git a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
index a14ed89456..94493fc0cb 100644
--- a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
@@ -731,8 +731,9 @@ Optional inputs for ERKStep
       :c:func:`ERKStepSetMaxGrowth()`,
       :c:func:`ERKStepSetMinReduction()`,
       :c:func:`ERKStepSetSafetyFactor()`,
-      :c:func:`ERKStepSetSmallNumEFails()` and
-      :c:func:`ERKStepSetStabilityFn()`
+      :c:func:`ERKStepSetSmallNumEFails()`,
+      :c:func:`ERKStepSetStabilityFn()`, and
+      :c:func:`ERKStepSetAdaptController()`
       will be ignored, since temporal adaptivity is disabled.
 
       If both :c:func:`ERKStepSetFixedStep()` and
@@ -1158,36 +1159,61 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 .. _ARKODE.Usage.ERKStep.ERKStepAdaptivityInputTable:
 .. table:: Optional inputs for time step adaptivity
 
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Optional input                                            | Function name                          | Default   |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Set a custom time step adaptivity function                | :c:func:`ERKStepSetAdaptivityFn()`     | internal  |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Choose an existing time step adaptivity method            | :c:func:`ERKStepSetAdaptivityMethod()` | 0         |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Explicit stability safety factor                          | :c:func:`ERKStepSetCFLFraction()`      | 0.5       |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Time step error bias factor                               | :c:func:`ERKStepSetErrorBias()`        | 1.5       |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Bounds determining no change in step size                 | :c:func:`ERKStepSetFixedStepBounds()`  | 1.0  1.5  |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Maximum step growth factor on error test fail             | :c:func:`ERKStepSetMaxEFailGrowth()`   | 0.3       |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Maximum first step growth factor                          | :c:func:`ERKStepSetMaxFirstGrowth()`   | 10000.0   |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Maximum allowed general step growth factor                | :c:func:`ERKStepSetMaxGrowth()`        | 20.0      |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Minimum allowed step reduction factor on error test fail  | :c:func:`ERKStepSetMinReduction()`     | 0.1       |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Time step safety factor                                   | :c:func:`ERKStepSetSafetyFactor()`     | 0.96      |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Error fails before MaxEFailGrowth takes effect            | :c:func:`ERKStepSetSmallNumEFails()`   | 2         |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
-   | Explicit stability function                               | :c:func:`ERKStepSetStabilityFn()`      | none      |
-   +-----------------------------------------------------------+----------------------------------------+-----------+
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Optional input                                            | Function name                              | Default   |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Provide a :c:type:`SUNAdaptController` for ERKStep to use | :c:func:`ERKStepSetAdaptController()`      | PI        |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Set a custom time step adaptivity function                | :c:func:`ERKStepSetAdaptivityFn()`         | internal  |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Choose an existing time step adaptivity method            | :c:func:`ERKStepSetAdaptivityMethod()`     | 0         |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Adjust the method order used in the controller            | :c:func:`ERKStepSetAdaptivityAdjustment()` | -1        |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Explicit stability safety factor                          | :c:func:`ERKStepSetCFLFraction()`          | 0.5       |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Time step error bias factor                               | :c:func:`ERKStepSetErrorBias()`            | 1.5       |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Bounds determining no change in step size                 | :c:func:`ERKStepSetFixedStepBounds()`      | 1.0  1.5  |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Maximum step growth factor on error test fail             | :c:func:`ERKStepSetMaxEFailGrowth()`       | 0.3       |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Maximum first step growth factor                          | :c:func:`ERKStepSetMaxFirstGrowth()`       | 10000.0   |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Maximum allowed general step growth factor                | :c:func:`ERKStepSetMaxGrowth()`            | 20.0      |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Minimum allowed step reduction factor on error test fail  | :c:func:`ERKStepSetMinReduction()`         | 0.1       |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Time step safety factor                                   | :c:func:`ERKStepSetSafetyFactor()`         | 0.96      |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Error fails before MaxEFailGrowth takes effect            | :c:func:`ERKStepSetSmallNumEFails()`       | 2         |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
+   | Explicit stability function                               | :c:func:`ERKStepSetStabilityFn()`          | none      |
+   +-----------------------------------------------------------+--------------------------------------------+-----------+
 
 
 
+.. c:function:: int ERKStepSetAdaptController(void* arkode_mem, SUNAdaptController C)
+
+   Sets a user-supplied time-step controller object.
+
+   **Arguments:**
+      * *arkode_mem* -- pointer to the ERKStep memory block.
+      * *C* -- user-supplied time adaptivity controller.  If ``NULL`` then the PID controller will be created (see :numref:`SUNAdaptController.Soderlind`).
+
+   **Return value:**
+      * *ARK_SUCCESS* if successful
+      * *ARK_MEM_NULL* if the ERKStep memory is ``NULL``
+      * *ARK_MEM_FAIL* if *C* was ``NULL`` and the PID controller could not be allocated.
+
+   **Notes:**
+      When *C* is ``NULL``, the PID controller that is created is not the same as the ERKStep default (PI).
+      To reset ERKStep to its default behavior after a non-default controller has been used, users should either
+      specifically create the PI controller *C* and attach it here, or call :c:func:`ERKStepSetDefaults()`.
+
+   .. versionadded:: x.x.x
+
+
 .. c:function:: int ERKStepSetAdaptivityFn(void* arkode_mem, ARKAdaptFn hfun, void* h_data)
 
    Sets a user-supplied time-step adaptivity function.
@@ -1209,6 +1235,10 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
       :c:func:`ERKStepSetStabilityFn()` should be used instead.
 
 
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
+
 
 .. c:function:: int ERKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, realtype* adapt_params)
 
@@ -1224,7 +1254,8 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
         parameters (1), or that they will be supplied in the
         *adapt_params* argument (0).
       * *pq* -- flag denoting whether to use the embedding order of
-        accuracy *p* (0) or the method order of accuracy *q* (1)
+        accuracy *p* (0), the method order of accuracy *q* (1), or the
+        minimum of the two (any input not equal to 0 or 1)
         within the adaptivity algorithm.  *p* is the default.
       * *adapt_params[0]* -- :math:`k_1` parameter within accuracy-based adaptivity algorithms.
       * *adapt_params[1]* -- :math:`k_2` parameter within accuracy-based adaptivity algorithms.
@@ -1241,8 +1272,38 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
       parameter values are desired, it is recommended to instead provide
       a custom function through a call to :c:func:`ERKStepSetAdaptivityFn()`.
 
+      .. versionchanged:: x.x.x
+         
+         Prior to version x.x.x, any nonzero value for *pq* would result in use of the
+         embedding order of accuracy.
+
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
 
 
+.. c:function:: int ERKStepSetAdaptivityAdjustment(void* arkode_mem, int adjust)
+
+   Called by a user to adjust the method order supplied to the temporal adaptivity
+   controller.  For example, if the user expects order reduction due to problem stiffness,
+   they may request that the controller assume a reduced order of accuracy for the method
+   by specifying a value :math:`adjust < 0`.
+
+   **Arguments:**
+      * *arkode_mem* -- pointer to the ERKStep memory block.
+      * *adjust* -- adjustment factor (default is -1).
+
+   **Return value:**
+      * *ARK_SUCCESS* if successful
+      * *ARK_MEM_NULL* if the ERKStep memory is ``NULL``
+      * *ARK_ILL_INPUT* if an argument has an illegal value
+
+   **Notes:**
+      This should be called prior to calling :c:func:`ERKStepEvolve()`, and can only be
+      reset following a call to :c:func:`ERKStepReInit()`.
+
+   .. versionadded:: x.x.x
+
 .. c:function:: int ERKStepSetCFLFraction(void* arkode_mem, realtype cfl_frac)
 
    Specifies the fraction of the estimated explicitly stable step to use.
@@ -1280,6 +1341,14 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
    **Notes:**
       Any value below 1.0 will imply a reset to the default value.
 
+      If both this and one of :c:func:`ERKStepSetAdaptivityMethod` or
+      :c:func:`ERKStepSetAdaptController` will be called, then this routine must be called
+      *second*.
+
+   .. deprecated:: x.x.x
+
+      Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
+
 
 
 .. c:function:: int ERKStepSetFixedStepBounds(void* arkode_mem, realtype lb, realtype ub)
diff --git a/doc/arkode/guide/source/index.rst b/doc/arkode/guide/source/index.rst
index fd61ab5981..4d4828f787 100644
--- a/doc/arkode/guide/source/index.rst
+++ b/doc/arkode/guide/source/index.rst
@@ -28,7 +28,7 @@ to have a similar user experience to the `CVODE
 solver, including user modes to allow adaptive integration to specified
 output times, return after each internal step and root-finding
 capabilities, and for calculations in serial, using shared-memory
-parallelism (via OpenMP, Pthreads, CUDA, Raja) or distributed-memory
+parallelism (e.g., via OpenMP, CUDA, Raja, Kokkos) or distributed-memory
 parallelism (via MPI).  The default integration and solver options
 should apply to most users, though control over nearly all internal
 parameters and time adaptivity algorithms is enabled through optional
@@ -64,6 +64,7 @@ with support by the `US Department of Energy <http://www.doe.gov>`_,
    sunmatrix/index.rst
    sunlinsol/index.rst
    sunnonlinsol/index.rst
+   sunadaptcontroller/index.rst
    sunmemory/index.rst
    Install_link.rst
    Constants
diff --git a/doc/arkode/guide/source/sunadaptcontroller/SUNAdaptController_links.rst b/doc/arkode/guide/source/sunadaptcontroller/SUNAdaptController_links.rst
new file mode 100644
index 0000000000..949d84196f
--- /dev/null
+++ b/doc/arkode/guide/source/sunadaptcontroller/SUNAdaptController_links.rst
@@ -0,0 +1,15 @@
+.. ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. include:: ../../../../shared/sunadaptcontroller/SUNAdaptController_Description.rst
+.. include:: ../../../../shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst
+.. include:: ../../../../shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst
diff --git a/doc/arkode/guide/source/sunadaptcontroller/index.rst b/doc/arkode/guide/source/sunadaptcontroller/index.rst
new file mode 100644
index 0000000000..bd4ab38d7b
--- /dev/null
+++ b/doc/arkode/guide/source/sunadaptcontroller/index.rst
@@ -0,0 +1,29 @@
+.. ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. _SUNAdaptController:
+
+#####################################
+Time Step Adaptivity Controllers
+#####################################
+
+The SUNDIALS library comes packaged with a variety of :c:type:`SUNAdaptController`
+implementations, designed to support various forms of error-based time step
+adaptivity within SUNDIALS time integrators.  To support applications that may
+want to adjust the controller parameters or provide their own implementations,
+SUNDIALS defines the :c:type:`SUNAdaptController` base class, along with a
+variety of default implementations.
+
+.. toctree::
+   :maxdepth: 1
+
+   SUNAdaptController_links.rst
diff --git a/doc/shared/sunadaptcontroller/SUNAdaptController_Description.rst b/doc/shared/sunadaptcontroller/SUNAdaptController_Description.rst
new file mode 100644
index 0000000000..acea4a0790
--- /dev/null
+++ b/doc/shared/sunadaptcontroller/SUNAdaptController_Description.rst
@@ -0,0 +1,338 @@
+..
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. _SUNAdaptController.Description:
+
+The SUNAdaptController API
+==========================
+
+.. versionadded:: x.x.x
+
+The SUNAdaptController base class provides a common API for accuracy-based adaptivity
+controllers to be used by SUNDIALS integrators. These controllers estimate step
+sizes (among other things) such that the next step solution satisfies a desired
+temporal accuracy, while striving to maximize computational efficiency. We note
+that in the descriptions below, we frequently use *dsm* to represent
+temporal error. This is **not** the raw temporal error estimate; instead, it is
+a norm of the temporal error estimate after scaling by the user-supplied
+accuracy tolerances (see :eq:`ARKODE_WRMS_NORM`),
+
+.. math::
+   \text{dsm} = \left( \frac{1}{N} \sum_{i=1}^N
+   \left(\frac{\text{error}_i}{\text{rtol}\cdot |y_{n-1,i}| + \text{atol}_i}\right)^2\right)^{1/2}.
+
+Thus *dsm* values below one represent errors estimated to be more accurate than
+needed, whereas errors above one are considered to be larger than allowable.
+
+The base ``SUNAdaptController`` class is modeled after SUNDIALS' other object-oriented
+classes, in that this class contains a pointer to an implementation-specific
+*content*, an *ops* structure with generic controller operations, and a
+:c:type:`SUNContext` object. Specifically, the type ``SUNAdaptController`` is defined
+as:
+
+.. c:type:: struct _generic_SUNAdaptController *SUNAdaptController
+
+and the base class structure is defined as
+
+.. code-block:: C
+
+   struct _generic_SUNAdaptController {
+        void* content;
+        generic_SUNAdaptController_Ops* ops;
+        SUNContext sunctx;
+    };
+
+Here, ``_generic_SUNAdaptController_Ops`` is the pointer to a structure containing
+function pointers to the various controller operations, and is defined as
+
+.. code-block:: c
+
+    struct _generic_SUNAdaptController_Ops {
+        SUNAdaptController_Type (*getid)(SUNAdaptController C);
+        int (*destroy)(SUNAdaptController C);
+        int (*estimatestep)(SUNAdaptController C, sunrealtype h, int p, sunrealtype dsm, sunrealtype* hnew);
+        int (*reset)(SUNAdaptController C);
+        int (*setdefaults)(SUNAdaptController C);
+        int (*write)(SUNAdaptController C, FILE* fptr);
+        int (*seterrorbias)(SUNAdaptController C, sunrealtype bias);
+        int (*updateh)(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
+        int (*space)(SUNAdaptController C, long int *lenrw, long int *leniw);
+    };
+
+
+.. _SUNAdaptController.Description.controllerTypes:
+
+SUNAdaptController Types
+------------------------
+
+The time integrators in SUNDIALS adapt a variety of parameters to achieve
+accurate and efficient computations. To this end, each SUNAdaptController implementation
+should note its type, so that integrators will understand the types of
+adaptivity that the controller is designed to perform. These are encoded in the
+following set of SUNAdaptController types:
+
+.. c:enum:: SUNAdaptController_Type
+
+   The enumerated type :c:type:`SUNAdaptController_Type` defines the enumeration
+   constants for SUNDIALS error controller types
+
+.. c:enumerator:: SUN_ADAPTCONTROLLER_NONE
+
+   Empty object that performs no control.
+
+.. c:enumerator:: SUN_ADAPTCONTROLLER_H
+
+   Controls a single-rate step size.
+
+
+
+.. _SUNAdaptController.Description.operations:
+
+SUNAdaptController Operations
+-----------------------------
+
+The base SUNAdaptController class defines and implements all SUNAdaptController functions. Most
+of these routines are merely wrappers for the operations defined by a particular
+SUNAdaptController implementation, which are accessed through the *ops* field of the
+``SUNAdaptController`` structure. The base SUNAdaptController class provides the
+constructor
+
+.. c:function:: SUNAdaptController SUNAdaptController_NewEmpty(SUNContext sunctx)
+
+  This function allocates a new generic ``SUNAdaptController`` object and initializes
+  its content pointer and the function pointers in the operations structure to
+  ``NULL``.
+
+  :param sunctx: the :c:type:`SUNContext` object (see :numref:`SUNDIALS.SUNContext`)
+
+  :returns: If successful, a generic :c:type:`SUNAdaptController` object. If
+            unsuccessful, a ``NULL`` pointer will be returned.
+
+Each of the following methods are *optional* for any specific SUNAdaptController
+implementation, however some may be required based on the implementation's
+:c:type:`SUNAdaptController_Type` (see Section :numref:`SUNAdaptController.Description.controllerTypes`). We
+note these requirements below. Additionally, we note the behavior of the base SUNAdaptController methods when they perform an action other than only a successful return.
+
+.. c:function:: SUNAdaptController_Type SUNAdaptController_GetType(SUNAdaptController C)
+
+   Returns the type identifier for the controller *C*. Returned values
+   are given in Section :numref:`SUNAdaptController.Description.controllerTypes`
+
+   :param C: the :c:type:`SUNAdaptController` object.
+   :return: :c:type:`SUNAdaptController_Type` type identifier.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController_Type id = SUNAdaptController_GetType(C);
+
+.. c:function:: int SUNAdaptController_Destroy(SUNAdaptController C)
+
+   Deallocates the controller *C*. If this method is not provided by the
+   implementation, the base class method will free both the *content* and
+   *ops* objects -- this should be sufficient unless a controller implementation
+   performs dynamic memory allocation of its own (note that the
+   SUNDIALS-provided SUNAdaptController implementations do not need to supply this
+   routine).
+
+   :param C: the :c:type:`SUNAdaptController` object.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_Destroy(C);
+
+.. c:function:: int SUNAdaptController_EstimateStep(SUNAdaptController C, sunrealtype h, int p, sunrealtype dsm, sunrealtype* hnew)
+
+   Estimates a single-rate step size. This routine is required for controllers
+   of type ``SUN_ADAPTCONTROLLER_H``.  If this is not provided by the
+   implementation, the base class method will set ``*hnew = h`` and return.
+
+   :param C: the :c:type:`SUNAdaptController` object.
+   :param h: the step size from the previous step attempt.
+   :param p: the current order of accuracy for the time integration method.
+   :param dsm: the local temporal estimate from the previous step attempt.
+   :param hnew: (output) the estimated step size.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_EstimateStep(C, hcur, p, dsm, &hnew);
+
+.. c:function:: int SUNAdaptController_Reset(SUNAdaptController C)
+
+   Resets the controller to its initial state, e.g., if it stores a small number
+   of previous *dsm* or *h* values.
+
+   :param C:  the :c:type:`SUNAdaptController` object.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_Reset(C);
+
+.. c:function:: int SUNAdaptController_SetDefaults(SUNAdaptController C)
+
+   Sets the controller parameters to their default values.
+
+   :param C:  the :c:type:`SUNAdaptController` object.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetDefaults(C);
+
+.. c:function:: int SUNAdaptController_Write(SUNAdaptController C, FILE* fptr)
+
+   Writes all controller parameters to the indicated file pointer.
+
+   :param C:  the :c:type:`SUNAdaptController` object.
+   :param fptr:  the output stream to write the parameters to.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_Write(C, stdout);
+
+.. c:function:: int SUNAdaptController_SetErrorBias(SUNAdaptController C, sunrealtype bias)
+
+   Sets an error bias factor for scaling the local error factors. This is
+   typically used to slightly exaggerate the temporal error during the
+   estimation process, leading to a more conservative estimated step size.
+
+   :param C:  the :c:type:`SUNAdaptController` object.
+   :param bias:  the error bias factor -- an input :math:`\leq 0` indicates to use
+                 the default value for the controller.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetErrorBias(C, 1.2);
+
+.. c:function:: int SUNAdaptController_UpdateH(SUNAdaptController C, sunrealtype h, sunrealtype dsm)
+
+   Notifies a controller of type SUN_ADAPTCONTROLLER_H that a successful time step
+   was taken with stepsize *h* and local error factor *dsm*, indicating that these
+   can be saved for subsequent controller functions. This is typically relevant for
+   controllers that store a history of either step sizes or error estimates for
+   performing the estimation process.
+
+   :param C:  the :c:type:`SUNAdaptController` object.
+   :param h:  the successful step size.
+   :param dsm:  the successful temporal error estimate.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_UpdateH(C, h, dsm);
+
+.. c:function:: int SUNAdaptController_Space(SUNAdaptController C, long int *lenrw, long int *leniw)
+
+   Informative routine that returns the memory requirements of the
+   :c:type:`SUNAdaptController` object.
+
+   :param C:  the :c:type:`SUNAdaptController` object..
+   :param lenrw: (output)  number of ``sunsunrealtype`` words stored in the
+                 controller.
+   :param leniw: (output)  number of ``sunindextype`` words stored in the
+                 controller. This may also include pointers, `int` and
+                 `long int` words.
+   :return: error code indicating success failure
+            (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_Space(C, &lenrw, &leniw);
+
+
+
+.. _SUNAdaptController.Description.errorCodes:
+
+SUNAdaptController Error Codes
+------------------------------
+
+SUNAdaptController functions return one of the following set of error codes:
+
+* ``SUNADAPTCONTROLLER_SUCCESS`` (0) -- successful call.
+
+* ``SUNADAPTCONTROLLER_ILL_INPUT`` (-1001) -- an illegal input has been provided to the function.
+
+* ``SUNADAPTCONTROLLER_MEM_FAIL`` (-1002) -- a memory access or allocation failed.
+
+* ``SUNADAPTCONTROLLER_USER_FCN_FAIL`` (-1003) -- a user-supplied function returned a nonzero [error] value.
+
+* ``SUNADAPTCONTROLLER_OPERATION_FAIL`` (-1004) -- catch-all for errors not in the above list.
+
+.. note::
+   The SUNDIALS time integrators do not rely on these specific return values and only
+   on whether the returned values are 0 (successful) or non-zero (failure).  Thus,
+   user-defined implementations are not required to use these specific error codes,
+   so long as the zero/non-zero convention is followed.
+
+
+C/C++ API Usage
+---------------
+
+Specific SUNDIALS adaptivity controller modules can be used in C and C++ programs by including
+the corresponding header file for that module, e.g. ``sunadaptcontroller/sunadaptcontroller_XYZ.h``.
+
+Example usage (here ``SUNAdaptController_XYZ`` is a placeholder for an actual SUNAdaptController
+constructor):
+
+.. code-block:: c
+
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <sundials/sundials_context.h>
+    #include <sundials/sundials_types.h>
+    #include <sunadaptcontroller/sunadaptcontroller_XYZ.h>
+
+    int main()
+    {
+        /* Create a SUNContext object */
+        SUNContext sunctx = ...;
+
+        /* Create a SUNAdaptController object */
+        SUNAdaptController C = SUNAdaptController_XYZ(sunctx);
+
+        /* Use the control object */
+
+        /* Destroy the control object */
+        retval = SUNAdaptController_Destroy(C);
+
+        return 0;
+    }
diff --git a/doc/shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst b/doc/shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst
new file mode 100644
index 0000000000..c0a54fddf8
--- /dev/null
+++ b/doc/shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst
@@ -0,0 +1,128 @@
+..
+   Programmer(s): Daniel R. Reynolds @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. _SUNAdaptController.ImExGus:
+
+The SUNAdaptController_ImExGus Module
+======================================
+
+The ImEx Gustafsson implementation of the SUNAdaptController class, SUNAdaptController_ImExGus,
+implements a combination of two adaptivity controllers proposed
+by K. Gustafsson.  His "explicit" controller was proposed in :cite:p:`Gust:91`,
+is primarily useful with explicit Runge--Kutta methods, and has the form
+
+.. math::
+   h' \;=\; \begin{cases}
+      h_1\; \varepsilon_1^{-1/(p+1)}, &\quad\text{on the first step}, \\
+      h_n\; \varepsilon_n^{-k_1^E/(p+1)}\;
+        \left(\dfrac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{k_2^E/(p+1)}, &
+      \quad\text{on subsequent steps}.
+   \end{cases}
+   :label: expGusController
+
+Similarly, Gustafsson's "implicit" controller was proposed in :cite:p:`Gust:94`
+with the form
+
+.. math::
+   h' = \begin{cases}
+      h_1 \varepsilon_1^{-1/(p+1)}, &\quad\text{on the first step}, \\
+      h_n \left(\dfrac{h_n}{h_{n-1}}\right) \varepsilon_n^{-k_1^I/(p+1)}
+        \left(\dfrac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{-k_2^I/(p+1)}, &
+      \quad\text{on subsequent steps}.
+   \end{cases}
+   :label: impGusController
+
+In the above formulas, the default values of :math:`k_1^E`, :math:`k_2^E`,
+:math:`k_1^I`, and :math:`k_2^I` are 0.367, 0.268, 0.98, and 0.95, respectively,
+and :math:`p` is the global order of the time integration method.  In these
+estimates, a floor of :math:`\varepsilon_* > 10^{-10}` is enforced to avoid
+division-by-zero errors.
+
+The SUNAdaptController_ImExGus controller implements both formulas
+:eq:`expGusController` and :eq:`impGusController`, and sets its recommended step
+size as the minimum of these two.  It is implemented as a derived SUNAdaptController
+class, and defines its *content* field as:
+
+.. code-block:: c
+
+   struct _SUNAdaptControllerContent_ImExGus {
+     sunrealtype k1e;
+     sunrealtype k2e;
+     sunrealtype k1i;
+     sunrealtype k2i;
+     sunrealtype bias;
+     sunrealtype ep;
+     sunrealtype hp;
+     sunbooleantype firststep;
+   };
+
+These entries of the *content* field contain the following information:
+
+* ``k1e, k2e`` - explicit controller parameters used in :eq:`expGusController`.
+
+* ``k1i, k2i`` - implicit controller parameters used in :eq:`impGusController`.
+
+* ``bias`` - error bias factor, that converts from an input temporal error
+  estimate via :math:`\varepsilon = \text{bias}*\text{dsm}`.
+
+* ``ep`` - storage for the previous error estimate, :math:`\varepsilon_{n-1}`.
+
+* ``hp`` - storage for the previous step size, :math:`h_{n-1}`.
+
+* ``firststep`` - flag indicating whether a step has completed successfully, allowing
+  the formulas above to transition between :math:`h_1` and :math:`h_n`.
+
+The header file to be included when using this module is
+``sunadaptcontroller/sunadaptcontroller_imexgus.h``.
+
+
+The SUNAdaptController_ImExGus class provides implementations of all operations
+relevant to a ``SUN_ADAPTCONTROLLER_H`` controller listed in
+:numref:`SUNAdaptController.Description.operations`. The
+SUNAdaptController_ImExGus class also provides the following additional user-callable
+routines:
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_ImExGus(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_ImExGus
+   object, and inserts its default parameters.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object; otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_ImExGus(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_ImExGus(SUNAdaptController C, sunrealtype k1e, sunrealtype k2e, sunrealtype k1i, sunrealtype k2i)
+
+   This user-callable function provides control over the relevant parameters
+   above.  This should be called *before* the time integrator is called to evolve
+   the problem.
+
+   :param C: the SUNAdaptController_ImExGus object.
+   :param k1e: parameter used within the controller time step estimate.
+   :param k2e: parameter used within the controller time step estimate.
+   :param k1i: parameter used within the controller time step estimate.
+   :param k2i: parameter used within the controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_ImExGus(C, 0.4, 0.3, -1.0, 1.0);
diff --git a/doc/shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst b/doc/shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst
new file mode 100644
index 0000000000..e7bf4867f2
--- /dev/null
+++ b/doc/shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst
@@ -0,0 +1,315 @@
+..
+   Programmer(s): Daniel R. Reynolds @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. _SUNAdaptController.Soderlind:
+
+The SUNAdaptController_Soderlind Module
+=======================================
+
+The Soderlind implementation of the SUNAdaptController class,
+SUNAdaptController_Soderlind, implements a general structure for temporal
+control proposed by G. Soderlind in :cite:p:`Sod:98`, :cite:p:`Sod:03`,
+and :cite:p:`Sod:06`.  This controller has the form
+
+.. math::
+   h' = h_n \varepsilon_n^{-k_1/(p+1)} \varepsilon_{n-1}^{-k_2/(p+1)} \varepsilon_{n-2}^{-k_3/(p+1)} \left(\dfrac{h_n}{h_{n-1}}\right)^{k_4} \left(\dfrac{h_{n-1}}{h_{n-2}}\right)^{k_5}
+
+with default parameter values :math:`k_1 = 1.25`, :math:`k_2 = 0.5`,
+:math:`k_3 = -0.75`, :math:`k_4 = 0.25`, and :math:`k_5 = 0.75`, where
+:math:`p` is the global order of the time integration method.  In this estimate,
+a floor of :math:`\varepsilon_* > 10^{-10}` is enforced to avoid division-by-zero
+errors.  During the first two steps (when :math:`\varepsilon_{n-2}`,
+:math:`\varepsilon_{n-1}`, :math:`h_{n-2}`, and :math:`h_{n-2}` may be unavailable),
+the corresponding terms are merely omitted during estimation of :math:`h'`.
+
+The SUNAdaptController_Soderlind controller is implemented as a derived
+SUNAdaptController class, and defines its *content* field as:
+
+.. code-block:: c
+
+   struct _SUNAdaptControllerContent_Soderlind {
+     sunrealtype k1;
+     sunrealtype k2;
+     sunrealtype k3;
+     sunrealtype k4;
+     sunrealtype k5;
+     sunrealtype bias;
+     sunrealtype ep;
+     sunrealtype epp;
+     sunrealtype hp;
+     sunrealtype hpp;
+     int firststeps;
+   };
+
+These entries of the *content* field contain the following information:
+
+* ``k1, k2, k3, k4, k5`` - controller parameters above.
+
+* ``bias`` - error bias factor, that converts from an input temporal error
+  estimate via :math:`\varepsilon = \text{bias}*\text{dsm}`.
+
+* ``ep, epp`` - storage for the two previous error estimates,
+  :math:`\varepsilon_{n-1}` and :math:`\varepsilon_{n-2}`.
+
+* ``hp, hpp`` - storage for the previous two step sizes, :math:`h_{n-1}`
+  and :math:`h_{n-2}`.
+
+* ``firststeps`` - counter to handle first two steps (where previous
+  step sizes and errors are unavailable).
+
+The header file to be included when using this module is
+``sunadaptcontroller/sunadaptcontroller_soderlind.h``.
+
+We note that through appropriate selection of the parameters :math:`k_*`,
+this controller may create a wide range of proposed temporal adaptivity controllers,
+including the PID, PI, I, as well as Gustafsson's explicit and implicit controllers,
+:cite:p:`Gust:91` and :cite:p:`Gust:94`.  As a convenience, utility routines to
+create these controllers and set their parameters (as special cases of the
+SUNAdaptController_Soderlind) are provided.
+
+The SUNAdaptController_Soderlind class provides implementations of all operations
+relevant to a ``SUN_ADAPTCONTROLLER_H`` controller listed in
+:numref:`SUNAdaptController.Description.operations`. This class
+also provides the following additional user-callable routines:
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_Soderlind(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, and inserts its default parameters.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_Soderlind(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_Soderlind(SUNAdaptController C, sunrealtype k1, sunrealtype k2, sunrealtype k3, sunrealtype k4, sunrealtype k5)
+
+   This user-callable function provides control over the relevant parameters
+   above.  This should be called *before* the time integrator is called to evolve
+   the problem.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1: parameter used within the controller time step estimate.
+   :param k2: parameter used within the controller time step estimate.
+   :param k3: parameter used within the controller time step estimate.
+   :param k4: parameter used within the controller time step estimate.
+   :param k5: parameter used within the controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      /* Specify parameters for Soderlind's H_{0}312 controller */
+      retval = SUNAdaptController_SetParams_Soderlind(C, 0.25, 0.5, 0.25, -0.75, -0.25);
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_PID(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, set up to replicate a PID controller, and inserts its default parameters
+   :math:`k_1=0.58`, :math:`k_2=-0.21`, :math:`k_3=0.1`, and :math:`k_4=k_5=0`.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_PID(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_PID(SUNAdaptController C, sunrealtype k1, sunrealtype k2, sunrealtype k3)
+
+   This user-callable function provides control over the relevant parameters
+   above for a PID controller, setting :math:`k_4 = k_5 = 0`.  This should be
+   called *before* the time integrator is called to evolve the problem.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1: parameter used within the controller time step estimate.
+   :param k2: parameter used within the controller time step estimate.
+   :param k3: parameter used within the controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_PID(C, 0.58, -0.21, 0.1);
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_PI(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, set up to replicate a PI controller, and inserts its default parameters
+   :math:`k_1=0.8`, :math:`k_2=-0.31`, and :math:`k_3=k_4=k_5=0`.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_PI(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_PI(SUNAdaptController C, sunrealtype k1, sunrealtype k2)
+
+   This user-callable function provides control over the relevant parameters
+   above for a PI controller, setting :math:`k_3 = k_4 = k_5 = 0`.  This should
+   be called *before* the time integrator is called to evolve the problem.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1: parameter used within the controller time step estimate.
+   :param k2: parameter used within the controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_PI(C, 0.8, -0.31);
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_I(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, set up to replicate an I controller, and inserts its default parameters
+   :math:`k_1=1.0` and :math:`k_2=k_3=k_4=k_5=0`.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_I(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_I(SUNAdaptController C, sunrealtype k1)
+
+   This user-callable function provides control over the relevant parameters
+   above for an I controller, setting :math:`k_2 = k_3 = k_4 = k_5 = 0`.  This
+   should be called *before* the time integrator is called to evolve the problem.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1: parameter used within the controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_I(C, 1.0);
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_ExpGus(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, set up to replicate Gustafsson's explicit controller :cite:p:`Gust:91`, and
+   inserts its default parameters :math:`k_1=0.635`, :math:`k_2=-0.268`, and
+   :math:`k_3=k_4=k_5=0`.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_ExpGus(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_ExpGus(SUNAdaptController C, sunrealtype k1_hat, sunrealtype k2_hat)
+
+   This user-callable function provides control over the relevant parameters
+   above for the explicit Gustafsson controller, setting :math:`k_3 = k_4 = k_5 = 0`. 
+   This should be called *before* the time integrator is called to evolve the problem.
+
+   .. note::
+
+      Gustafsson's explicit controller has the form
+
+      .. math::
+         h' = h_n \varepsilon_n^{-\hat{k}_1/(p+1)} \left(\frac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{-\hat{k}_2/(p+1)}.
+
+      The inputs to this function correspond to the values of :math:`\hat{k}_1` and :math:`\hat{k}_2`,
+      which are internally transformed into the Soderlind coeficients :math:`k_1 = \hat{k}_1+\hat{k}_2`
+      and :math:`k_2 = -\hat{k}_2`.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1_hat: parameter used within the explicit Gustafsson controller time step estimate.
+   :param k2_hat: parameter used within the explicit Gustafsson controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_ExpGus(C, 0.367, 0.268);
+
+
+.. c:function:: SUNAdaptController SUNAdaptController_ImpGus(SUNContext sunctx)
+
+   This constructor creates and allocates memory for a SUNAdaptController_Soderlind
+   object, set up to replicate Gustafsson's implicit controller :cite:p:`Gust:94`, and
+   inserts its default parameters :math:`k_1=1.93`, :math:`k_2=-0.95`, :math:`k_4=1`, and
+   :math:`k_3=k_5=0`.
+
+   :param sunctx: the current :c:type:`SUNContext` object.
+   :return: if successful, a usable :c:type:`SUNAdaptController` object;
+            otherwise it will return ``NULL``.
+
+   Usage:
+
+   .. code-block:: c
+
+      SUNAdaptController C = SUNAdaptController_ImpGus(sunctx);
+
+.. c:function:: int SUNAdaptController_SetParams_ImpGus(SUNAdaptController C, sunrealtype k1_hat, sunrealtype k2_hat)
+
+   This user-callable function provides control over the relevant parameters
+   above for the implicit Gustafsson controller, setting :math:`k_3 = k_4 = k_5 = 0`.
+   This should be called *before* the time integrator is called to evolve the problem.
+
+   .. note::
+
+      Gustafsson's implicit controller has the form
+
+      .. math::
+         h' = h_n \varepsilon_n^{-\hat{k}_1/(p+1)} \left(\frac{\varepsilon_n}{\varepsilon_{n-1}}\right)^{-\hat{k}_2/(p+1)} \left(\frac{h_n}{h_{n-1}}\right).
+
+      The inputs to this function correspond to the values of :math:`\hat{k}_1` and :math:`\hat{k}_2`,
+      which are internally transformed into the Soderlind coeficients :math:`k_1 = \hat{k}_1+\hat{k}_2`,
+      :math:`k_2 = -\hat{k}_2`, and :math:`k_4=1`.
+
+   :param C: the SUNAdaptController_Soderlind object.
+   :param k1_hat: parameter used within the implicit Gustafsson controller time step estimate.
+   :param k2_hat: parameter used within the implicit Gustafsson controller time step estimate.
+   :return: error code indication success or failure (see :numref:`SUNAdaptController.Description.errorCodes`).
+
+   Usage:
+
+   .. code-block:: c
+
+      retval = SUNAdaptController_SetParams_ImpGus(C, 0.98, 0.95);
diff --git a/doc/superbuild/source/arkode/index.rst b/doc/superbuild/source/arkode/index.rst
index 5d09b7044c..972153c5a4 100644
--- a/doc/superbuild/source/arkode/index.rst
+++ b/doc/superbuild/source/arkode/index.rst
@@ -14,6 +14,8 @@
 ARKODE Documentation
 ********************
 
+.. include:: ../../../arkode/guide/source/Landing.rst
+
 **Table of Contents**:
 
 .. toctree::
diff --git a/doc/superbuild/source/index.rst b/doc/superbuild/source/index.rst
index 571e8f9c2d..a0a56ed96e 100644
--- a/doc/superbuild/source/index.rst
+++ b/doc/superbuild/source/index.rst
@@ -39,6 +39,7 @@ SUNDIALS is developed on `GitHub <https://github.com/LLNL/sundials>`_.
    sunmatrix/index.rst
    sunlinsol/index.rst
    sunnonlinsol/index.rst
+   sunadaptcontroller/index.rst
    sunmemory/index.rst
    Install_link.rst
    History_link.rst
diff --git a/doc/superbuild/source/sunadaptcontroller/SUNAdaptController_links.rst b/doc/superbuild/source/sunadaptcontroller/SUNAdaptController_links.rst
new file mode 100644
index 0000000000..ee94a630b1
--- /dev/null
+++ b/doc/superbuild/source/sunadaptcontroller/SUNAdaptController_links.rst
@@ -0,0 +1,15 @@
+.. ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. include:: ../../../shared/sunadaptcontroller/SUNAdaptController_Description.rst
+.. include:: ../../../shared/sunadaptcontroller/SUNAdaptController_Soderlind.rst
+.. include:: ../../../shared/sunadaptcontroller/SUNAdaptController_ImExGus.rst
diff --git a/doc/superbuild/source/sunadaptcontroller/index.rst b/doc/superbuild/source/sunadaptcontroller/index.rst
new file mode 100644
index 0000000000..6ba75858a6
--- /dev/null
+++ b/doc/superbuild/source/sunadaptcontroller/index.rst
@@ -0,0 +1,31 @@
+..
+   Daniel R. Reynolds @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. _SUNAdaptController:
+
+#####################################
+Time Step Adaptivity Controllers
+#####################################
+
+The SUNDIALS library comes packaged with a variety of :c:type:`SUNAdaptController`
+implementations, designed to support various forms of error-based time step
+adaptivity within SUNDIALS time integrators.  To support applications that may
+want to adjust the controller parameters or provide their own implementations,
+SUNDIALS defines the :c:type:`SUNAdaptController` base class, along with a
+variety of default implementations.
+
+.. toctree::
+   :maxdepth: 1
+
+   SUNAdaptController_links.rst
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
index 1a5c98eeab..ad98ede688 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
@@ -67,7 +67,7 @@
 // Include MPI
 #include "mpi.h"
 
-// Include desired integrators, vectors, linear solvers, and nonlinear sovlers
+// Include desired integrators, vectors, linear solvers, and nonlinear solvers
 #include "arkode/arkode_arkstep.h"
 #include "arkode/arkode_mristep.h"
 #include "cvode/cvode.h"
@@ -393,10 +393,11 @@ static int SetupDecomp(UserData *udata);
 
 // Integrator setup functions
 static int SetupARK(SUNContext ctx, UserData *udata, N_Vector u,
-                    SUNLinearSolver LS, void **arkode_mem);
+                    SUNLinearSolver LS, SUNAdaptController *Ctrl,
+                    void **arkode_mem);
 static int SetupMRI(SUNContext ctx, UserData *udata, N_Vector u,
-                    SUNLinearSolver LS, void **arkode_mem,
-                    MRIStepInnerStepper *stepper);
+                    SUNLinearSolver LS, SUNAdaptController *Ctrl,
+                    void **arkode_mem, MRIStepInnerStepper *stepper);
 static int SetupMRICVODE(SUNContext ctx, UserData *udata, N_Vector u,
                          SUNLinearSolver LS, SUNNonlinearSolver *NLS,
                          void **arkode_mem, MRIStepInnerStepper *stepper);
@@ -588,15 +589,18 @@ int main(int argc, char* argv[])
   // Inner stepper nonlinear solver (CVODE)
   SUNNonlinearSolver NLS = NULL;
 
+  // Timestep adaptivity controller
+  SUNAdaptController Ctrl = NULL;
+
   // Create integrator
   switch(udata.integrator)
   {
   case(0):
-    flag = SetupARK(ctx, &udata, u, LS, &arkode_mem);
+    flag = SetupARK(ctx, &udata, u, LS, &Ctrl, &arkode_mem);
     if (check_flag((void *) arkode_mem, "SetupARK", 0)) return 1;
     break;
   case(1):
-    flag = SetupMRI(ctx, &udata, u, LS, &arkode_mem, &stepper);
+    flag = SetupMRI(ctx, &udata, u, LS, &Ctrl, &arkode_mem, &stepper);
     if (check_flag((void *) arkode_mem, "SetupMRI", 0)) return 1;
     break;
   case(2):
@@ -746,6 +750,7 @@ int main(int argc, char* argv[])
   N_VDestroy(N_VGetLocalVector_MPIPlusX(u));
   N_VDestroy(u);
   FreeUserData(&udata);
+  (void) SUNAdaptController_Destroy(Ctrl);
   SUNContext_Free(&ctx);
   flag = MPI_Finalize();
   return 0;
@@ -955,7 +960,8 @@ static int SetupDecomp(UserData *udata)
 
 
 static int SetupARK(SUNContext ctx, UserData* udata, N_Vector u,
-                    SUNLinearSolver LS, void** arkode_mem)
+                    SUNLinearSolver LS, SUNAdaptController *Ctrl,
+                    void** arkode_mem)
 {
   int flag;
 
@@ -1016,9 +1022,16 @@ static int SetupARK(SUNContext ctx, UserData* udata, N_Vector u,
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(*arkode_mem, udata->controller, SUNTRUE,
-                                      SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      *Ctrl = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       *Ctrl = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        *Ctrl = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  *Ctrl = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  *Ctrl = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): *Ctrl = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(*arkode_mem, *Ctrl);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Set max steps between outputs
@@ -1041,8 +1054,8 @@ static int SetupARK(SUNContext ctx, UserData* udata, N_Vector u,
 
 
 static int SetupMRI(SUNContext ctx, UserData* udata, N_Vector y,
-                    SUNLinearSolver LS, void** arkode_mem,
-                    MRIStepInnerStepper* stepper)
+                    SUNLinearSolver LS, SUNAdaptController *Ctrl,
+                    void** arkode_mem, MRIStepInnerStepper* stepper)
 {
   int flag;
 
@@ -1075,9 +1088,16 @@ static int SetupMRI(SUNContext ctx, UserData* udata, N_Vector y,
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(inner_arkode_mem, udata->controller,
-                                      SUNTRUE, SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      *Ctrl = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       *Ctrl = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        *Ctrl = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  *Ctrl = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  *Ctrl = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): *Ctrl = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(inner_arkode_mem, *Ctrl);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Set max steps between outputs
diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
index 485c1115ff..0e096b71b9 100644
--- a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
@@ -279,6 +279,7 @@ int main(int argc, char* argv[])
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
   FILE *diagfp       = NULL;  // diagnostics output file
+  SUNAdaptController C = NULL;  // timestep adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -463,9 +464,16 @@ int main(int argc, char* argv[])
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, udata->controller, SUNTRUE,
-                                      SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Specify linearly implicit non-time-dependent RHS
@@ -579,6 +587,7 @@ int main(int argc, char* argv[])
   N_VDestroy(u);             // Free vectors
   FreeUserData(udata);       // Free user data
   delete udata;
+  (void) SUNAdaptController_Destroy(C);  // Free timestep adaptivity controller
   SUNContext_Free(&ctx);     // Free context
   flag = MPI_Finalize();     // Finalize MPI
   return 0;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
index f4b27d9bf8..b38e7ded64 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
@@ -363,6 +363,7 @@ int main(int argc, char* argv[])
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
   FILE *diagfp       = NULL;  // diagnostics output file
+  SUNAdaptController C = NULL;  // timestep adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -513,9 +514,16 @@ int main(int argc, char* argv[])
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, udata->controller, SUNTRUE,
-                                      SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Specify linearly implicit non-time-dependent RHS
@@ -630,6 +638,7 @@ int main(int argc, char* argv[])
   N_VDestroy(u);             // Free vectors
   FreeUserData(udata);       // Free user data
   delete udata;
+  (void) SUNAdaptController_Destroy(C);  // Free time adaptivity controller
   SUNContext_Free(&ctx);     // Free context
   flag = MPI_Finalize();     // Finalize MPI
   return 0;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
index b9468dfc3f..29c9a4d0ee 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
@@ -322,6 +322,7 @@ int main(int argc, char* argv[])
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
   FILE *diagfp       = NULL;  // diagnostics output file
+  SUNAdaptController C = NULL;  // timestep adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -516,9 +517,16 @@ int main(int argc, char* argv[])
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, udata->controller, SUNTRUE,
-                                      SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Specify linearly implicit non-time-dependent RHS
@@ -632,6 +640,7 @@ int main(int argc, char* argv[])
   N_VDestroy(u);             // Free vectors
   FreeUserData(udata);       // Free user data
   delete udata;
+  (void) SUNAdaptController_Destroy(C);  // Free timestep adaptivity controller
   SUNContext_Free(&ctx);     // Free context
   flag = MPI_Finalize();     // Finalize MPI
   return 0;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
index ecbd9b44c1..b550f9e607 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
@@ -318,6 +318,7 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;     // vector for storing solution
   SUNLinearSolver LS = NULL;     // linear solver memory structure
   void *arkode_mem   = NULL;     // ARKode memory structure
+  SUNAdaptController C = NULL;   // Time adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -444,9 +445,16 @@ int main(int argc, char* argv[])
     }
     else
     {
-      flag = ARKStepSetAdaptivityMethod(arkode_mem, udata.controller, SUNTRUE,
-                                        SUNFALSE, NULL);
-      if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+      switch (udata.controller) {
+      case (ARK_ADAPT_PID):      C = SUNAdaptController_PID(sunctx);     break;
+      case (ARK_ADAPT_PI):       C = SUNAdaptController_PI(sunctx);      break;
+      case (ARK_ADAPT_I):        C = SUNAdaptController_I(sunctx);       break;
+      case (ARK_ADAPT_EXP_GUS):  C = SUNAdaptController_ExpGus(sunctx);  break;
+      case (ARK_ADAPT_IMP_GUS):  C = SUNAdaptController_ImpGus(sunctx);  break;
+      case (ARK_ADAPT_IMEX_GUS): C = SUNAdaptController_ImExGus(sunctx); break;
+      }
+      flag = ARKStepSetAdaptController(arkode_mem, C);
+      if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
     }
 
     // Specify linearly implicit non-time-dependent RHS
@@ -538,6 +546,7 @@ int main(int argc, char* argv[])
     SUNLinSolFree(LS);              // Free linear solver
     N_VDestroy(u);                  // Free vectors
     FreeUserData(&udata);           // Free user data
+    (void) SUNAdaptController_Destroy(C);  // Free time adaptivity controller
   }
 
   // Finalize MPI
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
index 8b1d75c513..7445479282 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
@@ -325,6 +325,7 @@ int main(int argc, char* argv[])
   void *inner_arkode_mem = NULL;            // ARKode memory structure
   MRIStepInnerStepper inner_stepper = NULL; // inner stepper
   MRIStepCoupling C = NULL;                 // slow coupling coefficients
+  SUNAdaptController Ctrl = NULL;           // timestep adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -439,9 +440,16 @@ int main(int argc, char* argv[])
     }
     else
     {
-      flag = ARKStepSetAdaptivityMethod(inner_arkode_mem, udata.controller, SUNTRUE,
-                                        SUNFALSE, NULL);
-      if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+      switch (udata.controller) {
+      case (ARK_ADAPT_PID):      Ctrl = SUNAdaptController_PID(sunctx);     break;
+      case (ARK_ADAPT_PI):       Ctrl = SUNAdaptController_PI(sunctx);      break;
+      case (ARK_ADAPT_I):        Ctrl = SUNAdaptController_I(sunctx);       break;
+      case (ARK_ADAPT_EXP_GUS):  Ctrl = SUNAdaptController_ExpGus(sunctx);  break;
+      case (ARK_ADAPT_IMP_GUS):  Ctrl = SUNAdaptController_ImpGus(sunctx);  break;
+      case (ARK_ADAPT_IMEX_GUS): Ctrl = SUNAdaptController_ImExGus(sunctx); break;
+      }
+      flag = ARKStepSetAdaptController(inner_arkode_mem, Ctrl);
+      if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
     }
 
     // Attach user data
@@ -606,6 +614,7 @@ int main(int argc, char* argv[])
     SUNLinSolFree(LSf);                        // Free linear solver
     N_VDestroy(u);                             // Free vectors
     FreeUserData(&udata);                      // Free user data
+    (void) SUNAdaptController_Destroy(Ctrl);   // Free timestep adaptivity controller
   }
 
   // Finalize MPI
diff --git a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
index dfb312466b..cde3f49b41 100644
--- a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
+++ b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
@@ -185,6 +185,9 @@ int main(int argc, char* argv[])
   SUNMatrix       A  = nullptr;
   SUNLinearSolver LS = nullptr;
 
+  // Adaptivity controller for DIRK, IMEX or MRI fast integrators
+  SUNAdaptController C = nullptr;
+
   // Matrix and linear solver for MRI fast integrator
   SUNMatrix       A_fast  = nullptr;
   SUNLinearSolver LS_fast = nullptr;
@@ -196,13 +199,13 @@ int main(int argc, char* argv[])
   switch(uopts.integrator)
   {
   case(0):
-    flag = SetupERK(ctx, udata, uopts, y, &arkode_mem);
+    flag = SetupERK(ctx, udata, uopts, y, &C, &arkode_mem);
     break;
   case(1):
-    flag = SetupARK(ctx, udata, uopts, y, &A, &LS, &arkode_mem);
+    flag = SetupARK(ctx, udata, uopts, y, &A, &LS, &C, &arkode_mem);
     break;
   case(2):
-    flag = SetupMRIARK(ctx, udata, uopts, y, &A, &LS, &A_fast, &LS_fast,
+    flag = SetupMRIARK(ctx, udata, uopts, y, &A, &LS, &A_fast, &LS_fast, &C,
                        &fast_mem, &arkode_mem);
     break;
   case(3):
@@ -365,6 +368,7 @@ int main(int argc, char* argv[])
   SUNLinSolFree(LS);
   SUNMatDestroy(A_fast);
   SUNLinSolFree(LS_fast);
+  (void) SUNAdaptController_Destroy(C);
 
   return 0;
 }
@@ -376,7 +380,7 @@ int main(int argc, char* argv[])
 
 
 int SetupERK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
-             void** arkode_mem)
+             SUNAdaptController* C, void** arkode_mem)
 {
   // Problem configuration
   ARKRhsFn f_RHS; // explicit RHS function
@@ -426,9 +430,16 @@ int SetupERK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
   }
   else if (uopts.controller >= 0)
   {
-    flag = ERKStepSetAdaptivityMethod(*arkode_mem, uopts.controller, SUNTRUE,
-                                      SUNFALSE, nullptr);
-    if (check_flag(flag, "ERKStepSetAdaptivityMethod")) return 1;
+    switch (uopts.controller) {
+    case (ARK_ADAPT_PID):      *C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       *C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        *C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  *C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  *C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): *C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ERKStepSetAdaptController(*arkode_mem, *C);
+    if (check_flag(flag, "ERKStepSetAdaptController")) return 1;
   }
 
   // Set max steps between outputs
@@ -444,7 +455,7 @@ int SetupERK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
 
 
 int SetupARK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
-             SUNMatrix* A, SUNLinearSolver* LS, void** arkode_mem)
+             SUNMatrix* A, SUNLinearSolver* LS, SUNAdaptController* C, void** arkode_mem)
 {
   // Problem configuration
   ARKRhsFn   fe_RHS;  // explicit RHS function
@@ -673,9 +684,16 @@ int SetupARK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
   }
   else if (uopts.controller >= 0)
   {
-    flag = ARKStepSetAdaptivityMethod(*arkode_mem, uopts.controller, SUNTRUE,
-                                      SUNFALSE, nullptr);
-    if (check_flag(flag, "ARKStepSetAdaptivityMethod")) return 1;
+    switch (uopts.controller) {
+    case (ARK_ADAPT_PID):      *C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       *C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        *C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  *C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  *C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): *C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(*arkode_mem, *C);
+    if (check_flag(flag, "ARKStepSetAdaptController")) return 1;
   }
 
   // Set max steps between outputs
@@ -693,7 +711,8 @@ int SetupARK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
 int SetupMRIARK(SUNContext ctx, UserData &udata, UserOptions &uopts,
                 N_Vector y, SUNMatrix* A, SUNLinearSolver* LS,
                 SUNMatrix* A_fast, SUNLinearSolver* LS_fast,
-                MRIStepInnerStepper* fast_mem, void** arkode_mem)
+                SUNAdaptController* C, MRIStepInnerStepper* fast_mem,
+                void** arkode_mem)
 {
   // Problem configuration
   ARKRhsFn   fse_RHS;  // slow explicit RHS function
@@ -805,9 +824,16 @@ int SetupMRIARK(SUNContext ctx, UserData &udata, UserOptions &uopts,
   }
   else if (uopts.controller_fast >= 0)
   {
-    flag = ARKStepSetAdaptivityMethod(fast_arkode_mem, uopts.controller_fast,
-                                      SUNTRUE, SUNFALSE, nullptr);
-    if (check_flag(flag, "ARKStepSetAdaptivityMethod")) return 1;
+    switch (uopts.controller_fast) {
+    case (ARK_ADAPT_PID):      *C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       *C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        *C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  *C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  *C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): *C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(fast_arkode_mem, *C);
+    if (check_flag(flag, "ARKStepSetAdaptController")) return 1;
   }
 
   // Set max steps between outputs
diff --git a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
index f4c2a56146..f72f53b066 100644
--- a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
+++ b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
@@ -248,14 +248,14 @@ int J_adv_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 // Integrator setup functions
 int SetupERK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
-             void** arkode_mem);
+             SUNAdaptController* C, void** arkode_mem);
 
 int SetupARK(SUNContext ctx, UserData &udata, UserOptions &uopts, N_Vector y,
-             SUNMatrix* A, SUNLinearSolver* LS, void** arkode_mem);
+             SUNMatrix* A, SUNLinearSolver* LS, SUNAdaptController* C, void** arkode_mem);
 
 int SetupMRIARK(SUNContext ctx, UserData &udata, UserOptions &uopts,
                 N_Vector y, SUNMatrix* A, SUNLinearSolver* LS,
-                SUNMatrix* A_fast, SUNLinearSolver* LS_fast,
+                SUNMatrix* A_fast, SUNLinearSolver* LS_fast, SUNAdaptController* C_fast,
                 MRIStepInnerStepper* fast_mem, void** arkode_mem);
 
 int SetupMRICVODE(SUNContext ctx, UserData &udata, UserOptions &uopts,
diff --git a/examples/arkode/CXX_serial/ark_heat2D.cpp b/examples/arkode/CXX_serial/ark_heat2D.cpp
index ae654ff5d0..60c5748b82 100644
--- a/examples/arkode/CXX_serial/ark_heat2D.cpp
+++ b/examples/arkode/CXX_serial/ark_heat2D.cpp
@@ -207,6 +207,7 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;  // vector for storing solution
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
+  SUNAdaptController C = NULL;  // Adaptivity controller
   FILE *diagfp       = NULL;  // diagnostics output file
 
   // Timing variables
@@ -371,9 +372,16 @@ int main(int argc, char* argv[])
   }
   else
   {
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, udata->controller, SUNTRUE,
-                                      SUNFALSE, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    switch (udata->controller) {
+    case (ARK_ADAPT_PID):      C = SUNAdaptController_PID(ctx);     break;
+    case (ARK_ADAPT_PI):       C = SUNAdaptController_PI(ctx);      break;
+    case (ARK_ADAPT_I):        C = SUNAdaptController_I(ctx);       break;
+    case (ARK_ADAPT_EXP_GUS):  C = SUNAdaptController_ExpGus(ctx);  break;
+    case (ARK_ADAPT_IMP_GUS):  C = SUNAdaptController_ImpGus(ctx);  break;
+    case (ARK_ADAPT_IMEX_GUS): C = SUNAdaptController_ImExGus(ctx); break;
+    }
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
   }
 
   // Specify linearly implicit non-time-dependent RHS
@@ -484,6 +492,7 @@ int main(int argc, char* argv[])
   N_VDestroy(u);             // Free vectors
   FreeUserData(udata);       // Free user data
   delete udata;
+  (void) SUNAdaptController_Destroy(C); // Free time adaptivity controller
   SUNContext_Free(&ctx);     // Free context
 
   return 0;
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
index 9aae281556..f20e4c97e0 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
@@ -358,6 +358,7 @@ int main(int argc, char* argv[])
   FILE *diagfp       = NULL;  // diagnostics output file
   braid_Core core    = NULL;  // XBraid memory structure
   braid_App app      = NULL;  // ARKode + XBraid interface structure
+  SUNAdaptController    C = NULL;  // time step adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -559,9 +560,11 @@ int main(int argc, char* argv[])
   // Set adaptive stepping (XBraid with temporal refinement) options
   if (udata->x_refine)
   {
-    // Use I controller
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, ARK_ADAPT_I, 1, 0, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    // Use I controller with default parameters
+    C = SUNAdaptController_I(ctx);
+    if (check_flag((void*) C, "SUNAdaptController_I", 0)) return 1;
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
 
     // Set the step size reduction factor limit (1 / refinement factor limit)
     flag = ARKStepSetMinReduction(arkode_mem, ONE / udata->x_rfactor_limit);
@@ -741,15 +744,16 @@ int main(int argc, char* argv[])
 
   if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0) fclose(diagfp);
 
-  ARKStepFree(&arkode_mem);  // Free integrator memory
-  SUNLinSolFree(LS);         // Free linear solver
-  N_VDestroy(u);             // Free vectors
-  FreeUserData(udata);       // Free user data
+  ARKStepFree(&arkode_mem);              // Free integrator memory
+  SUNLinSolFree(LS);                     // Free linear solver
+  N_VDestroy(u);                         // Free vectors
+  FreeUserData(udata);                   // Free user data
   delete udata;
-  braid_Destroy(core);       // Free braid memory
-  ARKBraid_Free(&app);       // Free interface memory
-  SUNContext_Free(&ctx);     // Free context
-  flag = MPI_Finalize();     // Finalize MPI
+  braid_Destroy(core);                   // Free braid memory
+  ARKBraid_Free(&app);                   // Free interface memory
+  (void) SUNAdaptController_Destroy(C);  // Free time adaptivity controller
+  SUNContext_Free(&ctx);                 // Free context
+  flag = MPI_Finalize();                 // Finalize MPI
 
   return 0;
 }
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
index 938562ce40..a9d90df9bd 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
@@ -315,6 +315,7 @@ int main(int argc, char* argv[])
   FILE *diagfp       = NULL;  // diagnostics output file
   braid_Core core    = NULL;  // XBraid memory structure
   braid_App app      = NULL;  // ARKode + XBraid interface structure
+  SUNAdaptController    C = NULL;  // time step adaptivity controller
 
   // Timing variables
   double t1 = 0.0;
@@ -506,9 +507,11 @@ int main(int argc, char* argv[])
   // Set adaptive stepping (XBraid with temporal refinement) options
   if (udata->x_refine)
   {
-    // Use I controller
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, ARK_ADAPT_I, 1, 0, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    // Use I controller with default parameters
+    C = SUNAdaptController_I(ctx);
+    if (check_flag((void*) C, "SUNAdaptController_I", 0)) return 1;
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
 
     // Set the step size reduction factor limit (1 / refinement factor limit)
     flag = ARKStepSetMinReduction(arkode_mem, ONE / udata->x_rfactor_limit);
@@ -688,15 +691,16 @@ int main(int argc, char* argv[])
 
   if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0) fclose(diagfp);
 
-  ARKStepFree(&arkode_mem);  // Free integrator memory
-  SUNLinSolFree(LS);         // Free linear solver
-  N_VDestroy(u);             // Free vectors
-  FreeUserData(udata);       // Free user data
+  ARKStepFree(&arkode_mem);              // Free integrator memory
+  SUNLinSolFree(LS);                     // Free linear solver
+  N_VDestroy(u);                         // Free vectors
+  FreeUserData(udata);                   // Free user data
   delete udata;
-  braid_Destroy(core);       // Free braid memory
-  ARKBraid_Free(&app);       // Free interface memory
-  SUNContext_Free(&ctx);     // Free context
-  flag = MPI_Finalize();     // Finalize MPI
+  braid_Destroy(core);                   // Free braid memory
+  ARKBraid_Free(&app);                   // Free interface memory
+  (void) SUNAdaptController_Destroy(C);  // Free time adaptivity controller
+  SUNContext_Free(&ctx);                 // Free context
+  flag = MPI_Finalize();                 // Finalize MPI
 
   return 0;
 }
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
index 5e4a0b9104..1b146d8a80 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
@@ -239,14 +239,15 @@ static int check_flag(void *flagvalue, const string funcname, int opt);
 
 int main(int argc, char* argv[])
 {
-  int flag;                   // reusable error-checking flag
-  UserData *udata    = NULL;  // user data structure
-  N_Vector u         = NULL;  // vector for storing solution
-  SUNLinearSolver LS = NULL;  // linear solver memory structure
-  void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
-  braid_Core core    = NULL;  // XBraid memory structure
-  braid_App app      = NULL;  // ARKode + XBraid interface structure
+  int flag;                     // reusable error-checking flag
+  UserData *udata      = NULL;  // user data structure
+  N_Vector u           = NULL;  // vector for storing solution
+  SUNLinearSolver LS   = NULL;  // linear solver memory structure
+  void *arkode_mem     = NULL;  // ARKODE memory structure
+  FILE *diagfp         = NULL;  // diagnostics output file
+  braid_Core core      = NULL;  // XBraid memory structure
+  braid_App app        = NULL;  // ARKode + XBraid interface structure
+  SUNAdaptController C = NULL;  // time adaptivity controller
 
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -444,9 +445,11 @@ int main(int argc, char* argv[])
   // Set adaptive stepping (XBraid with temporal refinement) options
   if (udata->x_refine)
   {
-    // Use I controller
-    flag = ARKStepSetAdaptivityMethod(arkode_mem, ARK_ADAPT_I, 1, 0, NULL);
-    if (check_flag(&flag, "ARKStepSetAdaptivityMethod", 1)) return 1;
+    // Use I controller with default parameters
+    C = SUNAdaptController_I(ctx);
+    if (check_flag((void*) C, "SUNAdaptController_I", 0)) return 1;
+    flag = ARKStepSetAdaptController(arkode_mem, C);
+    if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
 
     // Set the step size reduction factor limit (1 / refinement factor limit)
     flag = ARKStepSetMinReduction(arkode_mem, ONE / udata->x_rfactor_limit);
@@ -626,15 +629,16 @@ int main(int argc, char* argv[])
 
   if (udata->diagnostics || udata->lsinfo) fclose(diagfp);
 
-  ARKStepFree(&arkode_mem);  // Free integrator memory
-  SUNLinSolFree(LS);         // Free linear solver
-  N_VDestroy(u);             // Free vectors
-  FreeUserData(udata);       // Free user data
+  ARKStepFree(&arkode_mem);              // Free integrator memory
+  SUNLinSolFree(LS);                     // Free linear solver
+  N_VDestroy(u);                         // Free vectors
+  FreeUserData(udata);                   // Free user data
   delete udata;
-  braid_Destroy(core);       // Free braid memory
-  ARKBraid_Free(&app);       // Free interface memory
-  SUNContext_Free(&ctx);     // Free context
-  flag = MPI_Finalize();     // Finalize MPI
+  braid_Destroy(core);                   // Free braid memory
+  ARKBraid_Free(&app);                   // Free interface memory
+  (void) SUNAdaptController_Destroy(C);  // Free time adaptivity controller
+  SUNContext_Free(&ctx);                 // Free context
+  flag = MPI_Finalize();                 // Finalize MPI
 
   return 0;
 }
diff --git a/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c b/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
index 82b50d1a4d..bdadafc89b 100644
--- a/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
+++ b/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
@@ -121,6 +121,7 @@ int main() {
   N_Vector yt = NULL;          /* empty vector for swapping */
   SUNLinearSolver LS = NULL;   /* empty linear solver object */
   void *arkode_mem = NULL;     /* empty ARKode memory structure */
+  SUNAdaptController C = NULL; /* empty controller object */
   FILE *XFID, *UFID;
   realtype t, olddt, newdt;
   realtype *xnew_host = NULL;
@@ -189,6 +190,12 @@ int main() {
   flag = ARKStepSetPredictorMethod(arkode_mem, 0);     /* Set predictor method */
   if (check_flag(&flag, "ARKStepSetPredictorMethod", 1)) return 1;
 
+  /* Specify I-controller with default parameters */
+  C = SUNAdaptController_I(ctx);
+  if (check_flag((void *)C, "SUNAdaptController_I", 0)) return 1;
+  flag = ARKStepSetAdaptController(arkode_mem, C);
+  if (check_flag(&flag, "ARKStepSetAdaptController", 1)) return 1;
+
   /* Specify linearly implicit RHS, with time-dependent Jacobian */
   flag = ARKStepSetLinear(arkode_mem, 1);
   if (check_flag(&flag, "ARKStepSetLinear", 1)) return 1;
@@ -315,6 +322,7 @@ int main() {
   free(udata);
   ARKStepFree(&arkode_mem);    /* Free integrator memory */
   SUNLinSolFree(LS);           /* Free linear solver */
+  (void) SUNAdaptController_Destroy(C);  /* Free time adaptivity controller */
   SUNContext_Free(&ctx);       /* Free context */
 
   return 0;
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
index 280069d4a3..df7478fcae 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out
@@ -58,7 +58,7 @@ At top right:    c1, c2 =   -2.537e-27    4.163e+11
 
 Final Statistics: 
 
-lenrw   =  3901     leniw   =   267
+lenrw   =  3902     leniw   =   267
 lenrwls =  2455     leniwls =   126
 nst     =  7252     nfe     =     0
 nfe     = 76929     nfels   = 102816
@@ -127,7 +127,7 @@ At top right:    c1, c2 =   -5.134e-07    4.163e+11
 
 Final Statistics: 
 
-lenrw   =  3901     leniw   =   272
+lenrw   =  3902     leniw   =   272
 lenrwls =  2455     leniwls =   126
 nst     =  7427     nfe     =     0
 nfe     = 78794     nfels   = 111450
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_p.out
index 3e509d403e..a2db3d9006 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_p.out
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.out
@@ -10,8 +10,8 @@ At bottom left:  c1, c2 =    6.659e+06    2.582e+11
 At top right:    c1, c2 =    7.301e+06    2.833e+11 
 
 t = 2.16e+04   no. steps = 3533   stepsize = 1.04e+01
-At bottom left:  c1, c2 =    2.665e+07    2.993e+11 
-At top right:    c1, c2 =    2.931e+07    3.313e+11 
+At bottom left:  c1, c2 =    2.665e+07    2.993e+11
+At top right:    c1, c2 =    2.931e+07    3.313e+11
 
 t = 2.88e+04   no. steps = 4695   stepsize = 3.50e+00
 At bottom left:  c1, c2 =    8.702e+06    3.380e+11 
@@ -50,9 +50,9 @@ At bottom left:  c1, c2 =   -2.334e-27    3.352e+11
 At top right:    c1, c2 =   -8.983e-26    4.163e+11 
 
 
-Final Statistics: 
+Final Statistics:
 
-lenrw   =  3301     leniw   =   243
+lenrw   =  3302     leniw   =   243
 lenrwls =  2455     leniwls =   126
 nst     =  7447     nfe     =     0
 nfi     = 79041     nfels   = 108536
diff --git a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
index 2d806c7252..ffb0e71104 100644
--- a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
+++ b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out
@@ -2,8 +2,8 @@
 2-species diurnal advection-diffusion problem
 
 t = 7.20e+03   no. steps = 979   stepsize = 3.07e+00
-At bottom left:  c1, c2 =    1.047e+04    2.527e+11 
-At top right:    c1, c2 =    1.119e+04    2.700e+11 
+At bottom left:  c1, c2 =    1.047e+04    2.527e+11
+At top right:    c1, c2 =    1.119e+04    2.700e+11
 
 t = 1.44e+04   no. steps = 2733   stepsize = 6.93e+00
 At bottom left:  c1, c2 =    6.659e+06    2.582e+11 
@@ -50,9 +50,9 @@ At bottom left:  c1, c2 =   -5.225e-26    3.352e+11
 At top right:    c1, c2 =   -5.452e-25    4.163e+11 
 
 
-Final Statistics: 
+Final Statistics:
 
-lenrw   =  3301     leniw   =   243
+lenrw   =  3302     leniw   =   243
 lenrwls =  2455     leniwls =   126
 nst     =  7102     nfe     =     0
 nfi     = 74579     nfels   = 87090
@@ -60,4 +60,3 @@ nni     = 38921     nli     = 87090
 nsetups =   429     netf    =    29
 npe     =   119     nps     = 123765
 ncfn    =     0     ncfl    =     0
-
diff --git a/examples/arkode/C_petsc/ark_petsc_ex25.c b/examples/arkode/C_petsc/ark_petsc_ex25.c
index 9c144a9782..2d88255774 100644
--- a/examples/arkode/C_petsc/ark_petsc_ex25.c
+++ b/examples/arkode/C_petsc/ark_petsc_ex25.c
@@ -74,6 +74,7 @@ int main(int argc, char **argv)
   N_Vector           nvecx;      /* SUNDIALS N_Vector wrapper of X */
   SUNNonlinearSolver NLS;        /* SUNDIALS nonlinear solver */
   SUNContext         ctx;        /* SUNDIALS context */
+  SUNAdaptController C;          /* SUNDIALS controller object */
 
   /* PETSc data structures */
   SNES              snes;       /* nonlinear solver */
@@ -205,8 +206,10 @@ int main(int argc, char **argv)
   ierr = ARKStepSetNonlinearSolver(arkode_mem,NLS);
   if (check_retval(&ierr,"ARKStepSetNonlinearSolver",1)) return 1;
 
-  ierr = ARKStepSetAdaptivityMethod(arkode_mem,2,1,0,NULL);
-  if (check_retval(&ierr,"ARKStepSetAdaptivity",1)) return 1;
+  C = SUNAdaptController_I(ctx);
+  if (check_retval((void *)C, "SUNAdaptController_I", 0)) return 1;
+  ierr = ARKStepSetAdaptController(arkode_mem, C);
+  if (check_retval(&ierr, "ARKStepSetAdaptController", 1)) return 1;
 
   ierr = ARKStepSetInitStep(arkode_mem,dt);
   if (check_retval(&ierr,"ARKStepSetInitStep",1)) return 1;
@@ -251,6 +254,7 @@ int main(int argc, char **argv)
   N_VDestroy(nvecx);           /* Free x nvector         */
   SUNNonlinSolFree(NLS);       /* Free nonlinear solver  */
   ARKStepFree(&arkode_mem);    /* Free integrator memory */
+  (void) SUNAdaptController_Destroy(C); /* Free time adaptivity controller */
 
   /* Free petsc data structures */
   ierr = MatDestroy(&J);CHKERRQ(ierr);
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec.out b/examples/arkode/C_serial/ark_KrylovDemo_prec.out
index a3f589f739..79d7c4a86f 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec.out
@@ -418,7 +418,7 @@ Species 6
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -487,7 +487,7 @@ t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -556,7 +556,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -625,7 +625,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
index a3f589f739..79d7c4a86f 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out
@@ -418,7 +418,7 @@ Species 6
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -487,7 +487,7 @@ t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -556,7 +556,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -625,7 +625,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
index a3f589f739..79d7c4a86f 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out
@@ -418,7 +418,7 @@ Species 6
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  131 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -487,7 +487,7 @@ t =   1.00e+01  nst = 190  nfe = 0  nfi = 3030  nni = 2072  hu =    1.57e+00
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  136 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -556,7 +556,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  141 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
@@ -625,7 +625,7 @@ t =   1.00e+01  nst = 349  nfe = 0  nfi = 5589  nni = 3826  hu =    2.80e-01
 
  Final statistics for this run:
 
- ARKStep real workspace length         = 3557 
+ ARKStep real workspace length         = 3558 
  ARKStep integer workspace length      =  146 
  ARKLS real workspace length           = 2647 
  ARKLS integer workspace length        =   42 
diff --git a/examples/arkode/F2003_serial/ark_analytic_f2003.f90 b/examples/arkode/F2003_serial/ark_analytic_f2003.f90
index d8603bb118..1477c35d14 100644
--- a/examples/arkode/F2003_serial/ark_analytic_f2003.f90
+++ b/examples/arkode/F2003_serial/ark_analytic_f2003.f90
@@ -101,6 +101,8 @@ program main
   use fsunmatrix_dense_mod       ! Fortran interface to dense SUNMatrix
   use fsunlinsol_dense_mod       ! Fortran interface to dense SUNLinearSolver
   use fsundials_context_mod      ! Fortran interface to SUNContext
+  use fsundials_adaptcontroller_mod  ! Fortran interface to the generic SUNAdaptController
+  use fsunadaptcontroller_soderlind_mod ! Fortran interface to Soderlind controller
   use ode_mod                    ! ODE functions
 
   !======= Declarations =========
@@ -114,17 +116,16 @@ program main
   real(c_double) :: dtout                    ! output time interval
   real(c_double) :: tout                     ! output time
   real(c_double) :: tcur(1)                  ! current time
-  integer(c_int) :: imethod, idefault, pq    ! time step adaptivity parameters
-  real(c_double) :: adapt_params(3)          ! time step adaptivity parameters
   integer(c_int) :: ierr                     ! error flag from C functions
   integer(c_int) :: nout                     ! number of outputs
   integer(c_int) :: outstep                  ! output loop counter
 
-  type(N_Vector),        pointer :: sunvec_y    ! sundials vector
-  type(SUNMatrix),       pointer :: sunmat_A    ! sundials matrix
-  type(SUNLinearSolver), pointer :: sunls       ! sundials linear solver
-  type(c_ptr)                    :: arkode_mem  ! ARKODE memory
-  real(c_double),        pointer :: yvec(:)     ! underlying vector
+  type(N_Vector),           pointer :: sunvec_y    ! sundials vector
+  type(SUNMatrix),          pointer :: sunmat_A    ! sundials matrix
+  type(SUNLinearSolver),    pointer :: sunls       ! sundials linear solver
+  type(SUNAdaptController), pointer :: sunCtrl     ! time step controller
+  type(c_ptr)                       :: arkode_mem  ! ARKODE memory
+  real(c_double),           pointer :: yvec(:)     ! underlying vector
 
   !======= Internals ============
 
@@ -183,12 +184,14 @@ program main
      stop 1
   end if
 
-  imethod = 4
-  idefault = 1
-  pq = 0
-  ierr = FARKStepSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)
+  sunCtrl => FSUNAdaptController_ImpGus(ctx)
+  if (.not. associated(sunCtrl)) then
+     print *, 'ERROR: sunCtrl = NULL'
+     stop 1
+  end if
+  ierr = FARKStepSetAdaptController(arkode_mem, sunCtrl)
   if (ierr /= 0) then
-     write(*,*) 'Error in FARKStepSetAdaptivityMethod, ierr = ', ierr, '; halting'
+     write(*,*) 'Error in FARKStepSetAdaptController, ierr = ', ierr, '; halting'
      stop 1
   end if
 
@@ -228,6 +231,7 @@ program main
   call FN_VDestroy(sunvec_y)
   call FSUNMatDestroy(sunmat_A)
   ierr = FSUNLinSolFree(sunls)
+  ierr = FSUNAdaptController_Destroy(sunCtrl)
   ierr = FSUNContext_Free(ctx)
 
 end program main
diff --git a/examples/arkode/F2003_serial/ark_analytic_f2003.out b/examples/arkode/F2003_serial/ark_analytic_f2003.out
index 6bd9ca6971..c5c64ac439 100644
--- a/examples/arkode/F2003_serial/ark_analytic_f2003.out
+++ b/examples/arkode/F2003_serial/ark_analytic_f2003.out
@@ -16,15 +16,15 @@
    1.00000E+01  1.47113E+00
   
   General Solver Stats:
-    Total internal steps taken    =      413
-    Total internal steps attempts =      419
-    Total rhs function calls      =     4983
+    Total internal steps taken    =      419
+    Total internal steps attempts =      424
+    Total rhs function calls      =     5090
     Num lin solver setup calls    =       43
-    Num error test failures       =        6
+    Num error test failures       =        5
     First internal step size      = 6.10352E-12
-    Last internal step size       = 5.69650E-02
-    Next internal step size       = 5.69650E-02
-    Current internal time         = 1.00344E+01
-    Num nonlinear solver iters    =     2885
+    Last internal step size       = 6.85164E-02
+    Next internal step size       = 6.85164E-02
+    Current internal time         = 1.00642E+01
+    Num nonlinear solver iters    =     2967
     Num nonlinear solver fails    =        4
   
diff --git a/include/arkode/arkode.h b/include/arkode/arkode.h
index 3b12589182..a6ed8ebe83 100644
--- a/include/arkode/arkode.h
+++ b/include/arkode/arkode.h
@@ -137,6 +137,7 @@ extern "C" {
 #define ARK_RELAX_FUNC_FAIL        -45
 #define ARK_RELAX_JAC_FAIL         -46
 
+#define ARK_CONTROLLER_ERR         -47
 
 #define ARK_UNRECOGNIZED_ERROR     -99
 
diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
index 361d637e72..666318568c 100644
--- a/include/arkode/arkode_arkstep.h
+++ b/include/arkode/arkode_arkstep.h
@@ -20,6 +20,8 @@
 #include <sundials/sundials_nvector.h>
 #include <sundials/sundials_linearsolver.h>
 #include <sundials/sundials_nonlinearsolver.h>
+#include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
+#include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
 #include <arkode/arkode.h>
 #include <arkode/arkode_ls.h>
 #include <arkode/arkode_butcher_erk.h>
@@ -182,25 +184,27 @@ SUNDIALS_EXPORT int ARKStepSetTableNum(void *arkode_mem,
                                        ARKODE_DIRKTableID itable, ARKODE_ERKTableID etable);
 SUNDIALS_EXPORT int ARKStepSetTableName(void *arkode_mem,
                                         const char *itable, const char *etable);
+SUNDIALS_EXPORT int ARKStepSetAdaptController(void *arkode_mem, SUNAdaptController C);
+SUNDIALS_EXPORT int ARKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust);
 SUNDIALS_EXPORT int ARKStepSetCFLFraction(void *arkode_mem,
                                           realtype cfl_frac);
 SUNDIALS_EXPORT int ARKStepSetSafetyFactor(void *arkode_mem,
                                            realtype safety);
-SUNDIALS_EXPORT int ARKStepSetErrorBias(void *arkode_mem,
-                                        realtype bias);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ARKStepSetErrorBias(void *arkode_mem, realtype bias);
 SUNDIALS_EXPORT int ARKStepSetMaxGrowth(void *arkode_mem,
                                         realtype mx_growth);
 SUNDIALS_EXPORT int ARKStepSetMinReduction(void *arkode_mem,
                                            realtype eta_min);
 SUNDIALS_EXPORT int ARKStepSetFixedStepBounds(void *arkode_mem,
                                               realtype lb, realtype ub);
-SUNDIALS_EXPORT int ARKStepSetAdaptivityMethod(void *arkode_mem,
-                                               int imethod,
-                                               int idefault, int pq,
-                                               realtype adapt_params[3]);
-SUNDIALS_EXPORT int ARKStepSetAdaptivityFn(void *arkode_mem,
-                                           ARKAdaptFn hfun,
-                                           void *h_data);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ARKStepSetAdaptivityMethod(void *arkode_mem, int imethod,
+                               int idefault, int pq,
+                               realtype adapt_params[3]);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ARKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun,
+                           void *h_data);
 SUNDIALS_EXPORT int ARKStepSetMaxFirstGrowth(void *arkode_mem,
                                              realtype etamx1);
 SUNDIALS_EXPORT int ARKStepSetMaxEFailGrowth(void *arkode_mem,
diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
index de656604d1..304c1925c2 100644
--- a/include/arkode/arkode_erkstep.h
+++ b/include/arkode/arkode_erkstep.h
@@ -18,6 +18,8 @@
 #define _ERKSTEP_H
 
 #include <sundials/sundials_nvector.h>
+#include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
+#include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
 #include <arkode/arkode.h>
 #include <arkode/arkode_butcher_erk.h>
 
@@ -113,25 +115,27 @@ SUNDIALS_EXPORT int ERKStepSetTable(void *arkode_mem,
                                     ARKodeButcherTable B);
 SUNDIALS_EXPORT int ERKStepSetTableNum(void *arkode_mem, ARKODE_ERKTableID etable);
 SUNDIALS_EXPORT int ERKStepSetTableName(void *arkode_mem, const char *etable);
+SUNDIALS_EXPORT int ERKStepSetAdaptController(void *arkode_mem, SUNAdaptController C);
+SUNDIALS_EXPORT int ERKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust);
 SUNDIALS_EXPORT int ERKStepSetCFLFraction(void *arkode_mem,
                                           realtype cfl_frac);
 SUNDIALS_EXPORT int ERKStepSetSafetyFactor(void *arkode_mem,
                                            realtype safety);
-SUNDIALS_EXPORT int ERKStepSetErrorBias(void *arkode_mem,
-                                        realtype bias);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ERKStepSetErrorBias(void *arkode_mem, realtype bias);
 SUNDIALS_EXPORT int ERKStepSetMaxGrowth(void *arkode_mem,
                                         realtype mx_growth);
 SUNDIALS_EXPORT int ERKStepSetMinReduction(void *arkode_mem,
                                            realtype eta_min);
 SUNDIALS_EXPORT int ERKStepSetFixedStepBounds(void *arkode_mem,
                                               realtype lb, realtype ub);
-SUNDIALS_EXPORT int ERKStepSetAdaptivityMethod(void *arkode_mem,
-                                               int imethod,
-                                               int idefault, int pq,
-                                               realtype adapt_params[3]);
-SUNDIALS_EXPORT int ERKStepSetAdaptivityFn(void *arkode_mem,
-                                           ARKAdaptFn hfun,
-                                           void *h_data);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ERKStepSetAdaptivityMethod(void *arkode_mem, int imethod,
+                               int idefault, int pq,
+                               realtype adapt_params[3]);
+SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
+int ERKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun,
+                           void *h_data);
 SUNDIALS_EXPORT int ERKStepSetMaxFirstGrowth(void *arkode_mem,
                                              realtype etamx1);
 SUNDIALS_EXPORT int ERKStepSetMaxEFailGrowth(void *arkode_mem,
diff --git a/include/sunadaptcontroller/sunadaptcontroller_imexgus.h b/include/sunadaptcontroller/sunadaptcontroller_imexgus.h
new file mode 100644
index 0000000000..a5d547934b
--- /dev/null
+++ b/include/sunadaptcontroller/sunadaptcontroller_imexgus.h
@@ -0,0 +1,77 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the header file for the SUNAdaptController_ImExGus module.
+ * -----------------------------------------------------------------*/
+
+#ifndef _SUNADAPTCONTROLLER_IMEXGUS_H
+#define _SUNADAPTCONTROLLER_IMEXGUS_H
+
+#include <stdio.h>
+#include <sundials/sundials_adaptcontroller.h>
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* ----------------------------------------------------
+ * ImEx Gustafsson implementation of SUNAdaptController
+ * ---------------------------------------------------- */
+
+struct _SUNAdaptControllerContent_ImExGus {
+  sunrealtype k1i;          /* internal controller parameters */
+  sunrealtype k2i;
+  sunrealtype k1e;
+  sunrealtype k2e;
+  sunrealtype bias;         /* error bias factor */
+  sunrealtype ep;           /* error from previous step */
+  sunrealtype hp;           /* previous step size */
+  sunbooleantype firststep; /* flag indicating first step */
+};
+
+typedef struct _SUNAdaptControllerContent_ImExGus *SUNAdaptControllerContent_ImExGus;
+
+/* ------------------
+ * Exported Functions
+ * ------------------ */
+
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_ImExGus(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_ImExGus(SUNAdaptController C,
+                                         sunrealtype k1e, sunrealtype k2e,
+                                         sunrealtype k1i, sunrealtype k2i);
+SUNDIALS_EXPORT
+SUNAdaptController_Type SUNAdaptController_GetType_ImExGus(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,
+                                            int p, sunrealtype dsm, sunrealtype* hnew);
+SUNDIALS_EXPORT
+int SUNAdaptController_Reset_ImExGus(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetDefaults_ImExGus(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_Write_ImExGus(SUNAdaptController C, FILE* fptr);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetErrorBias_ImExGus(SUNAdaptController C, sunrealtype bias);
+SUNDIALS_EXPORT
+int SUNAdaptController_UpdateH_ImExGus(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
+SUNDIALS_EXPORT
+int SUNAdaptController_Space_ImExGus(SUNAdaptController C, long int *lenrw,
+                                     long int *leniw);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SUNADAPTCONTROLLER_IMEXGUS_H */
diff --git a/include/sunadaptcontroller/sunadaptcontroller_soderlind.h b/include/sunadaptcontroller/sunadaptcontroller_soderlind.h
new file mode 100644
index 0000000000..8ab530d1e1
--- /dev/null
+++ b/include/sunadaptcontroller/sunadaptcontroller_soderlind.h
@@ -0,0 +1,111 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the header file for the SUNAdaptController_Soderlind
+ * module.
+ * -----------------------------------------------------------------*/
+
+#ifndef _SUNADAPTCONTROLLER_SODERLIND_H
+#define _SUNADAPTCONTROLLER_SODERLIND_H
+
+#include <stdio.h>
+#include <sundials/sundials_adaptcontroller.h>
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* ----------------------------------------------------
+ * Soderlind implementation of SUNAdaptController
+ * ---------------------------------------------------- */
+
+struct _SUNAdaptControllerContent_Soderlind {
+  sunrealtype k1;        /* internal controller parameters */
+  sunrealtype k2;
+  sunrealtype k3;
+  sunrealtype k4;
+  sunrealtype k5;
+  sunrealtype bias;      /* error bias factor */
+  sunrealtype ep;        /* error from previous step */
+  sunrealtype epp;       /* error from 2 steps ago */
+  sunrealtype hp;        /* previous step size */
+  sunrealtype hpp;       /* step size from 2 steps ago */
+  int firststeps;        /* flag to handle first few steps */
+};
+
+typedef struct _SUNAdaptControllerContent_Soderlind *SUNAdaptControllerContent_Soderlind;
+
+/* ------------------
+ * Exported Functions
+ * ------------------ */
+
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_Soderlind(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_Soderlind(SUNAdaptController C,
+                                           sunrealtype k1, sunrealtype k2,
+                                           sunrealtype k3, sunrealtype k4,
+                                           sunrealtype k5);
+SUNDIALS_EXPORT
+SUNAdaptController_Type SUNAdaptController_GetType_Soderlind(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_EstimateStep_Soderlind(SUNAdaptController C, sunrealtype h,
+                                              int p, sunrealtype dsm, sunrealtype* hnew);
+SUNDIALS_EXPORT
+int SUNAdaptController_Reset_Soderlind(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetDefaults_Soderlind(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_Write_Soderlind(SUNAdaptController C, FILE* fptr);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetErrorBias_Soderlind(SUNAdaptController C, sunrealtype bias);
+SUNDIALS_EXPORT
+int SUNAdaptController_UpdateH_Soderlind(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
+SUNDIALS_EXPORT
+int SUNAdaptController_Space_Soderlind(SUNAdaptController C, long int *lenrw,
+                                       long int *leniw);
+
+/* Convenience routines to construct subsidiary controllers */
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_PID(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_PID(SUNAdaptController C,
+                                     sunrealtype k1, sunrealtype k2,
+                                     sunrealtype k3);
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_PI(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_PI(SUNAdaptController C,
+                                    sunrealtype k1, sunrealtype k2);
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_I(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_I(SUNAdaptController C, sunrealtype k1);
+
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_ExpGus(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_ExpGus(SUNAdaptController C,
+                                        sunrealtype k1, sunrealtype k2);
+
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_ImpGus(SUNContext sunctx);
+SUNDIALS_EXPORT
+int SUNAdaptController_SetParams_ImpGus(SUNAdaptController C,
+                                        sunrealtype k1, sunrealtype k2);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SUNADAPTCONTROLLER_SODERLIND_H */
diff --git a/include/sundials/sundials_adaptcontroller.h b/include/sundials/sundials_adaptcontroller.h
new file mode 100644
index 0000000000..55c65eac6c
--- /dev/null
+++ b/include/sundials/sundials_adaptcontroller.h
@@ -0,0 +1,159 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * SUNDIALS accuracy-based adaptivity controller class. These
+ * objects estimate step sizes for time integration methods such
+ * that the next step solution should satisfy a desired temporal
+ * accuracy.
+ * ----------------------------------------------------------------*/
+
+#ifndef _SUNDIALS_ADAPTCONTROLLER_H
+#define _SUNDIALS_ADAPTCONTROLLER_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sundials/sundials_context.h>
+#include "sundials/sundials_types.h"
+
+#ifdef __cplusplus /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* -----------------------------------------------------------------
+ * SUNAdaptController types (currently, only "H" is implemented;
+ * others are planned):
+ *    NONE - empty controller (does nothing)
+ *    H    - controls a single-rate step size
+ * ----------------------------------------------------------------- */
+
+typedef enum
+{
+  SUN_ADAPTCONTROLLER_NONE,
+  SUN_ADAPTCONTROLLER_H
+} SUNAdaptController_Type;
+
+/* -----------------------------------------------------------------
+ * Generic definition of SUNAdaptController
+ * ----------------------------------------------------------------- */
+
+/* Forward reference for pointer to SUNAdaptController_Ops object */
+typedef _SUNDIALS_STRUCT_ _generic_SUNAdaptController_Ops* SUNAdaptController_Ops;
+
+/* Forward reference for pointer to SUNAdaptController object */
+typedef _SUNDIALS_STRUCT_ _generic_SUNAdaptController* SUNAdaptController;
+
+/* Structure containing function pointers to controller operations  */
+struct _generic_SUNAdaptController_Ops
+{
+  /* REQUIRED of all controller implementations. */
+  SUNAdaptController_Type (*gettype)(SUNAdaptController C);
+
+  /* REQUIRED for controllers of SUN_ADAPTCONTROLLER_H type. */
+  int (*estimatestep)(SUNAdaptController C, sunrealtype h, int p,
+                      sunrealtype dsm, sunrealtype* hnew);
+
+  /* OPTIONAL for all SUNAdaptController implementations. */
+  int (*destroy)(SUNAdaptController C);
+  int (*reset)(SUNAdaptController C);
+  int (*setdefaults)(SUNAdaptController C);
+  int (*write)(SUNAdaptController C, FILE* fptr);
+  int (*seterrorbias)(SUNAdaptController C, sunrealtype bias);
+  int (*updateh)(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
+  int (*space)(SUNAdaptController C, long int *lenrw, long int *leniw);
+};
+
+/* A SUNAdaptController is a structure with an implementation-dependent
+   'content' field, and a pointer to a structure of
+   operations corresponding to that implementation. */
+struct _generic_SUNAdaptController
+{
+  void* content;
+  SUNAdaptController_Ops ops;
+  SUNContext sunctx;
+};
+
+/* -----------------------------------------------------------------
+ * Functions exported by SUNAdaptController module
+ * ----------------------------------------------------------------- */
+
+/* Function to create an empty SUNAdaptController data structure. */
+SUNDIALS_EXPORT
+SUNAdaptController SUNAdaptController_NewEmpty(SUNContext sunctx);
+
+/* Function to report the type of a SUNAdaptController object. */
+SUNDIALS_EXPORT
+SUNAdaptController_Type SUNAdaptController_GetType(SUNAdaptController C);
+
+/* Function to deallocate a SUNAdaptController object.
+
+   Any return value other than SUNADAPTCONTROLLER_SUCCESS will be treated as
+   an unrecoverable failure. */
+SUNDIALS_EXPORT
+int SUNAdaptController_Destroy(SUNAdaptController C);
+
+/* Main step size controller function.  This is called following
+   a time step with size 'h' and local error factor 'dsm', and the
+   controller should estimate 'hnew' so that the ensuing step
+   will have 'dsm' value JUST BELOW 1.
+
+   Any return value other than SUNADAPTCONTROLLER_SUCCESS will be treated as
+   an unrecoverable failure. */
+SUNDIALS_EXPORT
+int SUNAdaptController_EstimateStep(SUNAdaptController C, sunrealtype h,
+                                    int p, sunrealtype dsm, sunrealtype* hnew);
+
+/* Function to reset the controller to its initial state, e.g., if
+   it stores a small number of previous dsm or step size values. */
+SUNDIALS_EXPORT
+int SUNAdaptController_Reset(SUNAdaptController C);
+
+/* Function to set the controller parameters to their default values. */
+SUNDIALS_EXPORT
+int SUNAdaptController_SetDefaults(SUNAdaptController C);
+
+/* Function to write all controller parameters to the indicated file
+   pointer. */
+SUNDIALS_EXPORT
+int SUNAdaptController_Write(SUNAdaptController C, FILE* fptr);
+
+/* Function to set an error bias factor to use for scaling the local error
+   'dsm' factors above. */
+SUNDIALS_EXPORT
+int SUNAdaptController_SetErrorBias(SUNAdaptController C, sunrealtype bias);
+
+/* Function to notify a controller of type SUN_ADAPTCONTROLLER_H that
+   a successful time step was taken with stepsize h and local error factor
+   dsm, indicating that these can be saved for subsequent controller functions. */
+SUNDIALS_EXPORT
+int SUNAdaptController_UpdateH(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
+
+/* Function to return the memory requirements of the controller object. */
+SUNDIALS_EXPORT
+int SUNAdaptController_Space(SUNAdaptController C, long int *lenrw, long int *leniw);
+
+
+/* -----------------------------------------------------------------
+ * SUNAdaptController error codes
+ * ----------------------------------------------------------------- */
+
+#define SUNADAPTCONTROLLER_SUCCESS           0     /* function successfull        */
+#define SUNADAPTCONTROLLER_ILL_INPUT         -1001 /* illegal function input      */
+#define SUNADAPTCONTROLLER_MEM_FAIL          -1002 /* failed memory access/alloc  */
+#define SUNADAPTCONTROLLER_USER_FCN_FAIL     -1003 /* user-supplied fcn failure */
+#define SUNADAPTCONTROLLER_OPERATION_FAIL    -1004 /* catchall failure code       */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SUNDIALS_ADAPTCONTROLLER_H */
diff --git a/scripts/shared b/scripts/shared
index 11634ec73f..d0197358ba 100755
--- a/scripts/shared
+++ b/scripts/shared
@@ -69,6 +69,7 @@ $tar $tarfile $distrobase/include/sunlinsol
 $tar $tarfile $distrobase/include/sunmatrix
 $tar $tarfile $distrobase/include/sunmemory
 $tar $tarfile $distrobase/include/sunnonlinsol
+$tar $tarfile $distrobase/include/sunadaptcontroller
 
 echo "   --- Add scripts to $tarfile"
 $tar $tarfile $distrobase/scripts/sundials_csv.py
@@ -81,6 +82,7 @@ $tar $tarfile $distrobase/src/sunlinsol
 $tar $tarfile $distrobase/src/sunmatrix
 $tar $tarfile $distrobase/src/sunmemory
 $tar $tarfile $distrobase/src/sunnonlinsol
+$tar $tarfile $distrobase/src/sunadaptcontroller
 
 echo "   --- Add examples to $tarfile"
 $tar $tarfile $distrobase/examples/CMakeLists.txt
diff --git a/scripts/tarscript b/scripts/tarscript
index be1f8083d2..7f86abc7f7 100755
--- a/scripts/tarscript
+++ b/scripts/tarscript
@@ -244,6 +244,7 @@ cp -r $sundialsdir/include/sunmatrix $tmpdir/include/
 cp -r $sundialsdir/include/sunmemory $tmpdir/include/
 cp -r $sundialsdir/include/sunlinsol $tmpdir/include/
 cp -r $sundialsdir/include/sunnonlinsol $tmpdir/include/
+cp -r $sundialsdir/include/sunadaptcontroller $tmpdir/include/
 
 cp -r $sundialsdir/scripts $tmpdir/
 
@@ -254,6 +255,7 @@ cp -r $sundialsdir/src/sunmatrix $tmpdir/src/
 cp -r $sundialsdir/src/sunmemory $tmpdir/src/
 cp -r $sundialsdir/src/sunlinsol $tmpdir/src/
 cp -r $sundialsdir/src/sunnonlinsol $tmpdir/src/
+cp -r $sundialsdir/src/sunadaptcontroller $tmpdir/src/
 
 cp    $sundialsdir/test/testRunner $tmpdir/test/
 cp -r $sundialsdir/test/unit_tests $tmpdir/test/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5cc51eb748..a24be3c65a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,6 +22,7 @@ add_subdirectory(sunmatrix)
 add_subdirectory(sunlinsol)
 add_subdirectory(sunnonlinsol)
 add_subdirectory(sunmemory)
+add_subdirectory(sunadaptcontroller)
 
 # ARKODE library
 if(BUILD_ARKODE)
diff --git a/src/arkode/CMakeLists.txt b/src/arkode/CMakeLists.txt
index cf0254b3e2..7b50ba325f 100644
--- a/src/arkode/CMakeLists.txt
+++ b/src/arkode/CMakeLists.txt
@@ -41,6 +41,7 @@ set(arkode_SOURCES
   arkode_sprkstep_io.c
   arkode_sprkstep.c
   arkode_sprk.c
+  arkode_user_controller.c
   arkode.c
 )
 
@@ -75,6 +76,8 @@ sundials_add_library(sundials_arkode
     sundials_generic_obj
     sundials_sunmemsys_obj
     sundials_nvecserial_obj
+    sundials_sunadaptcontrollerimexgus_obj
+    sundials_sunadaptcontrollersoderlind_obj
     sundials_sunmatrixband_obj
     sundials_sunmatrixdense_obj
     sundials_sunmatrixsparse_obj
diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c
index d86cf7021c..c191270ec2 100644
--- a/src/arkode/arkode.c
+++ b/src/arkode/arkode.c
@@ -31,6 +31,7 @@
 #include <sundials/sundials_config.h>
 #include <sundials/sundials_math.h>
 #include <sundials/sundials_types.h>
+#include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
 
 
 /*===============================================================
@@ -49,6 +50,7 @@
 ARKodeMem arkCreate(SUNContext sunctx)
 {
   int iret;
+  long int lenrw, leniw;
   ARKodeMem ark_mem;
 
   if (!sunctx) {
@@ -133,6 +135,18 @@ ARKodeMem arkCreate(SUNContext sunctx)
   ark_mem->lrw += ARK_ADAPT_LRW;
   ark_mem->liw += ARK_ADAPT_LIW;
 
+  /* Allocate default step controller (PID) and note storage */
+  ark_mem->hadapt_mem->hcontroller = SUNAdaptController_PID(sunctx);
+  if (ark_mem->hadapt_mem->hcontroller == NULL) {
+    arkProcessError(NULL, ARK_MEM_FAIL, "ARKODE", "arkCreate",
+                    "Allocation of step controller object failed");
+    return(NULL);
+  }
+  ark_mem->hadapt_mem->owncontroller = SUNTRUE;
+  (void) SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  ark_mem->lrw += lenrw;
+  ark_mem->liw += leniw;
+
   /* Initialize the interpolation structure to NULL */
   ark_mem->interp = NULL;
   ark_mem->interp_type = -1;
@@ -890,13 +904,6 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
         if (kflag < 0)  break;
       }
 
-      /* if we've made it here then no nonrecoverable failures occurred; someone above
-         has recommended an 'eta' value for the next step -- enforce bounds on that value
-         and set upcoming step size */
-      ark_mem->eta = SUNMIN(ark_mem->eta, ark_mem->hadapt_mem->etamax);
-      ark_mem->eta = SUNMAX(ark_mem->eta, ark_mem->hmin / SUNRabs(ark_mem->h));
-      ark_mem->eta /= SUNMAX(ONE, SUNRabs(ark_mem->h) * ark_mem->hmax_inv*ark_mem->eta);
-
       /* if ignoring temporal error test result (XBraid) force step to pass */
       if (ark_mem->force_pass) {
         ark_mem->last_kflag = kflag;
@@ -1127,6 +1134,10 @@ void arkFree(void **arkode_mem)
 
   /* free the time step adaptivity module */
   if (ark_mem->hadapt_mem != NULL) {
+    if (ark_mem->hadapt_mem->owncontroller) {
+      (void) SUNAdaptController_Destroy(ark_mem->hadapt_mem->hcontroller);
+      ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    }
     free(ark_mem->hadapt_mem);
     ark_mem->hadapt_mem = NULL;
   }
@@ -1265,6 +1276,7 @@ int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
             int init_type)
 {
   booleantype stepperOK, nvectorOK, allocOK;
+  int retval;
   sunindextype lrw1, liw1;
 
   /* Check ark_mem */
@@ -1371,15 +1383,18 @@ int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
     /* Tolerance scale factor */
     ark_mem->tolsf = ONE;
 
+    /* Reset error controller object */
+    retval = SUNAdaptController_Reset(ark_mem->hadapt_mem->hcontroller);
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE", "arkInit",
+                      "Unable to reset error controller object");
+      return(ARK_CONTROLLER_ERR);
+    }
+
     /* Adaptivity counters */
     ark_mem->hadapt_mem->nst_acc = 0;
     ark_mem->hadapt_mem->nst_exp = 0;
 
-    /* Error and step size history */
-    ark_mem->hadapt_mem->ehist[0] = ONE;
-    ark_mem->hadapt_mem->ehist[1] = ONE;
-    ark_mem->hadapt_mem->hhist[0] = ZERO;
-    ark_mem->hadapt_mem->hhist[1] = ZERO;
 
     /* Indicate that calling the full RHS function is not required, this flag is
        updated to SUNTRUE by the interpolation module initialization function
@@ -2451,10 +2466,10 @@ int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
      tstop by roundoff, and in that case, we reset tn (after
      incrementing by h) to tstop. */
 
-  /* During long-time integration, roundoff can creep into tcur. 
+  /* During long-time integration, roundoff can creep into tcur.
      Compensated summation fixes this but with increased cost, so it is optional. */
   if (ark_mem->use_compensated_sums) {
-    sunCompensatedSum(ark_mem->tn, ark_mem->h, &ark_mem->tcur, &ark_mem->terr); 
+    sunCompensatedSum(ark_mem->tn, ark_mem->h, &ark_mem->tcur, &ark_mem->terr);
   } else {
     ark_mem->tcur = ark_mem->tn + ark_mem->h;
   }
@@ -2494,11 +2509,14 @@ int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
   N_VScale(ONE, ark_mem->ycur, ark_mem->yn);
   ark_mem->fn_is_current = SUNFALSE;
 
-  /* Update step size and error history arrays */
-  ark_mem->hadapt_mem->ehist[1] = ark_mem->hadapt_mem->ehist[0];
-  ark_mem->hadapt_mem->ehist[0] = dsm*ark_mem->hadapt_mem->bias;
-  ark_mem->hadapt_mem->hhist[1] = ark_mem->hadapt_mem->hhist[0];
-  ark_mem->hadapt_mem->hhist[0] = ark_mem->h;
+  /* Notify time step controller object of successful step */
+  retval = SUNAdaptController_UpdateH(ark_mem->hadapt_mem->hcontroller, ark_mem->h, dsm);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE", "arkCompleteStep",
+                    "Failure updating controller object");
+    return(ARK_CONTROLLER_ERR);
+  }
+
 
   /* update scalar quantities */
   ark_mem->nst++;
@@ -3089,6 +3107,13 @@ int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr, realtyp
                     ark_mem->h, dsm, nsttmp);
   if (retval != ARK_SUCCESS)  return(ARK_ERR_FAILURE);
 
+  /* if we've made it here then no nonrecoverable failures occurred; someone above
+     has recommended an 'eta' value for the next step -- enforce bounds on that value
+     and set upcoming step size */
+  ark_mem->eta = SUNMIN(ark_mem->eta, ark_mem->hadapt_mem->etamax);
+  ark_mem->eta = SUNMAX(ark_mem->eta, ark_mem->hmin / SUNRabs(ark_mem->h));
+  ark_mem->eta /= SUNMAX(ONE, SUNRabs(ark_mem->h) * ark_mem->hmax_inv*ark_mem->eta);
+
   /* If est. local error norm dsm passes test, return ARK_SUCCESS */
   if (dsm <= ONE) return(ARK_SUCCESS);
 
@@ -3103,10 +3128,15 @@ int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr, realtyp
   /* Set etamax=1 to prevent step size increase at end of this step */
   hadapt_mem->etamax = ONE;
 
-  /* Enforce failure bounds on eta, update h, and return for retry of step */
+  /* Enforce failure bounds on eta */
   if (*nefPtr >= hadapt_mem->small_nef)
     ark_mem->eta = SUNMIN(ark_mem->eta, hadapt_mem->etamxf);
 
+  /* Enforce min/max step bounds once again due to adjustments above */
+  ark_mem->eta = SUNMIN(ark_mem->eta, ark_mem->hadapt_mem->etamax);
+  ark_mem->eta = SUNMAX(ark_mem->eta, ark_mem->hmin / SUNRabs(ark_mem->h));
+  ark_mem->eta /= SUNMAX(ONE, SUNRabs(ark_mem->h) * ark_mem->hmax_inv*ark_mem->eta);
+
   return(TRY_AGAIN);
 }
 
diff --git a/src/arkode/arkode_adapt.c b/src/arkode/arkode_adapt.c
index 617681e9f5..afe0dfe61b 100644
--- a/src/arkode/arkode_adapt.c
+++ b/src/arkode/arkode_adapt.c
@@ -42,10 +42,6 @@ ARKodeHAdaptMem arkAdaptInit()
 
   /* initialize values (default parameters are set in arkSetDefaults) */
   memset(hadapt_mem, 0, sizeof(struct ARKodeHAdaptMemRec));
-  hadapt_mem->ehist[0] = ONE;
-  hadapt_mem->ehist[1] = ONE;
-  hadapt_mem->hhist[0] = ZERO;
-  hadapt_mem->hhist[1] = ZERO;
   hadapt_mem->nst_acc  = 0;
   hadapt_mem->nst_exp  = 0;
   return(hadapt_mem);
@@ -67,27 +63,17 @@ void arkPrintAdaptMem(ARKodeHAdaptMem hadapt_mem, FILE *outfile)
     fprintf(outfile, "ark_hadapt: etamin = %"RSYM"\n", hadapt_mem->etamin);
     fprintf(outfile, "ark_hadapt: small_nef = %i\n", hadapt_mem->small_nef);
     fprintf(outfile, "ark_hadapt: etacf = %"RSYM"\n", hadapt_mem->etacf);
-    fprintf(outfile, "ark_hadapt: imethod = %i\n", hadapt_mem->imethod);
-    fprintf(outfile, "ark_hadapt: ehist =  %"RSYM"  %"RSYM"\n",
-            hadapt_mem->ehist[0],
-            hadapt_mem->ehist[1]);
-    fprintf(outfile, "ark_hadapt: hhist =  %"RSYM"  %"RSYM"\n",
-            hadapt_mem->hhist[0],
-            hadapt_mem->hhist[1]);
     fprintf(outfile, "ark_hadapt: cfl = %"RSYM"\n", hadapt_mem->cfl);
     fprintf(outfile, "ark_hadapt: safety = %"RSYM"\n", hadapt_mem->safety);
-    fprintf(outfile, "ark_hadapt: bias = %"RSYM"\n", hadapt_mem->bias);
     fprintf(outfile, "ark_hadapt: growth = %"RSYM"\n", hadapt_mem->growth);
     fprintf(outfile, "ark_hadapt: lbound = %"RSYM"\n", hadapt_mem->lbound);
     fprintf(outfile, "ark_hadapt: ubound = %"RSYM"\n", hadapt_mem->ubound);
-    fprintf(outfile, "ark_hadapt: k1 = %"RSYM"\n", hadapt_mem->k1);
-    fprintf(outfile, "ark_hadapt: k2 = %"RSYM"\n", hadapt_mem->k2);
-    fprintf(outfile, "ark_hadapt: k3 = %"RSYM"\n", hadapt_mem->k3);
-    fprintf(outfile, "ark_hadapt: q = %i\n", hadapt_mem->q);
-    fprintf(outfile, "ark_hadapt: p = %i\n", hadapt_mem->p);
-    fprintf(outfile, "ark_hadapt: pq = %i\n", hadapt_mem->pq);
     fprintf(outfile, "ark_hadapt: nst_acc = %li\n", hadapt_mem->nst_acc);
     fprintf(outfile, "ark_hadapt: nst_exp = %li\n", hadapt_mem->nst_exp);
+    fprintf(outfile, "ark_hadapt: pq = %i\n", hadapt_mem->pq);
+    fprintf(outfile, "ark_hadapt: p = %i\n", hadapt_mem->p);
+    fprintf(outfile, "ark_hadapt: q = %i\n", hadapt_mem->q);
+    fprintf(outfile, "ark_hadapt: adjust = %i\n", hadapt_mem->adjust);
     if (hadapt_mem->expstab == arkExpStab) {
       fprintf(outfile, "  ark_hadapt: Default explicit stability function\n");
     } else {
@@ -95,6 +81,7 @@ void arkPrintAdaptMem(ARKodeHAdaptMem hadapt_mem, FILE *outfile)
       fprintf(outfile, "  ark_hadapt: stability function data pointer = %p\n",
               hadapt_mem->estab_data);
     }
+    (void) SUNAdaptController_Write(hadapt_mem->hcontroller, outfile);
   }
 }
 
@@ -110,9 +97,10 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
              N_Vector ycur, realtype tcur, realtype hcur,
              realtype dsm, long int nst)
 {
-  int ier, k;
-  realtype ecur, h_acc, h_cfl, int_dir;
+  int retval;
+  realtype h_acc, h_cfl, int_dir;
   ARKodeMem ark_mem;
+  int controller_order;
   if (arkode_mem == NULL) {
     arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
                     "arkAdapt", MSG_ARK_NO_MEM);
@@ -120,80 +108,35 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
   }
   ark_mem = (ARKodeMem) arkode_mem;
 
-  /* Current error with bias factor */
-  ecur = hadapt_mem->bias * dsm;
-
-  /* Set k as either p or q, based on pq flag */
-  k = (hadapt_mem->pq) ? hadapt_mem->q : hadapt_mem->p;
-
-  /* Call algorithm-specific error adaptivity method */
-  switch (hadapt_mem->imethod) {
-  case(ARK_ADAPT_PID):         /* PID controller */
-    ier = arkAdaptPID(hadapt_mem, k, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_PI):          /* PI controller */
-    ier = arkAdaptPI(hadapt_mem, k, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_I):           /* I controller */
-    ier = arkAdaptI(hadapt_mem, k, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_EXP_GUS):     /* explicit Gustafsson controller */
-    ier = arkAdaptExpGus(hadapt_mem, k, nst, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_IMP_GUS):     /* implicit Gustafsson controller */
-    ier = arkAdaptImpGus(hadapt_mem, k, nst, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_IMEX_GUS):    /* imex Gustafsson controller */
-    ier = arkAdaptImExGus(hadapt_mem, k, nst, hcur, ecur, &h_acc);
-    break;
-  case(ARK_ADAPT_CUSTOM):      /* user-supplied controller */
-    ier = hadapt_mem->HAdapt(ycur, tcur, hcur, hadapt_mem->hhist[0],
-                             hadapt_mem->hhist[1], ecur,
-                             hadapt_mem->ehist[0],
-                             hadapt_mem->ehist[1],
-                             hadapt_mem->q, hadapt_mem->p,
-                             &h_acc, hadapt_mem->HAdapt_data);
-    break;
-  default:
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkAdapt",
-                    "Illegal imethod.");
-    return (ARK_ILL_INPUT);
+  /* Request error-based step size from adaptivity controller */
+  if (hadapt_mem->pq == 0) {
+    controller_order = hadapt_mem->p + hadapt_mem->adjust;
+  } else if (hadapt_mem->pq == 1) {
+    controller_order = hadapt_mem->q + hadapt_mem->adjust;
+  } else {
+    controller_order = SUNMIN(hadapt_mem->p, hadapt_mem->q) + hadapt_mem->adjust;
   }
-  if (ier != ARK_SUCCESS) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkAdapt",
-                    "Error in accuracy-based adaptivity function.");
-    return (ARK_ILL_INPUT);
+  retval = SUNAdaptController_EstimateStep(hadapt_mem->hcontroller, hcur,
+                                           controller_order, dsm, &h_acc);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE", "arkAdapt",
+                    "SUNAdaptController_EstimateStep failure.");
+    return (ARK_CONTROLLER_ERR);
   }
 
   /* determine direction of integration */
   int_dir = hcur / SUNRabs(hcur);
 
   /* Call explicit stability function */
-  ier = hadapt_mem->expstab(ycur, tcur, &h_cfl, hadapt_mem->estab_data);
-  if (ier != ARK_SUCCESS) {
+  retval = hadapt_mem->expstab(ycur, tcur, &h_cfl, hadapt_mem->estab_data);
+  if (retval != ARK_SUCCESS) {
     arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE", "arkAdapt",
                     "Error in explicit stability function.");
     return (ARK_ILL_INPUT);
   }
   if (h_cfl <= ZERO)  h_cfl = RCONST(1.0e30) * SUNRabs(hcur);
 
-  /* Solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "ARKadapt  adapt  %"RSYM"  %"RSYM"  %"RSYM"  %"RSYM"  %"RSYM"  %"RSYM"  %"RSYM"  %"RSYM"  ",
-            ecur, hadapt_mem->ehist[0], hadapt_mem->ehist[1],
-            hcur, hadapt_mem->hhist[0], hadapt_mem->hhist[1], h_acc, h_cfl);
-
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
-                     "ARKODE::arkAdapt", "error-history",
-                     "ecur = %"RSYM", ehist[0] = %"RSYM", ehist[0] = %"RSYM,
-                     ecur, hadapt_mem->ehist[0], hadapt_mem->ehist[1]);
-
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
-                     "ARKODE::arkAdapt", "step-history",
-                     "hcur = %"RSYM", hhist[0] = %"RSYM", hhist[0] = %"RSYM,
-                     hcur, hadapt_mem->hhist[0], hadapt_mem->hhist[1]);
-
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
                      "ARKODE::arkAdapt", "new-step-before-bounds",
                      "h_acc = %"RSYM", h_cfl = %"RSYM, h_acc, h_cfl);
@@ -253,178 +196,9 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
                      "new-step-eta", "eta = %"RSYM, ark_mem->eta);
 #endif
 
-  return(ier);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptPID implements a PID time step control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptPID(ARKodeHAdaptMem hadapt_mem, int k, realtype hcur,
-                realtype ecur, realtype *hnew)
-{
-  realtype k1, k2, k3, e1, e2, e3, h_acc;
-
-  /* set usable time-step adaptivity parameters */
-  k1 = -hadapt_mem->k1 / k;
-  k2 =  hadapt_mem->k2 / k;
-  k3 = -hadapt_mem->k3 / k;
-  e1 = SUNMAX(ecur, TINY);
-  e2 = SUNMAX(hadapt_mem->ehist[0], TINY);
-  e3 = SUNMAX(hadapt_mem->ehist[1], TINY);
-
-  /* compute estimated optimal time step size, set into output */
-  h_acc = hcur * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2) * SUNRpowerR(e3,k3);
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptPI implements a PI time step control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptPI(ARKodeHAdaptMem hadapt_mem, int k, realtype hcur,
-               realtype ecur, realtype *hnew)
-{
-  realtype k1, k2, e1, e2, h_acc;
-
-  /* set usable time-step adaptivity parameters */
-  k1 = -hadapt_mem->k1 / k;
-  k2 =  hadapt_mem->k2 / k;
-  e1 = SUNMAX(ecur, TINY);
-  e2 = SUNMAX(hadapt_mem->ehist[0], TINY);
-
-  /* compute estimated optimal time step size, set into output */
-  h_acc = hcur * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2);
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptI implements an I time step control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptI(ARKodeHAdaptMem hadapt_mem, int k, realtype hcur,
-              realtype ecur, realtype *hnew)
-{
-  realtype k1, e1, h_acc;
-
-  /* set usable time-step adaptivity parameters */
-  k1 = -hadapt_mem->k1 / k;
-  e1 = SUNMAX(ecur, TINY);
-
-  /* compute estimated optimal time step size, set into output */
-  h_acc = hcur * SUNRpowerR(e1,k1);
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptExpGus implements the explicit Gustafsson time step
-  control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptExpGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                   realtype hcur, realtype ecur, realtype *hnew)
-{
-  realtype k1, k2, e1, e2, h_acc;
-
-  /* modified method for first step */
-  if (nst < 2) {
-
-    k1 = -ONE / k;
-    e1 = SUNMAX(ecur, TINY);
-    h_acc = hcur * SUNRpowerR(e1,k1);
-
-  /* general estimate */
-  } else {
-
-    k1 = -hadapt_mem->k1 / k;
-    k2 = -hadapt_mem->k2 / k;
-    e1 = SUNMAX(ecur, TINY);
-    e2 = e1 / SUNMAX(hadapt_mem->ehist[0], TINY);
-    h_acc = hcur * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2);
-
-  }
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptImpGus implements the implicit Gustafsson time step
-  control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptImpGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                   realtype hcur, realtype ecur, realtype *hnew)
-{
-  realtype k1, k2, e1, e2, hrat, h_acc;
-
-  /* modified method for first step */
-  if (nst < 2) {
-
-    k1 = -ONE / k;
-    e1 = SUNMAX(ecur, TINY);
-    h_acc = hcur * SUNRpowerR(e1,k1);
-
-  /* general estimate */
-  } else {
-
-    k1 = -hadapt_mem->k1 / k;
-    k2 = -hadapt_mem->k2 / k;
-    e1 = SUNMAX(ecur, TINY);
-    e2 = e1 / SUNMAX(hadapt_mem->ehist[0], TINY);
-    hrat = hcur / hadapt_mem->hhist[0];
-    h_acc = hcur * hrat * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2);
-
-  }
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkAdaptImExGus implements a combination implicit/explicit
-  Gustafsson time step control algorithm.
-  ---------------------------------------------------------------*/
-int arkAdaptImExGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                    realtype hcur, realtype ecur, realtype *hnew)
-{
-  realtype k1, k2, k3, e1, e2, hrat, h_acc;
-
-  /* modified method for first step */
-  if (nst < 2) {
-
-    k1 = -ONE / k;
-    e1 = SUNMAX(ecur, TINY);
-    h_acc = hcur * SUNRpowerR(e1,k1);
-
-  /* general estimate */
-  } else {
-
-    k1 = -hadapt_mem->k1 / k;
-    k2 = -hadapt_mem->k2 / k;
-    k3 = -hadapt_mem->k3 / k;
-    e1 = SUNMAX(ecur, TINY);
-    e2 = e1 / SUNMAX(hadapt_mem->ehist[0], TINY);
-    hrat = hcur / hadapt_mem->hhist[0];
-    /* implicit estimate */
-    h_acc = hcur * hrat * SUNRpowerR(e1,k3) * SUNRpowerR(e2,k3);
-    /* explicit estimate */
-    h_acc = SUNMIN(h_acc, hcur * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2));
-
-  }
-  *hnew = h_acc;
-
-  return(ARK_SUCCESS);
+  return(retval);
 }
 
-
 /*===============================================================
   EOF
   ===============================================================*/
diff --git a/src/arkode/arkode_adapt_impl.h b/src/arkode/arkode_adapt_impl.h
index 5cdd3d2e58..53303dcb21 100644
--- a/src/arkode/arkode_adapt_impl.h
+++ b/src/arkode/arkode_adapt_impl.h
@@ -20,6 +20,7 @@
 
 #include <stdarg.h>
 #include <arkode/arkode.h>
+#include <sundials/sundials_adaptcontroller.h>
 
 #ifdef __cplusplus  /* wrapper to enable C++ usage */
 extern "C" {
@@ -31,29 +32,15 @@ extern "C" {
   ===============================================================*/
 
 /* size constants for the adaptivity memory structure */
-#define ARK_ADAPT_LRW  19
-#define ARK_ADAPT_LIW  8    /* includes function/data pointers */
+#define ARK_ADAPT_LRW  10
+#define ARK_ADAPT_LIW  7    /* includes function/data pointers */
 
 /* Time step controller default values */
 #define CFLFAC    RCONST(0.5)
 #define SAFETY    RCONST(0.96)  /* CVODE uses 1.0  */
-#define BIAS      RCONST(1.5)   /* CVODE uses 6.0  */
 #define GROWTH    RCONST(20.0)  /* CVODE uses 10.0 */
 #define HFIXED_LB RCONST(1.0)   /* CVODE uses 1.0  */
 #define HFIXED_UB RCONST(1.5)   /* CVODE uses 1.5  */
-#define AD0_K1    RCONST(0.58)  /* PID controller constants */
-#define AD0_K2    RCONST(0.21)
-#define AD0_K3    RCONST(0.1)
-#define AD1_K1    RCONST(0.8)   /* PI controller constants */
-#define AD1_K2    RCONST(0.31)
-#define AD2_K1    RCONST(1.0)   /* I controller constants */
-#define AD3_K1    RCONST(0.367) /* explicit Gustafsson controller */
-#define AD3_K2    RCONST(0.268)
-#define AD4_K1    RCONST(0.98)  /* implicit Gustafsson controller */
-#define AD4_K2    RCONST(0.95)
-#define AD5_K1    RCONST(0.367) /* imex Gustafsson controller */
-#define AD5_K2    RCONST(0.268)
-#define AD5_K3    RCONST(0.95)
 
 #define ETAMX1    RCONST(10000.0)  /* maximum step size change on first step */
 #define ETAMXF    RCONST(0.3)      /* step size reduction factor on multiple error
@@ -64,6 +51,11 @@ extern "C" {
                                       convergence failure */
 #define SMALL_NEF 2                /* if an error failure occurs and SMALL_NEF <= nef,
                                       then reset  eta = MIN(eta, ETAMXF) */
+#define PQ        0                /* order to use for controller: 0=embedding,
+                                      1=method, otherwise min(method,embedding)
+                                      REMOVE AT SAME TIME AS ARKStepSetAdaptivityMethod */
+#define ADJUST    -1               /* adjustment to apply within controller to method
+                                      order of accuracy */
 
 
 /*===============================================================
@@ -85,30 +77,18 @@ typedef struct ARKodeHAdaptMemRec {
   realtype     etamin;      /* eta >= etamin on error test fail           */
   int          small_nef;   /* bound to determine 'multiple' above        */
   realtype     etacf;       /* h reduction factor on nonlinear conv fail  */
-  ARKAdaptFn   HAdapt;      /* function to set the new time step size     */
-  void        *HAdapt_data; /* user pointer passed to hadapt              */
-  realtype     ehist[2];    /* error history for time adaptivity          */
-  realtype     hhist[2];    /* step history for time adaptivity           */
-  int          imethod;     /* step adaptivity method to use:
-                               -1 -> User-specified function above
-                                0 -> PID controller
-                                1 -> PI controller
-                                2 -> I controller
-                                3 -> explicit Gustafsson controller
-                                4 -> implicit Gustafsson controller
-                                5 -> imex Gustafsson controller           */
   realtype     cfl;         /* cfl safety factor                          */
   realtype     safety;      /* accuracy safety factor on h                */
-  realtype     bias;        /* accuracy safety factor on LTE              */
   realtype     growth;      /* maximum step growth safety factor          */
   realtype     lbound;      /* eta lower bound to leave h unchanged       */
   realtype     ubound;      /* eta upper bound to leave h unchanged       */
-  realtype     k1;          /* method-specific adaptivity parameters      */
-  realtype     k2;
-  realtype     k3;
-  int q;                    /* method order                               */
-  int p;                    /* embedding order                            */
-  booleantype pq;           /* choice of using p (0) vs q (1)             */
+  int          p;           /* embedding order                            */
+  int          q;           /* method order                               */
+  int          pq;          /* decision flag for controller order         */
+  int          adjust;      /* controller order adjustment factor         */
+
+  SUNAdaptController hcontroller; /* temporal error controller            */
+  booleantype  owncontroller;  /* flag indicating hcontroller ownership   */
 
   ARKExpStabFn expstab;     /* step stability function                    */
   void        *estab_data;  /* user pointer passed to expstab             */
@@ -128,18 +108,6 @@ void arkPrintAdaptMem(ARKodeHAdaptMem hadapt_mem, FILE *outfile);
 int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
              N_Vector ycur, realtype tcur, realtype hcur,
              realtype dsm, long int nst);
-int arkAdaptPID(ARKodeHAdaptMem hadapt_mem, int k,
-                realtype hcur, realtype ecur, realtype *hnew);
-int arkAdaptPI(ARKodeHAdaptMem hadapt_mem, int k,
-               realtype hcur, realtype ecur, realtype *hnew);
-int arkAdaptI(ARKodeHAdaptMem hadapt_mem, int k,
-              realtype hcur, realtype ecur, realtype *hnew);
-int arkAdaptExpGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                   realtype hcur, realtype ecur, realtype *hnew);
-int arkAdaptImpGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                   realtype hcur, realtype ecur, realtype *hnew);
-int arkAdaptImExGus(ARKodeHAdaptMem hadapt_mem, int k, long int nst,
-                    realtype hcur, realtype ecur, realtype *hnew);
 
 
 #ifdef __cplusplus
diff --git a/src/arkode/arkode_arkstep_io.c b/src/arkode/arkode_arkstep_io.c
index 1151afd1bc..5925b29582 100644
--- a/src/arkode/arkode_arkstep_io.c
+++ b/src/arkode/arkode_arkstep_io.c
@@ -77,23 +77,18 @@ int ARKStepSetPostprocessStepFn(void *arkode_mem,
 int ARKStepSetPostprocessStageFn(void *arkode_mem,
                                  ARKPostProcessFn ProcessStage) {
   return(arkSetPostprocessStageFn(arkode_mem, ProcessStage)); }
+int ARKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust) {
+  return(arkSetAdaptivityAdjustment(arkode_mem, adjust)); }
 int ARKStepSetCFLFraction(void *arkode_mem, realtype cfl_frac) {
   return(arkSetCFLFraction(arkode_mem, cfl_frac)); }
 int ARKStepSetSafetyFactor(void *arkode_mem, realtype safety) {
   return(arkSetSafetyFactor(arkode_mem, safety)); }
-int ARKStepSetErrorBias(void *arkode_mem, realtype bias) {
-  return(arkSetErrorBias(arkode_mem, bias)); }
 int ARKStepSetMaxGrowth(void *arkode_mem, realtype mx_growth) {
   return(arkSetMaxGrowth(arkode_mem, mx_growth)); }
 int ARKStepSetMinReduction(void *arkode_mem, realtype eta_min) {
   return(arkSetMinReduction(arkode_mem, eta_min)); }
 int ARKStepSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub) {
   return(arkSetFixedStepBounds(arkode_mem, lb, ub)); }
-int ARKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                               int pq, realtype adapt_params[3]) {
-  return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
-int ARKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
-  return(arkSetAdaptivityFn(arkode_mem, hfun, h_data)); }
 int ARKStepSetMaxFirstGrowth(void *arkode_mem, realtype etamx1) {
   return(arkSetMaxFirstGrowth(arkode_mem, etamx1)); }
 int ARKStepSetMaxEFailGrowth(void *arkode_mem, realtype etamxf) {
@@ -108,6 +103,8 @@ int ARKStepSetMaxErrTestFails(void *arkode_mem, int maxnef) {
   return(arkSetMaxErrTestFails(arkode_mem, maxnef)); }
 int ARKStepSetMaxConvFails(void *arkode_mem, int maxncf) {
   return(arkSetMaxConvFails(arkode_mem, maxncf)); }
+int ARKStepSetAdaptController(void *arkode_mem, SUNAdaptController C) {
+  return(arkSetAdaptController(arkode_mem, C)); }
 int ARKStepSetFixedStep(void *arkode_mem, realtype hfixed) {
   return(arkSetFixedStep(arkode_mem, hfixed)); }
 
@@ -343,6 +340,35 @@ int ARKStepGetNumRelaxSolveIters(void* arkode_mem, long int* iters)
   return arkRelaxGetNumRelaxSolveIters(arkode_mem, iters);
 }
 
+
+
+/*===============================================================
+  DEPRECATED ARKStep optional input/output functions
+  ===============================================================*/
+
+/*---------------------------------------------------------------
+  ARKStepSetAdaptivityMethod: user should create/attach a
+  specific SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ARKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
+                               int pq, realtype adapt_params[3]) {
+  return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
+
+/*---------------------------------------------------------------
+  ARKStepSetAdaptivityFn: user should create/attach a custom
+  SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ARKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
+  return(arkSetAdaptivityFn(arkode_mem, hfun, h_data)); }
+
+/*---------------------------------------------------------------
+  ARKStepSetErrorBias: user should set this value directly in the
+  SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ARKStepSetErrorBias(void *arkode_mem, realtype bias) {
+  return(arkSetErrorBias(arkode_mem, bias)); }
+
+
 /*===============================================================
   ARKStep optional input functions -- stepper-specific
   ===============================================================*/
@@ -456,6 +482,7 @@ int ARKStepSetOptimalParams(void *arkode_mem)
   ARKodeARKStepMem step_mem;
   ARKodeHAdaptMem hadapt_mem;
   int retval;
+  long int lenrw, leniw;
 
   /* access ARKodeARKStepMem structure */
   retval = arkStep_AccessStepMem(arkode_mem, "ARKStepSetOptimalParams",
@@ -471,29 +498,59 @@ int ARKStepSetOptimalParams(void *arkode_mem)
   }
   hadapt_mem = ark_mem->hadapt_mem;
 
+  /* Remove current SUNAdaptController object */
+  retval = SUNAdaptController_Space(hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw -= leniw;
+    ark_mem->lrw -= lenrw;
+  }
+  if (hadapt_mem->owncontroller) {
+    retval = SUNAdaptController_Destroy(hadapt_mem->hcontroller);
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "ARKStepSetOptimalParams",
+                      "SUNAdaptController_Destroy failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+  hadapt_mem->hcontroller = NULL;
+
   /* Choose values based on method, order */
 
   /*    explicit */
   if (step_mem->explicit && !step_mem->implicit) {
-    hadapt_mem->imethod = ARK_ADAPT_PI;
-    hadapt_mem->safety  = RCONST(0.99);
-    hadapt_mem->bias    = RCONST(1.2);
-    hadapt_mem->growth  = RCONST(25.0);
-    hadapt_mem->k1      = RCONST(0.8);
-    hadapt_mem->k2      = RCONST(0.31);
-    hadapt_mem->etamxf  = RCONST(0.3);
+    hadapt_mem->hcontroller = SUNAdaptController_PI(ark_mem->sunctx);
+    if (hadapt_mem->hcontroller == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                      "ARKStepSetOptimalParams",
+                      "SUNAdaptController_PI allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
+    (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
+                                           -RCONST(0.31));
+    hadapt_mem->safety = RCONST(0.99);
+    hadapt_mem->growth = RCONST(25.0);
+    hadapt_mem->etamxf = RCONST(0.3);
+    hadapt_mem->pq     = PQ;
 
   /*    implicit */
   } else if (step_mem->implicit && !step_mem->explicit) {
     switch (step_mem->q) {
     case 2:   /* just use standard defaults since better ones unknown */
-      hadapt_mem->imethod   = ARK_ADAPT_PID;
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
       hadapt_mem->safety    = SAFETY;
-      hadapt_mem->bias      = BIAS;
       hadapt_mem->growth    = GROWTH;
       hadapt_mem->etamxf    = ETAMXF;
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.001);
       step_mem->maxcor      = 5;
       step_mem->crdown      = CRDOWN;
@@ -502,13 +559,20 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = MSBP;
       break;
     case 3:
-      hadapt_mem->imethod   = ARK_ADAPT_I;
+      hadapt_mem->hcontroller = SUNAdaptController_I(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_I allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.9));
       hadapt_mem->safety    = RCONST(0.957);
-      hadapt_mem->bias      = RCONST(1.9);
       hadapt_mem->growth    = RCONST(17.6);
       hadapt_mem->etamxf    = RCONST(0.45);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.22);
       step_mem->crdown      = RCONST(0.17);
       step_mem->rdiv        = RCONST(2.3);
@@ -516,16 +580,22 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = 60;
       break;
     case 4:
-      hadapt_mem->imethod   = ARK_ADAPT_PID;
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.535),
+                                              -RCONST(0.209), RCONST(0.148));
       hadapt_mem->safety    = RCONST(0.988);
-      hadapt_mem->bias      = RCONST(1.2);
       hadapt_mem->growth    = RCONST(31.5);
-      hadapt_mem->k1        = RCONST(0.535);
-      hadapt_mem->k2        = RCONST(0.209);
-      hadapt_mem->k3        = RCONST(0.148);
       hadapt_mem->etamxf    = RCONST(0.33);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.24);
       step_mem->crdown      = RCONST(0.26);
       step_mem->rdiv        = RCONST(2.3);
@@ -533,16 +603,22 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = 31;
       break;
     case 5:
-      hadapt_mem->imethod   = ARK_ADAPT_PID;
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(3.3));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.56),
+                                              -RCONST(0.338), RCONST(0.14));
       hadapt_mem->safety    = RCONST(0.937);
-      hadapt_mem->bias      = RCONST(3.3);
       hadapt_mem->growth    = RCONST(22.0);
-      hadapt_mem->k1        = RCONST(0.56);
-      hadapt_mem->k2        = RCONST(0.338);
-      hadapt_mem->k3        = RCONST(0.14);
       hadapt_mem->etamxf    = RCONST(0.44);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.25);
       step_mem->crdown      = RCONST(0.4);
       step_mem->rdiv        = RCONST(2.3);
@@ -554,17 +630,44 @@ int ARKStepSetOptimalParams(void *arkode_mem)
   /*    imex */
   } else {
     switch (step_mem->q) {
+    case 2:   /* just use standard defaults since better ones unknown */
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      hadapt_mem->safety    = SAFETY;
+      hadapt_mem->growth    = GROWTH;
+      hadapt_mem->etamxf    = ETAMXF;
+      hadapt_mem->small_nef = SMALL_NEF;
+      hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
+      step_mem->nlscoef     = RCONST(0.001);
+      step_mem->maxcor      = 5;
+      step_mem->crdown      = CRDOWN;
+      step_mem->rdiv        = RDIV;
+      step_mem->dgmax       = DGMAX;
+      step_mem->msbp        = MSBP;
+      break;
     case 3:
-      hadapt_mem->imethod   = ARK_ADAPT_PID;
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.42));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.54),
+                                              -RCONST(0.36), RCONST(0.14));
       hadapt_mem->safety    = RCONST(0.965);
-      hadapt_mem->bias      = RCONST(1.42);
       hadapt_mem->growth    = RCONST(28.7);
-      hadapt_mem->k1        = RCONST(0.54);
-      hadapt_mem->k2        = RCONST(0.36);
-      hadapt_mem->k3        = RCONST(0.14);
       hadapt_mem->etamxf    = RCONST(0.46);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.22);
       step_mem->crdown      = RCONST(0.17);
       step_mem->rdiv        = RCONST(2.3);
@@ -572,16 +675,22 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = 60;
       break;
     case 4:
-      hadapt_mem->imethod   = ARK_ADAPT_PID;
+      hadapt_mem->hcontroller = SUNAdaptController_PID(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PID allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.35));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.543),
+                                              -RCONST(0.297), RCONST(0.14));
       hadapt_mem->safety    = RCONST(0.97);
-      hadapt_mem->bias      = RCONST(1.35);
       hadapt_mem->growth    = RCONST(25.0);
-      hadapt_mem->k1        = RCONST(0.543);
-      hadapt_mem->k2        = RCONST(0.297);
-      hadapt_mem->k3        = RCONST(0.14);
       hadapt_mem->etamxf    = RCONST(0.47);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.24);
       step_mem->crdown      = RCONST(0.26);
       step_mem->rdiv        = RCONST(2.3);
@@ -589,15 +698,22 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = 31;
       break;
     case 5:
-      hadapt_mem->imethod   = ARK_ADAPT_PI;
+      hadapt_mem->hcontroller = SUNAdaptController_PI(ark_mem->sunctx);
+      if (hadapt_mem->hcontroller == NULL) {
+        arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ARKStep",
+                        "ARKStepSetOptimalParams",
+                        "SUNAdaptController_PI allocation failure");
+        return(ARK_MEM_FAIL);
+      }
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.15));
+      (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
+                                             -RCONST(0.35));
       hadapt_mem->safety    = RCONST(0.993);
-      hadapt_mem->bias      = RCONST(1.15);
       hadapt_mem->growth    = RCONST(28.5);
-      hadapt_mem->k1        = RCONST(0.8);
-      hadapt_mem->k2        = RCONST(0.35);
       hadapt_mem->etamxf    = RCONST(0.3);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
+      hadapt_mem->pq        = PQ;
       step_mem->nlscoef     = RCONST(0.25);
       step_mem->crdown      = RCONST(0.4);
       step_mem->rdiv        = RCONST(2.3);
@@ -605,6 +721,13 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       step_mem->msbp        = 31;
       break;
     }
+    hadapt_mem->owncontroller = SUNTRUE;
+
+    retval = SUNAdaptController_Space(hadapt_mem->hcontroller, &lenrw, &leniw);
+    if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+      ark_mem->liw += leniw;
+      ark_mem->lrw += lenrw;
+    }
 
   }
   return(ARK_SUCCESS);
diff --git a/src/arkode/arkode_erkstep_io.c b/src/arkode/arkode_erkstep_io.c
index 15845101cc..bfdf929f3e 100644
--- a/src/arkode/arkode_erkstep_io.c
+++ b/src/arkode/arkode_erkstep_io.c
@@ -78,23 +78,18 @@ int ERKStepSetPostprocessStepFn(void *arkode_mem,
 int ERKStepSetPostprocessStageFn(void *arkode_mem,
                                 ARKPostProcessFn ProcessStage) {
   return(arkSetPostprocessStageFn(arkode_mem, ProcessStage)); }
+int ERKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust) {
+  return(arkSetAdaptivityAdjustment(arkode_mem, adjust)); }
 int ERKStepSetCFLFraction(void *arkode_mem, realtype cfl_frac) {
   return(arkSetCFLFraction(arkode_mem, cfl_frac)); }
 int ERKStepSetSafetyFactor(void *arkode_mem, realtype safety) {
   return(arkSetSafetyFactor(arkode_mem, safety)); }
-int ERKStepSetErrorBias(void *arkode_mem, realtype bias) {
-  return(arkSetErrorBias(arkode_mem, bias)); }
 int ERKStepSetMaxGrowth(void *arkode_mem, realtype mx_growth) {
   return(arkSetMaxGrowth(arkode_mem, mx_growth)); }
 int ERKStepSetMinReduction(void *arkode_mem, realtype eta_min) {
   return(arkSetMinReduction(arkode_mem, eta_min)); }
 int ERKStepSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub) {
   return(arkSetFixedStepBounds(arkode_mem, lb, ub)); }
-int ERKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                               int pq, realtype adapt_params[3]) {
-  return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
-int ERKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
-  return(arkSetAdaptivityFn(arkode_mem, hfun, h_data)); }
 int ERKStepSetMaxFirstGrowth(void *arkode_mem, realtype etamx1) {
   return(arkSetMaxFirstGrowth(arkode_mem, etamx1)); }
 int ERKStepSetMaxEFailGrowth(void *arkode_mem, realtype etamxf) {
@@ -107,6 +102,8 @@ int ERKStepSetMaxErrTestFails(void *arkode_mem, int maxnef) {
   return(arkSetMaxErrTestFails(arkode_mem, maxnef)); }
 int ERKStepSetFixedStep(void *arkode_mem, realtype hfixed) {
   return(arkSetFixedStep(arkode_mem, hfixed)); }
+int ERKStepSetAdaptController(void *arkode_mem, SUNAdaptController C) {
+  return(arkSetAdaptController(arkode_mem, C)); }
 
 
 /*===============================================================
@@ -234,6 +231,34 @@ int ERKStepGetNumRelaxSolveIters(void* arkode_mem, long int* iters)
   return arkRelaxGetNumRelaxSolveIters(arkode_mem, iters);
 }
 
+
+/*===============================================================
+  DEPRECATED ERKStep optional input/output functions
+  ===============================================================*/
+
+/*---------------------------------------------------------------
+  ERKStepSetAdaptivityMethod: user should create/attach a
+  specific SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ERKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
+                               int pq, realtype adapt_params[3]) {
+  return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
+
+/*---------------------------------------------------------------
+  ERKStepSetAdaptivityFn: user should create/attach a custom
+  SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ERKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
+  return(arkSetAdaptivityFn(arkode_mem, hfun, h_data)); }
+
+/*---------------------------------------------------------------
+  ERKStepSetErrorBias: user should set this value directly in the
+  SUNAdaptController object.
+  ---------------------------------------------------------------*/
+int ERKStepSetErrorBias(void *arkode_mem, realtype bias) {
+  return(arkSetErrorBias(arkode_mem, bias)); }
+
+
 /*===============================================================
   ERKStep optional input functions -- stepper-specific
   ===============================================================*/
@@ -250,6 +275,7 @@ int ERKStepSetDefaults(void* arkode_mem)
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
   int retval;
+  long int lenrw, leniw;
 
   /* access ARKodeERKStepMem structure */
   retval = erkStep_AccessStepMem(arkode_mem, "ERKStepSetDefaults",
@@ -265,19 +291,48 @@ int ERKStepSetDefaults(void* arkode_mem)
     return(retval);
   }
 
+  /* Remove current SUNAdaptController object, and replace with "PI" */
+  retval = SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw -= leniw;
+    ark_mem->lrw -= lenrw;
+  }
+  if (ark_mem->hadapt_mem->owncontroller) {
+    retval = SUNAdaptController_Destroy(ark_mem->hadapt_mem->hcontroller);
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "ERKStepSetDefaults",
+                      "SUNAdaptController_Destroy failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+  ark_mem->hadapt_mem->hcontroller = NULL;
+  ark_mem->hadapt_mem->hcontroller = SUNAdaptController_PI(ark_mem->sunctx);
+  if (ark_mem->hadapt_mem->hcontroller == NULL) {
+    arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE::ERKStep",
+                    "ERKStepSetDefaults",
+                    "SUNAdaptControllerPI allocation failure");
+    return(ARK_MEM_FAIL);
+  }
+  ark_mem->hadapt_mem->owncontroller = SUNTRUE;
+  retval = SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw += leniw;
+    ark_mem->lrw += lenrw;
+  }
+
   /* Set default values for integrator optional inputs
      (overwrite some adaptivity params for ERKStep use) */
   step_mem->q = Q_DEFAULT;                     /* method order */
   step_mem->p = 0;                             /* embedding order */
+  step_mem->stages = 0;                        /* no stages */
+  step_mem->B = NULL;                          /* no Butcher table */
   ark_mem->hadapt_mem->etamxf  = RCONST(0.3);  /* max change on error-failed step */
-  ark_mem->hadapt_mem->imethod = ARK_ADAPT_PI; /* PI controller */
   ark_mem->hadapt_mem->safety  = RCONST(0.99); /* step adaptivity safety factor  */
-  ark_mem->hadapt_mem->bias    = RCONST(1.2);  /* step adaptivity error bias */
   ark_mem->hadapt_mem->growth  = RCONST(25.0); /* step adaptivity growth factor */
-  ark_mem->hadapt_mem->k1      = RCONST(0.8);  /* step adaptivity parameter */
-  ark_mem->hadapt_mem->k2      = RCONST(0.31); /* step adaptivity parameter */
-  step_mem->stages = 0;                        /* no stages */
-  step_mem->B = NULL;                          /* no Butcher table */
+  (void) SUNAdaptController_SetErrorBias(ark_mem->hadapt_mem->hcontroller, RCONST(1.2));
+  (void) SUNAdaptController_SetParams_PI(ark_mem->hadapt_mem->hcontroller,
+                                         RCONST(0.8), -RCONST(0.31));
   return(ARK_SUCCESS);
 }
 
diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
index e4285b6120..6cd8b85c25 100644
--- a/src/arkode/arkode_impl.h
+++ b/src/arkode/arkode_impl.h
@@ -25,6 +25,7 @@
 #include <arkode/arkode_butcher_erk.h>
 #include <sundials/sundials_context.h>
 #include <sundials/sundials_linearsolver.h>
+#include <sundials/sundials_adaptcontroller.h>
 
 #include "arkode_types_impl.h"
 #include "arkode_adapt_impl.h"
@@ -999,6 +1000,7 @@ int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr,
 int arkAccessHAdaptMem(void* arkode_mem, const char *fname,
                        ARKodeMem *ark_mem, ARKodeHAdaptMem *hadapt_mem);
 
+int arkSetAdaptController(void *arkode_mem, SUNAdaptController C);
 int arkSetDefaults(void *arkode_mem);
 int arkSetDenseOrder(void *arkode_mem, int dord);
 int arkSetInterpolantType(void *arkode_mem, int itype);
@@ -1026,6 +1028,7 @@ int arkSetPostprocessStageFn(void *arkode_mem,
                              ARKPostProcessFn ProcessStage);
 int arkSetConstraints(void *arkode_mem, N_Vector constraints);
 int arkSetMaxNumConstrFails(void *arkode_mem, int maxfails);
+int arkSetAdaptivityAdjustment(void *arkode_mem, int adjust);
 int arkSetCFLFraction(void *arkode_mem, realtype cfl_frac);
 int arkSetSafetyFactor(void *arkode_mem, realtype safety);
 int arkSetErrorBias(void *arkode_mem, realtype bias);
diff --git a/src/arkode/arkode_io.c b/src/arkode/arkode_io.c
index af230fb8e0..cc45123175 100644
--- a/src/arkode/arkode_io.c
+++ b/src/arkode/arkode_io.c
@@ -23,8 +23,11 @@
 
 #include "arkode_impl.h"
 #include "arkode_interp_impl.h"
+#include "arkode_user_controller.h"
 #include <sundials/sundials_math.h>
 #include <sundials/sundials_types.h>
+#include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
+#include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
 
 
 /*===============================================================
@@ -51,7 +54,7 @@ int arkSetDefaults(void *arkode_mem)
   ark_mem = (ARKodeMem) arkode_mem;
 
   /* Set default values for integrator optional inputs */
-  ark_mem->use_compensated_sums    = SUNFALSE; 
+  ark_mem->use_compensated_sums    = SUNFALSE;
   ark_mem->fixedstep               = SUNFALSE;       /* default to use adaptive steps */
   ark_mem->reltol                  = RCONST(1.e-4);  /* relative tolerance */
   ark_mem->itol                    = ARK_SS;         /* scalar-scalar solution tolerances */
@@ -90,21 +93,17 @@ int arkSetDefaults(void *arkode_mem)
   ark_mem->hadapt_mem->etamin      = ETAMIN;         /* min bound on time step reduction */
   ark_mem->hadapt_mem->small_nef   = SMALL_NEF;      /* num error fails before ETAMXF enforced */
   ark_mem->hadapt_mem->etacf       = ETACF;          /* max change on convergence failure */
-  ark_mem->hadapt_mem->HAdapt      = NULL;           /* step adaptivity fn */
-  ark_mem->hadapt_mem->HAdapt_data = NULL;           /* step adaptivity data */
-  ark_mem->hadapt_mem->imethod     = ARK_ADAPT_PID;  /* PID controller */
   ark_mem->hadapt_mem->cfl         = CFLFAC;         /* explicit stability factor */
   ark_mem->hadapt_mem->safety      = SAFETY;         /* step adaptivity safety factor  */
-  ark_mem->hadapt_mem->bias        = BIAS;           /* step adaptivity error bias */
   ark_mem->hadapt_mem->growth      = GROWTH;         /* step adaptivity growth factor */
   ark_mem->hadapt_mem->lbound      = HFIXED_LB;      /* step adaptivity no-change lower bound */
   ark_mem->hadapt_mem->ubound      = HFIXED_UB;      /* step adaptivity no-change upper bound */
-  ark_mem->hadapt_mem->k1          = AD0_K1;         /* step adaptivity parameter */
-  ark_mem->hadapt_mem->k2          = AD0_K2;         /* step adaptivity parameter */
-  ark_mem->hadapt_mem->k3          = AD0_K3;         /* step adaptivity parameter */
-  ark_mem->hadapt_mem->pq          = SUNFALSE;       /* use embedding order */
   ark_mem->hadapt_mem->expstab     = arkExpStab;     /* internal explicit stability fn */
   ark_mem->hadapt_mem->estab_data  = NULL;           /* no explicit stability fn data */
+  ark_mem->hadapt_mem->pq          = PQ;             /* embedding order */
+  ark_mem->hadapt_mem->p           = 0;              /* no default embedding order */
+  ark_mem->hadapt_mem->q           = 0;              /* no default method order */
+  ark_mem->hadapt_mem->adjust      = ADJUST;         /* controller order adjustment */
   return(ARK_SUCCESS);
 }
 
@@ -337,6 +336,67 @@ int arkSetDiagnostics(void *arkode_mem, FILE *diagfp)
 }
 
 
+/*---------------------------------------------------------------
+  arkSetAdaptController:
+
+  Specifies a non-default SUNAdaptController time step controller
+  object. If a NULL-valued SUNAdaptController is input, the
+  default will be re-enabled.
+  ---------------------------------------------------------------*/
+int arkSetAdaptController(void *arkode_mem, SUNAdaptController C)
+{
+  int retval;
+  long int lenrw, leniw;
+  ARKodeMem ark_mem;
+  if (arkode_mem==NULL) {
+    arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
+                    "arkSetAdaptController", MSG_ARK_NO_MEM);
+    return(ARK_MEM_NULL);
+  }
+  ark_mem = (ARKodeMem) arkode_mem;
+
+  /* Remove current SUNAdaptController object
+     (delete if owned, and then nullify pointer) */
+  retval = SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw -= leniw;
+    ark_mem->lrw -= lenrw;
+  }
+  if (ark_mem->hadapt_mem->owncontroller) {
+    retval = SUNAdaptController_Destroy(ark_mem->hadapt_mem->hcontroller);
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptController",
+                      "SUNAdaptController_Destroy failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+  ark_mem->hadapt_mem->hcontroller = NULL;
+
+  /* On NULL-valued input, create default SUNAdaptController object */
+  if (C == NULL) {
+    C = SUNAdaptController_PID(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptController",
+                      "SUNAdaptControllerPID allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    ark_mem->hadapt_mem->owncontroller = SUNTRUE;
+  } else {
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+  }
+
+  /* Attach new SUNAdaptController object */
+  retval = SUNAdaptController_Space(C, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw += leniw;
+    ark_mem->lrw += lenrw;
+  }
+  ark_mem->hadapt_mem->hcontroller = C;
+
+  return(ARK_SUCCESS);
+}
+
 /*---------------------------------------------------------------
   arkSetMaxNumSteps:
 
@@ -396,6 +456,7 @@ int arkSetMaxHnilWarns(void *arkode_mem, int mxhnil)
 int arkSetInitStep(void *arkode_mem, realtype hin)
 {
   ARKodeMem ark_mem;
+  int retval;
   if (arkode_mem==NULL) {
     arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
                     "arkSetInitStep", MSG_ARK_NO_MEM);
@@ -413,11 +474,9 @@ int arkSetInitStep(void *arkode_mem, realtype hin)
   /* Clear previous initial step */
   ark_mem->h0u = ZERO;
 
-  /* Clear error and step size history */
-  ark_mem->hadapt_mem->ehist[0] = ONE;
-  ark_mem->hadapt_mem->ehist[1] = ONE;
-  ark_mem->hadapt_mem->hhist[0] = ZERO;
-  ark_mem->hadapt_mem->hhist[1] = ZERO;
+  /* Reset error controller (e.g., error and step size history) */
+  retval = SUNAdaptController_Reset(ark_mem->hadapt_mem->hcontroller);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) { return(ARK_CONTROLLER_ERR); }
 
   return(ARK_SUCCESS);
 }
@@ -605,7 +664,7 @@ int arkSetFixedStep(void *arkode_mem, realtype hfixed)
     if (retval != ARK_SUCCESS) return(retval);
   }
 
-  /* set ark_mem entry */
+  /* set ark_mem "fixedstep" entry */
   if (hfixed != ZERO) {
     ark_mem->fixedstep = SUNTRUE;
     ark_mem->hin = hfixed;
@@ -613,6 +672,9 @@ int arkSetFixedStep(void *arkode_mem, realtype hfixed)
     ark_mem->fixedstep = SUNFALSE;
   }
 
+  /* Notify ARKODE to use hfixed as the initial step size, and return */
+  retval = arkSetInitStep(arkode_mem, hfixed);
+
   return(ARK_SUCCESS);
 }
 
@@ -775,16 +837,16 @@ int arkSetConstraints(void *arkode_mem, N_Vector constraints)
       constraints->ops->nvcompare     == NULL ||
       constraints->ops->nvconstrmask  == NULL ||
       constraints->ops->nvminquotient == NULL) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep",
-                    "ARKStepSetConstraints", MSG_ARK_BAD_NVECTOR);
+    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                    "arkSetConstraints", MSG_ARK_BAD_NVECTOR);
     return(ARK_ILL_INPUT);
   }
 
   /* Check the constraints vector */
   temptest = N_VMaxNorm(constraints);
   if ((temptest > RCONST(2.5)) || (temptest < HALF)) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep",
-                    "ARKStepSetConstraints", MSG_ARK_BAD_CONSTR);
+    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                    "arkSetConstraints", MSG_ARK_BAD_CONSTR);
     return(ARK_ILL_INPUT);
   }
 
@@ -826,6 +888,264 @@ int arkSetMaxNumConstrFails(void *arkode_mem, int maxfails)
 }
 
 
+/*---------------------------------------------------------------
+  arkSetAdaptivityMethod:  ***DEPRECATED***
+
+  Specifies the built-in time step adaptivity algorithm (and
+  optionally, its associated parameters) to use.  All parameters
+  will be checked for validity when used by the solver.
+
+  Users should transition to constructing non-default SUNAdaptController
+  objects directly, and providing those directly to the integrator
+  via the time-stepping module *SetController routines.
+  ---------------------------------------------------------------*/
+int arkSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
+                           int pq, realtype adapt_params[3])
+{
+  int retval;
+  long int lenrw, leniw;
+  realtype k1, k2, k3;
+  ARKodeMem ark_mem;
+  SUNAdaptController C;
+  if (arkode_mem==NULL) {
+    arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
+                    "arkSetController", MSG_ARK_NO_MEM);
+    return(ARK_MEM_NULL);
+  }
+  ark_mem = (ARKodeMem) arkode_mem;
+
+  /* Check for illegal inputs */
+  if ((idefault != 1) && (adapt_params == NULL)) {
+    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                    "arkSetAdaptivityMethod",
+                    "NULL-valued adapt_params provided");
+    return(ARK_ILL_INPUT);
+  }
+
+  /* Remove current SUNAdaptController object
+     (delete if owned, and then nullify pointer) */
+  retval = SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw -= leniw;
+    ark_mem->lrw -= lenrw;
+  }
+  if (ark_mem->hadapt_mem->owncontroller) {
+    retval = SUNAdaptController_Destroy(ark_mem->hadapt_mem->hcontroller);
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_Destroy failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+  ark_mem->hadapt_mem->hcontroller = NULL;
+
+  /* set adaptivity parameters from inputs */
+  k1 = k2 = k3 = ZERO;
+  if (idefault != 1) {
+    k1 = adapt_params[0];
+    k2 = adapt_params[1];
+    k3 = adapt_params[2];
+  }
+  ark_mem->hadapt_mem->pq = pq;
+
+  /* Create new SUNAdaptController object based on "imethod" input, optionally setting
+     the specified controller parameters */
+  C = NULL;
+  switch (imethod) {
+  case (ARK_ADAPT_PID):
+    C = SUNAdaptController_PID(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_PID allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_PID(C, k1, -k2, k3);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_PID failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  case (ARK_ADAPT_PI):
+    C = SUNAdaptController_PI(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_PI allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_PI(C, k1, -k2);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_PI failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  case (ARK_ADAPT_I):
+    C = SUNAdaptController_I(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_I allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_I(C, k1);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_I failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  case (ARK_ADAPT_EXP_GUS):
+    C = SUNAdaptController_ExpGus(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_ExpGus allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_ExpGus(C, k1, k2);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_ExpGus failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  case (ARK_ADAPT_IMP_GUS):
+    C = SUNAdaptController_ImpGus(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_ImpGus allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_ImpGus(C, k1, k2);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_ImpGus failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  case (ARK_ADAPT_IMEX_GUS):
+    C = SUNAdaptController_ImExGus(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityMethod",
+                      "SUNAdaptController_ImExGus allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+    if (idefault != 1) {
+      retval = SUNAdaptController_SetParams_ImExGus(C, k1, k2, k3, k3);
+      if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+        (void) SUNAdaptController_Destroy(C);
+        arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                        "arkSetAdaptivityMethod", "SUNAdaptController_SetParams_ImExGus failure");
+        return(ARK_CONTROLLER_ERR);
+      }
+    }
+    break;
+  default:
+    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
+                    "arkSetAdaptivityMethod", "Illegal imethod");
+    return(ARK_ILL_INPUT);
+  }
+
+  /* Attach new SUNAdaptController object */
+  retval = SUNAdaptController_Space(C, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw += leniw;
+    ark_mem->lrw += lenrw;
+  }
+  ark_mem->hadapt_mem->hcontroller = C;
+  ark_mem->hadapt_mem->owncontroller = SUNTRUE;
+
+  return(ARK_SUCCESS);
+}
+
+
+/*---------------------------------------------------------------
+  arkSetAdaptivityFn:  ***DEPRECATED***
+
+  Specifies the user-provided time step adaptivity function to use.
+  If 'hfun' is NULL-valued, then the default PID controller will
+  be used instead.
+
+  Users should transition to constructing a custom SUNAdaptController
+  object, and providing this directly to the integrator
+  via the time-stepping module *SetController routines.
+  ---------------------------------------------------------------*/
+int arkSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data)
+{
+  int retval;
+  long int lenrw, leniw;
+  ARKodeMem ark_mem;
+  SUNAdaptController C;
+  if (arkode_mem==NULL) {
+    arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
+                    "arkSetAdaptivityFn", MSG_ARK_NO_MEM);
+    return(ARK_MEM_NULL);
+  }
+  ark_mem = (ARKodeMem) arkode_mem;
+
+  /* Remove current SUNAdaptController object
+     (delete if owned, and then nullify pointer) */
+  retval = SUNAdaptController_Space(ark_mem->hadapt_mem->hcontroller, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw -= leniw;
+    ark_mem->lrw -= lenrw;
+  }
+  if (ark_mem->hadapt_mem->owncontroller) {
+    retval = SUNAdaptController_Destroy(ark_mem->hadapt_mem->hcontroller);
+    ark_mem->hadapt_mem->owncontroller = SUNFALSE;
+    if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityFn",
+                      "SUNAdaptController_Destroy failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+  ark_mem->hadapt_mem->hcontroller = NULL;
+
+  /* Create new SUNAdaptController object depending on NULL-ity of 'hfun' */
+  C = NULL;
+  if (hfun == NULL) {
+    C = SUNAdaptController_PID(ark_mem->sunctx);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityFn",
+                      "SUNAdaptController_PID allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+  } else {
+    C = ARKUserControl(ark_mem->sunctx, arkode_mem, hfun, h_data);
+    if (C == NULL) {
+      arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE", "arkSetAdaptivityFn",
+                      "ARKUserControl allocation failure");
+      return(ARK_MEM_FAIL);
+    }
+  }
+
+  /* Attach new SUNAdaptController object */
+  retval = SUNAdaptController_Space(C, &lenrw, &leniw);
+  if (retval == SUNADAPTCONTROLLER_SUCCESS) {
+    ark_mem->liw += leniw;
+    ark_mem->lrw += lenrw;
+  }
+  ark_mem->hadapt_mem->hcontroller = C;
+  ark_mem->hadapt_mem->owncontroller = SUNTRUE;
+
+  return(ARK_SUCCESS);
+}
+
 /*---------------------------------------------------------------
   arkSetCFLFraction:
 
@@ -861,6 +1181,30 @@ int arkSetCFLFraction(void *arkode_mem, realtype cfl_frac)
 }
 
 
+/*---------------------------------------------------------------
+  arkSetAdaptivityAdjustment:
+
+  Adjusts the method order supplied to the temporal adaptivity
+  controller.  For example, if the user expects order reduction
+  due to problem stiffness, they may request that the controller
+  assume a reduced order of accuracy for the method by specifying
+  a value adjust < 0.
+  ---------------------------------------------------------------*/
+int arkSetAdaptivityAdjustment(void *arkode_mem, int adjust)
+{
+  int retval;
+  ARKodeHAdaptMem hadapt_mem;
+  ARKodeMem ark_mem;
+  retval = arkAccessHAdaptMem(arkode_mem, "arkSetAdaptivityAdjustment",
+                              &ark_mem, &hadapt_mem);
+  if (retval != ARK_SUCCESS)  return(retval);
+
+  /* store requested adjustment */
+  hadapt_mem->adjust = adjust;
+  return(ARK_SUCCESS);
+}
+
+
 /*---------------------------------------------------------------
   arkSetSafetyFactor:
 
@@ -914,11 +1258,15 @@ int arkSetErrorBias(void *arkode_mem, realtype bias)
 
   /* set allowed value, otherwise set default */
   if (bias < ONE) {
-    hadapt_mem->bias = BIAS;
+    retval = SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, -1.0);
   } else {
-    hadapt_mem->bias = bias;
+    retval = SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, bias);
+  }
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+      arkProcessError(ark_mem, ARK_CONTROLLER_ERR, "ARKODE",
+                      "arkSetErrorBias", "SUNAdaptController_SetErrorBias failure");
+      return(ARK_CONTROLLER_ERR);
   }
-
   return(ARK_SUCCESS);
 }
 
@@ -1008,98 +1356,6 @@ int arkSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub)
 }
 
 
-/*---------------------------------------------------------------
-  arkSetAdaptivityMethod:
-
-  Specifies the built-in time step adaptivity algorithm (and
-  optionally, its associated parameters) to use.  All parameters
-  will be checked for validity when used by the solver.
-  ---------------------------------------------------------------*/
-int arkSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                           int pq, realtype adapt_params[3])
-{
-  int retval;
-  ARKodeHAdaptMem hadapt_mem;
-  ARKodeMem ark_mem;
-  retval = arkAccessHAdaptMem(arkode_mem, "arkSetAdaptivityMethod",
-                              &ark_mem, &hadapt_mem);
-  if (retval != ARK_SUCCESS)  return(retval);
-
-  /* check for allowable parameters */
-  if ((imethod > ARK_ADAPT_IMEX_GUS) || (imethod < ARK_ADAPT_PID)) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
-                    "arkSetAdaptivityMethod", "Illegal imethod");
-    return(ARK_ILL_INPUT);
-  }
-
-  /* set adaptivity method */
-  hadapt_mem->imethod = imethod;
-
-  /* set flag whether to use p (embedding, 0) or q (method, 1) order */
-  hadapt_mem->pq = (pq != 0);
-
-  /* set method parameters */
-  if (idefault == 1) {
-    switch (hadapt_mem->imethod) {
-    case (ARK_ADAPT_PID):
-      hadapt_mem->k1 = AD0_K1;
-      hadapt_mem->k2 = AD0_K2;
-      hadapt_mem->k3 = AD0_K3; break;
-    case (ARK_ADAPT_PI):
-      hadapt_mem->k1 = AD1_K1;
-      hadapt_mem->k2 = AD1_K2; break;
-    case (ARK_ADAPT_I):
-      hadapt_mem->k1 = AD2_K1; break;
-    case (ARK_ADAPT_EXP_GUS):
-      hadapt_mem->k1 = AD3_K1;
-      hadapt_mem->k2 = AD3_K2; break;
-    case (ARK_ADAPT_IMP_GUS):
-      hadapt_mem->k1 = AD4_K1;
-      hadapt_mem->k2 = AD4_K2; break;
-    case (ARK_ADAPT_IMEX_GUS):
-      hadapt_mem->k1 = AD5_K1;
-      hadapt_mem->k2 = AD5_K2;
-      hadapt_mem->k3 = AD5_K3; break;
-    }
-  } else {
-    hadapt_mem->k1 = adapt_params[0];
-    hadapt_mem->k2 = adapt_params[1];
-    hadapt_mem->k3 = adapt_params[2];
-  }
-
-  return(ARK_SUCCESS);
-}
-
-
-/*---------------------------------------------------------------
-  arkSetAdaptivityFn:
-
-  Specifies the user-provided time step adaptivity function to use.
-  ---------------------------------------------------------------*/
-int arkSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data)
-{
-  int retval;
-  ARKodeHAdaptMem hadapt_mem;
-  ARKodeMem ark_mem;
-  retval = arkAccessHAdaptMem(arkode_mem, "arkSetAdaptivityFn",
-                              &ark_mem, &hadapt_mem);
-  if (retval != ARK_SUCCESS)  return(retval);
-
-  /* NULL hfun sets default, otherwise set inputs */
-  if (hfun == NULL) {
-    hadapt_mem->HAdapt      = NULL;
-    hadapt_mem->HAdapt_data = NULL;
-    hadapt_mem->imethod     = ARK_ADAPT_PID;
-  } else {
-    hadapt_mem->HAdapt      = hfun;
-    hadapt_mem->HAdapt_data = h_data;
-    hadapt_mem->imethod     = ARK_ADAPT_CUSTOM;
-  }
-
-  return(ARK_SUCCESS);
-}
-
-
 /*---------------------------------------------------------------
   arkSetMaxFirstGrowth:
 
@@ -1835,6 +2091,9 @@ char *arkGetReturnFlagName(long int flag)
   case ARK_ROOT_RETURN:
     sprintf(name,"ARK_ROOT_RETURN");
     break;
+  case ARK_WARNING:
+    sprintf(name,"ARK_WARNING");
+    break;
   case ARK_TOO_MUCH_WORK:
     sprintf(name,"ARK_TOO_MUCH_WORK");
     break;
@@ -1889,6 +2148,9 @@ char *arkGetReturnFlagName(long int flag)
   case ARK_MASSMULT_FAIL:
     sprintf(name,"ARK_MASSMULT_FAIL");
     break;
+  case ARK_CONSTR_FAIL:
+    sprintf(name,"ARK_CONSTR_FAIL");
+    break;
   case ARK_MEM_FAIL:
     sprintf(name,"ARK_MEM_FAIL");
     break;
@@ -1913,12 +2175,6 @@ char *arkGetReturnFlagName(long int flag)
   case ARK_TOO_CLOSE:
     sprintf(name,"ARK_TOO_CLOSE");
     break;
-  case ARK_POSTPROCESS_STEP_FAIL:
-    sprintf(name,"ARK_POSTPROCESS_STEP_FAIL");
-    break;
-  case ARK_POSTPROCESS_STAGE_FAIL:
-    sprintf(name,"ARK_POSTPROCESS_STAGE_FAIL");
-    break;
   case ARK_VECTOROP_ERR:
     sprintf(name,"ARK_VECTOROP_ERR");
     break;
@@ -1928,6 +2184,9 @@ char *arkGetReturnFlagName(long int flag)
   case ARK_NLS_SETUP_FAIL:
     sprintf(name,"ARK_NLS_SETUP_FAIL");
     break;
+  case ARK_NLS_SETUP_RECVR:
+    sprintf(name,"ARK_NLS_SETUP_RECVR");
+    break;
   case ARK_NLS_OP_ERR:
     sprintf(name,"ARK_NLS_OP_ERR");
     break;
@@ -1937,6 +2196,36 @@ char *arkGetReturnFlagName(long int flag)
   case ARK_INNERSTEP_FAIL:
     sprintf(name,"ARK_INNERSTEP_FAIL");
     break;
+  case ARK_OUTERTOINNER_FAIL:
+    sprintf(name,"ARK_OUTERTOINNER_FAIL");
+    break;
+  case ARK_INNERTOOUTER_FAIL:
+    sprintf(name,"ARK_INNERTOOUTER_FAIL");
+    break;
+  case ARK_POSTPROCESS_STEP_FAIL:
+    sprintf(name,"ARK_POSTPROCESS_STEP_FAIL");
+    break;
+  case ARK_POSTPROCESS_STAGE_FAIL:
+    sprintf(name,"ARK_POSTPROCESS_STAGE_FAIL");
+    break;
+  case ARK_USER_PREDICT_FAIL:
+    sprintf(name,"ARK_USER_PREDICT_FAIL");
+    break;
+  case ARK_INTERP_FAIL:
+    sprintf(name,"ARK_INTERP_FAIL");
+    break;
+  case ARK_INVALID_TABLE:
+    sprintf(name,"ARK_INVALID_TABLE");
+    break;
+  case ARK_CONTEXT_ERR:
+    sprintf(name,"ARK_CONTEXT_ERR");
+    break;
+  case ARK_CONTROLLER_ERR:
+    sprintf(name,"ARK_CONTROLLER_ERR");
+    break;
+  case ARK_UNRECOGNIZED_ERROR:
+    sprintf(name,"ARK_UNRECOGNIZED_ERROR");
+    break;
   default:
     sprintf(name,"NONE");
   }
@@ -2005,24 +2294,16 @@ int arkWriteParameters(ARKodeMem ark_mem, FILE *fp)
           ark_mem->hadapt_mem->etacf);
   fprintf(fp, "  Explicit safety factor = %"RSYM"\n",
           ark_mem->hadapt_mem->cfl);
-  if (ark_mem->hadapt_mem->HAdapt == NULL) {
-    fprintf(fp, "  Time step adaptivity method %i\n", ark_mem->hadapt_mem->imethod);
-    fprintf(fp, "     Safety factor = %"RSYM"\n", ark_mem->hadapt_mem->safety);
-    fprintf(fp, "     Bias factor = %"RSYM"\n", ark_mem->hadapt_mem->bias);
-    fprintf(fp, "     Growth factor = %"RSYM"\n", ark_mem->hadapt_mem->growth);
-    fprintf(fp, "     Step growth lower bound = %"RSYM"\n", ark_mem->hadapt_mem->lbound);
-    fprintf(fp, "     Step growth upper bound = %"RSYM"\n", ark_mem->hadapt_mem->ubound);
-    fprintf(fp, "     k1 = %"RSYM"\n", ark_mem->hadapt_mem->k1);
-    fprintf(fp, "     k2 = %"RSYM"\n", ark_mem->hadapt_mem->k2);
-    fprintf(fp, "     k3 = %"RSYM"\n", ark_mem->hadapt_mem->k3);
-    if (ark_mem->hadapt_mem->expstab == arkExpStab) {
-      fprintf(fp, "  Default explicit stability function\n");
-    } else {
-      fprintf(fp, "  User provided explicit stability function\n");
-    }
-  } else {
-    fprintf(fp, "  User provided time step adaptivity function\n");
-  }
+  fprintf(fp, "  Safety factor = %"RSYM"\n", ark_mem->hadapt_mem->safety);
+  fprintf(fp, "  Growth factor = %"RSYM"\n", ark_mem->hadapt_mem->growth);
+  fprintf(fp, "  Step growth lower bound = %"RSYM"\n", ark_mem->hadapt_mem->lbound);
+  fprintf(fp, "  Step growth upper bound = %"RSYM"\n", ark_mem->hadapt_mem->ubound);
+  if (ark_mem->hadapt_mem->expstab == arkExpStab) {
+    fprintf(fp, "  Default explicit stability function\n");
+   } else {
+    fprintf(fp, "  User provided explicit stability function\n");
+  }
+  (void) SUNAdaptController_Write(ark_mem->hadapt_mem->hcontroller, fp);
 
   fprintf(fp, "  Maximum number of error test failures = %i\n",ark_mem->maxnef);
   fprintf(fp, "  Maximum number of convergence test failures = %i\n",ark_mem->maxncf);
diff --git a/src/arkode/arkode_user_controller.c b/src/arkode/arkode_user_controller.c
new file mode 100644
index 0000000000..ddf3cbd262
--- /dev/null
+++ b/src/arkode/arkode_user_controller.c
@@ -0,0 +1,155 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the implementation file for the ARKUserControl
+ * SUNAdaptController module.
+ * -----------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include "arkode_user_controller.h"
+
+
+/* ---------------
+ * Macro accessors
+ * --------------- */
+
+#define SC_CONTENT(C)     ( (ARKUserControlContent)(C->content) )
+#define SC_HP(C)          ( SC_CONTENT(C)->hp )
+#define SC_HPP(C)         ( SC_CONTENT(C)->hpp )
+#define SC_EP(C)          ( SC_CONTENT(C)->ep )
+#define SC_EPP(C)         ( SC_CONTENT(C)->epp )
+#define SC_ARKMEM(C)      ( SC_CONTENT(C)->ark_mem )
+#define SC_HADAPT(C)      ( SC_CONTENT(C)->hadapt )
+#define SC_DATA(C)        ( SC_CONTENT(C)->hadapt_data )
+
+
+/* -----------------------------------------------------------------
+ * exported functions
+ * ----------------------------------------------------------------- */
+
+/* -----------------------------------------------------------------
+ * Function to create a new ARKUserControl controller
+ */
+
+SUNAdaptController ARKUserControl(SUNContext sunctx, void* arkode_mem,
+                                  ARKAdaptFn hadapt, void* hadapt_data)
+{
+  SUNAdaptController C;
+  ARKUserControlContent content;
+
+  /* Return with failure if hadapt, arkode_mem, or context are NULL */
+  if ((hadapt == NULL) || (arkode_mem == NULL) || (sunctx == NULL)) { return (NULL); }
+
+  /* Create an empty controller object */
+  C = NULL;
+  C = SUNAdaptController_NewEmpty(sunctx);
+  if (C == NULL) { return (NULL); }
+
+  /* Attach operations */
+  C->ops->gettype      = SUNAdaptController_GetType_ARKUserControl;
+  C->ops->estimatestep = SUNAdaptController_EstimateStep_ARKUserControl;
+  C->ops->reset        = SUNAdaptController_Reset_ARKUserControl;
+  C->ops->write        = SUNAdaptController_Write_ARKUserControl;
+  C->ops->updateh      = SUNAdaptController_UpdateH_ARKUserControl;
+  C->ops->space        = SUNAdaptController_Space_ARKUserControl;
+
+  /* Create content */
+  content = NULL;
+  content = (ARKUserControlContent)malloc(sizeof *content);
+  if (content == NULL)
+  {
+    (void) SUNAdaptController_Destroy(C);
+    return (NULL);
+  }
+
+  /* Attach content */
+  C->content = content;
+
+  /* Attach ARKODE memory structure */
+  content->ark_mem = (ARKodeMem) arkode_mem;
+
+  /* Attach user-provided adaptivity function and data */
+  content->hadapt = hadapt;
+  content->hadapt_data = hadapt_data;
+
+  /* Fill content with default/reset values */
+  SUNAdaptController_Reset_ARKUserControl(C);
+
+  return (C);
+}
+
+
+/* -----------------------------------------------------------------
+ * implementation of controller operations
+ * ----------------------------------------------------------------- */
+
+SUNAdaptController_Type SUNAdaptController_GetType_ARKUserControl(SUNAdaptController C)
+{ return SUN_ADAPTCONTROLLER_H; }
+
+int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, realtype h,
+                                                   int p, realtype dsm, realtype* hnew)
+{
+  /* call user-provided function to compute new step */
+  sunrealtype ttmp = (dsm <= ONE) ? SC_ARKMEM(C)->tn + SC_ARKMEM(C)->h : SC_ARKMEM(C)->tn;
+  int retval = SC_HADAPT(C)(SC_ARKMEM(C)->ycur, ttmp, h, SC_HP(C),
+                            SC_HPP(C), dsm, SC_EP(C), SC_EPP(C),
+                            SC_ARKMEM(C)->hadapt_mem->q, SC_ARKMEM(C)->hadapt_mem->p,
+                            hnew, SC_DATA(C));
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) { return(SUNADAPTCONTROLLER_USER_FCN_FAIL); }
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Reset_ARKUserControl(SUNAdaptController C)
+{
+  SC_EP(C)  = RCONST(1.0);
+  SC_EPP(C) = RCONST(1.0);
+  SC_HP(C)  = RCONST(0.0);
+  SC_HPP(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Write_ARKUserControl(SUNAdaptController C, FILE *fptr)
+{
+  fprintf(fptr, "ARKUserControl module:\n");
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+  fprintf(fptr, "  hp = %12Lg\n", SC_HP(C));
+  fprintf(fptr, "  hpp = %12Lg\n", SC_HPP(C));
+  fprintf(fptr, "  ep = %12Lg\n", SC_EP(C));
+  fprintf(fptr, "  epp = %12Lg\n", SC_EPP(C));
+#else
+  fprintf(fptr, "  hp = %12g\n", SC_HP(C));
+  fprintf(fptr, "  hpp = %12g\n", SC_HPP(C));
+  fprintf(fptr, "  ep = %12g\n", SC_EP(C));
+  fprintf(fptr, "  epp = %12g\n", SC_EPP(C));
+#endif
+  fprintf(fptr, "  hadapt_data = %p\n", SC_DATA(C));
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, realtype h, realtype dsm)
+{
+  SC_HPP(C) = SC_HP(C);
+  SC_HP(C) = h;
+  SC_EPP(C) = SC_EP(C);
+  SC_EP(C) = dsm;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Space_ARKUserControl(SUNAdaptController C, long int* lenrw,
+                                            long int* leniw)
+{
+  *lenrw = 4;
+  *leniw = 2;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
diff --git a/src/arkode/arkode_user_controller.h b/src/arkode/arkode_user_controller.h
new file mode 100644
index 0000000000..201e622b70
--- /dev/null
+++ b/src/arkode/arkode_user_controller.h
@@ -0,0 +1,72 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the header file for a user-provided controller function
+ * SUNAdaptController module implementation.  This provides backwards-
+ * compatibility for ARKODE's previous "ARKAdaptFn"
+ * -----------------------------------------------------------------*/
+
+#ifndef _ARK_USERCONTROL_H
+#define _ARK_USERCONTROL_H
+
+#include <stdio.h>
+#include <sundials/sundials_adaptcontroller.h>
+#include "arkode_impl.h"
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/* ---------------------------------------------------
+ * ARKUserControl implementation of SUNAdaptController
+ * --------------------------------------------------- */
+
+struct _ARKUserControlContent {
+  realtype hp;        /* h from previous step */
+  realtype hpp;       /* h from 2 steps ago */
+  realtype ep;        /* error from previous step */
+  realtype epp;       /* error from 2 steps ago */
+  ARKodeMem ark_mem;  /* main ARKODE memory structure */
+  ARKAdaptFn hadapt;  /* user-provided adaptivity fn */
+  void* hadapt_data;  /* user-provided data pointer */
+};
+
+typedef struct _ARKUserControlContent *ARKUserControlContent;
+
+/* ------------------
+ * Exported Functions
+ * ------------------ */
+
+SUNDIALS_EXPORT
+SUNAdaptController ARKUserControl(SUNContext sunctx, void* arkode_mem,
+                                  ARKAdaptFn hadapt, void* hadapt_data);
+SUNDIALS_EXPORT
+SUNAdaptController_Type SUNAdaptController_GetType_ARKUserControl(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, realtype h,
+                                                   int p, realtype dsm, realtype* hnew);
+SUNDIALS_EXPORT
+int SUNAdaptController_Reset_ARKUserControl(SUNAdaptController C);
+SUNDIALS_EXPORT
+int SUNAdaptController_Write_ARKUserControl(SUNAdaptController C, FILE* fptr);
+SUNDIALS_EXPORT
+int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, realtype h, realtype dsm);
+SUNDIALS_EXPORT
+int SUNAdaptController_Space_ARKUserControl(SUNAdaptController C, long int *lenrw,
+                                            long int *leniw);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _ARK_USERCONTROL_H */
diff --git a/src/arkode/fmod/CMakeLists.txt b/src/arkode/fmod/CMakeLists.txt
index 5ac015daf1..840dfb2591 100644
--- a/src/arkode/fmod/CMakeLists.txt
+++ b/src/arkode/fmod/CMakeLists.txt
@@ -33,6 +33,8 @@ sundials_add_f2003_library(sundials_farkode_mod
   OBJECT_LIBRARIES
     sundials_fgeneric_mod_obj
     sundials_fnvecserial_mod_obj
+    sundials_fsunadaptcontrollersoderlind_mod_obj
+    sundials_fsunadaptcontrollerimexgus_mod_obj
     sundials_fsunmatrixband_mod_obj
     sundials_fsunmatrixdense_mod_obj
     sundials_fsunmatrixsparse_mod_obj
diff --git a/src/arkode/fmod/farkode_arkstep_mod.c b/src/arkode/fmod/farkode_arkstep_mod.c
index 2ae77231a3..311cea273e 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.c
+++ b/src/arkode/fmod/farkode_arkstep_mod.c
@@ -685,6 +685,34 @@ SWIGEXPORT int _wrap_FARKStepSetTableName(void *farg1, SwigArrayWrapper *farg2,
 }
 
 
+SWIGEXPORT int _wrap_FARKStepSetAdaptController(void *farg1, SUNAdaptController farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  SUNAdaptController arg2 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (void *)(farg1);
+  arg2 = (SUNAdaptController)(farg2);
+  result = (int)ARKStepSetAdaptController(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FARKStepSetAdaptivityAdjustment(void *farg1, int const *farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (void *)(farg1);
+  arg2 = (int)(*farg2);
+  result = (int)ARKStepSetAdaptivityAdjustment(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FARKStepSetCFLFraction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/arkode/fmod/farkode_arkstep_mod.f90 b/src/arkode/fmod/farkode_arkstep_mod.f90
index c52006c929..08ee14cc0a 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.f90
+++ b/src/arkode/fmod/farkode_arkstep_mod.f90
@@ -34,6 +34,7 @@ module farkode_arkstep_mod
  use fsundials_context_mod
  use fsundials_types_mod
  use fsundials_nonlinearsolver_mod
+ use fsundials_adaptcontroller_mod
  use fsundials_types_mod
  implicit none
  private
@@ -44,7 +45,9 @@ module farkode_arkstep_mod
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_4 = ARKODE_ZONNEVELD_5_3_4
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_5 = ARKODE_CASH_KARP_6_4_5
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_8_5_6
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_13_7_8
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_2 = ARKODE_SDIRK_2_1_2
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ARK324L2SA_DIRK_4_2_3
  integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_4 = ARKODE_SDIRK_5_3_4
@@ -91,6 +94,8 @@ module farkode_arkstep_mod
   integer(C_SIZE_T), public :: size = 0
  end type
  public :: FARKStepSetTableName
+ public :: FARKStepSetAdaptController
+ public :: FARKStepSetAdaptivityAdjustment
  public :: FARKStepSetCFLFraction
  public :: FARKStepSetSafetyFactor
  public :: FARKStepSetErrorBias
@@ -518,6 +523,24 @@ function swigc_FARKStepSetTableName(farg1, farg2, farg3) &
 integer(C_INT) :: fresult
 end function
 
+function swigc_FARKStepSetAdaptController(farg1, farg2) &
+bind(C, name="_wrap_FARKStepSetAdaptController") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FARKStepSetAdaptivityAdjustment(farg1, farg2) &
+bind(C, name="_wrap_FARKStepSetAdaptivityAdjustment") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
 function swigc_FARKStepSetCFLFraction(farg1, farg2) &
 bind(C, name="_wrap_FARKStepSetCFLFraction") &
 result(fresult)
@@ -2345,6 +2368,38 @@ function FARKStepSetTableName(arkode_mem, itable, etable) &
 swig_result = fresult
 end function
 
+function FARKStepSetAdaptController(arkode_mem, c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = arkode_mem
+farg2 = c_loc(c)
+fresult = swigc_FARKStepSetAdaptController(farg1, farg2)
+swig_result = fresult
+end function
+
+function FARKStepSetAdaptivityAdjustment(arkode_mem, adjust) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+integer(C_INT), intent(in) :: adjust
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+integer(C_INT) :: farg2 
+
+farg1 = arkode_mem
+farg2 = adjust
+fresult = swigc_FARKStepSetAdaptivityAdjustment(farg1, farg2)
+swig_result = fresult
+end function
+
 function FARKStepSetCFLFraction(arkode_mem, cfl_frac) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/arkode/fmod/farkode_erkstep_mod.c b/src/arkode/fmod/farkode_erkstep_mod.c
index 46836ba780..8a6be0ea0f 100644
--- a/src/arkode/fmod/farkode_erkstep_mod.c
+++ b/src/arkode/fmod/farkode_erkstep_mod.c
@@ -479,6 +479,34 @@ SWIGEXPORT int _wrap_FERKStepSetTableName(void *farg1, SwigArrayWrapper *farg2)
 }
 
 
+SWIGEXPORT int _wrap_FERKStepSetAdaptController(void *farg1, SUNAdaptController farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  SUNAdaptController arg2 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (void *)(farg1);
+  arg2 = (SUNAdaptController)(farg2);
+  result = (int)ERKStepSetAdaptController(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FERKStepSetAdaptivityAdjustment(void *farg1, int const *farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  int arg2 ;
+  int result;
+  
+  arg1 = (void *)(farg1);
+  arg2 = (int)(*farg2);
+  result = (int)ERKStepSetAdaptivityAdjustment(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FERKStepSetCFLFraction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/arkode/fmod/farkode_erkstep_mod.f90 b/src/arkode/fmod/farkode_erkstep_mod.f90
index 3857ac1a7d..d7f2b4fa8b 100644
--- a/src/arkode/fmod/farkode_erkstep_mod.f90
+++ b/src/arkode/fmod/farkode_erkstep_mod.f90
@@ -34,6 +34,7 @@ module farkode_erkstep_mod
  use fsundials_context_mod
  use fsundials_types_mod
  use fsundials_nonlinearsolver_mod
+ use fsundials_adaptcontroller_mod
  use fsundials_types_mod
  implicit none
  private
@@ -44,7 +45,9 @@ module farkode_erkstep_mod
  integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_4 = ARKODE_ZONNEVELD_5_3_4
  integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_5 = ARKODE_CASH_KARP_6_4_5
  integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_6 = ARKODE_VERNER_8_5_6
+ integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7
  integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8
+ integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9
  public :: FERKStepCreate
  public :: FERKStepResize
  public :: FERKStepReInit
@@ -65,6 +68,8 @@ module farkode_erkstep_mod
   integer(C_SIZE_T), public :: size = 0
  end type
  public :: FERKStepSetTableName
+ public :: FERKStepSetAdaptController
+ public :: FERKStepSetAdaptivityAdjustment
  public :: FERKStepSetCFLFraction
  public :: FERKStepSetSafetyFactor
  public :: FERKStepSetErrorBias
@@ -300,6 +305,24 @@ function swigc_FERKStepSetTableName(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
+function swigc_FERKStepSetAdaptController(farg1, farg2) &
+bind(C, name="_wrap_FERKStepSetAdaptController") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FERKStepSetAdaptivityAdjustment(farg1, farg2) &
+bind(C, name="_wrap_FERKStepSetAdaptivityAdjustment") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
 function swigc_FERKStepSetCFLFraction(farg1, farg2) &
 bind(C, name="_wrap_FERKStepSetCFLFraction") &
 result(fresult)
@@ -1319,6 +1342,38 @@ function FERKStepSetTableName(arkode_mem, etable) &
 swig_result = fresult
 end function
 
+function FERKStepSetAdaptController(arkode_mem, c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = arkode_mem
+farg2 = c_loc(c)
+fresult = swigc_FERKStepSetAdaptController(farg1, farg2)
+swig_result = fresult
+end function
+
+function FERKStepSetAdaptivityAdjustment(arkode_mem, adjust) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+integer(C_INT), intent(in) :: adjust
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+integer(C_INT) :: farg2 
+
+farg1 = arkode_mem
+farg2 = adjust
+fresult = swigc_FERKStepSetAdaptivityAdjustment(farg1, farg2)
+swig_result = fresult
+end function
+
 function FERKStepSetCFLFraction(arkode_mem, cfl_frac) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/arkode/fmod/farkode_mod.f90 b/src/arkode/fmod/farkode_mod.f90
index 5ca5dcc9f2..31610f9ac4 100644
--- a/src/arkode/fmod/farkode_mod.f90
+++ b/src/arkode/fmod/farkode_mod.f90
@@ -33,6 +33,7 @@ module farkode_mod
  use fsundials_context_mod
  use fsundials_types_mod
  use fsundials_nonlinearsolver_mod
+ use fsundials_adaptcontroller_mod
  use fsundials_types_mod
  implicit none
  private
@@ -104,6 +105,7 @@ module farkode_mod
  integer(C_INT), parameter, public :: ARK_RELAX_MEM_NULL = -44_C_INT
  integer(C_INT), parameter, public :: ARK_RELAX_FUNC_FAIL = -45_C_INT
  integer(C_INT), parameter, public :: ARK_RELAX_JAC_FAIL = -46_C_INT
+ integer(C_INT), parameter, public :: ARK_CONTROLLER_ERR = -47_C_INT
  integer(C_INT), parameter, public :: ARK_UNRECOGNIZED_ERROR = -99_C_INT
  ! typedef enum ARKRelaxSolver
  enum, bind(c)
@@ -236,7 +238,7 @@ module farkode_mod
  integer(C_INT), parameter, public :: ARK437L2SA_ERK_7_3_4 = 13_C_INT
  integer(C_INT), parameter, public :: ARK548L2SAb_ERK_8_4_5 = 14_C_INT
  integer(C_INT), parameter, public :: MIN_ERK_NUM = 0_C_INT
- integer(C_INT), parameter, public :: MAX_ERK_NUM = 14_C_INT
+ integer(C_INT), parameter, public :: MAX_ERK_NUM = 21_C_INT
  ! typedef enum ARKODE_ERKTableID
  enum, bind(c)
   enumerator :: ARKODE_ERK_NONE = -1
@@ -257,14 +259,21 @@ module farkode_mod
   enumerator :: ARKODE_ARK437L2SA_ERK_7_3_4
   enumerator :: ARKODE_ARK548L2SAb_ERK_8_4_5
   enumerator :: ARKODE_ARK2_ERK_3_1_2
-  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_ARK2_ERK_3_1_2
+  enumerator :: ARKODE_SOFRONIOU_SPALETTA_5_3_4
+  enumerator :: ARKODE_SHU_OSHER_3_2_3
+  enumerator :: ARKODE_VERNER_9_5_6
+  enumerator :: ARKODE_VERNER_10_6_7
+  enumerator :: ARKODE_VERNER_13_7_8
+  enumerator :: ARKODE_VERNER_16_8_9
+  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_VERNER_16_8_9
  end enum
  integer, parameter, public :: ARKODE_ERKTableID = kind(ARKODE_ERK_NONE)
  public :: ARKODE_ERK_NONE, ARKODE_MIN_ERK_NUM, ARKODE_HEUN_EULER_2_1_2, ARKODE_BOGACKI_SHAMPINE_4_2_3, &
     ARKODE_ARK324L2SA_ERK_4_2_3, ARKODE_ZONNEVELD_5_3_4, ARKODE_ARK436L2SA_ERK_6_3_4, ARKODE_SAYFY_ABURUB_6_3_4, &
     ARKODE_CASH_KARP_6_4_5, ARKODE_FEHLBERG_6_4_5, ARKODE_DORMAND_PRINCE_7_4_5, ARKODE_ARK548L2SA_ERK_8_4_5, &
     ARKODE_VERNER_8_5_6, ARKODE_FEHLBERG_13_7_8, ARKODE_KNOTH_WOLKE_3_3, ARKODE_ARK437L2SA_ERK_7_3_4, &
-    ARKODE_ARK548L2SAb_ERK_8_4_5, ARKODE_ARK2_ERK_3_1_2, ARKODE_MAX_ERK_NUM
+    ARKODE_ARK548L2SAb_ERK_8_4_5, ARKODE_ARK2_ERK_3_1_2, ARKODE_SOFRONIOU_SPALETTA_5_3_4, ARKODE_SHU_OSHER_3_2_3, &
+    ARKODE_VERNER_9_5_6, ARKODE_VERNER_10_6_7, ARKODE_VERNER_13_7_8, ARKODE_VERNER_16_8_9, ARKODE_MAX_ERK_NUM
  public :: FARKodeButcherTable_LoadERK
  public :: FARKodeButcherTable_LoadERKByName
  ! typedef enum ARKODE_SPRKMethodID
diff --git a/src/arkode/fmod/farkode_mristep_mod.f90 b/src/arkode/fmod/farkode_mristep_mod.f90
index b80ca727f8..6db939a4b7 100644
--- a/src/arkode/fmod/farkode_mristep_mod.f90
+++ b/src/arkode/fmod/farkode_mristep_mod.f90
@@ -34,6 +34,7 @@ module farkode_mristep_mod
  use fsundials_context_mod
  use fsundials_types_mod
  use fsundials_nonlinearsolver_mod
+ use fsundials_adaptcontroller_mod
  use fsundials_types_mod
  implicit none
  private
diff --git a/src/arkode/fmod/farkode_sprkstep_mod.f90 b/src/arkode/fmod/farkode_sprkstep_mod.f90
index ad9795aba2..7598cdc481 100644
--- a/src/arkode/fmod/farkode_sprkstep_mod.f90
+++ b/src/arkode/fmod/farkode_sprkstep_mod.f90
@@ -34,6 +34,7 @@ module farkode_sprkstep_mod
  use fsundials_context_mod
  use fsundials_types_mod
  use fsundials_nonlinearsolver_mod
+ use fsundials_adaptcontroller_mod
  use fsundials_types_mod
  implicit none
  private
diff --git a/src/sunadaptcontroller/CMakeLists.txt b/src/sunadaptcontroller/CMakeLists.txt
new file mode 100644
index 0000000000..8287f3da3d
--- /dev/null
+++ b/src/sunadaptcontroller/CMakeLists.txt
@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+# Programmer(s): Daniel R. Reynolds @ SMU
+# ------------------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ------------------------------------------------------------------------------
+# controller level CMakeLists.txt for SUNDIALS
+# ------------------------------------------------------------------------------
+
+# required native matrices
+add_subdirectory(imexgus)
+add_subdirectory(soderlind)
diff --git a/src/sunadaptcontroller/imexgus/CMakeLists.txt b/src/sunadaptcontroller/imexgus/CMakeLists.txt
new file mode 100644
index 0000000000..a98374f2a3
--- /dev/null
+++ b/src/sunadaptcontroller/imexgus/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ---------------------------------------------------------------
+# Programmer(s): Daniel R. Reynolds @ SMU
+# ---------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ---------------------------------------------------------------
+
+# Create a library out of the generic sundials modules
+sundials_add_library(sundials_sunadaptcontrollerimexgus
+  SOURCES
+    sunadaptcontroller_imexgus.c
+  HEADERS
+    ${SUNDIALS_SOURCE_DIR}/include/sunadaptcontroller/sunadaptcontroller_imexgus.h
+  INCLUDE_SUBDIR
+    sunadaptcontroller
+  OBJECT_LIB_ONLY
+)
+
+# Add F2003 module if the interface is enabled
+if(BUILD_FORTRAN_MODULE_INTERFACE)
+  add_subdirectory(fmod)
+endif()
diff --git a/src/sunadaptcontroller/imexgus/fmod/CMakeLists.txt b/src/sunadaptcontroller/imexgus/fmod/CMakeLists.txt
new file mode 100644
index 0000000000..7c943d4724
--- /dev/null
+++ b/src/sunadaptcontroller/imexgus/fmod/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ---------------------------------------------------------------
+# Programmer(s): Daniel R. Reynolds @ SMU
+# ---------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ---------------------------------------------------------------
+
+sundials_add_f2003_library(sundials_fsunadaptcontrollerimexgus_mod
+  SOURCES
+    fsunadaptcontroller_imexgus_mod.f90 fsunadaptcontroller_imexgus_mod.c
+  OBJECT_LIBRARIES
+    sundials_fgeneric_mod_obj
+  OUTPUT_NAME
+    sundials_fsunadaptcontrollerimexgus_mod
+  OBJECT_LIB_ONLY
+)
+
+message(STATUS "Added SUNAdaptController_ImExGus F2003 interface")
diff --git a/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.c b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.c
new file mode 100644
index 0000000000..18ab594868
--- /dev/null
+++ b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.c
@@ -0,0 +1,359 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.0
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------
+ * Programmer(s): Auto-generated by swig.
+ * ---------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -------------------------------------------------------------*/
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* qualifier for exported *const* global data variables*/
+#ifndef SWIGEXTERN
+# ifdef __cplusplus
+#   define SWIGEXTERN extern
+# else
+#   define SWIGEXTERN
+# endif
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+#include <assert.h>
+#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
+ { printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
+
+
+#include <stdio.h>
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+# ifndef snprintf
+#  define snprintf _snprintf
+# endif
+#endif
+
+
+/* Support for the `contract` feature.
+ *
+ * Note that RETURNNULL is first because it's inserted via a 'Replaceall' in
+ * the fortran.cxx file.
+ */
+#define SWIG_contract_assert(RETURNNULL, EXPR, MSG) \
+ if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } 
+
+
+#define SWIGVERSION 0x040000 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+
+
+#include "sundials/sundials_adaptcontroller.h"
+
+
+#include "sunadaptcontroller/sunadaptcontroller_imexgus.h"
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_ImExGus(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_ImExGus(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_ImExGus(SUNAdaptController farg1, double const *farg2, double const *farg3, double const *farg4, double const *farg5) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
+  sunrealtype arg5 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  arg5 = (sunrealtype)(*farg5);
+  result = (int)SUNAdaptController_SetParams_ImExGus(arg1,arg2,arg3,arg4,arg5);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_GetType_ImExGus(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  SUNAdaptController_Type result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (SUNAdaptController_Type)SUNAdaptController_GetType_ImExGus(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_EstimateStep_ImExGus(SUNAdaptController farg1, double const *farg2, int const *farg3, double const *farg4, double *farg5) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int arg3 ;
+  sunrealtype arg4 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (int)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  arg5 = (sunrealtype *)(farg5);
+  result = (int)SUNAdaptController_EstimateStep_ImExGus(arg1,arg2,arg3,arg4,arg5);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Reset_ImExGus(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_Reset_ImExGus(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetDefaults_ImExGus(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_SetDefaults_ImExGus(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Write_ImExGus(SUNAdaptController farg1, void *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  FILE *arg2 = (FILE *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (FILE *)(farg2);
+  result = (int)SUNAdaptController_Write_ImExGus(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetErrorBias_ImExGus(SUNAdaptController farg1, double const *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  result = (int)SUNAdaptController_SetErrorBias_ImExGus(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_UpdateH_ImExGus(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_UpdateH_ImExGus(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Space_ImExGus(SUNAdaptController farg1, long *farg2, long *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  long *arg2 = (long *) 0 ;
+  long *arg3 = (long *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (long *)(farg2);
+  arg3 = (long *)(farg3);
+  result = (int)SUNAdaptController_Space_ImExGus(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+
diff --git a/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90 b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
new file mode 100644
index 0000000000..11443858ac
--- /dev/null
+++ b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
@@ -0,0 +1,315 @@
+! This file was automatically generated by SWIG (http://www.swig.org).
+! Version 4.0.0
+!
+! Do not make changes to this file unless you know what you are doing--modify
+! the SWIG interface file instead.
+
+! ---------------------------------------------------------------
+! Programmer(s): Auto-generated by swig.
+! ---------------------------------------------------------------
+! SUNDIALS Copyright Start
+! Copyright (c) 2002-2023, Lawrence Livermore National Security
+! and Southern Methodist University.
+! All rights reserved.
+!
+! See the top-level LICENSE and NOTICE files for details.
+!
+! SPDX-License-Identifier: BSD-3-Clause
+! SUNDIALS Copyright End
+! ---------------------------------------------------------------
+
+module fsunadaptcontroller_imexgus_mod
+ use, intrinsic :: ISO_C_BINDING
+ use fsundials_adaptcontroller_mod
+ use fsundials_types_mod
+ use fsundials_context_mod
+ implicit none
+ private
+
+ ! DECLARATION CONSTRUCTS
+ public :: FSUNAdaptController_ImExGus
+ public :: FSUNAdaptController_SetParams_ImExGus
+ public :: FSUNAdaptController_GetType_ImExGus
+ public :: FSUNAdaptController_EstimateStep_ImExGus
+ public :: FSUNAdaptController_Reset_ImExGus
+ public :: FSUNAdaptController_SetDefaults_ImExGus
+ public :: FSUNAdaptController_Write_ImExGus
+ public :: FSUNAdaptController_SetErrorBias_ImExGus
+ public :: FSUNAdaptController_UpdateH_ImExGus
+ public :: FSUNAdaptController_Space_ImExGus
+
+! WRAPPER DECLARATIONS
+interface
+function swigc_FSUNAdaptController_ImExGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_ImExGus(farg1, farg2, farg3, farg4, farg5) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+real(C_DOUBLE), intent(in) :: farg5
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_GetType_ImExGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_GetType_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_EstimateStep_ImExGus(farg1, farg2, farg3, farg4, farg5) &
+bind(C, name="_wrap_FSUNAdaptController_EstimateStep_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+type(C_PTR), value :: farg5
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Reset_ImExGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_Reset_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetDefaults_ImExGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_SetDefaults_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Write_ImExGus(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_Write_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetErrorBias_ImExGus(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_SetErrorBias_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_UpdateH_ImExGus(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_UpdateH_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Space_ImExGus(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_Space_ImExGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+integer(C_INT) :: fresult
+end function
+
+end interface
+
+
+contains
+ ! MODULE SUBPROGRAMS
+function FSUNAdaptController_ImExGus(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_ImExGus(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_ImExGus(c, k1e, k2e, k1i, k2i) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1e
+real(C_DOUBLE), intent(in) :: k2e
+real(C_DOUBLE), intent(in) :: k1i
+real(C_DOUBLE), intent(in) :: k2i
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+real(C_DOUBLE) :: farg4 
+real(C_DOUBLE) :: farg5 
+
+farg1 = c_loc(c)
+farg2 = k1e
+farg3 = k2e
+farg4 = k1i
+farg5 = k2i
+fresult = swigc_FSUNAdaptController_SetParams_ImExGus(farg1, farg2, farg3, farg4, farg5)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_GetType_ImExGus(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(SUNAdaptController_Type) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_GetType_ImExGus(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_EstimateStep_ImExGus(c, h, p, dsm, hnew) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+integer(C_INT), intent(in) :: p
+real(C_DOUBLE), intent(in) :: dsm
+real(C_DOUBLE), target, intent(inout) :: hnew
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+integer(C_INT) :: farg3 
+real(C_DOUBLE) :: farg4 
+type(C_PTR) :: farg5 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = p
+farg4 = dsm
+farg5 = c_loc(hnew)
+fresult = swigc_FSUNAdaptController_EstimateStep_ImExGus(farg1, farg2, farg3, farg4, farg5)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Reset_ImExGus(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_Reset_ImExGus(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetDefaults_ImExGus(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_SetDefaults_ImExGus(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Write_ImExGus(c, fptr) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+type(C_PTR) :: fptr
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = fptr
+fresult = swigc_FSUNAdaptController_Write_ImExGus(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetErrorBias_ImExGus(c, bias) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: bias
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = bias
+fresult = swigc_FSUNAdaptController_SetErrorBias_ImExGus(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_UpdateH_ImExGus(c, h, dsm) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+real(C_DOUBLE), intent(in) :: dsm
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = dsm
+fresult = swigc_FSUNAdaptController_UpdateH_ImExGus(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Space_ImExGus(c, lenrw, leniw) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_LONG), dimension(*), target, intent(inout) :: lenrw
+integer(C_LONG), dimension(*), target, intent(inout) :: leniw
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = c_loc(lenrw(1))
+farg3 = c_loc(leniw(1))
+fresult = swigc_FSUNAdaptController_Space_ImExGus(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+
+end module
diff --git a/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c b/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
new file mode 100644
index 0000000000..9f9f1d39ab
--- /dev/null
+++ b/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
@@ -0,0 +1,230 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the implementation file for the SUNAdaptController_ImExGus
+ * module.
+ * -----------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sunadaptcontroller/sunadaptcontroller_imexgus.h>
+#include <sundials/sundials_math.h>
+
+
+/* ---------------
+ * Macro accessors
+ * --------------- */
+
+#define SACIMEXGUS_CONTENT(C)     ( (SUNAdaptControllerContent_ImExGus)(C->content) )
+#define SACIMEXGUS_K1E(C)         ( SACIMEXGUS_CONTENT(C)->k1e )
+#define SACIMEXGUS_K2E(C)         ( SACIMEXGUS_CONTENT(C)->k2e )
+#define SACIMEXGUS_K1I(C)         ( SACIMEXGUS_CONTENT(C)->k1i )
+#define SACIMEXGUS_K2I(C)         ( SACIMEXGUS_CONTENT(C)->k2i )
+#define SACIMEXGUS_BIAS(C)        ( SACIMEXGUS_CONTENT(C)->bias )
+#define SACIMEXGUS_EP(C)          ( SACIMEXGUS_CONTENT(C)->ep )
+#define SACIMEXGUS_HP(C)          ( SACIMEXGUS_CONTENT(C)->hp )
+#define SACIMEXGUS_FIRSTSTEP(C)   ( SACIMEXGUS_CONTENT(C)->firststep )
+
+/* ------------------
+ * Default parameters
+ * ------------------ */
+
+#define DEFAULT_K1E    RCONST(0.367)
+#define DEFAULT_K2E    RCONST(0.268)
+#define DEFAULT_K1I    RCONST(0.95)
+#define DEFAULT_K2I    RCONST(0.95)
+#define DEFAULT_BIAS   RCONST(1.5)
+#define TINY           RCONST(1.0e-10)
+
+
+/* -----------------------------------------------------------------
+ * exported functions
+ * ----------------------------------------------------------------- */
+
+/* -----------------------------------------------------------------
+ * Function to create a new ImExGus controller
+ */
+
+SUNAdaptController SUNAdaptController_ImExGus(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  SUNAdaptControllerContent_ImExGus content;
+
+  if (sunctx == NULL) { return NULL; }
+
+  /* Create an empty controller object */
+  C = NULL;
+  C = SUNAdaptController_NewEmpty(sunctx);
+  if (C == NULL) { return (NULL); }
+
+  /* Attach operations */
+  C->ops->gettype        = SUNAdaptController_GetType_ImExGus;
+  C->ops->estimatestep   = SUNAdaptController_EstimateStep_ImExGus;
+  C->ops->reset          = SUNAdaptController_Reset_ImExGus;
+  C->ops->setdefaults    = SUNAdaptController_SetDefaults_ImExGus;
+  C->ops->write          = SUNAdaptController_Write_ImExGus;
+  C->ops->seterrorbias   = SUNAdaptController_SetErrorBias_ImExGus;
+  C->ops->updateh        = SUNAdaptController_UpdateH_ImExGus;
+  C->ops->space          = SUNAdaptController_Space_ImExGus;
+
+  /* Create content */
+  content = NULL;
+  content = (SUNAdaptControllerContent_ImExGus)malloc(sizeof *content);
+  if (content == NULL)
+  {
+    (void) SUNAdaptController_Destroy(C);
+    return (NULL);
+  }
+
+  /* Attach content */
+  C->content = content;
+
+  /* Fill content with default/reset values */
+  SUNAdaptController_SetDefaults_ImExGus(C);
+  SUNAdaptController_Reset_ImExGus(C);
+
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set ImExGus parameters
+ */
+
+int SUNAdaptController_SetParams_ImExGus(SUNAdaptController C,
+                                         sunrealtype k1e, sunrealtype k2e,
+                                         sunrealtype k1i, sunrealtype k2i)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SACIMEXGUS_K1E(C) = k1e;
+  SACIMEXGUS_K2E(C) = k2e;
+  SACIMEXGUS_K1I(C) = k1i;
+  SACIMEXGUS_K2I(C) = k2i;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+
+
+/* -----------------------------------------------------------------
+ * implementation of controller operations
+ * ----------------------------------------------------------------- */
+
+SUNAdaptController_Type SUNAdaptController_GetType_ImExGus(SUNAdaptController C)
+{ return SUN_ADAPTCONTROLLER_H; }
+
+int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,
+                                            int p, sunrealtype dsm, sunrealtype* hnew)
+{
+  /* order parameter to use */
+  const int ord = p + 1;
+
+  /* set usable time-step adaptivity parameters -- first step */
+  const sunrealtype k = -RCONST(1.0) / ord;
+  const sunrealtype e = SUNMAX(SACIMEXGUS_BIAS(C) * dsm, TINY);
+
+  /* set usable time-step adaptivity parameters -- subsequent steps */
+  const sunrealtype k1e = -SACIMEXGUS_K1E(C) / ord;
+  const sunrealtype k2e = -SACIMEXGUS_K2E(C) / ord;
+  const sunrealtype k1i = -SACIMEXGUS_K1I(C) / ord;
+  const sunrealtype k2i = -SACIMEXGUS_K2I(C) / ord;
+  const sunrealtype e1 = SUNMAX(SACIMEXGUS_BIAS(C) * dsm, TINY);
+  const sunrealtype e2 = e1 / SUNMAX(SACIMEXGUS_EP(C), TINY);
+  const sunrealtype hrat = h / SACIMEXGUS_HP(C);
+
+  if (C == NULL || hnew == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+
+  /* compute estimated time step size, modifying the first step formula */
+  if (SACIMEXGUS_FIRSTSTEP(C))
+  {
+    *hnew = h * SUNRpowerR(e,k);
+  }
+  else
+  {
+    *hnew = h * SUNMIN(hrat * SUNRpowerR(e1,k1i) * SUNRpowerR(e2,k2i),
+                       SUNRpowerR(e1,k1e) * SUNRpowerR(e2,k2e));
+  }
+
+  /* return with success */
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Reset_ImExGus(SUNAdaptController C)
+{
+  SACIMEXGUS_EP(C) = RCONST(1.0);
+  SACIMEXGUS_FIRSTSTEP(C) = SUNTRUE;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_SetDefaults_ImExGus(SUNAdaptController C)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SACIMEXGUS_K1E(C)    = DEFAULT_K1E;
+  SACIMEXGUS_K2E(C)    = DEFAULT_K2E;
+  SACIMEXGUS_K1I(C)    = DEFAULT_K1I;
+  SACIMEXGUS_K2I(C)    = DEFAULT_K2I;
+  SACIMEXGUS_BIAS(C)   = DEFAULT_BIAS;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Write_ImExGus(SUNAdaptController C, FILE *fptr)
+{
+  if (C == NULL || fptr == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  fprintf(fptr, "ImEx Gustafsson SUNAdaptController module:\n");
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+  fprintf(fptr, "  k1e = %32Lg\n", SACIMEXGUS_K1E(C));
+  fprintf(fptr, "  k2e = %32Lg\n", SACIMEXGUS_K2E(C));
+  fprintf(fptr, "  k1i = %32Lg\n", SACIMEXGUS_K1I(C));
+  fprintf(fptr, "  k2i = %32Lg\n", SACIMEXGUS_K2I(C));
+  fprintf(fptr, "  bias factor = %22Lg\n", SACIMEXGUS_BIAS(C));
+  fprintf(fptr, "  previous error = %22Lg\n", SACIMEXGUS_EP(C));
+  fprintf(fptr, "  previous step = %22Lg\n", SACIMEXGUS_HP(C));
+#else
+  fprintf(fptr, "  k1e = %16g\n", SACIMEXGUS_K1E(C));
+  fprintf(fptr, "  k2e = %16g\n", SACIMEXGUS_K2E(C));
+  fprintf(fptr, "  k1i = %16g\n", SACIMEXGUS_K1I(C));
+  fprintf(fptr, "  k2i = %16g\n", SACIMEXGUS_K2I(C));
+  fprintf(fptr, "  bias factor = %16g\n", SACIMEXGUS_BIAS(C));
+  fprintf(fptr, "  previous error = %16g\n", SACIMEXGUS_EP(C));
+  fprintf(fptr, "  previous step = %16g\n", SACIMEXGUS_HP(C));
+#endif
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_SetErrorBias_ImExGus(SUNAdaptController C, sunrealtype bias)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  /* set allowed value, otherwise set default */
+  if (bias <= RCONST(0.0)) {
+    SACIMEXGUS_BIAS(C) = DEFAULT_BIAS;
+  } else {
+    SACIMEXGUS_BIAS(C) = bias;
+  }
+
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_UpdateH_ImExGus(SUNAdaptController C, sunrealtype h, sunrealtype dsm)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SACIMEXGUS_EP(C) = SACIMEXGUS_BIAS(C) * dsm;
+  SACIMEXGUS_HP(C) = h;
+  SACIMEXGUS_FIRSTSTEP(C) = SUNFALSE;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Space_ImExGus(SUNAdaptController C, long int* lenrw, long int* leniw)
+{
+  if (C == NULL || lenrw == NULL || leniw == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  *lenrw = 7;
+  *leniw = 1;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
diff --git a/src/sunadaptcontroller/soderlind/CMakeLists.txt b/src/sunadaptcontroller/soderlind/CMakeLists.txt
new file mode 100644
index 0000000000..ef8ed40df0
--- /dev/null
+++ b/src/sunadaptcontroller/soderlind/CMakeLists.txt
@@ -0,0 +1,29 @@
+# ---------------------------------------------------------------
+# Programmer(s): Daniel R. Reynolds @ SMU
+# ---------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ---------------------------------------------------------------
+
+# Create a library out of the generic sundials modules
+sundials_add_library(sundials_sunadaptcontrollersoderlind
+  SOURCES
+    sunadaptcontroller_soderlind.c
+  HEADERS
+    ${SUNDIALS_SOURCE_DIR}/include/sunadaptcontroller/sunadaptcontroller_soderlind.h
+  INCLUDE_SUBDIR
+    sunadaptcontroller
+  OBJECT_LIB_ONLY
+)
+
+# Add F2003 module if the interface is enabled
+if(BUILD_FORTRAN_MODULE_INTERFACE)
+  add_subdirectory(fmod)
+endif()
diff --git a/src/sunadaptcontroller/soderlind/fmod/CMakeLists.txt b/src/sunadaptcontroller/soderlind/fmod/CMakeLists.txt
new file mode 100644
index 0000000000..99cfdcbc0f
--- /dev/null
+++ b/src/sunadaptcontroller/soderlind/fmod/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ---------------------------------------------------------------
+# Programmer(s): Daniel R. Reynolds @ SMU
+# ---------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ---------------------------------------------------------------
+
+sundials_add_f2003_library(sundials_fsunadaptcontrollersoderlind_mod
+  SOURCES
+    fsunadaptcontroller_soderlind_mod.f90 fsunadaptcontroller_soderlind_mod.c
+  OBJECT_LIBRARIES
+    sundials_fgeneric_mod_obj
+  OUTPUT_NAME
+    sundials_fsunadaptcontrollersoderlind_mod
+  OBJECT_LIB_ONLY
+)
+
+message(STATUS "Added SUNAdaptController_Soderlind F2003 interface")
diff --git a/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.c b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.c
new file mode 100644
index 0000000000..394e83cd3e
--- /dev/null
+++ b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.c
@@ -0,0 +1,501 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.0
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+/* ---------------------------------------------------------------
+ * Programmer(s): Auto-generated by swig.
+ * ---------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -------------------------------------------------------------*/
+
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* qualifier for exported *const* global data variables*/
+#ifndef SWIGEXTERN
+# ifdef __cplusplus
+#   define SWIGEXTERN extern
+# else
+#   define SWIGEXTERN
+# endif
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+#include <assert.h>
+#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
+ { printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
+
+
+#include <stdio.h>
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+# ifndef snprintf
+#  define snprintf _snprintf
+# endif
+#endif
+
+
+/* Support for the `contract` feature.
+ *
+ * Note that RETURNNULL is first because it's inserted via a 'Replaceall' in
+ * the fortran.cxx file.
+ */
+#define SWIG_contract_assert(RETURNNULL, EXPR, MSG) \
+ if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } 
+
+
+#define SWIGVERSION 0x040000 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+
+
+#include "sundials/sundials_adaptcontroller.h"
+
+
+#include "sunadaptcontroller/sunadaptcontroller_soderlind.h"
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_Soderlind(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_Soderlind(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_Soderlind(SUNAdaptController farg1, double const *farg2, double const *farg3, double const *farg4, double const *farg5, double const *farg6) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
+  sunrealtype arg5 ;
+  sunrealtype arg6 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  arg5 = (sunrealtype)(*farg5);
+  arg6 = (sunrealtype)(*farg6);
+  result = (int)SUNAdaptController_SetParams_Soderlind(arg1,arg2,arg3,arg4,arg5,arg6);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_GetType_Soderlind(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  SUNAdaptController_Type result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (SUNAdaptController_Type)SUNAdaptController_GetType_Soderlind(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_EstimateStep_Soderlind(SUNAdaptController farg1, double const *farg2, int const *farg3, double const *farg4, double *farg5) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int arg3 ;
+  sunrealtype arg4 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (int)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  arg5 = (sunrealtype *)(farg5);
+  result = (int)SUNAdaptController_EstimateStep_Soderlind(arg1,arg2,arg3,arg4,arg5);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Reset_Soderlind(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_Reset_Soderlind(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetDefaults_Soderlind(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_SetDefaults_Soderlind(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Write_Soderlind(SUNAdaptController farg1, void *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  FILE *arg2 = (FILE *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (FILE *)(farg2);
+  result = (int)SUNAdaptController_Write_Soderlind(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetErrorBias_Soderlind(SUNAdaptController farg1, double const *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  result = (int)SUNAdaptController_SetErrorBias_Soderlind(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_UpdateH_Soderlind(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_UpdateH_Soderlind(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Space_Soderlind(SUNAdaptController farg1, long *farg2, long *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  long *arg2 = (long *) 0 ;
+  long *arg3 = (long *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (long *)(farg2);
+  arg3 = (long *)(farg3);
+  result = (int)SUNAdaptController_Space_Soderlind(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_PID(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_PID(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_PID(SUNAdaptController farg1, double const *farg2, double const *farg3, double const *farg4) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  result = (int)SUNAdaptController_SetParams_PID(arg1,arg2,arg3,arg4);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_PI(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_PI(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_PI(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_SetParams_PI(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_I(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_I(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_I(SUNAdaptController farg1, double const *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  result = (int)SUNAdaptController_SetParams_I(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_ExpGus(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_ExpGus(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_ExpGus(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_SetParams_ExpGus(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_ImpGus(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_ImpGus(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetParams_ImpGus(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_SetParams_ImpGus(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+
diff --git a/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90 b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
new file mode 100644
index 0000000000..720482cd6f
--- /dev/null
+++ b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
@@ -0,0 +1,579 @@
+! This file was automatically generated by SWIG (http://www.swig.org).
+! Version 4.0.0
+!
+! Do not make changes to this file unless you know what you are doing--modify
+! the SWIG interface file instead.
+
+! ---------------------------------------------------------------
+! Programmer(s): Auto-generated by swig.
+! ---------------------------------------------------------------
+! SUNDIALS Copyright Start
+! Copyright (c) 2002-2023, Lawrence Livermore National Security
+! and Southern Methodist University.
+! All rights reserved.
+!
+! See the top-level LICENSE and NOTICE files for details.
+!
+! SPDX-License-Identifier: BSD-3-Clause
+! SUNDIALS Copyright End
+! ---------------------------------------------------------------
+
+module fsunadaptcontroller_soderlind_mod
+ use, intrinsic :: ISO_C_BINDING
+ use fsundials_adaptcontroller_mod
+ use fsundials_types_mod
+ use fsundials_context_mod
+ implicit none
+ private
+
+ ! DECLARATION CONSTRUCTS
+ public :: FSUNAdaptController_Soderlind
+ public :: FSUNAdaptController_SetParams_Soderlind
+ public :: FSUNAdaptController_GetType_Soderlind
+ public :: FSUNAdaptController_EstimateStep_Soderlind
+ public :: FSUNAdaptController_Reset_Soderlind
+ public :: FSUNAdaptController_SetDefaults_Soderlind
+ public :: FSUNAdaptController_Write_Soderlind
+ public :: FSUNAdaptController_SetErrorBias_Soderlind
+ public :: FSUNAdaptController_UpdateH_Soderlind
+ public :: FSUNAdaptController_Space_Soderlind
+ public :: FSUNAdaptController_PID
+ public :: FSUNAdaptController_SetParams_PID
+ public :: FSUNAdaptController_PI
+ public :: FSUNAdaptController_SetParams_PI
+ public :: FSUNAdaptController_I
+ public :: FSUNAdaptController_SetParams_I
+ public :: FSUNAdaptController_ExpGus
+ public :: FSUNAdaptController_SetParams_ExpGus
+ public :: FSUNAdaptController_ImpGus
+ public :: FSUNAdaptController_SetParams_ImpGus
+
+! WRAPPER DECLARATIONS
+interface
+function swigc_FSUNAdaptController_Soderlind(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_Soderlind(farg1, farg2, farg3, farg4, farg5, farg6) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+real(C_DOUBLE), intent(in) :: farg5
+real(C_DOUBLE), intent(in) :: farg6
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_GetType_Soderlind(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_GetType_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_EstimateStep_Soderlind(farg1, farg2, farg3, farg4, farg5) &
+bind(C, name="_wrap_FSUNAdaptController_EstimateStep_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+type(C_PTR), value :: farg5
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Reset_Soderlind(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_Reset_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetDefaults_Soderlind(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_SetDefaults_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Write_Soderlind(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_Write_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetErrorBias_Soderlind(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_SetErrorBias_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_UpdateH_Soderlind(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_UpdateH_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Space_Soderlind(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_Space_Soderlind") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_PID(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_PID") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_PID(farg1, farg2, farg3, farg4) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_PID") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_PI(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_PI") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_PI(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_PI") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_I(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_I") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_I(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_I") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_ExpGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_ExpGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_ExpGus(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_ExpGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_ImpGus(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_ImpGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetParams_ImpGus(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_SetParams_ImpGus") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+end interface
+
+
+contains
+ ! MODULE SUBPROGRAMS
+function FSUNAdaptController_Soderlind(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_Soderlind(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_Soderlind(c, k1, k2, k3, k4, k5) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+real(C_DOUBLE), intent(in) :: k2
+real(C_DOUBLE), intent(in) :: k3
+real(C_DOUBLE), intent(in) :: k4
+real(C_DOUBLE), intent(in) :: k5
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+real(C_DOUBLE) :: farg4 
+real(C_DOUBLE) :: farg5 
+real(C_DOUBLE) :: farg6 
+
+farg1 = c_loc(c)
+farg2 = k1
+farg3 = k2
+farg4 = k3
+farg5 = k4
+farg6 = k5
+fresult = swigc_FSUNAdaptController_SetParams_Soderlind(farg1, farg2, farg3, farg4, farg5, farg6)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_GetType_Soderlind(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(SUNAdaptController_Type) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_GetType_Soderlind(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_EstimateStep_Soderlind(c, h, p, dsm, hnew) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+integer(C_INT), intent(in) :: p
+real(C_DOUBLE), intent(in) :: dsm
+real(C_DOUBLE), target, intent(inout) :: hnew
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+integer(C_INT) :: farg3 
+real(C_DOUBLE) :: farg4 
+type(C_PTR) :: farg5 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = p
+farg4 = dsm
+farg5 = c_loc(hnew)
+fresult = swigc_FSUNAdaptController_EstimateStep_Soderlind(farg1, farg2, farg3, farg4, farg5)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Reset_Soderlind(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_Reset_Soderlind(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetDefaults_Soderlind(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_SetDefaults_Soderlind(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Write_Soderlind(c, fptr) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+type(C_PTR) :: fptr
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = fptr
+fresult = swigc_FSUNAdaptController_Write_Soderlind(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetErrorBias_Soderlind(c, bias) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: bias
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = bias
+fresult = swigc_FSUNAdaptController_SetErrorBias_Soderlind(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_UpdateH_Soderlind(c, h, dsm) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+real(C_DOUBLE), intent(in) :: dsm
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = dsm
+fresult = swigc_FSUNAdaptController_UpdateH_Soderlind(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Space_Soderlind(c, lenrw, leniw) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_LONG), dimension(*), target, intent(inout) :: lenrw
+integer(C_LONG), dimension(*), target, intent(inout) :: leniw
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = c_loc(lenrw(1))
+farg3 = c_loc(leniw(1))
+fresult = swigc_FSUNAdaptController_Space_Soderlind(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_PID(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_PID(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_PID(c, k1, k2, k3) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+real(C_DOUBLE), intent(in) :: k2
+real(C_DOUBLE), intent(in) :: k3
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+real(C_DOUBLE) :: farg4 
+
+farg1 = c_loc(c)
+farg2 = k1
+farg3 = k2
+farg4 = k3
+fresult = swigc_FSUNAdaptController_SetParams_PID(farg1, farg2, farg3, farg4)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_PI(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_PI(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_PI(c, k1, k2) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+real(C_DOUBLE), intent(in) :: k2
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = k1
+farg3 = k2
+fresult = swigc_FSUNAdaptController_SetParams_PI(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_I(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_I(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_I(c, k1) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = k1
+fresult = swigc_FSUNAdaptController_SetParams_I(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_ExpGus(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_ExpGus(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_ExpGus(c, k1, k2) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+real(C_DOUBLE), intent(in) :: k2
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = k1
+farg3 = k2
+fresult = swigc_FSUNAdaptController_SetParams_ExpGus(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_ImpGus(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_ImpGus(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_SetParams_ImpGus(c, k1, k2) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: k1
+real(C_DOUBLE), intent(in) :: k2
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = k1
+farg3 = k2
+fresult = swigc_FSUNAdaptController_SetParams_ImpGus(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+
+end module
diff --git a/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c b/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
new file mode 100644
index 0000000000..4d16ac8f09
--- /dev/null
+++ b/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
@@ -0,0 +1,444 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the implementation file for the
+ * SUNAdaptController_Soderlind module.
+ * -----------------------------------------------------------------*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sunadaptcontroller/sunadaptcontroller_soderlind.h>
+#include <sundials/sundials_math.h>
+
+
+/* ---------------
+ * Macro accessors
+ * --------------- */
+
+#define SODERLIND_CONTENT(C)     ( (SUNAdaptControllerContent_Soderlind)(C->content) )
+#define SODERLIND_K1(C)          ( SODERLIND_CONTENT(C)->k1 )
+#define SODERLIND_K2(C)          ( SODERLIND_CONTENT(C)->k2 )
+#define SODERLIND_K3(C)          ( SODERLIND_CONTENT(C)->k3 )
+#define SODERLIND_K4(C)          ( SODERLIND_CONTENT(C)->k4 )
+#define SODERLIND_K5(C)          ( SODERLIND_CONTENT(C)->k5 )
+#define SODERLIND_BIAS(C)        ( SODERLIND_CONTENT(C)->bias )
+#define SODERLIND_EP(C)          ( SODERLIND_CONTENT(C)->ep )
+#define SODERLIND_EPP(C)         ( SODERLIND_CONTENT(C)->epp )
+#define SODERLIND_HP(C)          ( SODERLIND_CONTENT(C)->hp )
+#define SODERLIND_HPP(C)         ( SODERLIND_CONTENT(C)->hpp )
+#define SODERLIND_FIRSTSTEPS(C)  ( SODERLIND_CONTENT(C)->firststeps )
+
+/* ------------------
+ * Default parameters
+ * ------------------ */
+
+#define DEFAULT_K1          RCONST(1.25)    /* H_{0}321 parameters */
+#define DEFAULT_K2          RCONST(0.5)
+#define DEFAULT_K3          RCONST(-0.75)
+#define DEFAULT_K4          RCONST(0.25)
+#define DEFAULT_K5          RCONST(0.75)
+#define DEFAULT_PID_K1      RCONST(0.58)    /* PID parameters */
+#define DEFAULT_PID_K2     -RCONST(0.21)
+#define DEFAULT_PID_K3      RCONST(0.1)
+#define DEFAULT_PI_K1       RCONST(0.8)     /* PI parameters */
+#define DEFAULT_PI_K2      -RCONST(0.31)
+#define DEFAULT_I_K1        RCONST(1.0)     /* I parameters */
+#define DEFAULT_EXPGUS_K1   RCONST(0.367)   /* Explicit Gustafsson parameters */
+#define DEFAULT_EXPGUS_K2   RCONST(0.268)
+#define DEFAULT_IMPGUS_K1   RCONST(0.98)    /* Implicit Gustafsson parameters */
+#define DEFAULT_IMPGUS_K2   RCONST(0.95)
+#define DEFAULT_BIAS        RCONST(1.5)
+#define TINY                RCONST(1.0e-10)
+
+
+/* -----------------------------------------------------------------
+ * exported functions
+ * ----------------------------------------------------------------- */
+
+/* -----------------------------------------------------------------
+ * Function to create a new Soderlind controller
+ */
+
+SUNAdaptController SUNAdaptController_Soderlind(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  SUNAdaptControllerContent_Soderlind content;
+
+  if (sunctx == NULL) { return NULL; }
+
+  /* Create an empty controller object */
+  C = NULL;
+  C = SUNAdaptController_NewEmpty(sunctx);
+  if (C == NULL) { return (NULL); }
+
+  /* Attach operations */
+  C->ops->gettype      = SUNAdaptController_GetType_Soderlind;
+  C->ops->estimatestep = SUNAdaptController_EstimateStep_Soderlind;
+  C->ops->reset        = SUNAdaptController_Reset_Soderlind;
+  C->ops->setdefaults  = SUNAdaptController_SetDefaults_Soderlind;
+  C->ops->write        = SUNAdaptController_Write_Soderlind;
+  C->ops->seterrorbias = SUNAdaptController_SetErrorBias_Soderlind;
+  C->ops->updateh      = SUNAdaptController_UpdateH_Soderlind;
+  C->ops->space        = SUNAdaptController_Space_Soderlind;
+
+  /* Create content */
+  content = NULL;
+  content = (SUNAdaptControllerContent_Soderlind)malloc(sizeof *content);
+  if (content == NULL)
+  {
+    (void) SUNAdaptController_Destroy(C);
+    return (NULL);
+  }
+
+  /* Attach content */
+  C->content = content;
+
+  /* Fill content with default/reset values */
+  SUNAdaptController_SetDefaults_Soderlind(C);
+  SUNAdaptController_Reset_Soderlind(C);
+
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set Soderlind parameters
+ */
+
+int SUNAdaptController_SetParams_Soderlind(SUNAdaptController C,
+                                           sunrealtype k1, sunrealtype k2,
+                                           sunrealtype k3, sunrealtype k4,
+                                           sunrealtype k5)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1;
+  SODERLIND_K2(C) = k2;
+  SODERLIND_K3(C) = k3;
+  SODERLIND_K4(C) = k4;
+  SODERLIND_K5(C) = k5;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+/* -----------------------------------------------------------------
+ * Function to create a PID controller (subset of Soderlind)
+ */
+
+SUNAdaptController SUNAdaptController_PID(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  int retval;
+  if (sunctx == NULL) { return NULL; }
+  C = SUNAdaptController_Soderlind(sunctx);
+  if (C == NULL) { return NULL; }
+  retval = SUNAdaptController_SetParams_PID(C,
+                                            DEFAULT_PID_K1,
+                                            DEFAULT_PID_K2,
+                                            DEFAULT_PID_K3);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    (void) SUNAdaptController_Destroy(C);
+    C = NULL;
+  }
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set PID parameters
+ */
+
+int SUNAdaptController_SetParams_PID(SUNAdaptController C,
+                                     sunrealtype k1, sunrealtype k2,
+                                     sunrealtype k3)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1;
+  SODERLIND_K2(C) = k2;
+  SODERLIND_K3(C) = k3;
+  SODERLIND_K4(C) = RCONST(0.0);
+  SODERLIND_K5(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+/* -----------------------------------------------------------------
+ * Function to create a PI controller (subset of Soderlind)
+ */
+
+SUNAdaptController SUNAdaptController_PI(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  int retval;
+  if (sunctx == NULL) { return NULL; }
+  C = SUNAdaptController_Soderlind(sunctx);
+  if (C == NULL) { return NULL; }
+  retval = SUNAdaptController_SetParams_PI(C,
+                                           DEFAULT_PI_K1,
+                                           DEFAULT_PI_K2);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    (void) SUNAdaptController_Destroy(C);
+    C = NULL;
+  }
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set PI parameters
+ */
+
+int SUNAdaptController_SetParams_PI(SUNAdaptController C,
+                                    sunrealtype k1, sunrealtype k2)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1;
+  SODERLIND_K2(C) = k2;
+  SODERLIND_K3(C) = RCONST(0.0);
+  SODERLIND_K4(C) = RCONST(0.0);
+  SODERLIND_K5(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+/* -----------------------------------------------------------------
+ * Function to create an I controller (subset of Soderlind)
+ */
+
+SUNAdaptController SUNAdaptController_I(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  int retval;
+  if (sunctx == NULL) { return NULL; }
+  C = SUNAdaptController_Soderlind(sunctx);
+  if (C == NULL) { return NULL; }
+  retval = SUNAdaptController_SetParams_I(C, DEFAULT_I_K1);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    (void) SUNAdaptController_Destroy(C);
+    C = NULL;
+  }
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set PI parameters
+ */
+
+int SUNAdaptController_SetParams_I(SUNAdaptController C, sunrealtype k1)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1;
+  SODERLIND_K2(C) = RCONST(0.0);
+  SODERLIND_K3(C) = RCONST(0.0);
+  SODERLIND_K4(C) = RCONST(0.0);
+  SODERLIND_K5(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+/* -----------------------------------------------------------------
+ * Function to create an explicit Gustafsson controller
+ */
+
+SUNAdaptController SUNAdaptController_ExpGus(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  int retval;
+  if (sunctx == NULL) { return NULL; }
+  C = SUNAdaptController_Soderlind(sunctx);
+  if (C == NULL) { return NULL; }
+  retval = SUNAdaptController_SetParams_ExpGus(C,
+                                               DEFAULT_EXPGUS_K1,
+                                               DEFAULT_EXPGUS_K2);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    (void) SUNAdaptController_Destroy(C);
+    C = NULL;
+  }
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set explicit Gustafsson parameters
+ */
+
+int SUNAdaptController_SetParams_ExpGus(SUNAdaptController C,
+                                        sunrealtype k1, sunrealtype k2)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1+k2;
+  SODERLIND_K2(C) = -k2;
+  SODERLIND_K3(C) = RCONST(0.0);
+  SODERLIND_K4(C) = RCONST(0.0);
+  SODERLIND_K5(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+/* -----------------------------------------------------------------
+ * Function to create an implicit Gustafsson controller
+ */
+
+SUNAdaptController SUNAdaptController_ImpGus(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  int retval;
+  if (sunctx == NULL) { return NULL; }
+  C = SUNAdaptController_Soderlind(sunctx);
+  if (C == NULL) { return NULL; }
+  retval = SUNAdaptController_SetParams_ImpGus(C,
+                                               DEFAULT_IMPGUS_K1,
+                                               DEFAULT_IMPGUS_K2);
+  if (retval != SUNADAPTCONTROLLER_SUCCESS) {
+    (void) SUNAdaptController_Destroy(C);
+    C = NULL;
+  }
+  return (C);
+}
+
+/* -----------------------------------------------------------------
+ * Function to set explicit Gustafsson parameters
+ */
+
+int SUNAdaptController_SetParams_ImpGus(SUNAdaptController C,
+                                        sunrealtype k1, sunrealtype k2)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C) = k1+k2;
+  SODERLIND_K2(C) = -k2;
+  SODERLIND_K3(C) = RCONST(0.0);
+  SODERLIND_K4(C) = RCONST(1.0);
+  SODERLIND_K5(C) = RCONST(0.0);
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+
+
+/* -----------------------------------------------------------------
+ * implementation of controller operations
+ * ----------------------------------------------------------------- */
+
+SUNAdaptController_Type SUNAdaptController_GetType_Soderlind(SUNAdaptController C)
+{ return SUN_ADAPTCONTROLLER_H; }
+
+int SUNAdaptController_EstimateStep_Soderlind(SUNAdaptController C, sunrealtype h,
+                                              int p, sunrealtype dsm, sunrealtype* hnew)
+{
+  /* order parameter to use */
+  const int ord = p + 1;
+
+  /* set usable time-step adaptivity parameters */
+  const sunrealtype k1 = -SODERLIND_K1(C) / ord;
+  const sunrealtype k2 = -SODERLIND_K2(C) / ord;
+  const sunrealtype k3 = -SODERLIND_K3(C) / ord;
+  const sunrealtype k4 = SODERLIND_K4(C);
+  const sunrealtype k5 = SODERLIND_K5(C);
+  const sunrealtype e1 = SUNMAX(SODERLIND_BIAS(C) * dsm, TINY);
+  const sunrealtype e2 = SUNMAX(SODERLIND_EP(C), TINY);
+  const sunrealtype e3 = SUNMAX(SODERLIND_EPP(C), TINY);
+  const sunrealtype hrat = h / SODERLIND_HP(C);
+  const sunrealtype hrat2 = SODERLIND_HP(C) / SODERLIND_HPP(C);
+
+  if (C == NULL || hnew == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+
+  /* compute estimated optimal time step size */
+  if (SODERLIND_FIRSTSTEPS(C) < 1) {
+    *hnew = h * SUNRpowerR(e1,k1);
+  } else if  (SODERLIND_FIRSTSTEPS(C) < 2) {
+    *hnew = h * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2) * SUNRpowerR(hrat,k4);
+  } else {
+    *hnew = h * SUNRpowerR(e1,k1) * SUNRpowerR(e2,k2) * SUNRpowerR(e3,k3)
+              * SUNRpowerR(hrat,k4) * SUNRpowerR(hrat2,k5);
+  }
+
+  /* return with success */
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Reset_Soderlind(SUNAdaptController C)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_EP(C)  = RCONST(1.0);
+  SODERLIND_EPP(C) = RCONST(1.0);
+  SODERLIND_HP(C)  = RCONST(1.0);
+  SODERLIND_HPP(C) = RCONST(1.0);
+  SODERLIND_FIRSTSTEPS(C) = 0;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_SetDefaults_Soderlind(SUNAdaptController C)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_K1(C)   = DEFAULT_K1;
+  SODERLIND_K2(C)   = DEFAULT_K2;
+  SODERLIND_K3(C)   = DEFAULT_K3;
+  SODERLIND_K4(C)   = DEFAULT_K4;
+  SODERLIND_K5(C)   = DEFAULT_K5;
+  SODERLIND_BIAS(C) = DEFAULT_BIAS;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Write_Soderlind(SUNAdaptController C, FILE *fptr)
+{
+  if (C == NULL || fptr == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  fprintf(fptr, "Soderlind SUNAdaptController module:\n");
+#if defined(SUNDIALS_EXTENDED_PRECISION)
+  fprintf(fptr, "  k1 = %32Lg\n", SODERLIND_K1(C));
+  fprintf(fptr, "  k2 = %32Lg\n", SODERLIND_K2(C));
+  fprintf(fptr, "  k3 = %32Lg\n", SODERLIND_K3(C));
+  fprintf(fptr, "  k4 = %32Lg\n", SODERLIND_K4(C));
+  fprintf(fptr, "  k5 = %32Lg\n", SODERLIND_K5(C));
+  fprintf(fptr, "  bias factor = %22Lg\n", SODERLIND_BIAS(C));
+  fprintf(fptr, "  previous error = %22Lg\n", SODERLIND_EP(C));
+  fprintf(fptr, "  previous-previous error = %22Lg\n", SODERLIND_EPP(C));
+  fprintf(fptr, "  previous step = %22Lg\n", SODERLIND_HP(C));
+  fprintf(fptr, "  previous-previous step = %22Lg\n", SODERLIND_HPP(C));
+#else
+  fprintf(fptr, "  k1 = %16g\n", SODERLIND_K1(C));
+  fprintf(fptr, "  k2 = %16g\n", SODERLIND_K2(C));
+  fprintf(fptr, "  k3 = %16g\n", SODERLIND_K3(C));
+  fprintf(fptr, "  k4 = %16g\n", SODERLIND_K4(C));
+  fprintf(fptr, "  k5 = %16g\n", SODERLIND_K5(C));
+  fprintf(fptr, "  bias factor = %16g\n", SODERLIND_BIAS(C));
+  fprintf(fptr, "  previous error = %16g\n", SODERLIND_EP(C));
+  fprintf(fptr, "  previous-previous error = %16g\n", SODERLIND_EPP(C));
+  fprintf(fptr, "  previous step = %16g\n", SODERLIND_HP(C));
+  fprintf(fptr, "  previous-previous step = %16g\n", SODERLIND_HPP(C));
+#endif
+  fprintf(fptr, "  firststeps = %i\n", SODERLIND_FIRSTSTEPS(C));
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_SetErrorBias_Soderlind(SUNAdaptController C, sunrealtype bias)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  /* set allowed value, otherwise set default */
+  if (bias <= RCONST(0.0)) {
+    SODERLIND_BIAS(C) = DEFAULT_BIAS;
+  } else {
+    SODERLIND_BIAS(C) = bias;
+  }
+
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_UpdateH_Soderlind(SUNAdaptController C, sunrealtype h, sunrealtype dsm)
+{
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  SODERLIND_EPP(C) = SODERLIND_EP(C);
+  SODERLIND_EP(C)  = SODERLIND_BIAS(C) * dsm;
+  SODERLIND_HPP(C) = SODERLIND_HP(C);
+  SODERLIND_HP(C)  = h;
+  if (SODERLIND_FIRSTSTEPS(C) < 2) {
+    SODERLIND_FIRSTSTEPS(C) += 1;
+  }
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
+
+int SUNAdaptController_Space_Soderlind(SUNAdaptController C, long int* lenrw, long int* leniw)
+{
+  if (C == NULL || lenrw == NULL || leniw == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  *lenrw = 10;
+  *leniw = 1;
+  return SUNADAPTCONTROLLER_SUCCESS;
+}
diff --git a/src/sundials/CMakeLists.txt b/src/sundials/CMakeLists.txt
index 08afde2570..df5af04cd6 100644
--- a/src/sundials/CMakeLists.txt
+++ b/src/sundials/CMakeLists.txt
@@ -21,6 +21,7 @@ install(CODE "MESSAGE(\"\nInstall shared components\n\")")
 
 # Add variable sundials_HEADERS with the exported SUNDIALS header files
 set(sundials_HEADERS
+  sundials_adaptcontroller.h
   sundials_base.hpp
   sundials_band.h
   sundials_context.h
@@ -78,6 +79,7 @@ endif()
 add_prefix(${SUNDIALS_SOURCE_DIR}/include/sundials/ sundials_HEADERS)
 
 set(sundials_SOURCES
+  sundials_adaptcontroller.c
   sundials_band.c
   sundials_context.c
   sundials_dense.c
@@ -106,18 +108,12 @@ endif()
 # Add prefix with complete path to the source files
 add_prefix(${SUNDIALS_SOURCE_DIR}/src/sundials/ sundials_SOURCES)
 
-if(SUNDIALS_BUILD_WITH_PROFILING OR SUNDIALS_LOGGING_ENABLE_MPI)
+if(SUNDIALS_LOGGING_ENABLE_MPI)
   if(ENABLE_MPI AND MPI_C_FOUND)
     # Workaround bug in CMake < 3.17.3 when using MPI::MPI_CXX and CUDA
     set(_include_mpi_if_needed PUBLIC ${MPI_C_INCLUDE_DIRS})
     set(_link_mpi_if_needed PUBLIC ${MPI_C_LIBRARIES})
   endif()
-  if(ENABLE_CALIPER)
-    set(_link_caliper_if_needed PUBLIC caliper)
-  endif()
-  if(ENABLE_ADIAK)
-    set(_link_adiak_if_needed PUBLIC adiak::adiak ${CMAKE_DL_LIBS})
-  endif()
 endif()
 
 # Create a library out of the generic sundials modules
@@ -132,8 +128,6 @@ sundials_add_library(sundials_generic
     ${_include_mpi_if_needed}
   LINK_LIBRARIES
     ${_link_mpi_if_needed}
-    ${_link_caliper_if_needed}
-    ${_link_adiak_if_needed}
   OUTPUT_NAME
     sundials_generic
   VERSION
diff --git a/src/sundials/fmod/CMakeLists.txt b/src/sundials/fmod/CMakeLists.txt
index e3e05f4cd7..94325ce9d8 100644
--- a/src/sundials/fmod/CMakeLists.txt
+++ b/src/sundials/fmod/CMakeLists.txt
@@ -30,7 +30,9 @@ set(sundials_SOURCES
   fsundials_types_mod.f90
   fsundials_types_mod.c
   fsundials_context_mod.f90
-  fsundials_context_mod.c)
+  fsundials_context_mod.c
+  fsundials_adaptcontroller_mod.f90
+  fsundials_adaptcontroller_mod.c)
 
 if(SUNDIALS_BUILD_WITH_PROFILING)
   list(APPEND sundials_SOURCES
diff --git a/src/sundials/fmod/fsundials_adaptcontroller_mod.c b/src/sundials/fmod/fsundials_adaptcontroller_mod.c
new file mode 100644
index 0000000000..9ece239fdc
--- /dev/null
+++ b/src/sundials/fmod/fsundials_adaptcontroller_mod.c
@@ -0,0 +1,333 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 4.0.0
+ *
+ * This file is not intended to be easily readable and contains a number of
+ * coding conventions designed to improve portability and efficiency. Do not make
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
+ * ----------------------------------------------------------------------------- */
+/* -----------------------------------------------------------------------------
+ *  This section contains generic SWIG labels for method/variable
+ *  declarations/attributes, and other compiler dependent labels.
+ * ----------------------------------------------------------------------------- */
+
+/* template workaround for compilers that cannot correctly implement the C++ standard */
+#ifndef SWIGTEMPLATEDISAMBIGUATOR
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+#  define SWIGTEMPLATEDISAMBIGUATOR template
+# else
+#  define SWIGTEMPLATEDISAMBIGUATOR
+# endif
+#endif
+
+/* inline attribute */
+#ifndef SWIGINLINE
+# if defined(__cplusplus) || (defined(__GNUC__) && !defined(__STRICT_ANSI__))
+#   define SWIGINLINE inline
+# else
+#   define SWIGINLINE
+# endif
+#endif
+
+/* attribute recognised by some compilers to avoid 'unused' warnings */
+#ifndef SWIGUNUSED
+# if defined(__GNUC__)
+#   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+#     define SWIGUNUSED __attribute__ ((__unused__))
+#   else
+#     define SWIGUNUSED
+#   endif
+# elif defined(__ICC)
+#   define SWIGUNUSED __attribute__ ((__unused__))
+# else
+#   define SWIGUNUSED
+# endif
+#endif
+
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+#   pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
+#ifndef SWIGUNUSEDPARM
+# ifdef __cplusplus
+#   define SWIGUNUSEDPARM(p)
+# else
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
+# endif
+#endif
+
+/* internal SWIG method */
+#ifndef SWIGINTERN
+# define SWIGINTERN static SWIGUNUSED
+#endif
+
+/* internal inline SWIG method */
+#ifndef SWIGINTERNINLINE
+# define SWIGINTERNINLINE SWIGINTERN SWIGINLINE
+#endif
+
+/* qualifier for exported *const* global data variables*/
+#ifndef SWIGEXTERN
+# ifdef __cplusplus
+#   define SWIGEXTERN extern
+# else
+#   define SWIGEXTERN
+# endif
+#endif
+
+/* exporting methods */
+#if defined(__GNUC__)
+#  if (__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
+#    ifndef GCC_HASCLASSVISIBILITY
+#      define GCC_HASCLASSVISIBILITY
+#    endif
+#  endif
+#endif
+
+#ifndef SWIGEXPORT
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   if defined(STATIC_LINKED)
+#     define SWIGEXPORT
+#   else
+#     define SWIGEXPORT __declspec(dllexport)
+#   endif
+# else
+#   if defined(__GNUC__) && defined(GCC_HASCLASSVISIBILITY)
+#     define SWIGEXPORT __attribute__ ((visibility("default")))
+#   else
+#     define SWIGEXPORT
+#   endif
+# endif
+#endif
+
+/* calling conventions for Windows */
+#ifndef SWIGSTDCALL
+# if defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
+#   define SWIGSTDCALL __stdcall
+# else
+#   define SWIGSTDCALL
+# endif
+#endif
+
+/* Deal with Microsoft's attempt at deprecating C standard runtime functions */
+#if !defined(SWIG_NO_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
+# define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+/* Deal with Apple's deprecated 'AssertMacros.h' from Carbon-framework */
+#if defined(__APPLE__) && !defined(__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES)
+# define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
+#endif
+
+/* Intel's compiler complains if a variable which was never initialised is
+ * cast to void, which is a common idiom which we use to indicate that we
+ * are aware a variable isn't used.  So we just silence that warning.
+ * See: https://github.com/swig/swig/issues/192 for more discussion.
+ */
+#ifdef __INTEL_COMPILER
+# pragma warning disable 592
+#endif
+
+/*  Errors in SWIG */
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
+#define  SWIG_SystemError    	   -10
+#define  SWIG_AttributeError 	   -11
+#define  SWIG_MemoryError    	   -12
+#define  SWIG_NullReferenceError   -13
+
+
+
+
+#include <assert.h>
+#define SWIG_exception_impl(DECL, CODE, MSG, RETURNNULL) \
+ { printf("In " DECL ": " MSG); assert(0); RETURNNULL; }
+
+
+#include <stdio.h>
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(_WATCOM)
+# ifndef snprintf
+#  define snprintf _snprintf
+# endif
+#endif
+
+
+/* Support for the `contract` feature.
+ *
+ * Note that RETURNNULL is first because it's inserted via a 'Replaceall' in
+ * the fortran.cxx file.
+ */
+#define SWIG_contract_assert(RETURNNULL, EXPR, MSG) \
+ if (!(EXPR)) { SWIG_exception_impl("$decl", SWIG_ValueError, MSG, RETURNNULL); } 
+
+
+#define SWIGVERSION 0x040000 
+#define SWIG_VERSION SWIGVERSION
+
+
+#define SWIG_as_voidptr(a) (void *)((const void *)(a)) 
+#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a)) 
+
+
+#include "sundials/sundials_adaptcontroller.h"
+
+SWIGEXPORT SUNAdaptController _wrap_FSUNAdaptController_NewEmpty(void *farg1) {
+  SUNAdaptController fresult ;
+  SUNContext arg1 = (SUNContext) 0 ;
+  SUNAdaptController result;
+  
+  arg1 = (SUNContext)(farg1);
+  result = (SUNAdaptController)SUNAdaptController_NewEmpty(arg1);
+  fresult = result;
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_GetType(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  SUNAdaptController_Type result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (SUNAdaptController_Type)SUNAdaptController_GetType(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Destroy(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_Destroy(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_EstimateStep(SUNAdaptController farg1, double const *farg2, int const *farg3, double const *farg4, double *farg5) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int arg3 ;
+  sunrealtype arg4 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (int)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
+  arg5 = (sunrealtype *)(farg5);
+  result = (int)SUNAdaptController_EstimateStep(arg1,arg2,arg3,arg4,arg5);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Reset(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_Reset(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetDefaults(SUNAdaptController farg1) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  result = (int)SUNAdaptController_SetDefaults(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Write(SUNAdaptController farg1, void *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  FILE *arg2 = (FILE *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (FILE *)(farg2);
+  result = (int)SUNAdaptController_Write(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_SetErrorBias(SUNAdaptController farg1, double const *farg2) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  result = (int)SUNAdaptController_SetErrorBias(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_UpdateH(SUNAdaptController farg1, double const *farg2, double const *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
+  result = (int)SUNAdaptController_UpdateH(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNAdaptController_Space(SUNAdaptController farg1, long *farg2, long *farg3) {
+  int fresult ;
+  SUNAdaptController arg1 = (SUNAdaptController) 0 ;
+  long *arg2 = (long *) 0 ;
+  long *arg3 = (long *) 0 ;
+  int result;
+  
+  arg1 = (SUNAdaptController)(farg1);
+  arg2 = (long *)(farg2);
+  arg3 = (long *)(farg3);
+  result = (int)SUNAdaptController_Space(arg1,arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+
diff --git a/src/sundials/fmod/fsundials_adaptcontroller_mod.f90 b/src/sundials/fmod/fsundials_adaptcontroller_mod.f90
new file mode 100644
index 0000000000..c804548d50
--- /dev/null
+++ b/src/sundials/fmod/fsundials_adaptcontroller_mod.f90
@@ -0,0 +1,313 @@
+! This file was automatically generated by SWIG (http://www.swig.org).
+! Version 4.0.0
+!
+! Do not make changes to this file unless you know what you are doing--modify
+! the SWIG interface file instead.
+module fsundials_adaptcontroller_mod
+ use, intrinsic :: ISO_C_BINDING
+ use fsundials_types_mod
+ use fsundials_context_mod
+ implicit none
+ private
+
+ ! DECLARATION CONSTRUCTS
+ ! typedef enum SUNAdaptController_Type
+ enum, bind(c)
+  enumerator :: SUN_ADAPTCONTROLLER_NONE
+  enumerator :: SUN_ADAPTCONTROLLER_H
+ end enum
+ integer, parameter, public :: SUNAdaptController_Type = kind(SUN_ADAPTCONTROLLER_NONE)
+ public :: SUN_ADAPTCONTROLLER_NONE, SUN_ADAPTCONTROLLER_H
+ ! struct struct _generic_SUNAdaptController_Ops
+ type, bind(C), public :: SUNAdaptController_Ops
+  type(C_FUNPTR), public :: gettype
+  type(C_FUNPTR), public :: estimatestep
+  type(C_FUNPTR), public :: destroy
+  type(C_FUNPTR), public :: reset
+  type(C_FUNPTR), public :: setdefaults
+  type(C_FUNPTR), public :: write
+  type(C_FUNPTR), public :: seterrorbias
+  type(C_FUNPTR), public :: updateh
+  type(C_FUNPTR), public :: space
+ end type SUNAdaptController_Ops
+ ! struct struct _generic_SUNAdaptController
+ type, bind(C), public :: SUNAdaptController
+  type(C_PTR), public :: content
+  type(C_PTR), public :: ops
+  type(C_PTR), public :: sunctx
+ end type SUNAdaptController
+ public :: FSUNAdaptController_NewEmpty
+ public :: FSUNAdaptController_GetType
+ public :: FSUNAdaptController_Destroy
+ public :: FSUNAdaptController_EstimateStep
+ public :: FSUNAdaptController_Reset
+ public :: FSUNAdaptController_SetDefaults
+ public :: FSUNAdaptController_Write
+ public :: FSUNAdaptController_SetErrorBias
+ public :: FSUNAdaptController_UpdateH
+ public :: FSUNAdaptController_Space
+ integer(C_INT), parameter, public :: SUNADAPTCONTROLLER_SUCCESS = 0_C_INT
+ integer(C_INT), parameter, public :: SUNADAPTCONTROLLER_ILL_INPUT = -1001_C_INT
+ integer(C_INT), parameter, public :: SUNADAPTCONTROLLER_MEM_FAIL = -1002_C_INT
+ integer(C_INT), parameter, public :: SUNADAPTCONTROLLER_USER_FCN_FAIL = -1003_C_INT
+ integer(C_INT), parameter, public :: SUNADAPTCONTROLLER_OPERATION_FAIL = -1004_C_INT
+
+! WRAPPER DECLARATIONS
+interface
+function swigc_FSUNAdaptController_NewEmpty(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_NewEmpty") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR) :: fresult
+end function
+
+function swigc_FSUNAdaptController_GetType(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_GetType") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Destroy(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_Destroy") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_EstimateStep(farg1, farg2, farg3, farg4, farg5) &
+bind(C, name="_wrap_FSUNAdaptController_EstimateStep") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT), intent(in) :: farg3
+real(C_DOUBLE), intent(in) :: farg4
+type(C_PTR), value :: farg5
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Reset(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_Reset") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetDefaults(farg1) &
+bind(C, name="_wrap_FSUNAdaptController_SetDefaults") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Write(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_Write") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_SetErrorBias(farg1, farg2) &
+bind(C, name="_wrap_FSUNAdaptController_SetErrorBias") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_UpdateH(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_UpdateH") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+real(C_DOUBLE), intent(in) :: farg2
+real(C_DOUBLE), intent(in) :: farg3
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNAdaptController_Space(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNAdaptController_Space") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+type(C_PTR), value :: farg3
+integer(C_INT) :: fresult
+end function
+
+end interface
+
+
+contains
+ ! MODULE SUBPROGRAMS
+function FSUNAdaptController_NewEmpty(sunctx) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+type(SUNAdaptController), pointer :: swig_result
+type(C_PTR) :: sunctx
+type(C_PTR) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = sunctx
+fresult = swigc_FSUNAdaptController_NewEmpty(farg1)
+call c_f_pointer(fresult, swig_result)
+end function
+
+function FSUNAdaptController_GetType(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(SUNAdaptController_Type) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_GetType(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Destroy(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_Destroy(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_EstimateStep(c, h, p, dsm, hnew) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+integer(C_INT), intent(in) :: p
+real(C_DOUBLE), intent(in) :: dsm
+real(C_DOUBLE), target, intent(inout) :: hnew
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+integer(C_INT) :: farg3 
+real(C_DOUBLE) :: farg4 
+type(C_PTR) :: farg5 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = p
+farg4 = dsm
+farg5 = c_loc(hnew)
+fresult = swigc_FSUNAdaptController_EstimateStep(farg1, farg2, farg3, farg4, farg5)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Reset(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_Reset(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetDefaults(c) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = c_loc(c)
+fresult = swigc_FSUNAdaptController_SetDefaults(farg1)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Write(c, fptr) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+type(C_PTR) :: fptr
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = fptr
+fresult = swigc_FSUNAdaptController_Write(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_SetErrorBias(c, bias) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: bias
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+
+farg1 = c_loc(c)
+farg2 = bias
+fresult = swigc_FSUNAdaptController_SetErrorBias(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_UpdateH(c, h, dsm) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+real(C_DOUBLE), intent(in) :: h
+real(C_DOUBLE), intent(in) :: dsm
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+real(C_DOUBLE) :: farg2 
+real(C_DOUBLE) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = h
+farg3 = dsm
+fresult = swigc_FSUNAdaptController_UpdateH(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+function FSUNAdaptController_Space(c, lenrw, leniw) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(SUNAdaptController), target, intent(inout) :: c
+integer(C_LONG), dimension(*), target, intent(inout) :: lenrw
+integer(C_LONG), dimension(*), target, intent(inout) :: leniw
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = c_loc(c)
+farg2 = c_loc(lenrw(1))
+farg3 = c_loc(leniw(1))
+fresult = swigc_FSUNAdaptController_Space(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
+
+end module
diff --git a/src/sundials/fmod/fsundials_profiler_mod.c b/src/sundials/fmod/fsundials_profiler_mod.c
index f352495a34..75599fa693 100644
--- a/src/sundials/fmod/fsundials_profiler_mod.c
+++ b/src/sundials/fmod/fsundials_profiler_mod.c
@@ -273,6 +273,36 @@ SWIGEXPORT int _wrap_FSUNProfiler_End(void *farg1, SwigArrayWrapper *farg2) {
 }
 
 
+SWIGEXPORT int _wrap_FSUNProfiler_GetTimerResolution(void *farg1, double *farg2) {
+  int fresult ;
+  SUNProfiler arg1 = (SUNProfiler) 0 ;
+  double *arg2 = (double *) 0 ;
+  int result;
+  
+  arg1 = (SUNProfiler)(farg1);
+  arg2 = (double *)(farg2);
+  result = (int)SUNProfiler_GetTimerResolution(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
+SWIGEXPORT int _wrap_FSUNProfiler_GetElapsedTime(void *farg1, SwigArrayWrapper *farg2, double *farg3) {
+  int fresult ;
+  SUNProfiler arg1 = (SUNProfiler) 0 ;
+  char *arg2 = (char *) 0 ;
+  double *arg3 = (double *) 0 ;
+  int result;
+  
+  arg1 = (SUNProfiler)(farg1);
+  arg2 = (char *)(farg2->data);
+  arg3 = (double *)(farg3);
+  result = (int)SUNProfiler_GetElapsedTime(arg1,(char const *)arg2,arg3);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FSUNProfiler_Print(void *farg1, void *farg2) {
   int fresult ;
   SUNProfiler arg1 = (SUNProfiler) 0 ;
diff --git a/src/sundials/fmod/fsundials_profiler_mod.f90 b/src/sundials/fmod/fsundials_profiler_mod.f90
index b1b6c74dc5..328243e3a3 100644
--- a/src/sundials/fmod/fsundials_profiler_mod.f90
+++ b/src/sundials/fmod/fsundials_profiler_mod.f90
@@ -31,6 +31,8 @@ module fsundials_profiler_mod
  end type
  public :: FSUNProfiler_Begin
  public :: FSUNProfiler_End
+ public :: FSUNProfiler_GetTimerResolution
+ public :: FSUNProfiler_GetElapsedTime
  public :: FSUNProfiler_Print
  public :: FSUNProfiler_Reset
 
@@ -67,6 +69,26 @@ function swigc_FSUNProfiler_End(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
+function swigc_FSUNProfiler_GetTimerResolution(farg1, farg2) &
+bind(C, name="_wrap_FSUNProfiler_GetTimerResolution") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
+function swigc_FSUNProfiler_GetElapsedTime(farg1, farg2, farg3) &
+bind(C, name="_wrap_FSUNProfiler_GetElapsedTime") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+import :: swigarraywrapper
+type(C_PTR), value :: farg1
+type(SwigArrayWrapper) :: farg2
+type(C_PTR), value :: farg3
+integer(C_INT) :: fresult
+end function
+
 function swigc_FSUNProfiler_Print(farg1, farg2) &
 bind(C, name="_wrap_FSUNProfiler_Print") &
 result(fresult)
@@ -166,6 +188,42 @@ function FSUNProfiler_End(p, name) &
 swig_result = fresult
 end function
 
+function FSUNProfiler_GetTimerResolution(p, resolution) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: p
+real(C_DOUBLE), target, intent(inout) :: resolution
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = p
+farg2 = c_loc(resolution)
+fresult = swigc_FSUNProfiler_GetTimerResolution(farg1, farg2)
+swig_result = fresult
+end function
+
+function FSUNProfiler_GetElapsedTime(p, name, time) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: p
+character(kind=C_CHAR, len=*), target :: name
+character(kind=C_CHAR), dimension(:), allocatable, target :: farg2_chars
+real(C_DOUBLE), target, intent(inout) :: time
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(SwigArrayWrapper) :: farg2 
+type(C_PTR) :: farg3 
+
+farg1 = p
+call SWIG_string_to_chararray(name, farg2_chars, farg2)
+farg3 = c_loc(time)
+fresult = swigc_FSUNProfiler_GetElapsedTime(farg1, farg2, farg3)
+swig_result = fresult
+end function
+
 function FSUNProfiler_Print(p, fp) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/sundials/sundials_adaptcontroller.c b/src/sundials/sundials_adaptcontroller.c
new file mode 100644
index 0000000000..e39a02afec
--- /dev/null
+++ b/src/sundials/sundials_adaptcontroller.c
@@ -0,0 +1,175 @@
+/* -----------------------------------------------------------------
+ * Programmer(s): Daniel R. Reynolds @ SMU
+ * -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This is the implementation file for a generic SUNAdaptController
+ * package. It contains the implementation of the SUNAdaptController
+ * operations listed in sundials_adaptcontroller.h
+ * -----------------------------------------------------------------*/
+
+#include <sundials/sundials_adaptcontroller.h>
+
+/* -----------------------------------------------------------------
+ * Create a new empty SUNAdaptController object
+ * ----------------------------------------------------------------- */
+
+SUNAdaptController SUNAdaptController_NewEmpty(SUNContext sunctx)
+{
+  SUNAdaptController C;
+  SUNAdaptController_Ops ops;
+
+  /* a context is required */
+  if (sunctx == NULL) return(NULL);
+
+  /* create controller object */
+  C = NULL;
+  C = (SUNAdaptController) malloc(sizeof *C);
+  if (C == NULL) return(NULL);
+
+  /* create matrix ops structure */
+  ops = NULL;
+  ops = (SUNAdaptController_Ops) malloc(sizeof *ops);
+  if (ops == NULL) { free(C); return(NULL); }
+
+  /* initialize operations to NULL */
+  ops->gettype              = NULL;
+  ops->destroy              = NULL;
+  ops->reset                = NULL;
+  ops->estimatestep         = NULL;
+  ops->setdefaults          = NULL;
+  ops->write                = NULL;
+  ops->seterrorbias         = NULL;
+  ops->updateh              = NULL;
+  ops->space                = NULL;
+
+  /* attach ops and initialize content to NULL */
+  C->ops     = ops;
+  C->content = NULL;
+  C->sunctx  = sunctx;
+
+  return(C);
+}
+
+
+/* -----------------------------------------------------------------
+ * Free a generic SUNAdaptController (assumes content is already empty)
+ * ----------------------------------------------------------------- */
+
+void SUNAdaptController_DestroyEmpty(SUNAdaptController C)
+{
+  if (C == NULL)  return;
+
+  /* free non-NULL ops structure */
+  if (C->ops)  free(C->ops);
+  C->ops = NULL;
+
+  /* free overall SUNAdaptController object and return */
+  free(C);
+  return;
+}
+
+
+/* -----------------------------------------------------------------
+ * Required functions in the 'ops' structure for non-NULL controller
+ * ----------------------------------------------------------------- */
+
+SUNAdaptController_Type SUNAdaptController_GetType(SUNAdaptController C)
+{
+  if (C == NULL) { return SUN_ADAPTCONTROLLER_NONE; }
+  if (C->ops->gettype) { return C->ops->gettype(C); }
+  return SUN_ADAPTCONTROLLER_NONE;
+}
+
+/* -----------------------------------------------------------------
+ * Optional functions in the 'ops' structure
+ * ----------------------------------------------------------------- */
+
+int SUNAdaptController_Destroy(SUNAdaptController C)
+{
+  if (C == NULL) return(SUNADAPTCONTROLLER_SUCCESS);
+
+  /* if the destroy operation exists use it */
+  if (C->ops)
+    if (C->ops->destroy) { return(C->ops->destroy(C)); }
+
+  /* if we reach this point, either ops == NULL or destroy == NULL,
+     try to cleanup by freeing the content, ops, and matrix */
+  if (C->content) { free(C->content); C->content = NULL; }
+  if (C->ops) { free(C->ops); C->ops = NULL; }
+  free(C); C = NULL;
+
+  return(SUNADAPTCONTROLLER_SUCCESS);
+}
+
+int SUNAdaptController_EstimateStep(SUNAdaptController C, sunrealtype h, int p,
+                                    sunrealtype dsm, sunrealtype* hnew)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  *hnew = h;   /* initialize output with identity */
+  if (C == NULL || hnew == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->estimatestep)
+  {
+    ier = C->ops->estimatestep(C, h, p, dsm, hnew);
+  }
+  return(ier);
+}
+
+
+int SUNAdaptController_Reset(SUNAdaptController C)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->reset) { ier = C->ops->reset(C); }
+  return(ier);
+}
+
+int SUNAdaptController_SetDefaults(SUNAdaptController C)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->setdefaults) { ier = C->ops->setdefaults(C); }
+  return(ier);
+}
+
+int SUNAdaptController_Write(SUNAdaptController C, FILE* fptr)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL || fptr == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->write) { ier = C->ops->write(C, fptr); }
+  return(ier);
+}
+
+int SUNAdaptController_SetErrorBias(SUNAdaptController C, sunrealtype bias)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->seterrorbias) { ier = C->ops->seterrorbias(C, bias); }
+  return(ier);
+}
+
+int SUNAdaptController_UpdateH(SUNAdaptController C, sunrealtype h, sunrealtype dsm)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  if (C->ops->updateh) { ier = C->ops->updateh(C, h, dsm); }
+  return(ier);
+}
+
+int SUNAdaptController_Space(SUNAdaptController C, long int *lenrw, long int *leniw)
+{
+  int ier = SUNADAPTCONTROLLER_SUCCESS;
+  if (C == NULL || lenrw == NULL || leniw == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
+  *lenrw = 0;   /* initialize outputs with identity */
+  *leniw = 0;
+  if (C->ops->space) { ier = C->ops->space(C, lenrw, leniw); }
+  return(ier);
+}
diff --git a/swig/Makefile b/swig/Makefile
index 4a062e0445..1948ecfd74 100644
--- a/swig/Makefile
+++ b/swig/Makefile
@@ -20,17 +20,18 @@ CVODES=fcvodes_mod
 IDA=fida_mod
 IDAS=fidas_mod
 KINSOL=fkinsol_mod
-GENERIC=fsundials_types_mod fsundials_nvector_mod fsundials_matrix_mod fsundials_linearsolver_mod fsundials_nonlinearsolver_mod fsundials_futils_mod fsundials_context_mod fsundials_profiler_mod fsundials_logger_mod
+GENERIC=fsundials_types_mod fsundials_nvector_mod fsundials_matrix_mod fsundials_linearsolver_mod fsundials_nonlinearsolver_mod fsundials_futils_mod fsundials_context_mod fsundials_profiler_mod fsundials_logger_mod fsundials_adaptcontroller_mod
 NVECTOR=openmp pthreads serial parallel manyvector mpiplusx
 SUNMATRIX=band dense sparse
 SUNLINSOL=band dense lapackdense klu spbcgs spfgmr spgmr sptfqmr pcg
 SUNNONLINSOL=newton fixedpoint
+SUNADAPTCONTROLLER=imexgus soderlind
 
 INCLUDES=-I../include
 
-.PHONY: generic arkode cvode cvodes ida idas kinsol nvector sunmatrix sunlinsol sunnonlinsol patch
+.PHONY: generic arkode cvode cvodes ida idas kinsol nvector sunmatrix sunlinsol sunnonlinsol sunadaptcontroller patch
 
-all: generic arkode cvode cvodes ida idas kinsol nvector sunmatrix sunlinsol sunnonlinsol patch
+all: generic arkode cvode cvodes ida idas kinsol nvector sunmatrix sunlinsol sunnonlinsol sunadaptcontroller patch
 
 arkode: $(ARKODE:%:arkode/%.i)
 	@for i in ${ARKODE} ; do \
@@ -102,9 +103,15 @@ sunnonlinsol: $(SUNNONLINSOL:%:sunnonlinsol/fsunnonlinsol_%_mod.i)
 		swig -fortran -outdir ../src/sunnonlinsol/$${i}/fmod -o ../src/sunnonlinsol/$${i}/fmod/fsunnonlinsol_$${i}_mod.c ${INCLUDES} sunnonlinsol/fsunnonlinsol_$${i}_mod.i ; \
 	done
 
+sunadaptcontroller: $(SUNADAPTCONTROLLER:%:sunadaptcontroller/fsunadaptcontroller_%_mod.i)
+	@for i in ${SUNADAPTCONTROLLER} ; do \
+		echo "swig -fortran -outdir ../src/sunadaptcontroller/$${i}/fmod -o ../src/sunadaptcontroller/$${i}/fmod ${INCLUDES} sunadaptcontroller/fsunadaptcontroller_$${i}_mod.i" ; \
+		swig -fortran -outdir ../src/sunadaptcontroller/$${i}/fmod -o ../src/sunadaptcontroller/$${i}/fmod/fsunadaptcontroller_$${i}_mod.c ${INCLUDES} sunadaptcontroller/fsunadaptcontroller_$${i}_mod.i ; \
+	done
+
 patch: .FORCE
-	cd ..; 
-	
+	cd ..;
+
 clean:
 	rm ../src/**/fmod/*.c; rm ../src/**/fmod/*.f90
 
diff --git a/swig/arkode/farkode_mod.i b/swig/arkode/farkode_mod.i
index caaad3f3c1..926f895ab8 100644
--- a/swig/arkode/farkode_mod.i
+++ b/swig/arkode/farkode_mod.i
@@ -34,6 +34,7 @@
 %import "../sundials/fsundials_matrix_mod.i"
 %import "../sundials/fsundials_linearsolver_mod.i"
 %import "../sundials/fsundials_nonlinearsolver_mod.i"
+%import "../sundials/fsundials_adaptcontroller_mod.i"
 %import "../sundials/fsundials_types_mod.i"
 
 // Treat ARKodeButcherTable as an opaque pointer
diff --git a/swig/sunadaptcontroller/fsunadaptcontroller.i b/swig/sunadaptcontroller/fsunadaptcontroller.i
new file mode 100644
index 0000000000..3fd2354fa3
--- /dev/null
+++ b/swig/sunadaptcontroller/fsunadaptcontroller.i
@@ -0,0 +1,30 @@
+// ---------------------------------------------------------------
+// Programmer: Daniel R. Reynolds @ SMU
+// ---------------------------------------------------------------
+// SUNDIALS Copyright Start
+// Copyright (c) 2002-2023, Lawrence Livermore National Security
+// and Southern Methodist University.
+// All rights reserved.
+//
+// See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+// SUNDIALS Copyright End
+// ---------------------------------------------------------------
+// Swig interface file
+// ---------------------------------------------------------------
+
+// Include shared configuration
+%include "../sundials/fsundials.i"
+
+%{
+#include "sundials/sundials_adaptcontroller.h"
+%}
+
+// Load the typedefs and generate "use" statements
+%import "../sundials/fsundials_adaptcontroller_mod.i"
+
+// Macro for creating an interface to a SUNAdaptController
+%define %sunadaptcontroller_impl(TYPE)
+  %ignore _SUNAdaptControllerContent_## TYPE ##;
+%enddef
diff --git a/swig/sunadaptcontroller/fsunadaptcontroller_imexgus_mod.i b/swig/sunadaptcontroller/fsunadaptcontroller_imexgus_mod.i
new file mode 100644
index 0000000000..1b319a8b7c
--- /dev/null
+++ b/swig/sunadaptcontroller/fsunadaptcontroller_imexgus_mod.i
@@ -0,0 +1,29 @@
+// ---------------------------------------------------------------
+// Programmer: Daniel R. Reynolds @ SMU
+// ---------------------------------------------------------------
+// SUNDIALS Copyright Start
+// Copyright (c) 2002-2023, Lawrence Livermore National Security
+// and Southern Methodist University.
+// All rights reserved.
+//
+// See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+// SUNDIALS Copyright End
+// ---------------------------------------------------------------
+// Swig interface file
+// ---------------------------------------------------------------
+
+%module fsunadaptcontroller_imexgus_mod
+
+// include code common to all implementations
+%include "fsunadaptcontroller.i"
+
+%{
+#include "sunadaptcontroller/sunadaptcontroller_imexgus.h"
+%}
+
+%sunadaptcontroller_impl(ImExGus)
+
+// Process and wrap functions in the following files
+%include "sunadaptcontroller/sunadaptcontroller_imexgus.h"
diff --git a/swig/sunadaptcontroller/fsunadaptcontroller_soderlind_mod.i b/swig/sunadaptcontroller/fsunadaptcontroller_soderlind_mod.i
new file mode 100644
index 0000000000..cb9ab8ccbf
--- /dev/null
+++ b/swig/sunadaptcontroller/fsunadaptcontroller_soderlind_mod.i
@@ -0,0 +1,29 @@
+// ---------------------------------------------------------------
+// Programmer: Daniel R. Reynolds @ SMU
+// ---------------------------------------------------------------
+// SUNDIALS Copyright Start
+// Copyright (c) 2002-2023, Lawrence Livermore National Security
+// and Southern Methodist University.
+// All rights reserved.
+//
+// See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+// SUNDIALS Copyright End
+// ---------------------------------------------------------------
+// Swig interface file
+// ---------------------------------------------------------------
+
+%module fsunadaptcontroller_soderlind_mod
+
+// include code common to all implementations
+%include "fsunadaptcontroller.i"
+
+%{
+#include "sunadaptcontroller/sunadaptcontroller_soderlind.h"
+%}
+
+%sunadaptcontroller_impl(Soderlind)
+
+// Process and wrap functions in the following files
+%include "sunadaptcontroller/sunadaptcontroller_soderlind.h"
diff --git a/swig/sundials/fsundials.i b/swig/sundials/fsundials.i
index dcda29e1c8..bac0f74646 100644
--- a/swig/sundials/fsundials.i
+++ b/swig/sundials/fsundials.i
@@ -37,6 +37,7 @@
 %sundials_generic(SUNLinearSolver)
 %sundials_generic(SUNNonlinearSolver)
 %sundials_generic(SUNMatrix)
+%sundials_generic(SUNAdaptController)
 
 // Treat FILE* as an opaque pointer
 %apply void* { FILE* };
diff --git a/swig/sundials/fsundials_adaptcontroller_mod.i b/swig/sundials/fsundials_adaptcontroller_mod.i
new file mode 100644
index 0000000000..ff88ab8893
--- /dev/null
+++ b/swig/sundials/fsundials_adaptcontroller_mod.i
@@ -0,0 +1,28 @@
+// ---------------------------------------------------------------
+// Programmer: Daniel R. Reynolds @ SMU
+// ---------------------------------------------------------------
+// SUNDIALS Copyright Start
+// Copyright (c) 2002-2023, Lawrence Livermore National Security
+// and Southern Methodist University.
+// All rights reserved.
+//
+// See the top-level LICENSE and NOTICE files for details.
+//
+// SPDX-License-Identifier: BSD-3-Clause
+// SUNDIALS Copyright End
+// ---------------------------------------------------------------
+// Swig interface file
+// ---------------------------------------------------------------
+
+%module fsundials_adaptcontroller_mod
+
+// Load the typedefs and generate a "use" statement in the module
+%import "../sundials/fsundials_types_mod.i"
+%import "../sundials/fsundials_context_mod.i"
+
+%{
+#include "sundials/sundials_adaptcontroller.h"
+%}
+
+// Process and wrap functions in the following files
+%include "sundials/sundials_adaptcontroller.h"
diff --git a/test/answers b/test/answers
index a63bd8022c..1ff407f621 160000
--- a/test/answers
+++ b/test/answers
@@ -1 +1 @@
-Subproject commit a63bd8022ca4e772744769d7b6d5a371d5fb6429
+Subproject commit 1ff407f621fd49addea544af650362bf190ff9dd
diff --git a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
index 6367e502e4..d1c72d7799 100644
--- a/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/CXX_serial/CMakeLists.txt
@@ -60,7 +60,7 @@ foreach(test_tuple ${unit_tests})
 
     # We explicitly choose which object libraries to link to and link in the
     # arkode objects so that we have access to private functions w/o changing
-    # their visibility in the installed libraries. 
+    # their visibility in the installed libraries.
     target_link_libraries(${test_target}
       $<TARGET_OBJECTS:sundials_arkode_obj>
       sundials_sunmemsys_obj
@@ -69,6 +69,8 @@ foreach(test_tuple ${unit_tests})
       sundials_sunlinsoldense_obj
       sundials_sunnonlinsolnewton_obj
       sundials_sunnonlinsolfixedpoint_obj
+      sundials_sunadaptcontrollerimexgus_obj
+      sundials_sunadaptcontrollersoderlind_obj
       ${EXE_EXTRA_LINK_LIBS})
 
     # Tell CMake that we depend on the ARKODE library since it does not pick
diff --git a/test/unit_tests/arkode/C_serial/CMakeLists.txt b/test/unit_tests/arkode/C_serial/CMakeLists.txt
index 5fc081c930..a59f685fac 100644
--- a/test/unit_tests/arkode/C_serial/CMakeLists.txt
+++ b/test/unit_tests/arkode/C_serial/CMakeLists.txt
@@ -66,6 +66,8 @@ foreach(test_tuple ${ARKODE_unit_tests})
       sundials_sunlinsolband_obj
       sundials_sunlinsoldense_obj
       sundials_sunnonlinsolnewton_obj
+      sundials_sunadaptcontrollerimexgus_obj
+      sundials_sunadaptcontrollersoderlind_obj
       ${EXE_EXTRA_LINK_LIBS})
 
     # Tell CMake that we depend on the ARKODE library since it does not pick

From 1b913be7a9a63297056bd8c34a48c0cb8e0bda9b Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Sun, 12 Nov 2023 11:29:30 -0800
Subject: [PATCH 25/35] Developer docs (#361)

Add developer docs to RTD superbuild
Add instructions for updating answers in the developer docs.

---------

Co-authored-by: David Gardner <gardner48@llnl.gov>
---
 doc/shared/History.rst                        |   6 +-
 doc/shared/Install.rst                        |   6 +-
 doc/sundials_developers/source/conf.py        | 297 ------------------
 doc/sundials_developers/source/figs           |   1 -
 .../source/introduction/index.rst             |  28 --
 doc/sundials_developers/source/references.rst |  20 --
 .../source/testing/index.rst                  |  29 --
 doc/superbuild/source/conf.py                 |   2 +-
 .../source/developers}/History.rst            |   0
 .../source/developers}/Makefile               |   0
 .../developers}/appendix/GitCheatSheet.rst    |   0
 .../source/developers}/appendix/index.rst     |   2 +-
 .../benchmarks/advection_reaction.rst         |   0
 .../developers}/benchmarks/diffusion.rst      |   0
 .../source/developers}/benchmarks/index.rst   |   2 +-
 .../developers}/development/Checklist.rst     |   3 +
 .../source/developers}/development/index.rst  |   6 +-
 doc/superbuild/source/developers/figs         |   1 +
 .../getting_started/Documentation.rst         |   0
 .../getting_started/Environment.rst           |   0
 .../developers}/getting_started/Setup.rst     |   0
 .../developers}/getting_started/Workflow.rst  |   0
 .../developers}/getting_started/index.rst     |   0
 .../source/developers}/index.rst              |  22 +-
 .../source/developers}/packages/ARKODE.rst    |   0
 .../source/developers}/packages/index.rst     |   0
 .../developers}/pull_requests/MergePR.rst     |   0
 .../developers}/pull_requests/OpenPR.rst      |   0
 .../developers}/pull_requests/ReviewPR.rst    |   0
 .../developers}/pull_requests/index.rst       |   2 +-
 .../source/developers}/releases/Checklist.rst |   0
 .../source/developers}/releases/index.rst     |   2 +-
 .../developers}/style_guide/Classes.rst       |   0
 .../developers}/style_guide/Documentation.rst |   0
 .../developers}/style_guide/SourceCode.rst    |  19 +-
 .../source/developers}/style_guide/index.rst  |   5 +-
 .../source/developers/testing/Answers.rst     | 118 +++++++
 .../developers}/testing/Benchmarking.rst      |   0
 .../source/developers}/testing/CI.rst         |   4 +-
 .../source/developers}/testing/Local.rst      |   0
 .../source/developers}/testing/Spot.rst       |   0
 .../source/developers/testing/index.rst       |  50 +++
 doc/superbuild/source/index.rst               |   1 +
 43 files changed, 214 insertions(+), 412 deletions(-)
 delete mode 100644 doc/sundials_developers/source/conf.py
 delete mode 120000 doc/sundials_developers/source/figs
 delete mode 100644 doc/sundials_developers/source/introduction/index.rst
 delete mode 100644 doc/sundials_developers/source/references.rst
 delete mode 100644 doc/sundials_developers/source/testing/index.rst
 rename doc/{sundials_developers/source/introduction => superbuild/source/developers}/History.rst (100%)
 rename doc/{sundials_developers => superbuild/source/developers}/Makefile (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/appendix/GitCheatSheet.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/appendix/index.rst (97%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/benchmarks/advection_reaction.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/benchmarks/diffusion.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/benchmarks/index.rst (97%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/development/Checklist.rst (95%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/development/index.rst (91%)
 create mode 120000 doc/superbuild/source/developers/figs
 rename doc/{sundials_developers/source => superbuild/source/developers}/getting_started/Documentation.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/getting_started/Environment.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/getting_started/Setup.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/getting_started/Workflow.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/getting_started/index.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/index.rst (60%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/packages/ARKODE.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/packages/index.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/pull_requests/MergePR.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/pull_requests/OpenPR.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/pull_requests/ReviewPR.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/pull_requests/index.rst (98%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/releases/Checklist.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/releases/index.rst (97%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/style_guide/Classes.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/style_guide/Documentation.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/style_guide/SourceCode.rst (83%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/style_guide/index.rst (94%)
 create mode 100644 doc/superbuild/source/developers/testing/Answers.rst
 rename doc/{sundials_developers/source => superbuild/source/developers}/testing/Benchmarking.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/testing/CI.rst (98%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/testing/Local.rst (100%)
 rename doc/{sundials_developers/source => superbuild/source/developers}/testing/Spot.rst (100%)
 create mode 100644 doc/superbuild/source/developers/testing/index.rst

diff --git a/doc/shared/History.rst b/doc/shared/History.rst
index d078d42e0b..c010e30859 100644
--- a/doc/shared/History.rst
+++ b/doc/shared/History.rst
@@ -14,9 +14,9 @@
 
 .. _History:
 
-##################################
-Appendix: SUNDIALS Release History
-##################################
+###############
+Release History
+###############
 
 +----------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+-------------------+
 | Date     | SUNDIALS          | ARKODE            | CVODE             | CVODES            | IDA               | IDAS              | KINSOL            |
diff --git a/doc/shared/Install.rst b/doc/shared/Install.rst
index f132538739..9021e5b340 100644
--- a/doc/shared/Install.rst
+++ b/doc/shared/Install.rst
@@ -14,9 +14,9 @@
 
 .. _Installation:
 
-===============================
-SUNDIALS Installation Procedure
-===============================
+======================
+Installation Procedure
+======================
 
 The installation of any SUNDIALS package is accomplished by installing the
 SUNDIALS suite as a whole, according to the instructions that follow.  The same
diff --git a/doc/sundials_developers/source/conf.py b/doc/sundials_developers/source/conf.py
deleted file mode 100644
index 05d04cde08..0000000000
--- a/doc/sundials_developers/source/conf.py
+++ /dev/null
@@ -1,297 +0,0 @@
-# -----------------------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# -----------------------------------------------------------------------------
-
-import sys, os
-sys.path.append(os.path.dirname(os.path.abspath('../../shared/versions.py')))
-from versions import *
-
-# -- Create new object types --------------------------------------------------
-
-from sphinx.application import Sphinx
-
-def setup(app: Sphinx):
-    app.add_object_type('cmakeoption', 'cmakeop', 'single: %s (CMake option)')
-    app.add_config_value('package_name', '', 'env', types=[str])
-
-# -- General configuration ----------------------------------------------------
-
-# Set variable used to determine which package documentation this is
-# Can be one of 'arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol', 'dev', or 'super'
-package_name = 'dev'
-
-# If your documentation needs a minimal Sphinx version, state it here.
-needs_sphinx = '4.0'
-
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx_rtd_theme', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
-              'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex',
-              'sphinx_copybutton', 'sphinx.ext.graphviz']
-
-# References
-bibtex_bibfiles = ['../../shared/sundials.bib']
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'Developer Documentation for SUNDIALS'
-copyright = """2002-{year}, Lawrence Livermore National Security and Southern Methodist University""".format(year = year)
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-sun_version = '{sundials_version}'.format(sundials_version=sundials_version)
-version = sun_version
-
-# Set the date format (full-month-name day, full-year)
-today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-highlight_language = "c"
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# Number figures, tables, and code blocks (can reference by number with numref)
-numfig = True
-
-# Override format strings that numref/numfig uses
-numfig_format = {
-  'section': '§%s'
-}
-
-rst_prolog = open('../../shared/global.rst.txt', 'r').read()
-
-rst_epilog = """
-.. |YEAR| replace:: {year}
-.. |CVODE_VERSION| replace:: {cvode_version}
-.. |CVODES_VERSION| replace:: {cvodes_version}
-.. |ARKODE_VERSION| replace:: {arkode_version}
-.. |IDA_VERSION| replace:: {ida_version}
-.. |IDAS_VERSION| replace:: {idas_version}
-.. |KINSOL_VERSION| replace:: {kinsol_version}
-""".format(year = year,
-cvode_version = cvode_version,
-cvodes_version = cvodes_version,
-arkode_version = arkode_version,
-ida_version = ida_version,
-idas_version = idas_version,
-kinsol_version = kinsol_version
-)
-
-# -- Options for HTML output ---------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'sphinx_rtd_theme'
-
-# Set theme options
-html_theme_options = {
-    # Allow unlimited depth in table of contents tree
-    'navigation_depth': -1
-}
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-html_logo = 'figs/sundials_logo_blue.png'
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['../../shared/_static']
-
-# These paths are either relative to html_static_path
-# or fully qualified paths (eg. https://...)
-html_css_files = [
-  'css/custom.css'
-]
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-html_show_sourcelink = False
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'SUNDIALSdoc'
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_additional_files = ['../../shared/latex/preamble.tex.txt',
-                          '../../shared/latex/cover_pages.tex.txt']
-
-im_number = ""
-
-# 1. the rst file name used to generate the LaTeX file
-# 2. the name of the LaTeX file to generate (and the resulting PDF file name)
-# 3. the document title
-# 4. text for \author
-# 5. the LaTeX theme
-# 6. include the file from 1. in the output
-tex_author = "The SUNDIALS Development Team"
-
-latex_documents = [('index', 'dev_guide.tex', project,
-                    tex_author, 'manual', False)]
-
-# make sure the doc logo gets copied to the build directory
-latex_logo = 'figs/doc_logo_blue.pdf'
-
-# LaTeX customizations
-latex_elements = {
-# paper size option of the document class
-'papersize': 'letterpaper',
-# font size option of the document class
-'pointsize': '10pt',
-# set the version number/release name
-'releasename' : version,
-# arguments to the sphinxsetup macro
-'sphinxsetup':
-    # the color for titles
-    'TitleColor={RGB}{0,0,0},'+
-    # disable frames around code-blocks
-    'verbatimwithframe=false,'+
-    # do not wrap long lines in code-blocks
-    'verbatimwrapslines=false,'+
-    # background color for code-blocks
-    'VerbatimColor={RGB}{240.0,240.0,240.0},'+
-    # font used by heading
-    'HeaderFamily=\\rmfamily\\bfseries,' +
-    # line breaks are allowed inside inline literals
-    'inlineliteralwraps=true',
-# disable the fncychap package
-'fncychap':'',
-# figure alignment options
-'figure_align': 'htbp',
-# additional preamble content
-'preamble':
-    '\\input{preamble.tex.txt}\n'+
-    '\\newcommand{\\sunreleasename}{' + sun_version + '}\n' +
-    '\\newcommand{\\imnumber}{' + im_number + '}\n',
-# extra class options
-'extraclassoptions': 'twoside,openright',
-# custom maketitle
-'maketitle': '\\input{cover_pages.tex.txt}'
-}
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'SUNDEV', u'Developer Documentation for SUNDIALS',
-     [u'The SUNDIALS Development Team'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'SUNDEV', u'Developer Documentation for SUNDIALS',
-   u'The SUNDIALS Development Team', 'SUNDEV',
-   'SUNDIALS library of time integrators and nonlinear solvers.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
diff --git a/doc/sundials_developers/source/figs b/doc/sundials_developers/source/figs
deleted file mode 120000
index d3070ad74a..0000000000
--- a/doc/sundials_developers/source/figs
+++ /dev/null
@@ -1 +0,0 @@
-../../shared/figs
\ No newline at end of file
diff --git a/doc/sundials_developers/source/introduction/index.rst b/doc/sundials_developers/source/introduction/index.rst
deleted file mode 100644
index fea930c8b1..0000000000
--- a/doc/sundials_developers/source/introduction/index.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-..
-   Author(s): David J. Gardner @ LLNL
-   -----------------------------------------------------------------------------
-   SUNDIALS Copyright Start
-   Copyright (c) 2002-2023, Lawrence Livermore National Security
-   and Southern Methodist University.
-   All rights reserved.
-
-   See the top-level LICENSE and NOTICE files for details.
-
-   SPDX-License-Identifier: BSD-3-Clause
-   SUNDIALS Copyright End
-   -----------------------------------------------------------------------------
-
-.. _Introduction:
-
-Introduction
-============
-
-The SUite of Nonlinear and DIfferential/ALgebraic equation Solvers (SUNDIALS)
-consists of the time integration packages CVODE, IDA, and ARKODE, the
-sensitivity analysis enabled variants CVODES and IDAS, and the nonlinear solver
-package KINSOL.
-
-.. toctree::
-   :maxdepth: 2
-
-   History
diff --git a/doc/sundials_developers/source/references.rst b/doc/sundials_developers/source/references.rst
deleted file mode 100644
index 766b8f108a..0000000000
--- a/doc/sundials_developers/source/references.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-..
-   Author(s): David J. Gardner @ LLNL
-   -----------------------------------------------------------------------------
-   SUNDIALS Copyright Start
-   Copyright (c) 2002-2023, Lawrence Livermore National Security
-   and Southern Methodist University.
-   All rights reserved.
-
-   See the top-level LICENSE and NOTICE files for details.
-
-   SPDX-License-Identifier: BSD-3-Clause
-   SUNDIALS Copyright End
-   -----------------------------------------------------------------------------
-
-**********
-References
-**********
-
-.. [GoogleStyle] `Google Style Guides
-                 <https://google.github.io/styleguide/>`_
diff --git a/doc/sundials_developers/source/testing/index.rst b/doc/sundials_developers/source/testing/index.rst
deleted file mode 100644
index 983bdb205c..0000000000
--- a/doc/sundials_developers/source/testing/index.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-..
-   Author(s): David J. Gardner @ LLNL
-   -----------------------------------------------------------------------------
-   SUNDIALS Copyright Start
-   Copyright (c) 2002-2023, Lawrence Livermore National Security
-   and Southern Methodist University.
-   All rights reserved.
-
-   See the top-level LICENSE and NOTICE files for details.
-
-   SPDX-License-Identifier: BSD-3-Clause
-   SUNDIALS Copyright End
-   -----------------------------------------------------------------------------
-
-.. _Testing:
-
-*******
-Testing
-*******
-
-The following sections describe the SUNDIALS CI suite as well as a testing workflow for developers.
-
-.. toctree::
-   :maxdepth: 2
-
-   CI
-   Local
-   Benchmarking
-   Spot
diff --git a/doc/superbuild/source/conf.py b/doc/superbuild/source/conf.py
index 8e5ddb8017..4b54602384 100644
--- a/doc/superbuild/source/conf.py
+++ b/doc/superbuild/source/conf.py
@@ -28,7 +28,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = ['sphinx_rtd_theme', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
               'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex',
-              'sphinx_copybutton', 'sphinx_sundials']
+              'sphinx_copybutton', 'sphinx.ext.graphviz', 'sphinx_sundials']
 
 # References
 bibtex_bibfiles = ['../../shared/sundials.bib']
diff --git a/doc/sundials_developers/source/introduction/History.rst b/doc/superbuild/source/developers/History.rst
similarity index 100%
rename from doc/sundials_developers/source/introduction/History.rst
rename to doc/superbuild/source/developers/History.rst
diff --git a/doc/sundials_developers/Makefile b/doc/superbuild/source/developers/Makefile
similarity index 100%
rename from doc/sundials_developers/Makefile
rename to doc/superbuild/source/developers/Makefile
diff --git a/doc/sundials_developers/source/appendix/GitCheatSheet.rst b/doc/superbuild/source/developers/appendix/GitCheatSheet.rst
similarity index 100%
rename from doc/sundials_developers/source/appendix/GitCheatSheet.rst
rename to doc/superbuild/source/developers/appendix/GitCheatSheet.rst
diff --git a/doc/sundials_developers/source/appendix/index.rst b/doc/superbuild/source/developers/appendix/index.rst
similarity index 97%
rename from doc/sundials_developers/source/appendix/index.rst
rename to doc/superbuild/source/developers/appendix/index.rst
index d26cc8092e..b845b13c14 100644
--- a/doc/sundials_developers/source/appendix/index.rst
+++ b/doc/superbuild/source/developers/appendix/index.rst
@@ -18,6 +18,6 @@ Appendix
 ========
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    GitCheatSheet
diff --git a/doc/sundials_developers/source/benchmarks/advection_reaction.rst b/doc/superbuild/source/developers/benchmarks/advection_reaction.rst
similarity index 100%
rename from doc/sundials_developers/source/benchmarks/advection_reaction.rst
rename to doc/superbuild/source/developers/benchmarks/advection_reaction.rst
diff --git a/doc/sundials_developers/source/benchmarks/diffusion.rst b/doc/superbuild/source/developers/benchmarks/diffusion.rst
similarity index 100%
rename from doc/sundials_developers/source/benchmarks/diffusion.rst
rename to doc/superbuild/source/developers/benchmarks/diffusion.rst
diff --git a/doc/sundials_developers/source/benchmarks/index.rst b/doc/superbuild/source/developers/benchmarks/index.rst
similarity index 97%
rename from doc/sundials_developers/source/benchmarks/index.rst
rename to doc/superbuild/source/developers/benchmarks/index.rst
index 55a5a9ec21..eca6ce7849 100644
--- a/doc/sundials_developers/source/benchmarks/index.rst
+++ b/doc/superbuild/source/developers/benchmarks/index.rst
@@ -20,7 +20,7 @@ Benchmarks
 The following sections describe the SUNDIALS performance benchmark problems.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    advection_reaction.rst
    diffusion.rst
diff --git a/doc/sundials_developers/source/development/Checklist.rst b/doc/superbuild/source/developers/development/Checklist.rst
similarity index 95%
rename from doc/sundials_developers/source/development/Checklist.rst
rename to doc/superbuild/source/developers/development/Checklist.rst
index dfe19d9af2..0d04412848 100644
--- a/doc/sundials_developers/source/development/Checklist.rst
+++ b/doc/superbuild/source/developers/development/Checklist.rst
@@ -81,3 +81,6 @@ system, etc. developers should adhere to the following checklist.
    only. Additionally, the ``SUNDIALS_DEBUG_PRINTVEC`` macro should be used to
    ``#ifdef`` out calls to the generic vector print functions ``N_VPrint`` and
    ``N_VPrintFile`` used for debugging purposes.
+
+#. If answer files changed, and it is expected/desired, then update the `.out` files
+   that are embedded in the `examples/` directory AND the :ref:`"answers" repository<>`. 
diff --git a/doc/sundials_developers/source/development/index.rst b/doc/superbuild/source/developers/development/index.rst
similarity index 91%
rename from doc/sundials_developers/source/development/index.rst
rename to doc/superbuild/source/developers/development/index.rst
index 3ed659e61a..45c5214cc9 100644
--- a/doc/sundials_developers/source/development/index.rst
+++ b/doc/superbuild/source/developers/development/index.rst
@@ -18,10 +18,6 @@ Development
 ===========
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    Checklist
-
-..
-   Debugging
-   FortranInterfaces
diff --git a/doc/superbuild/source/developers/figs b/doc/superbuild/source/developers/figs
new file mode 120000
index 0000000000..8d81ed6895
--- /dev/null
+++ b/doc/superbuild/source/developers/figs
@@ -0,0 +1 @@
+../../../shared/figs
\ No newline at end of file
diff --git a/doc/sundials_developers/source/getting_started/Documentation.rst b/doc/superbuild/source/developers/getting_started/Documentation.rst
similarity index 100%
rename from doc/sundials_developers/source/getting_started/Documentation.rst
rename to doc/superbuild/source/developers/getting_started/Documentation.rst
diff --git a/doc/sundials_developers/source/getting_started/Environment.rst b/doc/superbuild/source/developers/getting_started/Environment.rst
similarity index 100%
rename from doc/sundials_developers/source/getting_started/Environment.rst
rename to doc/superbuild/source/developers/getting_started/Environment.rst
diff --git a/doc/sundials_developers/source/getting_started/Setup.rst b/doc/superbuild/source/developers/getting_started/Setup.rst
similarity index 100%
rename from doc/sundials_developers/source/getting_started/Setup.rst
rename to doc/superbuild/source/developers/getting_started/Setup.rst
diff --git a/doc/sundials_developers/source/getting_started/Workflow.rst b/doc/superbuild/source/developers/getting_started/Workflow.rst
similarity index 100%
rename from doc/sundials_developers/source/getting_started/Workflow.rst
rename to doc/superbuild/source/developers/getting_started/Workflow.rst
diff --git a/doc/sundials_developers/source/getting_started/index.rst b/doc/superbuild/source/developers/getting_started/index.rst
similarity index 100%
rename from doc/sundials_developers/source/getting_started/index.rst
rename to doc/superbuild/source/developers/getting_started/index.rst
diff --git a/doc/sundials_developers/source/index.rst b/doc/superbuild/source/developers/index.rst
similarity index 60%
rename from doc/sundials_developers/source/index.rst
rename to doc/superbuild/source/developers/index.rst
index 6fb64c1b28..b4ad109d17 100644
--- a/doc/sundials_developers/source/index.rst
+++ b/doc/superbuild/source/developers/index.rst
@@ -12,15 +12,19 @@
    SUNDIALS Copyright End
    -----------------------------------------------------------------------------
 
-#########################
-SUNDIALS Developers Guide
-#########################
+****************
+Developers Guide
+****************
+
+The SUite of Nonlinear and DIfferential/ALgebraic equation Solvers (SUNDIALS) consists of the time
+integration packages CVODE, IDA, and ARKODE, the sensitivity analysis enabled variants CVODES and
+IDAS, and the nonlinear solver package KINSOL. This is the part of the SUNDIALS documentation is
+meant for SUNDIALS developers.
 
 .. toctree::
-   :numbered:
-   :maxdepth: 2
+   :maxdepth: 1
 
-   introduction/index
+   History
    getting_started/index
    style_guide/index
    development/index
@@ -30,4 +34,8 @@ SUNDIALS Developers Guide
    releases/index
    packages/index
    appendix/index
-   references
+
+.. only:: html
+
+   * :ref:`genindex`
+
diff --git a/doc/sundials_developers/source/packages/ARKODE.rst b/doc/superbuild/source/developers/packages/ARKODE.rst
similarity index 100%
rename from doc/sundials_developers/source/packages/ARKODE.rst
rename to doc/superbuild/source/developers/packages/ARKODE.rst
diff --git a/doc/sundials_developers/source/packages/index.rst b/doc/superbuild/source/developers/packages/index.rst
similarity index 100%
rename from doc/sundials_developers/source/packages/index.rst
rename to doc/superbuild/source/developers/packages/index.rst
diff --git a/doc/sundials_developers/source/pull_requests/MergePR.rst b/doc/superbuild/source/developers/pull_requests/MergePR.rst
similarity index 100%
rename from doc/sundials_developers/source/pull_requests/MergePR.rst
rename to doc/superbuild/source/developers/pull_requests/MergePR.rst
diff --git a/doc/sundials_developers/source/pull_requests/OpenPR.rst b/doc/superbuild/source/developers/pull_requests/OpenPR.rst
similarity index 100%
rename from doc/sundials_developers/source/pull_requests/OpenPR.rst
rename to doc/superbuild/source/developers/pull_requests/OpenPR.rst
diff --git a/doc/sundials_developers/source/pull_requests/ReviewPR.rst b/doc/superbuild/source/developers/pull_requests/ReviewPR.rst
similarity index 100%
rename from doc/sundials_developers/source/pull_requests/ReviewPR.rst
rename to doc/superbuild/source/developers/pull_requests/ReviewPR.rst
diff --git a/doc/sundials_developers/source/pull_requests/index.rst b/doc/superbuild/source/developers/pull_requests/index.rst
similarity index 98%
rename from doc/sundials_developers/source/pull_requests/index.rst
rename to doc/superbuild/source/developers/pull_requests/index.rst
index 9e2c5ed2e5..6fd8b01082 100644
--- a/doc/sundials_developers/source/pull_requests/index.rst
+++ b/doc/superbuild/source/developers/pull_requests/index.rst
@@ -24,7 +24,7 @@ creating a new pull request, items a that should be consider when reviewing, and
 how to merge the pull request after approval.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    OpenPR
    ReviewPR
diff --git a/doc/sundials_developers/source/releases/Checklist.rst b/doc/superbuild/source/developers/releases/Checklist.rst
similarity index 100%
rename from doc/sundials_developers/source/releases/Checklist.rst
rename to doc/superbuild/source/developers/releases/Checklist.rst
diff --git a/doc/sundials_developers/source/releases/index.rst b/doc/superbuild/source/developers/releases/index.rst
similarity index 97%
rename from doc/sundials_developers/source/releases/index.rst
rename to doc/superbuild/source/developers/releases/index.rst
index 8fde8f3922..75d9ccd97a 100644
--- a/doc/sundials_developers/source/releases/index.rst
+++ b/doc/superbuild/source/developers/releases/index.rst
@@ -20,6 +20,6 @@ Releases
 This chapter discusses preparing a SUNDIALS release.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    Checklist
diff --git a/doc/sundials_developers/source/style_guide/Classes.rst b/doc/superbuild/source/developers/style_guide/Classes.rst
similarity index 100%
rename from doc/sundials_developers/source/style_guide/Classes.rst
rename to doc/superbuild/source/developers/style_guide/Classes.rst
diff --git a/doc/sundials_developers/source/style_guide/Documentation.rst b/doc/superbuild/source/developers/style_guide/Documentation.rst
similarity index 100%
rename from doc/sundials_developers/source/style_guide/Documentation.rst
rename to doc/superbuild/source/developers/style_guide/Documentation.rst
diff --git a/doc/sundials_developers/source/style_guide/SourceCode.rst b/doc/superbuild/source/developers/style_guide/SourceCode.rst
similarity index 83%
rename from doc/sundials_developers/source/style_guide/SourceCode.rst
rename to doc/superbuild/source/developers/style_guide/SourceCode.rst
index 05098a2d35..9b858ade69 100644
--- a/doc/sundials_developers/source/style_guide/SourceCode.rst
+++ b/doc/superbuild/source/developers/style_guide/SourceCode.rst
@@ -106,16 +106,15 @@ Comments
 TODO Comments
 ^^^^^^^^^^^^^
 
-Following the Google Style Guide [GoogleStyle]_, TODO comments are used to note
-code that is "temporary, a short-term solution, or good-enough but not perfect."
-
-A consistent TODO comment format provides an easy to search for keyword with
-details on how to get more information. TODO comments should start with ``TODO``
-followed by a unique identifier, enclosed in parentheses, for the person most
-knowledgeable about the issue and a brief description of the TODO item.
-Generally, these comments should be used sparingly and are not a substitute for
-creating an issue or bug report. When applicable, the comment should include the
-relevant issue or bug report number.
+Following the `Google Style Guide <https://google.github.io/styleguide/>`_ , TODO comments are used
+to note code that is "temporary, a short-term solution, or good-enough but not perfect."
+
+A consistent TODO comment format provides an easy to search for keyword with details on how to get
+more information. TODO comments should start with ``TODO`` followed by a unique identifier, enclosed
+in parentheses, for the person most knowledgeable about the issue and a brief description of the
+TODO item. Generally, these comments should be used sparingly and are not a substitute for creating
+an issue or bug report. When applicable, the comment should include the relevant issue or bug report
+number.
 
 Examples:
 
diff --git a/doc/sundials_developers/source/style_guide/index.rst b/doc/superbuild/source/developers/style_guide/index.rst
similarity index 94%
rename from doc/sundials_developers/source/style_guide/index.rst
rename to doc/superbuild/source/developers/style_guide/index.rst
index 07c3a2f565..09ee444c82 100644
--- a/doc/sundials_developers/source/style_guide/index.rst
+++ b/doc/superbuild/source/developers/style_guide/index.rst
@@ -14,15 +14,14 @@
 
 .. _Style:
 
-***********
 Style Guide
-***********
+===========
 
 This chapter covers the SUNDIALS style conventions for formatting source code,
 CMake files, and documentation files to ensure consistency and maintainability.
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    SourceCode
    Classes
diff --git a/doc/superbuild/source/developers/testing/Answers.rst b/doc/superbuild/source/developers/testing/Answers.rst
new file mode 100644
index 0000000000..b0c20513ce
--- /dev/null
+++ b/doc/superbuild/source/developers/testing/Answers.rst
@@ -0,0 +1,118 @@
+..
+   -----------------------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   -----------------------------------------------------------------------------
+
+.. _Answers:
+
+Answer Files
+============
+
+When solving ODEs/DAEs and nonlinear algebraic equations numerically, there is not always a known
+analytical solution for the problem to compare with. Additionally, there may be many paths to a
+correct solution and some may be less efficient than others. This presents an issue for testing
+SUNDIALS. How do we ensure SUNDIALS is working correctly if we cannot write down what "correct" is?
+To solve this problem SUNDIALS has tests (which often also serve as example codes) that have been
+verified by the author to be functioning correctly. These tests produce output which is stored in a
+file known as the "answer" file (aka "out" or "output" file). The output typically consist of the
+solution and/or some quantities derived from the solution as well as statistics about how the
+integration and/or solve (e.g., number of time steps). When changes are made to SUNDIALS, we ensure
+that these output files do not change unless it is expected/desired. Practically, this is ensured
+by our :ref:`CI testing <CI>`.
+
+Due to difference in microarichtectures and the nature of floating point arithmetic, it is quite
+possible that the output generated on one machine may differ from the output generated on another.
+As such, we specify that the the answer files that are embedded in ``examples/`` (the ``.out``
+files) should match what is produced on the Jenkins CI machine.  We also have a `separate git
+repostiory <https://github.com/sundials-codes/answers>`_ which holds answers for other  machines,
+such as the GitHub Actions virtual machines. 
+
+
+Updating and Adding Answer Files for Existing Machines
+------------------------------------------------------
+
+Sometimes it is necessary to update the answer files, or add a new file, so that the tests pass, if a change in output
+is expected/desired. Changing output files requires careful verification that the output is still
+"correct". The procedure for updating answer files is as follows:
+
+- For the ``.out`` files embedded in examples, simply overwrite the file with the new output. If the
+  tests still fail, then you will need to download the output file generated on the Jenkins CI
+  machine and commit it. Extracting this file from the Jenkins machine may require help from David
+  or Cody currently.
+
+- For the ``.out`` files in `sundials-codes/answers <https://github.com/sundials-codes/answers>`_:
+
+  #. Navigate to `test/answers` in the sundials repository. If there is nothing in this directory,
+     you need to run `git submodule init && git submodule update`. Alternatively clone the answers
+     repository outside of the SUNDIALS source tree. 
+
+  #. Checkout the main branch: ``git checkout main``. 
+
+  #. Create a new branch off of main. It is ideal if you use a branch name that matches the name of
+     the branch that you are developing in sundials on: ``git checkout -b <branch name>``.
+
+  #. Update the relevant ``.out`` files in
+     ``test/answers/linux-ubuntu20.04-x86_64/gcc-9.4.0/<double|single|extended>`` (this is the files
+     used for the GitHub Actions CI). Like with the embedded `.out` files, you can try and use the
+     output generated on your machine, but it may be different enough from what is produced on the
+     GitHub actions to trigger a failure. You can download the output files generated on the GitHub
+     machines by going to `<https://github.com/LLNL/sundials/actions>`_ finding your failing
+     test, clicking it, then at the bottom downloading the "output_files" artifact (you can also find your
+     failing test at the bottom of a PR). The downloaded zip file will be the SUNDIALS build
+     directory. To update just the failed files you can use ``scripts/updateOutFiles.py ``e.g.,
+    
+     .. code::
+
+         cd scripts  
+         ./updateOutFiles.py <source path> <destination path>  
+      
+     When updating files in the answers repo the source path is the path to the build directory
+     downloaded from GitHub and the destination path is ``<path to answers
+     repo>/linux-ubuntu20.04-x86_64/gcc-9.4.0/<double|single|extended>``. When updating with output
+     from Jenkins the source path is the build directory for the Jenkins run and the destination
+     path is the top level of the sundials repo (i.e., ../. if running from scripts). The script
+     will automatically traverse the examples and test/unit_test directories to update output files
+     for failed tests.
+
+  #. If you need to use ssh authentication for pushing to GitHub, then you may need to update the 
+     remote for the submodule:
+
+   .. code::
+
+         git remote set-url origin git@github.com:sundials-codes/answers.git
+
+  #. Create a pull-request in `sundials-codes/answers <https://github.com/sundials-codes/answers>`_
+     with your updates. 
+
+
+Adding Answer Files for a New Machine
+-------------------------------------
+
+- For the ``.out`` files embedded in examples, simply overwrite the file with the new output. If the
+  tests running on Jenkins still fail, then you will need to download the output file generated on
+  the Jenkins CI machine and commit it. Extracting this file from the Jenkins machine may require
+  help from David or Cody currently.
+
+- For the ``.out`` files in `sundials-codes/answers <https://github.com/sundials-codes/answers>`_:
+
+  #. To add new answers, start by copying the relevant answers in ``linux-ubuntu20.04-x86_64`` to
+     your new directory (following the naming scheme outlined above).
+
+  #. Next Commit these files and open a PR to the "staging" branch.
+
+  #. Once the PR is merged, you can generate your new answer files and overwrite the ones you copied
+     from ``linux-ubuntu20.04-x86_64``.
+
+  #. Compare the diff and make sure it is reasonable, then commit.
+
+  #. Finally, open a new PR targeting the "staging" branch.
+
+  #. Eventually, "staging" will be merged into main.
diff --git a/doc/sundials_developers/source/testing/Benchmarking.rst b/doc/superbuild/source/developers/testing/Benchmarking.rst
similarity index 100%
rename from doc/sundials_developers/source/testing/Benchmarking.rst
rename to doc/superbuild/source/developers/testing/Benchmarking.rst
diff --git a/doc/sundials_developers/source/testing/CI.rst b/doc/superbuild/source/developers/testing/CI.rst
similarity index 98%
rename from doc/sundials_developers/source/testing/CI.rst
rename to doc/superbuild/source/developers/testing/CI.rst
index 2e5b6e276b..c8b527d844 100644
--- a/doc/sundials_developers/source/testing/CI.rst
+++ b/doc/superbuild/source/developers/testing/CI.rst
@@ -11,10 +11,12 @@
    SUNDIALS Copyright End
    -----------------------------------------------------------------------------
 
+.. _CI:
+
 GitHub CI Testing 
 =================
 
-There are two types of CI testing that we run on GitHub via `GitHub actions <https://github.com/LLNL/sundials/actions>`_:
+There are two categories of CI testing that we run on GitHub via `GitHub actions <https://github.com/LLNL/sundials/actions>`_:
 
 1. Comprehensive (excluding GPUs)
 2. Minimal/Short
diff --git a/doc/sundials_developers/source/testing/Local.rst b/doc/superbuild/source/developers/testing/Local.rst
similarity index 100%
rename from doc/sundials_developers/source/testing/Local.rst
rename to doc/superbuild/source/developers/testing/Local.rst
diff --git a/doc/sundials_developers/source/testing/Spot.rst b/doc/superbuild/source/developers/testing/Spot.rst
similarity index 100%
rename from doc/sundials_developers/source/testing/Spot.rst
rename to doc/superbuild/source/developers/testing/Spot.rst
diff --git a/doc/superbuild/source/developers/testing/index.rst b/doc/superbuild/source/developers/testing/index.rst
new file mode 100644
index 0000000000..4af8caf083
--- /dev/null
+++ b/doc/superbuild/source/developers/testing/index.rst
@@ -0,0 +1,50 @@
+..
+   Author(s): David J. Gardner @ LLNL
+   -----------------------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   -----------------------------------------------------------------------------
+
+.. _Testing:
+
+Testing
+=======
+
+We include several types of tests in SUNDIALS: unit tests, integration test and performance tests.
+These tests are run via as part of our :ref:`Continuous Integration suite <CI>`.
+ 
+**Unit Tests**
+
+The unit tests reside in two places: ``test/unit_tests`` and in files named ``test_`` within
+``examples/``. With few exceptions, SUNDIALS unit tests should return an exit code indicating if the
+test was successful or not. I.e., they should be self-contained and not require any output file to
+determine success or failure.
+
+**Integration Tests**
+
+The integration tests are dual purpose; they serve as tests and also examples for users. They are
+found in ``examples/``. The integration tests produce output that is checked against an output file,
+i.e. an answer file, to determine if the test passed or failed. See :ref:`Answers <Answers>` for details.
+
+**Performance Tests**
+
+These tests are benchmarks of SUNDIALS performance and are found in ``benchmarks/``. Refer to
+:ref:`Continuous Performance Testing <CPT>` for more detail.
+
+
+.. toctree::
+   :maxdepth: 1
+
+   CI
+   Local
+   Answers
+   Benchmarking
+   Spot
+   
\ No newline at end of file
diff --git a/doc/superbuild/source/index.rst b/doc/superbuild/source/index.rst
index a0a56ed96e..62298bc824 100644
--- a/doc/superbuild/source/index.rst
+++ b/doc/superbuild/source/index.rst
@@ -43,6 +43,7 @@ SUNDIALS is developed on `GitHub <https://github.com/LLNL/sundials>`_.
    sunmemory/index.rst
    Install_link.rst
    History_link.rst
+   developers/index.rst
    References
 
 

From 551f676b21fefcf96edb67e51202a8128323c66e Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Mon, 13 Nov 2023 07:34:01 -0700
Subject: [PATCH 26/35] Remove deprecated code (#360)

Remove deprecated functions

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
---
 .github/workflows/double-precision.yml        |   2 +-
 .github/workflows/extended-precision.yml      |   2 +-
 .github/workflows/macos-latest.yml            |   4 +-
 .github/workflows/single-precision.yml        |   2 +-
 .github/workflows/spack-develop.yml           |   2 +-
 .github/workflows/ubuntu-clang-latest.yml     |  40 ++-
 .github/workflows/windows-latest-mingw.yml    |   4 +-
 .github/workflows/windows-latest.yml          |   4 +-
 CHANGELOG.md                                  |   4 +
 .../kokkos/arkode_driver.cpp                  |  59 +---
 .../kokkos/cvode_driver.cpp                   |   2 +-
 .../kokkos/ida_driver.cpp                     |   2 +-
 .../raja/arkode_driver.cpp                    |  59 +---
 .../raja/cvode_driver.cpp                     |   2 +-
 .../advection_reaction_3D/raja/ida_driver.cpp |   2 +-
 benchmarks/diffusion_2D/README.md             |   2 -
 benchmarks/diffusion_2D/main_arkode.cpp       |  50 +---
 benchmarks/diffusion_2D/main_cvode.cpp        |  33 +--
 benchmarks/diffusion_2D/main_ida.cpp          |  43 +--
 cmake/SundialsBuildOptionsPre.cmake           |   6 +-
 doc/arkode/guide/source/Introduction.rst      |   5 +
 doc/cvode/guide/source/Introduction.rst       |   4 +
 doc/cvodes/guide/source/Introduction.rst      |   4 +
 doc/ida/guide/source/Introduction.rst         |   4 +
 doc/idas/guide/source/Introduction.rst        |   4 +
 doc/kinsol/guide/source/Introduction.rst      |   4 +
 doc/kinsol/guide/source/Usage/index.rst       | 106 -------
 doc/shared/Install.rst                        |  20 --
 doc/shared/nvectors/NVector_OpenMP.rst        |  12 +-
 doc/shared/nvectors/NVector_OpenMPDEV.rst     |  12 +-
 doc/shared/nvectors/NVector_PETSc.rst         |  12 +-
 doc/shared/nvectors/NVector_ParHyp.rst        |  12 +-
 doc/shared/nvectors/NVector_Parallel.rst      |  12 +-
 doc/shared/nvectors/NVector_Pthreads.rst      |  12 +-
 doc/shared/nvectors/NVector_Serial.rst        |  12 +-
 doc/shared/nvectors/NVector_Trilinos.rst      |   3 +-
 .../developers/benchmarks/diffusion.rst       |   4 -
 .../arkode/CXX_parallel/ark_brusselator1D.h   |   2 +-
 .../ark_brusselator1D_task_local_nls.cpp      |  55 ++--
 .../CXX_parallel/ark_diffusion_reaction_p.cpp |  70 +----
 examples/arkode/CXX_parallel/ark_heat2D_p.cpp |  47 +---
 .../arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp |  26 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg.cpp      |  49 ----
 examples/arkode/CXX_serial/ark_heat2D.cpp     |  41 +--
 .../ark_heat2D_hypre_pfmg_xbraid.cpp          |  54 ----
 .../arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp |  54 ----
 .../arkode/CXX_xbraid/ark_heat2D_xbraid.cpp   |  62 +----
 .../ark_brusselator1D_task_local_nls.c        |  61 ++---
 .../arkode/C_parallel/ark_diurnal_kry_p.c     |   6 +-
 examples/arkode/C_serial/ark_brusselator_fp.c |  49 ++--
 ...ark_brusselator1D_task_local_nls_f2003.f90 |  58 +---
 examples/cvode/CXX_parallel/cv_heat2D_p.cpp   |  34 ---
 .../cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp |  35 ---
 examples/cvode/serial/cvKrylovDemo_ls.c       |  80 ++----
 .../cvode/superludist/cvAdvDiff_sludist.cpp   |   1 -
 examples/cvodes/serial/cvsKrylovDemo_ls.c     |  79 ++----
 .../serial/cvsRoberts_ASAi_dns_constraints.c  |   1 -
 .../CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp     |   8 +-
 .../CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp     |   1 -
 .../kin_heat2D_nonlin_hypre_pfmg.cpp          |   8 +-
 .../kin_heat2D_nonlin_hypre_pfmg.hpp          |   1 -
 .../kinLaplace_picard_kry_f2003.f90           |  18 --
 examples/kinsol/serial/kinAnalytic_fp.c       |   4 -
 .../kinsol/serial/kinLaplace_picard_kry.c     |   4 -
 examples/sunlinsol/test_sunlinsol.h           |   4 +-
 include/arkode/arkode_arkstep.h               |  49 ----
 include/arkode/arkode_butcher_dirk.h          |  43 ---
 include/arkode/arkode_butcher_erk.h           |  43 ---
 include/arkode/arkode_erkstep.h               |  32 ---
 include/arkode/arkode_mristep.h               |  51 ----
 include/cvode/cvode_direct.h                  |  67 -----
 include/cvode/cvode_spils.h                   |  92 -------
 include/cvodes/cvodes_direct.h                |  79 ------
 include/cvodes/cvodes_spils.h                 | 127 ---------
 include/ida/ida_direct.h                      |  68 -----
 include/ida/ida_spils.h                       |  95 -------
 include/idas/idas_direct.h                    |  81 ------
 include/idas/idas_spils.h                     | 131 ---------
 include/kinsol/kinsol.h                       |  10 +-
 include/kinsol/kinsol_direct.h                |  66 -----
 include/kinsol/kinsol_spils.h                 |  85 ------
 include/nvector/nvector_openmp.h              |  16 --
 include/nvector/nvector_openmpdev.h           |  16 --
 include/nvector/nvector_parallel.h            |  15 -
 include/nvector/nvector_parhyp.h              |  18 --
 include/nvector/nvector_petsc.h               |  15 -
 include/nvector/nvector_pthreads.h            |  18 --
 include/nvector/nvector_serial.h              |  15 -
 include/sundials/sundials_band.h              |  43 ---
 include/sundials/sundials_dense.h             |  48 ----
 include/sundials/sundials_direct.h            |  70 +----
 include/sundials/sundials_iterative.h         |  30 --
 include/sundials/sundials_lapack.h            | 258 ------------------
 include/sunlinsol/sunlinsol_pcg.h             |   5 -
 include/sunlinsol/sunlinsol_spbcgs.h          |   6 -
 include/sunlinsol/sunlinsol_spfgmr.h          |   6 -
 include/sunlinsol/sunlinsol_spgmr.h           |   7 -
 include/sunlinsol/sunlinsol_sptfqmr.h         |   6 -
 .../sunnonlinsol/sunnonlinsol_fixedpoint.h    |   9 -
 include/sunnonlinsol/sunnonlinsol_newton.h    |   9 -
 scripts/cpodes                                |  81 ------
 src/arkode/arkode.c                           |  13 +-
 src/arkode/arkode_adapt.c                     |  12 +-
 src/arkode/arkode_arkstep.c                   |  42 +--
 src/arkode/arkode_arkstep_io.c                |  20 --
 src/arkode/arkode_erkstep.c                   |  22 +-
 src/arkode/arkode_erkstep_io.c                |   2 -
 src/arkode/arkode_impl.h                      |   5 -
 src/arkode/arkode_interp.c                    |   8 +-
 src/arkode/arkode_io.c                        |  29 --
 src/arkode/arkode_ls.c                        |  24 +-
 src/arkode/arkode_mristep.c                   |  22 +-
 src/arkode/arkode_mristep_io.c                |  16 --
 src/arkode/arkode_relaxation.c                |   8 +-
 src/arkode/fmod/farkode_arkstep_mod.c         |  14 -
 src/arkode/fmod/farkode_arkstep_mod.f90       |  26 --
 src/arkode/fmod/farkode_erkstep_mod.c         |  14 -
 src/arkode/fmod/farkode_erkstep_mod.f90       |  26 --
 src/arkode/fmod/farkode_mod.f90               |  33 ---
 src/arkode/fmod/farkode_mristep_mod.c         |  14 -
 src/arkode/fmod/farkode_mristep_mod.f90       |  37 ---
 src/cvode/CMakeLists.txt                      |   4 -
 src/cvode/cvode_direct.c                      |  54 ----
 src/cvode/cvode_spils.c                       |  76 ------
 src/cvodes/CMakeLists.txt                     |   4 -
 src/cvodes/cvodes_direct.c                    |  65 -----
 src/cvodes/cvodes_spils.c                     | 107 --------
 src/ida/CMakeLists.txt                        |   4 -
 src/ida/ida_direct.c                          |  56 ----
 src/ida/ida_spils.c                           |  81 ------
 src/idas/CMakeLists.txt                       |   4 -
 src/idas/idas_direct.c                        |  66 -----
 src/idas/idas_spils.c                         | 114 --------
 src/kinsol/CMakeLists.txt                     |   4 -
 src/kinsol/fmod/fkinsol_mod.c                 |  58 ----
 src/kinsol/fmod/fkinsol_mod.f90               | 108 --------
 src/kinsol/kinsol.c                           | 177 ++++++------
 src/kinsol/kinsol_direct.c                    |  55 ----
 src/kinsol/kinsol_impl.h                      |  13 -
 src/kinsol/kinsol_io.c                        |  98 -------
 src/kinsol/kinsol_ls.c                        |   8 +-
 src/kinsol/kinsol_spils.c                     |  73 -----
 src/nvector/openmp/fmod/fnvector_openmp_mod.c |  38 ---
 .../openmp/fmod/fnvector_openmp_mod.f90       |  72 -----
 src/nvector/openmp/nvector_openmp.c           |  19 --
 src/nvector/openmpdev/nvector_openmpdev.c     |  19 --
 .../parallel/fmod/fnvector_parallel_mod.c     |  38 ---
 .../parallel/fmod/fnvector_parallel_mod.f90   |  72 -----
 src/nvector/parallel/nvector_parallel.c       |  20 --
 src/nvector/parhyp/nvector_parhyp.c           |  21 --
 src/nvector/petsc/nvector_petsc.c             |  20 --
 .../pthreads/fmod/fnvector_pthreads_mod.c     |  38 ---
 .../pthreads/fmod/fnvector_pthreads_mod.f90   |  72 -----
 src/nvector/pthreads/nvector_pthreads.c       |  19 --
 src/nvector/serial/fmod/fnvector_serial_mod.c |  38 ---
 .../serial/fmod/fnvector_serial_mod.f90       |  72 -----
 src/nvector/serial/nvector_serial.c           |  19 --
 src/sundials/CMakeLists.txt                   |   5 -
 .../fmod/fsundials_linearsolver_mod.c         |  80 ------
 .../fmod/fsundials_linearsolver_mod.f90       | 164 -----------
 src/sundials/sundials_logger.c                |  30 +-
 src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c   |  28 --
 src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90 |  52 ----
 src/sunlinsol/pcg/sunlinsol_pcg.c             |  30 --
 .../spbcgs/fmod/fsunlinsol_spbcgs_mod.c       |  28 --
 .../spbcgs/fmod/fsunlinsol_spbcgs_mod.f90     |  52 ----
 src/sunlinsol/spbcgs/sunlinsol_spbcgs.c       |  30 --
 .../spfgmr/fmod/fsunlinsol_spfgmr_mod.c       |  28 --
 .../spfgmr/fmod/fsunlinsol_spfgmr_mod.f90     |  52 ----
 src/sunlinsol/spfgmr/sunlinsol_spfgmr.c       |  31 ---
 .../spgmr/fmod/fsunlinsol_spgmr_mod.c         |  28 --
 .../spgmr/fmod/fsunlinsol_spgmr_mod.f90       |  52 ----
 src/sunlinsol/spgmr/sunlinsol_spgmr.c         |  30 --
 .../sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c     |  28 --
 .../sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90   |  52 ----
 src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c     |  30 --
 .../fmod/fsunnonlinsol_fixedpoint_mod.c       |  28 --
 .../fmod/fsunnonlinsol_fixedpoint_mod.f90     |  52 ----
 .../fixedpoint/sunnonlinsol_fixedpoint.c      |  28 --
 .../newton/fmod/fsunnonlinsol_newton_mod.c    |  28 --
 .../newton/fmod/fsunnonlinsol_newton_mod.f90  |  52 ----
 src/sunnonlinsol/newton/sunnonlinsol_newton.c |  28 --
 182 files changed, 414 insertions(+), 6113 deletions(-)
 delete mode 100644 include/cvode/cvode_direct.h
 delete mode 100644 include/cvode/cvode_spils.h
 delete mode 100644 include/cvodes/cvodes_direct.h
 delete mode 100644 include/cvodes/cvodes_spils.h
 delete mode 100644 include/ida/ida_direct.h
 delete mode 100644 include/ida/ida_spils.h
 delete mode 100644 include/idas/idas_direct.h
 delete mode 100644 include/idas/idas_spils.h
 delete mode 100644 include/kinsol/kinsol_direct.h
 delete mode 100644 include/kinsol/kinsol_spils.h
 delete mode 100644 include/sundials/sundials_lapack.h
 delete mode 100755 scripts/cpodes
 delete mode 100644 src/cvode/cvode_direct.c
 delete mode 100644 src/cvode/cvode_spils.c
 delete mode 100644 src/cvodes/cvodes_direct.c
 delete mode 100644 src/cvodes/cvodes_spils.c
 delete mode 100644 src/ida/ida_direct.c
 delete mode 100644 src/ida/ida_spils.c
 delete mode 100644 src/idas/idas_direct.c
 delete mode 100644 src/idas/idas_spils.c
 delete mode 100644 src/kinsol/kinsol_direct.c
 delete mode 100644 src/kinsol/kinsol_spils.c

diff --git a/.github/workflows/double-precision.yml b/.github/workflows/double-precision.yml
index 31feaf3ffb..6f43b2f2f2 100644
--- a/.github/workflows/double-precision.yml
+++ b/.github/workflows/double-precision.yml
@@ -1,5 +1,5 @@
 #
-name: double precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs)
 
 on:
   push:
diff --git a/.github/workflows/extended-precision.yml b/.github/workflows/extended-precision.yml
index 55d75f7d5d..dfb021dc66 100644
--- a/.github/workflows/extended-precision.yml
+++ b/.github/workflows/extended-precision.yml
@@ -1,5 +1,5 @@
 #
-name: extended precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc extended precision (TPLs, no GPUs)
 
 on:
   pull_request:
diff --git a/.github/workflows/macos-latest.yml b/.github/workflows/macos-latest.yml
index 4d5599295e..457d191b5c 100644
--- a/.github/workflows/macos-latest.yml
+++ b/.github/workflows/macos-latest.yml
@@ -1,4 +1,4 @@
-name: MacOS short test
+name: Build and Test - MacOS (short)
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_and_test:
     # The CMake configure and build commands are platform agnostic and should work equally
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
diff --git a/.github/workflows/single-precision.yml b/.github/workflows/single-precision.yml
index 9a87e7f0bd..a769b09729 100644
--- a/.github/workflows/single-precision.yml
+++ b/.github/workflows/single-precision.yml
@@ -1,5 +1,5 @@
 #
-name: single precision build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc single precision (TPLs, no GPUs)
 
 on:
   pull_request:
diff --git a/.github/workflows/spack-develop.yml b/.github/workflows/spack-develop.yml
index 745a57df7e..388fdd0940 100644
--- a/.github/workflows/spack-develop.yml
+++ b/.github/workflows/spack-develop.yml
@@ -1,5 +1,5 @@
 #
-name: spack@develop build and test with GCC+TPLs (no GPUs)
+name: Build and Test - Ubuntu/gcc spack@develop (TPLs, no GPUs)
 
 on:
   pull_request:
diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml
index 71f398d30a..eb46e250d4 100644
--- a/.github/workflows/ubuntu-clang-latest.yml
+++ b/.github/workflows/ubuntu-clang-latest.yml
@@ -1,4 +1,4 @@
-name: Ubuntu (clang) short test
+name: Build - Ubuntu/Clang (no TPLs)
 
 on:
   pull_request:
@@ -14,9 +14,15 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_cycle_log_levels:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        # 2 is what all other builds use (its the default), so skip it here
+        logging_level: [0, 1, 3, 4, 5] 
+
     steps:
     - name: Install LLVM and Clang
       uses: KyleMayes/install-llvm-action@v1
@@ -28,14 +34,32 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++)
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DSUNDIALS_LOGGING_LEVEL=${{matrix.logging_level}}
 
     - name: Build
       # Build your program with the given configuration
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
 
-    - name: Test
-      working-directory: ${{github.workspace}}/build
-      # Execute tests defined by the CMake configuration.
-      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C ${{env.BUILD_TYPE}}
+  build_cycle_profiling:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        profiling: ['OFF', 'ON']
+
+    steps:
+    - name: Install LLVM and Clang
+      uses: KyleMayes/install-llvm-action@v1
+      with:
+        version: "14.0"
+
+    - uses: actions/checkout@v3
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=$(which clang) -DCMAKE_CXX_COMPILER=$(which clang++) -DSUNDIALS_BUILD_WITH_PROFILING=${{matrix.profiling}}
+
+    - name: Build
+      # Build your program with the given configuration
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
diff --git a/.github/workflows/windows-latest-mingw.yml b/.github/workflows/windows-latest-mingw.yml
index 5289a953da..ac296c6b1c 100644
--- a/.github/workflows/windows-latest-mingw.yml
+++ b/.github/workflows/windows-latest-mingw.yml
@@ -1,4 +1,4 @@
-name: Windows (mingw) short test
+name: Build and Test - Windows/mingw (short)
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  buil_and_test:
     runs-on: windows-latest
 
     steps:
diff --git a/.github/workflows/windows-latest.yml b/.github/workflows/windows-latest.yml
index 66489fe976..feca1a4e67 100644
--- a/.github/workflows/windows-latest.yml
+++ b/.github/workflows/windows-latest.yml
@@ -1,4 +1,4 @@
-name: Windows short test
+name: Build and Test - Windows/MSVC (short)
 
 on:
   pull_request:
@@ -14,7 +14,7 @@ env:
   BUILD_TYPE: Release
 
 jobs:
-  build:
+  build_and_test:
     runs-on: windows-latest
 
     steps:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48b6a0b1b1..3a2cda6550 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,10 @@ method `ARKODE_VERNER_16_8_9`.
 Changed the `SUNProfiler` so that it does not rely on `MPI_WTime` in any case.
 This fixes https://github.com/LLNL/sundials/issues/312. 
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.
diff --git a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
index e2cf1451e3..5535557af4 100644
--- a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
@@ -38,7 +38,7 @@ typedef struct
 #define LOCAL_NLS(NLS)       ( GET_NLS_CONTENT(NLS)->local_nls )
 
 /* SUNNonlinearSolver constructor */
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID);
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y);
 
 
 /* --------------------------------------------------------------
@@ -59,7 +59,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npsol;        /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -85,16 +84,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->nls == "newton")
   {
@@ -107,7 +96,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -169,9 +158,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1, udata->myid);
@@ -234,7 +220,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npsol;        /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -260,16 +245,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->nls == "newton")
   {
@@ -282,7 +257,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx);
+    LS = SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -297,7 +272,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   {
     /* The custom task-local nonlinear solver handles the linear solve
        as well, so we do not need a SUNLinearSolver. */
-    NLS = TaskLocalNewton(udata->ctx, y, DFID);
+    NLS = TaskLocalNewton(udata->ctx, y);
     if (check_retval((void *)NLS, "TaskLocalNewton", 0, udata->myid)) return 1;
 
     /* Attach nonlinear solver */
@@ -355,9 +330,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1, udata->myid);
@@ -415,7 +387,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
   long int nfe;               /* RHS stats                     */
-  FILE*    DFID;              /* diagnostics output file       */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -445,16 +416,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ERKStepSetFixedStep(arkode_mem, 1e-5);
   if (check_retval(&retval, "ERKStepSetFixedStep", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ERKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ERKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Output initial condition */
   if (uopt->nout > 0)
   {
@@ -490,9 +451,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ERKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ERKStepGetNumSteps", 1, udata->myid);
@@ -718,7 +676,7 @@ int TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS,
 }
 
 
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y)
 {
   SUNNonlinearSolver NLS;
   TaskLocalNewton_Content content;
@@ -771,12 +729,5 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
 
   content->ncnf = 0;
 
-  /* Setup the local nonlinear solver monitoring */
-  if (DFID != NULL)
-  {
-    SUNNonlinSolSetInfoFile_Newton(LOCAL_NLS(NLS), DFID);
-    SUNNonlinSolSetPrintLevel_Newton(LOCAL_NLS(NLS), 1);
-  }
-
   return NLS;
 }
diff --git a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
index e147ccd8c4..dd75f4189a 100644
--- a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
@@ -70,7 +70,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "CVodeSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
index 3ae28a43ca..792e805365 100644
--- a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
@@ -92,7 +92,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "IDASetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
index e2cf1451e3..5535557af4 100644
--- a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
@@ -38,7 +38,7 @@ typedef struct
 #define LOCAL_NLS(NLS)       ( GET_NLS_CONTENT(NLS)->local_nls )
 
 /* SUNNonlinearSolver constructor */
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID);
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y);
 
 
 /* --------------------------------------------------------------
@@ -59,7 +59,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npsol;        /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -85,16 +84,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->nls == "newton")
   {
@@ -107,7 +96,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -169,9 +158,6 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1, udata->myid);
@@ -234,7 +220,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npsol;        /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -260,16 +245,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->nls == "newton")
   {
@@ -282,7 +257,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "ARKStepSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx);
+    LS = SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
@@ -297,7 +272,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   {
     /* The custom task-local nonlinear solver handles the linear solve
        as well, so we do not need a SUNLinearSolver. */
-    NLS = TaskLocalNewton(udata->ctx, y, DFID);
+    NLS = TaskLocalNewton(udata->ctx, y);
     if (check_retval((void *)NLS, "TaskLocalNewton", 0, udata->myid)) return 1;
 
     /* Attach nonlinear solver */
@@ -355,9 +330,6 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1, udata->myid);
@@ -415,7 +387,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
   long int nfe;               /* RHS stats                     */
-  FILE*    DFID;              /* diagnostics output file       */
   char     fname[MXSTR];
 
   /* Additively split methods should not add the advection and reaction terms */
@@ -445,16 +416,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
   retval = ERKStepSetFixedStep(arkode_mem, 1e-5);
   if (check_retval(&retval, "ERKStepSetFixedStep", 1, udata->myid)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->save)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ERKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ERKStepSetDiagnostics", 1, udata->myid)) return 1;
-  }
-
   /* Output initial condition */
   if (uopt->nout > 0)
   {
@@ -490,9 +451,6 @@ int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->save) fclose(DFID);
-
   /* Get final statistics */
   retval = ERKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ERKStepGetNumSteps", 1, udata->myid);
@@ -718,7 +676,7 @@ int TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS,
 }
 
 
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y)
 {
   SUNNonlinearSolver NLS;
   TaskLocalNewton_Content content;
@@ -771,12 +729,5 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
 
   content->ncnf = 0;
 
-  /* Setup the local nonlinear solver monitoring */
-  if (DFID != NULL)
-  {
-    SUNNonlinSolSetInfoFile_Newton(LOCAL_NLS(NLS), DFID);
-    SUNNonlinSolSetPrintLevel_Newton(LOCAL_NLS(NLS), 1);
-  }
-
   return NLS;
 }
diff --git a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
index e147ccd8c4..dd75f4189a 100644
--- a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
@@ -70,7 +70,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "CVodeSetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
index 3ae28a43ca..792e805365 100644
--- a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
@@ -92,7 +92,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
     if (check_retval(&retval, "IDASetNonlinearSolver", 1, udata->myid)) return 1;
 
     /* Create linear solver */
-    LS = uopt->precond ? SUNLinSol_SPGMR(y, PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, PREC_NONE, 0, udata->ctx);
+    LS = uopt->precond ? SUNLinSol_SPGMR(y, SUN_PREC_LEFT, 0, udata->ctx) : SUNLinSol_SPGMR(y, SUN_PREC_NONE, 0, udata->ctx);
     if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0, udata->myid)) return 1;
 
     /* Attach linear solver */
diff --git a/benchmarks/diffusion_2D/README.md b/benchmarks/diffusion_2D/README.md
index 453879953f..f98f058f7f 100644
--- a/benchmarks/diffusion_2D/README.md
+++ b/benchmarks/diffusion_2D/README.md
@@ -71,7 +71,6 @@ listed below.
 | `--maxsteps <int>`                   | Max number of steps between outputs (0 uses the integrator default)                      | 0       |
 | `--onstep <int>`                     | Number of steps to run using `ONE_STEP` mode for debugging (0 uses `NORMAL` mode)        | 0       |
 | `--ls <cg,gmres,sludist>`            | Linear solver: CG, GMRES, or SuperLU_DIST                                                | cg      |
-| `--lsinfo`                           | Output linear solver diagnostics                                                         | Off     |
 | `--liniters <int>`                   | Number of linear iterations                                                              | 20      |
 | `--epslin <realtype>`                | Linear solve tolerance factor (0 uses the integrator default)                            | 0       |
 | `--msbp <int>`                       | The linear solver setup frequency (CVODE and ARKODE only, 0 uses the integrator default) | 0       |
@@ -79,7 +78,6 @@ listed below.
 | `--order <int>`                      | Methods order                                                                            | 3       |
 | `--controller <int>`                 | Error controller option                                                                  | 0       |
 | `--nonlinear`                        | Treat the problem as nonlinearly implicit                                                | Linear  |
-| `--diagnostics`                      | Output integrator diagnostics                                                            | Off     |
 
 ## Building
 
diff --git a/benchmarks/diffusion_2D/main_arkode.cpp b/benchmarks/diffusion_2D/main_arkode.cpp
index 2c6e549360..f45da5fedc 100644
--- a/benchmarks/diffusion_2D/main_arkode.cpp
+++ b/benchmarks/diffusion_2D/main_arkode.cpp
@@ -28,7 +28,6 @@ struct UserOptions
   int      maxsteps    = 0;                // max steps between outputs
   int      onestep     = 0;                // one step mode, number of steps
   bool     linear      = true;             // linearly implicit RHS
-  bool     diagnostics = false;            // output diagnostics
 
   // Linear solver and preconditioner settings
   std::string ls              = "cg";   // linear solver to use
@@ -119,21 +118,11 @@ int main(int argc, char* argv[])
     flag = udata.setup();
     if (check_flag(&flag, "UserData::setup", 1)) return 1;
 
-    // Output problem setup/options
-    FILE *diagfp = NULL;
-
     if (outproc)
     {
       udata.print();
       uopts.print();
       uout.print();
-
-      // Open diagnostics output file
-      if (uopts.diagnostics || uopts.lsinfo)
-      {
-        diagfp = fopen("diagnostics.txt", "w");
-        if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-      }
     }
 
     // ---------------
@@ -187,35 +176,18 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
       LS = SUNLinSol_PCG(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
 
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-      }
     }
     else if (uopts.ls == "gmres")
     {
       LS = SUNLinSol_SPGMR(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
     }
     else
     {
@@ -343,13 +315,6 @@ int main(int argc, char* argv[])
     flag = ARKStepSetStopTime(arkode_mem, udata.tf);
     if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-    // Set diagnostics output file
-    if (diagfp)
-    {
-      flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-      if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-    }
-
     // -----------------------
     // Loop over output times
     // -----------------------
@@ -417,10 +382,6 @@ int main(int argc, char* argv[])
     // Free MPI Cartesian communicator
     MPI_Comm_free(&(udata.comm_c));
 
-    // Close diagnostics output file
-    if (diagfp) fclose(diagfp);
-
-    // Free integrator and linear solver
     ARKStepFree(&arkode_mem);
     SUNLinSolFree(LS);
 
@@ -525,13 +486,6 @@ int UserOptions::parse_args(vector<string> &args, bool outproc)
     args.erase(it);
   }
 
-  it = find(args.begin(), args.end(), "--diagnostics");
-  if (it != args.end())
-  {
-    diagnostics = true;
-    args.erase(it);
-  }
-
   it = find(args.begin(), args.end(), "--ls");
   if (it != args.end())
   {
@@ -582,7 +536,6 @@ void UserOptions::help()
   cout << "  --order <ord>           : method order" << endl;
   cout << "  --fixedstep <step>      : used fixed step size" << endl;
   cout << "  --controller <ctr>      : time step adaptivity controller" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --ls <cg|gmres|sludist> : linear solver" << endl;
   cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
@@ -605,7 +558,6 @@ void UserOptions::print()
   cout << " controller  = " << controller  << endl;
   cout << " max steps   = " << maxsteps    << endl;
   cout << " linear RHS  = " << linear      << endl;
-  cout << " diagnostics = " << diagnostics << endl;
   cout << " --------------------------------- " << endl;
 
   cout << endl;
diff --git a/benchmarks/diffusion_2D/main_cvode.cpp b/benchmarks/diffusion_2D/main_cvode.cpp
index 77a917970d..285a45ecd1 100644
--- a/benchmarks/diffusion_2D/main_cvode.cpp
+++ b/benchmarks/diffusion_2D/main_cvode.cpp
@@ -114,21 +114,11 @@ int main(int argc, char* argv[])
     flag = udata.setup();
     if (check_flag(&flag, "UserData::setup", 1)) return 1;
 
-    // Output problem setup/options
-    FILE *diagfp = NULL;
-
     if (outproc)
     {
       udata.print();
       uopts.print();
       uout.print();
-
-      // Open diagnostics output file
-      if (uopts.lsinfo)
-      {
-        diagfp = fopen("diagnostics.txt", "w");
-        if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-      }
     }
 
     // ---------------
@@ -182,35 +172,17 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
       LS = SUNLinSol_PCG(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-      }
     }
     else if (uopts.ls == "gmres")
     {
       LS = SUNLinSol_SPGMR(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
     }
     else if (uopts.ls == "sludist")
     {
@@ -390,9 +362,6 @@ int main(int argc, char* argv[])
     // Free MPI Cartesian communicator
     MPI_Comm_free(&(udata.comm_c));
 
-    // Close diagnostics output file
-    if (diagfp) fclose(diagfp);
-
     // Free integrator and linear solver
     CVodeFree(&cvode_mem);     // Free integrator memory
     SUNLinSolFree(LS);         // Free linear solver
diff --git a/benchmarks/diffusion_2D/main_ida.cpp b/benchmarks/diffusion_2D/main_ida.cpp
index d34dc81948..46cf86d84c 100644
--- a/benchmarks/diffusion_2D/main_ida.cpp
+++ b/benchmarks/diffusion_2D/main_ida.cpp
@@ -28,7 +28,6 @@ struct UserOptions
   // Linear solver and preconditioner settings
   std::string ls              = "cg";   // linear solver to use
   bool        preconditioning = true;   // preconditioner on/off
-  bool        lsinfo          = false;  // output residual history
   int         liniters        = 20;     // number of linear iterations
   realtype    epslin          = ZERO;   // linear solver tolerance factor
 
@@ -113,21 +112,11 @@ int main(int argc, char* argv[])
     flag = udata.setup();
     if (check_flag(&flag, "UserData::setup", 1)) return 1;
 
-    // Output problem setup/options
-    FILE *diagfp = NULL;
-
     if (outproc)
     {
       udata.print();
       uopts.print();
       uout.print();
-
-      // Open diagnostics output file
-      if (uopts.lsinfo)
-      {
-        diagfp = fopen("diagnostics.txt", "w");
-        if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-      }
     }
 
     // ---------------
@@ -187,35 +176,17 @@ int main(int argc, char* argv[])
     sunindextype* A_row_ptrs = nullptr;
 #endif
 
-    int prectype = (uopts.preconditioning) ? PREC_RIGHT : PREC_NONE;
+    int prectype = (uopts.preconditioning) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
     if (uopts.ls == "cg")
     {
       LS = SUNLinSol_PCG(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-      }
     }
     else if (uopts.ls == "gmres")
     {
       LS = SUNLinSol_SPGMR(u, prectype, uopts.liniters, ctx);
       if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-      if (uopts.lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
     }
     else
     {
@@ -386,9 +357,6 @@ int main(int argc, char* argv[])
     // Free MPI Cartesian communicator
     MPI_Comm_free(&(udata.comm_c));
 
-    // Close diagnostics output file
-    if (diagfp) fclose(diagfp);
-
     // Free integrator and linear solver
     IDAFree(&ida_mem);     // Free integrator memory
     SUNLinSolFree(LS);         // Free linear solver
@@ -474,12 +442,6 @@ int UserOptions::parse_args(vector<string> &args, bool outproc)
     args.erase(it, it + 2);
   }
 
-  it = find(args.begin(), args.end(), "--lsinfo");
-  if (it != args.end())
-  {
-    lsinfo = true;
-    args.erase(it);
-  }
 
   it = find(args.begin(), args.end(), "--liniters");
   if (it != args.end())
@@ -507,7 +469,6 @@ void UserOptions::help()
   cout << "  --rtol <rtol>           : relative tolerance" << endl;
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --ls <cg|gmres|sludist> : linear solver" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
@@ -537,7 +498,6 @@ void UserOptions::print()
 #else
     cout << " LS       = SuperLU_DIST" << endl;
 #endif
-    cout << " LS info  = " << lsinfo   << endl;
     cout << " --------------------------------- " << endl;
   }
   else
@@ -546,7 +506,6 @@ void UserOptions::print()
     cout << " --------------------------------- " << endl;
     cout << " LS       = " << ls              << endl;
     cout << " precond  = " << preconditioning << endl;
-    cout << " LS info  = " << lsinfo          << endl;
     cout << " LS iters = " << liniters        << endl;
     cout << " epslin   = " << epslin          << endl;
     cout << " --------------------------------- " << endl;
diff --git a/cmake/SundialsBuildOptionsPre.cmake b/cmake/SundialsBuildOptionsPre.cmake
index b9959f745d..3de3b3a29a 100644
--- a/cmake/SundialsBuildOptionsPre.cmake
+++ b/cmake/SundialsBuildOptionsPre.cmake
@@ -76,12 +76,12 @@ sundials_option(SUNDIALS_BUILD_WITH_PROFILING BOOL "${DOCSTR}" OFF)
 # ---------------------------------------------------------------
 
 set(DOCSTR "Build with logging capabilities enabled (0 = no logging, 1 = errors, 2 = +warnings, 3 = +info, 4 = +debug, 5 = +extras")
-sundials_option(SUNDIALS_LOGGING_LEVEL STRING "${DOCSTR}" 0
+sundials_option(SUNDIALS_LOGGING_LEVEL STRING "${DOCSTR}" 2
                 OPTIONS "0;1;2;3;4;5")
 
-if(SUNDIALS_LOGGING_LEVEL GREATER_EQUAL 1)
+if(SUNDIALS_LOGGING_LEVEL GREATER_EQUAL 3)
   message(STATUS "SUNDIALS logging level set to ${SUNDIALS_LOGGING_LEVEL}")
-  message(WARNING "SUNDIALS built with logging turned on, performance may be affected.")
+  message(WARNING "SUNDIALS built with additional logging turned on, performance may be affected.")
 endif()
 
 set(DOCSTR "Build SUNDIALS logging with MPI support")
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index 6eaf50a9ec..b6442c8fd8 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -182,6 +182,11 @@ This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index b4c2388e34..daa94f9fee 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -134,6 +134,10 @@ This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index d6ff7db84e..be21b803d0 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -137,6 +137,10 @@ This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 369147817e..83a4da2ba8 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -95,6 +95,10 @@ This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index 4dc93c7b41..c9a7d91871 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -112,6 +112,10 @@ This fixes `GitHub Issue #312 <https://github.com/LLNL/sundials/issues/312>`_.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 Changes in v5.6.1
 -----------------
 
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index a4c33cc470..7ac3cd37c9 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -104,6 +104,10 @@ CMake targets.
 
 Added Fortran support for the LAPACK  dense ``SUNLinearSolver`` implementation.
 
+**Breaking change**
+Functions, types and header files that were previously deprecated have been
+removed. 
+
 Changes in v6.6.1
 -----------------
 
diff --git a/doc/kinsol/guide/source/Usage/index.rst b/doc/kinsol/guide/source/Usage/index.rst
index c55d695dc8..98deec00ea 100644
--- a/doc/kinsol/guide/source/Usage/index.rst
+++ b/doc/kinsol/guide/source/Usage/index.rst
@@ -483,12 +483,8 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
   +--------------------------------------------------------+----------------------------------+------------------------------+
   | Info handler function                                  | :c:func:`KINSetInfoHandlerFn`    | internal fn.                 |
   +--------------------------------------------------------+----------------------------------+------------------------------+
-  | Pointer to an info file                                | :c:func:`KINSetInfoFile`         | ``stdout``                   |
-  +--------------------------------------------------------+----------------------------------+------------------------------+
   | Data for problem-defining function                     | :c:func:`KINSetUserData`         | ``NULL``                     |
   +--------------------------------------------------------+----------------------------------+------------------------------+
-  | Verbosity level of output                              | :c:func:`KINSetPrintLevel`       | 0                            |
-  +--------------------------------------------------------+----------------------------------+------------------------------+
   | Max. number of nonlinear iterations                    | :c:func:`KINSetNumMaxIters`      | 200                          |
   +--------------------------------------------------------+----------------------------------+------------------------------+
   | No initial matrix setup                                | :c:func:`KINSetNoInitSetup`      | ``SUNFALSE``                 |
@@ -601,83 +597,6 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       ``NULL`` will  always be directed to ``stderr``.
 
 
-.. c:function:: int KINSetInfoFile(void * kin_mem, FILE * infofp)
-
-   The function :c:func:`KINSetInfoFile` specifies the pointer to the file
-   where all informative (non-error) messages should be directed.
-
-   **Arguments:**
-     * ``kin_mem`` -- pointer to the KINSOL memory block.
-     * ``infofp`` -- pointer to output file.
-
-   **Return value:**
-     * ``KIN_SUCCESS`` -- The optional value has been successfully set.
-     * ``KIN_MEM_NULL`` -- The ``kin_mem`` pointer is ``NULL``.
-
-   **Notes:**
-      The default value for ``infofp`` is ``stdout``.
-
-   .. deprecated:: 6.2.0
-
-      Use :c:func:`SUNLogger_SetInfoFilename` instead.
-
-
-.. c:function:: int KINSetInfoHandlerFn(void * kin_mem, KINInfoHandlerFn ihfun, void * ih_data)
-
-   The function :c:func:`KINSetInfoHandlerFn` specifies the optional
-   user-defined function  to be used in handling informative (non-error)
-   messages.
-
-   **Arguments:**
-     * ``kin_mem`` -- pointer to the KINSOL memory block.
-     * ``ihfun`` -- is the user's CC information handler function (see :numref:`KINSOL.Usage.CC.user_fct_sim.ihFn`).
-     * ``ih_data`` -- pointer to user data passed to ``ihfun`` every time it is called.
-
-   **Return value:**
-     * ``KIN_SUCCESS`` -- The function ``ihfun`` and data pointer ``ih_data`` have been successfully set.
-     * ``KIN_MEM_NULL`` -- The ``kin_mem`` pointer is ``NULL``.
-
-   **Notes:**
-      The default internal information handler function directs informative
-      (non-error)  messages to the file specified by the file pointer ``infofp``
-      (see  :c:func:`KINSetInfoFile` above).
-
-
-.. c:function:: int KINSetPrintLevel(void * kin_mem, int printfl)
-
-   The function :c:func:`KINSetPrintLevel` specifies the level of verbosity  of the output.
-
-   **Arguments:**
-     * ``kin_mem`` -- pointer to the KINSOL memory block.
-     * ``printfl`` -- flag indicating the level of verbosity. Must be one of:
-
-       0 -- no information is displayed.
-
-       1 -- for each nonlinear iteration display the following information:
-
-       - the scaled Euclidean :math:`\ell_2` norm of the system function evaluated at the current iterate,
-       - the scaled norm of the Newton step (only if using ``KIN_NONE``), and
-       - the number of function evaluations performed so far.
-
-       2 -- display level 1 output and the following values for each iteration:
-
-       - :math:`\|F(u)\|_{D_F}` (only for ``KIN_NONE``).
-       - :math:`\|F(u)\|_{D_F,\infty}` (for ``KIN_NONE`` and ``KIN_LINESEARCH``).
-
-       3 -- display level 2 output plus
-
-       - additional values used by the global strategy (only if using ``KIN_LINESEARCH``), and
-       - statistical information for iterative linear solver modules.
-
-   **Return value:**
-     * ``KIN_SUCCESS`` -- The optional value has been successfully set.
-     * ``KIN_MEM_NULL`` -- The ``kin_mem`` pointer is ``NULL``.
-     * ``KIN_ILL_INPUT`` -- The argument ``printfl`` had an illegal value.
-
-   **Notes:**
-      The default value for ``printfl`` is :math:`0`.
-
-
 .. c:function:: int KINSetUserData(void * kin_mem, void * user_data)
 
    The function :c:func:`KINSetUserData` specifies the pointer to user-defined
@@ -2000,31 +1919,6 @@ follows:
       warnings. If a function that returns a pointer to memory encounters an error,
       it sets ``error_code`` to 0.
 
-.. _KINSOL.Usage.CC.user_fct_sim.ihFn:
-
-Informational message handler function
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-As an alternative to the default behavior of directing informational (meaning non-error) messages
-to the file pointed to by ``infofp`` (see :c:func:`KINSetInfoFile`), the user may
-provide a function of type :c:type:`KINInfoHandlerFn` to process any such messages.
-The function type :c:type:`KINInfoHandlerFn` is defined as follows:
-
-.. c:type:: void (*KINInfoHandlerFn)(const char *module, const char *function, char *msg, void *ih_data)
-
-   This function processes error and warning messages from KINSOL and its
-   sub-modules.
-
-   **Arguments:**
-      * ``error_code`` -- is the error code
-      * ``module`` -- is the name of the KINSOL module reporting the error
-      * ``function`` -- is the name of the function in which the error occurred
-      * ``ih_data`` -- is a pointer to user data, the same as the ``ih_data``
-        parameter passed to :c:func:`KINSetInfoHandlerFn`
-
-   **Return value:**
-      This function has no return value.
-
 
 .. _KINSOL.Usage.CC.user_fct_sim.jacFn:
 
diff --git a/doc/shared/Install.rst b/doc/shared/Install.rst
index 9021e5b340..0c44d10d87 100644
--- a/doc/shared/Install.rst
+++ b/doc/shared/Install.rst
@@ -1967,15 +1967,11 @@ configuration file to build against SUNDIALS in their own CMake project.
    |                              |              +----------------------------------------------+
    |                              |              | ``cvode/cvode_diag.h``                       |
    |                              |              +----------------------------------------------+
-   |                              |              | ``cvode/cvode_direct.h``                     |
-   |                              |              +----------------------------------------------+
    |                              |              | ``cvode/cvode_impl.h``                       |
    |                              |              +----------------------------------------------+
    |                              |              | ``cvode/cvode_ls.h``                         |
    |                              |              +----------------------------------------------+
    |                              |              | ``cvode/cvode_proj.h``                       |
-   |                              |              +----------------------------------------------+
-   |                              |              | ``cvode/cvode_spils.h``                      |
    +------------------------------+--------------+----------------------------------------------+
    | CVODES                       | Libraries    | ``libsundials_cvodes.LIB``                   |
    |                              +--------------+----------------------------------------------+
@@ -1987,13 +1983,9 @@ configuration file to build against SUNDIALS in their own CMake project.
    |                              |              +----------------------------------------------+
    |                              |              | ``cvodes/cvodes_diag.h``                     |
    |                              |              +----------------------------------------------+
-   |                              |              | ``cvodes/cvodes_direct.h``                   |
-   |                              |              +----------------------------------------------+
    |                              |              | ``cvodes/cvodes_impl.h``                     |
    |                              |              +----------------------------------------------+
    |                              |              | ``cvodes/cvodes_ls.h``                       |
-   |                              |              +----------------------------------------------+
-   |                              |              | ``cvodes/cvodes_spils.h``                    |
    +------------------------------+--------------+----------------------------------------------+
    | ARKODE                       | Libraries    | ``libsundials_arkode.LIB``                   |
    |                              |              +----------------------------------------------+
@@ -2029,13 +2021,9 @@ configuration file to build against SUNDIALS in their own CMake project.
    |                              |              +----------------------------------------------+
    |                              |              | ``ida/ida_bbdpre.h``                         |
    |                              |              +----------------------------------------------+
-   |                              |              | ``ida/ida_direct.h``                         |
-   |                              |              +----------------------------------------------+
    |                              |              | ``ida/ida_impl.h``                           |
    |                              |              +----------------------------------------------+
    |                              |              | ``ida/ida_ls.h``                             |
-   |                              |              +----------------------------------------------+
-   |                              |              | ``ida/ida_spils.h``                          |
    +------------------------------+--------------+----------------------------------------------+
    | IDAS                         | Libraries    | ``libsundials_idas.LIB``                     |
    |                              +--------------+----------------------------------------------+
@@ -2043,11 +2031,7 @@ configuration file to build against SUNDIALS in their own CMake project.
    |                              |              +----------------------------------------------+
    |                              |              | ``idas/idas_bbdpre.h``                       |
    |                              |              +----------------------------------------------+
-   |                              |              | ``idas/idas_direct.h``                       |
-   |                              |              +----------------------------------------------+
    |                              |              | ``idas/idas_impl.h``                         |
-   |                              |              +----------------------------------------------+
-   |                              |              | ``idas/idas_spils.h``                        |
    +------------------------------+--------------+----------------------------------------------+
    | KINSOL                       | Libraries    | ``libsundials_kinsol.LIB``                   |
    |                              +--------------+----------------------------------------------+
@@ -2055,11 +2039,7 @@ configuration file to build against SUNDIALS in their own CMake project.
    |                              |              +----------------------------------------------+
    |                              |              | ``kinsol/kinsol_bbdpre.h``                   |
    |                              |              +----------------------------------------------+
-   |                              |              | ``kinsol/kinsol_direct.h``                   |
-   |                              |              +----------------------------------------------+
    |                              |              | ``kinsol/kinsol_impl.h``                     |
    |                              |              +----------------------------------------------+
    |                              |              | ``kinsol/kinsol_ls.h``                       |
-   |                              |              +----------------------------------------------+
-   |                              |              | ``kinsol/kinsol_spils.h``                    |
    +------------------------------+--------------+----------------------------------------------+
diff --git a/doc/shared/nvectors/NVector_OpenMP.rst b/doc/shared/nvectors/NVector_OpenMP.rst
index dcd63c0709..09e3311bb9 100644
--- a/doc/shared/nvectors/NVector_OpenMP.rst
+++ b/doc/shared/nvectors/NVector_OpenMP.rst
@@ -289,13 +289,11 @@ options as the vector they are cloned from while vectors created with
   ``v_data = NV_DATA_OMP(v)`` and then access ``v_data[i]`` within the
   loop than it is to use ``NV_Ith_OMP(v,i)`` within the loop.
 
-* :c:func:`N_VNewEmpty_OpenMP`, :c:func:`N_VMake_OpenMP`, and
-  :c:func:`N_VCloneVectorArrayEmpty_OpenMP()` set the field *own_data*
-  to ``SUNFALSE``.  The functions :c:func:`N_VDestroy_OpenMP()` and
-  :c:func:`N_VDestroyVectorArray_OpenMP()` will not attempt to free the
-  pointer data for any ``N_Vector`` with *own_data* set to ``SUNFALSE``.
-  In such a case, it is the user's responsibility to deallocate the
-  data pointer.
+* :c:func:`N_VNewEmpty_OpenMP` and :c:func:`N_VMake_OpenMP` set the field
+  *own_data* to ``SUNFALSE``.  The function :c:func:`N_VDestroy_OpenMP()` will
+  not attempt to free the pointer data for any ``N_Vector`` with *own_data* set
+  to ``SUNFALSE``. In such a case, it is the user's responsibility to deallocate
+  the data pointer.
 
 * To maximize efficiency, vector operations in the NVECTOR_OPENMP
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_OpenMPDEV.rst b/doc/shared/nvectors/NVector_OpenMPDEV.rst
index 8415431485..9db8affe63 100644
--- a/doc/shared/nvectors/NVector_OpenMPDEV.rst
+++ b/doc/shared/nvectors/NVector_OpenMPDEV.rst
@@ -291,13 +291,11 @@ options as the vector they are cloned from while vectors created with
   back from the device with ``N_VCopyFromDevice_OpenMPDEV(v)``
   to ensure the array is up to date.
 
-* :c:func:`N_VNewEmpty_OpenMPDEV`, :c:func:`N_VMake_OpenMPDEV`, and
-  :c:func:`N_VCloneVectorArrayEmpty_OpenMPDEV()` set the field *own_data*
-  to ``SUNFALSE``.  The functions :c:func:`N_VDestroy_OpenMPDEV()` and
-  :c:func:`N_VDestroyVectorArray_OpenMPDEV()` will not attempt to free the
-  pointer data for any ``N_Vector`` with *own_data* set to ``SUNFALSE``.
-  In such a case, it is the user's responsibility to deallocate the
-  data pointers.
+* :c:func:`N_VNewEmpty_OpenMPDEV` and :c:func:`N_VMake_OpenMPDEV` set the field
+  *own_data* to ``SUNFALSE``.  The function :c:func:`N_VDestroy_OpenMPDEV()`
+  will not attempt to free the pointer data for any ``N_Vector`` with *own_data*
+  set to ``SUNFALSE``. In such a case, it is the user's responsibility to
+  deallocate the data pointers.
 
 * To maximize efficiency, vector operations in the NVECTOR_OPENMPDEV
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_PETSc.rst b/doc/shared/nvectors/NVector_PETSc.rst
index 6c8549f46c..5857f5d249 100644
--- a/doc/shared/nvectors/NVector_PETSc.rst
+++ b/doc/shared/nvectors/NVector_PETSc.rst
@@ -179,13 +179,11 @@ options as the vector they are cloned from while vectors created with
   is recommeded to extract the PETSc vector via ``x_vec = N_VGetVector_Petsc(v);``
   and then access components using appropriate PETSc functions.
 
-* The functions :c:func:`N_VNewEmpty_Petsc`, :c:func:`N_VMake_Petsc`,
-  and :c:func:`N_VCloneVectorArrayEmpty_Petsc()` set the field
-  *own_data* to ``SUNFALSE``. The routines :c:func:`N_VDestroy_Petsc()` and
-  :c:func:`N_VDestroyVectorArray_Petsc()` will not attempt to free the
-  pointer ``pvec`` for any ``N_Vector`` with *own_data* set to
-  ``SUNFALSE``. In such a case, it is the user's responsibility to
-  deallocate the ``pvec`` pointer.
+* The functions :c:func:`N_VNewEmpty_Petsc` and :c:func:`N_VMake_Petsc`, set the
+  field *own_data* to ``SUNFALSE``. The routine :c:func:`N_VDestroy_Petsc()`
+  will not attempt to free the pointer ``pvec`` for any ``N_Vector`` with
+  *own_data* set to ``SUNFALSE``. In such a case, it is the user's
+  responsibility to deallocate the ``pvec`` pointer.
 
 * To maximize efficiency, vector operations in the NVECTOR_PETSC
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_ParHyp.rst b/doc/shared/nvectors/NVector_ParHyp.rst
index 92b881bbd6..97f3ed0f40 100644
--- a/doc/shared/nvectors/NVector_ParHyp.rst
+++ b/doc/shared/nvectors/NVector_ParHyp.rst
@@ -188,13 +188,11 @@ options as the vector they are cloned from while vectors created with
   ``x_vec = N_VGetVector_ParHyp(v)`` and then access components using
   appropriate HYPRE functions.
 
-* :c:func:`N_VNewEmpty_ParHyp`, :c:func:`N_VMake_ParHyp`, and
-  :c:func:`N_VCloneVectorArrayEmpty_ParHyp()` set the field *own_parvector*
-  to ``SUNFALSE``.  The functions :c:func:`N_VDestroy_ParHyp()` and
-  :c:func:`N_VDestroyVectorArray_ParHyp()` will not attempt to delete an
-  underlying HYPRE vector for any ``N_Vector`` with *own_parvector*
-  set to ``SUNFALSE``.  In such a case, it is the user's responsibility
-  to delete the underlying vector.
+* :c:func:`N_VNewEmpty_ParHyp`, and :c:func:`N_VMake_ParHyp` set the field
+   *own_parvector* to ``SUNFALSE``.  The function :c:func:`N_VDestroy_ParHyp()`
+   will not attempt to delete an underlying HYPRE vector for any ``N_Vector``
+   with *own_parvector* set to ``SUNFALSE``.  In such a case, it is the
+   user's responsibility to delete the underlying vector.
 
 * To maximize efficiency, vector operations in the NVECTOR_PARHYP
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_Parallel.rst b/doc/shared/nvectors/NVector_Parallel.rst
index 0b9b2ae8f7..56721550c1 100644
--- a/doc/shared/nvectors/NVector_Parallel.rst
+++ b/doc/shared/nvectors/NVector_Parallel.rst
@@ -287,13 +287,11 @@ options as the vector they are cloned from, while vectors created with
   ``v_data = NV_DATA_P(v)``, and then access ``v_data[i]`` within the loop
   than it is to use ``NV_Ith_P(v,i)`` within the loop.
 
-* :c:func:`N_VNewEmpty_Parallel`, :c:func:`N_VMake_Parallel`, and
-  :c:func:`N_VCloneVectorArrayEmpty_Parallel()` set the field *own_data* to
-  ``SUNFALSE``. The routines :c:func:`N_VDestroy_Parallel()` and
-  :c:func:`N_VDestroyVectorArray_Parallel()` will not attempt to free the
-  pointer data for any ``N_Vector`` with *own_data* set to
-  ``SUNFALSE``. In such a case, it is the user's responsibility to
-  deallocate the data pointer.
+* :c:func:`N_VNewEmpty_Parallel` and :c:func:`N_VMake_Parallel` set the field
+  *own_data* to ``SUNFALSE``. The routine :c:func:`N_VDestroy_Parallel()` will
+  not attempt to free the pointer data for any ``N_Vector`` with *own_data* set
+  to ``SUNFALSE``. In such a case, it is the user's responsibility to deallocate
+  the data pointer.
 
 * To maximize efficiency, vector operations in the NVECTOR_PARALLEL
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_Pthreads.rst b/doc/shared/nvectors/NVector_Pthreads.rst
index fc78cfa323..5669210aa5 100644
--- a/doc/shared/nvectors/NVector_Pthreads.rst
+++ b/doc/shared/nvectors/NVector_Pthreads.rst
@@ -285,13 +285,11 @@ options as the vector they are cloned from while vectors created with
   NV_DATA_PT(v)`` and then access ``v_data[i]`` within the loop than it
   is to use ``NV_Ith_S(v,i)`` within the loop.
 
-* :c:func:`N_VNewEmpty_Pthreads`, :c:func:`N_VMake_Pthreads`, and
-  :c:func:`N_VCloneVectorArrayEmpty_Pthreads()` set the field *own_data*
-  to ``SUNFALSE``.  The functions :c:func:`N_VDestroy_Pthreads()` and
-  :c:func:`N_VDestroyVectorArray_Pthreads()` will not attempt to free the
-  pointer data for any ``N_Vector`` with *own_data* set to ``SUNFALSE``.
-  In such a case, it is the user's responsibility to deallocate the
-  data pointer.
+* :c:func:`N_VNewEmpty_Pthreads` and :c:func:`N_VMake_Pthreads` set the field
+  *own_data* to ``SUNFALSE``.  The function :c:func:`N_VDestroy_Pthreads()` will
+  not attempt to free the pointer data for any ``N_Vector`` with *own_data* set
+  to ``SUNFALSE``. In such a case, it is the user's responsibility to deallocate
+  the data pointer.
 
 * To maximize efficiency, vector operations in the NVECTOR_PTHREADS
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_Serial.rst b/doc/shared/nvectors/NVector_Serial.rst
index 53194e0569..b7b8bcab24 100644
--- a/doc/shared/nvectors/NVector_Serial.rst
+++ b/doc/shared/nvectors/NVector_Serial.rst
@@ -263,13 +263,11 @@ options as the vector they are cloned, from while vectors created with
   and then access ``v_data[i]`` within the loop than it
   is to use ``NV_Ith_S(v,i)`` within the loop.
 
-* :c:func:`N_VNewEmpty_Serial`, :c:func:`N_VMake_Serial`, and
-  :c:func:`N_VCloneVectorArrayEmpty_Serial()` set the field *own_data*
-  to ``SUNFALSE``.  The functions :c:func:`N_VDestroy_Serial()` and
-  :c:func:`N_VDestroyVectorArray_Serial()` will not attempt to free the
-  pointer data for any ``N_Vector`` with *own_data* set to ``SUNFALSE``.
-  In such a case, it is the user's responsibility to deallocate the
-  data pointer.
+* :c:func:`N_VNewEmpty_Serial`, :c:func:`N_VMake_Serial` set the field
+  *own_data* to ``SUNFALSE``.  The function :c:func:`N_VDestroy_Serial()` will
+  not attempt to free the pointer data for any ``N_Vector`` with *own_data* set
+  to ``SUNFALSE``. In such a case, it is the user's responsibility to deallocate
+  the data pointer.
 
 * To maximize efficiency, vector operations in the NVECTOR_SERIAL
   implementation that have more than one ``N_Vector`` argument do not
diff --git a/doc/shared/nvectors/NVector_Trilinos.rst b/doc/shared/nvectors/NVector_Trilinos.rst
index 861ffcacbf..6a47becd0c 100644
--- a/doc/shared/nvectors/NVector_Trilinos.rst
+++ b/doc/shared/nvectors/NVector_Trilinos.rst
@@ -108,7 +108,6 @@ The module NVECTOR_TRILINOS provides the following additional user-callable rout
   N_VGetVector_Trilinos(v)`` and then access components using the
   appropriate Trilinos functions.
 
-* The functions ``N_VDestroy_Trilinos`` and
-  ``N_VDestroyVectorArray_Trilinos`` only delete the ``N_Vector``
+* The function ``N_VDestroy_Trilinos`` only deletes the ``N_Vector``
   wrapper. The underlying Tpetra vector object will exist for as long
   as there is at least one reference to it.
diff --git a/doc/superbuild/source/developers/benchmarks/diffusion.rst b/doc/superbuild/source/developers/benchmarks/diffusion.rst
index 5c35ac4ec2..9b96887853 100644
--- a/doc/superbuild/source/developers/benchmarks/diffusion.rst
+++ b/doc/superbuild/source/developers/benchmarks/diffusion.rst
@@ -149,8 +149,6 @@ listed in :numref:`Benchmarks.Table.2D_diffusion_options`.
    | ``--ls``                      | Linear solver: ``cg``, ``gmres``,    | ``cg``        |
    |                               | ``sludist``                          |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--lsinfo``                  | Output linear solver diagnostics     | Off           |
-   +-------------------------------+--------------------------------------+---------------+
    | ``--liniters <int>``          | Number of linear iterations          | 20            |
    +-------------------------------+--------------------------------------+---------------+
    | ``--epslin <realtype>``       | Linear solve tolerance factor        | 0             |
@@ -169,8 +167,6 @@ listed in :numref:`Benchmarks.Table.2D_diffusion_options`.
    | ``--nonlinear``               | Treat the problem as nonlinearly     | Linear        |
    |                               | implicit                             |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--diagnostics``             | Output integrator diagnostics        | Off           |
-   +-------------------------------+--------------------------------------+---------------+
 
 
 Building
diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D.h b/examples/arkode/CXX_parallel/ark_brusselator1D.h
index d1e0a83254..b59fda6390 100644
--- a/examples/arkode/CXX_parallel/ark_brusselator1D.h
+++ b/examples/arkode/CXX_parallel/ark_brusselator1D.h
@@ -196,7 +196,7 @@ typedef struct
 #define LOCAL_NLS(NLS)       ( GET_NLS_CONTENT(NLS)->local_nls )
 
 /* SUNNonlinearSolver constructor */
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID);
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y);
 
 
 /*
diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
index a6d081357c..2d157c3d8c 100644
--- a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
+++ b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
@@ -142,6 +142,20 @@ int main(int argc, char *argv[])
     retval = SetupProblem(argc, argv, &udata, &uopt, ctx);
     if (check_retval(&retval, "SetupProblem", 1)) MPI_Abort(comm, 1);
 
+    /* Setup diagnostic logging if it is enabled */
+    if (uopt.monitor)
+    {
+      SUNLogger logger;
+      
+      sprintf(fname, "%s/diagnostics.%06d.txt", uopt.outputdir, udata.myid);
+
+      retval = SUNContext_GetLogger(ctx, &logger);
+      if (check_retval(&retval, "SUNContext_GetLogger", 1)) return 1;
+
+      retval = SUNLogger_SetInfoFilename(logger, fname);
+      if (check_retval(&retval, "SUNLogger_SetInfoFilename", 1)) return 1;
+    }
+
     /* Create solution vector */
     y = N_VMake_MPIPlusX(udata.comm, LocalNvector(udata.NEQ, ctx), ctx);
     if (check_retval((void *) y, "N_VMake_MPIPlusX", 0)) MPI_Abort(comm, 1);
@@ -218,8 +232,6 @@ int EvolveProblemIMEX(SUNContext ctx, N_Vector y, UserData* udata,
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npsol;        /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
-  char     fname[MXSTR];
 
   /* Create the ARK timestepper module */
   arkode_mem = ARKStepCreate(Advection, Reaction, uopt->t0, y, ctx);
@@ -241,16 +253,6 @@ int EvolveProblemIMEX(SUNContext ctx, N_Vector y, UserData* udata,
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->monitor)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->global)
   {
@@ -278,7 +280,7 @@ int EvolveProblemIMEX(SUNContext ctx, N_Vector y, UserData* udata,
   {
     /* The custom task-local nonlinear solver handles the linear solve
        as well, so we do not need a SUNLinearSolver. */
-    NLS = TaskLocalNewton(ctx, y, DFID);
+    NLS = TaskLocalNewton(ctx, y);
     if (check_retval((void *)NLS, "TaskLocalNewton", 0)) return 1;
 
     /* Attach nonlinear solver */
@@ -318,9 +320,6 @@ int EvolveProblemIMEX(SUNContext ctx, N_Vector y, UserData* udata,
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->monitor) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1);
@@ -380,8 +379,6 @@ int EvolveProblemExplicit(SUNContext ctx, N_Vector y, UserData* udata,
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
   long int nfe;               /* RHS stats                     */
-  FILE*    DFID;              /* diagnostics output file       */
-  char     fname[MXSTR];
 
   /* Create the ERK timestepper module */
   arkode_mem = ERKStepCreate(AdvectionReaction, uopt->t0, y, ctx);
@@ -403,16 +400,6 @@ int EvolveProblemExplicit(SUNContext ctx, N_Vector y, UserData* udata,
   retval = ERKStepSetMaxNumSteps(arkode_mem, 1000000);
   if (check_retval(&retval, "ERKStepSetMaxNumSteps", 1)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->monitor)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ERKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ERKStepSetDiagnostics", 1)) return 1;
-  }
-
   /* Output initial condition */
   if (udata->myid == 0 && uopt->monitor)
   {
@@ -445,9 +432,6 @@ int EvolveProblemExplicit(SUNContext ctx, N_Vector y, UserData* udata,
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->monitor) fclose(DFID);
-
   /* Get final statistics */
   retval = ERKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ERKStepGetNumSteps", 1);
@@ -1083,7 +1067,7 @@ int TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS,
 }
 
 
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y)
 {
   void* tmp_comm;
   SUNNonlinearSolver NLS;
@@ -1135,13 +1119,6 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
 
   content->ncnf = 0;
 
-  /* Setup the local nonlinear solver monitoring */
-  if (DFID != NULL)
-  {
-    SUNNonlinSolSetInfoFile_Newton(LOCAL_NLS(NLS), DFID);
-    SUNNonlinSolSetPrintLevel_Newton(LOCAL_NLS(NLS), 1);
-  }
-
   return NLS;
 }
 
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
index ad98ede688..788c16d067 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
@@ -291,7 +291,6 @@ struct UserData
   int  maxsteps    = 0;      // max steps between outputs (0 = use default)
   bool linear      = true;   // enable/disable linearly implicit option
   bool diagnostics = false;  // output diagnostics
-  FILE *diagfp     = NULL;   // diagnostics output file
 
   // -----------------------------------------
   // Nonlinear solver settings
@@ -508,6 +507,20 @@ int main(int argc, char* argv[])
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
   }
 
+  if (udata.diagnostics || udata.lsinfo)
+  {
+    SUNLogger logger;
+  
+    flag = SUNContext_GetLogger(ctx, &logger);
+    if (check_flag(&flag, "SUNContext_GetLogger", 1)) return 1;
+
+    flag = SUNLogger_SetInfoFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetInfoFilename", 1)) return 1;
+
+    flag = SUNLogger_SetDebugFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetDebugFilename", 1)) return 1;
+  }
+
   // --------------
   // Create vectors
   // --------------
@@ -520,13 +533,6 @@ int main(int argc, char* argv[])
   // Create linear solver
   // --------------------
 
-  // Open diagnostics file
-  if (outproc && (udata.diagnostics || udata.lsinfo))
-  {
-    udata.diagfp = fopen("diagnostics.txt", "w");
-    if (check_flag((void *) (udata.diagfp), "fopen", 0)) return 1;
-  }
-
   // Preconditioning type
   int prectype = (udata.prec) ? SUN_PREC_RIGHT : SUN_PREC_NONE;
 
@@ -537,29 +543,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata.liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata.lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, udata.diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata.liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata.lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, udata.diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // Allocate preconditioner workspace
@@ -712,8 +700,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if (outproc && (udata.diagnostics || udata.lsinfo)) fclose(udata.diagfp);
-
   switch(udata.integrator)
   {
   case(0):
@@ -1042,13 +1028,6 @@ static int SetupARK(SUNContext ctx, UserData* udata, N_Vector u,
   flag = ARKStepSetStopTime(*arkode_mem, udata->tf);
   if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->outproc)
-  {
-    flag = ARKStepSetDiagnostics(*arkode_mem, udata->diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   return 0;
 }
 
@@ -1104,13 +1083,6 @@ static int SetupMRI(SUNContext ctx, UserData* udata, N_Vector y,
   flag = ARKStepSetMaxNumSteps(inner_arkode_mem, udata->maxsteps);
   if (check_flag(&flag, "ARKStepSetMaxNumSteps", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->outproc)
-  {
-    flag = ARKStepSetDiagnostics(inner_arkode_mem, udata->diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // Wrap ARKODE as an MRIStepInnerStepper
   flag = ARKStepCreateMRIStepInnerStepper(inner_arkode_mem,
                                           stepper);
@@ -1179,13 +1151,6 @@ static int SetupMRI(SUNContext ctx, UserData* udata, N_Vector y,
   flag = MRIStepSetStopTime(*arkode_mem, udata->tf);
   if (check_flag(&flag, "MRIStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->outproc)
-  {
-    flag = MRIStepSetDiagnostics(*arkode_mem, udata->diagfp);
-    if (check_flag(&flag, "MRIStepSetDiagnostics", 1)) return 1;
-  }
-
   return 0;
 }
 
@@ -1339,13 +1304,6 @@ static int SetupMRICVODE(SUNContext ctx, UserData *udata, N_Vector y,
   flag = MRIStepSetStopTime(*arkode_mem, udata->tf);
   if (check_flag(&flag, "MRIStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->outproc)
-  {
-    flag = MRIStepSetDiagnostics(*arkode_mem, udata->diagfp);
-    if (check_flag(&flag, "MRIStepSetDiagnostics", 1)) return 1;
-  }
-
   return 0;
 }
 
diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
index 0e096b71b9..3e414c5224 100644
--- a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
@@ -278,7 +278,6 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;  // vector for storing solution
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
   SUNAdaptController C = NULL;  // timestep adaptivity controller
 
   // Timing variables
@@ -327,13 +326,20 @@ int main(int argc, char* argv[])
   {
     flag = PrintUserData(udata);
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
+  }
 
-    // Open diagnostics output file
-    if (udata->diagnostics || udata->lsinfo)
-    {
-      diagfp = fopen("diagnostics.txt", "w");
-      if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-    }
+  if (udata->diagnostics || udata->lsinfo)
+  {
+    SUNLogger logger = NULL;
+  
+    flag = SUNContext_GetLogger(ctx, &logger);
+    if (check_flag(&flag, "SUNContext_GetLogger", 1)) return 1;
+
+    flag = SUNLogger_SetInfoFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetInfoFilename", 1)) return 1;
+
+    flag = SUNLogger_SetDebugFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetDebugFilename", 1)) return 1;
   }
 
   // ------------------------
@@ -363,29 +369,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // Allocate preconditioner workspace
@@ -491,13 +479,6 @@ int main(int argc, char* argv[])
   flag = ARKStepSetStopTime(arkode_mem, udata->tf);
   if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && outproc)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // -----------------------
   // Loop over output times
   // -----------------------
@@ -580,8 +561,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if ((udata->diagnostics || udata->lsinfo) && outproc) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);  // Free integrator memory
   SUNLinSolFree(LS);         // Free linear solver
   N_VDestroy(u);             // Free vectors
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
index b38e7ded64..65695000b3 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
@@ -170,7 +170,6 @@ struct UserData
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
   bool     linear;      // enable/disable linearly implicit option
-  bool     diagnostics; // output diagnostics
 
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
@@ -362,8 +361,7 @@ int main(int argc, char* argv[])
   SUNMatrix A        = NULL;  // matrix for Jacobian
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
-  SUNAdaptController C = NULL;  // timestep adaptivity controller
+  SUNAdaptController C = NULL;  // timestep adaptivity controlle
 
   // Timing variables
   double t1 = 0.0;
@@ -411,13 +409,6 @@ int main(int argc, char* argv[])
   {
     flag = PrintUserData(udata);
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
-
-    // Open diagnostics output file
-    if (udata->diagnostics)
-    {
-      diagfp = fopen("diagnostics.txt", "w");
-      if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-    }
   }
 
   // ------------------------
@@ -541,13 +532,6 @@ int main(int argc, char* argv[])
   flag = ARKStepSetStopTime(arkode_mem, udata->tf);
   if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && outproc)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // -----------------------
   // Loop over output times
   // -----------------------
@@ -630,8 +614,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if (udata->diagnostics && outproc) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);  // Free integrator memory
   SUNLinSolFree(LS);         // Free linear solver
   SUNMatDestroy(A);          // Free matrix
@@ -1660,7 +1642,6 @@ static int InitUserData(UserData *udata)
   udata->controller  = 0;               // PID controller
   udata->maxsteps    = 0;               // use default
   udata->linear      = true;            // linearly implicit problem
-  udata->diagnostics = false;           // output diagnostics
 
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
@@ -1788,10 +1769,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->linear = false;
     }
-    else if (arg == "--diagnostics")
-    {
-      udata->diagnostics = true;
-    }
     // Linear solver settings
     else if (arg == "--gmres")
     {
@@ -1951,7 +1928,6 @@ static void InputHelp()
   cout << "  --order <ord>           : method order" << endl;
   cout << "  --fixedstep <step>      : used fixed step size" << endl;
   cout << "  --controller <ctr>      : time step adaptivity controller" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
index 29c9a4d0ee..3418b03ce2 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
@@ -170,13 +170,11 @@ struct UserData
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
   bool     linear;      // enable/disable linearly implicit option
-  bool     diagnostics; // output diagnostics
 
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
   bool     matvec;    // use hypre matrix-vector product
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -321,7 +319,6 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;  // vector for storing solution
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
   SUNAdaptController C = NULL;  // timestep adaptivity controller
 
   // Timing variables
@@ -370,13 +367,6 @@ int main(int argc, char* argv[])
   {
     flag = PrintUserData(udata);
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
-
-    // Open diagnostics output file
-    if (udata->diagnostics || udata->lsinfo)
-    {
-      diagfp = fopen("diagnostics.txt", "w");
-      if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-    }
   }
 
   // ------------------------
@@ -406,29 +396,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // ---------------------
@@ -544,13 +516,6 @@ int main(int argc, char* argv[])
   flag = ARKStepSetStopTime(arkode_mem, udata->tf);
   if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics && outproc)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // -----------------------
   // Loop over output times
   // -----------------------
@@ -633,8 +598,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if ((udata->diagnostics || udata->lsinfo) && outproc) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);  // Free integrator memory
   SUNLinSolFree(LS);         // Free linear solver
   N_VDestroy(u);             // Free vectors
@@ -2085,13 +2048,11 @@ static int InitUserData(UserData *udata)
   udata->controller  = 0;               // PID controller
   udata->maxsteps    = 0;               // use default
   udata->linear      = true;            // linearly implicit problem
-  udata->diagnostics = false;           // output diagnostics
 
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
   udata->matvec    = false;      // use hypre matrix-vector product
-  udata->lsinfo    = false;      // output residual history
   udata->liniters  = 10;         // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
@@ -2253,10 +2214,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->linear = false;
     }
-    else if (arg == "--diagnostics")
-    {
-      udata->diagnostics = true;
-    }
     // Linear solver settings
     else if (arg == "--gmres")
     {
@@ -2266,10 +2223,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->matvec = true;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -2424,10 +2377,8 @@ static void InputHelp()
   cout << "  --order <ord>           : method order" << endl;
   cout << "  --fixedstep <step>      : used fixed step size" << endl;
   cout << "  --controller <ctr>      : time step adaptivity controller" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
   cout << "  --matvec                : use hypre matrix-vector product" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/arkode/CXX_serial/ark_heat2D.cpp b/examples/arkode/CXX_serial/ark_heat2D.cpp
index 60c5748b82..12949c2698 100644
--- a/examples/arkode/CXX_serial/ark_heat2D.cpp
+++ b/examples/arkode/CXX_serial/ark_heat2D.cpp
@@ -208,7 +208,6 @@ int main(int argc, char* argv[])
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
   SUNAdaptController C = NULL;  // Adaptivity controller
-  FILE *diagfp       = NULL;  // diagnostics output file
 
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -237,11 +236,18 @@ int main(int argc, char* argv[])
   flag = PrintUserData(udata);
   if (check_flag(&flag, "PrintUserData", 1)) return 1;
 
-  // Open diagnostics output file
   if (udata->diagnostics || udata->lsinfo)
   {
-    diagfp = fopen("diagnostics.txt", "w");
-    if (check_flag((void *) diagfp, "fopen", 0)) return 1;
+    SUNLogger logger = NULL;
+  
+    flag = SUNContext_GetLogger(ctx, &logger);
+    if (check_flag(&flag, "SUNContext_GetLogger", 1)) return 1;
+
+    flag = SUNLogger_SetInfoFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetInfoFilename", 1)) return 1;
+
+    flag = SUNLogger_SetDebugFilename(logger, "diagnostics.txt");
+    if (check_flag(&flag, "SUNLogger_SetInfoFilename", 1)) return 1;
   }
 
   // ----------------------
@@ -271,29 +277,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // Allocate preconditioner workspace
@@ -399,13 +387,6 @@ int main(int argc, char* argv[])
   flag = ARKStepSetStopTime(arkode_mem, udata->tf);
   if (check_flag(&flag, "ARKStepSetStopTime", 1)) return 1;
 
-  // Set diagnostics output file
-  if (udata->diagnostics)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // -----------------------
   // Loop over output times
   // -----------------------
@@ -485,8 +466,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if (udata->diagnostics || udata->lsinfo) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);  // Free integrator memory
   SUNLinSolFree(LS);         // Free linear solver
   N_VDestroy(u);             // Free vectors
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
index f20e4c97e0..4bb96c8ab4 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
@@ -177,13 +177,11 @@ struct UserData
   realtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
-  bool     diagnostics; // output diagnostics
 
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
   bool     matvec;    // use hypre matrix-vector product
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -355,7 +353,6 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;  // vector for storing solution
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
   braid_Core core    = NULL;  // XBraid memory structure
   braid_App app      = NULL;  // ARKode + XBraid interface structure
   SUNAdaptController    C = NULL;  // time step adaptivity controller
@@ -406,18 +403,6 @@ int main(int argc, char* argv[])
   {
     flag = PrintUserData(udata);
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
-
-    // Open diagnostics output file
-    if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0)
-    {
-      stringstream fname;
-      fname << "diagnostics." << setfill('0') << setw(5) << udata->myid_w
-            << ".txt";
-
-      const std::string tmp = fname.str();
-      diagfp = fopen(tmp.c_str(), "w");
-      if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-    }
   }
 
   // ------------------------
@@ -447,29 +432,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // ---------------------
@@ -575,13 +542,6 @@ int main(int argc, char* argv[])
     if (check_flag(&flag, "ARKStepSetMaxCFailGrowth", 1)) return 1;
   }
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->myid_c == 0)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // ------------------------
   // Create XBraid interface
   // ------------------------
@@ -742,8 +702,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);              // Free integrator memory
   SUNLinSolFree(LS);                     // Free linear solver
   N_VDestroy(u);                         // Free vectors
@@ -2407,13 +2365,11 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->atol        = RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
-  udata->diagnostics = false;           // output diagnostics
 
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
   udata->matvec    = false;      // use hypre matrix-vector product
-  udata->lsinfo    = false;      // output residual history
   udata->liniters  = 100;        // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
@@ -2600,10 +2556,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->linear = false;
     }
-    else if (arg == "--diagnostics")
-    {
-      udata->diagnostics = true;
-    }
     // Linear solver settings
     else if (arg == "--gmres")
     {
@@ -2613,10 +2565,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->matvec = true;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -2854,10 +2802,8 @@ static void InputHelp()
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --nonlinear             : disable linearly implicit flag" << endl;
   cout << "  --order <ord>           : method order" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
   cout << "  --matvec                : use hypre matrix-vector product" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
index a9d90df9bd..e08c612f29 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
@@ -175,12 +175,10 @@ struct UserData
   realtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
-  bool     diagnostics; // output diagnostics
 
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -312,7 +310,6 @@ int main(int argc, char* argv[])
   N_Vector u         = NULL;  // vector for storing solution
   SUNLinearSolver LS = NULL;  // linear solver memory structure
   void *arkode_mem   = NULL;  // ARKODE memory structure
-  FILE *diagfp       = NULL;  // diagnostics output file
   braid_Core core    = NULL;  // XBraid memory structure
   braid_App app      = NULL;  // ARKode + XBraid interface structure
   SUNAdaptController    C = NULL;  // time step adaptivity controller
@@ -363,18 +360,6 @@ int main(int argc, char* argv[])
   {
     flag = PrintUserData(udata);
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
-
-    // Open diagnostics output file
-    if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0)
-    {
-      stringstream fname;
-      fname << "diagnostics." << setfill('0') << setw(5) << udata->myid_w
-            << ".txt";
-
-      const std::string tmp = fname.str();
-      diagfp = fopen(tmp.c_str(), "w");
-      if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-    }
   }
 
   // ------------------------
@@ -404,29 +389,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo && outproc)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // Allocate preconditioner workspace
@@ -522,13 +489,6 @@ int main(int argc, char* argv[])
     if (check_flag(&flag, "ARKStepSetMaxCFailGrowth", 1)) return 1;
   }
 
-  // Set diagnostics output file
-  if (udata->diagnostics && udata->myid_c == 0)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // ------------------------
   // Create XBraid interface
   // ------------------------
@@ -689,8 +649,6 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if ((udata->diagnostics || udata->lsinfo) && udata->myid_c == 0) fclose(diagfp);
-
   ARKStepFree(&arkode_mem);              // Free integrator memory
   SUNLinSolFree(LS);                     // Free linear solver
   N_VDestroy(u);                         // Free vectors
@@ -1672,12 +1630,10 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->atol        = RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
-  udata->diagnostics = false;           // output diagnostics
 
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
-  udata->lsinfo    = false;      // output residual history
   udata->liniters  = 100;        // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
@@ -1831,19 +1787,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->linear = false;
     }
-    else if (arg == "--diagnostics")
-    {
-      udata->diagnostics = true;
-    }
     // Linear solver settings
     else if (arg == "--gmres")
     {
       udata->pcg = false;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -2072,9 +2020,7 @@ static void InputHelp()
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --nonlinear             : disable linearly implicit flag" << endl;
   cout << "  --order <ord>           : method order" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
index 1b146d8a80..b773c5c93a 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
@@ -120,12 +120,10 @@ struct UserData
   realtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
-  bool     diagnostics; // output diagnostics
 
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -244,7 +242,6 @@ int main(int argc, char* argv[])
   N_Vector u           = NULL;  // vector for storing solution
   SUNLinearSolver LS   = NULL;  // linear solver memory structure
   void *arkode_mem     = NULL;  // ARKODE memory structure
-  FILE *diagfp         = NULL;  // diagnostics output file
   braid_Core core      = NULL;  // XBraid memory structure
   braid_App app        = NULL;  // ARKode + XBraid interface structure
   SUNAdaptController C = NULL;  // time adaptivity controller
@@ -303,18 +300,6 @@ int main(int argc, char* argv[])
     if (check_flag(&flag, "PrintUserData", 1)) return 1;
   }
 
-  // Open diagnostics output file
-  if (udata->diagnostics || udata->lsinfo)
-  {
-    stringstream fname;
-    fname << "diagnostics." << setfill('0') << setw(5) << udata->myid_w
-          << ".txt";
-
-    const std::string tmp = fname.str();
-    diagfp = fopen(tmp.c_str(), "w");
-    if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-  }
-
   // ----------------------
   // Create serial vectors
   // ----------------------
@@ -342,29 +327,11 @@ int main(int argc, char* argv[])
   {
     LS = SUNLinSol_PCG(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-    if (udata->lsinfo)
-    {
-      flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-    }
   }
   else
   {
     LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, ctx);
     if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-    if (udata->lsinfo)
-    {
-      flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-      if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-      flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-      if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-    }
   }
 
   // Allocate preconditioner workspace
@@ -460,13 +427,6 @@ int main(int argc, char* argv[])
     if (check_flag(&flag, "ARKStepSetMaxCFailGrowth", 1)) return 1;
   }
 
-  // Set diagnostics output file
-  if (udata->diagnostics)
-  {
-    flag = ARKStepSetDiagnostics(arkode_mem, diagfp);
-    if (check_flag(&flag, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   // ------------------------
   // Create XBraid interface
   // ------------------------
@@ -627,12 +587,10 @@ int main(int argc, char* argv[])
   // Clean up and return
   // --------------------
 
-  if (udata->diagnostics || udata->lsinfo) fclose(diagfp);
-
-  ARKStepFree(&arkode_mem);              // Free integrator memory
-  SUNLinSolFree(LS);                     // Free linear solver
-  N_VDestroy(u);                         // Free vectors
-  FreeUserData(udata);                   // Free user data
+  ARKStepFree(&arkode_mem);  // Free integrator memory
+  SUNLinSolFree(LS);         // Free linear solver
+  N_VDestroy(u);             // Free vectors
+  FreeUserData(udata);       // Free user data
   delete udata;
   braid_Destroy(core);                   // Free braid memory
   ARKBraid_Free(&app);                   // Free interface memory
@@ -1016,12 +974,10 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->atol        = RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
-  udata->diagnostics = false;           // output diagnostics
 
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
-  udata->lsinfo    = false;      // output residual history
   udata->liniters  = 100;        // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
@@ -1146,19 +1102,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->linear = false;
     }
-    else if (arg == "--diagnostics")
-    {
-      udata->diagnostics = true;
-    }
     // Linear solver settings
     else if (arg == "--gmres")
     {
       udata->pcg = false;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -1379,9 +1327,7 @@ static void InputHelp()
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --nonlinear             : disable linearly implicit flag" << endl;
   cout << "  --order <ord>           : method order" << endl;
-  cout << "  --diagnostics           : output diagnostics" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
index bd7b19fccf..b05278871a 100644
--- a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
+++ b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
@@ -70,6 +70,7 @@
 #include "arkode/arkode_erkstep.h"             /* ERKStep                   */
 #include "nvector/nvector_mpiplusx.h"          /* MPI+X N_Vector            */
 #include "nvector/nvector_serial.h"            /* serial N_Vector           */
+#include "sundials/sundials_logger.h"
 #include "sunmatrix/sunmatrix_dense.h"         /* dense SUNMatrix           */
 #include "sunlinsol/sunlinsol_dense.h"         /* dense SUNLinearSolver     */
 #include "sunlinsol/sunlinsol_spgmr.h"         /* GMRES SUNLinearSolver     */
@@ -183,7 +184,7 @@ typedef struct
 #define LOCAL_NLS(NLS)       ( GET_NLS_CONTENT(NLS)->local_nls )
 
 /* SUNNonlinearSolver constructor */
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID);
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y);
 
 
 /*
@@ -280,6 +281,23 @@ int main(int argc, char *argv[])
   retval = SetupProblem(argc, argv, udata, uopt, ctx);
   if (check_retval(&retval, "SetupProblem", 1)) MPI_Abort(comm, 1);
 
+  /* Setup diagnostic logging if it is enabled */
+  if (uopt->monitor)
+  {
+    SUNLogger logger;
+    
+    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
+
+    retval = SUNContext_GetLogger(ctx, &logger);
+    if (check_retval(&retval, "SUNContext_GetLogger", 1)) return 1;
+
+    retval = SUNLogger_SetInfoFilename(logger, fname);
+    if (check_retval(&retval, "SUNLogger_SetInfoFilename", 1)) return 1;
+
+    retval = SUNLogger_SetDebugFilename(logger, fname);
+    if (check_retval(&retval, "SUNLogger_SetInfoFilename", 1)) return 1;
+  }
+
   /* Create solution vector */
   y = N_VMake_MPIPlusX(udata->comm, N_VNew_Serial(udata->NEQ, ctx), ctx);
   if (check_retval((void *) y, "N_VMake_MPIPlusX", 0)) MPI_Abort(comm, 1);
@@ -351,8 +369,6 @@ int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt,
   long int nfe, nfi;          /* RHS stats                    */
   long int nni, ncnf;         /* nonlinear solver stats       */
   long int nli, npre, npsol;  /* linear solver stats          */
-  FILE*    DFID = NULL;       /* diagnostics output file      */
-  char     fname[MXSTR];
 
   /* Create the ARK timestepper module */
   arkode_mem = ARKStepCreate(Advection, Reaction, uopt->t0, y, ctx);
@@ -374,16 +390,6 @@ int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt,
   retval = ARKStepSetMaxNumSteps(arkode_mem, 100000);
   if (check_retval(&retval, "ARKStepSetMaxNumSteps", 1)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->monitor)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ARKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ARKStepSetDiagnostics", 1)) return 1;
-  }
-
   /* Create the (non)linear solver */
   if (uopt->global)
   {
@@ -411,7 +417,7 @@ int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt,
   {
     /* The custom task-local nonlinear solver handles the linear solve
       as well, so we do not need a SUNLinearSolver */
-    NLS = TaskLocalNewton(ctx, y, DFID);
+    NLS = TaskLocalNewton(ctx, y);
     if (check_retval((void *)NLS, "TaskLocalNewton", 0)) return 1;
 
     /* Attach nonlinear solver */
@@ -451,9 +457,6 @@ int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt,
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->monitor) fclose(DFID);
-
   /* Get final statistics */
   retval = ARKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ARKStepGetNumSteps", 1);
@@ -516,8 +519,6 @@ int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt,
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
   long int nfe;               /* RHS stats                     */
-  FILE*    DFID;              /* diagnostics output file       */
-  char     fname[MXSTR];
 
   /* Create the ERK timestepper module */
   arkode_mem = ERKStepCreate(AdvectionReaction, uopt->t0, y, ctx);
@@ -539,16 +540,6 @@ int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt,
   retval = ERKStepSetMaxNumSteps(arkode_mem, 1000000);
   if (check_retval(&retval, "ERKStepSetMaxNumSteps", 1)) return 1;
 
-  /* Open output file for integrator diagnostics */
-  if (uopt->monitor)
-  {
-    sprintf(fname, "%s/diagnostics.%06d.txt", uopt->outputdir, udata->myid);
-    DFID = fopen(fname, "w");
-
-    retval = ERKStepSetDiagnostics(arkode_mem, DFID);
-    if (check_retval(&retval, "ERKStepSetDiagnostics", 1)) return 1;
-  }
-
   /* Output initial condition */
   if (udata->myid == 0 && uopt->monitor)
   {
@@ -581,9 +572,6 @@ int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt,
     iout++;
   } while (iout < uopt->nout);
 
-  /* close output stream */
-  if (uopt->monitor) fclose(DFID);
-
   /* Get final statistics */
   retval = ERKStepGetNumSteps(arkode_mem, &nst);
   check_retval(&retval, "ERKStepGetNumSteps", 1);
@@ -1173,7 +1161,7 @@ int TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS,
 }
 
 
-SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
+SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y)
 {
   void* tmp_comm;
   SUNNonlinearSolver NLS;
@@ -1225,13 +1213,6 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y, FILE* DFID)
 
   content->ncnf = 0;
 
-  /* Setup the local nonlinear solver monitoring */
-  if (DFID != NULL)
-  {
-    SUNNonlinSolSetInfoFile_Newton(LOCAL_NLS(NLS), DFID);
-    SUNNonlinSolSetPrintLevel_Newton(LOCAL_NLS(NLS), 1);
-  }
-
   return NLS;
 }
 
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.c b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
index b17ed5f283..2eea2b3860 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_p.c
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
@@ -838,7 +838,7 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
   /* jok = SUNTRUE: Copy Jbd to P */
     for (ly = 0; ly < MYSUB; ly++)
       for (lx = 0; lx < MXSUB; lx++)
-        denseCopy(Jbd[lx][ly], P[lx][ly], NVARS, NVARS);
+        SUNDlsMat_denseCopy(Jbd[lx][ly], P[lx][ly], NVARS, NVARS);
 
   *jcurPtr = SUNFALSE;
 
@@ -873,7 +873,7 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
         IJth(j,1,2) = -Q2*c1 + q4coef;
         IJth(j,2,1) = Q1*C3 - Q2*c2;
         IJth(j,2,2) = (-Q2*c1 - q4coef) + diag;
-        denseCopy(j, a, NVARS, NVARS);
+        SUNDlsMat_denseCopy(j, a, NVARS, NVARS);
       }
     }
 
@@ -884,7 +884,7 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
   /* Scale by -gamma */
   for (ly = 0; ly < MYSUB; ly++)
     for (lx = 0; lx < MXSUB; lx++)
-      denseScale(-gamma, P[lx][ly], NVARS, NVARS);
+      SUNDlsMat_denseScale(-gamma, P[lx][ly], NVARS, NVARS);
 
   /* Add identity matrix and do LU decompositions on blocks in place */
   for (lx = 0; lx < MXSUB; lx++) {
diff --git a/examples/arkode/C_serial/ark_brusselator_fp.c b/examples/arkode/C_serial/ark_brusselator_fp.c
index a8f3084cde..3c99f2d8de 100644
--- a/examples/arkode/C_serial/ark_brusselator_fp.c
+++ b/examples/arkode/C_serial/ark_brusselator_fp.c
@@ -59,6 +59,7 @@
 #include <nvector/nvector_serial.h>                 /* serial N_Vector types, fcts., macros */
 #include <sunnonlinsol/sunnonlinsol_fixedpoint.h>   /* access to FP nonlinear solver        */
 #include <sundials/sundials_types.h>                /* def. of type 'realtype'              */
+#include <sundials/sundials_logger.h>
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -96,25 +97,40 @@ int main(int argc, char *argv[])
   int monitor = 0;               /* turn on/off monitoring */
 
   /* general problem variables */
+  SUNContext ctx = NULL;
+  SUNLogger logger = NULL;
+  const char* info_fname = "ark_brusselator_fp-info.txt";
   int flag;                       /* reusable error-checking flag */
   N_Vector y = NULL;              /* empty vector for storing solution */
   SUNNonlinearSolver NLS = NULL;  /* empty nonlinear solver object */
   void *arkode_mem = NULL;        /* empty ARKode memory structure */
-  FILE *UFID, *INFOFID;
+  FILE *UFID;
   realtype t, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nni, ncfn, netf;
 
-  /* Create SUNDIALS context */
-  SUNContext ctx = NULL;
-  flag = SUNContext_Create(NULL, &ctx);
-  if (check_flag(&flag, "SUNContext_Create", 1)) return 1;
-
   /* read inputs */
   if (argc == 2) {
     monitor = atoi(argv[1]);
   }
 
+  /* create SUNDIALS context and a logger which will record
+     nonlinear solver info (e.g., residual) amongst other things. */
+  
+  flag = SUNContext_Create(NULL, &ctx);
+  if (check_flag(&flag, "SUNContext_Create", 1)) return 1;
+
+  flag = SUNLogger_Create(NULL, 0, &logger);
+  if (check_flag(&flag, "SUNLogger_Create", 1)) return 1;
+
+  if (monitor) {
+    flag = SUNLogger_SetInfoFilename(logger, info_fname);   
+    if (check_flag(&flag, "SUNLogger_SetInfoFilename", 1)) return 1;
+  }
+
+  flag = SUNContext_SetLogger(ctx, logger);
+  if (check_flag(&flag, "SUNContext_SetLogger", 1)) return 1;
+
   /* set up the test problem according to the desired test */
   if (test == 1) {
     u0 = RCONST(3.9);
@@ -145,10 +161,6 @@ int main(int argc, char *argv[])
   printf("    problem parameters:  a = %"GSYM",  b = %"GSYM",  ep = %"GSYM"\n",a,b,ep);
   printf("    reltol = %.1"ESYM",  abstol = %.1"ESYM"\n\n",reltol,abstol);
 
-  /* Open up info output file */
-  INFOFID = NULL;
-  if (monitor) INFOFID = fopen("ark_brusselator_fp-info.txt","w");
-
   /* Initialize data structures */
   rdata[0] = a;    /* set user data  */
   rdata[1] = b;
@@ -168,12 +180,7 @@ int main(int argc, char *argv[])
   /* Initialize fixed-point nonlinear solver and attach to ARKStep */
   NLS = SUNNonlinSol_FixedPoint(y, fp_m, ctx);
   if (check_flag((void *)NLS, "SUNNonlinSol_FixedPoint", 0)) return 1;
-  if (monitor) {
-    flag = SUNNonlinSolSetPrintLevel_FixedPoint(NLS, 1);
-    if (check_flag(&flag, "SUNNonlinSolSetPrintLevel_Newton", 1)) return(1);
-    flag = SUNNonlinSolSetInfoFile_FixedPoint(NLS, INFOFID);
-    if (check_flag(&flag, "SUNNonlinSolSetPrintLevel_Newton", 1)) return(1);
-  }
+
   flag = ARKStepSetNonlinearSolver(arkode_mem, NLS);
   if (check_flag(&flag, "ARKStepSetNonlinearSolver", 1)) return 1;
 
@@ -217,7 +224,6 @@ int main(int argc, char *argv[])
   }
   printf("   ----------------------------------------------\n");
   fclose(UFID);
-  if (monitor) fclose(INFOFID);
 
   /* Print some final statistics */
   flag = ARKStepGetNumSteps(arkode_mem, &nst);
@@ -241,10 +247,11 @@ int main(int argc, char *argv[])
   printf("   Total number of error test failures = %li\n\n", netf);
 
   /* Clean up and return with successful completion */
-  N_VDestroy(y);               /* Free y vector */
-  ARKStepFree(&arkode_mem);    /* Free integrator memory */
-  SUNNonlinSolFree(NLS);       /* Free NLS object */
-  SUNContext_Free(&ctx);       /* Free context */
+  N_VDestroy(y);
+  ARKStepFree(&arkode_mem);
+  SUNNonlinSolFree(NLS);
+  SUNLogger_Destroy(&logger);
+  SUNContext_Free(&ctx);
 
   return 0;
 }
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
index 04d8477122..e3888b5fde 100644
--- a/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003.f90
+++ b/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003.f90
@@ -110,7 +110,6 @@ module ode_mod
   real(c_double) :: t0, tf     ! initial and final time
   real(c_double) :: rtol, atol ! relative and absolute tolerance
   integer(c_int) :: order      ! method order
-  type(c_ptr)    :: DFID       ! ARKODE diagnostics file
 
   logical :: explicit  ! use explicit or IMEX method
   logical :: global    ! use global or task-local nonlinear solver
@@ -999,7 +998,7 @@ function TaskLocalNewton(arkode_mem, sunvec_y) result(sunnls)
     use fsunlinsol_dense_mod
     use fsunmatrix_dense_mod
 
-    use ode_mod, only : sunctx, Nvar, comm, DFID, monitor
+    use ode_mod, only : sunctx, Nvar, comm
 
     !======= Declarations =========
     implicit none
@@ -1012,7 +1011,6 @@ function TaskLocalNewton(arkode_mem, sunvec_y) result(sunnls)
     type(SUNNonlinearSolver_Ops), pointer :: nlsops ! solver operations
 
     integer        :: ierr   ! MPI error status
-    integer(c_int) :: retval ! SUNDIALS error status
 
     !======= Internals ============
 
@@ -1055,20 +1053,6 @@ function TaskLocalNewton(arkode_mem, sunvec_y) result(sunnls)
     nnlfi    = 0
     ncnf_loc = 0
 
-    if (monitor) then
-       retval = FSUNNonlinSolSetInfoFile_Newton(sunnls_LOC, DFID)
-       if (retval /= 0) then
-          print *, "Error: FSUNNonlinSolSetInfoFile_Newton returned ",retval
-          call MPI_Abort(comm, 1, ierr)
-       end if
-
-       retval = FSUNNonlinSolSetPrintLevel_Newton(sunnls_LOC, 1)
-       if (retval /= 0) then
-          print *, "Error: FSUNNonlinSolSetPrintLevel_Newton returned ",retval
-          call MPI_Abort(comm, 1, ierr)
-       end if
-    end if
-
   end function TaskLocalNewton
 
 end module nls_mod
@@ -1229,7 +1213,7 @@ subroutine EvolveProblemIMEX(sunvec_y)
   use fsundials_nonlinearsolver_mod ! Access generic SUNNonlinearSolver
   use fsunnonlinsol_newton_mod      ! Access Newton SUNNonlinearSolver
 
-  use ode_mod, only : sunctx, comm, myid, Neq, t0, tf, atol, rtol, order, DFID, &
+  use ode_mod, only : sunctx, comm, myid, Neq, t0, tf, atol, rtol, order, &
        monitor, global, nout, umask_s, Advection, Reaction
 
   use prec_mod, only : sunls_P, sunmat_P, PSetup, PSolve
@@ -1267,7 +1251,6 @@ subroutine EvolveProblemIMEX(sunvec_y)
   integer            :: ierr        ! MPI error status
   integer            :: iout        ! output counter
   double precision   :: tout, dtout ! output time and update
-  character(len=100) :: outname     ! diagnostics ouptput file
 
   !======= Internals ============
 
@@ -1300,20 +1283,6 @@ subroutine EvolveProblemIMEX(sunvec_y)
      call MPI_Abort(comm, 1, ierr)
   end if
 
-  ! Open output file for integrator diagnostics
-  if (monitor) then
-
-     write(outname,"(A,I0.6,A)") "diagnostics.",myid,".txt"
-     DFID = FSUNDIALSFileOpen(trim(outname), "w")
-
-     retval = FARKStepSetDiagnostics(arkode_mem, DFID)
-     if (retval /= 0) then
-        print *, "Error: FARKStepSetDiagnostics returned ",retval
-        call MPI_Abort(comm, 1, ierr)
-     end if
-
-  end if
-
   ! Create the (non)linear solver
   if (global) then
 
@@ -1423,9 +1392,6 @@ subroutine EvolveProblemIMEX(sunvec_y)
      print *, ""
   end if
 
-  ! close output stream
-  if (monitor) call FSUNDIALSFileClose(DFID)
-
   ! Get final statistics
   retval = FARKStepGetNumSteps(arkode_mem, nst)
   if (retval /= 0) then
@@ -1552,7 +1518,7 @@ subroutine EvolveProblemExplicit(sunvec_y)
   use farkode_erkstep_mod   ! Access ERKStep
   use fsundials_nvector_mod ! Access generic N_Vector
 
-  use ode_mod, only : sunctx, comm, myid, t0, tf, atol, rtol, order, DFID, monitor, &
+  use ode_mod, only : sunctx, comm, myid, t0, tf, atol, rtol, order, monitor, &
        nout, AdvectionReaction
 
   !======= Declarations =========
@@ -1576,7 +1542,6 @@ subroutine EvolveProblemExplicit(sunvec_y)
   integer            :: ierr        ! output counter
   integer            :: iout        ! output counter
   double precision   :: tout, dtout ! output time and update
-  character(len=100) :: outname     ! diagnostics ouptput file
 
   !======= Internals ============
 
@@ -1608,20 +1573,6 @@ subroutine EvolveProblemExplicit(sunvec_y)
      call MPI_Abort(comm, 1, ierr)
   end if
 
-  ! Open output file for integrator diagnotics
-  if (monitor) then
-
-     write(outname,"(A,I0.6,A)") "diagnostics.",myid,".txt"
-     DFID = FSUNDIALSFileOpen(trim(outname), "w")
-
-     retval = FERKStepSetDiagnostics(arkode_mem, DFID)
-     if (retval /= 0) then
-        print *, "Error: FERKStepSetDiagnostics returned ",retval
-        call MPI_Abort(comm, 1, ierr)
-     end if
-
-  end if
-
   ! Set initial time, determine output time, and initialize output count
   t(1)  = t0
   dtout = (tf - t0)
@@ -1668,9 +1619,6 @@ subroutine EvolveProblemExplicit(sunvec_y)
      print *, ""
   end if
 
-  ! close output stream
-  if (monitor) call FSUNDIALSFileClose(DFID)
-
   ! Get final statistics
   retval = FERKStepGetNumSteps(arkode_mem, nst)
   if (retval /= 0) then
diff --git a/examples/cvode/CXX_parallel/cv_heat2D_p.cpp b/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
index 547f6cd342..b7a896014f 100644
--- a/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
+++ b/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
@@ -168,7 +168,6 @@ struct UserData
   // Linear solver and preconditioner settings
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -292,7 +291,6 @@ int main(int argc, char* argv[])
     N_Vector u         = NULL;  // vector for storing solution
     SUNLinearSolver LS = NULL;  // linear solver memory structure
     void *cvode_mem    = NULL;  // CVODE memory structure
-    FILE *diagfp       = NULL;  // diagnostics output file
 
     // SUNDIALS context
     sundials::Context sunctx(&comm_w);
@@ -324,12 +322,6 @@ int main(int argc, char* argv[])
       flag = PrintUserData(udata);
       if (check_flag(&flag, "PrintUserData", 1)) return 1;
 
-      // Open diagnostics output file
-      if (udata->lsinfo)
-      {
-        diagfp = fopen("diagnostics.txt", "w");
-        if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-      }
     }
 
     // ------------------------
@@ -359,29 +351,11 @@ int main(int argc, char* argv[])
     {
       LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);
       if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-      if (udata->lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-      }
     }
     else
     {
       LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, sunctx);
       if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-      if (udata->lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
     }
 
     // Allocate preconditioner workspace
@@ -520,8 +494,6 @@ int main(int argc, char* argv[])
     // Clean up and return
     // --------------------
 
-    if (udata->lsinfo && outproc) fclose(diagfp);
-
     CVodeFree(&cvode_mem);     // Free integrator memory
     SUNLinSolFree(LS);         // Free linear solver
     N_VDestroy(u);             // Free vectors
@@ -1290,7 +1262,6 @@ static int InitUserData(UserData *udata)
   // Linear solver and preconditioner options
   udata->pcg       = true;       // use PCG (true) or GMRES (false)
   udata->prec      = true;       // enable preconditioning
-  udata->lsinfo    = false;      // output residual history
   udata->liniters  = 20;         // max linear iterations
   udata->msbp      = 0;          // use default (20 steps)
   udata->epslin    = ZERO;       // use default (0.05)
@@ -1408,10 +1379,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->pcg = false;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -1547,7 +1514,6 @@ static void InputHelp()
   cout << "  --rtol <rtol>           : relative tolerance" << endl;
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
index 255520260f..fb783c1cea 100644
--- a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
+++ b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
@@ -176,7 +176,6 @@ struct UserData
   bool     pcg;       // use PCG (true) or GMRES (false)
   bool     prec;      // preconditioner on/off
   bool     matvec;    // use hypre matrix-vector product
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
@@ -334,7 +333,6 @@ int main(int argc, char* argv[])
     N_Vector u         = NULL;  // vector for storing solution
     SUNLinearSolver LS = NULL;  // linear solver memory structure
     void *cvode_mem    = NULL;  // CVODE memory structure
-    FILE *diagfp       = NULL;  // diagnostics output file
 
     // SUNDIALS context
     sundials::Context sunctx(&comm_w);
@@ -363,13 +361,6 @@ int main(int argc, char* argv[])
     {
       flag = PrintUserData(udata);
       if (check_flag(&flag, "PrintUserData", 1)) return 1;
-
-      // Open diagnostics output file
-      if (udata->lsinfo)
-      {
-        diagfp = fopen("diagnostics.txt", "w");
-        if (check_flag((void *) diagfp, "fopen", 0)) return 1;
-      }
     }
 
     // ------------------------
@@ -399,29 +390,11 @@ int main(int argc, char* argv[])
     {
       LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);
       if (check_flag((void *) LS, "SUNLinSol_PCG", 0)) return 1;
-
-      if (udata->lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_PCG(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_PCG", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_PCG(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_PCG", 1)) return(1);
-      }
     }
     else
     {
       LS = SUNLinSol_SPGMR(u, prectype, udata->liniters, sunctx);
       if (check_flag((void *) LS, "SUNLinSol_SPGMR", 0)) return 1;
-
-      if (udata->lsinfo && outproc)
-      {
-        flag = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_flag(&flag, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-
-        flag = SUNLinSolSetInfoFile_SPGMR(LS, diagfp);
-        if (check_flag(&flag, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
     }
 
     // ---------------------
@@ -570,8 +543,6 @@ int main(int argc, char* argv[])
     // Clean up and return
     // --------------------
 
-    if (udata->lsinfo && outproc) fclose(diagfp);
-
     CVodeFree(&cvode_mem);     // Free integrator memory
     SUNLinSolFree(LS);         // Free linear solver
     N_VDestroy(u);             // Free vectors
@@ -2023,7 +1994,6 @@ UserData::UserData(sundials::Context& sunctx)
   pcg       = true;       // use PCG (true) or GMRES (false)
   prec      = true;       // enable preconditioning
   matvec    = false;      // use hypre matrix-vector product
-  lsinfo    = false;      // output residual history
   liniters  = 10;         // max linear iterations
   msbp      = 0;          // use default (20 steps)
   epslin    = ZERO;       // use default (0.05)
@@ -2172,10 +2142,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
     {
       udata->matvec = true;
     }
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -2321,7 +2287,6 @@ static void InputHelp()
   cout << "  --atol <atol>           : absoltue tolerance" << endl;
   cout << "  --gmres                 : use GMRES linear solver" << endl;
   cout << "  --matvec                : use hypre matrix-vector product" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --noprec                : disable preconditioner" << endl;
diff --git a/examples/cvode/serial/cvKrylovDemo_ls.c b/examples/cvode/serial/cvKrylovDemo_ls.c
index 3b4cbf411a..dc89dfc91f 100644
--- a/examples/cvode/serial/cvKrylovDemo_ls.c
+++ b/examples/cvode/serial/cvKrylovDemo_ls.c
@@ -53,6 +53,7 @@
 #include <nvector/nvector_serial.h>           /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>          /* use generic DENSE solver in preconditioning */
 #include <sundials/sundials_types.h>          /* definition of realtype                      */
+#include <sundials/sundials_logger.h>
 
 /* helpful macros */
 
@@ -195,17 +196,17 @@ int main(int argc, char* argv[])
   SUNNonlinearSolver NLS;
   void *cvode_mem;
   int linsolver, iout, retval;
-  FILE* infofp;
   int nrmfactor;   /* LS norm conversion factor flag */
   realtype nrmfac; /* LS norm conversion factor      */
   int monitor;     /* LS resiudal monitoring flag    */
   SUNContext sunctx;
+  SUNLogger logger;
+  const char* info_fname = "cvKrylovDemo_ls-info.txt";
 
   u         = NULL;
   data      = NULL;
   LS        = NULL;
   cvode_mem = NULL;
-  infofp    = NULL;
   nrmfactor = 0;
   monitor   = 0;
 
@@ -213,16 +214,23 @@ int main(int argc, char* argv[])
   if (argc > 1) nrmfactor = atoi(argv[1]);
   if (argc > 2) monitor   = atoi(argv[2]);
 
-  /* Create SUNDIALS context */
+  /* Create SUNDIALS context and a logger which will record
+     nonlinear solver info (e.g., residual) amongst other things. */
+  
   retval = SUNContext_Create(NULL, &sunctx);
-  if (check_retval(&retval, "SUNContext_Create", 1)) return(1);
+  if (check_retval(&retval, "SUNContext_Create", 1)) return 1;
+
+  retval = SUNLogger_Create(NULL, 0, &logger);
+  if (check_retval(&retval, "SUNLogger_Create", 1)) return 1;
 
-  /* Open info file if monitoring is turned on */
   if (monitor) {
-    infofp = fopen("cvKrylovDemo_ls-info.txt", "w+");
-    if (check_retval((void *)infofp, "fopen", 0)) return(1);
+    retval = SUNLogger_SetInfoFilename(logger, info_fname);   
+    if (check_retval(&retval, "SUNLogger_SetInfoFilename", 1)) return 1;
   }
 
+  retval = SUNContext_SetLogger(sunctx, logger);
+  if (check_retval(&retval, "SUNContext_SetLogger", 1)) return 1;
+
   /* Allocate memory, and set problem data, initial values, tolerances */
   u = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)u, "N_VNew_Serial", 0)) return(1);
@@ -265,14 +273,6 @@ int main(int argc, char* argv[])
   /* Create the SUNNonlinearSolver */
   NLS = SUNNonlinSol_Newton(u, sunctx);
   if (check_retval(&retval, "SUNNonlinSol_Newton", 0)) return(1);
-  if (monitor) {
-    /* Set the print level set to 1, so that the nonlinear residual
-       is printed every newton iteration. */
-    retval = SUNNonlinSolSetPrintLevel_Newton(NLS, 1);
-    if (check_retval(&retval, "SUNNonlinSolSetPrintLevel_Newton", 1)) return(1);
-    retval = SUNNonlinSolSetInfoFile_Newton(NLS, infofp);
-    if (check_retval(&retval, "SUNNonlinSolSetInfoFile_Newton", 1)) return(1);
-  }
 
   /* Call CVodeSetNonlinearSolver to attach the nonlinear solver to CVode */
   retval = CVodeSetNonlinearSolver(cvode_mem, NLS);
@@ -309,22 +309,12 @@ int main(int argc, char* argv[])
       printf(" -------");
       printf(" \n| SPGMR |\n");
       printf(" -------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPGMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPGMR to specify the linear solver SPGMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPGMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPGMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
+      
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -337,22 +327,12 @@ int main(int argc, char* argv[])
       printf(" ---------");
       printf(" \n| SPFGMR |\n");
       printf(" ---------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPFGMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPFGMR to specify the linear solver SPFGMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPFGMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPFGMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPFGMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPFGMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPFGMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPFGMR", 1)) return(1);
-      }
+      
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -365,22 +345,12 @@ int main(int argc, char* argv[])
       printf(" -------");
       printf(" \n| SPBCGS |\n");
       printf(" -------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPBCGS |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPBCGS to specify the linear solver SPBCGS with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPBCGS(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPBCGS", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPBCGS(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPBCGS", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPBCGS(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPBCGS", 1)) return(1);
-      }
+      
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -393,22 +363,12 @@ int main(int argc, char* argv[])
       printf(" ---------");
       printf(" \n| SPTFQMR |\n");
       printf(" ---------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPTFQMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPTFQMR to specify the linear solver SPTFQMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPTFQMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPTFQMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPTFQMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPTFQMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPTFQMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPTFQMR", 1)) return(1);
-      }
+
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -454,12 +414,12 @@ int main(int argc, char* argv[])
   }  /* END: Loop through SPGMR, SPBCG and SPTFQMR linear solver modules */
 
   /* Free memory */
-  if (monitor) fclose(infofp);
   N_VDestroy(u);
   FreeUserData(data);
   CVodeFree(&cvode_mem);
   SUNLinSolFree(LS);
   SUNNonlinSolFree(NLS);
+  SUNLogger_Destroy(&logger);
   SUNContext_Free(&sunctx);
 
   return(0);
diff --git a/examples/cvode/superludist/cvAdvDiff_sludist.cpp b/examples/cvode/superludist/cvAdvDiff_sludist.cpp
index 08700e17f4..1b9ef77f15 100644
--- a/examples/cvode/superludist/cvAdvDiff_sludist.cpp
+++ b/examples/cvode/superludist/cvAdvDiff_sludist.cpp
@@ -46,7 +46,6 @@
 #include "superlu_ddefs.h"
 
 #include <cvode/cvode.h>                          /* prototypes for CVODE fcts., consts.          */
-#include <cvode/cvode_direct.h>                   /* CVODE direct linear solver interface         */
 #include <nvector/nvector_parallel.h>             /* access to MPI-parallel N_Vector              */
 #include <sunlinsol/sunlinsol_superludist.h>      /* access to the SuperLU-DIST SUNLinearSolver   */
 #include <sunmatrix/sunmatrix_slunrloc.h>         /* access to the SuperLU SLU_NR_loc SUNMatrix   */
diff --git a/examples/cvodes/serial/cvsKrylovDemo_ls.c b/examples/cvodes/serial/cvsKrylovDemo_ls.c
index 02309e0010..e76ccfa5dc 100644
--- a/examples/cvodes/serial/cvsKrylovDemo_ls.c
+++ b/examples/cvodes/serial/cvsKrylovDemo_ls.c
@@ -192,17 +192,17 @@ int main(int argc, char* argv[])
   SUNNonlinearSolver NLS;
   void *cvode_mem;
   int linsolver, iout, retval;
-  FILE* infofp;
   int nrmfactor;   /* LS norm conversion factor flag */
   realtype nrmfac; /* LS norm conversion factor      */
   int monitor;     /* LS resiudal monitoring flag    */
   SUNContext sunctx;
+  SUNLogger logger;
+  const char* info_fname = "cvKrylovDemo_ls-info.txt";
 
   u         = NULL;
   data      = NULL;
   LS        = NULL;
   cvode_mem = NULL;
-  infofp    = NULL;
   nrmfactor = 0;
   monitor   = 0;
 
@@ -210,16 +210,23 @@ int main(int argc, char* argv[])
   if (argc > 1) nrmfactor = atoi(argv[1]);
   if (argc > 2) monitor   = atoi(argv[2]);
 
-  /* Create SUNDIALS context */
+  /* Create SUNDIALS context and a logger which will record
+     nonlinear solver info (e.g., residual) amongst other things. */
+  
   retval = SUNContext_Create(NULL, &sunctx);
-  if (check_retval(&retval, "SUNContext_Create", 1)) return(1);
+  if (check_retval(&retval, "SUNContext_Create", 1)) return 1;
+
+  retval = SUNLogger_Create(NULL, 0, &logger);
+  if (check_retval(&retval, "SUNLogger_Create", 1)) return 1;
 
-  /* Open info file if monitoring is turned on */
   if (monitor) {
-    infofp = fopen("cvKrylovDemo_ls-info.txt", "w+");
-    if (check_retval((void *)infofp, "fopen", 0)) return(1);
+    retval = SUNLogger_SetInfoFilename(logger, info_fname);   
+    if (check_retval(&retval, "SUNLogger_SetInfoFilename", 1)) return 1;
   }
 
+  retval = SUNContext_SetLogger(sunctx, logger);
+  if (check_retval(&retval, "SUNContext_SetLogger", 1)) return 1;
+
   /* Allocate memory, and set problem data, initial values, tolerances */
   u = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)u, "N_VNew_Serial", 0)) return(1);
@@ -253,14 +260,6 @@ int main(int argc, char* argv[])
   /* Create the SUNNonlinearSolver */
   NLS = SUNNonlinSol_Newton(u, sunctx);
   if (check_retval(&retval, "SUNNonlinSol_Newton", 0)) return(1);
-  if (monitor) {
-    /* Set the print level set to 1, so that the nonlinear residual
-       is printed every newton iteration. */
-    retval = SUNNonlinSolSetPrintLevel_Newton(NLS, 1);
-    if (check_retval(&retval, "SUNNonlinSolSetPrintLevel_Newton", 1)) return(1);
-    retval = SUNNonlinSolSetInfoFile_Newton(NLS, infofp);
-    if (check_retval(&retval, "SUNNonlinSolSetInfoFile_Newton", 1)) return(1);
-  }
 
   /* Call CVodeSetNonlinearSolver to attach the nonlinear solver to CVode */
   retval = CVodeSetNonlinearSolver(cvode_mem, NLS);
@@ -294,22 +293,12 @@ int main(int argc, char* argv[])
       printf(" -------");
       printf(" \n| SPGMR |\n");
       printf(" -------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPGMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPGMR to specify the linear solver SPGMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPGMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPGMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPGMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPGMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPGMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPGMR", 1)) return(1);
-      }
+
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -322,22 +311,12 @@ int main(int argc, char* argv[])
       printf(" ---------");
       printf(" \n| SPFGMR |\n");
       printf(" ---------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPFGMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPFGMR to specify the linear solver SPFGMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPFGMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPFGMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPFGMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPFGMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPFGMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPFGMR", 1)) return(1);
-      }
+
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -350,22 +329,12 @@ int main(int argc, char* argv[])
       printf(" -------");
       printf(" \n| SPBCGS |\n");
       printf(" -------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPBCGS |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPBCGS to specify the linear solver SPBCGS with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPBCGS(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPBCGS", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPBCGS(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPBCGS", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPBCGS(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPBCGS", 1)) return(1);
-      }
+
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -378,22 +347,12 @@ int main(int argc, char* argv[])
       printf(" ---------");
       printf(" \n| SPTFQMR |\n");
       printf(" ---------\n");
-      if (monitor) {
-        fprintf(infofp, " ---------");
-        fprintf(infofp, " \n| SPTFQMR |\n");
-        fprintf(infofp, " ---------\n");
-      }
 
       /* Call SUNLinSol_SPTFQMR to specify the linear solver SPTFQMR with
          left preconditioning and the default maximum Krylov dimension */
       LS = SUNLinSol_SPTFQMR(u, SUN_PREC_LEFT, 0, sunctx);
       if (check_retval((void *)LS, "SUNLinSol_SPTFQMR", 0)) return(1);
-      if (monitor) {
-        retval = SUNLinSolSetPrintLevel_SPTFQMR(LS, 1);
-        if (check_retval(&retval, "SUNLinSolSetPrintLevel_SPTFQMR", 1)) return(1);
-        retval = SUNLinSolSetInfoFile_SPTFQMR(LS, infofp);
-        if (check_retval(&retval, "SUNLinSolSetInfoFile_SPTFQMR", 1)) return(1);
-      }
+
       retval = CVodeSetLinearSolver(cvode_mem, LS, NULL);
       if (check_retval(&retval, "CVodeSetLinearSolver", 1)) return 1;
 
@@ -439,12 +398,12 @@ int main(int argc, char* argv[])
   }  /* END: Loop through SPGMR, SPBCG and SPTFQMR linear solver modules */
 
   /* Free memory */
-  if (monitor) fclose(infofp);
   N_VDestroy(u);
   FreeUserData(data);
   CVodeFree(&cvode_mem);
   SUNLinSolFree(LS);
   SUNNonlinSolFree(NLS);
+  SUNLogger_Destroy(&logger);
   SUNContext_Free(&sunctx);
 
   return(0);
diff --git a/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c b/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
index 79c9d8038f..21538d367d 100644
--- a/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
+++ b/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
@@ -61,7 +61,6 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <cvodes/cvodes_direct.h>      /* access to CVDls interface            */
 #include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
index e3f1b20711..64445583a5 100644
--- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
@@ -495,7 +495,7 @@ static int SetupLS(N_Vector u, void *user_data, SUNContext sunctx)
   // Access problem data
   UserData *udata = (UserData *) user_data;
 
-  int prectype = PREC_RIGHT;
+  int prectype = SUN_PREC_RIGHT;
 
   // Create linear solver
   udata->LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);
@@ -1282,7 +1282,6 @@ static int InitUserData(UserData *udata)
 
 
   // Linear solver and preconditioner options
-  udata->lsinfo    = false;         // output residual history
   udata->liniters  = 20;            // max linear iterations
   udata->epslin    = RCONST(1.e-8); // relative stopping tolerance
 
@@ -1412,10 +1411,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
       udata->maxits = stoi((*argv)[arg_idx++]);
     }
     // Linear solver settings
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -1488,7 +1483,6 @@ static void InputHelp()
   cout << "  --damping <damping>     : damping for Anderson Acceleration " << endl;
   cout << "  --orthaa <orthaa>       : orthogonalization routine used in Anderson Acceleration " << endl;
   cout << "  --C                     : scalar value on exponential term " << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --pfmg_relax <types>    : relaxtion type in PFMG" << endl;
diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
index dfdb220127..fb5a8c6ce1 100644
--- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
+++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
@@ -108,7 +108,6 @@ struct UserData
   int      maxits;      // max number of fixed point iterations
 
   // Linear solver and preconditioner settings
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
index 1cb74e17ca..1c0f12a76c 100644
--- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
@@ -688,7 +688,7 @@ static int SetupLS(N_Vector u, void *user_data, SUNContext sunctx)
   // Access problem data
   UserData *udata = (UserData *) user_data;
 
-  int prectype = PREC_RIGHT;
+  int prectype = SUN_PREC_RIGHT;
 
   // Create linear solver
   udata->LS = SUNLinSol_PCG(u, prectype, udata->liniters, sunctx);
@@ -1452,7 +1452,6 @@ static int InitUserData(UserData *udata)
 
 
   // Linear solver and preconditioner options
-  udata->lsinfo    = false;         // output residual history
   udata->liniters  = 20;            // max linear iterations
   udata->epslin    = RCONST(1.e-8); // use default (0.05)
 
@@ -1629,10 +1628,6 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
       udata->c_int = stoi((*argv)[arg_idx++]);
     }
     // Linear solver settings
-    else if (arg == "--lsinfo")
-    {
-      udata->lsinfo = true;
-    }
     else if (arg == "--liniters")
     {
       udata->liniters = stoi((*argv)[arg_idx++]);
@@ -1756,7 +1751,6 @@ static void InputHelp()
   cout << "  --damping <damping>     : damping for Anderson Acceleration " << endl;
   cout << "  --orthaa <orthaa>       : orthogonalization routine used in Anderson Acceleration " << endl;
   cout << "  --c <c_int>             : nonlinear function parameter" << endl;
-  cout << "  --lsinfo                : output residual history" << endl;
   cout << "  --liniters <iters>      : max number of iterations" << endl;
   cout << "  --epslin <factor>       : linear tolerance factor" << endl;
   cout << "  --pfmg_relax <types>    : relaxtion type in PFMG" << endl;
diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
index 409ae447a3..723b93e8f7 100644
--- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
+++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
@@ -139,7 +139,6 @@ struct UserData
   int      maxits;      // max number of fixed point iterations
 
   // Linear solver and preconditioner settings
-  bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
   realtype epslin;    // linear solver tolerance factor
diff --git a/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.f90 b/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.f90
index 0f34228822..b6cd3d643b 100644
--- a/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.f90
+++ b/examples/kinsol/F2003_serial/kinLaplace_picard_kry_f2003.f90
@@ -215,7 +215,6 @@ program main
   type(SUNLinearSolver), pointer :: sunlinsol_LS  ! sundials linear solver
 
   type(c_ptr) :: kmem   ! KINSOL memory
-  type(c_ptr) :: infofp ! info file
 
   ! solution and scaling vectors; nx, ny are set in the prob_mod module
   real(c_double), dimension(nx,ny) :: u, scale
@@ -296,22 +295,6 @@ program main
      stop 1
   end if
 
-  ! Set information file
-
-  infofp = FSUNDIALSFileOpen("KINSOL.log", "w");
-
-  ierr = FKINSetInfoFile(kmem, infofp);
-  if (ierr /= 0) then
-     print *, 'Error in FKINSetInfoFile, ierr = ', ierr, '; halting'
-     stop 1
-  end if
-
-  ierr = FKINSetPrintLevel(kmem, 3);
-  if (ierr /= 0) then
-     print *, 'Error in FKINSetPrintLevel, ierr = ', ierr, '; halting'
-     stop 1
-  end if
-
   ! -------------------------
   ! Create a linear solver
 
@@ -372,7 +355,6 @@ program main
   call PrintFinalStats(kmem)
 
   ! clean up
-  call FSUNDIALSFileClose(infofp)
   call FKINFree(kmem)
   ierr = FSUNLinSolFree(sunlinsol_LS)
   call FN_VDestroy(sunvec_u)
diff --git a/examples/kinsol/serial/kinAnalytic_fp.c b/examples/kinsol/serial/kinAnalytic_fp.c
index 9fedd989c7..fb3dbe2106 100644
--- a/examples/kinsol/serial/kinAnalytic_fp.c
+++ b/examples/kinsol/serial/kinAnalytic_fp.c
@@ -231,11 +231,7 @@ int main(int argc, char *argv[])
   infofp = fopen("kinsol.log", "w");
   if (check_retval((void *)infofp, "fopen", 0)) return(1);
 
-  retval = KINSetInfoFile(kmem, infofp);
-  if (check_retval(&retval, "KINSetInfoFile", 1)) return(1);
 
-  retval = KINSetPrintLevel(kmem, 1);
-  if (check_retval(&retval, "KINSetPrintLevel", 1)) return(1);
 
   /* -------------
    * Initial guess
diff --git a/examples/kinsol/serial/kinLaplace_picard_kry.c b/examples/kinsol/serial/kinLaplace_picard_kry.c
index 30b18a92ba..7edd10866b 100644
--- a/examples/kinsol/serial/kinLaplace_picard_kry.c
+++ b/examples/kinsol/serial/kinLaplace_picard_kry.c
@@ -144,11 +144,7 @@ int main()
 
   infofp = fopen("KINSOL.log", "w");
 
-  retval = KINSetInfoFile(kmem, infofp);
-  if (check_retval(&retval, "KINSetInfoFile", 1)) return(1);
 
-  retval = KINSetPrintLevel(kmem, 3);
-  if (check_retval(&retval, "KINSetPrintLevel", 1)) return(1);
 
   /* ----------------------
    * Create SUNLinearSolver
diff --git a/examples/sunlinsol/test_sunlinsol.h b/examples/sunlinsol/test_sunlinsol.h
index d816f613de..7ae8aa000c 100644
--- a/examples/sunlinsol/test_sunlinsol.h
+++ b/examples/sunlinsol/test_sunlinsol.h
@@ -38,8 +38,8 @@ int Test_SUNLinSolSpace(SUNLinearSolver S, int myid);
 int Test_SUNLinSolNumIters(SUNLinearSolver S, int myid);
 int Test_SUNLinSolResNorm(SUNLinearSolver S, int myid);
 int Test_SUNLinSolResid(SUNLinearSolver S, int myid);
-int Test_SUNLinSolSetATimes(SUNLinearSolver S, void* ATdata, ATimesFn ATimes, int myid);
-int Test_SUNLinSolSetPreconditioner(SUNLinearSolver S, void* Pdata, PSetupFn PSetup, PSolveFn PSolve, int myid);
+int Test_SUNLinSolSetATimes(SUNLinearSolver S, void* ATdata, SUNATimesFn ATimes, int myid);
+int Test_SUNLinSolSetPreconditioner(SUNLinearSolver S, void* Pdata, SUNPSetupFn PSetup, SUNPSolveFn PSolve, int myid);
 int Test_SUNLinSolSetScalingVectors(SUNLinearSolver S, N_Vector s1, N_Vector s2, int myid);
 int Test_SUNLinSolSetZeroGuess(SUNLinearSolver S, int myid);
 int Test_SUNLinSolInitialize(SUNLinearSolver S, int myid);
diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
index 666318568c..4e090943c2 100644
--- a/include/arkode/arkode_arkstep.h
+++ b/include/arkode/arkode_arkstep.h
@@ -63,53 +63,6 @@ static const int ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3;
 static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK436L2SA_DIRK_6_3_4;
 static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SA_DIRK_8_4_5;
 
-#ifndef DEFAULT_ERK_2
-/* DEPRECATED DEFAULT_ERK_2: use ARKSTEP_ERK_DEFAULT_2 */
-#define DEFAULT_ERK_2           ARKSTEP_ERK_DEFAULT_2
-#endif
-
-#ifndef DEFAULT_ERK_3
-/* DEPRECATED DEFAULT_ERK_3: use ARKSTEP_ERK_DEFAULT_3 */
-#define DEFAULT_ERK_3           ARKSTEP_ERK_DEFAULT_3
-#endif
-
-#ifndef DEFAULT_ERK_4
-/* DEPRECATED DEFAULT_ERK_4: use ARKSTEP_ERK_DEFAULT_4 */
-#define DEFAULT_ERK_4           ARKSTEP_ERK_DEFAULT_4
-#endif
-
-#ifndef DEFAULT_ERK_5
-/* DEPRECATED DEFAULT_ERK_5: use ARKSTEP_ERK_DEFAULT_5 */
-#define DEFAULT_ERK_5           ARKSTEP_ERK_DEFAULT_5
-#endif
-
-#ifndef DEFAULT_ERK_6
-/* DEPRECATED DEFAULT_ERK_6: use ARKSTEP_ERK_DEFAULT_6 */
-#define DEFAULT_ERK_6           ARKSTEP_ERK_DEFAULT_6
-#endif
-
-#ifndef DEFAULT_ERK_8
-/* DEPRECATED DEFAULT_ERK_8: use ARKSTEP_ERK_DEFAULT_8 */
-#define DEFAULT_ERK_8           ARKSTEP_ERK_DEFAULT_8
-#endif
-
-/*    ImEx */
-/* DEPRECATED DEFAULT_ARK_ETABLE_3: use ARKSTEP_DEFAULT_ARK_ETABLE_3 */
-#define DEFAULT_ARK_ETABLE_3    ARKSTEP_DEFAULT_ARK_ETABLE_3
-/* DEPRECATED DEFAULT_ARK_ETABLE_4: use ARKSTEP_DEFAULT_ARK_ETABLE_4 */
-#define DEFAULT_ARK_ETABLE_4    ARKSTEP_DEFAULT_ARK_ETABLE_4
-/* DEPRECATED DEFAULT_ARK_ETABLE_5: use ARKSTEP_DEFAULT_ARK_ETABLE_4 */
-#define DEFAULT_ARK_ETABLE_5    ARKSTEP_DEFAULT_ARK_ETABLE_5
-/* DEPRECATED DEFAULT_ARK_ITABLE_3: use ARKSTEP_DEFAULT_ARK_ITABLE_3 */
-#define DEFAULT_ARK_ITABLE_3    ARKSTEP_DEFAULT_ARK_ITABLE_3
-/* DEPRECATED DEFAULT_ARK_ITABLE_4: use ARKSTEP_DEFAULT_ARK_ITABLE_4 */
-#define DEFAULT_ARK_ITABLE_4    ARKSTEP_DEFAULT_ARK_ITABLE_4
-/* DEPRECATED DEFAULT_ARK_ITABLE_5: use ARKSTEP_DEFAULT_ARK_ITABLE_5 */
-#define DEFAULT_ARK_ITABLE_5    ARKSTEP_DEFAULT_ARK_ITABLE_5
-
-/* backwards-compatibility */
-typedef ARKStagePredictFn ARKStepStagePredictFn;
-
 /* -------------------
  * Exported Functions
  * ------------------- */
@@ -267,8 +220,6 @@ SUNDIALS_EXPORT int ARKStepSetErrFile(void *arkode_mem,
                                       FILE *errfp);
 SUNDIALS_EXPORT int ARKStepSetUserData(void *arkode_mem,
                                        void *user_data);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDIALS_LOGGER instead")
-int ARKStepSetDiagnostics(void *arkode_mem, FILE *diagfp);
 
 SUNDIALS_EXPORT int ARKStepSetPostprocessStepFn(void *arkode_mem,
                                                 ARKPostProcessFn ProcessStep);
diff --git a/include/arkode/arkode_butcher_dirk.h b/include/arkode/arkode_butcher_dirk.h
index aecaf16a82..0dd8a788ea 100644
--- a/include/arkode/arkode_butcher_dirk.h
+++ b/include/arkode/arkode_butcher_dirk.h
@@ -23,49 +23,6 @@
 extern "C" {
 #endif
 
-
-/* Butcher table accessor IDs
-     ERK:    0 -  99
-     DIRK: 100 - 199
-     MRI:  200 - 299          */
-
-/* DEPRECATED SDIRK_2_1_2: use ARKODE_SDIRK_2_1_2 */
-#define SDIRK_2_1_2             100
-/* DEPRECATED BILLINGTON_3_3_2: use ARKODE_BILLINGTON_3_3_2 */
-#define BILLINGTON_3_3_2        101
-/* DEPRECATED TRBDF2_3_3_2: use ARKODE_TRBDF2_3_3_2 */
-#define TRBDF2_3_3_2            102
-/* DEPRECATED KVAERNO_4_2_3: use ARKODE_KVAERNO_4_2_3 */
-#define KVAERNO_4_2_3           103
-/* DEPRECATED ARK324L2SA_DIRK_4_2_3: use ARKODE_ARK324L2SA_DIRK_4_2_3 */
-#define ARK324L2SA_DIRK_4_2_3   104
-/* DEPRECATED CASH_5_2_4: use ARKODE_CASH_5_2_4 */
-#define CASH_5_2_4              105
-/* DEPRECATED CASH_5_3_4: use ARKODE_CASH_5_3_4 */
-#define CASH_5_3_4              106
-/* DEPRECATED SDIRK_5_3_4: use ARKODE_SDIRK_5_3_4 */
-#define SDIRK_5_3_4             107
-/* DEPRECATED KVAERNO_5_3_4: use ARKODE_KVAERNO_5_3_4 */
-#define KVAERNO_5_3_4           108
-/* DEPRECATED ARK436L2SA_DIRK_6_3_4: use ARKODE_ARK436L2SA_DIRK_6_3_4 */
-#define ARK436L2SA_DIRK_6_3_4   109
-/* DEPRECATED KVAERNO_7_4_5: use ARKODE_KVAERNO_7_4_5 */
-#define KVAERNO_7_4_5           110
-/* DEPRECATED ARK548L2SA_DIRK_8_4_5: use ARKODE_ARK548L2SA_DIRK_8_4_5 */
-#define ARK548L2SA_DIRK_8_4_5   111
-/* DEPRECATED ARK437L2SA_DIRK_7_3_4: use ARKODE_ARK437L2SA_DIRK_7_3_4 */
-#define ARK437L2SA_DIRK_7_3_4   112
-/* DEPRECATED ARK548L2SAb_DIRK_8_4_5: use ARKODE_ARK548L2SAb_DIRK_8_4_5 */
-#define ARK548L2SAb_DIRK_8_4_5  113
-
-/* Utility #defines to ensure valid input IDs for DIRK tables */
-
-/* DEPRECATED MIN_DIRK_NUM: use ARKODE_MIN_DIRK_NUM */
-#define MIN_DIRK_NUM            100
-
-/* DEPRECATED MAX_DIRK_NUM: use ARKODE_MAX_DIRK_NUM */
-#define MAX_DIRK_NUM            113
-
 typedef enum {
   ARKODE_DIRK_NONE = -1, /* ensure enum is signed int */
   ARKODE_MIN_DIRK_NUM = 100,
diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h
index cd552f58e3..e0c3c546a1 100644
--- a/include/arkode/arkode_butcher_erk.h
+++ b/include/arkode/arkode_butcher_erk.h
@@ -23,49 +23,6 @@
 extern "C" {
 #endif
 
-/* Butcher table accessor IDs
-     ERK:    0 -  99
-     DIRK: 100 - 199
-     MRI:  200 - 299          */
-
-/* DEPRECATED HEUN_EULER_2_1_2: use ARKODE_HEUN_EULER_2_1_2 */
-#define HEUN_EULER_2_1_2         0
-/* DEPRECATED BOGACKI_SHAMPINE_4_2_3: use ARKODE_BOGACKI_SHAMPINE_4_2_3 */
-#define BOGACKI_SHAMPINE_4_2_3   1
-/* DEPRECATED ARK324L2SA_ERK_4_2_3: use ARKODE_ARK324L2SA_ERK_4_2_3 */
-#define ARK324L2SA_ERK_4_2_3     2
-/* DEPRECATED ZONNEVELD_5_3_4: use ARKODE_ZONNEVELD_5_3_4 */
-#define ZONNEVELD_5_3_4          3
-/* DEPRECATED ARK436L2SA_ERK_6_3_4: use ARKODE_ARK436L2SA_ERK_6_3_4 */
-#define ARK436L2SA_ERK_6_3_4     4
-/* DEPRECATED SAYFY_ABURUB_6_3_4: use ARKODE_SAYFY_ABURUB_6_3_4 */
-#define SAYFY_ABURUB_6_3_4       5
-/* DEPRECATED CASH_KARP_6_4_5: use ARKODE_CASH_KARP_6_4_5 */
-#define CASH_KARP_6_4_5          6
-/* DEPRECATED FEHLBERG_6_4_5: use ARKODE_FEHLBERG_6_4_5 */
-#define FEHLBERG_6_4_5           7
-/* DEPRECATED DORMAND_PRINCE_7_4_5: use ARKODE_DORMAND_PRINCE_7_4_5 */
-#define DORMAND_PRINCE_7_4_5     8
-/* DEPRECATED ARK548L2SA_ERK_8_4_5: use ARKODE_ARK548L2SA_ERK_8_4_5 */
-#define ARK548L2SA_ERK_8_4_5     9
-/* DEPRECATED VERNER_8_5_6: use ARKODE_VERNER_8_5_6 */
-#define VERNER_8_5_6            10
-/* DEPRECATED FEHLBERG_13_7_8: use ARKODE_FEHLBERG_13_7_8 */
-#define FEHLBERG_13_7_8         11
-/* DEPRECATED KNOTH_WOLKE_3_3: use ARKODE_KNOTH_WOLKE_3_3 */
-#define KNOTH_WOLKE_3_3         12
-/* DEPRECATED ARK437L2SA_ERK_7_3_4: use ARKODE_ARK437L2SA_ERK_7_3_4 */
-#define ARK437L2SA_ERK_7_3_4    13
-/* DEPRECATED ARK548L2SAb_ERK_8_4_5: use ARKODE_ARK548L2SAb_ERK_8_4_5 */
-#define ARK548L2SAb_ERK_8_4_5   14
-
-/* Utility #defines to ensure valid input IDs for ERK tables */
-
-/* DEPRECATED MIN_ERK_NUM: use ARKODE_MIN_ERK_NUM */
-#define MIN_ERK_NUM              0
-/* DEPRECATED MAX_ERK_NUM: use ARKODE_MAX_ERK_NUM */
-#define MAX_ERK_NUM             21
-
 typedef enum {
   ARKODE_ERK_NONE = -1, /* ensure enum is signed int */
   ARKODE_MIN_ERK_NUM = 0,
diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
index 304c1925c2..b0fc8636dd 100644
--- a/include/arkode/arkode_erkstep.h
+++ b/include/arkode/arkode_erkstep.h
@@ -42,36 +42,6 @@ static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7;
 static const int ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8;
 static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
 
-#ifndef DEFAULT_ERK_2
-/* DEPRECATED DEFAULT_ERK_2: use ERKSTEP_DEFAULT_2 */
-#define DEFAULT_ERK_2           ERKSTEP_DEFAULT_2
-#endif
-
-#ifndef DEFAULT_ERK_3
-/* DEPRECATED DEFAULT_ERK_3: use ERKSTEP_DEFAULT_3 */
-#define DEFAULT_ERK_3           ERKSTEP_DEFAULT_3
-#endif
-
-#ifndef DEFAULT_ERK_4
-/* DEPRECATED DEFAULT_ERK_4: use ERKSTEP_DEFAULT_4 */
-#define DEFAULT_ERK_4           ERKSTEP_DEFAULT_4
-#endif
-
-#ifndef DEFAULT_ERK_5
-/* DEPRECATED DEFAULT_ERK_5: use ERKSTEP_DEFAULT_5 */
-#define DEFAULT_ERK_5           ERKSTEP_DEFAULT_5
-#endif
-
-#ifndef DEFAULT_ERK_6
-/* DEPRECATED DEFAULT_ERK_6: use ERKSTEP_DEFAULT_6 */
-#define DEFAULT_ERK_6           ERKSTEP_DEFAULT_6
-#endif
-
-#ifndef DEFAULT_ERK_8
-/* DEPRECATED DEFAULT_ERK_8: use ERKSTEP_DEFAULT_8 */
-#define DEFAULT_ERK_8           ERKSTEP_DEFAULT_8
-#endif
-
 /* -------------------
  * Exported Functions
  * ------------------- */
@@ -180,8 +150,6 @@ SUNDIALS_EXPORT int ERKStepSetErrFile(void *arkode_mem,
                                       FILE *errfp);
 SUNDIALS_EXPORT int ERKStepSetUserData(void *arkode_mem,
                                        void *user_data);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDIALS_LOGGER instead")
-int ERKStepSetDiagnostics(void *arkode_mem, FILE *diagfp);
 
 SUNDIALS_EXPORT int ERKStepSetPostprocessStepFn(void *arkode_mem,
                                                 ARKPostProcessFn ProcessStep);
diff --git a/include/arkode/arkode_mristep.h b/include/arkode/arkode_mristep.h
index d4d889813f..fbfb91c349 100644
--- a/include/arkode/arkode_mristep.h
+++ b/include/arkode/arkode_mristep.h
@@ -41,38 +41,6 @@ typedef enum {
   MRISTEP_IMEX
 } MRISTEP_METHOD_TYPE;
 
-
-/* MRI coupling table table accessor IDs:
-     ERK:    0 -  99
-     DIRK: 100 - 199
-     MRI:  200 - 299          */
-
-/* DEPRECATED MIS_KW3: use ARKODE_MIS_KW3 */
-#define MIS_KW3             200
-/* DEPRECATED MRI_GARK_ERK33a: use ARKODE_MRI_GARK_ERK33a */
-#define MRI_GARK_ERK33a     201
-/* DEPRECATED MRI_GARK_ERK45a: use ARKODE_MRI_GARK_ERK45a */
-#define MRI_GARK_ERK45a     202
-/* DEPRECATED MRI_GARK_IRK21a: use ARKODE_MRI_GARK_IRK21a */
-#define MRI_GARK_IRK21a     203
-/* DEPRECATED MRI_GARK_ESDIRK34a: use ARKODE_MRI_GARK_ESDIRK34a */
-#define MRI_GARK_ESDIRK34a  204
-/* DEPRECATED MRI_GARK_ESDIRK46a: use ARKODE_MRI_GARK_ESDIRK46a */
-#define MRI_GARK_ESDIRK46a  205
-/* DEPRECATED IMEX_MRI_GARK3a: use ARKODE_IMEX_MRI_GARK3a */
-#define IMEX_MRI_GARK3a     206
-/* DEPRECATED IMEX_MRI_GARK3b: use ARKODE_IMEX_MRI_GARK3b */
-#define IMEX_MRI_GARK3b     207
-/* DEPRECATED IMEX_MRI_GARK4: use ARKODE_IMEX_MRI_GARK4 */
-#define IMEX_MRI_GARK4      208
-
-/* Utility #defines to ensure valid input IDs for MRI tables */
-
-/* DEPRECATED MIN_MRI_NUM: use ARKODE_MIN_MRI_NUM */
-#define MIN_MRI_NUM         200
-/* DEPRECATED MAX_MRI_NUM: use ARKODE_MAX_MRI_NUM */
-#define MAX_MRI_NUM         208
-
 typedef enum {
   ARKODE_MRI_NONE = -1, /* ensure enum is signed int */
   ARKODE_MIN_MRI_NUM = 200,
@@ -100,23 +68,6 @@ static const int MRISTEP_DEFAULT_IMPL_SD_4 = ARKODE_MRI_GARK_ESDIRK46a;
 static const int MRISTEP_DEFAULT_IMEX_SD_3 = ARKODE_IMEX_MRI_GARK3b;
 static const int MRISTEP_DEFAULT_IMEX_SD_4 = ARKODE_IMEX_MRI_GARK4;
 
-/* DEPRECATED DEFAULT_MRI_TABLE_3: use MRISTEP_DEFAULT_3 */
-#define DEFAULT_MRI_TABLE_3          MRISTEP_DEFAULT_3     /* backwards-compatibility */
-/* DEPRECATED DEFAULT_EXPL_MRI_TABLE_3: use MRISTEP_DEFAULT_EXPL_3 */
-#define DEFAULT_EXPL_MRI_TABLE_3     MRISTEP_DEFAULT_EXPL_3
-/* DEPRECATED DEFAULT_EXPL_MRI_TABLE_4: use MRISTEP_DEFAULT_EXPL_4 */
-#define DEFAULT_EXPL_MRI_TABLE_4     MRISTEP_DEFAULT_EXPL_4
-/* DEPRECATED DEFAULT_IMPL_SD_TABLE_2: use MRISTEP_DEFAULT_IMPL_SD_2 */
-#define DEFAULT_IMPL_SD_MRI_TABLE_2  MRISTEP_DEFAULT_IMPL_SD_2
-/* DEPRECATED DEFAULT_IMPL_SD_TABLE_3: use MRISTEP_DEFAULT_IMPL_SD_3 */
-#define DEFAULT_IMPL_SD_MRI_TABLE_3  MRISTEP_DEFAULT_IMPL_SD_3
-/* DEPRECATED DEFAULT_IMPL_SD_TABLE_4: use MRISTEP_DEFAULT_IMPL_SD_4 */
-#define DEFAULT_IMPL_SD_MRI_TABLE_4  MRISTEP_DEFAULT_IMPL_SD_4
-/* DEPRECATED DEFAULT_IMEX_SD_TABLE_3: use MRISTEP_DEFAULT_IMEX_SD_3 */
-#define DEFAULT_IMEX_SD_MRI_TABLE_3  MRISTEP_DEFAULT_IMEX_SD_3
-/* DEPRECATED DEFAULT_IMEX_SD_TABLE_4: use MRISTEP_DEFAULT_IMEX_SD_4 */
-#define DEFAULT_IMEX_SD_MRI_TABLE_4  MRISTEP_DEFAULT_IMEX_SD_4
-
 /* ------------------------------------
  * MRIStep Inner Stepper Function Types
  * ------------------------------------ */
@@ -268,8 +219,6 @@ SUNDIALS_EXPORT int MRIStepSetErrFile(void *arkode_mem,
                                       FILE *errfp);
 SUNDIALS_EXPORT int MRIStepSetUserData(void *arkode_mem,
                                        void *user_data);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDIALS_LOGGER instead")
-int MRIStepSetDiagnostics(void *arkode_mem, FILE *diagfp);
 SUNDIALS_EXPORT int MRIStepSetPostprocessStepFn(void *arkode_mem,
                                                 ARKPostProcessFn ProcessStep);
 SUNDIALS_EXPORT int MRIStepSetPostprocessStageFn(void *arkode_mem,
diff --git a/include/cvode/cvode_direct.h b/include/cvode/cvode_direct.h
deleted file mode 100644
index 88568252d4..0000000000
--- a/include/cvode/cvode_direct.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * CVODE; these routines now just wrap the updated CVODE generic
- * linear solver interface in cvode_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _CVDLS_H
-#define _CVDLS_H
-
-#include <cvode/cvode_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*=================================================================
-  Function Types (typedefs for equivalent types in cvode_ls.h)
-  =================================================================*/
-
-typedef CVLsJacFn CVDlsJacFn;
-
-/*===================================================================
-  Exported Functions (wrappers for equivalent routines in cvode_ls.h)
-  ===================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolver instead")
-int CVDlsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS,
-                         SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacFn instead")
-int CVDlsSetJacFn(void *cvode_mem, CVDlsJacFn jac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinWorkSpace instead")
-int CVDlsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                      long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJacEvals instead")
-int CVDlsGetNumJacEvals(void *cvode_mem, long int *njevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinRhsEvals instead")
-int CVDlsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLastLinFlag instead")
-int CVDlsGetLastFlag(void *cvode_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinReturnFlagName instead")
-char *CVDlsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/cvode/cvode_spils.h b/include/cvode/cvode_spils.h
deleted file mode 100644
index 2c60f794d4..0000000000
--- a/include/cvode/cvode_spils.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in CVODE; these routines now just wrap
- * the updated CVODE generic linear solver interface in cvode_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _CVSPILS_H
-#define _CVSPILS_H
-
-#include <cvode/cvode_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*===============================================================
-  Function Types (typedefs for equivalent types in cvode_ls.h)
-  ===============================================================*/
-
-typedef CVLsPrecSetupFn CVSpilsPrecSetupFn;
-typedef CVLsPrecSolveFn CVSpilsPrecSolveFn;
-typedef CVLsJacTimesSetupFn CVSpilsJacTimesSetupFn;
-typedef CVLsJacTimesVecFn CVSpilsJacTimesVecFn;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in cvode_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolver instead")
-int CVSpilsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetEpsLin instead")
-int CVSpilsSetEpsLin(void *cvode_mem, realtype eplifac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetPreconditioner instead")
-int CVSpilsSetPreconditioner(void *cvode_mem, CVSpilsPrecSetupFn pset,
-                             CVSpilsPrecSolveFn psolve);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacTimes instead")
-int CVSpilsSetJacTimes(void *cvode_mem, CVSpilsJacTimesSetupFn jtsetup,
-                       CVSpilsJacTimesVecFn jtimes);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinWorkSpace instead")
-int CVSpilsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                        long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumPrecEvals instead")
-int CVSpilsGetNumPrecEvals(void *cvode_mem, long int *npevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumPrecSolves instead")
-int CVSpilsGetNumPrecSolves(void *cvode_mem, long int *npsolves);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinIters instead")
-int CVSpilsGetNumLinIters(void *cvode_mem, long int *nliters);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumConvFails instead")
-int CVSpilsGetNumConvFails(void *cvode_mem, long int *nlcfails);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJTSetupEvals instead")
-int CVSpilsGetNumJTSetupEvals(void *cvode_mem, long int *njtsetups);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJtimesEvals instead")
-int CVSpilsGetNumJtimesEvals(void *cvode_mem, long int *njvevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinRhsEvals instead")
-int CVSpilsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLastLinFlag instead")
-int CVSpilsGetLastFlag(void *cvode_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinReturnFlagName instead")
-char *CVSpilsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/cvodes/cvodes_direct.h b/include/cvodes/cvodes_direct.h
deleted file mode 100644
index a1b8a02cbe..0000000000
--- a/include/cvodes/cvodes_direct.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * CVODES; these routines now just wrap the updated CVODE generic
- * linear solver interface in cvodes_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _CVSDLS_H
-#define _CVSDLS_H
-
-#include <cvodes/cvodes_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*=================================================================
-  Function Types (typedefs for equivalent types in cvodes_ls.h)
-  =================================================================*/
-
-typedef CVLsJacFn CVDlsJacFn;
-typedef CVLsJacFnB CVDlsJacFnB;
-typedef CVLsJacFnBS CVDlsJacFnBS;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in cvodes_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolver instead")
-int CVDlsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS,
-                         SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacFn instead")
-int CVDlsSetJacFn(void *cvode_mem, CVDlsJacFn jac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinWorkSpace instead")
-int CVDlsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                      long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJacEvals instead")
-int CVDlsGetNumJacEvals(void *cvode_mem, long int *njevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinRhsEvals instead")
-int CVDlsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLastLinFlag instead")
-int CVDlsGetLastFlag(void *cvode_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinReturnFlagName instead")
-char *CVDlsGetReturnFlagName(long int flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolverB instead")
-int CVDlsSetLinearSolverB(void *cvode_mem, int which,
-                          SUNLinearSolver LS, SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacFnB instead")
-int CVDlsSetJacFnB(void *cvode_mem, int which, CVDlsJacFnB jacB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacFnBS instead")
-int CVDlsSetJacFnBS(void *cvode_mem, int which, CVDlsJacFnBS jacBS);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/cvodes/cvodes_spils.h b/include/cvodes/cvodes_spils.h
deleted file mode 100644
index 76b986d880..0000000000
--- a/include/cvodes/cvodes_spils.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in CVODES; these routines now just wrap
- * the updated CVODES generic linear solver interface in cvodes_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _CVSSPILS_H
-#define _CVSSPILS_H
-
-#include <cvodes/cvodes_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*===============================================================
-  Function Types (typedefs for equivalent types in cvodes_ls.h)
-  ===============================================================*/
-
-typedef CVLsPrecSetupFn CVSpilsPrecSetupFn;
-typedef CVLsPrecSolveFn CVSpilsPrecSolveFn;
-typedef CVLsJacTimesSetupFn CVSpilsJacTimesSetupFn;
-typedef CVLsJacTimesVecFn CVSpilsJacTimesVecFn;
-typedef CVLsPrecSetupFnB CVSpilsPrecSetupFnB;
-typedef CVLsPrecSetupFnBS CVSpilsPrecSetupFnBS;
-typedef CVLsPrecSolveFnB CVSpilsPrecSolveFnB;
-typedef CVLsPrecSolveFnBS CVSpilsPrecSolveFnBS;
-typedef CVLsJacTimesSetupFnB CVSpilsJacTimesSetupFnB;
-typedef CVLsJacTimesSetupFnBS CVSpilsJacTimesSetupFnBS;
-typedef CVLsJacTimesVecFnB CVSpilsJacTimesVecFnB;
-typedef CVLsJacTimesVecFnBS CVSpilsJacTimesVecFnBS;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in cvodes_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolver instead")
-int CVSpilsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetEpsLin instead")
-int CVSpilsSetEpsLin(void *cvode_mem, realtype eplifac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetPreconditioner instead")
-int CVSpilsSetPreconditioner(void *cvode_mem, CVSpilsPrecSetupFn pset,
-                             CVSpilsPrecSolveFn psolve);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacTimes instead")
-int CVSpilsSetJacTimes(void *cvode_mem, CVSpilsJacTimesSetupFn jtsetup,
-                       CVSpilsJacTimesVecFn jtimes);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinWorkSpace instead")
-int CVSpilsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                        long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumPrecEvals instead")
-int CVSpilsGetNumPrecEvals(void *cvode_mem, long int *npevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumPrecSolves instead")
-int CVSpilsGetNumPrecSolves(void *cvode_mem, long int *npsolves);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinIters instead")
-int CVSpilsGetNumLinIters(void *cvode_mem, long int *nliters);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumConvFails instead")
-int CVSpilsGetNumConvFails(void *cvode_mem, long int *nlcfails);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJTSetupEvals instead")
-int CVSpilsGetNumJTSetupEvals(void *cvode_mem, long int *njtsetups);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumJtimesEvals instead")
-int CVSpilsGetNumJtimesEvals(void *cvode_mem, long int *njvevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetNumLinRhsEvals instead")
-int CVSpilsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLastLinFlag instead")
-int CVSpilsGetLastFlag(void *cvode_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeGetLinReturnFlagName instead")
-char *CVSpilsGetReturnFlagName(long int flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetLinearSolverB instead")
-int CVSpilsSetLinearSolverB(void *cvode_mem, int which,
-                            SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetEpsLinB instead")
-int CVSpilsSetEpsLinB(void *cvode_mem, int which, realtype eplifacB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetPreconditionerB instead")
-int CVSpilsSetPreconditionerB(void *cvode_mem, int which,
-                              CVSpilsPrecSetupFnB psetB,
-                              CVSpilsPrecSolveFnB psolveB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetPreconditionerBS instead")
-int CVSpilsSetPreconditionerBS(void *cvode_mem, int which,
-                               CVSpilsPrecSetupFnBS psetBS,
-                               CVSpilsPrecSolveFnBS psolveBS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacTimesB instead")
-int CVSpilsSetJacTimesB(void *cvode_mem, int which,
-                        CVSpilsJacTimesSetupFnB jtsetupB,
-                        CVSpilsJacTimesVecFnB jtimesB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use CVodeSetJacTimesBS instead")
-int CVSpilsSetJacTimesBS(void *cvode_mem, int which,
-                         CVSpilsJacTimesSetupFnBS jtsetupBS,
-                         CVSpilsJacTimesVecFnBS jtimesBS);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/ida/ida_direct.h b/include/ida/ida_direct.h
deleted file mode 100644
index e45fc3018c..0000000000
--- a/include/ida/ida_direct.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Radu Serban @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * IDA; these routines now just wrap the updated IDA generic
- * linear solver interface in ida_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _IDADLS_H
-#define _IDADLS_H
-
-#include <ida/ida_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*=================================================================
-  Function Types (typedefs for equivalent types in ida_ls.h)
-  =================================================================*/
-
-typedef IDALsJacFn IDADlsJacFn;
-
-/*===================================================================
-  Exported Functions (wrappers for equivalent routines in ida_ls.h)
-  ===================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolver instead")
-int IDADlsSetLinearSolver(void *ida_mem, SUNLinearSolver LS,
-                          SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacFn instead")
-int IDADlsSetJacFn(void *ida_mem, IDADlsJacFn jac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinWorkSpace instead")
-int IDADlsGetWorkSpace(void *ida_mem, long int *lenrwLS,
-                       long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJacEvals instead")
-int IDADlsGetNumJacEvals(void *ida_mem, long int *njevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinResEvals instead")
-int IDADlsGetNumResEvals(void *ida_mem, long int *nrevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLastLinFlag instead")
-int IDADlsGetLastFlag(void *ida_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinReturnFlagName instead")
-char *IDADlsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/ida/ida_spils.h b/include/ida/ida_spils.h
deleted file mode 100644
index 2d40789ac2..0000000000
--- a/include/ida/ida_spils.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *         Alan Hindmarsh, Radu Serban and Aaron Collier @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in IDA; these routines now just wrap
- * the updated IDA generic linear solver interface in ida_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _IDASPILS_H
-#define _IDASPILS_H
-
-#include <ida/ida_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*===============================================================
-  Function Types (typedefs for equivalent types in ida_ls.h)
-  ===============================================================*/
-
-typedef IDALsPrecSetupFn IDASpilsPrecSetupFn;
-typedef IDALsPrecSolveFn IDASpilsPrecSolveFn;
-typedef IDALsJacTimesSetupFn IDASpilsJacTimesSetupFn;
-typedef IDALsJacTimesVecFn IDASpilsJacTimesVecFn;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in ida_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolver instead")
-int IDASpilsSetLinearSolver(void *ida_mem, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetPreconditioner instead")
-int IDASpilsSetPreconditioner(void *ida_mem, IDASpilsPrecSetupFn pset,
-                              IDASpilsPrecSolveFn psolve);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacTimes instead")
-int IDASpilsSetJacTimes(void *ida_mem, IDASpilsJacTimesSetupFn jtsetup,
-                        IDASpilsJacTimesVecFn jtimes);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetEpsLin instead")
-int IDASpilsSetEpsLin(void *ida_mem, realtype eplifac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetIncrementFactor instead")
-int IDASpilsSetIncrementFactor(void *ida_mem, realtype dqincfac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinWorkSpace instead")
-int IDASpilsGetWorkSpace(void *ida_mem, long int *lenrwLS, long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumPrecEvals instead")
-int IDASpilsGetNumPrecEvals(void *ida_mem, long int *npevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumPrecSolves instead")
-int IDASpilsGetNumPrecSolves(void *ida_mem, long int *npsolves);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinIters instead")
-int IDASpilsGetNumLinIters(void *ida_mem, long int *nliters);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinConvFails instead")
-int IDASpilsGetNumConvFails(void *ida_mem, long int *nlcfails);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJTSetupEvals instead")
-int IDASpilsGetNumJTSetupEvals(void *ida_mem, long int *njtsetups);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJtimesEvals instead")
-int IDASpilsGetNumJtimesEvals(void *ida_mem, long int *njvevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinResEvals instead")
-int IDASpilsGetNumResEvals(void *ida_mem, long int *nrevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLastLinFlag instead")
-int IDASpilsGetLastFlag(void *ida_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinReturnFlagName instead")
-char *IDASpilsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/idas/idas_direct.h b/include/idas/idas_direct.h
deleted file mode 100644
index 7fc6f47cf2..0000000000
--- a/include/idas/idas_direct.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * IDA; these routines now just wrap the updated IDA generic
- * linear solver interface in idas_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _IDADLS_H
-#define _IDADLS_H
-
-#include <idas/idas_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*=================================================================
-  Function Types (typedefs for equivalent types in ida_ls.h)
-  =================================================================*/
-
-typedef IDALsJacFn IDADlsJacFn;
-typedef IDALsJacFnB IDADlsJacFnB;
-typedef IDALsJacFnBS IDADlsJacFnBS;
-
-/*===================================================================
-  Exported Functions (wrappers for equivalent routines in idas_ls.h)
-  ===================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolver instead")
-int IDADlsSetLinearSolver(void *ida_mem, SUNLinearSolver LS,
-                          SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacFn instead")
-int IDADlsSetJacFn(void *ida_mem, IDADlsJacFn jac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinWorkSpace instead")
-int IDADlsGetWorkSpace(void *ida_mem, long int *lenrwLS,
-                       long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJacEvals instead")
-int IDADlsGetNumJacEvals(void *ida_mem, long int *njevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinResEvals instead")
-int IDADlsGetNumResEvals(void *ida_mem, long int *nrevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLastLinFlag instead")
-int IDADlsGetLastFlag(void *ida_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinReturnFlagName instead")
-char *IDADlsGetReturnFlagName(long int flag);
-
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolverB instead")
-int IDADlsSetLinearSolverB(void *ida_mem, int which,
-                           SUNLinearSolver LS, SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacFnB instead")
-int IDADlsSetJacFnB(void *ida_mem, int which, IDADlsJacFnB jacB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacFnBS instead")
-int IDADlsSetJacFnBS(void *ida_mem, int which, IDADlsJacFnBS jacBS);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/idas/idas_spils.h b/include/idas/idas_spils.h
deleted file mode 100644
index 9ea7b01749..0000000000
--- a/include/idas/idas_spils.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in IDAS; these routines now just wrap
- * the updated IDA generic linear solver interface in idas_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _IDASSPILS_H
-#define _IDASSPILS_H
-
-#include <idas/idas_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*===============================================================
-  Function Types (typedefs for equivalent types in idas_ls.h)
-  ===============================================================*/
-
-typedef IDALsPrecSetupFn IDASpilsPrecSetupFn;
-typedef IDALsPrecSolveFn IDASpilsPrecSolveFn;
-typedef IDALsJacTimesSetupFn IDASpilsJacTimesSetupFn;
-typedef IDALsJacTimesVecFn IDASpilsJacTimesVecFn;
-typedef IDALsPrecSetupFnB IDASpilsPrecSetupFnB;
-typedef IDALsPrecSetupFnBS IDASpilsPrecSetupFnBS;
-typedef IDALsPrecSolveFnB IDASpilsPrecSolveFnB;
-typedef IDALsPrecSolveFnBS IDASpilsPrecSolveFnBS;
-typedef IDALsJacTimesSetupFnB IDASpilsJacTimesSetupFnB;
-typedef IDALsJacTimesSetupFnBS IDASpilsJacTimesSetupFnBS;
-typedef IDALsJacTimesVecFnB IDASpilsJacTimesVecFnB;
-typedef IDALsJacTimesVecFnBS IDASpilsJacTimesVecFnBS;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in idas_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolver instead")
-int IDASpilsSetLinearSolver(void *ida_mem, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetPreconditioner instead")
-int IDASpilsSetPreconditioner(void *ida_mem, IDASpilsPrecSetupFn pset,
-                              IDASpilsPrecSolveFn psolve);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacTimes instead")
-int IDASpilsSetJacTimes(void *ida_mem, IDASpilsJacTimesSetupFn jtsetup,
-                        IDASpilsJacTimesVecFn jtimes);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetEpsLin instead")
-int IDASpilsSetEpsLin(void *ida_mem, realtype eplifac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetIncrementFactor instead")
-int IDASpilsSetIncrementFactor(void *ida_mem, realtype dqincfac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinWorkSpace instead")
-int IDASpilsGetWorkSpace(void *ida_mem, long int *lenrwLS, long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumPrecEvals instead")
-int IDASpilsGetNumPrecEvals(void *ida_mem, long int *npevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumPrecSolves instead")
-int IDASpilsGetNumPrecSolves(void *ida_mem, long int *npsolves);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinIters instead")
-int IDASpilsGetNumLinIters(void *ida_mem, long int *nliters);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinConvFails instead")
-int IDASpilsGetNumConvFails(void *ida_mem, long int *nlcfails);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJTSetupEvals instead")
-int IDASpilsGetNumJTSetupEvals(void *ida_mem, long int *njtsetups);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumJtimesEvals instead")
-int IDASpilsGetNumJtimesEvals(void *ida_mem, long int *njvevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetNumLinResEvals instead")
-int IDASpilsGetNumResEvals(void *ida_mem, long int *nrevalsLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLastLinFlag instead")
-int IDASpilsGetLastFlag(void *ida_mem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDAGetLinReturnFlagName instead")
-char *IDASpilsGetReturnFlagName(long int flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetLinearSolverB instead")
-int IDASpilsSetLinearSolverB(void *ida_mem, int which, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetEpsLinB instead")
-int IDASpilsSetEpsLinB(void *ida_mem, int which, realtype eplifacB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetIncrementFactorB instead")
-int IDASpilsSetIncrementFactorB(void *ida_mem, int which, realtype dqincfacB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetPreconditionerB instead")
-int IDASpilsSetPreconditionerB(void *ida_mem, int which,
-                               IDASpilsPrecSetupFnB psetB,
-                               IDASpilsPrecSolveFnB psolveB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetPreconditionerBS instead")
-int IDASpilsSetPreconditionerBS(void *ida_mem, int which,
-                                IDASpilsPrecSetupFnBS psetBS,
-                                IDASpilsPrecSolveFnBS psolveBS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacTimesB instead")
-int IDASpilsSetJacTimesB(void *ida_mem, int which,
-                         IDASpilsJacTimesSetupFnB jtsetupB,
-                         IDASpilsJacTimesVecFnB jtimesB);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use IDASetJacTimesBS instead")
-int IDASpilsSetJacTimesBS(void *ida_mem, int which,
-                          IDASpilsJacTimesSetupFnBS jtsetupBS,
-                          IDASpilsJacTimesVecFnBS jtimesBS);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/kinsol/kinsol.h b/include/kinsol/kinsol.h
index 7d8c7da50d..5a306fc967 100644
--- a/include/kinsol/kinsol.h
+++ b/include/kinsol/kinsol.h
@@ -133,18 +133,10 @@ SUNDIALS_EXPORT int KINSetScaledStepTol(void *kinmem, realtype scsteptol);
 SUNDIALS_EXPORT int KINSetConstraints(void *kinmem, N_Vector constraints);
 SUNDIALS_EXPORT int KINSetSysFunc(void *kinmem, KINSysFn func);
 
-/* Optional input functions for handling error/info/debug events */
+/* Optional input functions for handling error events */
 SUNDIALS_EXPORT int KINSetErrHandlerFn(void *kinmem, KINErrHandlerFn ehfun,
                                        void *eh_data);
 SUNDIALS_EXPORT int KINSetErrFile(void *kinmem, FILE *errfp);
-SUNDIALS_EXPORT int KINSetInfoHandlerFn(void *kinmem, KINInfoHandlerFn ihfun,
-                                        void *ih_data);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-SUNDIALS_EXPORT int KINSetInfoFile(void *kinmem, FILE *infofp);
-SUNDIALS_EXPORT int KINSetPrintLevel(void *kinmem, int printfl);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetDebugFilename instead")
-int KINSetDebugFile(void *kinmem, FILE *debugfp);
-
 
 /* Optional output functions */
 SUNDIALS_EXPORT int KINGetWorkSpace(void *kinmem, long int *lenrw,
diff --git a/include/kinsol/kinsol_direct.h b/include/kinsol/kinsol_direct.h
deleted file mode 100644
index bc5c1c6307..0000000000
--- a/include/kinsol/kinsol_direct.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Radu Serban @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * KINSOL; these routines now just wrap the updated KINSOL generic
- * linear solver interface in kinsol_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _KINDLS_H
-#define _KINDLS_H
-
-#include <kinsol/kinsol_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*=================================================================
-  Function Types (typedefs for equivalent types in kinsol_ls.h)
-  =================================================================*/
-
-typedef KINLsJacFn KINDlsJacFn;
-
-/*===================================================================
-  Exported Functions (wrappers for equivalent routines in kinsol_ls.h)
-  ===================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINSetLinearSolver instead")
-int KINDlsSetLinearSolver(void *kinmem, SUNLinearSolver LS, SUNMatrix A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINSetJacFn instead")
-int KINDlsSetJacFn(void *kinmem, KINDlsJacFn jac);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLinWorkSpace instead")
-int KINDlsGetWorkSpace(void *kinmem, long int *lenrw, long int *leniw);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumJacEvals instead")
-int KINDlsGetNumJacEvals(void *kinmem, long int *njevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumLinFuncEvals instead")
-int KINDlsGetNumFuncEvals(void *kinmem, long int *nfevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLastLinFlag instead")
-int KINDlsGetLastFlag(void *kinmem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLinReturnFlagName instead")
-char *KINDlsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/kinsol/kinsol_spils.h b/include/kinsol/kinsol_spils.h
deleted file mode 100644
index 075ff106ea..0000000000
--- a/include/kinsol/kinsol_spils.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Scott Cohen, Alan Hindmarsh, Radu Serban,
- *                  and Aaron Collier @ LLNL
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled Preconditioned Iterative
- * Linear Solver interface in KINSOL; these routines now just wrap
- * the updated KINSOL generic linear solver interface in kinsol_ls.h.
- * -----------------------------------------------------------------*/
-
-#ifndef _KINSPILS_H
-#define _KINSPILS_H
-
-#include <kinsol/kinsol_ls.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-
-/*===============================================================
-  Function Types (typedefs for equivalent types in kinsol_ls.h)
-  ===============================================================*/
-
-typedef KINLsPrecSetupFn KINSpilsPrecSetupFn;
-typedef KINLsPrecSolveFn KINSpilsPrecSolveFn;
-typedef KINLsJacTimesVecFn KINSpilsJacTimesVecFn;
-
-/*====================================================================
-  Exported Functions (wrappers for equivalent routines in kinsol_ls.h)
-  ====================================================================*/
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINSetLinearSolver instead")
-int KINSpilsSetLinearSolver(void *kinmem, SUNLinearSolver LS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINSetPreconditioner instead")
-int KINSpilsSetPreconditioner(void *kinmem, KINSpilsPrecSetupFn psetup,
-                              KINSpilsPrecSolveFn psolve);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINSetJacTimesVecFn instead")
-int KINSpilsSetJacTimesVecFn(void *kinmem, KINSpilsJacTimesVecFn jtv);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLinWorkSpace instead")
-int KINSpilsGetWorkSpace(void *kinmem, long int *lenrwLS, long int *leniwLS);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumPrecEvals instead")
-int KINSpilsGetNumPrecEvals(void *kinmem, long int *npevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumPrecSolves instead")
-int KINSpilsGetNumPrecSolves(void *kinmem, long int *npsolves);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumLinIters instead")
-int KINSpilsGetNumLinIters(void *kinmem, long int *nliters);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumLinConvFails instead")
-int KINSpilsGetNumConvFails(void *kinmem, long int *nlcfails);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumJtimesEvals instead")
-int KINSpilsGetNumJtimesEvals(void *kinmem, long int *njvevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetNumLinFuncEvals instead")
-int KINSpilsGetNumFuncEvals(void *kinmem, long int *nfevals);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLastLinFlag instead")
-int KINSpilsGetLastFlag(void *kinmem, long int *flag);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use KINGetLinReturnFlagName instead")
-char *KINSpilsGetReturnFlagName(long int flag);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/nvector/nvector_openmp.h b/include/nvector/nvector_openmp.h
index 9eaf4d8d04..713f1fbd64 100644
--- a/include/nvector/nvector_openmp.h
+++ b/include/nvector/nvector_openmp.h
@@ -194,22 +194,6 @@ SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, booleant
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, booleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArray_OpenMP(int count, N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArrayEmpty_OpenMP(int count, N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_OpenMP(N_Vector* vs, int count);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/nvector/nvector_openmpdev.h b/include/nvector/nvector_openmpdev.h
index 62cb37e811..fcc2ced766 100644
--- a/include/nvector/nvector_openmpdev.h
+++ b/include/nvector/nvector_openmpdev.h
@@ -195,22 +195,6 @@ SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, boole
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArray_OpenMPDEV(int count, N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArrayEmpty_OpenMPDEV(int count, N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_OpenMPDEV(N_Vector *vs, int count);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/nvector/nvector_parallel.h b/include/nvector/nvector_parallel.h
index bbb29b7de3..127f319c0b 100644
--- a/include/nvector/nvector_parallel.h
+++ b/include/nvector/nvector_parallel.h
@@ -225,21 +225,6 @@ SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, b
 
 SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Parallel(N_Vector v, booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArray_Parallel(int count, N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArrayEmpty_Parallel(int count, N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_Parallel(N_Vector* vs, int count);
-
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_parhyp.h b/include/nvector/nvector_parhyp.h
index f2748db746..03e7f66df6 100644
--- a/include/nvector/nvector_parhyp.h
+++ b/include/nvector/nvector_parhyp.h
@@ -211,24 +211,6 @@ SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v,
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v,
                                                                  booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArray_ParHyp(int count,
-                                                                N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArrayEmpty_ParHyp(int count,
-                                                                     N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_ParHyp(N_Vector *vs,
-                                                             int count);
-
 SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_ParHyp(N_Vector v, booleantype tf);
 
 #ifdef __cplusplus
diff --git a/include/nvector/nvector_petsc.h b/include/nvector/nvector_petsc.h
index 8ccbdcf2dc..f7745ad98f 100644
--- a/include/nvector/nvector_petsc.h
+++ b/include/nvector/nvector_petsc.h
@@ -195,21 +195,6 @@ SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, bool
 
 SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Petsc(N_Vector v, booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArray_Petsc(int count, N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector *N_VCloneVectorArrayEmpty_Petsc(int count, N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_Petsc(N_Vector *vs, int count);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/nvector/nvector_pthreads.h b/include/nvector/nvector_pthreads.h
index da6be3e461..4e20c7ad5b 100644
--- a/include/nvector/nvector_pthreads.h
+++ b/include/nvector/nvector_pthreads.h
@@ -243,24 +243,6 @@ SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v,
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v,
                                                                    booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArray_Pthreads(int count,
-                                                                  N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArrayEmpty_Pthreads(int count,
-                                                                       N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_Pthreads(N_Vector* vs,
-                                                               int count);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/nvector/nvector_serial.h b/include/nvector/nvector_serial.h
index 7a96499ee9..1b08708c6c 100644
--- a/include/nvector/nvector_serial.h
+++ b/include/nvector/nvector_serial.h
@@ -184,21 +184,6 @@ SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, booleant
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, booleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, booleantype tf);
 
-/*
- * -----------------------------------------------------------------
- * Deprecated functions
- * -----------------------------------------------------------------
- */
-
-/* use N_VCloneVectorArray */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArray_Serial(int count, N_Vector w);
-
-/* use N_VCloneVectorArrayEmpty */
-SUNDIALS_DEPRECATED_EXPORT N_Vector* N_VCloneVectorArrayEmpty_Serial(int count, N_Vector w);
-
-/* use N_VDestroyVectorArray */
-SUNDIALS_DEPRECATED_EXPORT void N_VDestroyVectorArray_Serial(N_Vector* vs, int count);
-
 
 #ifdef __cplusplus
 }
diff --git a/include/sundials/sundials_band.h b/include/sundials/sundials_band.h
index 47ef42a4cf..9c306de2c1 100644
--- a/include/sundials/sundials_band.h
+++ b/include/sundials/sundials_band.h
@@ -79,19 +79,11 @@ extern "C" {
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_BandGBTRF(SUNDlsMat A, sunindextype* p);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_BandGBTRF instead")
-sunindextype BandGBTRF(DlsMat A, sunindextype *p);
-
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_bandGBTRF(realtype **a, sunindextype n,
                                  sunindextype mu, sunindextype ml,
                                  sunindextype smu, sunindextype *p);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandGBTRF instead")
-sunindextype bandGBTRF(realtype **a, sunindextype n,
-                       sunindextype mu, sunindextype ml,
-                       sunindextype smu, sunindextype *p);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_BandGBTRS
@@ -113,17 +105,10 @@ sunindextype bandGBTRF(realtype **a, sunindextype n,
 SUNDIALS_EXPORT
 void SUNDlsMat_BandGBTRS(SUNDlsMat A, sunindextype *p, realtype *b);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_BandGBTRS instead")
-void BandGBTRS(DlsMat A, sunindextype *p, realtype *b);
-
 SUNDIALS_EXPORT
 void SUNDlsMat_bandGBTRS(realtype **a, sunindextype n, sunindextype smu,
                          sunindextype ml, sunindextype *p, realtype *b);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandGBTRS instead")
-void bandGBTRS(realtype **a, sunindextype n, sunindextype smu,
-               sunindextype ml, sunindextype *p, realtype *b);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_BandCopy
@@ -143,21 +128,11 @@ void bandGBTRS(realtype **a, sunindextype n, sunindextype smu,
 SUNDIALS_EXPORT
 void SUNDlsMat_BandCopy(SUNDlsMat A, SUNDlsMat B, sunindextype copymu,
                         sunindextype copyml);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_BandCopy instead")
-void BandCopy(DlsMat A, DlsMat B, sunindextype copymu,
-              sunindextype copyml);
-
 SUNDIALS_EXPORT
 void SUNDlsMat_bandCopy(realtype **a, realtype **b, sunindextype n,
                         sunindextype a_smu, sunindextype b_smu,
                         sunindextype copymu, sunindextype copyml);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandCopy instead")
-void bandCopy(realtype **a, realtype **b, sunindextype n,
-              sunindextype a_smu, sunindextype b_smu,
-              sunindextype copymu, sunindextype copyml);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_BandScale
@@ -174,17 +149,10 @@ void bandCopy(realtype **a, realtype **b, sunindextype n,
 
 void SUNDlsMat_BandScale(realtype c, SUNDlsMat A);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_BandScale instead")
-void BandScale(realtype c, DlsMat A);
-
 SUNDIALS_EXPORT
 void SUNDlsMat_bandScale(realtype c, realtype **a, sunindextype n,
                          sunindextype mu, sunindextype ml, sunindextype smu);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandScale instead")
-void bandScale(realtype c, realtype **a, sunindextype n,
-               sunindextype mu, sunindextype ml, sunindextype smu);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_bandAddIdentity
@@ -196,9 +164,6 @@ void bandScale(realtype c, realtype **a, sunindextype n,
 
 void SUNDlsMat_bandAddIdentity(realtype **a, sunindextype n, sunindextype smu);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandAddIdentity instead")
-void bandAddIdentity(realtype **a, sunindextype n, sunindextype smu);
-
 
 /*
  * -----------------------------------------------------------------
@@ -218,19 +183,11 @@ void bandAddIdentity(realtype **a, sunindextype n, sunindextype smu);
 SUNDIALS_EXPORT
 void SUNDlsMat_BandMatvec(SUNDlsMat A, realtype *x, realtype *y);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_BandMatvec instead")
-void BandMatvec(DlsMat A, realtype *x, realtype *y);
-
 SUNDIALS_EXPORT
 void SUNDlsMat_bandMatvec(realtype **a, realtype *x, realtype *y,
                           sunindextype n, sunindextype mu,
                           sunindextype ml, sunindextype smu);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_bandMatvec instead")
-void bandMatvec(realtype **a, realtype *x, realtype *y,
-                sunindextype n, sunindextype mu,
-                sunindextype ml, sunindextype smu);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/sundials/sundials_dense.h b/include/sundials/sundials_dense.h
index 2ba052c968..201580cad4 100644
--- a/include/sundials/sundials_dense.h
+++ b/include/sundials/sundials_dense.h
@@ -71,27 +71,17 @@ extern "C" {
 
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_DenseGETRF(SUNDlsMat A, sunindextype *p);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseGETRF instead")
-sunindextype DenseGETRF(DlsMat A, sunindextype *p);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_DenseGETRS(SUNDlsMat A, sunindextype *p, realtype *b);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseGETRS instead")
-void DenseGETRS(DlsMat A, sunindextype *p, realtype *b);
 
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_denseGETRF(realtype **a, sunindextype m,
                                   sunindextype n, sunindextype *p);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseGETRF instead")
-sunindextype denseGETRF(realtype **a, sunindextype m,
-                        sunindextype n, sunindextype *p);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_denseGETRS(realtype **a, sunindextype n, sunindextype *p,
                           realtype *b);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseGETRS instead")
-void denseGETRS(realtype **a, sunindextype n, sunindextype *p,
-                realtype *b);
 
 /*
  * ----------------------------------------------------------------------------
@@ -114,23 +104,15 @@ void denseGETRS(realtype **a, sunindextype n, sunindextype *p,
 
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_DensePOTRF(SUNDlsMat A);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DensePOTRF instead")
-sunindextype DensePOTRF(DlsMat A);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_DensePOTRS(SUNDlsMat A, realtype *b);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DensePOTRS instead")
-void DensePOTRS(DlsMat A, realtype *b);
 
 SUNDIALS_EXPORT
 sunindextype SUNDlsMat_densePOTRF(realtype **a, sunindextype m);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_densePOTRF instead")
-sunindextype densePOTRF(realtype **a, sunindextype m);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_densePOTRS(realtype **a, sunindextype m, realtype *b);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_densePOTRS instead")
-void densePOTRS(realtype **a, sunindextype m, realtype *b);
 
 /*
  * -----------------------------------------------------------------------------
@@ -160,32 +142,20 @@ void densePOTRS(realtype **a, sunindextype m, realtype *b);
 
 SUNDIALS_EXPORT
 int SUNDlsMat_DenseGEQRF(SUNDlsMat A, realtype *beta, realtype *wrk);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseGEQRF instead")
-int DenseGEQRF(DlsMat A, realtype *beta, realtype *wrk);
 
 SUNDIALS_EXPORT
 int SUNDlsMat_DenseORMQR(SUNDlsMat A, realtype *beta, realtype *vn,
                          realtype *vm, realtype *wrk);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseORMQR instead")
-int DenseORMQR(DlsMat A, realtype *beta, realtype *vn,
-               realtype *vm, realtype *wrk);
 
 
 SUNDIALS_EXPORT
 int SUNDlsMat_denseGEQRF(realtype **a, sunindextype m, sunindextype n,
                          realtype *beta, realtype *wrk);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseGEQRF instead")
-int denseGEQRF(realtype **a, sunindextype m, sunindextype n,
-               realtype *beta, realtype *wrk);
 
 SUNDIALS_EXPORT
 int SUNDlsMat_denseORMQR(realtype **a, sunindextype m, sunindextype n,
                          realtype *beta, realtype *v, realtype *w,
                          realtype *wrk);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseORMQR instead")
-int denseORMQR(realtype **a, sunindextype m, sunindextype n,
-               realtype *beta, realtype *v, realtype *w,
-               realtype *wrk);
 
 /*
  * ----------------------------------------------------------------------------
@@ -201,15 +171,10 @@ int denseORMQR(realtype **a, sunindextype m, sunindextype n,
 
 SUNDIALS_EXPORT
 void SUNDlsMat_DenseCopy(SUNDlsMat A, SUNDlsMat B);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseCopy instead")
-void DenseCopy(DlsMat A, DlsMat B);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_denseCopy(realtype **a, realtype **b, sunindextype m,
                          sunindextype n);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseCopy instead")
-void denseCopy(realtype **a, realtype **b, sunindextype m,
-               sunindextype n);
 
 /*
  * -----------------------------------------------------------------------------
@@ -226,16 +191,10 @@ void denseCopy(realtype **a, realtype **b, sunindextype m,
 
 SUNDIALS_EXPORT
 void SUNDlsMat_DenseScale(realtype c, SUNDlsMat A);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsSUNDlsMat_DenseScale_denseCopy instead")
-void DenseScale(realtype c, DlsMat A);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_denseScale(realtype c, realtype **a, sunindextype m,
                           sunindextype n);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseScale instead")
-void denseScale(realtype c, realtype **a, sunindextype m,
-                sunindextype n);
-
 
 /*
  * -----------------------------------------------------------------------------
@@ -248,8 +207,6 @@ void denseScale(realtype c, realtype **a, sunindextype m,
 
 SUNDIALS_EXPORT
 void SUNDlsMat_denseAddIdentity(realtype **a, sunindextype n);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseAddIdentity instead")
-void denseAddIdentity(realtype **a, sunindextype n);
 
 
 /*
@@ -268,15 +225,10 @@ void denseAddIdentity(realtype **a, sunindextype n);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_DenseMatvec(SUNDlsMat A, realtype *x, realtype *y);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DenseMatvec instead")
-void DenseMatvec(DlsMat A, realtype *x, realtype *y);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_denseMatvec(realtype **a, realtype *x, realtype *y,
                            sunindextype m, sunindextype n);
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_denseMatvec instead")
-void denseMatvec(realtype **a, realtype *x, realtype *y,
-                 sunindextype m, sunindextype n);
 
 
 #ifdef __cplusplus
diff --git a/include/sundials/sundials_direct.h b/include/sundials/sundials_direct.h
index b33c718032..b73ffeae7e 100644
--- a/include/sundials/sundials_direct.h
+++ b/include/sundials/sundials_direct.h
@@ -125,9 +125,8 @@ typedef struct _DlsMat {
   realtype *data;
   sunindextype ldata;
   realtype **cols;
-} *SUNDlsMat; /* DEPRECATED DlsMat: use SUNDlsMat instead */
+} *SUNDlsMat; 
 
-typedef SUNDlsMat DlsMat;
 
 /*
  * ==================================================================
@@ -155,11 +154,6 @@ typedef SUNDlsMat DlsMat;
 #define SUNDLS_DENSE_COL(A,j) ((A->cols)[j])
 #define SUNDLS_DENSE_ELEM(A,i,j) ((A->cols)[j][i])
 
-/* DEPRECATED DENSE_COL: use SUNDLS_DENSE_COL instead */
-#define DENSE_COL(A,j) SUNDLS_DENSE_COL(A,j)
-/* DEPRECATED DENSE_ELEM: use SUNDLS_DENSE_ELEM instead */
-#define DENSE_ELEM(A,i,j) SUNDLS_DENSE_ELEM(A,i,j)
-
 /*
  * -----------------------------------------------------------------
  * SUNDLS_BAND_COL, SUNDLS_BAND_COL_ELEM, and SUNDLS_BAND_ELEM
@@ -185,14 +179,6 @@ typedef SUNDlsMat DlsMat;
 #define SUNDLS_BAND_COL(A,j) (((A->cols)[j])+(A->s_mu))
 #define SUNDLS_BAND_COL_ELEM(col_j,i,j) (col_j[(i)-(j)])
 #define SUNDLS_BAND_ELEM(A,i,j) ((A->cols)[j][(i)-(j)+(A->s_mu)])
-
-/* DEPRECATED BAND_COL: use SUNDLS_BAND_COL */
-#define BAND_COL(A,j) SUNDLS_BAND_COL(A,j)
-/* DEPRECATED BAND_COL_ELEM: use SUNDLS_BAND_COL_ELEM */
-#define BAND_COL_ELEM(col_j,i,j) SUNDLS_BAND_COL_ELEM(col_j,i,j)
-/* DEPRECATED BAND_ELEM: use SUNDLS_BAND_ELEM */
-#define BAND_ELEM(A,i,j) SUNDLS_BAND_ELEM(A,i,j)
-
 /*
  * ==================================================================
  * Exported function prototypes (functions working on SUNDlsMat)
@@ -214,9 +200,6 @@ typedef SUNDlsMat DlsMat;
 SUNDIALS_EXPORT
 SUNDlsMat SUNDlsMat_NewDenseMat(sunindextype M, sunindextype N);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_NewDenseMat instead")
-DlsMat NewDenseMat(sunindextype M, sunindextype N);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_NewBandMat
@@ -241,10 +224,6 @@ SUNDIALS_EXPORT
 SUNDlsMat SUNDlsMat_NewBandMat(sunindextype N, sunindextype mu,
                                sunindextype ml, sunindextype smu);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_NewBandMat instead")
-DlsMat NewBandMat(sunindextype N, sunindextype mu,
-                  sunindextype ml, sunindextype smu);
-
 /*
  * -----------------------------------------------------------------
  * Functions: SUNDlsMat_DestroyMat
@@ -255,10 +234,7 @@ DlsMat NewBandMat(sunindextype N, sunindextype mu,
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_DestroyMat(DlsMat A);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DestroyMat instead")
-void DestroyMat(DlsMat A);
+void SUNDlsMat_DestroyMat(SUNDlsMat A);
 
 /*
  * -----------------------------------------------------------------
@@ -273,9 +249,6 @@ void DestroyMat(DlsMat A);
 SUNDIALS_EXPORT
 int* SUNDlsMat_NewIntArray(int N);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_NewIntArray instead")
-int* NewIntArray(int N);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_NewIndexArray
@@ -290,9 +263,6 @@ int* NewIntArray(int N);
 SUNDIALS_EXPORT
 sunindextype* SUNDlsMat_NewIndexArray(sunindextype N);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_NewIndexArray instead")
-sunindextype* NewIndexArray(sunindextype N);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_NewRealArray
@@ -306,9 +276,6 @@ sunindextype* NewIndexArray(sunindextype N);
 SUNDIALS_EXPORT
 realtype* SUNDlsMat_NewRealArray(sunindextype N);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_NewRealArray instead")
-realtype* NewRealArray(sunindextype N);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_DestroyArray
@@ -322,9 +289,6 @@ realtype* NewRealArray(sunindextype N);
 SUNDIALS_EXPORT
 void SUNDlsMat_DestroyArray(void *p);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_DestroyArray instead")
-void DestroyArray(void *p);
-
 /*
  * -----------------------------------------------------------------
  * Function : SUNDlsMat_AddIdentity
@@ -340,9 +304,6 @@ void DestroyArray(void *p);
 SUNDIALS_EXPORT
 void SUNDlsMat_AddIdentity(SUNDlsMat A);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_AddIdentity instead")
-void AddIdentity(DlsMat A);
-
 /*
  * -----------------------------------------------------------------
  * Function : SUNDlsMat_SetToZero
@@ -355,9 +316,6 @@ void AddIdentity(DlsMat A);
 SUNDIALS_EXPORT
 void SUNDlsMat_SetToZero(SUNDlsMat A);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_SetToZero instead")
-void SetToZero(DlsMat A);
-
 /*
  * -----------------------------------------------------------------
  * Functions: SUNDlsMat_PrintMat
@@ -373,9 +331,6 @@ void SetToZero(DlsMat A);
 SUNDIALS_EXPORT
 void SUNDlsMat_PrintMat(SUNDlsMat A, FILE *outfile);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_PrintMat")
-void PrintMat(DlsMat A, FILE *outfile);
-
 /*
  * ==================================================================
  * Exported function prototypes (functions working on realtype**)
@@ -385,47 +340,26 @@ void PrintMat(DlsMat A, FILE *outfile);
 SUNDIALS_EXPORT
 realtype** SUNDlsMat_newDenseMat(sunindextype m, sunindextype n);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_newDenseMat instead")
-realtype** newDenseMat(sunindextype m, sunindextype n);
-
 SUNDIALS_EXPORT
 realtype** SUNDlsMat_newBandMat(sunindextype n, sunindextype smu,
                                 sunindextype ml);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_newBandMat instead")
-realtype** newBandMat(sunindextype n, sunindextype smu,
-                      sunindextype ml);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_destroyMat(realtype** a);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_destroyMat instead")
-void destroyMat(realtype** a);
-
 SUNDIALS_EXPORT
 int* SUNDlsMat_newIntArray(int n);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_newIntArray instead")
-int* newIntArray(int n);
-
 SUNDIALS_EXPORT
 sunindextype* SUNDlsMat_newIndexArray(sunindextype n);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_newIndexArray instead")
-sunindextype* newIndexArray(sunindextype n);
-
 SUNDIALS_EXPORT
 realtype* SUNDlsMat_newRealArray(sunindextype m);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_newRealArray instead")
-  realtype* newRealArray(sunindextype m);
-
 SUNDIALS_EXPORT
 void SUNDlsMat_destroyArray(void* v);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNDlsMat_destroyArray instead")
-void destroyArray(void* v);
-
 
 #ifdef __cplusplus
 }
diff --git a/include/sundials/sundials_iterative.h b/include/sundials/sundials_iterative.h
index 80cf17ab75..ba909df174 100644
--- a/include/sundials/sundials_iterative.h
+++ b/include/sundials/sundials_iterative.h
@@ -51,11 +51,6 @@ extern "C" {
  * -----------------------------------------------------------------
  */
 
-/* DEPRECATED PREC_NONE: use SUN_PREC_NONE */
-/* DEPRECATED PREC_LEFT: use SUN_PREC_LEFT */
-/* DEPRECATED PREC_RIGHT: use SUN_PREC_RIGHT */
-/* DEPRECATED PREC_BOTH: use SUN_PREC_BOTH */
-enum { PREC_NONE, PREC_LEFT, PREC_RIGHT, PREC_BOTH };
 enum { SUN_PREC_NONE, SUN_PREC_LEFT, SUN_PREC_RIGHT, SUN_PREC_BOTH };
 
 /*
@@ -72,9 +67,6 @@ enum { SUN_PREC_NONE, SUN_PREC_LEFT, SUN_PREC_RIGHT, SUN_PREC_BOTH };
  * -----------------------------------------------------------------
  */
 
-/* DEPRECATED MODIFIED_GS: use SUN_MODIFIED_GS */
-/* DEPRECATED CLASSICAL_GS: use SUN_CLASSICAL_GS */
-enum { MODIFIED_GS = 1, CLASSICAL_GS = 2 };
 enum { SUN_MODIFIED_GS = 1, SUN_CLASSICAL_GS = 2 };
 
 /*
@@ -90,8 +82,6 @@ enum { SUN_MODIFIED_GS = 1, SUN_CLASSICAL_GS = 2 };
  * -----------------------------------------------------------------
  */
 
-/* DEPRECATED ATimesFn: use SUNATimesFn */
-typedef int (*ATimesFn)(void *A_data, N_Vector v, N_Vector z);
 typedef int (*SUNATimesFn)(void *A_data, N_Vector v, N_Vector z);
 
 /*
@@ -104,8 +94,6 @@ typedef int (*SUNATimesFn)(void *A_data, N_Vector v, N_Vector z);
  * -----------------------------------------------------------------
  */
 
-/* DEPRECATED PSetupFn: use SUNPSetupFn */
-typedef int (*PSetupFn)(void *P_data);
 typedef int (*SUNPSetupFn)(void *P_data);
 
 /*
@@ -134,9 +122,6 @@ typedef int (*SUNPSetupFn)(void *P_data);
  * -----------------------------------------------------------------
  */
 
-/* DEPRECATED PSolveFn: use SUNPSolveFn */
-typedef int (*PSolveFn)(void *P_data, N_Vector r, N_Vector z,
-                        realtype tol, int lr);
 typedef int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z,
                            realtype tol, int lr);
 
@@ -207,10 +192,6 @@ SUNDIALS_EXPORT
 int SUNModifiedGS(N_Vector* v, realtype **h, int k, int p,
                   realtype *new_vk_norm);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNModifiedGS instead")
-int ModifiedGS(N_Vector* v, realtype **h, int k, int p,
-               realtype *new_vk_norm);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNClassicalGS
@@ -236,11 +217,6 @@ int SUNClassicalGS(N_Vector* v, realtype **h, int k, int p,
                    realtype *new_vk_norm, realtype *stemp,
                    N_Vector* vtemp);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNClassicalGS instead")
-int ClassicalGS(N_Vector* v, realtype **h, int k, int p,
-                realtype *new_vk_norm, realtype *stemp,
-                N_Vector* vtemp);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNQRfact
@@ -276,9 +252,6 @@ int ClassicalGS(N_Vector* v, realtype **h, int k, int p,
 SUNDIALS_EXPORT
 int SUNQRfact(int n, realtype **h, realtype *q, int job);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNQRFact instead")
-int QRfact(int n, realtype **h, realtype *q, int job);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNQRsol
@@ -314,9 +287,6 @@ int QRfact(int n, realtype **h, realtype *q, int job);
 SUNDIALS_EXPORT
 int SUNQRsol(int n, realtype **h, realtype *q, realtype *b);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNQRsol instead")
-int QRsol(int n, realtype **h, realtype *q, realtype *b);
-
 /*
  * -----------------------------------------------------------------
  * Function: SUNQRAdd_MGS
diff --git a/include/sundials/sundials_lapack.h b/include/sundials/sundials_lapack.h
deleted file mode 100644
index b7e6ef0cd4..0000000000
--- a/include/sundials/sundials_lapack.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer: Radu Serban @ LLNL
- *             Daniel Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * This is the header file for a generic package of direct matrix
- * operations for use with BLAS/LAPACK.
- * -----------------------------------------------------------------*/
-
-#ifndef _SUNDIALS_LAPACK_H
-#define _SUNDIALS_LAPACK_H
-
-#include <sundials/sundials_types.h>
-
-#warning "This header file is deprecated and will be removed in SUNDIALS v7.0.0"
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*
- * ==================================================================
- * Blas and Lapack functions
- * ==================================================================
- */
-
-#if defined(SUNDIALS_F77_FUNC)
-
-#define dcopy_f77       SUNDIALS_F77_FUNC(dcopy, DCOPY)
-#define dscal_f77       SUNDIALS_F77_FUNC(dscal, DSCAL)
-#define dgemv_f77       SUNDIALS_F77_FUNC(dgemv, DGEMV)
-#define dtrsv_f77       SUNDIALS_F77_FUNC(dtrsv, DTRSV)
-#define dsyrk_f77       SUNDIALS_F77_FUNC(dsyrk, DSKYR)
-
-#define dgbtrf_f77      SUNDIALS_F77_FUNC(dgbtrf, DGBTRF)
-#define dgbtrs_f77      SUNDIALS_F77_FUNC(dgbtrs, DGBTRS)
-#define dgetrf_f77      SUNDIALS_F77_FUNC(dgetrf, DGETRF)
-#define dgetrs_f77      SUNDIALS_F77_FUNC(dgetrs, DGETRS)
-#define dgeqp3_f77      SUNDIALS_F77_FUNC(dgeqp3, DGEQP3)
-#define dgeqrf_f77      SUNDIALS_F77_FUNC(dgeqrf, DGEQRF)
-#define dormqr_f77      SUNDIALS_F77_FUNC(dormqr, DORMQR)
-#define dpotrf_f77      SUNDIALS_F77_FUNC(dpotrf, DPOTRF)
-#define dpotrs_f77      SUNDIALS_F77_FUNC(dpotrs, DPOTRS)
-
-#define scopy_f77       SUNDIALS_F77_FUNC(scopy, SCOPY)
-#define sscal_f77       SUNDIALS_F77_FUNC(sscal, SSCAL)
-#define sgemv_f77       SUNDIALS_F77_FUNC(sgemv, SGEMV)
-#define strsv_f77       SUNDIALS_F77_FUNC(strsv, STRSV)
-#define ssyrk_f77       SUNDIALS_F77_FUNC(ssyrk, SSKYR)
-
-#define sgbtrf_f77      SUNDIALS_F77_FUNC(sgbtrf, SGBTRF)
-#define sgbtrs_f77      SUNDIALS_F77_FUNC(sgbtrs, SGBTRS)
-#define sgetrf_f77      SUNDIALS_F77_FUNC(sgetrf, SGETRF)
-#define sgetrs_f77      SUNDIALS_F77_FUNC(sgetrs, SGETRS)
-#define sgeqp3_f77      SUNDIALS_F77_FUNC(sgeqp3, SGEQP3)
-#define sgeqrf_f77      SUNDIALS_F77_FUNC(sgeqrf, SGEQRF)
-#define sormqr_f77      SUNDIALS_F77_FUNC(sormqr, SORMQR)
-#define spotrf_f77      SUNDIALS_F77_FUNC(spotrf, SPOTRF)
-#define spotrs_f77      SUNDIALS_F77_FUNC(spotrs, SPOTRS)
-
-#else
-
-#define dcopy_f77       dcopy_
-#define dscal_f77       dscal_
-#define dgemv_f77       dgemv_
-#define dtrsv_f77       dtrsv_
-#define dsyrk_f77       dsyrk_
-
-#define dgbtrf_f77      dgbtrf_
-#define dgbtrs_f77      dgbtrs_
-#define dgeqp3_f77      dgeqp3_
-#define dgeqrf_f77      dgeqrf_
-#define dgetrf_f77      dgetrf_
-#define dgetrs_f77      dgetrs_
-#define dormqr_f77      dormqr_
-#define dpotrf_f77      dpotrf_
-#define dpotrs_f77      dpotrs_
-
-#define scopy_f77       scopy_
-#define sscal_f77       sscal_
-#define sgemv_f77       sgemv_
-#define strsv_f77       strsv_
-#define ssyrk_f77       ssyrk_
-
-#define sgbtrf_f77      sgbtrf_
-#define sgbtrs_f77      sgbtrs_
-#define sgeqp3_f77      sgeqp3_
-#define sgeqrf_f77      sgeqrf_
-#define sgetrf_f77      sgetrf_
-#define sgetrs_f77      sgetrs_
-#define sormqr_f77      sormqr_
-#define spotrf_f77      spotrf_
-#define spotrs_f77      spotrs_
-
-#endif
-
-/* Level-1 BLAS */
-
-extern void dcopy_f77(sunindextype *n, const double *x,
-                      const sunindextype *inc_x, double *y,
-                      const sunindextype *inc_y);
-
-extern void dscal_f77(sunindextype *n, const double *alpha, double *x,
-                      const sunindextype *inc_x);
-
-extern void scopy_f77(sunindextype *n, const float *x,
-                      const sunindextype *inc_x, float *y,
-                      const sunindextype *inc_y);
-
-extern void sscal_f77(sunindextype *n, const float *alpha, float *x,
-                      const sunindextype *inc_x);
-
-/* Level-2 BLAS */
-
-extern void dgemv_f77(const char *trans, sunindextype *m, sunindextype *n,
-                      const double *alpha, const double *a, sunindextype *lda,
-                      const double *x, sunindextype *inc_x, const double *beta,
-                      double *y, sunindextype *inc_y);
-
-extern void dtrsv_f77(const char *uplo, const char *trans, const char *diag,
-                      const sunindextype *n, const double *a,
-                      const sunindextype *lda, double *x,
-                      const sunindextype *inc_x);
-
-extern void sgemv_f77(const char *trans, sunindextype *m, sunindextype *n,
-                      const float *alpha, const float *a, sunindextype *lda,
-                      const float *x, sunindextype *inc_x, const float *beta,
-                      float *y, sunindextype *inc_y);
-
-extern void strsv_f77(const char *uplo, const char *trans, const char *diag,
-                      const sunindextype *n, const float *a,
-                      const sunindextype *lda, float *x,
-                      const sunindextype *inc_x);
-
-/* Level-3 BLAS */
-
-extern void dsyrk_f77(const char *uplo, const char *trans,
-                      const sunindextype *n, const sunindextype *k,
-                      const double *alpha, const double *a,
-                      const sunindextype *lda, const double *beta,
-                      const double *c, const sunindextype *ldc);
-
-extern void ssyrk_f77(const char *uplo, const char *trans,
-                      const sunindextype *n, const sunindextype *k,
-                      const float *alpha, const float *a,
-                      const sunindextype *lda, const float *beta,
-                      const float *c, const sunindextype *ldc);
-
-/* LAPACK */
-
-extern void dgbtrf_f77(const sunindextype *m, const sunindextype *n,
-                       const sunindextype *kl, const sunindextype *ku,
-                       double *ab, sunindextype *ldab, sunindextype *ipiv,
-                       sunindextype *info);
-
-extern void dgbtrs_f77(const char *trans, const sunindextype *n,
-                       const sunindextype *kl, const sunindextype *ku,
-                       const sunindextype *nrhs, double *ab,
-                       const sunindextype *ldab, sunindextype *ipiv,
-                       double *b, const sunindextype *ldb, sunindextype *info);
-
-
-extern void dgeqp3_f77(const sunindextype *m, const sunindextype *n, double *a,
-                       const sunindextype *lda, sunindextype *jpvt, double *tau,
-                       double *work, const sunindextype *lwork,
-                       sunindextype *info);
-
-extern void dgeqrf_f77(const sunindextype *m, const sunindextype *n, double *a,
-                       const sunindextype *lda, double *tau, double *work,
-                       const sunindextype *lwork, sunindextype *info);
-
-extern void dgetrf_f77(const sunindextype *m, const sunindextype *n, double *a,
-                       sunindextype *lda, sunindextype *ipiv,
-                       sunindextype *info);
-
-extern void dgetrs_f77(const char *trans, const sunindextype *n,
-                       const sunindextype *nrhs, double *a,
-                       const sunindextype *lda, sunindextype *ipiv, double *b,
-                       const sunindextype *ldb, sunindextype *info);
-
-
-extern void dormqr_f77(const char *side, const char *trans,
-                       const sunindextype *m, const sunindextype *n,
-                       const sunindextype *k, double *a,
-                       const sunindextype *lda, double *tau, double *c,
-                       const sunindextype *ldc, double *work,
-                       const sunindextype *lwork, sunindextype *info);
-
-extern void dpotrf_f77(const char *uplo, const sunindextype *n, double *a,
-                       sunindextype *lda, sunindextype *info);
-
-extern void dpotrs_f77(const char *uplo, const sunindextype *n,
-                       const sunindextype *nrhs, double *a,
-                       const sunindextype *lda, double *b,
-                       const sunindextype *ldb, sunindextype *info);
-
-
-extern void sgbtrf_f77(const sunindextype *m, const sunindextype *n,
-                       const sunindextype *kl, const sunindextype *ku,
-                       float *ab, sunindextype *ldab, sunindextype *ipiv,
-                       sunindextype *info);
-
-extern void sgbtrs_f77(const char *trans, const sunindextype *n,
-                       const sunindextype *kl, const sunindextype *ku,
-                       const sunindextype *nrhs, float *ab,
-                       const sunindextype *ldab, sunindextype *ipiv,
-                       float *b, const sunindextype *ldb, sunindextype *info);
-
-
-extern void sgeqp3_f77(const sunindextype *m, const sunindextype *n, float *a,
-                       const sunindextype *lda, sunindextype *jpvt, float *tau,
-                       float *work, const sunindextype *lwork,
-                       sunindextype *info);
-
-extern void sgeqrf_f77(const sunindextype *m, const sunindextype *n, float *a,
-                       const sunindextype *lda, float *tau, float *work,
-                       const sunindextype *lwork, sunindextype *info);
-
-extern void sgetrf_f77(const sunindextype *m, const sunindextype *n, float *a,
-                       sunindextype *lda, sunindextype *ipiv,
-                       sunindextype *info);
-
-extern void sgetrs_f77(const char *trans, const sunindextype *n,
-                       const sunindextype *nrhs, float *a,
-                       const sunindextype *lda, sunindextype *ipiv,
-                       float *b, const sunindextype *ldb, sunindextype *info);
-
-
-extern void sormqr_f77(const char *side, const char *trans,
-                       const sunindextype *m, const sunindextype *n,
-                       const sunindextype *k, float *a, const sunindextype *lda,
-                       float *tau, float *c, const sunindextype *ldc,
-                       float *work, const sunindextype *lwork,
-                       sunindextype *info);
-
-extern void spotrf_f77(const char *uplo, const sunindextype *n, float *a,
-                       sunindextype *lda, sunindextype *info);
-
-extern void spotrs_f77(const char *uplo, const sunindextype *n,
-                       const sunindextype *nrhs, float *a,
-                       const sunindextype *lda, float *b,
-                       const sunindextype *ldb, sunindextype *info);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/sunlinsol/sunlinsol_pcg.h b/include/sunlinsol/sunlinsol_pcg.h
index 3b748e813e..28e34ae6f9 100644
--- a/include/sunlinsol/sunlinsol_pcg.h
+++ b/include/sunlinsol/sunlinsol_pcg.h
@@ -105,11 +105,6 @@ SUNDIALS_EXPORT int SUNLinSolSpace_PCG(SUNLinearSolver S,
                                        long int *lenrwLS,
                                        long int *leniwLS);
 SUNDIALS_EXPORT int SUNLinSolFree_PCG(SUNLinearSolver S);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNLinSolSetInfoFile_PCG(SUNLinearSolver LS,
-                             FILE* info_file);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-int SUNLinSolSetPrintLevel_PCG(SUNLinearSolver LS, int print_level);
 
 #ifdef __cplusplus
 }
diff --git a/include/sunlinsol/sunlinsol_spbcgs.h b/include/sunlinsol/sunlinsol_spbcgs.h
index a257d850ee..f2caa1ba06 100644
--- a/include/sunlinsol/sunlinsol_spbcgs.h
+++ b/include/sunlinsol/sunlinsol_spbcgs.h
@@ -112,12 +112,6 @@ SUNDIALS_EXPORT int SUNLinSolSpace_SPBCGS(SUNLinearSolver S,
                                           long int *lenrwLS,
                                           long int *leniwLS);
 SUNDIALS_EXPORT int SUNLinSolFree_SPBCGS(SUNLinearSolver S);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNLinSolSetInfoFile_SPBCGS(SUNLinearSolver LS,
-                                FILE* info_file);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-int SUNLinSolSetPrintLevel_SPBCGS(SUNLinearSolver LS, int print_level);
-
 
 
 
diff --git a/include/sunlinsol/sunlinsol_spfgmr.h b/include/sunlinsol/sunlinsol_spfgmr.h
index 5814662e6d..39ba18027e 100644
--- a/include/sunlinsol/sunlinsol_spfgmr.h
+++ b/include/sunlinsol/sunlinsol_spfgmr.h
@@ -119,12 +119,6 @@ SUNDIALS_EXPORT int SUNLinSolSpace_SPFGMR(SUNLinearSolver S,
                                           long int *lenrwLS,
                                           long int *leniwLS);
 SUNDIALS_EXPORT int SUNLinSolFree_SPFGMR(SUNLinearSolver S);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNLinSolSetInfoFile_SPFGMR(SUNLinearSolver LS,
-                                FILE* info_file);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-int SUNLinSolSetPrintLevel_SPFGMR(SUNLinearSolver LS, int print_level);
-
 
 #ifdef __cplusplus
 }
diff --git a/include/sunlinsol/sunlinsol_spgmr.h b/include/sunlinsol/sunlinsol_spgmr.h
index 3fe7da9aee..807556b9a3 100644
--- a/include/sunlinsol/sunlinsol_spgmr.h
+++ b/include/sunlinsol/sunlinsol_spgmr.h
@@ -121,13 +121,6 @@ SUNDIALS_EXPORT int SUNLinSolSpace_SPGMR(SUNLinearSolver S,
                                          long int *lenrwLS,
                                          long int *leniwLS);
 SUNDIALS_EXPORT int SUNLinSolFree_SPGMR(SUNLinearSolver S);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNLinSolSetInfoFile_SPGMR(SUNLinearSolver LS,
-                               FILE* info_file);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-int SUNLinSolSetPrintLevel_SPGMR(SUNLinearSolver LS, int print_level);
-
-
 
 #ifdef __cplusplus
 }
diff --git a/include/sunlinsol/sunlinsol_sptfqmr.h b/include/sunlinsol/sunlinsol_sptfqmr.h
index 79f4f5f306..11355d15d9 100644
--- a/include/sunlinsol/sunlinsol_sptfqmr.h
+++ b/include/sunlinsol/sunlinsol_sptfqmr.h
@@ -112,12 +112,6 @@ SUNDIALS_EXPORT int SUNLinSolSpace_SPTFQMR(SUNLinearSolver S,
                                            long int *lenrwLS,
                                            long int *leniwLS);
 SUNDIALS_EXPORT int SUNLinSolFree_SPTFQMR(SUNLinearSolver S);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNLinSolSetInfoFile_SPTFQMR(SUNLinearSolver LS,
-                                 FILE* info_file);
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-int SUNLinSolSetPrintLevel_SPTFQMR(SUNLinearSolver LS, int print_level);
-
 
 #ifdef __cplusplus
 }
diff --git a/include/sunnonlinsol/sunnonlinsol_fixedpoint.h b/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
index 06c5f386a8..caaea50c20 100644
--- a/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
+++ b/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
@@ -122,15 +122,6 @@ SUNDIALS_EXPORT int SUNNonlinSolGetNumConvFails_FixedPoint(SUNNonlinearSolver NL
 SUNDIALS_EXPORT int SUNNonlinSolGetSysFn_FixedPoint(SUNNonlinearSolver NLS,
                                                     SUNNonlinSolSysFn *SysFn);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNNonlinSolSetInfoFile_FixedPoint(SUNNonlinearSolver NLS,
-                                       FILE* info_file);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-SUNDIALS_EXPORT int SUNNonlinSolSetPrintLevel_FixedPoint(SUNNonlinearSolver NLS,
-                                                         int print_level);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/sunnonlinsol/sunnonlinsol_newton.h b/include/sunnonlinsol/sunnonlinsol_newton.h
index 9f6333cb5c..d6bbe89d4f 100644
--- a/include/sunnonlinsol/sunnonlinsol_newton.h
+++ b/include/sunnonlinsol/sunnonlinsol_newton.h
@@ -113,15 +113,6 @@ SUNDIALS_EXPORT int SUNNonlinSolGetNumConvFails_Newton(SUNNonlinearSolver NLS,
 SUNDIALS_EXPORT int SUNNonlinSolGetSysFn_Newton(SUNNonlinearSolver NLS,
                                                 SUNNonlinSolSysFn *SysFn);
 
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger_SetInfoFilename instead")
-int SUNNonlinSolSetInfoFile_Newton(SUNNonlinearSolver NLS,
-                                   FILE* info_file);
-
-SUNDIALS_DEPRECATED_EXPORT_MSG("Use SUNLogger interface instead")
-SUNDIALS_EXPORT int SUNNonlinSolSetPrintLevel_Newton(SUNNonlinearSolver NLS,
-                                                     int print_level);
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/scripts/cpodes b/scripts/cpodes
deleted file mode 100755
index ccc4f2bcde..0000000000
--- a/scripts/cpodes
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-tarfile=$1
-distrobase=$2
-doc=$3
-
-shift 3
-tar=$*
-
-echo "   --- Add cpodes module to $tarfile"
-
-#if [ $doc = "T" ]; then
-#$tar $tarfile $distrobase/doc/cpodes/cps_guide.ps
-#$tar $tarfile $distrobase/doc/cpodes/cps_guide.pdf
-#$tar $tarfile $distrobase/doc/cpodes/cps_examples.ps
-#$tar $tarfile $distrobase/doc/cpodes/cps_examples.pdf
-#fi
-
-$tar $tarfile $distrobase/include/cpodes/cpodes.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_direct.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_dense.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_band.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_lapack.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_spgmr.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_spbcgs.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_sptfqmr.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_spils.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_bandpre.h
-$tar $tarfile $distrobase/include/cpodes/cpodes_bbdpre.h
-
-$tar $tarfile $distrobase/src/cpodes/LICENSE
-$tar $tarfile $distrobase/src/cpodes/NOTICE
-$tar $tarfile $distrobase/src/cpodes/README
-$tar $tarfile $distrobase/src/cpodes/CMakeLists.txt
-
-$tar $tarfile $distrobase/src/cpodes/cpodes.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_nls.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_proj.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_root.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_io.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_ic.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_direct.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_dense.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_band.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_lapack.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_spils.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_spgmr.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_spbcgs.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_sptfqmr.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_bandpre.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_bbdpre.c
-$tar $tarfile $distrobase/src/cpodes/cpodes_private.h
-$tar $tarfile $distrobase/src/cpodes/cpodes_impl.h
-$tar $tarfile $distrobase/src/cpodes/cpodes_direct_impl.h
-$tar $tarfile $distrobase/src/cpodes/cpodes_spils_impl.h
-$tar $tarfile $distrobase/src/cpodes/cpodes_bandpre_impl.h
-$tar $tarfile $distrobase/src/cpodes/cpodes_bbdpre_impl.h
-
-echo "   --- Add cpodes examples to $tarfile"
-
-$tar $tarfile $distrobase/examples/cpodes/CMakeLists.txt
-
-$tar $tarfile $distrobase/examples/cpodes/serial/README
-$tar $tarfile $distrobase/examples/cpodes/serial/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsAdvDiff_bnd.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsAdvDiff_bndL.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsAdvDiff_non.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsAkzoNob_dnsL.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsNewtCrd_dns.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsPend_dns.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsPend_dnsL.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsRoberts_dns.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsRoberts_dnsL.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsSlCrank_dns.c
-$tar $tarfile $distrobase/examples/cpodes/serial/cpsVanDPol_non.c
-
-$tar $tarfile $distrobase/examples/cpodes/parallel/README
-$tar $tarfile $distrobase/examples/cpodes/parallel/CMakeLists.txt
-$tar $tarfile $distrobase/examples/cpodes/parallel/cpsHeat2D_kry_bbd_p.c
-$tar $tarfile $distrobase/examples/cpodes/parallel/cpsHeat2D_kry_bbd_p.out
-
diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c
index c191270ec2..2a910b107d 100644
--- a/src/arkode/arkode.c
+++ b/src/arkode/arkode.c
@@ -102,10 +102,6 @@ ARKodeMem arkCreate(SUNContext sunctx)
   ark_mem->relax_enabled = SUNFALSE;
   ark_mem->relax_mem     = NULL;
 
-  /* Initialize diagnostics reporting variables */
-  ark_mem->report  = SUNFALSE;
-  ark_mem->diagfp  = NULL;
-
   /* Initialize lrw and liw */
   ark_mem->lrw = 18;
   ark_mem->liw = 41;  /* fcn/data ptr, int, long int, sunindextype, booleantype */
@@ -856,8 +852,8 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
       attempts++;
       ark_mem->nst_attempts++;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-      SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+      SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                          "ARKODE::arkEvolve", "start-step",
                          "step = %li, attempt = %i, h = %"RSYM", tcur = %"RSYM,
                          ark_mem->nst, attempts, ark_mem->h, ark_mem->tcur);
@@ -1435,7 +1431,6 @@ void arkPrintMem(ARKodeMem ark_mem, FILE *outfile)
   fprintf(outfile, "tstopset = %i\n", ark_mem->tstopset);
   fprintf(outfile, "tstopinterp = %i\n", ark_mem->tstopinterp);
   fprintf(outfile, "tstop = %" RSYM"\n", ark_mem->tstop);
-  fprintf(outfile, "report = %i\n", ark_mem->report);
   fprintf(outfile, "VabstolMallocDone = %i\n", ark_mem->VabstolMallocDone);
   fprintf(outfile, "MallocDone = %i\n", ark_mem->MallocDone);
   fprintf(outfile, "initsetup = %i\n", ark_mem->initsetup);
@@ -2481,8 +2476,8 @@ int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
       ark_mem->tcur = ark_mem->tstop;
   }
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::arkCompleteStep", "end-step",
                      "step = %li, h = %"RSYM", tcur = %"RSYM,
                      ark_mem->nst, ark_mem->h, ark_mem->tcur);
diff --git a/src/arkode/arkode_adapt.c b/src/arkode/arkode_adapt.c
index afe0dfe61b..d18cdf5d5a 100644
--- a/src/arkode/arkode_adapt.c
+++ b/src/arkode/arkode_adapt.c
@@ -152,10 +152,6 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
   /* enforce minimum bound time step reduction */
   h_acc = int_dir * SUNMAX(SUNRabs(h_acc), SUNRabs(hadapt_mem->etamin*hcur));
 
-  /* Solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "%"RSYM"  %"RSYM"  ", h_acc, h_cfl);
-
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
                      "ARKODE::arkAdapt", "new-step-after-max-min-bounds",
@@ -187,12 +183,8 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
   ark_mem->eta /= SUNMAX(ONE, SUNRabs(hcur) *
                          ark_mem->hmax_inv*ark_mem->eta);
 
-  /* Solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "%"RSYM"\n", ark_mem->eta);
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO, "ARKODE::arkAdapt",
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG, "ARKODE::arkAdapt",
                      "new-step-eta", "eta = %"RSYM, ark_mem->eta);
 #endif
 
diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c
index a3d22e2dee..b1ea90d03f 100644
--- a/src/arkode/arkode_arkstep.c
+++ b/src/arkode/arkode_arkstep.c
@@ -1268,12 +1268,6 @@ int arkStep_Init(void* arkode_mem, int init_type)
         return (ARK_ILL_INPUT);
       }
     }
-
-    /* If configured with either predictor 4 or 5 and a non-identity mass
-       matrix, reset to trivial predictor */
-    if (step_mem->mass_type != MASS_IDENTITY)
-      if ((step_mem->predictor == 4) || (step_mem->predictor == 5))
-        step_mem->predictor = 0;
   }
 
   /* set appropriate TakeStep routine based on problem configuration */
@@ -1883,8 +1877,8 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
     else
       ark_mem->tcur = ark_mem->tn + step_mem->Be->c[is]*ark_mem->h;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::arkStep_TakeStep_Z", "start-stage",
                        "step = %li, stage = %i, implicit = %i, h = %"RSYM", tcur = %"RSYM,
                        ark_mem->nst, is, implicit_stage, ark_mem->h, ark_mem->tcur);
@@ -1935,11 +1929,6 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
     N_VPrintFile(step_mem->sdata, ARK_LOGGER->debug_fp);
 #endif
 
-    /* solver diagnostics reporting */
-    if (ark_mem->report)
-      fprintf(ark_mem->diagfp, "ARKStep  step  %li  %"RSYM"  %i  %"RSYM"\n",
-              ark_mem->nst, ark_mem->h, is, ark_mem->tcur);
-
     /* perform implicit solve if required */
     if (implicit_stage) {
 
@@ -2088,11 +2077,6 @@ int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
   N_VPrintFile(ark_mem->ycur, ARK_LOGGER->debug_fp);
 #endif
 
-  /* solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "ARKStep  etest  %li  %"RSYM"  %"RSYM"\n",
-            ark_mem->nst, ark_mem->h, *dsmPtr);
-
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
                      "ARKODE::arkStep_TakeStep_Z", "end-step",
@@ -2742,28 +2726,6 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
       ONE : step_mem->gamma / step_mem->gammap;  /* protect x/x != 1.0 */
   }
 
-  /* If predictor==5, then sdata=0 (plus any implicit forcing).
-     Set sdata appropriately and return */
-  if (implicit && (step_mem->predictor == 5)) {
-
-    /* apply external polynomial forcing (updates nvec, cvals, Xvecs) */
-    if (step_mem->impforcing) {
-      nvec = 0;
-
-      step_mem->stage_times[0] = ark_mem->tcur;
-      step_mem->stage_coefs[0] = step_mem->gamma;
-
-      arkStep_ApplyForcing(step_mem, step_mem->stage_times,
-                           step_mem->stage_coefs, 1, &nvec);
-      retval = N_VLinearCombination(nvec, cvals, Xvecs, step_mem->sdata);
-      if (retval != 0) return(ARK_VECTOROP_ERR);
-    } else {
-      N_VConst(ZERO, step_mem->sdata);
-    }
-    return (ARK_SUCCESS);
-
-  }
-
   /* If implicit, initialize sdata to yn - zpred (here: zpred = zp), and set
      first entries for eventual N_VLinearCombination call */
   nvec = 0;
diff --git a/src/arkode/arkode_arkstep_io.c b/src/arkode/arkode_arkstep_io.c
index 5925b29582..1452669fbb 100644
--- a/src/arkode/arkode_arkstep_io.c
+++ b/src/arkode/arkode_arkstep_io.c
@@ -44,8 +44,6 @@ int ARKStepSetErrHandlerFn(void *arkode_mem, ARKErrHandlerFn ehfun,
   return(arkSetErrHandlerFn(arkode_mem, ehfun, eh_data)); }
 int ARKStepSetErrFile(void *arkode_mem, FILE *errfp) {
   return(arkSetErrFile(arkode_mem, errfp)); }
-int ARKStepSetDiagnostics(void *arkode_mem, FILE *diagfp) {
-  return(arkSetDiagnostics(arkode_mem, diagfp)); }
 int ARKStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int ARKStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
@@ -1456,16 +1454,6 @@ int ARKStepSetPredictorMethod(void *arkode_mem, int pred_method)
     return(ARK_ILL_INPUT);
   }
 
-  /* Deprecate options 4 and 5 */
-  if (pred_method == 4) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep", "ARKStepSetPredictorMethod",
-                    "Predictor option 4 is deprecated, and will be removed in an upcoming release");
-  }
-  if (pred_method == 5) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep", "ARKStepSetPredictorMethod",
-                    "Predictor option 5 is deprecated, and will be removed in an upcoming release");
-  }
-
   /* set parameter */
   step_mem->predictor = pred_method;
 
@@ -1564,14 +1552,6 @@ int ARKStepSetStagePredictFn(void *arkode_mem,
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS) return(retval);
 
-  /* override predictor method 5 if non-NULL PredictStage is supplied */
-  if ((step_mem->predictor == 5) && (PredictStage != NULL)) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::ARKStep",
-                    "ARKStepSetStagePredictFn",
-                    "User-supplied predictor is incompatible with predictor method 5");
-    return(ARK_ILL_INPUT);
-  }
-
   step_mem->stage_predict = PredictStage;
   return(ARK_SUCCESS);
 }
diff --git a/src/arkode/arkode_erkstep.c b/src/arkode/arkode_erkstep.c
index 4f1265358b..78aec3331a 100644
--- a/src/arkode/arkode_erkstep.c
+++ b/src/arkode/arkode_erkstep.c
@@ -764,8 +764,8 @@ int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
   cvals = step_mem->cvals;
   Xvecs = step_mem->Xvecs;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::erkStep_TakeStep", "start-stage",
                      "step = %li, stage = 0, h = %"RSYM", tcur = %"RSYM,
                      ark_mem->nst, ark_mem->h, ark_mem->tcur);
@@ -804,13 +804,8 @@ int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
     /* Set current stage time(s) */
     ark_mem->tcur = ark_mem->tn + step_mem->B->c[is]*ark_mem->h;
 
-    /* Solver diagnostics reporting */
-    if (ark_mem->report)
-      fprintf(ark_mem->diagfp, "ERKStep  step  %li  %"RSYM"  %i  %"RSYM"\n",
-              ark_mem->nst, ark_mem->h, is, ark_mem->tcur);
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::erkStep_TakeStep", "start-stage",
                        "step = %li, stage = %i, h = %"RSYM", tcur = %"RSYM,
                        ark_mem->nst, is, ark_mem->h, ark_mem->tcur);
@@ -866,13 +861,8 @@ int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
   N_VPrintFile(ark_mem->ycur, ARK_LOGGER->debug_fp);
 #endif
 
-  /* Solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "ERKStep  etest  %li  %"RSYM"  %"RSYM"\n",
-            ark_mem->nst, ark_mem->h, *dsmPtr);
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::erkStep_TakeStep", "error-test",
                      "step = %li, h = %"RSYM", dsm = %"RSYM,
                      ark_mem->nst, ark_mem->h, *dsmPtr);
diff --git a/src/arkode/arkode_erkstep_io.c b/src/arkode/arkode_erkstep_io.c
index bfdf929f3e..7a3f9dbc54 100644
--- a/src/arkode/arkode_erkstep_io.c
+++ b/src/arkode/arkode_erkstep_io.c
@@ -45,8 +45,6 @@ int ERKStepSetErrFile(void *arkode_mem, FILE *errfp) {
   return(arkSetErrFile(arkode_mem, errfp)); }
 int ERKStepSetUserData(void *arkode_mem, void *user_data) {
   return(arkSetUserData(arkode_mem, user_data)); }
-int ERKStepSetDiagnostics(void *arkode_mem, FILE *diagfp) {
-  return(arkSetDiagnostics(arkode_mem, diagfp)); }
 int ERKStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int ERKStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
index 6cd8b85c25..596d3202a5 100644
--- a/src/arkode/arkode_impl.h
+++ b/src/arkode/arkode_impl.h
@@ -390,10 +390,6 @@ struct ARKodeMemRec
   long int netf;          /* num error test failures                    */
   long int nconstrfails;  /* number of constraint failures              */
 
-  /* Diagnostic output */
-  booleantype report;   /* flag to enable/disable diagnostic output    */
-  FILE       *diagfp;   /* diagnostic outputs are sent to diagfp   */
-
   /* Space requirements for ARKODE */
   sunindextype lrw1;        /* no. of realtype words in 1 N_Vector          */
   sunindextype liw1;        /* no. of integer words in 1 N_Vector           */
@@ -1010,7 +1006,6 @@ int arkSetErrHandlerFn(void *arkode_mem,
                        void *eh_data);
 int arkSetErrFile(void *arkode_mem, FILE *errfp);
 int arkSetUserData(void *arkode_mem, void *user_data);
-int arkSetDiagnostics(void *arkode_mem, FILE *diagfp);
 int arkSetMaxNumSteps(void *arkode_mem, long int mxsteps);
 int arkSetMaxHnilWarns(void *arkode_mem, int mxhnil);
 int arkSetInitStep(void *arkode_mem, realtype hin);
diff --git a/src/arkode/arkode_interp.c b/src/arkode/arkode_interp.c
index 9854194c3f..542126463a 100644
--- a/src/arkode/arkode_interp.c
+++ b/src/arkode/arkode_interp.c
@@ -497,8 +497,8 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
   q = SUNMAX(order, 0);                 /* respect lower bound  */
   q = SUNMIN(q, HINT_DEGREE(interp));   /* respect max possible */
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::arkInterpEvaluate_Hermite", "interp-eval",
                      "tau = %"RSYM", d = %i, q = %i", tau, d, q);
 #endif
@@ -1185,8 +1185,8 @@ int arkInterpEvaluate_Lagrange(void* arkode_mem, ARKInterp I,
   q = SUNMAX(degree, 0);    /* respect lower bound */
   q = SUNMIN(q, nhist-1);   /* respect max possible */
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::arkInterpEvaluate_Lagrange", "interp-eval",
                      "tau = %"RSYM", d = %i, q = %i", tau, deriv, q);
 #endif
diff --git a/src/arkode/arkode_io.c b/src/arkode/arkode_io.c
index cc45123175..fe6bd4c5b1 100644
--- a/src/arkode/arkode_io.c
+++ b/src/arkode/arkode_io.c
@@ -86,8 +86,6 @@ int arkSetDefaults(void *arkode_mem)
   ark_mem->tstopset                = SUNFALSE;       /* no stop time set */
   ark_mem->tstopinterp             = SUNFALSE;       /* copy at stop time */
   ark_mem->tstop                   = ZERO;           /* no fixed stop time */
-  ark_mem->diagfp                  = NULL;           /* no solver diagnostics file */
-  ark_mem->report                  = SUNFALSE;       /* don't report solver diagnostics */
   ark_mem->hadapt_mem->etamx1      = ETAMX1;         /* max change on first step */
   ark_mem->hadapt_mem->etamxf      = ETAMXF;         /* max change on error-failed step */
   ark_mem->hadapt_mem->etamin      = ETAMIN;         /* min bound on time step reduction */
@@ -309,33 +307,6 @@ int arkSetUserData(void *arkode_mem, void *user_data)
   return(ARK_SUCCESS);
 }
 
-
-/*---------------------------------------------------------------
-  arkSetDiagnostics:
-
-  Specifies to enable solver diagnostics, and specifies the FILE
-  pointer for output (diagfp==NULL disables output)
-  ---------------------------------------------------------------*/
-int arkSetDiagnostics(void *arkode_mem, FILE *diagfp)
-{
-  ARKodeMem ark_mem;
-  if (arkode_mem==NULL) {
-    arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
-                    "arkSetDiagnostics", MSG_ARK_NO_MEM);
-    return(ARK_MEM_NULL);
-  }
-  ark_mem = (ARKodeMem) arkode_mem;
-  ark_mem->diagfp = diagfp;
-  if (diagfp != NULL) {
-    ark_mem->report = SUNTRUE;
-  } else {
-    ark_mem->report = SUNFALSE;
-  }
-
-  return(ARK_SUCCESS);
-}
-
-
 /*---------------------------------------------------------------
   arkSetAdaptController:
 
diff --git a/src/arkode/arkode_ls.c b/src/arkode/arkode_ls.c
index 71c05682a6..bd6749d401 100644
--- a/src/arkode/arkode_ls.c
+++ b/src/arkode/arkode_ls.c
@@ -2731,15 +2731,15 @@ int arkLsSolve(void* arkode_mem, N_Vector b, realtype tnow,
   if (retval != SUNLS_SUCCESS) arkls_mem->ncfl++;
 
   /* Log solver statistics to diagnostics file (if requested) */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "ARKLS  kry  %"RSYM"  %"RSYM"  %i  %i\n",
-            bnorm, resnorm, nli_inc, (int) (arkls_mem->nps - nps_inc));
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO, "ARKODE::arkLsSolve",
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG, "ARKODE::arkLsSolve",
                      "ls-stats", "bnorm = %"RSYM", resnorm = %"RSYM
                      ", ls_iters = %i, prec_solves = %i",
                      bnorm, resnorm, nli_inc, (int) (arkls_mem->nps - nps_inc));
+#else
+  /* Suppress warning about set but unused variables due to logging ifdef. */
+  (void) nps_inc;
+  (void) resnorm;
 #endif
 
   /* Interpret solver return value  */
@@ -3150,15 +3150,15 @@ int arkLsMassSolve(void *arkode_mem, N_Vector b, realtype nlscoef)
   if (retval != SUNLS_SUCCESS) arkls_mem->ncfl++;
 
   /* Log solver statistics to diagnostics file (if requested) */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "ARKLS  mass  %"RSYM"  %i  %i\n",
-            resnorm, nli_inc, (int) (arkls_mem->nps - nps_inc));
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::arkLsMassSolve", "mass-ls-stats",
                      "resnorm = %"RSYM", ls_iters = %i, prec_solves = %i",
                      resnorm, nli_inc, (int) (arkls_mem->nps - nps_inc));
+#else
+  /* Suppress warning about set but unused variables due to logging ifdef. */
+  (void) nps_inc;
+  (void) resnorm;
 #endif
 
   /* Interpret solver return value  */
diff --git a/src/arkode/arkode_mristep.c b/src/arkode/arkode_mristep.c
index f6af65c193..e6d32c65b3 100644
--- a/src/arkode/arkode_mristep.c
+++ b/src/arkode/arkode_mristep.c
@@ -1569,12 +1569,8 @@ int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
     ark_mem->tcur = ark_mem->tn + step_mem->MRIC->c[is]*ark_mem->h;
 
     /* Solver diagnostics reporting */
-    if (ark_mem->report)
-      fprintf(ark_mem->diagfp, "MRIStep  step  %li  %"RSYM"  %i  %"RSYM"\n",
-              ark_mem->nst, ark_mem->h, is, ark_mem->tcur);
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::mriStep_TakeStep", "start-stage",
                        "step = %li, stage = %i, stage type = %d, h = %"RSYM", tcur = %"RSYM,
                        ark_mem->nst, is, step_mem->stagetypes[is], ark_mem->h, ark_mem->tcur);
@@ -1679,12 +1675,8 @@ int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
 #endif
 
   /* Solver diagnostics reporting */
-  if (ark_mem->report)
-    fprintf(ark_mem->diagfp, "MRIStep  etest  %li  %"RSYM"  %"RSYM"\n",
-            ark_mem->nst, ark_mem->h, *dsmPtr);
-
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::mriStep_TakeStep", "error-test",
                      "step = %li, h = %"RSYM", dsm = %"RSYM,
                      ark_mem->nst, ark_mem->h, *dsmPtr);
@@ -2810,7 +2802,7 @@ int mriStepInnerStepper_Evolve(MRIStepInnerStepper stepper,
   if (stepper->ops == NULL) return ARK_ILL_INPUT;
   if (stepper->ops->evolve == NULL) return ARK_ILL_INPUT;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
   SUNLogger_QueueMsg(stepper->sunctx->logger, SUN_LOGLEVEL_INFO,
                      "ARKODE::mriStepInnerStepper_Evolve", "start-inner-evolve",
                      "t0 = %"RSYM", tout = %"RSYM, t0, tout);
@@ -2818,7 +2810,7 @@ int mriStepInnerStepper_Evolve(MRIStepInnerStepper stepper,
 
   stepper->last_flag = stepper->ops->evolve(stepper, t0, tout, y);
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
   SUNLogger_QueueMsg(stepper->sunctx->logger, SUN_LOGLEVEL_INFO,
                      "ARKODE::mriStepInnerStepper_Evolve", "end-inner-evolve",
                      "flag = %i", stepper->last_flag);
@@ -2851,7 +2843,7 @@ int mriStepInnerStepper_Reset(MRIStepInnerStepper stepper,
   if (stepper == NULL) return ARK_ILL_INPUT;
   if (stepper->ops == NULL) return ARK_ILL_INPUT;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
   SUNLogger_QueueMsg(stepper->sunctx->logger, SUN_LOGLEVEL_INFO,
                      "ARKODE::mriStepInnerStepper_Reset", "reset-inner-state",
                      "tR = %"RSYM, tR);
diff --git a/src/arkode/arkode_mristep_io.c b/src/arkode/arkode_mristep_io.c
index 5c6ced636e..da5a76442b 100644
--- a/src/arkode/arkode_mristep_io.c
+++ b/src/arkode/arkode_mristep_io.c
@@ -40,8 +40,6 @@ int MRIStepSetErrHandlerFn(void *arkode_mem, ARKErrHandlerFn ehfun,
   return(arkSetErrHandlerFn(arkode_mem, ehfun, eh_data)); }
 int MRIStepSetErrFile(void *arkode_mem, FILE *errfp) {
   return(arkSetErrFile(arkode_mem, errfp)); }
-int MRIStepSetDiagnostics(void *arkode_mem, FILE *diagfp) {
-  return(arkSetDiagnostics(arkode_mem, diagfp)); }
 int MRIStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int MRIStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
@@ -600,12 +598,6 @@ int MRIStepSetPredictorMethod(void *arkode_mem, int pred_method)
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS)  return(retval);
 
-  /* Deprecate option 4 */
-  if (pred_method == 4) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::MRIStep", "MRIStepSetPredictorMethod",
-                    "Predictor option 4 is deprecated, and will be removed in an upcoming release");
-  }
-
   /* set parameter */
   step_mem->predictor = pred_method;
 
@@ -704,14 +696,6 @@ int MRIStepSetStagePredictFn(void *arkode_mem,
                                  &ark_mem, &step_mem);
   if (retval != ARK_SUCCESS) return(retval);
 
-  /* override predictor method 5 if non-NULL PredictStage is supplied */
-  if ((step_mem->predictor == 5) && (PredictStage != NULL)) {
-    arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE::MRIStep",
-                    "MRIStepSetStagePredictFn",
-                    "User-supplied predictor is incompatible with predictor method 5");
-    return(ARK_ILL_INPUT);
-  }
-
   step_mem->stage_predict = PredictStage;
   return(ARK_SUCCESS);
 }
diff --git a/src/arkode/arkode_relaxation.c b/src/arkode/arkode_relaxation.c
index 4badc7cb70..5161b46dc0 100644
--- a/src/arkode/arkode_relaxation.c
+++ b/src/arkode/arkode_relaxation.c
@@ -841,8 +841,8 @@ int arkRelax(ARKodeMem ark_mem, int* relax_fails, realtype* dsm_inout,
     /* Cut step size and try again */
     ark_mem->eta = relax_mem->eta_fail;
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+    SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::arkStep_TakeStep_Z", "relaxation",
                        "relaxation failed");
 #endif
@@ -858,8 +858,8 @@ int arkRelax(ARKodeMem ark_mem, int* relax_fails, realtype* dsm_inout,
   N_VLinearSum(relax_val, ark_mem->ycur, (ONE - relax_val), ark_mem->yn,
                ark_mem->ycur);
 
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
+  SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                      "ARKODE::arkStep_TakeStep_Z", "relaxation",
                      "relaxation parameter = %"RSYM", relaxed h = %"RSYM
                      ", relaxed error = %"RSYM,
diff --git a/src/arkode/fmod/farkode_arkstep_mod.c b/src/arkode/fmod/farkode_arkstep_mod.c
index 311cea273e..cd0dfe64b1 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.c
+++ b/src/arkode/fmod/farkode_arkstep_mod.c
@@ -1255,20 +1255,6 @@ SWIGEXPORT int _wrap_FARKStepSetUserData(void *farg1, void *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FARKStepSetDiagnostics(void *farg1, void *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)ARKStepSetDiagnostics(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FARKStepSetPostprocessStepFn(void *farg1, ARKPostProcessFn farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/arkode/fmod/farkode_arkstep_mod.f90 b/src/arkode/fmod/farkode_arkstep_mod.f90
index 08ee14cc0a..189ac8b844 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.f90
+++ b/src/arkode/fmod/farkode_arkstep_mod.f90
@@ -134,7 +134,6 @@ module farkode_arkstep_mod
  public :: FARKStepSetErrHandlerFn
  public :: FARKStepSetErrFile
  public :: FARKStepSetUserData
- public :: FARKStepSetDiagnostics
  public :: FARKStepSetPostprocessStepFn
  public :: FARKStepSetPostprocessStageFn
  public :: FARKStepSetStagePredictFn
@@ -888,15 +887,6 @@ function swigc_FARKStepSetUserData(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FARKStepSetDiagnostics(farg1, farg2) &
-bind(C, name="_wrap_FARKStepSetDiagnostics") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
 function swigc_FARKStepSetPostprocessStepFn(farg1, farg2) &
 bind(C, name="_wrap_FARKStepSetPostprocessStepFn") &
 result(fresult)
@@ -3023,22 +3013,6 @@ function FARKStepSetUserData(arkode_mem, user_data) &
 swig_result = fresult
 end function
 
-function FARKStepSetDiagnostics(arkode_mem, diagfp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: arkode_mem
-type(C_PTR) :: diagfp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = arkode_mem
-farg2 = diagfp
-fresult = swigc_FARKStepSetDiagnostics(farg1, farg2)
-swig_result = fresult
-end function
-
 function FARKStepSetPostprocessStepFn(arkode_mem, processstep) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/arkode/fmod/farkode_erkstep_mod.c b/src/arkode/fmod/farkode_erkstep_mod.c
index 8a6be0ea0f..1e04abc320 100644
--- a/src/arkode/fmod/farkode_erkstep_mod.c
+++ b/src/arkode/fmod/farkode_erkstep_mod.c
@@ -923,20 +923,6 @@ SWIGEXPORT int _wrap_FERKStepSetUserData(void *farg1, void *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FERKStepSetDiagnostics(void *farg1, void *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)ERKStepSetDiagnostics(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FERKStepSetPostprocessStepFn(void *farg1, ARKPostProcessFn farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/arkode/fmod/farkode_erkstep_mod.f90 b/src/arkode/fmod/farkode_erkstep_mod.f90
index d7f2b4fa8b..d3650fe392 100644
--- a/src/arkode/fmod/farkode_erkstep_mod.f90
+++ b/src/arkode/fmod/farkode_erkstep_mod.f90
@@ -99,7 +99,6 @@ module farkode_erkstep_mod
  public :: FERKStepSetErrHandlerFn
  public :: FERKStepSetErrFile
  public :: FERKStepSetUserData
- public :: FERKStepSetDiagnostics
  public :: FERKStepSetPostprocessStepFn
  public :: FERKStepSetPostprocessStageFn
  public :: FERKStepEvolve
@@ -589,15 +588,6 @@ function swigc_FERKStepSetUserData(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FERKStepSetDiagnostics(farg1, farg2) &
-bind(C, name="_wrap_FERKStepSetDiagnostics") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
 function swigc_FERKStepSetPostprocessStepFn(farg1, farg2) &
 bind(C, name="_wrap_FERKStepSetPostprocessStepFn") &
 result(fresult)
@@ -1853,22 +1843,6 @@ function FERKStepSetUserData(arkode_mem, user_data) &
 swig_result = fresult
 end function
 
-function FERKStepSetDiagnostics(arkode_mem, diagfp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: arkode_mem
-type(C_PTR) :: diagfp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = arkode_mem
-farg2 = diagfp
-fresult = swigc_FERKStepSetDiagnostics(farg1, farg2)
-swig_result = fresult
-end function
-
 function FERKStepSetPostprocessStepFn(arkode_mem, processstep) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/arkode/fmod/farkode_mod.f90 b/src/arkode/fmod/farkode_mod.f90
index 31610f9ac4..6b3e629e0d 100644
--- a/src/arkode/fmod/farkode_mod.f90
+++ b/src/arkode/fmod/farkode_mod.f90
@@ -162,22 +162,6 @@ module farkode_mod
  public :: FARKodeButcherTable_Write
  public :: FARKodeButcherTable_CheckOrder
  public :: FARKodeButcherTable_CheckARKOrder
- integer(C_INT), parameter, public :: SDIRK_2_1_2 = 100_C_INT
- integer(C_INT), parameter, public :: BILLINGTON_3_3_2 = 101_C_INT
- integer(C_INT), parameter, public :: TRBDF2_3_3_2 = 102_C_INT
- integer(C_INT), parameter, public :: KVAERNO_4_2_3 = 103_C_INT
- integer(C_INT), parameter, public :: ARK324L2SA_DIRK_4_2_3 = 104_C_INT
- integer(C_INT), parameter, public :: CASH_5_2_4 = 105_C_INT
- integer(C_INT), parameter, public :: CASH_5_3_4 = 106_C_INT
- integer(C_INT), parameter, public :: SDIRK_5_3_4 = 107_C_INT
- integer(C_INT), parameter, public :: KVAERNO_5_3_4 = 108_C_INT
- integer(C_INT), parameter, public :: ARK436L2SA_DIRK_6_3_4 = 109_C_INT
- integer(C_INT), parameter, public :: KVAERNO_7_4_5 = 110_C_INT
- integer(C_INT), parameter, public :: ARK548L2SA_DIRK_8_4_5 = 111_C_INT
- integer(C_INT), parameter, public :: ARK437L2SA_DIRK_7_3_4 = 112_C_INT
- integer(C_INT), parameter, public :: ARK548L2SAb_DIRK_8_4_5 = 113_C_INT
- integer(C_INT), parameter, public :: MIN_DIRK_NUM = 100_C_INT
- integer(C_INT), parameter, public :: MAX_DIRK_NUM = 113_C_INT
  ! typedef enum ARKODE_DIRKTableID
  enum, bind(c)
   enumerator :: ARKODE_DIRK_NONE = -1
@@ -222,23 +206,6 @@ module farkode_mod
   integer(C_SIZE_T), public :: size = 0
  end type
  public :: FARKodeButcherTable_LoadDIRKByName
- integer(C_INT), parameter, public :: HEUN_EULER_2_1_2 = 0_C_INT
- integer(C_INT), parameter, public :: BOGACKI_SHAMPINE_4_2_3 = 1_C_INT
- integer(C_INT), parameter, public :: ARK324L2SA_ERK_4_2_3 = 2_C_INT
- integer(C_INT), parameter, public :: ZONNEVELD_5_3_4 = 3_C_INT
- integer(C_INT), parameter, public :: ARK436L2SA_ERK_6_3_4 = 4_C_INT
- integer(C_INT), parameter, public :: SAYFY_ABURUB_6_3_4 = 5_C_INT
- integer(C_INT), parameter, public :: CASH_KARP_6_4_5 = 6_C_INT
- integer(C_INT), parameter, public :: FEHLBERG_6_4_5 = 7_C_INT
- integer(C_INT), parameter, public :: DORMAND_PRINCE_7_4_5 = 8_C_INT
- integer(C_INT), parameter, public :: ARK548L2SA_ERK_8_4_5 = 9_C_INT
- integer(C_INT), parameter, public :: VERNER_8_5_6 = 10_C_INT
- integer(C_INT), parameter, public :: FEHLBERG_13_7_8 = 11_C_INT
- integer(C_INT), parameter, public :: KNOTH_WOLKE_3_3 = 12_C_INT
- integer(C_INT), parameter, public :: ARK437L2SA_ERK_7_3_4 = 13_C_INT
- integer(C_INT), parameter, public :: ARK548L2SAb_ERK_8_4_5 = 14_C_INT
- integer(C_INT), parameter, public :: MIN_ERK_NUM = 0_C_INT
- integer(C_INT), parameter, public :: MAX_ERK_NUM = 21_C_INT
  ! typedef enum ARKODE_ERKTableID
  enum, bind(c)
   enumerator :: ARKODE_ERK_NONE = -1
diff --git a/src/arkode/fmod/farkode_mristep_mod.c b/src/arkode/fmod/farkode_mristep_mod.c
index 8ba7ad5296..0065b6553f 100644
--- a/src/arkode/fmod/farkode_mristep_mod.c
+++ b/src/arkode/fmod/farkode_mristep_mod.c
@@ -1171,20 +1171,6 @@ SWIGEXPORT int _wrap_FMRIStepSetUserData(void *farg1, void *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FMRIStepSetDiagnostics(void *farg1, void *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)MRIStepSetDiagnostics(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FMRIStepSetPostprocessStepFn(void *farg1, ARKPostProcessFn farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/arkode/fmod/farkode_mristep_mod.f90 b/src/arkode/fmod/farkode_mristep_mod.f90
index 6db939a4b7..d5de6b89fc 100644
--- a/src/arkode/fmod/farkode_mristep_mod.f90
+++ b/src/arkode/fmod/farkode_mristep_mod.f90
@@ -48,17 +48,6 @@ module farkode_mristep_mod
  end enum
  integer, parameter, public :: MRISTEP_METHOD_TYPE = kind(MRISTEP_EXPLICIT)
  public :: MRISTEP_EXPLICIT, MRISTEP_IMPLICIT, MRISTEP_IMEX
- integer(C_INT), parameter, public :: MIS_KW3 = 200_C_INT
- integer(C_INT), parameter, public :: MRI_GARK_ERK33a = 201_C_INT
- integer(C_INT), parameter, public :: MRI_GARK_ERK45a = 202_C_INT
- integer(C_INT), parameter, public :: MRI_GARK_IRK21a = 203_C_INT
- integer(C_INT), parameter, public :: MRI_GARK_ESDIRK34a = 204_C_INT
- integer(C_INT), parameter, public :: MRI_GARK_ESDIRK46a = 205_C_INT
- integer(C_INT), parameter, public :: IMEX_MRI_GARK3a = 206_C_INT
- integer(C_INT), parameter, public :: IMEX_MRI_GARK3b = 207_C_INT
- integer(C_INT), parameter, public :: IMEX_MRI_GARK4 = 208_C_INT
- integer(C_INT), parameter, public :: MIN_MRI_NUM = 200_C_INT
- integer(C_INT), parameter, public :: MAX_MRI_NUM = 208_C_INT
  ! typedef enum ARKODE_MRITableID
  enum, bind(c)
   enumerator :: ARKODE_MRI_NONE = -1
@@ -169,7 +158,6 @@ module farkode_mristep_mod
  public :: FMRIStepSetErrHandlerFn
  public :: FMRIStepSetErrFile
  public :: FMRIStepSetUserData
- public :: FMRIStepSetDiagnostics
  public :: FMRIStepSetPostprocessStepFn
  public :: FMRIStepSetPostprocessStageFn
  public :: FMRIStepSetPreInnerFn
@@ -807,15 +795,6 @@ function swigc_FMRIStepSetUserData(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FMRIStepSetDiagnostics(farg1, farg2) &
-bind(C, name="_wrap_FMRIStepSetDiagnostics") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
 function swigc_FMRIStepSetPostprocessStepFn(farg1, farg2) &
 bind(C, name="_wrap_FMRIStepSetPostprocessStepFn") &
 result(fresult)
@@ -2449,22 +2428,6 @@ function FMRIStepSetUserData(arkode_mem, user_data) &
 swig_result = fresult
 end function
 
-function FMRIStepSetDiagnostics(arkode_mem, diagfp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: arkode_mem
-type(C_PTR) :: diagfp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = arkode_mem
-farg2 = diagfp
-fresult = swigc_FMRIStepSetDiagnostics(farg1, farg2)
-swig_result = fresult
-end function
-
 function FMRIStepSetPostprocessStepFn(arkode_mem, processstep) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/cvode/CMakeLists.txt b/src/cvode/CMakeLists.txt
index bcdbe0d513..ed1eb55dfe 100644
--- a/src/cvode/CMakeLists.txt
+++ b/src/cvode/CMakeLists.txt
@@ -23,12 +23,10 @@ set(cvode_SOURCES
   cvode_bandpre.c
   cvode_bbdpre.c
   cvode_diag.c
-  cvode_direct.c
   cvode_io.c
   cvode_ls.c
   cvode_nls.c
   cvode_proj.c
-  cvode_spils.c
   )
 
 # Add variable cvode_HEADERS with the exported CVODE header files
@@ -37,10 +35,8 @@ set(cvode_HEADERS
   cvode_bandpre.h
   cvode_bbdpre.h
   cvode_diag.h
-  cvode_direct.h
   cvode_ls.h
   cvode_proj.h
-  cvode_spils.h
   )
 
 # Add prefix with complete path to the CVODE header files
diff --git a/src/cvode/cvode_direct.c b/src/cvode/cvode_direct.c
deleted file mode 100644
index ca7c25ec13..0000000000
--- a/src/cvode/cvode_direct.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated direct linear solver interface in
- * CVODE; these routines now just wrap the updated CVODE generic
- * linear solver interface in cvode_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <cvode/cvode_ls.h>
-#include <cvode/cvode_direct.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in cvode_ls.h)
-  =================================================================*/
-
-int CVDlsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS, SUNMatrix A)
-{ return(CVodeSetLinearSolver(cvode_mem, LS, A)); }
-
-int CVDlsSetJacFn(void *cvode_mem, CVDlsJacFn jac)
-{ return(CVodeSetJacFn(cvode_mem, jac)); }
-
-int CVDlsGetWorkSpace(void *cvode_mem, long int *lenrwLS, long int *leniwLS)
-{ return(CVodeGetLinWorkSpace(cvode_mem, lenrwLS, leniwLS)); }
-
-int CVDlsGetNumJacEvals(void *cvode_mem, long int *njevals)
-{ return(CVodeGetNumJacEvals(cvode_mem, njevals)); }
-
-int CVDlsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS)
-{ return(CVodeGetNumLinRhsEvals(cvode_mem, nfevalsLS)); }
-
-int CVDlsGetLastFlag(void *cvode_mem, long int *flag)
-{ return(CVodeGetLastLinFlag(cvode_mem, flag)); }
-
-char *CVDlsGetReturnFlagName(long int flag)
-{ return(CVodeGetLinReturnFlagName(flag)); }
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/cvode/cvode_spils.c b/src/cvode/cvode_spils.c
deleted file mode 100644
index eebde519c5..0000000000
--- a/src/cvode/cvode_spils.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*-----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Implementation file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in CVODE; these routines now just wrap
- * the updated CVODE generic linear solver interface in cvode_ls.h.
- * -----------------------------------------------------------------*/
-
-#include <cvode/cvode_ls.h>
-#include <cvode/cvode_spils.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  CVSPILS Exported functions (wrappers for equivalent routines in
-  cvode_ls.h)
-  =================================================================*/
-
-int CVSpilsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS)
-{ return(CVodeSetLinearSolver(cvode_mem, LS, NULL)); }
-
-int CVSpilsSetEpsLin(void *cvode_mem, realtype eplifac)
-{ return(CVodeSetEpsLin(cvode_mem, eplifac)); }
-
-int CVSpilsSetPreconditioner(void *cvode_mem, CVSpilsPrecSetupFn pset, CVSpilsPrecSolveFn psolve)
-{ return(CVodeSetPreconditioner(cvode_mem, pset, psolve)); }
-
-int CVSpilsSetJacTimes(void *cvode_mem, CVSpilsJacTimesSetupFn jtsetup, CVSpilsJacTimesVecFn jtimes)
-{ return(CVodeSetJacTimes(cvode_mem, jtsetup, jtimes)); }
-
-int CVSpilsGetWorkSpace(void *cvode_mem, long int *lenrwLS, long int *leniwLS)
-{ return(CVodeGetLinWorkSpace(cvode_mem, lenrwLS, leniwLS)); }
-
-int CVSpilsGetNumPrecEvals(void *cvode_mem, long int *npevals)
-{ return(CVodeGetNumPrecEvals(cvode_mem, npevals)); }
-
-int CVSpilsGetNumPrecSolves(void *cvode_mem, long int *npsolves)
-{ return(CVodeGetNumPrecSolves(cvode_mem, npsolves)); }
-
-int CVSpilsGetNumLinIters(void *cvode_mem, long int *nliters)
-{ return(CVodeGetNumLinIters(cvode_mem, nliters)); }
-
-int CVSpilsGetNumConvFails(void *cvode_mem, long int *nlcfails)
-{ return(CVodeGetNumLinConvFails(cvode_mem, nlcfails)); }
-
-int CVSpilsGetNumJTSetupEvals(void *cvode_mem, long int *njtsetups)
-{ return(CVodeGetNumJTSetupEvals(cvode_mem, njtsetups)); }
-
-int CVSpilsGetNumJtimesEvals(void *cvode_mem, long int *njvevals)
-{ return(CVodeGetNumJtimesEvals(cvode_mem, njvevals)); }
-
-int CVSpilsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS)
-{ return(CVodeGetNumLinRhsEvals(cvode_mem, nfevalsLS)); }
-
-int CVSpilsGetLastFlag(void *cvode_mem, long int *flag)
-{ return(CVodeGetLastLinFlag(cvode_mem, flag)); }
-  
-char *CVSpilsGetReturnFlagName(long int flag)
-{ return(CVodeGetLinReturnFlagName(flag)); }
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/cvodes/CMakeLists.txt b/src/cvodes/CMakeLists.txt
index 480830056d..38cfc129a9 100644
--- a/src/cvodes/CMakeLists.txt
+++ b/src/cvodes/CMakeLists.txt
@@ -25,7 +25,6 @@ set(cvodes_SOURCES
   cvodes_bandpre.c
   cvodes_bbdpre.c
   cvodes_diag.c
-  cvodes_direct.c
   cvodes_io.c
   cvodes_ls.c
   cvodes_nls.c
@@ -33,7 +32,6 @@ set(cvodes_SOURCES
   cvodes_nls_stg.c
   cvodes_nls_stg1.c
   cvodes_proj.c
-  cvodes_spils.c
   )
 
 # Add variable cvodes_HEADERS with the exported CVODES header files
@@ -42,10 +40,8 @@ set(cvodes_HEADERS
   cvodes_bandpre.h
   cvodes_bbdpre.h
   cvodes_diag.h
-  cvodes_direct.h
   cvodes_ls.h
   cvodes_proj.h
-  cvodes_spils.h
   )
 
 # Add prefix with complete path to the CVODES header files
diff --git a/src/cvodes/cvodes_direct.c b/src/cvodes/cvodes_direct.c
deleted file mode 100644
index e5bccaf427..0000000000
--- a/src/cvodes/cvodes_direct.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/* -----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated direct linear solver interface in
- * CVODES; these routines now just wrap the updated CVODE generic
- * linear solver interface in cvodes_ls.h.
- * -----------------------------------------------------------------*/
-
-#include <cvodes/cvodes_ls.h>
-#include <cvodes/cvodes_direct.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in cvodes_ls.h)
-  =================================================================*/
-
-int CVDlsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS,
-                         SUNMatrix A)
-{ return(CVodeSetLinearSolver(cvode_mem, LS, A)); }
-
-int CVDlsSetJacFn(void *cvode_mem, CVDlsJacFn jac)
-{ return(CVodeSetJacFn(cvode_mem, jac)); }
-
-int CVDlsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                      long int *leniwLS)
-{ return(CVodeGetLinWorkSpace(cvode_mem, lenrwLS, leniwLS)); }
-
-int CVDlsGetNumJacEvals(void *cvode_mem, long int *njevals)
-{ return(CVodeGetNumJacEvals(cvode_mem, njevals)); }
-
-int CVDlsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS)
-{ return(CVodeGetNumLinRhsEvals(cvode_mem, nfevalsLS)); }
-
-int CVDlsGetLastFlag(void *cvode_mem, long int *flag)
-{ return(CVodeGetLastLinFlag(cvode_mem, flag)); }
-
-char *CVDlsGetReturnFlagName(long int flag)
-{ return(CVodeGetLinReturnFlagName(flag)); }
-
-int CVDlsSetLinearSolverB(void *cvode_mem, int which,
-                          SUNLinearSolver LS, SUNMatrix A)
-{ return(CVodeSetLinearSolverB(cvode_mem, which, LS, A)); }
-
-int CVDlsSetJacFnB(void *cvode_mem, int which, CVDlsJacFnB jacB)
-{ return(CVodeSetJacFnB(cvode_mem, which, jacB)); }
-
-int CVDlsSetJacFnBS(void *cvode_mem, int which, CVDlsJacFnBS jacBS)
-{ return(CVodeSetJacFnBS(cvode_mem, which, jacBS)); }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/cvodes/cvodes_spils.c b/src/cvodes/cvodes_spils.c
deleted file mode 100644
index 9f6f6cd037..0000000000
--- a/src/cvodes/cvodes_spils.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*----------------------------------------------------------------- 
- * Programmer(s): Daniel R. Reynolds @ SMU
- * -----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- * -----------------------------------------------------------------
- * Header file for the deprecated Scaled, Preconditioned Iterative
- * Linear Solver interface in CVODES; these routines now just wrap 
- * the updated CVODES generic linear solver interface in cvodes_ls.h.
- * -----------------------------------------------------------------*/
-
-#include <cvodes/cvodes_ls.h>
-#include <cvodes/cvodes_spils.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  CVSSPILS Exported functions (wrappers for equivalent routines in 
-  cvodes_ls.h)
-  =================================================================*/
-
-int CVSpilsSetLinearSolver(void *cvode_mem, SUNLinearSolver LS)
-{ return(CVodeSetLinearSolver(cvode_mem, LS, NULL)); }
-
-int CVSpilsSetEpsLin(void *cvode_mem, realtype eplifac)
-{ return(CVodeSetEpsLin(cvode_mem, eplifac)); }
-
-int CVSpilsSetPreconditioner(void *cvode_mem, CVSpilsPrecSetupFn pset, 
-                             CVSpilsPrecSolveFn psolve)
-{ return(CVodeSetPreconditioner(cvode_mem, pset, psolve)); }
-
-int CVSpilsSetJacTimes(void *cvode_mem, CVSpilsJacTimesSetupFn jtsetup,
-                       CVSpilsJacTimesVecFn jtimes)
-{ return(CVodeSetJacTimes(cvode_mem, jtsetup, jtimes)); }
-
-int CVSpilsGetWorkSpace(void *cvode_mem, long int *lenrwLS,
-                        long int *leniwLS)
-{ return(CVodeGetLinWorkSpace(cvode_mem, lenrwLS, leniwLS)); }
-  
-int CVSpilsGetNumPrecEvals(void *cvode_mem, long int *npevals)
-{ return(CVodeGetNumPrecEvals(cvode_mem, npevals)); }
-  
-int CVSpilsGetNumPrecSolves(void *cvode_mem, long int *npsolves)
-{ return(CVodeGetNumPrecSolves(cvode_mem, npsolves)); }
-  
-int CVSpilsGetNumLinIters(void *cvode_mem, long int *nliters)
-{ return(CVodeGetNumLinIters(cvode_mem, nliters)); }
-  
-int CVSpilsGetNumConvFails(void *cvode_mem, long int *nlcfails)
-{ return(CVodeGetNumLinConvFails(cvode_mem, nlcfails)); }
-  
-int CVSpilsGetNumJTSetupEvals(void *cvode_mem, long int *njtsetups)
-{ return(CVodeGetNumJTSetupEvals(cvode_mem, njtsetups)); }
-  
-int CVSpilsGetNumJtimesEvals(void *cvode_mem, long int *njvevals)
-{ return(CVodeGetNumJtimesEvals(cvode_mem, njvevals)); }
-  
-int CVSpilsGetNumRhsEvals(void *cvode_mem, long int *nfevalsLS)
-{ return(CVodeGetNumLinRhsEvals(cvode_mem, nfevalsLS)); }
-  
-int CVSpilsGetLastFlag(void *cvode_mem, long int *flag)
-{ return(CVodeGetLastLinFlag(cvode_mem, flag)); }
-  
-char *CVSpilsGetReturnFlagName(long int flag)
-{ return(CVodeGetLinReturnFlagName(flag)); }
-  
-int CVSpilsSetLinearSolverB(void *cvode_mem, int which,
-                            SUNLinearSolver LS)
-{ return(CVodeSetLinearSolverB(cvode_mem, which, LS, NULL)); }
-  
-int CVSpilsSetEpsLinB(void *cvode_mem, int which, realtype eplifacB)
-{ return(CVodeSetEpsLinB(cvode_mem, which, eplifacB)); }
-  
-int CVSpilsSetPreconditionerB(void *cvode_mem, int which, 
-                              CVSpilsPrecSetupFnB psetB,
-                              CVSpilsPrecSolveFnB psolveB)
-{ return(CVodeSetPreconditionerB(cvode_mem, which, psetB, psolveB)); }
-  
-int CVSpilsSetPreconditionerBS(void *cvode_mem, int which, 
-                               CVSpilsPrecSetupFnBS psetBS,
-                               CVSpilsPrecSolveFnBS psolveBS)
-{ return(CVodeSetPreconditionerBS(cvode_mem, which, psetBS, psolveBS)); }
-  
-int CVSpilsSetJacTimesB(void *cvode_mem, int which, 
-                        CVSpilsJacTimesSetupFnB jtsetupB,
-                        CVSpilsJacTimesVecFnB jtimesB)
-{ return(CVodeSetJacTimesB(cvode_mem, which, jtsetupB, jtimesB)); }
-  
-int CVSpilsSetJacTimesBS(void *cvode_mem, int which, 
-                         CVSpilsJacTimesSetupFnBS jtsetupBS,
-                         CVSpilsJacTimesVecFnBS jtimesBS)
-{ return(CVodeSetJacTimesBS(cvode_mem, which, jtsetupBS, jtimesBS)); }
-  
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/ida/CMakeLists.txt b/src/ida/CMakeLists.txt
index 120f3f9687..b95ee46f48 100644
--- a/src/ida/CMakeLists.txt
+++ b/src/ida/CMakeLists.txt
@@ -21,21 +21,17 @@ install(CODE "MESSAGE(\"\nInstall IDA\n\")")
 set(ida_SOURCES
   ida.c
   ida_bbdpre.c
-  ida_direct.c
   ida_ic.c
   ida_io.c
   ida_ls.c
   ida_nls.c
-  ida_spils.c
   )
 
 # Add variable ida_HEADERS with the exported IDA header files
 set(ida_HEADERS
   ida.h
   ida_bbdpre.h
-  ida_direct.h
   ida_ls.h
-  ida_spils.h
   )
 
 # Add prefix with complete path to the IDA header files
diff --git a/src/ida/ida_direct.c b/src/ida/ida_direct.c
deleted file mode 100644
index 52ef5ef0b6..0000000000
--- a/src/ida/ida_direct.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Radu Serban @ LLNL
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated direct linear solver interface in 
- * IDA; these routines now just wrap the updated IDA generic
- * linear solver interface in ida_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <ida/ida_ls.h>
-#include <ida/ida_direct.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in ida_ls.h)
-  =================================================================*/
-
-int IDADlsSetLinearSolver(void *ida_mem, SUNLinearSolver LS, SUNMatrix A)
-{ return(IDASetLinearSolver(ida_mem, LS, A)); }
-
-int IDADlsSetJacFn(void *ida_mem, IDADlsJacFn jac)
-{ return(IDASetJacFn(ida_mem, jac)); }
-
-int IDADlsGetWorkSpace(void *ida_mem, long int *lenrwLS, long int *leniwLS)
-{ return(IDAGetLinWorkSpace(ida_mem, lenrwLS, leniwLS)); }
-  
-int IDADlsGetNumJacEvals(void *ida_mem, long int *njevals)
-{ return(IDAGetNumJacEvals(ida_mem, njevals)); }
-  
-int IDADlsGetNumResEvals(void *ida_mem, long int *nfevalsLS)
-{ return(IDAGetNumLinResEvals(ida_mem, nfevalsLS)); }
-  
-int IDADlsGetLastFlag(void *ida_mem, long int *flag)
-{ return(IDAGetLastLinFlag(ida_mem, flag)); }
-
-char *IDADlsGetReturnFlagName(long int flag)
-{ return(IDAGetLinReturnFlagName(flag)); }
-
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/ida/ida_spils.c b/src/ida/ida_spils.c
deleted file mode 100644
index 50e2cbe94f..0000000000
--- a/src/ida/ida_spils.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*----------------------------------------------------------------- 
- * Programmer(s): Daniel R. Reynolds @ SMU
- *         Alan Hindmarsh, Radu Serban and Aaron Collier @ LLNL
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated Scaled and Preconditioned 
- * Iterative Linear Solver interface in IDA; these routines now just
- * wrap the updated IDA generic linear solver interface in ida_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <ida/ida_ls.h>
-#include <ida/ida_spils.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in ida_ls.h)
-  =================================================================*/
-
-int IDASpilsSetLinearSolver(void *ida_mem, SUNLinearSolver LS)
-{ return(IDASetLinearSolver(ida_mem, LS, NULL)); }
-
-int IDASpilsSetPreconditioner(void *ida_mem, IDASpilsPrecSetupFn pset, 
-                              IDASpilsPrecSolveFn psolve)
-{ return(IDASetPreconditioner(ida_mem, pset, psolve)); }
-
-int IDASpilsSetJacTimes(void *ida_mem, IDASpilsJacTimesSetupFn jtsetup,
-                        IDASpilsJacTimesVecFn jtimes)
-{ return(IDASetJacTimes(ida_mem, jtsetup, jtimes)); }
-
-int IDASpilsSetEpsLin(void *ida_mem, realtype eplifac)
-{ return(IDASetEpsLin(ida_mem, eplifac)); }
-
-int IDASpilsSetIncrementFactor(void *ida_mem, realtype dqincfac)
-{ return(IDASetIncrementFactor(ida_mem, dqincfac)); }
-
-int IDASpilsGetWorkSpace(void *ida_mem, long int *lenrwLS, long int *leniwLS)
-{ return(IDAGetLinWorkSpace(ida_mem, lenrwLS, leniwLS)); }
-
-int IDASpilsGetNumPrecEvals(void *ida_mem, long int *npevals)
-{ return(IDAGetNumPrecEvals(ida_mem, npevals)); }
-
-int IDASpilsGetNumPrecSolves(void *ida_mem, long int *npsolves)
-{ return(IDAGetNumPrecSolves(ida_mem, npsolves)); }
-
-int IDASpilsGetNumLinIters(void *ida_mem, long int *nliters)
-{ return(IDAGetNumLinIters(ida_mem, nliters)); }
-  
-int IDASpilsGetNumConvFails(void *ida_mem, long int *nlcfails)
-{ return(IDAGetNumLinConvFails(ida_mem, nlcfails)); }
-  
-int IDASpilsGetNumJTSetupEvals(void *ida_mem, long int *njtsetups)
-{ return(IDAGetNumJTSetupEvals(ida_mem, njtsetups)); }
-  
-int IDASpilsGetNumJtimesEvals(void *ida_mem, long int *njvevals)
-{ return(IDAGetNumJtimesEvals(ida_mem, njvevals)); }
-  
-int IDASpilsGetNumResEvals(void *ida_mem, long int *nrevalsLS)
-{ return(IDAGetNumLinResEvals(ida_mem, nrevalsLS)); }
-  
-int IDASpilsGetLastFlag(void *ida_mem, long int *flag)
-{ return(IDAGetLastLinFlag(ida_mem, flag)); }
-  
-char *IDASpilsGetReturnFlagName(long int flag)
-{ return(IDAGetLinReturnFlagName(flag)); }
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/idas/CMakeLists.txt b/src/idas/CMakeLists.txt
index c825d114c1..b0c6aa4df0 100644
--- a/src/idas/CMakeLists.txt
+++ b/src/idas/CMakeLists.txt
@@ -21,7 +21,6 @@ install(CODE "MESSAGE(\"\nInstall IDAS\n\")")
 set(idas_SOURCES
   idas.c
   idaa.c
-  idas_direct.c
   idas_io.c
   idas_ic.c
   idaa_io.c
@@ -30,16 +29,13 @@ set(idas_SOURCES
   idas_nls.c
   idas_nls_sim.c
   idas_nls_stg.c
-  idas_spils.c
   )
 
 # Add variable idas_HEADERS with the exported IDAS header files
 set(idas_HEADERS
   idas.h
   idas_bbdpre.h
-  idas_direct.h
   idas_ls.h
-  idas_spils.h
   )
 
 # Add prefix with complete path to the IDAS header files
diff --git a/src/idas/idas_direct.c b/src/idas/idas_direct.c
deleted file mode 100644
index c42f22c1ff..0000000000
--- a/src/idas/idas_direct.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated direct linear solver interface in 
- * IDA; these routines now just wrap the updated IDA generic
- * linear solver interface in idas_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <idas/idas_ls.h>
-#include <idas/idas_direct.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in idas_ls.h)
-  =================================================================*/
-
-int IDADlsSetLinearSolver(void *ida_mem, SUNLinearSolver LS,
-                          SUNMatrix A)
-{ return(IDASetLinearSolver(ida_mem, LS, A)); }
-  
-int IDADlsSetJacFn(void *ida_mem, IDADlsJacFn jac)
-{ return(IDASetJacFn(ida_mem, jac)); }
-  
-int IDADlsGetWorkSpace(void *ida_mem, long int *lenrwLS,
-                       long int *leniwLS)
-{ return(IDAGetLinWorkSpace(ida_mem, lenrwLS, leniwLS)); }
-  
-int IDADlsGetNumJacEvals(void *ida_mem, long int *njevals)
-{ return(IDAGetNumJacEvals(ida_mem, njevals)); }
-  
-int IDADlsGetNumResEvals(void *ida_mem, long int *nrevalsLS)
-{ return(IDAGetNumLinResEvals(ida_mem, nrevalsLS)); }
-  
-int IDADlsGetLastFlag(void *ida_mem, long int *flag)
-{ return(IDAGetLastLinFlag(ida_mem, flag)); }
-  
-char *IDADlsGetReturnFlagName(long int flag)
-{ return(IDAGetLinReturnFlagName(flag)); }
-  
-int IDADlsSetLinearSolverB(void *ida_mem, int which,
-                           SUNLinearSolver LS, SUNMatrix A)
-{ return(IDASetLinearSolverB(ida_mem, which, LS, A)); }
-  
-int IDADlsSetJacFnB(void *ida_mem, int which, IDADlsJacFnB jacB)
-{ return(IDASetJacFnB(ida_mem, which, jacB)); }
-  
-int IDADlsSetJacFnBS(void *ida_mem, int which, IDADlsJacFnBS jacBS)
-{ return(IDASetJacFnBS(ida_mem, which, jacBS)); }
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/idas/idas_spils.c b/src/idas/idas_spils.c
deleted file mode 100644
index 9ee1b1d311..0000000000
--- a/src/idas/idas_spils.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*----------------------------------------------------------------- 
- * Programmer(s): Daniel R. Reynolds @ SMU
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated Scaled and Preconditioned 
- * Iterative Linear Solver interface in IDAS; these routines now just
- * wrap the updated IDA generic linear solver interface in idas_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <idas/idas_ls.h>
-#include <idas/idas_spils.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in idas_ls.h)
-  =================================================================*/
-  
-int IDASpilsSetLinearSolver(void *ida_mem, SUNLinearSolver LS)
-{ return(IDASetLinearSolver(ida_mem, LS, NULL)); }
-  
-int IDASpilsSetPreconditioner(void *ida_mem, IDASpilsPrecSetupFn pset, 
-                              IDASpilsPrecSolveFn psolve)
-{ return(IDASetPreconditioner(ida_mem, pset,  psolve)); }
-  
-int IDASpilsSetJacTimes(void *ida_mem, IDASpilsJacTimesSetupFn jtsetup,
-                        IDASpilsJacTimesVecFn jtimes)
-{ return(IDASetJacTimes(ida_mem, jtsetup, jtimes)); }
-  
-int IDASpilsSetEpsLin(void *ida_mem, realtype eplifac)
-{ return(IDASetEpsLin(ida_mem, eplifac)); }
-  
-int IDASpilsSetIncrementFactor(void *ida_mem, realtype dqincfac)
-{ return(IDASetIncrementFactor(ida_mem, dqincfac)); }
-  
-int IDASpilsGetWorkSpace(void *ida_mem, long int *lenrwLS,
-                         long int *leniwLS)
-{ return(IDAGetLinWorkSpace(ida_mem, lenrwLS, leniwLS)); }
-  
-int IDASpilsGetNumPrecEvals(void *ida_mem, long int *npevals)
-{ return(IDAGetNumPrecEvals(ida_mem, npevals)); }
-  
-int IDASpilsGetNumPrecSolves(void *ida_mem, long int *npsolves)
-{ return(IDAGetNumPrecSolves(ida_mem, npsolves)); }
-  
-int IDASpilsGetNumLinIters(void *ida_mem, long int *nliters)
-{ return(IDAGetNumLinIters(ida_mem, nliters)); }
-  
-int IDASpilsGetNumConvFails(void *ida_mem, long int *nlcfails)
-{ return(IDAGetNumLinConvFails(ida_mem, nlcfails)); }
-  
-int IDASpilsGetNumJTSetupEvals(void *ida_mem, long int *njtsetups)
-{ return(IDAGetNumJTSetupEvals(ida_mem, njtsetups)); }
-  
-int IDASpilsGetNumJtimesEvals(void *ida_mem, long int *njvevals)
-{ return(IDAGetNumJtimesEvals(ida_mem, njvevals)); }
-  
-int IDASpilsGetNumResEvals(void *ida_mem, long int *nrevalsLS)
-{ return(IDAGetNumLinResEvals(ida_mem, nrevalsLS)); }
-  
-int IDASpilsGetLastFlag(void *ida_mem, long int *flag)
-{ return(IDAGetLastLinFlag(ida_mem, flag)); }
-  
-char *IDASpilsGetReturnFlagName(long int flag)
-{ return(IDAGetLinReturnFlagName(flag)); }
-  
-int IDASpilsSetLinearSolverB(void *ida_mem, int which,
-                             SUNLinearSolver LS)
-{ return(IDASetLinearSolverB(ida_mem, which, LS, NULL)); }
-  
-int IDASpilsSetEpsLinB(void *ida_mem, int which, realtype eplifacB)
-{ return(IDASetEpsLinB(ida_mem, which, eplifacB)); }
-  
-int IDASpilsSetIncrementFactorB(void *ida_mem, int which,
-                                realtype dqincfacB)
-{ return(IDASetIncrementFactorB(ida_mem, which, dqincfacB)); }
-  
-int IDASpilsSetPreconditionerB(void *ida_mem, int which,
-                               IDASpilsPrecSetupFnB psetB,
-                               IDASpilsPrecSolveFnB psolveB)
-{ return(IDASetPreconditionerB(ida_mem, which, psetB, psolveB)); }
-  
-int IDASpilsSetPreconditionerBS(void *ida_mem, int which,
-                                IDASpilsPrecSetupFnBS psetBS,
-                                IDASpilsPrecSolveFnBS psolveBS)
-{ return(IDASetPreconditionerBS(ida_mem, which, psetBS, psolveBS)); }
-  
-int IDASpilsSetJacTimesB(void *ida_mem, int which,
-                         IDASpilsJacTimesSetupFnB jtsetupB,
-                         IDASpilsJacTimesVecFnB jtimesB)
-{ return(IDASetJacTimesB(ida_mem, which, jtsetupB, jtimesB)); }
-  
-int IDASpilsSetJacTimesBS(void *ida_mem, int which,
-                          IDASpilsJacTimesSetupFnBS jtsetupBS,
-                          IDASpilsJacTimesVecFnBS jtimesBS)
-{ return(IDASetJacTimesBS(ida_mem, which, jtsetupBS, jtimesBS)); }
-  
-
- 
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/kinsol/CMakeLists.txt b/src/kinsol/CMakeLists.txt
index 20fd1572ec..aa331f6560 100644
--- a/src/kinsol/CMakeLists.txt
+++ b/src/kinsol/CMakeLists.txt
@@ -21,19 +21,15 @@ install(CODE "MESSAGE(\"\nInstall KINSOL\n\")")
 set(kinsol_SOURCES
   kinsol.c
   kinsol_bbdpre.c
-  kinsol_direct.c
   kinsol_io.c
   kinsol_ls.c
-  kinsol_spils.c
   )
 
 # Add variable kinsol_HEADERS with the exported KINSOL header files
 set(kinsol_HEADERS
   kinsol.h
   kinsol_bbdpre.h
-  kinsol_direct.h
   kinsol_ls.h
-  kinsol_spils.h
   )
 
 # Add prefix with complete path to the KINSOL header files
diff --git a/src/kinsol/fmod/fkinsol_mod.c b/src/kinsol/fmod/fkinsol_mod.c
index 29e070fbb6..11473b35fb 100644
--- a/src/kinsol/fmod/fkinsol_mod.c
+++ b/src/kinsol/fmod/fkinsol_mod.c
@@ -667,64 +667,6 @@ SWIGEXPORT int _wrap_FKINSetErrFile(void *farg1, void *farg2) {
 }
 
 
-SWIGEXPORT int _wrap_FKINSetInfoHandlerFn(void *farg1, KINInfoHandlerFn farg2, void *farg3) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  KINInfoHandlerFn arg2 = (KINInfoHandlerFn) 0 ;
-  void *arg3 = (void *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (KINInfoHandlerFn)(farg2);
-  arg3 = (void *)(farg3);
-  result = (int)KINSetInfoHandlerFn(arg1,arg2,arg3);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FKINSetInfoFile(void *farg1, void *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)KINSetInfoFile(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FKINSetPrintLevel(void *farg1, int const *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)KINSetPrintLevel(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FKINSetDebugFile(void *farg1, void *farg2) {
-  int fresult ;
-  void *arg1 = (void *) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (void *)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)KINSetDebugFile(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FKINGetWorkSpace(void *farg1, long *farg2, long *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
diff --git a/src/kinsol/fmod/fkinsol_mod.f90 b/src/kinsol/fmod/fkinsol_mod.f90
index c60ae37fb3..325c4dd6c7 100644
--- a/src/kinsol/fmod/fkinsol_mod.f90
+++ b/src/kinsol/fmod/fkinsol_mod.f90
@@ -100,10 +100,6 @@ module fkinsol_mod
  public :: FKINSetSysFunc
  public :: FKINSetErrHandlerFn
  public :: FKINSetErrFile
- public :: FKINSetInfoHandlerFn
- public :: FKINSetInfoFile
- public :: FKINSetPrintLevel
- public :: FKINSetDebugFile
  public :: FKINGetWorkSpace
  public :: FKINGetNumNonlinSolvIters
  public :: FKINGetNumFuncEvals
@@ -430,43 +426,6 @@ function swigc_FKINSetErrFile(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FKINSetInfoHandlerFn(farg1, farg2, farg3) &
-bind(C, name="_wrap_FKINSetInfoHandlerFn") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_FUNPTR), value :: farg2
-type(C_PTR), value :: farg3
-integer(C_INT) :: fresult
-end function
-
-function swigc_FKINSetInfoFile(farg1, farg2) &
-bind(C, name="_wrap_FKINSetInfoFile") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FKINSetPrintLevel(farg1, farg2) &
-bind(C, name="_wrap_FKINSetPrintLevel") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FKINSetDebugFile(farg1, farg2) &
-bind(C, name="_wrap_FKINSetDebugFile") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
 function swigc_FKINGetWorkSpace(farg1, farg2, farg3) &
 bind(C, name="_wrap_FKINGetWorkSpace") &
 result(fresult)
@@ -1264,73 +1223,6 @@ function FKINSetErrFile(kinmem, errfp) &
 swig_result = fresult
 end function
 
-function FKINSetInfoHandlerFn(kinmem, ihfun, ih_data) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: kinmem
-type(C_FUNPTR), intent(in), value :: ihfun
-type(C_PTR) :: ih_data
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_FUNPTR) :: farg2 
-type(C_PTR) :: farg3 
-
-farg1 = kinmem
-farg2 = ihfun
-farg3 = ih_data
-fresult = swigc_FKINSetInfoHandlerFn(farg1, farg2, farg3)
-swig_result = fresult
-end function
-
-function FKINSetInfoFile(kinmem, infofp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: kinmem
-type(C_PTR) :: infofp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = kinmem
-farg2 = infofp
-fresult = swigc_FKINSetInfoFile(farg1, farg2)
-swig_result = fresult
-end function
-
-function FKINSetPrintLevel(kinmem, printfl) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: kinmem
-integer(C_INT), intent(in) :: printfl
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = kinmem
-farg2 = printfl
-fresult = swigc_FKINSetPrintLevel(farg1, farg2)
-swig_result = fresult
-end function
-
-function FKINSetDebugFile(kinmem, debugfp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: kinmem
-type(C_PTR) :: debugfp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = kinmem
-farg2 = debugfp
-fresult = swigc_FKINSetDebugFile(farg1, farg2)
-swig_result = fresult
-end function
-
 function FKINGetWorkSpace(kinmem, lenrw, leniw) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/kinsol/kinsol.c b/src/kinsol/kinsol.c
index 10e200c49c..3446f0ff65 100644
--- a/src/kinsol/kinsol.c
+++ b/src/kinsol/kinsol.c
@@ -49,7 +49,6 @@
  *     KINScSNorm
  *   KINSOL Verbose output functions
  *     KINPrintInfo
- *     KINInfoHandler
  *   KINSOL Error Handling functions
  *     KINProcessError
  *     KINErrHandler
@@ -274,8 +273,6 @@ void *KINCreate(SUNContext sunctx)
   kin_mem->kin_constraintsSet   = SUNFALSE;
   kin_mem->kin_ehfun            = KINErrHandler;
   kin_mem->kin_eh_data          = kin_mem;
-  kin_mem->kin_ihfun            = KINInfoHandler;
-  kin_mem->kin_ih_data          = kin_mem;
   kin_mem->kin_ret_newest       = SUNFALSE;
   kin_mem->kin_mxiter           = MXITER_DEFAULT;
   kin_mem->kin_noInitSetup      = SUNFALSE;
@@ -301,18 +298,9 @@ void *KINCreate(SUNContext sunctx)
   kin_mem->kin_omega_max        = OMEGA_MAX;
 
   kin_mem->kin_errfp            = stderr;
-  kin_mem->kin_infofp           = stdout;
-  kin_mem->kin_debugfp          = stdout;
-  kin_mem->kin_printfl          = PRINTFL_DEFAULT;
 #if SUNDIALS_LOGGING_LEVEL > 0
   kin_mem->kin_errfp            = (KIN_LOGGER->error_fp) ? KIN_LOGGER->error_fp : stderr;
 #endif
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  kin_mem->kin_infofp           = (KIN_LOGGER->info_fp) ? KIN_LOGGER->info_fp : stdout;
-#endif
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
-  kin_mem->kin_debugfp          = (KIN_LOGGER->debug_fp) ? KIN_LOGGER->debug_fp : stdout;
-#endif
 
   /* initialize lrw and liw */
 
@@ -532,8 +520,10 @@ int KINSol(void *kinmem, N_Vector u, int strategy_in,
       return(KIN_ILL_INPUT);
     }
 
-    if (kin_mem->kin_printfl > 0)
-      KINPrintInfo(kin_mem, PRNT_TOL, "KINSOL", "KINSol", INFO_TOL, kin_mem->kin_scsteptol, kin_mem->kin_fnormtol);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_TOL, "KINSOL", "KINSol", INFO_TOL, kin_mem->kin_scsteptol,              
+                 kin_mem->kin_fnormtol);
+#endif
 
     kin_mem->kin_nfe = kin_mem->kin_nnilset = kin_mem->kin_nnilset_sub = kin_mem->kin_nni = kin_mem->kin_nbcf = kin_mem->kin_nbktrk = 0;
     ret = KINFP(kin_mem);
@@ -685,10 +675,12 @@ int KINSol(void *kinmem, N_Vector u, int strategy_in,
 
     kin_mem->kin_f1norm = f1normp;
 
-    /* print the current nni, fnorm, and nfe values if printfl > 0 */
+    /* print the current nni, fnorm, and nfe values */
 
-    if (kin_mem->kin_printfl > 0)
-      KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINSol", INFO_NNI, kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINSol", INFO_NNI, kin_mem->kin_nni, kin_mem->kin_nfe, 
+                 kin_mem->kin_fnorm);
+#endif
 
     if (ret != CONTINUE_ITERATIONS) break;
 
@@ -697,9 +689,9 @@ int KINSol(void *kinmem, N_Vector u, int strategy_in,
   }  /* end of loop; return */
 
 
-
-  if (kin_mem->kin_printfl > 0)
-    KINPrintInfo(kin_mem, PRNT_RETVAL, "KINSOL", "KINSol", INFO_RETVAL, ret);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_RETVAL, "KINSOL", "KINSol", INFO_RETVAL, ret);
+#endif
 
   switch(ret) {
   case KIN_SYSFUNC_FAIL:
@@ -1411,9 +1403,10 @@ static int KINSolInit(KINMem kin_mem)
   }
 
   /* all error checking is complete at this point */
-
-  if (kin_mem->kin_printfl > 0)
-    KINPrintInfo(kin_mem, PRNT_TOL, "KINSOL", "KINSolInit", INFO_TOL, kin_mem->kin_scsteptol, kin_mem->kin_fnormtol);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_TOL, "KINSOL", "KINSolInit", INFO_TOL, kin_mem->kin_scsteptol,         
+                 kin_mem->kin_fnormtol);
+#endif
 
   /* calculate the default value for mxnewtstep (maximum Newton step) */
 
@@ -1472,8 +1465,9 @@ static int KINSolInit(KINMem kin_mem)
     return(KIN_INITIAL_GUESS_OK);
   }
 
-  if (kin_mem->kin_printfl > 1)
-    KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINSolInit", INFO_FMAX, fmax);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINSolInit", INFO_FMAX, fmax);
+#endif
 
   /* initialize the linear solver if linit != NULL */
 
@@ -1490,10 +1484,10 @@ static int KINSolInit(KINMem kin_mem)
   kin_mem->kin_fnorm = N_VWL2Norm(kin_mem->kin_fval, kin_mem->kin_fscale);
   kin_mem->kin_f1norm = HALF * kin_mem->kin_fnorm * kin_mem->kin_fnorm;
   kin_mem->kin_fnorm_sub = kin_mem->kin_fnorm;
-
-  if (kin_mem->kin_printfl > 0)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
     KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINSolInit",
                  INFO_NNI, kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#endif
 
   /* problem has now been successfully initialized */
 
@@ -1588,9 +1582,9 @@ static int KINFullNewton(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
     N_VScale(ratio, kin_mem->kin_pp, kin_mem->kin_pp);
     pnorm = kin_mem->kin_mxnewtstep;
   }
-
-  if (kin_mem->kin_printfl > 0)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
     KINPrintInfo(kin_mem, PRNT_PNORM, "KINSOL", "KINFullNewton", INFO_PNORM, pnorm);
+#endif
 
   /* If constraints are active, then constrain the step accordingly */
 
@@ -1604,8 +1598,9 @@ static int KINFullNewton(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
       N_VScale(kin_mem->kin_stepmul, kin_mem->kin_pp, kin_mem->kin_pp);
       pnorm *= kin_mem->kin_stepmul;
       kin_mem->kin_stepl = pnorm;
-      if (kin_mem->kin_printfl > 0)
-        KINPrintInfo(kin_mem, PRNT_PNORM, "KINSOL", "KINFullNewton", INFO_PNORM, pnorm);
+  #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+      KINPrintInfo(kin_mem, PRNT_PNORM, "KINSOL", "KINFullNewton", INFO_PNORM, pnorm);
+  #endif
       if (pnorm <= kin_mem->kin_scsteptol) {
         N_VLinearSum(ONE, kin_mem->kin_uu, ONE, kin_mem->kin_pp, kin_mem->kin_unew);
         return(STEP_TOO_SMALL);}
@@ -1651,8 +1646,9 @@ static int KINFullNewton(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
   kin_mem->kin_sFdotJp *= ratio;
   kin_mem->kin_sJpnorm *= ratio;
 
-  if (kin_mem->kin_printfl > 1)
-    KINPrintInfo(kin_mem, PRNT_FNORM, "KINSOL", "KINFullNewton", INFO_FNORM, *fnormp);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_FNORM, "KINSOL", "KINFullNewton", INFO_FNORM, *fnormp);
+#endif
 
   if (pnorm > (POINT99 * kin_mem->kin_mxnewtstep)) *maxStepTaken = SUNTRUE;
 
@@ -1756,7 +1752,9 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
       pnorm *= kin_mem->kin_stepmul;
       rlmax = ONE;
       kin_mem->kin_stepl = pnorm;
-      if (kin_mem->kin_printfl > 0) KINPrintInfo(kin_mem, PRNT_PNORM1, "KINSOL", "KINLineSearch", INFO_PNORM1, pnorm);
+  #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+      KINPrintInfo(kin_mem, PRNT_PNORM1, "KINSOL", "KINLineSearch", INFO_PNORM1, pnorm);
+  #endif
       if (pnorm <= kin_mem->kin_scsteptol) {
         N_VLinearSum(ONE, kin_mem->kin_uu, ONE, kin_mem->kin_pp, kin_mem->kin_unew);
         return(STEP_TOO_SMALL);}
@@ -1806,8 +1804,9 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
   rlmin = (kin_mem->kin_scsteptol) / rlength;
   rl = ONE;
 
-  if (kin_mem->kin_printfl > 2)
-    KINPrintInfo(kin_mem, PRNT_LAM, "KINSOL", "KINLineSearch", INFO_LAM, rlmin, kin_mem->kin_f1norm, pnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_LAM, "KINSOL", "KINLineSearch", INFO_LAM, rlmin, kin_mem->kin_f1norm, pnorm);
+#endif
 
   /* Loop until the ALPHA condition is satisfied. Terminate if rl becomes too small */
 
@@ -1817,9 +1816,10 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
 
     alpha_cond = kin_mem->kin_f1norm + (alpha * slpi * rl);
 
-    if (kin_mem->kin_printfl > 2)
-      KINPrintInfo(kin_mem, PRNT_ALPHA, "KINSOL", "KINLinesearch",
-                   INFO_ALPHA, *fnormp, *f1normp, alpha_cond, rl);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_ALPHA, "KINSOL", "KINLinesearch",
+                 INFO_ALPHA, *fnormp, *f1normp, alpha_cond, rl);
+#endif
 
     /* If ALPHA condition is satisfied, break out from loop */
 
@@ -1908,9 +1908,10 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
         alpha_cond = kin_mem->kin_f1norm + (alpha * slpi * rl);
         beta_cond = kin_mem->kin_f1norm + (beta * slpi * rl);
 
-        if (kin_mem->kin_printfl > 2)
-          KINPrintInfo(kin_mem, PRNT_BETA, "KINSOL", "KINLineSearch",
-                       INFO_BETA, *f1normp, beta_cond, rl);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+        KINPrintInfo(kin_mem, PRNT_BETA, "KINSOL", "KINLineSearch",
+                     INFO_BETA, *f1normp, beta_cond, rl);
+#endif
 
       } while (((*f1normp) <= alpha_cond) &&
                ((*f1normp) < beta_cond) && (rl < rlmax));
@@ -1937,9 +1938,10 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
         alpha_cond = kin_mem->kin_f1norm + (alpha * slpi * rl);
         beta_cond = kin_mem->kin_f1norm + (beta * slpi * rl);
 
-        if (kin_mem->kin_printfl > 2)
-          KINPrintInfo(kin_mem, PRNT_ALPHABETA, "KINSOL", "KINLineSearch",
-                       INFO_ALPHABETA, *f1normp, alpha_cond, beta_cond, rl);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+        KINPrintInfo(kin_mem, PRNT_ALPHABETA, "KINSOL", "KINLineSearch",
+                     INFO_ALPHABETA, *f1normp, alpha_cond, beta_cond, rl);
+#endif
 
         if ((*f1normp) > alpha_cond) rldiff = rlinc;
         else if (*f1normp < beta_cond) {
@@ -1976,8 +1978,9 @@ static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
 
   kin_mem->kin_nbktrk += nbktrk_l;
 
-  if (kin_mem->kin_printfl > 1)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
     KINPrintInfo(kin_mem, PRNT_ADJ, "KINSOL", "KINLineSearch", INFO_ADJ, nbktrk_l);
+#endif
 
   /* scale sFdotJp and sJpnorm by rl * ratio for later use in KINForcingTerm */
 
@@ -2065,8 +2068,9 @@ static int KINStop(KINMem kin_mem, booleantype maxStepTaken, int sflag)
 
   fmax = KINScFNorm(kin_mem, kin_mem->kin_fval, kin_mem->kin_fscale);
 
-  if (kin_mem->kin_printfl > 1)
-    KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINStop", INFO_FMAX, fmax);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINStop", INFO_FMAX, fmax);
+#endif
 
   if (fmax <= kin_mem->kin_fnormtol) return(KIN_SUCCESS);
 
@@ -2352,9 +2356,10 @@ void KINPrintInfo(KINMem kin_mem,
 
   }
 
-  /* call the info message handler */
-
-  kin_mem->kin_ihfun(module, fname, msg, kin_mem->kin_ih_data);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
+  SUNLogger_QueueMsg(KIN_LOGGER, SUN_LOGLEVEL_INFO,
+    "KINSOL", fname, "%s", msg);
+#endif
 
   /* finalize argument processing */
 
@@ -2363,35 +2368,6 @@ void KINPrintInfo(KINMem kin_mem,
   return;
 }
 
-
-/*
- * KINInfoHandler
- *
- * This is the default KINSOL info handling function.
- * It sends the info message to the stream pointed to by kin_infofp
- */
-
-void KINInfoHandler(const char *module, const char *function,
-                    char *msg, void *data)
-{
-  KINMem kin_mem;
-
-  /* data points to kin_mem here */
-
-  kin_mem = (KINMem) data;
-#ifndef NO_FPRINTF_OUTPUT
-  if (kin_mem->kin_infofp != NULL &&
-      kin_mem->kin_infofp != kin_mem->kin_sunctx->logger->info_fp) {
-    fprintf(kin_mem->kin_infofp,"\n[%s] %s\n",module, function);
-    fprintf(kin_mem->kin_infofp,"   %s\n",msg);
-  }
-#endif
-#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
-  SUNLogger_QueueMsg(KIN_LOGGER, SUN_LOGLEVEL_INFO,
-    "KINSOL::KINInfoHandler", function, "%s", msg);
-#endif
-}
-
 /*
  * =================================================================
  * KINSOL Error Handling functions
@@ -2578,14 +2554,16 @@ static int KINPicardAA(KINMem kin_mem)
     kin_mem->kin_fnorm = KINScFNorm(kin_mem, kin_mem->kin_fval,
                                     kin_mem->kin_fscale);
 
-    if (kin_mem->kin_printfl > 1)
-      KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINPicardAA", INFO_FMAX,
-                   kin_mem->kin_fnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINPicardAA", INFO_FMAX,
+                 kin_mem->kin_fnorm);
+#endif
 
-    /* print the current iter, fnorm, and nfe values if printfl > 0 */
-    if (kin_mem->kin_printfl > 0)
-      KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINPicardAA", INFO_NNI,
-                   kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    /* print the current iter, fnorm, and nfe values */
+    KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINPicardAA", INFO_NNI,
+                 kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#endif
 
     /* Check if the maximum number of iterations is reached */
     if (kin_mem->kin_nni >= kin_mem->kin_mxiter) {
@@ -2608,9 +2586,9 @@ static int KINPicardAA(KINMem kin_mem)
     fflush(kin_mem->kin_errfp);
 
   }  /* end of loop; return */
-
-  if (kin_mem->kin_printfl > 0)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
     KINPrintInfo(kin_mem, PRNT_RETVAL, "KINSOL", "KINPicardAA", INFO_RETVAL, ret);
+#endif
 
   return(ret);
 }
@@ -2786,14 +2764,16 @@ static int KINFP(KINMem kin_mem)
     /* measure || g(x) - x || */
     kin_mem->kin_fnorm = KINScFNorm(kin_mem, delta, kin_mem->kin_fscale);
 
-    if (kin_mem->kin_printfl > 1)
-      KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINFP", INFO_FMAX,
-                   kin_mem->kin_fnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    KINPrintInfo(kin_mem, PRNT_FMAX, "KINSOL", "KINFP", INFO_FMAX,
+                 kin_mem->kin_fnorm);
+#endif
 
-    /* print the current iter, fnorm, and nfe values if printfl > 0 */
-    if (kin_mem->kin_printfl > 0)
-      KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINFP", INFO_NNI,
-                   kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+    /* print the current iter, fnorm, and nfe values */
+    KINPrintInfo(kin_mem, PRNT_NNI, "KINSOL", "KINFP", INFO_NNI,
+                 kin_mem->kin_nni, kin_mem->kin_nfe, kin_mem->kin_fnorm);
+#endif
 
     /* Check if the maximum number of iterations is reached */
     if (kin_mem->kin_nni >= kin_mem->kin_mxiter) {
@@ -2814,8 +2794,9 @@ static int KINFP(KINMem kin_mem)
 
   }  /* end of loop; return */
 
-  if (kin_mem->kin_printfl > 0)
-    KINPrintInfo(kin_mem, PRNT_RETVAL, "KINSOL", "KINFP", INFO_RETVAL, ret);
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  KINPrintInfo(kin_mem, PRNT_RETVAL, "KINSOL", "KINFP", INFO_RETVAL, ret);
+#endif
 
   return(ret);
 }
diff --git a/src/kinsol/kinsol_direct.c b/src/kinsol/kinsol_direct.c
deleted file mode 100644
index a9427041ea..0000000000
--- a/src/kinsol/kinsol_direct.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/*----------------------------------------------------------------- 
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Radu Serban @ LLNL
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Implementation file for the deprecated direct linear solver interface in 
- * KINSOL; these routines now just wrap the updated KINSOL generic
- * linear solver interface in kinsol_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <kinsol/kinsol_ls.h>
-#include <kinsol/kinsol_direct.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-  
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in kinsol_ls.h)
-  =================================================================*/
-  
-int KINDlsSetLinearSolver(void *kinmem, SUNLinearSolver LS, SUNMatrix A)
-{ return(KINSetLinearSolver(kinmem, LS, A)); }
-
-int KINDlsSetJacFn(void *kinmem, KINDlsJacFn jac)
-{ return(KINSetJacFn(kinmem, jac)); }
-
-int KINDlsGetWorkSpace(void *kinmem, long int *lenrw, long int *leniw)
-{ return(KINGetLinWorkSpace(kinmem, lenrw, leniw)); }
-
-int KINDlsGetNumJacEvals(void *kinmem, long int *njevals)
-{ return(KINGetNumJacEvals(kinmem, njevals)); }
-
-int KINDlsGetNumFuncEvals(void *kinmem, long int *nfevals)
-{ return(KINGetNumLinFuncEvals(kinmem, nfevals)); }
-
-int KINDlsGetLastFlag(void *kinmem, long int *flag)
-{ return(KINGetLastLinFlag(kinmem, flag)); }
-
-char *KINDlsGetReturnFlagName(long int flag)
-{ return(KINGetLinReturnFlagName(flag)); }
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/kinsol/kinsol_impl.h b/src/kinsol/kinsol_impl.h
index 47a684cc73..d76542cfdc 100644
--- a/src/kinsol/kinsol_impl.h
+++ b/src/kinsol/kinsol_impl.h
@@ -47,7 +47,6 @@ extern "C" {
 
 /* KINSOL default constants */
 
-#define PRINTFL_DEFAULT    0
 #define MXITER_DEFAULT     200
 #define MXNBCF_DEFAULT     10
 #define MSBSET_DEFAULT     10
@@ -90,7 +89,6 @@ typedef struct KINMemRec {
   realtype kin_scsteptol;      /* scaled step length tolerance                 */
   int kin_globalstrategy;      /* choices are KIN_NONE, KIN_LINESEARCH
                                   KIN_PICARD and KIN_FP                        */
-  int kin_printfl;             /* level of verbosity of output                 */
   long int kin_mxiter;         /* maximum number of nonlinear iterations       */
   long int kin_msbset;         /* maximum number of nonlinear iterations that
                                   may be performed between calls to the
@@ -279,16 +277,6 @@ typedef struct KINMemRec {
   void *kin_eh_data;           /* dats pointer passed to ehfun                 */
   FILE *kin_errfp;             /* KINSOL error messages are sent to errfp      */
 
-  KINInfoHandlerFn kin_ihfun;  /* Info messages are handled by ihfun           */
-  void *kin_ih_data;           /* dats pointer passed to ihfun                 */
-  FILE *kin_infofp;            /* where KINSol info messages are sent          */
-
-  /*---------
-    Debugging
-    ---------*/
-
-  FILE *kin_debugfp; /* debugging output file */
-
 } *KINMem;
 
 /*
@@ -432,7 +420,6 @@ void KINInfoHandler(const char *module, const char *function,
 #define MSG_FUNC_NULL          "func = NULL illegal."
 #define MSG_NO_MALLOC          "Attempt to call before KINMalloc illegal."
 
-#define MSG_BAD_PRINTFL        "Illegal value for printfl."
 #define MSG_BAD_MXITER         "Illegal value for mxiter."
 #define MSG_BAD_MSBSET         "Illegal msbset < 0."
 #define MSG_BAD_MSBSETSUB      "Illegal msbsetsub < 0."
diff --git a/src/kinsol/kinsol_io.c b/src/kinsol/kinsol_io.c
index 2e393ee383..e46968053b 100644
--- a/src/kinsol/kinsol_io.c
+++ b/src/kinsol/kinsol_io.c
@@ -85,104 +85,6 @@ int KINSetErrFile(void *kinmem, FILE *errfp)
   return(KIN_SUCCESS);
 }
 
-/*
- * -----------------------------------------------------------------
- * Function : KINSetPrintLevel
- * -----------------------------------------------------------------
- */
-
-int KINSetPrintLevel(void *kinmem, int printfl)
-{
-  KINMem kin_mem;
-
-  if (kinmem == NULL) {
-    KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetPrintLevel", MSG_NO_MEM);
-    return(KIN_MEM_NULL);
-  }
-
-  kin_mem = (KINMem) kinmem;
-
-  if ((printfl < 0) || (printfl > 3)) {
-    KINProcessError(NULL, KIN_ILL_INPUT, "KINSOL", "KINSetPrintLevel", MSG_BAD_PRINTFL);
-    return(KIN_ILL_INPUT);
-  }
-
-  kin_mem->kin_printfl = printfl;
-
-  return(KIN_SUCCESS);
-}
-
-/*
- * -----------------------------------------------------------------
- * KINSetInfoHandlerFn
- * -----------------------------------------------------------------
- */
-
-int KINSetInfoHandlerFn(void *kinmem, KINInfoHandlerFn ihfun, void *ih_data)
-{
-  KINMem kin_mem;
-
-  if (kinmem == NULL) {
-    KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetInfoHandlerFn", MSG_NO_MEM);
-    return(KIN_MEM_NULL);
-  }
-
-  kin_mem = (KINMem) kinmem;
-
-  kin_mem->kin_ihfun = ihfun;
-  kin_mem->kin_ih_data = ih_data;
-
-  return(KIN_SUCCESS);
-}
-
-
-/*
- * -----------------------------------------------------------------
- * Function : KINSetInfoFile
- * DEPRECATED: use SUNLogger_SetInfoFilename instead
- * -----------------------------------------------------------------
- */
-
-int KINSetInfoFile(void *kinmem, FILE *infofp)
-{
-  KINMem kin_mem;
-
-  if (kinmem == NULL) {
-    KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetInfoFile", MSG_NO_MEM);
-    return(KIN_MEM_NULL);
-  }
-
-  kin_mem = (KINMem) kinmem;
-  kin_mem->kin_infofp = infofp;
-
-  return(KIN_SUCCESS);
-}
-
-
-/*
- * -----------------------------------------------------------------
- * Function : KINSetDebugFile
- * DEPRECATED: use SUNLogger_SetDebugFilename instead
- * -----------------------------------------------------------------
- */
-
-int KINSetDebugFile(void *kinmem, FILE *debugfp)
-{
-  KINMem kin_mem;
-
-  if (kinmem == NULL) {
-    KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetDebugFile",
-                    MSG_NO_MEM);
-    return(KIN_MEM_NULL);
-  }
-
-  kin_mem = (KINMem) kinmem;
-  kin_mem->kin_debugfp = debugfp;
-
-  return(KIN_SUCCESS);
-}
-
-
 /*
  * -----------------------------------------------------------------
  * Function : KINSetUserData
diff --git a/src/kinsol/kinsol_ls.c b/src/kinsol/kinsol_ls.c
index 61e9f8f659..59dd1ccb8c 100644
--- a/src/kinsol/kinsol_ls.c
+++ b/src/kinsol/kinsol_ls.c
@@ -1244,9 +1244,11 @@ int kinLsSolve(KINMem kin_mem, N_Vector xx, N_Vector bb,
   if (kinls_mem->LS->ops->numiters)
     nli_inc = SUNLinSolNumIters(kinls_mem->LS);
 
-  if (kinls_mem->iterative && kin_mem->kin_printfl > 2)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  if (kinls_mem->iterative)
     KINPrintInfo(kin_mem, PRNT_NLI, "KINLS", "kinLsSolve",
                  INFO_NLI, nli_inc);
+#endif
 
   /* Increment counters nli and ncfl */
   kinls_mem->nli += nli_inc;
@@ -1325,9 +1327,11 @@ int kinLsSolve(KINMem kin_mem, N_Vector xx, N_Vector bb,
     }
   }
 
-  if (kin_mem->kin_inexact_ls && kin_mem->kin_printfl > 2)
+#if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGLEVEL_INFO
+  if (kin_mem->kin_inexact_ls)
     KINPrintInfo(kin_mem, PRNT_EPS, "KINLS", "kinLsSolve",
                  INFO_EPS, res_norm, kin_mem->kin_eps);
+#endif
 
   return(0);
 }
diff --git a/src/kinsol/kinsol_spils.c b/src/kinsol/kinsol_spils.c
deleted file mode 100644
index aad4005762..0000000000
--- a/src/kinsol/kinsol_spils.c
+++ /dev/null
@@ -1,73 +0,0 @@
-/*-----------------------------------------------------------------
- * Programmer(s): Daniel R. Reynolds @ SMU
- *                Scott Cohen, Alan Hindmarsh, Radu Serban, 
- *                  and Aaron Collier @ LLNL
- *-----------------------------------------------------------------
- * SUNDIALS Copyright Start
- * Copyright (c) 2002-2023, Lawrence Livermore National Security
- * and Southern Methodist University.
- * All rights reserved.
- *
- * See the top-level LICENSE and NOTICE files for details.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- * SUNDIALS Copyright End
- *-----------------------------------------------------------------
- * Header file for the deprecated Scaled Preconditioned Iterative 
- * Linear Solver interface in KINSOL; these routines now just wrap 
- * the updated KINSOL generic linear solver interface in kinsol_ls.h.
- *-----------------------------------------------------------------*/
-
-#include <kinsol/kinsol_ls.h>
-#include <kinsol/kinsol_spils.h>
-
-#ifdef __cplusplus  /* wrapper to enable C++ usage */
-extern "C" {
-#endif
-
-/*=================================================================
-  Exported Functions (wrappers for equivalent routines in kinsol_ls.h)
-  =================================================================*/
-
-int KINSpilsSetLinearSolver(void *kinmem, SUNLinearSolver LS)
-{ return(KINSetLinearSolver(kinmem, LS, NULL)); }
-
-int KINSpilsSetPreconditioner(void *kinmem, KINSpilsPrecSetupFn psetup,
-                              KINSpilsPrecSolveFn psolve)
-{ return(KINSetPreconditioner(kinmem, psetup, psolve)); }
-  
-int KINSpilsSetJacTimesVecFn(void *kinmem, KINSpilsJacTimesVecFn jtv)
-{ return(KINSetJacTimesVecFn(kinmem, jtv)); }
-
-int KINSpilsGetWorkSpace(void *kinmem, long int *lenrwLS, long int *leniwLS)
-{ return(KINGetLinWorkSpace(kinmem, lenrwLS, leniwLS)); }
-  
-int KINSpilsGetNumPrecEvals(void *kinmem, long int *npevals)
-{ return(KINGetNumPrecEvals(kinmem, npevals)); }
-  
-int KINSpilsGetNumPrecSolves(void *kinmem, long int *npsolves)
-{ return(KINGetNumPrecSolves(kinmem, npsolves)); }
-  
-int KINSpilsGetNumLinIters(void *kinmem, long int *nliters)
-{ return(KINGetNumLinIters(kinmem, nliters)); }
-  
-int KINSpilsGetNumConvFails(void *kinmem, long int *nlcfails)
-{ return(KINGetNumLinConvFails(kinmem, nlcfails)); }
-  
-int KINSpilsGetNumJtimesEvals(void *kinmem, long int *njvevals)
-{ return(KINGetNumJtimesEvals(kinmem, njvevals)); }
-  
-int KINSpilsGetNumFuncEvals(void *kinmem, long int *nfevals)
-{ return(KINGetNumLinFuncEvals(kinmem, nfevals)); }
-  
-int KINSpilsGetLastFlag(void *kinmem, long int *flag)
-{ return(KINGetLastLinFlag(kinmem, flag)); }
-  
-char *KINSpilsGetReturnFlagName(long int flag)
-{ return(KINGetLinReturnFlagName(flag)); }
-
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/src/nvector/openmp/fmod/fnvector_openmp_mod.c b/src/nvector/openmp/fmod/fnvector_openmp_mod.c
index 4216804206..91edfc2791 100644
--- a/src/nvector/openmp/fmod/fnvector_openmp_mod.c
+++ b/src/nvector/openmp/fmod/fnvector_openmp_mod.c
@@ -946,44 +946,6 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector farg1, in
 }
 
 
-SWIGEXPORT void * _wrap_FN_VCloneVectorArray_OpenMP(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArray_OpenMP(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void * _wrap_FN_VCloneVectorArrayEmpty_OpenMP(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArrayEmpty_OpenMP(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void _wrap_FN_VDestroyVectorArray_OpenMP(void *farg1, int const *farg2) {
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  int arg2 ;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (int)(*farg2);
-  N_VDestroyVectorArray_OpenMP(arg1,arg2);
-}
-
-
 
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_OpenMP(N_Vector farg1) {
   double * fresult ;
diff --git a/src/nvector/openmp/fmod/fnvector_openmp_mod.f90 b/src/nvector/openmp/fmod/fnvector_openmp_mod.f90
index 8518caf673..ab547e6c94 100644
--- a/src/nvector/openmp/fmod/fnvector_openmp_mod.f90
+++ b/src/nvector/openmp/fmod/fnvector_openmp_mod.f90
@@ -80,9 +80,6 @@ module fnvector_openmp_mod
  public :: FN_VEnableConstVectorArray_OpenMP
  public :: FN_VEnableWrmsNormVectorArray_OpenMP
  public :: FN_VEnableWrmsNormMaskVectorArray_OpenMP
- public :: FN_VCloneVectorArray_OpenMP
- public :: FN_VCloneVectorArrayEmpty_OpenMP
- public :: FN_VDestroyVectorArray_OpenMP
 
  public :: FN_VGetArrayPointer_OpenMP
 
@@ -564,31 +561,6 @@ function swigc_FN_VEnableWrmsNormMaskVectorArray_OpenMP(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FN_VCloneVectorArray_OpenMP(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArray_OpenMP") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-function swigc_FN_VCloneVectorArrayEmpty_OpenMP(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArrayEmpty_OpenMP") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-subroutine swigc_FN_VDestroyVectorArray_OpenMP(farg1, farg2) &
-bind(C, name="_wrap_FN_VDestroyVectorArray_OpenMP")
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-end subroutine
-
 
 function swigc_FN_VGetArrayPointer_OpenMP(farg1) &
 bind(C, name="_wrap_FN_VGetArrayPointer_OpenMP") &
@@ -1473,50 +1445,6 @@ function FN_VEnableWrmsNormMaskVectorArray_OpenMP(v, tf) &
 swig_result = fresult
 end function
 
-function FN_VCloneVectorArray_OpenMP(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArray_OpenMP(farg1, farg2)
-swig_result = fresult
-end function
-
-function FN_VCloneVectorArrayEmpty_OpenMP(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArrayEmpty_OpenMP(farg1, farg2)
-swig_result = fresult
-end function
-
-subroutine FN_VDestroyVectorArray_OpenMP(vs, count)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: vs
-integer(C_INT), intent(in) :: count
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = vs
-farg2 = count
-call swigc_FN_VDestroyVectorArray_OpenMP(farg1, farg2)
-end subroutine
-
 
 function FN_VGetArrayPointer_OpenMP(v) &
 result(swig_result)
diff --git a/src/nvector/openmp/nvector_openmp.c b/src/nvector/openmp/nvector_openmp.c
index d9d3889493..5b8db6e85a 100644
--- a/src/nvector/openmp/nvector_openmp.c
+++ b/src/nvector/openmp/nvector_openmp.c
@@ -219,25 +219,6 @@ N_Vector* N_VCloneVectorArray_OpenMP(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------------------
- * Function to create an array of new vectors with NULL data array.
- */
-
-N_Vector* N_VCloneVectorArrayEmpty_OpenMP(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_OpenMP
- */
-
-void N_VDestroyVectorArray_OpenMP(N_Vector* vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------------------
  * Function to return number of vector elements
  */
diff --git a/src/nvector/openmpdev/nvector_openmpdev.c b/src/nvector/openmpdev/nvector_openmpdev.c
index 7b8d46bf9b..3d4ccd8355 100644
--- a/src/nvector/openmpdev/nvector_openmpdev.c
+++ b/src/nvector/openmpdev/nvector_openmpdev.c
@@ -230,25 +230,6 @@ N_Vector *N_VCloneVectorArray_OpenMPDEV(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------------------
- * Function to create an array of new vectors with NULL data array.
- */
-
-N_Vector *N_VCloneVectorArrayEmpty_OpenMPDEV(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_OpenMPDEV
- */
-
-void N_VDestroyVectorArray_OpenMPDEV(N_Vector *vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------------------
  * Function to return number of vector elements
  */
diff --git a/src/nvector/parallel/fmod/fnvector_parallel_mod.c b/src/nvector/parallel/fmod/fnvector_parallel_mod.c
index cc4244981e..c2668e3c4c 100644
--- a/src/nvector/parallel/fmod/fnvector_parallel_mod.c
+++ b/src/nvector/parallel/fmod/fnvector_parallel_mod.c
@@ -1130,44 +1130,6 @@ SWIGEXPORT int _wrap_FN_VEnableDotProdMultiLocal_Parallel(N_Vector farg1, int co
 }
 
 
-SWIGEXPORT void * _wrap_FN_VCloneVectorArray_Parallel(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArray_Parallel(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void * _wrap_FN_VCloneVectorArrayEmpty_Parallel(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArrayEmpty_Parallel(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void _wrap_FN_VDestroyVectorArray_Parallel(void *farg1, int const *farg2) {
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  int arg2 ;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (int)(*farg2);
-  N_VDestroyVectorArray_Parallel(arg1,arg2);
-}
-
-
 
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Parallel(N_Vector farg1) {
   double * fresult ;
diff --git a/src/nvector/parallel/fmod/fnvector_parallel_mod.f90 b/src/nvector/parallel/fmod/fnvector_parallel_mod.f90
index d8e7fcb23e..43fb070b88 100644
--- a/src/nvector/parallel/fmod/fnvector_parallel_mod.f90
+++ b/src/nvector/parallel/fmod/fnvector_parallel_mod.f90
@@ -92,9 +92,6 @@ module fnvector_parallel_mod
  public :: FN_VEnableWrmsNormVectorArray_Parallel
  public :: FN_VEnableWrmsNormMaskVectorArray_Parallel
  public :: FN_VEnableDotProdMultiLocal_Parallel
- public :: FN_VCloneVectorArray_Parallel
- public :: FN_VCloneVectorArrayEmpty_Parallel
- public :: FN_VDestroyVectorArray_Parallel
 
  public :: FN_VGetArrayPointer_Parallel
 
@@ -686,31 +683,6 @@ function swigc_FN_VEnableDotProdMultiLocal_Parallel(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FN_VCloneVectorArray_Parallel(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArray_Parallel") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-function swigc_FN_VCloneVectorArrayEmpty_Parallel(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArrayEmpty_Parallel") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-subroutine swigc_FN_VDestroyVectorArray_Parallel(farg1, farg2) &
-bind(C, name="_wrap_FN_VDestroyVectorArray_Parallel")
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-end subroutine
-
 
 function swigc_FN_VGetArrayPointer_Parallel(farg1) &
 bind(C, name="_wrap_FN_VGetArrayPointer_Parallel") &
@@ -1793,50 +1765,6 @@ function FN_VEnableDotProdMultiLocal_Parallel(v, tf) &
 swig_result = fresult
 end function
 
-function FN_VCloneVectorArray_Parallel(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArray_Parallel(farg1, farg2)
-swig_result = fresult
-end function
-
-function FN_VCloneVectorArrayEmpty_Parallel(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArrayEmpty_Parallel(farg1, farg2)
-swig_result = fresult
-end function
-
-subroutine FN_VDestroyVectorArray_Parallel(vs, count)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: vs
-integer(C_INT), intent(in) :: count
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = vs
-farg2 = count
-call swigc_FN_VDestroyVectorArray_Parallel(farg1, farg2)
-end subroutine
-
 
 function FN_VGetArrayPointer_Parallel(v) &
 result(swig_result)
diff --git a/src/nvector/parallel/nvector_parallel.c b/src/nvector/parallel/nvector_parallel.c
index 88dee009e6..097e2cd1ee 100644
--- a/src/nvector/parallel/nvector_parallel.c
+++ b/src/nvector/parallel/nvector_parallel.c
@@ -241,26 +241,6 @@ N_Vector* N_VCloneVectorArray_Parallel(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------
- * Function to create an array of new parallel vectors with empty
- * (NULL) data array.
- */
-
-N_Vector* N_VCloneVectorArrayEmpty_Parallel(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_Parallel
- */
-
-void N_VDestroyVectorArray_Parallel(N_Vector* vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------
  * Function to return global vector length
  */
diff --git a/src/nvector/parhyp/nvector_parhyp.c b/src/nvector/parhyp/nvector_parhyp.c
index c5a7983c7c..5397f0308b 100644
--- a/src/nvector/parhyp/nvector_parhyp.c
+++ b/src/nvector/parhyp/nvector_parhyp.c
@@ -266,27 +266,6 @@ N_Vector *N_VCloneVectorArray_ParHyp(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------
- * Function to create an array of new parhyp vector wrappers
- * without uderlying HYPRE vectors.
- */
-
-N_Vector *N_VCloneVectorArrayEmpty_ParHyp(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_ParHyp
- */
-
-void N_VDestroyVectorArray_ParHyp(N_Vector *vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
-
 /* ----------------------------------------------------------------
  * Extract HYPRE vector
  */
diff --git a/src/nvector/petsc/nvector_petsc.c b/src/nvector/petsc/nvector_petsc.c
index 0cd81a84c8..3dbff29050 100644
--- a/src/nvector/petsc/nvector_petsc.c
+++ b/src/nvector/petsc/nvector_petsc.c
@@ -248,26 +248,6 @@ N_Vector *N_VCloneVectorArray_Petsc(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------
- * Function to create an array of new PETSc vector wrappers with
- * empty (NULL) PETSc vectors.
- */
-
-N_Vector *N_VCloneVectorArrayEmpty_Petsc(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_Petsc
- */
-
-void N_VDestroyVectorArray_Petsc(N_Vector *vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------
  * Function to extract PETSc vector
  */
diff --git a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
index d34088af42..73c8ca0c51 100644
--- a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
+++ b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
@@ -946,44 +946,6 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector farg1,
 }
 
 
-SWIGEXPORT void * _wrap_FN_VCloneVectorArray_Pthreads(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArray_Pthreads(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void * _wrap_FN_VCloneVectorArrayEmpty_Pthreads(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArrayEmpty_Pthreads(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void _wrap_FN_VDestroyVectorArray_Pthreads(void *farg1, int const *farg2) {
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  int arg2 ;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (int)(*farg2);
-  N_VDestroyVectorArray_Pthreads(arg1,arg2);
-}
-
-
 
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Pthreads(N_Vector farg1) {
   double * fresult ;
diff --git a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90 b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90
index 4456bf0f8a..40fac42471 100644
--- a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90
+++ b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90
@@ -80,9 +80,6 @@ module fnvector_pthreads_mod
  public :: FN_VEnableConstVectorArray_Pthreads
  public :: FN_VEnableWrmsNormVectorArray_Pthreads
  public :: FN_VEnableWrmsNormMaskVectorArray_Pthreads
- public :: FN_VCloneVectorArray_Pthreads
- public :: FN_VCloneVectorArrayEmpty_Pthreads
- public :: FN_VDestroyVectorArray_Pthreads
 
  public :: FN_VGetArrayPointer_Pthreads
 
@@ -564,31 +561,6 @@ function swigc_FN_VEnableWrmsNormMaskVectorArray_Pthreads(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FN_VCloneVectorArray_Pthreads(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArray_Pthreads") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-function swigc_FN_VCloneVectorArrayEmpty_Pthreads(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArrayEmpty_Pthreads") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-subroutine swigc_FN_VDestroyVectorArray_Pthreads(farg1, farg2) &
-bind(C, name="_wrap_FN_VDestroyVectorArray_Pthreads")
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-end subroutine
-
 
 function swigc_FN_VGetArrayPointer_Pthreads(farg1) &
 bind(C, name="_wrap_FN_VGetArrayPointer_Pthreads") &
@@ -1473,50 +1445,6 @@ function FN_VEnableWrmsNormMaskVectorArray_Pthreads(v, tf) &
 swig_result = fresult
 end function
 
-function FN_VCloneVectorArray_Pthreads(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArray_Pthreads(farg1, farg2)
-swig_result = fresult
-end function
-
-function FN_VCloneVectorArrayEmpty_Pthreads(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArrayEmpty_Pthreads(farg1, farg2)
-swig_result = fresult
-end function
-
-subroutine FN_VDestroyVectorArray_Pthreads(vs, count)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: vs
-integer(C_INT), intent(in) :: count
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = vs
-farg2 = count
-call swigc_FN_VDestroyVectorArray_Pthreads(farg1, farg2)
-end subroutine
-
 
 function FN_VGetArrayPointer_Pthreads(v) &
 result(swig_result)
diff --git a/src/nvector/pthreads/nvector_pthreads.c b/src/nvector/pthreads/nvector_pthreads.c
index 62093e6363..d4b3b10caa 100644
--- a/src/nvector/pthreads/nvector_pthreads.c
+++ b/src/nvector/pthreads/nvector_pthreads.c
@@ -289,25 +289,6 @@ N_Vector* N_VCloneVectorArray_Pthreads(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------------------
- * Function to create an array of new vectors with NULL data array.
- */
-
-N_Vector* N_VCloneVectorArrayEmpty_Pthreads(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_Pthreads
- */
-
-void N_VDestroyVectorArray_Pthreads(N_Vector* vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------------------
  * Function to return number of vector elements
  */
diff --git a/src/nvector/serial/fmod/fnvector_serial_mod.c b/src/nvector/serial/fmod/fnvector_serial_mod.c
index ed9a774185..591ee2c0f7 100644
--- a/src/nvector/serial/fmod/fnvector_serial_mod.c
+++ b/src/nvector/serial/fmod/fnvector_serial_mod.c
@@ -940,44 +940,6 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_Serial(N_Vector farg1, in
 }
 
 
-SWIGEXPORT void * _wrap_FN_VCloneVectorArray_Serial(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArray_Serial(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void * _wrap_FN_VCloneVectorArrayEmpty_Serial(int const *farg1, N_Vector farg2) {
-  void * fresult ;
-  int arg1 ;
-  N_Vector arg2 = (N_Vector) 0 ;
-  N_Vector *result = 0 ;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (N_Vector)(farg2);
-  result = (N_Vector *)N_VCloneVectorArrayEmpty_Serial(arg1,arg2);
-  fresult = result;
-  return fresult;
-}
-
-
-SWIGEXPORT void _wrap_FN_VDestroyVectorArray_Serial(void *farg1, int const *farg2) {
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  int arg2 ;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (int)(*farg2);
-  N_VDestroyVectorArray_Serial(arg1,arg2);
-}
-
-
 
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Serial(N_Vector farg1) {
   double * fresult ;
diff --git a/src/nvector/serial/fmod/fnvector_serial_mod.f90 b/src/nvector/serial/fmod/fnvector_serial_mod.f90
index 97b2660ec9..8bf8ca4fd9 100644
--- a/src/nvector/serial/fmod/fnvector_serial_mod.f90
+++ b/src/nvector/serial/fmod/fnvector_serial_mod.f90
@@ -80,9 +80,6 @@ module fnvector_serial_mod
  public :: FN_VEnableConstVectorArray_Serial
  public :: FN_VEnableWrmsNormVectorArray_Serial
  public :: FN_VEnableWrmsNormMaskVectorArray_Serial
- public :: FN_VCloneVectorArray_Serial
- public :: FN_VCloneVectorArrayEmpty_Serial
- public :: FN_VDestroyVectorArray_Serial
 
  public :: FN_VGetArrayPointer_Serial
 
@@ -561,31 +558,6 @@ function swigc_FN_VEnableWrmsNormMaskVectorArray_Serial(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FN_VCloneVectorArray_Serial(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArray_Serial") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-function swigc_FN_VCloneVectorArrayEmpty_Serial(farg1, farg2) &
-bind(C, name="_wrap_FN_VCloneVectorArrayEmpty_Serial") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR) :: fresult
-end function
-
-subroutine swigc_FN_VDestroyVectorArray_Serial(farg1, farg2) &
-bind(C, name="_wrap_FN_VDestroyVectorArray_Serial")
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-end subroutine
-
 
 function swigc_FN_VGetArrayPointer_Serial(farg1) &
 bind(C, name="_wrap_FN_VGetArrayPointer_Serial") &
@@ -1461,50 +1433,6 @@ function FN_VEnableWrmsNormMaskVectorArray_Serial(v, tf) &
 swig_result = fresult
 end function
 
-function FN_VCloneVectorArray_Serial(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArray_Serial(farg1, farg2)
-swig_result = fresult
-end function
-
-function FN_VCloneVectorArrayEmpty_Serial(count, w) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: swig_result
-integer(C_INT), intent(in) :: count
-type(N_Vector), target, intent(inout) :: w
-type(C_PTR) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = count
-farg2 = c_loc(w)
-fresult = swigc_FN_VCloneVectorArrayEmpty_Serial(farg1, farg2)
-swig_result = fresult
-end function
-
-subroutine FN_VDestroyVectorArray_Serial(vs, count)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR) :: vs
-integer(C_INT), intent(in) :: count
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = vs
-farg2 = count
-call swigc_FN_VDestroyVectorArray_Serial(farg1, farg2)
-end subroutine
-
 
 function FN_VGetArrayPointer_Serial(v) &
 result(swig_result)
diff --git a/src/nvector/serial/nvector_serial.c b/src/nvector/serial/nvector_serial.c
index 980363fbb6..43ced7bc82 100644
--- a/src/nvector/serial/nvector_serial.c
+++ b/src/nvector/serial/nvector_serial.c
@@ -213,25 +213,6 @@ N_Vector* N_VCloneVectorArray_Serial(int count, N_Vector w)
   return(N_VCloneVectorArray(count, w));
 }
 
-/* ----------------------------------------------------------------------------
- * Function to create an array of new serial vectors with NULL data array.
- */
-
-N_Vector* N_VCloneVectorArrayEmpty_Serial(int count, N_Vector w)
-{
-  return(N_VCloneEmptyVectorArray(count, w));
-}
-
-/* ----------------------------------------------------------------------------
- * Function to free an array created with N_VCloneVectorArray_Serial
- */
-
-void N_VDestroyVectorArray_Serial(N_Vector* vs, int count)
-{
-  N_VDestroyVectorArray(vs, count);
-  return;
-}
-
 /* ----------------------------------------------------------------------------
  * Function to return number of vector elements
  */
diff --git a/src/sundials/CMakeLists.txt b/src/sundials/CMakeLists.txt
index df5af04cd6..d782ef0103 100644
--- a/src/sundials/CMakeLists.txt
+++ b/src/sundials/CMakeLists.txt
@@ -65,11 +65,6 @@ if(ENABLE_SYCL)
   list(APPEND sundials_HEADERS sundials_sycl_policies.hpp)
 endif()
 
-# If Blas/Lapack support was enabled, add the Lapack interface headers
-if(BUILD_SUNLINSOL_LAPACKBAND OR BUILD_SUNLINSOL_LAPACKDENSE)
-  list(APPEND sundials_HEADERS sundials_lapack.h)
-endif()
-
 # If enabled, add the XBraid interface header
 if(ENABLE_XBRAID)
   list(APPEND sundials_HEADERS sundials_xbraid.h)
diff --git a/src/sundials/fmod/fsundials_linearsolver_mod.c b/src/sundials/fmod/fsundials_linearsolver_mod.c
index c755ea1949..9c6ed9076e 100644
--- a/src/sundials/fmod/fsundials_linearsolver_mod.c
+++ b/src/sundials/fmod/fsundials_linearsolver_mod.c
@@ -211,26 +211,6 @@ SWIGEXPORT int _wrap_FSUNModifiedGS(void *farg1, void *farg2, int const *farg3,
 }
 
 
-SWIGEXPORT int _wrap_FModifiedGS(void *farg1, void *farg2, int const *farg3, int const *farg4, double *farg5) {
-  int fresult ;
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype **arg2 = (realtype **) 0 ;
-  int arg3 ;
-  int arg4 ;
-  realtype *arg5 = (realtype *) 0 ;
-  int result;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (int)(*farg3);
-  arg4 = (int)(*farg4);
-  arg5 = (realtype *)(farg5);
-  result = (int)ModifiedGS(arg1,arg2,arg3,arg4,arg5);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FSUNClassicalGS(void *farg1, void *farg2, int const *farg3, int const *farg4, double *farg5, double *farg6, void *farg7) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
@@ -255,30 +235,6 @@ SWIGEXPORT int _wrap_FSUNClassicalGS(void *farg1, void *farg2, int const *farg3,
 }
 
 
-SWIGEXPORT int _wrap_FClassicalGS(void *farg1, void *farg2, int const *farg3, int const *farg4, double *farg5, double *farg6, void *farg7) {
-  int fresult ;
-  N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype **arg2 = (realtype **) 0 ;
-  int arg3 ;
-  int arg4 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
-  N_Vector *arg7 = (N_Vector *) 0 ;
-  int result;
-  
-  arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (int)(*farg3);
-  arg4 = (int)(*farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
-  arg7 = (N_Vector *)(farg7);
-  result = (int)ClassicalGS(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FSUNQRfact(int const *farg1, void *farg2, double *farg3, int const *farg4) {
   int fresult ;
   int arg1 ;
@@ -297,24 +253,6 @@ SWIGEXPORT int _wrap_FSUNQRfact(int const *farg1, void *farg2, double *farg3, in
 }
 
 
-SWIGEXPORT int _wrap_FQRfact(int const *farg1, void *farg2, double *farg3, int const *farg4) {
-  int fresult ;
-  int arg1 ;
-  realtype **arg2 = (realtype **) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  int arg4 ;
-  int result;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (int)(*farg4);
-  result = (int)QRfact(arg1,arg2,arg3,arg4);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FSUNQRsol(int const *farg1, void *farg2, double *farg3, double *farg4) {
   int fresult ;
   int arg1 ;
@@ -333,24 +271,6 @@ SWIGEXPORT int _wrap_FSUNQRsol(int const *farg1, void *farg2, double *farg3, dou
 }
 
 
-SWIGEXPORT int _wrap_FQRsol(int const *farg1, void *farg2, double *farg3, double *farg4) {
-  int fresult ;
-  int arg1 ;
-  realtype **arg2 = (realtype **) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
-  int result;
-  
-  arg1 = (int)(*farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (realtype *)(farg4);
-  result = (int)QRsol(arg1,arg2,arg3,arg4);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 SWIGEXPORT int _wrap_FSUNQRAdd_MGS(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
diff --git a/src/sundials/fmod/fsundials_linearsolver_mod.f90 b/src/sundials/fmod/fsundials_linearsolver_mod.f90
index e5fc92eb13..2c4272768e 100644
--- a/src/sundials/fmod/fsundials_linearsolver_mod.f90
+++ b/src/sundials/fmod/fsundials_linearsolver_mod.f90
@@ -18,13 +18,6 @@ module fsundials_linearsolver_mod
  private
 
  ! DECLARATION CONSTRUCTS
- enum, bind(c)
-  enumerator :: PREC_NONE
-  enumerator :: PREC_LEFT
-  enumerator :: PREC_RIGHT
-  enumerator :: PREC_BOTH
- end enum
- public :: PREC_NONE, PREC_LEFT, PREC_RIGHT, PREC_BOTH
  enum, bind(c)
   enumerator :: SUN_PREC_NONE
   enumerator :: SUN_PREC_LEFT
@@ -32,24 +25,15 @@ module fsundials_linearsolver_mod
   enumerator :: SUN_PREC_BOTH
  end enum
  public :: SUN_PREC_NONE, SUN_PREC_LEFT, SUN_PREC_RIGHT, SUN_PREC_BOTH
- enum, bind(c)
-  enumerator :: MODIFIED_GS = 1
-  enumerator :: CLASSICAL_GS = 2
- end enum
- public :: MODIFIED_GS, CLASSICAL_GS
  enum, bind(c)
   enumerator :: SUN_MODIFIED_GS = 1
   enumerator :: SUN_CLASSICAL_GS = 2
  end enum
  public :: SUN_MODIFIED_GS, SUN_CLASSICAL_GS
  public :: FSUNModifiedGS
- public :: FModifiedGS
  public :: FSUNClassicalGS
- public :: FClassicalGS
  public :: FSUNQRfact
- public :: FQRfact
  public :: FSUNQRsol
- public :: FQRsol
  public :: FSUNQRAdd_MGS
  public :: FSUNQRAdd_ICWY
  public :: FSUNQRAdd_ICWY_SB
@@ -170,18 +154,6 @@ function swigc_FSUNModifiedGS(farg1, farg2, farg3, farg4, farg5) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FModifiedGS(farg1, farg2, farg3, farg4, farg5) &
-bind(C, name="_wrap_FModifiedGS") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT), intent(in) :: farg3
-integer(C_INT), intent(in) :: farg4
-type(C_PTR), value :: farg5
-integer(C_INT) :: fresult
-end function
-
 function swigc_FSUNClassicalGS(farg1, farg2, farg3, farg4, farg5, farg6, farg7) &
 bind(C, name="_wrap_FSUNClassicalGS") &
 result(fresult)
@@ -196,20 +168,6 @@ function swigc_FSUNClassicalGS(farg1, farg2, farg3, farg4, farg5, farg6, farg7)
 integer(C_INT) :: fresult
 end function
 
-function swigc_FClassicalGS(farg1, farg2, farg3, farg4, farg5, farg6, farg7) &
-bind(C, name="_wrap_FClassicalGS") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT), intent(in) :: farg3
-integer(C_INT), intent(in) :: farg4
-type(C_PTR), value :: farg5
-type(C_PTR), value :: farg6
-type(C_PTR), value :: farg7
-integer(C_INT) :: fresult
-end function
-
 function swigc_FSUNQRfact(farg1, farg2, farg3, farg4) &
 bind(C, name="_wrap_FSUNQRfact") &
 result(fresult)
@@ -221,17 +179,6 @@ function swigc_FSUNQRfact(farg1, farg2, farg3, farg4) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FQRfact(farg1, farg2, farg3, farg4) &
-bind(C, name="_wrap_FQRfact") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR), value :: farg3
-integer(C_INT), intent(in) :: farg4
-integer(C_INT) :: fresult
-end function
-
 function swigc_FSUNQRsol(farg1, farg2, farg3, farg4) &
 bind(C, name="_wrap_FSUNQRsol") &
 result(fresult)
@@ -243,17 +190,6 @@ function swigc_FSUNQRsol(farg1, farg2, farg3, farg4) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FQRsol(farg1, farg2, farg3, farg4) &
-bind(C, name="_wrap_FQRsol") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT), intent(in) :: farg1
-type(C_PTR), value :: farg2
-type(C_PTR), value :: farg3
-type(C_PTR), value :: farg4
-integer(C_INT) :: fresult
-end function
-
 function swigc_FSUNQRAdd_MGS(farg1, farg2, farg3, farg4, farg5, farg6) &
 bind(C, name="_wrap_FSUNQRAdd_MGS") &
 result(fresult)
@@ -511,31 +447,6 @@ function FSUNModifiedGS(v, h, k, p, new_vk_norm) &
 swig_result = fresult
 end function
 
-function FModifiedGS(v, h, k, p, new_vk_norm) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: v
-type(C_PTR), target, intent(inout) :: h
-integer(C_INT), intent(in) :: k
-integer(C_INT), intent(in) :: p
-real(C_DOUBLE), dimension(*), target, intent(inout) :: new_vk_norm
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-integer(C_INT) :: farg3 
-integer(C_INT) :: farg4 
-type(C_PTR) :: farg5 
-
-farg1 = v
-farg2 = c_loc(h)
-farg3 = k
-farg4 = p
-farg5 = c_loc(new_vk_norm(1))
-fresult = swigc_FModifiedGS(farg1, farg2, farg3, farg4, farg5)
-swig_result = fresult
-end function
-
 function FSUNClassicalGS(v, h, k, p, new_vk_norm, stemp, vtemp) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
@@ -567,37 +478,6 @@ function FSUNClassicalGS(v, h, k, p, new_vk_norm, stemp, vtemp) &
 swig_result = fresult
 end function
 
-function FClassicalGS(v, h, k, p, new_vk_norm, stemp, vtemp) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(C_PTR) :: v
-type(C_PTR), target, intent(inout) :: h
-integer(C_INT), intent(in) :: k
-integer(C_INT), intent(in) :: p
-real(C_DOUBLE), dimension(*), target, intent(inout) :: new_vk_norm
-real(C_DOUBLE), dimension(*), target, intent(inout) :: stemp
-type(C_PTR) :: vtemp
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-integer(C_INT) :: farg3 
-integer(C_INT) :: farg4 
-type(C_PTR) :: farg5 
-type(C_PTR) :: farg6 
-type(C_PTR) :: farg7 
-
-farg1 = v
-farg2 = c_loc(h)
-farg3 = k
-farg4 = p
-farg5 = c_loc(new_vk_norm(1))
-farg6 = c_loc(stemp(1))
-farg7 = vtemp
-fresult = swigc_FClassicalGS(farg1, farg2, farg3, farg4, farg5, farg6, farg7)
-swig_result = fresult
-end function
-
 function FSUNQRfact(n, h, q, job) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
@@ -620,28 +500,6 @@ function FSUNQRfact(n, h, q, job) &
 swig_result = fresult
 end function
 
-function FQRfact(n, h, q, job) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-integer(C_INT), intent(in) :: n
-type(C_PTR), target, intent(inout) :: h
-real(C_DOUBLE), dimension(*), target, intent(inout) :: q
-integer(C_INT), intent(in) :: job
-integer(C_INT) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-type(C_PTR) :: farg3 
-integer(C_INT) :: farg4 
-
-farg1 = n
-farg2 = c_loc(h)
-farg3 = c_loc(q(1))
-farg4 = job
-fresult = swigc_FQRfact(farg1, farg2, farg3, farg4)
-swig_result = fresult
-end function
-
 function FSUNQRsol(n, h, q, b) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
@@ -664,28 +522,6 @@ function FSUNQRsol(n, h, q, b) &
 swig_result = fresult
 end function
 
-function FQRsol(n, h, q, b) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-integer(C_INT), intent(in) :: n
-type(C_PTR), target, intent(inout) :: h
-real(C_DOUBLE), dimension(*), target, intent(inout) :: q
-real(C_DOUBLE), dimension(*), target, intent(inout) :: b
-integer(C_INT) :: fresult 
-integer(C_INT) :: farg1 
-type(C_PTR) :: farg2 
-type(C_PTR) :: farg3 
-type(C_PTR) :: farg4 
-
-farg1 = n
-farg2 = c_loc(h)
-farg3 = c_loc(q(1))
-farg4 = c_loc(b(1))
-fresult = swigc_FQRsol(farg1, farg2, farg3, farg4)
-swig_result = fresult
-end function
-
 function FSUNQRAdd_MGS(q, r, df, m, mmax, qrdata) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
diff --git a/src/sundials/sundials_logger.c b/src/sundials/sundials_logger.c
index b0ae437223..ce4769c76f 100644
--- a/src/sundials/sundials_logger.c
+++ b/src/sundials/sundials_logger.c
@@ -143,7 +143,7 @@ static sunbooleantype sunLoggerIsOutputRank(SUNLogger logger, int* rank_ref)
 #else
   if (rank_ref)
   {
-    *rank_ref = -1;
+    *rank_ref = 0;
   }
   retval = SUNTRUE;
 #endif
@@ -254,13 +254,6 @@ int SUNLogger_SetErrorFilename(SUNLogger logger, const char* error_filename)
         return -1;
       }
     }
-#else
-    fprintf(stderr,
-            "[LOGGER WARNING] "
-            "SUNDIALS_LOGGING_LEVEL=%d (build time option) "
-            "is set too low for ERROR, but a ERROR file was provided. "
-            "Set the logging level to >= %d and recompile if ERROR output level "
-            "is desired.\n", SUN_LOGLEVEL_ERROR, SUNDIALS_LOGGING_LEVEL);
 #endif
   }
 
@@ -300,13 +293,6 @@ int SUNLogger_SetWarningFilename(SUNLogger logger, const char* warning_filename)
         return -1;
       }
     }
-#else
-    fprintf(stderr,
-            "[LOGGER WARNING] "
-            "SUNDIALS_LOGGING_LEVEL=%d (build time option) "
-            "is set too low for WARNING, but a WARNING file was provided. "
-            "Set the logging level to >= %d and recompile if WARNING output "
-            "level is desired.\n", SUN_LOGLEVEL_WARNING, SUNDIALS_LOGGING_LEVEL);
 #endif
   }
 
@@ -346,13 +332,6 @@ int SUNLogger_SetInfoFilename(SUNLogger logger, const char* info_filename)
         return -1;
       }
     }
-#else
-    fprintf(stderr,
-            "[LOGGER WARNING] "
-            "SUNDIALS_LOGGING_LEVEL=%d (build time option) "
-            "is set too low for INFO, but a INFO file was provided. Set the "
-            "logging level to >= %d and recompile if INFO output level is "
-            "desired.\n", SUN_LOGLEVEL_INFO, SUNDIALS_LOGGING_LEVEL);
 #endif
   }
 
@@ -392,13 +371,6 @@ int SUNLogger_SetDebugFilename(SUNLogger logger, const char* debug_filename)
         return -1;
       }
     }
-#else
-    fprintf(stderr,
-            "[LOGGER WARNING] "
-            "SUNDIALS_LOGGING_LEVEL=%d (build time option) "
-            "is set too low for DEBUG output, but a DEBUG file was provided. "
-            "Set the logging level to >= %d and recompile if DEBUG output level "
-            "is desired.\n", SUN_LOGLEVEL_DEBUG, SUNDIALS_LOGGING_LEVEL);
 #endif
   }
 
diff --git a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
index 3bdb6ea15f..68489d3520 100644
--- a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
+++ b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
@@ -464,32 +464,4 @@ SWIGEXPORT int _wrap_FSUNLinSolFree_PCG(SUNLinearSolver farg1) {
 }
 
 
-SWIGEXPORT int _wrap_FSUNLinSolSetInfoFile_PCG(SUNLinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNLinSolSetInfoFile_PCG(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNLinSolSetPrintLevel_PCG(SUNLinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNLinSolSetPrintLevel_PCG(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90 b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90
index faf98e9503..6334343b52 100644
--- a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90
+++ b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.f90
@@ -53,8 +53,6 @@ module fsunlinsol_pcg_mod
  public :: FSUNLinSolLastFlag_PCG
  public :: FSUNLinSolSpace_PCG
  public :: FSUNLinSolFree_PCG
- public :: FSUNLinSolSetInfoFile_PCG
- public :: FSUNLinSolSetPrintLevel_PCG
 
 ! WRAPPER DECLARATIONS
 interface
@@ -222,24 +220,6 @@ function swigc_FSUNLinSolFree_PCG(farg1) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNLinSolSetInfoFile_PCG(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetInfoFile_PCG") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNLinSolSetPrintLevel_PCG(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetPrintLevel_PCG") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -539,37 +519,5 @@ function FSUNLinSolFree_PCG(s) &
 swig_result = fresult
 end function
 
-function FSUNLinSolSetInfoFile_PCG(ls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = info_file
-fresult = swigc_FSUNLinSolSetInfoFile_PCG(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNLinSolSetPrintLevel_PCG(ls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = print_level
-fresult = swigc_FSUNLinSolSetPrintLevel_PCG(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunlinsol/pcg/sunlinsol_pcg.c b/src/sunlinsol/pcg/sunlinsol_pcg.c
index eb21a71da2..46d0a24842 100644
--- a/src/sunlinsol/pcg/sunlinsol_pcg.c
+++ b/src/sunlinsol/pcg/sunlinsol_pcg.c
@@ -577,33 +577,3 @@ int SUNLinSolFree_PCG(SUNLinearSolver S)
   free(S); S = NULL;
   return(SUNLS_SUCCESS);
 }
-
-
-int SUNLinSolSetInfoFile_PCG(SUNLinearSolver S,
-                             FILE* info_file)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  PCG_CONTENT(S)->info_file = info_file;
-
-  return(SUNLS_SUCCESS);
-}
-
-
-int SUNLinSolSetPrintLevel_PCG(SUNLinearSolver S,
-                               int print_level)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUNLS_ILL_INPUT);
-
-  PCG_CONTENT(S)->print_level = print_level;
-
-  return(SUNLS_SUCCESS);
-}
diff --git a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
index 1d58f0c9b1..e6e3e56704 100644
--- a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
+++ b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
@@ -464,32 +464,4 @@ SWIGEXPORT int _wrap_FSUNLinSolFree_SPBCGS(SUNLinearSolver farg1) {
 }
 
 
-SWIGEXPORT int _wrap_FSUNLinSolSetInfoFile_SPBCGS(SUNLinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNLinSolSetInfoFile_SPBCGS(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNLinSolSetPrintLevel_SPBCGS(SUNLinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNLinSolSetPrintLevel_SPBCGS(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.f90 b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.f90
index 301bcf85d5..2159bfe002 100644
--- a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.f90
+++ b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.f90
@@ -53,8 +53,6 @@ module fsunlinsol_spbcgs_mod
  public :: FSUNLinSolLastFlag_SPBCGS
  public :: FSUNLinSolSpace_SPBCGS
  public :: FSUNLinSolFree_SPBCGS
- public :: FSUNLinSolSetInfoFile_SPBCGS
- public :: FSUNLinSolSetPrintLevel_SPBCGS
 
 ! WRAPPER DECLARATIONS
 interface
@@ -222,24 +220,6 @@ function swigc_FSUNLinSolFree_SPBCGS(farg1) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNLinSolSetInfoFile_SPBCGS(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetInfoFile_SPBCGS") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNLinSolSetPrintLevel_SPBCGS(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetPrintLevel_SPBCGS") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -539,37 +519,5 @@ function FSUNLinSolFree_SPBCGS(s) &
 swig_result = fresult
 end function
 
-function FSUNLinSolSetInfoFile_SPBCGS(ls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = info_file
-fresult = swigc_FSUNLinSolSetInfoFile_SPBCGS(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNLinSolSetPrintLevel_SPBCGS(ls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = print_level
-fresult = swigc_FSUNLinSolSetPrintLevel_SPBCGS(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c b/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
index f2e6360251..efdc437f70 100644
--- a/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
+++ b/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
@@ -779,33 +779,3 @@ int SUNLinSolFree_SPBCGS(SUNLinearSolver S)
   free(S); S = NULL;
   return(SUNLS_SUCCESS);
 }
-
-
-int SUNLinSolSetInfoFile_SPBCGS(SUNLinearSolver S,
-                                FILE* info_file)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  SPBCGS_CONTENT(S)->info_file = info_file;
-
-  return(SUNLS_SUCCESS);
-}
-
-
-int SUNLinSolSetPrintLevel_SPBCGS(SUNLinearSolver S,
-                                  int print_level)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUNLS_ILL_INPUT);
-
-  SPBCGS_CONTENT(S)->print_level = print_level;
-
-  return(SUNLS_SUCCESS);
-}
diff --git a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
index 8332d7967a..69904ab23d 100644
--- a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
+++ b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
@@ -478,32 +478,4 @@ SWIGEXPORT int _wrap_FSUNLinSolFree_SPFGMR(SUNLinearSolver farg1) {
 }
 
 
-SWIGEXPORT int _wrap_FSUNLinSolSetInfoFile_SPFGMR(SUNLinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNLinSolSetInfoFile_SPFGMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNLinSolSetPrintLevel_SPFGMR(SUNLinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNLinSolSetPrintLevel_SPFGMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.f90 b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.f90
index f62b8e6dd8..c6ed64bf5b 100644
--- a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.f90
+++ b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.f90
@@ -55,8 +55,6 @@ module fsunlinsol_spfgmr_mod
  public :: FSUNLinSolLastFlag_SPFGMR
  public :: FSUNLinSolSpace_SPFGMR
  public :: FSUNLinSolFree_SPFGMR
- public :: FSUNLinSolSetInfoFile_SPFGMR
- public :: FSUNLinSolSetPrintLevel_SPFGMR
 
 ! WRAPPER DECLARATIONS
 interface
@@ -233,24 +231,6 @@ function swigc_FSUNLinSolFree_SPFGMR(farg1) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNLinSolSetInfoFile_SPFGMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetInfoFile_SPFGMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNLinSolSetPrintLevel_SPFGMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetPrintLevel_SPFGMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -566,37 +546,5 @@ function FSUNLinSolFree_SPFGMR(s) &
 swig_result = fresult
 end function
 
-function FSUNLinSolSetInfoFile_SPFGMR(ls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = info_file
-fresult = swigc_FSUNLinSolSetInfoFile_SPFGMR(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNLinSolSetPrintLevel_SPFGMR(ls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = print_level
-fresult = swigc_FSUNLinSolSetPrintLevel_SPFGMR(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c b/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
index 23ce66f615..ef5e759eee 100644
--- a/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
+++ b/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
@@ -818,34 +818,3 @@ int SUNLinSolFree_SPFGMR(SUNLinearSolver S)
   free(S); S = NULL;
   return(SUNLS_SUCCESS);
 }
-
-
-int SUNLinSolSetInfoFile_SPFGMR(SUNLinearSolver S,
-                                FILE* info_file)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  SPFGMR_CONTENT(S)->info_file = info_file;
-
-  return(SUNLS_SUCCESS);
-}
-
-
-int SUNLinSolSetPrintLevel_SPFGMR(SUNLinearSolver S,
-                                  int print_level)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUNLS_ILL_INPUT);
-
-  SPFGMR_CONTENT(S)->print_level = print_level;
-
-  return(SUNLS_SUCCESS);
-}
-
diff --git a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
index eec1e72e4a..eaa89837b1 100644
--- a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
+++ b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
@@ -478,32 +478,4 @@ SWIGEXPORT int _wrap_FSUNLinSolFree_SPGMR(SUNLinearSolver farg1) {
 }
 
 
-SWIGEXPORT int _wrap_FSUNLinSolSetInfoFile_SPGMR(SUNLinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNLinSolSetInfoFile_SPGMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNLinSolSetPrintLevel_SPGMR(SUNLinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNLinSolSetPrintLevel_SPGMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.f90 b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.f90
index d185bd8d43..77873a000a 100644
--- a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.f90
+++ b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.f90
@@ -55,8 +55,6 @@ module fsunlinsol_spgmr_mod
  public :: FSUNLinSolLastFlag_SPGMR
  public :: FSUNLinSolSpace_SPGMR
  public :: FSUNLinSolFree_SPGMR
- public :: FSUNLinSolSetInfoFile_SPGMR
- public :: FSUNLinSolSetPrintLevel_SPGMR
 
 ! WRAPPER DECLARATIONS
 interface
@@ -233,24 +231,6 @@ function swigc_FSUNLinSolFree_SPGMR(farg1) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNLinSolSetInfoFile_SPGMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetInfoFile_SPGMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNLinSolSetPrintLevel_SPGMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetPrintLevel_SPGMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -566,37 +546,5 @@ function FSUNLinSolFree_SPGMR(s) &
 swig_result = fresult
 end function
 
-function FSUNLinSolSetInfoFile_SPGMR(ls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = info_file
-fresult = swigc_FSUNLinSolSetInfoFile_SPGMR(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNLinSolSetPrintLevel_SPGMR(ls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = print_level
-fresult = swigc_FSUNLinSolSetPrintLevel_SPGMR(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunlinsol/spgmr/sunlinsol_spgmr.c b/src/sunlinsol/spgmr/sunlinsol_spgmr.c
index 3aa0934c13..4922c71740 100644
--- a/src/sunlinsol/spgmr/sunlinsol_spgmr.c
+++ b/src/sunlinsol/spgmr/sunlinsol_spgmr.c
@@ -867,33 +867,3 @@ int SUNLinSolFree_SPGMR(SUNLinearSolver S)
   free(S); S = NULL;
   return(SUNLS_SUCCESS);
 }
-
-
-int SUNLinSolSetInfoFile_SPGMR(SUNLinearSolver S,
-                               FILE* info_file)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  SPGMR_CONTENT(S)->info_file = info_file;
-
-  return(SUNLS_SUCCESS);
-}
-
-
-int SUNLinSolSetPrintLevel_SPGMR(SUNLinearSolver S,
-                                 int print_level)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUNLS_ILL_INPUT);
-
-  SPGMR_CONTENT(S)->print_level = print_level;
-
-  return(SUNLS_SUCCESS);
-}
diff --git a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
index ebc9c85d8b..9a46dee3a2 100644
--- a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
+++ b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
@@ -464,32 +464,4 @@ SWIGEXPORT int _wrap_FSUNLinSolFree_SPTFQMR(SUNLinearSolver farg1) {
 }
 
 
-SWIGEXPORT int _wrap_FSUNLinSolSetInfoFile_SPTFQMR(SUNLinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNLinSolSetInfoFile_SPTFQMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNLinSolSetPrintLevel_SPTFQMR(SUNLinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNLinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNLinSolSetPrintLevel_SPTFQMR(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90 b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90
index 5f3b43ecf2..c4d9abe539 100644
--- a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90
+++ b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.f90
@@ -53,8 +53,6 @@ module fsunlinsol_sptfqmr_mod
  public :: FSUNLinSolLastFlag_SPTFQMR
  public :: FSUNLinSolSpace_SPTFQMR
  public :: FSUNLinSolFree_SPTFQMR
- public :: FSUNLinSolSetInfoFile_SPTFQMR
- public :: FSUNLinSolSetPrintLevel_SPTFQMR
 
 ! WRAPPER DECLARATIONS
 interface
@@ -222,24 +220,6 @@ function swigc_FSUNLinSolFree_SPTFQMR(farg1) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNLinSolSetInfoFile_SPTFQMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetInfoFile_SPTFQMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNLinSolSetPrintLevel_SPTFQMR(farg1, farg2) &
-bind(C, name="_wrap_FSUNLinSolSetPrintLevel_SPTFQMR") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -539,37 +519,5 @@ function FSUNLinSolFree_SPTFQMR(s) &
 swig_result = fresult
 end function
 
-function FSUNLinSolSetInfoFile_SPTFQMR(ls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = info_file
-fresult = swigc_FSUNLinSolSetInfoFile_SPTFQMR(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNLinSolSetPrintLevel_SPTFQMR(ls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNLinearSolver), target, intent(inout) :: ls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(ls)
-farg2 = print_level
-fresult = swigc_FSUNLinSolSetPrintLevel_SPTFQMR(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c b/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
index 47c6544819..4a5c5e6c8d 100644
--- a/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
+++ b/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
@@ -906,33 +906,3 @@ int SUNLinSolFree_SPTFQMR(SUNLinearSolver S)
   free(S); S = NULL;
   return(SUNLS_SUCCESS);
 }
-
-
-int SUNLinSolSetInfoFile_SPTFQMR(SUNLinearSolver S,
-                                 FILE* info_file)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  SPTFQMR_CONTENT(S)->info_file = info_file;
-
-  return(SUNLS_SUCCESS);
-}
-
-
-int SUNLinSolSetPrintLevel_SPTFQMR(SUNLinearSolver S,
-                                   int print_level)
-{
-  /* check that the linear solver is non-null */
-  if (S == NULL)
-    return(SUNLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUNLS_ILL_INPUT);
-
-  SPTFQMR_CONTENT(S)->print_level = print_level;
-
-  return(SUNLS_SUCCESS);
-}
diff --git a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
index 905b285380..3afafbe18c 100644
--- a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
+++ b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
@@ -416,32 +416,4 @@ SWIGEXPORT int _wrap_FSUNNonlinSolGetSysFn_FixedPoint(SUNNonlinearSolver farg1,
 }
 
 
-SWIGEXPORT int _wrap_FSUNNonlinSolSetInfoFile_FixedPoint(SUNNonlinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNNonlinearSolver arg1 = (SUNNonlinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNNonlinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNNonlinSolSetInfoFile_FixedPoint(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNNonlinSolSetPrintLevel_FixedPoint(SUNNonlinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNNonlinearSolver arg1 = (SUNNonlinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNNonlinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNNonlinSolSetPrintLevel_FixedPoint(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.f90 b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.f90
index 4b7cf6dfcb..a1b693a285 100644
--- a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.f90
+++ b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.f90
@@ -45,8 +45,6 @@ module fsunnonlinsol_fixedpoint_mod
  public :: FSUNNonlinSolGetCurIter_FixedPoint
  public :: FSUNNonlinSolGetNumConvFails_FixedPoint
  public :: FSUNNonlinSolGetSysFn_FixedPoint
- public :: FSUNNonlinSolSetInfoFile_FixedPoint
- public :: FSUNNonlinSolSetPrintLevel_FixedPoint
 
 ! WRAPPER DECLARATIONS
 interface
@@ -182,24 +180,6 @@ function swigc_FSUNNonlinSolGetSysFn_FixedPoint(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNNonlinSolSetInfoFile_FixedPoint(farg1, farg2) &
-bind(C, name="_wrap_FSUNNonlinSolSetInfoFile_FixedPoint") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNNonlinSolSetPrintLevel_FixedPoint(farg1, farg2) &
-bind(C, name="_wrap_FSUNNonlinSolSetPrintLevel_FixedPoint") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -447,37 +427,5 @@ function FSUNNonlinSolGetSysFn_FixedPoint(nls, sysfn) &
 swig_result = fresult
 end function
 
-function FSUNNonlinSolSetInfoFile_FixedPoint(nls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNNonlinearSolver), target, intent(inout) :: nls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(nls)
-farg2 = info_file
-fresult = swigc_FSUNNonlinSolSetInfoFile_FixedPoint(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNNonlinSolSetPrintLevel_FixedPoint(nls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNNonlinearSolver), target, intent(inout) :: nls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(nls)
-farg2 = print_level
-fresult = swigc_FSUNNonlinSolSetPrintLevel_FixedPoint(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c b/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
index 5204d53be7..64249652b3 100644
--- a/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
+++ b/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
@@ -739,31 +739,3 @@ static void FreeContent(SUNNonlinearSolver NLS)
 
   return;
 }
-
-int SUNNonlinSolSetInfoFile_FixedPoint(SUNNonlinearSolver NLS,
-                                       FILE* info_file)
-{
-  /* check that the nonlinear solver is non-null */
-  if (NLS == NULL)
-    return(SUN_NLS_MEM_NULL);
-
-  FP_CONTENT(NLS)->info_file = info_file;
-
-  return(SUN_NLS_SUCCESS);
-}
-
-int SUNNonlinSolSetPrintLevel_FixedPoint(SUNNonlinearSolver NLS,
-                                         int print_level)
-{
-  /* check that the nonlinear solver is non-null */
-  if (NLS == NULL)
-    return(SUN_NLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUN_NLS_ILL_INPUT);
-
-  FP_CONTENT(NLS)->print_level = print_level;
-
-  return(SUN_NLS_SUCCESS);
-}
diff --git a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
index ae1c387991..fc17b3040e 100644
--- a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
+++ b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
@@ -426,32 +426,4 @@ SWIGEXPORT int _wrap_FSUNNonlinSolGetSysFn_Newton(SUNNonlinearSolver farg1, void
 }
 
 
-SWIGEXPORT int _wrap_FSUNNonlinSolSetInfoFile_Newton(SUNNonlinearSolver farg1, void *farg2) {
-  int fresult ;
-  SUNNonlinearSolver arg1 = (SUNNonlinearSolver) 0 ;
-  FILE *arg2 = (FILE *) 0 ;
-  int result;
-  
-  arg1 = (SUNNonlinearSolver)(farg1);
-  arg2 = (FILE *)(farg2);
-  result = (int)SUNNonlinSolSetInfoFile_Newton(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
-SWIGEXPORT int _wrap_FSUNNonlinSolSetPrintLevel_Newton(SUNNonlinearSolver farg1, int const *farg2) {
-  int fresult ;
-  SUNNonlinearSolver arg1 = (SUNNonlinearSolver) 0 ;
-  int arg2 ;
-  int result;
-  
-  arg1 = (SUNNonlinearSolver)(farg1);
-  arg2 = (int)(*farg2);
-  result = (int)SUNNonlinSolSetPrintLevel_Newton(arg1,arg2);
-  fresult = (int)(result);
-  return fresult;
-}
-
-
 
diff --git a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.f90 b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.f90
index 52fb84ca61..634bc969c0 100644
--- a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.f90
+++ b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.f90
@@ -46,8 +46,6 @@ module fsunnonlinsol_newton_mod
  public :: FSUNNonlinSolGetCurIter_Newton
  public :: FSUNNonlinSolGetNumConvFails_Newton
  public :: FSUNNonlinSolGetSysFn_Newton
- public :: FSUNNonlinSolSetInfoFile_Newton
- public :: FSUNNonlinSolSetPrintLevel_Newton
 
 ! WRAPPER DECLARATIONS
 interface
@@ -190,24 +188,6 @@ function swigc_FSUNNonlinSolGetSysFn_Newton(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
-function swigc_FSUNNonlinSolSetInfoFile_Newton(farg1, farg2) &
-bind(C, name="_wrap_FSUNNonlinSolSetInfoFile_Newton") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-type(C_PTR), value :: farg2
-integer(C_INT) :: fresult
-end function
-
-function swigc_FSUNNonlinSolSetPrintLevel_Newton(farg1, farg2) &
-bind(C, name="_wrap_FSUNNonlinSolSetPrintLevel_Newton") &
-result(fresult)
-use, intrinsic :: ISO_C_BINDING
-type(C_PTR), value :: farg1
-integer(C_INT), intent(in) :: farg2
-integer(C_INT) :: fresult
-end function
-
 end interface
 
 
@@ -465,37 +445,5 @@ function FSUNNonlinSolGetSysFn_Newton(nls, sysfn) &
 swig_result = fresult
 end function
 
-function FSUNNonlinSolSetInfoFile_Newton(nls, info_file) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNNonlinearSolver), target, intent(inout) :: nls
-type(C_PTR) :: info_file
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-type(C_PTR) :: farg2 
-
-farg1 = c_loc(nls)
-farg2 = info_file
-fresult = swigc_FSUNNonlinSolSetInfoFile_Newton(farg1, farg2)
-swig_result = fresult
-end function
-
-function FSUNNonlinSolSetPrintLevel_Newton(nls, print_level) &
-result(swig_result)
-use, intrinsic :: ISO_C_BINDING
-integer(C_INT) :: swig_result
-type(SUNNonlinearSolver), target, intent(inout) :: nls
-integer(C_INT), intent(in) :: print_level
-integer(C_INT) :: fresult 
-type(C_PTR) :: farg1 
-integer(C_INT) :: farg2 
-
-farg1 = c_loc(nls)
-farg2 = print_level
-fresult = swigc_FSUNNonlinSolSetPrintLevel_Newton(farg1, farg2)
-swig_result = fresult
-end function
-
 
 end module
diff --git a/src/sunnonlinsol/newton/sunnonlinsol_newton.c b/src/sunnonlinsol/newton/sunnonlinsol_newton.c
index 6422b24963..75781e6018 100644
--- a/src/sunnonlinsol/newton/sunnonlinsol_newton.c
+++ b/src/sunnonlinsol/newton/sunnonlinsol_newton.c
@@ -499,31 +499,3 @@ int SUNNonlinSolGetSysFn_Newton(SUNNonlinearSolver NLS, SUNNonlinSolSysFn *SysFn
   *SysFn = NEWTON_CONTENT(NLS)->Sys;
   return(SUN_NLS_SUCCESS);
 }
-
-int SUNNonlinSolSetInfoFile_Newton(SUNNonlinearSolver NLS,
-                                   FILE* info_file)
-{
-  /* check that the nonlinear solver is non-null */
-  if (NLS == NULL)
-    return(SUN_NLS_MEM_NULL);
-
-  NEWTON_CONTENT(NLS)->info_file = info_file;
-
-  return(SUN_NLS_SUCCESS);
-}
-
-int SUNNonlinSolSetPrintLevel_Newton(SUNNonlinearSolver NLS,
-                                     int print_level)
-{
-  /* check that the nonlinear solver is non-null */
-  if (NLS == NULL)
-    return(SUN_NLS_MEM_NULL);
-
-  /* check for valid print level */
-  if (print_level < 0 || print_level > 1)
-    return(SUN_NLS_ILL_INPUT);
-
-  NEWTON_CONTENT(NLS)->print_level = print_level;
-
-  return(SUN_NLS_SUCCESS);
-}

From e75d0c03345b230def5713cda2e1b2748171634b Mon Sep 17 00:00:00 2001
From: Cody Balos <balos1@llnl.gov>
Date: Tue, 14 Nov 2023 11:14:55 -0700
Subject: [PATCH 27/35] Remove deprecated types (#369)

Remove `realtype`, `booleantype`, and related deprecated macros.

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Steven Roberts <roberts115@llnl.gov>
Co-authored-by: David J. Gardner <gardner48@llnl.gov>
---
 .github/actions/test-driver/action.yml        |    2 +-
 CHANGELOG.md                                  |    6 +-
 .../kokkos/ParallelGrid.hpp                   |   48 +-
 .../advection_reaction_3D/kokkos/README.md    |   14 +-
 .../kokkos/advection_reaction_3D.cpp          |   92 +-
 .../kokkos/advection_reaction_3D.hpp          |   30 +-
 .../kokkos/arkode_driver.cpp                  |   16 +-
 .../kokkos/cvode_driver.cpp                   |    4 +-
 .../kokkos/ida_driver.cpp                     |    2 +-
 .../advection_reaction_3D/kokkos/rhs3D.hpp    |  218 +--
 .../advection_reaction_3D/raja/README.md      |   14 +-
 .../raja/advection_reaction_3D.cpp            |  116 +-
 .../raja/advection_reaction_3D.hpp            |   32 +-
 .../raja/arkode_driver.cpp                    |   16 +-
 .../advection_reaction_3D/raja/backends.hpp   |    2 +-
 .../raja/cvode_driver.cpp                     |    4 +-
 .../advection_reaction_3D/raja/ida_driver.cpp |    2 +-
 .../advection_reaction_3D/raja/rhs3D.hpp      |  254 +--
 benchmarks/diffusion_2D/README.md             |   16 +-
 benchmarks/diffusion_2D/diffusion_2D.cpp      |   26 +-
 benchmarks/diffusion_2D/diffusion_2D.hpp      |   76 +-
 benchmarks/diffusion_2D/main_arkode.cpp       |   16 +-
 benchmarks/diffusion_2D/main_cvode.cpp        |   14 +-
 benchmarks/diffusion_2D/main_ida.cpp          |   14 +-
 benchmarks/diffusion_2D/mpi_gpu/buffers.cpp   |   40 +-
 benchmarks/diffusion_2D/mpi_gpu/diffusion.cpp |  130 +-
 benchmarks/diffusion_2D/mpi_gpu/solution.cpp  |   44 +-
 .../diffusion_2D/mpi_serial/buffers.cpp       |   18 +-
 .../diffusion_2D/mpi_serial/diffusion.cpp     |   34 +-
 .../diffusion_2D/mpi_serial/solution.cpp      |   20 +-
 .../diffusion_2D/preconditioner_jacobi.cpp    |   30 +-
 .../cuda/test_nvector_performance_cuda.cu     |   34 +-
 .../hip/test_nvector_performance_hip.cpp      |   34 +-
 .../test_nvector_performance_mpiplusx.c       |   22 +-
 .../openmp/test_nvector_performance_openmp.c  |   22 +-
 .../test_nvector_performance_openmpdev.c      |    8 +-
 .../test_nvector_performance_parallel.c       |   22 +-
 .../parhyp/test_nvector_performance_parhyp.c  |   22 +-
 .../petsc/test_nvector_performance_petsc.c    |   16 +-
 .../test_nvector_performance_pthreads.c       |   22 +-
 .../raja/test_nvector_performance_raja.cpp    |    2 +-
 .../serial/test_nvector_performance_serial.c  |   22 +-
 .../sycl/test_nvector_performance_sycl.cpp    |    2 +-
 benchmarks/nvector/test_nvector_performance.c |  160 +-
 benchmarks/nvector/test_nvector_performance.h |   20 +-
 cmake/SundialsBuildOptionsPre.cmake           |    2 +-
 .../guide/source/ARKodeButcherTable.rst       |   14 +-
 doc/arkode/guide/source/Introduction.rst      |    6 +
 .../ARKStep_c_interface/Preconditioners.rst   |   12 +-
 .../Usage/ARKStep_c_interface/Skeleton.rst    |    2 +-
 .../ARKStep_c_interface/User_callable.rst     |   98 +-
 .../Usage/ARKStep_c_interface/XBraid.rst      |    8 +-
 .../Usage/ERKStep_c_interface/Skeleton.rst    |    2 +-
 .../ERKStep_c_interface/User_callable.rst     |   68 +-
 doc/arkode/guide/source/Usage/General.rst     |    2 +-
 .../Custom_Inner_Stepper/Description.rst      |   10 +-
 .../MRIStep_c_interface/MRIStepCoupling.rst   |   10 +-
 .../Usage/MRIStep_c_interface/Skeleton.rst    |    2 +-
 .../MRIStep_c_interface/User_callable.rst     |   64 +-
 .../Usage/SPRKStep_c_interface/Skeleton.rst   |    2 +-
 .../SPRKStep_c_interface/User_callable.rst    |   22 +-
 .../guide/source/Usage/User_supplied.rst      |   46 +-
 .../source/sunnonlinsol/ARKODE_interface.rst  |    4 +-
 doc/cvode/cv_ex_serial.tex                    |    8 +-
 doc/cvode/guide/source/Introduction.rst       |    6 +
 doc/cvode/guide/source/Usage/index.rst        |  126 +-
 .../source/sunnonlinsol/CVODE_interface.rst   |    4 +-
 doc/cvodes/cvs_ex_adj.tex                     |    2 +-
 doc/cvodes/cvs_ex_fwd.tex                     |    4 +-
 doc/cvodes/guide/source/Introduction.rst      |    6 +
 doc/cvodes/guide/source/Usage/ADJ.rst         |   74 +-
 doc/cvodes/guide/source/Usage/FSA.rst         |   40 +-
 doc/cvodes/guide/source/Usage/SIM.rst         |  136 +-
 .../source/sunnonlinsol/CVODES_interface.rst  |    4 +-
 doc/ida/guide/source/Introduction.rst         |    6 +
 doc/ida/guide/source/Usage/index.rst          |  100 +-
 .../source/sunnonlinsol/IDA_interface.rst     |    4 +-
 doc/ida/ida_ex_serial.tex                     |    4 +-
 doc/idas/guide/source/Introduction.rst        |    6 +
 doc/idas/guide/source/Usage/ADJ.rst           |   78 +-
 doc/idas/guide/source/Usage/FSA.rst           |   36 +-
 doc/idas/guide/source/Usage/SIM.rst           |  114 +-
 .../source/sunnonlinsol/IDAS_interface.rst    |    6 +-
 doc/kinsol/guide/source/Introduction.rst      |    6 +
 doc/kinsol/guide/source/Usage/index.rst       |   52 +-
 doc/kinsol/kin_ex_c.tex                       |    6 +-
 doc/kinsol/kin_ex_fortran.tex                 |    2 +-
 doc/shared/Types.rst                          |   52 +-
 doc/shared/nvectors/NVector_CUDA.rst          |   40 +-
 doc/shared/nvectors/NVector_Description.rst   |   82 +-
 doc/shared/nvectors/NVector_HIP.rst           |   40 +-
 doc/shared/nvectors/NVector_MPIManyVector.rst |   24 +-
 doc/shared/nvectors/NVector_MPIPlusX.rst      |    4 +-
 doc/shared/nvectors/NVector_ManyVector.rst    |   24 +-
 doc/shared/nvectors/NVector_OpenMP.rst        |   28 +-
 doc/shared/nvectors/NVector_OpenMPDEV.rst     |   34 +-
 doc/shared/nvectors/NVector_Operations.rst    |  112 +-
 doc/shared/nvectors/NVector_PETSc.rst         |   24 +-
 doc/shared/nvectors/NVector_ParHyp.rst        |   28 +-
 doc/shared/nvectors/NVector_Parallel.rst      |   28 +-
 doc/shared/nvectors/NVector_Pthreads.rst      |   28 +-
 doc/shared/nvectors/NVector_RAJA.rst          |   40 +-
 doc/shared/nvectors/NVector_SYCL.rst          |   40 +-
 doc/shared/nvectors/NVector_Serial.rst        |   28 +-
 doc/shared/nvectors/NVector_Trilinos.rst      |    4 +-
 doc/shared/sundials/Fortran.rst               |   14 +-
 doc/shared/sunlinsol/SUNLinSol_API.rst        |   16 +-
 doc/shared/sunlinsol/SUNLinSol_KLU.rst        |    2 +-
 doc/shared/sunlinsol/SUNLinSol_LapackBand.rst |    4 +-
 .../sunlinsol/SUNLinSol_LapackDense.rst       |    4 +-
 doc/shared/sunlinsol/SUNLinSol_MagmaDense.rst |    4 +-
 doc/shared/sunlinsol/SUNLinSol_PCG.rst        |    4 +-
 doc/shared/sunlinsol/SUNLinSol_SPBCGS.rst     |    4 +-
 doc/shared/sunlinsol/SUNLinSol_SPFGMR.rst     |   12 +-
 doc/shared/sunlinsol/SUNLinSol_SPGMR.rst      |   12 +-
 doc/shared/sunlinsol/SUNLinSol_SPTFQMR.rst    |    4 +-
 .../sunlinsol/SUNLinSol_SuperLUDIST.rst       |    8 +-
 doc/shared/sunlinsol/SUNLinSol_SuperLUMT.rst  |    4 +-
 doc/shared/sunlinsol/SUNLinSol_cuSolverSp.rst |    2 +-
 doc/shared/sunmatrix/SUNMatrix_Band.rst       |   14 +-
 doc/shared/sunmatrix/SUNMatrix_Dense.rst      |   14 +-
 .../sunmatrix/SUNMatrix_Description.rst       |    4 +-
 doc/shared/sunmatrix/SUNMatrix_MagmaDense.rst |   14 +-
 .../sunmatrix/SUNMatrix_OneMklDense.rst       |   14 +-
 doc/shared/sunmatrix/SUNMatrix_Operations.rst |    6 +-
 doc/shared/sunmatrix/SUNMatrix_SLUNRloc.rst   |    4 +-
 doc/shared/sunmatrix/SUNMatrix_Sparse.rst     |   10 +-
 doc/shared/sunmatrix/SUNMatrix_cuSparse.rst   |   14 +-
 .../sunmemory/SUNMemory_Description.rst       |    2 +-
 doc/shared/sunnonlinsol/SUNNonlinSol_API.rst  |   12 +-
 .../sunnonlinsol/SUNNonlinSol_FixedPoint.rst  |   12 +-
 .../sunnonlinsol/SUNNonlinSol_Newton.rst      |    2 +-
 .../benchmarks/advection_reaction.rst         |   14 +-
 .../developers/benchmarks/diffusion.rst       |   16 +-
 .../source/developers/testing/Local.rst       |    2 +-
 .../ark_brusselator1D_task_local_nls.cpp      |    2 +-
 .../CXX_parallel/ark_diffusion_reaction_p.cpp |  240 +--
 examples/arkode/CXX_parallel/ark_heat2D_p.cpp |  182 +-
 .../arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp |  174 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg.cpp      |  186 +-
 .../CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp |  230 +--
 .../CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp  |  206 +-
 .../ark_advection_diffusion_reaction.cpp      |   90 +-
 .../ark_advection_diffusion_reaction.hpp      |  120 +-
 .../arkode/CXX_serial/ark_analytic_sys.cpp    |   48 +-
 examples/arkode/CXX_serial/ark_heat2D.cpp     |  140 +-
 examples/arkode/CXX_serial/ark_kpr_Mt.cpp     |  192 +-
 examples/arkode/CXX_serial/ark_pendulum.cpp   |    2 +-
 .../ark_brusselator1D_FEM_sludist.cpp         |  166 +-
 .../ark_heat2D_hypre_pfmg_xbraid.cpp          |  178 +-
 .../arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp |  174 +-
 .../arkode/CXX_xbraid/ark_heat2D_xbraid.cpp   |  132 +-
 .../C_manyvector/ark_brusselator1D_manyvec.c  |  102 +-
 .../arkode/C_openmp/ark_brusselator1D_omp.c   |  126 +-
 examples/arkode/C_openmp/ark_heat1D_omp.c     |   50 +-
 .../C_openmpdev/ark_analytic_nonlin_ompdev.c  |   24 +-
 .../C_openmpdev/ark_heat1D_adapt_ompdev.c     |  108 +-
 .../arkode/C_openmpdev/ark_heat1D_ompdev.c    |   50 +-
 .../ark_brusselator1D_task_local_nls.c        |   10 +-
 .../arkode/C_parallel/ark_diurnal_kry_bbd_p.c |  136 +-
 .../arkode/C_parallel/ark_diurnal_kry_p.c     |  196 +-
 examples/arkode/C_parhyp/ark_diurnal_kry_ph.c |  198 +-
 .../arkode/C_serial/ark_KrylovDemo_prec.c     |  164 +-
 examples/arkode/C_serial/ark_analytic.c       |   50 +-
 examples/arkode/C_serial/ark_analytic_mels.c  |   52 +-
 .../arkode/C_serial/ark_analytic_nonlin.c     |   18 +-
 examples/arkode/C_serial/ark_brusselator.c    |   86 +-
 examples/arkode/C_serial/ark_brusselator1D.c  |  120 +-
 .../C_serial/ark_brusselator1D_FEM_slu.c      |  158 +-
 .../C_serial/ark_brusselator1D_imexmri.c      |  346 ++--
 .../arkode/C_serial/ark_brusselator1D_klu.c   |  100 +-
 .../arkode/C_serial/ark_brusselator_1D_mri.c  |  104 +-
 examples/arkode/C_serial/ark_brusselator_fp.c |   80 +-
 .../arkode/C_serial/ark_brusselator_mri.c     |   58 +-
 examples/arkode/C_serial/ark_heat1D.c         |   50 +-
 examples/arkode/C_serial/ark_heat1D_adapt.c   |   96 +-
 examples/arkode/C_serial/ark_kepler.c         |    4 +-
 examples/arkode/C_serial/ark_kepler.h         |    2 +-
 examples/arkode/C_serial/ark_kpr_mri.c        |  262 +--
 .../arkode/C_serial/ark_onewaycouple_mri.c    |   62 +-
 .../C_serial/ark_reaction_diffusion_mri.c     |   62 +-
 examples/arkode/C_serial/ark_robertson.c      |   58 +-
 .../C_serial/ark_robertson_constraints.c      |   60 +-
 examples/arkode/C_serial/ark_robertson_root.c |   56 +-
 .../arkode/C_serial/ark_twowaycouple_mri.c    |   40 +-
 .../CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp |  114 +-
 examples/cvode/CXX_parallel/cv_heat2D_p.cpp   |  178 +-
 .../cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp   |  170 +-
 .../cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp |  182 +-
 examples/cvode/CXX_serial/cv_heat2D.cpp       |    8 +-
 examples/cvode/CXX_serial/cv_heat2D.hpp       |   10 +-
 examples/cvode/CXX_serial/cv_kpr.cpp          |   60 +-
 examples/cvode/CXX_serial/cv_kpr.hpp          |   14 +-
 .../cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp     |  100 +-
 .../cvDiurnal_kry_mpimanyvec.c                |  182 +-
 examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c   |   54 +-
 .../cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c  |   80 +-
 examples/cvode/cuda/cvAdvDiff_diag_cuda.cu    |   56 +-
 examples/cvode/cuda/cvAdvDiff_kry_cuda.cu     |   88 +-
 .../cvode/cuda/cvAdvDiff_kry_cuda_managed.cu  |   88 +-
 .../cvRoberts_block_cusolversp_batchqr.cu     |   74 +-
 examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp    |   10 +-
 examples/cvode/ginkgo/cv_kpr_ginkgo.cpp       |   58 +-
 examples/cvode/ginkgo/cv_kpr_ginkgo.hpp       |   14 +-
 examples/cvode/hip/cvAdvDiff_diag_hip.cpp     |   56 +-
 examples/cvode/hip/cvAdvDiff_kry_hip.cpp      |   88 +-
 .../kokkos/cv_bruss_batched_kokkos_2D.cpp     |    4 +-
 .../cvode/magma/cv_bruss_batched_magma.cpp    |   42 +-
 examples/cvode/parallel/cvAdvDiff_diag_p.c    |   48 +-
 examples/cvode/parallel/cvAdvDiff_non_p.c     |   48 +-
 examples/cvode/parallel/cvDiurnal_kry_bbd_p.c |  138 +-
 examples/cvode/parallel/cvDiurnal_kry_p.c     |  196 +-
 examples/cvode/parhyp/cvAdvDiff_non_ph.c      |   50 +-
 examples/cvode/petsc/cvAdvDiff_petsc.c        |   46 +-
 examples/cvode/raja/cvAdvDiff_kry_raja.cpp    |   92 +-
 examples/cvode/serial/cvAdvDiff_bnd.c         |   54 +-
 examples/cvode/serial/cvAdvDiff_bndL.c        |   54 +-
 examples/cvode/serial/cvAnalytic_mels.c       |   52 +-
 examples/cvode/serial/cvDirectDemo_ls.c       |   94 +-
 examples/cvode/serial/cvDisc_dns.c            |   26 +-
 examples/cvode/serial/cvDiurnal_kry.c         |  154 +-
 examples/cvode/serial/cvDiurnal_kry_bp.c      |   96 +-
 examples/cvode/serial/cvKrylovDemo_ls.c       |  136 +-
 examples/cvode/serial/cvKrylovDemo_prec.c     |  160 +-
 examples/cvode/serial/cvParticle_dns.c        |   82 +-
 examples/cvode/serial/cvPendulum_dns.c        |  112 +-
 examples/cvode/serial/cvRoberts_block_klu.c   |   64 +-
 examples/cvode/serial/cvRoberts_dns.c         |   84 +-
 examples/cvode/serial/cvRoberts_dnsL.c        |   68 +-
 .../cvode/serial/cvRoberts_dns_constraints.c  |   84 +-
 examples/cvode/serial/cvRoberts_dns_negsol.c  |   46 +-
 examples/cvode/serial/cvRoberts_dns_uw.c      |   70 +-
 examples/cvode/serial/cvRoberts_klu.c         |   70 +-
 examples/cvode/serial/cvRoberts_sps.c         |   70 +-
 examples/cvode/serial/cvRocket_dns.c          |   36 +-
 .../cvode/superludist/cvAdvDiff_sludist.cpp   |   64 +-
 examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c |   54 +-
 .../cvodes/parallel/cvsAdvDiff_ASAp_non_p.c   |   94 +-
 .../cvodes/parallel/cvsAdvDiff_FSA_non_p.c    |   76 +-
 examples/cvodes/parallel/cvsAdvDiff_non_p.c   |   48 +-
 .../parallel/cvsAtmDisp_ASAi_kry_bbd_p.c      |  158 +-
 .../cvodes/parallel/cvsDiurnal_FSA_kry_p.c    |  212 +-
 .../cvodes/parallel/cvsDiurnal_kry_bbd_p.c    |  138 +-
 examples/cvodes/parallel/cvsDiurnal_kry_p.c   |  200 +-
 examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c  |   72 +-
 examples/cvodes/serial/cvsAdvDiff_FSA_non.c   |   76 +-
 examples/cvodes/serial/cvsAdvDiff_bnd.c       |   54 +-
 examples/cvodes/serial/cvsAdvDiff_bndL.c      |   54 +-
 examples/cvodes/serial/cvsAnalytic_mels.c     |   52 +-
 examples/cvodes/serial/cvsDirectDemo_ls.c     |   94 +-
 examples/cvodes/serial/cvsDiurnal_FSA_kry.c   |  174 +-
 examples/cvodes/serial/cvsDiurnal_kry.c       |  154 +-
 examples/cvodes/serial/cvsDiurnal_kry_bp.c    |   96 +-
 examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c  |  212 +-
 examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c  |  214 +--
 examples/cvodes/serial/cvsHessian_ASA_FSA.c   |  122 +-
 examples/cvodes/serial/cvsKrylovDemo_ls.c     |  134 +-
 examples/cvodes/serial/cvsKrylovDemo_prec.c   |  160 +-
 examples/cvodes/serial/cvsParticle_dns.c      |   82 +-
 examples/cvodes/serial/cvsPendulum_dns.c      |  112 +-
 examples/cvodes/serial/cvsRoberts_ASAi_dns.c  |  112 +-
 .../serial/cvsRoberts_ASAi_dns_constraints.c  |  114 +-
 examples/cvodes/serial/cvsRoberts_ASAi_klu.c  |  116 +-
 examples/cvodes/serial/cvsRoberts_ASAi_sps.c  |  116 +-
 examples/cvodes/serial/cvsRoberts_FSA_dns.c   |   80 +-
 .../cvodes/serial/cvsRoberts_FSA_dns_Switch.c |   84 +-
 .../serial/cvsRoberts_FSA_dns_constraints.c   |   88 +-
 examples/cvodes/serial/cvsRoberts_FSA_klu.c   |   92 +-
 examples/cvodes/serial/cvsRoberts_FSA_sps.c   |   92 +-
 examples/cvodes/serial/cvsRoberts_dns.c       |   84 +-
 examples/cvodes/serial/cvsRoberts_dnsL.c      |   68 +-
 .../serial/cvsRoberts_dns_constraints.c       |   84 +-
 examples/cvodes/serial/cvsRoberts_dns_uw.c    |   70 +-
 examples/cvodes/serial/cvsRoberts_klu.c       |   70 +-
 examples/cvodes/serial/cvsRoberts_sps.c       |   70 +-
 examples/ida/C_openmp/idaFoodWeb_bnd_omp.c    |   92 +-
 examples/ida/C_openmp/idaFoodWeb_kry_omp.c    |  122 +-
 examples/ida/cuda/idaHeat2D_kry_cuda.cu       |   78 +-
 .../ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu    |  218 +--
 .../ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp   |  190 +-
 examples/ida/parallel/idaFoodWeb_kry_bbd_p.c  |  112 +-
 examples/ida/parallel/idaFoodWeb_kry_p.c      |  140 +-
 examples/ida/parallel/idaHeat2D_kry_bbd_p.c   |   72 +-
 examples/ida/parallel/idaHeat2D_kry_p.c       |  136 +-
 examples/ida/petsc/idaHeat2D_petsc_snes.c     |   26 +-
 examples/ida/petsc/idaHeat2D_petsc_spgmr.c    |   42 +-
 examples/ida/raja/idaHeat2D_kry_raja.cpp      |   70 +-
 examples/ida/serial/idaAnalytic_mels.c        |   72 +-
 examples/ida/serial/idaFoodWeb_bnd.c          |   94 +-
 examples/ida/serial/idaFoodWeb_kry.c          |  124 +-
 examples/ida/serial/idaHeat2D_bnd.c           |   42 +-
 examples/ida/serial/idaHeat2D_klu.c           |   62 +-
 examples/ida/serial/idaHeat2D_kry.c           |   58 +-
 examples/ida/serial/idaKrylovDemo_ls.c        |   62 +-
 examples/ida/serial/idaRoberts_dns.c          |   94 +-
 examples/ida/serial/idaRoberts_klu.c          |  102 +-
 examples/ida/serial/idaRoberts_sps.c          |   82 +-
 examples/ida/serial/idaSlCrank_dns.c          |   84 +-
 .../ida/trilinos/idaHeat2D_kry_p_tpetra.cpp   |  124 +-
 .../ida/trilinos/idaHeat2D_kry_tpetra.cpp     |   62 +-
 examples/idas/C_openmp/idasFoodWeb_bnd_omp.c  |   92 +-
 examples/idas/C_openmp/idasFoodWeb_kry_omp.c  |  122 +-
 .../idas/parallel/idasBruss_ASAp_kry_bbd_p.c  |  128 +-
 .../idas/parallel/idasBruss_FSA_kry_bbd_p.c   |  118 +-
 examples/idas/parallel/idasBruss_kry_bbd_p.c  |  108 +-
 .../idas/parallel/idasFoodWeb_kry_bbd_p.c     |  112 +-
 examples/idas/parallel/idasFoodWeb_kry_p.c    |  140 +-
 .../idas/parallel/idasHeat2D_FSA_kry_bbd_p.c  |   96 +-
 examples/idas/parallel/idasHeat2D_kry_bbd_p.c |   72 +-
 examples/idas/parallel/idasHeat2D_kry_p.c     |   86 +-
 examples/idas/serial/idasAkzoNob_ASAi_dns.c   |  104 +-
 examples/idas/serial/idasAkzoNob_dns.c        |   88 +-
 examples/idas/serial/idasAnalytic_mels.c      |   72 +-
 examples/idas/serial/idasFoodWeb_bnd.c        |   94 +-
 examples/idas/serial/idasHeat2D_bnd.c         |   42 +-
 examples/idas/serial/idasHeat2D_kry.c         |   58 +-
 examples/idas/serial/idasHessian_ASA_FSA.c    |  136 +-
 examples/idas/serial/idasKrylovDemo_ls.c      |   62 +-
 examples/idas/serial/idasRoberts_ASAi_dns.c   |  114 +-
 examples/idas/serial/idasRoberts_ASAi_klu.c   |  118 +-
 examples/idas/serial/idasRoberts_ASAi_sps.c   |  118 +-
 examples/idas/serial/idasRoberts_FSA_dns.c    |   86 +-
 examples/idas/serial/idasRoberts_FSA_klu.c    |  100 +-
 examples/idas/serial/idasRoberts_FSA_sps.c    |  100 +-
 examples/idas/serial/idasRoberts_dns.c        |   94 +-
 examples/idas/serial/idasRoberts_klu.c        |  102 +-
 examples/idas/serial/idasRoberts_sps.c        |   82 +-
 examples/idas/serial/idasSlCrank_FSA_dns.c    |  108 +-
 examples/idas/serial/idasSlCrank_dns.c        |  100 +-
 examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu    |   62 +-
 examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp   |   28 +-
 examples/kinsol/CXX_parallel/kin_em_p.cpp     |   54 +-
 examples/kinsol/CXX_parallel/kin_em_p.hpp     |   28 +-
 .../CXX_parallel/kin_heat2D_nonlin_p.cpp      |   78 +-
 .../CXX_parallel/kin_heat2D_nonlin_p.hpp      |  120 +-
 .../CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp     |   30 +-
 .../CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp     |   30 +-
 .../kin_heat2D_nonlin_hypre_pfmg.cpp          |   68 +-
 .../kin_heat2D_nonlin_hypre_pfmg.hpp          |  124 +-
 examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c |   94 +-
 .../kinsol/parallel/kinFoodWeb_kry_bbd_p.c    |  112 +-
 examples/kinsol/parallel/kinFoodWeb_kry_p.c   |  130 +-
 examples/kinsol/serial/kinAnalytic_fp.c       |   60 +-
 examples/kinsol/serial/kinFerTron_dns.c       |   50 +-
 examples/kinsol/serial/kinFerTron_klu.c       |   54 +-
 examples/kinsol/serial/kinFoodWeb_kry.c       |   94 +-
 examples/kinsol/serial/kinKrylovDemo_ls.c     |   94 +-
 examples/kinsol/serial/kinLaplace_bnd.c       |   24 +-
 .../kinsol/serial/kinLaplace_picard_bnd.c     |   30 +-
 .../kinsol/serial/kinLaplace_picard_kry.c     |   36 +-
 examples/kinsol/serial/kinRoberts_fp.c        |   42 +-
 examples/kinsol/serial/kinRoboKin_dns.c       |   32 +-
 examples/kinsol/serial/kinRoboKin_slu.c       |   34 +-
 .../nvector/C_openmp/test_nvector_openmp.c    |   14 +-
 examples/nvector/cuda/test_nvector_cuda.cu    |   26 +-
 examples/nvector/hip/test_nvector_hip.cpp     |   26 +-
 .../nvector/kokkos/test_nvector_kokkos.cpp    |   10 +-
 .../manyvector/test_nvector_manyvector.c      |   12 +-
 .../nvector/mpicuda/test_nvector_mpicuda.cu   |   14 +-
 .../test_nvector_mpimanyvector_parallel1.c    |   12 +-
 .../test_nvector_mpimanyvector_parallel2.c    |   12 +-
 .../nvector/mpiplusx/test_nvector_mpiplusx.c  |   18 +-
 .../nvector/mpiraja/test_nvector_mpiraja.cpp  |   14 +-
 .../openmpdev/test_nvector_openmpdev.c        |   20 +-
 examples/nvector/parallel/test_nvector_mpi.c  |   14 +-
 examples/nvector/parhyp/test_nvector_parhyp.c |   16 +-
 examples/nvector/petsc/test_nvector_petsc.c   |   12 +-
 .../nvector/pthreads/test_nvector_pthreads.c  |   14 +-
 examples/nvector/raja/test_nvector_raja.cpp   |   26 +-
 examples/nvector/serial/test_nvector_serial.c |   14 +-
 examples/nvector/sycl/test_nvector_sycl.cpp   |   26 +-
 examples/nvector/test_nvector.c               |  160 +-
 examples/nvector/test_nvector.h               |   24 +-
 .../trilinos/test_nvector_trilinos.cpp        |   10 +-
 .../band/test_fsunlinsol_band_mod.f90         |    2 +-
 examples/sunlinsol/band/test_sunlinsol_band.c |   12 +-
 .../test_sunlinsol_cusolversp_batchqr.cu      |   12 +-
 .../dense/test_fsunlinsol_dense_mod.f90       |    2 +-
 .../sunlinsol/dense/test_sunlinsol_dense.c    |   12 +-
 .../sunlinsol/klu/test_fsunlinsol_klu_mod.f90 |    2 +-
 examples/sunlinsol/klu/test_sunlinsol_klu.c   |   12 +-
 .../kokkos/test_sunlinsol_kokkosdense.cpp     |    2 +-
 .../lapackband/test_sunlinsol_lapackband.c    |   12 +-
 .../test_fsunlinsol_lapackdense_mod.f90       |    2 +-
 .../lapackdense/test_sunlinsol_lapackdense.c  |   12 +-
 .../magmadense/test_sunlinsol_magmadense.cpp  |   18 +-
 .../test_sunlinsol_onemkldense.cpp            |   22 +-
 .../parallel/test_sunlinsol_pcg_parallel.c    |   24 +-
 .../pcg/serial/test_sunlinsol_pcg_serial.c    |   24 +-
 .../parallel/test_sunlinsol_spbcgs_parallel.c |   24 +-
 .../serial/test_sunlinsol_spbcgs_serial.c     |   24 +-
 .../parallel/test_sunlinsol_spfgmr_parallel.c |   24 +-
 .../serial/test_sunlinsol_spfgmr_serial.c     |   24 +-
 .../parallel/test_sunlinsol_spgmr_parallel.c  |   24 +-
 .../serial/test_sunlinsol_spgmr_serial.c      |   24 +-
 .../test_sunlinsol_sptfqmr_parallel.c         |   24 +-
 .../serial/test_sunlinsol_sptfqmr_serial.c    |   24 +-
 .../test_sunlinsol_superludist.cpp            |   24 +-
 .../superlumt/test_sunlinsol_superlumt.c      |   12 +-
 examples/sunlinsol/test_sunlinsol.c           |    4 +-
 examples/sunlinsol/test_sunlinsol.h           |    8 +-
 examples/sunmatrix/band/test_sunmatrix_band.c |   24 +-
 .../cusparse/test_sunmatrix_cusparse.cu       |   46 +-
 .../sunmatrix/dense/test_sunmatrix_dense.c    |   22 +-
 examples/sunmatrix/dreadrb.c                  |   14 +-
 .../ginkgo/test_sunmatrix_ginkgo.cpp          |   18 +-
 .../kokkos/test_sunmatrix_kokkosdense.cpp     |    4 +-
 .../magmadense/test_sunmatrix_magmadense.cpp  |   28 +-
 .../test_sunmatrix_onemkldense.cpp            |   30 +-
 .../slunrloc/test_sunmatrix_slunrloc.cpp      |   46 +-
 .../sunmatrix/sparse/test_sunmatrix_sparse.c  |  174 +-
 examples/sunmatrix/test_sunmatrix.c           |   12 +-
 examples/sunmatrix/test_sunmatrix.f90         |   12 +-
 examples/sunmatrix/test_sunmatrix.h           |   26 +-
 .../fixedpoint/test_sunnonlinsol_fixedpoint.c |   54 +-
 .../newton/test_sunnonlinsol_newton.c         |   34 +-
 .../petsc/test_sunnonlinsol_petscsnes.c       |   28 +-
 examples/utilities/test_utilities.f90         |    4 +-
 include/arkode/arkode.h                       |   26 +-
 include/arkode/arkode_arkstep.h               |   98 +-
 include/arkode/arkode_bbdpre.h                |    8 +-
 include/arkode/arkode_butcher.h               |   18 +-
 include/arkode/arkode_erkstep.h               |   68 +-
 include/arkode/arkode_ls.h                    |   38 +-
 include/arkode/arkode_mristep.h               |   80 +-
 include/arkode/arkode_sprkstep.h              |   26 +-
 include/arkode/arkode_xbraid.h                |   10 +-
 include/cvode/cvode.h                         |   78 +-
 include/cvode/cvode_bbdpre.h                  |    8 +-
 include/cvode/cvode_ls.h                      |   30 +-
 include/cvode/cvode_proj.h                    |   10 +-
 include/cvodes/cvodes.h                       |  196 +-
 include/cvodes/cvodes_bbdpre.h                |   16 +-
 include/cvodes/cvodes_ls.h                    |   86 +-
 include/cvodes/cvodes_proj.h                  |   10 +-
 include/ida/ida.h                             |   76 +-
 include/ida/ida_bbdpre.h                      |    8 +-
 include/ida/ida_ls.h                          |   26 +-
 include/idas/idas.h                           |  188 +-
 include/idas/idas_bbdpre.h                    |   16 +-
 include/idas/idas_ls.h                        |   70 +-
 include/kinsol/kinsol.h                       |   36 +-
 include/kinsol/kinsol_bbdpre.h                |    2 +-
 include/kinsol/kinsol_ls.h                    |    2 +-
 include/nvector/nvector_cuda.h                |  102 +-
 include/nvector/nvector_hip.h                 |  102 +-
 include/nvector/nvector_kokkos.hpp            |    4 +-
 include/nvector/nvector_manyvector.h          |   86 +-
 include/nvector/nvector_mpimanyvector.h       |  102 +-
 include/nvector/nvector_mpiplusx.h            |    6 +-
 include/nvector/nvector_openmp.h              |   92 +-
 include/nvector/nvector_openmpdev.h           |   96 +-
 include/nvector/nvector_parallel.h            |  112 +-
 include/nvector/nvector_parhyp.h              |  108 +-
 include/nvector/nvector_petsc.h               |  108 +-
 include/nvector/nvector_pthreads.h            |  102 +-
 include/nvector/nvector_raja.h                |   94 +-
 include/nvector/nvector_serial.h              |   92 +-
 include/nvector/nvector_sycl.h                |  102 +-
 include/nvector/nvector_trilinos.h            |   52 +-
 .../SundialsTpetraVectorInterface.hpp         |    2 +-
 include/sundials/sundials_band.h              |   26 +-
 include/sundials/sundials_config.in           |    2 +-
 include/sundials/sundials_dense.h             |   48 +-
 include/sundials/sundials_direct.h            |   26 +-
 include/sundials/sundials_iterative.h         |   48 +-
 include/sundials/sundials_linearsolver.h      |   12 +-
 include/sundials/sundials_math.h              |   16 +-
 include/sundials/sundials_matrix.h            |    8 +-
 include/sundials/sundials_memory.h            |    4 +-
 include/sundials/sundials_nonlinearsolver.h   |   10 +-
 include/sundials/sundials_nvector.h           |  156 +-
 .../sundials/sundials_nvector_senswrapper.h   |   34 +-
 include/sundials/sundials_types.h             |   26 -
 include/sundials/sundials_types_deprecated.h  |   73 +
 include/sunlinsol/sunlinsol_band.h            |    2 +-
 .../sunlinsol/sunlinsol_cusolversp_batchqr.h  |    4 +-
 include/sunlinsol/sunlinsol_dense.h           |    6 +-
 include/sunlinsol/sunlinsol_klu.h             |    4 +-
 include/sunlinsol/sunlinsol_lapackband.h      |    2 +-
 include/sunlinsol/sunlinsol_lapackdense.h     |    2 +-
 include/sunlinsol/sunlinsol_magmadense.h      |    6 +-
 include/sunlinsol/sunlinsol_onemkldense.h     |    2 +-
 include/sunlinsol/sunlinsol_pcg.h             |   10 +-
 include/sunlinsol/sunlinsol_spbcgs.h          |   10 +-
 include/sunlinsol/sunlinsol_spfgmr.h          |   18 +-
 include/sunlinsol/sunlinsol_spgmr.h           |   18 +-
 include/sunlinsol/sunlinsol_sptfqmr.h         |   10 +-
 include/sunlinsol/sunlinsol_superludist.h     |    8 +-
 include/sunlinsol/sunlinsol_superlumt.h       |    8 +-
 include/sunmatrix/sunmatrix_band.h            |   18 +-
 include/sunmatrix/sunmatrix_cusparse.h        |   22 +-
 include/sunmatrix/sunmatrix_dense.h           |   18 +-
 include/sunmatrix/sunmatrix_magmadense.h      |   24 +-
 include/sunmatrix/sunmatrix_onemkldense.h     |   24 +-
 include/sunmatrix/sunmatrix_slunrloc.h        |    8 +-
 include/sunmatrix/sunmatrix_sparse.h          |   16 +-
 .../sunnonlinsol/sunnonlinsol_fixedpoint.h    |   16 +-
 include/sunnonlinsol/sunnonlinsol_newton.h    |    6 +-
 include/sunnonlinsol/sunnonlinsol_petscsnes.h |    4 +-
 src/arkode/arkode.c                           |  120 +-
 src/arkode/arkode_adapt.c                     |    8 +-
 src/arkode/arkode_adapt_impl.h                |   46 +-
 src/arkode/arkode_arkstep.c                   |  130 +-
 src/arkode/arkode_arkstep_impl.h              |   96 +-
 src/arkode/arkode_arkstep_io.c                |  218 +--
 src/arkode/arkode_arkstep_nls.c               |   18 +-
 src/arkode/arkode_bandpre.c                   |   36 +-
 src/arkode/arkode_bbdpre.c                    |   40 +-
 src/arkode/arkode_bbdpre_impl.h               |    2 +-
 src/arkode/arkode_butcher.c                   |  506 ++---
 src/arkode/arkode_butcher_dirk.def            | 1418 +++++++-------
 src/arkode/arkode_butcher_erk.def             | 1712 ++++++++---------
 src/arkode/arkode_erkstep.c                   |   48 +-
 src/arkode/arkode_erkstep_impl.h              |   10 +-
 src/arkode/arkode_erkstep_io.c                |   54 +-
 src/arkode/arkode_impl.h                      |  262 +--
 src/arkode/arkode_interp.c                    |  158 +-
 src/arkode/arkode_interp_impl.h               |   38 +-
 src/arkode/arkode_io.c                        |   62 +-
 src/arkode/arkode_ls.c                        |  104 +-
 src/arkode/arkode_ls_impl.h                   |   70 +-
 src/arkode/arkode_mri_tables.c                |   32 +-
 src/arkode/arkode_mri_tables.def              |  546 +++---
 src/arkode/arkode_mristep.c                   |   96 +-
 src/arkode/arkode_mristep_impl.h              |   84 +-
 src/arkode/arkode_mristep_io.c                |   46 +-
 src/arkode/arkode_mristep_nls.c               |   16 +-
 src/arkode/arkode_relaxation.c                |    2 +-
 src/arkode/arkode_root.c                      |   20 +-
 src/arkode/arkode_root_impl.h                 |   20 +-
 src/arkode/arkode_sprkstep.c                  |   22 +-
 src/arkode/arkode_sprkstep_impl.h             |    2 +-
 src/arkode/arkode_sprkstep_io.c               |   14 +-
 src/arkode/arkode_user_controller.c           |   14 +-
 src/arkode/arkode_user_controller.h           |   14 +-
 src/arkode/fmod/farkode_arkstep_mod.c         |  190 +-
 src/arkode/fmod/farkode_arkstep_mod.f90       |    4 +-
 src/arkode/fmod/farkode_erkstep_mod.c         |  138 +-
 src/arkode/fmod/farkode_mod.c                 |   70 +-
 src/arkode/fmod/farkode_mod.f90               |   46 +-
 src/arkode/fmod/farkode_mristep_mod.c         |  144 +-
 src/arkode/fmod/farkode_mristep_mod.f90       |    4 +-
 src/arkode/fmod/farkode_sprkstep_mod.c        |   60 +-
 src/arkode/xbraid/arkode_xbraid.c             |   20 +-
 src/arkode/xbraid/arkode_xbraid_impl.h        |    2 +-
 src/cvode/cvode.c                             |  238 +--
 src/cvode/cvode_bandpre.c                     |   40 +-
 src/cvode/cvode_bbdpre.c                      |   42 +-
 src/cvode/cvode_bbdpre_impl.h                 |    2 +-
 src/cvode/cvode_diag.c                        |   28 +-
 src/cvode/cvode_diag_impl.h                   |    2 +-
 src/cvode/cvode_fused_gpu.cpp                 |  132 +-
 src/cvode/cvode_fused_stubs.c                 |   36 +-
 src/cvode/cvode_impl.h                        |  186 +-
 src/cvode/cvode_io.c                          |   80 +-
 src/cvode/cvode_ls.c                          |   62 +-
 src/cvode/cvode_ls_impl.h                     |   36 +-
 src/cvode/cvode_nls.c                         |   28 +-
 src/cvode/cvode_proj.c                        |   14 +-
 src/cvode/cvode_proj_impl.h                   |   14 +-
 src/cvode/fmod/fcvode_mod.c                   |  172 +-
 src/cvode/fmod/fcvode_mod.f90                 |    4 +-
 src/cvodes/cvodea.c                           |   96 +-
 src/cvodes/cvodea_io.c                        |   16 +-
 src/cvodes/cvodes.c                           |  412 ++--
 src/cvodes/cvodes_bandpre.c                   |   40 +-
 src/cvodes/cvodes_bbdpre.c                    |   54 +-
 src/cvodes/cvodes_bbdpre_impl.h               |    2 +-
 src/cvodes/cvodes_diag.c                      |   16 +-
 src/cvodes/cvodes_diag_impl.h                 |    2 +-
 src/cvodes/cvodes_impl.h                      |  362 ++--
 src/cvodes/cvodes_io.c                        |   92 +-
 src/cvodes/cvodes_ls.c                        |  158 +-
 src/cvodes/cvodes_ls_impl.h                   |   36 +-
 src/cvodes/cvodes_nls.c                       |   20 +-
 src/cvodes/cvodes_nls_sim.c                   |   20 +-
 src/cvodes/cvodes_nls_stg.c                   |   16 +-
 src/cvodes/cvodes_nls_stg1.c                  |   14 +-
 src/cvodes/cvodes_proj.c                      |   14 +-
 src/cvodes/cvodes_proj_impl.h                 |   14 +-
 src/cvodes/fmod/fcvodes_mod.c                 |  390 ++--
 src/cvodes/fmod/fcvodes_mod.f90               |    4 +-
 src/ida/fmod/fida_mod.c                       |  164 +-
 src/ida/fmod/fida_mod.f90                     |    8 +-
 src/ida/ida.c                                 |  170 +-
 src/ida/ida_bbdpre.c                          |   38 +-
 src/ida/ida_bbdpre_impl.h                     |    2 +-
 src/ida/ida_ic.c                              |   44 +-
 src/ida/ida_impl.h                            |  156 +-
 src/ida/ida_io.c                              |   76 +-
 src/ida/ida_ls.c                              |   58 +-
 src/ida/ida_ls_impl.h                         |   28 +-
 src/ida/ida_nls.c                             |   24 +-
 src/idas/fmod/fidas_mod.c                     |  394 ++--
 src/idas/fmod/fidas_mod.f90                   |    8 +-
 src/idas/idaa.c                               |  112 +-
 src/idas/idaa_io.c                            |   12 +-
 src/idas/idas.c                               |  384 ++--
 src/idas/idas_bbdpre.c                        |   50 +-
 src/idas/idas_bbdpre_impl.h                   |    2 +-
 src/idas/idas_ic.c                            |   78 +-
 src/idas/idas_impl.h                          |  322 ++--
 src/idas/idas_io.c                            |   88 +-
 src/idas/idas_ls.c                            |  142 +-
 src/idas/idas_ls_impl.h                       |   28 +-
 src/idas/idas_nls.c                           |   24 +-
 src/idas/idas_nls_sim.c                       |   24 +-
 src/idas/idas_nls_stg.c                       |   20 +-
 src/kinsol/fmod/fkinsol_mod.c                 |   60 +-
 src/kinsol/kinsol.c                           |  130 +-
 src/kinsol/kinsol_bbdpre.c                    |   14 +-
 src/kinsol/kinsol_bbdpre_impl.h               |    2 +-
 src/kinsol/kinsol_impl.h                      |   96 +-
 src/kinsol/kinsol_io.c                        |   70 +-
 src/kinsol/kinsol_ls.c                        |   30 +-
 src/kinsol/kinsol_ls_impl.h                   |   18 +-
 src/nvector/cuda/nvector_cuda.cu              |  282 +--
 src/nvector/hip/nvector_hip.hip.cpp           |  396 ++--
 .../manyvector/fmod/fnvector_manyvector_mod.c |  132 +-
 .../fmod/fnvector_mpimanyvector_mod.c         |  166 +-
 src/nvector/manyvector/nvector_manyvector.c   |  160 +-
 .../mpiplusx/fmod/fnvector_mpiplusx_mod.c     |    8 +-
 src/nvector/mpiplusx/nvector_mpiplusx.c       |    4 +-
 src/nvector/openmp/fmod/fnvector_openmp_mod.c |  132 +-
 src/nvector/openmp/nvector_openmp.c           |  332 ++--
 src/nvector/openmpdev/nvector_openmpdev.c     |  494 ++---
 .../parallel/fmod/fnvector_parallel_mod.c     |  170 +-
 src/nvector/parallel/nvector_parallel.c       |  368 ++--
 src/nvector/parhyp/nvector_parhyp.c           |  272 +--
 src/nvector/petsc/nvector_petsc.c             |  164 +-
 .../pthreads/fmod/fnvector_pthreads_mod.c     |  132 +-
 src/nvector/pthreads/nvector_pthreads.c       |  412 ++--
 src/nvector/raja/nvector_raja.cpp             |  296 +--
 src/nvector/serial/fmod/fnvector_serial_mod.c |  132 +-
 src/nvector/serial/nvector_serial.c           |  326 ++--
 src/nvector/sycl/nvector_sycl.cpp             |  314 +--
 src/nvector/trilinos/nvector_trilinos.cpp     |   56 +-
 .../fmod/fsunadaptcontroller_imexgus_mod.f90  |    4 +-
 .../imexgus/sunadaptcontroller_imexgus.c      |   18 +-
 .../fsunadaptcontroller_soderlind_mod.f90     |    4 +-
 .../soderlind/sunadaptcontroller_soderlind.c  |   74 +-
 src/sundials/CMakeLists.txt                   |    1 +
 .../fmod/fsundials_adaptcontroller_mod.f90    |    4 +-
 .../fmod/fsundials_linearsolver_mod.c         |   74 +-
 src/sundials/fmod/fsundials_matrix_mod.c      |    8 +-
 .../fmod/fsundials_nonlinearsolver_mod.c      |    4 +-
 src/sundials/fmod/fsundials_nvector_mod.c     |  170 +-
 src/sundials/sundials_band.c                  |   58 +-
 src/sundials/sundials_context_impl.h          |    4 +-
 src/sundials/sundials_cuda.h                  |    2 +-
 src/sundials/sundials_cusolver.h              |    2 +-
 src/sundials/sundials_cusparse.h              |    2 +-
 src/sundials/sundials_dense.c                 |   98 +-
 src/sundials/sundials_direct.c                |   56 +-
 src/sundials/sundials_hip.h                   |    2 +-
 src/sundials/sundials_iterative.c             |   52 +-
 src/sundials/sundials_iterative_impl.h        |    6 +-
 src/sundials/sundials_linearsolver.c          |    8 +-
 src/sundials/sundials_math.c                  |   28 +-
 src/sundials/sundials_matrix.c                |    4 +-
 src/sundials/sundials_memory.c                |    2 +-
 src/sundials/sundials_nonlinearsolver.c       |    4 +-
 src/sundials/sundials_nvector.c               |  168 +-
 src/sundials/sundials_nvector_senswrapper.c   |   52 +-
 src/sundials/sundials_xbraid.c                |    2 +-
 src/sunlinsol/band/fmod/fsunlinsol_band_mod.c |    4 +-
 src/sunlinsol/band/sunlinsol_band.c           |   10 +-
 .../sunlinsol_cusolversp_batchqr.cu           |   16 +-
 .../dense/fmod/fsunlinsol_dense_mod.c         |    4 +-
 src/sunlinsol/dense/sunlinsol_dense.c         |    8 +-
 src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c   |    4 +-
 src/sunlinsol/klu/sunlinsol_klu.c             |   16 +-
 .../lapackband/sunlinsol_lapackband.c         |   12 +-
 .../fmod/fsunlinsol_lapackdense_mod.c         |    4 +-
 .../lapackdense/sunlinsol_lapackdense.c       |   12 +-
 .../magmadense/sunlinsol_magmadense.cpp       |   20 +-
 .../onemkldense/sunlinsol_onemkldense.cpp     |   34 +-
 src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c   |   10 +-
 src/sunlinsol/pcg/sunlinsol_pcg.c             |   20 +-
 .../spbcgs/fmod/fsunlinsol_spbcgs_mod.c       |   10 +-
 src/sunlinsol/spbcgs/sunlinsol_spbcgs.c       |   22 +-
 .../spfgmr/fmod/fsunlinsol_spfgmr_mod.c       |   10 +-
 src/sunlinsol/spfgmr/sunlinsol_spfgmr.c       |   32 +-
 .../spgmr/fmod/fsunlinsol_spgmr_mod.c         |   10 +-
 src/sunlinsol/spgmr/sunlinsol_spgmr.c         |   32 +-
 .../sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c     |   10 +-
 src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c     |   28 +-
 .../superludist/sunlinsol_superludist.c       |   12 +-
 src/sunlinsol/superlumt/sunlinsol_superlumt.c |   10 +-
 src/sunmatrix/band/fmod/fsunmatrix_band_mod.c |   20 +-
 src/sunmatrix/band/sunmatrix_band.c           |   46 +-
 src/sunmatrix/cusparse/sunmatrix_cusparse.cu  |   60 +-
 .../dense/fmod/fsunmatrix_dense_mod.c         |   20 +-
 src/sunmatrix/dense/sunmatrix_dense.c         |   30 +-
 .../magmadense/sunmatrix_magmadense.cpp       |   94 +-
 .../onemkldense/sunmatrix_onemkldense.cpp     |   74 +-
 src/sunmatrix/slunrloc/sunmatrix_slunrloc.c   |   16 +-
 .../sparse/fmod/fsunmatrix_sparse_mod.c       |   20 +-
 src/sunmatrix/sparse/sunmatrix_sparse.c       |   54 +-
 .../fmod/fsunnonlinsol_fixedpoint_mod.c       |    8 +-
 .../fixedpoint/sunnonlinsol_fixedpoint.c      |   20 +-
 .../newton/fmod/fsunnonlinsol_newton_mod.c    |    4 +-
 src/sunnonlinsol/newton/sunnonlinsol_newton.c |   10 +-
 .../petscsnes/sunnonlinsol_petscsnes.c        |    4 +-
 swig/nvector/fnvector_manyvector_mod.i        |    4 +-
 swig/nvector/fnvector_mpimanyvector_mod.i     |    4 +-
 swig/nvector/fnvector_mpiplusx_mod.i          |    4 +-
 swig/nvector/fnvector_openmp_mod.i            |    4 +-
 swig/nvector/fnvector_parallel_mod.i          |    4 +-
 swig/nvector/fnvector_pthreads_mod.i          |    4 +-
 swig/nvector/fnvector_serial_mod.i            |    4 +-
 swig/sundials/fsundials.i                     |    4 +-
 swig/sundials/fsundials_nvector_mod.i         |    8 +-
 swig/sundials/fsundials_types_mod.i           |    2 +-
 swig/sunmatrix/fsunmatrix_band_mod.i          |    8 +-
 swig/sunmatrix/fsunmatrix_dense_mod.i         |    8 +-
 swig/sunmatrix/fsunmatrix_sparse_mod.i        |    4 +-
 test/test_driver.sh                           |   24 +-
 .../CXX_parallel/ark_test_heat2D_mri.cpp      |  144 +-
 .../CXX_serial/ark_test_analytic_sys_mri.cpp  |  124 +-
 .../CXX_serial/ark_test_dahlquist_mri.cpp     |   70 +-
 .../C_serial/ark_test_arkstepsetforcing.c     |   54 +-
 .../arkode/C_serial/ark_test_getuserdata.c    |    2 +-
 .../arkode/C_serial/ark_test_interp.c         |  134 +-
 .../arkode/C_serial/ark_test_reset.c          |   86 +-
 .../cvode/CXX_serial/cv_test_kpr.cpp          |   56 +-
 .../cvode/CXX_serial/cv_test_kpr.hpp          |   54 +-
 .../cvode/C_serial/cv_test_getuserdata.c      |    2 +-
 .../cvodes/CXX_serial/cvs_test_kpr.cpp        |   56 +-
 .../cvodes/CXX_serial/cvs_test_kpr.hpp        |   54 +-
 .../cvodes/C_serial/cvs_test_getuserdata.c    |    2 +-
 .../ida/CXX_serial/ida_test_getjac.cpp        |    4 +-
 .../ida/CXX_serial/ida_test_kpr.cpp           |   66 +-
 .../ida/CXX_serial/ida_test_kpr.hpp           |   48 +-
 .../ida/C_serial/ida_test_getuserdata.c       |    2 +-
 .../idas/CXX_serial/idas_test_getjac.cpp      |    4 +-
 .../idas/CXX_serial/idas_test_kpr.cpp         |   66 +-
 .../idas/CXX_serial/idas_test_kpr.hpp         |   48 +-
 .../idas/C_serial/idas_test_getuserdata.c     |    2 +-
 .../kinsol/CXX_serial/kin_test_getjac.cpp     |    2 +-
 741 files changed, 24741 insertions(+), 24619 deletions(-)
 create mode 100644 include/sundials/sundials_types_deprecated.h

diff --git a/.github/actions/test-driver/action.yml b/.github/actions/test-driver/action.yml
index 75f09300ff..f56126095e 100644
--- a/.github/actions/test-driver/action.yml
+++ b/.github/actions/test-driver/action.yml
@@ -26,5 +26,5 @@ runs:
       run: |
         git config --global --add safe.directory $GITHUB_WORKSPACE
         cd test
-        ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --realtype ${{ inputs.precision }} --indexsize ${{ inputs.indexsize }}
+        ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --sunrealtype ${{ inputs.precision }} --indexsize ${{ inputs.indexsize }}
       shell: bash
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a2cda6550..0e33ad8f97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # SUNDIALS Changelog
 
-
 ## Changes to SUNDIALS in release X.X.X
 
+The previously deprecated types `realtype` and `booleantype` were removed from `sundials_types.h`
+and replaced with `sunrealtype` and `sunbooleantype`. The deprecated names for these types
+can be used by including the header file `sundials_types_deprecated.h` but will be fully removed in the
+next major release.
+
 Added the `SUNAdaptController` base class, ported ARKODE's internal
 implementations of time step controllers into implementations of this class,
 and updated ARKODE to use these objects instead of its own implementations.
diff --git a/benchmarks/advection_reaction_3D/kokkos/ParallelGrid.hpp b/benchmarks/advection_reaction_3D/kokkos/ParallelGrid.hpp
index c324105b02..6d35bed198 100644
--- a/benchmarks/advection_reaction_3D/kokkos/ParallelGrid.hpp
+++ b/benchmarks/advection_reaction_3D/kokkos/ParallelGrid.hpp
@@ -47,8 +47,8 @@ using MemSpace  = Kokkos::HostSpace;
 using ExecSpace = Kokkos::Serial;
 using MemSpace  = Kokkos::HostSpace;
 #endif
-using Vec1D = Kokkos::View<realtype*, MemSpace>;
-using Vec4D = Kokkos::View<realtype****, MemSpace>;
+using Vec1D = Kokkos::View<sunrealtype*, MemSpace>;
+using Vec4D = Kokkos::View<sunrealtype****, MemSpace>;
 using Vec1DHost = Vec1D::HostMirror;
 using Vec4DHost = Vec4D::HostMirror;
 using Range3D = Kokkos::MDRangePolicy<ExecSpace, Kokkos::Rank<3>>;
@@ -84,8 +84,8 @@ class ParallelGrid
   // [in] st - the stencil to use (see StencilType)
   // [in] npxyz - the number of processors in each dimension; defaults to 0 which means MPI will choose
   // [in] reorder - should MPI_Cart_create do process reordering to optimize or not; defaults to false (some MPI implementations ignore this)
-  ParallelGrid(MPI_Comm* comm, const realtype a[], const realtype b[], const GLOBALINT npts[],
-               int dof, BoundaryType bc, StencilType st, const realtype c,
+  ParallelGrid(MPI_Comm* comm, const sunrealtype a[], const sunrealtype b[], const GLOBALINT npts[],
+               int dof, BoundaryType bc, StencilType st, const sunrealtype c,
                const int npxyz[] = nullptr, bool reorder = false)
     : nx(1), ny(1), nz(1),
       nxl(1), nyl(1), nzl(1),
@@ -130,7 +130,7 @@ class ParallelGrid
     nx  = npts[0];
     ax  = a[0];
     bx  = b[0];
-    dx  = (bx-ax) / (realtype) nx;
+    dx  = (bx-ax) / (sunrealtype) nx;
     int is = nx*(coords[0])/npx;
     int ie = nx*(coords[0]+1)/npx-1;
     nxl = ie-is+1;
@@ -141,7 +141,7 @@ class ParallelGrid
     ny  = npts[1];
     ay  = a[1];
     by  = b[1];
-    dy  = (by-ay) / (realtype) ny;
+    dy  = (by-ay) / (sunrealtype) ny;
     int js = ny*(coords[1])/npy;
     int je = ny*(coords[1]+1)/npy-1;
     nyl = je-js+1;
@@ -152,7 +152,7 @@ class ParallelGrid
     nz  = npts[2];
     az  = a[2];
     bz  = b[2];
-    dz  = (bz-az) / (realtype) nz;
+    dz  = (bz-az) / (sunrealtype) nz;
     int ks = nz*(coords[2])/npz;
     int ke = nz*(coords[2]+1)/npz-1;
     nzl = ke-ks+1;
@@ -469,31 +469,31 @@ class ParallelGrid
     return dof*nptsl();
   }
 
-  realtype* GetRecvView(const std::string& direction)
+  sunrealtype* GetRecvView(const std::string& direction)
   {
     if (direction == "WEST")
     {
-      return static_cast<realtype*>(Wrecv_.data());
+      return static_cast<sunrealtype*>(Wrecv_.data());
     }
     else if (direction == "EAST")
     {
-      return static_cast<realtype*>(Erecv_.data());
+      return static_cast<sunrealtype*>(Erecv_.data());
     }
     else if (direction == "NORTH")
     {
-      return static_cast<realtype*>(Nrecv_.data());
+      return static_cast<sunrealtype*>(Nrecv_.data());
     }
     else if (direction == "SOUTH")
     {
-      return static_cast<realtype*>(Srecv_.data());
+      return static_cast<sunrealtype*>(Srecv_.data());
     }
     else if (direction == "FRONT")
     {
-      return static_cast<realtype*>(Frecv_.data());
+      return static_cast<sunrealtype*>(Frecv_.data());
     }
     else if (direction == "BACK")
     {
-      return static_cast<realtype*>(Brecv_.data());
+      return static_cast<sunrealtype*>(Brecv_.data());
     }
     else
     {
@@ -502,31 +502,31 @@ class ParallelGrid
     }
   }
 
-  realtype* GetSendView(const std::string& direction)
+  sunrealtype* GetSendView(const std::string& direction)
   {
     if (direction == "WEST")
     {
-      return static_cast<realtype*>(Wsend_.data());
+      return static_cast<sunrealtype*>(Wsend_.data());
     }
     else if (direction == "EAST")
     {
-      return static_cast<realtype*>(Esend_.data());
+      return static_cast<sunrealtype*>(Esend_.data());
     }
     else if (direction == "NORTH")
     {
-      return static_cast<realtype*>(Nsend_.data());
+      return static_cast<sunrealtype*>(Nsend_.data());
     }
     else if (direction == "SOUTH")
     {
-      return static_cast<realtype*>(Ssend_.data());
+      return static_cast<sunrealtype*>(Ssend_.data());
     }
     else if (direction == "FRONT")
     {
-      return static_cast<realtype*>(Fsend_.data());
+      return static_cast<sunrealtype*>(Fsend_.data());
     }
     else if (direction == "BACK")
     {
-      return static_cast<realtype*>(Bsend_.data());
+      return static_cast<sunrealtype*>(Bsend_.data());
     }
     else
     {
@@ -538,9 +538,9 @@ class ParallelGrid
   GLOBALINT nx, ny, nz;    /* number of intervals globally       */
   int       nxl, nyl, nzl; /* number of intervals locally        */
   int       npx, npy, npz; /* numner of processes                */
-  realtype  dx, dy, dz;    /* mesh spacing                       */
-  realtype  ax, ay, az;    /* domain in [a, b]                   */
-  realtype  bx, by, bz;
+  sunrealtype  dx, dy, dz;    /* mesh spacing                       */
+  sunrealtype  ax, ay, az;    /* domain in [a, b]                   */
+  sunrealtype  bx, by, bz;
   int       dof;           /* degrees of freedom per node        */
   int       neq;           /* total number of equations locally  */
 
diff --git a/benchmarks/advection_reaction_3D/kokkos/README.md b/benchmarks/advection_reaction_3D/kokkos/README.md
index f27484385f..3cf8fca124 100644
--- a/benchmarks/advection_reaction_3D/kokkos/README.md
+++ b/benchmarks/advection_reaction_3D/kokkos/README.md
@@ -60,19 +60,19 @@ listed below.
 | `--nout <int>`              | Number of output times                                                        | 40          |
 | `--npts <int>`              | Number of mesh points in each direction                                       | 100         |
 | `--npxyz <int> <int> <int>` | Number of MPI tasks in each direction (0 forces MPI to decide)                | 0 0 0       |
-| `--xmax <realtype>`         | Maximum value of `x`, `y`, and `z` in :math:`X_max`                           | 1.0         |
-| `--A <realtype>`            | Constant concentration of species `A`                                         | 1.0         |
-| `--B <realtype>`            | Constant concentration of species `B`                                         | 3.5         |
-| `--c <realtype>`            | Advection speed `c`                                                           | 0.01        |
+| `--xmax <sunrealtype>`      | Maximum value of `x`, `y`, and `z` in :math:`X_max`                           | 1.0         |
+| `--A <sunrealtype>`         | Constant concentration of species `A`                                         | 1.0         |
+| `--B <sunrealtype>`         | Constant concentration of species `B`                                         | 3.5         |
+| `--c <sunrealtype>`         | Advection speed `c`                                                           | 0.01        |
 | `--order <int>`             | Integration method order                                                      | 3           |
 | `--method <method>`         | Integrator to use: `ERK`, `ARK-DIRK`, `ARK-IMEX`, `CV-BDF`, `CV-ADAMS`, `IDA` | `ARK-DIRK`  |
 | `--nls <method>`            | Nonlinear Solver Method: `newton`, `tl-newton`, `fixedpoint`, `none`          | `newton`    |
 | `--fpaccel <int>`           | Number of fixed point acceleration vectors                                    | 3           |
 | `--nopre`                   | Disable preconditioning                                                       | False       |
 | `--fused`                   | Enabled fused operations                                                      | Off         |
-| `--tf <realtype>`           | Final integration time `t_f`                                                  | 10.0        |
-| `--rtol <realtype>`         | Relative tolerance                                                            | 1.0e-6      |
-| `--atol <realtype>`         | Absolute tolerance                                                            | 1.0e-9      |
+| `--tf <sunrealtype>`        | Final integration time `t_f`                                                  | 10.0        |
+| `--rtol <sunrealtype>`      | Relative tolerance                                                            | 1.0e-6      |
+| `--atol <sunrealtype>`      | Absolute tolerance                                                            | 1.0e-9      |
 
 ## Building and Running
 
diff --git a/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.cpp b/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.cpp
index fa9f2bcc94..188cfd716b 100644
--- a/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.cpp
@@ -49,14 +49,14 @@
  *   --nopre            turn off preconditioning
  *   --order <int>      the method order to use
  *   --npts <int>       number of mesh points in each direction
- *   --xmax <realtype>  maximum value of x (size of domain)
- *   --tf <realtype>    final time
- *   --A <realtype>     A parameter value
- *   --B <realtype>     B parameter value
- *   --k <realtype>     reaction rate
- *   --c <realtype>     advection speed
- *   --rtol <realtype>  relative tolerance
- *   --atol <realtype>  absolute tolerance
+ *   --xmax <sunrealtype>  maximum value of x (size of domain)
+ *   --tf <sunrealtype>    final time
+ *   --A <sunrealtype>     A parameter value
+ *   --B <sunrealtype>     B parameter value
+ *   --k <sunrealtype>     reaction rate
+ *   --c <sunrealtype>     advection speed
+ *   --rtol <sunrealtype>  relative tolerance
+ *   --atol <sunrealtype>  absolute tolerance
  * --------------------------------------------------------------------------*/
 
 #include "advection_reaction_3D.hpp"
@@ -167,7 +167,7 @@ int FillSendBuffers(N_Vector y, UserData* udata)
 {
 
   /* Shortcuts */
-  const realtype c = udata->c;
+  const sunrealtype c = udata->c;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
@@ -468,8 +468,8 @@ int SetupProblem(int argc, char *argv[], UserData* udata, UserOptions* uopt,
 
   /* Setup the parallel decomposition */
   const sunindextype npts[] = {uopt->npts, uopt->npts, uopt->npts};
-  const realtype amax[] = {0.0, 0.0, 0.0};
-  const realtype bmax[] = {udata->xmax, udata->xmax, udata->xmax};
+  const sunrealtype amax[] = {0.0, 0.0, 0.0};
+  const sunrealtype bmax[] = {udata->xmax, udata->xmax, udata->xmax};
   udata->grid = new ParallelGrid<sunindextype>(&udata->comm, amax, bmax, npts,
       3, BoundaryType::PERIODIC, StencilType::UPWIND, udata->c, uopt->npxyz);
 
@@ -551,15 +551,15 @@ int SetupProblem(int argc, char *argv[], UserData* udata, UserOptions* uopt,
 
 /* Compute the 3D Gaussian function. */
 KOKKOS_FUNCTION
-void Gaussian3D(realtype& x, realtype& y, realtype& z, realtype xmax)
+void Gaussian3D(sunrealtype& x, sunrealtype& y, sunrealtype& z, sunrealtype xmax)
 {
   /* Gaussian distribution defaults */
-  const realtype alpha = 0.1;
-  const realtype mu[] = { xmax/RCONST(2.0), xmax/RCONST(2.0), xmax/RCONST(2.0) };
-  const realtype sigma[] = { xmax/RCONST(4.0), xmax/RCONST(4.0), xmax/RCONST(4.0) }; // Sigma = diag(sigma)
+  const sunrealtype alpha = 0.1;
+  const sunrealtype mu[] = { xmax/SUN_RCONST(2.0), xmax/SUN_RCONST(2.0), xmax/SUN_RCONST(2.0) };
+  const sunrealtype sigma[] = { xmax/SUN_RCONST(4.0), xmax/SUN_RCONST(4.0), xmax/SUN_RCONST(4.0) }; // Sigma = diag(sigma)
 
   /* denominator = 2*sqrt(|Sigma|*(2pi)^3) */
-  const realtype denom = 2.0 * sqrt((sigma[0]*sigma[1]*sigma[2])*pow(2*M_PI,3));
+  const sunrealtype denom = 2.0 * sqrt((sigma[0]*sigma[1]*sigma[2])*pow(2*M_PI,3));
   x = alpha * exp( -((x - mu[0])*(x - mu[0])*(1.0/sigma[0])) / denom );
   y = alpha * exp( -((y - mu[1])*(y - mu[1])*(1.0/sigma[1])) / denom );
   z = alpha * exp( -((z - mu[2])*(z - mu[2])*(1.0/sigma[2])) / denom );
@@ -576,24 +576,24 @@ int SetIC(N_Vector y, UserData* udata)
   const int      nyl  = udata->grid->nyl;
   const int      nzl  = udata->grid->nzl;
   const int      dof  = udata->grid->dof;
-  const realtype dx   = udata->grid->dx;
-  const realtype dy   = udata->grid->dy;
-  const realtype dz   = udata->grid->dz;
-  const realtype xmax = udata->xmax;
-  const realtype A    = udata->A;
-  const realtype B    = udata->B;
-  const realtype k1   = udata->k1;
-  const realtype k2   = udata->k2;
-  const realtype k3   = udata->k3;
-  const realtype k4   = udata->k4;
+  const sunrealtype dx   = udata->grid->dx;
+  const sunrealtype dy   = udata->grid->dy;
+  const sunrealtype dz   = udata->grid->dz;
+  const sunrealtype xmax = udata->xmax;
+  const sunrealtype A    = udata->A;
+  const sunrealtype B    = udata->B;
+  const sunrealtype k1   = udata->k1;
+  const sunrealtype k2   = udata->k2;
+  const sunrealtype k3   = udata->k3;
+  const sunrealtype k4   = udata->k4;
   const int      xcrd = udata->grid->coords[0];
   const int      ycrd = udata->grid->coords[1];
   const int      zcrd = udata->grid->coords[2];
 
   /* Steady state solution */
-  const realtype us = k1 * A / k4;
-  const realtype vs = k2 * k4 * B / (k1 * k3 * A);
-  const realtype ws = 3.0;
+  const sunrealtype us = k1 * A / k4;
+  const sunrealtype vs = k2 * k4 * B / (k1 * k3 * A);
+  const sunrealtype ws = 3.0;
 
   /* Create 4D view of y */
   Vec4D yview(N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(y)), nxl, nyl, nzl, dof);
@@ -603,11 +603,11 @@ int SetIC(N_Vector y, UserData* udata)
                        Range3D({0,0,0},{nxl,nyl,nzl}),
                        KOKKOS_LAMBDA (int i, int j, int k)
   {
-    realtype x = (xcrd * nxl + i) * dx;
-    realtype y = (ycrd * nyl + j) * dy;
-    realtype z = (zcrd * nzl + k) * dz;
+    sunrealtype x = (xcrd * nxl + i) * dx;
+    sunrealtype y = (ycrd * nyl + j) * dy;
+    sunrealtype z = (zcrd * nzl + k) * dz;
     Gaussian3D(x,y,z,xmax);
-    const realtype p = x + y + z;
+    const sunrealtype p = x + y + z;
     yview(i,j,k,0) = us + p;
     yview(i,j,k,1) = vs + p;
     yview(i,j,k,2) = ws + p;
@@ -619,17 +619,17 @@ int SetIC(N_Vector y, UserData* udata)
 
 
 /* Write time and solution to disk */
-int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt)
+int WriteOutput(sunrealtype t, N_Vector y, UserData* udata, UserOptions* uopt)
 {
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
   /* output current solution norm to screen */
-  realtype N = (realtype) udata->grid->npts();
-  realtype u = N_VWL2Norm(y, udata->umask);
+  sunrealtype N = (sunrealtype) udata->grid->npts();
+  sunrealtype u = N_VWL2Norm(y, udata->umask);
   u = sqrt(u*u/N);
-  realtype v = N_VWL2Norm(y, udata->vmask);
+  sunrealtype v = N_VWL2Norm(y, udata->vmask);
   v = sqrt(v*v/N);
-  realtype w = N_VWL2Norm(y, udata->wmask);
+  sunrealtype w = N_VWL2Norm(y, udata->wmask);
   w = sqrt(w*w/N);
   if (udata->myid == 0) {
     printf("     %10.6f   %10.6f   %10.6f   %10.6f\n", t, u, v, w);
@@ -697,14 +697,14 @@ void InputError(char *name)
     fprintf(stderr, "  --order <int>             the method order to use\n");
     fprintf(stderr, "  --npts <int>              number of mesh points in each direction\n");
     fprintf(stderr, "  --npxyz <int> <int> <int> number of processors in each direction (0 forces MPI to decide)\n");
-    fprintf(stderr, "  --xmax <realtype>         maximum value of x (size of domain)\n");
-    fprintf(stderr, "  --tf <realtype>           final time\n");
-    fprintf(stderr, "  --A <realtype>            A parameter value\n");
-    fprintf(stderr, "  --B <realtype>            B parameter value\n");
-    fprintf(stderr, "  --k <realtype>            reaction rate\n");
-    fprintf(stderr, "  --c <realtype>            advection speed\n");
-    fprintf(stderr, "  --rtol <realtype>         relative tolerance\n");
-    fprintf(stderr, "  --atol <realtype>         absolute tolerance\n");
+    fprintf(stderr, "  --xmax <sunrealtype>         maximum value of x (size of domain)\n");
+    fprintf(stderr, "  --tf <sunrealtype>           final time\n");
+    fprintf(stderr, "  --A <sunrealtype>            A parameter value\n");
+    fprintf(stderr, "  --B <sunrealtype>            B parameter value\n");
+    fprintf(stderr, "  --k <sunrealtype>            reaction rate\n");
+    fprintf(stderr, "  --c <sunrealtype>            advection speed\n");
+    fprintf(stderr, "  --rtol <sunrealtype>         relative tolerance\n");
+    fprintf(stderr, "  --atol <sunrealtype>         absolute tolerance\n");
   }
 
   MPI_Barrier(MPI_COMM_WORLD);
diff --git a/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.hpp b/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.hpp
index cb0dceea64..3c6764990f 100644
--- a/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.hpp
+++ b/benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.hpp
@@ -47,10 +47,10 @@ struct UserOptions
 {
   int      npxyz[3]; /* number of processors in x,y,z */
   sunindextype npts; /* number of spatial mesh points */
-  realtype t0;       /* initial time                  */
-  realtype tf;       /* final time                    */
-  realtype rtol;     /* relative tolerance            */
-  realtype atol;     /* absolute tolerance            */
+  sunrealtype t0;       /* initial time                  */
+  sunrealtype tf;       /* final time                    */
+  sunrealtype rtol;     /* relative tolerance            */
+  sunrealtype atol;     /* absolute tolerance            */
   int      order;    /* method order                  */
   string   method;   /* method string                 */
   string   nls;      /* nonlinear solver to use       */
@@ -93,16 +93,16 @@ struct UserData
   N_Vector wmask;
 
   /* Problem parameters */
-  realtype  xmax; /* maximum x value              */
-  realtype  A;    /* concentration of species A   */
-  realtype  B;    /* w source rate                */
-  realtype  k1;   /* reaction rates               */
-  realtype  k2;
-  realtype  k3;
-  realtype  k4;
-  realtype  k5;
-  realtype  k6;
-  realtype  c;    /* advection coefficient        */
+  sunrealtype  xmax; /* maximum x value              */
+  sunrealtype  A;    /* concentration of species A   */
+  sunrealtype  B;    /* w source rate                */
+  sunrealtype  k1;   /* reaction rates               */
+  sunrealtype  k2;
+  sunrealtype  k3;
+  sunrealtype  k4;
+  sunrealtype  k5;
+  sunrealtype  k6;
+  sunrealtype  c;    /* advection coefficient        */
 
   /* Parallel mesh */
   ParallelGrid<sunindextype>* grid;
@@ -166,6 +166,6 @@ void InputError(char *name);
 int ComponentMask(N_Vector mask, const int component, const UserData* udata);
 
 /* function to write solution to disk */
-int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt);
+int WriteOutput(sunrealtype t, N_Vector y, UserData* udata, UserOptions* uopt);
 
 #endif
diff --git a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
index 5535557af4..27b1a870b7 100644
--- a/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
@@ -52,7 +52,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, nst_a, netf;  /* step stats                   */
@@ -213,7 +213,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, nst_a, netf;  /* step stats                   */
@@ -382,7 +382,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
 int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
 {
   void*    arkode_mem = NULL; /* empty ARKODE memory structure */
-  realtype   t, dtout, tout;    /* current/output time data      */
+  sunrealtype   t, dtout, tout;    /* current/output time data      */
   int      retval;            /* reusable error-checking flag  */
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
@@ -487,12 +487,12 @@ int TaskLocalNlsResidual(N_Vector ycor, N_Vector F, void* arkode_mem)
   /* temporary variables */
   UserData* udata;
   int      retval;
-  realtype   c[3];
+  sunrealtype   c[3];
   N_Vector X[3];
 
   /* nonlinear system data */
   N_Vector z, zpred, Fi, sdata;
-  realtype   tcur, gamma;
+  sunrealtype   tcur, gamma;
   void     *user_data;
 
   ARKStepGetNonlinearSystemData(arkode_mem, &tcur, &zpred, &z, &Fi,
@@ -536,7 +536,7 @@ int TaskLocalLSolve(N_Vector delta, void* arkode_mem)
 
   /* nonlinear system data */
   N_Vector z, zpred, Fi, sdata;
-  realtype tcur, gamma;
+  sunrealtype tcur, gamma;
   void*    user_data = NULL;
 
   ARKStepGetNonlinearSystemData(arkode_mem, &tcur, &zpred, &z, &Fi,
@@ -575,8 +575,8 @@ int TaskLocalNewton_Initialize(SUNNonlinearSolver NLS)
 
 int TaskLocalNewton_Solve(SUNNonlinearSolver NLS,
                           N_Vector y0, N_Vector ycor,
-                          N_Vector w, realtype tol,
-                          booleantype callLSetup, void* mem)
+                          N_Vector w, sunrealtype tol,
+                          sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   MPI_Comm comm;
diff --git a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
index dd75f4189a..e85a9272e2 100644
--- a/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
@@ -27,7 +27,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
@@ -184,7 +184,7 @@ int EvolveProblemAdams(N_Vector y, UserData* udata, UserOptions* uopt)
   void*              cvode_mem = NULL;   /* empty CVODE memory structure    */
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
diff --git a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
index 792e805365..df053bec5d 100644
--- a/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
@@ -41,7 +41,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNLinearSolver    LS  = NULL;      /* empty linear solver structure    */
   N_Vector           yp  = NULL;      /* empty vector structure           */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
diff --git a/benchmarks/advection_reaction_3D/kokkos/rhs3D.hpp b/benchmarks/advection_reaction_3D/kokkos/rhs3D.hpp
index 34698146ab..75f18209a0 100644
--- a/benchmarks/advection_reaction_3D/kokkos/rhs3D.hpp
+++ b/benchmarks/advection_reaction_3D/kokkos/rhs3D.hpp
@@ -26,7 +26,7 @@
    upwind 1st order finite differences.  At present, only periodic boudary
    conditions are supported, which are handled via MPI's Cartesian
    communicator (even for serial runs). */
-static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+static int Advection(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
   /* access problem data */
   UserData* udata = (UserData*) user_data;
@@ -38,10 +38,10 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
   const int      nyl = udata->grid->nyl;
   const int      nzl = udata->grid->nzl;
   const int      dof = udata->grid->dof;
-  const realtype c   = udata->c;
-  const realtype cx  = -c / udata->grid->dx;
-  const realtype cy  = -c / udata->grid->dy;
-  const realtype cz  = -c / udata->grid->dz;
+  const sunrealtype c   = udata->c;
+  const sunrealtype cx  = -c / udata->grid->dx;
+  const sunrealtype cy  = -c / udata->grid->dy;
+  const sunrealtype cz  = -c / udata->grid->dz;
 
   /* local variables */
   int retval;
@@ -71,9 +71,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          Range3D({1,1,1},{nxl,nyl,nzl}),
                          KOKKOS_LAMBDA (int i, int j, int k)
     {
-      const realtype u_ijk = Yview(i,j,k,0);
-      const realtype v_ijk = Yview(i,j,k,1);
-      const realtype w_ijk = Yview(i,j,k,2);
+      const sunrealtype u_ijk = Yview(i,j,k,0);
+      const sunrealtype v_ijk = Yview(i,j,k,1);
+      const sunrealtype w_ijk = Yview(i,j,k,2);
 
       // grad * u
       dYview(i,j,k,0)  = cz * (u_ijk - Yview(i,j,k-1,0)); // du/dz
@@ -98,9 +98,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          Range3D({0,0,0},{nxl-1,nyl-1,nzl-1}),
                          KOKKOS_LAMBDA (int i, int j, int k)
     {
-      const realtype u_ijk = Yview(i,j,k,0);
-      const realtype v_ijk = Yview(i,j,k,1);
-      const realtype w_ijk = Yview(i,j,k,2);
+      const sunrealtype u_ijk = Yview(i,j,k,0);
+      const sunrealtype v_ijk = Yview(i,j,k,1);
+      const sunrealtype w_ijk = Yview(i,j,k,2);
 
       // grad * u
       dYview(i,j,k,0)  = cz * (Yview(i,j,k+1,0) - u_ijk); // du/dz
@@ -143,9 +143,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int j, int k, int l)
     {
       const int i = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,0,k,l);
-      const realtype YBack  = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,0,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,0,k,l);
+      const sunrealtype YBack  = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,0,l);
       dYview(i,j,k,l)  = cx * (Yijkl - Wrecv(0,j,k,l)); // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - YSouth);         // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - YBack);          // d/dz
@@ -155,9 +155,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int i, int k, int l)
     {
       const int j = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YWest = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(0,j,k,l);
-      const realtype YBack = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,0,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YWest = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(0,j,k,l);
+      const sunrealtype YBack = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,0,l);
       dYview(i,j,k,l)  = cx * (Yijkl - YWest);          // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - Srecv(i,0,k,l)); // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - YBack);          // d/dz
@@ -167,9 +167,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int i, int j, int l)
     {
       const int k = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YWest  = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(0,j,k,l);
-      const realtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,0,k,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YWest  = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(0,j,k,l);
+      const sunrealtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,0,k,l);
       dYview(i,j,k,l)  = cx * (Yijkl - YWest);          // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - YSouth);         // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - Brecv(i,j,0,l)); // d/dz
@@ -193,9 +193,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int j, int k, int l)
     {
       const int i = nxl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,0,k,l);
-      const realtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,0,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,0,k,l);
+      const sunrealtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,0,l);
       dYview(i,j,k,l)  = cx * (Erecv(0,j,k,l) - Yijkl); // d/dx
       dYview(i,j,k,l) += cy * (YNorth - Yijkl);         // d/dy
       dYview(i,j,k,l) += cz * (YFront - Yijkl);         // d/dz
@@ -205,9 +205,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int i, int k, int l)
     {
       const int j = nyl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(0,j,k,l);
-      const realtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,0,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(0,j,k,l);
+      const sunrealtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,0,l);
       dYview(i,j,k,l)  = cx * (YEast - Yijkl);          // d/dx
       dYview(i,j,k,l) += cy * (Nrecv(i,0,k,l) - Yijkl); // d/dy
       dYview(i,j,k,l) += cz * (YFront - Yijkl);         // d/dz
@@ -217,9 +217,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                          KOKKOS_LAMBDA (int i, int j, int l)
     {
       const int k = nzl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(0,j,k,l);
-      const realtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,0,k,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(0,j,k,l);
+      const sunrealtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,0,k,l);
       dYview(i,j,k,l)  = cx * (YEast - Yijkl);          // d/dx
       dYview(i,j,k,l) += cy * (YNorth - Yijkl);         // d/dy
       dYview(i,j,k,l) += cz * (Frecv(i,j,0,l) - Yijkl); // d/dz
@@ -232,7 +232,7 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
 
 
 /* Compute the reaction term g(t,y). */
-static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+static int Reaction(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
   /* access problem data */
   UserData* udata = (UserData*) user_data;
@@ -240,14 +240,14 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
   /* set variable shortcuts */
-  const realtype A  = udata->A;
-  const realtype B  = udata->B;
-  const realtype k1 = udata->k1;
-  const realtype k2 = udata->k2;
-  const realtype k3 = udata->k3;
-  const realtype k4 = udata->k4;
-  const realtype k5 = udata->k5;
-  const realtype k6 = udata->k6;
+  const sunrealtype A  = udata->A;
+  const sunrealtype B  = udata->B;
+  const sunrealtype k1 = udata->k1;
+  const sunrealtype k2 = udata->k2;
+  const sunrealtype k3 = udata->k3;
+  const sunrealtype k4 = udata->k4;
+  const sunrealtype k5 = udata->k5;
+  const sunrealtype k6 = udata->k6;
   const int     nxl = udata->grid->nxl;
   const int     nyl = udata->grid->nyl;
   const int     nzl = udata->grid->nzl;
@@ -266,9 +266,9 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                        Range3D({0,0,0},{nxl,nyl,nzl}),
                        KOKKOS_LAMBDA (int i, int j, int k)
   {
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
     dYview(i,j,k,0) += k1 * A - k2 * w * u + k3 * u * u * v - k4 * u;
     dYview(i,j,k,1) += k2 * w * u - k3 * u * u * v;
     dYview(i,j,k,2) += -k2 * w * u + k5 * B - k6 * w;
@@ -280,7 +280,7 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
 
 
 /* Compute the RHS as h(t,y) = f(t,y) + g(t,y). */
-static int AdvectionReaction(realtype t, N_Vector y, N_Vector ydot,
+static int AdvectionReaction(sunrealtype t, N_Vector y, N_Vector ydot,
                              void *user_data)
 {
   /* access problem data */
@@ -300,7 +300,7 @@ static int AdvectionReaction(realtype t, N_Vector y, N_Vector ydot,
 }
 
 /* Compute the residual F(t,y,y') = ydot - h(t,y) = 0. */
-static int AdvectionReactionResidual(realtype t, N_Vector y, N_Vector ydot,
+static int AdvectionReactionResidual(sunrealtype t, N_Vector y, N_Vector ydot,
                                      N_Vector F, void *user_data)
 {
   /* access problem data */
@@ -330,17 +330,17 @@ static int AdvectionReactionResidual(realtype t, N_Vector y, N_Vector ydot,
    When using a fully implicit method, we are approximating
    dh/dy as dg/dy. */
 static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
-                               const realtype gamma, UserData* udata)
+                               const sunrealtype gamma, UserData* udata)
 {
   /* set variable shortcuts */
   const int dof = udata->grid->dof;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
-  const realtype k2  = udata->k2;
-  const realtype k3  = udata->k3;
-  const realtype k4  = udata->k4;
-  const realtype k6  = udata->k6;
+  const sunrealtype k2  = udata->k2;
+  const sunrealtype k3  = udata->k3;
+  const sunrealtype k4  = udata->k4;
+  const sunrealtype k6  = udata->k6;
 
   /* create 4D views of state, RHS and solution vectors */
   Vec4D Yview(N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(y)), nxl, nyl, nzl, dof);
@@ -354,47 +354,47 @@ static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
   {
 
     /* shortcuts to u, v, w for the block */
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
 
     //
     // compute A = I - gamma*(dg/dy)
     //
 
     /* 1st row: u, v, w */
-    const realtype A0 = 1. - gamma * (-k2 * w + 2.0 * k3 * u * v - k4);
-    const realtype A1 = -gamma * (k3 * u * u);
-    const realtype A2 = -gamma * (-k2 * u);
+    const sunrealtype A0 = 1. - gamma * (-k2 * w + 2.0 * k3 * u * v - k4);
+    const sunrealtype A1 = -gamma * (k3 * u * u);
+    const sunrealtype A2 = -gamma * (-k2 * u);
 
     /* 2nd row: u, v, w */
-    const realtype A3 = -gamma * (k2 * w - 2.0 * k3 * u * v);
-    const realtype A4 = 1. - gamma * (-k3 * u * u);
-    const realtype A5 = -gamma * (k2 * u);
+    const sunrealtype A3 = -gamma * (k2 * w - 2.0 * k3 * u * v);
+    const sunrealtype A4 = 1. - gamma * (-k3 * u * u);
+    const sunrealtype A5 = -gamma * (k2 * u);
 
     /* 3rd row: u, v, w */
-    const realtype A6 = -gamma * (-k2 * w);
-    const realtype A7 =  0.0;
-    const realtype A8 = 1. - gamma * (-k2 * u - k6);
+    const sunrealtype A6 = -gamma * (-k2 * w);
+    const sunrealtype A7 =  0.0;
+    const sunrealtype A8 = 1. - gamma * (-k2 * u - k6);
 
     //
     // compute x = A^{-1}*b
     //
 
-    const realtype scratch_0 = A4*A8;
-    const realtype scratch_1 = A1*A5;
-    const realtype scratch_2 = A2*A7;
-    const realtype scratch_3 = A5*A7;
-    const realtype scratch_4 = A1*A8;
-    const realtype scratch_5 = A2*A4;
-    const realtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
-    const realtype scratch_7 = A2*A3;
-    const realtype scratch_8 = A6*Bview(i,j,k,0);
-    const realtype scratch_9 = A2*A6;
-    const realtype scratch_10 = A3*Bview(i,j,k,0);
-    const realtype scratch_11 = 1.0/A0;
-    const realtype scratch_12 = A1*scratch_11;
-    const realtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
+    const sunrealtype scratch_0 = A4*A8;
+    const sunrealtype scratch_1 = A1*A5;
+    const sunrealtype scratch_2 = A2*A7;
+    const sunrealtype scratch_3 = A5*A7;
+    const sunrealtype scratch_4 = A1*A8;
+    const sunrealtype scratch_5 = A2*A4;
+    const sunrealtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
+    const sunrealtype scratch_7 = A2*A3;
+    const sunrealtype scratch_8 = A6*Bview(i,j,k,0);
+    const sunrealtype scratch_9 = A2*A6;
+    const sunrealtype scratch_10 = A3*Bview(i,j,k,0);
+    const sunrealtype scratch_11 = 1.0/A0;
+    const sunrealtype scratch_12 = A1*scratch_11;
+    const sunrealtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
 
     Xview(i,j,k,0) = scratch_6*( Bview(i,j,k,0)*(scratch_0 - scratch_3)
                                + Bview(i,j,k,1)*(scratch_2 - scratch_4)
@@ -414,17 +414,17 @@ static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
 /* Solve the linear systems Ax = b where A = -dg/dy + gamma.
    We are approximating dh/dy as dg/dy. */
 static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
-                                  const realtype gamma, UserData* udata)
+                                  const sunrealtype gamma, UserData* udata)
 {
   /* set variable shortcuts */
   const int dof = udata->grid->dof;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
-  const realtype k2  = udata->k2;
-  const realtype k3  = udata->k3;
-  const realtype k4  = udata->k4;
-  const realtype k6  = udata->k6;
+  const sunrealtype k2  = udata->k2;
+  const sunrealtype k3  = udata->k3;
+  const sunrealtype k4  = udata->k4;
+  const sunrealtype k6  = udata->k6;
 
   /* create 4D views of state, RHS and solution vectors */
   Vec4D Yview(N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(y)), nxl, nyl, nzl, dof);
@@ -438,9 +438,9 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
   {
 
     /* shortcuts to u, v, w for the block */
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
 
     //
     // compute A = -dg/dy + gamma*diag(df/dydot)
@@ -449,38 +449,38 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
     //
 
     /* 1st row: u, v, w */
-    const realtype A0 = -(-k2 * w + 2.0 * k3 * u * v - k4) + gamma;
-    const realtype A1 = -(k3 * u * u);
-    const realtype A2 = -(-k2 * u);
+    const sunrealtype A0 = -(-k2 * w + 2.0 * k3 * u * v - k4) + gamma;
+    const sunrealtype A1 = -(k3 * u * u);
+    const sunrealtype A2 = -(-k2 * u);
 
     /* 2nd row: u, v, w */
-    const realtype A3 = -(k2 * w - 2.0 * k3 * u * v);
-    const realtype A4 = -(-k3 * u * u) + gamma;
-    const realtype A5 = -(k2 * u);
+    const sunrealtype A3 = -(k2 * w - 2.0 * k3 * u * v);
+    const sunrealtype A4 = -(-k3 * u * u) + gamma;
+    const sunrealtype A5 = -(k2 * u);
 
     /* 3rd row: u, v, w */
-    const realtype A6 = -(-k2 * w);
-    const realtype A7 =  0.0;
-    const realtype A8 = -(-k2 * u - k6) + gamma;
+    const sunrealtype A6 = -(-k2 * w);
+    const sunrealtype A7 =  0.0;
+    const sunrealtype A8 = -(-k2 * u - k6) + gamma;
 
     //
     // compute x = A^{-1}*b
     //
 
-    const realtype scratch_0 = A4*A8;
-    const realtype scratch_1 = A1*A5;
-    const realtype scratch_2 = A2*A7;
-    const realtype scratch_3 = A5*A7;
-    const realtype scratch_4 = A1*A8;
-    const realtype scratch_5 = A2*A4;
-    const realtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
-    const realtype scratch_7 = A2*A3;
-    const realtype scratch_8 = A6*Bview(i,j,k,0);
-    const realtype scratch_9 = A2*A6;
-    const realtype scratch_10 = A3*Bview(i,j,k,0);
-    const realtype scratch_11 = 1.0/A0;
-    const realtype scratch_12 = A1*scratch_11;
-    const realtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
+    const sunrealtype scratch_0 = A4*A8;
+    const sunrealtype scratch_1 = A1*A5;
+    const sunrealtype scratch_2 = A2*A7;
+    const sunrealtype scratch_3 = A5*A7;
+    const sunrealtype scratch_4 = A1*A8;
+    const sunrealtype scratch_5 = A2*A4;
+    const sunrealtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
+    const sunrealtype scratch_7 = A2*A3;
+    const sunrealtype scratch_8 = A6*Bview(i,j,k,0);
+    const sunrealtype scratch_9 = A2*A6;
+    const sunrealtype scratch_10 = A3*Bview(i,j,k,0);
+    const sunrealtype scratch_11 = 1.0/A0;
+    const sunrealtype scratch_12 = A1*scratch_11;
+    const sunrealtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
 
     Xview(i,j,k,0) = scratch_6*( Bview(i,j,k,0)*(scratch_0 - scratch_3)
                                + Bview(i,j,k,1)*(scratch_2 - scratch_4)
@@ -503,8 +503,8 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
  * --------------------------------------------------------------*/
 
 /* Solves Pz = r where P = I - gamma * dg/dy */
-static int PSolve(realtype t, N_Vector y, N_Vector ydot, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   /* local variables */
@@ -520,8 +520,8 @@ static int PSolve(realtype t, N_Vector y, N_Vector ydot, N_Vector r,
 }
 
 /* Solves Pz = r where P = -dg/dy + gamma */
-static int PSolveRes(realtype t, N_Vector y, N_Vector ydot, N_Vector F,
-                     N_Vector r, N_Vector z, realtype cj, realtype delta,
+static int PSolveRes(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector F,
+                     N_Vector r, N_Vector z, sunrealtype cj, sunrealtype delta,
                      void *user_data)
 {
   /* local variables */
diff --git a/benchmarks/advection_reaction_3D/raja/README.md b/benchmarks/advection_reaction_3D/raja/README.md
index 33c82db725..3f6ea80bb2 100644
--- a/benchmarks/advection_reaction_3D/raja/README.md
+++ b/benchmarks/advection_reaction_3D/raja/README.md
@@ -60,19 +60,19 @@ listed below.
 | `--nout <int>`              | Number of output times                                                        | 40          |
 | `--npts <int>`              | Number of mesh points in each direction                                       | 100         |
 | `--npxyz <int> <int> <int>` | Number of MPI tasks in each direction (0 forces MPI to decide)                | 0 0 0       |
-| `--xmax <realtype>`         | Maximum value of `x`, `y`, and `z` in :math:`X_max`                           | 1.0         |
-| `--A <realtype>`            | Constant concentration of species `A`                                         | 1.0         |
-| `--B <realtype>`            | Constant concentration of species `B`                                         | 3.5         |
-| `--c <realtype>`            | Advection speed `c`                                                           | 0.01        |
+| `--xmax <sunrealtype>`      | Maximum value of `x`, `y`, and `z` in :math:`X_max`                           | 1.0         |
+| `--A <sunrealtype>`         | Constant concentration of species `A`                                         | 1.0         |
+| `--B <sunrealtype>`         | Constant concentration of species `B`                                         | 3.5         |
+| `--c <sunrealtype>`         | Advection speed `c`                                                           | 0.01        |
 | `--order <int>`             | Integration method order                                                      | 3           |
 | `--method <method>`         | Integrator to use: `ERK`, `ARK-DIRK`, `ARK-IMEX`, `CV-BDF`, `CV-ADAMS`, `IDA` | `ARK-DIRK`  |
 | `--nls <method>`            | Nonlinear Solver Method: `newton`, `tl-newton`, `fixedpoint`, `none`          | `newton`    |
 | `--fpaccel <int>`           | Number of fixed point acceleration vectors                                    | 3           |
 | `--nopre`                   | Disable preconditioning                                                       | False       |
 | `--fused`                   | Enabled fused operations                                                      | Off         |
-| `--tf <realtype>`           | Final integration time `t_f`                                                  | 10.0        |
-| `--rtol <realtype>`         | Relative tolerance                                                            | 1.0e-6      |
-| `--atol <realtype>`         | Absolute tolerance                                                            | 1.0e-9      |
+| `--tf <sunrealtype>`        | Final integration time `t_f`                                                  | 10.0        |
+| `--rtol <sunrealtype>`      | Relative tolerance                                                            | 1.0e-6      |
+| `--atol <sunrealtype>`      | Absolute tolerance                                                            | 1.0e-9      |
 
 ## Building and Running
 
diff --git a/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.cpp b/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.cpp
index 088e4536a0..0b1aa0b583 100644
--- a/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.cpp
+++ b/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.cpp
@@ -49,14 +49,14 @@
  *   --nopre            turn off preconditioning
  *   --order <int>      the method order to use
  *   --npts <int>       number of mesh points in each direction
- *   --xmax <realtype>  maximum value of x (size of domain)
- *   --tf <realtype>    final time
- *   --A <realtype>     A parameter value
- *   --B <realtype>     B parameter value
- *   --k <realtype>     reaction rate
- *   --c <realtype>     advection speed
- *   --rtol <realtype>  relative tolerance
- *   --atol <realtype>  absolute tolerance
+ *   --xmax <sunrealtype>  maximum value of x (size of domain)
+ *   --tf <sunrealtype>    final time
+ *   --A <sunrealtype>     A parameter value
+ *   --B <sunrealtype>     B parameter value
+ *   --k <sunrealtype>     reaction rate
+ *   --c <sunrealtype>     advection speed
+ *   --rtol <sunrealtype>  relative tolerance
+ *   --atol <sunrealtype>  absolute tolerance
  * --------------------------------------------------------------------------*/
 
 #include "advection_reaction_3D.hpp"
@@ -184,14 +184,14 @@ int FillSendBuffers(N_Vector y, UserData* udata)
 {
 
   /* shortcuts */
-  const realtype c = udata->c;
+  const sunrealtype c = udata->c;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
   const int dof = udata->grid->dof;
 
   /* Create a 4D view of the vector */
-  RAJA::View<realtype, RAJA::Layout<4> > Yview(GetVecData(y),
+  RAJA::View<sunrealtype, RAJA::Layout<4> > Yview(GetVecData(y),
                                                nxl, nyl, nzl, dof);
 
   if (c > 0.0)
@@ -200,11 +200,11 @@ int FillSendBuffers(N_Vector y, UserData* udata)
     /* Flow moving in the positive directions uses backward difference. */
 
     /* Fill 3D views of send buffers on device */
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Esend(udata->grid->getSendBuffer("EAST"),  nyl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Nsend(udata->grid->getSendBuffer("NORTH"), nxl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Fsend(udata->grid->getSendBuffer("FRONT"), nxl, nyl, dof);
 
     auto east_face = RAJA::make_tuple(RAJA::RangeSegment(0, nyl),
@@ -238,11 +238,11 @@ int FillSendBuffers(N_Vector y, UserData* udata)
     /* Flow moving in the negative directions uses forward difference. */
 
     /* Fill 3D views of send buffers on device */
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Wsend(udata->grid->getSendBuffer("WEST"),  nyl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Ssend(udata->grid->getSendBuffer("SOUTH"), nxl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Bsend(udata->grid->getSendBuffer("BACK"),  nxl, nyl, dof);
 
     auto west_face = RAJA::make_tuple(RAJA::RangeSegment(0, nyl),
@@ -431,7 +431,7 @@ int ComponentMask(N_Vector mask, int component, const UserData* udata)
   N_VConst(0.0, mask);
 
   /* Create 4D view of mask data */
-  RAJA::View<realtype, RAJA::Layout<4> > mask_view(GetVecData(mask),
+  RAJA::View<sunrealtype, RAJA::Layout<4> > mask_view(GetVecData(mask),
                                                    udata->grid->nxl,
                                                    udata->grid->nyl,
                                                    udata->grid->nzl,
@@ -506,9 +506,9 @@ int SetupProblem(int argc, char *argv[], UserData* udata, UserOptions* uopt,
 
   /* Setup the parallel decomposition */
   const sunindextype npts[] = {uopt->npts, uopt->npts, uopt->npts};
-  const realtype amax[] = {0.0, 0.0, 0.0};
-  const realtype bmax[] = {udata->xmax, udata->xmax, udata->xmax};
-  udata->grid = new ParallelGrid<realtype,sunindextype>(memhelper, &udata->comm,
+  const sunrealtype amax[] = {0.0, 0.0, 0.0};
+  const sunrealtype bmax[] = {udata->xmax, udata->xmax, udata->xmax};
+  udata->grid = new ParallelGrid<sunrealtype,sunindextype>(memhelper, &udata->comm,
     amax, bmax, npts, 3, BoundaryType::PERIODIC, StencilType::UPWIND, udata->c,
     STENCIL_WIDTH, uopt->npxyz);
 
@@ -574,15 +574,15 @@ int SetupProblem(int argc, char *argv[], UserData* udata, UserOptions* uopt,
 
 /* Compute the 3D Gaussian function. */
 DEVICE_FUNC
-void Gaussian3D(realtype& x, realtype& y, realtype& z, realtype xmax)
+void Gaussian3D(sunrealtype& x, sunrealtype& y, sunrealtype& z, sunrealtype xmax)
 {
   /* Gaussian distribution defaults */
-  const realtype alpha = 0.1;
-  const realtype mu[] = { xmax/RCONST(2.0), xmax/RCONST(2.0), xmax/RCONST(2.0) };
-  const realtype sigma[] = { xmax/RCONST(4.0), xmax/RCONST(4.0), xmax/RCONST(4.0) }; // Sigma = diag(sigma)
+  const sunrealtype alpha = 0.1;
+  const sunrealtype mu[] = { xmax/SUN_RCONST(2.0), xmax/SUN_RCONST(2.0), xmax/SUN_RCONST(2.0) };
+  const sunrealtype sigma[] = { xmax/SUN_RCONST(4.0), xmax/SUN_RCONST(4.0), xmax/SUN_RCONST(4.0) }; // Sigma = diag(sigma)
 
   /* denominator = 2*sqrt(|Sigma|*(2pi)^3) */
-  const realtype denom = 2.0 * sqrt((sigma[0]*sigma[1]*sigma[2])*pow(2*M_PI,3));
+  const sunrealtype denom = 2.0 * sqrt((sigma[0]*sigma[1]*sigma[2])*pow(2*M_PI,3));
   x = alpha * exp( -((x - mu[0])*(x - mu[0])*(1.0/sigma[0])) / denom );
   y = alpha * exp( -((y - mu[1])*(y - mu[1])*(1.0/sigma[1])) / denom );
   z = alpha * exp( -((z - mu[2])*(z - mu[2])*(1.0/sigma[2])) / denom );
@@ -599,27 +599,27 @@ int SetIC(N_Vector y, UserData* udata)
   const int      nyl  = udata->grid->nyl;
   const int      nzl  = udata->grid->nzl;
   const int      dof  = udata->grid->dof;
-  const realtype dx   = udata->grid->dx;
-  const realtype dy   = udata->grid->dy;
-  const realtype dz   = udata->grid->dz;
-  const realtype xmax = udata->xmax;
-  const realtype A    = udata->A;
-  const realtype B    = udata->B;
-  const realtype k1   = udata->k1;
-  const realtype k2   = udata->k2;
-  const realtype k3   = udata->k3;
-  const realtype k4   = udata->k4;
+  const sunrealtype dx   = udata->grid->dx;
+  const sunrealtype dy   = udata->grid->dy;
+  const sunrealtype dz   = udata->grid->dz;
+  const sunrealtype xmax = udata->xmax;
+  const sunrealtype A    = udata->A;
+  const sunrealtype B    = udata->B;
+  const sunrealtype k1   = udata->k1;
+  const sunrealtype k2   = udata->k2;
+  const sunrealtype k3   = udata->k3;
+  const sunrealtype k4   = udata->k4;
   const int      xcrd = udata->grid->coords[0];
   const int      ycrd = udata->grid->coords[1];
   const int      zcrd = udata->grid->coords[2];
 
   /* Steady state solution */
-  const realtype us = k1 * A / k4;
-  const realtype vs = k2 * k4 * B / (k1 * k3 * A);
-  const realtype ws = 3.0;
+  const sunrealtype us = k1 * A / k4;
+  const sunrealtype vs = k2 * k4 * B / (k1 * k3 * A);
+  const sunrealtype ws = 3.0;
 
   /* Create 4D view of y */
-  RAJA::View<realtype, RAJA::Layout<4> > yview(GetVecData(y),
+  RAJA::View<sunrealtype, RAJA::Layout<4> > yview(GetVecData(y),
                                                nxl, nyl, nzl, dof);
 
   /* Gaussian perturbation of the steady state solution */
@@ -629,11 +629,11 @@ int SetIC(N_Vector y, UserData* udata)
   RAJA::kernel<XYZ_KERNEL_POL>(range,
     [=] DEVICE_FUNC (int i, int j, int k)
   {
-    realtype x = (xcrd * nxl + i) * dx;
-    realtype y = (ycrd * nyl + j) * dy;
-    realtype z = (zcrd * nzl + k) * dz;
+    sunrealtype x = (xcrd * nxl + i) * dx;
+    sunrealtype y = (ycrd * nyl + j) * dy;
+    sunrealtype z = (zcrd * nzl + k) * dz;
     Gaussian3D(x,y,z,xmax);
-    const realtype p = x + y + z;
+    const sunrealtype p = x + y + z;
     yview(i,j,k,0) = us + p;
     yview(i,j,k,1) = vs + p;
     yview(i,j,k,2) = ws + p;
@@ -645,7 +645,7 @@ int SetIC(N_Vector y, UserData* udata)
 
 
 /* Write time and solution to disk */
-int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt)
+int WriteOutput(sunrealtype t, N_Vector y, UserData* udata, UserOptions* uopt)
 {
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
@@ -653,12 +653,12 @@ int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt)
   CopyVecFromDevice(N_VGetLocalVector_MPIPlusX(y));
 
   /* output current solution norm to screen */
-  realtype N = (realtype) udata->grid->npts();
-  realtype u = N_VWL2Norm(y, udata->umask);
+  sunrealtype N = (sunrealtype) udata->grid->npts();
+  sunrealtype u = N_VWL2Norm(y, udata->umask);
   u = sqrt(u*u/N);
-  realtype v = N_VWL2Norm(y, udata->vmask);
+  sunrealtype v = N_VWL2Norm(y, udata->vmask);
   v = sqrt(v*v/N);
-  realtype w = N_VWL2Norm(y, udata->wmask);
+  sunrealtype w = N_VWL2Norm(y, udata->wmask);
   w = sqrt(w*w/N);
   if (udata->myid == 0) {
     printf("     %10.6f   %10.6f   %10.6f   %10.6f\n", t, u, v, w);
@@ -674,14 +674,14 @@ int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt)
     }
 
     /* create 4D view of host data */
-    realtype* ydata = NULL;
+    sunrealtype* ydata = NULL;
     ydata = N_VGetArrayPointer(y);
     if (check_retval((void *) ydata, "N_VGetArrayPointer", 0, udata->myid)) return -1;
     const int nxl = udata->grid->nxl;
     const int nyl = udata->grid->nyl;
     const int nzl = udata->grid->nzl;
     const int dof = udata->grid->dof;
-    RAJA::View<realtype, RAJA::Layout<4> > Yview(ydata, nxl, nyl, nzl, dof);
+    RAJA::View<sunrealtype, RAJA::Layout<4> > Yview(ydata, nxl, nyl, nzl, dof);
 
     /* output results to disk */
     for (int i = 0; i < nxl; i++)
@@ -725,14 +725,14 @@ void InputError(char *name)
     fprintf(stderr, "  --order <int>             the method order to use\n");
     fprintf(stderr, "  --npts <int>              number of mesh points in each direction\n");
     fprintf(stderr, "  --npxyz <int> <int> <int> number of processors in each direction (0 forces MPI to decide)\n");
-    fprintf(stderr, "  --xmax <realtype>         maximum value of x (size of domain)\n");
-    fprintf(stderr, "  --tf <realtype>           final time\n");
-    fprintf(stderr, "  --A <realtype>            A parameter value\n");
-    fprintf(stderr, "  --B <realtype>            B parameter value\n");
-    fprintf(stderr, "  --k <realtype>            reaction rate\n");
-    fprintf(stderr, "  --c <realtype>            advection speed\n");
-    fprintf(stderr, "  --rtol <realtype>         relative tolerance\n");
-    fprintf(stderr, "  --atol <realtype>         absolute tolerance\n");
+    fprintf(stderr, "  --xmax <sunrealtype>         maximum value of x (size of domain)\n");
+    fprintf(stderr, "  --tf <sunrealtype>           final time\n");
+    fprintf(stderr, "  --A <sunrealtype>            A parameter value\n");
+    fprintf(stderr, "  --B <sunrealtype>            B parameter value\n");
+    fprintf(stderr, "  --k <sunrealtype>            reaction rate\n");
+    fprintf(stderr, "  --c <sunrealtype>            advection speed\n");
+    fprintf(stderr, "  --rtol <sunrealtype>         relative tolerance\n");
+    fprintf(stderr, "  --atol <sunrealtype>         absolute tolerance\n");
   }
 
   MPI_Barrier(MPI_COMM_WORLD);
diff --git a/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.hpp b/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.hpp
index e4227d62c7..6fdd714ffa 100644
--- a/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.hpp
+++ b/benchmarks/advection_reaction_3D/raja/advection_reaction_3D.hpp
@@ -46,10 +46,10 @@ struct UserOptions
 {
   int      npxyz[3]; /* number of processors in x,y,z */
   sunindextype npts; /* number of spatial mesh points */
-  realtype t0;       /* initial time                  */
-  realtype tf;       /* final time                    */
-  realtype rtol;     /* relative tolerance            */
-  realtype atol;     /* absolute tolerance            */
+  sunrealtype t0;       /* initial time                  */
+  sunrealtype tf;       /* final time                    */
+  sunrealtype rtol;     /* relative tolerance            */
+  sunrealtype atol;     /* absolute tolerance            */
   int      order;    /* method order                  */
   string   method;   /* method string                 */
   string   nls;      /* nonlinear solver to use       */
@@ -92,19 +92,19 @@ struct UserData
   N_Vector wmask;
 
   /* problem paramaters */
-  realtype  xmax; /* maximum x value              */
-  realtype  A;    /* concentration of species A   */
-  realtype  B;    /* w source rate                */
-  realtype  k1;   /* reaction rates               */
-  realtype  k2;
-  realtype  k3;
-  realtype  k4;
-  realtype  k5;
-  realtype  k6;
-  realtype  c;    /* advection coefficient        */
+  sunrealtype  xmax; /* maximum x value              */
+  sunrealtype  A;    /* concentration of species A   */
+  sunrealtype  B;    /* w source rate                */
+  sunrealtype  k1;   /* reaction rates               */
+  sunrealtype  k2;
+  sunrealtype  k3;
+  sunrealtype  k4;
+  sunrealtype  k5;
+  sunrealtype  k6;
+  sunrealtype  c;    /* advection coefficient        */
 
   /* parallel mesh */
-  ParallelGrid<realtype,sunindextype>* grid;
+  ParallelGrid<sunrealtype,sunindextype>* grid;
 
   /* count of implicit function evals by the task local nonlinear solver */
   long int nnlfi;
@@ -165,6 +165,6 @@ void InputError(char *name);
 int ComponentMask(N_Vector mask, const int component, const UserData* udata);
 
 /* function to write solution to disk */
-int WriteOutput(realtype t, N_Vector y, UserData* udata, UserOptions* uopt);
+int WriteOutput(sunrealtype t, N_Vector y, UserData* udata, UserOptions* uopt);
 
 #endif
diff --git a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
index 5535557af4..27b1a870b7 100644
--- a/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
@@ -52,7 +52,7 @@ int EvolveProblemDIRK(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, nst_a, netf;  /* step stats                   */
@@ -213,7 +213,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, nst_a, netf;  /* step stats                   */
@@ -382,7 +382,7 @@ int EvolveProblemIMEX(N_Vector y, UserData* udata, UserOptions* uopt)
 int EvolveProblemExplicit(N_Vector y, UserData* udata, UserOptions* uopt)
 {
   void*    arkode_mem = NULL; /* empty ARKODE memory structure */
-  realtype   t, dtout, tout;    /* current/output time data      */
+  sunrealtype   t, dtout, tout;    /* current/output time data      */
   int      retval;            /* reusable error-checking flag  */
   int      iout;              /* output counter                */
   long int nst, nst_a, netf;  /* step stats                    */
@@ -487,12 +487,12 @@ int TaskLocalNlsResidual(N_Vector ycor, N_Vector F, void* arkode_mem)
   /* temporary variables */
   UserData* udata;
   int      retval;
-  realtype   c[3];
+  sunrealtype   c[3];
   N_Vector X[3];
 
   /* nonlinear system data */
   N_Vector z, zpred, Fi, sdata;
-  realtype   tcur, gamma;
+  sunrealtype   tcur, gamma;
   void     *user_data;
 
   ARKStepGetNonlinearSystemData(arkode_mem, &tcur, &zpred, &z, &Fi,
@@ -536,7 +536,7 @@ int TaskLocalLSolve(N_Vector delta, void* arkode_mem)
 
   /* nonlinear system data */
   N_Vector z, zpred, Fi, sdata;
-  realtype tcur, gamma;
+  sunrealtype tcur, gamma;
   void*    user_data = NULL;
 
   ARKStepGetNonlinearSystemData(arkode_mem, &tcur, &zpred, &z, &Fi,
@@ -575,8 +575,8 @@ int TaskLocalNewton_Initialize(SUNNonlinearSolver NLS)
 
 int TaskLocalNewton_Solve(SUNNonlinearSolver NLS,
                           N_Vector y0, N_Vector ycor,
-                          N_Vector w, realtype tol,
-                          booleantype callLSetup, void* mem)
+                          N_Vector w, sunrealtype tol,
+                          sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   MPI_Comm comm;
diff --git a/benchmarks/advection_reaction_3D/raja/backends.hpp b/benchmarks/advection_reaction_3D/raja/backends.hpp
index f9fd5f388f..5d6c9799ee 100644
--- a/benchmarks/advection_reaction_3D/raja/backends.hpp
+++ b/benchmarks/advection_reaction_3D/raja/backends.hpp
@@ -162,7 +162,7 @@ constexpr auto LocalNvector = N_VNew_Serial;
 
 /* Get the vector data array pointer for the device
    if using the GPU, or host if not. */
-static realtype* GetVecData(N_Vector y)
+static sunrealtype* GetVecData(N_Vector y)
 {
 #ifdef USE_GPU
   if (N_VGetVectorID(y) == SUNDIALS_NVEC_MPIPLUSX)
diff --git a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
index dd75f4189a..e85a9272e2 100644
--- a/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
@@ -27,7 +27,7 @@ int EvolveProblemBDF(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
   SUNLinearSolver    LS  = NULL;         /* empty linear solver structure    */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
@@ -184,7 +184,7 @@ int EvolveProblemAdams(N_Vector y, UserData* udata, UserOptions* uopt)
   void*              cvode_mem = NULL;   /* empty CVODE memory structure    */
   SUNNonlinearSolver NLS = NULL;         /* empty nonlinear solver structure */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
diff --git a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
index 792e805365..df053bec5d 100644
--- a/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
+++ b/benchmarks/advection_reaction_3D/raja/ida_driver.cpp
@@ -41,7 +41,7 @@ int EvolveDAEProblem(N_Vector y, UserData* udata, UserOptions* uopt)
   SUNLinearSolver    LS  = NULL;      /* empty linear solver structure    */
   N_Vector           yp  = NULL;      /* empty vector structure           */
 
-  realtype t, dtout, tout;    /* current/output time data     */
+  sunrealtype t, dtout, tout;    /* current/output time data     */
   int      retval;            /* reusable error-checking flag */
   int      iout;              /* output counter               */
   long int nst, netf;         /* step stats                   */
diff --git a/benchmarks/advection_reaction_3D/raja/rhs3D.hpp b/benchmarks/advection_reaction_3D/raja/rhs3D.hpp
index 1bb2b6f105..6c38ef154e 100644
--- a/benchmarks/advection_reaction_3D/raja/rhs3D.hpp
+++ b/benchmarks/advection_reaction_3D/raja/rhs3D.hpp
@@ -24,7 +24,7 @@
 
 /* Compute the advection term f(t,y) = -c (grad * y). This is done using
    upwind 1st order finite differences. */
-static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+static int Advection(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
   /* access problem data */
   UserData* udata = (UserData*) user_data;
@@ -36,10 +36,10 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
   const int      nyl = udata->grid->nyl;
   const int      nzl = udata->grid->nzl;
   const int      dof = udata->grid->dof;
-  const realtype c   = udata->c;
-  const realtype cx  = -c / udata->grid->dx;
-  const realtype cy  = -c / udata->grid->dy;
-  const realtype cz  = -c / udata->grid->dz;
+  const sunrealtype c   = udata->c;
+  const sunrealtype cx  = -c / udata->grid->dx;
+  const sunrealtype cy  = -c / udata->grid->dy;
+  const sunrealtype cz  = -c / udata->grid->dz;
 
   /* local variables */
   int retval;
@@ -58,8 +58,8 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
   N_VConst(0.0, ydot);
 
   /* create views of the state and RHS vectors */
-  RAJA::View<realtype, RAJA::Layout<4> > Yview(GetVecData(y), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4> > dYview(GetVecData(ydot), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4> > Yview(GetVecData(y), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4> > dYview(GetVecData(ydot), nxl, nyl, nzl, dof);
 
   /* iterate over domain interior, computing advection */
   if (c > 0.0)
@@ -70,9 +70,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                                   RAJA::RangeSegment(1, nzl));
     RAJA::kernel<XYZ_KERNEL_POL>(range,
       [=] DEVICE_FUNC (int i, int j, int k) {
-      const realtype u_ijk = Yview(i,j,k,0);
-      const realtype v_ijk = Yview(i,j,k,1);
-      const realtype w_ijk = Yview(i,j,k,2);
+      const sunrealtype u_ijk = Yview(i,j,k,0);
+      const sunrealtype v_ijk = Yview(i,j,k,1);
+      const sunrealtype w_ijk = Yview(i,j,k,2);
 
       // grad * u
       dYview(i,j,k,0) =  cz * (u_ijk - Yview(i,j,k-1,0)); // du/dz
@@ -99,9 +99,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                                   RAJA::RangeSegment(0, nzl-1));
     RAJA::kernel<XYZ_KERNEL_POL>(range,
       [=] DEVICE_FUNC (int i, int j, int k) {
-      const realtype u_ijk = Yview(i,j,k,0);
-      const realtype v_ijk = Yview(i,j,k,1);
-      const realtype w_ijk = Yview(i,j,k,2);
+      const sunrealtype u_ijk = Yview(i,j,k,0);
+      const sunrealtype v_ijk = Yview(i,j,k,1);
+      const sunrealtype w_ijk = Yview(i,j,k,2);
 
       // grad * u
       dYview(i,j,k,0) =  cz * (Yview(i,j,k+1,0) - u_ijk); // du/dz
@@ -136,11 +136,11 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     *  boundaries are west face, south face, back face */
 
     /*   Perform calculations on each "lower" face */
-    RAJA::View<realtype, RAJA::Layout<3>>
+    RAJA::View<sunrealtype, RAJA::Layout<3>>
       Wrecv(udata->grid->getRecvBuffer("WEST"),  nyl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3>>
+    RAJA::View<sunrealtype, RAJA::Layout<3>>
       Srecv(udata->grid->getRecvBuffer("SOUTH"), nxl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3>>
+    RAJA::View<sunrealtype, RAJA::Layout<3>>
       Brecv(udata->grid->getRecvBuffer("BACK"),  nxl, nyl, dof);
 
     auto west_face = RAJA::make_tuple(RAJA::RangeSegment(0, nyl),
@@ -149,9 +149,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(west_face,
       [=] DEVICE_FUNC (int j, int k, int l) {
       const int i = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,k,l);
-      const realtype YBack  = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,k,l);
+      const sunrealtype YBack  = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,l);
       dYview(i,j,k,l)  = cx * (Yijkl - Wrecv(j,k,l)); // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - YSouth);       // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - YBack);        // d/dz
@@ -163,9 +163,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(south_face,
       [=] DEVICE_FUNC (int i, int k, int l) {
       const int j = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YWest = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(j,k,l);
-      const realtype YBack = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YWest = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(j,k,l);
+      const sunrealtype YBack = (k > 0) ? Yview(i,j,k-1,l) : Brecv(i,j,l);
       dYview(i,j,k,l)  = cx * (Yijkl - YWest);        // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - Srecv(i,k,l)); // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - YBack);        // d/dz
@@ -177,9 +177,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(back_face,
       [=] DEVICE_FUNC (int i, int j, int l) {
       const int k = 0;
-      const realtype Yijkl  = Yview(i,j,k,l);
-      const realtype YWest  = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(j,k,l);
-      const realtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,k,l);
+      const sunrealtype Yijkl  = Yview(i,j,k,l);
+      const sunrealtype YWest  = (i > 0) ? Yview(i-1,j,k,l) : Wrecv(j,k,l);
+      const sunrealtype YSouth = (j > 0) ? Yview(i,j-1,k,l) : Srecv(i,k,l);
       dYview(i,j,k,l)  = cx * (Yijkl - YWest);        // d/dx
       dYview(i,j,k,l) += cy * (Yijkl - YSouth);       // d/dy
       dYview(i,j,k,l) += cz * (Yijkl - Brecv(i,j,l)); // d/dz
@@ -193,11 +193,11 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     *  boundaries are east face, north face, and front face */
 
     /*   Perform calculations on each "upper" face */
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Erecv(udata->grid->getRecvBuffer("EAST"),  nyl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Nrecv(udata->grid->getRecvBuffer("NORTH"), nxl, nzl, dof);
-    RAJA::View<realtype, RAJA::Layout<3> >
+    RAJA::View<sunrealtype, RAJA::Layout<3> >
       Frecv(udata->grid->getRecvBuffer("FRONT"), nxl, nyl, dof);
 
     auto east_face = RAJA::make_tuple(RAJA::RangeSegment(0, nyl),
@@ -206,9 +206,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(east_face,
       [=] DEVICE_FUNC (int j, int k, int l) {
       const int i = nxl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,k,l);
-      const realtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,k,l);
+      const sunrealtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,l);
       dYview(i,j,k,l)  = cx * (Erecv(j,k,l) - Yijkl); // d/dx
       dYview(i,j,k,l) += cy * (YNorth - Yijkl);       // d/dy
       dYview(i,j,k,l) += cz * (YFront - Yijkl);       // d/dz
@@ -220,9 +220,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(north_face,
       [=] DEVICE_FUNC (int i, int k, int l) {
       const int j = nyl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(j,k,l);
-      const realtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(j,k,l);
+      const sunrealtype YFront = (k < nzl-1) ? Yview(i,j,k+1,l) : Frecv(i,j,l);
       dYview(i,j,k,l)  = cx * (YEast - Yijkl);        // d/dx
       dYview(i,j,k,l) += cy * (Nrecv(i,k,l) - Yijkl); // d/dy
       dYview(i,j,k,l) += cz * (YFront - Yijkl);       // d/dz
@@ -234,9 +234,9 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     RAJA::kernel<XYZ_KERNEL_POL>(front_face,
       [=] DEVICE_FUNC (int i, int j, int l) {
       const int k = nzl-1;
-      const realtype Yijkl = Yview(i,j,k,l);
-      const realtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(j,k,l);
-      const realtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,k,l);
+      const sunrealtype Yijkl = Yview(i,j,k,l);
+      const sunrealtype YEast  = (i < nxl-1) ? Yview(i+1,j,k,l) : Erecv(j,k,l);
+      const sunrealtype YNorth = (j < nyl-1) ? Yview(i,j+1,k,l) : Nrecv(i,k,l);
       dYview(i,j,k,l)  = cx * (YEast - Yijkl);        // d/dx
       dYview(i,j,k,l) += cy * (YNorth - Yijkl);       // d/dy
       dYview(i,j,k,l) += cz * (Frecv(i,j,l) - Yijkl); // d/dz
@@ -249,7 +249,7 @@ static int Advection(realtype t, N_Vector y, N_Vector ydot, void* user_data)
 
 
 /* Compute the reaction term g(t,y). */
-static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+static int Reaction(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
   /* access problem data */
   UserData* udata = (UserData*) user_data;
@@ -257,14 +257,14 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
   /* set variable shortcuts */
-  const realtype A  = udata->A;
-  const realtype B  = udata->B;
-  const realtype k1 = udata->k1;
-  const realtype k2 = udata->k2;
-  const realtype k3 = udata->k3;
-  const realtype k4 = udata->k4;
-  const realtype k5 = udata->k5;
-  const realtype k6 = udata->k6;
+  const sunrealtype A  = udata->A;
+  const sunrealtype B  = udata->B;
+  const sunrealtype k1 = udata->k1;
+  const sunrealtype k2 = udata->k2;
+  const sunrealtype k3 = udata->k3;
+  const sunrealtype k4 = udata->k4;
+  const sunrealtype k5 = udata->k5;
+  const sunrealtype k6 = udata->k6;
   const int     nxl = udata->grid->nxl;
   const int     nyl = udata->grid->nyl;
   const int     nzl = udata->grid->nzl;
@@ -275,18 +275,18 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     N_VConst(0.0, ydot);
 
   /* access data arrays */
-  realtype* Ydata  = NULL;
+  sunrealtype* Ydata  = NULL;
   Ydata = GetVecData(y);
   if (check_retval((void *)Ydata, "GetVecData", 0, udata->myid))
     return(-1);
-  realtype* dYdata = NULL;
+  sunrealtype* dYdata = NULL;
   dYdata = GetVecData(ydot);
   if (check_retval((void *)dYdata, "GetVecData", 0, udata->myid))
     return(-1);
 
   /* create 4D views of state and RHS vectors */
-  RAJA::View<realtype, RAJA::Layout<4> > Yview(GetVecData(y), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4> > dYview(GetVecData(ydot), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4> > Yview(GetVecData(y), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4> > dYview(GetVecData(ydot), nxl, nyl, nzl, dof);
 
   /* add reaction terms to RHS */
   auto range = RAJA::make_tuple(RAJA::RangeSegment(0, nxl),
@@ -294,9 +294,9 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
                                 RAJA::RangeSegment(0, nzl));
   RAJA::kernel<XYZ_KERNEL_POL>(range,
     [=] DEVICE_FUNC (int i, int j, int k) {
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
     dYview(i,j,k,0) += k1 * A - k2 * w * u + k3 * u * u * v - k4 * u;
     dYview(i,j,k,1) += k2 * w * u - k3 * u * u * v;
     dYview(i,j,k,2) += -k2 * w * u + k5 * B - k6 * w;
@@ -308,7 +308,7 @@ static int Reaction(realtype t, N_Vector y, N_Vector ydot, void* user_data)
 
 
 /* Compute the RHS as h(t,y) = f(t,y) + g(t,y). */
-static int AdvectionReaction(realtype t, N_Vector y, N_Vector ydot,
+static int AdvectionReaction(sunrealtype t, N_Vector y, N_Vector ydot,
                              void *user_data)
 {
   /* access problem data */
@@ -328,7 +328,7 @@ static int AdvectionReaction(realtype t, N_Vector y, N_Vector ydot,
 }
 
 /* Compute the residual F(t,y,y') = ydot - h(t,y) = 0. */
-static int AdvectionReactionResidual(realtype t, N_Vector y, N_Vector ydot,
+static int AdvectionReactionResidual(sunrealtype t, N_Vector y, N_Vector ydot,
                                      N_Vector F, void *user_data)
 {
   /* access problem data */
@@ -358,22 +358,22 @@ static int AdvectionReactionResidual(realtype t, N_Vector y, N_Vector ydot,
    When using a fully implicit method, we are approximating
    dh/dy as dg/dy. */
 static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
-                               realtype gamma, UserData* udata)
+                               sunrealtype gamma, UserData* udata)
 {
   /* set variable shortcuts */
   const int dof = udata->grid->dof;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
-  const realtype k2 = udata->k2;
-  const realtype k3 = udata->k3;
-  const realtype k4 = udata->k4;
-  const realtype k6 = udata->k6;
+  const sunrealtype k2 = udata->k2;
+  const sunrealtype k3 = udata->k3;
+  const sunrealtype k4 = udata->k4;
+  const sunrealtype k6 = udata->k6;
 
   /* create 4D views of state, RHS and solution vectors */
-  RAJA::View<realtype, RAJA::Layout<4>> Yview(GetVecData(y), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4>> Bview(GetVecData(b), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4>> Xview(GetVecData(x), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Yview(GetVecData(y), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Bview(GetVecData(b), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Xview(GetVecData(x), nxl, nyl, nzl, dof);
 
   /* solve reaction linear system */
   auto blocks = RAJA::make_tuple(RAJA::RangeSegment(0, nxl),
@@ -383,28 +383,28 @@ static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
     [=] DEVICE_FUNC (int i, int j, int k) {
 
     /* shortcuts to u, v, w for the block */
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
 
     //
     // compute J = dg/dy
     //
 
     /* 1st row: u, v, w */
-    realtype A0 = -k2 * w + 2.0 * k3 * u * v - k4;
-    realtype A1 =  k3 * u * u;
-    realtype A2 = -k2 * u;
+    sunrealtype A0 = -k2 * w + 2.0 * k3 * u * v - k4;
+    sunrealtype A1 =  k3 * u * u;
+    sunrealtype A2 = -k2 * u;
 
     /* 2nd row: u, v, w */
-    realtype A3 =  k2 * w - 2.0 * k3 * u * v;
-    realtype A4 = -k3 * u * u;
-    realtype A5 =  k2 * u;
+    sunrealtype A3 =  k2 * w - 2.0 * k3 * u * v;
+    sunrealtype A4 = -k3 * u * u;
+    sunrealtype A5 =  k2 * u;
 
     /* 3rd row: u, v, w */
-    realtype A6 = -k2 * w;
-    realtype A7 =  0.0;
-    realtype A8 = -k2 * u - k6;
+    sunrealtype A6 = -k2 * w;
+    sunrealtype A7 =  0.0;
+    sunrealtype A8 = -k2 * u - k6;
 
     //
     // compute A = I - gamma*J
@@ -424,20 +424,20 @@ static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
     // compute x = A^{-1}b
     //
 
-    realtype scratch_0 = A4*A8;
-    realtype scratch_1 = A1*A5;
-    realtype scratch_2 = A2*A7;
-    realtype scratch_3 = A5*A7;
-    realtype scratch_4 = A1*A8;
-    realtype scratch_5 = A2*A4;
-    realtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
-    realtype scratch_7 = A2*A3;
-    realtype scratch_8 = A6*Bview(i,j,k,0);
-    realtype scratch_9 = A2*A6;
-    realtype scratch_10 = A3*Bview(i,j,k,0);
-    realtype scratch_11 = 1.0/A0;
-    realtype scratch_12 = A1*scratch_11;
-    realtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
+    sunrealtype scratch_0 = A4*A8;
+    sunrealtype scratch_1 = A1*A5;
+    sunrealtype scratch_2 = A2*A7;
+    sunrealtype scratch_3 = A5*A7;
+    sunrealtype scratch_4 = A1*A8;
+    sunrealtype scratch_5 = A2*A4;
+    sunrealtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
+    sunrealtype scratch_7 = A2*A3;
+    sunrealtype scratch_8 = A6*Bview(i,j,k,0);
+    sunrealtype scratch_9 = A2*A6;
+    sunrealtype scratch_10 = A3*Bview(i,j,k,0);
+    sunrealtype scratch_11 = 1.0/A0;
+    sunrealtype scratch_12 = A1*scratch_11;
+    sunrealtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
 
     Xview(i,j,k,0) = scratch_6*( Bview(i,j,k,0)*(scratch_0 - scratch_3)
                                + Bview(i,j,k,1)*(scratch_2 - scratch_4)
@@ -457,22 +457,22 @@ static int SolveReactionLinSys(N_Vector y, N_Vector x, N_Vector b,
 /* Solve the linear systems Ax = b where A = -dg/dy + gamma.
    We are approximating dh/dy as dg/dy. */
 static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
-                                  realtype gamma, UserData* udata)
+                                  sunrealtype gamma, UserData* udata)
 {
   /* set variable shortcuts */
   const int dof = udata->grid->dof;
   const int nxl = udata->grid->nxl;
   const int nyl = udata->grid->nyl;
   const int nzl = udata->grid->nzl;
-  const realtype k2  = udata->k2;
-  const realtype k3  = udata->k3;
-  const realtype k4  = udata->k4;
-  const realtype k6  = udata->k6;
+  const sunrealtype k2  = udata->k2;
+  const sunrealtype k3  = udata->k3;
+  const sunrealtype k4  = udata->k4;
+  const sunrealtype k6  = udata->k6;
 
   /* create 4D views of state, RHS and solution vectors */
-  RAJA::View<realtype, RAJA::Layout<4>> Yview(GetVecData(y), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4>> Bview(GetVecData(b), nxl, nyl, nzl, dof);
-  RAJA::View<realtype, RAJA::Layout<4>> Xview(GetVecData(x), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Yview(GetVecData(y), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Bview(GetVecData(b), nxl, nyl, nzl, dof);
+  RAJA::View<sunrealtype, RAJA::Layout<4>> Xview(GetVecData(x), nxl, nyl, nzl, dof);
 
   /* solve reaction linear system */
   auto blocks = RAJA::make_tuple(RAJA::RangeSegment(0, nxl),
@@ -482,28 +482,28 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
     [=] DEVICE_FUNC (int i, int j, int k) {
 
     /* shortcuts to u, v, w for the block */
-    const realtype u = Yview(i,j,k,0);
-    const realtype v = Yview(i,j,k,1);
-    const realtype w = Yview(i,j,k,2);
+    const sunrealtype u = Yview(i,j,k,0);
+    const sunrealtype v = Yview(i,j,k,1);
+    const sunrealtype w = Yview(i,j,k,2);
 
     //
     // compute dg/dy
     //
 
     /* 1st row: u, v, w */
-    realtype A0 = -k2 * w + 2.0 * k3 * u * v - k4;
-    realtype A1 =  k3 * u * u;
-    realtype A2 = -k2 * u;
+    sunrealtype A0 = -k2 * w + 2.0 * k3 * u * v - k4;
+    sunrealtype A1 =  k3 * u * u;
+    sunrealtype A2 = -k2 * u;
 
     /* 2nd row: u, v, w */
-    realtype A3 =  k2 * w - 2.0 * k3 * u * v;
-    realtype A4 = -k3 * u * u;
-    realtype A5 =  k2 * u;
+    sunrealtype A3 =  k2 * w - 2.0 * k3 * u * v;
+    sunrealtype A4 = -k3 * u * u;
+    sunrealtype A5 =  k2 * u;
 
     /* 3rd row: u, v, w */
-    realtype A6 = -k2 * w;
-    realtype A7 =  0.0;
-    realtype A8 = -k2 * u - k6;
+    sunrealtype A6 = -k2 * w;
+    sunrealtype A7 =  0.0;
+    sunrealtype A8 = -k2 * u - k6;
 
     //
     // compute A = -dg/dy + gamma*diag(df/dydot)
@@ -525,20 +525,20 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
     // compute x = A^{-1}b
     //
 
-    realtype scratch_0 = A4*A8;
-    realtype scratch_1 = A1*A5;
-    realtype scratch_2 = A2*A7;
-    realtype scratch_3 = A5*A7;
-    realtype scratch_4 = A1*A8;
-    realtype scratch_5 = A2*A4;
-    realtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
-    realtype scratch_7 = A2*A3;
-    realtype scratch_8 = A6*Bview(i,j,k,0);
-    realtype scratch_9 = A2*A6;
-    realtype scratch_10 = A3*Bview(i,j,k,0);
-    realtype scratch_11 = 1.0/A0;
-    realtype scratch_12 = A1*scratch_11;
-    realtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
+    sunrealtype scratch_0 = A4*A8;
+    sunrealtype scratch_1 = A1*A5;
+    sunrealtype scratch_2 = A2*A7;
+    sunrealtype scratch_3 = A5*A7;
+    sunrealtype scratch_4 = A1*A8;
+    sunrealtype scratch_5 = A2*A4;
+    sunrealtype scratch_6 = 1.0/(A0*scratch_0 - A0*scratch_3 + A3*scratch_2 - A3*scratch_4 + A6*scratch_1 - A6*scratch_5);
+    sunrealtype scratch_7 = A2*A3;
+    sunrealtype scratch_8 = A6*Bview(i,j,k,0);
+    sunrealtype scratch_9 = A2*A6;
+    sunrealtype scratch_10 = A3*Bview(i,j,k,0);
+    sunrealtype scratch_11 = 1.0/A0;
+    sunrealtype scratch_12 = A1*scratch_11;
+    sunrealtype scratch_13 = (-A6*scratch_12 + A7)/(-A3*scratch_12 + A4);
 
     Xview(i,j,k,0) = scratch_6*( Bview(i,j,k,0)*(scratch_0 - scratch_3)
                                + Bview(i,j,k,1)*(scratch_2 - scratch_4)
@@ -561,8 +561,8 @@ static int SolveReactionLinSysRes(N_Vector y, N_Vector x, N_Vector b,
  * --------------------------------------------------------------*/
 
 /* Solves Pz = r where P = I - gamma * dg/dy */
-static int PSolve(realtype t, N_Vector y, N_Vector ydot, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   /* local variables */
@@ -578,8 +578,8 @@ static int PSolve(realtype t, N_Vector y, N_Vector ydot, N_Vector r,
 }
 
 /* Solves Pz = r where P = -dg/dy + gamma */
-static int PSolveRes(realtype t, N_Vector y, N_Vector ydot, N_Vector F,
-                     N_Vector r, N_Vector z, realtype cj, realtype delta,
+static int PSolveRes(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector F,
+                     N_Vector r, N_Vector z, sunrealtype cj, sunrealtype delta,
                      void *user_data)
 {
   /* local variables */
diff --git a/benchmarks/diffusion_2D/README.md b/benchmarks/diffusion_2D/README.md
index f98f058f7f..311bd839fb 100644
--- a/benchmarks/diffusion_2D/README.md
+++ b/benchmarks/diffusion_2D/README.md
@@ -56,23 +56,23 @@ listed below.
 | `--npy <int>`                        | Number of MPI tasks in the y-direction (0 forces MPI to decide)                          | 0       |
 | `--nx <int>`                         | Number of mesh points in the x-direction                                                 | 32      |
 | `--ny <int>`                         | Number of mesh points in the y-direction                                                 | 32      |
-| `--xu <realtype>`                    | The domain upper bound in the x-direction $x_{\text{max}}$                               | 1.0     |
-| `--yu <realtype>`                    | The domain upper bound in the y-direction $y_{\text{max}}$                               | 1.0     |
-| `--kx <realtype>`                    | Diffusion coefficient in the x-direction $k_x$                                           | 1.0     |
-| `--ky <realtype>`                    | Diffusion coefficient in the y-direction $k_y$                                           | 1.0     |
-| `--tf <realtype>`                    | The final time `tf`                                                                      | 1.0     |
+| `--xu <sunrealtype>`                 | The domain upper bound in the x-direction $x_{\text{max}}$                               | 1.0     |
+| `--yu <sunrealtype>`                 | The domain upper bound in the y-direction $y_{\text{max}}$                               | 1.0     |
+| `--kx <sunrealtype>`                 | Diffusion coefficient in the x-direction $k_x$                                           | 1.0     |
+| `--ky <sunrealtype>`                 | Diffusion coefficient in the y-direction $k_y$                                           | 1.0     |
+| `--tf <sunrealtype>`                 | The final time `tf`                                                                      | 1.0     |
 | `--noforcing`                        | Disable the forcing term                                                                 | Enabled |
 | Output Options                       |                                                                                          |         |
 | `--output <int>`                     | Output level: `0` no output, `1` output progress and stats, `2` write solution to disk   | 1       |
 | `--nout <int>`                       | Number of output times                                                                   | 20      |
 | Common Integrator and Solver Options |                                                                                          |         |
-| `--rtol <realtype>`                  | Relative tolerance                                                                       | 1e-5    |
-| `--atol <realtype>`                  | Absolute tolerance                                                                       | 1e-10   |
+| `--rtol <sunrealtype>`               | Relative tolerance                                                                       | 1e-5    |
+| `--atol <sunrealtype>`               | Absolute tolerance                                                                       | 1e-10   |
 | `--maxsteps <int>`                   | Max number of steps between outputs (0 uses the integrator default)                      | 0       |
 | `--onstep <int>`                     | Number of steps to run using `ONE_STEP` mode for debugging (0 uses `NORMAL` mode)        | 0       |
 | `--ls <cg,gmres,sludist>`            | Linear solver: CG, GMRES, or SuperLU_DIST                                                | cg      |
 | `--liniters <int>`                   | Number of linear iterations                                                              | 20      |
-| `--epslin <realtype>`                | Linear solve tolerance factor (0 uses the integrator default)                            | 0       |
+| `--epslin <sunrealtype>`             | Linear solve tolerance factor (0 uses the integrator default)                            | 0       |
 | `--msbp <int>`                       | The linear solver setup frequency (CVODE and ARKODE only, 0 uses the integrator default) | 0       |
 | Additional ARKODE Options            |                                                                                          |         |
 | `--order <int>`                      | Methods order                                                                            | 3       |
diff --git a/benchmarks/diffusion_2D/diffusion_2D.cpp b/benchmarks/diffusion_2D/diffusion_2D.cpp
index f8365b3a02..34d151c6b9 100644
--- a/benchmarks/diffusion_2D/diffusion_2D.cpp
+++ b/benchmarks/diffusion_2D/diffusion_2D.cpp
@@ -22,7 +22,7 @@
 
 #if defined(BENCHMARK_ODE)
 
-int diffusion(realtype t, N_Vector u, N_Vector f, void *user_data)
+int diffusion(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   // Access problem data
   UserData *udata = (UserData *) user_data;
@@ -37,7 +37,7 @@ int diffusion(realtype t, N_Vector u, N_Vector f, void *user_data)
   return 0;
 }
 
-int diffusion_jac(realtype t, N_Vector u, N_Vector f, SUNMatrix Jac,
+int diffusion_jac(sunrealtype t, N_Vector u, N_Vector f, SUNMatrix Jac,
                   void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
@@ -60,7 +60,7 @@ int diffusion_jac(realtype t, N_Vector u, N_Vector f, SUNMatrix Jac,
 
 #elif defined(BENCHMARK_DAE)
 
-int diffusion(realtype t, N_Vector u, N_Vector up, N_Vector res,
+int diffusion(sunrealtype t, N_Vector u, N_Vector up, N_Vector res,
               void *user_data)
 {
   // Access problem data
@@ -79,7 +79,7 @@ int diffusion(realtype t, N_Vector u, N_Vector up, N_Vector res,
   return 0;
 }
 
-int diffusion_jac(realtype t, realtype cj, N_Vector u, N_Vector up,
+int diffusion_jac(sunrealtype t, sunrealtype cj, N_Vector u, N_Vector up,
                   N_Vector res, SUNMatrix Jac, void* user_data, N_Vector tmp1,
                   N_Vector tmp2, N_Vector tmp3)
 {
@@ -708,7 +708,7 @@ int UserOutput::open(UserData *udata)
   if (outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << endl;
     if (error)
     {
@@ -756,7 +756,7 @@ int UserOutput::open(UserData *udata)
     uoutstream << "# je  " << udata->je  << endl;
 
     uoutstream << scientific;
-    uoutstream << setprecision(numeric_limits<realtype>::digits10);
+    uoutstream << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (error)
     {
@@ -785,7 +785,7 @@ int UserOutput::open(UserData *udata)
       eoutstream << "# je  " << udata->je  << endl;
 
       eoutstream << scientific;
-      eoutstream << setprecision(numeric_limits<realtype>::digits10);
+      eoutstream << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -793,10 +793,10 @@ int UserOutput::open(UserData *udata)
 }
 
 
-int UserOutput::write(realtype t, N_Vector u, UserData *udata)
+int UserOutput::write(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (output > 0)
@@ -812,7 +812,7 @@ int UserOutput::write(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -834,7 +834,7 @@ int UserOutput::write(realtype t, N_Vector u, UserData *udata)
       flag = CopyDataFromDevice(u);
       if (check_flag(&flag, "CopyDataFromDevice", 1)) return -1;
 
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       uoutstream << t << " ";
@@ -851,7 +851,7 @@ int UserOutput::write(realtype t, N_Vector u, UserData *udata)
         if (check_flag(&flag, "CopyDataFromDevice", 1)) return -1;
 
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(error);
+        sunrealtype *earray = N_VGetArrayPointer(error);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         eoutstream << t << " ";
@@ -912,7 +912,7 @@ int UserOutput::close(UserData *udata)
 // -----------------------------------------------------------------------------
 
 // Compute the solution error
-int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
diff --git a/benchmarks/diffusion_2D/diffusion_2D.hpp b/benchmarks/diffusion_2D/diffusion_2D.hpp
index eabffd487b..ad081ca0cd 100644
--- a/benchmarks/diffusion_2D/diffusion_2D.hpp
+++ b/benchmarks/diffusion_2D/diffusion_2D.hpp
@@ -47,11 +47,11 @@
 #endif
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -70,20 +70,20 @@ struct UserData
   SUNProfiler prof = NULL;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx = ONE;
-  realtype ky = ONE;
+  sunrealtype kx = ONE;
+  sunrealtype ky = ONE;
 
   // Enable/disable forcing
   bool forcing = true;
 
   // Final time
-  realtype tf = ONE;
+  sunrealtype tf = ONE;
 
   // Lower and Upper bounds in x and y directions
-  realtype xl = ZERO;
-  realtype yl = ZERO;
-  realtype xu = ONE;
-  realtype yu = ONE;
+  sunrealtype xl = ZERO;
+  sunrealtype yl = ZERO;
+  sunrealtype xu = ONE;
+  sunrealtype yu = ONE;
 
   // Global number of nodes in the x and y directions
   sunindextype nx = 32;
@@ -93,8 +93,8 @@ struct UserData
   sunindextype nodes = nx * ny;
 
   // Mesh spacing in the x and y directions
-  realtype dx = xu / (nx - 1);
-  realtype dy = yu / (ny - 1);
+  sunrealtype dx = xu / (nx - 1);
+  sunrealtype dy = yu / (ny - 1);
 
   // Minimum number of local nodes in the x and y directions
   sunindextype qx = 0;
@@ -141,10 +141,10 @@ struct UserData
   int ipN = -1;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv = NULL;
-  realtype *Erecv = NULL;
-  realtype *Srecv = NULL;
-  realtype *Nrecv = NULL;
+  sunrealtype *Wrecv = NULL;
+  sunrealtype *Erecv = NULL;
+  sunrealtype *Srecv = NULL;
+  sunrealtype *Nrecv = NULL;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -153,10 +153,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend = NULL;
-  realtype *Esend = NULL;
-  realtype *Ssend = NULL;
-  realtype *Nsend = NULL;
+  sunrealtype *Wsend = NULL;
+  sunrealtype *Esend = NULL;
+  sunrealtype *Ssend = NULL;
+  sunrealtype *Nsend = NULL;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -204,7 +204,7 @@ struct UserOutput
 
   // Output functions
   int open(UserData* udata);
-  int write(realtype t, N_Vector u, UserData *udata);
+  int write(sunrealtype t, N_Vector u, UserData *udata);
   int close(UserData* udata);
 };
 
@@ -213,7 +213,7 @@ struct UserOutput
 // -----------------------------------------------------------------------------
 
 // Common function for computing the Laplacian
-int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata);
+int laplacian(sunrealtype t, N_Vector u, N_Vector f, UserData* udata);
 
 #if defined(BENCHMARK_ODE)
 
@@ -222,17 +222,17 @@ int laplacian_matrix_sludist(N_Vector u, SUNMatrix L, UserData* udata);
 #endif
 
 // ODE right hand side function
-int diffusion(realtype t, N_Vector u, N_Vector f, void *user_data);
+int diffusion(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
-int diffusion_jac(realtype t, N_Vector u, N_Vector f, SUNMatrix Jac,
+int diffusion_jac(sunrealtype t, N_Vector u, N_Vector f, SUNMatrix Jac,
                   void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // Preconditioner setup and solve functions
-int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-           booleantype *jcurPtr, realtype gamma, void *user_data);
+int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+           sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-           N_Vector z, realtype gamma, realtype delta, int lr,
+int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+           N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
            void *user_data);
 
 #elif defined(BENCHMARK_DAE)
@@ -243,19 +243,19 @@ int laplacian_matrix_sludist(N_Vector u, sunrealtype cj, SUNMatrix L,
 #endif
 
 // DAE residual function
-int diffusion(realtype t, N_Vector u, N_Vector up, N_Vector res,
+int diffusion(sunrealtype t, N_Vector u, N_Vector up, N_Vector res,
               void *user_data);
 
-int diffusion_jac(realtype t, realtype cj, N_Vector u, N_Vector up,
+int diffusion_jac(sunrealtype t, sunrealtype cj, N_Vector u, N_Vector up,
                   N_Vector res, SUNMatrix Jac, void* user_data, N_Vector tmp1,
                   N_Vector tmp2, N_Vector tmp3);
 
 // Preconditioner setup and solve functions
-int PSetup(realtype t, N_Vector u, N_Vector up, N_Vector res, realtype cj,
+int PSetup(sunrealtype t, N_Vector u, N_Vector up, N_Vector res, sunrealtype cj,
            void *user_data);
 
-int PSolve(realtype t, N_Vector u, N_Vector up, N_Vector res, N_Vector r,
-           N_Vector z, realtype cj, realtype delta, void *user_data);
+int PSolve(sunrealtype t, N_Vector u, N_Vector up, N_Vector res, N_Vector r,
+           N_Vector z, sunrealtype cj, sunrealtype delta, void *user_data);
 
 #else
 #error "Missing ODE/DAE preprocessor directive"
@@ -272,11 +272,11 @@ int DeviceSynchronize();
 int CopyDataFromDevice(N_Vector y);
 
 // Compute the true solution and its derivative
-int Solution(realtype t, N_Vector u, UserData *udata);
-int SolutionDerivative(realtype t, N_Vector up, UserData *udata);
+int Solution(sunrealtype t, N_Vector u, UserData *udata);
+int SolutionDerivative(sunrealtype t, N_Vector up, UserData *udata);
 
 // Compute the solution error
-int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata);
+int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata);
 
 // Check function return values
 int check_flag(void *flagvalue, const string funcname, int opt);
diff --git a/benchmarks/diffusion_2D/main_arkode.cpp b/benchmarks/diffusion_2D/main_arkode.cpp
index f45da5fedc..a1251c64f4 100644
--- a/benchmarks/diffusion_2D/main_arkode.cpp
+++ b/benchmarks/diffusion_2D/main_arkode.cpp
@@ -20,9 +20,9 @@
 struct UserOptions
 {
   // Integrator settings
-  realtype rtol        = RCONST(1.0e-5);   // relative tolerance
-  realtype atol        = RCONST(1.0e-10);  // absolute tolerance
-  realtype hfixed      = ZERO;             // fixed step size
+  sunrealtype rtol        = SUN_RCONST(1.0e-5);   // relative tolerance
+  sunrealtype atol        = SUN_RCONST(1.0e-10);  // absolute tolerance
+  sunrealtype hfixed      = ZERO;             // fixed step size
   int      order       = 3;                // ARKode method order
   int      controller  = 0;                // step size adaptivity method
   int      maxsteps    = 0;                // max steps between outputs
@@ -35,7 +35,7 @@ struct UserOptions
   bool        lsinfo          = false;  // output residual history
   int         liniters        = 20;     // number of linear iterations
   int         msbp            = 0;      // preconditioner setup frequency
-  realtype    epslin          = ZERO;   // linear solver tolerance factor
+  sunrealtype    epslin          = ZERO;   // linear solver tolerance factor
 
   // Helper functions
   int parse_args(vector<string> &args, bool outproc);
@@ -198,7 +198,7 @@ int main(int argc, char* argv[])
       // Create arrays for CSR matrix: data, column indices, and row pointers
       sunindextype nnz_loc = 5 * udata.nodes_loc;
 
-      A_data = (realtype*)malloc(nnz_loc * sizeof(sunrealtype));
+      A_data = (sunrealtype*)malloc(nnz_loc * sizeof(sunrealtype));
       if (check_flag((void*)A_data, "malloc Adata", 0)) return 1;
 
       A_col_idxs = (sunindextype*)malloc(nnz_loc * sizeof(sunindextype));
@@ -329,9 +329,9 @@ int main(int argc, char* argv[])
       stepmode  = ARK_ONE_STEP;
     }
 
-    realtype t     = ZERO;
-    realtype dTout = udata.tf / uout.nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata.tf / uout.nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = uout.open(&udata);
diff --git a/benchmarks/diffusion_2D/main_cvode.cpp b/benchmarks/diffusion_2D/main_cvode.cpp
index 285a45ecd1..282a104ab1 100644
--- a/benchmarks/diffusion_2D/main_cvode.cpp
+++ b/benchmarks/diffusion_2D/main_cvode.cpp
@@ -20,8 +20,8 @@
 struct UserOptions
 {
   // Integrator settings
-  realtype rtol        = RCONST(1.0e-5);   // relative tolerance
-  realtype atol        = RCONST(1.0e-10);  // absolute tolerance
+  sunrealtype rtol        = SUN_RCONST(1.0e-5);   // relative tolerance
+  sunrealtype atol        = SUN_RCONST(1.0e-10);  // absolute tolerance
   int      maxsteps    = 0;                // max steps between outputs
   int      onestep     = 0;                // one step mode, number of steps
 
@@ -31,7 +31,7 @@ struct UserOptions
   bool        lsinfo          = false;  // output residual history
   int         liniters        = 20;     // number of linear iterations
   int         msbp            = 0;      // preconditioner setup frequency
-  realtype    epslin          = ZERO;   // linear solver tolerance factor
+  sunrealtype    epslin          = ZERO;   // linear solver tolerance factor
 
   // Helper functions
   int parse_args(vector<string> &args, bool outproc);
@@ -193,7 +193,7 @@ int main(int argc, char* argv[])
       // Create arrays for CSR matrix: data, column indices, and row pointers
       sunindextype nnz_loc = 5 * udata.nodes_loc;
 
-      A_data = (realtype*)malloc(nnz_loc * sizeof(sunrealtype));
+      A_data = (sunrealtype*)malloc(nnz_loc * sizeof(sunrealtype));
       if (check_flag((void*)A_data, "malloc Adata", 0)) return 1;
 
       A_col_idxs = (sunindextype*)malloc(nnz_loc * sizeof(sunindextype));
@@ -309,9 +309,9 @@ int main(int argc, char* argv[])
       stepmode  = CV_ONE_STEP;
     }
 
-    realtype t     = ZERO;
-    realtype dTout = udata.tf / uout.nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata.tf / uout.nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = uout.open(&udata);
diff --git a/benchmarks/diffusion_2D/main_ida.cpp b/benchmarks/diffusion_2D/main_ida.cpp
index 46cf86d84c..e0ce26d913 100644
--- a/benchmarks/diffusion_2D/main_ida.cpp
+++ b/benchmarks/diffusion_2D/main_ida.cpp
@@ -20,8 +20,8 @@
 struct UserOptions
 {
   // Integrator settings
-  realtype rtol        = RCONST(1.0e-5);   // relative tolerance
-  realtype atol        = RCONST(1.0e-10);  // absolute tolerance
+  sunrealtype rtol        = SUN_RCONST(1.0e-5);   // relative tolerance
+  sunrealtype atol        = SUN_RCONST(1.0e-10);  // absolute tolerance
   int      maxsteps    = 0;                // max steps between outputs
   int      onestep     = 0;                // one step mode, number of steps
 
@@ -29,7 +29,7 @@ struct UserOptions
   std::string ls              = "cg";   // linear solver to use
   bool        preconditioning = true;   // preconditioner on/off
   int         liniters        = 20;     // number of linear iterations
-  realtype    epslin          = ZERO;   // linear solver tolerance factor
+  sunrealtype    epslin          = ZERO;   // linear solver tolerance factor
 
   // Helper functions
   int parse_args(vector<string> &args, bool outproc);
@@ -197,7 +197,7 @@ int main(int argc, char* argv[])
       // Create arrays for CSR matrix: data, column indices, and row pointers
       sunindextype nnz_loc = 5 * udata.nodes_loc;
 
-      A_data = (realtype*)malloc(nnz_loc * sizeof(sunrealtype));
+      A_data = (sunrealtype*)malloc(nnz_loc * sizeof(sunrealtype));
       if (check_flag((void*)A_data, "malloc Adata", 0)) return 1;
 
       A_col_idxs = (sunindextype*)malloc(nnz_loc * sizeof(sunindextype));
@@ -304,9 +304,9 @@ int main(int argc, char* argv[])
       stepmode  = IDA_ONE_STEP;
     }
 
-    realtype t     = ZERO;
-    realtype dTout = udata.tf / uout.nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata.tf / uout.nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = uout.open(&udata);
diff --git a/benchmarks/diffusion_2D/mpi_gpu/buffers.cpp b/benchmarks/diffusion_2D/mpi_gpu/buffers.cpp
index adb3280e99..b639a80164 100644
--- a/benchmarks/diffusion_2D/mpi_gpu/buffers.cpp
+++ b/benchmarks/diffusion_2D/mpi_gpu/buffers.cpp
@@ -33,9 +33,9 @@
 // Pack exchange buffers kernel
 __global__ void pack_buffers_kernel(const sunindextype nx_loc,
                                     const sunindextype ny_loc,
-                                    const realtype *u,
-                                    realtype *wbuf, realtype *ebuf,
-                                    realtype *sbuf, realtype *nbuf)
+                                    const sunrealtype *u,
+                                    sunrealtype *wbuf, sunrealtype *ebuf,
+                                    sunrealtype *sbuf, sunrealtype *nbuf)
 {
   // Thread ID
   int i = blockIdx.x * blockDim.x + threadIdx.x;
@@ -60,7 +60,7 @@ __global__ void pack_buffers_kernel(const sunindextype nx_loc,
 int UserData::pack_buffers(const N_Vector u)
 {
   // Access data array
-  const realtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
+  const sunrealtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
   if (check_flag((void *) uarray, "N_VGetDeviceArrayPointer", 0)) return -1;
 
   sunindextype maxdim = max(nx_loc, ny_loc);
@@ -80,11 +80,11 @@ int UserData::allocate_buffers()
   if (HaveNbrW)
   {
 #if defined(USE_HIP)
-    hipMalloc(&Wrecv, ny_loc * sizeof(realtype));
-    hipMalloc(&Wsend, ny_loc * sizeof(realtype));
+    hipMalloc(&Wrecv, ny_loc * sizeof(sunrealtype));
+    hipMalloc(&Wsend, ny_loc * sizeof(sunrealtype));
 #elif defined(USE_CUDA)
-    cudaMalloc(&Wrecv, ny_loc * sizeof(realtype));
-    cudaMalloc(&Wsend, ny_loc * sizeof(realtype));
+    cudaMalloc(&Wrecv, ny_loc * sizeof(sunrealtype));
+    cudaMalloc(&Wsend, ny_loc * sizeof(sunrealtype));
 #else
 #error Define USE_CUDA or USE_HIP
 #endif
@@ -93,11 +93,11 @@ int UserData::allocate_buffers()
   if (HaveNbrE)
   {
 #if defined(USE_HIP)
-    hipMalloc(&Erecv, ny_loc * sizeof(realtype));
-    hipMalloc(&Esend, ny_loc * sizeof(realtype));
+    hipMalloc(&Erecv, ny_loc * sizeof(sunrealtype));
+    hipMalloc(&Esend, ny_loc * sizeof(sunrealtype));
 #elif defined(USE_CUDA)
-    cudaMalloc(&Erecv, ny_loc * sizeof(realtype));
-    cudaMalloc(&Esend, ny_loc * sizeof(realtype));
+    cudaMalloc(&Erecv, ny_loc * sizeof(sunrealtype));
+    cudaMalloc(&Esend, ny_loc * sizeof(sunrealtype));
 #else
 #error Define USE_CUDA or USE_HIP
 #endif
@@ -106,11 +106,11 @@ int UserData::allocate_buffers()
   if (HaveNbrS)
   {
 #if defined(USE_HIP)
-    hipMalloc(&Srecv, nx_loc * sizeof(realtype));
-    hipMalloc(&Ssend, nx_loc * sizeof(realtype));
+    hipMalloc(&Srecv, nx_loc * sizeof(sunrealtype));
+    hipMalloc(&Ssend, nx_loc * sizeof(sunrealtype));
 #elif defined(USE_CUDA)
-    cudaMalloc(&Srecv, nx_loc * sizeof(realtype));
-    cudaMalloc(&Ssend, nx_loc * sizeof(realtype));
+    cudaMalloc(&Srecv, nx_loc * sizeof(sunrealtype));
+    cudaMalloc(&Ssend, nx_loc * sizeof(sunrealtype));
 #else
 #error Define USE_CUDA or USE_HIP
 #endif
@@ -119,11 +119,11 @@ int UserData::allocate_buffers()
   if (HaveNbrN)
   {
 #if defined(USE_HIP)
-    hipMalloc(&Nrecv, nx_loc * sizeof(realtype));
-    hipMalloc(&Nsend, nx_loc * sizeof(realtype));
+    hipMalloc(&Nrecv, nx_loc * sizeof(sunrealtype));
+    hipMalloc(&Nsend, nx_loc * sizeof(sunrealtype));
 #elif defined(USE_CUDA)
-    cudaMalloc(&Nrecv, nx_loc * sizeof(realtype));
-    cudaMalloc(&Nsend, nx_loc * sizeof(realtype));
+    cudaMalloc(&Nrecv, nx_loc * sizeof(sunrealtype));
+    cudaMalloc(&Nsend, nx_loc * sizeof(sunrealtype));
 #else
 #error Define USE_CUDA or USE_HIP
 #endif
diff --git a/benchmarks/diffusion_2D/mpi_gpu/diffusion.cpp b/benchmarks/diffusion_2D/mpi_gpu/diffusion.cpp
index 2043070b0e..13a2fd75dd 100644
--- a/benchmarks/diffusion_2D/mpi_gpu/diffusion.cpp
+++ b/benchmarks/diffusion_2D/mpi_gpu/diffusion.cpp
@@ -32,22 +32,22 @@
 
 
 // Forcing device function
-__device__ void add_forcing(const realtype t,
-                            const realtype x, const realtype y,
-                            const realtype kx, const realtype ky,
-                            const sunindextype c, realtype *udot)
+__device__ void add_forcing(const sunrealtype t,
+                            const sunrealtype x, const sunrealtype y,
+                            const sunrealtype kx, const sunrealtype ky,
+                            const sunindextype c, sunrealtype *udot)
 {
-  realtype sin_sqr_x = sin(PI * x) * sin(PI * x);
-  realtype sin_sqr_y = sin(PI * y) * sin(PI * y);
+  sunrealtype sin_sqr_x = sin(PI * x) * sin(PI * x);
+  sunrealtype sin_sqr_y = sin(PI * y) * sin(PI * y);
 
-  realtype cos_sqr_x = cos(PI * x) * cos(PI * x);
-  realtype cos_sqr_y = cos(PI * y) * cos(PI * y);
+  sunrealtype cos_sqr_x = cos(PI * x) * cos(PI * x);
+  sunrealtype cos_sqr_y = cos(PI * y) * cos(PI * y);
 
-  realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-  realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+  sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+  sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
-  realtype bx = kx * TWO * PI * PI;
-  realtype by = ky * TWO * PI * PI;
+  sunrealtype bx = kx * TWO * PI * PI;
+  sunrealtype by = ky * TWO * PI * PI;
 
   udot[c] += -TWO * PI * sin_sqr_x * sin_sqr_y * sin_t_cos_t
     -bx * (cos_sqr_x - sin_sqr_x) * sin_sqr_y * cos_sqr_t
@@ -56,17 +56,17 @@ __device__ void add_forcing(const realtype t,
 
 
 // Interior diffusion kernel
-__global__ void diffusion_interior_kernel(const realtype t,
-                                          const realtype *u,
-                                          realtype *udot,
+__global__ void diffusion_interior_kernel(const sunrealtype t,
+                                          const sunrealtype *u,
+                                          sunrealtype *udot,
                                           const sunindextype is,
                                           const sunindextype js,
                                           const sunindextype nx_loc,
                                           const sunindextype ny_loc,
-                                          const realtype dx,
-                                          const realtype dy,
-                                          const realtype kx,
-                                          const realtype ky,
+                                          const sunrealtype dx,
+                                          const sunrealtype dy,
+                                          const sunrealtype kx,
+                                          const sunrealtype ky,
                                           const bool forcing)
 {
   // Thread location in the local grid
@@ -86,16 +86,16 @@ __global__ void diffusion_interior_kernel(const realtype t,
     int n = c + nx_loc;
 
     // Set diffusion term
-    realtype cx = kx / (dx * dx);
-    realtype cy = ky / (dy * dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = kx / (dx * dx);
+    sunrealtype cy = ky / (dy * dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     udot[c] = cc * u[c] + cx * (u[w] + u[e]) + cy * (u[s] + u[n]);
 
     if (forcing)
     {
-      realtype x = (is + i) * dx;
-      realtype y = (js + j) * dy;
+      sunrealtype x = (is + i) * dx;
+      sunrealtype y = (js + j) * dy;
 
       add_forcing(t, x, y, kx, ky, c, udot);
     }
@@ -104,30 +104,30 @@ __global__ void diffusion_interior_kernel(const realtype t,
 
 
 // Interior boundary kernel
-__global__ void diffusion_boundary_kernel(const realtype t,
-                                          const realtype *u,
-                                          realtype *udot,
+__global__ void diffusion_boundary_kernel(const sunrealtype t,
+                                          const sunrealtype *u,
+                                          sunrealtype *udot,
                                           const sunindextype is,
                                           const sunindextype js,
                                           const sunindextype nx_loc,
                                           const sunindextype ny_loc,
-                                          const realtype dx,
-                                          const realtype dy,
-                                          const realtype kx,
-                                          const realtype ky,
+                                          const sunrealtype dx,
+                                          const sunrealtype dy,
+                                          const sunrealtype kx,
+                                          const sunrealtype ky,
                                           const bool forcing,
-                                          const realtype *wbuf,
-                                          const realtype *ebuf,
-                                          const realtype *sbuf,
-                                          const realtype *nbuf)
+                                          const sunrealtype *wbuf,
+                                          const sunrealtype *ebuf,
+                                          const sunrealtype *sbuf,
+                                          const sunrealtype *nbuf)
 {
   // Thread ID
   int i = blockIdx.x * blockDim.x + threadIdx.x;
 
   // Set diffusion term
-  realtype cx = kx / (dx * dx);
-  realtype cy = ky / (dy * dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = kx / (dx * dx);
+  sunrealtype cy = ky / (dy * dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // West and East faces excluding corners
   if (i > 0 && i < ny_loc - 1)
@@ -146,8 +146,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = is * dx;
-        realtype y = (js + i) * dy;
+        sunrealtype x = is * dx;
+        sunrealtype y = (js + i) * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -172,8 +172,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = (is + nx_loc - 1) * dx;
-        realtype y = (js + i) * dy;
+        sunrealtype x = (is + nx_loc - 1) * dx;
+        sunrealtype y = (js + i) * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -204,8 +204,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = (is + i) * dx;
-        realtype y = js * dy;
+        sunrealtype x = (is + i) * dx;
+        sunrealtype y = js * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -230,8 +230,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = (is + i) * dx;
-        realtype y = (js + ny_loc - 1) * dy;
+        sunrealtype x = (is + i) * dx;
+        sunrealtype y = (js + ny_loc - 1) * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -262,8 +262,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = is * dx;
-        realtype y = js * dy;
+        sunrealtype x = is * dx;
+        sunrealtype y = js * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -288,8 +288,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = (is + nx_loc - 1) * dx;
-        realtype y = js * dy;
+        sunrealtype x = (is + nx_loc - 1) * dx;
+        sunrealtype y = js * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -314,8 +314,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = is * dx;
-        realtype y = (js + ny_loc - 1) * dy;
+        sunrealtype x = is * dx;
+        sunrealtype y = (js + ny_loc - 1) * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -340,8 +340,8 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
       if (forcing)
       {
-        realtype x = (is + nx_loc - 1) * dx;
-        realtype y = (js + ny_loc - 1) * dy;
+        sunrealtype x = (is + nx_loc - 1) * dx;
+        sunrealtype y = (js + ny_loc - 1) * dy;
 
         add_forcing(t, x, y, kx, ky, c, udot);
       }
@@ -356,7 +356,7 @@ __global__ void diffusion_boundary_kernel(const realtype t,
 
 
 // Diffusion function
-int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
+int laplacian(sunrealtype t, N_Vector u, N_Vector f, UserData* udata)
 {
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
@@ -371,17 +371,17 @@ int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
   const sunindextype js      = udata->js;
   const sunindextype nx_loc  = udata->nx_loc;
   const sunindextype ny_loc  = udata->ny_loc;
-  const realtype     dx      = udata->dx;
-  const realtype     dy      = udata->dy;
-  const realtype     kx      = udata->kx;
-  const realtype     ky      = udata->ky;
+  const sunrealtype     dx      = udata->dx;
+  const sunrealtype     dy      = udata->dy;
+  const sunrealtype     kx      = udata->kx;
+  const sunrealtype     ky      = udata->ky;
   const bool         forcing = udata->forcing;
 
   // Access data arrays
-  const realtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
+  const sunrealtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
   if (check_flag((void *) uarray, "N_VGetDeviceArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(f));
+  sunrealtype *farray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(f));
   if (check_flag((void *) farray, "N_VGetDeviceArrayPointer", 0)) return -1;
 
   // Update subdomain interior
@@ -397,10 +397,10 @@ int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
   if (check_flag(&flag, "UserData::end_exchagne", 1)) return -1;
 
   // Update subdomain boundary
-  const realtype *Warray = (udata->HaveNbrW) ? udata->Wrecv : NULL;
-  const realtype *Earray = (udata->HaveNbrE) ? udata->Erecv : NULL;
-  const realtype *Sarray = (udata->HaveNbrS) ? udata->Srecv : NULL;
-  const realtype *Narray = (udata->HaveNbrN) ? udata->Nrecv : NULL;
+  const sunrealtype *Warray = (udata->HaveNbrW) ? udata->Wrecv : NULL;
+  const sunrealtype *Earray = (udata->HaveNbrE) ? udata->Erecv : NULL;
+  const sunrealtype *Sarray = (udata->HaveNbrS) ? udata->Srecv : NULL;
+  const sunrealtype *Narray = (udata->HaveNbrN) ? udata->Nrecv : NULL;
 
   sunindextype maxdim = max(nx_loc, ny_loc);
   dim3 bblock(BLOCK_SIZE);
diff --git a/benchmarks/diffusion_2D/mpi_gpu/solution.cpp b/benchmarks/diffusion_2D/mpi_gpu/solution.cpp
index 1dfd38c141..bafca2b739 100644
--- a/benchmarks/diffusion_2D/mpi_gpu/solution.cpp
+++ b/benchmarks/diffusion_2D/mpi_gpu/solution.cpp
@@ -32,13 +32,13 @@
 
 
 // Compute the exact solution
-__global__ void solution_kernel(const realtype t, realtype *u,
+__global__ void solution_kernel(const sunrealtype t, sunrealtype *u,
                                 const sunindextype is, const sunindextype ie,
                                 const sunindextype js, const sunindextype je,
                                 const sunindextype nx, const sunindextype ny,
                                 const sunindextype nx_loc,
                                 const sunindextype ny_loc,
-                                const realtype dx, const realtype dy)
+                                const sunrealtype dx, const sunrealtype dy)
 {
   // Thread location in the local grid
   int i = blockIdx.x * blockDim.x + threadIdx.x;
@@ -54,12 +54,12 @@ __global__ void solution_kernel(const realtype t, realtype *u,
     }
     else
     {
-      realtype x = (is + i) * dx;
-      realtype y = (js + j) * dy;
+      sunrealtype x = (is + i) * dx;
+      sunrealtype y = (js + j) * dy;
 
-      realtype cos_sqr_t = cos(PI * t) * cos(PI * t);
-      realtype sin_sqr_x = sin(PI * x) * sin(PI * x);
-      realtype sin_sqr_y = sin(PI * y) * sin(PI * y);
+      sunrealtype cos_sqr_t = cos(PI * t) * cos(PI * t);
+      sunrealtype sin_sqr_x = sin(PI * x) * sin(PI * x);
+      sunrealtype sin_sqr_y = sin(PI * y) * sin(PI * y);
 
       u[i + j * nx_loc] = sin_sqr_x * sin_sqr_y * cos_sqr_t;
     }
@@ -68,13 +68,13 @@ __global__ void solution_kernel(const realtype t, realtype *u,
 
 
 // Compute the exact solution derivative
-__global__ void solution_p_kernel(const realtype t, realtype *up,
+__global__ void solution_p_kernel(const sunrealtype t, sunrealtype *up,
                                   const sunindextype is, const sunindextype ie,
                                   const sunindextype js, const sunindextype je,
                                   const sunindextype nx, const sunindextype ny,
                                   const sunindextype nx_loc,
                                   const sunindextype ny_loc,
-                                  const realtype dx, const realtype dy)
+                                  const sunrealtype dx, const sunrealtype dy)
 {
   // Thread location in the local grid
   int i = blockIdx.x * blockDim.x + threadIdx.x;
@@ -90,12 +90,12 @@ __global__ void solution_p_kernel(const realtype t, realtype *up,
     }
     else
     {
-      realtype x = (is + i) * dx;
-      realtype y = (js + j) * dy;
+      sunrealtype x = (is + i) * dx;
+      sunrealtype y = (js + j) * dy;
 
-      realtype cos_sin_t = -TWO * PI * cos(PI * t) * sin(PI * t);
-      realtype sin_sqr_x = sin(PI * x) * sin(PI * x);
-      realtype sin_sqr_y = sin(PI * y) * sin(PI * y);
+      sunrealtype cos_sin_t = -TWO * PI * cos(PI * t) * sin(PI * t);
+      sunrealtype sin_sqr_x = sin(PI * x) * sin(PI * x);
+      sunrealtype sin_sqr_y = sin(PI * y) * sin(PI * y);
 
       up[i + j * nx_loc] = sin_sqr_x * sin_sqr_y * cos_sin_t;
     }
@@ -104,7 +104,7 @@ __global__ void solution_p_kernel(const realtype t, realtype *up,
 
 
 // Compute the exact solution
-int Solution(realtype t, N_Vector u, UserData *udata)
+int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
@@ -118,10 +118,10 @@ int Solution(realtype t, N_Vector u, UserData *udata)
   const sunindextype ny      = udata->ny;
   const sunindextype nx_loc  = udata->nx_loc;
   const sunindextype ny_loc  = udata->ny_loc;
-  const realtype     dx      = udata->dx;
-  const realtype     dy      = udata->dy;
+  const sunrealtype     dx      = udata->dx;
+  const sunrealtype     dy      = udata->dy;
 
-  realtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
+  sunrealtype *uarray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(u));
   if (check_flag((void *) uarray, "N_VGetDeviceArrayPointer", 0)) return -1;
 
   dim3 block(BLOCK_SIZE_X, BLOCK_SIZE_Y);
@@ -135,7 +135,7 @@ int Solution(realtype t, N_Vector u, UserData *udata)
 
 
 // Compute the exact solution derivative
-int SolutionDerivative(realtype t, N_Vector up, UserData *udata)
+int SolutionDerivative(sunrealtype t, N_Vector up, UserData *udata)
 {
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, up);
@@ -149,10 +149,10 @@ int SolutionDerivative(realtype t, N_Vector up, UserData *udata)
   const sunindextype ny      = udata->ny;
   const sunindextype nx_loc  = udata->nx_loc;
   const sunindextype ny_loc  = udata->ny_loc;
-  const realtype     dx      = udata->dx;
-  const realtype     dy      = udata->dy;
+  const sunrealtype     dx      = udata->dx;
+  const sunrealtype     dy      = udata->dy;
 
-  realtype *uparray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(up));
+  sunrealtype *uparray = N_VGetDeviceArrayPointer(N_VGetLocalVector_MPIPlusX(up));
   if (check_flag((void *) uparray, "N_VGetDeviceArrayPointer", 0)) return -1;
 
   dim3 block(BLOCK_SIZE_X, BLOCK_SIZE_Y);
diff --git a/benchmarks/diffusion_2D/mpi_serial/buffers.cpp b/benchmarks/diffusion_2D/mpi_serial/buffers.cpp
index 8c68483510..6b54361711 100644
--- a/benchmarks/diffusion_2D/mpi_serial/buffers.cpp
+++ b/benchmarks/diffusion_2D/mpi_serial/buffers.cpp
@@ -20,7 +20,7 @@
 int UserData::pack_buffers(const N_Vector u)
 {
   // Access data array
-  const realtype *uarray = N_VGetArrayPointer(u);
+  const sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   if (HaveNbrW)
@@ -48,26 +48,26 @@ int UserData::allocate_buffers()
 {
   if (HaveNbrW)
   {
-    Wrecv = new realtype[ny_loc];
-    Wsend = new realtype[ny_loc];
+    Wrecv = new sunrealtype[ny_loc];
+    Wsend = new sunrealtype[ny_loc];
   }
 
   if (HaveNbrE)
   {
-    Erecv = new realtype[ny_loc];
-    Esend = new realtype[ny_loc];
+    Erecv = new sunrealtype[ny_loc];
+    Esend = new sunrealtype[ny_loc];
   }
 
   if (HaveNbrS)
   {
-    Srecv = new realtype[nx_loc];
-    Ssend = new realtype[nx_loc];
+    Srecv = new sunrealtype[nx_loc];
+    Ssend = new sunrealtype[nx_loc];
   }
 
   if (HaveNbrN)
   {
-    Nrecv = new realtype[nx_loc];
-    Nsend = new realtype[nx_loc];
+    Nrecv = new sunrealtype[nx_loc];
+    Nsend = new sunrealtype[nx_loc];
   }
 
   return 0;
diff --git a/benchmarks/diffusion_2D/mpi_serial/diffusion.cpp b/benchmarks/diffusion_2D/mpi_serial/diffusion.cpp
index 98724f7963..52d0f503ca 100644
--- a/benchmarks/diffusion_2D/mpi_serial/diffusion.cpp
+++ b/benchmarks/diffusion_2D/mpi_serial/diffusion.cpp
@@ -17,7 +17,7 @@
 #include "diffusion_2D.hpp"
 
 // Diffusion function
-int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
+int laplacian(sunrealtype t, N_Vector u, N_Vector f, UserData* udata)
 {
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
@@ -39,15 +39,15 @@ int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -56,15 +56,15 @@ int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -104,10 +104,10 @@ int laplacian(realtype t, N_Vector u, N_Vector f, UserData* udata)
   if (check_flag(&flag, "UserData::end_excahnge", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
diff --git a/benchmarks/diffusion_2D/mpi_serial/solution.cpp b/benchmarks/diffusion_2D/mpi_serial/solution.cpp
index 39639b68b6..c0b7326ea7 100644
--- a/benchmarks/diffusion_2D/mpi_serial/solution.cpp
+++ b/benchmarks/diffusion_2D/mpi_serial/solution.cpp
@@ -17,16 +17,16 @@
 #include "diffusion_2D.hpp"
 
 // Compute the exact solution
-int Solution(realtype t, N_Vector u, UserData *udata)
+int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
 
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
-  realtype cos_sqr_t = cos(PI * t) * cos(PI * t);
+  sunrealtype cos_sqr_t = cos(PI * t) * cos(PI * t);
 
   // Iterative over domain interior
   sunindextype istart = (udata->HaveNbrW) ? 0 : 1;
@@ -35,7 +35,7 @@ int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -57,16 +57,16 @@ int Solution(realtype t, N_Vector u, UserData *udata)
 
 
 // Compute the exact solution derivative
-int SolutionDerivative(realtype t, N_Vector up, UserData *udata)
+int SolutionDerivative(sunrealtype t, N_Vector up, UserData *udata)
 {
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, up);
 
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
-  realtype cos_sin_t = -TWO * PI * cos(PI * t) * sin(PI * t);
+  sunrealtype cos_sin_t = -TWO * PI * cos(PI * t) * sin(PI * t);
 
   // Iterative over domain interior
   sunindextype istart = (udata->HaveNbrW) ? 0 : 1;
@@ -75,7 +75,7 @@ int SolutionDerivative(realtype t, N_Vector up, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uparray = N_VGetArrayPointer(up);
+  sunrealtype *uparray = N_VGetArrayPointer(up);
   if (check_flag((void *) uparray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
diff --git a/benchmarks/diffusion_2D/preconditioner_jacobi.cpp b/benchmarks/diffusion_2D/preconditioner_jacobi.cpp
index b30c00bfde..5ef49ee461 100644
--- a/benchmarks/diffusion_2D/preconditioner_jacobi.cpp
+++ b/benchmarks/diffusion_2D/preconditioner_jacobi.cpp
@@ -19,8 +19,8 @@
 #if defined(BENCHMARK_ODE)
 
 // Preconditioner setup routine
-int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-           booleantype *jcurPtr, realtype gamma, void *user_data)
+int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+           sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Access problem data
   UserData *udata = (UserData *) user_data;
@@ -28,13 +28,13 @@ int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->diag);
 
 
@@ -44,8 +44,8 @@ int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 
 
 // Preconditioner solve routine for Pz = r
-int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-           N_Vector z, realtype gamma, realtype delta, int lr,
+int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+           N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
            void *user_data)
 {
   // Access user_data structure
@@ -64,7 +64,7 @@ int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
 #elif defined(BENCHMARK_DAE)
 
 // Preconditioner setup and solve functions
-int PSetup(realtype t, N_Vector u, N_Vector up, N_Vector res, realtype cj,
+int PSetup(sunrealtype t, N_Vector u, N_Vector up, N_Vector res, sunrealtype cj,
            void *user_data)
 {
   // Access problem data
@@ -73,13 +73,13 @@ int PSetup(realtype t, N_Vector u, N_Vector up, N_Vector res, realtype cj,
   SUNDIALS_CXX_MARK_FUNCTION(udata->prof);
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (cj - cc);
+  sunrealtype c = ONE / (cj - cc);
   N_VConst(c, udata->diag);
 
 
@@ -88,8 +88,8 @@ int PSetup(realtype t, N_Vector u, N_Vector up, N_Vector res, realtype cj,
 }
 
 
-int PSolve(realtype t, N_Vector u, N_Vector up, N_Vector res, N_Vector r,
-           N_Vector z, realtype cj, realtype delta, void *user_data)
+int PSolve(sunrealtype t, N_Vector u, N_Vector up, N_Vector res, N_Vector r,
+           N_Vector z, sunrealtype cj, sunrealtype delta, void *user_data)
 {
   // Access user_data structure
   UserData *udata = (UserData *) user_data;
diff --git a/benchmarks/nvector/cuda/test_nvector_performance_cuda.cu b/benchmarks/nvector/cuda/test_nvector_performance_cuda.cu
index 2d806be195..b4be26d8d6 100644
--- a/benchmarks/nvector/cuda/test_nvector_performance_cuda.cu
+++ b/benchmarks/nvector/cuda/test_nvector_performance_cuda.cu
@@ -30,22 +30,22 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;    /* data length */
-static realtype* h_data;  /* host data   */
-static realtype* h_sum;   /* host sum    */
-static realtype* d_data;  /* device data */
-static realtype* d_sum;   /* device sum  */
+static sunrealtype* h_data;  /* host data   */
+static sunrealtype* h_sum;   /* host sum    */
+static sunrealtype* d_data;  /* device data */
+static sunrealtype* d_sum;   /* device sum  */
 static int blocksPerGrid;
 
 /* cuda reduction kernel to clearing cache between tests */
 __global__
-void ClearCacheKernel(sunindextype N, realtype* data, realtype* out)
+void ClearCacheKernel(sunindextype N, sunrealtype* data, sunrealtype* out)
 {
-  __shared__ realtype shared[256];
+  __shared__ sunrealtype shared[256];
 
   int sharedidx = blockIdx.x;
   int tid = blockIdx.x * blockDim.x + threadIdx.x;
 
-  realtype tmp = 0;
+  sunrealtype tmp = 0;
   while (tid < N) {
     tmp += data[tid];
     tid += blockDim.x * gridDim.x;
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   rand_realtype(N_VGetHostArrayPointer_Cuda(Xvec), Xlen, lower, upper);
   N_VCopyToDevice_Cuda(Xvec);
@@ -249,33 +249,33 @@ static int InitializeClearCache(int cachesize)
   cudaError_t err;     /* cuda error flag     */
   size_t      nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate host data */
   blocksPerGrid = SUNMIN(32,(N+255)/256);
 
-  h_data = (realtype*) malloc(N*sizeof(realtype));
-  h_sum  = (realtype*) malloc(blocksPerGrid*sizeof(realtype));
+  h_data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  h_sum  = (sunrealtype*) malloc(blocksPerGrid*sizeof(sunrealtype));
 
   /* allocate device data */
-  err = cudaMalloc((void**) &d_data, N*sizeof(realtype));
+  err = cudaMalloc((void**) &d_data, N*sizeof(sunrealtype));
   if (err != cudaSuccess) {
     fprintf(stderr,"Failed to allocate device vector (error code %d )!\n",err);
     return(-1);
   }
 
-  err = cudaMalloc((void**) &d_sum, blocksPerGrid*sizeof(realtype));
+  err = cudaMalloc((void**) &d_sum, blocksPerGrid*sizeof(sunrealtype));
   if (err != cudaSuccess) {
     fprintf(stderr,"Failed to allocate device vector (error code %d )!\n",err);
     return(-1);
   }
 
   /* fill host vector with random data and copy to device */
-  rand_realtype(h_data, N, RCONST(-1.0), RCONST(1.0));
+  rand_realtype(h_data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
-  err = cudaMemcpy(d_data, h_data, N*sizeof(realtype), cudaMemcpyHostToDevice);
+  err = cudaMemcpy(d_data, h_data, N*sizeof(sunrealtype), cudaMemcpyHostToDevice);
   if (err != cudaSuccess) {
     fprintf(stderr,"Failed to copy data from host to device (error code %d )!\n",err);
     return(-1);
@@ -310,7 +310,7 @@ void ClearCache()
 {
   /* call cuda kernel to clear the cache */
   ClearCacheKernel<<<SUNMIN(32,(N+255)/256), 256>>>(N, d_data, d_sum);
-  cudaMemcpy(h_sum, d_sum, blocksPerGrid*sizeof(realtype), cudaMemcpyDeviceToHost);
+  cudaMemcpy(h_sum, d_sum, blocksPerGrid*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
   cudaDeviceSynchronize();
   return;
 }
diff --git a/benchmarks/nvector/hip/test_nvector_performance_hip.cpp b/benchmarks/nvector/hip/test_nvector_performance_hip.cpp
index eeabb4b871..bb8b3fe350 100644
--- a/benchmarks/nvector/hip/test_nvector_performance_hip.cpp
+++ b/benchmarks/nvector/hip/test_nvector_performance_hip.cpp
@@ -30,22 +30,22 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;    /* data length */
-static realtype* h_data;  /* host data   */
-static realtype* h_sum;   /* host sum    */
-static realtype* d_data;  /* device data */
-static realtype* d_sum;   /* device sum  */
+static sunrealtype* h_data;  /* host data   */
+static sunrealtype* h_sum;   /* host sum    */
+static sunrealtype* d_data;  /* device data */
+static sunrealtype* d_sum;   /* device sum  */
 static int blocksPerGrid;
 
 /* hip reduction kernel to clearing cache between tests */
 __global__
-void ClearCacheKernel(sunindextype N, realtype* data, realtype* out)
+void ClearCacheKernel(sunindextype N, sunrealtype* data, sunrealtype* out)
 {
-  __shared__ realtype shared[256];
+  __shared__ sunrealtype shared[256];
 
   int sharedidx = blockIdx.x;
   int tid = blockIdx.x * blockDim.x + threadIdx.x;
 
-  realtype tmp = 0;
+  sunrealtype tmp = 0;
   while (tid < N) {
     tmp += data[tid];
     tid += blockDim.x * gridDim.x;
@@ -202,7 +202,7 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   rand_realtype(N_VGetHostArrayPointer_Hip(Xvec), Xlen, lower, upper);
   N_VCopyToDevice_Hip(Xvec);
@@ -249,33 +249,33 @@ static int InitializeClearCache(int cachesize)
   hipError_t err;     /* hip error flag     */
   size_t      nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate host data */
   blocksPerGrid = SUNMIN(32,(N+255)/256);
 
-  h_data = (realtype*) malloc(N*sizeof(realtype));
-  h_sum  = (realtype*) malloc(blocksPerGrid*sizeof(realtype));
+  h_data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  h_sum  = (sunrealtype*) malloc(blocksPerGrid*sizeof(sunrealtype));
 
   /* allocate device data */
-  err = hipMalloc((void**) &d_data, N*sizeof(realtype));
+  err = hipMalloc((void**) &d_data, N*sizeof(sunrealtype));
   if (err != hipSuccess) {
     fprintf(stderr,"Failed to allocate device vector (error code %d )!\n",err);
     return(-1);
   }
 
-  err = hipMalloc((void**) &d_sum, blocksPerGrid*sizeof(realtype));
+  err = hipMalloc((void**) &d_sum, blocksPerGrid*sizeof(sunrealtype));
   if (err != hipSuccess) {
     fprintf(stderr,"Failed to allocate device vector (error code %d )!\n",err);
     return(-1);
   }
 
   /* fill host vector with random data and copy to device */
-  rand_realtype(h_data, N, RCONST(-1.0), RCONST(1.0));
+  rand_realtype(h_data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
-  err = hipMemcpy(d_data, h_data, N*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_data, h_data, N*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (err != hipSuccess) {
     fprintf(stderr,"Failed to copy data from host to device (error code %d )!\n",err);
     return(-1);
@@ -310,7 +310,7 @@ void ClearCache()
 {
   /* call hip kernel to clear the cache */
   ClearCacheKernel<<<SUNMIN(32,(N+255)/256), 256>>>(N, d_data, d_sum);
-  hipMemcpy(h_sum, d_sum, blocksPerGrid*sizeof(realtype), hipMemcpyDeviceToHost);
+  hipMemcpy(h_sum, d_sum, blocksPerGrid*sizeof(sunrealtype), hipMemcpyDeviceToHost);
   hipDeviceSynchronize();
   return;
 }
diff --git a/benchmarks/nvector/mpiplusx/test_nvector_performance_mpiplusx.c b/benchmarks/nvector/mpiplusx/test_nvector_performance_mpiplusx.c
index 8fab63253a..eab5de07e5 100644
--- a/benchmarks/nvector/mpiplusx/test_nvector_performance_mpiplusx.c
+++ b/benchmarks/nvector/mpiplusx/test_nvector_performance_mpiplusx.c
@@ -33,7 +33,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -196,9 +196,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -207,7 +207,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -216,7 +216,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
@@ -258,13 +258,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -277,10 +277,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/openmp/test_nvector_performance_openmp.c b/benchmarks/nvector/openmp/test_nvector_performance_openmp.c
index ec01e7d624..56d88738b5 100644
--- a/benchmarks/nvector/openmp/test_nvector_performance_openmp.c
+++ b/benchmarks/nvector/openmp/test_nvector_performance_openmp.c
@@ -31,7 +31,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -179,9 +179,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -190,7 +190,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -199,7 +199,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
@@ -231,13 +231,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -250,10 +250,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/openmpdev/test_nvector_performance_openmpdev.c b/benchmarks/nvector/openmpdev/test_nvector_performance_openmpdev.c
index db1494a741..f5ed4ef6bf 100644
--- a/benchmarks/nvector/openmpdev/test_nvector_performance_openmpdev.c
+++ b/benchmarks/nvector/openmpdev/test_nvector_performance_openmpdev.c
@@ -159,9 +159,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetHostArrayPointer_OpenMPDEV(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -171,7 +171,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetHostArrayPointer_OpenMPDEV(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -181,7 +181,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetHostArrayPointer_OpenMPDEV(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
diff --git a/benchmarks/nvector/parallel/test_nvector_performance_parallel.c b/benchmarks/nvector/parallel/test_nvector_performance_parallel.c
index 0ab1fa7f7c..343a0cfb54 100644
--- a/benchmarks/nvector/parallel/test_nvector_performance_parallel.c
+++ b/benchmarks/nvector/parallel/test_nvector_performance_parallel.c
@@ -31,7 +31,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -193,9 +193,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -204,7 +204,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -213,7 +213,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
@@ -255,13 +255,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -274,10 +274,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/parhyp/test_nvector_performance_parhyp.c b/benchmarks/nvector/parhyp/test_nvector_performance_parhyp.c
index f73f8f00ba..1c0bf6591e 100644
--- a/benchmarks/nvector/parhyp/test_nvector_performance_parhyp.c
+++ b/benchmarks/nvector/parhyp/test_nvector_performance_parhyp.c
@@ -31,7 +31,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -212,10 +212,10 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   HYPRE_ParVector Xhyp;
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xhyp  = N_VGetVector_ParHyp(Xvec);
   Xdata = hypre_VectorData(hypre_ParVectorLocalVector(Xhyp));
@@ -226,7 +226,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
   HYPRE_ParVector Xhyp;
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xhyp  = N_VGetVector_ParHyp(Xvec);
   Xdata = hypre_VectorData(hypre_ParVectorLocalVector(Xhyp));
@@ -237,7 +237,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
   HYPRE_ParVector Xhyp;
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xhyp  = N_VGetVector_ParHyp(Xvec);
   Xdata = hypre_VectorData(hypre_ParVectorLocalVector(Xhyp));
@@ -280,13 +280,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -299,10 +299,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/petsc/test_nvector_performance_petsc.c b/benchmarks/nvector/petsc/test_nvector_performance_petsc.c
index 0689354a96..07a35ef5d4 100644
--- a/benchmarks/nvector/petsc/test_nvector_performance_petsc.c
+++ b/benchmarks/nvector/petsc/test_nvector_performance_petsc.c
@@ -32,7 +32,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   Vec Xpetsc;
   PetscScalar *Xdata;
@@ -275,13 +275,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -294,10 +294,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/pthreads/test_nvector_performance_pthreads.c b/benchmarks/nvector/pthreads/test_nvector_performance_pthreads.c
index fb446f32be..18d7c286d3 100644
--- a/benchmarks/nvector/pthreads/test_nvector_performance_pthreads.c
+++ b/benchmarks/nvector/pthreads/test_nvector_performance_pthreads.c
@@ -29,7 +29,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -176,9 +176,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -187,7 +187,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -196,7 +196,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
@@ -228,13 +228,13 @@ static int InitializeClearCache(int cachesize)
 {
   size_t nbytes;  /* cache size in bytes */
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -247,10 +247,10 @@ static int FinalizeClearCache()
 
 void ClearCache()
 {
-  realtype     sum;
+  sunrealtype     sum;
   sunindextype i;
 
-  sum = RCONST(0.0);
+  sum = SUN_RCONST(0.0);
   for (i=0; i<N; i++)
     sum += data[i];
 
diff --git a/benchmarks/nvector/raja/test_nvector_performance_raja.cpp b/benchmarks/nvector/raja/test_nvector_performance_raja.cpp
index 4228ee84ef..cbeebc396e 100644
--- a/benchmarks/nvector/raja/test_nvector_performance_raja.cpp
+++ b/benchmarks/nvector/raja/test_nvector_performance_raja.cpp
@@ -170,7 +170,7 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   rand_realtype(N_VGetHostArrayPointer_Raja(Xvec), Xlen, lower, upper);
   N_VCopyToDevice_Raja(Xvec);
diff --git a/benchmarks/nvector/serial/test_nvector_performance_serial.c b/benchmarks/nvector/serial/test_nvector_performance_serial.c
index d0427268a0..5259de8d18 100644
--- a/benchmarks/nvector/serial/test_nvector_performance_serial.c
+++ b/benchmarks/nvector/serial/test_nvector_performance_serial.c
@@ -30,7 +30,7 @@ static int FinalizeClearCache();
 
 /* private data for clearing cache */
 static sunindextype N;  /* data length */
-static realtype* data;  /* host data   */
+static sunrealtype* data;  /* host data   */
 
 
 /* ----------------------------------------------------------------------
@@ -169,9 +169,9 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 /* random data between lower and upper */
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype(Xdata, Xlen, lower, upper);
@@ -180,7 +180,7 @@ void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
 /* series of 0 and 1 */
 void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_zero_one(Xdata, Xlen);
@@ -189,7 +189,7 @@ void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen)
 /* random values for constraint array */
 void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen)
 {
-  realtype *Xdata;
+  sunrealtype *Xdata;
 
   Xdata = N_VGetArrayPointer(Xvec);
   rand_realtype_constraints(Xdata, Xlen);
@@ -228,13 +228,13 @@ static int InitializeClearCache(int cachesize)
     return 0;
   }
 
-  /* determine size of vector to clear cache, N = ceil(2 * nbytes/realtype) */
+  /* determine size of vector to clear cache, N = ceil(2 * nbytes/sunrealtype) */
   nbytes = (size_t) (2 * cachesize * 1024 * 1024);
-  N = (sunindextype) ((nbytes + sizeof(realtype) - 1)/sizeof(realtype));
+  N = (sunindextype) ((nbytes + sizeof(sunrealtype) - 1)/sizeof(sunrealtype));
 
   /* allocate data and fill random values */
-  data = (realtype*) malloc(N*sizeof(realtype));
-  rand_realtype(data, N, RCONST(-1.0), RCONST(1.0));
+  data = (sunrealtype*) malloc(N*sizeof(sunrealtype));
+  rand_realtype(data, N, SUN_RCONST(-1.0), SUN_RCONST(1.0));
 
   return(0);
 }
@@ -249,10 +249,10 @@ void ClearCache()
 {
   if (data)
   {
-    realtype     sum;
+    sunrealtype     sum;
     sunindextype i;
 
-    sum = RCONST(0.0);
+    sum = SUN_RCONST(0.0);
     for (i=0; i<N; i++)
       sum += data[i];
   }
diff --git a/benchmarks/nvector/sycl/test_nvector_performance_sycl.cpp b/benchmarks/nvector/sycl/test_nvector_performance_sycl.cpp
index c90020e78a..456be8a915 100644
--- a/benchmarks/nvector/sycl/test_nvector_performance_sycl.cpp
+++ b/benchmarks/nvector/sycl/test_nvector_performance_sycl.cpp
@@ -206,7 +206,7 @@ int main(int argc, char *argv[])
  * --------------------------------------------------------------------*/
 
 // random data between lower and upper
-void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper)
+void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper)
 {
   rand_realtype(N_VGetHostArrayPointer_Sycl(Xvec), Xlen, lower, upper);
   N_VCopyToDevice_Sycl(Xvec);
diff --git a/benchmarks/nvector/test_nvector_performance.c b/benchmarks/nvector/test_nvector_performance.c
index ab069fcc88..e41abc8443 100644
--- a/benchmarks/nvector/test_nvector_performance.c
+++ b/benchmarks/nvector/test_nvector_performance.c
@@ -74,7 +74,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
   double   start_time, stop_time;
   double   *times;
   double   avgtime, sdevtime, mintime, maxtime;
-  realtype a, b;
+  sunrealtype a, b;
   int      i;
   N_Vector Y, Z;
 
@@ -137,7 +137,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
-    a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -205,7 +205,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
-    b = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    b = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -298,7 +298,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    b = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    b = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -322,7 +322,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -346,7 +346,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    b = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    b = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -370,7 +370,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -394,7 +394,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -418,7 +418,7 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
     b = -1.0*a;
 
     ClearCache();
@@ -443,8 +443,8 @@ int Test_N_VLinearSum(N_Vector X, sunindextype local_length, int ntests)
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VRand(Y, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    a = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
-    b = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
+    a = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
+    b = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -476,13 +476,13 @@ int Test_N_VConst(N_Vector X, sunindextype local_length, int ntests)
   double   start_time, stop_time;
   double   *times;
   double   avgtime, sdevtime, mintime, maxtime;
-  realtype c;
+  sunrealtype c;
   int      i;
 
   times = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   for (i=0; i < ntests+nwarmups; i++) {
-    c = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
+    c = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -601,7 +601,7 @@ int Test_N_VScale(N_Vector X, sunindextype local_length, int ntests)
   double   start_time, stop_time;
   double   *times;
   double   avgtime, sdevtime, mintime, maxtime;
-  realtype c;
+  sunrealtype c;
   int      i;
   N_Vector Z;
 
@@ -617,7 +617,7 @@ int Test_N_VScale(N_Vector X, sunindextype local_length, int ntests)
   for (i=0; i < ntests+nwarmups; i++) {
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
-    c = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
+    c = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -684,7 +684,7 @@ int Test_N_VScale(N_Vector X, sunindextype local_length, int ntests)
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    c = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
+    c = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -799,7 +799,7 @@ int Test_N_VAddConst(N_Vector X, sunindextype local_length, int ntests)
   double   start_time, stop_time;
   double   *times;
   double   avgtime, sdevtime, mintime, maxtime;
-  realtype c;
+  sunrealtype c;
   int      i;
   N_Vector Z;
 
@@ -812,7 +812,7 @@ int Test_N_VAddConst(N_Vector X, sunindextype local_length, int ntests)
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    c = 2.0*((realtype)rand() / (realtype)RAND_MAX) - 1.0;
+    c = 2.0*((sunrealtype)rand() / (sunrealtype)RAND_MAX) - 1.0;
 
     ClearCache();
     start_time = get_time();
@@ -1123,7 +1123,7 @@ int Test_N_VCompare(N_Vector X, sunindextype local_length, int ntests)
   double   start_time, stop_time;
   double   *times;
   double   avgtime, sdevtime, mintime, maxtime;
-  realtype c;
+  sunrealtype c;
   int      i;
   N_Vector Z;
 
@@ -1136,7 +1136,7 @@ int Test_N_VCompare(N_Vector X, sunindextype local_length, int ntests)
     /* fill vector data */
     N_VRand(X, local_length, NEG_ONE, ONE);
     N_VConst(ZERO, Z);
-    c = ((realtype)rand() / (realtype)RAND_MAX);
+    c = ((sunrealtype)rand() / (sunrealtype)RAND_MAX);
 
     ClearCache();
     start_time = get_time();
@@ -1303,7 +1303,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Y;
 
   /* allocate timing arrays */
@@ -1311,7 +1311,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create additional nvectors and array of scaling factors */
-  c = (realtype*) malloc(nvecs*sizeof(realtype));
+  c = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Y = N_VCloneVectorArray(nvecs, X);
 
   /*
@@ -1324,7 +1324,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
 
   for (j=1; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* unfused operation */
@@ -1354,7 +1354,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
 
   for (j=1; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* fused operation */
@@ -1381,12 +1381,12 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
    */
 
   /* fill vector data */
-  c[0] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  c[0] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   N_VRand(Y[0], local_length, NEG_ONE, ONE);
 
   for (j=1; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* unfused operation */
@@ -1412,12 +1412,12 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
   }
 
   /* fill vector data */
-  c[0] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  c[0] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   N_VRand(Y[0], local_length, NEG_ONE, ONE);
 
   for (j=1; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* fused operation */
@@ -1446,7 +1446,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* unfused operation */
@@ -1474,7 +1474,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int nvecs,
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* fused operation */
@@ -1516,7 +1516,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Y, *Z;
 
   /* allocate timing arrays */
@@ -1524,7 +1524,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create additional nvectors and array of scaling factors */
-  c = (realtype*) malloc(nvecs*sizeof(realtype));
+  c = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Y = N_VCloneVectorArray(nvecs, X);
   Z = N_VCloneVectorArray(nvecs, X);
 
@@ -1536,7 +1536,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   N_VRand(X, local_length, NEG_ONE, ONE);
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* unfused operation */
@@ -1556,7 +1556,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   N_VRand(X, local_length, NEG_ONE, ONE);
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* fused operation */
@@ -1586,7 +1586,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   N_VRand(X, local_length, NEG_ONE, ONE);
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* unfused operation */
@@ -1606,7 +1606,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int nvecs, int
   N_VRand(X, local_length, NEG_ONE, ONE);
   for (j=0; j < nvecs; j++) {
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   }
 
   /* fused operation */
@@ -1649,7 +1649,7 @@ int Test_N_VDotProdMulti(N_Vector X, sunindextype local_length, int nvecs, int n
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Y;
 
   /* allocate timing arrays */
@@ -1657,7 +1657,7 @@ int Test_N_VDotProdMulti(N_Vector X, sunindextype local_length, int nvecs, int n
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create additional nvectors and array of dot products */
-  c = (realtype*) malloc(nvecs*sizeof(realtype));
+  c = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Y = N_VCloneVectorArray(nvecs, X);
 
   /* fill vector data */
@@ -1723,7 +1723,7 @@ int Test_N_VLinearSumVectorArray(N_Vector V, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype a, b;
+  sunrealtype a, b;
   N_Vector *X, *Y, *Z;
 
   /* allocate timing arrays */
@@ -1740,8 +1740,8 @@ int Test_N_VLinearSumVectorArray(N_Vector V, sunindextype local_length,
    */
 
   /* fill vector data */
-  a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
-  b = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
+  b = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   for (j=0; j < nvecs; j++) {
     N_VRand(X[j], local_length, NEG_ONE, ONE);
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
@@ -1761,8 +1761,8 @@ int Test_N_VLinearSumVectorArray(N_Vector V, sunindextype local_length,
   }
 
   /* fill vector data */
-  a = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
-  b = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  a = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
+  b = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   for (j=0; j < nvecs; j++) {
     N_VRand(X[j], local_length, NEG_ONE, ONE);
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
@@ -1809,7 +1809,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Y, *Z;
 
   /* allocate timing arrays */
@@ -1817,7 +1817,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create nvectors arrays and scaling factor array */
-  c = (realtype*) malloc(nvecs*sizeof(realtype));
+  c = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Y = N_VCloneVectorArray(nvecs, X);
   Z = N_VCloneVectorArray(nvecs, X);
 
@@ -1827,7 +1827,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
 
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
   }
 
@@ -1846,7 +1846,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
 
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
   }
 
@@ -1875,7 +1875,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
 
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
   }
 
@@ -1894,7 +1894,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length,
 
   /* fill vector data */
   for (j=0; j < nvecs; j++) {
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
   }
 
@@ -1939,7 +1939,7 @@ int Test_N_VConstVectorArray(N_Vector X, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype c;
+  sunrealtype c;
   N_Vector *Y;
 
   /* allocate timing arrays */
@@ -1954,7 +1954,7 @@ int Test_N_VConstVectorArray(N_Vector X, sunindextype local_length,
    */
 
   /* fill vector data */
-  c = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  c = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   for (j=0; j < nvecs; j++)
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
 
@@ -1972,7 +1972,7 @@ int Test_N_VConstVectorArray(N_Vector X, sunindextype local_length,
   }
 
   /* fill vector data */
-  c = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+  c = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
   for (j=0; j < nvecs; j++)
     N_VRand(Y[j], local_length, NEG_ONE, ONE);
 
@@ -2015,7 +2015,7 @@ int Test_N_VWrmsNormVectorArray(N_Vector X, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Z, *W;
 
   /* allocate timing arrays */
@@ -2023,7 +2023,7 @@ int Test_N_VWrmsNormVectorArray(N_Vector X, sunindextype local_length,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create nvectors arrays and array for norms */
-  c = (realtype*) malloc(nvecs*sizeof(realtype));
+  c = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Z = N_VCloneVectorArray(nvecs, X);
   W = N_VCloneVectorArray(nvecs, X);
 
@@ -2097,7 +2097,7 @@ int Test_N_VWrmsNormMaskVectorArray(N_Vector X, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *Z, *W, ID;
 
   /* allocate timing arrays */
@@ -2105,7 +2105,7 @@ int Test_N_VWrmsNormMaskVectorArray(N_Vector X, sunindextype local_length,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create nvectors arrays and array for norms */
-  c  = (realtype*) malloc(nvecs*sizeof(realtype));
+  c  = (sunrealtype*) malloc(nvecs*sizeof(sunrealtype));
   Z  = N_VCloneVectorArray(nvecs, X);
   W  = N_VCloneVectorArray(nvecs, X);
   ID = N_VClone(X);
@@ -2183,7 +2183,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j, k;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector *X, **Y, **Z;
 
   /* allocate timing arrays */
@@ -2191,7 +2191,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create nvectors arrays and array for norms */
-  c = (realtype*) malloc(nsums*sizeof(realtype));
+  c = (sunrealtype*) malloc(nsums*sizeof(sunrealtype));
   X = N_VCloneVectorArray(nvecs, V);
 
   Y = (N_Vector**) malloc(nsums*sizeof(N_Vector*));
@@ -2207,7 +2207,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (k=0; k < nvecs; k++)
     N_VRand(X[k], local_length, NEG_ONE, ONE);
@@ -2232,7 +2232,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (k=0; k < nvecs; k++)
     N_VRand(X[k], local_length, NEG_ONE, ONE);
@@ -2266,7 +2266,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (k=0; k < nvecs; k++)
     N_VRand(X[k], local_length, NEG_ONE, ONE);
@@ -2291,7 +2291,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (k=0; k < nvecs; k++)
     N_VRand(X[k], local_length, NEG_ONE, ONE);
@@ -2347,7 +2347,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
   double   *ftimes, *utimes;
   int      i, j, k;
   int      ier = 0;
-  realtype *c;
+  sunrealtype *c;
   N_Vector **X, *Z;
 
   /* allocate timing arrays */
@@ -2355,7 +2355,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
   utimes = (double*) malloc((ntests+nwarmups)*sizeof(double));
 
   /* create nvectors arrays and array for norms */
-  c = (realtype*) malloc(nsums*sizeof(realtype));
+  c = (sunrealtype*) malloc(nsums*sizeof(sunrealtype));
   Z = N_VCloneVectorArray(nvecs, V);
 
   X = (N_Vector**) malloc(nsums*sizeof(N_Vector*));
@@ -2369,7 +2369,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
   /* fill data */
   c[0] = ONE;
   for (j=1; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2401,7 +2401,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
   /* fill data */
   c[0] = ONE;
   for (j=1; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2433,7 +2433,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2467,7 +2467,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2499,7 +2499,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2533,7 +2533,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
 
   /* fill data */
   for (j=0; j < nsums; j++)
-    c[j] = ((realtype)rand() / (realtype)RAND_MAX) + 1.0;
+    c[j] = ((sunrealtype)rand() / (sunrealtype)RAND_MAX) + 1.0;
 
   for (j=0; j < nsums; j++)
     for (k=0; k < nvecs; k++)
@@ -2623,13 +2623,13 @@ void SetTiming(int onoff, int myid)
 
 
 /* ----------------------------------------------------------------------
- * Fill a realtype array with random numbers between lower and upper
+ * Fill a sunrealtype array with random numbers between lower and upper
  * using a linear congruential generator suggested in the C99 standard
  * --------------------------------------------------------------------*/
-void rand_realtype(realtype *data, sunindextype len, realtype lower, realtype upper)
+void rand_realtype(sunrealtype *data, sunindextype len, sunrealtype lower, sunrealtype upper)
 {
   int i, rand;
-  realtype range;
+  sunrealtype range;
   static int rand_max = 0x7fffffff; /* 2^32 - 1 */
 
   /* fill array with random data between lower and upper */
@@ -2637,7 +2637,7 @@ void rand_realtype(realtype *data, sunindextype len, realtype lower, realtype up
   rand  = (int) time(NULL);
   for (i=0; i < len; i++) {
     rand = (1103515245*rand+12345) & rand_max;
-    data[i] = range*((realtype)rand / (realtype)rand_max) + lower;
+    data[i] = range*((sunrealtype)rand / (sunrealtype)rand_max) + lower;
   }
 
   return;
@@ -2645,9 +2645,9 @@ void rand_realtype(realtype *data, sunindextype len, realtype lower, realtype up
 
 
 /* ----------------------------------------------------------------------
- * Fill a realtype array with random series of 0 or 1
+ * Fill a sunrealtype array with random series of 0 or 1
  * --------------------------------------------------------------------*/
-void rand_realtype_zero_one(realtype *data, sunindextype len)
+void rand_realtype_zero_one(sunrealtype *data, sunindextype len)
 {
   int i, rand;
   static int rand_max = 0x7fffffff; /* 2^32 - 1 */
@@ -2656,7 +2656,7 @@ void rand_realtype_zero_one(realtype *data, sunindextype len)
   rand = (int) time(NULL);
   for (i=0; i < len; i++) {
     rand = (1103515245*rand+12345) & rand_max;
-    data[i] = (realtype) (rand % 2);
+    data[i] = (sunrealtype) (rand % 2);
   }
 
   return;
@@ -2664,9 +2664,9 @@ void rand_realtype_zero_one(realtype *data, sunindextype len)
 
 
 /* ----------------------------------------------------------------------
- * Fill a realtype array with random values for constraint testing
+ * Fill a sunrealtype array with random values for constraint testing
  * --------------------------------------------------------------------*/
-void rand_realtype_constraints(realtype *data, sunindextype len)
+void rand_realtype_constraints(sunrealtype *data, sunindextype len)
 {
   int i, rand;
   static int rand_max = 0x7fffffff; /* 2^32 - 1 */
@@ -2675,7 +2675,7 @@ void rand_realtype_constraints(realtype *data, sunindextype len)
   rand = (int) time(NULL);
   for (i=0; i < len; i++) {
     rand = (1103515245*rand+12345) & rand_max;
-    data[i] = (realtype) (rand % 5 - 2);
+    data[i] = (sunrealtype) (rand % 5 - 2);
   }
 
   return;
diff --git a/benchmarks/nvector/test_nvector_performance.h b/benchmarks/nvector/test_nvector_performance.h
index b81f1c2d98..99d947e796 100644
--- a/benchmarks/nvector/test_nvector_performance.h
+++ b/benchmarks/nvector/test_nvector_performance.h
@@ -18,11 +18,11 @@
 #include <math.h>
 
 /* define constatnts */
-#define NEG_ONE  RCONST(-1.0)
-#define ZERO     RCONST(0.0)
-#define ONE      RCONST(1.0)
-#define TWO      RCONST(2.0)
-#define TEN      RCONST(10.0)
+#define NEG_ONE  SUN_RCONST(-1.0)
+#define ZERO     SUN_RCONST(0.0)
+#define ONE      SUN_RCONST(1.0)
+#define TWO      SUN_RCONST(2.0)
+#define TEN      SUN_RCONST(10.0)
 
 #ifdef __cplusplus  /* wrapper to enable C++ usage */
 extern "C" {
@@ -32,7 +32,7 @@ extern "C" {
   void collect_times(N_Vector X, double *times, int ntimes);
   void sync_device(N_Vector x);
   void ClearCache();
-  void N_VRand(N_Vector Xvec, sunindextype Xlen, realtype lower, realtype upper);
+  void N_VRand(N_Vector Xvec, sunindextype Xlen, sunrealtype lower, sunrealtype upper);
   void N_VRandZeroOne(N_Vector Xvec, sunindextype Xlen);
   void N_VRandConstraints(N_Vector Xvec, sunindextype Xlen);
 
@@ -89,10 +89,10 @@ extern "C" {
   /* Print output table header */
   void PrintTableHeader(int type);
 
-  /* Fill realtype arrays with random data */
-  void rand_realtype(realtype *data, sunindextype len, realtype lower, realtype upper);
-  void rand_realtype_zero_one(realtype *data, sunindextype len);
-  void rand_realtype_constraints(realtype *data, sunindextype len);
+  /* Fill sunrealtype arrays with random data */
+  void rand_realtype(sunrealtype *data, sunindextype len, sunrealtype lower, sunrealtype upper);
+  void rand_realtype_zero_one(sunrealtype *data, sunindextype len);
+  void rand_realtype_constraints(sunrealtype *data, sunindextype len);
 
 #ifdef __cplusplus
 }
diff --git a/cmake/SundialsBuildOptionsPre.cmake b/cmake/SundialsBuildOptionsPre.cmake
index 3de3b3a29a..cc4e7202ea 100644
--- a/cmake/SundialsBuildOptionsPre.cmake
+++ b/cmake/SundialsBuildOptionsPre.cmake
@@ -34,7 +34,7 @@ if(USE_XSDK_DEFAULTS)
 endif()
 
 # ---------------------------------------------------------------
-# Option to specify precision (realtype)
+# Option to specify precision (sunrealtype)
 # ---------------------------------------------------------------
 
 set(DOCSTR "single, double, or extended")
diff --git a/doc/arkode/guide/source/ARKodeButcherTable.rst b/doc/arkode/guide/source/ARKodeButcherTable.rst
index 86a13a15e4..85622a1c7f 100644
--- a/doc/arkode/guide/source/ARKodeButcherTable.rst
+++ b/doc/arkode/guide/source/ARKodeButcherTable.rst
@@ -57,10 +57,10 @@ where ``ARKodeButcherTableMem`` is the structure
      int q;
      int p;
      int stages;
-     realtype **A;
-     realtype *c;
-     realtype *b;
-     realtype *d;
+     sunrealtype **A;
+     sunrealtype *c;
+     sunrealtype *b;
+     sunrealtype *d;
 
    };
 
@@ -172,7 +172,7 @@ ARKodeButcherTable functions
       This function is case sensitive.
 
 
-.. c:function:: ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, booleantype embedded)
+.. c:function:: ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, sunbooleantype embedded)
 
    Allocates an empty Butcher table.
 
@@ -185,7 +185,7 @@ ARKodeButcherTable functions
       * :c:type:`ARKodeButcherTable` structure if successful.
       * ``NULL`` pointer if *stages* was invalid or an allocation error occurred.
 
-.. c:function:: ARKodeButcherTable ARKodeButcherTable_Create(int s, int q, int p, realtype *c, realtype *A, realtype *b, realtype *d)
+.. c:function:: ARKodeButcherTable ARKodeButcherTable_Create(int s, int q, int p, sunrealtype *c, sunrealtype *A, sunrealtype *b, sunrealtype *d)
 
    Allocates a Butcher table and fills it with the given values.
 
@@ -228,7 +228,7 @@ ARKodeButcherTable functions
 
    **Arguments:**
       * *B* -- the Butcher table.
-      * *lenrw* -- the number of ``realtype`` values in the Butcher table workspace.
+      * *lenrw* -- the number of ``sunrealtype`` values in the Butcher table workspace.
       * *leniw* -- the number of integer values in the Butcher table workspace.
 
    **Return value:**
diff --git a/doc/arkode/guide/source/Introduction.rst b/doc/arkode/guide/source/Introduction.rst
index b6442c8fd8..2ef2b1c5c3 100644
--- a/doc/arkode/guide/source/Introduction.rst
+++ b/doc/arkode/guide/source/Introduction.rst
@@ -133,6 +133,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Added the :c:type:`SUNAdaptController` base class, ported ARKODE's internal
 implementations of time step controllers into implementations of this class,
 and updated ARKODE to use these objects instead of its own implementations.  Added
diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/Preconditioners.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/Preconditioners.rst
index 3dc9517777..4b4d07ccd2 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/Preconditioners.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/Preconditioners.rst
@@ -172,7 +172,7 @@ the ARKBANDPRE module:
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ARKStep memory block.
-      * *lenrwLS* -- the number of ``realtype`` values in the
+      * *lenrwLS* -- the number of ``sunrealtype`` values in the
         ARKBANDPRE workspace.
       * *leniwLS* -- the number of integer values in the  ARKBANDPRE workspace.
 
@@ -347,7 +347,7 @@ communicated between processes by *cfn*, and that are then used by
 
 
 
-.. c:type:: int (*ARKLocalFn)(sunindextype Nlocal, realtype t, N_Vector y, N_Vector glocal, void* user_data)
+.. c:type:: int (*ARKLocalFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, N_Vector glocal, void* user_data)
 
    This *gloc* function computes :math:`g(t,y)`.  It
    fills the vector *glocal* as a function of *t* and *y*.
@@ -377,7 +377,7 @@ communicated between processes by *cfn*, and that are then used by
 
 
 
-.. c:type:: int (*ARKCommFn)(sunindextype Nlocal, realtype t, N_Vector y, void* user_data)
+.. c:type:: int (*ARKCommFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, void* user_data)
 
    This *cfn* function performs all inter-process
    communication necessary for the execution of the *gloc* function
@@ -497,7 +497,7 @@ ARKBBDPRE user-callable functions
 The ARKBBDPRE preconditioner module is initialized (or re-initialized)
 and attached to the integrator by calling the following functions:
 
-.. c:function:: int ARKBBDPrecInit(void* arkode_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dqrely, ARKLocalFn gloc, ARKCommFn cfn)
+.. c:function:: int ARKBBDPrecInit(void* arkode_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dqrely, ARKLocalFn gloc, ARKCommFn cfn)
 
    Initializes and allocates (internal) memory for the
    ARKBBDPRE preconditioner.
@@ -565,7 +565,7 @@ SUNLINSOL module, and/or one or more of the corresponding
 ``ARKStepSet***`` functions, must also be made (in the proper order).
 
 
-.. c:function:: int ARKBBDPrecReInit(void* arkode_mem, sunindextype mudq, sunindextype mldq, realtype dqrely)
+.. c:function:: int ARKBBDPrecReInit(void* arkode_mem, sunindextype mudq, sunindextype mldq, sunrealtype dqrely)
 
    Re-initializes the ARKBBDPRE preconditioner module.
 
@@ -603,7 +603,7 @@ the ARKBBDPRE module:
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ARKStep memory block.
-      * *lenrwBBDP* -- the number of ``realtype`` values in the
+      * *lenrwBBDP* -- the number of ``sunrealtype`` values in the
         ARKBBDPRE workspace.
       * *leniwBBDP* -- the number of integer values in the  ARKBBDPRE workspace.
 
diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/Skeleton.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/Skeleton.rst
index 4b75d6d36e..9ab0755b18 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/Skeleton.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/Skeleton.rst
@@ -59,7 +59,7 @@ the function to be called or macro to be referenced.
 
       y0 = N_VMake_***(..., ydata);
 
-   if the ``realtype`` array ``ydata`` containing the initial values of
+   if the ``sunrealtype`` array ``ydata`` containing the initial values of
    :math:`y` already exists.  Otherwise, create a new vector by making
    a call of the form
 
diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
index 8db35e2510..0425ab5bec 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/User_callable.rst
@@ -41,7 +41,7 @@ ARKStep initialization and deallocation functions
 ------------------------------------------------------
 
 
-.. c:function:: void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, realtype t0, N_Vector y0, SUNContext sunctx)
+.. c:function:: void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, sunrealtype t0, N_Vector y0, SUNContext sunctx)
 
    This function creates an internal memory block for a problem to be
    solved using the ARKStep time-stepping module in ARKODE.
@@ -114,7 +114,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int ARKStepSStolerances(void* arkode_mem, realtype reltol, realtype abstol)
+.. c:function:: int ARKStepSStolerances(void* arkode_mem, sunrealtype reltol, sunrealtype abstol)
 
    This function specifies scalar relative and absolute tolerances.
 
@@ -131,7 +131,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int ARKStepSVtolerances(void* arkode_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int ARKStepSVtolerances(void* arkode_mem, sunrealtype reltol, N_Vector abstol)
 
    This function specifies a scalar relative tolerance and a vector
    absolute tolerance (a potentially different absolute tolerance for
@@ -207,7 +207,7 @@ these functions is provided below.
 
 
 
-.. c:function:: int ARKStepResStolerance(void* arkode_mem, realtype rabstol)
+.. c:function:: int ARKStepResStolerance(void* arkode_mem, sunrealtype rabstol)
 
    This function specifies a scalar absolute residual tolerance.
 
@@ -546,7 +546,7 @@ Newton and mass matrix systems, these must have the same type:
   Newton systems.
 
 
-.. c:function:: int ARKStepSetMassLinearSolver(void* arkode_mem, SUNLinearSolver LS, SUNMatrix M, booleantype time_dep)
+.. c:function:: int ARKStepSetMassLinearSolver(void* arkode_mem, SUNLinearSolver LS, SUNMatrix M, sunbooleantype time_dep)
 
    This function specifies the ``SUNLinearSolver`` object
    that ARKStep should use for mass matrix systems, as well as a
@@ -704,7 +704,7 @@ the user has set a stop time (with a call to the optional input function
 :c:func:`ARKStepSetStopTime()`) or has requested rootfinding.
 
 
-.. c:function:: int ARKStepEvolve(void* arkode_mem, realtype tout, N_Vector yout, realtype *tret, int itask)
+.. c:function:: int ARKStepEvolve(void* arkode_mem, sunrealtype tout, N_Vector yout, sunrealtype *tret, int itask)
 
    Integrates the ODE over an interval in :math:`t`.
 
@@ -1071,7 +1071,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
 
 
 
-.. c:function:: int ARKStepSetFixedStep(void* arkode_mem, realtype hfixed)
+.. c:function:: int ARKStepSetFixedStep(void* arkode_mem, sunrealtype hfixed)
 
    Disables time step adaptivity within ARKStep, and specifies the
    fixed time step size to use for the following internal step(s).
@@ -1130,7 +1130,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
 
 
 
-.. c:function:: int ARKStepSetInitStep(void* arkode_mem, realtype hin)
+.. c:function:: int ARKStepSetInitStep(void* arkode_mem, sunrealtype hin)
 
    Specifies the initial time step size ARKStep should use after
    initialization, re-initialization, or resetting.
@@ -1204,7 +1204,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
 
 
 
-.. c:function:: int ARKStepSetMaxStep(void* arkode_mem, realtype hmax)
+.. c:function:: int ARKStepSetMaxStep(void* arkode_mem, sunrealtype hmax)
 
    Specifies the upper bound on the magnitude of the time step size.
 
@@ -1222,7 +1222,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
 
 
 
-.. c:function:: int ARKStepSetMinStep(void* arkode_mem, realtype hmin)
+.. c:function:: int ARKStepSetMinStep(void* arkode_mem, sunrealtype hmin)
 
    Specifies the lower bound on the magnitude of the time step size.
 
@@ -1240,7 +1240,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
 
 
 
-.. c:function:: int ARKStepSetStopTime(void* arkode_mem, realtype tstop)
+.. c:function:: int ARKStepSetStopTime(void* arkode_mem, sunrealtype tstop)
 
    Specifies the value of the independent variable
    :math:`t` past which the solution is not to proceed.
@@ -1266,7 +1266,7 @@ Set max number of constraint failures             :c:func:`ARKStepSetMaxNumConst
       :c:func:`ARKStepClearStopTime`.
 
 
-.. c:function:: int ARKStepSetInterpolateStopTime(void* arkode_mem, booleantype interp)
+.. c:function:: int ARKStepSetInterpolateStopTime(void* arkode_mem, sunbooleantype interp)
 
    Specifies that the output solution should be interpolated when the current
    :math:`t` equals the specified ``tstop`` (instead of merely copying the
@@ -1754,7 +1754,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, realtype* adapt_params)
+.. c:function:: int ARKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, sunrealtype* adapt_params)
 
    Specifies the method (and associated parameters) used for time step adaptivity.
 
@@ -1820,7 +1820,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
    .. versionadded:: x.x.x
 
-.. c:function:: int ARKStepSetCFLFraction(void* arkode_mem, realtype cfl_frac)
+.. c:function:: int ARKStepSetCFLFraction(void* arkode_mem, sunrealtype cfl_frac)
 
    Specifies the fraction of the estimated explicitly stable step to use.
 
@@ -1839,7 +1839,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetErrorBias(void* arkode_mem, realtype bias)
+.. c:function:: int ARKStepSetErrorBias(void* arkode_mem, sunrealtype bias)
 
    Specifies the bias to be applied to the error estimates within
    accuracy-based adaptivity strategies.
@@ -1866,7 +1866,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
       Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
 
 
-.. c:function:: int ARKStepSetFixedStepBounds(void* arkode_mem, realtype lb, realtype ub)
+.. c:function:: int ARKStepSetFixedStepBounds(void* arkode_mem, sunrealtype lb, sunrealtype ub)
 
    Specifies the step growth interval in which the step size will remain unchanged.
 
@@ -1885,7 +1885,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetMaxCFailGrowth(void* arkode_mem, realtype etacf)
+.. c:function:: int ARKStepSetMaxCFailGrowth(void* arkode_mem, sunrealtype etacf)
 
    Specifies the maximum step size growth factor upon an algebraic
    solver convergence failure on a stage solve within a step, :math:`\eta_{cf}` from
@@ -1906,7 +1906,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetMaxEFailGrowth(void* arkode_mem, realtype etamxf)
+.. c:function:: int ARKStepSetMaxEFailGrowth(void* arkode_mem, sunrealtype etamxf)
 
    Specifies the maximum step size growth factor upon multiple successive
    accuracy-based error failures in the solver.
@@ -1925,7 +1925,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetMaxFirstGrowth(void* arkode_mem, realtype etamx1)
+.. c:function:: int ARKStepSetMaxFirstGrowth(void* arkode_mem, sunrealtype etamx1)
 
    Specifies the maximum allowed growth factor in step size following the very
    first integration step.
@@ -1945,7 +1945,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetMaxGrowth(void* arkode_mem, realtype mx_growth)
+.. c:function:: int ARKStepSetMaxGrowth(void* arkode_mem, sunrealtype mx_growth)
 
    Specifies the maximum allowed growth factor in step size between
    consecutive steps in the integration process.
@@ -1965,7 +1965,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetMinReduction(void* arkode_mem, realtype eta_min)
+.. c:function:: int ARKStepSetMinReduction(void* arkode_mem, sunrealtype eta_min)
 
    Specifies the minimum allowed reduction factor in step size between
    step attempts, resulting from a temporal error failure in the integration
@@ -1987,7 +1987,7 @@ Explicit stability function                                 :c:func:`ARKStepSetS
 
 
 
-.. c:function:: int ARKStepSetSafetyFactor(void* arkode_mem, realtype safety)
+.. c:function:: int ARKStepSetSafetyFactor(void* arkode_mem, sunrealtype safety)
 
    Specifies the safety factor to be applied to the accuracy-based
    estimated step.
@@ -2248,7 +2248,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`ARKStepSetDe
 
 
 
-.. c:function:: int ARKStepSetNonlinConvCoef(void* arkode_mem, realtype nlscoef)
+.. c:function:: int ARKStepSetNonlinConvCoef(void* arkode_mem, sunrealtype nlscoef)
 
    Specifies the safety factor :math:`\epsilon` used within the nonlinear
    solver convergence test :eq:`ARKODE_NonlinearTolerance`.
@@ -2268,7 +2268,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`ARKStepSetDe
 
 
 
-.. c:function:: int ARKStepSetNonlinCRDown(void* arkode_mem, realtype crdown)
+.. c:function:: int ARKStepSetNonlinCRDown(void* arkode_mem, sunrealtype crdown)
 
    Specifies the constant :math:`c_r` used in estimating the nonlinear solver convergence rate :eq:`ARKODE_NonlinearCRate`.
 
@@ -2286,7 +2286,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`ARKStepSetDe
 
 
 
-.. c:function:: int ARKStepSetNonlinRDiv(void* arkode_mem, realtype rdiv)
+.. c:function:: int ARKStepSetNonlinRDiv(void* arkode_mem, sunrealtype rdiv)
 
    Specifies the nonlinear correction threshold :math:`r_{div}` from
    :eq:`ARKODE_NonlinearDivergence`, beyond which the iteration will be declared divergent.
@@ -2435,7 +2435,7 @@ is recomputed using the current :math:`\gamma` value.
    =============================================  =========================================  ============
 
 
-.. c:function:: int ARKStepSetDeltaGammaMax(void* arkode_mem, realtype dgmax)
+.. c:function:: int ARKStepSetDeltaGammaMax(void* arkode_mem, sunrealtype dgmax)
 
    Specifies a scaled step size ratio tolerance, :math:`\Delta\gamma_{max}` from
    :numref:`ARKODE.Mathematics.Linear.Setup`, beyond which the linear solver
@@ -2663,7 +2663,7 @@ data in the program. The user data pointer may be specified through
       :numref:`ARKODE.Usage.UserSupplied`.
 
 
-.. c:function:: int ARKStepSetLinearSolutionScaling(void* arkode_mem, booleantype onoff)
+.. c:function:: int ARKStepSetLinearSolutionScaling(void* arkode_mem, sunbooleantype onoff)
 
    Enables or disables scaling the linear system solution to account for a
    change in :math:`\gamma` in the linear system. For more details see
@@ -2969,7 +2969,7 @@ the user through the :c:func:`ARKStepSetEpsLin()` function.
 
 
 
-.. c:function:: int ARKStepSetEpsLin(void* arkode_mem, realtype eplifac)
+.. c:function:: int ARKStepSetEpsLin(void* arkode_mem, sunrealtype eplifac)
 
    Specifies the factor :math:`\epsilon_L` by which the tolerance on
    the nonlinear iteration is multiplied to get a tolerance on the
@@ -2995,7 +2995,7 @@ the user through the :c:func:`ARKStepSetEpsLin()` function.
 
 
 
-.. c:function:: int ARKStepSetMassEpsLin(void* arkode_mem, realtype eplifac)
+.. c:function:: int ARKStepSetMassEpsLin(void* arkode_mem, sunrealtype eplifac)
 
    Specifies the factor by which the tolerance on the nonlinear
    iteration is multiplied to get a tolerance on the mass matrix
@@ -3035,7 +3035,7 @@ functions :c:func:`ARKStepSetLSNormFactor()` and :c:func:`ARKStepSetMassLSNormFa
 allow for additional user control over these conversion factors.
 
 
-.. c:function:: int ARKStepSetLSNormFactor(void* arkode_mem, realtype nrmfac)
+.. c:function:: int ARKStepSetLSNormFactor(void* arkode_mem, sunrealtype nrmfac)
 
    Specifies the factor to use when converting from the integrator tolerance
    (WRMS norm) to the linear solver tolerance (L2 norm) for Newton linear system
@@ -3064,7 +3064,7 @@ allow for additional user control over these conversion factors.
 
 
 
-.. c:function:: int ARKStepSetMassLSNormFactor(void* arkode_mem, realtype nrmfac)
+.. c:function:: int ARKStepSetMassLSNormFactor(void* arkode_mem, sunrealtype nrmfac)
 
    Specifies the factor to use when converting from the integrator tolerance
    (WRMS norm) to the linear solver tolerance (L2 norm) for mass matrix linear
@@ -3184,7 +3184,7 @@ polynomial model may be evaluated upon request.
 
 
 
-.. c:function:: int ARKStepGetDky(void* arkode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int ARKStepGetDky(void* arkode_mem, sunrealtype t, int k, N_Vector dky)
 
    Computes the *k*-th derivative of the function
    :math:`y` at the time *t*,
@@ -3331,7 +3331,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ARKStep memory block.
-      * *lenrw* -- the number of ``realtype`` values in the ARKStep workspace.
+      * *lenrw* -- the number of ``sunrealtype`` values in the ARKStep workspace.
       * *leniw* -- the number of integer values in the ARKStep workspace.
 
    **Return value:**
@@ -3355,7 +3355,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetActualInitStep(void* arkode_mem, realtype* hinused)
+.. c:function:: int ARKStepGetActualInitStep(void* arkode_mem, sunrealtype* hinused)
 
    Returns the value of the integration step size used on the first step.
 
@@ -3378,7 +3378,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetLastStep(void* arkode_mem, realtype* hlast)
+.. c:function:: int ARKStepGetLastStep(void* arkode_mem, sunrealtype* hlast)
 
    Returns the integration step size taken on the last successful
    internal step.
@@ -3393,7 +3393,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetCurrentStep(void* arkode_mem, realtype* hcur)
+.. c:function:: int ARKStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur)
 
    Returns the integration step size to be attempted on the next internal step.
 
@@ -3407,7 +3407,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetCurrentTime(void* arkode_mem, realtype* tcur)
+.. c:function:: int ARKStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur)
 
    Returns the current internal time reached by the solver.
 
@@ -3439,7 +3439,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
       on the particular use case and on when this routine is called.
 
 
-.. c:function:: int ARKStepGetCurrentGamma(void *arkode_mem, realtype *gamma)
+.. c:function:: int ARKStepGetCurrentGamma(void *arkode_mem, sunrealtype *gamma)
 
    Returns the current internal value of :math:`\gamma` used in the implicit
    solver Newton matrix (see equation :eq:`ARKODE_NewtonMatrix`).
@@ -3454,7 +3454,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetTolScaleFactor(void* arkode_mem, realtype* tolsfac)
+.. c:function:: int ARKStepGetTolScaleFactor(void* arkode_mem, sunrealtype* tolsfac)
 
    Returns a suggested factor by which the user's
    tolerances should be scaled when too much accuracy has been
@@ -3506,7 +3506,7 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
 
 
 
-.. c:function:: int ARKStepGetStepStats(void* arkode_mem, long int* nsteps, realtype* hinused, realtype* hlast, realtype* hcur, realtype* tcur)
+.. c:function:: int ARKStepGetStepStats(void* arkode_mem, long int* nsteps, sunrealtype* hinused, sunrealtype* hlast, sunrealtype* hcur, sunrealtype* tcur)
 
    Returns many of the most useful optional outputs in a single call.
 
@@ -3684,10 +3684,10 @@ Retrieve a pointer for user data                       :c:func:`ARKStepGetUserDa
         int q;           /* method order of accuracy       */
         int p;           /* embedding order of accuracy    */
         int stages;      /* number of stages               */
-        realtype **A;    /* Butcher table coefficients     */
-        realtype *c;     /* canopy node coefficients       */
-        realtype *b;     /* root node coefficients         */
-        realtype *d;     /* embedding coefficients         */
+        sunrealtype **A;    /* Butcher table coefficients     */
+        sunrealtype *c;     /* canopy node coefficients       */
+        sunrealtype *b;     /* root node coefficients         */
+        sunrealtype *d;     /* embedding coefficients         */
 
       } *ARKStepButcherTable;
 
@@ -4026,7 +4026,7 @@ Last return from a mass matrix solver function                     :c:func:`ARKS
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ARKStep memory block.
-      * *lenrwLS* -- the number of ``realtype`` values in the ARKLS workspace.
+      * *lenrwLS* -- the number of ``sunrealtype`` values in the ARKLS workspace.
       * *leniwLS* -- the number of integer values in the ARKLS workspace.
 
    **Return value:**
@@ -4273,7 +4273,7 @@ Last return from a mass matrix solver function                     :c:func:`ARKS
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ARKStep memory block.
-      * *lenrwMLS* -- the number of ``realtype`` values in the ARKLS mass solver workspace.
+      * *lenrwMLS* -- the number of ``sunrealtype`` values in the ARKLS mass solver workspace.
       * *leniwMLS* -- the number of integer values in the ARKLS mass solver workspace.
 
    **Return value:**
@@ -4619,7 +4619,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int ARKStepReInit(void* arkode_mem, ARKRhsFn fe, ARKRhsFn fi, realtype t0, N_Vector y0)
+.. c:function:: int ARKStepReInit(void* arkode_mem, ARKRhsFn fe, ARKRhsFn fi, sunrealtype t0, N_Vector y0)
 
    Provides required problem specifications and re-initializes the
    ARKStep time-stepper module.
@@ -4695,7 +4695,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int ARKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+.. c:function:: int ARKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 
    Resets the current ARKStep time-stepper module state to the provided
    independent variable value and dependent variable vector.
@@ -4761,7 +4761,7 @@ rescale the upcoming time step by the specified factor.  If a value
 
 
 
-.. c:function:: int ARKStepResize(void* arkode_mem, N_Vector yR, realtype hscale, realtype tR, ARKVecResizeFn resize, void* resize_data)
+.. c:function:: int ARKStepResize(void* arkode_mem, N_Vector yR, sunrealtype hscale, sunrealtype tR, ARKVecResizeFn resize, void* resize_data)
 
    Re-sizes ARKStep with a different state vector but with comparable
    dynamical time scale.
diff --git a/doc/arkode/guide/source/Usage/ARKStep_c_interface/XBraid.rst b/doc/arkode/guide/source/Usage/ARKStep_c_interface/XBraid.rst
index fab00f5214..501c4bd4bf 100644
--- a/doc/arkode/guide/source/Usage/ARKStep_c_interface/XBraid.rst
+++ b/doc/arkode/guide/source/Usage/ARKStep_c_interface/XBraid.rst
@@ -532,7 +532,7 @@ if an error occurred. The possible return codes are given in
 
 
 
-.. c:function:: int ARKBraid_BraidInit(MPI_Comm comm_w, MPI_Comm comm_t, realtype tstart, realtype tstop, sunindextype ntime, braid_App app, braid_Core *core)
+.. c:function:: int ARKBraid_BraidInit(MPI_Comm comm_w, MPI_Comm comm_t, sunrealtype tstart, sunrealtype tstop, sunindextype ntime, braid_App app, braid_Core *core)
 
    This function wraps the XBraid ``braid_Init()`` function to create the
    XBraid core memory structure and initializes XBraid with the ARKBraid and
@@ -771,7 +771,7 @@ error occurred. The possible return codes are given in
       * *SUNBRAID_MEMFAIL* if the *app* content is ``NULL``.
 
 
-.. c:function:: int ARKBraid_GetSolution(braid_App app, realtype *tout, N_Vector yout)
+.. c:function:: int ARKBraid_GetSolution(braid_App app, sunrealtype *tout, N_Vector yout)
 
    This function returns final time and state stored with the default access
    function :c:func:`ARKBraid_Access()`.
@@ -845,7 +845,7 @@ in :numref:`ARKODE.Usage.ARKStep.SUNBraidReturnCodes.Table`.
 
 
 
-.. c:function:: int ARKBraid_Init(braid_App app, realtype t, braid_Vector *u_ptr)
+.. c:function:: int ARKBraid_Init(braid_App app, sunrealtype t, braid_Vector *u_ptr)
 
    This is the default vector initialization function provided to XBraid. The
    initialization function is called by XBraid to create a new vector and set
@@ -998,7 +998,7 @@ ARKODE and XBraid that requries defining a custom SUNBraidApp implementation.
 
 
 
-.. c:function:: int ARKBraid_TakeStep(void *arkode_mem, realtype tstart, realtype tstop, N_Vector y, int *ark_flag)
+.. c:function:: int ARKBraid_TakeStep(void *arkode_mem, sunrealtype tstart, sunrealtype tstop, N_Vector y, int *ark_flag)
 
    This function advances the vector *y* from *tstart* to *tstop* using a
    single ARKStep time step with step size *h = tstop - start*.
diff --git a/doc/arkode/guide/source/Usage/ERKStep_c_interface/Skeleton.rst b/doc/arkode/guide/source/Usage/ERKStep_c_interface/Skeleton.rst
index 5c5a1e869f..76685ec367 100644
--- a/doc/arkode/guide/source/Usage/ERKStep_c_interface/Skeleton.rst
+++ b/doc/arkode/guide/source/Usage/ERKStep_c_interface/Skeleton.rst
@@ -58,7 +58,7 @@ referenced.
 
       y0 = N_VMake_***(..., ydata);
 
-   if the ``realtype`` array ``ydata`` containing the initial values of
+   if the ``sunrealtype`` array ``ydata`` containing the initial values of
    :math:`y` already exists.  Otherwise, create a new vector by making
    a call of the form
 
diff --git a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
index 94493fc0cb..c48b8c5190 100644
--- a/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/ERKStep_c_interface/User_callable.rst
@@ -41,7 +41,7 @@ ERKStep initialization and deallocation functions
 ------------------------------------------------------
 
 
-.. c:function:: void* ERKStepCreate(ARKRhsFn f, realtype t0, N_Vector y0, SUNContext sunctx)
+.. c:function:: void* ERKStepCreate(ARKRhsFn f, sunrealtype t0, N_Vector y0, SUNContext sunctx)
 
    This function allocates and initializes memory for a problem to
    be solved using the ERKStep time-stepping module in ARKODE.
@@ -112,7 +112,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int ERKStepSStolerances(void* arkode_mem, realtype reltol, realtype abstol)
+.. c:function:: int ERKStepSStolerances(void* arkode_mem, sunrealtype reltol, sunrealtype abstol)
 
    This function specifies scalar relative and absolute tolerances.
 
@@ -129,7 +129,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int ERKStepSVtolerances(void* arkode_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int ERKStepSVtolerances(void* arkode_mem, sunrealtype reltol, N_Vector abstol)
 
    This function specifies a scalar relative tolerance and a vector
    absolute tolerance (a potentially different absolute tolerance for
@@ -329,7 +329,7 @@ has requested rootfinding.
 
 
 
-.. c:function:: int ERKStepEvolve(void* arkode_mem, realtype tout, N_Vector yout, realtype *tret, int itask)
+.. c:function:: int ERKStepEvolve(void* arkode_mem, sunrealtype tout, N_Vector yout, sunrealtype *tret, int itask)
 
    Integrates the ODE over an interval in :math:`t`.
 
@@ -696,7 +696,7 @@ Optional inputs for ERKStep
 
 
 
-.. c:function:: int ERKStepSetFixedStep(void* arkode_mem, realtype hfixed)
+.. c:function:: int ERKStepSetFixedStep(void* arkode_mem, sunrealtype hfixed)
 
    Disabled time step adaptivity within ERKStep, and specifies the
    fixed time step size to use for the following internal step(s).
@@ -753,7 +753,7 @@ Optional inputs for ERKStep
 
 
 
-.. c:function:: int ERKStepSetInitStep(void* arkode_mem, realtype hin)
+.. c:function:: int ERKStepSetInitStep(void* arkode_mem, sunrealtype hin)
 
    Specifies the initial time step size ERKStep should use after
    initialization, re-initialization, or resetting.
@@ -826,7 +826,7 @@ Optional inputs for ERKStep
 
 
 
-.. c:function:: int ERKStepSetMaxStep(void* arkode_mem, realtype hmax)
+.. c:function:: int ERKStepSetMaxStep(void* arkode_mem, sunrealtype hmax)
 
    Specifies the upper bound on the magnitude of the time step size.
 
@@ -844,7 +844,7 @@ Optional inputs for ERKStep
 
 
 
-.. c:function:: int ERKStepSetMinStep(void* arkode_mem, realtype hmin)
+.. c:function:: int ERKStepSetMinStep(void* arkode_mem, sunrealtype hmin)
 
    Specifies the lower bound on the magnitude of the time step size.
 
@@ -862,7 +862,7 @@ Optional inputs for ERKStep
 
 
 
-.. c:function:: int ERKStepSetStopTime(void* arkode_mem, realtype tstop)
+.. c:function:: int ERKStepSetStopTime(void* arkode_mem, sunrealtype tstop)
 
    Specifies the value of the independent variable
    :math:`t` past which the solution is not to proceed.
@@ -888,7 +888,7 @@ Optional inputs for ERKStep
       :c:func:`ERKStepClearStopTime`.
 
 
-.. c:function:: int ERKStepSetInterpolateStopTime(void* arkode_mem, booleantype interp)
+.. c:function:: int ERKStepSetInterpolateStopTime(void* arkode_mem, sunbooleantype interp)
 
    Specifies that the output solution should be interpolated when the current
    :math:`t` equals the specified ``tstop`` (instead of merely copying the
@@ -1240,7 +1240,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
       Use the SUNAdaptController infrastructure instead (see :numref:`SUNAdaptController.Description`).
 
 
-.. c:function:: int ERKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, realtype* adapt_params)
+.. c:function:: int ERKStepSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, sunrealtype* adapt_params)
 
    Specifies the method (and associated parameters) used for time step adaptivity.
 
@@ -1304,7 +1304,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
    .. versionadded:: x.x.x
 
-.. c:function:: int ERKStepSetCFLFraction(void* arkode_mem, realtype cfl_frac)
+.. c:function:: int ERKStepSetCFLFraction(void* arkode_mem, sunrealtype cfl_frac)
 
    Specifies the fraction of the estimated explicitly stable step to use.
 
@@ -1323,7 +1323,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetErrorBias(void* arkode_mem, realtype bias)
+.. c:function:: int ERKStepSetErrorBias(void* arkode_mem, sunrealtype bias)
 
    Specifies the bias to be applied to the error estimates within
    accuracy-based adaptivity strategies.
@@ -1351,7 +1351,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetFixedStepBounds(void* arkode_mem, realtype lb, realtype ub)
+.. c:function:: int ERKStepSetFixedStepBounds(void* arkode_mem, sunrealtype lb, sunrealtype ub)
 
    Specifies the step growth interval in which the step size will remain unchanged.
 
@@ -1370,7 +1370,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetMaxEFailGrowth(void* arkode_mem, realtype etamxf)
+.. c:function:: int ERKStepSetMaxEFailGrowth(void* arkode_mem, sunrealtype etamxf)
 
    Specifies the maximum step size growth factor upon multiple successive
    accuracy-based error failures in the solver.
@@ -1389,7 +1389,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetMaxFirstGrowth(void* arkode_mem, realtype etamx1)
+.. c:function:: int ERKStepSetMaxFirstGrowth(void* arkode_mem, sunrealtype etamx1)
 
    Specifies the maximum allowed growth factor in step size following the very
    first integration step.
@@ -1409,7 +1409,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetMaxGrowth(void* arkode_mem, realtype mx_growth)
+.. c:function:: int ERKStepSetMaxGrowth(void* arkode_mem, sunrealtype mx_growth)
 
    Specifies the maximum allowed growth factor in step size between
    consecutive steps in the integration process.
@@ -1429,7 +1429,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetMinReduction(void* arkode_mem, realtype eta_min)
+.. c:function:: int ERKStepSetMinReduction(void* arkode_mem, sunrealtype eta_min)
 
    Specifies the minimum allowed reduction factor in step size between
    step attempts, resulting from a temporal error failure in the integration
@@ -1451,7 +1451,7 @@ the code, is provided in :numref:`ARKODE.Mathematics.Adaptivity`.
 
 
 
-.. c:function:: int ERKStepSetSafetyFactor(void* arkode_mem, realtype safety)
+.. c:function:: int ERKStepSetSafetyFactor(void* arkode_mem, sunrealtype safety)
 
    Specifies the safety factor to be applied to the accuracy-based
    estimated step.
@@ -1610,7 +1610,7 @@ derivatives of the polynomial model may be evaluated upon request.
 
 
 
-.. c:function:: int ERKStepGetDky(void* arkode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int ERKStepGetDky(void* arkode_mem, sunrealtype t, int k, N_Vector dky)
 
    Computes the *k*-th derivative of the function
    :math:`y` at the time *t*,
@@ -1752,7 +1752,7 @@ Main solver optional output functions
 
    **Arguments:**
       * *arkode_mem* -- pointer to the ERKStep memory block.
-      * *lenrw* -- the number of ``realtype`` values in the ERKStep workspace.
+      * *lenrw* -- the number of ``sunrealtype`` values in the ERKStep workspace.
       * *leniw* -- the number of integer values in the ERKStep workspace.
 
    **Return value:**
@@ -1776,7 +1776,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetActualInitStep(void* arkode_mem, realtype* hinused)
+.. c:function:: int ERKStepGetActualInitStep(void* arkode_mem, sunrealtype* hinused)
 
    Returns the value of the integration step size used on the first step.
 
@@ -1798,7 +1798,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetLastStep(void* arkode_mem, realtype* hlast)
+.. c:function:: int ERKStepGetLastStep(void* arkode_mem, sunrealtype* hlast)
 
    Returns the integration step size taken on the last successful
    internal step.
@@ -1813,7 +1813,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetCurrentStep(void* arkode_mem, realtype* hcur)
+.. c:function:: int ERKStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur)
 
    Returns the integration step size to be attempted on the next internal step.
 
@@ -1827,7 +1827,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetCurrentTime(void* arkode_mem, realtype* tcur)
+.. c:function:: int ERKStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur)
 
    Returns the current internal time reached by the solver.
 
@@ -1841,7 +1841,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetTolScaleFactor(void* arkode_mem, realtype* tolsfac)
+.. c:function:: int ERKStepGetTolScaleFactor(void* arkode_mem, sunrealtype* tolsfac)
 
    Returns a suggested factor by which the user's
    tolerances should be scaled when too much accuracy has been
@@ -1875,7 +1875,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int ERKStepGetStepStats(void* arkode_mem, long int* nsteps, realtype* hinused, realtype* hlast, realtype* hcur, realtype* tcur)
+.. c:function:: int ERKStepGetStepStats(void* arkode_mem, long int* nsteps, sunrealtype* hinused, sunrealtype* hlast, sunrealtype* hcur, sunrealtype* tcur)
 
    Returns many of the most useful optional outputs in a single call.
 
@@ -2031,10 +2031,10 @@ Main solver optional output functions
            int q;           /* method order of accuracy       */
            int p;           /* embedding order of accuracy    */
            int stages;      /* number of stages               */
-           realtype **A;    /* Butcher table coefficients     */
-           realtype *c;     /* canopy node coefficients       */
-           realtype *b;     /* root node coefficients         */
-           realtype *d;     /* embedding coefficients         */
+           sunrealtype **A;    /* Butcher table coefficients     */
+           sunrealtype *c;     /* canopy node coefficients       */
+           sunrealtype *b;     /* root node coefficients         */
+           sunrealtype *d;     /* embedding coefficients         */
 
          } *ARKodeButcherTable;
 
@@ -2301,7 +2301,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int ERKStepReInit(void* arkode_mem, ARKRhsFn f, realtype t0, N_Vector y0)
+.. c:function:: int ERKStepReInit(void* arkode_mem, ARKRhsFn f, sunrealtype t0, N_Vector y0)
 
    Provides required problem specifications and re-initializes the
    ERKStep time-stepper module.
@@ -2369,7 +2369,7 @@ restarted problem uses the new values (which have jumped).  Similar
 comments apply if there is to be a jump in the dependent variable
 vector.
 
-.. c:function:: int ERKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+.. c:function:: int ERKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 
    Resets the current ERKStep time-stepper module state to the provided
    independent variable value and dependent variable vector.
@@ -2435,7 +2435,7 @@ rescale the upcoming time step by the specified factor.  If a value
 
 
 
-.. c:function:: int ERKStepResize(void* arkode_mem, N_Vector yR, realtype hscale, realtype tR, ARKVecResizeFn resize, void* resize_data)
+.. c:function:: int ERKStepResize(void* arkode_mem, N_Vector yR, sunrealtype hscale, sunrealtype tR, ARKVecResizeFn resize, void* resize_data)
 
    Re-sizes ERKStep with a different state vector but with comparable
    dynamical time scale.
diff --git a/doc/arkode/guide/source/Usage/General.rst b/doc/arkode/guide/source/Usage/General.rst
index ea741b89ee..5d6a421db8 100644
--- a/doc/arkode/guide/source/Usage/General.rst
+++ b/doc/arkode/guide/source/Usage/General.rst
@@ -66,7 +66,7 @@ function prototypes, and include the shared ``arkode/arkode.h`` and
 ``arkode/arkode_ls.h`` header files.
 
 Note that ``arkode.h`` includes ``sundials_types.h`` directly, which
-defines the types ``realtype``,  ``sunindextype``, and ``booleantype``
+defines the types ``sunrealtype``,  ``sunindextype``, and ``sunbooleantype``
 and the constants ``SUNFALSE`` and ``SUNTRUE``, so a user program does
 not need to include ``sundials_types.h`` directly.
 
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
index 33fa9edbc7..d99b603f2a 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Custom_Inner_Stepper/Description.rst
@@ -253,7 +253,7 @@ this section can be used to either apply the inner (fast) forcing or access the
 data necessary to construct the inner (fast) forcing polynomial.
 
 
-.. c:function:: int MRIStepInnerStepper_AddForcing(MRIStepInnerStepper stepper, realtype t, N_Vector ff)
+.. c:function:: int MRIStepInnerStepper_AddForcing(MRIStepInnerStepper stepper, sunrealtype t, N_Vector ff)
 
    This function computes the forcing term :eq:`ARKODE_MRI_forcing_poly` at the input
    time *t* and adds it to input vector *ff*, i.e., the inner (fast) right-hand
@@ -279,7 +279,7 @@ data necessary to construct the inner (fast) forcing polynomial.
       * ``examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp``
 
 
-.. c:function:: int MRIStepInnerStepper_GetForcingData(MRIStepInnerStepper stepper, realtype *tshift, realtype *tscale, N_Vector **forcing, int *nforcing)
+.. c:function:: int MRIStepInnerStepper_GetForcingData(MRIStepInnerStepper stepper, sunrealtype *tshift, sunrealtype *tscale, N_Vector **forcing, int *nforcing)
 
    This function provides access to data necessary to compute the forcing term
    :eq:`ARKODE_MRI_forcing_poly`. This includes the shift and scaling factors for the
@@ -345,7 +345,7 @@ An :c:type:`MRIStepInnerStepper` *must* provide implementations of the following
 member functions:
 
 
-.. c:type:: int (*MRIStepInnerEvolveFn)(MRIStepInnerStepper stepper, realtype t0, realtype tout, N_Vector v)
+.. c:type:: int (*MRIStepInnerEvolveFn)(MRIStepInnerStepper stepper, sunrealtype t0, sunrealtype tout, N_Vector v)
 
    This function advances the state vector *v* for the inner (fast) ODE system
    from time *t0* to time *tout*.
@@ -371,7 +371,7 @@ Optional Member Functions
 An :c:type:`MRIStepInnerStepper` *may* provide implementations of any of the
 following member functions:
 
-.. c:type:: int (*MRIStepInnerFullRhsFn)(MRIStepInnerStepper stepper, realtype t, N_Vector v, N_Vector f, int mode)
+.. c:type:: int (*MRIStepInnerFullRhsFn)(MRIStepInnerStepper stepper, sunrealtype t, N_Vector v, N_Vector f, int mode)
 
    This function computes the full right-hand side function of the inner (fast)
    ODE, :math:`f^F(t,v)` in :eq:`ARKODE_MRI_IVP` for a given value of the independent
@@ -402,7 +402,7 @@ following member functions:
 
       Supplying a full right-hand side function was made optional.
 
-.. c:type:: int (*MRIStepInnerResetFn)(MRIStepInnerStepper stepper, realtype tR, N_Vector vR)
+.. c:type:: int (*MRIStepInnerResetFn)(MRIStepInnerStepper stepper, sunrealtype tR, N_Vector vR)
 
    This function resets the inner (fast) stepper state to the provided
    independent variable value and dependent variable vector.
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/MRIStepCoupling.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/MRIStepCoupling.rst
index 3143b304e3..10c5df3f48 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/MRIStepCoupling.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/MRIStepCoupling.rst
@@ -43,9 +43,9 @@ where ``MRIStepCouplingMem`` is the structure
      int stages;
      int q;
      int p;
-     realtype ***G;
-     realtype ***W;
-     realtype *c;
+     sunrealtype ***G;
+     sunrealtype ***W;
+     sunrealtype *c;
    };
 
 and the members of the strucutre are:
@@ -165,7 +165,7 @@ are defined ``arkode/arkode_mristep.h``.
       allocated.
 
 
-.. c:function:: MRIStepCoupling MRIStepCoupling_Create(int nmat, int stages, int q, int p, realtype *W, realtype *G, realtype *c)
+.. c:function:: MRIStepCoupling MRIStepCoupling_Create(int nmat, int stages, int q, int p, sunrealtype *W, sunrealtype *G, sunrealtype *c)
 
    Allocates a coupling table and fills it with the given values.
 
@@ -244,7 +244,7 @@ are defined ``arkode/arkode_mristep.h``.
 
    **Arguments:**
       * ``C`` -- the coupling table.
-      * ``lenrw`` -- the number of ``realtype`` values in the coupling table
+      * ``lenrw`` -- the number of ``sunrealtype`` values in the coupling table
         workspace.
       * ``leniw`` -- the number of integer values in the coupling table workspace.
 
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Skeleton.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Skeleton.rst
index 57d05b4650..e823b52548 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/Skeleton.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/Skeleton.rst
@@ -61,7 +61,7 @@ specific name of the function to be called or macro to be referenced.
 
       y0 = N_VMake_***(..., ydata);
 
-   if the ``realtype`` array ``ydata`` containing the initial values of
+   if the ``sunrealtype`` array ``ydata`` containing the initial values of
    :math:`y` already exists.  Otherwise, create a new vector by making
    a call of the form
 
diff --git a/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
index e39f20bbbf..c4d478c9cd 100644
--- a/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/MRIStep_c_interface/User_callable.rst
@@ -42,7 +42,7 @@ MRIStep initialization and deallocation functions
 ------------------------------------------------------
 
 
-.. c:function:: void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, realtype t0, N_Vector y0, MRIStepInnerStepper stepper, SUNContext sunctx)
+.. c:function:: void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0, N_Vector y0, MRIStepInnerStepper stepper, SUNContext sunctx)
 
    This function allocates and initializes memory for a problem to
    be solved using the MRIStep time-stepping module in ARKODE.
@@ -152,7 +152,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int MRIStepSStolerances(void* arkode_mem, realtype reltol, realtype abstol)
+.. c:function:: int MRIStepSStolerances(void* arkode_mem, sunrealtype reltol, sunrealtype abstol)
 
    This function specifies scalar relative and absolute tolerances.
 
@@ -169,7 +169,7 @@ Alternatively, the user may supply a custom function to supply the
 
 
 
-.. c:function:: int MRIStepSVtolerances(void* arkode_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int MRIStepSVtolerances(void* arkode_mem, sunrealtype reltol, N_Vector abstol)
 
    This function specifies a scalar relative tolerance and a vector
    absolute tolerance (a potentially different absolute tolerance for
@@ -523,7 +523,7 @@ the user has set a stop time (with a call to the optional input function
 :c:func:`MRIStepSetStopTime()`) or has requested rootfinding.
 
 
-.. c:function:: int MRIStepEvolve(void* arkode_mem, realtype tout, N_Vector yout, realtype *tret, int itask)
+.. c:function:: int MRIStepEvolve(void* arkode_mem, sunrealtype tout, N_Vector yout, sunrealtype *tret, int itask)
 
    Integrates the ODE over an interval in :math:`t`.
 
@@ -917,7 +917,7 @@ Optional inputs for MRIStep
 
 
 
-.. c:function:: int MRIStepSetFixedStep(void* arkode_mem, realtype hs)
+.. c:function:: int MRIStepSetFixedStep(void* arkode_mem, sunrealtype hs)
 
    Set the slow step size used within MRIStep for the following internal step(s).
 
@@ -943,7 +943,7 @@ Optional inputs for MRIStep
 
 
 ..
-   .. c:function:: int MRIStepSetInitStep(void* arkode_mem, realtype hin)
+   .. c:function:: int MRIStepSetInitStep(void* arkode_mem, sunrealtype hin)
 
       Specifies the initial time step size MRIStep should use after
       initialization or re-initialization.
@@ -1028,7 +1028,7 @@ Optional inputs for MRIStep
 
 
 ..
-   .. c:function:: int MRIStepSetMaxStep(void* arkode_mem, realtype hmax)
+   .. c:function:: int MRIStepSetMaxStep(void* arkode_mem, sunrealtype hmax)
 
       Specifies the upper bound on the magnitude of the time step size.
 
@@ -1051,7 +1051,7 @@ Optional inputs for MRIStep
 
 
 ..
-   .. c:function:: int MRIStepSetMinStep(void* arkode_mem, realtype hmin)
+   .. c:function:: int MRIStepSetMinStep(void* arkode_mem, sunrealtype hmin)
 
       Specifies the lower bound on the magnitude of the time step size.
 
@@ -1072,7 +1072,7 @@ Optional inputs for MRIStep
       **Notes:** Pass *hmin* :math:`\le 0.0` to set the default value of 0.
 
 
-.. c:function:: int MRIStepSetStopTime(void* arkode_mem, realtype tstop)
+.. c:function:: int MRIStepSetStopTime(void* arkode_mem, sunrealtype tstop)
 
    Specifies the value of the independent variable
    :math:`t` past which the solution is not to proceed.
@@ -1104,7 +1104,7 @@ Optional inputs for MRIStep
       :c:func:`MRIStepClearStopTime`.
 
 
-.. c:function:: int MRIStepSetInterpolateStopTime(void* arkode_mem, booleantype interp)
+.. c:function:: int MRIStepSetInterpolateStopTime(void* arkode_mem, sunbooleantype interp)
 
    Specifies that the output solution should be interpolated when the current
    :math:`t` equals the specified ``tstop`` (instead of merely copying the
@@ -1429,7 +1429,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`MRIStepSetDe
 
 
 
-.. c:function:: int MRIStepSetNonlinConvCoef(void* arkode_mem, realtype nlscoef)
+.. c:function:: int MRIStepSetNonlinConvCoef(void* arkode_mem, sunrealtype nlscoef)
 
    Specifies the safety factor used within the nonlinear solver convergence test.
 
@@ -1447,7 +1447,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`MRIStepSetDe
 
 
 
-.. c:function:: int MRIStepSetNonlinCRDown(void* arkode_mem, realtype crdown)
+.. c:function:: int MRIStepSetNonlinCRDown(void* arkode_mem, sunrealtype crdown)
 
    Specifies the constant used in estimating the nonlinear solver convergence rate.
 
@@ -1464,7 +1464,7 @@ Specify if :math:`f^I` is deduced after a nonlinear solve  :c:func:`MRIStepSetDe
 
 
 
-.. c:function:: int MRIStepSetNonlinRDiv(void* arkode_mem, realtype rdiv)
+.. c:function:: int MRIStepSetNonlinRDiv(void* arkode_mem, sunrealtype rdiv)
 
    Specifies the nonlinear correction threshold beyond which the
    iteration will be declared divergent.
@@ -1623,7 +1623,7 @@ Jacobian / preconditioner update frequency     :c:func:`MRIStepSetJacEvalFrequen
 =============================================  =========================================  ============
 
 
-.. c:function:: int MRIStepSetDeltaGammaMax(void* arkode_mem, realtype dgmax)
+.. c:function:: int MRIStepSetDeltaGammaMax(void* arkode_mem, sunrealtype dgmax)
 
    Specifies a scaled step size ratio tolerance, beyond which the
    linear solver setup routine will be signaled.
@@ -1802,7 +1802,7 @@ program. The user data pointer may be specified through
    :numref:`ARKODE.Usage.UserSupplied`.
 
 
-.. c:function:: int MRIStepSetLinearSolutionScaling(void* arkode_mem, booleantype onoff)
+.. c:function:: int MRIStepSetLinearSolutionScaling(void* arkode_mem, sunbooleantype onoff)
 
    Enables or disables scaling the linear system solution to account for a
    change in :math:`\gamma` in the linear system. For more details see
@@ -2006,7 +2006,7 @@ the user through the :c:func:`MRIStepSetEpsLin()` function.
    :numref:`ARKODE.Usage.UserSupplied`.
 
 
-.. c:function:: int MRIStepSetEpsLin(void* arkode_mem, realtype eplifac)
+.. c:function:: int MRIStepSetEpsLin(void* arkode_mem, sunrealtype eplifac)
 
    Specifies the factor by which the tolerance on the nonlinear
    iteration is multiplied to get a tolerance on the linear
@@ -2030,7 +2030,7 @@ the user through the :c:func:`MRIStepSetEpsLin()` function.
    :c:func:`MRIStepSetLinearSolver()`.
 
 
-.. c:function:: int MRIStepSetLSNormFactor(void* arkode_mem, realtype nrmfac)
+.. c:function:: int MRIStepSetLSNormFactor(void* arkode_mem, sunrealtype nrmfac)
 
    Specifies the factor to use when converting from the integrator tolerance
    (WRMS norm) to the linear solver tolerance (L2 norm) for Newton linear system
@@ -2144,7 +2144,7 @@ polynomial model may be evaluated upon request.
 
 
 
-.. c:function:: int MRIStepGetDky(void* arkode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int MRIStepGetDky(void* arkode_mem, sunrealtype t, int k, N_Vector dky)
 
    Computes the *k*-th derivative of the function
    :math:`y` at the time *t*,
@@ -2312,7 +2312,7 @@ Main solver optional output functions
 
    * *arkode_mem* -- pointer to the MRIStep memory block.
 
-   * *lenrw* -- the number of ``realtype`` values in the MRIStep workspace.
+   * *lenrw* -- the number of ``sunrealtype`` values in the MRIStep workspace.
 
    * *leniw* -- the number of integer values in the MRIStep workspace.
 
@@ -2344,7 +2344,7 @@ Main solver optional output functions
 
 
 ..
-   .. c:function:: int MRIStepGetActualInitStep(void* arkode_mem, realtype* hinused)
+   .. c:function:: int MRIStepGetActualInitStep(void* arkode_mem, sunrealtype* hinused)
 
       Returns the value of the integration step size used on the first step.
 
@@ -2361,7 +2361,7 @@ Main solver optional output functions
       * *ARK_MEM_NULL* if the MRIStep memory was ``NULL``
 
 
-.. c:function:: int MRIStepGetLastStep(void* arkode_mem, realtype* hlast)
+.. c:function:: int MRIStepGetLastStep(void* arkode_mem, sunrealtype* hlast)
 
    Returns the integration step size taken on the last successful
    internal step.
@@ -2380,7 +2380,7 @@ Main solver optional output functions
 
 
 ..
-   .. c:function:: int MRIStepGetCurrentStep(void* arkode_mem, realtype* hcur)
+   .. c:function:: int MRIStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur)
 
       Returns the integration step size to be attempted on the next internal step.
 
@@ -2397,7 +2397,7 @@ Main solver optional output functions
       * *ARK_MEM_NULL* if the MRIStep memory was ``NULL``
 
 
-.. c:function:: int MRIStepGetCurrentTime(void* arkode_mem, realtype* tcur)
+.. c:function:: int MRIStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur)
 
    Returns the current internal time reached by the solver.
 
@@ -2435,7 +2435,7 @@ Main solver optional output functions
    on the particular use case and on when this routine is called.
 
 
-.. c:function:: int MRIStepGetCurrentGamma(void *arkode_mem, realtype *gamma)
+.. c:function:: int MRIStepGetCurrentGamma(void *arkode_mem, sunrealtype *gamma)
 
    Returns the current internal value of :math:`\gamma` used in the implicit
    solver Newton matrix (see equation :eq:`ARKODE_NewtonMatrix`).
@@ -2454,7 +2454,7 @@ Main solver optional output functions
 
 
 
-.. c:function:: int MRIStepGetTolScaleFactor(void* arkode_mem, realtype* tolsfac)
+.. c:function:: int MRIStepGetTolScaleFactor(void* arkode_mem, sunrealtype* tolsfac)
 
    Returns a suggested factor by which the user's
    tolerances should be scaled when too much accuracy has been
@@ -2494,7 +2494,7 @@ Main solver optional output functions
 
 
 ..
-   .. c:function:: int MRIStepGetStepStats(void* arkode_mem, long int* nssteps, long int* nfsteps, realtype* hlast, realtype* tcur)
+   .. c:function:: int MRIStepGetStepStats(void* arkode_mem, long int* nssteps, long int* nfsteps, sunrealtype* hlast, sunrealtype* tcur)
 
       Returns many of the most useful optional outputs in a single call.
 
@@ -2699,8 +2699,8 @@ Main solver optional output functions
          int stages;      /* size of coupling matrices (stages * stages) */
          int q;           /* method order of accuracy                    */
          int p;           /* embedding order of accuracy                 */
-         realtype ***G;   /* coupling matrices [nmat][stages][stages]    */
-         realtype *c;     /* abscissae                                   */
+         sunrealtype ***G;   /* coupling matrices [nmat][stages][stages]    */
+         sunrealtype *c;     /* abscissae                                   */
 
        };
        typedef MRIStepCouplingMem *MRIStepCoupling;
@@ -3077,7 +3077,7 @@ Linear Solver) has been added here (e.g. *lenrwLS*).
 
    * *arkode_mem* -- pointer to the MRIStep memory block.
 
-   * *lenrwLS* -- the number of ``realtype`` values in the ARKLS workspace.
+   * *lenrwLS* -- the number of ``sunrealtype`` values in the ARKLS workspace.
 
    * *leniwLS* -- the number of integer values in the ARKLS workspace.
 
@@ -3481,7 +3481,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, realtype t0, N_Vector y0)
+.. c:function:: int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0, N_Vector y0)
 
    Provides required problem specifications and re-initializes the
    MRIStep outer (slow) stepper.
@@ -3568,7 +3568,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int MRIStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+.. c:function:: int MRIStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 
    Resets the current MRIStep outer (slow) time-stepper module state to the
    provided independent variable value and dependent variable vector.
@@ -3630,7 +3630,7 @@ internal to MRIStep will be destroyed and re-cloned from the new input
 vector.
 
 
-.. c:function:: int MRIStepResize(void* arkode_mem, N_Vector yR, realtype tR, ARKVecResizeFn resize, void* resize_data)
+.. c:function:: int MRIStepResize(void* arkode_mem, N_Vector yR, sunrealtype tR, ARKVecResizeFn resize, void* resize_data)
 
    Re-initializes MRIStep with a different state vector.
 
diff --git a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/Skeleton.rst b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/Skeleton.rst
index fdc5f03545..6b0100d14e 100644
--- a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/Skeleton.rst
+++ b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/Skeleton.rst
@@ -55,7 +55,7 @@ referenced.
 
       y0 = N_VMake_***(..., ydata);
 
-   if the ``realtype`` array ``ydata`` containing the initial values of
+   if the ``sunrealtype`` array ``ydata`` containing the initial values of
    :math:`y` already exists. For some GPU-enabled vectors, a similar constructor
    can be used to provide host  and device data pointers. If the data array
    does not already exist, create a new vector by making a call of the form
diff --git a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
index 28fb2f2ca8..7e1065977a 100644
--- a/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
+++ b/doc/arkode/guide/source/Usage/SPRKStep_c_interface/User_callable.rst
@@ -39,7 +39,7 @@ SPRKStep initialization and deallocation functions
 ------------------------------------------------------
 
 
-.. c:function:: void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0,\
+.. c:function:: void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, sunrealtype t0,\
                                      N_Vector y0, SUNContext sunctx)
 
    This function allocates and initializes memory for a problem to
@@ -131,7 +131,7 @@ has requested rootfinding.
 
 
 
-.. c:function:: int SPRKStepEvolve(void* arkode_mem, realtype tout, N_Vector yout, realtype *tret, int itask)
+.. c:function:: int SPRKStepEvolve(void* arkode_mem, sunrealtype tout, N_Vector yout, sunrealtype *tret, int itask)
 
    Integrates the ODE over an interval in :math:`t`.
 
@@ -424,7 +424,7 @@ Optional inputs for SPRKStep
       ``NULL`` will always be directed to ``stderr``.
 
 
-.. c:function:: int SPRKStepSetFixedStep(void* arkode_mem, realtype hfixed)
+.. c:function:: int SPRKStepSetFixedStep(void* arkode_mem, sunrealtype hfixed)
 
    Sets the time step size used within SPRKStep.
 
@@ -455,7 +455,7 @@ Optional inputs for SPRKStep
    :retval ARK_ILL_INPUT: if an argument has an illegal value
 
 
-.. c:function:: int SPRKStepSetStopTime(void* arkode_mem, realtype tstop)
+.. c:function:: int SPRKStepSetStopTime(void* arkode_mem, sunrealtype tstop)
 
    Specifies the value of the independent variable
    :math:`t` past which the solution is not to proceed.
@@ -677,7 +677,7 @@ by :c:func:`SPRKStepEvolve()`.
 
 
 
-.. c:function:: int SPRKStepGetDky(void* arkode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int SPRKStepGetDky(void* arkode_mem, sunrealtype t, int k, N_Vector dky)
 
    Computes the *k*-th derivative of the function :math:`y` at the time *t*,
    i.e., :math:`y^{(k)}(t)`, for values of the independent variable satisfying
@@ -808,7 +808,7 @@ Main solver optional output functions
    :retval ARK_MEM_NULL: if the SPRKStep memory was ``NULL``
 
 
-.. c:function:: int SPRKStepGetLastStep(void* arkode_mem, realtype* hlast)
+.. c:function:: int SPRKStepGetLastStep(void* arkode_mem, sunrealtype* hlast)
 
    Returns the integration step size taken on the last successful
    internal step.
@@ -820,7 +820,7 @@ Main solver optional output functions
    :retval ARK_MEM_NULL: if the SPRKStep memory was ``NULL``
 
 
-.. c:function:: int SPRKStepGetCurrentStep(void* arkode_mem, realtype* hcur)
+.. c:function:: int SPRKStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur)
 
    Returns the integration step size to be attempted on the next internal step.
 
@@ -831,7 +831,7 @@ Main solver optional output functions
    :retval ARK_MEM_NULL: if the SPRKStep memory was ``NULL``
 
 
-.. c:function:: int SPRKStepGetCurrentTime(void* arkode_mem, realtype* tcur)
+.. c:function:: int SPRKStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur)
 
    Returns the current internal time reached by the solver.
 
@@ -859,7 +859,7 @@ Main solver optional output functions
       on the particular use case and on when this routine is called.
 
 
-.. c:function:: int SPRKStepGetStepStats(void* arkode_mem, long int* nsteps, realtype* hinused, realtype* hlast, realtype* hcur, realtype* tcur)
+.. c:function:: int SPRKStepGetStepStats(void* arkode_mem, long int* nsteps, sunrealtype* hinused, sunrealtype* hlast, sunrealtype* hcur, sunrealtype* tcur)
 
    Returns many of the most useful optional outputs in a single call.
 
@@ -1084,7 +1084,7 @@ this routine. We note that for the solution to retain temporal accuracy,
 the RHS function should not incorporate the discontinuity.
 
 
-.. c:function:: int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2, realtype t0, N_Vector y0)
+.. c:function:: int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2, sunrealtype t0, N_Vector y0)
 
    Provides required problem specifications and re-initializes the SPRKStep
    time-stepper module.
@@ -1128,7 +1128,7 @@ solving the problem. By default the next call to :c:func:`SPRKStepEvolve()` will
 use the step size computed by SPRKStep prior to calling :c:func:`SPRKStepReset()`.
 
 
-.. c:function:: int SPRKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+.. c:function:: int SPRKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 
    Resets the current SPRKStep time-stepper module state to the provided
    independent variable value and dependent variable vector.
diff --git a/doc/arkode/guide/source/Usage/User_supplied.rst b/doc/arkode/guide/source/Usage/User_supplied.rst
index becfdd3775..3dacbd8a88 100644
--- a/doc/arkode/guide/source/Usage/User_supplied.rst
+++ b/doc/arkode/guide/source/Usage/User_supplied.rst
@@ -79,7 +79,7 @@ the ODE system function to ERKStep, or the "slow" right-hand side of the
 ODE system to MRIStep:
 
 
-.. c:type:: int (*ARKRhsFn)(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+.. c:type:: int (*ARKRhsFn)(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 
    These functions compute the ODE right-hand side for a given
    value of the independent variable :math:`t` and state vector :math:`y`.
@@ -257,7 +257,7 @@ such that the error estimate for the next time step remains below 1.
 
 
 
-.. c:type:: int (*ARKAdaptFn)(N_Vector y, realtype t, realtype h1, realtype h2, realtype h3, realtype e1, realtype e2, realtype e3, int q, int p, realtype* hnew, void* user_data)
+.. c:type:: int (*ARKAdaptFn)(N_Vector y, sunrealtype t, sunrealtype h1, sunrealtype h2, sunrealtype h3, sunrealtype e1, sunrealtype e2, sunrealtype e3, int q, int p, sunrealtype* hnew, void* user_data)
 
    This function implements a time step adaptivity algorithm
    that chooses :math:`h` to satisfy the error tolerances.
@@ -305,7 +305,7 @@ step, and the accuracy-based time step.
 
 
 
-.. c:type:: int (*ARKExpStabFn)(N_Vector y, realtype t, realtype* hstab, void* user_data)
+.. c:type:: int (*ARKExpStabFn)(N_Vector y, sunrealtype t, sunrealtype* hstab, void* user_data)
 
    This function predicts the maximum stable step size for the
    explicit portion of the ODE system.
@@ -350,7 +350,7 @@ recommended that the user *not* call :c:func:`ARKStepSetPredictorMethod` or
 
 
 
-.. c:type:: int (*ARKStagePredictFn)(realtype t, N_Vector zpred, void* user_data)
+.. c:type:: int (*ARKStagePredictFn)(sunrealtype t, N_Vector zpred, void* user_data)
 
    This function updates the prediction for the implicit stage solution.
 
@@ -388,7 +388,7 @@ ODE system, the user must supply a function of type :c:type:`ARKRootFn`.
 
 
 
-.. c:type:: int (*ARKRootFn)(realtype t, N_Vector y, realtype* gout, void* user_data)
+.. c:type:: int (*ARKRootFn)(sunrealtype t, N_Vector y, sunrealtype* gout, void* user_data)
 
    This function implements a vector-valued function
    :math:`g(t,y)` such that roots are sought for the components
@@ -425,7 +425,7 @@ object was supplied to :c:func:`ARKStepSetLinearSolver` or
 
 
 
-.. c:type:: int (*ARKLsJacFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*ARKLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the Jacobian matrix :math:`J(t,y) =
    \dfrac{\partial f^I}{\partial y}(t,y)` (or an approximation to it).
@@ -482,7 +482,7 @@ object was supplied to :c:func:`ARKStepSetLinearSolver` or
       then use the ``ARKStepGet*`` or ``MRIStepGet*`` functions listed in
       :numref:`ARKODE.Usage.ARKStep.OptionalOutputs` or
       :numref:`ARKODE.Usage.MRIStep.OptionalOutputs`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF``, which is defined in the header
+      accessed as ``SUN_UNIT_ROUNDOFF``, which is defined in the header
       file ``sundials_types.h``.
 
       **dense** :math:`J(t,y)`:
@@ -513,7 +513,7 @@ object was supplied to :c:func:`ARKStepSetLinearSolver` or
 
 
 
-.. c:type:: int (*ARKLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix A, SUNMatrix M, booleantype jok, booleantype *jcur, realtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*ARKLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A, SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the linear system matrix :math:`\mathcal{A}(t,y) = M(t) - \gamma J(t,y)` (or
    an approximation to it).
@@ -568,7 +568,7 @@ matrix-vector products :math:`Jv`. If such a function is not supplied,
 the default is a difference quotient approximation to these products.
 
 
-.. c:type:: int (*ARKLsJacTimesVecFn)(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy, void* user_data, N_Vector tmp)
+.. c:type:: int (*ARKLsJacTimesVecFn)(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy, void* user_data, N_Vector tmp)
 
    This function computes the product :math:`Jv` where :math:`J(t,y) \approx
    \dfrac{\partial f^I}{\partial y}(t,y)` (or an approximation to it).
@@ -600,7 +600,7 @@ the default is a difference quotient approximation to these products.
       their ``user_data``, and then use the ``ARKStepGet*`` or ``MRIStepGet*``
       functions listed in :numref:`ARKODE.Usage.ARKStep.OptionalOutputs` or
       :numref:`ARKODE.Usage.MRIStep.OptionalOutputs`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF``, which is defined in the header
+      accessed as ``SUN_UNIT_ROUNDOFF``, which is defined in the header
       file ``sundials_types.h``.
 
 
@@ -617,7 +617,7 @@ user-supplied function of type :c:type:`ARKLsJacTimesSetupFn`,
 defined as follows:
 
 
-.. c:type:: int (*ARKLsJacTimesSetupFn)(realtype t, N_Vector y, N_Vector fy, void* user_data)
+.. c:type:: int (*ARKLsJacTimesSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, void* user_data)
 
    This function preprocesses and/or evaluates any Jacobian-related
    data needed by the Jacobian-times-vector routine.
@@ -652,7 +652,7 @@ defined as follows:
       ``MRIStepGet*`` functions listed in
       :numref:`ARKODE.Usage.ARKStep.OptionalOutputs` or
       :numref:`ARKODE.Usage.MRIStep.OptionalOutputs`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF``, which is defined in the header
+      accessed as ``SUN_UNIT_ROUNDOFF``, which is defined in the header
       file ``sundials_types.h``.
 
 
@@ -675,7 +675,7 @@ preconditioner matrices should approximate :math:`\mathcal{A}`.
 
 
 
-.. c:type:: int (*ARKLsPrecSolveFn)(realtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, realtype gamma, realtype delta, int lr, void* user_data)
+.. c:type:: int (*ARKLsPrecSolveFn)(sunrealtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, sunrealtype gamma, sunrealtype delta, int lr, void* user_data)
 
    This function solves the preconditioner system :math:`Pz=r`.
 
@@ -721,7 +721,7 @@ preprocessed or evaluated, then these actions need to occur within a
 user-supplied function of type :c:type:`ARKLsPrecSetupFn`.
 
 
-.. c:type:: int (*ARKLsPrecSetupFn)(realtype t, N_Vector y, N_Vector fy, booleantype jok, booleantype* jcurPtr, realtype gamma, void* user_data)
+.. c:type:: int (*ARKLsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, sunbooleantype jok, sunbooleantype* jcurPtr, sunrealtype gamma, void* user_data)
 
    This function preprocesses and/or evaluates Jacobian-related
    data needed by the preconditioner.
@@ -782,7 +782,7 @@ user-supplied function of type :c:type:`ARKLsPrecSetupFn`.
       ``user_data``, and then use the ``ARKStepGet*`` or ``MRIStepGet*``
       functions listed in :numref:`ARKODE.Usage.ARKStep.OptionalOutputs` or
       :numref:`ARKODE.Usage.MRIStep.OptionalOutputs`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF``, which is defined in the header
+      accessed as ``SUN_UNIT_ROUNDOFF``, which is defined in the header
       file ``sundials_types.h``.
 
 
@@ -799,7 +799,7 @@ the mass matrix approximation.
 
 
 
-.. c:type:: int (*ARKLsMassFn)(realtype t, SUNMatrix M, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*ARKLsMassFn)(sunrealtype t, SUNMatrix M, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the mass matrix :math:`M(t)` (or an approximation to it).
 
@@ -870,7 +870,7 @@ compute matrix-vector products :math:`M(t)\, v`.
 
 
 
-.. c:type:: int (*ARKLsMassTimesVecFn)(N_Vector v, N_Vector Mv, realtype t, void* mtimes_data)
+.. c:type:: int (*ARKLsMassTimesVecFn)(N_Vector v, N_Vector Mv, sunrealtype t, void* mtimes_data)
 
    This function computes the product :math:`M(t)\, v` (or an approximation to it).
 
@@ -901,7 +901,7 @@ be done in a user-supplied function of type
 
 
 
-.. c:type:: int (*ARKLsMassTimesSetupFn)(realtype t, void* mtimes_data)
+.. c:type:: int (*ARKLsMassTimesSetupFn)(sunrealtype t, void* mtimes_data)
 
    This function preprocesses and/or evaluates any mass-matrix-related
    data needed by the mass-matrix-times-vector routine.
@@ -934,7 +934,7 @@ both sides, the product of the two preconditioner matrices should
 approximate :math:`M(t)`.
 
 
-.. c:type:: int (*ARKLsMassPrecSolveFn)(realtype t, N_Vector r, N_Vector z, realtype delta, int lr, void* user_data)
+.. c:type:: int (*ARKLsMassPrecSolveFn)(sunrealtype t, N_Vector r, N_Vector z, sunrealtype delta, int lr, void* user_data)
 
    This function solves the preconditioner system :math:`Pz=r`.
 
@@ -977,7 +977,7 @@ occur within a user-supplied function of type
 
 
 
-.. c:type:: int (*ARKLsMassPrecSetupFn)(realtype t, void* user_data)
+.. c:type:: int (*ARKLsMassPrecSetupFn)(sunrealtype t, void* user_data)
 
    This function preprocesses and/or evaluates mass-matrix-related
    data needed by the preconditioner.
@@ -1067,7 +1067,7 @@ memory transfers of forcing data supplied by the outer integrator to the inner
 integrator for the inner integration.
 
 
-.. c:type:: int (*MRIStepPreInnerFn)(realtype t, N_Vector* f, int num_vecs, void* user_data)
+.. c:type:: int (*MRIStepPreInnerFn)(sunrealtype t, N_Vector* f, int num_vecs, void* user_data)
 
    **Arguments:**
       * *t* -- the current value of the independent variable.
@@ -1098,7 +1098,7 @@ memory transfers of state data supplied by the inner integrator to the
 outer integrator for the outer integration.
 
 
-.. c:type:: int (*MRIStepPostInnerFn)(realtype t, N_Vector y, void* user_data)
+.. c:type:: int (*MRIStepPostInnerFn)(sunrealtype t, N_Vector y, void* user_data)
 
    **Arguments:**
       * *t* -- the current value of the independent variable.
@@ -1122,7 +1122,7 @@ outer integrator for the outer integration.
 Relaxation function
 -------------------
 
-.. c:type:: int (*ARKRelaxFn)(N_Vector y, realtype* r, void* user_data)
+.. c:type:: int (*ARKRelaxFn)(N_Vector y, sunrealtype* r, void* user_data)
 
    When applying relaxation, an :c:func:`ARKRelaxFn` function is required to
    compute the conservative or dissipative function :math:`\xi(y)`.
diff --git a/doc/arkode/guide/source/sunnonlinsol/ARKODE_interface.rst b/doc/arkode/guide/source/sunnonlinsol/ARKODE_interface.rst
index bb9466bf35..67dd93512d 100644
--- a/doc/arkode/guide/source/sunnonlinsol/ARKODE_interface.rst
+++ b/doc/arkode/guide/source/sunnonlinsol/ARKODE_interface.rst
@@ -107,7 +107,7 @@ of user-supplied SUNNonlinSol modules are as follows.
       * ``ARK_MEM_NULL`` if the ARKStep memory was ``NULL``.
 
 
-.. c:function:: int ARKStepGetNonlinearSystemData(void* arkode_mem, realtype *tcur, N_Vector *zpred, N_Vector *z, N_Vector *Fi, realtype *gamma, N_Vector *sdata, void **user_data)
+.. c:function:: int ARKStepGetNonlinearSystemData(void* arkode_mem, sunrealtype *tcur, N_Vector *zpred, N_Vector *z, N_Vector *Fi, sunrealtype *gamma, N_Vector *sdata, void **user_data)
 
    Returns all internal data required to construct the current nonlinear
    implicit system :eq:`ARKODE_Residual_corrector` or :eq:`ARKODE_FixedPt_corrector`:
@@ -203,7 +203,7 @@ Additional advanced output functions that are provided to aid in the constructio
 of user-supplied SUNNonlinSol modules are as follows.
 
 
-.. c:function:: int MRIStepGetNonlinearSystemData(void* arkode_mem, realtype *tcur, N_Vector *zpred, N_Vector *z, N_Vector *Fi, realtype *gamma, N_Vector *sdata, void **user_data)
+.. c:function:: int MRIStepGetNonlinearSystemData(void* arkode_mem, sunrealtype *tcur, N_Vector *zpred, N_Vector *z, N_Vector *Fi, sunrealtype *gamma, N_Vector *sdata, void **user_data)
 
    Returns all internal data required to construct the current nonlinear
    implicit system :eq:`ARKODE_Residual_corrector` or :eq:`ARKODE_FixedPt_corrector`:
diff --git a/doc/cvode/cv_ex_serial.tex b/doc/cvode/cv_ex_serial.tex
index d011a0a14f..35d62d5f79 100644
--- a/doc/cvode/cv_ex_serial.tex
+++ b/doc/cvode/cv_ex_serial.tex
@@ -33,8 +33,8 @@ \subsection{A dense example: cvRoberts\_dns}\label{ss:cvRoberts}
 Following the initial comment block, this program has a number
 of \id{\#include} lines, which allow access to useful items in {\cvode}
 header files.  The \id{sundials\_types.h} file provides the definition of the
-type \id{realtype} (see \ugref{s:types} for details).  
-For now, it suffices to read \id{realtype} as \id{double}.
+type \id{sunrealtype} (see \ugref{s:types} for details).  
+For now, it suffices to read \id{sunrealtype} as \id{double}.
 The \id{cvode.h} file provides prototypes for the {\cvode}
 functions to be called (excluding the linear solver selection
 function), and also a number of constants that are to be used in
@@ -407,7 +407,7 @@ \subsection{A Krylov example: cvDiurnal\_kry}\label{ss:cvDiurnal}
 contains constants and function prototypes associated with the
 {\sunlinsolspgmr} module, including the values of the \id{pretype}
 argument to \id{SUNLinSol\_SPGMR}. The inclusion of \id{sundials\_math.h} is
-done to access the \id{SUNSQR} macro for the square of a \id{realtype}
+done to access the \id{SUNSQR} macro for the square of a \id{sunrealtype}
 number. 
 
 The \id{main} program calls \id{CVodeCreate} specifying the \id{CV\_BDF} method
@@ -474,7 +474,7 @@ \subsection{A Krylov example: cvDiurnal\_kry}\label{ss:cvDiurnal}
 this program.  While the generic {\sunlinsoldense} linear solver
 module serves as the interface to dense matrix solves for the main
 {\sundials} solvers, the underlying algebraic operations operate on
-dense matrices with \id{realtype **} as the underlying dense matrix
+dense matrices with \id{sunrealtype **} as the underlying dense matrix
 type.  To avoid the extra layer of function calls and dense matrix and
 linear solver data structures, \id{cvDiurnal\_kry.c} uses underling small
 dense functions for all operations on the $2 \times 2$ preconditioner blocks.  
diff --git a/doc/cvode/guide/source/Introduction.rst b/doc/cvode/guide/source/Introduction.rst
index daa94f9fee..ac240a5d2c 100644
--- a/doc/cvode/guide/source/Introduction.rst
+++ b/doc/cvode/guide/source/Introduction.rst
@@ -114,6 +114,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/cvode/guide/source/Usage/index.rst b/doc/cvode/guide/source/Usage/index.rst
index 1bfd789b52..2ea0337a4b 100644
--- a/doc/cvode/guide/source/Usage/index.rst
+++ b/doc/cvode/guide/source/Usage/index.rst
@@ -101,7 +101,7 @@ required is:
 
 * ``cvode/cvode.h`` the main header file for CVODE, which defines the several types and various constants, and includes function prototypes. This includes the header file for CVLS, ``cvode/cvode_ls.h``.
 
-Note that ``cvode.h`` includes ``sundials_types.h``, which defines the types, ``realtype``, ``sunindextype``, and ``booleantype`` and the constants ``SUNFALSE`` and ``SUNTRUE``.
+Note that ``cvode.h`` includes ``sundials_types.h``, which defines the types, ``sunrealtype``, ``sunindextype``, and ``sunbooleantype`` and the constants ``SUNFALSE`` and ``SUNTRUE``.
 
 The calling program must also include an ``N_Vector`` implementation header file, of the form ``nvector/nvector_*.h``. See :numref:`NVectors` for the appropriate name. This file in turn includes the header file ``sundials_nvector.h`` which defines the abstract data type.
 
@@ -325,7 +325,7 @@ calls.
    :c:func:`CVodeSetNonlinearSolver`.
 
 
-.. c:function:: int CVodeInit(void* cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
+.. c:function:: int CVodeInit(void* cvode_mem, CVRhsFn f, sunrealtype t0, N_Vector y0)
 
    The function ``CVodeInit`` provides required problem and solution
    specifications, allocates internal memory, and initializes CVODE.
@@ -369,7 +369,7 @@ integration tolerances (or directly specify the weights used in
 evaluating WRMS vector norms). Note that this call must be made after
 the call to :c:func:`CVodeInit`
 
-.. c:function:: int CVodeSStolerances(void* cvode_mem, realtype reltol, realtype abstol)
+.. c:function:: int CVodeSStolerances(void* cvode_mem, sunrealtype reltol, sunrealtype abstol)
 
    The function ``CVodeSStolerances`` specifies scalar relative and absolute  tolerances.
 
@@ -384,7 +384,7 @@ the call to :c:func:`CVodeInit`
      * ``CV_NO_MALLOC`` -- The allocation function returned ``NULL``
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
-.. c:function:: int CVodeSVtolerances(void* cvode_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int CVodeSVtolerances(void* cvode_mem, sunrealtype reltol, N_Vector abstol)
 
    The function ``CVodeSVtolerances`` specifies scalar relative tolerance and  vector absolute tolerances.
 
@@ -713,7 +713,7 @@ of two modes as to where CVODE is to return a solution. But these
 modes are modified if the user has set a stop time (with :c:func:`CVodeSetStopTime`) or requested
 rootfinding.
 
-.. c:function:: int CVode(void* cvode_mem, realtype tout, N_Vector yout, realtype* tret, int itask)
+.. c:function:: int CVode(void* cvode_mem, sunrealtype tout, N_Vector yout, sunrealtype* tret, int itask)
 
    The function ``CVode`` integrates the ODE over an interval in t.
 
@@ -1010,7 +1010,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 10.  A negative value for ``mxhnil`` indicates that no warning messages should  be issued.
 
-.. c:function:: int CVodeSetStabLimDet(void* cvode_mem, booleantype stldet)
+.. c:function:: int CVodeSetStabLimDet(void* cvode_mem, sunbooleantype stldet)
 
    The function ``CVodeSetStabLimDet`` indicates if  the BDF stability limit detection algorithm should be used. See :numref:`CVODE.Mathematics.stablimit` for further details.
 
@@ -1026,7 +1026,7 @@ Main solver optional input functions
    **Notes:**
       The default value is ``SUNFALSE``. If ``stldet = SUNTRUE`` when BDF is used  and the method order is greater than or equal to 3, then an internal function, ``CVsldet``,  is called to detect a possible stability limit. If such a limit is detected, then the order is  reduced.
 
-.. c:function:: int CVodeSetInitStep(void* cvode_mem, realtype hin)
+.. c:function:: int CVodeSetInitStep(void* cvode_mem, sunrealtype hin)
 
    The function ``CVodeSetInitStep`` specifies the initial step size.
 
@@ -1041,7 +1041,7 @@ Main solver optional input functions
    **Notes:**
       By default, CVODE estimates the initial step size to be the solution :math:`h` of the equation :math:`0.5 h^2 \ddot{y} = 1`,  where :math:`\ddot{y}` is an estimated second derivative of the solution at :math:`t_0`.
 
-.. c:function:: int CVodeSetMinStep(void* cvode_mem, realtype hmin)
+.. c:function:: int CVodeSetMinStep(void* cvode_mem, sunrealtype hmin)
 
    The function ``CVodeSetMinStep`` specifies a lower bound on the magnitude  of the step size.
 
@@ -1057,7 +1057,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 0.0.
 
-.. c:function:: int CVodeSetMaxStep(void* cvode_mem, realtype hmax)
+.. c:function:: int CVodeSetMaxStep(void* cvode_mem, sunrealtype hmax)
 
    The function ``CVodeSetMaxStep`` specifies an upper bound on the magnitude  of the step size.
 
@@ -1073,7 +1073,7 @@ Main solver optional input functions
    **Notes:**
       Pass ``hmax`` = 0.0 to obtain the default value :math:`\infty`.
 
-.. c:function:: int CVodeSetStopTime(void* cvode_mem, realtype tstop)
+.. c:function:: int CVodeSetStopTime(void* cvode_mem, sunrealtype tstop)
 
    The function ``CVodeSetStopTime`` specifies the value of the  independent variable :math:`t` past which the solution is not to proceed.
 
@@ -1094,7 +1094,7 @@ Main solver optional input functions
       A stop time not reached before a call to :c:func:`CVodeReInit` will
       remain active but can be disabled by calling :c:func:`CVodeClearStopTime`.
 
-.. c:function:: int CVodeSetInterpolateStopTime(void* cvode_mem, booleantype interp)
+.. c:function:: int CVodeSetInterpolateStopTime(void* cvode_mem, sunbooleantype interp)
 
    The function ``CVodeSetInterpolateStopTime`` specifies that the output solution should be
    interpolated when the current :math:`t` equals the specified ``tstop`` (instead of
@@ -1164,7 +1164,7 @@ Main solver optional input functions
    **Notes:**
       The presence of a non-``NULL`` constraints vector that is not 0.0 in  all components will cause constraint checking to be performed.  However, a call with 0.0 in all components of ``constraints`` will  result in an illegal input return. A ``NULL`` constraints vector will disable  constraint checking.
 
-.. c:function:: int CVodeSetUseIntegratorFusedKernels(void* cvode_mem, booleantype onoff)
+.. c:function:: int CVodeSetUseIntegratorFusedKernels(void* cvode_mem, sunbooleantype onoff)
 
    The function ``CVodeSetUseIntegratorFusedKernels`` informs CVODE that it should  use specialized fused kernels internally, if available. The specialized  kernels may offer performance improvements for small problem sizes. Users  should beware that these kernels can cause changes in the behavior of the  integrator. By default, these kernels are not used.  Must be called after :c:func:`CVodeInit`.
 
@@ -1281,7 +1281,7 @@ difference approximation or a call to the :ref:`user-supplied Jacobian function
 :math:`M(t,y) \approx I - \gamma J(t,y)` is recomputed using the current
 :math:`\gamma` value.
 
-.. c:function:: int CVodeSetDeltaGammaMaxLSetup(void* cvode_mem, realtype dgmax_lsetup)
+.. c:function:: int CVodeSetDeltaGammaMaxLSetup(void* cvode_mem, sunrealtype dgmax_lsetup)
 
    The function ``CVodeSetDeltaGammaMaxLSetup`` specifies the maximum allowed
    :math:`\gamma` change that does not require a linear solver setup call. If
@@ -1301,7 +1301,7 @@ difference approximation or a call to the :ref:`user-supplied Jacobian function
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetDeltaGammaMaxBadJac(void* cvode_mem, realtype dgmax_jbad)
+.. c:function:: int CVodeSetDeltaGammaMaxBadJac(void* cvode_mem, sunrealtype dgmax_jbad)
 
    The function ``CVodeSetDeltaGammaMaxBadJac`` specifies the maximum allowed
    :math:`\gamma` change after a NLS failure that requires updating the Jacobian
@@ -1452,7 +1452,7 @@ system to account for the lagged value of :math:`\gamma`. See
 necessary, e.g., when providing a custom linear solver that updates the matrix
 using the current :math:`\gamma` as part of the solve.
 
-.. c:function:: int CVodeSetLinearSolutionScaling(void* cvode_mem, booleantype onoff)
+.. c:function:: int CVodeSetLinearSolutionScaling(void* cvode_mem, sunbooleantype onoff)
 
    The function :c:func:`CVodeSetLinearSolutionScaling` enables or disables scaling  the linear system solution to account for a change in :math:`\gamma` in the linear system. For more details see :numref:`SUNLinSol.CVODE.lagged`.
 
@@ -1601,7 +1601,7 @@ the :c:func:`CVodeSetEpsLin` function.
       The previous routine ``CVSpilsSetPreconditioner`` is now a wrapper  for this routine, and may still be used for backward-compatibility.  However, this will be deprecated in future releases, so we recommend  that users transition to the new routine name soon.
 
 
-.. c:function:: int CVodeSetEpsLin(void* cvode_mem, realtype eplifac)
+.. c:function:: int CVodeSetEpsLin(void* cvode_mem, sunrealtype eplifac)
 
    The function ``CVodeSetEpsLin`` specifies the factor by  which the Krylov linear solver's convergence test constant is  reduced from the nonlinear solver test constant.
 
@@ -1625,7 +1625,7 @@ the :c:func:`CVodeSetEpsLin` function.
       The previous routine ``CVSpilsSetEpsLin`` is now a wrapper for this  routine, and may still be used for backward-compatibility.  However,  this will be deprecated in future releases, so we recommend that  users transition to the new routine name soon.
 
 
-.. c:function:: int CVodeSetLSNormFactor(void* cvode_mem, realtype nrmfac)
+.. c:function:: int CVodeSetLSNormFactor(void* cvode_mem, sunrealtype nrmfac)
 
    The function ``CVodeSetLSNormFactor`` specifies the factor to use when  converting from the integrator tolerance (WRMS norm) to the linear solver  tolerance (L2 norm) for Newton linear system solves e.g.,  ``tol_L2 = fac * tol_WRMS``.
 
@@ -1706,7 +1706,7 @@ nonlinear solver.
    **Notes:**
       The default value is 10.
 
-.. c:function:: int CVodeSetNonlinConvCoef(void* cvode_mem, realtype nlscoef)
+.. c:function:: int CVodeSetNonlinConvCoef(void* cvode_mem, sunrealtype nlscoef)
 
    The function ``CVodeSetNonlinConvCoef`` specifies the safety factor used in the nonlinear convergence test (see :numref:`CVODE.Mathematics.ivp_sol`).
 
@@ -1804,7 +1804,7 @@ step size adaptivity.
    make changes gradually and with testing to determine their effectiveness.
 
 
-.. c:function:: int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx, realtype eta_max_fx)
+.. c:function:: int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx, sunrealtype eta_max_fx)
 
    The function ``CVodeSetEtaFixedStepBounds`` specifies the interval lower
    (:math:`\eta_{\mathrm{min\_fx}}`) and upper (:math:`\eta_{\mathrm{max\_fx}}`)
@@ -1830,7 +1830,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
+.. c:function:: int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs)
 
    The function ``CVodeSetEtaMaxFirstStep`` specifies the maximum step size
    factor after the first time step, :math:`\eta_{\mathrm{max\_fs}}`.
@@ -1849,7 +1849,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es)
+.. c:function:: int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es)
 
    The function ``CVodeSetEtaMaxEarlyStepEtaMax`` specifies the maximum step size
    factor for steps early in the integration,
@@ -1906,7 +1906,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
+.. c:function:: int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs)
 
    The function ``CVodeSetEtaMax`` specifies the maximum step size factor,
    :math:`\eta_{\mathrm{max\_gs}}`.
@@ -1933,7 +1933,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
+.. c:function:: int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min)
 
    The function ``CVodeSetEtaMin`` specifies the minimum step size factor,
    :math:`\eta_{\mathrm{min}}`.
@@ -1952,7 +1952,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMinErrFail(void *cvode_mem, realtype eta_min_ef)
+.. c:function:: int CVodeSetEtaMinErrFail(void *cvode_mem, sunrealtype eta_min_ef)
 
    The function ``CVodeSetEtaMinErrFail`` specifies the minimum step size
    factor after an error test failure, :math:`\eta_{\mathrm{min\_ef}}`.
@@ -1972,7 +1972,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef)
+.. c:function:: int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef)
 
    The function ``CVodeSetEtaMaxErrFail`` specifies the maximum step size
    factor after multiple error test failures, :math:`\eta_{\mathrm{max\_ef}}`.
@@ -2025,7 +2025,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
+.. c:function:: int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf)
 
    The function ``CVodeSetEtaConvFail`` specifies the step size factor after a
    nonlinear solver failure :math:`\eta_{\mathrm{cf}}`.
@@ -2127,7 +2127,7 @@ Projection optional input functions
 The following functions can be called to set optional inputs to control
 the projection when solving an IVP with constraints.
 
-.. c:function:: int CVodeSetProjErrEst(void* cvode_mem, booleantype onoff)
+.. c:function:: int CVodeSetProjErrEst(void* cvode_mem, sunbooleantype onoff)
 
    The function ``CVodeSetProjErrEst`` enables or disables projection of the error estimate by the projection function.
 
@@ -2172,7 +2172,7 @@ the projection when solving an IVP with constraints.
 
    .. versionadded:: 5.3.0
 
-.. c:function:: int CVodeSetEpsProj(void* cvode_mem, realtype eps)
+.. c:function:: int CVodeSetEpsProj(void* cvode_mem, sunrealtype eps)
 
    The function ``CVodeSetEpsProj`` specifies the tolerance for the nonlinear constrained least squares problem solved by the projection function.
 
@@ -2187,7 +2187,7 @@ the projection when solving an IVP with constraints.
 
    .. versionadded:: 5.3.0
 
-.. c:function:: int CVodeSetProjFailEta(void* cvode_mem, realtype eta)
+.. c:function:: int CVodeSetProjFailEta(void* cvode_mem, sunrealtype eta)
 
    The function ``CVodeSetProjFailEta`` specifies the time step reduction factor to apply on a projection function failure.
 
@@ -2216,7 +2216,7 @@ value of :math:`t` in the last internal step taken by CVODE.
 
 The call to the function has the following form:
 
-.. c:function:: int CVodeGetDky(void* cvode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int CVodeGetDky(void* cvode_mem, sunrealtype t, int k, N_Vector dky)
 
    The function ``CVodeGetDky`` computes the ``k``-th derivative of the function  ``y`` at time ``t``, i.e. :math:`\dfrac{\mathrm d^{k}y}{\mathrm dt^{k}}(t)`, where :math:`t_n - h_u \leq  t \leq t_n`, :math:`t_n` denotes the current internal time reached, and :math:`h_u` is the  last internal step size successfully used by the solver.  The  user may request ``k`` = :math:`0, 1, \ldots, q_u`, where :math:`q_u` is the current order  (optional output ``qlast``).
 
@@ -2394,7 +2394,7 @@ described next.
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODE memory block.
-     * ``lenrw`` -- the number of ``realtype`` values in the CVODE workspace.
+     * ``lenrw`` -- the number of ``sunrealtype`` values in the CVODE workspace.
      * ``leniw`` -- the number of integer values in the CVODE workspace.
 
    **Return value:**
@@ -2402,7 +2402,7 @@ described next.
      * ``CV_MEM_NULL`` -- The CVODE memory block was not initialized through a previous call to :c:func:`CVodeCreate`.
 
    **Notes:**
-      In terms of the problem size :math:`N`, the maximum method order :math:`\texttt{maxord}`, and the number :math:`\texttt{nrtfn}` of root functions (see :numref:`CVODE.Usage.CC.cvrootinit`) the actual size of the real workspace, in ``realtype`` words, is  given by the following:
+      In terms of the problem size :math:`N`, the maximum method order :math:`\texttt{maxord}`, and the number :math:`\texttt{nrtfn}` of root functions (see :numref:`CVODE.Usage.CC.cvrootinit`) the actual size of the real workspace, in ``sunrealtype`` words, is  given by the following:
 
       * base value: :math:`\texttt{lenrw} = 96 + ( \texttt{maxord} + 5) N_r + 3\texttt{nrtfn}`;
 
@@ -2531,7 +2531,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetLastStep(void* cvode_mem, realtype *hlast)
+.. c:function:: int CVodeGetLastStep(void* cvode_mem, sunrealtype *hlast)
 
    The function ``CVodeGetLastStep`` returns the  integration step size taken on the last internal step.
 
@@ -2545,7 +2545,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetCurrentStep(void* cvode_mem, realtype *hcur)
+.. c:function:: int CVodeGetCurrentStep(void* cvode_mem, sunrealtype *hcur)
 
    The function ``CVodeGetCurrentStep`` returns the  integration step size to be attempted on the next internal step.
 
@@ -2559,7 +2559,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetActualInitStep(void* cvode_mem, realtype *hinused)
+.. c:function:: int CVodeGetActualInitStep(void* cvode_mem, sunrealtype *hinused)
 
    The function ``CVodeGetActualInitStep`` returns the  value of the integration step size used on the first step.
 
@@ -2576,7 +2576,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetCurrentTime(void* cvode_mem, realtype *tcur)
+.. c:function:: int CVodeGetCurrentTime(void* cvode_mem, sunrealtype *tcur)
 
    The function ``CVodeGetCurrentTime`` returns the  current internal time reached by the solver.
 
@@ -2607,7 +2607,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetTolScaleFactor(void* cvode_mem, realtype *tolsfac)
+.. c:function:: int CVodeGetTolScaleFactor(void* cvode_mem, sunrealtype *tolsfac)
 
    The function ``CVodeGetTolScaleFactor`` returns a  suggested factor by which the user's tolerances  should be scaled when too much accuracy has been  requested for some internal step.
 
@@ -2661,7 +2661,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetIntegratorStats(void* cvode_mem, long int *nsteps, long int *nfevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, realtype *hinused, realtype *hlast, realtype *hcur, realtype *tcur)
+.. c:function:: int CVodeGetIntegratorStats(void* cvode_mem, long int *nsteps, long int *nfevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, sunrealtype *hinused, sunrealtype *hlast, sunrealtype *hcur, sunrealtype *tcur)
 
    The function ``CVodeGetIntegratorStats`` returns the CVODE integrator statistics as a group.
 
@@ -2936,7 +2936,7 @@ solver, a suffix (for Linear Solver) has been added (e.g. ``lenrwLS``).
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODE memory block.
-     * ``lenrwLS`` -- the number of ``realtype`` values in the CVLS workspace.
+     * ``lenrwLS`` -- the number of ``sunrealtype`` values in the CVLS workspace.
      * ``leniwLS`` -- the number of integer values in the CVLS workspace.
 
    **Return value:**
@@ -3156,7 +3156,7 @@ solver, a suffix (for Linear Solver) has been added here (e.g. ``lenrwLS``).
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODE memory block.
-     * ``lenrwLS`` -- the number of ``realtype`` values in the CVDIAG workspace.
+     * ``lenrwLS`` -- the number of ``sunrealtype`` values in the CVDIAG workspace.
      * ``leniwLS`` -- the number of integer values in the CVDIAG workspace.
 
    **Return value:**
@@ -3165,7 +3165,7 @@ solver, a suffix (for Linear Solver) has been added here (e.g. ``lenrwLS``).
      * ``CVDIAG_LMEM_NULL`` -- The CVDIAG linear solver has not been initialized.
 
    **Notes:**
-      In terms of the problem size :math:`N`, the actual size of the real workspace  is roughly :math:`3 N` ``realtype`` words.
+      In terms of the problem size :math:`N`, the actual size of the real workspace  is roughly :math:`3 N` ``sunrealtype`` words.
 
 
 .. c:function:: int CVDiagGetNumRhsEvals(void* cvode_mem, long int *nfevalsLS)
@@ -3256,7 +3256,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int CVodeReInit(void* cvode_mem, realtype t0, N_Vector y0)
+.. c:function:: int CVodeReInit(void* cvode_mem, sunrealtype t0, N_Vector y0)
 
    The function ``CVodeReInit`` provides required problem specifications  and reinitializes CVODE.
 
@@ -3299,7 +3299,7 @@ ODE right-hand side
 
 The user must provide a function of type defined as follows:
 
-.. c:type:: int (*CVRhsFn)(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+.. c:type:: int (*CVRhsFn)(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
    This function computes the ODE right-hand side for a given value of the independent variable :math:`t` and state vector :math:`y`.
 
@@ -3439,7 +3439,7 @@ If a rootfinding problem is to be solved during the integration of the
 ODE system, the user must supply a C function of type ``CVRootFn``, defined as
 follows:
 
-.. c:type:: int (*CVRootFn)(realtype t, N_Vector y, realtype *gout, void *user_data);
+.. c:type:: int (*CVRootFn)(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
    This function implements a vector-valued function :math:`g(t,y)` such that the roots of the ``nrtfn`` components :math:`g_i(t,y)` are sought.
 
@@ -3465,7 +3465,7 @@ When solving an IVP with a constraint equation and providing a
 user-defined projection operation the projection function must have type
 ``CVProjFn``, defined as follows:
 
-.. c:type:: int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj, N_Vector err, void *user_data);
+.. c:type:: int (*CVProjFn)(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj, N_Vector err, void *user_data);
 
    This function computes the projection of the solution and, if enabled, the error on to the constraint manifold.
 
@@ -3491,7 +3491,7 @@ user-defined projection operation the projection function must have type
 
       If needed by the user's projection routine, the error weight vector can be
       accessed by calling :c:func:`CVodeGetErrWeights`, and the unit roundoff is
-      available as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      available as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. versionadded:: 5.3.0
 
@@ -3507,7 +3507,7 @@ a function of type ``CVLsJacFn`` for evaluating the Jacobian of the ODE right-ha
 side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
 
 
-.. c:type:: int (*CVLsJacFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+.. c:type:: int (*CVLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
    This function computes the Jacobian matrix :math:`J = \dfrac{\partial f}{\partial y}` (or an approximation to it).
 
@@ -3547,7 +3547,7 @@ side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
       the current step size, the error weights, etc. To obtain these, the user
       will need to add a pointer to ``cv_mem`` in ``user_data`` and then use the
       ``CVodeGet*`` functions described in :numref:`CVODE.Usage.CC.optional_output`.
-      The unit roundoff can be accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      The unit roundoff can be accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       **Dense**:
       A user-supplied dense Jacobian function must load the :math:`N` by :math:`N`
@@ -3591,7 +3591,7 @@ side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
       :math:`\le m-n \le` ``mlower``. Alternatively,
       ``SM_COLUMN_B(J, j)`` returns a pointer to the diagonal element
       of the :math:`j`-th column of ``Jac``, and if we assign this address
-      to ``realtype *col_j``, then the :math:`i`-th element of the
+      to ``sunrealtype *col_j``, then the :math:`i`-th element of the
       :math:`j`-th column is given by
       ``SM_COLUMN_ELEMENT_B(col_j, i, j)``, counting from 0.  Thus,
       for :math:`(m,n)` within the band, :math:`J(m,n)` can be loaded by setting
@@ -3637,7 +3637,7 @@ side function, the user may optionally supply a function of type ``CVLsLinSysFn`
 for evaluating the linear system, :math:`M = I - \gamma J` (or an
 approximation of it).  ``CVLsLinSysFn`` is defined as follows:
 
-.. c:type:: int (*CVLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix M, booleantype jok, booleantype *jcur, realtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+.. c:type:: int (*CVLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
    This function computes the linear system matrix :math:`M = I - \gamma J` (or an approximation to it).
 
@@ -3667,7 +3667,7 @@ provide a function of type :c:type:`CVLsJacTimesVecFn` in the following form,
 to compute matrix-vector products :math:`Jv`. If such a function is not supplied,
 the default is a difference quotient approximation to these products.
 
-.. c:type:: int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy, void *user_data, N_Vector tmp);
+.. c:type:: int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy, void *user_data, N_Vector tmp);
 
    This function computes the product :math:`Jv = \dfrac{\partial f(t,y)}{\partial y} v` (or an approximation to it).
 
@@ -3693,7 +3693,7 @@ the default is a difference quotient approximation to these products.
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODE.Usage.CC.optional_output.optout_main`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsJacTimesVecFn`` is identical to
       :c:func:`CVLsJacTimesVecFn`, and may still be used for backward-compatibility.
@@ -3710,7 +3710,7 @@ If the user’s Jacobian-times-vector routine requires that any
 Jacobian-related data be preprocessed or evaluated, then this needs to
 be done in a user-supplied function of type :c:type:`CVLsJacTimesSetupFn`, defined as follows:
 
-.. c:type:: int (*CVLsJacTimesSetupFn)(realtype t, N_Vector y, N_Vector fy, void *user_data);
+.. c:type:: int (*CVLsJacTimesSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, void *user_data);
 
    This function preprocesses and/or evaluates Jacobian-related data needed by the Jacobian-times-vector routine.
 
@@ -3738,7 +3738,7 @@ be done in a user-supplied function of type :c:type:`CVLsJacTimesSetupFn`, defin
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODE.Usage.CC.optional_output.optout_main`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsJacTimesSetupFn`` is identical
       to :c:type:`CVLsJacTimesSetupFn`, and may still be used for
@@ -3761,7 +3761,7 @@ crudely) the matrix :math:`M = I - \gamma J`, where
 sides, the product of the two preconditioner matrices should approximate
 :math:`M`. This function must be of type :c:type:`CVLsPrecSolveFn`, defined as follows:
 
-.. c:type:: int (*CVLsPrecSolveFn)(realtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, realtype gamma, realtype delta, int lr, void *user_data);
+.. c:type:: int (*CVLsPrecSolveFn)(sunrealtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
    This function solves the preconditioned system :math:`Pz = r`.
 
@@ -3798,7 +3798,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 preprocessed or evaluated, then this needs to be done in a user-supplied
 function of type , defined as follows:
 
-.. c:type:: int (*CVLsPrecSetupFn)(realtype t, N_Vector y, N_Vector fy, booleantype jok, booleantype *jcurPtr, realtype gamma, void *user_data);
+.. c:type:: int (*CVLsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, sunbooleantype jok, sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
    This function preprocesses and/or evaluates Jacobian-related data needed by the preconditioner.
 
@@ -3841,7 +3841,7 @@ function of type , defined as follows:
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODE.Usage.CC.optional_output`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsPrecSetupFn`` is identical to
       :c:type:`CVLsPrecSetupFn`, and may still be used for backward-compatibility.
@@ -3985,7 +3985,7 @@ the CVBANDPRE module:
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODE memory block.
-     * ``lenrwBP`` -- the number of ``realtype`` values in teh CVBANDPRE workspace.
+     * ``lenrwBP`` -- the number of ``sunrealtype`` values in teh CVBANDPRE workspace.
      * ``leniwBP`` -- the number of integer values in the CVBANDPRE workspace.
 
    **Return value:**
@@ -4117,7 +4117,7 @@ The user is responsible for providing space (presumably within ``user_data``)
 for components of :math:`y` that are communicated between processes by ``cfn``, and
 that are then used by ``gloc``, which should not do any communication.
 
-.. c:type:: int (*CVLocalFn)(sunindextype Nlocal, realtype t, N_Vector y, N_Vector glocal, void *user_data);
+.. c:type:: int (*CVLocalFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, N_Vector glocal, void *user_data);
 
    This ``gloc`` function computes :math:`g(t,y)`. It loads the vector ``glocal`` as a function of ``t`` and ``y``.
 
@@ -4142,7 +4142,7 @@ that are then used by ``gloc``, which should not do any communication.
       The case where :math:`g` is mathematically identical to :math:`f` is allowed.
 
 
-.. c:type:: int (*CVCommFn)(sunindextype Nlocal, realtype t, N_Vector y, void *user_data);
+.. c:type:: int (*CVCommFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, void *user_data);
 
    This ``cfn`` function performs all interprocess communication necessary for the execution of the ``gloc`` function above, using the input vector ``y``.
 
@@ -4254,7 +4254,7 @@ The user-callable functions that initialize or re-initialize
 the CVBBDPRE preconditioner module are described next.
 
 
-.. c:function:: int CVBBDPrecInit(void* cvode_mem, sunindextype local_N, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dqrely, CVLocalFn gloc, CVCommFn cfn)
+.. c:function:: int CVBBDPrecInit(void* cvode_mem, sunindextype local_N, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn)
 
    The function ``CVBBDPrecInit`` initializes and allocates (internal) memory for the CVBBDPRE preconditioner.
 
@@ -4308,7 +4308,7 @@ one or more of the corresponding CVLS "set" functions, must
 also be made (in the proper order).
 
 
-.. c:function:: int CVBBDPrecReInit(void* cvode_mem, sunindextype mudq, sunindextype mldq, realtype dqrely)
+.. c:function:: int CVBBDPrecReInit(void* cvode_mem, sunindextype mudq, sunindextype mldq, sunrealtype dqrely)
 
    The function ``CVBBDPrecReInit`` re-initializes the CVBBDPRE preconditioner.
 
@@ -4338,7 +4338,7 @@ the CVBBDPRE module:
 
    **Arguments:**
       * ``cvode_mem`` -- pointer to the CVODE memory block.
-      * ``lenrwBBDP`` -- local number of ``realtype`` values in the CVBBDPRE workspace.
+      * ``lenrwBBDP`` -- local number of ``sunrealtype`` values in the CVBBDPRE workspace.
       * ``leniwBBDP`` -- local number of integer values in the CVBBDPRE workspace.
 
    **Return value:**
diff --git a/doc/cvode/guide/source/sunnonlinsol/CVODE_interface.rst b/doc/cvode/guide/source/sunnonlinsol/CVODE_interface.rst
index de10a67328..7e4dffc28f 100644
--- a/doc/cvode/guide/source/sunnonlinsol/CVODE_interface.rst
+++ b/doc/cvode/guide/source/sunnonlinsol/CVODE_interface.rst
@@ -57,7 +57,7 @@ users, but might be useful for users who choose to provide their own
 implementation of the :c:type:`SUNNonlinearSolver` API. For example, such a user
 might need access to the current value of :math:`\gamma` to compute Jacobian data.
 
-.. c:function:: int CVodeGetCurrentGamma(void* cvode_mem, realtype* gamma)
+.. c:function:: int CVodeGetCurrentGamma(void* cvode_mem, sunrealtype* gamma)
 
    The function ``CVodeGetCurrentGamma`` returns the current value of the scalar :math:`gamma`.
 
@@ -81,7 +81,7 @@ might need access to the current value of :math:`\gamma` to compute Jacobian dat
      * ``CV_SUCCESS`` -- The optional output value has been successfully set.
      * ``CV_MEM_NULL`` -- The CVODE memory block was ``NULL``.
 
-.. c:function:: int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur, N_Vector *ypred, N_Vector *yn, N_Vector *fn, realtype *gamma, realtype *rl1, N_Vector *zn1, void **user_data)
+.. c:function:: int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur, N_Vector *ypred, N_Vector *yn, N_Vector *fn, sunrealtype *gamma, sunrealtype *rl1, N_Vector *zn1, void **user_data)
 
    The function ``CVodeGetNonlinearSystemData`` returns all internal data required to construct the current nonlinear system :eq:`CVODE_res_corrector` or :eq:`CVODE_fp_corrector`.
 
diff --git a/doc/cvodes/cvs_ex_adj.tex b/doc/cvodes/cvs_ex_adj.tex
index f63ca32a2d..00269acf6f 100644
--- a/doc/cvodes/cvs_ex_adj.tex
+++ b/doc/cvodes/cvs_ex_adj.tex
@@ -73,7 +73,7 @@ \subsection{A serial dense example: cvsRoberts\_ASAi\_dns}\label{ss:cvsRoberts_A
 of the {\nvector} module, {\nvecs}, the header files
 \id{sunmatrix\_dense.h} and \id{sunlinsol\_dense.h} for the dense
 {\sunmatrix} and {\sunlinsol} modules, the header file
-\id{sundials\_types.h} for the definition of \id{realtype} and \id{sunindextype},
+\id{sundials\_types.h} for the definition of \id{sunrealtype} and \id{sunindextype},
 and the file \id{sundials\_math.h} for the
 definition of the \id{SUNRabs} macro.
 %% 
diff --git a/doc/cvodes/cvs_ex_fwd.tex b/doc/cvodes/cvs_ex_fwd.tex
index bcd3e5909d..ec8f23fa9e 100644
--- a/doc/cvodes/cvs_ex_fwd.tex
+++ b/doc/cvodes/cvs_ex_fwd.tex
@@ -79,7 +79,7 @@ \subsection{A serial nonstiff example: cvsAdvDiff\_FSA\_non}
 
 The \id{cvsAdvDiff\_FSA\_non.c} file begins by including several header files, including 
 the main {\cvodes} header file, the \id{sundials\_types.h} header file for the
-definition of the \id{realtype} type, and the {\nvecs} header file 
+definition of the \id{sunrealtype} type, and the {\nvecs} header file 
 for the definitions of the serial \id{N\_Vector} type and operations on such vectors.
 Following that are definitions of problem constants and a data block for communication
 with the \id{f} routine.  That block includes the problem parameters and the mesh 
@@ -203,7 +203,7 @@ \subsection{A serial dense example: cvsRoberts\_FSA\_dns}
 {\cvodes} to communicate parameter values to the right-hand side function
 \id{f}. In the \id{cvsRoberts\_FSA\_dns} example this is done by defining
 \id{data} to be of type \id{UserData}, i.e. a pointer to a structure which contains
-an array of \id{NP} \id{realtype} values.
+an array of \id{NP} \id{sunrealtype} values.
 
 Four user-supplied functions are defined. The function \id{f}, passed to \id{CVodeInit},
 computes the right-hand side of the ODE (\ref{e:cvsRoberts_FSA_dns_ode}), while
diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
index be21b803d0..6039efb33e 100644
--- a/doc/cvodes/guide/source/Introduction.rst
+++ b/doc/cvodes/guide/source/Introduction.rst
@@ -114,6 +114,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/cvodes/guide/source/Usage/ADJ.rst b/doc/cvodes/guide/source/Usage/ADJ.rst
index 80e567f024..ca236e5767 100644
--- a/doc/cvodes/guide/source/Usage/ADJ.rst
+++ b/doc/cvodes/guide/source/Usage/ADJ.rst
@@ -383,7 +383,7 @@ use in Forward Sensitivity Analysis; for that, see :numref:`CVODES.Usage.FSA`.
 The call to this function has the form
 
 
-.. c:function:: int CVodeF(void * cvode_mem, realtype tout, N_Vector yret, realtype* tret, int itask, int* ncheck)
+.. c:function:: int CVodeF(void * cvode_mem, sunrealtype tout, N_Vector yret, sunrealtype* tret, int itask, int* ncheck)
 
    The function :c:func:`CVodeF` integrates the forward problem over an interval
    in :math:`t`  and saves checkpointing data.
@@ -466,7 +466,7 @@ case when the backward problem does not depend on the forward sensitivities, and
 one for the case when it does. These two functions are described next.
 
 
-.. c:function:: int CVodeInitB(void * cvode_mem, int which, CVRhsFnB rhsB, realtype tB0, N_Vector yB0)
+.. c:function:: int CVodeInitB(void * cvode_mem, int which, CVRhsFnB rhsB, sunrealtype tB0, N_Vector yB0)
 
    The function :c:func:`CVodeInitB` provides problem specification, allocates
    internal memory,  and initializes the backward problem.
@@ -501,7 +501,7 @@ user must call :c:func:`CVodeInitBS` instead of :c:func:`CVodeInitB`. Only the
 third argument of each function differs between these two functions.
 
 
-.. c:function:: int CVodeInitBS(void * cvode_mem, int which, CVRhsFnBS rhsBS, realtype tB0, N_Vector yB0)
+.. c:function:: int CVodeInitBS(void * cvode_mem, int which, CVRhsFnBS rhsBS, sunrealtype tB0, N_Vector yB0)
 
    The function :c:func:`CVodeInitBS` provides problem specification, allocates
    internal memory,  and initializes the backward problem.
@@ -538,7 +538,7 @@ associated with the previous backward problem. The call to the
 :c:func:`CVodeReInitB` function has the form
 
 
-.. c:function:: int CVodeReInitB(void * cvode_mem, int which, realtype tB0, N_Vector yB0)
+.. c:function:: int CVodeReInitB(void * cvode_mem, int which, sunrealtype tB0, N_Vector yB0)
 
    The function :c:func:`CVodeReInitB` reinitializes a CVODES backward problem.
 
@@ -567,7 +567,7 @@ tolerances for the backward problem. Note that this call must be made after the
 call to :c:func:`CVodeInitB` or :c:func:`CVodeInitBS`.
 
 
-.. c:function:: int CVodeSStolerancesB(void * cvode_mem, int which, realtype reltolB, realtype abstolB)
+.. c:function:: int CVodeSStolerancesB(void * cvode_mem, int which, sunrealtype reltolB, sunrealtype abstolB)
 
    The function :c:func:`CVodeSStolerancesB` specifies scalar relative and absolute  tolerances.
 
@@ -741,7 +741,7 @@ sake of efficiency, it should be disabled for :c:func:`CVodeB` by first calling
 
 The call to :c:func:`CVodeB` has the form
 
-.. c:function:: int CVodeB(void * cvode_mem, realtype tBout, int itaskB)
+.. c:function:: int CVodeB(void * cvode_mem, sunrealtype tBout, int itaskB)
 
    The function :c:func:`CVodeB` integrates the backward ODE problem.
 
@@ -786,7 +786,7 @@ repeated calls will eventually advance all problems to ``tBout``.
 
 To obtain the solution ``yB`` to the backward problem, call the function :c:func:`CVodeGetB` as follows:
 
-.. c:function:: int CVodeGetB(void * cvode_mem, int which, realtype* tret, N_Vector yB)
+.. c:function:: int CVodeGetB(void * cvode_mem, int which, sunrealtype* tret, N_Vector yB)
 
    The function :c:func:`CVodeGetB` provides the solution ``yB`` of the backward
    ODE  problem.
@@ -971,7 +971,7 @@ sensitivities.
 The function :c:func:`CVodeSetLinearSolutionScalingB` can be used to enable or
 disable solution scaling when using a matrix-based linear solver.
 
-.. c:function:: int CVodeSetLinearSolutionScalingB(void * cvode_mem, int which, booleantype onoffB)
+.. c:function:: int CVodeSetLinearSolutionScalingB(void * cvode_mem, int which, sunbooleantype onoffB)
 
    The function :c:func:`CVodeSetLinearSolutionScalingB` enables or disables
    scaling  the linear system solution to account for a change in :math:`\gamma`
@@ -1124,7 +1124,7 @@ potentially non-differentiable factor.
       :c:type:`CVSpilsSetPrecSolveFnBS` is now deprecated.
 
 
-.. c:function:: int CVodeSetEpsLinB(void * cvode_mem, int which, realtype eplifacB)
+.. c:function:: int CVodeSetEpsLinB(void * cvode_mem, int which, sunrealtype eplifacB)
 
    The function :c:func:`CVodeSetEpsLinB` specifies the factor by  which the
    Krylov linear solver's convergence test constant is reduced  from the
@@ -1150,7 +1150,7 @@ potentially non-differentiable factor.
       ``CVSpilsSetEpsLinB`` is now deprecated.
 
 
-.. c:function:: int CVodeSetLSNormFactorB(void * cvode_mem, int which, realtype nrmfac)
+.. c:function:: int CVodeSetLSNormFactorB(void * cvode_mem, int which, sunrealtype nrmfac)
 
    The function :c:func:`CVodeSetLSNormFactor` specifies the factor to use when
    converting from the integrator tolerance (WRMS norm) to the linear solver
@@ -1212,7 +1212,7 @@ which the backward solution has just been obtained with :c:func:`CVodeGetB`. In
 any case, it must be within the last checkpoint interval used by
 :c:func:`CVodeB`.
 
-.. c:function:: int CVodeGetAdjY(void * cvode_mem, realtype t, N_Vector y)
+.. c:function:: int CVodeGetAdjY(void * cvode_mem, sunrealtype t, N_Vector y)
 
    The function :c:func:`CVodeGetAdjY` returns the interpolated value of  the forward solution :math:`y` during a backward integration.
 
@@ -1246,11 +1246,11 @@ any case, it must be within the last checkpoint interval used by
 
       * ``ckpnt[i].my_addr`` (``void *``) -- address of current checkpoint in ``cvode_mem->cv_adj_mem``
       * ``ckpnt[i].next_addr`` (``void *``) -- address of next checkpoint
-      * ``ckpnt[i].t0`` (``realtype``) -- start of checkpoint interval
-      * ``ckpnt[i].t1`` (``realtype``) -- end of checkpoint interval
+      * ``ckpnt[i].t0`` (``sunrealtype``) -- start of checkpoint interval
+      * ``ckpnt[i].t1`` (``sunrealtype``) -- end of checkpoint interval
       * ``ckpnt[i].nstep`` (``long int``) -- step counter at ckeckpoint ``t0``
       * ``ckpnt[i].order`` (``int``) -- method order at checkpoint ``t0``
-      * ``ckpnt[i].step`` (``realtype``) -- step size at checkpoint ``t0``
+      * ``ckpnt[i].step`` (``sunrealtype``) -- step size at checkpoint ``t0``
 
 
 Backward integration of quadrature equations
@@ -1353,7 +1353,7 @@ To extract the values of the quadrature variables at the last return time of
 :c:func:`CVodeGetQuad`.
 
 
-.. c:function:: int CVodeGetQuadB(void * cvode_mem, int which, realtype* tret, N_Vector yQB)
+.. c:function:: int CVodeGetQuadB(void * cvode_mem, int which, sunrealtype* tret, N_Vector yQB)
 
    The function :c:func:`CVodeGetQuadB` returns the quadrature solution vector
    after  a successful return from :c:func:`CVodeB`.
@@ -1432,7 +1432,7 @@ ODE right-hand side for the backward problem
 If the backward problem does not depend on the forward sensitivities, the user
 must provide a ``rhsB`` function of type :c:type:`CVRhsFnB` defined as follows:
 
-.. c:type:: int (*CVRhsFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
+.. c:type:: int (*CVRhsFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
 
    This function evaluates the right-hand side :math:`f_B(t,y,y_B)` of the
    backward problem  ODE system. This could be either :eq:`CVODES_adj_eqns` or :eq:`CVODES_adj1_eqns`.
@@ -1480,7 +1480,7 @@ ODE right-hand side for the backward problem depending on the forward sensitivit
 If the backward problem does depend on the forward sensitivities, the user must
 provide a ``rhsBS`` function of type :c:type:`CVRhsFnBS` defined as follows:
 
-.. c:type:: int (*CVRhsFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector yBdot, void *user_dataB)
+.. c:type:: int (*CVRhsFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector yBdot, void *user_dataB)
 
    This function evaluates the right-hand side :math:`f_B(t, y, y_B, s)` of the
    backward problem  ODE system. This could be either :eq:`CVODES_adj_eqns` or
@@ -1531,7 +1531,7 @@ Quadrature right-hand side for the backward problem
 The user must provide an ``fQB`` function of type :c:type:`CVQuadRhsFnB` defined
 by
 
-.. c:type:: int (*CVQuadRhsFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector qBdot, void *user_dataB)
+.. c:type:: int (*CVQuadRhsFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector qBdot, void *user_dataB)
 
    This function computes the quadrature equation right-hand side for the
    backward problem.
@@ -1580,7 +1580,7 @@ Sensitivity-dependent quadrature right-hand side for the backward problem
 The user must provide an ``fQBS`` function of type :c:type:`CVQuadRhsFnBS`
 defined by
 
-.. c:type:: int (*CVQuadRhsFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector qBdot, void *user_dataB)
+.. c:type:: int (*CVQuadRhsFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector qBdot, void *user_dataB)
 
    This function computes the quadrature equation right-hand side for the
    backward problem.
@@ -1632,7 +1632,7 @@ non-``NULL`` ``SUNMatrix`` object was supplied to
 :c:func:`CVodeSetLinearSolverB`), the user may provide a function of type
 :c:type:`CVLsJacFnB` or :c:type:`CVLsJacFnBS`, defined as follows:
 
-.. c:type:: int (*CVLsJacFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
+.. c:type:: int (*CVLsJacFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 
    This function computes the Jacobian of the backward problem (or an
    approximation  to it).
@@ -1681,7 +1681,7 @@ non-``NULL`` ``SUNMatrix`` object was supplied to
       that users transition to the new function type name soon.
 
 
-.. c:type:: int (*CVLsJacFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
+.. c:type:: int (*CVLsJacFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 
    This function computes the Jacobian of the backward problem (or an
    approximation to it), in the case where the backward problem depends on the
@@ -1746,7 +1746,7 @@ function, the user may optionally supply a function of type :c:type:`CVLsLinSysF
 :c:type:`CVLsLinSysFnBS` for evaluating the linear system, :math:`M_B = I - \gamma_B
 J_B` (or an approximation of it) for the backward problem.
 
-.. c:type:: int (*CVLsLinSysFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix AB, booleantype jokB, booleantype *jcurB, realtype gammaB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
+.. c:type:: int (*CVLsLinSysFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix AB, sunbooleantype jokB, sunbooleantype *jcurB, sunrealtype gammaB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
    This function computes the linear system of the backward problem (or an
    approximation to it).
@@ -1787,7 +1787,7 @@ J_B` (or an approximation of it) for the backward problem.
       ``CVLS_JACFUNC_UNRECVR``).
 
 
-.. c:type:: int (*CVLsLinSysFnBS)(realtype t, N_Vector y, N_Vector* yS, N_Vector yB, N_Vector fyB, SUNMatrix AB, booleantype jokB, booleantype *jcurB, realtype gammaB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
+.. c:type:: int (*CVLsLinSysFnBS)(sunrealtype t, N_Vector y, N_Vector* yS, N_Vector yB, N_Vector fyB, SUNMatrix AB, sunbooleantype jokB, sunbooleantype *jcurB, sunrealtype gammaB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
    This function computes the linear system of the backward problem (or an
    approximation to it), in the case where the backward problem depends on the
@@ -1844,7 +1844,7 @@ provide a function of type :c:type:`CVLsJacTimesVecFnB` or
 products :math:`Jv`. If such a function is not supplied, the default is a
 difference quotient approximation to these products.
 
-.. c:type:: int (*CVLsJacTimesVecFnB)(N_Vector vB, N_Vector JvB, realtype t, N_Vector y, N_Vector yB, N_Vector fyB, void *jac_dataB, N_Vector tmpB);
+.. c:type:: int (*CVLsJacTimesVecFnB)(N_Vector vB, N_Vector JvB, sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, void *jac_dataB, N_Vector tmpB);
 
    This function computes the action of the Jacobian ``JB`` for  the backward
    problem on a given vector ``vB``.
@@ -1877,7 +1877,7 @@ difference quotient approximation to these products.
       :c:type:`CVSpilsJacTimesVecFnB` is deprecated.
 
 
-.. c:type:: int (*CVLsJacTimesVecFnBS)(N_Vector vB, N_Vector JvB, realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, void *user_dataB, N_Vector tmpB);
+.. c:type:: int (*CVLsJacTimesVecFnBS)(N_Vector vB, N_Vector JvB, sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, void *user_dataB, N_Vector tmpB);
 
    This function computes the action of the Jacobian ``JB`` for  the backward
    problem on a given vector ``vB``, in the case where  the backward problem
@@ -1920,7 +1920,7 @@ data be preprocessed or evaluated, then this needs to be done in a user-supplied
 function of type :c:type:`CVLsJacTimesSetupFnB` or
 :c:type:`CVLsJacTimesSetupFnBS`, defined as follows:
 
-.. c:type:: int (*CVLsJacTimesSetupFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, void *user_dataB)
+.. c:type:: int (*CVLsJacTimesSetupFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian data needed  by the
    Jacobian-times-vector routine for the backward problem.
@@ -1949,7 +1949,7 @@ function of type :c:type:`CVLsJacTimesSetupFnB` or
       obtain these, the user will need to add a pointer to ``cvode_mem``  to
       ``user_dataB`` and then use the ``CVGet*`` functions described in
       :numref:`CVODES.Usage.SIM.optional_output`. The unit
-      roundoff can be accessed as  ``UNIT_ROUNDOFF`` defined in
+      roundoff can be accessed as  ``SUN_UNIT_ROUNDOFF`` defined in
       ``sundials_types.h``.  The previous function type
       :c:type:`CVSpilsJacTimesSetupFnB` is identical  to
       :c:type:`CVLsJacTimesSetupFnB`, and may still be used for
@@ -1958,7 +1958,7 @@ function of type :c:type:`CVLsJacTimesSetupFnB` or
       name soon.
 
 
-.. c:type:: int (*CVLsJacTimesSetupFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, void *user_dataB)
+.. c:type:: int (*CVLsJacTimesSetupFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian data needed  by the
    Jacobian-times-vector routine for the backward problem, in the case that  the
@@ -1989,7 +1989,7 @@ function of type :c:type:`CVLsJacTimesSetupFnB` or
       etc.  To obtain these, the user will need to add a pointer to
       ``cvode_mem``  to ``user_dataB`` and then use the ``CVGet*`` functions
       described in  :numref:`CVODES.Usage.SIM.optional_output`.
-      The unit roundoff can be accessed as  ``UNIT_ROUNDOFF`` defined in
+      The unit roundoff can be accessed as  ``SUN_UNIT_ROUNDOFF`` defined in
       ``sundials_types.h``.  The previous function type
       :c:type:`CVSpilsJacTimesSetupFnBS` is identical  to
       :c:type:`CVLsJacTimesSetupFnBS`, and may still be used for
@@ -2012,7 +2012,7 @@ If preconditioning is done on both sides, the product of the two preconditioner
 matrices should approximate :math:`M_B`. This function must be of one of the
 following two types:
 
-.. c:type:: int (*CVLsPrecSolveFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, N_Vector rvecB, N_Vector zvecB, realtype gammaB, realtype deltaB, void *user_dataB)
+.. c:type:: int (*CVLsPrecSolveFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, N_Vector rvecB, N_Vector zvecB, sunrealtype gammaB, sunrealtype deltaB, void *user_dataB)
 
    This function solves the preconditioning system :math:`Pz = r` for the
    backward problem.
@@ -2038,7 +2038,7 @@ following two types:
       The previous function type :c:type:`CVSpilsPrecSolveFnB` is deprecated.
 
 
-.. c:type:: int (*CVLsPrecSolveFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, N_Vector rvecB, N_Vector zvecB, realtype gammaB, realtype deltaB, void *user_dataB)
+.. c:type:: int (*CVLsPrecSolveFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, N_Vector rvecB, N_Vector zvecB, sunrealtype gammaB, sunrealtype deltaB, void *user_dataB)
 
    This function solves the preconditioning system :math:`Pz = r` for the backward problem,  in the case where the backward problem depends on the forward sensitivities.
 
@@ -2074,7 +2074,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 preprocessed or evaluated, then this needs to be done in a user-supplied
 function of one of the following two types:
 
-.. c:type:: int (*CVLsPrecSetupFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, booleantype jokB, booleantype *jcurPtrB, realtype gammaB, void *user_dataB)
+.. c:type:: int (*CVLsPrecSetupFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, sunbooleantype jokB, sunbooleantype *jcurPtrB, sunrealtype gammaB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian-related data needed  by
    the preconditioner for the backward problem.
@@ -2103,7 +2103,7 @@ function of one of the following two types:
       name soon.
 
 
-.. c:type:: int (*CVLsPrecSetupFnBS)(realtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, booleantype jokB, booleantype *jcurPtrB, realtype gammaB, void *user_dataB)
+.. c:type:: int (*CVLsPrecSetupFnBS)(sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yB, N_Vector fyB, sunbooleantype jokB, sunbooleantype *jcurPtrB, sunrealtype gammaB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian-related data needed  by
    the preconditioner for the backward problem, in the case where the  backward
@@ -2203,7 +2203,7 @@ iterative ``SUNLinearSolver`` object has been attached to CVODES via a call to
 :c:func:`CVodeSetLinearSolverB`.
 
 
-.. c:function:: int CVBBDPrecInitB(void * cvode_mem, int which, sunindextype NlocalB, sunindextype mudqB, sunindextype mldqB, sunindextype mukeepB, sunindextype mlkeepB, realtype dqrelyB, CVBBDLocalFnB glocB, CVBBDCommFnB gcommB)
+.. c:function:: int CVBBDPrecInitB(void * cvode_mem, int which, sunindextype NlocalB, sunindextype mudqB, sunindextype mldqB, sunindextype mukeepB, sunindextype mlkeepB, sunrealtype dqrelyB, CVBBDLocalFnB glocB, CVBBDCommFnB gcommB)
 
    The function :c:func:`CVBBDPrecInitB` initializes and allocates  memory for the
    CVBBDPRE preconditioner for the backward problem.  It creates, allocates, and
@@ -2230,7 +2230,7 @@ iterative ``SUNLinearSolver`` object has been attached to CVODES via a call to
      * ``CVLS_ILL_INPUT`` -- An invalid parameter has been passed.
 
 
-.. c:function:: int CVBBDPrecReInitB(void * cvode_mem, int which, sunindextype mudqB, sunindextype mldqB, realtype dqrelyB)
+.. c:function:: int CVBBDPrecReInitB(void * cvode_mem, int which, sunindextype mudqB, sunindextype mldqB, sunrealtype dqrelyB)
 
    The function :c:func:`CVBBDPrecReInitB` reinitializes the CVBBDPRE preconditioner
    for the backward problem.
@@ -2266,7 +2266,7 @@ communication necessary to evaluate this approximate right-hand side. The
 prototypes for these two functions are described below.
 
 
-.. c:type:: int (*CVBBDLocalFnB)(sunindextype NlocalB, realtype t, N_Vector y, N_Vector yB, N_Vector gB, void *user_dataB)
+.. c:type:: int (*CVBBDLocalFnB)(sunindextype NlocalB, sunrealtype t, N_Vector y, N_Vector yB, N_Vector gB, void *user_dataB)
 
    This ``glocB`` function loads the vector ``gB``, an approximation to the
    right-hand side :math:`f_B` of the backward problem, as a function of ``t``,
@@ -2301,7 +2301,7 @@ prototypes for these two functions are described below.
       ``CV_LSETUP_FAIL``).
 
 
-.. c:type:: int (*CVBBDCommFnB)(sunindextype NlocalB, realtype t, N_Vector y, N_Vector yB, void *user_dataB)
+.. c:type:: int (*CVBBDCommFnB)(sunindextype NlocalB, sunrealtype t, N_Vector y, N_Vector yB, void *user_dataB)
 
    This ``gcommB`` function must perform all interprocess communications
    necessary  for the execution of the ``glocB`` function above, using the input
diff --git a/doc/cvodes/guide/source/Usage/FSA.rst b/doc/cvodes/guide/source/Usage/FSA.rst
index 205dabf7bb..02c502fe44 100644
--- a/doc/cvodes/guide/source/Usage/FSA.rst
+++ b/doc/cvodes/guide/source/Usage/FSA.rst
@@ -234,7 +234,7 @@ sensitivity analysis beyond those for IVP solution
    Upon completion of the integration, deallocate memory for the vectors
    ``yS0`` using ``N_VDestroyVectorArray(yS0, Ns);``
 
-   If ``yS`` was created from ``realtype`` arrays ``yS_i``, it is the user’s
+   If ``yS`` was created from ``sunrealtype`` arrays ``yS_i``, it is the user’s
    responsibility to also free the space for the arrays ``yS0_i``.
 
 #. :silver:`Finalize MPI, if used`
@@ -429,7 +429,7 @@ One of the following three functions must be called to specify the
 integration tolerances for sensitivities. Note that this call must be made after
 the call to :c:func:`CVodeSensInit` or :c:func:`CVodeSensInit1`.
 
-.. c:function:: int CVodeSensSStolerances(void * cvode_mem, realtype reltolS, realtype* abstolS)
+.. c:function:: int CVodeSensSStolerances(void * cvode_mem, sunrealtype reltolS, sunrealtype* abstolS)
 
    The function :c:func:`CVodeSensSStolerances` specifies scalar relative and absolute
    tolerances.
@@ -446,7 +446,7 @@ the call to :c:func:`CVodeSensInit` or :c:func:`CVodeSensInit1`.
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int CVodeSensSVtolerances(void * cvode_mem, realtype reltolS, N_Vector* abstolS)
+.. c:function:: int CVodeSensSVtolerances(void * cvode_mem, sunrealtype reltolS, N_Vector* abstolS)
 
    The function :c:func:`CVodeSensSVtolerances` specifies scalar relative tolerance
    and  vector absolute tolerances.
@@ -617,7 +617,7 @@ solution :math:`y` in ``yout``. Solution sensitivities can be obtained through
 one of the following functions:
 
 
-.. c:function:: int CVodeGetSens(void * cvode_mem, realtype * tret, N_Vector * yS)
+.. c:function:: int CVodeGetSens(void * cvode_mem, sunrealtype * tret, N_Vector * yS)
 
    The function :c:func:`CVodeGetSens` returns the sensitivity solution vectors after
    a  successful return from :c:func:`CVode`.
@@ -644,7 +644,7 @@ function is called by :c:func:`CVodeGetSens` with ``k`` :math:`= 0`, but may als
 called directly by the user.
 
 
-.. c:function:: int CVodeGetSensDky(void * cvode_mem, realtype t, int k, N_Vector * dkyS)
+.. c:function:: int CVodeGetSensDky(void * cvode_mem, sunrealtype t, int k, N_Vector * dkyS)
 
    The function :c:func:`CVodeGetSensDky` returns derivatives of the sensitivity
    solution  vectors after a successful return from :c:func:`CVode`.
@@ -669,7 +669,7 @@ parameter in turn through the functions :c:func:`CVodeGetSens1` and
 :c:func:`CVodeGetSensDky1`, defined as follows:
 
 
-.. c:function:: int CVodeGetSens1(void * cvode_mem, realtype * tret, int is, N_Vector yS)
+.. c:function:: int CVodeGetSens1(void * cvode_mem, sunrealtype * tret, int is, N_Vector yS)
 
    The function :c:func:`CVodeGetSens1` returns the ``is``-th sensitivity solution
    vector  after a successful return from :c:func:`CVode`.
@@ -693,7 +693,7 @@ parameter in turn through the functions :c:func:`CVodeGetSens1` and
       will be  the same as that returned at the last :c:func:`CVode` call.
 
 
-.. c:function:: int CVodeGetSensDky1(void * cvode_mem, realtype t, int k, int is, N_Vector dkyS)
+.. c:function:: int CVodeGetSensDky1(void * cvode_mem, sunrealtype t, int k, int is, N_Vector dkyS)
 
    The function :c:func:`CVodeGetSensDky1` returns the ``k``-th derivative of the
    ``is``-th sensitivity solution vector after a successful return from
@@ -747,7 +747,7 @@ time and, if successful, takes effect immediately.
    =================================== ==================================== ============
 
 
-.. c:function:: int CVodeSetSensParams(void * cvode_mem, realtype * p, realtype * pbar, int * plist)
+.. c:function:: int CVodeSetSensParams(void * cvode_mem, sunrealtype * p, sunrealtype * pbar, int * plist)
 
    The function :c:func:`CVodeSetSensParams` specifies problem parameter information
    for sensitivity calculations.
@@ -776,7 +776,7 @@ time and, if successful, takes effect immediately.
          :c:func:`CVodeSensInit1`.
 
 
-.. c:function:: int CVodeSetSensDQMethod(void * cvode_mem, int DQtype, realtype DQrhomax)
+.. c:function:: int CVodeSetSensDQMethod(void * cvode_mem, int DQtype, sunrealtype DQrhomax)
 
    The function :c:func:`CVodeSetSensDQMethod` specifies the difference quotient
    strategy in  the case in which the right-hand side of the sensitivity
@@ -805,7 +805,7 @@ time and, if successful, takes effect immediately.
       ``DQrhomax=0.0``.
 
 
-.. c:function:: int CVodeSetSensErrCon(void * cvode_mem, booleantype errconS)
+.. c:function:: int CVodeSetSensErrCon(void * cvode_mem, sunbooleantype errconS)
 
    The function :c:func:`CVodeSetSensErrCon` specifies the error control  strategy for
    sensitivity variables.
@@ -1177,7 +1177,7 @@ right-hand sides of the sensitivity equations :eq:`CVODES_sens_eqns`, for all
 sensitivity parameters at once, through a function of type :c:type:`CVSensRhsFn`
 defined by:
 
-.. c:type:: int (*CVSensRhsFn)(int Ns, realtype t, N_Vector y, N_Vector ydot, N_Vector *yS, N_Vector *ySdot, void *user_data, N_Vector tmp1, N_Vector tmp2)
+.. c:type:: int (*CVSensRhsFn)(int Ns, sunrealtype t, N_Vector y, N_Vector ydot, N_Vector *yS, N_Vector *ySdot, void *user_data, N_Vector tmp1, N_Vector tmp2)
 
    This function computes the sensitivity right-hand side for all sensitivity
    equations at once.  It must compute the vectors
@@ -1227,7 +1227,7 @@ sensitivity parameter at a time, through a function of type
 :c:func:`CVodeSensInit1`. The type :c:type:`CVSensRhs1Fn` is defined by
 
 
-.. c:type:: int (*CVSensRhs1Fn)(int Ns, realtype t, N_Vector y, N_Vector ydot, int iS, N_Vector yS, N_Vector ySdot, void *user_data, N_Vector tmp1, N_Vector tmp2)
+.. c:type:: int (*CVSensRhs1Fn)(int Ns, sunrealtype t, N_Vector y, N_Vector ydot, int iS, N_Vector yS, N_Vector ySdot, void *user_data, N_Vector tmp1, N_Vector tmp2)
 
    This function computes the sensitivity right-hand side for one sensitivity
    equation at a time.  It must compute the vector
@@ -1471,7 +1471,7 @@ vectors, and quadratures depending on sensitivities at time ``t``. However,
 Sensitivity-dependent quadratures can be obtained using one of the following
 functions:
 
-.. c:function:: int CVodeGetQuadSens(void * cvode_mem, realtype tret, N_Vector * yQS)
+.. c:function:: int CVodeGetQuadSens(void * cvode_mem, sunrealtype tret, N_Vector * yQS)
 
    The function :c:func:`CVodeGetQuadSens` returns the quadrature sensitivities
    solution vectors after a successful return from :c:func:`CVode`.
@@ -1494,7 +1494,7 @@ the interpolating polynomials for the sensitivity-dependent quadrature variables
 at time ``t``. This function is called by :c:func:`CVodeGetQuadSens` with ``k =
 0``, but may also be called directly by the user.
 
-.. c:function:: int CVodeGetQuadSensDky(void* cvode_mem, realtype t, int k, N_Vector* dkyQS)
+.. c:function:: int CVodeGetQuadSensDky(void* cvode_mem, sunrealtype t, int k, N_Vector* dkyQS)
 
    The function :c:func:`CVodeGetQuadSensDky` returns derivatives of the
    quadrature sensitivities  solution vectors after a successful return from
@@ -1520,7 +1520,7 @@ Quadrature sensitivity solution vectors can also be extracted separately for
 each parameter in turn through the functions :c:func:`CVodeGetQuadSens1` and
 :c:func:`CVodeGetQuadSensDky1`, defined as follows:
 
-.. c:function:: int CVodeGetQuadSens1(void * cvode_mem, realtype tret, int is, N_Vector yQS)
+.. c:function:: int CVodeGetQuadSens1(void * cvode_mem, sunrealtype tret, int is, N_Vector yQS)
 
    The function :c:func:`CVodeGetQuadSens1` returns the ``is``-th sensitivity
    of quadratures after a successful return from :c:func:`CVode`.
@@ -1540,7 +1540,7 @@ each parameter in turn through the functions :c:func:`CVodeGetQuadSens1` and
      * ``CV_BAD_DKY`` -- ``yQS`` is ``NULL``.
 
 
-.. c:function:: int CVodeGetQuadSensDky1(void * cvode_mem, realtype t, int k, int is, N_Vector dkyQS)
+.. c:function:: int CVodeGetQuadSensDky1(void * cvode_mem, sunrealtype t, int k, int is, N_Vector dkyQS)
 
    The function :c:func:`CVodeGetQuadSensDky1` returns the ``k``-th derivative
    of the  ``is``-th sensitivity solution vector after a successful  return from
@@ -1573,7 +1573,7 @@ CVODES provides the following optional input functions to control the
 integration of sensitivity-dependent quadrature equations.
 
 
-.. c:function:: int CVodeSetQuadSensErrCon(void * cvode_mem, booleantype errconQS)
+.. c:function:: int CVodeSetQuadSensErrCon(void * cvode_mem, sunbooleantype errconQS)
 
    The function :c:func:`CVodeSetQuadSensErrCon` specifies whether or not the
    quadrature variables are to be used in the step size control  mechanism. If
@@ -1600,7 +1600,7 @@ integration of sensitivity-dependent quadrature equations.
          to :c:func:`CVodeQuadSensInit`.
 
 
-.. c:function:: int CVodeQuadSensSStolerances(void * cvode_mem, realtype reltolQS, realtype* abstolQS)
+.. c:function:: int CVodeQuadSensSStolerances(void * cvode_mem, sunrealtype reltolQS, sunrealtype* abstolQS)
 
    The function :c:func:`CVodeQuadSensSStolerances` specifies scalar relative
    and absolute  tolerances.
@@ -1617,7 +1617,7 @@ integration of sensitivity-dependent quadrature equations.
      * ``CV_NO_QUADSENS`` -- Quadratures depending on the sensitivities were not activated.
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
-.. c:function:: int CVodeQuadSensSVtolerances(void * cvode_mem, realtype reltolQS, N_Vector* abstolQS)
+.. c:function:: int CVodeQuadSensSVtolerances(void * cvode_mem, sunrealtype reltolQS, N_Vector* abstolQS)
 
    The function :c:func:`CVodeQuadSensSVtolerances` specifies scalar relative
    and  vector absolute tolerances.
@@ -1745,7 +1745,7 @@ integrand :math:`q`, the appropriate right-hand side functions are given by:
 :math:`\bar{q}_i = q_y s_i + q_{p_i}`. This user function must be of type
 ``CVQuadSensRhsFn`` defined as follows:
 
-.. c:type:: int (*CVQuadSensRhsFn)(int Ns, realtype t, N_Vector y, N_Vector *yS, N_Vector yQdot, N_Vector *yQSdot, void *user_data, N_Vector tmp, N_Vector tmpQ)
+.. c:type:: int (*CVQuadSensRhsFn)(int Ns, sunrealtype t, N_Vector y, N_Vector *yS, N_Vector yQdot, N_Vector *yQSdot, void *user_data, N_Vector tmp, N_Vector tmpQ)
 
    This function computes the sensitivity quadrature equation right-hand side
    for a given value of the independent variable :math:`t`` and state vector
diff --git a/doc/cvodes/guide/source/Usage/SIM.rst b/doc/cvodes/guide/source/Usage/SIM.rst
index 539f521ea7..2a14eb3635 100644
--- a/doc/cvodes/guide/source/Usage/SIM.rst
+++ b/doc/cvodes/guide/source/Usage/SIM.rst
@@ -109,7 +109,7 @@ required is:
 
 * ``cvodes/cvodes.h`` the main header file for CVODES, which defines the several types and various constants, and includes function prototypes. This includes the header file for CVLS, ``cvodes/cvodes_ls.h``.
 
-Note that ``cvodes.h`` includes ``sundials_types.h``, which defines the types, ``realtype``, ``sunindextype``, and ``booleantype`` and the constants ``SUNFALSE`` and ``SUNTRUE``.
+Note that ``cvodes.h`` includes ``sundials_types.h``, which defines the types, ``sunrealtype``, ``sunindextype``, and ``sunbooleantype`` and the constants ``SUNFALSE`` and ``SUNTRUE``.
 
 The calling program must also include an ``N_Vector`` implementation header file, of the form ``nvector/nvector_*.h``. See :numref:`NVectors` for the appropriate name. This file in turn includes the header file ``sundials_nvector.h`` which defines the abstract data type.
 
@@ -328,7 +328,7 @@ calls.
       :c:func:`CVodeSetNonlinearSolver`.
 
 
-.. c:function:: int CVodeInit(void* cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
+.. c:function:: int CVodeInit(void* cvode_mem, CVRhsFn f, sunrealtype t0, N_Vector y0)
 
    The function ``CVodeInit`` provides required problem and solution
    specifications, allocates internal memory, and initializes CVODES.
@@ -372,7 +372,7 @@ integration tolerances (or directly specify the weights used in
 evaluating WRMS vector norms). Note that this call must be made after
 the call to :c:func:`CVodeInit`.
 
-.. c:function:: int CVodeSStolerances(void* cvode_mem, realtype reltol, realtype abstol)
+.. c:function:: int CVodeSStolerances(void* cvode_mem, sunrealtype reltol, sunrealtype abstol)
 
    The function ``CVodeSStolerances`` specifies scalar relative and absolute  tolerances.
 
@@ -387,7 +387,7 @@ the call to :c:func:`CVodeInit`.
      * ``CV_NO_MALLOC`` -- The allocation function returned ``NULL``.
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
-.. c:function:: int CVodeSVtolerances(void* cvode_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int CVodeSVtolerances(void* cvode_mem, sunrealtype reltol, N_Vector abstol)
 
    The function ``CVodeSVtolerances`` specifies scalar relative tolerance and  vector absolute tolerances.
 
@@ -721,7 +721,7 @@ of two modes as to where CVODES is to return a solution. But these
 modes are modified if the user has set a stop time (with :c:func:`CVodeSetStopTime`) or requested
 rootfinding.
 
-.. c:function:: int CVode(void* cvode_mem, realtype tout, N_Vector yout, realtype* tret, int itask)
+.. c:function:: int CVode(void* cvode_mem, sunrealtype tout, N_Vector yout, sunrealtype* tret, int itask)
 
    The function ``CVode`` integrates the ODE over an interval in t.
 
@@ -1014,7 +1014,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 10.  A negative value for ``mxhnil`` indicates that no warning messages should  be issued.
 
-.. c:function:: int CVodeSetStabLimDet(void* cvode_mem, booleantype stldet)
+.. c:function:: int CVodeSetStabLimDet(void* cvode_mem, sunbooleantype stldet)
 
    The function ``CVodeSetStabLimDet`` indicates if  the BDF stability limit detection algorithm should be used. See :numref:`CVODES.Mathematics.stablimit` for further details.
 
@@ -1030,7 +1030,7 @@ Main solver optional input functions
    **Notes:**
       The default value is ``SUNFALSE``. If ``stldet = SUNTRUE`` when BDF is used  and the method order is greater than or equal to 3, then an internal function, ``CVsldet``,  is called to detect a possible stability limit. If such a limit is detected, then the order is  reduced.
 
-.. c:function:: int CVodeSetInitStep(void* cvode_mem, realtype hin)
+.. c:function:: int CVodeSetInitStep(void* cvode_mem, sunrealtype hin)
 
    The function ``CVodeSetInitStep`` specifies the initial step size.
 
@@ -1045,7 +1045,7 @@ Main solver optional input functions
    **Notes:**
       By default, CVODES estimates the initial step size to be the solution :math:`h` of the equation :math:`0.5 h^2 \ddot{y} = 1`,  where :math:`\ddot{y}` is an estimated second derivative of the solution at :math:`t_0`.
 
-.. c:function:: int CVodeSetMinStep(void* cvode_mem, realtype hmin)
+.. c:function:: int CVodeSetMinStep(void* cvode_mem, sunrealtype hmin)
 
    The function ``CVodeSetMinStep`` specifies a lower bound on the magnitude  of the step size.
 
@@ -1061,7 +1061,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 0.0.
 
-.. c:function:: int CVodeSetMaxStep(void* cvode_mem, realtype hmax)
+.. c:function:: int CVodeSetMaxStep(void* cvode_mem, sunrealtype hmax)
 
    The function ``CVodeSetMaxStep`` specifies an upper bound on the magnitude  of the step size.
 
@@ -1077,7 +1077,7 @@ Main solver optional input functions
    **Notes:**
       Pass ``hmax`` = 0.0 to obtain the default value :math:`\infty`.
 
-.. c:function:: int CVodeSetStopTime(void* cvode_mem, realtype tstop)
+.. c:function:: int CVodeSetStopTime(void* cvode_mem, sunrealtype tstop)
 
    The function ``CVodeSetStopTime`` specifies the value of the  independent variable :math:`t` past which the solution is not to proceed.
 
@@ -1098,7 +1098,7 @@ Main solver optional input functions
       A stop time not reached before a call to :c:func:`CVodeReInit` will
       remain active but can be disabled by calling :c:func:`CVodeClearStopTime`.
 
-.. c:function:: int CVodeSetInterpolateStopTime(void* cvode_mem, booleantype interp)
+.. c:function:: int CVodeSetInterpolateStopTime(void* cvode_mem, sunbooleantype interp)
 
    The function ``CVodeSetInterpolateStopTime`` specifies that the output solution should be
    interpolated when the current :math:`t` equals the specified ``tstop`` (instead of
@@ -1277,7 +1277,7 @@ difference approximation or a call to the user-supplied Jacobian function
 is reused and the system matrix :math:`M(t,y) \approx I - \gamma J(t,y)` is recomputed
 using the current :math:`\gamma` value.
 
-.. c:function:: int CVodeSetDeltaGammaMaxLSetup(void* cvode_mem, realtype dgmax_lsetup)
+.. c:function:: int CVodeSetDeltaGammaMaxLSetup(void* cvode_mem, sunrealtype dgmax_lsetup)
 
    The function ``CVodeSetDeltaGammaMaxLSetup`` specifies the maximum allowed
    :math:`\gamma` change that does not require a linear solver setup call. If
@@ -1297,7 +1297,7 @@ using the current :math:`\gamma` value.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetDeltaGammaMaxBadJac(void* cvode_mem, realtype dgmax_jbad)
+.. c:function:: int CVodeSetDeltaGammaMaxBadJac(void* cvode_mem, sunrealtype dgmax_jbad)
 
    The function ``CVodeSetDeltaGammaMaxBadJac`` specifies the maximum allowed
    :math:`\gamma` change after a NLS failure that requires updating the Jacobian
@@ -1448,7 +1448,7 @@ system to account for the lagged value of :math:`\gamma`. See
 necessary, e.g., when providing a custom linear solver that updates the matrix
 using the current :math:`\gamma` as part of the solve.
 
-.. c:function:: int CVodeSetLinearSolutionScaling(void* cvode_mem, booleantype onoff)
+.. c:function:: int CVodeSetLinearSolutionScaling(void* cvode_mem, sunbooleantype onoff)
 
    The function :c:func:`CVodeSetLinearSolutionScaling` enables or disables scaling  the linear system solution to account for a change in :math:`\gamma` in the linear system. For more details see :numref:`SUNLinSol.CVODES.lagged`.
 
@@ -1597,7 +1597,7 @@ the :c:func:`CVodeSetEpsLin` function.
       The previous routine ``CVSpilsSetPreconditioner`` is now a wrapper  for this routine, and may still be used for backward-compatibility.  However, this will be deprecated in future releases, so we recommend  that users transition to the new routine name soon.
 
 
-.. c:function:: int CVodeSetEpsLin(void* cvode_mem, realtype eplifac)
+.. c:function:: int CVodeSetEpsLin(void* cvode_mem, sunrealtype eplifac)
 
    The function ``CVodeSetEpsLin`` specifies the factor by  which the Krylov linear solver's convergence test constant is  reduced from the nonlinear solver test constant.
 
@@ -1621,7 +1621,7 @@ the :c:func:`CVodeSetEpsLin` function.
       The previous routine ``CVSpilsSetEpsLin`` is now a wrapper for this  routine, and may still be used for backward-compatibility.  However,  this will be deprecated in future releases, so we recommend that  users transition to the new routine name soon.
 
 
-.. c:function:: int CVodeSetLSNormFactor(void* cvode_mem, realtype nrmfac)
+.. c:function:: int CVodeSetLSNormFactor(void* cvode_mem, sunrealtype nrmfac)
 
    The function ``CVodeSetLSNormFactor`` specifies the factor to use when  converting from the integrator tolerance (WRMS norm) to the linear solver  tolerance (L2 norm) for Newton linear system solves e.g.,  ``tol_L2 = fac * tol_WRMS``.
 
@@ -1702,7 +1702,7 @@ nonlinear solver.
    **Notes:**
       The default value is 10.
 
-.. c:function:: int CVodeSetNonlinConvCoef(void* cvode_mem, realtype nlscoef)
+.. c:function:: int CVodeSetNonlinConvCoef(void* cvode_mem, sunrealtype nlscoef)
 
    The function ``CVodeSetNonlinConvCoef`` specifies the safety factor used in the nonlinear convergence test (see :numref:`CVODES.Mathematics.ivp_sol`).
 
@@ -1800,7 +1800,7 @@ step size adaptivity.
    make changes gradually and with testing to determine their effectiveness.
 
 
-.. c:function:: int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx, realtype eta_max_fx)
+.. c:function:: int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx, sunrealtype eta_max_fx)
 
    The function ``CVodeSetEtaFixedStepBounds`` specifies the interval lower
    (:math:`\eta_{\mathrm{min\_fx}}`) and upper (:math:`\eta_{\mathrm{max\_fx}}`)
@@ -1826,7 +1826,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
+.. c:function:: int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs)
 
    The function ``CVodeSetEtaMaxFirstStep`` specifies the maximum step size
    factor after the first time step, :math:`\eta_{\mathrm{max\_fs}}`.
@@ -1845,7 +1845,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es)
+.. c:function:: int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es)
 
    The function ``CVodeSetEtaMaxEarlyStepEtaMax`` specifies the maximum step size
    factor for steps early in the integration,
@@ -1902,7 +1902,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
+.. c:function:: int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs)
 
    The function ``CVodeSetEtaMax`` specifies the maximum step size factor,
    :math:`\eta_{\mathrm{max\_gs}}`.
@@ -1929,7 +1929,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
+.. c:function:: int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min)
 
    The function ``CVodeSetEtaMin`` specifies the minimum step size factor,
    :math:`\eta_{\mathrm{min}}`.
@@ -1948,7 +1948,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMinErrFail(void *cvode_mem, realtype eta_min_ef)
+.. c:function:: int CVodeSetEtaMinErrFail(void *cvode_mem, sunrealtype eta_min_ef)
 
    The function ``CVodeSetEtaMinErrFail`` specifies the minimum step size
    factor after an error test failure, :math:`\eta_{\mathrm{min\_ef}}`.
@@ -1968,7 +1968,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef)
+.. c:function:: int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef)
 
    The function ``CVodeSetEtaMaxErrFail`` specifies the maximum step size
    factor after multiple error test failures, :math:`\eta_{\mathrm{max\_ef}}`.
@@ -2021,7 +2021,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
+.. c:function:: int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf)
 
    The function ``CVodeSetEtaConvFail`` specifies the step size factor after a
    nonlinear solver failure :math:`\eta_{\mathrm{cf}}`.
@@ -2123,7 +2123,7 @@ Projection optional input functions
 The following functions can be called to set optional inputs to control
 the projection when solving an IVP with constraints.
 
-.. c:function:: int CVodeSetProjErrEst(void* cvode_mem, booleantype onoff)
+.. c:function:: int CVodeSetProjErrEst(void* cvode_mem, sunbooleantype onoff)
 
    The function ``CVodeSetProjErrEst`` enables or disables projection of  the error estimate by the projection function.
 
@@ -2168,7 +2168,7 @@ the projection when solving an IVP with constraints.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetEpsProj(void* cvode_mem, realtype eps)
+.. c:function:: int CVodeSetEpsProj(void* cvode_mem, sunrealtype eps)
 
    The function ``CVodeSetEpsProj`` specifies the tolerance for the nonlinear  constrained least squares problem solved by the projection function.
 
@@ -2183,7 +2183,7 @@ the projection when solving an IVP with constraints.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int CVodeSetProjFailEta(void* cvode_mem, realtype eta)
+.. c:function:: int CVodeSetProjFailEta(void* cvode_mem, sunrealtype eta)
 
    The function ``CVodeSetProjFailEta`` specifies the time step reduction factor  to apply on a projection function failure.
 
@@ -2212,7 +2212,7 @@ value of :math:`t` in the last internal step taken by CVODES.
 
 The call to the function has the following form:
 
-.. c:function:: int CVodeGetDky(void* cvode_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int CVodeGetDky(void* cvode_mem, sunrealtype t, int k, N_Vector dky)
 
    The function ``CVodeGetDky`` computes the ``k``-th derivative of the function  ``y`` at time ``t``, i.e. :math:`\dfrac{\mathrm d^{k}y}{\mathrm dt^{k}}(t)`, where :math:`t_n - h_u \leq  t \leq t_n`, :math:`t_n` denotes the current internal time reached, and :math:`h_u` is the  last internal step size successfully used by the solver.  The  user may request ``k`` = :math:`0, 1, \ldots, q_u`, where :math:`q_u` is the current order  (optional output ``qlast``).
 
@@ -2390,7 +2390,7 @@ described next.
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODES memory block.
-     * ``lenrw`` -- the number of ``realtype`` values in the CVODES workspace.
+     * ``lenrw`` -- the number of ``sunrealtype`` values in the CVODES workspace.
      * ``leniw`` -- the number of integer values in the CVODES workspace.
 
    **Return value:**
@@ -2398,7 +2398,7 @@ described next.
      * ``CV_MEM_NULL`` -- The CVODES memory block was not initialized through a previous call to :c:func:`CVodeCreate`.
 
    **Notes:**
-      In terms of the problem size :math:`N`, the maximum method order :math:`\texttt{maxord}`, and the number :math:`\texttt{nrtfn}` of root functions (see :numref:`CVODES.Usage.SIM.cvrootinit`) the actual size of the real workspace, in ``realtype`` words, is  given by the following:
+      In terms of the problem size :math:`N`, the maximum method order :math:`\texttt{maxord}`, and the number :math:`\texttt{nrtfn}` of root functions (see :numref:`CVODES.Usage.SIM.cvrootinit`) the actual size of the real workspace, in ``sunrealtype`` words, is  given by the following:
 
       * base value: :math:`\texttt{lenrw} = 96 + ( \texttt{maxord} + 5) N_r + 3\texttt{nrtfn}`;
 
@@ -2530,7 +2530,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetLastStep(void* cvode_mem, realtype *hlast)
+.. c:function:: int CVodeGetLastStep(void* cvode_mem, sunrealtype *hlast)
 
    The function ``CVodeGetLastStep`` returns the  integration step size taken on the last internal step.
 
@@ -2544,7 +2544,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetCurrentStep(void* cvode_mem, realtype *hcur)
+.. c:function:: int CVodeGetCurrentStep(void* cvode_mem, sunrealtype *hcur)
 
    The function ``CVodeGetCurrentStep`` returns the  integration step size to be attempted on the next internal step.
 
@@ -2558,7 +2558,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetActualInitStep(void* cvode_mem, realtype *hinused)
+.. c:function:: int CVodeGetActualInitStep(void* cvode_mem, sunrealtype *hinused)
 
    The function ``CVodeGetActualInitStep`` returns the  value of the integration step size used on the first step.
 
@@ -2575,7 +2575,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetCurrentTime(void* cvode_mem, realtype *tcur)
+.. c:function:: int CVodeGetCurrentTime(void* cvode_mem, sunrealtype *tcur)
 
    The function ``CVodeGetCurrentTime`` returns the  current internal time reached by the solver.
 
@@ -2606,7 +2606,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetTolScaleFactor(void* cvode_mem, realtype *tolsfac)
+.. c:function:: int CVodeGetTolScaleFactor(void* cvode_mem, sunrealtype *tolsfac)
 
    The function ``CVodeGetTolScaleFactor`` returns a  suggested factor by which the user's tolerances  should be scaled when too much accuracy has been  requested for some internal step.
 
@@ -2660,7 +2660,7 @@ described next.
 
 
 
-.. c:function:: int CVodeGetIntegratorStats(void* cvode_mem, long int *nsteps, long int *nfevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, realtype *hinused, realtype *hlast, realtype *hcur, realtype *tcur)
+.. c:function:: int CVodeGetIntegratorStats(void* cvode_mem, long int *nsteps, long int *nfevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, sunrealtype *hinused, sunrealtype *hlast, sunrealtype *hcur, sunrealtype *tcur)
 
    The function ``CVodeGetIntegratorStats`` returns the CVODES integrator statistics as a group.
 
@@ -2930,7 +2930,7 @@ solver, a suffix (for Linear Solver) has been added (e.g. ``lenrwLS``).
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODES memory block.
-     * ``lenrwLS`` -- the number of ``realtype`` values in the CVLS workspace.
+     * ``lenrwLS`` -- the number of ``sunrealtype`` values in the CVLS workspace.
      * ``leniwLS`` -- the number of integer values in the CVLS workspace.
 
    **Return value:**
@@ -3150,7 +3150,7 @@ solver, a suffix (for Linear Solver) has been added here (e.g. ``lenrwLS``).
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODES memory block.
-     * ``lenrwLS`` -- the number of ``realtype`` values in the CVDIAG workspace.
+     * ``lenrwLS`` -- the number of ``sunrealtype`` values in the CVDIAG workspace.
      * ``leniwLS`` -- the number of integer values in the CVDIAG workspace.
 
    **Return value:**
@@ -3159,7 +3159,7 @@ solver, a suffix (for Linear Solver) has been added here (e.g. ``lenrwLS``).
      * ``CVDIAG_LMEM_NULL`` -- The CVDIAG linear solver has not been initialized.
 
    **Notes:**
-      In terms of the problem size :math:`N`, the actual size of the real workspace  is roughly :math:`3 N` ``realtype`` words.
+      In terms of the problem size :math:`N`, the actual size of the real workspace  is roughly :math:`3 N` ``sunrealtype`` words.
 
 
 .. c:function:: int CVDiagGetNumRhsEvals(void* cvode_mem, long int *nfevalsLS)
@@ -3250,7 +3250,7 @@ comments apply if there is to be a jump in the dependent variable
 vector.
 
 
-.. c:function:: int CVodeReInit(void* cvode_mem, realtype t0, N_Vector y0)
+.. c:function:: int CVodeReInit(void* cvode_mem, sunrealtype t0, N_Vector y0)
 
    The function ``CVodeReInit`` provides required problem specifications  and reinitializes CVODES.
 
@@ -3292,7 +3292,7 @@ ODE right-hand side
 
 The user must provide a function of type defined as follows:
 
-.. c:type:: int (*CVRhsFn)(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+.. c:type:: int (*CVRhsFn)(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
    This function computes the ODE right-hand side for a given value of the independent variable :math:`t` and state vector :math:`y`.
 
@@ -3441,7 +3441,7 @@ If a rootfinding problem is to be solved during the integration of the
 ODE system, the user must supply a C function of type ``CVRootFn``, defined as
 follows:
 
-.. c:type:: int (*CVRootFn)(realtype t, N_Vector y, realtype *gout, void *user_data);
+.. c:type:: int (*CVRootFn)(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
    This function implements a vector-valued function :math:`g(t,y)` such that the roots of the ``nrtfn`` components :math:`g_i(t,y)` are sought.
 
@@ -3467,7 +3467,7 @@ When solving an IVP with a constraint equation and providing a
 user-defined projection operation the projection function must have type
 ``CVProjFn``, defined as follows:
 
-.. c:type:: int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj, N_Vector err, void *user_data);
+.. c:type:: int (*CVProjFn)(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj, N_Vector err, void *user_data);
 
    This function computes the projection of the solution and, if enabled, the error on to the constraint manifold.
 
@@ -3493,7 +3493,7 @@ user-defined projection operation the projection function must have type
 
       If needed by the user's projection routine, the error weight vector can be
       accessed by calling :c:func:`CVodeGetErrWeights`, and the unit roundoff is
-      available as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      available as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. versionadded:: 6.2.0
 
@@ -3509,7 +3509,7 @@ a function of type ``CVLsJacFn`` for evaluating the Jacobian of the ODE right-ha
 side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
 
 
-.. c:type:: int (*CVLsJacFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+.. c:type:: int (*CVLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
    This function computes the Jacobian matrix :math:`J = \dfrac{\partial f}{\partial y}` (or an approximation to it).
 
@@ -3549,7 +3549,7 @@ side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
       the current step size, the error weights, etc. To obtain these, the user
       will need to add a pointer to ``cv_mem`` in ``user_data`` and then use the
       ``CVodeGet*`` functions described in :numref:`CVODES.Usage.SIM.optional_output`.
-      The unit roundoff can be accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      The unit roundoff can be accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       **Dense**:
       A user-supplied dense Jacobian function must load the :math:`N` by :math:`N`
@@ -3593,7 +3593,7 @@ side function (or an approximation of it). ``CVLsJacFn`` is defined as follows:
       :math:`\le m-n \le` ``mlower``. Alternatively,
       ``SM_COLUMN_B(J, j)`` returns a pointer to the diagonal element
       of the :math:`j`-th column of ``Jac``, and if we assign this address
-      to ``realtype *col_j``, then the :math:`i`-th element of the
+      to ``sunrealtype *col_j``, then the :math:`i`-th element of the
       :math:`j`-th column is given by
       ``SM_COLUMN_ELEMENT_B(col_j, i, j)``, counting from 0.  Thus,
       for :math:`(m,n)` within the band, :math:`J(m,n)` can be loaded by setting
@@ -3639,7 +3639,7 @@ side function, the user may optionally supply a function of type ``CVLsLinSysFn`
 for evaluating the linear system, :math:`M = I - \gamma J` (or an
 approximation of it).  ``CVLsLinSysFn`` is defined as follows:
 
-.. c:type:: int (*CVLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix M, booleantype jok, booleantype *jcur, realtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+.. c:type:: int (*CVLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
    This function computes the linear system matrix :math:`M = I - \gamma J` (or an approximation to it).
 
@@ -3669,7 +3669,7 @@ provide a function of type :c:type:`CVLsJacTimesVecFn` in the following form,
 to compute matrix-vector products :math:`Jv`. If such a function is not supplied,
 the default is a difference quotient approximation to these products.
 
-.. c:type:: int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy, void *user_data, N_Vector tmp);
+.. c:type:: int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy, void *user_data, N_Vector tmp);
 
    This function computes the product :math:`Jv = \dfrac{\partial f(t,y)}{\partial y} v` (or an approximation to it).
 
@@ -3695,7 +3695,7 @@ the default is a difference quotient approximation to these products.
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODES.Usage.SIM.optional_output.optout_main`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsJacTimesVecFn`` is identical to
       :c:func:`CVLsJacTimesVecFn`, and may still be used for backward-compatibility.
@@ -3712,7 +3712,7 @@ If the user’s Jacobian-times-vector routine requires that any
 Jacobian-related data be preprocessed or evaluated, then this needs to
 be done in a user-supplied function of type :c:type:`CVLsJacTimesSetupFn`, defined as follows:
 
-.. c:type:: int (*CVLsJacTimesSetupFn)(realtype t, N_Vector y, N_Vector fy, void *user_data);
+.. c:type:: int (*CVLsJacTimesSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, void *user_data);
 
    This function preprocesses and/or evaluates Jacobian-related data needed by the Jacobian-times-vector routine.
 
@@ -3740,7 +3740,7 @@ be done in a user-supplied function of type :c:type:`CVLsJacTimesSetupFn`, defin
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODES.Usage.SIM.optional_output.optout_main`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsJacTimesSetupFn`` is identical
       to :c:type:`CVLsJacTimesSetupFn`, and may still be used for
@@ -3763,7 +3763,7 @@ crudely) the matrix :math:`M = I - \gamma J`, where
 sides, the product of the two preconditioner matrices should approximate
 :math:`M`. This function must be of type :c:type:`CVLsPrecSolveFn`, defined as follows:
 
-.. c:type:: int (*CVLsPrecSolveFn)(realtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, realtype gamma, realtype delta, int lr, void *user_data);
+.. c:type:: int (*CVLsPrecSolveFn)(sunrealtype t, N_Vector y, N_Vector fy, N_Vector r, N_Vector z, sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
    This function solves the preconditioned system :math:`Pz = r`.
 
@@ -3800,7 +3800,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 preprocessed or evaluated, then this needs to be done in a user-supplied
 function of type , defined as follows:
 
-.. c:type:: int (*CVLsPrecSetupFn)(realtype t, N_Vector y, N_Vector fy, booleantype jok, booleantype *jcurPtr, realtype gamma, void *user_data);
+.. c:type:: int (*CVLsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy, sunbooleantype jok, sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
    This function preprocesses and/or evaluates Jacobian-related data needed by the preconditioner.
 
@@ -3843,7 +3843,7 @@ function of type , defined as follows:
       To obtain these, the user will need to add a pointer to ``cvode_mem``
       to ``user_data`` and then use the ``CVodeGet*`` functions described in
       :numref:`CVODES.Usage.SIM.optional_output`. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       The previous function type ``CVSpilsPrecSetupFn`` is identical to
       :c:type:`CVLsPrecSetupFn`, and may still be used for backward-compatibility.
@@ -4042,7 +4042,7 @@ solution and quadratures at time ``t``. However, :c:func:`CVode` will still retu
 only the solution :math:`y` in ``yout``. Solution quadratures can be obtained
 using the following function:
 
-.. c:function:: int CVodeGetQuad(void * cvode_mem, realtype* tret, N_Vector yQ)
+.. c:function:: int CVodeGetQuad(void * cvode_mem, sunrealtype* tret, N_Vector yQ)
 
    The function ``CVodeGetQuad`` returns the quadrature solution vector after a  successful return from ``CVode``.
 
@@ -4066,7 +4066,7 @@ interpolating polynomials for the quadrature variables at time ``t``. This
 function is called by :c:func:`CVodeGetQuad` with ``k = 0`` and with the current time
 at which :c:func:`CVode` has returned, but may also be called directly by the user.
 
-.. c:function:: int CVodeGetQuadDky(void * cvode_mem, realtype t, int k, N_Vector dkyQ)
+.. c:function:: int CVodeGetQuadDky(void * cvode_mem, sunrealtype t, int k, N_Vector dkyQ)
 
    The function ``CVodeGetQuadDky`` returns derivatives of the quadrature solution  vector after a successful return from :c:func:`CVode`.
 
@@ -4097,7 +4097,7 @@ CVODES provides the following optional input functions to control the integratio
 of quadrature equations.
 
 
-.. c:function:: int CVodeSetQuadErrCon(void * cvode_mem, booleantype errconQ)
+.. c:function:: int CVodeSetQuadErrCon(void * cvode_mem, sunbooleantype errconQ)
 
    The function ``CVodeSetQuadErrCon`` specifies whether or not the  quadrature variables are to be used in the step size control mechanism within CVODES.  If they are, the user must call :c:func:`CVodeQuadSStolerances`  or :c:func:`CVodeQuadSVtolerances` to specify the  integration tolerances for the quadrature variables.
 
@@ -4122,7 +4122,7 @@ If the quadrature variables are part of the step size control mechanism,
 one of the following functions must be called to specify the
 integration tolerances for quadrature variables.
 
-.. c:function:: int CVodeQuadSStolerances(void *cvode_mem, realtype reltolQ, realtype abstolQ)
+.. c:function:: int CVodeQuadSStolerances(void *cvode_mem, sunrealtype reltolQ, sunrealtype abstolQ)
 
    The function ``CVodeQuadSStolerances`` specifies scalar relative and absolute tolerances.
 
@@ -4138,7 +4138,7 @@ integration tolerances for quadrature variables.
      * ``CV_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int CVodeQuadSVtolerances(void * cvode_mem, realtype reltolQ, N_Vector abstolQ)
+.. c:function:: int CVodeQuadSVtolerances(void * cvode_mem, sunrealtype reltolQ, N_Vector abstolQ)
 
    The function ``CVodeQuadSVtolerances`` specifies scalar relative and vector absolute tolerances.
 
@@ -4232,7 +4232,7 @@ that defines the right-hand side of the quadrature equations (in other words,
 the integrand function of the integral that must be evaluated). This function
 must be of type :c:type:`CVQuadRhsFn` defined as follows:
 
-.. c:type:: int (*CVQuadRhsFn)(realtype t, N_Vector y, N_Vector yQdot, void *user_data)
+.. c:type:: int (*CVQuadRhsFn)(sunrealtype t, N_Vector y, N_Vector yQdot, void *user_data)
 
    This function computes the quadrature equation right-hand side for a given value
    of the independent variable :math:`t` and state vector :math:`y`.
@@ -4399,7 +4399,7 @@ the CVBANDPRE module:
 
    **Arguments:**
      * ``cvode_mem`` -- pointer to the CVODES memory block.
-     * ``lenrwBP`` -- the number of ``realtype`` values in the CVBANDPRE workspace.
+     * ``lenrwBP`` -- the number of ``sunrealtype`` values in the CVBANDPRE workspace.
      * ``leniwBP`` -- the number of integer values in the CVBANDPRE workspace.
 
    **Return value:**
@@ -4531,7 +4531,7 @@ The user is responsible for providing space (presumably within ``user_data``)
 for components of :math:`y` that are communicated between processes by ``cfn``, and
 that are then used by ``gloc``, which should not do any communication.
 
-.. c:type:: int (*CVLocalFn)(sunindextype Nlocal, realtype t, N_Vector y, N_Vector glocal, void *user_data);
+.. c:type:: int (*CVLocalFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, N_Vector glocal, void *user_data);
 
    This ``gloc`` function computes :math:`g(t,y)`. It loads the vector ``glocal`` as a function of ``t`` and ``y``.
 
@@ -4556,7 +4556,7 @@ that are then used by ``gloc``, which should not do any communication.
       The case where :math:`g` is mathematically identical to :math:`f` is allowed.
 
 
-.. c:type:: int (*CVCommFn)(sunindextype Nlocal, realtype t, N_Vector y, void *user_data);
+.. c:type:: int (*CVCommFn)(sunindextype Nlocal, sunrealtype t, N_Vector y, void *user_data);
 
    This ``cfn`` function performs all interprocess communication necessary for the execution of the ``gloc`` function above, using the input vector ``y``.
 
@@ -4660,7 +4660,7 @@ The user-callable functions that initialize or re-initialize
 the CVBBDPRE preconditioner module are described next.
 
 
-.. c:function:: int CVBBDPrecInit(void* cvode_mem, sunindextype local_N, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dqrely, CVLocalFn gloc, CVCommFn cfn)
+.. c:function:: int CVBBDPrecInit(void* cvode_mem, sunindextype local_N, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn)
 
    The function ``CVBBDPrecInit`` initializes and allocates (internal) memory for the CVBBDPRE preconditioner.
 
@@ -4713,7 +4713,7 @@ one or more of the corresponding CVLS "set" functions, must
 also be made (in the proper order).
 
 
-.. c:function:: int CVBBDPrecReInit(void* cvode_mem, sunindextype mudq, sunindextype mldq, realtype dqrely)
+.. c:function:: int CVBBDPrecReInit(void* cvode_mem, sunindextype mudq, sunindextype mldq, sunrealtype dqrely)
 
    The function ``CVBBDPrecReInit`` re-initializes the CVBBDPRE preconditioner.
 
@@ -4743,7 +4743,7 @@ the CVBBDPRE module:
 
    **Arguments:**
       * ``cvode_mem`` -- pointer to the CVODES memory block.
-      * ``lenrwBBDP`` -- local number of ``realtype`` values in the CVBBDPRE workspace.
+      * ``lenrwBBDP`` -- local number of ``sunrealtype`` values in the CVBBDPRE workspace.
       * ``leniwBBDP`` -- local number of integer values in the CVBBDPRE workspace.
 
    **Return value:**
diff --git a/doc/cvodes/guide/source/sunnonlinsol/CVODES_interface.rst b/doc/cvodes/guide/source/sunnonlinsol/CVODES_interface.rst
index 19a115306c..74f850423b 100644
--- a/doc/cvodes/guide/source/sunnonlinsol/CVODES_interface.rst
+++ b/doc/cvodes/guide/source/sunnonlinsol/CVODES_interface.rst
@@ -60,7 +60,7 @@ users, but might be useful for users who choose to provide their own
 implementation of the ``SUNNonlinearSolver`` API. For example, such a user might
 need access to the current value of :math:`\gamma` to compute Jacobian data.
 
-.. c:function:: int CVodeGetCurrentGamma(void* cvode_mem, realtype* gamma)
+.. c:function:: int CVodeGetCurrentGamma(void* cvode_mem, sunrealtype* gamma)
 
    The function :c:func:`CVodeGetCurrentGamma` returns the current value of the
    scalar :math:`\gamma`.
@@ -91,7 +91,7 @@ need access to the current value of :math:`\gamma` to compute Jacobian data.
      * ``CV_MEM_NULL`` -- The CVODES memory block was ``NULL``.
 
 
-.. c:function:: int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur, N_Vector *ypred, N_Vector *yn, N_Vector *fn, realtype *gamma, realtype *rl1, N_Vector *zn1, void **user_data)
+.. c:function:: int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur, N_Vector *ypred, N_Vector *yn, N_Vector *fn, sunrealtype *gamma, sunrealtype *rl1, N_Vector *zn1, void **user_data)
 
    The function :c:func:`CVodeGetNonlinearSystemData` returns all internal data
    required to construct the current nonlinear system :eq:`CVODES_res_corrector` or
diff --git a/doc/ida/guide/source/Introduction.rst b/doc/ida/guide/source/Introduction.rst
index 83a4da2ba8..86d00e6885 100644
--- a/doc/ida/guide/source/Introduction.rst
+++ b/doc/ida/guide/source/Introduction.rst
@@ -75,6 +75,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/ida/guide/source/Usage/index.rst b/doc/ida/guide/source/Usage/index.rst
index c6fca6bcee..2b38d456ab 100644
--- a/doc/ida/guide/source/Usage/index.rst
+++ b/doc/ida/guide/source/Usage/index.rst
@@ -97,7 +97,7 @@ data types can be used. The header file that is always required is:
   header file for IDALS, ``ida/ida_ls.h``.
 
 Note that ``ida.h`` includes ``sundials_types.h``, which defines the types,
-``realtype``, ``sunindextype``, and ``booleantype`` and the constants
+``sunrealtype``, ``sunindextype``, and ``sunbooleantype`` and the constants
 ``SUNFALSE`` and ``SUNTRUE``.
 
 The calling program must also include an ``N_Vector`` implementation
@@ -347,7 +347,7 @@ IDA initialization and deallocation functions
    **Return value:**
       * ``void*`` pointer the IDA solver object.
 
-.. c:function:: int IDAInit(void* ida_mem, IDAResFn res, realtype t0, N_Vector y0, N_Vector yp0)
+.. c:function:: int IDAInit(void* ida_mem, IDAResFn res, sunrealtype t0, N_Vector y0, N_Vector yp0)
 
    The function ``IDAInit`` provides required problem and solution
    specifications, allocates internal memory, and initializes IDA.
@@ -393,7 +393,7 @@ One of the following three functions must be called to specify the integration
 tolerances (or directly specify the weights used in evaluating WRMS vector
 norms). Note that this call must be made after the call to :c:func:`IDAInit`.
 
-.. c:function:: int IDASStolerances(void* ida_mem, realtype reltol, realtype abstol)
+.. c:function:: int IDASStolerances(void* ida_mem, sunrealtype reltol, sunrealtype abstol)
 
    The function ``IDASStolerances`` specifies scalar relative and absolute
    tolerances.
@@ -410,7 +410,7 @@ norms). Note that this call must be made after the call to :c:func:`IDAInit`.
         called.
       * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
-.. c:function:: int IDASVtolerances(void* ida_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int IDASVtolerances(void* ida_mem, sunrealtype reltol, N_Vector abstol)
 
    The function ``IDASVtolerances`` specifies scalar relative tolerance and
    vector absolute tolerances.
@@ -685,7 +685,7 @@ successful call to the linear system solver specification function. The call to
 :c:func:`IDACalcIC` should precede the call(s) to :c:func:`IDASolve` for the
 given problem.
 
-.. c:function:: int IDACalcIC(void* ida_mem, int icopt, realtype tout1)
+.. c:function:: int IDACalcIC(void* ida_mem, int icopt, sunrealtype tout1)
 
    The function ``IDACalcIC`` corrects the initial values ``y0`` and ``yp0`` at
    time ``t0``.
@@ -792,7 +792,7 @@ the user has set a stop time (with :c:func:`IDASetStopTime`) or requested
 rootfinding (with :c:func:`IDARootInit`).
 
 
-.. c:function:: int IDASolve(void * ida_mem, realtype tout, realtype* tret, N_Vector yret, N_Vector ypret, int itask)
+.. c:function:: int IDASolve(void * ida_mem, sunrealtype tout, sunrealtype* tret, N_Vector yret, N_Vector ypret, int itask)
 
    The function ``IDASolve`` integrates the DAE over an interval in t.
 
@@ -1078,7 +1078,7 @@ Main solver optional input functions
       Passing ``mxsteps`` = 0 results in IDA using the default value (500).
       Passing ``mxsteps`` < 0 disables the test (not recommended).
 
-.. c:function:: int IDASetInitStep(void * ida_mem, realtype hin)
+.. c:function:: int IDASetInitStep(void * ida_mem, sunrealtype hin)
 
    The function ``IDASetInitStep`` specifies the initial step size.
 
@@ -1096,7 +1096,7 @@ Main solver optional input functions
       :math:`\|h \dot{y} \|_{{\scriptsize WRMS}} = 1/2`, with an added restriction
       that :math:`|h| \leq .001|t_{\text{out}} - t_0|`.
 
-.. c:function:: int IDASetMinStep(void * ida_mem, realtype hmin)
+.. c:function:: int IDASetMinStep(void * ida_mem, sunrealtype hmin)
 
    The function ``IDASetMinStep`` specifies the minimum absolute value of the
    step size.
@@ -1114,7 +1114,7 @@ Main solver optional input functions
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetMaxStep(void * ida_mem, realtype hmax)
+.. c:function:: int IDASetMaxStep(void * ida_mem, sunrealtype hmax)
 
    The function ``IDASetMaxStep`` specifies the maximum absolute value of the
    step size.
@@ -1132,7 +1132,7 @@ Main solver optional input functions
    **Notes:**
       Pass ``hmax = 0`` to obtain the default value :math:`\infty`.
 
-.. c:function:: int IDASetStopTime(void * ida_mem, realtype tstop)
+.. c:function:: int IDASetStopTime(void * ida_mem, sunrealtype tstop)
 
    The function ``IDASetStopTime`` specifies the value of the independent
    variable :math:`t` past which the solution is not to proceed.
@@ -1191,7 +1191,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 10.
 
-.. c:function:: int IDASetSuppressAlg(void * ida_mem, booleantype suppressalg)
+.. c:function:: int IDASetSuppressAlg(void * ida_mem, sunbooleantype suppressalg)
 
    The function ``IDASetSuppressAlg`` indicates whether or not to suppress
    algebraic variables in the local error test.
@@ -1356,7 +1356,7 @@ more details. The function :c:func:`IDASetLinearSolutionScaling` can be used to
 disable this scaling when necessary, e.g., when providing a custom linear solver
 that updates the matrix using the current :math:`\alpha` as part of the solve.
 
-.. c:function:: int IDASetDeltaCjLSetup(void* ida_mem, realtype dcj)
+.. c:function:: int IDASetDeltaCjLSetup(void* ida_mem, sunrealtype dcj)
 
    The function ``IDASetDeltaCjLSetup`` specifies the parameter that determines
    the bounds on a change in :math:`c_j` that require a linear solver setup
@@ -1377,7 +1377,7 @@ that updates the matrix using the current :math:`\alpha` as part of the solve.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetLinearSolutionScaling(void * ida_mem, booleantype onoff)
+.. c:function:: int IDASetLinearSolutionScaling(void * ida_mem, sunbooleantype onoff)
 
    The function ``IDASetLinearSolutionScaling`` enables or disables scaling the
    linear system solution to account for a change in :math:`\alpha` in the
@@ -1461,7 +1461,7 @@ When using the default difference-quotient approximation to the Jacobian-vector
 product, the user may specify the factor to use in setting increments for the
 finite-difference approximation, via a call to :c:func:`IDASetIncrementFactor`.
 
-.. c:function:: int IDASetIncrementFactor(void * ida_mem, realtype dqincfac)
+.. c:function:: int IDASetIncrementFactor(void * ida_mem, sunrealtype dqincfac)
 
    The function ``IDASetIncrementFactor`` specifies the increment factor to be
    used in the difference-quotient approximation to the product :math:`Jv`.
@@ -1596,7 +1596,7 @@ where :math:`\epsilon` is the nonlinear solver tolerance, and the default
 :math:`\epsilon_L = 0.05`; this value may be modified by the user through the
 :c:func:`IDASetEpsLin` function.
 
-.. c:function:: int IDASetEpsLin(void * ida_mem, realtype eplifac)
+.. c:function:: int IDASetEpsLin(void * ida_mem, sunrealtype eplifac)
 
    The function ``IDASetEpsLin`` specifies the factor by which the Krylov linear
    solver's convergence test constant is reduced from the nonlinear iteration
@@ -1625,7 +1625,7 @@ where :math:`\epsilon` is the nonlinear solver tolerance, and the default
       will be deprecated in future releases, so we recommend that users
       transition to the new routine name soon.
 
-.. c:function:: int IDASetLSNormFactor(void * ida_mem, realtype nrmfac)
+.. c:function:: int IDASetLSNormFactor(void * ida_mem, sunrealtype nrmfac)
 
    The function ``IDASetLSNormFactor`` specifies the factor to use when
    converting from the integrator tolerance (WRMS norm) to the linear solver
@@ -1716,7 +1716,7 @@ nonlinear solver.
       The default value is 10.
 
 
-.. c:function:: int IDASetNonlinConvCoef(void * ida_mem, realtype nlscoef)
+.. c:function:: int IDASetNonlinConvCoef(void * ida_mem, sunrealtype nlscoef)
 
    The function ``IDASetNonlinConvCoef`` specifies the safety factor in the
    nonlinear convergence test; see :eq:`IDA_DAE_nls_test`.
@@ -1787,7 +1787,7 @@ Initial condition calculation optional input functions
 The following functions can be called just prior to calling :c:func:`IDACalcIC`
 to set optional inputs controlling the initial condition calculation.
 
-.. c:function:: int IDASetNonlinConvCoefIC(void * ida_mem, realtype epiccon)
+.. c:function:: int IDASetNonlinConvCoefIC(void * ida_mem, sunrealtype epiccon)
 
    The function ``IDASetNonlinConvCoefIC`` specifies the positive constant in
    the Newton iteration convergence test within the initial condition
@@ -1883,7 +1883,7 @@ to set optional inputs controlling the initial condition calculation.
    **Notes:**
       The default value is :math:`100`.
 
-.. c:function:: int IDASetLineSearchOffIC(void * ida_mem, booleantype lsoff)
+.. c:function:: int IDASetLineSearchOffIC(void * ida_mem, sunbooleantype lsoff)
 
    The function ``IDASetLineSearchOffIC`` specifies whether to turn on or off
    the linesearch algorithm.
@@ -1962,7 +1962,7 @@ step size adaptivity.
    make changes gradually and with testing to determine their effectiveness.
 
 
-.. c:function:: int IDASetEtaFixedStepBounds(void* ida_mem, realtype eta_min_fx, realtype eta_max_fx)
+.. c:function:: int IDASetEtaFixedStepBounds(void* ida_mem, sunrealtype eta_min_fx, sunrealtype eta_max_fx)
 
    The function ``IDASetEtaFixedStepBounds`` specifies the bounds
    :math:`\eta_{\mathrm{min\_fx}}` and :math:`\eta_{\mathrm{max\_fx}}`. If step size
@@ -1987,7 +1987,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetEtaMax(void* ida_mem, realtype eta_max)
+.. c:function:: int IDASetEtaMax(void* ida_mem, sunrealtype eta_max)
 
    The function ``IDASetEtaMax`` specifies the maximum step size growth
    factor :math:`\eta_{\mathrm{max}}`.
@@ -2004,7 +2004,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetEtaMin(void* ida_mem, realtype eta_min)
+.. c:function:: int IDASetEtaMin(void* ida_mem, sunrealtype eta_min)
 
    The function ``IDASetEtaMin`` specifies the minimum step size reduction
    factor :math:`\eta_{\mathrm{min}}`.
@@ -2024,7 +2024,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetEtaLow(void* ida_mem, realtype eta_low)
+.. c:function:: int IDASetEtaLow(void* ida_mem, sunrealtype eta_low)
 
    The function ``IDASetEtaLow`` specifies the maximum step size reduction
    factor :math:`\eta_{\mathrm{low}}`.
@@ -2044,7 +2044,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetEtaMinErrFail(void* ida_mem, realtype eta_min_ef)
+.. c:function:: int IDASetEtaMinErrFail(void* ida_mem, sunrealtype eta_min_ef)
 
    The function ``IDASetEtaMinErrFail`` specifies the minimum step size
    reduction factor :math:`\eta_{\mathrm{min\_ef}}` after an error test failure.
@@ -2064,7 +2064,7 @@ step size adaptivity.
 
    .. versionadded:: 6.2.0
 
-.. c:function:: int IDASetEtaConvFail(void* ida_mem, realtype eta_cf)
+.. c:function:: int IDASetEtaConvFail(void* ida_mem, sunrealtype eta_cf)
 
    The function ``IDASetEtaConvFail`` specifies the step size reduction factor
    :math:`\eta_{\mathrm{cf}}` after a nonlinear solver convergence failure.
@@ -2166,7 +2166,7 @@ output values. This function must be called after a successful return from
 derivatives of order up to the last internal order used for any value of
 :math:`t` in the last internal step taken by IDA.
 
-.. c:function:: int IDAGetDky(void * ida_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int IDAGetDky(void * ida_mem, sunrealtype t, int k, N_Vector dky)
 
    The function ``IDAGetDky`` computes the interpolated values of the
    :math:`k^{th}` derivative of :math:`y` for any value of :math:`t` in the last
@@ -2352,7 +2352,7 @@ described next.
       In terms of the problem size :math:`N`, the maximum method order
       ``maxord``, and the number of root functions ``nrtfn`` (see
       :numref:`IDA.Usage.CC.idarootinit`), the actual size of the real workspace, in
-      :c:type:`realtype` words, is given by the following:
+      :c:type:`sunrealtype` words, is given by the following:
 
       * base value:
         :math:`\mathtt{lenrw} = 55 + (m + 6) * N_r + 3 * \mathtt{nrtfn}`;
@@ -2478,7 +2478,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetLastStep(void * ida_mem, realtype * hlast)
+.. c:function:: int IDAGetLastStep(void * ida_mem, sunrealtype * hlast)
 
    The function ``IDAGetLastStep`` returns the integration step size taken on
    the last internal step (if from :c:func:`IDASolve`), or the last value of the
@@ -2494,7 +2494,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetCurrentStep(void * ida_mem, realtype * hcur)
+.. c:function:: int IDAGetCurrentStep(void * ida_mem, sunrealtype * hcur)
 
    The function ``IDAGetCurrentStep`` returns the integration step size to be
    attempted on the next internal step.
@@ -2507,7 +2507,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetActualInitStep(void * ida_mem, realtype * hinused)
+.. c:function:: int IDAGetActualInitStep(void * ida_mem, sunrealtype * hinused)
 
    The function ``IDAGetActualInitStep`` returns the value of the integration
    step size used on the first step.
@@ -2527,7 +2527,7 @@ described next.
    changed by IDA to ensure that the step size is within the prescribed bounds
    :math:`(h_{min} \le h_0 \le h_{max})`, or to meet the local error test.
 
-.. c:function:: int IDAGetCurrentTime(void * ida_mem, realtype * tcur)
+.. c:function:: int IDAGetCurrentTime(void * ida_mem, sunrealtype * tcur)
 
    The function ``IDAGetCurrentTime`` returns the current internal time reached
    by the solver.
@@ -2540,7 +2540,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetTolScaleFactor(void * ida_mem, realtype * tolsfac)
+.. c:function:: int IDAGetTolScaleFactor(void * ida_mem, sunrealtype * tolsfac)
 
    The function ``IDAGetTolScaleFactor`` returns a suggested factor by which the
    user's tolerances should be scaled when too much accuracy has been requested
@@ -2600,7 +2600,7 @@ described next.
       causing the failures are those with largest values for the products,
       denoted loosely as ``eweight[i]*ele[i]``.
 
-.. c:function:: int IDAGetIntegratorStats(void *ida_mem, long int *nsteps, long int *nrevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, realtype *hinused, realtype *hlast, realtype *hcur, realtype *tcur)
+.. c:function:: int IDAGetIntegratorStats(void *ida_mem, long int *nsteps, long int *nrevals, long int *nlinsetups, long int *netfails, int *qlast, int *qcur, sunrealtype *hinused, sunrealtype *hlast, sunrealtype *hcur, sunrealtype *tcur)
 
     The function ``IDAGetIntegratorStats`` returns the IDA integrator stats in
     one function call.
@@ -3194,7 +3194,7 @@ integration and the restart, so that the restarted problem uses the new values
 (which have jumped).  Similar comments apply if there is to be a jump in the
 dependent variable vector.
 
-.. c:function:: int IDAReInit(void * ida_mem, realtype t0, N_Vector y0, N_Vector yp0)
+.. c:function:: int IDAReInit(void * ida_mem, sunrealtype t0, N_Vector y0, N_Vector yp0)
 
    The function ``IDAReInit`` provides required problem specifications and
    reinitializes IDA.
@@ -3241,7 +3241,7 @@ DAE residual function
 
 The user must provide a function of type :c:type:`IDAResFn` defined as follows:
 
-.. c:type:: int (*IDAResFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+.. c:type:: int (*IDAResFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 
    This function computes the problem residual for given values of the
    independent variable :math:`t`, state vector :math:`y`, and derivative
@@ -3349,7 +3349,7 @@ If a rootfinding problem is to be solved during the integration of the DAE
 system, the user must supply a function of type :c:type:`IDARootFn`, defined
 as follows:
 
-.. c:type:: int (*IDARootFn)(realtype t, N_Vector y, N_Vector yp, realtype *gout, void *user_data)
+.. c:type:: int (*IDARootFn)(sunrealtype t, N_Vector y, N_Vector yp, sunrealtype *gout, void *user_data)
 
    This function computes a vector-valued function :math:`g(t,y,\dot{y})` such
    that the roots of the ``nrtfn`` components :math:`g_i(t,y,\dot{y})` are to be
@@ -3383,7 +3383,7 @@ If a matrix-based linear solver module is used (i.e. a non-``NULL``
 ``SUNMatrix`` object was supplied to :c:func:`IDASetLinearSolver`), the
 user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
 
-.. c:type:: int (*IDALsJacFn)(realtype t, realtype c_j, N_Vector y, N_Vector yp, N_Vector r, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*IDALsJacFn)(sunrealtype t, sunrealtype c_j, N_Vector y, N_Vector yp, N_Vector r, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the Jacobian matrix :math:`J` of the DAE system (or an
    approximation to it), defined by :eq:`IDA_DAE_Jacobian`.
@@ -3441,7 +3441,7 @@ user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
       obtain these, the user will need to add a pointer to ``ida_mem`` to
       ``user_data`` and then use the ``IDAGet*`` functions described in
       :numref:`IDA.Usage.CC.optional_output.optout_main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       **dense:**
 
@@ -3485,7 +3485,7 @@ user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
       elements within the band are those with ``-mupper`` :math:`\le` ``m-n``
       :math:`\le` ``mlower``. Alternatively, ``SM_COLUMN_B(J, j)`` returns a
       pointer to the diagonal element of the ``j``-th column of ``Jac``, and if we
-      assign this address to ``realtype *col_j``, then the ``i``-th element of the
+      assign this address to ``sunrealtype *col_j``, then the ``i``-th element of the
       ``j``-th column is given by ``SM_COLUMN_ELEMENT_B(col_j, i, j)``, counting
       from :math:`0`. Thus, for :math:`(m,n)` within the band, :math:`J_{m,n}` can
       be loaded by setting ``col_n = SM_COLUMN_B(J, n-1);`` and
@@ -3532,7 +3532,7 @@ provide a function of type :c:type:`IDALsJacTimesVecFn` in the following form, t
 compute matrix-vector products :math:`Jv`. If such a function is not supplied,
 the default is a difference quotient approximation to these products.
 
-.. c:type:: int (*IDALsJacTimesVecFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector v, N_Vector Jv, realtype cj, void *user_data, N_Vector tmp1, N_Vector tmp2)
+.. c:type:: int (*IDALsJacTimesVecFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector v, N_Vector Jv, sunrealtype cj, void *user_data, N_Vector tmp1, N_Vector tmp2)
 
    This function computes the product :math:`Jv` of the DAE system Jacobian
    :math:`J` (or an approximation to it) and a given vector ``v``, where
@@ -3571,7 +3571,7 @@ the default is a difference quotient approximation to these products.
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDA.Usage.CC.optional_output.optout_main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. warning::
 
@@ -3592,7 +3592,7 @@ Jacobian-related data be preprocessed or evaluated, then this needs to be done
 in a user-supplied function of type :c:type:`IDALsJacTimesSetupFn`, defined as
 follows:
 
-.. c:type:: int (*IDALsJacTimesSetupFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, ealtype cj, void *user_data);
+.. c:type:: int (*IDALsJacTimesSetupFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, ealtype cj, void *user_data);
 
    This function setups any data needed by :math:`Jv` product function (see
    :c:type:`IDALsJacTimesVecFn`).
@@ -3627,7 +3627,7 @@ follows:
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDA.Usage.CC.optional_output.optout_main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. warning::
 
@@ -3652,7 +3652,7 @@ approximates (at least crudely) the Jacobian matrix :math:`J =
 must be of type :c:type:`IDALsPrecSolveFn`, defined as follows:
 
 
-.. c:type:: int (*IDALsPrecSolveFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector rvec, N_Vector zvec, realtype cj, realtype delta, void *user_data)
+.. c:type:: int (*IDALsPrecSolveFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector rvec, N_Vector zvec, sunrealtype cj, sunrealtype delta, void *user_data)
 
    This function solves the preconditioning system :math:`Pz = r`.
 
@@ -3693,7 +3693,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 evaluated or preprocessed, then this needs to be done in a user-supplied
 function of type :c:type:`IDALsPrecSetupFn`, defined as follows:
 
-.. c:type:: int (*IDALsPrecSetupFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, realtype cj, void *user_data)
+.. c:type:: int (*IDALsPrecSetupFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, sunrealtype cj, void *user_data)
 
    This function solves the preconditioning system :math:`Pz = r`.
 
@@ -3735,7 +3735,7 @@ function of type :c:type:`IDALsPrecSetupFn`, defined as follows:
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDA.Usage.CC.optional_output.optout_main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
 
 .. _IDA.Usage.CC.precond:
@@ -3851,7 +3851,7 @@ space (presumably within ``user_data``) for components of ``yy`` and ``yp`` that
 are communicated by ``Gcomm`` from the other processors, and that are then used
 by ``Gres``, which should not do any communication.
 
-.. c:type:: int (*IDABBDLocalFn)(sunindextype Nlocal, realtype tt, N_Vector yy, N_Vector yp, N_Vector gval, void *user_data)
+.. c:type:: int (*IDABBDLocalFn)(sunindextype Nlocal, sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector gval, void *user_data)
 
    This ``Gres`` function computes :math:`G(t,y,\dot{y})`. It loads the vector
    ``gval`` as a function of ``tt``, ``yy``, and ``yp``.
@@ -3876,7 +3876,7 @@ by ``Gres``, which should not do any communication.
 
       The case where :math:`G` is mathematically identical to :math:`F` is allowed.
 
-.. c:type:: int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt, N_Vector yy, N_Vector yp, void *user_data)
+.. c:type:: int (*IDABBDCommFn)(sunindextype Nlocal, sunrealtype tt, N_Vector yy, N_Vector yp, void *user_data)
 
    This ``Gcomm`` function performs all inter-processor communications necessary
    for the execution of the ``Gres`` function above, using the input vectors
@@ -3971,7 +3971,7 @@ user main program presented in :numref:`IDA.Usage.CC.skeleton_sim` are not bold.
 The user-callable functions that initialize or re-initialize the IDABBDPRE
 preconditioner module are described next.
 
-.. c:function:: int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dq_rel_yy, IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
+.. c:function:: int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dq_rel_yy, IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
 
    The function ``IDABBDPrecInit`` initializes and allocates (internal) memory
    for the IDABBDPRE preconditioner.
@@ -4030,7 +4030,7 @@ there is a change in any of the linear solver inputs, an additional call to the
 the corresponding ``IDASet***`` functions, must also be made (in the proper
 order).
 
-.. c:function:: int IDABBDPrecReInit(void * ida_mem, sunindextype mudq, sunindextype mldq, realtype dq_rel_yy)
+.. c:function:: int IDABBDPrecReInit(void * ida_mem, sunindextype mudq, sunindextype mldq, sunrealtype dq_rel_yy)
 
    The function ``IDABBDPrecReInit`` reinitializes the IDABBDPRE preconditioner.
 
diff --git a/doc/ida/guide/source/sunnonlinsol/IDA_interface.rst b/doc/ida/guide/source/sunnonlinsol/IDA_interface.rst
index 513b183512..367fe5cb2c 100644
--- a/doc/ida/guide/source/sunnonlinsol/IDA_interface.rst
+++ b/doc/ida/guide/source/sunnonlinsol/IDA_interface.rst
@@ -47,7 +47,7 @@ the ``SUNNonlinearSolver`` API. For example, such a user might need access to
 the current :math:`y` and :math:`\dot{y}` vectors to compute Jacobian data.
 
 
-.. c:function:: int IDAGetCurrentCj(void *ida_mem, realtype *cj)
+.. c:function:: int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj)
 
    The function ``IDAGetCurrentCj`` returns the scalar :math:`c_j` which is
    proportional to the inverse of the step size (:math:`\alpha` in
@@ -88,7 +88,7 @@ the current :math:`y` and :math:`\dot{y}` vectors to compute Jacobian data.
       * ``IDA_MEM_NULL`` -- The IDA memory block is ``NULL``.
 
 
-.. c:function:: int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur, N_Vector *yypred, N_Vector *yppred, N_Vector *yyn, N_Vector *ypn, N_Vector *res, realtype *cj, void **user_data)
+.. c:function:: int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur, N_Vector *yypred, N_Vector *yppred, N_Vector *yyn, N_Vector *ypn, N_Vector *res, sunrealtype *cj, void **user_data)
 
    The function ``IDAGetNonlinearSystemData`` returns all internal data required
    to construct the current nonlinear system :eq:`IDA_res_corrector`.
diff --git a/doc/ida/ida_ex_serial.tex b/doc/ida/ida_ex_serial.tex
index a3579b690f..fb9e8fd934 100644
--- a/doc/ida/ida_ex_serial.tex
+++ b/doc/ida/ida_ex_serial.tex
@@ -28,8 +28,8 @@ \subsection{A dense example: idaRoberts\_dns}\label{ss:idaRoberts}
 Following the initial comment block, this program has a number
 of \id{\#include} lines, which allow access to useful items in {\ida}
 header files.  The \id{sundials\_types.h} file provides the definition of the
-type \id{realtype} (see \ugref{s:types} in the user guide \cite{ida_ug}
-for details).  For now, it suffices to read \id{realtype} as \id{double}.
+type \id{sunrealtype} (see \ugref{s:types} in the user guide \cite{ida_ug}
+for details).  For now, it suffices to read \id{sunrealtype} as \id{double}.
 The \id{ida.h} file provides prototypes for the {\ida}
 functions to be called (excluding the linear solver selection
 function), and also a number of constants that are to be used in
diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
index c9a7d91871..9c037a0fd5 100644
--- a/doc/idas/guide/source/Introduction.rst
+++ b/doc/idas/guide/source/Introduction.rst
@@ -89,6 +89,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/idas/guide/source/Usage/ADJ.rst b/doc/idas/guide/source/Usage/ADJ.rst
index 8996217cce..07adee3c6f 100644
--- a/doc/idas/guide/source/Usage/ADJ.rst
+++ b/doc/idas/guide/source/Usage/ADJ.rst
@@ -414,7 +414,7 @@ Adjoint Sensitivity Analysis. It is not for use in Forward Sensitivity Analysis;
 for that, see :numref:`IDAS.Usage.FSA`. The call to this function
 has the form
 
-.. c:function:: int IDASolveF(void * ida_mem, realtype tout, realtype * tret, N_Vector yret, N_Vector ypret, int itask, int * ncheck)
+.. c:function:: int IDASolveF(void * ida_mem, sunrealtype tout, sunrealtype * tret, N_Vector yret, N_Vector ypret, int itask, int * ncheck)
 
    The function :c:func:`IDASolveF` integrates the forward problem over an
    interval in :math:`t`  and saves checkpointing data.
@@ -512,7 +512,7 @@ not depend on the forward sensitivities. It is essentially wrapper for IDAInit
 with some particularization for backward integration, as described below.
 
 
-.. c:function:: int IDAInitB(void * ida_mem, int which, IDAResFnB resB, realtype tB0, N_Vector yB0, N_Vector ypB0)
+.. c:function:: int IDAInitB(void * ida_mem, int which, IDAResFnB resB, sunrealtype tB0, N_Vector yB0, N_Vector ypB0)
 
    The function :c:func:`IDAInitB` provides problem specification, allocates
    internal memory,  and initializes the backward problem.
@@ -542,7 +542,7 @@ user must call :c:func:`IDAInitBS` instead of :c:func:`IDAInitB`. Only the third
 argument of each function differs between these functions.
 
 
-.. c:function:: int IDAInitBS(void * ida_mem, int which, IDAResFnBS resBS, realtype tB0, N_Vector yB0, N_Vector ypB0)
+.. c:function:: int IDAInitBS(void * ida_mem, int which, IDAResFnBS resBS, sunrealtype tB0, N_Vector yB0, N_Vector ypB0)
 
    The function :c:func:`IDAInitBS` provides problem specification, allocates
    internal memory,  and initializes the backward problem.
@@ -579,7 +579,7 @@ extraction functions ``IDAGet**`` associated with the previous backward problem.
 The call to the :c:func:`IDAReInitB` function has the form
 
 
-.. c:function:: int IDAReInitB(void * ida_mem, int which, realtype tB0, N_Vector yB0, N_Vector ypB0)
+.. c:function:: int IDAReInitB(void * ida_mem, int which, sunrealtype tB0, N_Vector yB0, N_Vector ypB0)
 
    The function :c:func:`IDAReInitB` reinitializes an IDAS backward problem.
 
@@ -608,7 +608,7 @@ One of the following two functions must be called to specify the integration
 tolerances for the backward problem. Note that this call must be made after the
 call to :c:func:`IDAInitB` or :c:func:`IDAInitBS`.
 
-.. c:function:: int IDASStolerancesB(void * ida_mem, int which, realtype reltolB, realtype abstolB)
+.. c:function:: int IDASStolerancesB(void * ida_mem, int which, sunrealtype reltolB, sunrealtype abstolB)
 
    The function :c:func:`IDASStolerancesB` specifies scalar relative and
    absolute  tolerances.
@@ -627,7 +627,7 @@ call to :c:func:`IDAInitB` or :c:func:`IDAInitBS`.
      * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int IDASVtolerancesB(void * ida_mem, int which, realtype reltolB, N_Vector abstolB)
+.. c:function:: int IDASVtolerancesB(void * ida_mem, int which, sunrealtype reltolB, N_Vector abstolB)
 
    The function :c:func:`IDASVtolerancesB` specifies scalar relative tolerance
    and  vector absolute tolerances.
@@ -755,7 +755,7 @@ Both functions require forward solutions at the final time ``tB0``.
 :c:func:`IDACalcICBS` also needs forward sensitivities at the final time
 ``tB0``.
 
-.. c:function:: int IDACalcICB(void * ida_mem, int which, realtype tBout1, N_Vector yfin, N_Vector ypfin)
+.. c:function:: int IDACalcICB(void * ida_mem, int which, sunrealtype tBout1, N_Vector yfin, N_Vector ypfin)
 
    The function :c:func:`IDACalcICB` corrects the initial values ``yB0`` and
    ``ypB0`` at  time ``tB0`` for the backward problem.
@@ -791,7 +791,7 @@ In the case where the backward problem also depends on the forward
 sensitivities, user must call the following function to correct the initial
 conditions:
 
-.. c:function:: int IDACalcICBS(void * ida_mem, int which, realtype tBout1, N_Vector yfin, N_Vector ypfin, N_Vector ySfin, N_Vector ypSfin)
+.. c:function:: int IDACalcICBS(void * ida_mem, int which, sunrealtype tBout1, N_Vector yfin, N_Vector ypfin, N_Vector ySfin, N_Vector ypSfin)
 
    The function :c:func:`IDACalcICBS` corrects the initial values ``yB0`` and
    ``ypB0`` at  time ``tB0`` for the backward problem.
@@ -850,7 +850,7 @@ should be disabled for :c:func:`IDASolveB` by first calling :c:func:`IDARootInit
 
 The call to :c:func:`IDASolveB` has the form
 
-.. c:function:: int IDASolveB(void * ida_mem, realtype tBout, int itaskB)
+.. c:function:: int IDASolveB(void * ida_mem, sunrealtype tBout, int itaskB)
 
    The function :c:func:`IDASolveB` integrates the backward DAE problem.
 
@@ -891,7 +891,7 @@ The call to :c:func:`IDASolveB` has the form
 To obtain the solution ``yB`` to the backward problem, call the function
 :c:func:`IDAGetB` as follows:
 
-.. c:function:: int IDAGetB(void * ida_mem, int which, realtype * tret, N_Vector yB, N_Vector ypB)
+.. c:function:: int IDAGetB(void * ida_mem, int which, sunrealtype * tret, N_Vector yB, N_Vector ypB)
 
    The function :c:func:`IDAGetB` provides the solution ``yB`` of the backward
    DAE  problem.
@@ -1022,7 +1022,7 @@ backward problem depends on the forward sensitivities.
 The function :c:func:`IDASetLinearSolutionScalingB` can be used to enable or
 disable solution scaling when using a matrix-based linear solver.
 
-.. c:function:: int IDASetLinearSolutionScalingB(void * ida_mem, int which, booleantype onoffB)
+.. c:function:: int IDASetLinearSolutionScalingB(void * ida_mem, int which, sunbooleantype onoffB)
 
    The function :c:func:`IDASetLinearSolutionScalingB` enables or disables
    scaling  the linear system solution to account for a change in :math:`\alpha`
@@ -1108,7 +1108,7 @@ product for the backward problem, the user may specify the factor to use in
 setting increments for the finite-difference approximation, via a call to
 :c:func:`IDASetIncrementFactorB`.
 
-.. c:function:: int IDASetIncrementFactorB(void * ida_mem, int which, realtype dqincfacB)
+.. c:function:: int IDASetIncrementFactorB(void * ida_mem, int which, sunrealtype dqincfacB)
 
    The function :c:func:`IDASetIncrementFactorB` specifies the factor  in the
    increments used in the difference quotient approximations to matrix-vector
@@ -1236,7 +1236,7 @@ These may be accomplished through calling the following functions:
       The previous routine ``IDASpilsSetPreconditionerBS`` is now deprecated.
 
 
-.. c:function:: int IDASetEpsLinB(void * ida_mem, int which, realtype eplifacB)
+.. c:function:: int IDASetEpsLinB(void * ida_mem, int which, sunrealtype eplifacB)
 
    The function :c:func:`IDASetEpsLinB` specifies the factor by  which the
    Krylov linear solver's convergence test constant is reduced  from the
@@ -1266,7 +1266,7 @@ These may be accomplished through calling the following functions:
 
       The previous routine ``IDASpilsSetEpsLinB`` is now deprecated.
 
-.. c:function:: int IDASetLSNormFactorB(void * ida_mem, int which, realtype nrmfac)
+.. c:function:: int IDASetLSNormFactorB(void * ida_mem, int which, sunrealtype nrmfac)
 
    The function :c:func:`IDASetLSNormFactorB` specifies the factor to use when
    converting from the integrator tolerance (WRMS norm) to the linear solver
@@ -1341,7 +1341,7 @@ which the backward solution has just been obtained with :c:func:`IDAGetB`. In
 any case, it must be within the last checkpoint interval used by
 :c:func:`IDASolveB`.
 
-.. c:function:: int IDAGetAdjY(void * ida_mem, realtype t, N_Vector y, N_Vector yp)
+.. c:function:: int IDAGetAdjY(void * ida_mem, sunrealtype t, N_Vector y, N_Vector yp)
 
    The function :c:func:`IDAGetAdjY` returns the interpolated value of the
    forward solution :math:`y` and its derivative during a backward integration.
@@ -1381,15 +1381,15 @@ any case, it must be within the last checkpoint interval used by
 
       -  ``ckpnt[i].next_addr`` (``void *``) address of next checkpoint
 
-      -  ``ckpnt[i].t0`` (``realtype``) start of checkpoint interval
+      -  ``ckpnt[i].t0`` (``sunrealtype``) start of checkpoint interval
 
-      -  ``ckpnt[i].t1`` (``realtype``) end of checkpoint interval
+      -  ``ckpnt[i].t1`` (``sunrealtype``) end of checkpoint interval
 
       -  ``ckpnt[i].nstep`` (``long int``) step counter at ckeckpoint ``t0``
 
       -  ``ckpnt[i].order`` (``int``) method order at checkpoint ``t0``
 
-      -  ``ckpnt[i].step`` (``realtype``) step size at checkpoint ``t0``
+      -  ``ckpnt[i].step`` (``sunrealtype``) step size at checkpoint ``t0``
 
 
 .. _IDAS.Usage.ADJ.user_callable.optional_ouput_b.iccalcB:
@@ -1523,7 +1523,7 @@ To extract the values of the quadrature variables at the last return time of
 :c:func:`IDAGetQuad`. The call to this function has the form
 
 
-.. c:function:: int IDAGetQuadB(void * ida_mem, int which, realtype * tret, N_Vector yQB)
+.. c:function:: int IDAGetQuadB(void * ida_mem, int which, sunrealtype * tret, N_Vector yQB)
 
    The function :c:func:`IDAGetQuadB` returns the quadrature solution vector
    after  a successful return from :c:func:`IDASolveB`.
@@ -1603,7 +1603,7 @@ DAE residual for the backward problem
 
 The user must provide a ``resB`` function of type ``IDAResFnB`` defined as follows:
 
-.. c:type:: int (*IDAResFnB)(realtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, void *user_dataB)
+.. c:type:: int (*IDAResFnB)(sunrealtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, void *user_dataB)
 
    This function evaluates the residual of the backward problem DAE system.
    This could be :eq:`IDAS_adj_eqns` or :eq:`IDAS_adj1_eqns`.
@@ -1650,7 +1650,7 @@ DAE residual for the backward problem depending on the forward sensitivities
 The user must provide a ``resBS`` function of type ``IDAResFnBS`` defined as
 follows:
 
-.. c:type:: int (*IDAResFnBS)(realtype t, N_Vector y, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, void *user_dataB)
+.. c:type:: int (*IDAResFnBS)(sunrealtype t, N_Vector y, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, void *user_dataB)
 
    This function evaluates the residual of the backward problem DAE system.
    This could be :eq:`IDAS_adj_eqns` or :eq:`IDAS_adj1_eqns`.
@@ -1699,7 +1699,7 @@ Quadrature right-hand side for the backward problem
 
 The user must provide an ``fQB`` function of type ``IDAQuadRhsFnB`` defined by
 
-.. c:type:: int (*IDAQuadRhsFnB)(realtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector rhsvalBQ, void *user_dataB)
+.. c:type:: int (*IDAQuadRhsFnB)(sunrealtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector rhsvalBQ, void *user_dataB)
 
    This function computes the quadrature equation right-hand side for the
    backward problem.
@@ -1750,7 +1750,7 @@ Sensitivity-dependent quadrature right-hand side for the backward problem
 
 The user must provide an ``fQBS`` function of type ``IDAQuadRhsFnBS`` defined by
 
-.. c:type:: int (*IDAQuadRhsFnBS)(realtype t, N_Vector y, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector rhsvalBQS, void *user_dataB)
+.. c:type:: int (*IDAQuadRhsFnBS)(sunrealtype t, N_Vector y, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector rhsvalBQS, void *user_dataB)
 
    This function computes the quadrature equation residual for the  backward problem.
 
@@ -1803,7 +1803,7 @@ argument in the step described in :numref:`IDAS.Usage.ADJ.skeleton_adj`), the
 user may provide a function of type ``IDALsJacFnB`` or :c:type:`IDALsJacFnBS`, defined
 as follows:
 
-.. c:type:: int (*IDALsJacFnB)(realtype tt, realtype c_jB, N_Vector yy, N_Vector yp, N_Vector yyB, N_Vector ypB, N_Vector rrB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
+.. c:type:: int (*IDALsJacFnB)(sunrealtype tt, sunrealtype c_jB, N_Vector yy, N_Vector yp, N_Vector yyB, N_Vector ypB, N_Vector rrB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 
    This function computes the Jacobian of the backward problem (or an
    approximation  to it).
@@ -1857,7 +1857,7 @@ as follows:
         the new function type name soon.
 
 
-.. c:type:: int (*IDALsJacFnBS)(realtype tt, realtype c_jB, N_Vector yy, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yyB, N_Vector ypB, N_Vector rrB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
+.. c:type:: int (*IDALsJacFnBS)(sunrealtype tt, sunrealtype c_jB, N_Vector yy, N_Vector yp, N_Vector *yS, N_Vector *ypS, N_Vector yyB, N_Vector ypB, N_Vector rrB, SUNMatrix JacB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
    This function computes the Jacobian of the backward problem (or an
    approximation to it), in the case where the backward problem depends on the
@@ -1928,7 +1928,7 @@ in the following form, to compute matrix-vector products :math:`Jv`. If such a
 function is not supplied, the default is a difference quotient approximation to
 these products.
 
-.. c:type:: int (*IDALsJacTimesVecFnB)(realtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector vB, N_Vector JvB, realtype cjB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B)
+.. c:type:: int (*IDALsJacTimesVecFnB)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector vB, N_Vector JvB, sunrealtype cjB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B)
 
    This function computes the action of the backward problem Jacobian ``JB``  on
    a given vector ``vB``.
@@ -1971,7 +1971,7 @@ these products.
       name soon.
 
 
-.. c:type:: int (*IDALsJacTimesVecFnBS)(realtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector vB, N_Vector JvB, realtype cjB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B)
+.. c:type:: int (*IDALsJacTimesVecFnBS)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector vB, N_Vector JvB, sunrealtype cjB, void *user_dataB, N_Vector tmp1B, N_Vector tmp2B)
 
    This function computes the action of the backward problem Jacobian ``JB``  on
    a given vector ``vB``, in the case where the backward problem depends  on the
@@ -2025,7 +2025,7 @@ preprocessed or evaluated, then this needs to be done in a user-supplied
 function of type :c:type:`IDALsJacTimesSetupFnB` or
 :c:type:`IDALsJacTimesSetupFnBS`, defined as follows:
 
-.. c:type:: int (*IDALsJacTimesSetupFnB)(realtype tt, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, realtype cjB, void *user_dataB)
+.. c:type:: int (*IDALsJacTimesSetupFnB)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, sunrealtype cjB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian data needed  by the
    Jacobian-times-vector routine for the backward problem.
@@ -2057,7 +2057,7 @@ function of type :c:type:`IDALsJacTimesSetupFnB` or
       these, the user will need to add a pointer to ``ida_mem``  to
       ``user_dataB`` and then use the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.SIM.user_callable.optional_output.main`.
-      The unit roundoff can be accessed as  ``UNIT_ROUNDOFF`` defined in
+      The unit roundoff can be accessed as  ``SUN_UNIT_ROUNDOFF`` defined in
       ``sundials_types.h``.
 
    .. warning::
@@ -2069,7 +2069,7 @@ function of type :c:type:`IDALsJacTimesSetupFnB` or
       name soon.
 
 
-.. c:type:: int (*IDALsJacTimesSetupFnBS)(realtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, realtype cjB, void *user_dataB)
+.. c:type:: int (*IDALsJacTimesSetupFnBS)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, sunrealtype cjB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian data needed  by the Jacobian-times-vector routine for the backward problem, in the case that  the backward problem depends on the forward sensitivities.
 
@@ -2102,7 +2102,7 @@ function of type :c:type:`IDALsJacTimesSetupFnB` or
       etc.  To obtain these, the user will need to add a pointer to ``ida_mem``
       to ``user_dataB`` and then use the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.ADJ.user_callable.optional_output_b`. The unit roundoff
-      can be accessed as  ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      can be accessed as  ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
       The previous function type ``IDASpilsJacTimesSetupFnBS`` is deprecated.
 
    .. warning::
@@ -2124,7 +2124,7 @@ user must provide a function to solve the linear system :math:`Pz = r`, where
 :math:`P` is a left preconditioner matrix. This function must have one of the
 following two forms:
 
-.. c:type:: int (*IDALsPrecSolveFnB)(realtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector rvecB, N_Vector zvecB, realtype cjB, realtype deltaB, void *user_dataB)
+.. c:type:: int (*IDALsPrecSolveFnB)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector rvecB, N_Vector zvecB, sunrealtype cjB, sunrealtype deltaB, void *user_dataB)
 
    This function solves the preconditioning system :math:`Pz = r` for the backward
    problem.
@@ -2154,7 +2154,7 @@ following two forms:
       ``IDALsPrecSolveFnB``, and is deprecated.
 
 
-.. c:type:: int (*IDALsPrecSolveFnBS)(realtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector rvecB, N_Vector zvecB, realtype cjB, realtype deltaB, void *user_dataB)
+.. c:type:: int (*IDALsPrecSolveFnBS)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, N_Vector rvecB, N_Vector zvecB, sunrealtype cjB, sunrealtype deltaB, void *user_dataB)
 
    This function solves the preconditioning system :math:`Pz = r` for the
    backward problem,  for the case in which the backward problem depends on the
@@ -2196,7 +2196,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 preprocessed or evaluated, then this needs to be done in a user-supplied
 function of one of the following two types:
 
-.. c:type:: int (*IDALsPrecSetupFnB)(realtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, realtype cjB, void *user_dataB)
+.. c:type:: int (*IDALsPrecSetupFnB)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector resvalB, sunrealtype cjB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian-related data needed  by
    the preconditioner for the backward problem.
@@ -2223,7 +2223,7 @@ function of one of the following two types:
       ``IDALsPrecSetupFnB``, and is deprecated.
 
 
-.. c:type:: int (*IDALsPrecSetupFnBS)(realtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, realtype cjB, void *user_dataB)
+.. c:type:: int (*IDALsPrecSetupFnBS)(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector yB, N_Vector ypB, N_Vector resvalB, sunrealtype cjB, void *user_dataB)
 
    This function preprocesses and/or evaluates Jacobian-related data needed  by
    the preconditioner for the backward problem, in the case where the  backward
@@ -2280,7 +2280,7 @@ The IDABBDPRE module is initialized by calling the following function, *after*
 an iterative linear solver for the backward problem has been attached to IDAS by
 calling :c:func:`IDASetLinearSolverB` (see :numref:`IDAS.Usage.ADJ.user_callable.lin_solv_b`).
 
-.. c:function:: int IDABBDPrecInitB(void * ida_mem, int which, sunindextype NlocalB, sunindextype mudqB, sunindextype mldqB, sunindextype mukeepB, sunindextype mlkeepB, realtype dqrelyB, IDABBDLocalFnB GresB, IDABBDCommFnB GcommB)
+.. c:function:: int IDABBDPrecInitB(void * ida_mem, int which, sunindextype NlocalB, sunindextype mudqB, sunindextype mldqB, sunindextype mukeepB, sunindextype mlkeepB, sunrealtype dqrelyB, IDABBDLocalFnB GresB, IDABBDCommFnB GcommB)
 
    The function :c:func:`IDABBDPrecInitB` initializes and allocates  memory for
    the IDABBDPRE preconditioner for the backward problem.
@@ -2311,7 +2311,7 @@ To reinitialize the IDABBDPRE preconditioner module for the backward problem,
 possibly with a change in ``mudqB``, ``mldqB``, or ``dqrelyB``, call the
 following function:
 
-.. c:function:: int IDABBDPrecReInitB(void * ida_mem, int which, sunindextype mudqB, sunindextype mldqB, realtype dqrelyB)
+.. c:function:: int IDABBDPrecReInitB(void * ida_mem, int which, sunindextype mudqB, sunindextype mldqB, sunrealtype dqrelyB)
 
    The function :c:func:`IDABBDPrecReInitB` reinitializes the IDABBDPRE
    preconditioner  for the backward problem.
@@ -2345,7 +2345,7 @@ necessary to evaluate this approximate residual (see
 are described below.
 
 
-.. c:type:: int (*IDABBDLocalFnB)(sunindextype NlocalB, realtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector gB, void *user_dataB)
+.. c:type:: int (*IDABBDLocalFnB)(sunindextype NlocalB, sunrealtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, N_Vector gB, void *user_dataB)
 
    This ``GresB`` function loads the vector ``gB``, an approximation to the
    residual of the backward problem, as a function of ``t``, ``y``, ``yp``,  and
@@ -2381,7 +2381,7 @@ are described below.
         halt the integration  (:c:func:`IDASolveB` returns ``IDA_LSETUP_FAIL``).
 
 
-.. c:type:: int (*IDABBDCommFnB)(sunindextype NlocalB, realtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, void *user_dataB)
+.. c:type:: int (*IDABBDCommFnB)(sunindextype NlocalB, sunrealtype t, N_Vector y, N_Vector yp, N_Vector yB, N_Vector ypB, void *user_dataB)
 
    This ``GcommB`` function performs all interprocess communications necessary
    for the execution of the ``GresB`` function above, using the input  vectors
diff --git a/doc/idas/guide/source/Usage/FSA.rst b/doc/idas/guide/source/Usage/FSA.rst
index d6472c3f76..239760d5cb 100644
--- a/doc/idas/guide/source/Usage/FSA.rst
+++ b/doc/idas/guide/source/Usage/FSA.rst
@@ -365,7 +365,7 @@ One of the following three functions must be called to specify the
 integration tolerances for sensitivities. Note that this call must be made after
 the call to :c:func:`IDASensInit`.
 
-.. c:function:: int IDASensSStolerances(void * ida_mem, realtype reltolS, realtype* abstolS)
+.. c:function:: int IDASensSStolerances(void * ida_mem, sunrealtype reltolS, sunrealtype* abstolS)
 
    The function :c:func:`IDASensSStolerances` specifies scalar relative and absolute
    tolerances.
@@ -382,7 +382,7 @@ the call to :c:func:`IDASensInit`.
      * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int IDASensSVtolerances(void * ida_mem, realtype reltolS, N_Vector* abstolS)
+.. c:function:: int IDASensSVtolerances(void * ida_mem, sunrealtype reltolS, N_Vector* abstolS)
 
    The function :c:func:`IDASensSVtolerances` specifies scalar relative tolerance
    and  vector absolute tolerances.
@@ -541,7 +541,7 @@ then IDAS computes both a solution and sensitivities at time ``t``. However,
 Solution sensitivities can be obtained through one of the following functions:
 
 
-.. c:function:: int IDAGetSens(void * ida_mem, realtype * tret, N_Vector * yS)
+.. c:function:: int IDAGetSens(void * ida_mem, sunrealtype * tret, N_Vector * yS)
 
    The function :c:func:`IDAGetSens` returns the sensitivity solution vectors after
    a  successful return from :c:func:`IDASolve`.
@@ -568,7 +568,7 @@ function is called by :c:func:`IDAGetSens` with ``k`` :math:`= 0`, but may also
 called directly by the user.
 
 
-.. c:function:: int IDAGetSensDky(void * ida_mem, realtype t, int k, N_Vector * dkyS)
+.. c:function:: int IDAGetSensDky(void * ida_mem, sunrealtype t, int k, N_Vector * dkyS)
 
    The function :c:func:`IDAGetSensDky` returns derivatives of the sensitivity
    solution  vectors after a successful return from :c:func:`IDASolve`.
@@ -593,7 +593,7 @@ parameter in turn through the functions :c:func:`IDAGetSens1` and
 :c:func:`IDAGetSensDky1`, defined as follows:
 
 
-.. c:function:: int IDAGetSens1(void * ida_mem, realtype * tret, int is, N_Vector yS)
+.. c:function:: int IDAGetSens1(void * ida_mem, sunrealtype * tret, int is, N_Vector yS)
 
    The function ``IDAGetSens1`` returns the ``is``-th sensitivity solution
    vector  after a successful return from :c:func:`IDASolve`.
@@ -617,7 +617,7 @@ parameter in turn through the functions :c:func:`IDAGetSens1` and
       will be  the same as that returned at the last :c:func:`IDASolve` call.
 
 
-.. c:function:: int IDAGetSensDky1(void * ida_mem, realtype t, int k, int is, N_Vector dkyS)
+.. c:function:: int IDAGetSensDky1(void * ida_mem, sunrealtype t, int k, int is, N_Vector dkyS)
 
    The function ``IDAGetSensDky1`` returns the ``k``-th derivative of the
    ``is``-th sensitivity solution vector after a successful return from
@@ -671,7 +671,7 @@ time and, if successful, takes effect immediately.
   =================================== ==================================== ============
 
 
-.. c:function:: int IDASetSensParams(void * ida_mem, realtype * p, realtype * pbar, int * plist)
+.. c:function:: int IDASetSensParams(void * ida_mem, sunrealtype * p, sunrealtype * pbar, int * plist)
 
    The function :c:func:`IDASetSensParams` specifies problem parameter information
    for sensitivity calculations.
@@ -729,7 +729,7 @@ time and, if successful, takes effect immediately.
       The array ``p`` *must* also be attached to the user data structure. For
       example, ``user_data->p = p;``.
 
-.. c:function:: int IDASetSensDQMethod(void * ida_mem, int DQtype, realtype DQrhomax)
+.. c:function:: int IDASetSensDQMethod(void * ida_mem, int DQtype, sunrealtype DQrhomax)
 
    The function :c:func:`IDASetSensDQMethod` specifies the difference quotient
    strategy in  the case in which the residual of the sensitivity
@@ -760,7 +760,7 @@ time and, if successful, takes effect immediately.
    ``DQrhomax``:math:`=0.0`.
 
 
-.. c:function:: int IDASetSensErrCon(void * ida_mem, booleantype errconS)
+.. c:function:: int IDASetSensErrCon(void * ida_mem, sunbooleantype errconS)
 
    The function :c:func:`IDASetSensErrCon` specifies the error control  strategy for
    sensitivity variables.
@@ -1069,7 +1069,7 @@ for all sensitivity parameters at once, through a function of type
 :c:type:`IDASensResFn` defined by:
 
 
-.. c:type:: int (*IDASensResFn)(int Ns, realtype t, N_Vector yy, N_Vector yp, N_Vector resval, N_Vector *yS, N_Vector *ypS, N_Vector *resvalS, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*IDASensResFn)(int Ns, sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, N_Vector *yS, N_Vector *ypS, N_Vector *resvalS, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the sensitivity residual for all sensitivity
    equations.  It must compute the vectors
@@ -1322,7 +1322,7 @@ at time ``t``. However, :c:func:`IDASolve` will still return only the solutions
 Sensitivity-dependent quadratures can be obtained using one of the following
 functions:
 
-.. c:function:: int IDAGetQuadSens(void * ida_mem, realtype * tret, N_Vector * yQS)
+.. c:function:: int IDAGetQuadSens(void * ida_mem, sunrealtype * tret, N_Vector * yQS)
 
    The function :c:func:`IDAGetQuadSens` returns the quadrature sensitivity  solution vectors after a successful return from :c:func:`IDASolve`.
 
@@ -1344,7 +1344,7 @@ the interpolating polynomials for the sensitivity-dependent quadrature variables
 at time ``t``. This function is called by :c:func:`IDAGetQuadSens` with
 ``k = 0``, but may also be called directly by the user.
 
-.. c:function:: int IDAGetQuadSensDky(void * ida_mem, realtype t, int k, N_Vector* dkyQS)
+.. c:function:: int IDAGetQuadSensDky(void * ida_mem, sunrealtype t, int k, N_Vector* dkyQS)
 
    The function :c:func:`IDAGetQuadSensDky` returns derivatives of the quadrature sensitivities  solution vectors after a successful return from :c:func:`IDASolve`.
 
@@ -1368,7 +1368,7 @@ Quadrature sensitivity solution vectors can also be extracted separately for
 each parameter in turn through the functions ``IDAGetQuadSens1`` and
 ``IDAGetQuadSensDky1``, defined as follows:
 
-.. c:function:: int IDAGetQuadSens1(void * ida_mem, realtype * tret, int is, N_Vector yQS)
+.. c:function:: int IDAGetQuadSens1(void * ida_mem, sunrealtype * tret, int is, N_Vector yQS)
 
    The function ``IDAGetQuadSens1`` returns the ``is``-th sensitivity  of quadratures after a successful return from :c:func:`IDASolve`.
 
@@ -1387,7 +1387,7 @@ each parameter in turn through the functions ``IDAGetQuadSens1`` and
      * ``IDA_BAD_DKY`` -- ``yQS`` is ``NULL``.
 
 
-.. c:function:: int IDAGetQuadSensDky1(void * ida_mem, realtype t, int k, int is, N_Vector dkyQS)
+.. c:function:: int IDAGetQuadSensDky1(void * ida_mem, sunrealtype t, int k, int is, N_Vector dkyQS)
 
    The function ``IDAGetQuadSensDky1`` returns the ``k``-th derivative of the  ``is``-th sensitivity solution vector after a successful  return from :c:func:`IDASolve`.
 
@@ -1417,7 +1417,7 @@ Optional inputs for sensitivity-dependent quadrature integration
 IDAS provides the following optional input functions to control the integration
 of sensitivity-dependent quadrature equations.
 
-.. c:function:: int IDASetQuadSensErrCon(void * ida_mem, booleantype errconQS)
+.. c:function:: int IDASetQuadSensErrCon(void * ida_mem, sunbooleantype errconQS)
 
    The function :c:func:`IDASetQuadSensErrCon` specifies whether or not the  quadrature variables are to be used in the local error control mechanism.  If they are, the user must specify the error tolerances for the quadrature  variables by calling :c:func:`IDAQuadSensSStolerances`,  :c:func:`IDAQuadSensSVtolerances`, or :c:func:`IDAQuadSensEEtolerances`.
 
@@ -1442,7 +1442,7 @@ If the quadrature variables are part of the step size control mechanism, one of
 the following functions must be called to specify the integration tolerances for
 quadrature variables.
 
-.. c:function:: int IDAQuadSensSStolerances(void * ida_mem, realtype reltolQS, realtype* abstolQS)
+.. c:function:: int IDAQuadSensSStolerances(void * ida_mem, sunrealtype reltolQS, sunrealtype* abstolQS)
 
    The function :c:func:`IDAQuadSensSStolerances` specifies scalar relative and absolute  tolerances.
 
@@ -1459,7 +1459,7 @@ quadrature variables.
      * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int IDAQuadSensSVtolerances(void * ida_mem, realtype reltolQS, N_Vector* abstolQS)
+.. c:function:: int IDAQuadSensSVtolerances(void * ida_mem, sunrealtype reltolQS, N_Vector* abstolQS)
 
    The function :c:func:`IDAQuadSensSVtolerances` specifies scalar relative and  vector absolute tolerances.
 
@@ -1590,7 +1590,7 @@ q}/{\partial y} s_i + {\partial q}/{\partial \dot{y}} \dot{s}_i + {\partial
 q}{\partial p_i}`.  This user function must be of type
 :c:type:`IDAQuadSensRhsFn` defined as follows:
 
-.. c:type:: int (*IDAQuadSensRhsFn)(int Ns, realtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector rrQ, N_Vector *rhsvalQS, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*IDAQuadSensRhsFn)(int Ns, sunrealtype t, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS, N_Vector rrQ, N_Vector *rhsvalQS, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the sensitivity quadrature equation right-hand side
    for a given value  of the independent variable :math:`t` and state vector
diff --git a/doc/idas/guide/source/Usage/SIM.rst b/doc/idas/guide/source/Usage/SIM.rst
index 4bd1ac2738..97639f76b3 100644
--- a/doc/idas/guide/source/Usage/SIM.rst
+++ b/doc/idas/guide/source/Usage/SIM.rst
@@ -101,7 +101,7 @@ data types can be used. The header file that is always required is:
   header file for IDALS, ``idas/idas_ls.h``.
 
 Note that ``idas.h`` includes ``sundials_types.h``, which defines the types,
-``realtype``, ``sunindextype``, and ``booleantype`` and the constants
+``sunrealtype``, ``sunindextype``, and ``sunbooleantype`` and the constants
 ``SUNFALSE`` and ``SUNTRUE``.
 
 The calling program must also include an ``N_Vector`` implementation
@@ -350,7 +350,7 @@ IDAS initialization and deallocation functions
    **Return value:**
       * ``void*`` pointer the IDAS solver object.
 
-.. c:function:: int IDAInit(void* ida_mem, IDAResFn res, realtype t0, N_Vector y0, N_Vector yp0)
+.. c:function:: int IDAInit(void* ida_mem, IDAResFn res, sunrealtype t0, N_Vector y0, N_Vector yp0)
 
    The function :c:func:`IDAInit` provides required problem and solution
    specifications, allocates internal memory, and initializes IDAS.
@@ -396,7 +396,7 @@ One of the following three functions must be called to specify the integration
 tolerances (or directly specify the weights used in evaluating WRMS vector
 norms). Note that this call must be made after the call to :c:func:`IDAInit`.
 
-.. c:function:: int IDASStolerances(void* ida_mem, realtype reltol, realtype abstol)
+.. c:function:: int IDASStolerances(void* ida_mem, sunrealtype reltol, sunrealtype abstol)
 
    The function :c:func:`IDASStolerances` specifies scalar relative and absolute
    tolerances.
@@ -413,7 +413,7 @@ norms). Note that this call must be made after the call to :c:func:`IDAInit`.
         called.
       * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
-.. c:function:: int IDASVtolerances(void* ida_mem, realtype reltol, N_Vector abstol)
+.. c:function:: int IDASVtolerances(void* ida_mem, sunrealtype reltol, N_Vector abstol)
 
    The function :c:func:`IDASVtolerances` specifies scalar relative tolerance and
    vector absolute tolerances.
@@ -694,7 +694,7 @@ successful call to the linear system solver specification function. The call to
 :c:func:`IDACalcIC` should precede the call(s) to :c:func:`IDASolve` for the
 given problem.
 
-.. c:function:: int IDACalcIC(void* ida_mem, int icopt, realtype tout1)
+.. c:function:: int IDACalcIC(void* ida_mem, int icopt, sunrealtype tout1)
 
    The function :c:func:`IDACalcIC` corrects the initial values ``y0`` and ``yp0`` at
    time ``t0``.
@@ -801,7 +801,7 @@ the user has set a stop time (with :c:func:`IDASetStopTime`) or requested
 rootfinding (with :c:func:`IDARootInit`).
 
 
-.. c:function:: int IDASolve(void* ida_mem, realtype tout, realtype* tret, \
+.. c:function:: int IDASolve(void* ida_mem, sunrealtype tout, sunrealtype* tret, \
                 N_Vector yret, N_Vector ypret, int itask)
 
    The function :c:func:`IDASolve` integrates the DAE over an interval in t.
@@ -1088,7 +1088,7 @@ Main solver optional input functions
       Passing ``mxsteps`` = 0 results in IDAS using the default value (500).
       Passing ``mxsteps`` < 0 disables the test (not recommended).
 
-.. c:function:: int IDASetInitStep(void * ida_mem, realtype hin)
+.. c:function:: int IDASetInitStep(void * ida_mem, sunrealtype hin)
 
    The function :c:func:`IDASetInitStep` specifies the initial step size.
 
@@ -1106,7 +1106,7 @@ Main solver optional input functions
       :math:`\|h \dot{y} \|_{{\scriptsize WRMS}} = 1/2`, with an added restriction
       that :math:`|h| \leq .001|t_{\text{out}} - t_0|`.
 
-.. c:function:: int IDASetMinStep(void * ida_mem, realtype hmin)
+.. c:function:: int IDASetMinStep(void * ida_mem, sunrealtype hmin)
 
    The function :c:func:`IDASetMinStep` specifies the minimum absolute value of
    the step size.
@@ -1124,7 +1124,7 @@ Main solver optional input functions
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetMaxStep(void * ida_mem, realtype hmax)
+.. c:function:: int IDASetMaxStep(void * ida_mem, sunrealtype hmax)
 
    The function :c:func:`IDASetMaxStep` specifies the maximum absolute value of the
    step size.
@@ -1142,7 +1142,7 @@ Main solver optional input functions
    **Notes:**
       Pass ``hmax = 0`` to obtain the default value :math:`\infty`.
 
-.. c:function:: int IDASetStopTime(void * ida_mem, realtype tstop)
+.. c:function:: int IDASetStopTime(void * ida_mem, sunrealtype tstop)
 
    The function :c:func:`IDASetStopTime` specifies the value of the independent
    variable :math:`t` past which the solution is not to proceed.
@@ -1201,7 +1201,7 @@ Main solver optional input functions
    **Notes:**
       The default value is 10.
 
-.. c:function:: int IDASetSuppressAlg(void * ida_mem, booleantype suppressalg)
+.. c:function:: int IDASetSuppressAlg(void * ida_mem, sunbooleantype suppressalg)
 
    The function :c:func:`IDASetSuppressAlg` indicates whether or not to suppress
    algebraic variables in the local error test.
@@ -1373,7 +1373,7 @@ more details. The function :c:func:`IDASetLinearSolutionScaling` can be used to
 disable this scaling when necessary, e.g., when providing a custom linear solver
 that updates the matrix using the current :math:`\alpha` as part of the solve.
 
-.. c:function:: int IDASetDeltaCjLSetup(void* ida_mem, realtype dcj)
+.. c:function:: int IDASetDeltaCjLSetup(void* ida_mem, sunrealtype dcj)
 
    The function ``IDASetDeltaCjLSetup`` specifies the parameter that determines
    the bounds on a change in :math:`c_j` that require a linear solver setup
@@ -1394,7 +1394,7 @@ that updates the matrix using the current :math:`\alpha` as part of the solve.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetLinearSolutionScaling(void * ida_mem, booleantype onoff)
+.. c:function:: int IDASetLinearSolutionScaling(void * ida_mem, sunbooleantype onoff)
 
    The function :c:func:`IDASetLinearSolutionScaling` enables or disables scaling the
    linear system solution to account for a change in :math:`\alpha` in the
@@ -1478,7 +1478,7 @@ When using the default difference-quotient approximation to the Jacobian-vector
 product, the user may specify the factor to use in setting increments for the
 finite-difference approximation, via a call to :c:func:`IDASetIncrementFactor`.
 
-.. c:function:: int IDASetIncrementFactor(void * ida_mem, realtype dqincfac)
+.. c:function:: int IDASetIncrementFactor(void * ida_mem, sunrealtype dqincfac)
 
    The function :c:func:`IDASetIncrementFactor` specifies the increment factor to be
    used in the difference-quotient approximation to the product :math:`Jv`.
@@ -1613,7 +1613,7 @@ where :math:`\epsilon` is the nonlinear solver tolerance, and the default
 :math:`\epsilon_L = 0.05`; this value may be modified by the user through the
 :c:func:`IDASetEpsLin` function.
 
-.. c:function:: int IDASetEpsLin(void * ida_mem, realtype eplifac)
+.. c:function:: int IDASetEpsLin(void * ida_mem, sunrealtype eplifac)
 
    The function :c:func:`IDASetEpsLin` specifies the factor by which the Krylov linear
    solver's convergence test constant is reduced from the nonlinear iteration
@@ -1642,7 +1642,7 @@ where :math:`\epsilon` is the nonlinear solver tolerance, and the default
       will be deprecated in future releases, so we recommend that users
       transition to the new routine name soon.
 
-.. c:function:: int IDASetLSNormFactor(void * ida_mem, realtype nrmfac)
+.. c:function:: int IDASetLSNormFactor(void * ida_mem, sunrealtype nrmfac)
 
    The function :c:func:`IDASetLSNormFactor` specifies the factor to use when
    converting from the integrator tolerance (WRMS norm) to the linear solver
@@ -1733,7 +1733,7 @@ nonlinear solver.
       The default value is 10.
 
 
-.. c:function:: int IDASetNonlinConvCoef(void * ida_mem, realtype nlscoef)
+.. c:function:: int IDASetNonlinConvCoef(void * ida_mem, sunrealtype nlscoef)
 
    The function :c:func:`IDASetNonlinConvCoef` specifies the safety factor in the
    nonlinear convergence test; see :eq:`IDAS_DAE_nls_test`.
@@ -1808,7 +1808,7 @@ Initial condition calculation optional input functions
 The following functions can be called just prior to calling :c:func:`IDACalcIC`
 to set optional inputs controlling the initial condition calculation.
 
-.. c:function:: int IDASetNonlinConvCoefIC(void * ida_mem, realtype epiccon)
+.. c:function:: int IDASetNonlinConvCoefIC(void * ida_mem, sunrealtype epiccon)
 
    The function :c:func:`IDASetNonlinConvCoefIC` specifies the positive constant in
    the Newton iteration convergence test within the initial condition
@@ -1909,7 +1909,7 @@ to set optional inputs controlling the initial condition calculation.
       values and the initial sensititivies.
 
 
-.. c:function:: int IDASetLineSearchOffIC(void * ida_mem, booleantype lsoff)
+.. c:function:: int IDASetLineSearchOffIC(void * ida_mem, sunbooleantype lsoff)
 
    The function :c:func:`IDASetLineSearchOffIC` specifies whether to turn on or off
    the linesearch algorithm.
@@ -1988,7 +1988,7 @@ step size adaptivity.
    make changes gradually and with testing to determine their effectiveness.
 
 
-.. c:function:: int IDASetEtaFixedStepBounds(void* ida_mem, realtype eta_min_fx, realtype eta_max_fx)
+.. c:function:: int IDASetEtaFixedStepBounds(void* ida_mem, sunrealtype eta_min_fx, sunrealtype eta_max_fx)
 
    The function ``IDASetEtaFixedStepBounds`` specifies the bounds
    :math:`\eta_{\mathrm{min\_fx}}` and :math:`\eta_{\mathrm{max\_fx}}`. If step size
@@ -2013,7 +2013,7 @@ step size adaptivity.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetEtaMax(void* ida_mem, realtype eta_max)
+.. c:function:: int IDASetEtaMax(void* ida_mem, sunrealtype eta_max)
 
    The function ``IDASetEtaMax`` specifies the maximum step size growth
    factor :math:`\eta_{\mathrm{max}}`.
@@ -2030,7 +2030,7 @@ step size adaptivity.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetEtaMin(void* ida_mem, realtype eta_min)
+.. c:function:: int IDASetEtaMin(void* ida_mem, sunrealtype eta_min)
 
    The function ``IDASetEtaMin`` specifies the minimum step size reduction
    factor :math:`\eta_{\mathrm{min}}`.
@@ -2050,7 +2050,7 @@ step size adaptivity.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetEtaLow(void* ida_mem, realtype eta_low)
+.. c:function:: int IDASetEtaLow(void* ida_mem, sunrealtype eta_low)
 
    The function ``IDASetEtaLow`` specifies the maximum step size reduction
    factor :math:`\eta_{\mathrm{low}}`.
@@ -2070,7 +2070,7 @@ step size adaptivity.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetEtaMinErrFail(void* ida_mem, realtype eta_min_ef)
+.. c:function:: int IDASetEtaMinErrFail(void* ida_mem, sunrealtype eta_min_ef)
 
    The function ``IDASetEtaMinErrFail`` specifies the minimum step size
    reduction factor :math:`\eta_{\mathrm{min\_ef}}` after an error test failure.
@@ -2090,7 +2090,7 @@ step size adaptivity.
 
    .. versionadded:: 5.2.0
 
-.. c:function:: int IDASetEtaConvFail(void* ida_mem, realtype eta_cf)
+.. c:function:: int IDASetEtaConvFail(void* ida_mem, sunrealtype eta_cf)
 
    The function ``IDASetEtaConvFail`` specifies the step size reduction factor
    :math:`\eta_{\mathrm{cf}}` after a nonlinear solver convergence failure.
@@ -2192,7 +2192,7 @@ output values. This function must be called after a successful return from
 derivatives of order up to the last internal order used for any value of
 :math:`t` in the last internal step taken by IDAS.
 
-.. c:function:: int IDAGetDky(void * ida_mem, realtype t, int k, N_Vector dky)
+.. c:function:: int IDAGetDky(void * ida_mem, sunrealtype t, int k, N_Vector dky)
 
    The function :c:func:`IDAGetDky` computes the interpolated values of the
    :math:`k^{th}` derivative of :math:`y` for any value of :math:`t` in the last
@@ -2378,7 +2378,7 @@ described next.
       In terms of the problem size :math:`N`, the maximum method order
       ``maxord``, and the number of root functions ``nrtfn`` (see
       :numref:`IDAS.Usage.SIM.user_callable.idarootinit`), the actual size of the real workspace, in
-      :c:type:`realtype` words, is given by the following:
+      :c:type:`sunrealtype` words, is given by the following:
 
       * base value:
         :math:`\mathtt{lenrw} = 55 + (m + 6) * N_r + 3 * \mathtt{nrtfn}`;
@@ -2509,7 +2509,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetLastStep(void * ida_mem, realtype * hlast)
+.. c:function:: int IDAGetLastStep(void * ida_mem, sunrealtype * hlast)
 
    The function :c:func:`IDAGetLastStep` returns the integration step size taken on
    the last internal step (if from :c:func:`IDASolve`), or the last value of the
@@ -2525,7 +2525,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetCurrentStep(void * ida_mem, realtype * hcur)
+.. c:function:: int IDAGetCurrentStep(void * ida_mem, sunrealtype * hcur)
 
    The function :c:func:`IDAGetCurrentStep` returns the integration step size to be
    attempted on the next internal step.
@@ -2538,7 +2538,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetActualInitStep(void * ida_mem, realtype * hinused)
+.. c:function:: int IDAGetActualInitStep(void * ida_mem, sunrealtype * hinused)
 
    The function :c:func:`IDAGetActualInitStep` returns the value of the integration
    step size used on the first step.
@@ -2558,7 +2558,7 @@ described next.
    changed by IDAS to ensure that the step size is within the prescribed bounds
    :math:`(h_{min} \le h_0 \le h_{max})`, or to meet the local error test.
 
-.. c:function:: int IDAGetCurrentTime(void * ida_mem, realtype * tcur)
+.. c:function:: int IDAGetCurrentTime(void * ida_mem, sunrealtype * tcur)
 
    The function :c:func:`IDAGetCurrentTime` returns the current internal time reached
    by the solver.
@@ -2571,7 +2571,7 @@ described next.
       * ``IDA_SUCCESS`` -- The optional output value has been successfully set.
       * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
-.. c:function:: int IDAGetTolScaleFactor(void * ida_mem, realtype * tolsfac)
+.. c:function:: int IDAGetTolScaleFactor(void * ida_mem, sunrealtype * tolsfac)
 
    The function :c:func:`IDAGetTolScaleFactor` returns a suggested factor by which the
    user's tolerances should be scaled when too much accuracy has been requested
@@ -2633,8 +2633,8 @@ described next.
 
 .. c:function:: int IDAGetIntegratorStats(void *ida_mem, long int *nsteps, \
                 long int *nrevals, long int *nlinsetups, long int *netfails, \
-                int *klast, int *kcur, realtype *hinused, realtype *hlast, \
-                realtype *hcur, realtype *tcur)
+                int *klast, int *kcur, sunrealtype *hinused, sunrealtype *hlast, \
+                sunrealtype *hcur, sunrealtype *tcur)
 
     The function :c:func:`IDAGetIntegratorStats` returns the IDAS integrator stats in
     one function call.
@@ -3225,7 +3225,7 @@ integration and the restart, so that the restarted problem uses the new values
 (which have jumped).  Similar comments apply if there is to be a jump in the
 dependent variable vector.
 
-.. c:function:: int IDAReInit(void * ida_mem, realtype t0, N_Vector y0, N_Vector yp0)
+.. c:function:: int IDAReInit(void * ida_mem, sunrealtype t0, N_Vector y0, N_Vector yp0)
 
    The function :c:func:`IDAReInit` provides required problem specifications and
    reinitializes IDAS.
@@ -3272,7 +3272,7 @@ DAE residual function
 
 The user must provide a function of type :c:type:`IDAResFn` defined as follows:
 
-.. c:type:: int (*IDAResFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+.. c:type:: int (*IDAResFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 
    This function computes the problem residual for given values of the
    independent variable :math:`t`, state vector :math:`y`, and derivative
@@ -3389,7 +3389,7 @@ If a rootfinding problem is to be solved during the integration of the DAE
 system, the user must supply a function of type :c:type:`IDARootFn`, defined
 as follows:
 
-.. c:type:: int (*IDARootFn)(realtype t, N_Vector y, N_Vector yp, realtype *gout, void *user_data)
+.. c:type:: int (*IDARootFn)(sunrealtype t, N_Vector y, N_Vector yp, sunrealtype *gout, void *user_data)
 
    This function computes a vector-valued function :math:`g(t,y,\dot{y})` such
    that the roots of the ``nrtfn`` components :math:`g_i(t,y,\dot{y})` are to be
@@ -3423,7 +3423,7 @@ If a matrix-based linear solver module is used (i.e. a non-``NULL``
 ``SUNMatrix`` object was supplied to :c:func:`IDASetLinearSolver`), the
 user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
 
-.. c:type:: int (*IDALsJacFn)(realtype t, realtype c_j, N_Vector y, N_Vector yp, N_Vector r, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+.. c:type:: int (*IDALsJacFn)(sunrealtype t, sunrealtype c_j, N_Vector y, N_Vector yp, N_Vector r, SUNMatrix Jac, void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 
    This function computes the Jacobian matrix :math:`J` of the DAE system (or an
    approximation to it), defined by :eq:`IDAS_DAE_Jacobian`.
@@ -3481,7 +3481,7 @@ user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
       obtain these, the user will need to add a pointer to ``ida_mem`` to
       ``user_data`` and then use the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.SIM.user_callable.optional_output.main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       **dense:**
 
@@ -3525,7 +3525,7 @@ user may provide a function of type :c:type:`IDALsJacFn` defined as follows:
       elements within the band are those with ``-mupper`` :math:`\le` ``m-n``
       :math:`\le` ``mlower``. Alternatively, ``SM_COLUMN_B(J, j)`` returns a
       pointer to the diagonal element of the ``j``-th column of ``Jac``, and if we
-      assign this address to ``realtype *col_j``, then the ``i``-th element of the
+      assign this address to ``sunrealtype *col_j``, then the ``i``-th element of the
       ``j``-th column is given by ``SM_COLUMN_ELEMENT_B(col_j, i, j)``, counting
       from :math:`0`. Thus, for :math:`(m,n)` within the band, :math:`J_{m,n}` can
       be loaded by setting ``col_n = SM_COLUMN_B(J, n-1);`` and
@@ -3572,7 +3572,7 @@ provide a function of type :c:type:`IDALsJacTimesVecFn` in the following form, t
 compute matrix-vector products :math:`Jv`. If such a function is not supplied,
 the default is a difference quotient approximation to these products.
 
-.. c:type:: int (*IDALsJacTimesVecFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector v, N_Vector Jv, realtype cj, void *user_data, N_Vector tmp1, N_Vector tmp2)
+.. c:type:: int (*IDALsJacTimesVecFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector v, N_Vector Jv, sunrealtype cj, void *user_data, N_Vector tmp1, N_Vector tmp2)
 
    This function computes the product :math:`Jv` of the DAE system Jacobian
    :math:`J` (or an approximation to it) and a given vector ``v``, where
@@ -3611,7 +3611,7 @@ the default is a difference quotient approximation to these products.
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.SIM.user_callable.optional_output.main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. warning::
 
@@ -3632,7 +3632,7 @@ Jacobian-related data be preprocessed or evaluated, then this needs to be done
 in a user-supplied function of type :c:type:`IDALsJacTimesSetupFn`, defined as
 follows:
 
-.. c:type:: int (*IDALsJacTimesSetupFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, ealtype cj, void *user_data);
+.. c:type:: int (*IDALsJacTimesSetupFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, ealtype cj, void *user_data);
 
    This function setups any data needed by :math:`Jv` product function (see
    :c:type:`IDALsJacTimesVecFn`).
@@ -3667,7 +3667,7 @@ follows:
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.SIM.user_callable.optional_output.main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. warning::
 
@@ -3692,7 +3692,7 @@ approximates (at least crudely) the Jacobian matrix :math:`J =
 function must be of type :c:type:`IDALsPrecSolveFn`, defined as follows:
 
 
-.. c:type:: int (*IDALsPrecSolveFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector rvec, N_Vector zvec, realtype cj, realtype delta, void *user_data)
+.. c:type:: int (*IDALsPrecSolveFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, N_Vector rvec, N_Vector zvec, sunrealtype cj, sunrealtype delta, void *user_data)
 
    This function solves the preconditioning system :math:`Pz = r`.
 
@@ -3733,7 +3733,7 @@ If the user’s preconditioner requires that any Jacobian-related data be
 evaluated or preprocessed, then this needs to be done in a user-supplied
 function of type :c:type:`IDALsPrecSetupFn`, defined as follows:
 
-.. c:type:: int (*IDALsPrecSetupFn)(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr, realtype cj, void *user_data)
+.. c:type:: int (*IDALsPrecSetupFn)(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr, sunrealtype cj, void *user_data)
 
    This function solves the preconditioning system :math:`Pz = r`.
 
@@ -3775,7 +3775,7 @@ function of type :c:type:`IDALsPrecSetupFn`, defined as follows:
       user will need to add a pointer to ``ida_mem`` to ``user_data`` and then use
       the ``IDAGet*`` functions described in
       :numref:`IDAS.Usage.SIM.user_callable.optional_output.main`. The unit roundoff can be
-      accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
 
 .. _IDAS.Usage.Purequad:
@@ -3970,7 +3970,7 @@ then IDAS computes both a solution and quadratures at time ``t``. However,
 :c:func:`IDASolve` will still return only the solution :math:`y` in ``y``.
 Solution quadratures can be obtained using the following function:
 
-.. c:function:: int IDAGetQuad(void * ida_mem, realtype* tret, N_Vector yQ)
+.. c:function:: int IDAGetQuad(void * ida_mem, sunrealtype* tret, N_Vector yQ)
 
    The function :c:func:`IDAGetQuad` returns the quadrature solution vector after a  successful return from :c:func:`IDASolve`.
 
@@ -3992,7 +3992,7 @@ function is called by :c:func:`IDAGetQuad` with ``k = 0`` and with the current
 time at which :c:func:`IDASolve` has returned, but may also be called directly
 by the user.
 
-.. c:function:: int IDAGetQuadDky(void * ida_mem, realtype t, int k, N_Vector dkyQ)
+.. c:function:: int IDAGetQuadDky(void * ida_mem, sunrealtype t, int k, N_Vector dkyQ)
 
    The function :c:func:`IDAGetQuadDky` returns derivatives of the quadrature solution
    vector after a successful return from ``IDA``.
@@ -4024,7 +4024,7 @@ Optional inputs for quadrature integration
 IDAS provides the following optional input functions to control the integration
 of quadrature equations.
 
-.. c:function:: int IDASetQuadErrCon(void * ida_mem, booleantype errconQ)
+.. c:function:: int IDASetQuadErrCon(void * ida_mem, sunbooleantype errconQ)
 
    The function :c:func:`IDASetQuadErrCon` specifies whether or not the
    quadrature variables are to be used in the step size control mechanism
@@ -4051,7 +4051,7 @@ If the quadrature variables are part of the step size control mechanism, one of
 the following functions must be called to specify the integration tolerances for
 quadrature variables.
 
-.. c:function:: int IDAQuadSStolerances(void * ida_mem, realtype reltolQ, realtype abstolQ)
+.. c:function:: int IDAQuadSStolerances(void * ida_mem, sunrealtype reltolQ, sunrealtype abstolQ)
 
    The function :c:func:`IDAQuadSStolerances` specifies scalar relative and absolute  tolerances.
 
@@ -4067,7 +4067,7 @@ quadrature variables.
      * ``IDA_ILL_INPUT`` -- One of the input tolerances was negative.
 
 
-.. c:function:: int IDAQuadSVtolerances(void * ida_mem, realtype reltolQ, N_Vector abstolQ)
+.. c:function:: int IDAQuadSVtolerances(void * ida_mem, sunrealtype reltolQ, N_Vector abstolQ)
 
    The function :c:func:`IDAQuadSVtolerances` specifies scalar relative and  vector absolute tolerances.
 
@@ -4165,7 +4165,7 @@ defines the right-hand side of the quadrature equations (in other words, the
 integrand function of the integral that must be evaluated). This function must
 be of type :c:func:`IDAQuadRhsFn` defined as follows:
 
-.. c:type:: int (*IDAQuadRhsFn)(realtype tres, N_Vector yy, N_Vector yp, N_Vector rrQ, void *user_data)
+.. c:type:: int (*IDAQuadRhsFn)(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rrQ, void *user_data)
 
    This function computes the quadrature equation right-hand side for a given
    value  of the independent variable :math:`t` and state vectors :math:`y` and
@@ -4311,7 +4311,7 @@ space (presumably within ``user_data``) for components of ``yy`` and ``yp`` that
 are communicated by ``Gcomm`` from the other processors, and that are then used
 by ``Gres``, which should not do any communication.
 
-.. c:type:: int (*IDABBDLocalFn)(sunindextype Nlocal, realtype tt, N_Vector yy, N_Vector yp, N_Vector gval, void *user_data)
+.. c:type:: int (*IDABBDLocalFn)(sunindextype Nlocal, sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector gval, void *user_data)
 
    This ``Gres`` function computes :math:`G(t,y,\dot{y})`. It loads the vector
    ``gval`` as a function of ``tt``, ``yy``, and ``yp``.
@@ -4338,7 +4338,7 @@ by ``Gres``, which should not do any communication.
 
    The case where :math:`G` is mathematically identical to :math:`F` is allowed.
 
-.. c:type:: int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt, N_Vector yy, N_Vector yp, void *user_data)
+.. c:type:: int (*IDABBDCommFn)(sunindextype Nlocal, sunrealtype tt, N_Vector yy, N_Vector yp, void *user_data)
 
    This ``Gcomm`` function performs all inter-processor communications necessary
    for the execution of the ``Gres`` function above, using the input vectors
@@ -4438,7 +4438,7 @@ out and new or modified steps are in bold.
 The user-callable functions that initialize or re-initialize the IDABBDPRE
 preconditioner module are described next.
 
-.. c:function:: int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dq_rel_yy, IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
+.. c:function:: int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal, sunindextype mudq, sunindextype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dq_rel_yy, IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
 
    The function :c:func:`IDABBDPrecInit` initializes and allocates (internal) memory
    for the IDABBDPRE preconditioner.
@@ -4503,7 +4503,7 @@ there is a change in any of the linear solver inputs, an additional call to the
 the corresponding ``IDASet***`` functions, must also be made (in the proper
 order).
 
-.. c:function:: int IDABBDPrecReInit(void * ida_mem, sunindextype mudq, sunindextype mldq, realtype dq_rel_yy)
+.. c:function:: int IDABBDPrecReInit(void * ida_mem, sunindextype mudq, sunindextype mldq, sunrealtype dq_rel_yy)
 
    The function :c:func:`IDABBDPrecReInit` reinitializes the IDABBDPRE preconditioner.
 
diff --git a/doc/idas/guide/source/sunnonlinsol/IDAS_interface.rst b/doc/idas/guide/source/sunnonlinsol/IDAS_interface.rst
index 643de50494..ca45f40d99 100644
--- a/doc/idas/guide/source/sunnonlinsol/IDAS_interface.rst
+++ b/doc/idas/guide/source/sunnonlinsol/IDAS_interface.rst
@@ -50,7 +50,7 @@ the ``SUNNonlinearSolver`` API. For example, such a user might need access to
 the current :math:`y` and :math:`\dot{y}` vectors to compute Jacobian data.
 
 
-.. c:function:: int IDAGetCurrentCj(void *ida_mem, realtype *cj)
+.. c:function:: int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj)
 
    The function :c:func:`IDAGetCurrentCj` returns the scalar :math:`c_j` which is
    proportional to the inverse of the step size (:math:`\alpha` in
@@ -120,7 +120,7 @@ the current :math:`y` and :math:`\dot{y}` vectors to compute Jacobian data.
      * ``IDA_MEM_NULL`` -- The ``ida_mem`` pointer is ``NULL``.
 
 
-.. c:function:: int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur, N_Vector *yypred, N_Vector *yppred, N_Vector *yyn, N_Vector *ypn, N_Vector *res, realtype *cj, void **user_data)
+.. c:function:: int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur, N_Vector *yypred, N_Vector *yppred, N_Vector *yyn, N_Vector *ypn, N_Vector *res, sunrealtype *cj, void **user_data)
 
    The function :c:func:`IDAGetNonlinearSystemData` returns all internal data
    required to construct the current nonlinear system :eq:`IDAS_res_corrector`.
@@ -179,7 +179,7 @@ the current :math:`y` and :math:`\dot{y}` vectors to compute Jacobian data.
       evaluation of the nonlinear system function.
 
 
-.. c:function:: int IDAGetNonlinearSystemDataSens(void * ida_mem, realtype* tcur, N_Vector** yySpred, N_Vector** ypSpred, N_Vector** yySn, N_Vector** ypSn, realtype* cj, void** user_data)
+.. c:function:: int IDAGetNonlinearSystemDataSens(void * ida_mem, sunrealtype* tcur, N_Vector** yySpred, N_Vector** ypSpred, N_Vector** yySn, N_Vector** ypSn, sunrealtype* cj, void** user_data)
 
    The function :c:func:`IDAGetNonlinearSystemDataSens` returns all internal
    sensitivity data required to construct the current nonlinear system
diff --git a/doc/kinsol/guide/source/Introduction.rst b/doc/kinsol/guide/source/Introduction.rst
index 7ac3cd37c9..00974af502 100644
--- a/doc/kinsol/guide/source/Introduction.rst
+++ b/doc/kinsol/guide/source/Introduction.rst
@@ -91,6 +91,12 @@ Changes from previous versions
 Changes in vX.X.X
 -----------------
 
+The previously deprecated types ``realtype`` and ``booleantype`` were removed
+from ``sundials_types.h`` and replaced with ``sunrealtype`` and
+``sunbooleantype``. The deprecated names for these types can be used by including
+the header file ``sundials_types_deprecated.h`` but will be fully removed in the
+next major release.
+
 Fixed the build system support for MAGMA when using a NVIDIA HPC SDK installation of CUDA
 and fixed the targets used for rocBLAS and rocSPARSE.
 
diff --git a/doc/kinsol/guide/source/Usage/index.rst b/doc/kinsol/guide/source/Usage/index.rst
index 98deec00ea..e0f384b7c7 100644
--- a/doc/kinsol/guide/source/Usage/index.rst
+++ b/doc/kinsol/guide/source/Usage/index.rst
@@ -98,7 +98,7 @@ data types can be used. The header file that is always required is:
   header file for KINLS, ``kinsol/kinsol_ls.h``.
 
 Note that ``kinsol.h`` includes ``sundials_types.h``, which defines the types,
-``realtype``, ``sunindextype``, and ``booleantype`` and the constants
+``sunrealtype``, ``sunindextype``, and ``sunbooleantype`` and the constants
 ``SUNFALSE`` and ``SUNTRUE``.
 
 The calling program must also include an ``N_Vector`` implementation
@@ -639,7 +639,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       The default value for ``mxiter`` is ``MXITER_DEFAULT`` :math:`=200`.
 
 
-.. c:function:: int KINSetNoInitSetup(void * kin_mem, booleantype noInitSetup)
+.. c:function:: int KINSetNoInitSetup(void * kin_mem, sunbooleantype noInitSetup)
 
    The function :c:func:`KINSetNoInitSetup` specifies whether an initial call
    to the preconditioner or Jacobian setup function should be made or not.
@@ -662,7 +662,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       problem is to be used initially  for the next problem.
 
 
-.. c:function:: int KINSetNoResMon(void * kin_mem, booleantype noNNIResMon)
+.. c:function:: int KINSetNoResMon(void * kin_mem, sunbooleantype noNNIResMon)
 
    The function :c:func:`KINSetNoResMon` specifies whether or not the nonlinear
    residual monitoring scheme is used to control Jacobian updating
@@ -778,7 +778,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       where :math:`\eta_{\text{min}} = 10^{-4}` and :math:`\eta_{\text{max}} = 0.9`.
 
 
-.. c:function:: int KINSetEtaConstValue(void * kin_mem, realtype eta)
+.. c:function:: int KINSetEtaConstValue(void * kin_mem, sunrealtype eta)
 
    The function :c:func:`KINSetEtaConstValue` specifies the constant value  for
    :math:`\eta` in the case  ``etachoice = KIN_ETACONSTANT``.
@@ -797,7 +797,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       :math:`0.0 <` ``eta`` :math:`\le 1.0`.
 
 
-.. c:function:: int KINSetEtaParams(void * kin_mem, realtype egamma, realtype ealpha)
+.. c:function:: int KINSetEtaParams(void * kin_mem, sunrealtype egamma, sunrealtype ealpha)
 
    The function :c:func:`KINSetEtaParams` specifies the parameters
    :math:`\gamma` and  :math:`\alpha` in the formula for :math:`\eta`, in the
@@ -819,7 +819,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       :math:`\le 1.0` and  :math:`1.0<` ``ealpha`` :math:`\le 2.0`.
 
 
-.. c:function:: int KINSetResMonConstValue(void * kin_mem, realtype omegaconst)
+.. c:function:: int KINSetResMonConstValue(void * kin_mem, sunrealtype omegaconst)
 
    The function :c:func:`KINSetResMonConstValue` specifies the constant value
    for :math:`\omega` when using residual monitoring.
@@ -838,7 +838,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       :math:`0.0 <` ``omegaconst`` :math:`< 1.0`.
 
 
-.. c:function:: int KINSetResMonParams(void * kin_mem, realtype omegamin, realtype omegamax)
+.. c:function:: int KINSetResMonParams(void * kin_mem, sunrealtype omegamin, sunrealtype omegamax)
 
    The function :c:func:`KINSetResMonParams` specifies the parameters
    :math:`\omega_{min}` and  :math:`\omega_{max}` in the formula :eq:`KIN_resmon_omega` for
@@ -864,7 +864,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       solver modules.
 
 
-.. c:function:: int KINSetNoMinEps(void * kin_mem, booleantype noMinEps)
+.. c:function:: int KINSetNoMinEps(void * kin_mem, sunbooleantype noMinEps)
 
    The function :c:func:`KINSetNoMinEps` specifies a flag that controls whether
    or not  the value of :math:`\epsilon`, the scaled linear residual tolerance,
@@ -884,7 +884,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       :math:`\epsilon` (see :c:func:`KINSetFuncNormTol` below).
 
 
-.. c:function:: int KINSetMaxNewtonStep(void * kin_mem, realtype mxnewtstep)
+.. c:function:: int KINSetMaxNewtonStep(void * kin_mem, sunrealtype mxnewtstep)
 
    The function :c:func:`KINSetMaxNewtonStep` specifies the maximum allowable
    scaled  length of the Newton step.
@@ -904,7 +904,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       where :math:`u_0` is the initial guess.
 
 
-.. c:function:: int KINSetMaxBetaFails(void * kin_mem, realtype mxnbcf)
+.. c:function:: int KINSetMaxBetaFails(void * kin_mem, sunrealtype mxnbcf)
 
    The function :c:func:`KINSetMaxBetaFails` specifies the maximum number of
    :math:`\beta`-condition failures in the linesearch algorithm.
@@ -923,7 +923,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       The default value of ``mxnbcf`` is ``MXNBCF_DEFAULT`` :math:`=10`.
 
 
-.. c:function:: int KINSetRelErrFunc(void * kin_mem, realtype relfunc)
+.. c:function:: int KINSetRelErrFunc(void * kin_mem, sunrealtype relfunc)
 
    The function :c:func:`KINSetRelErrFunc` specifies the relative error in
    computing :math:`F(u)`, which is used in the difference quotient
@@ -945,7 +945,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       The default value for ``relfunc`` is :math:`U` = unit roundoff.
 
 
-.. c:function:: int KINSetFuncNormTol(void * kin_mem, realtype fnormtol)
+.. c:function:: int KINSetFuncNormTol(void * kin_mem, sunrealtype fnormtol)
 
    The function :c:func:`KINSetFuncNormTol` specifies the scalar used as a
    stopping  tolerance on the scaled maximum norm of the system function
@@ -965,7 +965,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       The default value for ``fnormtol`` is (unit roundoff) :math:`^{1/3}`.
 
 
-.. c:function:: int KINSetScaledStepTol(void * kin_mem, realtype scsteptol)
+.. c:function:: int KINSetScaledStepTol(void * kin_mem, sunrealtype scsteptol)
 
    The function :c:func:`KINSetScaledStepTol` specifies the scalar used  as a
    stopping tolerance on the minimum scaled step length.
@@ -1035,7 +1035,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       different functions.
 
 
-.. c:function:: int KINSetReturnNewest(void * kin_mem, booleantype ret_newest)
+.. c:function:: int KINSetReturnNewest(void * kin_mem, sunbooleantype ret_newest)
 
    The function :c:func:`KINSetReturnNewest` specifies if the fixed point
    iteration  should return the newest iteration or the iteration consistent
@@ -1053,7 +1053,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       The default value of ``ret_newest`` is ``SUNFALSE``.
 
 
-.. c:function:: int KINSetDamping(void * kin_mem, realtype beta)
+.. c:function:: int KINSetDamping(void * kin_mem, sunrealtype beta)
 
    The function :c:func:`KINSetDamping` specifies the value of the damping
    parameter  in the fixed point or Picard iteration.
@@ -1105,7 +1105,7 @@ negative, so a test ``retval`` :math:`<0` will catch any error.
       value of ``mxiter``.
 
 
-.. c:function:: int KINSetDampingAA(void * kin_mem, realtype beta)
+.. c:function:: int KINSetDampingAA(void * kin_mem, sunrealtype beta)
 
    The function :c:func:`KINSetDampingAA` specifies the value of the Anderson
    acceleration damping paramter.
@@ -1418,7 +1418,7 @@ functions are described next.
 
    **Arguments:**
      * ``kin_mem`` -- pointer to the KINSOL memory block.
-     * ``lenrw`` -- the number of ``realtype`` values in the KINSOL workspace.
+     * ``lenrw`` -- the number of ``sunrealtype`` values in the KINSOL workspace.
      * ``leniw`` -- the number of integer values in the KINSOL workspace.
 
    **Return value:**
@@ -1427,7 +1427,7 @@ functions are described next.
 
    **Notes:**
       KINSOL solver  In terms of the problem size :math:`N`, the actual size of
-      the real workspace  is :math:`17 + 5 N` ``realtype`` words. The real workspace
+      the real workspace  is :math:`17 + 5 N` ``sunrealtype`` words. The real workspace
       is increased by  an additional :math:`N` words if constraint checking is
       enabled (see :c:func:`KINSetConstraints`).
 
@@ -1492,7 +1492,7 @@ functions are described next.
      * ``KIN_MEM_NULL`` -- The ``kin_mem`` pointer is ``NULL``.
 
 
-.. c:function:: int KINGetFuncNorm(void * kin_mem, realtype fnorm)
+.. c:function:: int KINGetFuncNorm(void * kin_mem, sunrealtype fnorm)
 
    The function :c:func:`KINGetFuncNorm` returns the scaled Euclidean
    :math:`\ell_2` norm of the  nonlinear system function :math:`F(u)` evaluated
@@ -1507,7 +1507,7 @@ functions are described next.
      * ``KIN_MEM_NULL`` -- The ``kin_mem`` pointer is ``NULL``.
 
 
-.. c:function:: int KINGetStepLength(void * kin_mem, realtype steplength)
+.. c:function:: int KINGetStepLength(void * kin_mem, sunrealtype steplength)
 
    The function :c:func:`KINGetStepLength` returns the scaled Euclidean
    :math:`\ell_2` norm of  the step used during the previous iteration.
@@ -1966,7 +1966,7 @@ provide a function of type :c:type:`KINLsJacFn` defined as follows:
       These quantities may include the scale vectors and the unit roundoff. To
       obtain the scale vectors, the user will need to add to ``user_data``
       pointers to ``u_scale`` and/or ``f_scale`` as needed. The unit roundoff
-      can be accessed as ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      can be accessed as ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       **dense:**
 
@@ -2010,7 +2010,7 @@ provide a function of type :c:type:`KINLsJacFn` defined as follows:
       :math:`J_{m,n}`. The elements within the band are those with ``-mupper``
       :math:`\le` ``m-n`` :math:`\le` ``mlower``. Alternatively,
       ``SM_COLUMN_B(J, j)`` returns a pointer to the diagonal element of the
-      ``j``-th column of ``J``, and if we assign this address to ``realtype
+      ``j``-th column of ``J``, and if we assign this address to ``sunrealtype
       *col_j``, then the ``i``-th element of the ``j``-th column is given by
       ``SM_COLUMN_ELEMENT_B(col_j, i, j)``, counting from :math:`0`. Thus, for
       :math:`(m,n)` within the band, :math:`J_{m,n}` can be loaded by setting
@@ -2058,7 +2058,7 @@ provide a function of type :c:type:`KINLsJacTimesVecFn` in the following form,
 to compute matrix-vector products :math:`Jv`. If such a function is not
 supplied, the default is a difference quotient approximation to these products.
 
-.. c:type:: int (*KINLsJacTimesVecFn)(N_Vector v, N_Vector Jv, N_Vector u, booleantype* new_u, void* user_data)
+.. c:type:: int (*KINLsJacTimesVecFn)(N_Vector v, N_Vector Jv, N_Vector u, sunbooleantype* new_u, void* user_data)
 
    This function computes the product :math:`J v` (or an approximation to it).
 
@@ -2089,7 +2089,7 @@ supplied, the default is a difference quotient approximation to these products.
       might include the scale vectors and the unit roundoff. To obtain the scale
       vectors, the user will need to add to ``user_data`` pointers to ``u_scale``
       and/or ``f_scale`` as needed. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
    .. warning::
 
@@ -2184,7 +2184,7 @@ function of type :c:type:`KINLsPrecSetupFn`, defined as follows:
       might include the scale vectors and the unit roundoff. To obtain the scale
       vectors, the user will need to add to ``user_data`` pointers to ``u_scale``
       and/or ``f_scale`` as needed. The unit roundoff can be accessed as
-      ``UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
+      ``SUN_UNIT_ROUNDOFF`` defined in ``sundials_types.h``.
 
       If the preconditioner solve routine requires no preparation, then a
       preconditioner setup function need not be given.
@@ -2351,7 +2351,7 @@ user main program presented in :numref:`KINSOL.Usage.CC.skeleton_sim` are not bo
 The user-callable functions that initialize or re-initialize the KINBBDPRE
 preconditioner module are described next.
 
-.. c:function:: int KINBBDPrecInit(void* kin_mem, sunindextype Nlocal, sunindextype mudq, sunindexype mldq, sunindextype mukeep, sunindextype mlkeep, realtype dq_rel_u, KINBBDLocalFn Gloc, KINBBDCommFn Gcomm)
+.. c:function:: int KINBBDPrecInit(void* kin_mem, sunindextype Nlocal, sunindextype mudq, sunindexype mldq, sunindextype mukeep, sunindextype mlkeep, sunrealtype dq_rel_u, KINBBDLocalFn Gloc, KINBBDCommFn Gcomm)
 
    The function :c:func:`KINBBDPrecInit` initializes and allocates  memory for
    the KINBBDPRE preconditioner.
diff --git a/doc/kinsol/kin_ex_c.tex b/doc/kinsol/kin_ex_c.tex
index 5471fb208d..74fd91f289 100644
--- a/doc/kinsol/kin_ex_c.tex
+++ b/doc/kinsol/kin_ex_c.tex
@@ -58,8 +58,8 @@ \subsection{A serial dense example: kinFerTron\_dns}\label{ss:kinFerTron_dns}
 The \id{sunlinsol\_dense.h} file provides the prototype for the \id{SUNLinSol\_Dense} function.
 %%
 The \id{sundials\_types.h} file provides the definition of the
-type \id{realtype} (see \ugref{s:types} for details).  
-For now, it suffices to read \id{realtype} as \id{double}.
+type \id{sunrealtype} (see \ugref{s:types} for details).  
+For now, it suffices to read \id{sunrealtype} as \id{double}.
 %%
 Finally, \id{sundials\_math.h} is included for the definition of the
 exponential function \id{RExp}.
@@ -211,7 +211,7 @@ \subsection{A serial Krylov example: kinFoodWeb\_kry}\label{ss:kinFoodWeb_kry}
 constants and function prototypes associated with the {\spgmr} solver module.
 The inclusion of \id{sundials\_math.h} is done to access the \id{SUNMAX} and
 \id{SUNRabs} macros, and the \id{SUNRsqrt} function to compute the square root
-of a \id{realtype} number.
+of a \id{sunrealtype} number.
 
 The \id{main} program calls \id{KINCreate} and then calls \id{KINInit} with the
 name of the user-supplied system function \id{func} and solution vector as
diff --git a/doc/kinsol/kin_ex_fortran.tex b/doc/kinsol/kin_ex_fortran.tex
index 87bb6a2cda..2c7b263144 100644
--- a/doc/kinsol/kin_ex_fortran.tex
+++ b/doc/kinsol/kin_ex_fortran.tex
@@ -16,7 +16,7 @@ \section{Fortran example problems}\label{s:ex_fortran}
 where {\em n} denotes the number of bytes in the corresponding {\CC} type
 ({\tt long int} or {\tt int}). Floating-point variable declarations remain
 unchanged if double precision is used, but are changed to {\tt REAL*}{\em n},
-where {\em n} denotes the number of bytes in the {\sundials} type {\tt realtype},
+where {\em n} denotes the number of bytes in the {\sundials} type {\tt sunrealtype},
 if using single precision. Also, if using single precision, declarations of
 floating-point constants are appropriately modified, e.g. {\tt 0.5D-4} is
 changed to {\tt 0.5E-4}.
diff --git a/doc/shared/Types.rst b/doc/shared/Types.rst
index 9c26c7a20d..59c24d4931 100644
--- a/doc/shared/Types.rst
+++ b/doc/shared/Types.rst
@@ -17,33 +17,33 @@ Data Types
 
 The header file ``sundials_types.h`` contains the definition of the types:
 
-* :c:type:`realtype` -- the floating-point type used by the SUNDIALS packages
+* :c:type:`sunrealtype` -- the floating-point type used by the SUNDIALS packages
 
 * :c:type:`sunindextype` -- the integer type used for vector and matrix indices
 
-* :c:type:`booleantype` -- the type used for logic operations within SUNDIALS
+* :c:type:`sunbooleantype` -- the type used for logic operations within SUNDIALS
 
 * :c:type:`SUNOutputFormat` -- an enumerated type for SUNDIALS output formats
 
 Floating point types
 ~~~~~~~~~~~~~~~~~~~~
 
-.. c:type:: realtype
+.. c:type:: sunrealtype
 
-   The type ``realtype`` can be ``float``, ``double``, or ``long double``, with
+   The type ``sunrealtype`` can be ``float``, ``double``, or ``long double``, with
    the default being ``double``. The user can change the precision of the
    arithmetic used in the SUNDIALS solvers at the configuration stage (see
    :cmakeop:`SUNDIALS_PRECISION`).
 
 Additionally, based on the current precision, ``sundials_types.h`` defines
-``BIG_REAL`` to be the largest value representable as a ``realtype``,
-``SMALL_REAL`` to be the smallest value representable as a ``realtype``, and
-``UNIT_ROUNDOFF`` to be the difference between :math:`1.0` and the minimum
-``realtype`` greater than :math:`1.0`.
+``SUN_BIG_REAL`` to be the largest value representable as a ``sunrealtype``,
+``SUN_SMALL_REAL`` to be the smallest value representable as a ``sunrealtype``, and
+``SUN_UNIT_ROUNDOFF`` to be the difference between :math:`1.0` and the minimum
+``sunrealtype`` greater than :math:`1.0`.
 
-Within SUNDIALS, real constants are set by way of a macro called ``RCONST``. It
+Within SUNDIALS, real constants are set by way of a macro called ``SUN_RCONST``. It
 is this macro that needs the ability to branch on the definition of
-``realtype``. In ANSI C, a floating-point constant with no suffix is stored as a
+``sunrealtype``. In ANSI C, a floating-point constant with no suffix is stored as a
 ``double``. Placing the suffix "``F``" at the end of a floating point constant
 makes it a ``float``, whereas using the suffix "``L``" makes it a ``long
 double``. For example,
@@ -56,27 +56,27 @@ double``. For example,
 
 defines ``A`` to be a ``double`` constant equal to :math:`1.0`, ``B`` to be a
 ``float`` constant equal to :math:`1.0`, and ``C`` to be a ``long double``
-constant equal to :math:`1.0`. The macro call ``RCONST(1.0)`` automatically
-expands to ``1.0`` if ``realtype`` is ``double``, to ``1.0F`` if ``realtype`` is
-``float``, or to ``1.0L`` if ``realtype`` is ``long double``. SUNDIALS uses the
-``RCONST`` macro internally to declare all of its floating-point constants.
+constant equal to :math:`1.0`. The macro call ``SUN_RCONST(1.0)`` automatically
+expands to ``1.0`` if ``sunrealtype`` is ``double``, to ``1.0F`` if ``sunrealtype`` is
+``float``, or to ``1.0L`` if ``sunrealtype`` is ``long double``. SUNDIALS uses the
+``SUN_RCONST`` macro internally to declare all of its floating-point constants.
 
 Additionally, SUNDIALS defines several macros for common mathematical functions
 *e.g.*, ``fabs``, ``sqrt``, ``exp``, etc. in ``sundials_math.h``. The macros are
 prefixed with ``SUNR`` and expand to the appropriate ``C`` function based on the
-``realtype``. For example, the macro ``SUNRabs`` expands to the ``C`` function
-``fabs`` when ``realtype`` is ``double``, ``fabsf`` when ``realtype`` is
-``float``, and ``fabsl`` when ``realtype`` is ``long double``.
+``sunrealtype``. For example, the macro ``SUNRabs`` expands to the ``C`` function
+``fabs`` when ``sunrealtype`` is ``double``, ``fabsf`` when ``sunrealtype`` is
+``float``, and ``fabsl`` when ``sunrealtype`` is ``long double``.
 
-A user program which uses the type ``realtype``, the ``RCONST`` macro, and the
+A user program which uses the type ``sunrealtype``, the ``SUN_RCONST`` macro, and the
 ``SUNR`` mathematical function macros is precision-independent except for any
 calls to precision-specific library functions. Our example programs use
-``realtype``, ``RCONST``, and the ``SUNR`` macros. Users can, however, use the
+``sunrealtype``, ``SUN_RCONST``, and the ``SUNR`` macros. Users can, however, use the
 type ``double``, ``float``, or ``long double`` in their code (assuming that this
-usage is consistent with the typedef for ``realtype``) and call the appropriate
+usage is consistent with the typedef for ``sunrealtype``) and call the appropriate
 math library functions directly. Thus, a previously existing piece of C or C++
-code can use SUNDIALS without modifying the code to use ``realtype``,
-``RCONST``, or the ``SUNR`` macros so long as the SUNDIALS libraries are built
+code can use SUNDIALS without modifying the code to use ``sunrealtype``,
+``SUN_RCONST``, or the ``SUNR`` macros so long as the SUNDIALS libraries are built
 to use the corresponding precision (see :numref:`Installation.CMake.Options`).
 
 Integer types used for indexing
@@ -110,14 +110,14 @@ SUNDIALS libraries use the appropriate index storage type (for details see
 Boolean type
 ~~~~~~~~~~~~
 
-.. c:type:: booleantype
+.. c:type:: sunbooleantype
 
    As ANSI C89 (ISO C90) does not have a built-in boolean data type, SUNDIALS
-   defines the type ``booleantype`` as an ``int``.
+   defines the type ``sunbooleantype`` as an ``int``.
 
-The advantage of using the name booleantype (instead of int) is an increase in
+The advantage of using the name sunbooleantype (instead of int) is an increase in
 code readability. It also allows the programmer to make a distinction between
-int and boolean data. Variables of type ``booleantype`` are intended to have
+int and boolean data. Variables of type ``sunbooleantype`` are intended to have
 only the two values ``SUNFALSE`` (``0``) and ``SUNTRUE`` (``1``).
 
 Output formatting type
diff --git a/doc/shared/nvectors/NVector_CUDA.rst b/doc/shared/nvectors/NVector_CUDA.rst
index 53eec3ef68..d7aaf5fa92 100644
--- a/doc/shared/nvectors/NVector_CUDA.rst
+++ b/doc/shared/nvectors/NVector_CUDA.rst
@@ -28,7 +28,7 @@ is as follows:
    struct _N_VectorContent_Cuda
    {
       sunindextype       length;
-      booleantype        own_helper;
+      sunbooleantype     own_helper;
       SUNMemory          host_data;
       SUNMemory          device_data;
       SUNCudaExecPolicy* stream_exec_policy;
@@ -72,17 +72,17 @@ provide macros to access its member variables. Instead, user should use the
 accessor functions:
 
 
-.. c:function:: realtype* N_VGetHostArrayPointer_Cuda(N_Vector v)
+.. c:function:: sunrealtype* N_VGetHostArrayPointer_Cuda(N_Vector v)
 
    This function returns pointer to the vector data on the host.
 
 
-.. c:function:: realtype* N_VGetDeviceArrayPointer_Cuda(N_Vector v)
+.. c:function:: sunrealtype* N_VGetDeviceArrayPointer_Cuda(N_Vector v)
 
    This function returns pointer to the vector data on the device.
 
 
-.. c:function:: booleantype N_VIsManagedMemory_Cuda(N_Vector v)
+.. c:function:: sunbooleantype N_VIsManagedMemory_Cuda(N_Vector v)
 
    This function returns a boolean flag indiciating if the vector
    data array is in managed memory or not.
@@ -119,7 +119,7 @@ following additional user-callable routines:
    ``N_Vector``. The vector data array is allocated in managed memory.
 
 
-.. c:function:: N_Vector N_VNewWithMemHelp_Cuda(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
+.. c:function:: N_Vector N_VNewWithMemHelp_Cuda(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
 
    This function creates a new CUDA ``N_Vector`` with a user-supplied
    SUNMemoryHelper for allocating/freeing memory.
@@ -132,14 +132,14 @@ following additional user-callable routines:
    the other constructors to create a new vector.
 
 
-.. c:function:: N_Vector N_VMake_Cuda(sunindextype vec_length, realtype *h_vdata, realtype *d_vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Cuda(sunindextype vec_length, sunrealtype *h_vdata, sunrealtype *d_vdata, SUNContext sunctx)
 
 
    This function creates a CUDA ``N_Vector`` with user-supplied vector data arrays
    for the host and the device.
 
 
-.. c:function:: N_Vector N_VMakeManaged_Cuda(sunindextype vec_length, realtype *vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMakeManaged_Cuda(sunindextype vec_length, sunrealtype *vdata, SUNContext sunctx)
 
    This function creates a CUDA ``N_Vector`` with a user-supplied
    managed memory data array.
@@ -180,12 +180,12 @@ The module NVECTOR_CUDA also provides the following user-callable routines:
       policies across vectors
 
 
-.. c:function:: realtype* N_VCopyToDevice_Cuda(N_Vector v)
+.. c:function:: sunrealtype* N_VCopyToDevice_Cuda(N_Vector v)
 
    This function copies host vector data to the device.
 
 
-.. c:function:: realtype* N_VCopyFromDevice_Cuda(N_Vector v)
+.. c:function:: sunrealtype* N_VCopyFromDevice_Cuda(N_Vector v)
 
    This function copies vector data from the device to the host.
 
@@ -211,71 +211,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VNew_Cuda` will have the default settings for the NVECTOR_CUDA module.
 
-.. c:function:: int N_VEnableFusedOps_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the CUDA vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the CUDA vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the CUDA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the CUDA vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the CUDA vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the CUDA vector. The return value
diff --git a/doc/shared/nvectors/NVector_Description.rst b/doc/shared/nvectors/NVector_Description.rst
index 5f634a684c..67a0435065 100644
--- a/doc/shared/nvectors/NVector_Description.rst
+++ b/doc/shared/nvectors/NVector_Description.rst
@@ -54,56 +54,56 @@ defined as
       N_Vector     (*nvcloneempty)(N_Vector);
       void         (*nvdestroy)(N_Vector);
       void         (*nvspace)(N_Vector, sunindextype *, sunindextype *);
-      realtype*    (*nvgetarraypointer)(N_Vector);
-      realtype*    (*nvgetdevicearraypointer)(N_Vector);
-      void         (*nvsetarraypointer)(realtype *, N_Vector);
+      sunrealtype*    (*nvgetarraypointer)(N_Vector);
+      sunrealtype*    (*nvgetdevicearraypointer)(N_Vector);
+      void         (*nvsetarraypointer)(sunrealtype *, N_Vector);
       void*        (*nvgetcommunicator)(N_Vector);
       sunindextype (*nvgetlength)(N_Vector);
       sunindextype (*nvgetlocallength)(N_Vector);
-      void         (*nvlinearsum)(realtype, N_Vector, realtype, N_Vector, N_Vector);
-      void         (*nvconst)(realtype, N_Vector);
+      void         (*nvlinearsum)(sunrealtype, N_Vector, sunrealtype, N_Vector, N_Vector);
+      void         (*nvconst)(sunrealtype, N_Vector);
       void         (*nvprod)(N_Vector, N_Vector, N_Vector);
       void         (*nvdiv)(N_Vector, N_Vector, N_Vector);
-      void         (*nvscale)(realtype, N_Vector, N_Vector);
+      void         (*nvscale)(sunrealtype, N_Vector, N_Vector);
       void         (*nvabs)(N_Vector, N_Vector);
       void         (*nvinv)(N_Vector, N_Vector);
-      void         (*nvaddconst)(N_Vector, realtype, N_Vector);
-      realtype     (*nvdotprod)(N_Vector, N_Vector);
-      realtype     (*nvmaxnorm)(N_Vector);
-      realtype     (*nvwrmsnorm)(N_Vector, N_Vector);
-      realtype     (*nvwrmsnormmask)(N_Vector, N_Vector, N_Vector);
-      realtype     (*nvmin)(N_Vector);
-      realtype     (*nvwl2norm)(N_Vector, N_Vector);
-      realtype     (*nvl1norm)(N_Vector);
-      void         (*nvcompare)(realtype, N_Vector, N_Vector);
-      booleantype  (*nvinvtest)(N_Vector, N_Vector);
-      booleantype  (*nvconstrmask)(N_Vector, N_Vector, N_Vector);
-      realtype     (*nvminquotient)(N_Vector, N_Vector);
-      int          (*nvlinearcombination)(int, realtype *, N_Vector *, N_Vector);
-      int          (*nvscaleaddmulti)(int, realtype *, N_Vector, N_Vector *, N_Vector *);
-      int          (*nvdotprodmulti)(int, N_Vector, N_Vector *,  realtype *);
-      int          (*nvlinearsumvectorarray)(int, realtype, N_Vector *, realtype,
+      void         (*nvaddconst)(N_Vector, sunrealtype, N_Vector);
+      sunrealtype     (*nvdotprod)(N_Vector, N_Vector);
+      sunrealtype     (*nvmaxnorm)(N_Vector);
+      sunrealtype     (*nvwrmsnorm)(N_Vector, N_Vector);
+      sunrealtype     (*nvwrmsnormmask)(N_Vector, N_Vector, N_Vector);
+      sunrealtype     (*nvmin)(N_Vector);
+      sunrealtype     (*nvwl2norm)(N_Vector, N_Vector);
+      sunrealtype     (*nvl1norm)(N_Vector);
+      void         (*nvcompare)(sunrealtype, N_Vector, N_Vector);
+      sunbooleantype  (*nvinvtest)(N_Vector, N_Vector);
+      sunbooleantype  (*nvconstrmask)(N_Vector, N_Vector, N_Vector);
+      sunrealtype     (*nvminquotient)(N_Vector, N_Vector);
+      int          (*nvlinearcombination)(int, sunrealtype *, N_Vector *, N_Vector);
+      int          (*nvscaleaddmulti)(int, sunrealtype *, N_Vector, N_Vector *, N_Vector *);
+      int          (*nvdotprodmulti)(int, N_Vector, N_Vector *,  sunrealtype *);
+      int          (*nvlinearsumvectorarray)(int, sunrealtype, N_Vector *, sunrealtype,
                                              N_Vector *, N_Vector *);
-      int          (*nvscalevectorarray)(int, realtype *,  N_Vector *, N_Vector *);
-      int          (*nvconstvectorarray)(int, realtype, N_Vector *);
-      int          (*nvwrmsnomrvectorarray)(int, N_Vector *, N_Vector *, realtype *);
+      int          (*nvscalevectorarray)(int, sunrealtype *,  N_Vector *, N_Vector *);
+      int          (*nvconstvectorarray)(int, sunrealtype, N_Vector *);
+      int          (*nvwrmsnomrvectorarray)(int, N_Vector *, N_Vector *, sunrealtype *);
       int          (*nvwrmsnomrmaskvectorarray)(int, N_Vector *, N_Vector *, N_Vector,
-                                                realtype *);
-      int          (*nvscaleaddmultivectorarray)(int, int, realtype *, N_Vector *,
+                                                sunrealtype *);
+      int          (*nvscaleaddmultivectorarray)(int, int, sunrealtype *, N_Vector *,
                                                  N_Vector **, N_Vector **);
-      int          (*nvlinearcombinationvectorarray)(int, int, realtype *, N_Vector **,
+      int          (*nvlinearcombinationvectorarray)(int, int, sunrealtype *, N_Vector **,
                                                      N_Vector *);
-      realtype     (*nvdotprodlocal)(N_Vector, N_Vector);
-      realtype     (*nvmaxnormlocal)(N_Vector);
-      realtype     (*nvminlocal)(N_Vector);
-      realtype     (*nvl1normlocal)(N_Vector);
-      booleantype  (*nvinvtestlocal)(N_Vector, N_Vector);
-      booleantype  (*nvconstrmasklocal)(N_Vector, N_Vector, N_Vector);
-      realtype     (*nvminquotientlocal)(N_Vector, N_Vector);
-      realtype     (*nvwsqrsumlocal)(N_Vector, N_Vector);
-      realtype     (*nvwsqrsummasklocal(N_Vector, N_Vector, N_Vector);
-      int          (*nvdotprodmultilocal)(int, N_Vector, N_Vector *, realtype *);
-      int          (*nvdotprodmultiallreduce)(int, N_Vector, realtype *);
+      sunrealtype     (*nvdotprodlocal)(N_Vector, N_Vector);
+      sunrealtype     (*nvmaxnormlocal)(N_Vector);
+      sunrealtype     (*nvminlocal)(N_Vector);
+      sunrealtype     (*nvl1normlocal)(N_Vector);
+      sunbooleantype  (*nvinvtestlocal)(N_Vector, N_Vector);
+      sunbooleantype  (*nvconstrmasklocal)(N_Vector, N_Vector, N_Vector);
+      sunrealtype     (*nvminquotientlocal)(N_Vector, N_Vector);
+      sunrealtype     (*nvwsqrsumlocal)(N_Vector, N_Vector);
+      sunrealtype     (*nvwsqrsummasklocal(N_Vector, N_Vector, N_Vector);
+      int          (*nvdotprodmultilocal)(int, N_Vector, N_Vector *, sunrealtype *);
+      int          (*nvdotprodmultiallreduce)(int, N_Vector, sunrealtype *);
       int          (*nvbufsize)(N_Vector, sunindextype *);
       int          (*nvbufpack)(N_Vector, void*);
       int          (*nvbufunpack)(N_Vector, void*);
@@ -121,7 +121,7 @@ for vectors :math:`x` and :math:`z` and a scalar :math:`c`:
 
 .. code-block:: c
 
-   void N_VScale(realtype c, N_Vector x, N_Vector z) {
+   void N_VScale(sunrealtype c, N_Vector x, N_Vector z) {
       z->ops->nvscale(c, x, z);
    }
 
@@ -419,7 +419,7 @@ provide the following guidance:
 
 * :c:func:`N_VDotProd()` should mathematically return a complex number
   for complex-valued vectors; as this is not possible with
-  SUNDIALS' current ``realtype``, this routine should
+  SUNDIALS' current ``sunrealtype``, this routine should
   be set to ``NULL`` in the custom NVECTOR implementation.
 
 * :c:func:`N_VCompare()`, :c:func:`N_VConstrMask()`, :c:func:`N_VMinQuotient()`,
diff --git a/doc/shared/nvectors/NVector_HIP.rst b/doc/shared/nvectors/NVector_HIP.rst
index 50548ad01f..d5cf941dc7 100644
--- a/doc/shared/nvectors/NVector_HIP.rst
+++ b/doc/shared/nvectors/NVector_HIP.rst
@@ -28,7 +28,7 @@ the HIP-clang compiler. The vector content layout is as follows:
    struct _N_VectorContent_Hip
    {
       sunindextype       length;
-      booleantype        own_helper;
+      sunbooleantype     own_helper;
       SUNMemory          host_data;
       SUNMemory          device_data;
       SUNHipExecPolicy*  stream_exec_policy;
@@ -69,17 +69,17 @@ provide macros to access its member variables. Instead, user should use the
 accessor functions:
 
 
-.. c:function:: realtype* N_VGetHostArrayPointer_Hip(N_Vector v)
+.. c:function:: sunrealtype* N_VGetHostArrayPointer_Hip(N_Vector v)
 
    This function returns pointer to the vector data on the host.
 
 
-.. c:function:: realtype* N_VGetDeviceArrayPointer_Hip(N_Vector v)
+.. c:function:: sunrealtype* N_VGetDeviceArrayPointer_Hip(N_Vector v)
 
    This function returns pointer to the vector data on the device.
 
 
-.. c:function:: booleantype N_VIsManagedMemory_Hip(N_Vector v)
+.. c:function:: sunbooleantype N_VIsManagedMemory_Hip(N_Vector v)
 
    This function returns a boolean flag indiciating if the vector
    data array is in managed memory or not.
@@ -109,7 +109,7 @@ following additional user-callable routines:
    ``N_Vector``. The vector data array is allocated in managed memory.
 
 
-.. c:function:: N_Vector N_VNewWithMemHelp_Hip(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
+.. c:function:: N_Vector N_VNewWithMemHelp_Hip(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
 
    This function creates a new HIP ``N_Vector`` with a user-supplied
    SUNMemoryHelper for allocating/freeing memory.
@@ -122,14 +122,14 @@ following additional user-callable routines:
    other constructors to create a new vector.
 
 
-.. c:function:: N_Vector N_VMake_Hip(sunindextype vec_length, realtype *h_vdata, realtype *d_vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Hip(sunindextype vec_length, sunrealtype *h_vdata, sunrealtype *d_vdata, SUNContext sunctx)
 
 
    This function creates a HIP ``N_Vector`` with user-supplied vector data arrays
    for the host and the device.
 
 
-.. c:function:: N_Vector N_VMakeManaged_Hip(sunindextype vec_length, realtype *vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMakeManaged_Hip(sunindextype vec_length, sunrealtype *vdata, SUNContext sunctx)
 
    This function creates a HIP ``N_Vector`` with a user-supplied
    managed memory data array.
@@ -163,12 +163,12 @@ The module NVECTOR_HIP also provides the following user-callable routines:
       policies across vectors*
 
 
-.. c:function:: realtype* N_VCopyToDevice_Hip(N_Vector v)
+.. c:function:: sunrealtype* N_VCopyToDevice_Hip(N_Vector v)
 
    This function copies host vector data to the device.
 
 
-.. c:function:: realtype* N_VCopyFromDevice_Hip(N_Vector v)
+.. c:function:: sunrealtype* N_VCopyFromDevice_Hip(N_Vector v)
 
    This function copies vector data from the device to the host.
 
@@ -194,71 +194,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VNew_Hip` will have the default settings for the NVECTOR_HIP module.
 
-.. c:function:: int N_VEnableFusedOps_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the HIP vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the HIP vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the HIP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the HIP vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the HIP vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the HIP vector. The return value
diff --git a/doc/shared/nvectors/NVector_MPIManyVector.rst b/doc/shared/nvectors/NVector_MPIManyVector.rst
index bb4907569c..adcd362ff4 100644
--- a/doc/shared/nvectors/NVector_MPIManyVector.rst
+++ b/doc/shared/nvectors/NVector_MPIManyVector.rst
@@ -99,7 +99,7 @@ the beginning of the array of subvectors, and a boolean flag
      sunindextype  num_subvectors;  /* number of vectors attached      */
      sunindextype  global_length;   /* overall mpimanyvector length    */
      N_Vector*     subvec_array;    /* pointer to N_Vector array       */
-     booleantype   own_data;        /* flag indicating data ownership  */
+     sunbooleantype   own_data;        /* flag indicating data ownership  */
    };
 
 The header file to include when using this module is
@@ -209,7 +209,7 @@ the following additional user-callable routines:
       local_length = N_VGetSubvectorLocalLength_MPIManyVector(v, 0);
 
 
-.. c:function:: realtype *N_VGetSubvectorArrayPointer_MPIManyVector(N_Vector v, sunindextype vec_num)
+.. c:function:: sunrealtype *N_VGetSubvectorArrayPointer_MPIManyVector(N_Vector v, sunindextype vec_num)
 
    This function returns the data array pointer for the *vec_num*
    subvector from the NVECTOR array.
@@ -219,7 +219,7 @@ the following additional user-callable routines:
    returned.
 
 
-.. c:function:: int N_VSetSubvectorArrayPointer_MPIManyVector(realtype *v_data, N_Vector v, sunindextype vec_num)
+.. c:function:: int N_VSetSubvectorArrayPointer_MPIManyVector(sunrealtype *v_data, N_Vector v, sunindextype vec_num)
 
    This function sets the data array pointer for the *vec_num*
    subvector from the NVECTOR array.
@@ -254,57 +254,57 @@ subvectors, so those should be set up as desired *before* attaching
 them to the MPIManyVector in :c:func:`N_VNew_MPIManyVector` or
 :c:func:`N_VMake_MPIManyVector`.
 
-.. c:function:: int N_VEnableFusedOps_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the MPIManyVector vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the MPIManyVector vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the MPIManyVector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_MPIManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the MPIManyVector vector. The return value is
diff --git a/doc/shared/nvectors/NVector_MPIPlusX.rst b/doc/shared/nvectors/NVector_MPIPlusX.rst
index 17869cb067..d43e721b0a 100644
--- a/doc/shared/nvectors/NVector_MPIPlusX.rst
+++ b/doc/shared/nvectors/NVector_MPIPlusX.rst
@@ -105,7 +105,7 @@ user-callable routines:
       local_length = N_VGetLocalLength_MPIPlusX(v);
 
 
-.. c:function:: realtype *N_VGetArrayPointer_MPIPlusX(N_Vector v)
+.. c:function:: sunrealtype *N_VGetArrayPointer_MPIPlusX(N_Vector v)
 
    This function returns the data array pointer for the local vector.
 
@@ -113,7 +113,7 @@ user-callable routines:
    operation, then ``NULL`` is returned.
 
 
-.. c:function:: void N_VSetArrayPointer_MPIPlusX(realtype *v_data, N_Vector v)
+.. c:function:: void N_VSetArrayPointer_MPIPlusX(sunrealtype *v_data, N_Vector v)
 
    This function sets the data array pointer for the local vector if
    the local vector implements the :c:func:`N_VSetArrayPointer` operation.
diff --git a/doc/shared/nvectors/NVector_ManyVector.rst b/doc/shared/nvectors/NVector_ManyVector.rst
index 5f2557aea9..02dec8d5bd 100644
--- a/doc/shared/nvectors/NVector_ManyVector.rst
+++ b/doc/shared/nvectors/NVector_ManyVector.rst
@@ -82,7 +82,7 @@ the beginning of the array of subvectors, and a boolean flag
      sunindextype  num_subvectors;  /* number of vectors attached      */
      sunindextype  global_length;   /* overall manyvector length       */
      N_Vector*     subvec_array;    /* pointer to N_Vector array       */
-     booleantype   own_data;        /* flag indicating data ownership  */
+     sunbooleantype   own_data;        /* flag indicating data ownership  */
    };
 
 The header file to include when using this module is
@@ -149,7 +149,7 @@ the following additional user-callable routines:
       local_length = N_VGetSubvectorLocalLength_ManyVector(v, 0);
 
 
-.. c:function:: realtype *N_VGetSubvectorArrayPointer_ManyVector(N_Vector v, sunindextype vec_num)
+.. c:function:: sunrealtype *N_VGetSubvectorArrayPointer_ManyVector(N_Vector v, sunindextype vec_num)
 
    This function returns the data array pointer for the *vec_num*
    subvector from the NVECTOR array.
@@ -159,7 +159,7 @@ the following additional user-callable routines:
    returned.
 
 
-.. c:function:: int N_VSetSubvectorArrayPointer_ManyVector(realtype *v_data, N_Vector v, sunindextype vec_num)
+.. c:function:: int N_VSetSubvectorArrayPointer_ManyVector(sunrealtype *v_data, N_Vector v, sunindextype vec_num)
 
    This function sets the data array pointer for the *vec_num*
    subvector from the NVECTOR array.
@@ -193,57 +193,57 @@ that these routines *do not* call the corresponding routines on
 subvectors, so those should be set up as desired *before* attaching
 them to the ManyVector in :c:func:`N_VNew_ManyVector`.
 
-.. c:function:: int N_VEnableFusedOps_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the manyvector vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the manyvector vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the manyvector vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_ManyVector(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_ManyVector(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the manyvector vector. The return value is
diff --git a/doc/shared/nvectors/NVector_OpenMP.rst b/doc/shared/nvectors/NVector_OpenMP.rst
index 09e3311bb9..fc5c1a9288 100644
--- a/doc/shared/nvectors/NVector_OpenMP.rst
+++ b/doc/shared/nvectors/NVector_OpenMP.rst
@@ -37,8 +37,8 @@ supplied argument in the vector constructor.
 
    struct _N_VectorContent_OpenMP {
      sunindextype length;
-     booleantype own_data;
-     realtype *data;
+     sunbooleantype own_data;
+     sunrealtype *data;
      int num_threads;
    };
 
@@ -180,7 +180,7 @@ The module NVECTOR_OPENMP provides the following additional user-callable routin
    (``NULL``) data array.
 
 
-.. c:function:: N_Vector N_VMake_OpenMP(sunindextype vec_length, realtype* v_data, int num_threads, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_OpenMP(sunindextype vec_length, sunrealtype* v_data, int num_threads, SUNContext sunctx)
 
    This function creates and allocates memory for a OpenMP vector with
    user-provided data array, *v_data*.
@@ -209,71 +209,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VNew_OpenMP` will have the default settings for the NVECTOR_OPENMP module.
 
-.. c:function:: int N_VEnableFusedOps_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the OpenMP vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the OpenMP vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the OpenMP vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the OpenMP vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the OpenMP vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the OpenMP vector. The return value
diff --git a/doc/shared/nvectors/NVector_OpenMPDEV.rst b/doc/shared/nvectors/NVector_OpenMPDEV.rst
index 9db8affe63..e347ea2ac9 100644
--- a/doc/shared/nvectors/NVector_OpenMPDEV.rst
+++ b/doc/shared/nvectors/NVector_OpenMPDEV.rst
@@ -32,9 +32,9 @@ the ownership of host and device data arrays.
   struct _N_VectorContent_OpenMPDEV
   {
     sunindextype length;
-    booleantype  own_data;
-    realtype     *host_data;
-    realtype     *dev_data;
+    sunbooleantype  own_data;
+    sunrealtype     *host_data;
+    sunrealtype     *dev_data;
   };
 
 The header file to include when using this module is ``nvector_openmpdev.h``.
@@ -144,19 +144,19 @@ user-callable routines:
    (``NULL``) data array.
 
 
-.. c:function:: N_Vector N_VMake_OpenMPDEV(sunindextype vec_length, realtype *h_vdata, realtype *d_vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_OpenMPDEV(sunindextype vec_length, sunrealtype *h_vdata, sunrealtype *d_vdata, SUNContext sunctx)
 
    This function creates an NVECTOR_OPENMPDEV vector with user-supplied vector data
    arrays ``h_vdata`` and ``d_vdata``. This function does not allocate memory for
    data itself.
 
 
-.. c:function:: realtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v)
+.. c:function:: sunrealtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v)
 
    This function returns a pointer to the host data array.
 
 
-.. c:function:: realtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v)
+.. c:function:: sunrealtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v)
 
    This function returns a pointer to the device data array.
 
@@ -193,21 +193,21 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 ``N_VNew_OpenMPDEV`` will have the default settings for the NVECTOR_OPENMPDEV module.
 
-.. c:function::  int N_VEnableFusedOps_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function::  int N_VEnableFusedOps_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
   vector array operations in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
   combination fused operation in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
   add a vector to multiple vectors fused operation in the NVECTOR_OPENMPDEV vector. The
@@ -215,7 +215,7 @@ options as the vector they are cloned from while vectors created with
   ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
   dot products fused operation in the NVECTOR_OPENMPDEV vector. The return value is ``0``
@@ -223,35 +223,35 @@ options as the vector they are cloned from while vectors created with
   ``NULL``.
 
 
-.. c:function:: int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
   operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
   operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
   operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
   operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value is ``0`` for
   success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
   norm operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value is
@@ -259,7 +259,7 @@ options as the vector they are cloned from while vectors created with
   ``NULL``.
 
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
   add a vector array to multiple vector arrays operation in the NVECTOR_OPENMPDEV vector. The
@@ -267,7 +267,7 @@ options as the vector they are cloned from while vectors created with
   ``ops`` structure are ``NULL``.
 
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 
   This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
   combination operation for vector arrays in the NVECTOR_OPENMPDEV vector. The return value
diff --git a/doc/shared/nvectors/NVector_Operations.rst b/doc/shared/nvectors/NVector_Operations.rst
index 6ef842fdc0..eb5c287131 100644
--- a/doc/shared/nvectors/NVector_Operations.rst
+++ b/doc/shared/nvectors/NVector_Operations.rst
@@ -84,7 +84,7 @@ operations below.
 
    Returns storage requirements for the ``N_Vector`` *v*:
 
-   * *lrw* contains the number of ``realtype`` words
+   * *lrw* contains the number of ``sunrealtype`` words
    * *liw* contains the number of integer words.
 
    This function is advisory only, for use in
@@ -99,11 +99,11 @@ operations below.
       N_VSpace(nvSpec, &lrw, &liw);
 
 
-.. c:function:: realtype* N_VGetArrayPointer(N_Vector v)
+.. c:function:: sunrealtype* N_VGetArrayPointer(N_Vector v)
 
-   Returns a pointer to a ``realtype`` array from the ``N_Vector``
+   Returns a pointer to a ``sunrealtype`` array from the ``N_Vector``
    *v*.  Note that this assumes that the internal data in the
-   ``N_Vector`` is a contiguous array of ``realtype`` and is
+   ``N_Vector`` is a contiguous array of ``sunrealtype`` and is
    accesible from the CPU.
 
    This routine is
@@ -119,11 +119,11 @@ operations below.
       vdata = N_VGetArrayPointer(v);
 
 
-.. c:function:: realtype* N_VGetDeviceArrayPointer(N_Vector v)
+.. c:function:: sunrealtype* N_VGetDeviceArrayPointer(N_Vector v)
 
-   Returns a device pointer to a ``realtype`` array from the ``N_Vector``
+   Returns a device pointer to a ``sunrealtype`` array from the ``N_Vector``
    ``v``. Note that this assumes that the internal data in ``N_Vector`` is a
-   contiguous array of ``realtype`` and is accessible from the device (e.g.,
+   contiguous array of ``sunrealtype`` and is accessible from the device (e.g.,
    GPU).
 
    This operation is *optional* except when using the GPU-enabled direct
@@ -136,12 +136,12 @@ operations below.
       vdata = N_VGetArrayPointer(v);
 
 
-.. c:function:: void N_VSetArrayPointer(realtype* vdata, N_Vector v)
+.. c:function:: void N_VSetArrayPointer(sunrealtype* vdata, N_Vector v)
 
    Replaces the data array pointer in an ``N_Vector`` with a given
-   array of ``realtype``.  Note that this assumes that the internal
+   array of ``sunrealtype``.  Note that this assumes that the internal
    data in the ``N_Vector`` is a contiguous array of
-   ``realtype``. This routine is only used in the interfaces to the
+   ``sunrealtype``. This routine is only used in the interfaces to the
    dense (serial) linear solver, hence need not exist in a
    user-supplied NVECTOR module.
 
@@ -193,10 +193,10 @@ operations below.
       local_length = N_VGetLocalLength(v);
 
 
-.. c:function:: void N_VLinearSum(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+.. c:function:: void N_VLinearSum(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 
    Performs the operation *z = ax + by*, where *a* and *b* are
-   ``realtype`` scalars and *x* and *y* are of type ``N_Vector``:
+   ``sunrealtype`` scalars and *x* and *y* are of type ``N_Vector``:
 
    .. math::
       z_i = a x_i + b y_i, \quad i=0,\ldots,n-1.
@@ -211,9 +211,9 @@ operations below.
       N_VLinearSum(a, x, b, y, z);
 
 
-.. c:function:: void N_VConst(realtype c, N_Vector z)
+.. c:function:: void N_VConst(sunrealtype c, N_Vector z)
 
-   Sets all components of the ``N_Vector`` *z* to ``realtype`` *c*:
+   Sets all components of the ``N_Vector`` *z* to ``sunrealtype`` *c*:
 
    .. math::
       z_i = c, \quad i=0,\ldots,n-1.
@@ -258,9 +258,9 @@ operations below.
       N_VDiv(x, y, z);
 
 
-.. c:function:: void N_VScale(realtype c, N_Vector x, N_Vector z)
+.. c:function:: void N_VScale(sunrealtype c, N_Vector x, N_Vector z)
 
-   Scales the ``N_Vector`` *x* by the ``realtype`` scalar *c* and
+   Scales the ``N_Vector`` *x* by the ``sunrealtype`` scalar *c* and
    returns the result in *z*:
 
    .. math::
@@ -306,9 +306,9 @@ operations below.
       N_VInv(x, z);
 
 
-.. c:function:: void N_VAddConst(N_Vector x, realtype b, N_Vector z)
+.. c:function:: void N_VAddConst(N_Vector x, sunrealtype b, N_Vector z)
 
-   Adds the ``realtype`` scalar *b* to all components of *x* and
+   Adds the ``sunrealtype`` scalar *b* to all components of *x* and
    returns the result in the ``N_Vector`` *z*:
 
    .. math::
@@ -321,7 +321,7 @@ operations below.
       N_VAddConst(x, b, z);
 
 
-.. c:function:: realtype N_VDotProd(N_Vector x, N_Vector z)
+.. c:function:: sunrealtype N_VDotProd(N_Vector x, N_Vector z)
 
    Returns the value of the dot-product of the ``N_Vectors`` *x* and *y*:
 
@@ -335,7 +335,7 @@ operations below.
       d = N_VDotProd(x, y);
 
 
-.. c:function:: realtype N_VMaxNorm(N_Vector x)
+.. c:function:: sunrealtype N_VMaxNorm(N_Vector x)
 
    Returns the value of the :math:`l_{\infty}` norm of the
    ``N_Vector`` *x*:
@@ -350,10 +350,10 @@ operations below.
       m = N_VMaxNorm(x);
 
 
-.. c:function:: realtype N_VWrmsNorm(N_Vector x, N_Vector w)
+.. c:function:: sunrealtype N_VWrmsNorm(N_Vector x, N_Vector w)
 
    Returns the weighted root-mean-square norm of the ``N_Vector`` *x*
-   with (positive) ``realtype`` weight vector *w*:
+   with (positive) ``sunrealtype`` weight vector *w*:
 
    .. math::
       m = \sqrt{\left( \sum_{i=0}^{n-1} (x_i w_i)^2 \right) / n}
@@ -365,10 +365,10 @@ operations below.
       m = N_VWrmsNorm(x, w);
 
 
-.. c:function:: realtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id)
+.. c:function:: sunrealtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id)
 
    Returns the weighted root mean square norm of the ``N_Vector`` *x*
-   with ``realtype`` weight vector *w* built using only the
+   with ``sunrealtype`` weight vector *w* built using only the
    elements of *x* corresponding to positive elements of the
    ``N_Vector`` *id*:
 
@@ -383,7 +383,7 @@ operations below.
 
       m = N_VWrmsNormMask(x, w, id);
 
-.. c:function:: realtype N_VMin(N_Vector x)
+.. c:function:: sunrealtype N_VMin(N_Vector x)
 
    Returns the smallest element of the ``N_Vector`` *x*:
 
@@ -396,10 +396,10 @@ operations below.
 
       m = N_VMin(x);
 
-.. c:function:: realtype N_VWl2Norm(N_Vector x, N_Vector w)
+.. c:function:: sunrealtype N_VWl2Norm(N_Vector x, N_Vector w)
 
    Returns the weighted Euclidean :math:`l_2` norm of the ``N_Vector``
-   *x* with ``realtype`` weight vector *w*:
+   *x* with ``sunrealtype`` weight vector *w*:
 
    .. math::
       m = \sqrt{\sum_{i=0}^{n-1}\left(x_i w_i\right)^2}.
@@ -410,7 +410,7 @@ operations below.
 
       m = N_VWL2Norm(x, w);
 
-.. c:function:: realtype N_VL1Norm(N_Vector x)
+.. c:function:: sunrealtype N_VL1Norm(N_Vector x)
 
    Returns the :math:`l_1` norm of the ``N_Vector`` *x*:
 
@@ -424,9 +424,9 @@ operations below.
       m = N_VL1Norm(x);
 
 
-.. c:function:: void N_VCompare(realtype c, N_Vector x, N_Vector z)
+.. c:function:: void N_VCompare(sunrealtype c, N_Vector x, N_Vector z)
 
-   Compares the components of the ``N_Vector`` *x* to the ``realtype``
+   Compares the components of the ``N_Vector`` *x* to the ``sunrealtype``
    scalar *c* and returns an ``N_Vector`` *z* such that for all
    :math:`0\le i< n`,
 
@@ -440,7 +440,7 @@ operations below.
 
       N_VCompare(c, x, z);
 
-.. c:function:: booleantype N_VInvTest(N_Vector x, N_Vector z)
+.. c:function:: sunbooleantype N_VInvTest(N_Vector x, N_Vector z)
 
    Sets the components of the ``N_Vector`` *z* to be the inverses of
    the components of the ``N_Vector`` *x*, with prior testing for
@@ -459,7 +459,7 @@ operations below.
 
       t = N_VInvTest(x, z);
 
-.. c:function:: booleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m)
+.. c:function:: sunbooleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m)
 
    Performs the following constraint tests based on the values in
    :math:`c_i`:
@@ -485,7 +485,7 @@ operations below.
 
       t = N_VConstrMask(c, x, m);
 
-.. c:function:: realtype N_VMinQuotient(N_Vector num, N_Vector denom)
+.. c:function:: sunrealtype N_VMinQuotient(N_Vector num, N_Vector denom)
 
    This routine returns the minimum of the quotients obtained by
    termwise dividing the elements of *n* by the elements in *d*:
@@ -494,7 +494,7 @@ operations below.
       \min_{0\le i< n} \frac{\text{num}_i}{\text{denom}_i}.
 
    A zero element in *denom* will be skipped.  If no such quotients
-   are found, then the large value ``BIG_REAL`` (defined in the header
+   are found, then the large value ``SUN_BIG_REAL`` (defined in the header
    file ``sundials_types.h``) is returned.
 
    Usage:
@@ -521,7 +521,7 @@ the name, usage of the function, and a description of its mathematical
 operations below.
 
 
-.. c:function:: int N_VLinearCombination(int nv, realtype* c, N_Vector* X, N_Vector z)
+.. c:function:: int N_VLinearCombination(int nv, sunrealtype* c, N_Vector* X, N_Vector z)
 
    This routine computes the linear combination of *nv* vectors with :math:`n` elements:
 
@@ -541,7 +541,7 @@ operations below.
       retval = N_VLinearCombination(nv, c, X, z);
 
 
-.. c:function:: int N_VScaleAddMulti(int nv, realtype* c, N_Vector x, N_Vector* Y, N_Vector* Z)
+.. c:function:: int N_VScaleAddMulti(int nv, sunrealtype* c, N_Vector x, N_Vector* Y, N_Vector* Z)
 
    This routine scales and adds one vector to *nv* vectors with :math:`n` elements:
 
@@ -560,7 +560,7 @@ operations below.
       retval = N_VScaleAddMulti(nv, c, x, Y, Z);
 
 
-.. c:function:: int N_VDotProdMulti(int nv, N_Vector x, N_Vector* Y, realtype* d)
+.. c:function:: int N_VDotProdMulti(int nv, N_Vector x, N_Vector* Y, sunrealtype* d)
 
    This routine computes the dot product of a vector with *nv* vectors
    having :math:`n` elements:
@@ -596,7 +596,7 @@ operation, we give the name, usage of the function, and a description
 of its mathematical operations below.
 
 
-.. c:function:: int N_VLinearSumVectorArray(int nv, realtype a, N_Vector X, realtype b, N_Vector* Y, N_Vector* Z)
+.. c:function:: int N_VLinearSumVectorArray(int nv, sunrealtype a, N_Vector X, sunrealtype b, N_Vector* Y, N_Vector* Z)
 
    This routine computes the linear sum of two vector arrays of *nv* vectors with :math:`n` elements:
 
@@ -615,7 +615,7 @@ of its mathematical operations below.
       retval = N_VLinearSumVectorArray(nv, a, X, b, Y, Z);
 
 
-.. c:function:: int N_VScaleVectorArray(int nv, realtype* c, N_Vector* X, N_Vector* Z)
+.. c:function:: int N_VScaleVectorArray(int nv, sunrealtype* c, N_Vector* X, N_Vector* Z)
 
    This routine scales each element in a vector of :math:`n` elements
    in a vector array of *nv* vectors by a potentially different constant:
@@ -634,7 +634,7 @@ of its mathematical operations below.
       retval = N_VScaleVectorArray(nv, c, X, Z);
 
 
-.. c:function:: int N_VConstVectorArray(int nv, realtype c, N_Vector* Z)
+.. c:function:: int N_VConstVectorArray(int nv, sunrealtype c, N_Vector* Z)
 
    This routine sets each element in a vector of :math:`n` elements in
    a vector array of *nv* vectors to the same value:
@@ -652,7 +652,7 @@ of its mathematical operations below.
       retval = N_VConstVectorArray(nv, c, Z);
 
 
-.. c:function:: int N_VWrmsNormVectorArray(int nv, N_Vector* X, N_Vector* W, realtype* m)
+.. c:function:: int N_VWrmsNormVectorArray(int nv, N_Vector* X, N_Vector* W, sunrealtype* m)
 
    This routine computes the weighted root mean square norm of each
    vector in a vector array:
@@ -672,7 +672,7 @@ of its mathematical operations below.
       retval = N_VWrmsNormVectorArray(nv, X, W, m);
 
 
-.. c:function:: int N_VWrmsNormMaskVectorArray(int nv, N_Vector* X, N_Vector* W, N_Vector id, realtype* m)
+.. c:function:: int N_VWrmsNormMaskVectorArray(int nv, N_Vector* X, N_Vector* W, N_Vector id, sunrealtype* m)
 
    This routine computes the masked weighted root mean square norm of
    each vector in a vector array:
@@ -694,7 +694,7 @@ of its mathematical operations below.
       retval = N_VWrmsNormMaskVectorArray(nv, X, W, id, m);
 
 
-.. c:function:: int N_VScaleAddMultiVectorArray(int nv, int nsum, realtype* c, N_Vector* X, N_Vector** YY, N_Vector** ZZ)
+.. c:function:: int N_VScaleAddMultiVectorArray(int nv, int nsum, sunrealtype* c, N_Vector* X, N_Vector** YY, N_Vector** ZZ)
 
    This routine scales and adds a vector array of *nv* vectors to
    *nsum* other vector arrays:
@@ -715,7 +715,7 @@ of its mathematical operations below.
       retval = N_VScaleAddMultiVectorArray(nv, nsum, c, x, YY, ZZ);
 
 
-.. c:function:: int N_VLinearCombinationVectorArray(int nv, int nsum, realtype* c, N_Vector** XX, N_Vector* Z)
+.. c:function:: int N_VLinearCombinationVectorArray(int nv, int nsum, sunrealtype* c, N_Vector** XX, N_Vector* Z)
 
    This routine computes the linear combination of *nsum* vector
    arrays containing *nv* vectors:
@@ -752,7 +752,7 @@ the name, usage of the function, and a description of its mathematical
 operations below.
 
 
-.. c:function:: realtype N_VDotProdLocal(N_Vector x, N_Vector y)
+.. c:function:: sunrealtype N_VDotProdLocal(N_Vector x, N_Vector y)
 
    This routine computes the MPI task-local portion of the ordinary
    dot product of *x* and *y*:
@@ -771,7 +771,7 @@ operations below.
       d = N_VDotProdLocal(x, y);
 
 
-.. c:function:: realtype N_VMaxNormLocal(N_Vector x)
+.. c:function:: sunrealtype N_VMaxNormLocal(N_Vector x)
 
    This routine computes the MPI task-local portion of the maximum
    norm of the NVECTOR *x*:
@@ -790,7 +790,7 @@ operations below.
       m = N_VMaxNormLocal(x);
 
 
-.. c:function:: realtype N_VMinLocal(N_Vector x)
+.. c:function:: sunrealtype N_VMinLocal(N_Vector x)
 
    This routine computes the smallest element of the MPI task-local
    portion of the NVECTOR *x*:
@@ -809,7 +809,7 @@ operations below.
       m = N_VMinLocal(x);
 
 
-.. c:function:: realtype N_VL1NormLocal(N_Vector x)
+.. c:function:: sunrealtype N_VL1NormLocal(N_Vector x)
 
    This routine computes the MPI task-local portion of the :math:`l_1`
    norm of the ``N_Vector`` *x*:
@@ -828,7 +828,7 @@ operations below.
       n = N_VL1NormLocal(x);
 
 
-.. c:function:: realtype N_VWSqrSumLocal(N_Vector x, N_Vector w)
+.. c:function:: sunrealtype N_VWSqrSumLocal(N_Vector x, N_Vector w)
 
    This routine computes the MPI task-local portion of the weighted
    squared sum of the NVECTOR *x* with weight vector *w*:
@@ -847,7 +847,7 @@ operations below.
       s = N_VWSqrSumLocal(x, w);
 
 
-.. c:function:: realtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id)
+.. c:function:: sunrealtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id)
 
    This routine computes the MPI task-local portion of the weighted
    squared sum of the NVECTOR *x* with weight vector *w* built using
@@ -872,7 +872,7 @@ operations below.
       s = N_VWSqrSumMaskLocal(x, w, id);
 
 
-.. c:function:: booleantype N_VInvTestLocal(N_Vector x)
+.. c:function:: sunbooleantype N_VInvTestLocal(N_Vector x)
 
    This routine sets the MPI task-local components of the
    NVECTOR *z* to be the inverses of the components of the NVECTOR
@@ -894,7 +894,7 @@ operations below.
       t = N_VInvTestLocal(x);
 
 
-.. c:function:: booleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m)
+.. c:function:: sunbooleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m)
 
    Performs the following constraint tests based on the values in
    :math:`c_i`:
@@ -922,13 +922,13 @@ operations below.
       t = N_VConstrMaskLocal(c, x, m);
 
 
-.. c:function:: realtype N_VMinQuotientLocal(N_Vector num, N_Vector denom)
+.. c:function:: sunrealtype N_VMinQuotientLocal(N_Vector num, N_Vector denom)
 
    This routine returns the minimum of the quotients obtained by
    term-wise dividing :math:`num_i` by :math:`denom_i`, for all MPI
    task-local components of the vectors.  A zero element in *denom*
    will be skipped. If no such quotients are found, then the large value
-   ``BIG_REAL`` (defined in the header file ``sundials_types.h``)
+   ``SUN_BIG_REAL`` (defined in the header file ``sundials_types.h``)
    is returned.
 
    Usage:
@@ -950,7 +950,7 @@ orthogonalization methods to reduce the number of MPI ``Allreduce`` calls. If a
 particular NVECTOR implementation does not define these operations additional
 communication will be required.
 
-.. c:function:: int N_VDotProdMultiLocal(int nv, N_Vector x, N_Vector* Y, realtype* d)
+.. c:function:: int N_VDotProdMultiLocal(int nv, N_Vector x, N_Vector* Y, sunrealtype* d)
 
    This routine computes the MPI task-local portion of the dot product of a
    vector :math:`x` with *nv* vectors :math:`y_j`:
@@ -971,7 +971,7 @@ communication will be required.
       retval = N_VDotProdMultiLocal(nv, x, Y, d);
 
 
-.. c:function:: int N_VDotProdMultiAllReduce(int nv, N_Vector x, realtype* d)
+.. c:function:: int N_VDotProdMultiAllReduce(int nv, N_Vector x, sunrealtype* d)
 
    This routine combines the MPI task-local portions of the dot product of a
    vector :math:`x` with *nv* vectors:
diff --git a/doc/shared/nvectors/NVector_PETSc.rst b/doc/shared/nvectors/NVector_PETSc.rst
index 5857f5d249..dcfa24a158 100644
--- a/doc/shared/nvectors/NVector_PETSc.rst
+++ b/doc/shared/nvectors/NVector_PETSc.rst
@@ -28,7 +28,7 @@ indicating ownership of the wrapped PETSc vector.
    struct _N_VectorContent_Petsc {
       sunindextype local_length;
       sunindextype global_length;
-      booleantype own_data;
+      sunbooleantype own_data;
       Vec *pvec;
       MPI_Comm comm;
    };
@@ -101,71 +101,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VMake_Petsc` will have the default settings for the NVECTOR_PETSC module.
 
-.. c:function:: int N_VEnableFusedOps_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the PETSc vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the PETSc vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the PETSc vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the PETSc vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the PETSc vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the PETSc vector. The return value
diff --git a/doc/shared/nvectors/NVector_ParHyp.rst b/doc/shared/nvectors/NVector_ParHyp.rst
index 97f3ed0f40..767958faed 100644
--- a/doc/shared/nvectors/NVector_ParHyp.rst
+++ b/doc/shared/nvectors/NVector_ParHyp.rst
@@ -33,9 +33,9 @@ HYPRE parallel vector object *x*.
    struct _N_VectorContent_ParHyp {
      sunindextype local_length;
      sunindextype global_length;
-     booleantype own_data;
-     booleantype own_parvector;
-     realtype *data;
+     sunbooleantype own_data;
+     sunbooleantype own_parvector;
+     sunrealtype *data;
      MPI_Comm comm;
      hypre_ParVector *x;
    };
@@ -109,71 +109,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VMake_ParHyp` will have the default settings for the NVECTOR_PARHYP module.
 
-.. c:function:: int N_VEnableFusedOps_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the parhyp vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the parhyp vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the parhyp vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the parhyp vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the parhyp vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the parhyp vector. The return value
diff --git a/doc/shared/nvectors/NVector_Parallel.rst b/doc/shared/nvectors/NVector_Parallel.rst
index 56721550c1..ce360fd3bb 100644
--- a/doc/shared/nvectors/NVector_Parallel.rst
+++ b/doc/shared/nvectors/NVector_Parallel.rst
@@ -29,8 +29,8 @@ ownership of the data array *data*.
    struct _N_VectorContent_Parallel {
       sunindextype local_length;
       sunindextype global_length;
-      booleantype own_data;
-      realtype *data;
+      sunbooleantype own_data;
+      sunrealtype *data;
       MPI_Comm comm;
    };
 
@@ -173,7 +173,7 @@ the following additional user-callable routines:
    (``NULL``) data array.
 
 
-.. c:function:: N_Vector N_VMake_Parallel(MPI_Comm comm, sunindextype local_length, sunindextype global_length, realtype* v_data, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Parallel(MPI_Comm comm, sunindextype local_length, sunindextype global_length, sunrealtype* v_data, SUNContext sunctx)
 
    This function creates and allocates memory for a parallel vector
    with user-provided data array.
@@ -207,71 +207,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from, while vectors created with
 :c:func:`N_VNew_Parallel` will have the default settings for the NVECTOR_PARALLEL module.
 
-.. c:function:: int N_VEnableFusedOps_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the parallel vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the parallel vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the parallel vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the parallel vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the parallel vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the parallel vector. The return value
diff --git a/doc/shared/nvectors/NVector_Pthreads.rst b/doc/shared/nvectors/NVector_Pthreads.rst
index 5669210aa5..124f0e1262 100644
--- a/doc/shared/nvectors/NVector_Pthreads.rst
+++ b/doc/shared/nvectors/NVector_Pthreads.rst
@@ -36,8 +36,8 @@ threaded using POSIX threads (Pthreads).
 
    struct _N_VectorContent_Pthreads {
      sunindextype length;
-     booleantype own_data;
-     realtype *data;
+     sunbooleantype own_data;
+     sunrealtype *data;
      int num_threads;
    };
 
@@ -176,7 +176,7 @@ user-callable routines:
    (``NULL``) data array.
 
 
-.. c:function:: N_Vector N_VMake_Pthreads(sunindextype vec_length, realtype* v_data, int num_threads, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Pthreads(sunindextype vec_length, sunrealtype* v_data, int num_threads, SUNContext sunctx)
 
    This function creates and allocates memory for a Pthreads vector with
    user-provided data array, *v_data*.
@@ -205,71 +205,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VNew_Pthreads` will have the default settings for the NVECTOR_PTHREADS module.
 
-.. c:function:: int N_VEnableFusedOps_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the Pthreads vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the Pthreads vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the Pthreads vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the Pthreads vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the Pthreads vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the Pthreads vector. The return value
diff --git a/doc/shared/nvectors/NVector_RAJA.rst b/doc/shared/nvectors/NVector_RAJA.rst
index 38990e034a..9a2df1fea7 100644
--- a/doc/shared/nvectors/NVector_RAJA.rst
+++ b/doc/shared/nvectors/NVector_RAJA.rst
@@ -39,9 +39,9 @@ The vector content layout is as follows:
    struct _N_VectorContent_Raja
    {
       sunindextype length;
-      booleantype  own_data;
-      realtype*    host_data;
-      realtype*    device_data;
+      sunbooleantype  own_data;
+      sunrealtype*    host_data;
+      sunrealtype*    device_data;
       void*        priv; /* 'private' data */
    };
 
@@ -74,16 +74,16 @@ accessor functions:
 
 
 
-.. c:function:: realtype* N_VGetHostArrayPointer_Raja(N_Vector v)
+.. c:function:: sunrealtype* N_VGetHostArrayPointer_Raja(N_Vector v)
 
    This function returns pointer to the vector data on the host.
 
 
-.. c:function:: realtype* N_VGetDeviceArrayPointer_Raja(N_Vector v)
+.. c:function:: sunrealtype* N_VGetDeviceArrayPointer_Raja(N_Vector v)
 
    This function returns pointer to the vector data on the device.
 
-.. c:function:: booleantype N_VIsManagedMemory_Raja(N_Vector v)
+.. c:function:: sunbooleantype N_VIsManagedMemory_Raja(N_Vector v)
 
    This function returns a boolean flag indicating if the vector
    data is allocated in managed memory or not.
@@ -125,19 +125,19 @@ NVECTOR_RAJA provides the following additional user-callable routines:
    The vector data array is allocated in managed memory.
 
 
-.. c:function:: N_Vector N_VMake_Raja(sunindextype length, realtype *h_data, realtype *v_data, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Raja(sunindextype length, sunrealtype *h_data, sunrealtype *v_data, SUNContext sunctx)
 
    This function creates an NVECTOR_RAJA with user-supplied host and device
    data arrays. This function does not allocate memory for data itself.
 
 
-.. c:function:: N_Vector N_VMakeManaged_Raja(sunindextype length, realtype *vdata, SUNContext sunctx)
+.. c:function:: N_Vector N_VMakeManaged_Raja(sunindextype length, sunrealtype *vdata, SUNContext sunctx)
 
    This function creates an NVECTOR_RAJA with a user-supplied managed
    memory data array. This function does not allocate memory for data itself.
 
 
-.. c:function:: N_Vector N_VNewWithMemHelp_Raja(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
+.. c:function:: N_Vector N_VNewWithMemHelp_Raja(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
 
    This function creates an NVECTOR_RAJA with a user-supplied SUNMemoryHelper
    for allocating/freeing memory.
@@ -181,19 +181,19 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned from while vectors created with
 :c:func:`N_VNew_Raja` will have the default settings for the NVECTOR_RAJA module.
 
-.. c:function:: int N_VEnableFusedOps_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the RAJA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the RAJA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the RAJA vector. The
@@ -201,53 +201,53 @@ options as the vector they are cloned from while vectors created with
    ``ops`` structure are ``NULL``.
 
 ..
-   .. c:function:: int N_VEnableDotProdMulti_Raja(N_Vector v, booleantype tf)
+   .. c:function:: int N_VEnableDotProdMulti_Raja(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
       dot products fused operation in the RAJA vector. The return value is ``0``
       for success and ``-1`` if the input vector or its ``ops`` structure are
       ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the RAJA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the RAJA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the RAJA vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 ..
-   .. c:function:: int N_VEnableWrmsNormVectorArray_Raja(N_Vector v, booleantype tf)
+   .. c:function:: int N_VEnableWrmsNormVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
       operation for vector arrays in the RAJA vector. The return value is ``0`` for
       success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-   .. c:function:: int N_VEnableWrmsNormMaskVectorArray_Raja(N_Vector v, booleantype tf)
+   .. c:function:: int N_VEnableWrmsNormMaskVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
       norm operation for vector arrays in the RAJA vector. The return value is
       ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
       ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the RAJA vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the RAJA vector. The return value
diff --git a/doc/shared/nvectors/NVector_SYCL.rst b/doc/shared/nvectors/NVector_SYCL.rst
index aaab5035bd..7f6036f925 100644
--- a/doc/shared/nvectors/NVector_SYCL.rst
+++ b/doc/shared/nvectors/NVector_SYCL.rst
@@ -30,7 +30,7 @@ The vector content layout is as follows:
    struct _N_VectorContent_Sycl
    {
       sunindextype       length;
-      booleantype        own_helper;
+      sunbooleantype     own_helper;
       SUNMemory          host_data;
       SUNMemory          device_data;
       SUNSyclExecPolicy* stream_exec_policy;
@@ -96,21 +96,21 @@ constructors for creating a new NVECTOR_SYCL:
    operation are launched in the provided queue.
 
 
-.. cpp:function:: N_Vector N_VMake_Sycl(sunindextype length, realtype *h_vdata, realtype *d_vdata, sycl::queue* Q, SUNContext sunctx)
+.. cpp:function:: N_Vector N_VMake_Sycl(sunindextype length, sunrealtype *h_vdata, sunrealtype *d_vdata, sycl::queue* Q, SUNContext sunctx)
 
    This function creates an NVECTOR_SYCL with user-supplied host and device
    data arrays. This function does not allocate memory for data itself. All
    operation are launched in the provided queue.
 
 
-.. cpp:function:: N_Vector N_VMakeManaged_Sycl(sunindextype length, realtype *vdata, sycl::queue *Q, SUNContext sunctx)
+.. cpp:function:: N_Vector N_VMakeManaged_Sycl(sunindextype length, sunrealtype *vdata, sycl::queue *Q, SUNContext sunctx)
 
    This function creates an NVECTOR_SYCL with a user-supplied managed (shared)
    data array. This function does not allocate memory for data itself. All
    operation are launched in the provided queue.
 
 
-.. cpp:function:: N_Vector N_VNewWithMemHelp_Sycl(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, sycl::queue *Q, SUNContext sunctx)
+.. cpp:function:: N_Vector N_VNewWithMemHelp_Sycl(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, sycl::queue *Q, SUNContext sunctx)
 
    This function creates an NVECTOR_SYCL with a user-supplied SUNMemoryHelper
    for allocating/freeing memory. All operation are launched in the provided
@@ -133,22 +133,22 @@ functions given below. To ensure memory coherency, a user will need to call the
 host and device, unless managed (shared) memory is used.
 
 
-.. cpp:function:: realtype* N_VGetHostArrayPointer_Sycl(N_Vector v)
+.. cpp:function:: sunrealtype* N_VGetHostArrayPointer_Sycl(N_Vector v)
 
    This function returns a pointer to the vector host data array.
 
 
-.. cpp:function:: realtype* N_VGetDeviceArrayPointer_Sycl(N_Vector v)
+.. cpp:function:: sunrealtype* N_VGetDeviceArrayPointer_Sycl(N_Vector v)
 
    This function returns a pointer to the vector device data array.
 
 
-.. cpp:function:: void N_VSetHostArrayPointer_Sycl(realtype* h_vdata, N_Vector v)
+.. cpp:function:: void N_VSetHostArrayPointer_Sycl(sunrealtype* h_vdata, N_Vector v)
 
    This function sets the host array pointer in the vector ``v``.
 
 
-.. cpp:function:: void N_VSetDeviceArrayPointer_Sycl(realtype* d_vdata, N_Vector v)
+.. cpp:function:: void N_VSetDeviceArrayPointer_Sycl(sunrealtype* d_vdata, N_Vector v)
 
    This function sets the device array pointer in the vector ``v``.
 
@@ -163,7 +163,7 @@ host and device, unless managed (shared) memory is used.
    This function copies vector data from the device to the host.
 
 
-.. cpp:function:: booleantype N_VIsManagedMemory_Sycl(N_Vector v)
+.. cpp:function:: sunbooleantype N_VIsManagedMemory_Sycl(N_Vector v)
 
    This function returns ``SUNTRUE`` if the vector data is allocated as managed
    (shared) memory otherwise it returns ``SUNFALSE``.
@@ -224,19 +224,19 @@ vectors created by any of the constructors above will have the default settings
 for the NVECTOR_SYCL module.
 
 
-.. cpp:function:: int N_VEnableFusedOps_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableFusedOps_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the SYCL vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. cpp:function:: int N_VEnableLinearCombination_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableLinearCombination_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the SYCL vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. cpp:function:: int N_VEnableScaleAddMulti_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableScaleAddMulti_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the SYCL vector. The
@@ -244,53 +244,53 @@ for the NVECTOR_SYCL module.
    ``ops`` structure are ``NULL``.
 
 ..
-   .. cpp:function:: int N_VEnableDotProdMulti_Sycl(N_Vector v, booleantype tf)
+   .. cpp:function:: int N_VEnableDotProdMulti_Sycl(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
       dot products fused operation in the SYCL vector. The return value is ``0``
       for success and ``-1`` if the input vector or its ``ops`` structure are
       ``NULL``.
 
-.. cpp:function:: int N_VEnableLinearSumVectorArray_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableLinearSumVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the SYCL vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. cpp:function:: int N_VEnableScaleVectorArray_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableScaleVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the SYCL vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. cpp:function:: int N_VEnableConstVectorArray_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableConstVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the SYCL vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
 ..
-   .. cpp:function:: int N_VEnableWrmsNormVectorArray_Sycl(N_Vector v, booleantype tf)
+   .. cpp:function:: int N_VEnableWrmsNormVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
       operation for vector arrays in the SYCL vector. The return value is ``0`` for
       success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-   .. cpp:function:: int N_VEnableWrmsNormMaskVectorArray_Sycl(N_Vector v, booleantype tf)
+   .. cpp:function:: int N_VEnableWrmsNormMaskVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
       This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
       norm operation for vector arrays in the SYCL vector. The return value is
       ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
       ``NULL``.
 
-.. cpp:function:: int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the SYCL vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. cpp:function:: int N_VEnableLinearCombinationVectorArray_Sycl(N_Vector v, booleantype tf)
+.. cpp:function:: int N_VEnableLinearCombinationVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the SYCL vector. The return value
diff --git a/doc/shared/nvectors/NVector_Serial.rst b/doc/shared/nvectors/NVector_Serial.rst
index b7b8bcab24..f93ffd8b40 100644
--- a/doc/shared/nvectors/NVector_Serial.rst
+++ b/doc/shared/nvectors/NVector_Serial.rst
@@ -27,8 +27,8 @@ flag *own_data* which specifies the ownership of data.
 
    struct _N_VectorContent_Serial {
       sunindextype length;
-      booleantype own_data;
-      realtype *data;
+      sunbooleantype own_data;
+      sunrealtype *data;
    };
 
 The header file to be included when using this module is ``nvector_serial.h``.
@@ -154,7 +154,7 @@ user-callable routines:
    (``NULL``) data array.
 
 
-.. c:function:: N_Vector N_VMake_Serial(sunindextype vec_length, realtype* v_data, SUNContext sunctx)
+.. c:function:: N_Vector N_VMake_Serial(sunindextype vec_length, sunrealtype* v_data, SUNContext sunctx)
 
    This function creates and allocates memory for a serial vector with
    user-provided data array, *v_data*.
@@ -183,71 +183,71 @@ operations enabled/disabled as cloned vectors inherit the same enable/disable
 options as the vector they are cloned, from while vectors created with
 :c:func:`N_VNew_Serial` will have the default settings for the NVECTOR_SERIAL module.
 
-.. c:function:: int N_VEnableFusedOps_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableFusedOps_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) all fused and
    vector array operations in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombination_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombination_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination fused operation in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMulti_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMulti_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector to multiple vectors fused operation in the serial vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableDotProdMulti_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableDotProdMulti_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the multiple
    dot products fused operation in the serial vector. The return value is ``0``
    for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableLinearSumVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearSumVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear sum
    operation for vector arrays in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableScaleVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale
    operation for vector arrays in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableConstVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableConstVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the const
    operation for vector arrays in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the WRMS norm
    operation for vector arrays in the serial vector. The return value is ``0`` for
    success and ``-1`` if the input vector or its ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the masked WRMS
    norm operation for vector arrays in the serial vector. The return value is
    ``0`` for success and ``-1`` if the input vector or its ``ops`` structure are
    ``NULL``.
 
-.. c:function:: int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the scale and
    add a vector array to multiple vector arrays operation in the serial vector. The
    return value is ``0`` for success and ``-1`` if the input vector or its
    ``ops`` structure are ``NULL``.
 
-.. c:function:: int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, booleantype tf)
+.. c:function:: int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, sunbooleantype tf)
 
    This function enables (``SUNTRUE``) or disables (``SUNFALSE``) the linear
    combination operation for vector arrays in the serial vector. The return value
diff --git a/doc/shared/nvectors/NVector_Trilinos.rst b/doc/shared/nvectors/NVector_Trilinos.rst
index 6a47becd0c..46e13149e4 100644
--- a/doc/shared/nvectors/NVector_Trilinos.rst
+++ b/doc/shared/nvectors/NVector_Trilinos.rst
@@ -36,9 +36,9 @@ is not deleted for as long as the ``N_Vector`` object exists.
 The Tpetra vector type in the ``sundials::trilinos::nvector_tpetra::TpetraVectorInterface``
 class is defined as:
 
-.. cpp:type:: Tpetra::Vector<realtype, int, sunindextype> vector_type;
+.. cpp:type:: Tpetra::Vector<sunrealtype, int, sunindextype> vector_type;
 
-The Tpetra vector will use the SUNDIALS-specified ``realtype`` as its scalar
+The Tpetra vector will use the SUNDIALS-specified ``sunrealtype`` as its scalar
 type, ``int`` as the local ordinal type, and ``sunindextype`` as the global ordinal type.
 This type definition will use Tpetra's default node type. Available Kokkos node
 types as of the Trilinos 12.14 release are serial (single thread), OpenMP, Pthread,
diff --git a/doc/shared/sundials/Fortran.rst b/doc/shared/sundials/Fortran.rst
index bef4eb5aca..ae90b760e0 100644
--- a/doc/shared/sundials/Fortran.rst
+++ b/doc/shared/sundials/Fortran.rst
@@ -169,7 +169,7 @@ equivalencies with the parameter direction in mind.
 .. warning::
 
    Currently, the Fortran 2003 interfaces are only compatible with SUNDIALS
-   builds where the ``realtype`` is double-precision the ``sunindextype`` size
+   builds where the ``sunrealtype`` is double-precision the ``sunindextype`` size
    is 64-bits.
 
 .. _SUNDIALS.Fortran.DataTypes.Table:
@@ -184,9 +184,9 @@ equivalencies with the parameter direction in mind.
    +-------------------------+-------------------------------+-------------------------------------------+
    |``long``                 | in, inout, out, return        | ``integer(c_long)``                       |
    +-------------------------+-------------------------------+-------------------------------------------+
-   |``booleantype``          | in, inout, out, return        | ``integer(c_int)``                        |
+   |``sunbooleantype``       | in, inout, out, return        | ``integer(c_int)``                        |
    +-------------------------+-------------------------------+-------------------------------------------+
-   |``realtype``             | in, inout, out, return        | ``real(c_double)``                        |
+   |``sunrealtype``          | in, inout, out, return        | ``real(c_double)``                        |
    +-------------------------+-------------------------------+-------------------------------------------+
    |``sunindextype``         | in, inout, out, return        | ``integer(c_long)``                       |
    +-------------------------+-------------------------------+-------------------------------------------+
@@ -202,15 +202,15 @@ equivalencies with the parameter direction in mind.
    +-------------------------+-------------------------------+-------------------------------------------+
    |``long*``                | return                        | ``real(c_long), pointer, dimension(:)``   |
    +-------------------------+-------------------------------+-------------------------------------------+
-   |``realtype*``            | in, inout, out                | ``real(c_double), dimension(*)``          |
+   |``sunrealtype*``         | in, inout, out                | ``real(c_double), dimension(*)``          |
    +-------------------------+-------------------------------+-------------------------------------------+
-   |``realtype*``            | return                        | ``real(c_double), pointer, dimension(:)`` |
+   |``sunrealtype*``         | return                        | ``real(c_double), pointer, dimension(:)`` |
    +-------------------------+-------------------------------+-------------------------------------------+
    |``sunindextype*``        | in, inout, out                | ``real(c_long), dimension(*)``            |
    +-------------------------+-------------------------------+-------------------------------------------+
    |``sunindextype*``        | return                        | ``real(c_long), pointer, dimension(:)``   |
    +-------------------------+-------------------------------+-------------------------------------------+
-   |``realtype[]``           | in, inout, out                | ``real(c_double), dimension(*)``          |
+   |``sunrealtype[]``        | in, inout, out                | ``real(c_double), dimension(*)``          |
    +-------------------------+-------------------------------+-------------------------------------------+
    |``sunindextype[]``       | in, inout, out                | ``integer(c_long), dimension(*)``         |
    +-------------------------+-------------------------------+-------------------------------------------+
@@ -302,7 +302,7 @@ C code:
 .. sourcecode:: c
 
    N_Vector x;
-   realtype* xdata;
+   sunrealtype* xdata;
    long int leniw, lenrw;
 
    /* create a new serial vector */
diff --git a/doc/shared/sunlinsol/SUNLinSol_API.rst b/doc/shared/sunlinsol/SUNLinSol_API.rst
index 0d734904ff..200bbee338 100644
--- a/doc/shared/sunlinsol/SUNLinSol_API.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_API.rst
@@ -157,7 +157,7 @@ set up the linear solver object to utilize an updated matrix :math:`A`
          retval = SUNLinSolSetup(LS, A);
 
 
-.. c:function:: int SUNLinSolSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x, N_Vector b, realtype tol)
+.. c:function:: int SUNLinSolSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x, N_Vector b, sunrealtype tol)
 
    This *required* function solves a linear system :math:`Ax = b`.
 
@@ -310,7 +310,7 @@ function pointer ``NULL`` instead of supplying a dummy routine.
          retval = SUNLinSolSetScalingVectors(LS, s1, s2);
 
 
-.. c:function:: int SUNLinSolSetZeroGuess(SUNLinearSolver LS, booleantype onoff)
+.. c:function:: int SUNLinSolSetZeroGuess(SUNLinearSolver LS, sunbooleantype onoff)
 
    This *optional* routine indicates if the upcoming :c:func:`SUNlinSolSolve` call
    will be made with a zero initial guess (``SUNTRUE``) or a non-zero initial
@@ -357,7 +357,7 @@ linear solve.  *All routines are optional.*
          its = SUNLinSolNumIters(LS);
 
 
-.. c:function:: realtype SUNLinSolResNorm(SUNLinearSolver LS)
+.. c:function:: sunrealtype SUNLinSolResNorm(SUNLinearSolver LS)
 
    This *optional* routine should return the final residual norm from
    the most-recent "solve" call.
@@ -412,7 +412,7 @@ linear solve.  *All routines are optional.*
    This *optional* routine should return the storage requirements for
    the linear solver *LS*:
 
-   * *lrw* is a ``long int`` containing the number of realtype words
+   * *lrw* is a ``long int`` containing the number of sunrealtype words
    * *liw* is a ``long int`` containing the number of integer words.
 
    The return value is an integer flag denoting success/failure of the operation.
@@ -469,7 +469,7 @@ these routines are defined in the header file
       Zero for a successful call, and non-zero upon failure.
 
 
-.. c:type:: int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z, realtype tol, int lr)
+.. c:type:: int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 
    Solves the preconditioner equation :math:`Pz = r` for the vector :math:`z`.
    Memory for *z* will already be allocated prior to calling this function.
@@ -620,13 +620,13 @@ structure is defined as
                                                SUNPSetupFn, SUNPSolveFn);
      int                  (*setscalingvectors)(SUNLinearSolver,
                                                N_Vector, N_Vector);
-     int                  (*setzeroguess)(SUNLinearSolver, booleantype);
+     int                  (*setzeroguess)(SUNLinearSolver, sunbooleantype);
      int                  (*initialize)(SUNLinearSolver);
      int                  (*setup)(SUNLinearSolver, SUNMatrix);
      int                  (*solve)(SUNLinearSolver, SUNMatrix, N_Vector,
-                                   N_Vector, realtype);
+                                   N_Vector, sunrealtype);
      int                  (*numiters)(SUNLinearSolver);
-     realtype             (*resnorm)(SUNLinearSolver);
+     sunrealtype          (*resnorm)(SUNLinearSolver);
      sunindextype         (*lastflag)(SUNLinearSolver);
      int                  (*space)(SUNLinearSolver, long int*, long int*);
      N_Vector             (*resid)(SUNLinearSolver);
diff --git a/doc/shared/sunlinsol/SUNLinSol_KLU.rst b/doc/shared/sunlinsol/SUNLinSol_KLU.rst
index 1975ac9c74..4c505492e9 100644
--- a/doc/shared/sunlinsol/SUNLinSol_KLU.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_KLU.rst
@@ -233,7 +233,7 @@ that SUNDIALS has been configured appropriately to link with KLU
 (see :numref:`Installation.CMake.ExternalLibraries` for details).
 Additionally, this wrapper only supports double-precision
 calculations, and therefore cannot be compiled if SUNDIALS is
-configured to have :c:type:`realtype` set to either ``extended`` or
+configured to have :c:type:`sunrealtype` set to either ``extended`` or
 ``single`` (see :ref:`Usage.CC.DataTypes` for
 details). Since the KLU library supports both 32-bit and 64-bit
 integers, this interface will be compiled for either of the available
diff --git a/doc/shared/sunlinsol/SUNLinSol_LapackBand.rst b/doc/shared/sunlinsol/SUNLinSol_LapackBand.rst
index 661412b169..a253b3b669 100644
--- a/doc/shared/sunlinsol/SUNLinSol_LapackBand.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_LapackBand.rst
@@ -108,7 +108,7 @@ information:
 The SUNLinSol_LapackBand module is a ``SUNLinearSolver`` wrapper for
 the LAPACK band matrix factorization and solve routines, ``*GBTRF``
 and ``*GBTRS``, where ``*`` is either ``D`` or ``S``, depending on
-whether SUNDIALS was configured to have :c:type:`realtype` set to
+whether SUNDIALS was configured to have :c:type:`sunrealtype` set to
 ``double`` or ``single``, respectively (see
 :numref:`Usage.CC.DataTypes` for details).
 In order to use the SUNLinSol_LapackBand module it is assumed
@@ -118,7 +118,7 @@ link with LAPACK (see
 :numref:`Installation.CMake.ExternalLibraries` for details).  We note
 that since there do not exist 128-bit floating-point factorization and
 solve routines in LAPACK, this interface cannot be compiled when
-using ``extended`` precision for :c:type:`realtype`.  Similarly, since
+using ``extended`` precision for :c:type:`sunrealtype`.  Similarly, since
 there do not exist 64-bit integer LAPACK routines, the
 SUNLinSol_LapackBand module also cannot be compiled when using
 ``int64_t`` for the :c:type:`sunindextype`.
diff --git a/doc/shared/sunlinsol/SUNLinSol_LapackDense.rst b/doc/shared/sunlinsol/SUNLinSol_LapackDense.rst
index 7052fbeaee..ef152f6350 100644
--- a/doc/shared/sunlinsol/SUNLinSol_LapackDense.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_LapackDense.rst
@@ -104,7 +104,7 @@ information:
 The SUNLinSol_LapackDense module is a ``SUNLinearSolver`` wrapper for
 the LAPACK dense matrix factorization and solve routines, ``*GETRF``
 and ``*GETRS``, where ``*`` is either ``D`` or ``S``, depending on
-whether SUNDIALS was configured to have :c:type:`realtype` set to
+whether SUNDIALS was configured to have :c:type:`sunrealtype` set to
 ``double`` or ``single``, respectively (see
 :numref:`Usage.CC.DataTypes` for details).  In order to use the
 SUNLinSol_LapackDense module it is assumed that LAPACK has been
@@ -114,7 +114,7 @@ link with LAPACK (see
 :numref:`Installation.CMake.ExternalLibraries` for details).
 We note that since there do not exist 128-bit floating-point
 factorization and solve routines in LAPACK, this interface cannot be
-compiled when using ``extended`` precision for :c:type:`realtype`.
+compiled when using ``extended`` precision for :c:type:`sunrealtype`.
 Similarly, since there do not exist 64-bit integer LAPACK routines,
 the SUNLinSol_LapackDense module also cannot be compiled when using
 ``int64_t`` for the :c:type:`sunindextype`.
diff --git a/doc/shared/sunlinsol/SUNLinSol_MagmaDense.rst b/doc/shared/sunlinsol/SUNLinSol_MagmaDense.rst
index fa62cb2abc..37efe8681b 100644
--- a/doc/shared/sunlinsol/SUNLinSol_MagmaDense.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_MagmaDense.rst
@@ -83,7 +83,7 @@ In addition, the module provides the following user-callable routines:
       the input matrix and vector to determine the linear system size and to
       assess compatibility with the solver.
 
-.. c:function:: int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver LS, booleantype onoff)
+.. c:function:: int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver LS, sunbooleantype onoff)
 
    This function can be used to toggle the linear solver between asynchronous
    and synchronous modes. In asynchronous mode (default), SUNLinearSolver
@@ -109,7 +109,7 @@ The SUNLinearSolver_MagmaDense module defines the object *content* field of a
 
    struct _SUNLinearSolverContent_MagmaDense {
      int             last_flag;
-     booleantype     async;
+     sunbooleantype  async;
      sunindextype    N;
      SUNMemory       pivots;
      SUNMemory       pivotsarr;
diff --git a/doc/shared/sunlinsol/SUNLinSol_PCG.rst b/doc/shared/sunlinsol/SUNLinSol_PCG.rst
index 017004e609..4620aeb5d3 100644
--- a/doc/shared/sunlinsol/SUNLinSol_PCG.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_PCG.rst
@@ -268,9 +268,9 @@ The SUNLinSol_PCG module defines the *content* field of a
    struct _SUNLinearSolverContent_PCG {
      int maxl;
      int pretype;
-     booleantype zeroguess;
+     sunbooleantype zeroguess;
      int numiters;
-     realtype resnorm;
+     sunrealtype resnorm;
      int last_flag;
      SUNATimesFn ATimes;
      void* ATData;
diff --git a/doc/shared/sunlinsol/SUNLinSol_SPBCGS.rst b/doc/shared/sunlinsol/SUNLinSol_SPBCGS.rst
index 160bcf0292..9fd930ad7f 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SPBCGS.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SPBCGS.rst
@@ -212,9 +212,9 @@ The SUNLinSol_SPBCGS module defines the *content* field of a
    struct _SUNLinearSolverContent_SPBCGS {
      int maxl;
      int pretype;
-     booleantype zeroguess;
+     sunbooleantype zeroguess;
      int numiters;
-     realtype resnorm;
+     sunrealtype resnorm;
      int last_flag;
      SUNATimesFn ATimes;
      void* ATData;
diff --git a/doc/shared/sunlinsol/SUNLinSol_SPFGMR.rst b/doc/shared/sunlinsol/SUNLinSol_SPFGMR.rst
index 3ef26b7557..b864dab057 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SPFGMR.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SPFGMR.rst
@@ -243,9 +243,9 @@ The SUNLinSol_SPFGMR module defines the *content* field of a
      int pretype;
      int gstype;
      int max_restarts;
-     booleantype zeroguess;
+     sunbooleantype zeroguess;
      int numiters;
-     realtype resnorm;
+     sunrealtype resnorm;
      int last_flag;
      SUNATimesFn ATimes;
      void* ATData;
@@ -256,10 +256,10 @@ The SUNLinSol_SPFGMR module defines the *content* field of a
      N_Vector s2;
      N_Vector *V;
      N_Vector *Z;
-     realtype **Hes;
-     realtype *givens;
+     sunrealtype **Hes;
+     sunrealtype *givens;
      N_Vector xcor;
-     realtype *yg;
+     sunrealtype *yg;
      N_Vector vtemp;
      int      print_level;
      FILE*    info_file;
@@ -338,7 +338,7 @@ information:
 * ``xcor`` - a vector which holds the scaled, preconditioned
   correction to the initial guess,
 
-* ``yg`` - a length :math:`(\text{maxl}+1)` array of ``realtype``
+* ``yg`` - a length :math:`(\text{maxl}+1)` array of ``sunrealtype``
   values used to hold "short" vectors (e.g. :math:`y` and :math:`g`),
 
 * ``vtemp`` - temporary vector storage.
diff --git a/doc/shared/sunlinsol/SUNLinSol_SPGMR.rst b/doc/shared/sunlinsol/SUNLinSol_SPGMR.rst
index 184c723daa..4e665edf93 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SPGMR.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SPGMR.rst
@@ -230,9 +230,9 @@ The SUNLinSol_SPGMR module defines the *content* field of a
      int pretype;
      int gstype;
      int max_restarts;
-     booleantype zeroguess;
+     sunbooleantype zeroguess;
      int numiters;
-     realtype resnorm;
+     sunrealtype resnorm;
      int last_flag;
      SUNATimesFn ATimes;
      void* ATData;
@@ -242,10 +242,10 @@ The SUNLinSol_SPGMR module defines the *content* field of a
      N_Vector s1;
      N_Vector s2;
      N_Vector *V;
-     realtype **Hes;
-     realtype *givens;
+     sunrealtype **Hes;
+     sunrealtype *givens;
      N_Vector xcor;
-     realtype *yg;
+     sunrealtype *yg;
      N_Vector vtemp;
      int      print_level;
      FILE*    info_file;
@@ -322,7 +322,7 @@ information:
 * ``xcor`` - a vector which holds the scaled, preconditioned
   correction to the initial guess,
 
-* ``yg`` - a length :math:`(\text{maxl}+1)` array of ``realtype``
+* ``yg`` - a length :math:`(\text{maxl}+1)` array of ``sunrealtype``
   values used to hold "short" vectors (e.g. :math:`y` and :math:`g`),
 
 * ``vtemp`` - temporary vector storage.
diff --git a/doc/shared/sunlinsol/SUNLinSol_SPTFQMR.rst b/doc/shared/sunlinsol/SUNLinSol_SPTFQMR.rst
index 83eea40cc2..3513f66a41 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SPTFQMR.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SPTFQMR.rst
@@ -214,9 +214,9 @@ The SUNLinSol_SPTFQMR module defines the *content* field of a
    struct _SUNLinearSolverContent_SPTFQMR {
      int maxl;
      int pretype;
-     booleantype zeroguess;
+     sunbooleantype zeroguess;
      int numiters;
-     realtype resnorm;
+     sunrealtype resnorm;
      int last_flag;
      SUNATimesFn ATimes;
      void* ATData;
diff --git a/doc/shared/sunlinsol/SUNLinSol_SuperLUDIST.rst b/doc/shared/sunlinsol/SUNLinSol_SuperLUDIST.rst
index aa5c86e2e4..43c6e59307 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SuperLUDIST.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SuperLUDIST.rst
@@ -81,11 +81,11 @@ The module SUNLinSol_SuperLUDIST provides the following user-callable routines:
       is modified in the setup and solve routines.
 
 
-.. c:function:: realtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS)
+.. c:function:: sunrealtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS)
 
    This function returns the componentwise relative backward error of the
    computed solution.   It takes one argument, the ``SUNLinearSolver`` object.
-   The return type is ``realtype``.
+   The return type is ``sunrealtype``.
 
 
 .. c:function:: gridinfo_t* SUNLinSol_SuperLUDIST_GetGridinfo(SUNLinearSolver LS)
@@ -141,9 +141,9 @@ The SUNLinSol_SuperLUDIST module defines the *content* field of a
 .. code-block:: c
 
    struct _SUNLinearSolverContent_SuperLUDIST {
-     booleantype             first_factorize;
+     sunbooleantype          first_factorize;
      int                     last_flag;
-     realtype                berr;
+     sunrealtype             berr;
      gridinfo_t              *grid;
      xLUstruct_t             *lu;
      superlu_dist_options_t  *options;
diff --git a/doc/shared/sunlinsol/SUNLinSol_SuperLUMT.rst b/doc/shared/sunlinsol/SUNLinSol_SuperLUMT.rst
index e313e94e4e..2bafac815b 100644
--- a/doc/shared/sunlinsol/SUNLinSol_SuperLUMT.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_SuperLUMT.rst
@@ -133,7 +133,7 @@ The SUNLinSol_SuperLUMT module defines the *content* field of a
      sunindextype *perm_r, *perm_c;
      sunindextype N;
      int          num_threads;
-     realtype     diag_pivot_thresh;
+     sunrealtype  diag_pivot_thresh;
      int          ordering;
      superlumt_options_t *options;
    };
@@ -177,7 +177,7 @@ appropriately to link with SuperLU_MT (see
 :numref:`Installation.CMake.ExternalLibraries` for details).
 Additionally, this wrapper only supports single- and
 double-precision calculations, and therefore cannot be compiled if
-SUNDIALS is configured to have :c:type:`realtype` set to ``extended``
+SUNDIALS is configured to have :c:type:`sunrealtype` set to ``extended``
 (see :numref:`Usage.CC.DataTypes` for details).  Moreover,
 since the SuperLU_MT library may be installed to support either 32-bit
 or 64-bit integers, it is assumed that the SuperLU_MT library is
diff --git a/doc/shared/sunlinsol/SUNLinSol_cuSolverSp.rst b/doc/shared/sunlinsol/SUNLinSol_cuSolverSp.rst
index aa5a7d6735..a9adfae9b6 100644
--- a/doc/shared/sunlinsol/SUNLinSol_cuSolverSp.rst
+++ b/doc/shared/sunlinsol/SUNLinSol_cuSolverSp.rst
@@ -143,7 +143,7 @@ The SUNLinSol_cuSolverSp_batchQR module defines the *content* field of a
 
    struct _SUNLinearSolverContent_cuSolverSp_batchQR {
       int                last_flag;       /* last return flag                          */
-      booleantype        first_factorize; /* is this the first factorization?          */
+      sunbooleantype     first_factorize; /* is this the first factorization?          */
       size_t             internal_size;   /* size of cusolver buffer for Q and R       */
       size_t             workspace_size;  /* size of cusolver memory for factorization */
       cusolverSpHandle_t cusolver_handle; /* cuSolverSp context                        */
diff --git a/doc/shared/sunmatrix/SUNMatrix_Band.rst b/doc/shared/sunmatrix/SUNMatrix_Band.rst
index 1f428cf8c3..f9503cbd2f 100644
--- a/doc/shared/sunmatrix/SUNMatrix_Band.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_Band.rst
@@ -29,9 +29,9 @@ defines the *content* field of ``SUNMatrix`` to be the following structure:
      sunindextype ml;
      sunindextype smu;
      sunindextype ldim;
-     realtype *data;
+     sunrealtype *data;
      sunindextype ldata;
-     realtype **cols;
+     sunrealtype **cols;
    };
 
 A diagram of the underlying data representation in a banded matrix is
@@ -57,7 +57,7 @@ complete description of the parts of this *content* field is given below:
 
 * ``ldim`` - leading dimension (:math:`\text{ldim} \ge smu + ml + 1`)
 
-* ``data`` - pointer to a contiguous block of ``realtype`` variables.
+* ``data`` - pointer to a contiguous block of ``sunrealtype`` variables.
   The elements of the banded matrix are stored columnwise
   (i.e. columns are stored one on top of the other in memory). Only
   elements within the specified half-bandwidths are stored.  ``data``
@@ -251,7 +251,7 @@ the *banded* version.
    The assignment ``col_j = SM_COLUMN_B(A,j)`` sets ``col_j`` to be
    a pointer to the diagonal element of the j-th column of the
    :math:`N \times N` band matrix ``A``, :math:`0 \le j \le N-1`.
-   The type of the expression ``SM_COLUMN_B(A,j)`` is ``realtype *``.
+   The type of the expression ``SM_COLUMN_B(A,j)`` is ``sunrealtype *``.
    The pointer returned by the call ``SM_COLUMN_B(A,j)`` can be treated as
    an array which is indexed from ``-mu`` to ``ml``.
 
@@ -381,17 +381,17 @@ following additional user-callable routines:
 
    This function returns the length of the data array for the banded ``SUNMatrix``.
 
-.. c:function:: realtype* SUNBandMatrix_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNBandMatrix_Data(SUNMatrix A)
 
    This function returns a pointer to the data array for the banded ``SUNMatrix``.
 
 
-.. c:function:: realtype** SUNBandMatrix_Cols(SUNMatrix A)
+.. c:function:: sunrealtype** SUNBandMatrix_Cols(SUNMatrix A)
 
    This function returns a pointer to the cols array for the band ``SUNMatrix``.
 
 
-.. c:function:: realtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j)
+.. c:function:: sunrealtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j)
 
    This function returns a pointer to the diagonal entry of the j-th
    column of the banded ``SUNMatrix``.  The resulting pointer should
diff --git a/doc/shared/sunmatrix/SUNMatrix_Dense.rst b/doc/shared/sunmatrix/SUNMatrix_Dense.rst
index daec69d2ba..2639a10552 100644
--- a/doc/shared/sunmatrix/SUNMatrix_Dense.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_Dense.rst
@@ -25,9 +25,9 @@ defines the *content* field of ``SUNMatrix`` to be the following structure:
    struct _SUNMatrixContent_Dense {
      sunindextype M;
      sunindextype N;
-     realtype *data;
+     sunrealtype *data;
      sunindextype ldata;
-     realtype **cols;
+     sunrealtype **cols;
    };
 
 These entries of the *content* field contain the following information:
@@ -36,7 +36,7 @@ These entries of the *content* field contain the following information:
 
 * ``N`` - number of columns
 
-* ``data`` - pointer to a contiguous block of ``realtype`` variables.
+* ``data`` - pointer to a contiguous block of ``sunrealtype`` variables.
   The elements of the dense matrix are stored columnwise, i.e. the
   :math:`(i,j)` element of a dense ``SUNMatrix`` object
   (with :math:`0 \le i < M` and :math:`0 \le j < N`) may be accessed
@@ -169,7 +169,7 @@ these macros are for *SUNMatrix* implementations, and the suffix
    The assignment ``col_j = SM_COLUMN_D(A,j)`` sets ``col_j`` to be
    a pointer to the first entry of the ``j``-th column of the :math:`M \times N`
    dense matrix ``A`` (with :math:`0 \le j < N`).  The type of the
-   expression ``SM_COLUMN_D(A,j)`` is ``realtype *``.  The pointer
+   expression ``SM_COLUMN_D(A,j)`` is ``sunrealtype *``.  The pointer
    returned by the call ``SM_COLUMN_D(A,j)`` can be treated as
    an array which is indexed from 0 to ``M-1``.
 
@@ -235,17 +235,17 @@ following additional user-callable routines:
    This function returns the length of the data array for the dense ``SUNMatrix``.
 
 
-.. c:function:: realtype* SUNDenseMatrix_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNDenseMatrix_Data(SUNMatrix A)
 
    This function returns a pointer to the data array for the dense ``SUNMatrix``.
 
 
-.. c:function:: realtype** SUNDenseMatrix_Cols(SUNMatrix A)
+.. c:function:: sunrealtype** SUNDenseMatrix_Cols(SUNMatrix A)
 
    This function returns a pointer to the cols array for the dense ``SUNMatrix``.
 
 
-.. c:function:: realtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j)
+.. c:function:: sunrealtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j)
 
    This function returns a pointer to the first entry of the jth
    column of the dense ``SUNMatrix``.  The resulting pointer should
diff --git a/doc/shared/sunmatrix/SUNMatrix_Description.rst b/doc/shared/sunmatrix/SUNMatrix_Description.rst
index 1da83aea02..1febfd7124 100644
--- a/doc/shared/sunmatrix/SUNMatrix_Description.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_Description.rst
@@ -59,8 +59,8 @@ defined as
      void         (*destroy)(SUNMatrix);
      int          (*zero)(SUNMatrix);
      int          (*copy)(SUNMatrix, SUNMatrix);
-     int          (*scaleadd)(realtype, SUNMatrix, SUNMatrix);
-     int          (*scaleaddi)(realtype, SUNMatrix);
+     int          (*scaleadd)(sunrealtype, SUNMatrix, SUNMatrix);
+     int          (*scaleaddi)(sunrealtype, SUNMatrix);
      int          (*matvecsetup)(SUNMatrix);
      int          (*matvec)(SUNMatrix, N_Vector, N_Vector);
      int          (*space)(SUNMatrix, long int*, long int*);
diff --git a/doc/shared/sunmatrix/SUNMatrix_MagmaDense.rst b/doc/shared/sunmatrix/SUNMatrix_MagmaDense.rst
index 64dba58996..8d9dcbaae0 100644
--- a/doc/shared/sunmatrix/SUNMatrix_MagmaDense.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_MagmaDense.rst
@@ -189,7 +189,7 @@ implementation specific functions:
       ``SUNMATRIX_ILL_INPUT``.
 
 
-.. c:function:: realtype* SUNMatrix_MagmaDense_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNMatrix_MagmaDense_Data(SUNMatrix A)
 
    This function returns the ``SUNMatrix`` data array.
 
@@ -200,7 +200,7 @@ implementation specific functions:
       If successful, the ``SUNMatrix`` data array otherwise ``NULL``.
 
 
-.. c:function:: realtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix A)
+.. c:function:: sunrealtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix A)
 
    This function returns an array of pointers that point to the start of the
    data array for each block in the ``SUNMatrix``.
@@ -213,7 +213,7 @@ implementation specific functions:
       blocks otherwise ``NULL``.
 
 
-.. c:function:: realtype* SUNMatrix_MagmaDense_Block(SUNMatrix A, sunindextype k)
+.. c:function:: sunrealtype* SUNMatrix_MagmaDense_Block(SUNMatrix A, sunindextype k)
 
    This function returns a pointer to the data array for block *k* in the
    ``SUNMatrix``.
@@ -232,7 +232,7 @@ implementation specific functions:
       less than *nblocks*.
 
 
-.. c:function:: realtype* SUNMatrix_MagmaDense_Column(SUNMatrix A, sunindextype j)
+.. c:function:: sunrealtype* SUNMatrix_MagmaDense_Column(SUNMatrix A, sunindextype j)
 
    This function returns a pointer to the data array for column *j* in the
    ``SUNMatrix``.
@@ -251,7 +251,7 @@ implementation specific functions:
       less than :math:`nblocks * N_{\text{block}}`.
 
 
-.. c:function:: realtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix A, sunindextype k, sunindextype j)
+.. c:function:: sunrealtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix A, sunindextype k, sunindextype j)
 
    This function returns a pointer to the data array for column *j* of block *k*
    in the ``SUNMatrix``.
@@ -273,7 +273,7 @@ implementation specific functions:
 
 
 
-.. c:function:: int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix A, realtype* h_data)
+.. c:function:: int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix A, sunrealtype* h_data)
 
    This function copies the matrix data to the GPU device from the provided host
    array.
@@ -289,7 +289,7 @@ implementation specific functions:
       * ``SUNMAT_MEM_FAIL`` -- if the copy fails.
 
 
-.. c:function:: int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix A, realtype* h_data)
+.. c:function:: int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix A, sunrealtype* h_data)
 
    This function copies the matrix data from the GPU device to the provided host
    array.
diff --git a/doc/shared/sunmatrix/SUNMatrix_OneMklDense.rst b/doc/shared/sunmatrix/SUNMatrix_OneMklDense.rst
index 4a0fe1a53e..b900f7a62d 100644
--- a/doc/shared/sunmatrix/SUNMatrix_OneMklDense.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_OneMklDense.rst
@@ -199,7 +199,7 @@ Access Matrix Data
       ``SUNMATRIX_ILL_INPUT``.
 
 
-.. c:function:: realtype* SUNMatrix_OneMklDense_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNMatrix_OneMklDense_Data(SUNMatrix A)
 
    This function returns the ``SUNMatrix`` data array.
 
@@ -210,7 +210,7 @@ Access Matrix Data
       If successful, the ``SUNMatrix`` data array otherwise ``NULL``.
 
 
-.. c:function:: realtype* SUNMatrix_OneMklDense_Column(SUNMatrix A, sunindextype j)
+.. c:function:: sunrealtype* SUNMatrix_OneMklDense_Column(SUNMatrix A, sunindextype j)
 
    This function returns a pointer to the data array for column *j* in the
    ``SUNMatrix``.
@@ -246,7 +246,7 @@ Access Matrix Block Data
       otherwise ``SUNMATRIX_ILL_INPUT``.
 
 
-.. c:function:: realtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A)
+.. c:function:: sunrealtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A)
 
    This function returns an array of pointers that point to the start of the
    data array for each block in the ``SUNMatrix``.
@@ -259,7 +259,7 @@ Access Matrix Block Data
       blocks otherwise ``NULL``.
 
 
-.. c:function:: realtype* SUNMatrix_OneMklDense_Block(SUNMatrix A, sunindextype k)
+.. c:function:: sunrealtype* SUNMatrix_OneMklDense_Block(SUNMatrix A, sunindextype k)
 
    This function returns a pointer to the data array for block *k* in the
    ``SUNMatrix``.
@@ -278,7 +278,7 @@ Access Matrix Block Data
       less than *nblocks*.
 
 
-.. c:function:: realtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix A, sunindextype k, sunindextype j)
+.. c:function:: sunrealtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix A, sunindextype k, sunindextype j)
 
    This function returns a pointer to the data array for column *j* of block *k*
    in the ``SUNMatrix``.
@@ -303,7 +303,7 @@ Copy Data
 ^^^^^^^^^
 
 
-.. c:function:: int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, realtype* h_data)
+.. c:function:: int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, sunrealtype* h_data)
 
    This function copies the matrix data to the GPU device from the provided host
    array.
@@ -319,7 +319,7 @@ Copy Data
       * ``SUNMAT_MEM_FAIL`` -- if the copy fails.
 
 
-.. c:function:: int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, realtype* h_data)
+.. c:function:: int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, sunrealtype* h_data)
 
    This function copies the matrix data from the GPU device to the provided host
    array.
diff --git a/doc/shared/sunmatrix/SUNMatrix_Operations.rst b/doc/shared/sunmatrix/SUNMatrix_Operations.rst
index 7834f3f5a9..7f6c51c0d2 100644
--- a/doc/shared/sunmatrix/SUNMatrix_Operations.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_Operations.rst
@@ -65,7 +65,7 @@ below.
 .. c:function:: int SUNMatSpace(SUNMatrix A, long int *lrw, long int *liw)
 
    Returns the storage requirements for the matrix *A*.  *lrw*
-   contains the number of realtype words and *liw* contains the number
+   contains the number of sunrealtype words and *liw* contains the number
    of integer words.  The return value denotes success/failure of the
    operation.
 
@@ -111,7 +111,7 @@ below.
       retval = SUNMatCopy(A,B);
 
 
-.. c:function:: int SUNMatScaleAdd(realtype c, SUNMatrix A, SUNMatrix B)
+.. c:function:: int SUNMatScaleAdd(sunrealtype c, SUNMatrix A, SUNMatrix B)
 
    Performs the operation *A \gets cA + B*.  The return value is an integer
    flag denoting success/failure of the operation:
@@ -126,7 +126,7 @@ below.
       retval = SUNMatScaleAdd(c, A, B);
 
 
-.. c:function:: int SUNMatScaleAddI(realtype c, SUNMatrix A)
+.. c:function:: int SUNMatScaleAddI(sunrealtype c, SUNMatrix A)
 
    Performs the operation *A \gets cA + I*.  The return value is an integer
    flag denoting success/failure of the operation:
diff --git a/doc/shared/sunmatrix/SUNMatrix_SLUNRloc.rst b/doc/shared/sunmatrix/SUNMatrix_SLUNRloc.rst
index 6ff397d17f..eec2b9d2a8 100644
--- a/doc/shared/sunmatrix/SUNMatrix_SLUNRloc.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_SLUNRloc.rst
@@ -29,7 +29,7 @@ structure:
 .. code-block:: c
 
    struct _SUNMatrixContent_SLUNRloc {
-     booleantype   own_data;
+     sunbooleantype own_data;
      gridinfo_t    *grid;
      sunindextype  *row_to_proc;
      pdgsmv_comm_t *gsmv_comm;
@@ -101,7 +101,7 @@ The SUNMATRIX_SLUNRLOC module provides the following user-callable routines:
    ``A``. Its only argument is the ``SUNMatrix`` object to access.
 
 
-.. c:function:: booleantype SUNMatrix_SLUNRloc_OwnData(SUNMatrix A)
+.. c:function:: sunbooleantype SUNMatrix_SLUNRloc_OwnData(SUNMatrix A)
 
    This function returns true if the ``SUNMatrix`` object is responsible
    for freeing the underlying ``SuperMatrix``, otherwise it returns false.
diff --git a/doc/shared/sunmatrix/SUNMatrix_Sparse.rst b/doc/shared/sunmatrix/SUNMatrix_Sparse.rst
index e60d6e8431..c2458fa33b 100644
--- a/doc/shared/sunmatrix/SUNMatrix_Sparse.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_Sparse.rst
@@ -30,7 +30,7 @@ structure:
      sunindextype N;
      sunindextype NNZ;
      sunindextype NP;
-     realtype *data;
+     sunrealtype *data;
      int sparsetype;
      sunindextype *indexvals;
      sunindextype *indexptrs;
@@ -58,7 +58,7 @@ complete description of the parts of this *content* field is given below:
   ``NP=M``. This value is set automatically at construction based the
   input choice for ``sparsetype``.
 
-* ``data`` - pointer to a contiguous block of ``realtype``
+* ``data`` - pointer to a contiguous block of ``sunrealtype``
   variables (of length ``NNZ``), containing the values of the
   nonzero entries in the matrix
 
@@ -337,7 +337,7 @@ following additional user-callable routines:
 
 
 
-.. c:function:: SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix A, realtype droptol, int sparsetype)
+.. c:function:: SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix A, sunrealtype droptol, int sparsetype)
 
    This constructor function creates a new sparse matrix from an
    existing SUNMATRIX_DENSE object by copying all values with
@@ -356,7 +356,7 @@ following additional user-callable routines:
 
 
 
-.. c:function:: SUNMatrix SUNSparseFromBandMatrix(SUNMatrix A, realtype droptol, int sparsetype)
+.. c:function:: SUNMatrix SUNSparseFromBandMatrix(SUNMatrix A, sunrealtype droptol, int sparsetype)
 
    This constructor function creates a new sparse matrix from an
    existing SUNMATRIX_BAND object by copying all values with
@@ -422,7 +422,7 @@ following additional user-callable routines:
    or ``CSC_MAT``) for the sparse  ``SUNMatrix``.
 
 
-.. c:function:: realtype* SUNSparseMatrix_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNSparseMatrix_Data(SUNMatrix A)
 
    This function returns a pointer to the data array for the
    sparse ``SUNMatrix``.
diff --git a/doc/shared/sunmatrix/SUNMatrix_cuSparse.rst b/doc/shared/sunmatrix/SUNMatrix_cuSparse.rst
index aa63289dd5..823de99c48 100644
--- a/doc/shared/sunmatrix/SUNMatrix_cuSparse.rst
+++ b/doc/shared/sunmatrix/SUNMatrix_cuSparse.rst
@@ -110,7 +110,7 @@ functions:
       ``blockrows == blockcols``.
 
 
-.. c:function:: SUNMatrix SUNMatrix_cuSparse_MakeCSR(cusparseMatDescr_t mat_descr, int M, int N, int NNZ, int *rowptrs , int *colind , realtype *data, cusparseHandle_t cusp, SUNContext sunctx)
+.. c:function:: SUNMatrix SUNMatrix_cuSparse_MakeCSR(cusparseMatDescr_t mat_descr, int M, int N, int NNZ, int *rowptrs , int *colind , sunrealtype *data, cusparseHandle_t cusp, SUNContext sunctx)
 
    This constructor function creates a SUNMATRIX_CUSPARSE ``SUNMatrix``
    object from user provided pointers. Its arguments are a ``cusparseMatDescr_t``
@@ -141,7 +141,7 @@ functions:
    or ``SUNMAT_CUSPARSE_BCSR``) for the sparse ``SUNMatrix``.
 
 
-.. c:function:: realtype* SUNMatrix_cuSparse_Data(SUNMatrix A)
+.. c:function:: sunrealtype* SUNMatrix_cuSparse_Data(SUNMatrix A)
 
    This function returns a pointer to the data array for the
    sparse ``SUNMatrix``.
@@ -185,7 +185,7 @@ functions:
    matrix block.
 
 
-.. c:function:: realtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx)
+.. c:function:: sunrealtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx)
 
    This function returns a pointer to the location in the ``data`` array
    where the data for the block, ``blockidx``, begins. Thus, ``blockidx``
@@ -199,7 +199,7 @@ functions:
    the matrix.
 
 
-.. c:function:: int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix A, realtype* h_data, int* h_idxptrs, int* h_idxvals)
+.. c:function:: int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix A, sunrealtype* h_data, int* h_idxptrs, int* h_idxvals)
 
    This functions copies the matrix information to the GPU device from the provided
    host arrays. A user may provide ``NULL`` for any of ``h_data``, ``h_idxptrs``, or
@@ -208,13 +208,13 @@ functions:
    The function returns ``SUNMAT_SUCCESS`` if the copy operation(s) were successful,
    or a nonzero error code otherwise.
 
-.. c:function:: int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix A, realtype* h_data, int* h_idxptrs, int* h_idxvals)
+.. c:function:: int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix A, sunrealtype* h_data, int* h_idxptrs, int* h_idxvals)
 
    This functions copies the matrix information from the GPU device to the provided
    host arrays. A user may provide ``NULL`` for any of ``h_data``, ``h_idxptrs``, or
    ``h_idxvals`` to avoid copying that information. Otherwise:
 
-   * The ``h_data`` array must be at least ``SUNMatrix_cuSparse_NNZ(A)*sizeof(realtype)``
+   * The ``h_data`` array must be at least ``SUNMatrix_cuSparse_NNZ(A)*sizeof(sunrealtype)``
      bytes.
 
    * The ``h_idxptrs`` array must be at least
@@ -227,7 +227,7 @@ functions:
    or a nonzero error code otherwise.
 
 
-.. c:function:: int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, booleantype yesno)
+.. c:function:: int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, sunbooleantype yesno)
 
    This function changes the behavior of the the ``SUNMatZero`` operation on the object
    ``A``.  By default the matrix sparsity pattern is not considered to be fixed, thus,
diff --git a/doc/shared/sunmemory/SUNMemory_Description.rst b/doc/shared/sunmemory/SUNMemory_Description.rst
index d344af612b..0dd9da86d0 100644
--- a/doc/shared/sunmemory/SUNMemory_Description.rst
+++ b/doc/shared/sunmemory/SUNMemory_Description.rst
@@ -32,7 +32,7 @@ This API consists of three new SUNDIALS types: :c:type:`SUNMemoryType`,
       {
         void*         ptr;
         SUNMemoryType type;
-        booleantype   own;
+        sunbooleantype   own;
         size_t        bytes;
       };
 
diff --git a/doc/shared/sunnonlinsol/SUNNonlinSol_API.rst b/doc/shared/sunnonlinsol/SUNNonlinSol_API.rst
index c89db9b7e7..60dd19a2d5 100644
--- a/doc/shared/sunnonlinsol/SUNNonlinSol_API.rst
+++ b/doc/shared/sunnonlinsol/SUNNonlinSol_API.rst
@@ -99,7 +99,7 @@ initialization (:c:func:`SUNNonlinSolInitialization`), setup
       require setup may set this operation to ``NULL``.
 
 
-.. c:function:: int SUNNonlinSolSolve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector ycor, N_Vector w, realtype tol, booleantype callLSetup, void *mem)
+.. c:function:: int SUNNonlinSolSolve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector ycor, N_Vector w, sunrealtype tol, sunbooleantype callLSetup, void *mem)
 
    This *required* function solves the nonlinear system
    :math:`F(y)=0` or :math:`G(y)=y`.
@@ -376,7 +376,7 @@ module have types defined in the header file
       linear solver setup and solve functions as applicable.
 
 
-.. c:type:: int (*SUNNonlinSolLSetupFn)(booleantype jbad, booleantype* jcur, void* mem)
+.. c:type:: int (*SUNNonlinSolLSetupFn)(sunbooleantype jbad, sunbooleantype* jcur, void* mem)
 
    These functions are wrappers to the SUNDIALS integrator's function
    for setting up linear solves with SUNLinSol modules.
@@ -439,7 +439,7 @@ module have types defined in the header file
       solution).
 
 
-.. c:type:: int (*SUNNonlinSolConvTestFn)(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del, realtype tol, N_Vector ewt, void* ctest_data)
+.. c:type:: int (*SUNNonlinSolConvTestFn)(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del, sunrealtype tol, N_Vector ewt, void* ctest_data)
 
    These functions are SUNDIALS integrator-specific convergence tests for
    nonlinear solvers and are typically supplied by each SUNDIALS integrator,
@@ -547,7 +547,7 @@ structure is defined as
      int                     (*initialize)(SUNNonlinearSolver);
      int                     (*setup)(SUNNonlinearSolver, N_Vector, void*);
      int                     (*solve)(SUNNonlinearSolver, N_Vector, N_Vector,
-                                      N_Vector, realtype, booleantype, void*);
+                                      N_Vector, sunrealtype, sunbooleantype, void*);
      int                     (*free)(SUNNonlinearSolver);
      int                     (*setsysfn)(SUNNonlinearSolver, SUNNonlinSolSysFn);
      int                     (*setlsetupfn)(SUNNonlinearSolver, SUNNonlinSolLSetupFn);
@@ -575,8 +575,8 @@ system and returns a flag denoting a successful or failed solve:
 
    int SUNNonlinSolSolve(SUNNonlinearSolver NLS,
                          N_Vector y0, N_Vector y,
-                         N_Vector w, realtype tol,
-                         booleantype callLSetup, void* mem)
+                         N_Vector w, sunrealtype tol,
+                         sunbooleantype callLSetup, void* mem)
    {
      return((int) NLS->ops->solve(NLS, y0, y, w, tol, callLSetup, mem));
    }
diff --git a/doc/shared/sunnonlinsol/SUNNonlinSol_FixedPoint.rst b/doc/shared/sunnonlinsol/SUNNonlinSol_FixedPoint.rst
index 2c4f924323..8e0ed3ecf4 100644
--- a/doc/shared/sunnonlinsol/SUNNonlinSol_FixedPoint.rst
+++ b/doc/shared/sunnonlinsol/SUNNonlinSol_FixedPoint.rst
@@ -172,7 +172,7 @@ user-callable functions.
       calls to *SysFn*.
 
 
-.. c:function:: int SUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver NLS, realtype beta)
+.. c:function:: int SUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver NLS, sunrealtype beta)
 
    This sets the damping parameter :math:`\beta` to use with Anderson
    acceleration. By default damping is disabled i.e., :math:`\beta = 1.0`.
@@ -271,11 +271,11 @@ following structure.
 
      int          m;
      int         *imap;
-     realtype    *R;
-     booleantype  damping
-     realtype     beta
-     realtype    *gamma;
-     realtype    *cvals;
+     sunrealtype    *R;
+     sunbooleantype  damping
+     sunrealtype     beta
+     sunrealtype    *gamma;
+     sunrealtype    *cvals;
      N_Vector    *df;
      N_Vector    *dg;
      N_Vector    *q;
diff --git a/doc/shared/sunnonlinsol/SUNNonlinSol_Newton.rst b/doc/shared/sunnonlinsol/SUNNonlinSol_Newton.rst
index 17fcef9f9f..3d7077f769 100644
--- a/doc/shared/sunnonlinsol/SUNNonlinSol_Newton.rst
+++ b/doc/shared/sunnonlinsol/SUNNonlinSol_Newton.rst
@@ -230,7 +230,7 @@ following structure.
      SUNNonlinSolConvTestFn CTest;
 
      N_Vector    delta;
-     booleantype jcur;
+     sunbooleantype jcur;
      int         curiter;
      int         maxiters;
      long int    niters;
diff --git a/doc/superbuild/source/developers/benchmarks/advection_reaction.rst b/doc/superbuild/source/developers/benchmarks/advection_reaction.rst
index c67b26d699..046e08c88a 100644
--- a/doc/superbuild/source/developers/benchmarks/advection_reaction.rst
+++ b/doc/superbuild/source/developers/benchmarks/advection_reaction.rst
@@ -105,17 +105,17 @@ listed in :numref:`Table.3D_advection_reaction_options`.
    | ``--npxyz <int> <int> <int>`` | Number of MPI tasks in each        | 0 0 0         |
    |                               | direction (0 forces MPI to decide) |               |
    +-------------------------------+------------------------------------+---------------+
-   | ``--xmax <realtype>``         | Maximum value of :math:`x`,        | 1.0           |
+   | ``--xmax <sunrealtype>``      | Maximum value of :math:`x`,        | 1.0           |
    |                               | :math:`y`, and :math:`z` in        |               |
    |                               | :math:`\textbf{x}_{\text{max}}`    |               |
    +-------------------------------+------------------------------------+---------------+
-   | ``--A <realtype>``            | Constant concentration of species  | 1.0           |
+   | ``--A <sunrealtype>``         | Constant concentration of species  | 1.0           |
    |                               | :math:`A`                          |               |
    +-------------------------------+------------------------------------+---------------+
-   | ``--B <realtype>``            | Constant concentration of species  | 3.5           |
+   | ``--B <sunrealtype>``         | Constant concentration of species  | 3.5           |
    |                               | :math:`B`                          |               |
    +-------------------------------+------------------------------------+---------------+
-   | ``--c <realtype>``            | Advection speed :math:`c`          | 0.01          |
+   | ``--c <sunrealtype>``         | Advection speed :math:`c`          | 0.01          |
    +-------------------------------+------------------------------------+---------------+
    | ``--order <int>``             | Integration method order           | 3             |
    +-------------------------------+------------------------------------+---------------+
@@ -132,11 +132,11 @@ listed in :numref:`Table.3D_advection_reaction_options`.
    +-------------------------------+------------------------------------+---------------+
    | ``--fused``                   | Enabled fused operations           | Off           |
    +-------------------------------+------------------------------------+---------------+
-   | ``--tf <realtype>``           | Final integration time :math:`t_f` | 10.0          |
+   | ``--tf <sunrealtype>``        | Final integration time :math:`t_f` | 10.0          |
    +-------------------------------+------------------------------------+---------------+
-   | ``--rtol <realtype>``         | Relative tolerance                 | 1.0e-6        |
+   | ``--rtol <sunrealtype>``      | Relative tolerance                 | 1.0e-6        |
    +-------------------------------+------------------------------------+---------------+
-   | ``--atol <realtype>``         | Absolute tolerance                 | 1.0e-9        |
+   | ``--atol <sunrealtype>``      | Absolute tolerance                 | 1.0e-9        |
    +-------------------------------+------------------------------------+---------------+
 
 
diff --git a/doc/superbuild/source/developers/benchmarks/diffusion.rst b/doc/superbuild/source/developers/benchmarks/diffusion.rst
index 9b96887853..814ec3be82 100644
--- a/doc/superbuild/source/developers/benchmarks/diffusion.rst
+++ b/doc/superbuild/source/developers/benchmarks/diffusion.rst
@@ -109,19 +109,19 @@ listed in :numref:`Benchmarks.Table.2D_diffusion_options`.
    | ``--ny <int>``                | Number of mesh points in the         | 32            |
    |                               | y-direction                          |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--xu <realtype>``           | The domain upper bound in the        | 1.0           |
+   | ``--xu <sunrealtype>``        | The domain upper bound in the        | 1.0           |
    |                               | x-direction (:math:`x_\text{max}`)   |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--yu <realtype>``           | The domain upper bound in the        | 1.0           |
+   | ``--yu <sunrealtype>``        | The domain upper bound in the        | 1.0           |
    |                               | y-direction :math:`y_\text{max}`     |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--kx <realtype>``           | Diffusion coefficient in the         | 1.0           |
+   | ``--kx <sunrealtype>``        | Diffusion coefficient in the         | 1.0           |
    |                               | x-direction :math:`k_x`              |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--ky <realtype>``           | Diffusion coefficient in the         | 1.0           |
+   | ``--ky <sunrealtype>``        | Diffusion coefficient in the         | 1.0           |
    |                               | y-direction :math:`k_y`              |               |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--tf <realtype>``           | The final time :math:`t_f`           | 1.0           |
+   | ``--tf <sunrealtype>``        | The final time :math:`t_f`           | 1.0           |
    +-------------------------------+--------------------------------------+---------------+
    | ``--noforcing``               | Disable the forcing term             | Enabled       |
    +-------------------------------+--------------------------------------+---------------+
@@ -135,9 +135,9 @@ listed in :numref:`Benchmarks.Table.2D_diffusion_options`.
    +-------------------------------+--------------------------------------+---------------+
    | Common Integrator and Solver Options                                                 |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--rtol <realtype>``         | Relative tolerance                   | 1e-5          |
+   | ``--rtol <sunrealtype>``      | Relative tolerance                   | 1e-5          |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--atol <realtype>``         | Absolute tolerance                   | 1e-10         |
+   | ``--atol <sunrealtype>``      | Absolute tolerance                   | 1e-10         |
    +-------------------------------+--------------------------------------+---------------+
    | ``--maxsteps <int>``          | Max number of steps between outputs  | 0             |
    |                               | (0 uses the integrator default)      |               |
@@ -151,7 +151,7 @@ listed in :numref:`Benchmarks.Table.2D_diffusion_options`.
    +-------------------------------+--------------------------------------+---------------+
    | ``--liniters <int>``          | Number of linear iterations          | 20            |
    +-------------------------------+--------------------------------------+---------------+
-   | ``--epslin <realtype>``       | Linear solve tolerance factor        | 0             |
+   | ``--epslin <sunrealtype>``    | Linear solve tolerance factor        | 0             |
    |                               | (0 uses the integrator default)      |               |
    +-------------------------------+--------------------------------------+---------------+
    | ``--msbp <int>``              | The linear solver setup frequency    | 0             |
diff --git a/doc/superbuild/source/developers/testing/Local.rst b/doc/superbuild/source/developers/testing/Local.rst
index d3a98b188a..68a49d2d9d 100644
--- a/doc/superbuild/source/developers/testing/Local.rst
+++ b/doc/superbuild/source/developers/testing/Local.rst
@@ -33,7 +33,7 @@ The ``exec`` command can then be used to execute the test script:
 
 .. code-block:: shell
 
-   docker exec -w /sundials/test sundialsci-int32-double-latest ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --realtype double --indexsize 32
+   docker exec -w /sundials/test sundialsci-int32-double-latest ./test_driver.sh --testtype CUSTOM --env env/docker.sh --tpls --sunrealtype double --indexsize 32
 
 Alternatively, you can drop into a bash shell inside the container to run specific examples:
 
diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
index 2d157c3d8c..23944a3d55 100644
--- a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
+++ b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp
@@ -967,7 +967,7 @@ int TaskLocalNewton_Initialize(SUNNonlinearSolver NLS)
 int TaskLocalNewton_Solve(SUNNonlinearSolver NLS,
                           N_Vector y0, N_Vector ycor,
                           N_Vector w, double tol,
-                          booleantype callLSetup, void* mem)
+                          sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   MPI_Comm comm;
diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
index 788c16d067..9e2ca43a9b 100644
--- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p.cpp
@@ -78,14 +78,14 @@
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h"
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NSPECIES 2
 
-#define WIDTH (10 + numeric_limits<realtype>::digits10)
+#define WIDTH (10 + numeric_limits<sunrealtype>::digits10)
 
 // Macro to access each species at an (x,y) location in a 1D array
 #define UIDX(x,y,nx) (NSPECIES * ((nx) * (y) + (x)))
@@ -112,20 +112,20 @@ class Timer
     end_ = MPI_Wtime();
     total_ += (end_-start_);
   }
-  realtype total() const
+  sunrealtype total() const
   {
     return total_;
   }
-  realtype max(MPI_Comm comm)
+  sunrealtype max(MPI_Comm comm)
   {
     double maxtime = 0.0;
     MPI_Reduce(&total_, &maxtime, 1, MPI_DOUBLE, MPI_MAX, 0, comm);
     return maxtime;
   }
 private:
-  realtype total_;
-  realtype start_;
-  realtype end_;
+  sunrealtype total_;
+  sunrealtype start_;
+  sunrealtype end_;
 };
 
 
@@ -141,23 +141,23 @@ struct UserData
   // ------------------
 
   // Diffusion coefficients for u and v
-  realtype Dux = RCONST(1.0e-3);
-  realtype Duy = RCONST(1.0e-3);
-  realtype Dvx = RCONST(1.0e-3);
-  realtype Dvy = RCONST(1.0e-3);
+  sunrealtype Dux = SUN_RCONST(1.0e-3);
+  sunrealtype Duy = SUN_RCONST(1.0e-3);
+  sunrealtype Dvx = SUN_RCONST(1.0e-3);
+  sunrealtype Dvy = SUN_RCONST(1.0e-3);
 
   // Feed and reaction rates
-  realtype A = RCONST(1.0);
-  realtype B = RCONST(3.0);
+  sunrealtype A = SUN_RCONST(1.0);
+  sunrealtype B = SUN_RCONST(3.0);
 
   // Final simulation time
-  realtype tf = RCONST(10.0);
+  sunrealtype tf = SUN_RCONST(10.0);
 
   // Domain boundaries in x and y directions
-  realtype xl = RCONST(-0.5);
-  realtype xu = RCONST(0.5);
-  realtype yl = RCONST(-0.5);
-  realtype yu = RCONST(0.5);
+  sunrealtype xl = SUN_RCONST(-0.5);
+  sunrealtype xu = SUN_RCONST(0.5);
+  sunrealtype yl = SUN_RCONST(-0.5);
+  sunrealtype yu = SUN_RCONST(0.5);
 
   // Enable/disable RHS terms
   bool diffusion = true;
@@ -174,8 +174,8 @@ struct UserData
   sunindextype ny_loc = 0;
 
   // Mesh spacing in the x and y directions
-  realtype dx = (xu - xl) / nx;
-  realtype dy = (yu - yl) / ny;
+  sunrealtype dx = (xu - xl) / nx;
+  sunrealtype dy = (yu - yl) / ny;
 
   // Global and local number of equations
   sunindextype neq     = NSPECIES * nx * ny;
@@ -220,18 +220,18 @@ struct UserData
   int ybufcount = 0;
 
   // Receive and send buffers
-  realtype *Wrecv = NULL;
-  realtype *Erecv = NULL;
-  realtype *Srecv = NULL;
-  realtype *Nrecv = NULL;
+  sunrealtype *Wrecv = NULL;
+  sunrealtype *Erecv = NULL;
+  sunrealtype *Srecv = NULL;
+  sunrealtype *Nrecv = NULL;
 
-  realtype *Wsend = NULL;
-  realtype *Esend = NULL;
-  realtype *Ssend = NULL;
-  realtype *Nsend = NULL;
+  sunrealtype *Wsend = NULL;
+  sunrealtype *Esend = NULL;
+  sunrealtype *Ssend = NULL;
+  sunrealtype *Nsend = NULL;
 
-  realtype *SWsend = NULL;
-  realtype *NErecv = NULL;
+  sunrealtype *SWsend = NULL;
+  sunrealtype *NErecv = NULL;
 
   // Recieve and send requests
   MPI_Request reqRW, reqRE, reqRS, reqRN;
@@ -254,11 +254,11 @@ struct UserData
   // -------------
 
   // Relative and absolute tolerances
-  realtype rtol_imex = RCONST(1.e-4);
-  realtype atol_imex = RCONST(1.e-8);
+  sunrealtype rtol_imex = SUN_RCONST(1.e-4);
+  sunrealtype atol_imex = SUN_RCONST(1.e-8);
 
   // Step size selection (ZERO = adaptive steps)
-  realtype h_imex = ZERO;
+  sunrealtype h_imex = ZERO;
 
   // Method order
   int order_imex = 3;
@@ -268,14 +268,14 @@ struct UserData
   // ------------
 
   // Relative and absolute tolerances (slow and fast)
-  realtype rtol_slow = RCONST(1.e-4);
-  realtype atol_slow = RCONST(1.e-8);
-  realtype rtol_fast = RCONST(1.e-5);
-  realtype atol_fast = RCONST(1.e-9);
+  sunrealtype rtol_slow = SUN_RCONST(1.e-4);
+  sunrealtype atol_slow = SUN_RCONST(1.e-8);
+  sunrealtype rtol_fast = SUN_RCONST(1.e-5);
+  sunrealtype atol_fast = SUN_RCONST(1.e-9);
 
   // Fixed step size (slow and fast)
-  realtype h_slow = RCONST(-1.0);  // use multiple of CFL
-  realtype h_fast = ZERO;          // use adaptive stepping
+  sunrealtype h_slow = SUN_RCONST(-1.0);  // use multiple of CFL
+  sunrealtype h_fast = ZERO;          // use adaptive stepping
 
   // Inner ARKODE method order
   int order_fast = 3;
@@ -308,7 +308,7 @@ struct UserData
   bool     lsinfo   = false;  // output residual history
   int      liniters = 10;     // number of linear iterations
   int      msbp     = 0;      // preconditioner setup frequency (0 = default)
-  realtype epslin   = ZERO;   // linear solver tolerance factor (ZERO = default)
+  sunrealtype epslin   = ZERO;   // linear solver tolerance factor (ZERO = default)
   N_Vector diag     = NULL;   // inverse of Jacobian diagonal
 
   // ---------------
@@ -359,12 +359,12 @@ struct InnerStepperContent
 };
 
 static int CVodeInnerStepper_Evolve(MRIStepInnerStepper stepper,
-                                    realtype t0, realtype tout, N_Vector y);
+                                    sunrealtype t0, sunrealtype tout, N_Vector y);
 static int CVodeInnerStepper_FullRhs(MRIStepInnerStepper stepper,
-                                     realtype t, N_Vector y, N_Vector f,
+                                     sunrealtype t, N_Vector y, N_Vector f,
                                      int mode);
 static int CVodeInnerStepper_Reset(MRIStepInnerStepper stepper,
-                                   realtype tR, N_Vector yR);
+                                   sunrealtype tR, N_Vector yR);
 
 
 // -----------------------------------------------------------------------------
@@ -373,12 +373,12 @@ static int CVodeInnerStepper_Reset(MRIStepInnerStepper stepper,
 
 
 // ODE right hand side functions
-static int diffusion(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int reaction(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int diffusion(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int reaction(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner solve function
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 
@@ -437,7 +437,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -615,9 +615,9 @@ int main(int argc, char* argv[])
   }
 
   // Initial time, time between outputs, output time
-  realtype t     = ZERO;
-  realtype dTout = udata.tf / udata.nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata.tf / udata.nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(&udata);
@@ -853,19 +853,19 @@ static int SetupDecomp(UserData *udata)
 
   // Allocate exchange buffers if necessary
   udata->ybufcount = NSPECIES * udata->ny_loc;
-  udata->Wrecv     = new realtype[udata->ybufcount];
-  udata->Wsend     = new realtype[udata->ybufcount];
-  udata->Erecv     = new realtype[udata->ybufcount];
-  udata->Esend     = new realtype[udata->ybufcount];
+  udata->Wrecv     = new sunrealtype[udata->ybufcount];
+  udata->Wsend     = new sunrealtype[udata->ybufcount];
+  udata->Erecv     = new sunrealtype[udata->ybufcount];
+  udata->Esend     = new sunrealtype[udata->ybufcount];
 
   udata->xbufcount = NSPECIES * udata->nx_loc;
-  udata->Srecv     = new realtype[udata->xbufcount];
-  udata->Ssend     = new realtype[udata->xbufcount];
-  udata->Nrecv     = new realtype[udata->xbufcount];
-  udata->Nsend     = new realtype[udata->xbufcount];
+  udata->Srecv     = new sunrealtype[udata->xbufcount];
+  udata->Ssend     = new sunrealtype[udata->xbufcount];
+  udata->Nrecv     = new sunrealtype[udata->xbufcount];
+  udata->Nsend     = new sunrealtype[udata->xbufcount];
 
-  udata->SWsend = new realtype[NSPECIES];
-  udata->NErecv = new realtype[NSPECIES];
+  udata->SWsend = new sunrealtype[NSPECIES];
+  udata->NErecv = new sunrealtype[NSPECIES];
 
   // MPI neighborhood information
   int nbcoords[2];
@@ -1314,10 +1314,10 @@ static int SetupMRICVODE(SUNContext ctx, UserData *udata, N_Vector y,
 
 
 static int CVodeInnerStepper_Evolve(MRIStepInnerStepper stepper,
-                                    realtype t0, realtype tout, N_Vector y)
+                                    sunrealtype t0, sunrealtype tout, N_Vector y)
 {
   int      flag;
-  realtype tret;
+  sunrealtype tret;
   void*    inner_content = NULL;
 
   flag = MRIStepInnerStepper_GetContent(stepper, &inner_content);
@@ -1348,7 +1348,7 @@ static int CVodeInnerStepper_Evolve(MRIStepInnerStepper stepper,
 
 
 static int CVodeInnerStepper_FullRhs(MRIStepInnerStepper stepper,
-                                     realtype t, N_Vector y, N_Vector f,
+                                     sunrealtype t, N_Vector y, N_Vector f,
                                      int mode)
 {
   int   flag;
@@ -1375,7 +1375,7 @@ static int CVodeInnerStepper_FullRhs(MRIStepInnerStepper stepper,
 
 
 static int CVodeInnerStepper_Reset(MRIStepInnerStepper stepper,
-                                   realtype tR, N_Vector yR)
+                                   sunrealtype tR, N_Vector yR)
 {
   int   flag;
   void* inner_content = NULL;
@@ -1432,7 +1432,7 @@ static int CVodeInnerStepper_Reset(MRIStepInnerStepper stepper,
 
 
 // Routine to compute the ODE diffusion RHS function
-static int diffusion(realtype t, N_Vector y, N_Vector f, void *user_data)
+static int diffusion(sunrealtype t, N_Vector y, N_Vector f, void *user_data)
 {
   int flag;
 
@@ -1447,19 +1447,19 @@ static int diffusion(realtype t, N_Vector y, N_Vector f, void *user_data)
   if (check_flag(&flag, "StartExchange", 1)) return -1;
 
   // Constants for computing diffusion term
-  realtype cxu = udata->Dux / (udata->dx * udata->dx);
-  realtype cyu = udata->Duy / (udata->dy * udata->dy);
-  realtype ccu = -TWO * (cxu + cyu);
+  sunrealtype cxu = udata->Dux / (udata->dx * udata->dx);
+  sunrealtype cyu = udata->Duy / (udata->dy * udata->dy);
+  sunrealtype ccu = -TWO * (cxu + cyu);
 
-  realtype cxv = udata->Dvx / (udata->dx * udata->dx);
-  realtype cyv = udata->Dvy / (udata->dy * udata->dy);
-  realtype ccv = -TWO * (cxv + cyv);
+  sunrealtype cxv = udata->Dvx / (udata->dx * udata->dx);
+  sunrealtype cyv = udata->Dvy / (udata->dy * udata->dy);
+  sunrealtype ccv = -TWO * (cxv + cyv);
 
   // Access data arrays
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   if (check_flag((void *) ydata, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *fdata = N_VGetArrayPointer(f);
+  sunrealtype *fdata = N_VGetArrayPointer(f);
   if (check_flag((void *) fdata, "N_VGetArrayPointer", 0)) return -1;
 
   // Shortcuts to array indices (center, west, east, south, north)
@@ -1501,10 +1501,10 @@ static int diffusion(realtype t, N_Vector y, N_Vector f, void *user_data)
   flag = EndExchange(udata);
   if (check_flag(&flag, "EndExchange", 1)) return -1;
 
-  realtype *Wdata = udata->Wrecv;
-  realtype *Edata = udata->Erecv;
-  realtype *Sdata = udata->Srecv;
-  realtype *Ndata = udata->Nrecv;
+  sunrealtype *Wdata = udata->Wrecv;
+  sunrealtype *Edata = udata->Erecv;
+  sunrealtype *Sdata = udata->Srecv;
+  sunrealtype *Ndata = udata->Nrecv;
 
   sunindextype i, j;
 
@@ -1699,7 +1699,7 @@ static int diffusion(realtype t, N_Vector y, N_Vector f, void *user_data)
 
 
 // Routine to compute the ODE reaction RHS function
-static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
+static int reaction(sunrealtype t, N_Vector y, N_Vector f, void *user_data)
 {
   // Access problem data
   UserData *udata = (UserData *) user_data;
@@ -1708,10 +1708,10 @@ static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
   udata->rhsR.start();
 
   // Access data arrays
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   if (check_flag((void *) ydata, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *fdata = N_VGetArrayPointer(f);
+  sunrealtype *fdata = N_VGetArrayPointer(f);
   if (check_flag((void *) fdata, "N_VGetArrayPointer", 0)) return -1;
 
   // Shortcuts to local number of nodes
@@ -1719,7 +1719,7 @@ static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
   sunindextype nx_loc = udata->nx_loc;
 
   // Compute reaction term on the subdomain
-  realtype u, v;
+  sunrealtype u, v;
 
   for (sunindextype j = 0; j < ny_loc; j++)
   {
@@ -1748,7 +1748,7 @@ static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
     else if (udata->integrator == 3)
     {
       int      nforcing;
-      realtype tshift, tscale;
+      sunrealtype tshift, tscale;
       N_Vector *forcing;
 
       // With a local inner stepper the RHS vector f is a serial vector and the
@@ -1760,8 +1760,8 @@ static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
       if (flag != 0) return flag;
 
       N_Vector forcing_loc;
-      realtype tau  = (t - tshift) / tscale;
-      realtype taui = ONE;
+      sunrealtype tau  = (t - tshift) / tscale;
+      sunrealtype taui = ONE;
 
       for (int i = 0; i < nforcing; i++)
       {
@@ -1786,8 +1786,8 @@ static int reaction(realtype t, N_Vector y, N_Vector f, void *user_data)
 
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Access user_data structure
@@ -1797,19 +1797,19 @@ static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
   udata->psolve.start();
 
   // Constants for computing diffusion
-  realtype cxu = udata->Dux / (udata->dx * udata->dx);
-  realtype cyu = udata->Duy / (udata->dy * udata->dy);
-  realtype ccu = -TWO * (cxu + cyu);
+  sunrealtype cxu = udata->Dux / (udata->dx * udata->dx);
+  sunrealtype cyu = udata->Duy / (udata->dy * udata->dy);
+  sunrealtype ccu = -TWO * (cxu + cyu);
 
-  realtype cxv = udata->Dvx / (udata->dx * udata->dx);
-  realtype cyv = udata->Dvy / (udata->dy * udata->dy);
-  realtype ccv = -TWO * (cxv + cyv);
+  sunrealtype cxv = udata->Dvx / (udata->dx * udata->dx);
+  sunrealtype cyv = udata->Dvy / (udata->dy * udata->dy);
+  sunrealtype ccv = -TWO * (cxv + cyv);
 
   // Access data arrays
-  realtype *rdata = N_VGetArrayPointer(r);
+  sunrealtype *rdata = N_VGetArrayPointer(r);
   if (check_flag((void *) rdata, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *zdata = N_VGetArrayPointer(z);
+  sunrealtype *zdata = N_VGetArrayPointer(z);
   if (check_flag((void *) zdata, "N_VGetArrayPointer", 0)) return -1;
 
   // Shortcuts to local number of nodes
@@ -1817,8 +1817,8 @@ static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
   sunindextype nx_loc = udata->nx_loc;
 
   // Set all entries of diag to the inverse diagonal values
-  realtype du = ONE / (ONE - gamma * ccu);
-  realtype dv = ONE / (ONE - gamma * ccv);
+  sunrealtype du = ONE / (ONE - gamma * ccu);
+  sunrealtype dv = ONE / (ONE - gamma * ccv);
 
   for (sunindextype j = 0; j < ny_loc; j++)
   {
@@ -1891,7 +1891,7 @@ static int StartExchange(N_Vector y, UserData *udata)
   sunindextype nx_loc = udata->nx_loc;
 
   // Access data array
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   if (check_flag((void *) ydata, "N_VGetArrayPointer", 0)) return -1;
 
   // Send West face data to neighbor's East face
@@ -2075,7 +2075,7 @@ static int ExchangeBC(N_Vector y, UserData *udata)
     }
   }
 
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   if (check_flag((void *) ydata, "N_VGetArrayPointer", 0)) return -1;
 
   // Send West face data
@@ -2438,11 +2438,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata)
   // Compute slow step size based on CFL if not set by input
   if (udata->h_slow < ZERO)
   {
-    realtype cfl_u = RCONST(0.5) / ((udata->Dux / (udata->dx * udata->dx)) +
+    sunrealtype cfl_u = SUN_RCONST(0.5) / ((udata->Dux / (udata->dx * udata->dx)) +
                                     (udata->Duy / (udata->dy * udata->dy)));
-    realtype cfl_v = RCONST(0.5) / ((udata->Dvx / (udata->dx * udata->dx)) +
+    sunrealtype cfl_v = SUN_RCONST(0.5) / ((udata->Dvx / (udata->dx * udata->dx)) +
                                     (udata->Dvy / (udata->dy * udata->dy)));
-    udata->h_slow = RCONST(5.0) * min(cfl_u, cfl_v);
+    udata->h_slow = SUN_RCONST(5.0) * min(cfl_u, cfl_v);
   }
 
   // Return success
@@ -2458,7 +2458,7 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata)
 // Compute the initial condition
 static int SetIC(N_Vector u, UserData *udata)
 {
-  realtype x, y, a, b;
+  sunrealtype x, y, a, b;
 
   // Shortcuts to local number of nodes
   sunindextype ny_loc = udata->ny_loc;
@@ -2466,9 +2466,9 @@ static int SetIC(N_Vector u, UserData *udata)
 
   // Gaussian random number generator
   default_random_engine generator;
-  normal_distribution<double> dist(RCONST(0.0), RCONST(0.001));
+  normal_distribution<double> dist(SUN_RCONST(0.0), SUN_RCONST(0.001));
 
-  realtype *data = N_VGetArrayPointer(u);
+  sunrealtype *data = N_VGetArrayPointer(u);
   if (check_flag((void *) data, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = 0; j < ny_loc; j++)
@@ -2481,7 +2481,7 @@ static int SetIC(N_Vector u, UserData *udata)
       a = TWO * PI * (x - udata->xl) / (udata->xu - udata->xl);
       b = TWO * PI * (y - udata->yl) / (udata->yu - udata->yl);
 
-      data[UIDX(i,j,nx_loc)] = udata->A + RCONST(0.5) * sin(a) * sin(b);
+      data[UIDX(i,j,nx_loc)] = udata->A + SUN_RCONST(0.5) * sin(a) * sin(b);
       data[VIDX(i,j,nx_loc)] = udata->B / udata->A;
     }
   }
@@ -2618,7 +2618,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && udata->outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << "          t           ";
     cout << "          ||u||_rms      " << endl;
     cout << " ---------------------";
@@ -2635,7 +2635,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     // Add 1 to the total number of nodes in the x and y directions and to the
     // end indices in the x and y direction at the North and East boundary to
@@ -2670,14 +2670,14 @@ static int OpenOutput(UserData *udata)
 
 
 // Write output
-static int WriteOutput(realtype t, N_Vector y, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector y, UserData *udata)
 {
   int flag;
 
   if (udata->output > 0)
   {
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(y, y) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(y, y) / udata->nx / udata->ny);
 
     // Output current status
     if (udata->outproc) cout << setw(22) << t << setw(25) << urms << endl;
@@ -2692,7 +2692,7 @@ static int WriteOutput(realtype t, N_Vector y, UserData *udata)
       flag = ExchangeBC(y, udata);
       if (check_flag(&flag, "ExchangeBC", 1)) return -1;
 
-      realtype *ydata = N_VGetArrayPointer(y);
+      sunrealtype *ydata = N_VGetArrayPointer(y);
       if (check_flag((void *) ydata, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t;
@@ -2813,8 +2813,8 @@ static int OutputStatsIMEX(void *arkode_mem, UserData* udata)
   if (udata->diffusion)
   {
     // Compute average nls iters per step attempt and ls iters per nls iter
-    realtype avgnli = (realtype) nni / (realtype) nst_a;
-    realtype avgli  = (realtype) nli / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+    sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
     cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
     cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
     cout << endl;
@@ -2882,8 +2882,8 @@ static int OutputStatsMRI(void *arkode_mem, MRIStepInnerStepper stepper,
   cout << endl;
 
   // Compute average nls iters per step and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nsts;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nsts;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
@@ -2972,8 +2972,8 @@ static int OutputStatsMRICVODE(void *arkode_mem,
   cout << endl;
 
   // Compute average nls iters per step and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nsts;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nsts;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
index 3e414c5224..cda3dde1df 100644
--- a/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
+++ b/examples/arkode/CXX_parallel/ark_heat2D_p.cpp
@@ -60,11 +60,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -78,18 +78,18 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -99,8 +99,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -137,10 +137,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -149,10 +149,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -161,9 +161,9 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
-  realtype hfixed;      // fixed step size
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
+  sunrealtype hfixed;      // fixed step size
   int      order;       // ARKode method order
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
@@ -176,7 +176,7 @@ struct UserData
   bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Inverse of Jacobian diagonal for preconditioner
   N_Vector d;
@@ -202,14 +202,14 @@ struct UserData
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -242,10 +242,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -255,7 +255,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -428,7 +428,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (requires fixed step size)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -483,9 +483,9 @@ int main(int argc, char* argv[])
   // Loop over output times
   // -----------------------
 
-  realtype t     = ZERO;
-  realtype dTout = udata->tf / udata->nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata->tf / udata->nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(udata);
@@ -540,12 +540,12 @@ int main(int argc, char* argv[])
     flag = SolutionError(t, u, udata->e, udata);
     if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     if (outproc)
     {
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl;
     }
   }
@@ -683,23 +683,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -766,7 +766,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -796,15 +796,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -813,15 +813,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -861,10 +861,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -965,8 +965,8 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Start timer
   double t1 = MPI_Wtime();
@@ -975,17 +975,17 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   UserData *udata = (UserData *) user_data;
 
   // Access data array
-  realtype *diag = N_VGetArrayPointer(udata->d);
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->d);
 
   // Stop timer
@@ -999,8 +999,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Start timer
@@ -1100,7 +1100,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1322,8 +1322,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->hfixed      = ZERO;            // using adaptive step sizes
   udata->order       = 3;               // method order
   udata->controller  = 0;               // PID controller
@@ -1551,11 +1551,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1570,7 +1570,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1591,7 +1591,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -1694,7 +1694,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -1745,7 +1745,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -1756,7 +1756,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -1764,10 +1764,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -1783,7 +1783,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -1801,7 +1801,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -1814,7 +1814,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -1910,8 +1910,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
index 65695000b3..1b068b6dde 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp
@@ -62,11 +62,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -80,18 +80,18 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -101,8 +101,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -139,10 +139,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -151,10 +151,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -163,9 +163,9 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
-  realtype hfixed;      // fixed step size
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
+  sunrealtype hfixed;      // fixed step size
   int      order;       // ARKode method order
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
@@ -176,7 +176,7 @@ struct UserData
   bool     prec;      // preconditioner on/off
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // hypre PFMG settings (hypre defaults)
   HYPRE_Int pfmg_relax;  // type of relaxation:
@@ -243,7 +243,7 @@ SUNMatrix_ID Hypre5ptMatrix_GetID(SUNMatrix A);
 SUNMatrix Hypre5ptMatrix_Clone(SUNMatrix A);
 void Hypre5ptMatrix_Destroy(SUNMatrix A);
 int Hypre5ptMatrix_Copy(SUNMatrix A, SUNMatrix B);
-int Hypre5ptMatrix_ScaleAddI(realtype c, SUNMatrix A);
+int Hypre5ptMatrix_ScaleAddI(sunrealtype c, SUNMatrix A);
 
 // -----------------------------------------------------------------------------
 // Custom hypre linear solver definition
@@ -279,7 +279,7 @@ SUNLinearSolver_Type HypreLS_GetType(SUNLinearSolver S);
 int HypreLS_Initialize(SUNLinearSolver S);
 int HypreLS_Setup(SUNLinearSolver S, SUNMatrix A);
 int HypreLS_Solve(SUNLinearSolver S, SUNMatrix A,
-                   N_Vector x, N_Vector b, realtype tol);
+                   N_Vector x, N_Vector b, sunrealtype tol);
 int HypreLS_NumIters(SUNLinearSolver S);
 int HypreLS_Free(SUNLinearSolver S);
 
@@ -288,10 +288,10 @@ int HypreLS_Free(SUNLinearSolver S);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Jacobian evaluation function
-static int Jac(realtype t, N_Vector u, N_Vector f, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector f, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
@@ -324,10 +324,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -337,7 +337,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -481,7 +481,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (requires fixed step size)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -536,9 +536,9 @@ int main(int argc, char* argv[])
   // Loop over output times
   // -----------------------
 
-  realtype t     = ZERO;
-  realtype dTout = udata->tf / udata->nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata->tf / udata->nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(udata);
@@ -593,12 +593,12 @@ int main(int argc, char* argv[])
     flag = SolutionError(t, u, udata->e, udata);
     if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     if (outproc)
     {
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl;
     }
   }
@@ -737,23 +737,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -820,7 +820,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -850,15 +850,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -867,15 +867,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -915,10 +915,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -1019,7 +1019,7 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Jac function to compute the ODE RHS function Jacobian, (df/dy)(t,y).
-static int Jac(realtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Shortcuts to hypre matrix and grid extents, work array, etc.
@@ -1068,9 +1068,9 @@ static int Jac(realtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1413,7 +1413,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1635,8 +1635,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->hfixed      = ZERO;            // using adaptive step sizes
   udata->order       = 3;               // method order
   udata->controller  = 0;               // PID controller
@@ -1858,11 +1858,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1877,7 +1877,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1898,7 +1898,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -2003,7 +2003,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -2054,7 +2054,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -2065,7 +2065,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -2073,10 +2073,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -2092,7 +2092,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2110,7 +2110,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2123,7 +2123,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -2216,8 +2216,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
@@ -2471,7 +2471,7 @@ int Hypre5ptMatrix_Copy(SUNMatrix A, SUNMatrix B)
   return(SUNMAT_SUCCESS);
 }
 
-int Hypre5ptMatrix_ScaleAddI(realtype c, SUNMatrix A)
+int Hypre5ptMatrix_ScaleAddI(sunrealtype c, SUNMatrix A)
 {
   int flag;
 
@@ -2717,7 +2717,7 @@ int HypreLS_Setup(SUNLinearSolver LS, SUNMatrix A)
 }
 
 int HypreLS_Solve(SUNLinearSolver LS, SUNMatrix A,
-                  N_Vector x, N_Vector b, realtype tol)
+                  N_Vector x, N_Vector b, sunrealtype tol)
 {
   int flag;
 
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
index 3418b03ce2..e5f28fc9a6 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp
@@ -62,11 +62,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -80,18 +80,18 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -101,8 +101,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -139,10 +139,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -151,10 +151,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -163,9 +163,9 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
-  realtype hfixed;      // fixed step size
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
+  sunrealtype hfixed;      // fixed step size
   int      order;       // ARKode method order
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
@@ -177,7 +177,7 @@ struct UserData
   bool     matvec;    // use hypre matrix-vector product
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // hypre objects
   HYPRE_StructGrid    grid;
@@ -232,18 +232,18 @@ struct UserData
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -263,7 +263,7 @@ static int SetupHypre(UserData *udata);
 
 // Fill Jacobian and A = I - gamma * J
 static int Jac(UserData *udata);
-static int ScaleAddI(UserData *udata, realtype gamma);
+static int ScaleAddI(UserData *udata, sunrealtype gamma);
 
 // -----------------------------------------------------------------------------
 // UserData and input functions
@@ -283,10 +283,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -296,7 +296,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -465,7 +465,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (requires fixed step size)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -520,9 +520,9 @@ int main(int argc, char* argv[])
   // Loop over output times
   // -----------------------
 
-  realtype t     = ZERO;
-  realtype dTout = udata->tf / udata->nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata->tf / udata->nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(udata);
@@ -577,12 +577,12 @@ int main(int argc, char* argv[])
     flag = SolutionError(t, u, udata->e, udata);
     if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     if (outproc)
     {
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl;
     }
   }
@@ -720,23 +720,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -803,7 +803,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -833,15 +833,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -850,15 +850,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -898,10 +898,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -1002,7 +1002,7 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp)
 {
   int flag;
@@ -1054,8 +1054,8 @@ static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   int flag;
 
@@ -1143,8 +1143,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   int flag;
@@ -1422,9 +1422,9 @@ static int Jac(UserData *udata)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1690,7 +1690,7 @@ static int Jac(UserData *udata)
 }
 
 // Fill A = I - gamma * J matrix
-static int ScaleAddI(UserData *udata, realtype gamma)
+static int ScaleAddI(UserData *udata, sunrealtype gamma)
 {
   int flag;
 
@@ -1819,7 +1819,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -2041,8 +2041,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->hfixed      = ZERO;            // using adaptive step sizes
   udata->order       = 3;               // method order
   udata->controller  = 0;               // PID controller
@@ -2307,11 +2307,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -2326,7 +2326,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -2347,7 +2347,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -2454,7 +2454,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -2505,7 +2505,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -2516,7 +2516,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -2524,10 +2524,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -2543,7 +2543,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2561,7 +2561,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2574,7 +2574,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -2670,8 +2670,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
index b550f9e607..de71ae3410 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp
@@ -63,11 +63,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -82,22 +82,22 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Advection coefficients in the x and y directions
-  realtype ax;
-  realtype ay;
+  sunrealtype ax;
+  sunrealtype ay;
 
   // Reactions coefficient
-  realtype r;
+  sunrealtype r;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -107,8 +107,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -145,10 +145,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -157,10 +157,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -169,18 +169,18 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;    // relative tolerance
-  realtype atol;    // absolute tolerance
+  sunrealtype rtol;    // relative tolerance
+  sunrealtype atol;    // absolute tolerance
   bool     linear;  // enable/disable linearly implicit option
   int      order;   // ARKode method order
 
-  realtype hf;         // fixed step size
+  sunrealtype hf;         // fixed step size
   int      controller; // step size adaptivity method
   int      maxsteps;   // max number of steps between outputs
 
   // Linear solver and preconditioner settings
   int      liniters; // number of linear iterations
-  realtype epslin;   // linear solver tolerance factor
+  sunrealtype epslin;   // linear solver tolerance factor
   int      prectype; // preconditioner type (NONE or LEFT)
   int      msbp;     // max number of steps between preconditioner setups
 
@@ -240,17 +240,17 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side functions
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int fi(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int fe(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int ffeval(realtype *fval, realtype uval, realtype rval);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int fi(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int fe(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int ffeval(sunrealtype *fval, sunrealtype uval, sunrealtype rval);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -261,7 +261,7 @@ static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
 static int HyprePFMG(UserData *udata);
 
 // Fill A = I - gamma * J matrix
-static int FillMatrix(UserData *udata, realtype gamma);
+static int FillMatrix(UserData *udata, sunrealtype gamma);
 
 // Perform neighbor exchange
 static int PostRecv(UserData *udata);
@@ -282,7 +282,7 @@ static int FreeUserData(UserData *udata);
 static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 
 // Compute the initial condition
-static int InitSolution(realtype t, N_Vector u, UserData *udata);
+static int InitSolution(sunrealtype t, N_Vector u, UserData *udata);
 
 // -----------------------------------------------------------------------------
 // Output and utility functions
@@ -296,7 +296,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -480,9 +480,9 @@ int main(int argc, char* argv[])
     // Loop over output times
     // -----------------------
 
-    realtype t     = ZERO;
-    realtype dTout = udata.tf / udata.nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata.tf / udata.nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = OpenOutput(&udata);
@@ -665,23 +665,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -747,11 +747,11 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // Functions called by the integrator
 // -----------------------------------------------------------------------------
 // f routine to compute the full ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
-  realtype ftemp;
+  sunrealtype ftemp;
 
   // Start timer
   double t1 = MPI_Wtime();
@@ -764,10 +764,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Open exchange receives
@@ -779,18 +779,18 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "SendData", 1)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Constants for computing advection
-  realtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
-  realtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
-  realtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
-  realtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
 
   // Shortcut to reaction coefficient
-  realtype rval = udata->r;
+  sunrealtype rval = udata->r;
 
   // Initialize rhs to zero (handles boundary conditions)
   N_VConst(ZERO, f);
@@ -817,10 +817,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries (if not at overall domain boundary)
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face
   if (udata->HaveNbrW)
@@ -969,11 +969,11 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // fi routine to compute the implicit part of ODE RHS function fi(t,u).
-static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int fi(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
-  realtype ftemp;
+  sunrealtype ftemp;
 
   // Start timer
   double t1 = MPI_Wtime();
@@ -986,10 +986,10 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Open exchange receives
@@ -1001,12 +1001,12 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "SendData", 1)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Shortcut to reaction coefficient
-  realtype rval = udata->r;
+  sunrealtype rval = udata->r;
 
   // Initialize rhs to zero (handles boundary conditions)
   N_VConst(ZERO, f);
@@ -1029,10 +1029,10 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries (if not at overall domain boundary)
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face
   if (udata->HaveNbrW)
@@ -1149,7 +1149,7 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // fe routine to compute the explicit part of ODE RHS function.
-static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int fe(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -1165,10 +1165,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Open exchange receives
@@ -1180,10 +1180,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "SendData", 1)) return -1;
 
   // Constants for computing advection
-  realtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
-  realtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
-  realtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
-  realtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
 
   // Initialize rhs to zero (handles boundary conditions)
   N_VConst(ZERO, f);
@@ -1206,10 +1206,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries (if not at overall domain boundary)
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face
   if (udata->HaveNbrW)
@@ -1326,15 +1326,15 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // ff helper function
-static int ffeval(realtype *fval, realtype uval, realtype rval) {
+static int ffeval(sunrealtype *fval, sunrealtype uval, sunrealtype rval) {
 
   *fval = rval * (uval - uval*uval*uval);
   return 0;
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   int flag;
 
@@ -1384,8 +1384,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   int flag;
@@ -1595,7 +1595,7 @@ static int HyprePFMG(UserData *udata)
 }
 
 // Fill A = I - gamma * J matrix
-static int FillMatrix(UserData *udata, realtype gamma)
+static int FillMatrix(UserData *udata, sunrealtype gamma)
 {
   // Variable shortcuts
   HYPRE_Int ilower[2];
@@ -1639,14 +1639,14 @@ static int FillMatrix(UserData *udata, realtype gamma)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype c1 = udata->kx / (udata->dx * udata->dx);
-    realtype c2 = udata->ky / (udata->dy * udata->dy);
-    realtype c3 = -TWO * (c1 + c2);
+    sunrealtype c1 = udata->kx / (udata->dx * udata->dx);
+    sunrealtype c2 = udata->ky / (udata->dy * udata->dy);
+    sunrealtype c3 = -TWO * (c1 + c2);
 
     // Linear system values
-    realtype cx = -gamma * c1;
-    realtype cy = -gamma * c2;
-    realtype cc = ONE - gamma * c3;
+    sunrealtype cx = -gamma * c1;
+    sunrealtype cy = -gamma * c2;
+    sunrealtype cc = ONE - gamma * c3;
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1987,7 +1987,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -2213,8 +2213,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol     = RCONST(1.e-5);   // relative tolerance
-  udata->atol     = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol     = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol     = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->linear   = false;           // linearly implicit problem
   udata->order    = 3;               // method order
 
@@ -2463,11 +2463,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int InitSolution(realtype t, N_Vector u, UserData *udata)
+static int InitSolution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -2482,7 +2482,7 @@ static int InitSolution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -2588,7 +2588,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << "          t           ";
     cout << "          ||u||_rms      " << endl;
     cout << " ---------------------";
@@ -2627,14 +2627,14 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   bool outproc = (udata->myid_c == 0);
 
@@ -2642,7 +2642,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
   {
 
     // Compute rms norm
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2653,7 +2653,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2735,8 +2735,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
index 7445479282..28a226c42e 100644
--- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
+++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp
@@ -62,11 +62,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -81,22 +81,22 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Advection coefficients in the x and y directions
-  realtype ax;
-  realtype ay;
+  sunrealtype ax;
+  sunrealtype ay;
 
   // Reactions coefficient
-  realtype r;
+  sunrealtype r;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -106,8 +106,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -144,10 +144,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -156,10 +156,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -168,20 +168,20 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;    // relative tolerance
-  realtype atol;    // absolute tolerance
+  sunrealtype rtol;    // relative tolerance
+  sunrealtype atol;    // absolute tolerance
   bool     linear;  // enable/disable linearly implicit option
   int      sorder;  // slow method order
   int      forder;  // fast ARKode method order
 
-  realtype hf;         // fast fixed step size
-  realtype hs;         // slow timestep fixed
+  sunrealtype hf;         // fast fixed step size
+  sunrealtype hs;         // slow timestep fixed
   int      controller; // step size adaptivity method
   int      maxsteps;   // max number of steps between outputs
 
   // Linear solver and preconditioner settings
   int      liniters; // number of linear iterations
-  realtype epslin;   // linear solver tolerance factor
+  sunrealtype epslin;   // linear solver tolerance factor
   int      prectype; // preconditioner type (NONE or LEFT)
   int      msbp;     // max number of steps between preconditioner setups
 
@@ -242,17 +242,17 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side functions
-static int fi(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int fe(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int ff(realtype t, N_Vector u, N_Vector f, void *user_data);
-static int ffeval(realtype *fval, realtype uval, realtype rval);
+static int fi(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int fe(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int ff(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
+static int ffeval(sunrealtype *fval, sunrealtype uval, sunrealtype rval);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -263,7 +263,7 @@ static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
 static int HyprePFMG(UserData *udata);
 
 // Fill A = I - gamma * J matrix
-static int FillMatrix(UserData *udata, realtype gamma);
+static int FillMatrix(UserData *udata, sunrealtype gamma);
 
 // Perform neighbor exchange
 static int PostRecv(UserData *udata);
@@ -284,7 +284,7 @@ static int FreeUserData(UserData *udata);
 static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 
 // Compute the initial condition
-static int InitSolution(realtype t, N_Vector u, UserData *udata);
+static int InitSolution(sunrealtype t, N_Vector u, UserData *udata);
 
 // -----------------------------------------------------------------------------
 // Output and utility functions
@@ -298,7 +298,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -540,9 +540,9 @@ int main(int argc, char* argv[])
     // Loop over output times
     // -----------------------
 
-    realtype t     = ZERO;
-    realtype dTout = udata.tf / udata.nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata.tf / udata.nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = OpenOutput(&udata);
@@ -734,23 +734,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -817,7 +817,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // fi routine to compute the slow-implicit part of ODE RHS function.
-static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int fi(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -833,10 +833,10 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Open exchange receives
@@ -848,9 +848,9 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "SendData", 1)) return -1;
 
   // Constants for computing diffusion and forcing
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Initialize rhs to zero (handles boundary conditions)
   N_VConst(ZERO, f);
@@ -872,10 +872,10 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries (if not at overall domain boundary)
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face
   if (udata->HaveNbrW)
@@ -984,7 +984,7 @@ static int fi(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // fe routine to compute the slow-explicit part of ODE RHS function f(t,y).
-static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int fe(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -1000,10 +1000,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Open exchange receives
@@ -1015,10 +1015,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "SendData", 1)) return -1;
 
   // Constants for computing advection
-  realtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
-  realtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
-  realtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
-  realtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cxp = -SUNMAX(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cxm = -SUNMIN(udata->ax, ZERO) / (udata->dx);
+  sunrealtype cyp = -SUNMAX(udata->ay, ZERO) / (udata->dy);
+  sunrealtype cym = -SUNMIN(udata->ay, ZERO) / (udata->dy);
 
   // Initialize rhs to zero (handles boundary conditions)
   N_VConst(ZERO, f);
@@ -1041,10 +1041,10 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries (if not at overall domain boundary)
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face
   if (udata->HaveNbrW)
@@ -1161,14 +1161,14 @@ static int fe(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // ff helper function
-static int ffeval(realtype *fval, realtype uval, realtype rval) {
+static int ffeval(sunrealtype *fval, sunrealtype uval, sunrealtype rval) {
 
   *fval = rval * (uval - uval*uval*uval);
   return 0;
 }
 
 // f routine to compute the ODE RHS function f(t,y).
-static int ff(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int ff(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   sunindextype i, j;
 
@@ -1183,13 +1183,13 @@ static int ff(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Shortcut to reaction coefficient
-  realtype rval = udata->r;
+  sunrealtype rval = udata->r;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs to zero (handles boundary conditions)
@@ -1287,8 +1287,8 @@ static int ff(realtype t, N_Vector u, N_Vector f, void *user_data)
 
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   int flag;
 
@@ -1338,8 +1338,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   int flag;
@@ -1549,7 +1549,7 @@ static int HyprePFMG(UserData *udata)
 }
 
 // Fill A = I - gamma * J matrix
-static int FillMatrix(UserData *udata, realtype gamma)
+static int FillMatrix(UserData *udata, sunrealtype gamma)
 {
   // Variable shortcuts
   HYPRE_Int ilower[2];
@@ -1593,14 +1593,14 @@ static int FillMatrix(UserData *udata, realtype gamma)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype c1 = udata->kx / (udata->dx * udata->dx);
-    realtype c2 = udata->ky / (udata->dy * udata->dy);
-    realtype c3 = -TWO * (c1 + c2);
+    sunrealtype c1 = udata->kx / (udata->dx * udata->dx);
+    sunrealtype c2 = udata->ky / (udata->dy * udata->dy);
+    sunrealtype c3 = -TWO * (c1 + c2);
 
     // Linear system values
-    realtype cx = -gamma * c1;
-    realtype cy = -gamma * c2;
-    realtype cc = ONE - gamma * c3;
+    sunrealtype cx = -gamma * c1;
+    sunrealtype cy = -gamma * c2;
+    sunrealtype cc = ONE - gamma * c3;
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1941,7 +1941,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -2167,8 +2167,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol     = RCONST(1.e-5);   // relative tolerance
-  udata->atol     = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol     = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol     = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->linear   = false;           // linearly implicit problem
   udata->sorder    = 3;               // slow method order
   udata->forder    = 3;               // fast method order
@@ -2435,11 +2435,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int InitSolution(realtype t, N_Vector u, UserData *udata)
+static int InitSolution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -2454,7 +2454,7 @@ static int InitSolution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -2569,7 +2569,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << "          t           ";
     cout << "          ||u||_rms      " << endl;
     cout << " ---------------------";
@@ -2608,14 +2608,14 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   bool outproc = (udata->myid_c == 0);
 
@@ -2623,7 +2623,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
   {
 
     // Compute rms norm
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2634,7 +2634,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2716,8 +2716,8 @@ static int OutputFastStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
@@ -2778,7 +2778,7 @@ static int OutputSlowStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
 
diff --git a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
index cde3f49b41..0a969ea6c4 100644
--- a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
+++ b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.cpp
@@ -222,9 +222,9 @@ int main(int argc, char* argv[])
   // ----------------------
 
   // Initial time, time between outputs, output time
-  realtype t     = ZERO;
-  realtype dTout = udata.tf / uopts.nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata.tf / uopts.nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(udata, uopts);
@@ -1116,8 +1116,8 @@ int SetupMRICVODE(SUNContext ctx, UserData &udata, UserOptions &uopts,
 
 
 // Advance the fast ODE in time
-int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, realtype t0,
-                             realtype tout, N_Vector y)
+int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, sunrealtype t0,
+                             sunrealtype tout, N_Vector y)
 {
   void* inner_content = nullptr;
   int flag = MRIStepInnerStepper_GetContent(fast_mem, &inner_content);
@@ -1142,7 +1142,7 @@ int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, realtype t0,
   flag = CVodeSetStopTime(content->cvode_mem, tout);
   if (check_flag(flag, "CVodeSetStopTime")) return -1;
 
-  realtype tret;
+  sunrealtype tret;
   flag = CVode(content->cvode_mem, tout, y, &tret, CV_NORMAL);
   if (flag < 0) return -1;
 
@@ -1165,7 +1165,7 @@ int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, realtype t0,
 
 
 // Compute the RHS of the fast ODE
-int CVodeInnerStepper_FullRhs(MRIStepInnerStepper fast_mem, realtype t,
+int CVodeInnerStepper_FullRhs(MRIStepInnerStepper fast_mem, sunrealtype t,
                               N_Vector y, N_Vector f, int mode)
 {
   void* inner_content = nullptr;
@@ -1182,7 +1182,7 @@ int CVodeInnerStepper_FullRhs(MRIStepInnerStepper fast_mem, realtype t,
 
 
 // Reset the fast integrator to the given time and state
-int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, realtype tR,
+int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, sunrealtype tR,
                             N_Vector yR)
 {
   void* inner_content = nullptr;
@@ -1209,24 +1209,24 @@ int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, realtype tR,
 
 
 // Advection RHS function
-int f_advection(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_advection(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
 
   // Access data arrays
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   if (check_ptr(ydata, "N_VGetArrayPointer")) return -1;
 
-  realtype* fdata = N_VGetArrayPointer(f);
+  sunrealtype* fdata = N_VGetArrayPointer(f);
   if (check_ptr(fdata, "N_VGetArrayPointer")) return -1;
 
   // Compute advection RHS
-  realtype ul, ur;
-  realtype vl, vr;
-  realtype wl, wr;
+  sunrealtype ul, ur;
+  sunrealtype vl, vr;
+  sunrealtype wl, wr;
 
-  realtype c = -ONE * udata->c / (TWO * udata->dx);
+  sunrealtype c = -ONE * udata->c / (TWO * udata->dx);
 
   fdata[0] = fdata[1] = fdata[2] = ZERO;
 
@@ -1253,14 +1253,14 @@ int f_advection(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Advection Jacobian function
-int J_advection(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_advection(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2,
                 N_Vector tmp3)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
 
-  realtype c = -ONE * udata->c / (TWO * udata->dx);
+  sunrealtype c = -ONE * udata->c / (TWO * udata->dx);
 
   for (sunindextype i = 1; i < udata->nx - 1; i++)
   {
@@ -1279,24 +1279,24 @@ int J_advection(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Diffusion RHS function
-int f_diffusion(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_diffusion(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
 
   // Access data arrays
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   if (check_ptr(ydata, "N_VGetArrayPointer")) return -1;
 
-  realtype* fdata = N_VGetArrayPointer(f);
+  sunrealtype* fdata = N_VGetArrayPointer(f);
   if (check_ptr(fdata, "N_VGetArrayPointer")) return -1;
 
   // Compute diffusion RHS
-  realtype ul, uc, ur;
-  realtype vl, vc, vr;
-  realtype wl, wc, wr;
+  sunrealtype ul, uc, ur;
+  sunrealtype vl, vc, vr;
+  sunrealtype wl, wc, wr;
 
-  realtype d = udata->d / (udata->dx * udata->dx);
+  sunrealtype d = udata->d / (udata->dx * udata->dx);
 
   fdata[0] = fdata[1] = fdata[2] = ZERO;
 
@@ -1326,14 +1326,14 @@ int f_diffusion(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Diffusion Jacobian function
-int J_diffusion(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_diffusion(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2,
                 N_Vector tmp3)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
 
-  realtype d = udata->d / (udata->dx * udata->dx);
+  sunrealtype d = udata->d / (udata->dx * udata->dx);
 
   for (sunindextype i = 1; i < udata->nx - 1; i++)
   {
@@ -1355,20 +1355,20 @@ int J_diffusion(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Reaction RHS function
-int f_reaction(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_reaction(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
 
   // Access data arrays
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   if (check_ptr(ydata, "N_VGetArrayPointer")) return -1;
 
-  realtype* fdata = N_VGetArrayPointer(f);
+  sunrealtype* fdata = N_VGetArrayPointer(f);
   if (check_ptr(fdata, "N_VGetArrayPointer")) return -1;
 
   // Compute reaction RHS
-  realtype u, v, w;
+  sunrealtype u, v, w;
 
   fdata[0] = fdata[1] = fdata[2] = ZERO;
 
@@ -1390,7 +1390,7 @@ int f_reaction(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Diffusion Jacobian function
-int J_reaction(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_reaction(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void* user_data, N_Vector tmp1, N_Vector tmp2,
                N_Vector tmp3)
 {
@@ -1398,10 +1398,10 @@ int J_reaction(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   UserData* udata = (UserData*) user_data;
 
   // Access data array
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   if (check_ptr(ydata, "N_VGetArrayPointer")) return 1;
 
-  realtype u, v, w;
+  sunrealtype u, v, w;
 
   for (sunindextype i = 1; i < udata->nx - 1; i++)
   {
@@ -1429,7 +1429,7 @@ int J_reaction(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Advection-diffusion RHS function
-int f_adv_diff(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_adv_diff(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
@@ -1450,7 +1450,7 @@ int f_adv_diff(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Advection-diffusion Jacobian function
-int J_adv_diff(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_diff(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
@@ -1476,7 +1476,7 @@ int J_adv_diff(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Advection-reaction RHS function
-int f_adv_react(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_adv_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
@@ -1497,7 +1497,7 @@ int f_adv_react(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Diffusion-reaction Jacobian function
-int J_adv_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
@@ -1523,7 +1523,7 @@ int J_adv_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Diffusion-reaction RHS function
-int f_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_diff_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
@@ -1544,7 +1544,7 @@ int f_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Diffusion-reaction Jacobian function
-int J_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_diff_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                  void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
@@ -1570,7 +1570,7 @@ int J_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Advection-diffusion-reaction RHS function
-int f_adv_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_adv_diff_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
@@ -1598,7 +1598,7 @@ int f_adv_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data)
 
 
 // Diffusion-reaction Jacobian function
-int J_adv_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_diff_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                      void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Access problem data
@@ -1635,7 +1635,7 @@ int J_adv_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 // Reaction RHS function with MRI forcing
-int f_react_forcing(realtype t, N_Vector y, N_Vector f, void* user_data)
+int f_react_forcing(sunrealtype t, N_Vector y, N_Vector f, void* user_data)
 {
   // Access problem data
   UserData* udata = (UserData*) user_data;
@@ -1655,15 +1655,15 @@ int f_react_forcing(realtype t, N_Vector y, N_Vector f, void* user_data)
 // Compute the initial condition
 int SetIC(N_Vector y, UserData &udata)
 {
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   if (check_ptr(ydata, "N_VGetArrayPointer")) return -1;
 
-  realtype x, p;
+  sunrealtype x, p;
 
   for (sunindextype i = 0; i < udata.nx; i++)
   {
     x = udata.xl + i * udata.dx;
-    p = RCONST(0.1) * sin(PI * x);
+    p = SUN_RCONST(0.1) * sin(PI * x);
     ydata[UIDX(i)] = udata.A + p;
     ydata[VIDX(i)] = udata.B / udata.A + p;
     ydata[WIDX(i)] = udata.B + p;
diff --git a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
index f72f53b066..7a659b6ea8 100644
--- a/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
+++ b/examples/arkode/CXX_serial/ark_advection_diffusion_reaction.hpp
@@ -35,14 +35,14 @@
 #include "sunlinsol/sunlinsol_band.h"
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NSPECIES 3
 
-#define WIDTH (10 + numeric_limits<realtype>::digits10)
+#define WIDTH (10 + numeric_limits<sunrealtype>::digits10)
 
 // Macro to access each species at an x location
 #define UIDX(i) (NSPECIES * (i))
@@ -65,28 +65,28 @@ struct UserData
   int splitting = 3;
 
   // Advection and diffusion coefficients
-  realtype c = RCONST(1.0e-3);
-  realtype d = RCONST(1.0e-2);
+  sunrealtype c = SUN_RCONST(1.0e-3);
+  sunrealtype d = SUN_RCONST(1.0e-2);
 
   // Feed and reaction rates
-  realtype A = RCONST(0.6);
-  realtype B = RCONST(2.0);
+  sunrealtype A = SUN_RCONST(0.6);
+  sunrealtype B = SUN_RCONST(2.0);
 
   // Stiffness parameter
-  realtype eps = RCONST(1.0e-2);
+  sunrealtype eps = SUN_RCONST(1.0e-2);
 
   // Final simulation time
-  realtype tf = RCONST(3.0);
+  sunrealtype tf = SUN_RCONST(3.0);
 
   // Domain boundaries
-  realtype xl = ZERO;
-  realtype xu = ONE;
+  sunrealtype xl = ZERO;
+  sunrealtype xu = ONE;
 
   // Number of nodes
   sunindextype nx = 512;
 
   // Mesh spacing
-  realtype dx = (xu - xl) / (nx - 1);
+  sunrealtype dx = (xu - xl) / (nx - 1);
 
   // Number of equations
   sunindextype neq = NSPECIES * nx;
@@ -132,17 +132,17 @@ struct UserOptions
   bool ark_dirk  = false;
 
   // Relative and absolute tolerances
-  realtype rtol      = RCONST(1.e-4);
-  realtype atol      = RCONST(1.e-9);
-  realtype rtol_fast = RCONST(1.e-4);
-  realtype atol_fast = RCONST(1.e-9);
+  sunrealtype rtol      = SUN_RCONST(1.e-4);
+  sunrealtype atol      = SUN_RCONST(1.e-9);
+  sunrealtype rtol_fast = SUN_RCONST(1.e-4);
+  sunrealtype atol_fast = SUN_RCONST(1.e-9);
 
   // Step size selection (ZERO = adaptive steps)
-  realtype fixed_h      = ZERO;
-  realtype fixed_h_fast = ZERO;
+  sunrealtype fixed_h      = ZERO;
+  sunrealtype fixed_h_fast = ZERO;
 
   // First step growth factor
-  realtype etamx1_fast = ZERO;
+  sunrealtype etamx1_fast = ZERO;
 
   int maxsteps      = 10000;  // max steps between outputs
   int controller    = -1;     // step size adaptivity method
@@ -159,7 +159,7 @@ struct UserOptions
   bool save_hinit = false;
   bool save_hcur  = false;
 
-  realtype hcur_factor = RCONST(0.7);
+  sunrealtype hcur_factor = SUN_RCONST(0.7);
 
   int output = 1;   // 0 = none, 1 = stats, 2 = disk, 3 = disk with tstop
   int nout   = 10;  // number of output times
@@ -179,10 +179,10 @@ struct CVodeInnerStepperContent
   bool save_hinit = false;
   bool save_hcur  = false;
 
-  realtype hcur_factor = ONE;
+  sunrealtype hcur_factor = ONE;
 
-  realtype hinit = ZERO;  // initial step size
-  realtype hcur  = ZERO;  // current step size
+  sunrealtype hinit = ZERO;  // initial step size
+  sunrealtype hcur  = ZERO;  // current step size
 
   // saved integrator stats
   long int nst     = 0;  // time steps
@@ -194,13 +194,13 @@ struct CVodeInnerStepperContent
   long int nje     = 0;  // Jacobian evals
 };
 
-int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, realtype t0,
-                             realtype tout, N_Vector y);
+int CVodeInnerStepper_Evolve(MRIStepInnerStepper fast_mem, sunrealtype t0,
+                             sunrealtype tout, N_Vector y);
 
-int CVodeInnerStepper_FullRhs(MRIStepInnerStepper fast_mem, realtype t,
+int CVodeInnerStepper_FullRhs(MRIStepInnerStepper fast_mem, sunrealtype t,
                               N_Vector y, N_Vector f, int mode);
 
-int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, realtype tR,
+int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, sunrealtype tR,
                             N_Vector yR);
 
 // -----------------------------------------------------------------------------
@@ -208,37 +208,37 @@ int CVodeInnerStepper_Reset(MRIStepInnerStepper fast_mem, realtype tR,
 // -----------------------------------------------------------------------------
 
 // ODE right hand side (RHS) functions
-int f_advection(realtype t, N_Vector y, N_Vector f, void* user_data);
-int f_diffusion(realtype t, N_Vector y, N_Vector f, void* user_data);
-int f_reaction(realtype t, N_Vector y, N_Vector f, void* user_data);
+int f_advection(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
+int f_diffusion(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
+int f_reaction(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
 
-int f_adv_diff(realtype t, N_Vector y, N_Vector f, void* user_data);
-int f_adv_react(realtype t, N_Vector y, N_Vector f, void* user_data);
-int f_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data);
-int f_adv_diff_react(realtype t, N_Vector y, N_Vector f, void* user_data);
+int f_adv_diff(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
+int f_adv_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
+int f_diff_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
+int f_adv_diff_react(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
 
-int f_react_forcing(realtype t, N_Vector y, N_Vector f, void* user_data);
+int f_react_forcing(sunrealtype t, N_Vector y, N_Vector f, void* user_data);
 
 // Jacobian of RHS functions
-int J_advection(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_advection(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2,
                 N_Vector tmp3);
-int J_diffusion(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_diffusion(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2,
                 N_Vector tmp3);
-int J_reaction(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_reaction(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void* user_data, N_Vector tmp1, N_Vector tmp2,
                N_Vector tmp3);
-int J_adv_diff(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_diff(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void* user_data, N_Vector tmp1, N_Vector tmp2,
                N_Vector tmp3);
-int J_adv_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                 void* user_data, N_Vector tmp1, N_Vector tmp2,
                 N_Vector tmp3);
-int J_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_diff_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                  void* user_data, N_Vector tmp1, N_Vector tmp2,
                  N_Vector tmp3);
-int J_adv_diff_react(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int J_adv_diff_react(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                      void* user_data, N_Vector tmp1, N_Vector tmp2,
                      N_Vector tmp3);
 
@@ -359,8 +359,8 @@ int OutputStatsARK(void* arkode_mem, UserData &udata)
     cout << "  J evals            = " << nje     << endl;
     cout << endl;
 
-    realtype avgnli = (realtype) nni / (realtype) nst_a;
-    realtype avgls  = (realtype) nsetups / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+    sunrealtype avgls  = (sunrealtype) nsetups / (sunrealtype) nni;
     cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
     cout << "  Avg LS setups per NLS iter     = " << avgls  << endl;
   }
@@ -410,8 +410,8 @@ int OutputStatsMRIARK(void* arkode_mem, MRIStepInnerStepper fast_mem,
     cout << endl;
 
     // Compute average nls iters per step and ls iters per nls iter
-    realtype avgnli = (realtype) nni / (realtype) nst;
-    realtype avgls  = (realtype) nsetups / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst;
+    sunrealtype avgls  = (sunrealtype) nsetups / (sunrealtype) nni;
     cout << "  Avg NLS iters per slow step = " << avgnli << endl;
     cout << "  Avg LS setups per NLS iter  = " << avgls  << endl;
   }
@@ -459,8 +459,8 @@ int OutputStatsMRIARK(void* arkode_mem, MRIStepInnerStepper fast_mem,
     cout << "  J evals                 = " << nje     << endl;
     cout << endl;
 
-    realtype avgnli = (realtype) nni / (realtype) nst;
-    realtype avgls  = (realtype) nsetups / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst;
+    sunrealtype avgls  = (sunrealtype) nsetups / (sunrealtype) nni;
     cout << "  Avg NLS iters per fast step = " << avgnli << endl;
     cout << "  Avg LS setups per NLS iter  = " << avgls  << endl;
   }
@@ -545,8 +545,8 @@ int OutputStatsMRICVODE(void* arkode_mem, MRIStepInnerStepper fast_mem,
   cout << endl;
 
   // Compute average nls iters per step and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nsts;
-  realtype avgls  = (realtype) nsetups / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nsts;
+  sunrealtype avgls  = (sunrealtype) nsetups / (sunrealtype) nni;
   cout << "  Avg NLS iters per slow step = " << avgnli << endl;
   cout << "  Avg LS setups per NLS iter  = " << avgls  << endl;
   cout << endl;
@@ -571,8 +571,8 @@ int OutputStatsMRICVODE(void* arkode_mem, MRIStepInnerStepper fast_mem,
   cout << "  J evals          = " << content->nje     << endl;
   cout << endl;
 
-  avgnli = (realtype) content->nni / (realtype) content->nst;
-  avgls  = (realtype) content->nsetups / (realtype) content->nni;
+  avgnli = (sunrealtype) content->nni / (sunrealtype) content->nst;
+  avgls  = (sunrealtype) content->nsetups / (sunrealtype) content->nni;
   cout << "  Avg NLS iters per fast step = " << avgnli << endl;
   cout << "  Avg LS setups per NLS iter  = " << avgls  << endl;
   cout << endl;
@@ -626,7 +626,7 @@ void InputHelp()
 }
 
 
-inline void find_arg(vector<string> &args, const string key, realtype &dest)
+inline void find_arg(vector<string> &args, const string key, sunrealtype &dest)
 {
   auto it = find(args.begin(), args.end(), key);
   if (it != args.end())
@@ -1153,7 +1153,7 @@ int OpenOutput(UserData &udata, UserOptions &uopts)
   if (uopts.output)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << "          t           ";
     cout << "          ||y||_rms      " << endl;
     cout << " ---------------------";
@@ -1169,7 +1169,7 @@ int OpenOutput(UserData &udata, UserOptions &uopts)
     uopts.uout.open(fname.str());
 
     uopts.uout << scientific;
-    uopts.uout << setprecision(numeric_limits<realtype>::digits10);
+    uopts.uout << setprecision(numeric_limits<sunrealtype>::digits10);
     uopts.uout <<  "# title Advection-Diffusion-Reaction (Brusselator)" << endl;
     uopts.uout <<  "# nvar 3"     << endl;
     uopts.uout <<  "# vars u v w" << endl;
@@ -1184,18 +1184,18 @@ int OpenOutput(UserData &udata, UserOptions &uopts)
 
 
 // Write output
-int WriteOutput(realtype t, N_Vector y, UserData &udata, UserOptions &uopts)
+int WriteOutput(sunrealtype t, N_Vector y, UserData &udata, UserOptions &uopts)
 {
   if (uopts.output)
   {
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(y, y) / udata.nx);
+    sunrealtype urms = sqrt(N_VDotProd(y, y) / udata.nx);
     cout << setw(22) << t << setw(25) << urms << endl;
 
     // Write solution to disk
     if (uopts.output >= 2)
     {
-      realtype* ydata = N_VGetArrayPointer(y);
+      sunrealtype* ydata = N_VGetArrayPointer(y);
       if (check_ptr(ydata, "N_VGetArrayPointer")) return -1;
 
       uopts.uout << t;
diff --git a/examples/arkode/CXX_serial/ark_analytic_sys.cpp b/examples/arkode/CXX_serial/ark_analytic_sys.cpp
index 83153a67d3..fa7bb0b4c5 100644
--- a/examples/arkode/CXX_serial/ark_analytic_sys.cpp
+++ b/examples/arkode/CXX_serial/ark_analytic_sys.cpp
@@ -49,7 +49,7 @@
 #include <nvector/nvector_serial.h>     // access to serial N_Vector
 #include <sunmatrix/sunmatrix_dense.h>  // access to dense SUNMatrix
 #include <sunlinsol/sunlinsol_dense.h>  // access to dense SUNLinearSolver
-#include <sundials/sundials_types.h>    // def. of type 'realtype'
+#include <sundials/sundials_types.h>    // def. of type 'sunrealtype'
 #include <sundials/sundials_logger.h>
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -65,8 +65,8 @@
 using namespace std;
 
 // User-supplied Functions Called by the Solver
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // Private function to perform matrix-matrix product
@@ -79,13 +79,13 @@ static int check_flag(void *flagvalue, const string funcname, int opt);
 int main()
 {
   // general problem parameters
-  realtype T0 = RCONST(0.0);         // initial time
-  realtype Tf = RCONST(0.05);        // final time
-  realtype dTout = RCONST(0.005);    // time between outputs
+  sunrealtype T0 = SUN_RCONST(0.0);         // initial time
+  sunrealtype Tf = SUN_RCONST(0.05);        // final time
+  sunrealtype dTout = SUN_RCONST(0.005);    // time between outputs
   sunindextype NEQ = 3;              // number of dependent vars.
-  realtype reltol = RCONST(1.0e-6);  // tolerances
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  // stiffness parameter
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  // tolerances
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  // stiffness parameter
 
   // general problem variables
   int flag;                      // reusable error-checking flag
@@ -195,8 +195,8 @@ int main()
 
   /* Main time-stepping loop: calls ARKStepEvolve to perform the integration, then
      prints results.  Stops when the final time has been reached */
-  realtype t = T0;
-  realtype tout = T0+dTout;
+  sunrealtype t = T0;
+  sunrealtype tout = T0+dTout;
   cout << "      t        y0        y1        y2\n";
   cout << "   --------------------------------------\n";
   while (Tf - t > 1.0e-15) {
@@ -263,14 +263,14 @@ int main()
  *-------------------------------*/
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   // cast user_data to realtype
-  realtype lam = rdata[0];                    // set shortcut for stiffness parameter
-  realtype y0 = NV_Ith_S(y,0);                // access current solution values
-  realtype y1 = NV_Ith_S(y,1);
-  realtype y2 = NV_Ith_S(y,2);
-  realtype yd0, yd1, yd2;
+  sunrealtype *rdata = (sunrealtype *) user_data;   // cast user_data to sunrealtype
+  sunrealtype lam = rdata[0];                    // set shortcut for stiffness parameter
+  sunrealtype y0 = NV_Ith_S(y,0);                // access current solution values
+  sunrealtype y1 = NV_Ith_S(y,1);
+  sunrealtype y2 = NV_Ith_S(y,2);
+  sunrealtype yd0, yd1, yd2;
 
   // fill in the RHS function: f(t,y) = V*D*Vi*y
   yd0 = 0.25*(5.0*y0 + 1.0*y1 - 3.0*y2);     // yd = Vi*y
@@ -290,12 +290,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // Jacobian routine to compute J(t,y) = df/dy.
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rdata = (realtype *) user_data;   // cast user_data to realtype
-  realtype lam = rdata[0];                    // set shortcut for stiffness parameter
+  sunrealtype *rdata = (sunrealtype *) user_data;   // cast user_data to sunrealtype
+  sunrealtype lam = rdata[0];                    // set shortcut for stiffness parameter
 
   // Get Jacobian context
   SUNContext sunctx = J->sunctx;
@@ -371,9 +371,9 @@ static int SUNDlsMat_dense_MM(SUNMatrix A, SUNMatrix B, SUNMatrix C)
     return 1;
   }
 
-  realtype **adata = SUNDenseMatrix_Cols(A);     // access data and extents
-  realtype **bdata = SUNDenseMatrix_Cols(B);
-  realtype **cdata = SUNDenseMatrix_Cols(C);
+  sunrealtype **adata = SUNDenseMatrix_Cols(A);     // access data and extents
+  sunrealtype **bdata = SUNDenseMatrix_Cols(B);
+  sunrealtype **cdata = SUNDenseMatrix_Cols(C);
   sunindextype m = SUNDenseMatrix_Rows(C);
   sunindextype n = SUNDenseMatrix_Columns(C);
   sunindextype l = SUNDenseMatrix_Columns(A);
diff --git a/examples/arkode/CXX_serial/ark_heat2D.cpp b/examples/arkode/CXX_serial/ark_heat2D.cpp
index 12949c2698..2bebfd8da6 100644
--- a/examples/arkode/CXX_serial/ark_heat2D.cpp
+++ b/examples/arkode/CXX_serial/ark_heat2D.cpp
@@ -60,11 +60,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -78,18 +78,18 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Number of nodes in the x and y directions
   sunindextype nx;
@@ -99,13 +99,13 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
-  realtype hfixed;      // fixed step size
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
+  sunrealtype hfixed;      // fixed step size
   int      order;       // ARKode method order
   int      controller;  // step size adaptivity method
   int      maxsteps;    // max number of steps between outputs
@@ -118,7 +118,7 @@ struct UserData
   bool     lsinfo;    // output residual history
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Inverse of Jacobian diagonal for preconditioner
   N_Vector d;
@@ -143,14 +143,14 @@ struct UserData
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -171,10 +171,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -184,7 +184,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -336,7 +336,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (requires fixed step size)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -391,9 +391,9 @@ int main(int argc, char* argv[])
   // Loop over output times
   // -----------------------
 
-  realtype t     = ZERO;
-  realtype dTout = udata->tf / udata->nout;
-  realtype tout  = dTout;
+  sunrealtype t     = ZERO;
+  sunrealtype dTout = udata->tf / udata->nout;
+  sunrealtype tout  = dTout;
 
   // Inital output
   flag = OpenOutput(udata);
@@ -448,10 +448,10 @@ int main(int argc, char* argv[])
     flag = SolutionError(t, u, udata->e, udata);
     if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     cout << "  Max error = " << maxerr << endl;
   }
 
@@ -482,7 +482,7 @@ int main(int argc, char* argv[])
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -499,15 +499,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny = udata->ny;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -516,15 +516,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over domain interior and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (sunindextype j = 1; j < ny - 1; j++)
     {
@@ -570,8 +570,8 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -584,17 +584,17 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   UserData *udata = (UserData *) user_data;
 
   // Access data array
-  realtype *diag = N_VGetArrayPointer(udata->d);
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->d);
 
   // Stop timer
@@ -608,8 +608,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Timing variables
@@ -666,8 +666,8 @@ static int InitUserData(UserData *udata)
   udata->dy = udata->yu / (udata->ny - 1);
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->hfixed      = ZERO;            // using adaptive step sizes
   udata->order       = 3;               // method order
   udata->controller  = 0;               // PID controller
@@ -871,11 +871,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -883,7 +883,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = 1; j < udata->ny - 1; j++)
@@ -904,7 +904,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -998,7 +998,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -1033,13 +1033,13 @@ static int OpenOutput(UserData *udata)
     // Open output streams for solution and error
     udata->uout.open("heat2d_solution.txt");
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
       udata->eout.open("heat2d_error.txt");
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -1047,14 +1047,14 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int flag;
 
   if (udata->output > 0)
   {
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (udata->forcing)
@@ -1064,7 +1064,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
       // Compute max error
-      realtype max = N_VMaxNorm(udata->e);
+      sunrealtype max = N_VMaxNorm(udata->e);
 
       cout << setw(22) << t << setw(25) << urms << setw(25) << max << endl;
     }
@@ -1076,7 +1076,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -1089,7 +1089,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -1183,8 +1183,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst_a;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
   cout << endl;
diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt.cpp b/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
index 83e549c031..7404f37a4a 100644
--- a/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
+++ b/examples/arkode/CXX_serial/ark_kpr_Mt.cpp
@@ -81,7 +81,7 @@
 #include <nvector/nvector_serial.h>     // serial N_Vector type, fcts., macros
 #include <sunmatrix/sunmatrix_dense.h>  // dense matrix type, fcts., macros
 #include <sunlinsol/sunlinsol_dense.h>  // dense linear solver
-#include <sundials/sundials_math.h>     // def. math fcns, 'realtype'
+#include <sundials/sundials_math.h>     // def. math fcns, 'sunrealtype'
 #include <sunnonlinsol/sunnonlinsol_newton.h>      // Newton nonlinear solver
 #include <sunnonlinsol/sunnonlinsol_fixedpoint.h>  // fixed-point nonlinear solver
 
@@ -95,63 +95,63 @@
 #define FSYM "f"
 #endif
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define PI4  RCONST(0.78539816339744830961566084581987572)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define PI4  SUN_RCONST(0.78539816339744830961566084581987572)
 
 using namespace std;
 
 // User data structure
 struct UserData
 {
-  realtype G;
-  realtype g;
-  realtype e;
-  booleantype M_timedep;
+  sunrealtype G;
+  sunrealtype g;
+  sunrealtype e;
+  sunbooleantype M_timedep;
 };
 
 // User-supplied functions called by the solver
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Ji(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fn(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Ji(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jn(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // Private utility functions
-static int adaptive_run(void *arkode_mem, N_Vector y, realtype T0, realtype Tf,
-                        realtype dTout, realtype reltol, realtype abstol,
+static int adaptive_run(void *arkode_mem, N_Vector y, sunrealtype T0, sunrealtype Tf,
+                        sunrealtype dTout, sunrealtype reltol, sunrealtype abstol,
                         int rk_type, int nls_type, UserData &udata);
-static int check_order(void *arkode_mem, N_Vector y, realtype T0,
-                       realtype Tf, int order, int rk_type, UserData &udata);
-static realtype r(realtype t);
-static realtype s(realtype t);
-static realtype rdot(realtype t);
-static realtype sdot(realtype t);
-static realtype utrue(realtype t);
-static realtype vtrue(realtype t);
-static int Ytrue(realtype t, N_Vector y);
+static int check_order(void *arkode_mem, N_Vector y, sunrealtype T0,
+                       sunrealtype Tf, int order, int rk_type, UserData &udata);
+static sunrealtype r(sunrealtype t);
+static sunrealtype s(sunrealtype t);
+static sunrealtype rdot(sunrealtype t);
+static sunrealtype sdot(sunrealtype t);
+static sunrealtype utrue(sunrealtype t);
+static sunrealtype vtrue(sunrealtype t);
+static int Ytrue(sunrealtype t, N_Vector y);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 // Main Program
 int main(int argc, char *argv[])
 {
   // general problem parameters
-  realtype T0 = RCONST(-3.0);       // initial time
-  realtype Tf = RCONST(7.0);        // final time
-  realtype dTout = RCONST(0.1);     // time between outputs
+  sunrealtype T0 = SUN_RCONST(-3.0);       // initial time
+  sunrealtype Tf = SUN_RCONST(7.0);        // final time
+  sunrealtype dTout = SUN_RCONST(0.1);     // time between outputs
   sunindextype NEQ = 2;             // number of dependent vars.
   int rk_type = 0;                  // type of RK method [ARK=0, DIRK=1, ERK=2]
   int nls_type = 0;                 // type of nonlinear solver [Newton=0, FP=1]
   int order = 4;                    // order of accuracy for RK method
-  booleantype deduce = SUNFALSE;    // deduce fi after a nonlinear solve
-  booleantype adaptive = SUNTRUE;   // adaptive run vs convergence order
-  realtype reltol = RCONST(1e-5);   // relative tolerance
-  realtype abstol = RCONST(1e-11);  // absolute tolerance
+  sunbooleantype deduce = SUNFALSE;    // deduce fi after a nonlinear solve
+  sunbooleantype adaptive = SUNTRUE;   // adaptive run vs convergence order
+  sunrealtype reltol = SUN_RCONST(1e-5);   // relative tolerance
+  sunrealtype abstol = SUN_RCONST(1e-11);  // absolute tolerance
 
   // general problem variables
   int retval;                    // reusable error-checking flag
@@ -163,9 +163,9 @@ int main(int argc, char *argv[])
   SUNLinearSolver MLS = NULL;    // empty mass linear solver object
   SUNNonlinearSolver NLS = NULL; // empty nonlinear solver object
   UserData udata;                // user-data structure
-  udata.G = RCONST(-100.0);      // stiffness parameter
-  udata.g = RCONST(10.0);        // mass matrix parameter
-  udata.e = RCONST(0.5);         // coupling strength
+  udata.G = SUN_RCONST(-100.0);      // stiffness parameter
+  udata.g = SUN_RCONST(10.0);        // mass matrix parameter
+  udata.e = SUN_RCONST(0.5);         // coupling strength
   udata.M_timedep = SUNTRUE;     // time-dependence of mass matrix
 
   //
@@ -176,9 +176,9 @@ int main(int argc, char *argv[])
   if (argc > 1)  rk_type = (int) atoi(argv[1]);
   if (argc > 2)  order = (int) atoi(argv[2]);
   if (argc > 3)  nls_type = (int) atoi(argv[3]);
-  if (argc > 4)  udata.G = (realtype) atof(argv[4]);
+  if (argc > 4)  udata.G = (sunrealtype) atof(argv[4]);
   if (argc > 5)  udata.M_timedep = (int) atoi(argv[5]);
-  if (argc > 6)  udata.g = (realtype) atof(argv[6]);
+  if (argc > 6)  udata.g = (sunrealtype) atof(argv[6]);
   if (argc > 7)  deduce = (int) atoi(argv[7]);
 
   // Check arguments for validity
@@ -343,12 +343,12 @@ int main(int argc, char *argv[])
 //------------------------------
 
 // fe routine to compute the explicit portion of the ODE RHS.
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData *udata = (UserData *) user_data;
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype gcos, gsin, tmp1, tmp2;
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype gcos, gsin, tmp1, tmp2;
 
   // fill in the RHS function:
   //   g*[ cos(t) sin(t)] * [rdot(t)/(2u)]
@@ -365,12 +365,12 @@ static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // fi routine to compute the implicit portion of the ODE RHS.
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData *udata = (UserData *) user_data;
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype gcos, gsin, tmp1, tmp2, tmp3, tmp4;
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype gcos, gsin, tmp1, tmp2, tmp3, tmp4;
 
   // fill in the RHS function:
   //   g*[ cos(t) sin(t)]*[G  e]*[(-1+u^2-r(t))/(2*u)]
@@ -388,12 +388,12 @@ static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return 0;
 }
 
-static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fn(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData *udata = (UserData *) user_data;
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype gcos, gsin, tmp1, tmp2, tmp3, tmp4;
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype gcos, gsin, tmp1, tmp2, tmp3, tmp4;
 
   // fill in the RHS function:
   //   g*[ cos(t) sin(t)]*( [G  e]*[(-1+u^2-r(t))/(2*u)] + [rdot(t)/(2u)]
@@ -411,13 +411,13 @@ static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return 0;
 }
 
-static int Ji(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Ji(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
               void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData *udata = (UserData *) user_data;
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype gcos, gsin, t11, t12, t21, t22, m11, m12, m21, m22;
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype gcos, gsin, t11, t12, t21, t22, m11, m12, m21, m22;
 
   // fill in the Jacobian:
   //   g*[ cos(t) sin(t)]*[G  e]*[1-(u^2-r(t)-1)/(2*u^2),  0]
@@ -441,13 +441,13 @@ static int Ji(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   return 0;
 }
 
-static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jn(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
               void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData *udata = (UserData *) user_data;
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype gcos, gsin, t11, t12, t21, t22, m11, m12, m21, m22;
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype gcos, gsin, t11, t12, t21, t22, m11, m12, m21, m22;
 
   // fill in the Jacobian:
   //   g*[ cos(t) sin(t)]*( [G  e]*[1-(u^2-r(t)-1)/(2*u^2),  0] + [-r'(t)/(2*u^2),  0])
@@ -472,7 +472,7 @@ static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 }
 
 // Routine to compute the mass matrix multiplying y_t.
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData *udata = (UserData *) user_data;
@@ -493,8 +493,8 @@ static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
 // Private helper functions
 //------------------------------
 
-static int adaptive_run(void *arkode_mem, N_Vector y, realtype T0, realtype Tf,
-                        realtype dTout, realtype reltol, realtype abstol,
+static int adaptive_run(void *arkode_mem, N_Vector y, sunrealtype T0, sunrealtype Tf,
+                        sunrealtype dTout, sunrealtype reltol, sunrealtype abstol,
                         int rk_type, int nls_type, UserData &udata)
 {
   // reused variables
@@ -519,13 +519,13 @@ static int adaptive_run(void *arkode_mem, N_Vector y, realtype T0, realtype Tf,
   // Main time-stepping loop: calls ARKStepEvolve to perform integration,
   // then prints results. Stops when the final time has been reached
   int Nt = (int) ceil((Tf-T0)/dTout);
-  realtype t = T0;
-  realtype tout = T0+dTout;
-  realtype uerr = ZERO;
-  realtype verr = ZERO;
-  realtype uerrtot = ZERO;
-  realtype verrtot = ZERO;
-  realtype errtot  = ZERO;
+  sunrealtype t = T0;
+  sunrealtype tout = T0+dTout;
+  sunrealtype uerr = ZERO;
+  sunrealtype verr = ZERO;
+  sunrealtype uerrtot = ZERO;
+  sunrealtype verrtot = ZERO;
+  sunrealtype errtot  = ZERO;
   cout << "\n        t           u           v       uerr      verr\n";
   cout << "   ------------------------------------------------------\n";
   printf("  %10.6" FSYM"  %10.6" FSYM"  %10.6" FSYM"  %.2" ESYM"  %.2" ESYM"\n",
@@ -606,15 +606,15 @@ static int adaptive_run(void *arkode_mem, N_Vector y, realtype T0, realtype Tf,
   return(0);
 }
 
-static int check_order(void *arkode_mem, N_Vector y, realtype T0,
-                       realtype Tf, int order, int rk_type, UserData &udata)
+static int check_order(void *arkode_mem, N_Vector y, sunrealtype T0,
+                       sunrealtype Tf, int order, int rk_type, UserData &udata)
 {
   // local variables
   int retval;
   size_t Nout = 20;
-  realtype reltol = RCONST(1.e-9);
-  realtype abstol = RCONST(1.e-12);
-  realtype a11, a12, a21, a22, b1, b2;
+  sunrealtype reltol = SUN_RCONST(1.e-9);
+  sunrealtype abstol = SUN_RCONST(1.e-12);
+  sunrealtype a11, a12, a21, a22, b1, b2;
   a11 = a12 = a21 = a22 = b1 = b2 = ZERO;
 
   // Tighten implicit solver to accommodate fixed step sizes
@@ -636,13 +636,13 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
   }
 
   // Set array of fixed step sizes to use, storage for corresponding errors/orders
-  realtype hmax = Tf - T0;
+  sunrealtype hmax = Tf - T0;
   if (rk_type == 2)  hmax = ONE/SUNRabs(udata.G);
-  realtype Nmin = SUNMAX((realtype) Nout, (realtype) ceil((Tf-T0)/hmax));
-  vector<realtype> hvals = {(Tf-T0)/Nmin, (Tf-T0)/2/Nmin, (Tf-T0)/4/Nmin, (Tf-T0)/8/Nmin,
+  sunrealtype Nmin = SUNMAX((sunrealtype) Nout, (sunrealtype) ceil((Tf-T0)/hmax));
+  vector<sunrealtype> hvals = {(Tf-T0)/Nmin, (Tf-T0)/2/Nmin, (Tf-T0)/4/Nmin, (Tf-T0)/8/Nmin,
                             (Tf-T0)/16/Nmin, (Tf-T0)/32/Nmin, (Tf-T0)/64/Nmin, (Tf-T0)/128/Nmin};
-  vector<realtype> errs(hvals.size());
-  vector<realtype> orders(hvals.size()-1);
+  vector<sunrealtype> errs(hvals.size());
+  vector<sunrealtype> orders(hvals.size()-1);
 
   // Loop over fixed step sizes
   cout << "\n Fixed-step runs:\n";
@@ -658,11 +658,11 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
     if (check_retval(&retval, "ARKStepSetFixedStep", 1)) return 1;
 
     // Main time-stepping loop: run for Nout periods, accumulating overall error
-    realtype t = T0;
-    realtype dTout = (Tf-T0)/((realtype) Nout);
-    realtype tout = T0+dTout;
-    realtype uerr = ZERO;
-    realtype verr = ZERO;
+    sunrealtype t = T0;
+    sunrealtype dTout = (Tf-T0)/((sunrealtype) Nout);
+    sunrealtype tout = T0+dTout;
+    sunrealtype uerr = ZERO;
+    sunrealtype verr = ZERO;
     errs[ih] = ZERO;
     for (size_t iout=0; iout<Nout; iout++) {
 
@@ -677,7 +677,7 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
       verr = SUNRabs(NV_Ith_S(y,1)-vtrue(t));
       errs[ih] += uerr*uerr + verr*verr;
     }
-    errs[ih] = SUNMIN(ONE, SUNRsqrt(errs[ih] / ((realtype) Nout * 2)));
+    errs[ih] = SUNMIN(ONE, SUNRsqrt(errs[ih] / ((sunrealtype) Nout * 2)));
     a11 += 1;
     a12 += log(hvals[ih]);
     a21 += log(hvals[ih]);
@@ -695,20 +695,20 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
   cout << " -----------------------------------------------------\n";
 
   // Compute/print overall estimated convergence rate
-  realtype ord_avg, ord_max, ord_est, det;
+  sunrealtype ord_avg, ord_max, ord_est, det;
   ord_avg = ord_max = ord_est = ZERO;
   for (size_t ih=1; ih<hvals.size(); ih++) {
     ord_avg += orders[ih-1];
     ord_max = SUNMAX(ord_max,orders[ih-1]);
   }
-  ord_avg = ord_avg/((realtype) hvals.size()-1);
+  ord_avg = ord_avg/((sunrealtype) hvals.size()-1);
   det = a11*a22-a12*a21;
   ord_est = (a11*b2 - a21*b1)/det;
   printf(" Order: max = %.2" FSYM ",  avg = %.2" FSYM ",  overall = %.2" FSYM,
          ord_max, ord_avg, ord_est);
 
   // clean up and return
-  if (ord_max < (order-RCONST(0.5))) {
+  if (ord_max < (order-SUN_RCONST(0.5))) {
     cout << " [FAILURE]\n";
     return(1);
   } else {
@@ -717,31 +717,31 @@ static int check_order(void *arkode_mem, N_Vector y, realtype T0,
   }
 }
 
-static realtype r(realtype t)
+static sunrealtype r(sunrealtype t)
 {
-  return( RCONST(0.5)*cos(t) );
+  return( SUN_RCONST(0.5)*cos(t) );
 }
-static realtype s(realtype t)
+static sunrealtype s(sunrealtype t)
 {
   return( sin(t) );
 }
-static realtype rdot(realtype t)
+static sunrealtype rdot(sunrealtype t)
 {
-  return( -RCONST(0.5)*sin(t) );
+  return( -SUN_RCONST(0.5)*sin(t) );
 }
-static realtype sdot(realtype t)
+static sunrealtype sdot(sunrealtype t)
 {
   return( cos(t) );
 }
-static realtype utrue(realtype t)
+static sunrealtype utrue(sunrealtype t)
 {
   return( SUNRsqrt(ONE+r(t)) );
 }
-static realtype vtrue(realtype t)
+static sunrealtype vtrue(sunrealtype t)
 {
   return( SUNRsqrt(TWO+s(t)) );
 }
-static int Ytrue(realtype t, N_Vector y)
+static int Ytrue(sunrealtype t, N_Vector y)
 {
   NV_Ith_S(y,0) = utrue(t);
   NV_Ith_S(y,1) = vtrue(t);
diff --git a/examples/arkode/CXX_serial/ark_pendulum.cpp b/examples/arkode/CXX_serial/ark_pendulum.cpp
index a0a0cf3090..9b6e6bdac7 100644
--- a/examples/arkode/CXX_serial/ark_pendulum.cpp
+++ b/examples/arkode/CXX_serial/ark_pendulum.cpp
@@ -238,7 +238,7 @@ int main(int argc, char* argv[])
 
   std::cout << std::endl;
   std::cout << std::scientific;
-  std::cout << std::setprecision(std::numeric_limits<realtype>::digits10);
+  std::cout << std::setprecision(std::numeric_limits<sunrealtype>::digits10);
   std::cout << std::setw(swidth) << 0 << std::setw(rwidth) << t
             << std::setw(rwidth) << ydata[0] << std::setw(rwidth) << ydata[1]
             << std::setw(rwidth) << eng0 << std::setw(rwidth)
diff --git a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.cpp b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.cpp
index 75df158b1a..1d9fe00536 100644
--- a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.cpp
+++ b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.cpp
@@ -67,7 +67,7 @@
 #include <nvector/nvector_serial.h>           /* serial N_Vector types, fcts., macros     */
 #include <sunmatrix/sunmatrix_slunrloc.h>     /* access to SuperLU SLU_NR_loc SUNMatrix   */
 #include <sunlinsol/sunlinsol_superludist.h>  /* access to SuperLU_DIST SUNLinearSolver   */
-#include <sundials/sundials_types.h>          /* defs. of realtype, sunindextype, etc     */
+#include <sundials/sundials_types.h>          /* defs. of sunrealtype, sunindextype, etc     */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -84,18 +84,18 @@
 #define IDX(x,v) (3*(x)+v)
 
 /* constants */
-#define ZERO (RCONST(0.0))
-#define ONE  (RCONST(1.0))
-#define TWO  (RCONST(2.0))
-#define HALF (RCONST(0.5))
+#define ZERO (SUN_RCONST(0.0))
+#define ONE  (SUN_RCONST(1.0))
+#define TWO  (SUN_RCONST(2.0))
+#define HALF (SUN_RCONST(0.5))
 
 /* Gaussian quadrature nodes, weights and formula (3 node, 7th-order accurate) */
-#define X1(xl,xr)   (HALF*(xl+xr) - HALF*(xr-xl)*RCONST(0.774596669241483377035853079956))
+#define X1(xl,xr)   (HALF*(xl+xr) - HALF*(xr-xl)*SUN_RCONST(0.774596669241483377035853079956))
 #define X2(xl,xr)   (HALF*(xl+xr))
-#define X3(xl,xr)   (HALF*(xl+xr) + HALF*(xr-xl)*RCONST(0.774596669241483377035853079956))
-#define W1          (RCONST(0.55555555555555555555555555555556))
-#define W2          (RCONST(0.88888888888888888888888888888889))
-#define W3          (RCONST(0.55555555555555555555555555555556))
+#define X3(xl,xr)   (HALF*(xl+xr) + HALF*(xr-xl)*SUN_RCONST(0.774596669241483377035853079956))
+#define W1          (SUN_RCONST(0.55555555555555555555555555555556))
+#define W2          (SUN_RCONST(0.88888888888888888888888888888889))
+#define W3          (SUN_RCONST(0.55555555555555555555555555555556))
 #define Quad(f1,f2,f3,xl,xr) (HALF*(xr-xl)*(W1*f1 + W2*f2 + W3*f3))
 
 /* evaluation macros for variables, basis functions and basis derivatives */
@@ -110,25 +110,25 @@
 /* user data structure */
 typedef struct {
   sunindextype N;   /* number of intervals     */
-  realtype *x;      /* mesh node locations     */
-  realtype a;       /* constant forcing on u   */
-  realtype b;       /* steady-state value of w */
-  realtype du;      /* diffusion coeff for u   */
-  realtype dv;      /* diffusion coeff for v   */
-  realtype dw;      /* diffusion coeff for w   */
-  realtype ep;      /* stiffness parameter     */
+  sunrealtype *x;      /* mesh node locations     */
+  sunrealtype a;       /* constant forcing on u   */
+  sunrealtype b;       /* steady-state value of w */
+  sunrealtype du;      /* diffusion coeff for u   */
+  sunrealtype dv;      /* diffusion coeff for v   */
+  sunrealtype dw;      /* diffusion coeff for w   */
+  sunrealtype ep;      /* stiffness parameter     */
   N_Vector tmp;     /* temporary vector        */
   SUNMatrix R;      /* temporary storage       */
 } *UserData;
 
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f_diff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f_rx(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private helper functions  */
@@ -142,24 +142,24 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[]) {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);    /* initial time */
-  realtype Tf = RCONST(10.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);    /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);   /* final time */
   int Nt = 100;                 /* total number of output times */
   int Nvar = 3;                 /* number of solution fields */
   UserData udata = NULL;
-  realtype *data;
-  realtype *Mdata, *Adata, *Rdata;           /* CSR matrix data for solver and mass matrix */
+  sunrealtype *data;
+  sunrealtype *Mdata, *Adata, *Rdata;           /* CSR matrix data for solver and mass matrix */
   sunindextype *Acolind, *Mcolind, *Rcolind; /* CSR matrix column indices */
   sunindextype *Arowptr, *Mrowptr, *Rrowptr; /* CSR matrix row pointers */
   sunindextype N = 201;         /* spatial mesh size */
-  realtype a = RCONST(0.6);             /* problem parameters */
-  realtype b = RCONST(2.0);
-  realtype du = RCONST(0.025);
-  realtype dv = RCONST(0.025);
-  realtype dw = RCONST(0.025);
-  realtype ep = RCONST(1.0e-5);         /* stiffness parameter */
-  realtype reltol = RCONST(1.0e-6);     /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
+  sunrealtype a = SUN_RCONST(0.6);             /* problem parameters */
+  sunrealtype b = SUN_RCONST(2.0);
+  sunrealtype du = SUN_RCONST(0.025);
+  sunrealtype dv = SUN_RCONST(0.025);
+  sunrealtype dw = SUN_RCONST(0.025);
+  sunrealtype ep = SUN_RCONST(1.0e-5);         /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);     /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
   sunindextype i, NEQ, NNZ;
   int npes, my_pe;
 
@@ -185,7 +185,7 @@ int main(int argc, char *argv[]) {
 
   void *arkode_mem = NULL;
   FILE *FID, *UFID, *VFID, *WFID;
-  realtype h, z, t, dTout, tout, u, v, w, pi;
+  sunrealtype h, z, t, dTout, tout, u, v, w, pi;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nni, ncfn;
   long int netf, nmset, nms, nMv;
@@ -262,20 +262,20 @@ int main(int argc, char *argv[]) {
 
   /* allocate and set up spatial mesh; this [arbitrarily] clusters
      more intervals near the end points of the interval */
-  udata->x = (realtype *) malloc(N*sizeof(realtype));
+  udata->x = (sunrealtype *) malloc(N*sizeof(sunrealtype));
   if (check_retval((void *)udata->x, "malloc", 2)) MPI_Abort(grid.comm, 1);
-  h = RCONST(10.0)/(N-1);
+  h = SUN_RCONST(10.0)/(N-1);
   for (i=0; i<N; i++) {
-    z = -RCONST(5.0) + h*i;
-    udata->x[i] = HALF/atan(RCONST(5.0))*atan(z) + HALF;
+    z = -SUN_RCONST(5.0) + h*i;
+    udata->x[i] = HALF/atan(SUN_RCONST(5.0))*atan(z) + HALF;
   }
 
   /* Set initial conditions into y */
-  pi = RCONST(4.0)*atan(RCONST(1.0));
+  pi = SUN_RCONST(4.0)*atan(SUN_RCONST(1.0));
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*udata->x[i]);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*udata->x[i]);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*udata->x[i]);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* w */
   }
 
   /* Set mask array values for each solution component */
@@ -320,7 +320,7 @@ int main(int argc, char *argv[]) {
   NNZ = 15*NEQ;
 
   Adata = NULL;
-  Adata = (realtype *) malloc(NNZ*sizeof(realtype));
+  Adata = (sunrealtype *) malloc(NNZ*sizeof(sunrealtype));
   if (check_retval((void *)Adata, "malloc Adata", 2)) MPI_Abort(grid.comm, 1);
 
   Acolind = NULL;
@@ -332,7 +332,7 @@ int main(int argc, char *argv[]) {
   if (check_retval((void *)Arowptr, "malloc Arowptr", 2)) MPI_Abort(grid.comm, 1);
 
   Mdata = NULL;
-  Mdata = (realtype *) malloc(NNZ*sizeof(realtype));
+  Mdata = (sunrealtype *) malloc(NNZ*sizeof(sunrealtype));
   if (check_retval((void *)Mdata, "malloc Mdata", 2)) MPI_Abort(grid.comm, 1);
 
   Mcolind = NULL;
@@ -344,7 +344,7 @@ int main(int argc, char *argv[]) {
   if (check_retval((void *)Mrowptr, "malloc Mrowptr", 2)) MPI_Abort(grid.comm, 1);
 
   Rdata = NULL;
-  Rdata = (realtype *) malloc(NNZ*sizeof(realtype));
+  Rdata = (sunrealtype *) malloc(NNZ*sizeof(sunrealtype));
   if (check_retval((void *)Rdata, "malloc Rdata", 2)) MPI_Abort(grid.comm, 1);
 
   Rcolind = NULL;
@@ -543,7 +543,7 @@ int main(int argc, char *argv[]) {
 /* Routine to compute the ODE RHS function f(t,y), where system is of the form
         M y_t = f(t,y) := Ly + R(y)
    This routine only computes the f(t,y), leaving (M y_t) alone. */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
   /* local data */
   int ier;
@@ -564,23 +564,23 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
 
 /* Routine to compute the diffusion portion of the ODE RHS function f(t,y). */
-static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
+static int f_diff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
   /* problem data */
   UserData udata = (UserData) user_data;
 
   /* shortcuts to number of intervals, background values */
   sunindextype N = udata->N;
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
 
   /* local variables */
   sunindextype i;
-  realtype ul, ur, vl, vr, wl, wr;
-  realtype xl, xr, f1;
-  booleantype left, right;
-  realtype *Ydata, *RHSdata;
+  sunrealtype ul, ur, vl, vr, wl, wr;
+  sunrealtype xl, xr, f1;
+  sunbooleantype left, right;
+  sunrealtype *Ydata, *RHSdata;
 
   /* access data arrays */
   Ydata = N_VGetArrayPointer(y);
@@ -645,23 +645,23 @@ static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
 
 /* Routine to compute the reaction portion of the ODE RHS function f(t,y). */
-static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
+static int f_rx(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
   /* problem data */
   UserData udata = (UserData) user_data;
 
   /* shortcuts to number of intervals, background values */
   sunindextype N = udata->N;
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
 
   /* local variables */
   sunindextype i;
-  realtype ul, ur, vl, vr, wl, wr;
-  realtype u, v, w, xl, xr, f1, f2, f3;
-  booleantype left, right;
-  realtype *Ydata, *RHSdata;
+  sunrealtype ul, ur, vl, vr, wl, wr;
+  sunrealtype u, v, w, xl, xr, f1, f2, f3;
+  sunbooleantype left, right;
+  sunrealtype *Ydata, *RHSdata;
 
   /* access data arrays */
   Ydata = N_VGetArrayPointer(y);
@@ -791,7 +791,7 @@ static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
 
 /* Interface routine to compute the Jacobian of the full RHS function, f(y) */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3) {
 
   /* temporary variables */
@@ -838,7 +838,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 /* Routine to compute the mass matrix multiplying y_t. */
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3) {
 
   /* user data structure */
@@ -850,13 +850,13 @@ static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
   NRformat_loc *Mstore = (NRformat_loc *) Msuper->Store;
   sunindextype *rowptrs = Mstore->rowptr;
   sunindextype *colinds = Mstore->colind;
-  realtype *Mdata = (realtype *) Mstore->nzval;
-  realtype *Xdata = udata->x;
+  sunrealtype *Mdata = (sunrealtype *) Mstore->nzval;
+  sunrealtype *Xdata = udata->x;
 
   /* local data */
   sunindextype i, nz=0;
-  realtype xl, xc, xr, Ml, Mc, Mr, ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
-  booleantype left, right, interior;
+  sunrealtype xl, xc, xr, Ml, Mc, Mr, ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
+  sunbooleantype left, right, interior;
 
   /* check that vector/matrix dimensions match up */
   if ((Msuper->nrow != NEQ) || (Msuper->ncol != NEQ)) {
@@ -1068,14 +1068,14 @@ static int LaplaceMatrix(SUNMatrix L, UserData udata)
   sunindextype N = udata->N;
   sunindextype *rowptrs = Lstore->rowptr;
   sunindextype *colinds = Lstore->colind;
-  realtype *Ldata = (realtype *) Lstore->nzval;
-  realtype *Xdata = udata->x;
-  realtype du = udata->du, dv = udata->dv, dw = udata->dw;
+  sunrealtype *Ldata = (sunrealtype *) Lstore->nzval;
+  sunrealtype *Xdata = udata->x;
+  sunrealtype du = udata->du, dv = udata->dv, dw = udata->dw;
 
   /* set local variables */
   sunindextype i, j, nz=0;
-  realtype xl, xc, xr;
-  realtype Lu[9], Lv[9], Lw[9];
+  sunrealtype xl, xc, xr;
+  sunrealtype Lu[9], Lv[9], Lw[9];
 
   /* initialize all local variables to zero (to avoid uninitialized variable warnings) */
   xl = xc = xr = ZERO;
@@ -1311,20 +1311,20 @@ static int ReactionJac(N_Vector y, SUNMatrix Jac, UserData udata)
   sunindextype N = udata->N;
   sunindextype *rowptrs = Jstore->rowptr;
   sunindextype *colinds = Jstore->colind;
-  realtype *Jdata = (realtype *) Jstore->nzval;
-  realtype *Xdata = udata->x;
+  sunrealtype *Jdata = (sunrealtype *) Jstore->nzval;
+  sunrealtype *Xdata = udata->x;
 
   /* set local variables */
   sunindextype i, j, nz=0;
-  realtype ep = udata->ep;
-  realtype ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr;
-  realtype u1, u2, u3, v1, v2, v3, w1, w2, w3;
-  realtype df1, df2, df3, dQdf1, dQdf2, dQdf3;
-  realtype ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
-  realtype Ju[9], Jv[9], Jw[9];
+  sunrealtype ep = udata->ep;
+  sunrealtype ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr;
+  sunrealtype u1, u2, u3, v1, v2, v3, w1, w2, w3;
+  sunrealtype df1, df2, df3, dQdf1, dQdf2, dQdf3;
+  sunrealtype ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
+  sunrealtype Ju[9], Jv[9], Jw[9];
 
   /* access data arrays */
-  realtype *Ydata = N_VGetArrayPointer(y);
+  sunrealtype *Ydata = N_VGetArrayPointer(y);
   if (check_retval((void *) Ydata, "N_VGetArrayPointer", 0)) return(1);
 
   /* initialize all local variables to zero (to avoid uninitialized variable warnings) */
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
index 4bb96c8ab4..e36f3c06e5 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp
@@ -64,11 +64,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -85,18 +85,18 @@ struct UserData
   SUNContext ctx;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -106,8 +106,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -149,10 +149,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -161,10 +161,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -173,8 +173,8 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
 
@@ -184,7 +184,7 @@ struct UserData
   bool     matvec;    // use hypre matrix-vector product
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // hypre objects
   HYPRE_StructGrid    grid;
@@ -235,7 +235,7 @@ struct UserData
   double accesstime;
 
   // XBraid settings
-  realtype x_tol;           // Xbraid stopping tolerance
+  sunrealtype x_tol;           // Xbraid stopping tolerance
   int      x_nt;            // number of fine grid time points
   int      x_skip;          // skip all work on first down cycle
   int      x_max_levels;    // max number of levels
@@ -263,7 +263,7 @@ struct UserData
 // Functions provided to XBraid
 // -----------------------------------------------------------------------------
 
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr);
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr);
 int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 
 // -----------------------------------------------------------------------------
@@ -271,18 +271,18 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -302,7 +302,7 @@ static int SetupHypre(UserData *udata);
 
 // Fill Jacobian and A = I - gamma * J
 static int Jac(UserData *udata);
-static int ScaleAddI(UserData *udata, realtype gamma);
+static int ScaleAddI(UserData *udata, sunrealtype gamma);
 
 // -----------------------------------------------------------------------------
 // UserData and input functions
@@ -322,10 +322,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -501,7 +501,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (XBraid temporal refinement must be disabled)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -579,7 +579,7 @@ int main(int argc, char* argv[])
   {
     // Since we are using the Euclidean 2-norm in space, scale the tolerance so
     // it approximates to L2-norm.
-    realtype tolfactor;
+    sunrealtype tolfactor;
     if (udata->x_tnorm == 3)
     {
       // Infinity norm in time
@@ -842,23 +842,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -926,7 +926,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 
 
 // Create and initialize vectors
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr)
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr)
 {
   int      flag;
   void     *user_data;
@@ -963,7 +963,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
   int       iter;    // current iteration number
   int       level;   // current level
   int       done;    // has XBraid finished
-  realtype  t;       // current time
+  sunrealtype  t;       // current time
   void     *user_data;
   UserData *udata;
 
@@ -1039,7 +1039,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->uout.open(fname.str());
         udata->uout << scientific;
-        udata->uout << setprecision(numeric_limits<realtype>::digits10);
+        udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         fname.str("");
         fname.clear();
@@ -1049,14 +1049,14 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->eout.open(fname.str());
         udata->eout << scientific;
-        udata->eout << setprecision(numeric_limits<realtype>::digits10);
+        udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         // Compute the error
         flag = SolutionError(t, y, udata->e, udata);
         if (check_flag(&flag, "SolutionError", 1)) return 1;
 
         // Output solution to disk
-        realtype *yarray = N_VGetArrayPointer(y);
+        sunrealtype *yarray = N_VGetArrayPointer(y);
         if (check_flag((void *) yarray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->uout << t << " ";
@@ -1067,7 +1067,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
         udata->uout << endl;
 
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -1090,12 +1090,12 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
       flag = SolutionError(t, y, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       if (udata->myid_c == 0)
       {
         cout << scientific;
-        cout << setprecision(numeric_limits<realtype>::digits10);
+        cout << setprecision(numeric_limits<sunrealtype>::digits10);
         cout << "  Max error = " << maxerr << endl << endl;
       }
     }
@@ -1115,7 +1115,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -1145,15 +1145,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -1162,15 +1162,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -1210,10 +1210,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -1314,7 +1314,7 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp)
 {
   int flag;
@@ -1366,8 +1366,8 @@ static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   int flag;
 
@@ -1455,8 +1455,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   int flag;
@@ -1734,9 +1734,9 @@ static int Jac(UserData *udata)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -2002,7 +2002,7 @@ static int Jac(UserData *udata)
 }
 
 // Fill A = I - gamma * J matrix
-static int ScaleAddI(UserData *udata, realtype gamma)
+static int ScaleAddI(UserData *udata, sunrealtype gamma)
 {
   int flag;
 
@@ -2131,7 +2131,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -2361,8 +2361,8 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
 
@@ -2734,11 +2734,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -2753,7 +2753,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -2774,7 +2774,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -2963,8 +2963,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
     cout << endl;
 
     // Compute average nls iters per step attempt and ls iters per nls iter
-    realtype avgnli = (realtype) nni / (realtype) nst_a;
-    realtype avgli  = (realtype) nli / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+    sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
     cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
     cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
     cout << endl;
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
index e08c612f29..66dca0e734 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid.cpp
@@ -62,11 +62,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -83,18 +83,18 @@ struct UserData
   SUNContext ctx;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -104,8 +104,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -147,10 +147,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -159,10 +159,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -171,8 +171,8 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
 
@@ -181,7 +181,7 @@ struct UserData
   bool     prec;      // preconditioner on/off
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Inverse of Jacobian diagonal for preconditioner
   N_Vector d;
@@ -203,7 +203,7 @@ struct UserData
   double accesstime;
 
   // XBraid settings
-  realtype x_tol;           // Xbraid stopping tolerance
+  sunrealtype x_tol;           // Xbraid stopping tolerance
   int      x_nt;            // number of fine grid time points
   int      x_skip;          // skip all work on first down cycle
   int      x_max_levels;    // max number of levels
@@ -231,7 +231,7 @@ struct UserData
 // Functions provided to XBraid
 // -----------------------------------------------------------------------------
 
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr);
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr);
 int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 
 // -----------------------------------------------------------------------------
@@ -239,14 +239,14 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -279,10 +279,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -448,7 +448,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (XBraid temporal refinement must be disabled)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -526,7 +526,7 @@ int main(int argc, char* argv[])
   {
     // Since we are using the Euclidean 2-norm in space, scale the tolerance so
     // it approximates to L2-norm.
-    realtype tolfactor;
+    sunrealtype tolfactor;
     if (udata->x_tnorm == 3)
     {
       // Infinity norm in time
@@ -789,23 +789,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -873,7 +873,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 
 
 // Create and initialize vectors
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr)
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr)
 {
   int      flag;
   void     *user_data;
@@ -910,7 +910,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
   int       iter;    // current iteration number
   int       level;   // current level
   int       done;    // has XBraid finished
-  realtype  t;       // current time
+  sunrealtype  t;       // current time
   void     *user_data;
   UserData *udata;
 
@@ -986,7 +986,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->uout.open(fname.str());
         udata->uout << scientific;
-        udata->uout << setprecision(numeric_limits<realtype>::digits10);
+        udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         fname.str("");
         fname.clear();
@@ -996,14 +996,14 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->eout.open(fname.str());
         udata->eout << scientific;
-        udata->eout << setprecision(numeric_limits<realtype>::digits10);
+        udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         // Compute the error
         flag = SolutionError(t, y, udata->e, udata);
         if (check_flag(&flag, "SolutionError", 1)) return 1;
 
         // Output solution to disk
-        realtype *yarray = N_VGetArrayPointer(y);
+        sunrealtype *yarray = N_VGetArrayPointer(y);
         if (check_flag((void *) yarray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->uout << t << " ";
@@ -1014,7 +1014,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
         udata->uout << endl;
 
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -1037,12 +1037,12 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
       flag = SolutionError(t, y, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       if (udata->myid_c == 0)
       {
         cout << scientific;
-        cout << setprecision(numeric_limits<realtype>::digits10);
+        cout << setprecision(numeric_limits<sunrealtype>::digits10);
         cout << "  Max error = " << maxerr << endl << endl;
       }
     }
@@ -1062,7 +1062,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -1092,15 +1092,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -1109,15 +1109,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -1157,10 +1157,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -1261,8 +1261,8 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Start timer
   double t1 = MPI_Wtime();
@@ -1271,17 +1271,17 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   UserData *udata = (UserData *) user_data;
 
   // Access data array
-  realtype *diag = N_VGetArrayPointer(udata->d);
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->d);
 
   // Stop timer
@@ -1295,8 +1295,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Start timer
@@ -1396,7 +1396,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1626,8 +1626,8 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
 
@@ -1952,11 +1952,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1971,7 +1971,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1992,7 +1992,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -2175,8 +2175,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
     cout << endl;
 
     // Compute average nls iters per step attempt and ls iters per nls iter
-    realtype avgnli = (realtype) nni / (realtype) nst_a;
-    realtype avgli  = (realtype) nli / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+    sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
     cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
     cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
     cout << endl;
diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
index b773c5c93a..c94fb5b278 100644
--- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
+++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid.cpp
@@ -63,11 +63,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -84,18 +84,18 @@ struct UserData
   SUNContext ctx;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Number of nodes in the x and y directions
   sunindextype nx;
@@ -105,8 +105,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // MPI variables
   MPI_Comm comm_w; // world communicator
@@ -116,8 +116,8 @@ struct UserData
   int myid_w; // process ID in space and time
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      order;       // ARKode method order
   bool     linear;      // enable/disable linearly implicit option
 
@@ -126,7 +126,7 @@ struct UserData
   bool     prec;      // preconditioner on/off
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Inverse of Jacobian diagonal for preconditioner
   N_Vector d;
@@ -147,7 +147,7 @@ struct UserData
   double accesstime;
 
   // XBraid settings
-  realtype x_tol;           // Xbraid stopping tolerance
+  sunrealtype x_tol;           // Xbraid stopping tolerance
   int      x_nt;            // number of fine grid time points
   int      x_skip;          // skip all work on first down cycle
   int      x_max_levels;    // max number of levels
@@ -175,7 +175,7 @@ struct UserData
 // Functions provided to XBraid
 // -----------------------------------------------------------------------------
 
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr);
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr);
 int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 
 // -----------------------------------------------------------------------------
@@ -183,14 +183,14 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -211,10 +211,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -386,7 +386,7 @@ int main(int argc, char* argv[])
   else
   {
     // Use implicit Euler (XBraid temporal refinement must be disabled)
-    realtype c[1], A[1], b[1];
+    sunrealtype c[1], A[1], b[1];
     ARKodeButcherTable B = NULL;
 
     // Create implicit Euler Butcher table
@@ -464,7 +464,7 @@ int main(int argc, char* argv[])
   {
     // Since we are using the Euclidean 2-norm in space, scale the tolerance so
     // it approximates to L2-norm.
-    realtype tolfactor;
+    sunrealtype tolfactor;
     if (udata->x_tnorm == 3)
     {
       // Infinity norm in time
@@ -607,7 +607,7 @@ int main(int argc, char* argv[])
 
 
 // Create and initialize vectors
-int MyInit(braid_App app, realtype t, braid_Vector *u_ptr)
+int MyInit(braid_App app, sunrealtype t, braid_Vector *u_ptr)
 {
   int      flag;
   void     *user_data;
@@ -643,7 +643,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
   int       iter;    // current iteration number
   int       level;   // current level
   int       done;    // has XBraid finished
-  realtype  t;       // current time
+  sunrealtype  t;       // current time
   void     *user_data;
   UserData *udata;
 
@@ -706,7 +706,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->uout.open(fname.str());
         udata->uout << scientific;
-        udata->uout << setprecision(numeric_limits<realtype>::digits10);
+        udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         fname.str("");
         fname.clear();
@@ -715,14 +715,14 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 
         udata->eout.open(fname.str());
         udata->eout << scientific;
-        udata->eout << setprecision(numeric_limits<realtype>::digits10);
+        udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
 
         // Compute the error
         flag = SolutionError(t, y, udata->e, udata);
         if (check_flag(&flag, "SolutionError", 1)) return 1;
 
         // Output solution to disk
-        realtype *yarray = N_VGetArrayPointer(y);
+        sunrealtype *yarray = N_VGetArrayPointer(y);
         if (check_flag((void *) yarray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->uout << t << " ";
@@ -733,7 +733,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
         udata->uout << endl;
 
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -756,10 +756,10 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
       flag = SolutionError(t, y, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl << endl;
     }
   }
@@ -778,7 +778,7 @@ int MyAccess(braid_App app, braid_Vector u, braid_AccessStatus astatus)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -795,15 +795,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype ny = udata->ny;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -812,15 +812,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over domain interior and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (sunindextype j = 1; j < ny - 1; j++)
     {
@@ -866,8 +866,8 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Timing variables
   chrono::time_point<chrono::steady_clock> t1;
@@ -880,17 +880,17 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   UserData *udata = (UserData *) user_data;
 
   // Access data array
-  realtype *diag = N_VGetArrayPointer(udata->d);
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->d);
 
   // Stop timer
@@ -904,8 +904,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Timing variables
@@ -970,8 +970,8 @@ static int InitUserData(UserData *udata, SUNContext ctx)
   udata->nprocs_w = 1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-5);   // relative tolerance
-  udata->atol        = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol        = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol        = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->order       = 3;               // method order
   udata->linear      = true;            // linearly implicit problem
 
@@ -1267,11 +1267,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1279,7 +1279,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = 1; j < udata->ny - 1; j++)
@@ -1300,7 +1300,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -1477,8 +1477,8 @@ static int OutputStats(void *arkode_mem, UserData* udata)
     cout << endl;
 
     // Compute average nls iters per step attempt and ls iters per nls iter
-    realtype avgnli = (realtype) nni / (realtype) nst_a;
-    realtype avgli  = (realtype) nli / (realtype) nni;
+    sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst_a;
+    sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
     cout << "  Avg NLS iters per step attempt = " << avgnli << endl;
     cout << "  Avg LS iters per NLS iter      = " << avgli  << endl;
     cout << endl;
diff --git a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.c b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.c
index bc3c434f77..94c6ae8220 100644
--- a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.c
+++ b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.c
@@ -58,7 +58,7 @@
 #include <nvector/nvector_manyvector.h>/* manyvector N_Vector types, fcts. etc */
 #include <nvector/nvector_serial.h>    /* serial N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -70,27 +70,27 @@
 #define FSYM "f"
 #endif
 
-/* realtype constant macros */
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+/* sunrealtype constant macros */
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals     */
-  realtype dx;     /* mesh spacing            */
-  realtype a;      /* constant forcing on u   */
-  realtype b;      /* steady-state value of w */
-  realtype du;     /* diffusion coeff for u   */
-  realtype dv;     /* diffusion coeff for v   */
-  realtype dw;     /* diffusion coeff for w   */
-  realtype ep;     /* stiffness parameter     */
+  sunrealtype dx;     /* mesh spacing            */
+  sunrealtype a;      /* constant forcing on u   */
+  sunrealtype b;      /* steady-state value of w */
+  sunrealtype du;     /* diffusion coeff for u   */
+  sunrealtype dv;     /* diffusion coeff for v   */
+  sunrealtype dw;     /* diffusion coeff for w   */
+  sunrealtype ep;     /* stiffness parameter     */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int JacVI(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int JacVI(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                  N_Vector fy, void *user_data, N_Vector tmp1);
 
 /* Private function to check function return values */
@@ -100,21 +100,21 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = ZERO;                /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
+  sunrealtype T0 = ZERO;                /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
   int Nt = 100;                      /* total number of output times */
   int Nvar = 3;                      /* number of solution fields */
   UserData userdata = NULL;
-  realtype *udata, *vdata, *wdata;
+  sunrealtype *udata, *vdata, *wdata;
   sunindextype N = 201;              /* spatial mesh size */
-  realtype a = RCONST(0.6);          /* problem parameters */
-  realtype b = RCONST(2.0);
-  realtype du = RCONST(0.001);
-  realtype dv = RCONST(0.001);
-  realtype dw = RCONST(0.001);
-  realtype ep = RCONST(1.0e-5);      /* stiffness parameter */
-  realtype reltol = RCONST(1.0e-6);  /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
+  sunrealtype a = SUN_RCONST(0.6);          /* problem parameters */
+  sunrealtype b = SUN_RCONST(2.0);
+  sunrealtype du = SUN_RCONST(0.001);
+  sunrealtype dv = SUN_RCONST(0.001);
+  sunrealtype dw = SUN_RCONST(0.001);
+  sunrealtype ep = SUN_RCONST(1.0e-5);      /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
   sunindextype i;
 
   /* general problem variables */
@@ -126,7 +126,7 @@ int main()
   N_Vector uvw[3];              /* vector array composed of u,v,w component vectors */
   SUNLinearSolver LS = NULL;    /* empty linear solver object */
   void *arkode_mem = NULL;      /* empty ARKode memory structure */
-  realtype pi, t, dTout, tout, unorm, vnorm, wnorm;
+  sunrealtype pi, t, dTout, tout, unorm, vnorm, wnorm;
   FILE *FID, *UFID, *VFID, *WFID;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nli, nlcf, nJv, nfeLS, nni, ncfn, netf;
@@ -180,11 +180,11 @@ int main()
   if (check_flag((void *)wdata, "N_VGetArrayPointer", 0)) return 1;
 
   /* Set initial conditions into y */
-  pi = RCONST(4.0)*atan(ONE);
+  pi = SUN_RCONST(4.0)*atan(ONE);
   for (i=0; i<N; i++) {
-    udata[i] =  a  + RCONST(0.1)*sin(pi*i*userdata->dx);  /* u */
-    vdata[i] = b/a + RCONST(0.1)*sin(pi*i*userdata->dx);  /* v */
-    wdata[i] =  b  + RCONST(0.1)*sin(pi*i*userdata->dx);  /* w */
+    udata[i] =  a  + SUN_RCONST(0.1)*sin(pi*i*userdata->dx);  /* u */
+    vdata[i] = b/a + SUN_RCONST(0.1)*sin(pi*i*userdata->dx);  /* v */
+    wdata[i] =  b  + SUN_RCONST(0.1)*sin(pi*i*userdata->dx);  /* w */
   }
 
   /* Call ARKStepCreate to initialize the ARK timestepper module and
@@ -326,17 +326,17 @@ int main()
  *-------------------------------*/
 
 /* fe routine to compute the diffusion portion of the ODE RHS. */
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData userdata = (UserData) user_data;      /* access problem data */
   sunindextype N = userdata->N;                  /* set variable shortcuts */
-  realtype du = userdata->du;
-  realtype dv = userdata->dv;
-  realtype dw = userdata->dw;
-  realtype dx = userdata->dx;
-  realtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
-  realtype *f_u=NULL, *f_v=NULL, *f_w=NULL;
-  realtype uconst, vconst, wconst;
+  sunrealtype du = userdata->du;
+  sunrealtype dv = userdata->dv;
+  sunrealtype dw = userdata->dw;
+  sunrealtype dx = userdata->dx;
+  sunrealtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
+  sunrealtype *f_u=NULL, *f_v=NULL, *f_w=NULL;
+  sunrealtype uconst, vconst, wconst;
   sunindextype i;
 
   y_u = N_VGetArrayPointer(N_VGetSubvector_ManyVector(y, 0));
@@ -353,7 +353,7 @@ static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   f_w = N_VGetArrayPointer(N_VGetSubvector_ManyVector(ydot, 2));
   if (check_flag((void *) f_w, "N_VGetArrayPointer", 0)) return 1;
 
-  N_VConst(RCONST(0.0), ydot);              /* initialize ydot to zero */
+  N_VConst(SUN_RCONST(0.0), ydot);              /* initialize ydot to zero */
 
   /* iterate over domain, computing all equations */
   uconst = du/dx/dx;
@@ -379,15 +379,15 @@ static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fi routine to compute the reaction portion of the ODE RHS. */
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData userdata = (UserData) user_data;      /* access problem data */
   sunindextype N = userdata->N;                  /* set variable shortcuts */
-  realtype a  = userdata->a;
-  realtype b  = userdata->b;
-  realtype ep = userdata->ep;
-  realtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
-  realtype *f_u=NULL, *f_v=NULL, *f_w=NULL;
+  sunrealtype a  = userdata->a;
+  sunrealtype b  = userdata->b;
+  sunrealtype ep = userdata->ep;
+  sunrealtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
+  sunrealtype *f_u=NULL, *f_v=NULL, *f_w=NULL;
   sunindextype i;
 
   y_u = N_VGetArrayPointer(N_VGetSubvector_ManyVector(y, 0));
@@ -427,15 +427,15 @@ static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian-vector product routine (implicit portion only) */
-static int JacVI(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int JacVI(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                  N_Vector fy, void *user_data, N_Vector tmp1)
 {
   UserData userdata = (UserData) user_data;      /* access problem data */
   sunindextype N = userdata->N;                  /* set variable shortcuts */
-  realtype ep = userdata->ep;
-  realtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
-  realtype *v_u=NULL, *v_v=NULL, *v_w=NULL;
-  realtype *Ju_v=NULL, *Jv_v=NULL, *Jw_v=NULL;
+  sunrealtype ep = userdata->ep;
+  sunrealtype *y_u=NULL, *y_v=NULL, *y_w=NULL;
+  sunrealtype *v_u=NULL, *v_v=NULL, *v_w=NULL;
+  sunrealtype *Ju_v=NULL, *Jv_v=NULL, *Jw_v=NULL;
   sunindextype i;
 
   y_u = N_VGetArrayPointer(N_VGetSubvector_ManyVector(y, 0));
diff --git a/examples/arkode/C_openmp/ark_brusselator1D_omp.c b/examples/arkode/C_openmp/ark_brusselator1D_omp.c
index 2ab76f583d..78a2c8bbb0 100644
--- a/examples/arkode/C_openmp/ark_brusselator1D_omp.c
+++ b/examples/arkode/C_openmp/ark_brusselator1D_omp.c
@@ -52,7 +52,7 @@
 #include <nvector/nvector_openmp.h>   /* access to OpenMP N_Vector */
 #include <sunmatrix/sunmatrix_band.h> /* access to band SUNMatrix */
 #include <sunlinsol/sunlinsol_band.h> /* access to band SUNLinearSolver */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype' */
 
 #ifdef _OPENMP
 #include <omp.h>                      /* OpenMP functions */
@@ -75,25 +75,25 @@
 typedef struct {
   sunindextype N;  /* number of intervals      */
   int nthreads;    /* number of OpenMP threads */
-  realtype dx;     /* mesh spacing             */
-  realtype a;      /* constant forcing on u    */
-  realtype b;      /* steady-state value of w  */
-  realtype du;     /* diffusion coeff for u    */
-  realtype dv;     /* diffusion coeff for v    */
-  realtype dw;     /* diffusion coeff for w    */
-  realtype ep;     /* stiffness parameter      */
+  sunrealtype dx;     /* mesh spacing             */
+  sunrealtype a;      /* constant forcing on u    */
+  sunrealtype b;      /* steady-state value of w  */
+  sunrealtype du;     /* diffusion coeff for u    */
+  sunrealtype dv;     /* diffusion coeff for v    */
+  sunrealtype dw;     /* diffusion coeff for w    */
+  sunrealtype ep;     /* stiffness parameter      */
 } *UserData;
 
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private helper functions  */
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata);
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata);
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata);
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -102,21 +102,21 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);    /* initial time */
-  realtype Tf = RCONST(10.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);    /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);   /* final time */
   int Nt = 100;                 /* total number of output times */
   int Nvar = 3;                 /* number of solution fields */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;         /* spatial mesh size */
-  realtype a = 0.6;             /* problem parameters */
-  realtype b = 2.0;
-  realtype du = 0.025;
-  realtype dv = 0.025;
-  realtype dw = 0.025;
-  realtype ep = 1.0e-5;         /* stiffness parameter */
-  realtype reltol = 1.0e-6;     /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype a = 0.6;             /* problem parameters */
+  sunrealtype b = 2.0;
+  sunrealtype du = 0.025;
+  sunrealtype dv = 0.025;
+  sunrealtype dw = 0.025;
+  sunrealtype ep = 1.0e-5;         /* stiffness parameter */
+  sunrealtype reltol = 1.0e-6;     /* tolerances */
+  sunrealtype abstol = 1.0e-10;
   sunindextype NEQ, i;
 
   /* general problem variables */
@@ -128,7 +128,7 @@ int main(int argc, char *argv[])
   SUNMatrix A = NULL;           /* empty matrix for linear solver */
   SUNLinearSolver LS = NULL;    /* empty linear solver structure */
   void *arkode_mem = NULL;      /* empty ARKode memory structure */
-  realtype pi, t, dTout, tout, u, v, w;
+  sunrealtype pi, t, dTout, tout, u, v, w;
   FILE *FID, *UFID, *VFID, *WFID;
   int iout, num_threads;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, ncfn, netf;
@@ -190,32 +190,32 @@ int main(int argc, char *argv[])
   if (check_flag((void *)wmask, "N_VClone", 0)) return 1;
 
   /* Set initial conditions into y */
-  udata->dx = RCONST(1.0)/(N-1);     /* set spatial mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(N-1);     /* set spatial mesh spacing */
   data = N_VGetArrayPointer(y);      /* Access data array for new NVector y */
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
 
-  pi = RCONST(4.0)*atan(RCONST(1.0));
+  pi = SUN_RCONST(4.0)*atan(SUN_RCONST(1.0));
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
   }
 
   /* Set mask array values for each solution component */
   N_VConst(0.0, umask);
   data = N_VGetArrayPointer(umask);
   if (check_flag((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,0)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,0)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, vmask);
   data = N_VGetArrayPointer(vmask);
   if (check_flag((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,1)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,1)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, wmask);
   data = N_VGetArrayPointer(wmask);
   if (check_flag((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,2)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,2)] = SUN_RCONST(1.0);
 
   /* Initialize matrix and linear solver data structures */
   A = SUNBandMatrix(NEQ, 4, 4, ctx);
@@ -350,19 +350,19 @@ int main(int argc, char *argv[])
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i = 0;
 
   /* clear out ydot (to be careful) */
@@ -387,13 +387,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
     w = Ydata[IDX(i,2)];  wl = Ydata[IDX(i-1,2)];  wr = Ydata[IDX(i+1,2)];
 
     /* u_t = du*u_xx + a - (w+1)*u + v*u^2 */
-    dYdata[IDX(i,0)] = (ul - RCONST(2.0)*u + ur)*uconst + a - (w+RCONST(1.0))*u + v*u*u;
+    dYdata[IDX(i,0)] = (ul - SUN_RCONST(2.0)*u + ur)*uconst + a - (w+SUN_RCONST(1.0))*u + v*u*u;
 
     /* v_t = dv*v_xx + w*u - v*u^2 */
-    dYdata[IDX(i,1)] = (vl - RCONST(2.0)*v + vr)*vconst + w*u - v*u*u;
+    dYdata[IDX(i,1)] = (vl - SUN_RCONST(2.0)*v + vr)*vconst + w*u - v*u*u;
 
     /* w_t = dw*w_xx + (b-w)/ep - w*u */
-    dYdata[IDX(i,2)] = (wl - RCONST(2.0)*w + wr)*wconst + (b-w)/ep - w*u;
+    dYdata[IDX(i,2)] = (wl - SUN_RCONST(2.0)*w + wr)*wconst + (b-w)/ep - w*u;
 
   }
 
@@ -406,7 +406,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
@@ -414,13 +414,13 @@ static int Jac(realtype t, N_Vector y, N_Vector fy,
   SUNMatZero(J);                          /* Initialize Jacobian to zero */
 
   /* Fill in the Laplace matrix */
-  if (LaplaceMatrix(RCONST(1.0), J, udata)) {
+  if (LaplaceMatrix(SUN_RCONST(1.0), J, udata)) {
     printf("Jacobian calculation error in calling LaplaceMatrix!\n");
     return 1;
   }
 
   /* Add in the Jacobian of the reaction terms matrix */
-  if (ReactionJac(RCONST(1.0), y, J, udata)) {
+  if (ReactionJac(SUN_RCONST(1.0), y, J, udata)) {
     printf("Jacobian calculation error in calling ReactionJac!\n");
     return 1;
   }
@@ -434,14 +434,14 @@ static int Jac(realtype t, N_Vector y, N_Vector fy,
 
 /* Routine to compute the stiffness matrix from (L*y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;            /* set shortcuts */
-  realtype dx = udata->dx;
+  sunrealtype dx = udata->dx;
   sunindextype i  = 0;
-  realtype uconst = c*udata->du/dx/dx;
-  realtype vconst = c*udata->dv/dx/dx;
-  realtype wconst = c*udata->dw/dx/dx;
+  sunrealtype uconst = c*udata->du/dx/dx;
+  sunrealtype vconst = c*udata->dv/dx/dx;
+  sunrealtype wconst = c*udata->dw/dx/dx;
 
   /* iterate over intervals, filling in Jacobian entries */
 #pragma omp parallel for default(shared) private(i) schedule(static) num_threads(udata->nthreads)
@@ -451,9 +451,9 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i-1,0)) += uconst;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i-1,1)) += vconst;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i-1,2)) += wconst;
-    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) -= RCONST(2.0)*uconst;
-    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) -= RCONST(2.0)*vconst;
-    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) -= RCONST(2.0)*wconst;
+    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) -= SUN_RCONST(2.0)*uconst;
+    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) -= SUN_RCONST(2.0)*vconst;
+    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) -= SUN_RCONST(2.0)*wconst;
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i+1,0)) += uconst;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i+1,1)) += vconst;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i+1,2)) += wconst;
@@ -466,13 +466,13 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
 
 /* Routine to compute the Jacobian matrix from R(y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;                   /* set shortcuts */
-  realtype ep = udata->ep;
+  sunrealtype ep = udata->ep;
   sunindextype i = 0;
-  realtype u, v, w;
-  realtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
+  sunrealtype u, v, w;
+  sunrealtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
   if (check_flag((void *)Ydata, "N_VGetArrayPointer", 0)) return 1;
 
   /* iterate over nodes, filling in Jacobian entries */
@@ -485,8 +485,8 @@ static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
     w = Ydata[IDX(i,2)];
 
     /* all vars wrt u */
-    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += c*(RCONST(2.0)*u*v-(w+RCONST(1.0)));
-    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,0)) += c*(w - RCONST(2.0)*u*v);
+    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += c*(SUN_RCONST(2.0)*u*v-(w+SUN_RCONST(1.0)));
+    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,0)) += c*(w - SUN_RCONST(2.0)*u*v);
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,0)) += c*(-w);
 
     /* all vars wrt v */
@@ -496,7 +496,7 @@ static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
     /* all vars wrt w */
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,2)) += c*(-u);
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,2)) += c*(u);
-    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += c*(-RCONST(1.0)/ep - u);
+    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += c*(-SUN_RCONST(1.0)/ep - u);
 
   }
 
diff --git a/examples/arkode/C_openmp/ark_heat1D_omp.c b/examples/arkode/C_openmp/ark_heat1D_omp.c
index 225471029c..586f0c2037 100644
--- a/examples/arkode/C_openmp/ark_heat1D_omp.c
+++ b/examples/arkode/C_openmp/ark_heat1D_omp.c
@@ -45,7 +45,7 @@
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_openmp.h>   /* OpenMP N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_pcg.h>  /* access to PCG SUNLinearSolver        */
-#include <sundials/sundials_types.h>  /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>  /* defs. of sunrealtype, sunindextype, etc */
 
 #ifdef _OPENMP
 #include <omp.h>                      /* OpenMP function defs.                */
@@ -65,13 +65,13 @@
 typedef struct {
   sunindextype N;  /* number of intervals      */
   int nthreads;    /* number of OpenMP threads */
-  realtype dx;     /* mesh spacing             */
-  realtype k;      /* diffusion coefficient    */
+  sunrealtype dx;     /* mesh spacing             */
+  sunrealtype k;      /* diffusion coefficient    */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp);
 
 /* Private function to check function return values */
@@ -81,15 +81,15 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main(int argc, char *argv[]) {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);   /* initial time */
-  realtype Tf = RCONST(1.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);   /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);   /* final time */
   int Nt = 10;                 /* total number of output times */
-  realtype rtol = 1.e-6;       /* relative tolerance */
-  realtype atol = 1.e-10;      /* absolute tolerance */
+  sunrealtype rtol = 1.e-6;       /* relative tolerance */
+  sunrealtype atol = 1.e-10;      /* absolute tolerance */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;        /* spatial mesh size */
-  realtype k = 0.5;            /* heat conductivity */
+  sunrealtype k = 0.5;            /* heat conductivity */
   sunindextype i;
 
   /* general problem variables */
@@ -98,7 +98,7 @@ int main(int argc, char *argv[]) {
   SUNLinearSolver LS = NULL;   /* empty linear solver object */
   void *arkode_mem = NULL;     /* empty ARKStep memory structure */
   FILE *FID, *UFID;
-  realtype t, dTout, tout;
+  sunrealtype t, dTout, tout;
   int iout, num_threads;
   long int nst, nst_a, nfe, nfi, nsetups, nli, nJv, nlcf, nni, ncfn, netf;
 
@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) {
   udata = (UserData) malloc(sizeof(*udata));
   udata->N = N;
   udata->k = k;
-  udata->dx = RCONST(1.0)/(N-1);     /* mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(N-1);     /* mesh spacing */
   udata->nthreads = num_threads;
 
   /* Initial problem output */
@@ -247,14 +247,14 @@ int main(int argc, char *argv[]) {
  *--------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N  = udata->N;                   /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype c1, c2;
   sunindextype i = 0;
   sunindextype isource;
 
@@ -266,7 +266,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
   /* iterate over domain, computing all equations */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
   isource = N/2;
   Ydot[0] = 0.0;                 /* left boundary condition */
 #pragma omp parallel for default(shared) private(i) schedule(static) num_threads(udata->nthreads)
@@ -279,15 +279,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
 	       N_Vector fy, void *user_data, N_Vector tmp)
 {
   UserData udata = (UserData) user_data;     /* variable shortcuts */
   sunindextype N = udata->N;
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *V=NULL, *JV=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *V=NULL, *JV=NULL;
+  sunrealtype c1, c2;
   sunindextype i = 0;
 
   V = N_VGetArrayPointer(v);       /* access data arrays */
@@ -298,7 +298,7 @@ static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
 
   /* iterate over domain, computing all Jacobian-vector products */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
   JV[0] = 0.0;
 #pragma omp parallel for default(shared) private(i) schedule(static) num_threads(udata->nthreads)
   for (i=1; i<N-1; i++)
diff --git a/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.c b/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.c
index 3bc3571627..a25d8ffbdb 100644
--- a/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.c
+++ b/examples/arkode/C_openmpdev/ark_analytic_nonlin_ompdev.c
@@ -33,7 +33,7 @@
 #include <math.h>
 #include <arkode/arkode_erkstep.h>     /* prototypes for ERKStep fcts., consts */
 #include <nvector/nvector_openmpdev.h> /* OpenMPDEV N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>   /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>   /* def. of type 'sunrealtype' */
 #include <sundials/sundials_math.h>    /* def. of SUNRsqrt, etc. */
 
 #ifdef _OPENMP
@@ -51,7 +51,7 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -60,21 +60,21 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(10.0);    /* final time */
-  realtype dTout = RCONST(1.0);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);    /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);  /* time between outputs */
   sunindextype NEQ = 1;          /* number of dependent vars. */
-  realtype reltol = 1.0e-6;      /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype reltol = 1.0e-6;      /* tolerances */
+  sunrealtype abstol = 1.0e-10;
 
   /* general problem variables */
   int flag;                      /* reusable error-checking flag */
   N_Vector y = NULL;             /* empty vector for storing solution */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nst_a, nfe, netf;
-  realtype *y_data = NULL;
+  sunrealtype *y_data = NULL;
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -159,11 +159,11 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   int dev;
-  realtype *y_data    = N_VGetDeviceArrayPointer_OpenMPDEV(y);
-  realtype *ydot_data = N_VGetDeviceArrayPointer_OpenMPDEV(ydot);
+  sunrealtype *y_data    = N_VGetDeviceArrayPointer_OpenMPDEV(y);
+  sunrealtype *ydot_data = N_VGetDeviceArrayPointer_OpenMPDEV(ydot);
 
   dev = omp_get_default_device();
 
diff --git a/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c b/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
index bdadafc89b..5ffda25392 100644
--- a/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
+++ b/examples/arkode/C_openmpdev/ark_heat1D_adapt_ompdev.c
@@ -45,7 +45,7 @@
 #include <arkode/arkode_arkstep.h>     /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_openmpdev.h> /* OpenMPDEV N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_pcg.h>   /* access to PCG SUNLinearSolver        */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype, etc */
 #include <sundials/sundials_math.h>    /* def. of SUNRsqrt, etc.               */
 
 #ifdef _OPENMP
@@ -63,53 +63,53 @@
 #endif
 
 /* constants */
-#define ZERO        RCONST(0.0)
-#define PT25        RCONST(0.25)
-#define PT4         RCONST(0.4)
-#define PT5         RCONST(0.5)
-#define PT55        RCONST(0.55)
-#define PT7         RCONST(0.7)
-#define ONE         RCONST(1.0)
-#define TWO         RCONST(2.0)
-#define TWOHUNDRED  RCONST(200.0)
-#define FOURHUNDRED RCONST(400.0)
-#define FIVEHUNDRED RCONST(500.0)
-#define SIXHUNDRED  RCONST(600.0)
+#define ZERO        SUN_RCONST(0.0)
+#define PT25        SUN_RCONST(0.25)
+#define PT4         SUN_RCONST(0.4)
+#define PT5         SUN_RCONST(0.5)
+#define PT55        SUN_RCONST(0.55)
+#define PT7         SUN_RCONST(0.7)
+#define ONE         SUN_RCONST(1.0)
+#define TWO         SUN_RCONST(2.0)
+#define TWOHUNDRED  SUN_RCONST(200.0)
+#define FOURHUNDRED SUN_RCONST(400.0)
+#define FIVEHUNDRED SUN_RCONST(500.0)
+#define SIXHUNDRED  SUN_RCONST(600.0)
 
 /* user data structure */
 typedef struct {
   sunindextype N;       /* current number of intervals */
-  realtype *x_host;     /* current mesh on host */
-  realtype *x_dev;      /* current mesh on device */
-  realtype k;           /* diffusion coefficient */
-  realtype refine_tol;  /* adaptivity tolerance */
+  sunrealtype *x_host;     /* current mesh on host */
+  sunrealtype *x_dev;      /* current mesh on device */
+  sunrealtype k;           /* diffusion coefficient */
+  sunrealtype refine_tol;  /* adaptivity tolerance */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp);
 
 /* Private function to check function return values */
-realtype * adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata);
-static int project(sunindextype Nold, realtype *xold, N_Vector yold,
-                   sunindextype Nnew, realtype *xnew, N_Vector ynew);
+sunrealtype * adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata);
+static int project(sunindextype Nold, sunrealtype *xold, N_Vector yold,
+                   sunindextype Nnew, sunrealtype *xnew, N_Vector ynew);
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Main Program */
 int main() {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(1.0);         /* final time */
-  realtype rtol = RCONST(1.e-3);     /* relative tolerance */
-  realtype atol = RCONST(1.e-10);    /* absolute tolerance */
-  realtype hscale = RCONST(1.0);     /* time step change factor on resizes */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);         /* final time */
+  sunrealtype rtol = SUN_RCONST(1.e-3);     /* relative tolerance */
+  sunrealtype atol = SUN_RCONST(1.e-10);    /* absolute tolerance */
+  sunrealtype hscale = SUN_RCONST(1.0);     /* time step change factor on resizes */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 21;               /* initial spatial mesh size */
-  realtype refine = RCONST(3.0e-3);  /* adaptivity refinement tolerance */
-  realtype k = RCONST(0.5);          /* heat conductivity */
+  sunrealtype refine = SUN_RCONST(3.0e-3);  /* adaptivity refinement tolerance */
+  sunrealtype k = SUN_RCONST(0.5);          /* heat conductivity */
   sunindextype i;
   long int nni, nni_tot=0, nli, nli_tot=0;
   int iout=0;
@@ -123,9 +123,9 @@ int main() {
   void *arkode_mem = NULL;     /* empty ARKode memory structure */
   SUNAdaptController C = NULL; /* empty controller object */
   FILE *XFID, *UFID;
-  realtype t, olddt, newdt;
-  realtype *xnew_host = NULL;
-  realtype *xnew_dev = NULL;
+  sunrealtype t, olddt, newdt;
+  sunrealtype *xnew_host = NULL;
+  sunrealtype *xnew_dev = NULL;
   sunindextype Nnew;
   int dev, host;
 
@@ -143,10 +143,10 @@ int main() {
   udata->N = N;
   udata->k = k;
   udata->refine_tol = refine;
-  udata->x_host = malloc(N * sizeof(realtype));
+  udata->x_host = malloc(N * sizeof(sunrealtype));
   for (i=0; i<N; i++)  udata->x_host[i] = ONE*i/(N-1);
-  udata->x_dev = omp_target_alloc(N * sizeof(realtype), dev);
-  omp_target_memcpy(udata->x_dev, udata->x_host, N * sizeof(realtype), 0, 0, dev, host);
+  udata->x_dev = omp_target_alloc(N * sizeof(sunrealtype), dev);
+  omp_target_memcpy(udata->x_dev, udata->x_host, N * sizeof(sunrealtype), 0, 0, dev, host);
 
   /* Initial problem output */
   printf("\n1D adaptive Heat PDE test problem:\n");
@@ -267,8 +267,8 @@ int main() {
     if (check_flag((void *) y2, "N_VNew_OpenMPDEV", 0)) return 1;
 
     /* copy new mesh from host array to device array */
-    xnew_dev = omp_target_alloc(Nnew * sizeof(realtype), dev);
-    omp_target_memcpy(xnew_dev, xnew_host, Nnew*sizeof(realtype), 0, 0, dev, host);
+    xnew_dev = omp_target_alloc(Nnew * sizeof(sunrealtype), dev);
+    omp_target_memcpy(xnew_dev, xnew_host, Nnew*sizeof(sunrealtype), 0, 0, dev, host);
 
     /* project solution onto new mesh */
     flag = project(udata->N, udata->x_dev, y, Nnew, xnew_dev, y2);
@@ -333,14 +333,14 @@ int main() {
  *--------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N = udata->N;                /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype *x = udata->x_dev;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype dxL, dxR;
+  sunrealtype k  = udata->k;
+  sunrealtype *x = udata->x_dev;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype dxL, dxR;
   sunindextype i;
   int dev;
 
@@ -374,15 +374,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp)
 {
   UserData udata = (UserData) user_data;     /* variable shortcuts */
   sunindextype N = udata->N;
-  realtype k  = udata->k;
-  realtype *x = udata->x_dev;
-  realtype *V=NULL, *JV=NULL;
-  realtype dxL, dxR;
+  sunrealtype k  = udata->k;
+  sunrealtype *x = udata->x_dev;
+  sunrealtype *V=NULL, *JV=NULL;
+  sunrealtype dxL, dxR;
   sunindextype i;
   int dev;
 
@@ -423,11 +423,11 @@ static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
       Nnew [output] -- the size of the new mesh
       udata [input] -- the current system information
    The return for this function is a pointer to the new mesh. */
-realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
+sunrealtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
 {
   sunindextype i, j;
   int *marks=NULL;
-  realtype ydd, *xold=NULL, *Y=NULL, *xnew=NULL;
+  sunrealtype ydd, *xold=NULL, *Y=NULL, *xnew=NULL;
   sunindextype num_refine, N_new;
 
   /* Access current solution and mesh arrays */
@@ -460,7 +460,7 @@ realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
     if (marks[i] == 1)   num_refine++;
   N_new = udata->N + num_refine;
   *Nnew = N_new;            /* Store new array length */
-  xnew = malloc((N_new) * sizeof(realtype));
+  xnew = malloc((N_new) * sizeof(sunrealtype));
 
 
   /* fill new mesh */
@@ -505,11 +505,11 @@ realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
       xnew [input] -- the new mesh
       ynew [output] -- the vector defined over the new mesh
                        (allocated prior to calling project) */
-static int project(sunindextype Nold, realtype *xold, N_Vector yold,
-                   sunindextype Nnew, realtype *xnew, N_Vector ynew)
+static int project(sunindextype Nold, sunrealtype *xold, N_Vector yold,
+                   sunindextype Nnew, sunrealtype *xnew, N_Vector ynew)
 {
   sunindextype iv, i, j;
-  realtype *Yold=NULL, *Ynew=NULL;
+  sunrealtype *Yold=NULL, *Ynew=NULL;
 
   int dev = omp_get_default_device();
 
diff --git a/examples/arkode/C_openmpdev/ark_heat1D_ompdev.c b/examples/arkode/C_openmpdev/ark_heat1D_ompdev.c
index 54abdb2318..8f9e9145b1 100644
--- a/examples/arkode/C_openmpdev/ark_heat1D_ompdev.c
+++ b/examples/arkode/C_openmpdev/ark_heat1D_ompdev.c
@@ -45,7 +45,7 @@
 #include <arkode/arkode_arkstep.h>     /* prototypes for ARKStep fcts., consts. */
 #include <nvector/nvector_openmpdev.h> /* OpenMPDEV N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_pcg.h>   /* access to PCG SUNLinearSolver        */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype, etc */
 #include <sundials/sundials_math.h>    /* def. of SUNRsqrt, etc.               */
 
 #ifdef _OPENMP
@@ -65,13 +65,13 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals   */
-  realtype dx;     /* mesh spacing          */
-  realtype k;      /* diffusion coefficient */
+  sunrealtype dx;     /* mesh spacing          */
+  sunrealtype k;      /* diffusion coefficient */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp);
 
 /* Private function to check function return values */
@@ -81,15 +81,15 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main() {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);   /* initial time */
-  realtype Tf = RCONST(1.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);   /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);   /* final time */
   int Nt = 10;                 /* total number of output times */
-  realtype rtol = 1.e-6;       /* relative tolerance */
-  realtype atol = 1.e-10;      /* absolute tolerance */
+  sunrealtype rtol = 1.e-6;       /* relative tolerance */
+  sunrealtype atol = 1.e-10;      /* absolute tolerance */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;        /* spatial mesh size */
-  realtype k = 0.5;            /* heat conductivity */
+  sunrealtype k = 0.5;            /* heat conductivity */
   sunindextype i;
 
   /* general problem variables */
@@ -98,7 +98,7 @@ int main() {
   SUNLinearSolver LS = NULL;   /* empty linear solver object */
   void *arkode_mem = NULL;     /* empty ARKStep memory structure */
   FILE *FID, *UFID;
-  realtype t, dTout, tout;
+  sunrealtype t, dTout, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nli, nJv, nlcf, nni, ncfn, netf;
 
@@ -111,7 +111,7 @@ int main() {
   udata = (UserData) malloc(sizeof(*udata));
   udata->N = N;
   udata->k = k;
-  udata->dx = RCONST(1.0)/(1.0*N-1.0);     /* mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(1.0*N-1.0);     /* mesh spacing */
 
   /* Initial problem output */
   printf("\n1D Heat PDE test problem:\n");
@@ -245,14 +245,14 @@ int main() {
  *--------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N  = udata->N;                   /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype c1, c2;
   sunindextype i, isource;
   int dev;
 
@@ -266,7 +266,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
   /* iterate over domain, computing all equations */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
   isource = N/2;
 
 #pragma omp target map(to:c1,c2,isource,N,dx) is_device_ptr(Ydot,Y) device(dev)
@@ -283,15 +283,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
 	       N_Vector fy, void *user_data, N_Vector tmp)
 {
   UserData udata = (UserData) user_data;     /* variable shortcuts */
   sunindextype N = udata->N;
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *V=NULL, *JV=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *V=NULL, *JV=NULL;
+  sunrealtype c1, c2;
   sunindextype i;
   int dev;
 
@@ -305,7 +305,7 @@ static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
 
   /* iterate over domain, computing all Jacobian-vector products */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
 
 #pragma omp target map(to:c1,c2,N) is_device_ptr(JV,V) device(dev)
 #pragma omp teams distribute parallel for schedule(static, 1)
diff --git a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
index b05278871a..3e1863376a 100644
--- a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
+++ b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c
@@ -200,8 +200,8 @@ static int AdvectionReaction(double t, N_Vector y, N_Vector ydot,
  * Preconditioner functions (used only when using the global nonlinear solver)
  */
 
-static int PSetup(double t, N_Vector y, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, double gamma, void *user_data);
+static int PSetup(double t, N_Vector y, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, double gamma, void *user_data);
 static int PSolve(double t, N_Vector y, N_Vector f, N_Vector r,
                   N_Vector z, double gamma, double delta, int lr,
                   void *user_data);
@@ -1062,7 +1062,7 @@ int TaskLocalNewton_Initialize(SUNNonlinearSolver NLS)
 int TaskLocalNewton_Solve(SUNNonlinearSolver NLS,
                           N_Vector y0, N_Vector ycor,
                           N_Vector w, double tol,
-                          booleantype callLSetup, void* mem)
+                          sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   MPI_Comm comm;
@@ -1223,8 +1223,8 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y)
 
 
 /* Sets P = I - gamma * J */
-int PSetup(double t, N_Vector y, N_Vector ydot, booleantype jok,
-           booleantype *jcurPtr, double gamma, void *user_data)
+int PSetup(double t, N_Vector y, N_Vector ydot, sunbooleantype jok,
+           sunbooleantype *jcurPtr, double gamma, void *user_data)
 {
   /* local variables */
   UserData  udata = (UserData) user_data;
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
index 8143a128c0..c5a82ece7a 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.c
@@ -71,29 +71,29 @@
 #endif
 
 /* Problem Constants */
-#define ZERO         RCONST(0.0)
+#define ZERO         SUN_RCONST(0.0)
 #define NVARS        2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                /* initial time */
 #define NOUT         12                  /* number of output times */
-#define TWOHR        RCONST(7200.0)      /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)      /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898) /* pi */
+#define TWOHR        SUN_RCONST(7200.0)      /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)      /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898) /* pi */
 
 #define XMIN         ZERO                /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)        /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)        /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -105,8 +105,8 @@
 #define MY           (NPEY*MYSUB)   /* MY = number of y mesh points */
                                     /* Spatial mesh is MX by MY */
 /* initialization constants */
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -114,8 +114,8 @@
    contains problem constants, extended dependent variable array,
    grid constants, processor indices, MPI communicator */
 typedef struct {
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, Nlocal;
   MPI_Comm comm;
@@ -128,27 +128,27 @@ static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
                        sunindextype mukeep, sunindextype mlkeep);
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *arkode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[]);
+                  sunrealtype uarray[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[]);
+                      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
-static void fucomm(realtype t, N_Vector u, void *user_data);
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
+static void fucomm(sunrealtype t, N_Vector u, void *user_data);
 
 /* Prototype of function called by the solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Prototype of functions called by the ARKBBDPRE module */
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
   UserData data;
   SUNLinearSolver LS;
   void *arkode_mem;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   int iout, my_pe, npes, flag, jpre;
   sunindextype neq, local_N, mudq, mldq, mukeep, mlkeep;
@@ -316,11 +316,11 @@ static void InitUserData(int my_pe, sunindextype local_N, MPI_Comm comm,
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -342,8 +342,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   int isubx, isuby;
   int lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *uarray;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *uarray;
 
   /* Set pointer to data array in vector u */
   uarray = N_VGetArrayPointer(u);
@@ -356,18 +356,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       uarray[offset  ] = C1_SCALE*cx*cy;
       uarray[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -391,12 +391,12 @@ static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int flag, npelast;
   sunindextype i0, i1;
   long int nst;
-  realtype hu, *uarray, tempu[2];
+  sunrealtype hu, *uarray, tempu[2];
   MPI_Status status;
 
   npelast = NPEX*NPEY - 1;
@@ -503,11 +503,11 @@ static void PrintFinalStats(void *arkode_mem)
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[])
+                  sunrealtype uarray[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -544,18 +544,18 @@ static void BSend(MPI_Comm comm,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[])
+                      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -584,18 +584,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -637,10 +637,10 @@ static void BRecvWait(MPI_Request request[],
 
 /* fucomm routine.  This routine performs all inter-processor
    communication of data in u needed to calculate f.         */
-static void fucomm(realtype t, N_Vector u, void *user_data)
+static void fucomm(sunrealtype t, N_Vector u, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -670,7 +670,7 @@ static void fucomm(realtype t, N_Vector u, void *user_data)
 
 /* f routine.  Evaluate f(t,y).  First call fucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to flocal. */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data;
 
@@ -690,19 +690,19 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 /* flocal routine.  Compute f(t,y).  This routine assumes that all
    inter-processor communication of data needed to calculate f has already
    been done, and this data is in the work array uext.                    */
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
   UserData data;
-  realtype *uarray, *duarray;
+  sunrealtype *uarray, *duarray;
 
   uarray = N_VGetArrayPointer(u);
   duarray = N_VGetArrayPointer(udot);
@@ -781,10 +781,10 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
     jy = ly + isuby*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -811,8 +811,8 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.c b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
index 2eea2b3860..93224a455b 100644
--- a/examples/arkode/C_parallel/ark_diurnal_kry_p.c
+++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.c
@@ -69,27 +69,27 @@
 
 /* Problem Constants */
 #define NVARS        2                    /* number of species         */
-#define KH           RCONST(4.0e-6)       /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)        /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)       /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)        /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)        /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)        /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
-
-#define T0           RCONST(0.0)          /* initial time */
+#define KH           SUN_RCONST(4.0e-6)       /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)        /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)       /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)        /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)        /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)        /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
+
+#define T0           SUN_RCONST(0.0)          /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI           RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI           SUN_RCONST(3.1415926535898)  /* pi */
 
-#define XMIN         RCONST(0.0)          /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMIN         SUN_RCONST(0.0)          /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2                    /* no. PEs in x direction of PE array */
 #define NPEY         2                    /* no. PEs in y direction of PE array */
@@ -102,8 +102,8 @@
                                           /* Spatial mesh is MX by MY */
 
 /* initialization constants */
-#define RTOL    RCONST(1.0e-5)            /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)             /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)            /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)             /* value of C1 or C2 at which tolerances */
                                           /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)              /* scalar absolute tolerance */
 
@@ -113,7 +113,7 @@
    IJth is defined in order to write code which indexes into dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -125,14 +125,14 @@
    for the preconditiner */
 typedef struct {
 
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   int nvmxsub, nvmxsub2;
   MPI_Comm comm;
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
@@ -142,33 +142,33 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *arkode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[]);
+                  sunrealtype udata[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[]);
+                      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
-static void ucomm(realtype t, N_Vector u, UserData data);
-static void fcalc(realtype t, realtype udata[], realtype dudata[],
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
+static void ucomm(sunrealtype t, N_Vector u, UserData data);
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[],
                   UserData data);
 
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
-                  N_Vector r, N_Vector z, realtype gamma,
-                  realtype delta, int lr, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
+                  N_Vector r, N_Vector z, sunrealtype gamma,
+                  sunrealtype delta, int lr, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt, int id);
@@ -177,7 +177,7 @@ static int check_flag(void *flagvalue, const char *funcname, int opt, int id);
 /***************************** Main Program ******************************/
 int main(int argc, char *argv[])
 {
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -301,11 +301,11 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -350,8 +350,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 {
   int isubx, isuby, lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *udata;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u */
   udata = N_VGetArrayPointer(u);
@@ -364,18 +364,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       udata[offset  ] = C1_SCALE*cx*cy;
       udata[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -385,10 +385,10 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int flag;
-  realtype hu, *udata, tempu[2];
+  sunrealtype hu, *udata, tempu[2];
   int npelast;
   sunindextype i0, i1;
   long int nst;
@@ -489,11 +489,11 @@ static void PrintFinalStats(void *arkode_mem)
 /* Routine to send boundary data to neighboring PEs */
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, sunindextype dsizex,
-                  sunindextype dsizey, realtype udata[])
+                  sunindextype dsizey, sunrealtype udata[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -530,7 +530,7 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -538,11 +538,11 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[])
+                      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -571,19 +571,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -626,10 +626,10 @@ static void BRecvWait(MPI_Request request[],
 /* ucomm routine.  This routine performs all communication
    between processors of data needed to calculate f. */
 
-static void ucomm(realtype t, N_Vector u, UserData data)
+static void ucomm(sunrealtype t, N_Vector u, UserData data)
 {
 
-  realtype *udata, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *udata, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -659,14 +659,14 @@ static void ucomm(realtype t, N_Vector u, UserData data)
    between processors of data needed to calculate f has already been done,
    and this data is in the work array uext. */
 
-static void fcalc(realtype t, realtype udata[],
-                  realtype dudata[], UserData data)
+static void fcalc(sunrealtype t, sunrealtype udata[],
+                  sunrealtype dudata[], UserData data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
@@ -727,12 +727,12 @@ static void fcalc(realtype t, realtype udata[],
   /* Set diurnal rate coefficients as functions of t, and save q4 in
   data block for use by preconditioner evaluation routine */
   s = sin((data->om)*t);
-  if (s > RCONST(0.0)) {
+  if (s > SUN_RCONST(0.0)) {
     q3 = exp(-A3/s);
     q4coef = exp(-A4/s);
   } else {
-    q3 = RCONST(0.0);
-    q4coef = RCONST(0.0);
+    q3 = SUN_RCONST(0.0);
+    q4coef = SUN_RCONST(0.0);
   }
   data->q4 = q4coef;
 
@@ -742,10 +742,10 @@ static void fcalc(realtype t, realtype udata[],
     jy = ly + isuby*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -756,7 +756,7 @@ static void fcalc(realtype t, realtype udata[],
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -772,8 +772,8 @@ static void fcalc(realtype t, realtype udata[],
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
@@ -791,9 +791,9 @@ static void fcalc(realtype t, realtype udata[],
 /* f routine.  Evaluate f(t,y).  First call ucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to fcalc. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype *udata, *dudata;
+  sunrealtype *udata, *dudata;
   UserData data;
 
   udata = N_VGetArrayPointer(u);
@@ -811,17 +811,17 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 
 /* Preconditioner setup routine. Generate and preprocess P. */
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   int nvmxsub, offset;
   sunindextype ier;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly, jy, isuby;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, pointer to u's data,
@@ -858,11 +858,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
      computed on the last f call).  Load into P. */
     for (ly = 0; ly < MYSUB; ly++) {
       jy = ly + isuby*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*hordco);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*hordco);
       for (lx = 0; lx < MXSUB; lx++) {
         offset = lx*NVARS + ly*nvmxsub;
         c1 = udata[offset];
@@ -900,16 +900,16 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
 
 
 /* Preconditioner solve routine */
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   int nvmxsub;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data */
@@ -920,7 +920,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
   nvmxsub = data->nvmxsub;
   zdata = N_VGetArrayPointer(z);
 
diff --git a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.c b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.c
index 1241dc161c..9e1377b783 100644
--- a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.c
+++ b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_parhyp.h>    /* declaration of N_Vector  */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver  */
 #include <sundials/sundials_dense.h>   /* prototypes for small dense fcts. */
-#include <sundials/sundials_types.h>   /* definitions of realtype, booleantype */
+#include <sundials/sundials_types.h>   /* definitions of sunrealtype, sunbooleantype */
 #include <sundials/sundials_math.h>    /* definition of macros SUNSQR and EXP */
 #include <mpi.h>                       /* MPI constants and types */
 
@@ -69,27 +69,27 @@
 
 /* Problem Constants */
 #define NVARS        2                    /* number of species         */
-#define KH           RCONST(4.0e-6)       /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)        /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)       /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)        /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)        /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)        /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
-
-#define T0           RCONST(0.0)          /* initial time */
+#define KH           SUN_RCONST(4.0e-6)       /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)        /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)       /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)        /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)        /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)        /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
+
+#define T0           SUN_RCONST(0.0)          /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
-#define XMIN         RCONST(0.0)          /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMIN         SUN_RCONST(0.0)          /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2                    /* no. PEs in x direction of PE array */
 #define NPEY         2                    /* no. PEs in y direction of PE array */
@@ -102,8 +102,8 @@
                                           /* Spatial mesh is MX by MY */
 
 /* initialization constants */
-#define RTOL    RCONST(1.0e-5)            /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)             /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)            /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)             /* value of C1 or C2 at which tolerances */
                                           /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)              /* scalar absolute tolerance */
 
@@ -113,7 +113,7 @@
    IJth is defined in order to write code which indexes into dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -125,14 +125,14 @@
    for the preconditiner */
 typedef struct {
 
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   int nvmxsub, nvmxsub2;
   MPI_Comm comm;
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
@@ -144,33 +144,33 @@ static void SetInitialProfiles(HYPRE_IJVector Uij, UserData data,
                                sunindextype local_length,
                                sunindextype my_base);
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *arkode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[]);
+                  sunrealtype udata[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[]);
+                      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
-static void ucomm(realtype t, N_Vector u, UserData data);
-static void fcalc(realtype t, realtype udata[], realtype dudata[],
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
+static void ucomm(sunrealtype t, N_Vector u, UserData data);
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[],
                   UserData data);
 
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 /* Private function to check function return values */
@@ -181,7 +181,7 @@ static int check_flag(void *flagvalue, const char *funcname, int opt, int id);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -309,11 +309,11 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SUNSQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SUNSQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SUNSQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -360,12 +360,12 @@ static void SetInitialProfiles(HYPRE_IJVector Uij, UserData data,
 {
   int isubx, isuby, lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *udata;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *udata;
   HYPRE_Int *iglobal;
 
   /* Set pointer to data array in vector u */
-  udata   = (realtype*) malloc(local_length*sizeof(realtype));
+  udata   = (sunrealtype*) malloc(local_length*sizeof(sunrealtype));
   iglobal = (HYPRE_Int*) malloc(local_length*sizeof(HYPRE_Int));
 
 
@@ -377,18 +377,18 @@ static void SetInitialProfiles(HYPRE_IJVector Uij, UserData data,
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SUNSQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SUNSQR(cy);
+    cy = SUNSQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SUNSQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SUNSQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SUNSQR(cx);
+      cx = SUNSQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SUNSQR(cx);
       iglobal[offset] = my_base + offset;
       udata[offset++] = C1_SCALE*cx*cy;
       iglobal[offset] = my_base + offset;
@@ -402,10 +402,10 @@ static void SetInitialProfiles(HYPRE_IJVector Uij, UserData data,
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 static void PrintOutput(void *arkode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int flag;
-  realtype hu, *udata, tempu[2];
+  sunrealtype hu, *udata, tempu[2];
   int npelast;
   sunindextype i0, i1;
   long int nst;
@@ -509,11 +509,11 @@ static void PrintFinalStats(void *arkode_mem)
 /* Routine to send boundary data to neighboring PEs */
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, sunindextype dsizex,
-                  sunindextype dsizey, realtype udata[])
+                  sunindextype dsizey, sunrealtype udata[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -550,7 +550,7 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -558,11 +558,11 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[])
+                      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -591,19 +591,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -646,10 +646,10 @@ static void BRecvWait(MPI_Request request[],
 /* ucomm routine.  This routine performs all communication
    between processors of data needed to calculate f. */
 
-static void ucomm(realtype t, N_Vector u, UserData data)
+static void ucomm(sunrealtype t, N_Vector u, UserData data)
 {
 
-  realtype *udata, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *udata, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -681,14 +681,14 @@ static void ucomm(realtype t, N_Vector u, UserData data)
    between processors of data needed to calculate f has already been done,
    and this data is in the work array uext. */
 
-static void fcalc(realtype t, realtype udata[],
-                  realtype dudata[], UserData data)
+static void fcalc(sunrealtype t, sunrealtype udata[],
+                  sunrealtype dudata[], UserData data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
@@ -749,12 +749,12 @@ static void fcalc(realtype t, realtype udata[],
   /* Set diurnal rate coefficients as functions of t, and save q4 in
   data block for use by preconditioner evaluation routine */
   s = sin((data->om)*t);
-  if (s > RCONST(0.0)) {
+  if (s > SUN_RCONST(0.0)) {
     q3 = SUNRexp(-A3/s);
     q4coef = SUNRexp(-A4/s);
   } else {
-    q3 = RCONST(0.0);
-    q4coef = RCONST(0.0);
+    q3 = SUN_RCONST(0.0);
+    q4coef = SUN_RCONST(0.0);
   }
   data->q4 = q4coef;
 
@@ -764,10 +764,10 @@ static void fcalc(realtype t, realtype udata[],
     jy = ly + isuby*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*SUNRexp(RCONST(0.2)*ydn);
-    cyup = verdco*SUNRexp(RCONST(0.2)*yup);
+    cydn = verdco*SUNRexp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*SUNRexp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -778,7 +778,7 @@ static void fcalc(realtype t, realtype udata[],
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -794,8 +794,8 @@ static void fcalc(realtype t, realtype udata[],
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
@@ -813,9 +813,9 @@ static void fcalc(realtype t, realtype udata[],
 /* f routine.  Evaluate f(t,y).  First call ucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to fcalc. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype *udata, *udotdata;
+  sunrealtype *udata, *udotdata;
   UserData data;
   HYPRE_ParVector uhyp;
   HYPRE_ParVector udothyp;
@@ -842,16 +842,16 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Preconditioner setup routine. Generate and preprocess P. */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   int nvmxsub, ier, offset;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly, jy, isuby;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   HYPRE_ParVector uhyp;
   UserData data;
 
@@ -891,11 +891,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
      computed on the last f call).  Load into P. */
     for (ly = 0; ly < MYSUB; ly++) {
       jy = ly + isuby*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*SUNRexp(RCONST(0.2)*ydn);
-      cyup = verdco*SUNRexp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*hordco);
+      cydn = verdco*SUNRexp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*SUNRexp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*hordco);
       for (lx = 0; lx < MXSUB; lx++) {
         offset = lx*NVARS + ly*nvmxsub;
         c1 = udata[offset];
@@ -933,16 +933,16 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
 
 
 /* Preconditioner solve routine */
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   int nvmxsub;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   HYPRE_ParVector zhyp;
   UserData data;
 
@@ -954,7 +954,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
   nvmxsub = data->nvmxsub;
   zhyp  = N_VGetVector_ParHyp(z); /* extract hypre vector */
   zdata = hypre_VectorData(hypre_ParVectorLocalVector(zhyp));
diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec.c b/examples/arkode/C_serial/ark_KrylovDemo_prec.c
index e6041f6f7e..37acdbbf43 100644
--- a/examples/arkode/C_serial/ark_KrylovDemo_prec.c
+++ b/examples/arkode/C_serial/ark_KrylovDemo_prec.c
@@ -103,7 +103,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h>  /* access to SPGMR SUNLinearSolver             */
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>    /* use generic DENSE solver in preconditioning */
-#include <sundials/sundials_types.h>    /* definition of realtype                      */
+#include <sundials/sundials_types.h>    /* definition of sunrealtype                      */
 
 /* helpful macros */
 
@@ -127,17 +127,17 @@
 
 /* Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Problem Specification Constants */
 
 #define AA    ONE               /* AA = a */
-#define EE    RCONST(1.0e4)     /* EE = e */
-#define GG    RCONST(0.5e-6)    /* GG = g */
+#define EE    SUN_RCONST(1.0e4)     /* EE = e */
+#define GG    SUN_RCONST(0.5e-6)    /* GG = g */
 #define BB    ONE               /* BB = b */
 #define DPREY ONE
-#define DPRED RCONST(0.5)
+#define DPRED SUN_RCONST(0.5)
 #define ALPH  ONE
 #define NP    3
 #define NS    (2*NP)
@@ -149,8 +149,8 @@
 #define MXNS  (MX*NS)
 #define AX    ONE
 #define AY    ONE
-#define DX    (AX/(realtype)(MX-1))
-#define DY    (AY/(realtype)(MY-1))
+#define DX    (AX/(sunrealtype)(MX-1))
+#define DY    (AY/(sunrealtype)(MY-1))
 #define MP    NS
 #define MQ    (MX*MY)
 #define MXMP  (MX*MP)
@@ -163,8 +163,8 @@
 
 #define NEQ  (NS*MX*MY)
 #define T0   ZERO
-#define RTOL RCONST(1.0e-5)
-#define ATOL RCONST(1.0e-5)
+#define RTOL SUN_RCONST(1.0e-5)
+#define ATOL SUN_RCONST(1.0e-5)
 
 /* Spgmr Constants */
 
@@ -173,8 +173,8 @@
 
 /* Output Constants */
 
-#define T1        RCONST(1.0e-8)
-#define TOUT_MULT RCONST(10.0)
+#define T1        SUN_RCONST(1.0e-8)
+#define TOUT_MULT SUN_RCONST(10.0)
 #define DTOUT     ONE
 #define NOUT      18
 
@@ -185,15 +185,15 @@
 /* Structure for user data */
 
 typedef struct {
-  realtype **P[NGRP];
+  sunrealtype **P[NGRP];
   sunindextype *pivot[NGRP];
   int ns, mxns;
   int mp, mq, mx, my, ngrp, ngx, ngy, mxmp;
   int jgx[NGX+1], jgy[NGY+1], jigx[MX], jigy[MY];
   int jxr[NGX], jyr[NGY];
-  realtype acoef[NS][NS], bcoef[NS], diff[NS];
-  realtype cox[NS], coy[NS], dx, dy, srur;
-  realtype fsave[NEQ];
+  sunrealtype acoef[NS][NS], bcoef[NS], diff[NS];
+  sunrealtype cox[NS], coy[NS], dx, dy, srur;
+  sunrealtype fsave[NEQ];
   N_Vector tmp;
   N_Vector rewt;
   void *arkode_mem;
@@ -207,33 +207,33 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[]);
 static void CInit(N_Vector c, WebData wdata);
 static void PrintIntro(void);
 static void PrintHeader(int jpre, int gstype);
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t);
-static void PrintOutput(void *arkode_mem, realtype t);
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t);
+static void PrintOutput(void *arkode_mem, sunrealtype t);
 static void PrintFinalStats(void *arkode_mem);
 static void FreeUserData(WebData wdata);
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata);
-static void fblock (realtype t, realtype cdata[], int jx, int jy,
-                    realtype cdotdata[], WebData wdata);
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata);
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata);
+static void fblock (sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                    sunrealtype cdotdata[], WebData wdata);
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata);
 
 /* Small Vector Kernels */
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_sum_prods(realtype u[], realtype p[], realtype q[], realtype v[],
-                        realtype w[], int n);
-static void v_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_zero(realtype u[], int n);
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[], sunrealtype v[],
+                        sunrealtype w[], int n);
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_zero(sunrealtype u[], int n);
 
 /* Functions Called By The Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype tn, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
 /* Private function to check function return values */
 
@@ -243,16 +243,16 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 int main(int argc, char* argv[])
 {
-  realtype abstol=ATOL, reltol=RTOL, t, tout;
+  sunrealtype abstol=ATOL, reltol=RTOL, t, tout;
   N_Vector c = NULL;
   WebData wdata = NULL;
   SUNLinearSolver LS = NULL;
   void *arkode_mem = NULL;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int jpre, gstype, flag;
   int ns, mxns, iout;
   int nrmfactor = 0;   /* LS norm conversion factor flag */
-  realtype nrmfac;     /* LS norm conversion factor      */
+  sunrealtype nrmfac;     /* LS norm conversion factor      */
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -323,7 +323,7 @@ int main(int argc, char* argv[])
 
         case(1):
           /* use the square root of the vector length */
-          nrmfac = SQRT((realtype)NEQ);
+          nrmfac = SQRT((sunrealtype)NEQ);
           break;
         case(2):
           /* compute with dot product */
@@ -361,7 +361,7 @@ int main(int argc, char* argv[])
         PrintOutput(arkode_mem, t);
         if (firstrun && (iout % 3 == 0)) PrintAllSpecies(c, ns, mxns, t);
         if(check_flag(&flag, "ARKStepEvolve", 1)) break;
-        if (tout > RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
+        if (tout > SUN_RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
       }
 
       /* Print final statistics, and loop for next case */
@@ -399,8 +399,8 @@ static WebData AllocUserData(SUNContext ctx)
 static void InitUserData(WebData wdata)
 {
   int i, j, ns;
-  realtype *bcoef, *diff, *cox, *coy, dx, dy;
-  realtype (*acoef)[NS];
+  sunrealtype *bcoef, *diff, *cox, *coy, dx, dy;
+  sunrealtype (*acoef)[NS];
 
   acoef = wdata->acoef;
   bcoef = wdata->bcoef;
@@ -439,7 +439,7 @@ static void InitUserData(WebData wdata)
   wdata->mq = MQ;
   wdata->mx = MX;
   wdata->my = MY;
-  wdata->srur = sqrt(UNIT_ROUNDOFF);
+  wdata->srur = sqrt(SUN_UNIT_ROUNDOFF);
   wdata->mxmp = MXMP;
   wdata->ngrp = NGRP;
   wdata->ngx = NGX;
@@ -480,7 +480,7 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[])
 static void CInit(N_Vector c, WebData wdata)
 {
   int jx, jy, ns, mxns, ioff, iyoff, i, ici;
-  realtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
+  sunrealtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -488,8 +488,8 @@ static void CInit(N_Vector c, WebData wdata)
   dx = wdata->dx;
   dy = wdata->dy;
 
-  x_factor = RCONST(4.0)/SQR(AX);
-  y_factor = RCONST(4.0)/SQR(AY);
+  x_factor = SUN_RCONST(4.0)/SQR(AX);
+  y_factor = SUN_RCONST(4.0)/SQR(AY);
   for (jy = 0; jy < MY; jy++) {
     y = jy*dy;
     argy = SQR(y_factor*y*(AY-y));
@@ -500,7 +500,7 @@ static void CInit(N_Vector c, WebData wdata)
       ioff = iyoff + ns*jx;
       for (i = 1; i <= ns; i++) {
         ici = ioff + i-1;
-        cdata[ici] = RCONST(10.0) + i*argx*argy;
+        cdata[ici] = SUN_RCONST(10.0) + i*argx*argy;
       }
     }
   }
@@ -569,10 +569,10 @@ static void PrintHeader(int jpre, int gstype)
     printf("\nGram-Schmidt method type is    gstype = %s\n\n\n", "SUN_CLASSICAL_GS");
 }
 
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t)
 {
   int i, jx ,jy;
-  realtype *cdata;
+  sunrealtype *cdata;
 
   cdata = N_VGetArrayPointer(c);
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -600,11 +600,11 @@ static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
   }
 }
 
-static void PrintOutput(void *arkode_mem, realtype t)
+static void PrintOutput(void *arkode_mem, sunrealtype t)
 {
   long int nst, nfe, nfi, nni;
   int flag;
-  realtype hu;
+  sunrealtype hu;
 
   flag = ARKStepGetNumSteps(arkode_mem, &nst);
   check_flag(&flag, "ARKStepGetNumSteps", 1);
@@ -634,7 +634,7 @@ static void PrintFinalStats(void *arkode_mem)
   long int nst, nfe, nfi, nsetups, nni, ncfn, netf;
   long int nli, npe, nps, ncfl, nfeLS;
   int flag;
-  realtype avdim;
+  sunrealtype avdim;
 
   flag = ARKStepGetWorkSpace(arkode_mem, &lenrw, &leniw);
   check_flag(&flag, "ARKStepGetWorkSpace", 1);
@@ -682,7 +682,7 @@ static void PrintFinalStats(void *arkode_mem)
   printf(" Number of error test failures         = %4ld \n", netf);
   printf(" Number of nonlinear conv. failures    = %4ld \n", ncfn);
   printf(" Number of linear convergence failures = %4ld \n", ncfl);
-  avdim = (nni > 0) ? ((realtype)nli)/((realtype)nni) : ZERO;
+  avdim = (nni > 0) ? ((sunrealtype)nli)/((sunrealtype)nni) : ZERO;
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf(" Average Krylov subspace dimension     = %.3Lf \n", avdim);
 #else
@@ -713,11 +713,11 @@ static void FreeUserData(WebData wdata)
  returns it in cdot. The interaction rates are computed by calls to WebRates,
  and these are saved in fsave for use in preconditioning.
 */
-static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
+static int f(sunrealtype t, N_Vector c, N_Vector cdot,void *user_data)
 {
   int i, ic, ici, idxl, idxu, jx, ns, mxns, iyoff, jy, idyu, idyl;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
-  realtype *cdata, *cdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
+  sunrealtype *cdata, *cdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -768,12 +768,12 @@ static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
   c_1, ... ,c_ns (stored in c[0],...,c[ns-1]), at one spatial point
   and at time t.
 */
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata)
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -804,16 +804,16 @@ static void WebRates(realtype x, realtype y, realtype t, realtype c[],
  of a block-diagonal preconditioner. The blocks are of size mp, and
  there are ngrp=ngx*ngy blocks computed in the block-grouping scheme.
 */
-static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype ier;
   sunindextype **pivot;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, flag;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   WebData wdata;
   void *arkode_mem;
   N_Vector rewt;
@@ -826,7 +826,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   if(check_flag(&flag, "ARKStepGetErrWeights", 1)) return(1);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -847,7 +847,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   f1 = N_VGetArrayPointer(wdata->tmp);
 
   fac = N_VWrmsNorm (fc, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -891,11 +891,11 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   system, namely block (jx,jy), for use in preconditioning.
   Here jx and jy count from 0.
 */
-static void fblock(realtype t, realtype cdata[], int jx, int jy,
-                   realtype cdotdata[], WebData wdata)
+static void fblock(sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                   sunrealtype cdotdata[], WebData wdata)
 {
   int iblok, ic;
-  realtype x, y;
+  sunrealtype x, y;
 
   iblok = jx + jy*(wdata->mx);
   y = jy*(wdata->dy);
@@ -914,10 +914,10 @@ static void fblock(realtype t, realtype cdata[], int jx, int jy,
   Then it computes ((I - gamma*Jr)-inverse)*z, using LU factors of the
   blocks in P, and pivot information in pivot, and returns the result in z.
 */
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data)
 {
-  realtype   ***P;
+  sunrealtype   ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -964,12 +964,12 @@ static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
   Some inner loops of length ns are implemented with the small
   vector kernels v_sum_prods, v_prod, v_inc_by_prod.
 */
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata)
 {
   int jx, jy, mx, my, x_loc, y_loc;
   int ns, mxns, i, iyoff, ic, iter;
-  realtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
-  realtype temp, *cox, *coy, *xd, *zd;
+  sunrealtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
+  sunrealtype temp, *cox, *coy, *xd, *zd;
 
   xd = N_VGetArrayPointer(x);
   zd = N_VGetArrayPointer(z);
@@ -984,11 +984,11 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
      Load local arrays beta, beta2, gam, gam2, and cof1. */
 
   for (i = 0; i < ns; i++) {
-    temp = ONE/(ONE + RCONST(2.0)*gamma*(cox[i] + coy[i]));
+    temp = ONE/(ONE + SUN_RCONST(2.0)*gamma*(cox[i] + coy[i]));
     beta[i] = gamma*cox[i]*temp;
-    beta2[i] = RCONST(2.0)*beta[i];
+    beta2[i] = SUN_RCONST(2.0)*beta[i];
     gam[i] = gamma*coy[i]*temp;
-    gam2[i] = RCONST(2.0)*gam[i];
+    gam2[i] = SUN_RCONST(2.0)*gam[i];
     cof1[i] = temp;
   }
 
@@ -1135,26 +1135,26 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
   }
 }
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] += v[i]*w[i];
 }
 
-static void v_sum_prods(realtype u[], realtype p[], realtype q[],
-                        realtype v[], realtype w[], int n)
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[],
+                        sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = p[i]*q[i] + v[i]*w[i];
 }
 
-static void v_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = v[i]*w[i];
 }
 
-static void v_zero(realtype u[], int n)
+static void v_zero(sunrealtype u[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = ZERO;
diff --git a/examples/arkode/C_serial/ark_analytic.c b/examples/arkode/C_serial/ark_analytic.c
index 3b1766d492..18190e1a3a 100644
--- a/examples/arkode/C_serial/ark_analytic.c
+++ b/examples/arkode/C_serial/ark_analytic.c
@@ -37,7 +37,7 @@
 #include <nvector/nvector_serial.h>        /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_dense.h>     /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>     /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>       /* definition of type realtype          */
+#include <sundials/sundials_types.h>       /* definition of type sunrealtype          */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -50,27 +50,27 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
-  realtype dTout = RCONST(1.0);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);      /* time between outputs */
   sunindextype NEQ = 1;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-6);  /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  /* stiffness parameter */
 
   /* general problem variables */
   int flag;                       /* reusable error-checking flag */
@@ -79,7 +79,7 @@ int main()
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *arkode_mem = NULL;        /* empty ARKode memory structure */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, ncfn, netf;
 
   /* Create the SUNDIALS context object for this simulation */
@@ -96,7 +96,7 @@ int main()
   /* Initialize data structures */
   y = N_VNew_Serial(NEQ, ctx);          /* Create serial vector for solution */
   if (check_flag((void *)y, "N_VNew_Serial", 0)) return 1;
-  N_VConst(RCONST(0.0), y);        /* Specify initial condition */
+  N_VConst(SUN_RCONST(0.0), y);        /* Specify initial condition */
 
   /* Call ARKStepCreate to initialize the ARK timestepper module and
      specify the right-hand side function in y'=f(t,y), the inital time
@@ -205,25 +205,25 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype u = NV_Ith_S(y,0);                 /* access current solution value */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access current solution value */
 
   /* fill in the RHS function: "NV_Ith_S" accesses the 0th entry of ydot */
-  NV_Ith_S(ydot,0) = lamda*u + RCONST(1.0)/(RCONST(1.0)+t*t) - lamda*atan(t);
+  NV_Ith_S(ydot,0) = lamda*u + SUN_RCONST(1.0)/(SUN_RCONST(1.0)+t*t) - lamda*atan(t);
 
   return 0;                                   /* return with success */
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype *Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype *Jdata = SUNDenseMatrix_Data(J);
 
   /* Fill in Jacobian of f: set the first entry of the data array to set the (0,0) entry */
   Jdata[0] = lamda;
@@ -271,18 +271,18 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;     /* answer pass (0) or fail (1) flag     */
-  realtype ans, err, ewt;  /* answer data, error, and error weight */
+  sunrealtype ans, err, ewt;  /* answer data, error, and error weight */
 
   /* compute solution error */
   ans = atan(t);
-  ewt = RCONST(1.0) / (rtol * fabs(ans) + atol);
+  ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol);
   err = ewt * fabs(NV_Ith_S(y,0) - ans);
 
   /* is the solution within the tolerances? */
-  passfail = (err < RCONST(1.0)) ? 0 : 1;
+  passfail = (err < SUN_RCONST(1.0)) ? 0 : 1;
 
   if (passfail) {
     fprintf(stdout, "\nSUNDIALS_WARNING: check_ans error=%"GSYM"\n\n", err);
diff --git a/examples/arkode/C_serial/ark_analytic_mels.c b/examples/arkode/C_serial/ark_analytic_mels.c
index f1758db3ef..86dc78d0e2 100644
--- a/examples/arkode/C_serial/ark_analytic_mels.c
+++ b/examples/arkode/C_serial/ark_analytic_mels.c
@@ -34,7 +34,7 @@
 #include <math.h>
 #include <arkode/arkode_arkstep.h>         /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>        /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>       /* definition of type realtype          */
+#include <sundials/sundials_types.h>       /* definition of type sunrealtype          */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -47,39 +47,39 @@
 #endif
 
 /* User-supplied functions called by ARKStep */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Custom linear solver data structure, accessor macros, and routines */
 static SUNLinearSolver MatrixEmbeddedLS(void *arkode_mem, SUNContext ctx);
 static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S);
 static int MatrixEmbeddedLSSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol);
+                                 N_Vector b, sunrealtype tol);
 static int MatrixEmbeddedLSFree(SUNLinearSolver S);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
-  realtype dTout = RCONST(1.0);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);      /* time between outputs */
   sunindextype NEQ = 1;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-6);  /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  /* stiffness parameter */
 
   /* general problem variables */
   int retval;                     /* reusable error-checking flag */
   N_Vector y = NULL;              /* empty vector for storing solution */
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *arkode_mem = NULL;        /* empty ARKODE memory structure */
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, ncfn, netf;
 
   /* Create the SUNDIALS context object for this simulation */
@@ -96,7 +96,7 @@ int main()
   /* Initialize data structures */
   y = N_VNew_Serial(NEQ, ctx);          /* Create serial vector for solution */
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return 1;
-  N_VConst(RCONST(0.0), y);        /* Specify initial condition */
+  N_VConst(SUN_RCONST(0.0), y);        /* Specify initial condition */
 
   /* Call ARKStepCreate to initialize the ARK timestepper module and
      specify the right-hand side function in y'=f(t,y), the inital time
@@ -189,14 +189,14 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype u = NV_Ith_S(y,0);                 /* access current solution value */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access current solution value */
 
   /* fill in the RHS function: "NV_Ith_S" accesses the 0th entry of ydot */
-  NV_Ith_S(ydot,0) = lamda*u + RCONST(1.0)/(RCONST(1.0)+t*t) - lamda*atan(t);
+  NV_Ith_S(ydot,0) = lamda*u + SUN_RCONST(1.0)/(SUN_RCONST(1.0)+t*t) - lamda*atan(t);
 
   return 0;                                   /* return with success */
 }
@@ -232,15 +232,15 @@ static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S)
 
 /* linear solve routine */
 static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol)
+                                 N_Vector b, sunrealtype tol)
 {
   /* temporary variables */
   int       retval;
   N_Vector  z, zpred, Fi, sdata;
-  realtype  tcur, gamma;
+  sunrealtype  tcur, gamma;
   void      *user_data;
-  realtype  *rdata;
-  realtype  lamda;
+  sunrealtype  *rdata;
+  sunrealtype  lamda;
 
   /* retrieve implicit system data from ARKStep */
   retval = ARKStepGetNonlinearSystemData(LS->content, &tcur, &zpred, &z, &Fi,
@@ -249,7 +249,7 @@ static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
     return(-1);
 
   /* extract stiffness parameter from user_data */
-  rdata = (realtype *) user_data;
+  rdata = (sunrealtype *) user_data;
   lamda = rdata[0];
 
   /* perform linear solve: (1-gamma*lamda)*x = b */
@@ -308,18 +308,18 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;     /* answer pass (0) or fail (1) flag     */
-  realtype ans, err, ewt;  /* answer data, error, and error weight */
+  sunrealtype ans, err, ewt;  /* answer data, error, and error weight */
 
   /* compute solution error */
   ans = atan(t);
-  ewt = RCONST(1.0) / (rtol * fabs(ans) + atol);
+  ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol);
   err = ewt * fabs(NV_Ith_S(y,0) - ans);
 
   /* is the solution within the tolerances? */
-  passfail = (err < RCONST(1.0)) ? 0 : 1;
+  passfail = (err < SUN_RCONST(1.0)) ? 0 : 1;
 
   if (passfail) {
     fprintf(stdout, "\nSUNDIALS_WARNING: check_ans error=%"GSYM"\n\n", err);
diff --git a/examples/arkode/C_serial/ark_analytic_nonlin.c b/examples/arkode/C_serial/ark_analytic_nonlin.c
index e6d6cde481..c55fae9bc0 100644
--- a/examples/arkode/C_serial/ark_analytic_nonlin.c
+++ b/examples/arkode/C_serial/ark_analytic_nonlin.c
@@ -30,7 +30,7 @@
 #include <math.h>
 #include <arkode/arkode_erkstep.h>    /* prototypes for ERKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype' */
 #include <sundials/sundials_math.h>   /* def. of SUNRsqrt, etc. */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -44,7 +44,7 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -53,19 +53,19 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(10.0);    /* final time */
-  realtype dTout = RCONST(1.0);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);    /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);  /* time between outputs */
   sunindextype NEQ = 1;          /* number of dependent vars. */
-  realtype reltol = 1.0e-6;      /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype reltol = 1.0e-6;      /* tolerances */
+  sunrealtype abstol = 1.0e-10;
 
   /* general problem variables */
   int flag;                      /* reusable error-checking flag */
   N_Vector y = NULL;             /* empty vector for storing solution */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
   FILE *UFID, *FID;
-  realtype t, tout;
+  sunrealtype t, tout;
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -144,7 +144,7 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   NV_Ith_S(ydot,0) = (t+1.0)*SUNRexp(-NV_Ith_S(y,0));
   return 0;
diff --git a/examples/arkode/C_serial/ark_brusselator.c b/examples/arkode/C_serial/ark_brusselator.c
index b0b69028fb..ae0b41cbcb 100644
--- a/examples/arkode/C_serial/ark_brusselator.c
+++ b/examples/arkode/C_serial/ark_brusselator.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_dense.h>  /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>  /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>    /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>    /* def. of type 'sunrealtype' */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -73,8 +73,8 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
@@ -84,15 +84,15 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
-  realtype dTout = RCONST(1.0);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);      /* time between outputs */
   sunindextype NEQ = 3;              /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout);     /* number of output times */
   int test = 2;                      /* test problem to run */
-  realtype reltol = 1.0e-6;          /* tolerances */
-  realtype abstol = 1.0e-10;
-  realtype a, b, ep, u0, v0, w0;
+  sunrealtype reltol = 1.0e-6;          /* tolerances */
+  sunrealtype abstol = 1.0e-10;
+  sunrealtype a, b, ep, u0, v0, w0;
 
   /* general problem variables */
   int flag;                      /* reusable error-checking flag */
@@ -100,9 +100,9 @@ int main()
   SUNMatrix A = NULL;            /* empty matrix for solver */
   SUNLinearSolver LS = NULL;     /* empty linear solver object */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
-  realtype rdata[3];
+  sunrealtype rdata[3];
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, nnf, ncfn, netf;
 
@@ -113,26 +113,26 @@ int main()
 
   /* set up the test problem according to the desired test */
   if (test == 1) {
-    u0 = RCONST(3.9);
-    v0 = RCONST(1.1);
-    w0 = RCONST(2.8);
-    a  = RCONST(1.2);
-    b  = RCONST(2.5);
-    ep = RCONST(1.0e-5);
+    u0 = SUN_RCONST(3.9);
+    v0 = SUN_RCONST(1.1);
+    w0 = SUN_RCONST(2.8);
+    a  = SUN_RCONST(1.2);
+    b  = SUN_RCONST(2.5);
+    ep = SUN_RCONST(1.0e-5);
   } else if (test == 3) {
-    u0 = RCONST(3.0);
-    v0 = RCONST(3.0);
-    w0 = RCONST(3.5);
-    a  = RCONST(0.5);
-    b  = RCONST(3.0);
-    ep = RCONST(5.0e-4);
+    u0 = SUN_RCONST(3.0);
+    v0 = SUN_RCONST(3.0);
+    w0 = SUN_RCONST(3.5);
+    a  = SUN_RCONST(0.5);
+    b  = SUN_RCONST(3.0);
+    ep = SUN_RCONST(5.0e-4);
   } else {
-    u0 = RCONST(1.2);
-    v0 = RCONST(3.1);
-    w0 = RCONST(3.0);
-    a  = RCONST(1.0);
-    b  = RCONST(3.5);
-    ep = RCONST(5.0e-6);
+    u0 = SUN_RCONST(1.2);
+    v0 = SUN_RCONST(3.1);
+    w0 = SUN_RCONST(3.0);
+    a  = SUN_RCONST(1.0);
+    b  = SUN_RCONST(3.5);
+    ep = SUN_RCONST(5.0e-6);
   }
 
   /* Initial problem output */
@@ -264,15 +264,15 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype a  = rdata[0];                     /* access data entries */
-  realtype b  = rdata[1];
-  realtype ep = rdata[2];
-  realtype u = NV_Ith_S(y,0);                 /* access solution values */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype a  = rdata[0];                     /* access data entries */
+  sunrealtype b  = rdata[1];
+  sunrealtype ep = rdata[2];
+  sunrealtype u = NV_Ith_S(y,0);                 /* access solution values */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = a - (w+1.0)*u + v*u*u;
@@ -283,14 +283,14 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype ep = rdata[2];                     /* access data entries */
-  realtype u = NV_Ith_S(y,0);                 /* access solution values */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype ep = rdata[2];                     /* access data entries */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access solution values */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* fill in the Jacobian via SUNDenseMatrix macro, SM_ELEMENT_D (see sunmatrix_dense.h) */
   SM_ELEMENT_D(J,0,0) = -(w+1.0) + 2.0*u*v;
diff --git a/examples/arkode/C_serial/ark_brusselator1D.c b/examples/arkode/C_serial/ark_brusselator1D.c
index 86d157e802..53d3dac473 100644
--- a/examples/arkode/C_serial/ark_brusselator1D.c
+++ b/examples/arkode/C_serial/ark_brusselator1D.c
@@ -50,7 +50,7 @@
 #include <nvector/nvector_serial.h>    /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -68,23 +68,23 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals     */
-  realtype dx;     /* mesh spacing            */
-  realtype a;      /* constant forcing on u   */
-  realtype b;      /* steady-state value of w */
-  realtype du;     /* diffusion coeff for u   */
-  realtype dv;     /* diffusion coeff for v   */
-  realtype dw;     /* diffusion coeff for w   */
-  realtype ep;     /* stiffness parameter     */
+  sunrealtype dx;     /* mesh spacing            */
+  sunrealtype a;      /* constant forcing on u   */
+  sunrealtype b;      /* steady-state value of w */
+  sunrealtype du;     /* diffusion coeff for u   */
+  sunrealtype dv;     /* diffusion coeff for v   */
+  sunrealtype dw;     /* diffusion coeff for w   */
+  sunrealtype ep;     /* stiffness parameter     */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private helper functions  */
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata);
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata);
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata);
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -93,21 +93,21 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);    /* initial time */
-  realtype Tf = RCONST(10.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);    /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);   /* final time */
   int Nt = 100;                 /* total number of output times */
   int Nvar = 3;                 /* number of solution fields */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;         /* spatial mesh size */
-  realtype a = 0.6;             /* problem parameters */
-  realtype b = 2.0;
-  realtype du = 0.025;
-  realtype dv = 0.025;
-  realtype dw = 0.025;
-  realtype ep = 1.0e-5;         /* stiffness parameter */
-  realtype reltol = 1.0e-6;     /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype a = 0.6;             /* problem parameters */
+  sunrealtype b = 2.0;
+  sunrealtype du = 0.025;
+  sunrealtype dv = 0.025;
+  sunrealtype dw = 0.025;
+  sunrealtype ep = 1.0e-5;         /* stiffness parameter */
+  sunrealtype reltol = 1.0e-6;     /* tolerances */
+  sunrealtype abstol = 1.0e-10;
   sunindextype NEQ, i;
 
   /* general problem variables */
@@ -119,7 +119,7 @@ int main()
   SUNMatrix A = NULL;           /* empty matrix object for solver */
   SUNLinearSolver LS = NULL;    /* empty linear solver object */
   void *arkode_mem = NULL;      /* empty ARKode memory structure */
-  realtype pi, t, dTout, tout, u, v, w;
+  sunrealtype pi, t, dTout, tout, u, v, w;
   FILE *FID, *UFID, *VFID, *WFID;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, ncfn, netf;
@@ -168,32 +168,32 @@ int main()
   if (check_flag((void *)wmask, "N_VClone", 0)) return 1;
 
   /* Set initial conditions into y */
-  udata->dx = RCONST(1.0)/(N-1);    /* set spatial mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(N-1);    /* set spatial mesh spacing */
   data = N_VGetArrayPointer(y);     /* Access data array for new NVector y */
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
 
-  pi = RCONST(4.0)*atan(RCONST(1.0));
+  pi = SUN_RCONST(4.0)*atan(SUN_RCONST(1.0));
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
   }
 
   /* Set mask array values for each solution component */
   N_VConst(0.0, umask);
   data = N_VGetArrayPointer(umask);
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,0)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,0)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, vmask);
   data = N_VGetArrayPointer(vmask);
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,1)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,1)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, wmask);
   data = N_VGetArrayPointer(wmask);
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,2)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,2)] = SUN_RCONST(1.0);
 
   /* Call ARKStepCreate to initialize the ARK timestepper module and
      specify the right-hand side function in y'=f(t,y), the inital time
@@ -328,19 +328,19 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -360,13 +360,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
     w = Ydata[IDX(i,2)];  wl = Ydata[IDX(i-1,2)];  wr = Ydata[IDX(i+1,2)];
 
     /* Fill in ODE RHS for u */
-    dYdata[IDX(i,0)] = (ul - RCONST(2.0)*u + ur)*uconst + a - (w+RCONST(1.0))*u + v*u*u;
+    dYdata[IDX(i,0)] = (ul - SUN_RCONST(2.0)*u + ur)*uconst + a - (w+SUN_RCONST(1.0))*u + v*u*u;
 
     /* Fill in ODE RHS for v */
-    dYdata[IDX(i,1)] = (vl - RCONST(2.0)*v + vr)*vconst + w*u - v*u*u;
+    dYdata[IDX(i,1)] = (vl - SUN_RCONST(2.0)*v + vr)*vconst + w*u - v*u*u;
 
     /* Fill in ODE RHS for w */
-    dYdata[IDX(i,2)] = (wl - RCONST(2.0)*w + wr)*wconst + (b-w)/ep - w*u;
+    dYdata[IDX(i,2)] = (wl - SUN_RCONST(2.0)*w + wr)*wconst + (b-w)/ep - w*u;
   }
 
   /* enforce stationary boundaries */
@@ -377,17 +377,17 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData udata = (UserData) user_data;     /* access problem data */
   SUNMatZero(J);                             /* Initialize Jacobian to zero */
 
   /* Fill in the Laplace matrix */
-  LaplaceMatrix(RCONST(1.0), J, udata);
+  LaplaceMatrix(SUN_RCONST(1.0), J, udata);
 
   /* Add in the Jacobian of the reaction terms matrix */
-  ReactionJac(RCONST(1.0), y, J, udata);
+  ReactionJac(SUN_RCONST(1.0), y, J, udata);
 
   return 0;                                  /* Return with success */
 }
@@ -398,10 +398,10 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 /* Routine to compute the stiffness matrix from (L*y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;           /* set shortcuts */
-  realtype dx = udata->dx;
+  sunrealtype dx = udata->dx;
   sunindextype i;
 
   /* iterate over intervals, filling in Jacobian of (L*y) using SM_ELEMENT_B
@@ -410,9 +410,9 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i-1,0)) += c*udata->du/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i-1,1)) += c*udata->dv/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i-1,2)) += c*udata->dw/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += -c*RCONST(2.0)*udata->du/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) += -c*RCONST(2.0)*udata->dv/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += -c*RCONST(2.0)*udata->dw/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += -c*SUN_RCONST(2.0)*udata->du/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) += -c*SUN_RCONST(2.0)*udata->dv/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += -c*SUN_RCONST(2.0)*udata->dw/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i+1,0)) += c*udata->du/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i+1,1)) += c*udata->dv/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i+1,2)) += c*udata->dw/dx/dx;
@@ -423,13 +423,13 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
 
 /* Routine to compute the Jacobian matrix from R(y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;                      /* set shortcuts */
-  realtype ep = udata->ep;
+  sunrealtype ep = udata->ep;
   sunindextype i;
-  realtype u, v, w;
-  realtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
+  sunrealtype u, v, w;
+  sunrealtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
   if (check_flag((void *)Ydata, "N_VGetArrayPointer", 0)) return 1;
 
   /* iterate over nodes, filling in Jacobian of reaction terms */
@@ -440,8 +440,8 @@ static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
     w = Ydata[IDX(i,2)];
 
     /* all vars wrt u */
-    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += c*(RCONST(2.0)*u*v-(w+RCONST(1.0)));
-    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,0)) += c*(w - RCONST(2.0)*u*v);
+    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += c*(SUN_RCONST(2.0)*u*v-(w+SUN_RCONST(1.0)));
+    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,0)) += c*(w - SUN_RCONST(2.0)*u*v);
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,0)) += c*(-w);
 
     /* all vars wrt v */
@@ -451,7 +451,7 @@ static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
     /* all vars wrt w */
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,2)) += c*(-u);
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,2)) += c*(u);
-    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += c*(-RCONST(1.0)/ep - u);
+    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += c*(-SUN_RCONST(1.0)/ep - u);
 
   }
 
diff --git a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.c b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.c
index 14d767a109..6c1496ba1f 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.c
+++ b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.c
@@ -65,7 +65,7 @@
 #include <nvector/nvector_serial.h>         /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_sparse.h>     /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h>  /* access to SuperLU_MT SUNLinearSolver */
-#include <sundials/sundials_types.h>        /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>        /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -82,18 +82,18 @@
 #define IDX(x,v) (3*(x)+v)
 
 /* constants */
-#define ZERO (RCONST(0.0))
-#define ONE  (RCONST(1.0))
-#define TWO  (RCONST(2.0))
-#define HALF (RCONST(0.5))
+#define ZERO (SUN_RCONST(0.0))
+#define ONE  (SUN_RCONST(1.0))
+#define TWO  (SUN_RCONST(2.0))
+#define HALF (SUN_RCONST(0.5))
 
 /* Gaussian quadrature nodes, weights and formula (3 node, 7th-order accurate) */
-#define X1(xl,xr)   (HALF*(xl+xr) - HALF*(xr-xl)*RCONST(0.774596669241483377035853079956))
+#define X1(xl,xr)   (HALF*(xl+xr) - HALF*(xr-xl)*SUN_RCONST(0.774596669241483377035853079956))
 #define X2(xl,xr)   (HALF*(xl+xr))
-#define X3(xl,xr)   (HALF*(xl+xr) + HALF*(xr-xl)*RCONST(0.774596669241483377035853079956))
-#define W1          (RCONST(0.55555555555555555555555555555556))
-#define W2          (RCONST(0.88888888888888888888888888888889))
-#define W3          (RCONST(0.55555555555555555555555555555556))
+#define X3(xl,xr)   (HALF*(xl+xr) + HALF*(xr-xl)*SUN_RCONST(0.774596669241483377035853079956))
+#define W1          (SUN_RCONST(0.55555555555555555555555555555556))
+#define W2          (SUN_RCONST(0.88888888888888888888888888888889))
+#define W3          (SUN_RCONST(0.55555555555555555555555555555556))
 #define Quad(f1,f2,f3,xl,xr) (HALF*(xr-xl)*(W1*f1 + W2*f2 + W3*f3))
 
 /* evaluation macros for variables, basis functions and basis derivatives */
@@ -108,25 +108,25 @@
 /* user data structure */
 typedef struct {
   sunindextype N;   /* number of intervals     */
-  realtype *x;      /* mesh node locations     */
-  realtype a;       /* constant forcing on u   */
-  realtype b;       /* steady-state value of w */
-  realtype du;      /* diffusion coeff for u   */
-  realtype dv;      /* diffusion coeff for v   */
-  realtype dw;      /* diffusion coeff for w   */
-  realtype ep;      /* stiffness parameter     */
+  sunrealtype *x;      /* mesh node locations     */
+  sunrealtype a;       /* constant forcing on u   */
+  sunrealtype b;       /* steady-state value of w */
+  sunrealtype du;      /* diffusion coeff for u   */
+  sunrealtype dv;      /* diffusion coeff for v   */
+  sunrealtype dw;      /* diffusion coeff for w   */
+  sunrealtype ep;      /* stiffness parameter     */
   N_Vector tmp;     /* temporary vector        */
   SUNMatrix R;      /* temporary storage       */
 } *UserData;
 
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f_diff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f_rx(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private helper functions  */
@@ -140,21 +140,21 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[]) {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);            /* initial time */
-  realtype Tf = RCONST(10.0);           /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);            /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);           /* final time */
   int Nt = 100;                         /* total number of output times */
   int Nvar = 3;                         /* number of solution fields */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;                 /* spatial mesh size */
-  realtype a = RCONST(0.6);             /* problem parameters */
-  realtype b = RCONST(2.0);
-  realtype du = RCONST(0.025);
-  realtype dv = RCONST(0.025);
-  realtype dw = RCONST(0.025);
-  realtype ep = RCONST(1.0e-5);         /* stiffness parameter */
-  realtype reltol = RCONST(1.0e-6);     /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
+  sunrealtype a = SUN_RCONST(0.6);             /* problem parameters */
+  sunrealtype b = SUN_RCONST(2.0);
+  sunrealtype du = SUN_RCONST(0.025);
+  sunrealtype dv = SUN_RCONST(0.025);
+  sunrealtype dw = SUN_RCONST(0.025);
+  sunrealtype ep = SUN_RCONST(1.0e-5);         /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);     /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
   sunindextype i, NEQ, NNZ;
   int num_threads;
 
@@ -170,7 +170,7 @@ int main(int argc, char *argv[]) {
   SUNLinearSolver MLS = NULL; /* empty mass matrix solver object */
   void *arkode_mem = NULL;
   FILE *FID, *UFID, *VFID, *WFID;
-  realtype h, z, t, dTout, tout, u, v, w, pi;
+  sunrealtype h, z, t, dTout, tout, u, v, w, pi;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nni, ncfn;
   long int netf, nmset, nms, nMv;
@@ -236,20 +236,20 @@ int main(int argc, char *argv[]) {
   data = N_VGetArrayPointer(y);     /* Access data array for new NVector y */
   if (check_retval((void *)data, "N_VGetArrayPointer", 0)) return(1);
 
-  udata->x = (realtype *) malloc(N*sizeof(realtype));
+  udata->x = (sunrealtype *) malloc(N*sizeof(sunrealtype));
   if (check_retval((void *)udata->x, "malloc", 2)) return(1);
-  h = RCONST(10.0)/(N-1);
+  h = SUN_RCONST(10.0)/(N-1);
   for (i=0; i<N; i++) {
-    z = -RCONST(5.0) + h*i;
-    udata->x[i] = HALF/atan(RCONST(5.0))*atan(z) + HALF;
+    z = -SUN_RCONST(5.0) + h*i;
+    udata->x[i] = HALF/atan(SUN_RCONST(5.0))*atan(z) + HALF;
   }
 
   /* Set initial conditions into y */
-  pi = RCONST(4.0)*atan(RCONST(1.0));
+  pi = SUN_RCONST(4.0)*atan(SUN_RCONST(1.0));
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*udata->x[i]);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*udata->x[i]);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*udata->x[i]);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*udata->x[i]);  /* w */
   }
 
   /* Set mask array values for each solution component */
@@ -450,7 +450,7 @@ int main(int argc, char *argv[]) {
 /* Routine to compute the ODE RHS function f(t,y), where system is of the form
         M y_t = f(t,y) := Ly + R(y)
    This routine only computes the f(t,y), leaving (M y_t) alone. */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
   /* local data */
   int ier;
@@ -471,23 +471,23 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
 
 /* Routine to compute the diffusion portion of the ODE RHS function f(t,y). */
-static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f_diff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   /* problem data */
   UserData udata = (UserData) user_data;
 
   /* shortcuts to number of intervals, background values */
   sunindextype N = udata->N;
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
 
   /* local variables */
   sunindextype i;
-  realtype ul, ur, vl, vr, wl, wr;
-  realtype xl, xr, f1;
-  booleantype left, right;
-  realtype *Ydata, *RHSdata;
+  sunrealtype ul, ur, vl, vr, wl, wr;
+  sunrealtype xl, xr, f1;
+  sunbooleantype left, right;
+  sunrealtype *Ydata, *RHSdata;
 
   /* access data arrays */
   Ydata = N_VGetArrayPointer(y);
@@ -552,23 +552,23 @@ static int f_diff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Routine to compute the reaction portion of the ODE RHS function f(t,y). */
-static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
+static int f_rx(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
   /* problem data */
   UserData udata = (UserData) user_data;
 
   /* shortcuts to number of intervals, background values */
   sunindextype N = udata->N;
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
 
   /* local variables */
   sunindextype i;
-  realtype ul, ur, vl, vr, wl, wr;
-  realtype u, v, w, xl, xr, f1, f2, f3;
-  booleantype left, right;
-  realtype *Ydata, *RHSdata;
+  sunrealtype ul, ur, vl, vr, wl, wr;
+  sunrealtype u, v, w, xl, xr, f1, f2, f3;
+  sunbooleantype left, right;
+  sunrealtype *Ydata, *RHSdata;
 
   /* access data arrays */
   Ydata = N_VGetArrayPointer(y);
@@ -698,7 +698,7 @@ static int f_rx(realtype t, N_Vector y, N_Vector ydot, void *user_data) {
 
 
 /* Interface routine to compute the Jacobian of the full RHS function, f(y) */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3) {
 
   /* temporary variables */
@@ -752,7 +752,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 
 /* Routine to compute the mass matrix multiplying y_t. */
-static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
+static int MassMatrix(sunrealtype t, SUNMatrix M, void *user_data,
                       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3) {
 
   /* user data structure */
@@ -762,13 +762,13 @@ static int MassMatrix(realtype t, SUNMatrix M, void *user_data,
   sunindextype N = udata->N, NEQ = 3*N;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(M);
   sunindextype *colinds = SUNSparseMatrix_IndexValues(M);
-  realtype *Mdata = SUNSparseMatrix_Data(M);
-  realtype *Xdata = udata->x;
+  sunrealtype *Mdata = SUNSparseMatrix_Data(M);
+  sunrealtype *Xdata = udata->x;
 
   /* local data */
   sunindextype i, nz=0;
-  realtype xl, xc, xr, Ml, Mc, Mr, ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
-  booleantype left, right;
+  sunrealtype xl, xc, xr, Ml, Mc, Mr, ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
+  sunbooleantype left, right;
 
   /* check that vector/matrix dimensions match up */
   if ((SUNSparseMatrix_Rows(M) != NEQ) || (SUNSparseMatrix_Columns(M) != NEQ) ||
@@ -891,14 +891,14 @@ static int LaplaceMatrix(SUNMatrix L, UserData udata)
   sunindextype N = udata->N;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(L);
   sunindextype *colinds = SUNSparseMatrix_IndexValues(L);
-  realtype *Ldata = SUNSparseMatrix_Data(L);
-  realtype *Xdata = udata->x;
-  realtype du = udata->du, dv = udata->dv, dw = udata->dw;
+  sunrealtype *Ldata = SUNSparseMatrix_Data(L);
+  sunrealtype *Xdata = udata->x;
+  sunrealtype du = udata->du, dv = udata->dv, dw = udata->dw;
 
   /* set local variables */
   sunindextype i, j, nz=0;
-  realtype xl, xc, xr;
-  realtype Lu[9], Lv[9], Lw[9];
+  sunrealtype xl, xc, xr;
+  sunrealtype Lu[9], Lv[9], Lw[9];
 
   /* initialize all local variables to zero (to avoid uninitialized variable warnings) */
   xl = xc = xr = 0.0;
@@ -1079,20 +1079,20 @@ static int ReactionJac(N_Vector y, SUNMatrix Jac, UserData udata)
   sunindextype N = udata->N;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(Jac);
   sunindextype *colinds = SUNSparseMatrix_IndexValues(Jac);
-  realtype *Jdata = SUNSparseMatrix_Data(Jac);
-  realtype *Xdata = udata->x;
+  sunrealtype *Jdata = SUNSparseMatrix_Data(Jac);
+  sunrealtype *Xdata = udata->x;
 
   /* set local variables */
   sunindextype i, j, nz=0;
-  realtype ep = udata->ep;
-  realtype ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr;
-  realtype u1, u2, u3, v1, v2, v3, w1, w2, w3;
-  realtype df1, df2, df3, dQdf1, dQdf2, dQdf3;
-  realtype ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
-  realtype Ju[9], Jv[9], Jw[9];
+  sunrealtype ep = udata->ep;
+  sunrealtype ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr;
+  sunrealtype u1, u2, u3, v1, v2, v3, w1, w2, w3;
+  sunrealtype df1, df2, df3, dQdf1, dQdf2, dQdf3;
+  sunrealtype ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3;
+  sunrealtype Ju[9], Jv[9], Jw[9];
 
   /* access data arrays */
-  realtype *Ydata = N_VGetArrayPointer(y);
+  sunrealtype *Ydata = N_VGetArrayPointer(y);
   if (check_retval((void *) Ydata, "N_VGetArrayPointer", 0)) return(1);
 
   /* initialize all local variables to zero (to avoid uninitialized variable warnings) */
diff --git a/examples/arkode/C_serial/ark_brusselator1D_imexmri.c b/examples/arkode/C_serial/ark_brusselator1D_imexmri.c
index 7b8f22c88f..c27b14d8d1 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_imexmri.c
+++ b/examples/arkode/C_serial/ark_brusselator1D_imexmri.c
@@ -72,7 +72,7 @@
 #include <nvector/nvector_serial.h>   /* access to Serial N_Vector */
 #include <sunmatrix/sunmatrix_band.h> /* access to band SUNMatrix */
 #include <sunlinsol/sunlinsol_band.h> /* access to band SUNLinearSolver */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype' */
 #include <sundials/sundials_math.h>   /* def. of SUNRsqrt, etc. */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -86,9 +86,9 @@
 #endif
 
 /* Define some constants */
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 /* accessor macros between (x,v) location and 1D NVector array */
 #define IDX(x,v) (3*(x)+v)
@@ -96,40 +96,40 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals     */
-  realtype dx;     /* mesh spacing            */
-  realtype a;      /* constant forcing on u   */
-  realtype b;      /* steady-state value of w */
-  realtype pi;     /* value of pi             */
-  realtype du;     /* diffusion coeff for u   */
-  realtype dv;     /* diffusion coeff for v   */
-  realtype dw;     /* diffusion coeff for w   */
-  realtype au;     /* advection coeff for u   */
-  realtype av;     /* advection coeff for v   */
-  realtype aw;     /* advection coeff for w   */
-  realtype ep;     /* stiffness parameter     */
+  sunrealtype dx;     /* mesh spacing            */
+  sunrealtype a;      /* constant forcing on u   */
+  sunrealtype b;      /* steady-state value of w */
+  sunrealtype pi;     /* value of pi             */
+  sunrealtype du;     /* diffusion coeff for u   */
+  sunrealtype dv;     /* diffusion coeff for v   */
+  sunrealtype dw;     /* diffusion coeff for w   */
+  sunrealtype au;     /* advection coeff for u   */
+  sunrealtype av;     /* advection coeff for v   */
+  sunrealtype aw;     /* advection coeff for w   */
+  sunrealtype ep;     /* stiffness parameter     */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jf(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fse(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fsi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jf(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jsi(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jsi(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Js(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Js(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private helper functions  */
 static int SetIC(N_Vector y, void *user_data);
-static int AdvectionJac(realtype c, SUNMatrix Jac, UserData udata);
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata);
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata);
+static int AdvectionJac(sunrealtype c, SUNMatrix Jac, UserData udata);
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata);
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -138,28 +138,28 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   /* general problem parameters */
-  realtype T0 = ZERO;    /* initial time                 */
-  realtype Tf = RCONST(10.0);   /* final time                   */
+  sunrealtype T0 = ZERO;    /* initial time                 */
+  sunrealtype Tf = SUN_RCONST(10.0);   /* final time                   */
   int Nt = 10;                  /* total number of output times */
-  realtype dTout = (Tf-T0)/Nt;  /* time between outputs         */
+  sunrealtype dTout = (Tf-T0)/Nt;  /* time between outputs         */
   int Nvar = 3;                 /* number of solution fields    */
   sunindextype N = 101;         /* spatial mesh size            */
-  realtype hs;                  /* slow step size       */
-  realtype m = RCONST(10.0);    /* time-scale separation factor */
+  sunrealtype hs;                  /* slow step size       */
+  sunrealtype m = SUN_RCONST(10.0);    /* time-scale separation factor */
   int solve_type;               /* solver configuration */
-  realtype dx = ONE/(N-1);      /* set spatial mesh spacing     */
-  realtype a = 0.6;             /* problem parameters           */
-  realtype b = 2.0;
-  realtype pi = RCONST(4.0)*atan(ONE);
-  realtype du = 0.01;
-  realtype dv = 0.01;
-  realtype dw = 0.01;
-  realtype au = -0.001;
-  realtype av = -0.001;
-  realtype aw = -0.001;
-  realtype ep = 1.0e-2;         /* stiffness parameter          */
-  realtype reltol = 1.0e-12;    /* tolerances                   */
-  realtype abstol = 1.0e-14;
+  sunrealtype dx = ONE/(N-1);      /* set spatial mesh spacing     */
+  sunrealtype a = 0.6;             /* problem parameters           */
+  sunrealtype b = 2.0;
+  sunrealtype pi = SUN_RCONST(4.0)*atan(ONE);
+  sunrealtype du = 0.01;
+  sunrealtype dv = 0.01;
+  sunrealtype dw = 0.01;
+  sunrealtype au = -0.001;
+  sunrealtype av = -0.001;
+  sunrealtype aw = -0.001;
+  sunrealtype ep = 1.0e-2;         /* stiffness parameter          */
+  sunrealtype reltol = 1.0e-12;    /* tolerances                   */
+  sunrealtype abstol = 1.0e-14;
 
   /* general problem variables */
   int retval;                               /* reusable return flag          */
@@ -173,14 +173,14 @@ int main(int argc, char *argv[])
   SUNLinearSolver LSf = NULL;               /* fast linear solver object     */
   SUNMatrix As = NULL;                      /* matrix for slow solver        */
   SUNLinearSolver LSs = NULL;               /* slow linear solver object     */
-  booleantype implicit_slow;
-  booleantype imex_slow = SUNFALSE;
+  sunbooleantype implicit_slow;
+  sunbooleantype imex_slow = SUNFALSE;
   N_Vector umask = NULL;                    /* empty mask vectors            */
   N_Vector vmask = NULL;
   N_Vector wmask = NULL;
-  realtype t, tout;                         /* current/output time data      */
-  realtype hf;                              /* fast time step                */
-  realtype u, v, w;                         /* temp data values              */
+  sunrealtype t, tout;                         /* current/output time data      */
+  sunrealtype hf;                              /* fast time step                */
+  sunrealtype u, v, w;                         /* temp data values              */
   FILE *FID, *UFID, *VFID, *WFID;           /* output file pointers          */
   int iout;                                 /* output counter                */
   long int nsts, nstf;                      /* step stats                    */
@@ -189,8 +189,8 @@ int main(int argc, char *argv[])
   sunindextype NEQ;                         /* number of equations           */
   sunindextype i;                           /* counter                       */
   UserData udata = NULL;                    /* user data pointer             */
-  realtype* data = NULL;                    /* array for vector data         */
-  realtype  gamma, beta;
+  sunrealtype* data = NULL;                    /* array for vector data         */
+  sunrealtype  gamma, beta;
   char ofname[50]="";
 
   /* Create the SUNDIALS context object for this simulation. */
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
     return(-1);
   }
   solve_type = (sunindextype) atol(argv[1]);
-  hs = (realtype) atof(argv[2]);
+  hs = (sunrealtype) atof(argv[2]);
 
 
   /* Check arguments for validity */
@@ -339,17 +339,17 @@ int main(int argc, char *argv[])
   N_VConst(0.0, umask);
   data = N_VGetArrayPointer(umask);
   if (check_retval((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,0)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,0)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, vmask);
   data = N_VGetArrayPointer(vmask);
   if (check_retval((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,1)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,1)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, wmask);
   data = N_VGetArrayPointer(wmask);
   if (check_retval((void *)data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,2)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,2)] = SUN_RCONST(1.0);
 
   /*
    * Create the fast integrator and set options
@@ -366,18 +366,18 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    beta  = SUNRsqrt(RCONST(3.0))/RCONST(6.0) + RCONST(0.5);
-    gamma = (-ONE/RCONST(8.0))*(SUNRsqrt(RCONST(3.0))+ONE);
-    B->A[1][0] = RCONST(4.0)*gamma+TWO*beta;
-    B->A[1][1] = ONE-RCONST(4.0)*gamma-TWO*beta;
-    B->A[2][0] = RCONST(0.5)-beta-gamma;
+    beta  = SUNRsqrt(SUN_RCONST(3.0))/SUN_RCONST(6.0) + SUN_RCONST(0.5);
+    gamma = (-ONE/SUN_RCONST(8.0))*(SUNRsqrt(SUN_RCONST(3.0))+ONE);
+    B->A[1][0] = SUN_RCONST(4.0)*gamma+TWO*beta;
+    B->A[1][1] = ONE-SUN_RCONST(4.0)*gamma-TWO*beta;
+    B->A[2][0] = SUN_RCONST(0.5)-beta-gamma;
     B->A[2][1] = gamma;
     B->A[2][2] = beta;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = ONE/RCONST(6.0);
-    B->b[2] = TWO/RCONST(3.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = ONE/SUN_RCONST(6.0);
+    B->b[2] = TWO/SUN_RCONST(3.0);
     B->c[1] = ONE;
-    B->c[2] = RCONST(0.5);
+    B->c[2] = SUN_RCONST(0.5);
     B->q=3;
     retval = ARKStepSetTables(inner_arkode_mem, 3, 0, B, NULL);
     if (check_retval(&retval, "ARKStepSetTables", 1)) return 1;
@@ -438,14 +438,14 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNTRUE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
     B->A[2][0] = -ONE;
     B->A[2][1] = TWO;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = TWO/RCONST(3.0);
-    B->b[2] = ONE/RCONST(6.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = TWO/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(6.0);
     B->d[1] = ONE;
-    B->c[1] = RCONST(0.5);
+    B->c[1] = SUN_RCONST(0.5);
     B->c[2] = ONE;
     B->q=3;
     B->p=2;
@@ -457,15 +457,15 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(4, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
-    B->A[2][1] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
+    B->A[2][1] = SUN_RCONST(0.5);
     B->A[3][2] = ONE;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = ONE/RCONST(3.0);
-    B->b[2] = ONE/RCONST(3.0);
-    B->b[3] = ONE/RCONST(6.0);
-    B->c[1] = RCONST(0.5);
-    B->c[2] = RCONST(0.5);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = ONE/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(3.0);
+    B->b[3] = ONE/SUN_RCONST(6.0);
+    B->c[1] = SUN_RCONST(0.5);
+    B->c[2] = SUN_RCONST(0.5);
     B->c[3] = ONE;
     B->q=4;
     retval = ARKStepSetTables(inner_arkode_mem, 4, 0, NULL, B);
@@ -534,10 +534,10 @@ int main(int argc, char *argv[])
     if (check_retval((void *)arkode_mem, "MRIStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(2, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = TWO/RCONST(3.0);
-    B->b[0] = RCONST(0.25);
-    B->b[1] = RCONST(0.75);
-    B->c[1] = TWO/RCONST(3.0);
+    B->A[1][0] = TWO/SUN_RCONST(3.0);
+    B->b[0] = SUN_RCONST(0.25);
+    B->b[1] = SUN_RCONST(0.75);
+    B->c[1] = TWO/SUN_RCONST(3.0);
     B->q=2;
     C = MRIStepCoupling_MIStoMRI(B, 2, 0);
     if (check_retval((void *)C, "MRIStepCoupling_MIStoMRI", 0)) return 1;
@@ -819,15 +819,15 @@ int main(int argc, char *argv[])
  *------------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype u, v, w;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype u, v, w;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -862,16 +862,16 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fse routine to compute the slow-explicit portion of the ODE RHS function. */
-static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fse(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype au = udata->au;
-  realtype av = udata->av;
-  realtype aw = udata->aw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype auconst, avconst, awconst, ul, ur, vl, vr, wl, wr;
+  sunrealtype au = udata->au;
+  sunrealtype av = udata->av;
+  sunrealtype aw = udata->aw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype auconst, avconst, awconst, ul, ur, vl, vr, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -881,9 +881,9 @@ static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   N_VConst(0.0, ydot);                        /* initialize ydot to zero */
 
   /* iterate over domain, computing all equations */
-  auconst = -au/RCONST(2.0)/dx;
-  avconst = -av/RCONST(2.0)/dx;
-  awconst = -aw/RCONST(2.0)/dx;
+  auconst = -au/SUN_RCONST(2.0)/dx;
+  avconst = -av/SUN_RCONST(2.0)/dx;
+  awconst = -aw/SUN_RCONST(2.0)/dx;
   for (i=1; i<N-1; i++) {
     /* set shortcuts */
     ul = Ydata[IDX(i-1,0)];  ur = Ydata[IDX(i+1,0)];
@@ -909,16 +909,16 @@ static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fsi routine to compute the slow-implicit portion of the  ODE RHS. */
-static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fsi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype duconst, dvconst, dwconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype duconst, dvconst, dwconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -938,13 +938,13 @@ static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
     w = Ydata[IDX(i,2)];  wl = Ydata[IDX(i-1,2)];  wr = Ydata[IDX(i+1,2)];
 
     /* Fill in ODE RHS for u */
-    dYdata[IDX(i,0)] = (ul - RCONST(2.0)*u + ur)*duconst;
+    dYdata[IDX(i,0)] = (ul - SUN_RCONST(2.0)*u + ur)*duconst;
 
     /* Fill in ODE RHS for v */
-    dYdata[IDX(i,1)] = (vl - RCONST(2.0)*v + vr)*dvconst;
+    dYdata[IDX(i,1)] = (vl - SUN_RCONST(2.0)*v + vr)*dvconst;
 
     /* Fill in ODE RHS for w */
-    dYdata[IDX(i,2)] = (wl - RCONST(2.0)*w + wr)*dwconst;
+    dYdata[IDX(i,2)] = (wl - SUN_RCONST(2.0)*w + wr)*dwconst;
   }
 
   /* enforce stationary boundaries */
@@ -956,19 +956,19 @@ static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
-  realtype au = udata->au;
-  realtype av = udata->av;
-  realtype aw = udata->aw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype duconst, dvconst, dwconst, auconst, avconst, awconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
+  sunrealtype au = udata->au;
+  sunrealtype av = udata->av;
+  sunrealtype aw = udata->aw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype duconst, dvconst, dwconst, auconst, avconst, awconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -1009,22 +1009,22 @@ static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* f routine to compute the full ODE RHS function. */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                  /* set variable shortcuts */
-  realtype a  = udata->a;
-  realtype b  = udata->b;
-  realtype ep = udata->ep;
-  realtype du = udata->du;
-  realtype dv = udata->dv;
-  realtype dw = udata->dw;
-  realtype au = udata->au;
-  realtype av = udata->av;
-  realtype aw = udata->aw;
-  realtype dx = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype duconst, dvconst, dwconst, auconst, avconst, awconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype a  = udata->a;
+  sunrealtype b  = udata->b;
+  sunrealtype ep = udata->ep;
+  sunrealtype du = udata->du;
+  sunrealtype dv = udata->dv;
+  sunrealtype dw = udata->dw;
+  sunrealtype au = udata->au;
+  sunrealtype av = udata->av;
+  sunrealtype aw = udata->aw;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype duconst, dvconst, dwconst, auconst, avconst, awconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -1037,9 +1037,9 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   duconst = du/dx/dx;
   dvconst = dv/dx/dx;
   dwconst = dw/dx/dx;
-  auconst = -au/RCONST(2.0)/dx;
-  avconst = -av/RCONST(2.0)/dx;
-  awconst = -aw/RCONST(2.0)/dx;
+  auconst = -au/SUN_RCONST(2.0)/dx;
+  avconst = -av/SUN_RCONST(2.0)/dx;
+  awconst = -aw/SUN_RCONST(2.0)/dx;
   for (i=1; i<N-1; i++) {
     /* set shortcuts */
     u = Ydata[IDX(i,0)];  ul = Ydata[IDX(i-1,0)];  ur = Ydata[IDX(i+1,0)];
@@ -1047,13 +1047,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
     w = Ydata[IDX(i,2)];  wl = Ydata[IDX(i-1,2)];  wr = Ydata[IDX(i+1,2)];
 
     /* Fill in ODE RHS for u */
-    dYdata[IDX(i,0)] = (ul - RCONST(2.0)*u + ur)*duconst + (ur - ul)*auconst +  a - (w+RCONST(1.0))*u + v*u*u;
+    dYdata[IDX(i,0)] = (ul - SUN_RCONST(2.0)*u + ur)*duconst + (ur - ul)*auconst +  a - (w+SUN_RCONST(1.0))*u + v*u*u;
 
     /* Fill in ODE RHS for v */
-    dYdata[IDX(i,1)] = (vl - RCONST(2.0)*v + vr)*dvconst + (vr - vl)*avconst +  w*u - v*u*u;
+    dYdata[IDX(i,1)] = (vl - SUN_RCONST(2.0)*v + vr)*dvconst + (vr - vl)*avconst +  w*u - v*u*u;
 
     /* Fill in ODE RHS for w */
-    dYdata[IDX(i,2)] = (wl - RCONST(2.0)*w + wr)*dwconst + (wr - wl)*awconst + (b-w)/ep - w*u;
+    dYdata[IDX(i,2)] = (wl - SUN_RCONST(2.0)*w + wr)*dwconst + (wr - wl)*awconst + (b-w)/ep - w*u;
   }
 
   /* enforce stationary boundaries */
@@ -1065,72 +1065,72 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Placeholder function of zeroes */
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   N_VConst(ZERO,ydot);
   return(0);
 }
 
 /* Jf routine to compute Jacobian of the fast portion of the ODE RHS */
-static int Jf(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jf(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData udata = (UserData) user_data;     /* access problem data         */
   SUNMatZero(J);                             /* Initialize Jacobian to zero */
 
   /* Add in the Jacobian of the reaction terms matrix */
-  ReactionJac(RCONST(1.0), y, J, udata);
+  ReactionJac(SUN_RCONST(1.0), y, J, udata);
 
   /* Return with success */
   return 0;
 }
 
 /* Jsi routine to compute the Jacobian of the slow-implicit portion of the ODE RHS. */
-static int Jsi(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jsi(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData udata = (UserData) user_data;     /* access problem data */
   SUNMatZero(J);                             /* Initialize Jacobian to zero */
 
   /* Fill in the Laplace matrix */
-  LaplaceMatrix(RCONST(1.0), J, udata);
+  LaplaceMatrix(SUN_RCONST(1.0), J, udata);
 
   /* Return with success */
   return 0;
 }
 
 /* Js routine to compute the Jacobian of the slow portion of ODE RHS. */
-static int Js(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Js(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData udata = (UserData) user_data;     /* access problem data         */
   SUNMatZero(J);                             /* Initialize Jacobian to zero */
 
   /* Fill in the Laplace matrix */
-  LaplaceMatrix(RCONST(1.0), J, udata);
+  LaplaceMatrix(SUN_RCONST(1.0), J, udata);
 
   /* Add Jacobian of the advection terms  */
-  AdvectionJac(RCONST(1.0), J, udata);
+  AdvectionJac(SUN_RCONST(1.0), J, udata);
 
   /* Return with success */
   return 0;
 }
 
 /* Jac routine to compute the Jacobian of the full ODE RHS. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData udata = (UserData) user_data;     /* access problem data         */
   SUNMatZero(J);                             /* Initialize Jacobian to zero */
 
   /* Fill in the Laplace matrix */
-  LaplaceMatrix(RCONST(1.0), J, udata);
+  LaplaceMatrix(SUN_RCONST(1.0), J, udata);
 
   /* Add Jacobian of the advection terms  */
-  AdvectionJac(RCONST(1.0), J, udata);
+  AdvectionJac(SUN_RCONST(1.0), J, udata);
 
   /* Add in the Jacobian of the reaction terms matrix */
-  ReactionJac(RCONST(1.0), y, J, udata);
+  ReactionJac(SUN_RCONST(1.0), y, J, udata);
 
   /* Return with success */
   return 0;
@@ -1147,11 +1147,11 @@ static int SetIC(N_Vector y, void *user_data)
 {
   UserData     udata = (UserData) user_data;  /* access problem data    */
   sunindextype N     = udata->N;              /* set variable shortcuts */
-  realtype     a     = udata->a;
-  realtype     b     = udata->b;
-  realtype     dx    = udata->dx;
-  realtype     pi    = udata->pi;
-  realtype*    data  = NULL;
+  sunrealtype     a     = udata->a;
+  sunrealtype     b     = udata->b;
+  sunrealtype     dx    = udata->dx;
+  sunrealtype     pi    = udata->pi;
+  sunrealtype*    data  = NULL;
   sunindextype i;
 
   /* Access data array from NVector y */
@@ -1159,9 +1159,9 @@ static int SetIC(N_Vector y, void *user_data)
 
   /* Set initial conditions into y */
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*i*dx);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*i*dx);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*i*dx);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*i*dx);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*i*dx);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*i*dx);  /* w */
   }
 
   /* Return  with success */
@@ -1170,16 +1170,16 @@ static int SetIC(N_Vector y, void *user_data)
 
 /* Routine to compute the Jacobian matrix from fse(t,y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int AdvectionJac(realtype c, SUNMatrix Jac, UserData udata)
+static int AdvectionJac(sunrealtype c, SUNMatrix Jac, UserData udata)
 {
   /* Set shortcuts */
   sunindextype N = udata->N;
-  realtype dx    = udata->dx;
-  realtype au = udata->au;
-  realtype av = udata->av;
-  realtype aw = udata->aw;
+  sunrealtype dx    = udata->dx;
+  sunrealtype au = udata->au;
+  sunrealtype av = udata->av;
+  sunrealtype aw = udata->aw;
   sunindextype i;
-  realtype auconst, avconst, awconst;
+  sunrealtype auconst, avconst, awconst;
   auconst = -au/TWO/dx;
   avconst = -av/TWO/dx;
   awconst = -aw/TWO/dx;
@@ -1201,10 +1201,10 @@ static int AdvectionJac(realtype c, SUNMatrix Jac, UserData udata)
 
 /* Routine to compute the stiffness matrix from (L*y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
+static int LaplaceMatrix(sunrealtype c, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;           /* set shortcuts */
-  realtype dx    = udata->dx;
+  sunrealtype dx    = udata->dx;
   sunindextype i;
 
   /* iterate over intervals, filling in Jacobian of (L*y) using SM_ELEMENT_B
@@ -1213,9 +1213,9 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i-1,0)) += c*udata->du/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i-1,1)) += c*udata->dv/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i-1,2)) += c*udata->dw/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += -c*RCONST(2.0)*udata->du/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) += -c*RCONST(2.0)*udata->dv/dx/dx;
-    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += -c*RCONST(2.0)*udata->dw/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,0),IDX(i,0)) += -c*SUN_RCONST(2.0)*udata->du/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,1),IDX(i,1)) += -c*SUN_RCONST(2.0)*udata->dv/dx/dx;
+    SM_ELEMENT_B(Jac,IDX(i,2),IDX(i,2)) += -c*SUN_RCONST(2.0)*udata->dw/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,0),IDX(i+1,0)) += c*udata->du/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,1),IDX(i+1,1)) += c*udata->dv/dx/dx;
     SM_ELEMENT_B(Jac,IDX(i,2),IDX(i+1,2)) += c*udata->dw/dx/dx;
@@ -1227,13 +1227,13 @@ static int LaplaceMatrix(realtype c, SUNMatrix Jac, UserData udata)
 
 /* Routine to compute the Jacobian matrix from R(y), scaled by the factor c.
    We add the result into Jac and do not erase what was already there */
-static int ReactionJac(realtype c, N_Vector y, SUNMatrix Jac, UserData udata)
+static int ReactionJac(sunrealtype c, N_Vector y, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;                      /* set shortcuts */
-  realtype ep = udata->ep;
+  sunrealtype ep = udata->ep;
   sunindextype i;
-  realtype u, v, w;
-  realtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
+  sunrealtype u, v, w;
+  sunrealtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
   if (check_retval((void *)Ydata, "N_VGetArrayPointer", 0)) return 1;
 
   /* iterate over nodes, filling in Jacobian of reaction terms */
diff --git a/examples/arkode/C_serial/ark_brusselator1D_klu.c b/examples/arkode/C_serial/ark_brusselator1D_klu.c
index 10bd50c840..8063885913 100644
--- a/examples/arkode/C_serial/ark_brusselator1D_klu.c
+++ b/examples/arkode/C_serial/ark_brusselator1D_klu.c
@@ -55,7 +55,7 @@
 #include <nvector/nvector_serial.h>      /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_sparse.h>  /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>     /* access to KLU SUNLinearSolver        */
-#include <sundials/sundials_types.h>     /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>     /* defs. of sunrealtype, sunindextype, etc */
 #include <sundials/sundials_math.h>      /* def. of SUNRsqrt, etc.               */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -72,26 +72,26 @@
 #define IDX(x,v) (3*(x)+v)
 
 /* constants */
-#define ONE (RCONST(1.0))
-#define TWO (RCONST(2.0))
+#define ONE (SUN_RCONST(1.0))
+#define TWO (SUN_RCONST(2.0))
 
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals     */
-  realtype dx;     /* mesh spacing            */
-  realtype a;      /* constant forcing on u   */
-  realtype b;      /* steady-state value of w */
-  realtype du;     /* diffusion coeff for u   */
-  realtype dv;     /* diffusion coeff for v   */
-  realtype dw;     /* diffusion coeff for w   */
-  realtype ep;     /* stiffness parameter     */
+  sunrealtype dx;     /* mesh spacing            */
+  sunrealtype a;      /* constant forcing on u   */
+  sunrealtype b;      /* steady-state value of w */
+  sunrealtype du;     /* diffusion coeff for u   */
+  sunrealtype dv;     /* diffusion coeff for v   */
+  sunrealtype dw;     /* diffusion coeff for w   */
+  sunrealtype ep;     /* stiffness parameter     */
   SUNMatrix R;     /* temporary storage       */
 } *UserData;
 
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
@@ -106,21 +106,21 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);    /* initial time */
-  realtype Tf = RCONST(10.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);    /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);   /* final time */
   int Nt = 10;                  /* total number of output times */
   int Nvar = 3;
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;         /* spatial mesh size */
-  realtype a = 0.6;             /* problem parameters */
-  realtype b = 2.0;
-  realtype du = 0.025;
-  realtype dv = 0.025;
-  realtype dw = 0.025;
-  realtype ep = 1.0e-5;         /* stiffness parameter */
-  realtype reltol = 1.0e-6;     /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype a = 0.6;             /* problem parameters */
+  sunrealtype b = 2.0;
+  sunrealtype du = 0.025;
+  sunrealtype dv = 0.025;
+  sunrealtype dw = 0.025;
+  sunrealtype ep = 1.0e-5;         /* stiffness parameter */
+  sunrealtype reltol = 1.0e-6;     /* tolerances */
+  sunrealtype abstol = 1.0e-10;
   sunindextype NEQ, i, NNZ;
 
   /* general problem variables */
@@ -132,12 +132,12 @@ int main()
   SUNMatrix A = NULL;           /* empty matrix object for solver */
   SUNLinearSolver LS = NULL;    /* empty linear solver object */
   void *arkode_mem = NULL;
-  realtype pi;
+  sunrealtype pi;
   FILE *FID, *UFID, *VFID, *WFID;
-  realtype t = T0;
-  realtype dTout = (Tf-T0)/Nt;
-  realtype tout = T0+dTout;
-  realtype u, v, w;
+  sunrealtype t = T0;
+  sunrealtype dTout = (Tf-T0)/Nt;
+  sunrealtype tout = T0+dTout;
+  sunrealtype u, v, w;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nni, ncfn, netf;
 
@@ -186,15 +186,15 @@ int main()
   if (check_flag((void *)wmask, "N_VClone", 0)) return 1;
 
   /* Set initial conditions into y */
-  udata->dx = RCONST(1.0)/(N-1);    /* set spatial mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(N-1);    /* set spatial mesh spacing */
   data = N_VGetArrayPointer(y);     /* Access data array for new NVector y */
   if (check_flag((void *)data, "N_VGetArrayPointer", 0)) return 1;
 
-  pi = RCONST(4.0)*atan(ONE);
+  pi = SUN_RCONST(4.0)*atan(ONE);
   for (i=0; i<N; i++) {
-    data[IDX(i,0)] =  a  + RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
-    data[IDX(i,1)] = b/a + RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
-    data[IDX(i,2)] =  b  + RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
+    data[IDX(i,0)] =  a  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* u */
+    data[IDX(i,1)] = b/a + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* v */
+    data[IDX(i,2)] =  b  + SUN_RCONST(0.1)*sin(pi*i*udata->dx);  /* w */
   }
 
   /* Set mask array values for each solution component */
@@ -346,19 +346,19 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;      /* access problem data */
   sunindextype N = udata->N;                     /* set variable shortcuts */
-  realtype a     = udata->a;
-  realtype b     = udata->b;
-  realtype ep    = udata->ep;
-  realtype du    = udata->du;
-  realtype dv    = udata->dv;
-  realtype dw    = udata->dw;
-  realtype dx    = udata->dx;
-  realtype *Ydata=NULL, *dYdata=NULL;
-  realtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
+  sunrealtype a     = udata->a;
+  sunrealtype b     = udata->b;
+  sunrealtype ep    = udata->ep;
+  sunrealtype du    = udata->du;
+  sunrealtype dv    = udata->dv;
+  sunrealtype dw    = udata->dw;
+  sunrealtype dx    = udata->dx;
+  sunrealtype *Ydata=NULL, *dYdata=NULL;
+  sunrealtype uconst, vconst, wconst, u, ul, ur, v, vl, vr, w, wl, wr;
   sunindextype i;
 
   Ydata = N_VGetArrayPointer(y);     /* access data arrays */
@@ -398,7 +398,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* problem data */
@@ -457,10 +457,10 @@ static int LaplaceMatrix(SUNMatrix Lap, UserData udata)
 {
   sunindextype N = udata->N;  /* set shortcuts */
   sunindextype i, nz=0;
-  realtype uconst, uconst2, vconst, vconst2, wconst, wconst2;
+  sunrealtype uconst, uconst2, vconst, vconst2, wconst, wconst2;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(Lap);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(Lap);
-  realtype *data = SUNSparseMatrix_Data(Lap);
+  sunrealtype *data = SUNSparseMatrix_Data(Lap);
 
   /* clear out matrix */
   SUNMatZero(Lap);
@@ -544,12 +544,12 @@ static int ReactionJac(N_Vector y, SUNMatrix Jac, UserData udata)
 {
   sunindextype N = udata->N;                   /* set shortcuts */
   sunindextype i, nz=0;
-  realtype u, v, w;
-  realtype ep = udata->ep;
+  sunrealtype u, v, w;
+  sunrealtype ep = udata->ep;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(Jac);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(Jac);
-  realtype *data = SUNSparseMatrix_Data(Jac);
-  realtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
+  sunrealtype *data = SUNSparseMatrix_Data(Jac);
+  sunrealtype *Ydata = N_VGetArrayPointer(y);     /* access solution array */
   if (check_flag((void *) Ydata, "N_VGetArrayPointer", 0)) return 1;
 
   /* clear out matrix */
diff --git a/examples/arkode/C_serial/ark_brusselator_1D_mri.c b/examples/arkode/C_serial/ark_brusselator_1D_mri.c
index 1070cd72df..86445d02f8 100644
--- a/examples/arkode/C_serial/ark_brusselator_1D_mri.c
+++ b/examples/arkode/C_serial/ark_brusselator_1D_mri.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_serial.h>   /* access to Serial N_Vector */
 #include <sunmatrix/sunmatrix_band.h> /* access to band SUNMatrix */
 #include <sunlinsol/sunlinsol_band.h> /* access to band SUNLinearSolver */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype' */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype' */
 #include <sundials/sundials_math.h>   /* def. of SUNRsqrt, etc. */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -74,9 +74,9 @@
 #endif
 
 /* Define some constants */
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 /* accessor macros between (x,v) location and 1D NVector array */
 #define IDX(x,v) (3*(x)+v)
@@ -84,17 +84,17 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals      */
-  realtype dx;     /* mesh spacing             */
-  realtype a;      /* constant forcing on u    */
-  realtype b;      /* steady-state value of w  */
-  realtype c;      /* advection coefficient    */
-  realtype ep;     /* stiffness parameter      */
+  sunrealtype dx;     /* mesh spacing             */
+  sunrealtype a;      /* constant forcing on u    */
+  sunrealtype b;      /* steady-state value of w  */
+  sunrealtype c;      /* advection coefficient    */
+  sunrealtype ep;     /* stiffness parameter      */
 } *UserData;
 
 /* user-provided functions called by the integrator */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jf(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jf(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
               void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* function for setting initial condition */
@@ -108,20 +108,20 @@ static int check_retval(void *flagvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   /* general problem parameters */
-  realtype     T0     = RCONST(0.0);      /* initial time                    */
-  realtype     Tf     = RCONST(10.0);     /* final time                      */
+  sunrealtype     T0     = SUN_RCONST(0.0);      /* initial time                    */
+  sunrealtype     Tf     = SUN_RCONST(10.0);     /* final time                      */
   int          Nt     = 100;              /* total number of output times    */
   int          Nvar   = 3;                /* number of solution fields       */
   sunindextype N      = 200;              /* spatial mesh size (N intervals) */
-  realtype     a      = RCONST(1.0);      /* problem parameters              */
-  realtype     b      = RCONST(3.5);
-  realtype     c      = RCONST(0.25);
-  realtype     ep     = RCONST(1.0e-6);   /* stiffness parameter */
-  realtype     reltol = RCONST(1.0e-6);   /* tolerances          */
-  realtype     abstol = RCONST(1.0e-10);
+  sunrealtype     a      = SUN_RCONST(1.0);      /* problem parameters              */
+  sunrealtype     b      = SUN_RCONST(3.5);
+  sunrealtype     c      = SUN_RCONST(0.25);
+  sunrealtype     ep     = SUN_RCONST(1.0e-6);   /* stiffness parameter */
+  sunrealtype     reltol = SUN_RCONST(1.0e-6);   /* tolerances          */
+  sunrealtype     abstol = SUN_RCONST(1.0e-10);
 
   /* general problem variables */
-  realtype hs;                              /* slow step size                 */
+  sunrealtype hs;                              /* slow step size                 */
   int retval;                               /* reusable return flag           */
   N_Vector y = NULL;                        /* empty solution vector          */
   N_Vector umask = NULL;                    /* empty mask vectors             */
@@ -132,8 +132,8 @@ int main(int argc, char *argv[])
   void *arkode_mem = NULL;                  /* empty ARKode memory structure  */
   void *inner_arkode_mem = NULL;            /* empty ARKode memory structure  */
   MRIStepInnerStepper inner_stepper = NULL; /* inner stepper                  */
-  realtype t, dTout, tout;                  /* current/output time data       */
-  realtype u, v, w;                         /* temp data values               */
+  sunrealtype t, dTout, tout;                  /* current/output time data       */
+  sunrealtype u, v, w;                         /* temp data values               */
   FILE *FID, *UFID, *VFID, *WFID;           /* output file pointers           */
   int iout;                                 /* output counter                 */
   long int nsts, nstf, nstf_a, netf;        /* step stats                     */
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
   sunindextype NEQ;                         /* number of equations            */
   sunindextype i;                           /* counter                        */
   UserData udata = NULL;                    /* user data pointer              */
-  realtype* data  = NULL;                   /* array for vector data          */
+  sunrealtype* data  = NULL;                   /* array for vector data          */
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -160,13 +160,13 @@ int main(int argc, char *argv[])
   udata->b  = b;
   udata->c  = c;
   udata->ep = ep;
-  udata->dx = RCONST(1.0)/N; /* periodic BC, divide by N not N-1 */
+  udata->dx = SUN_RCONST(1.0)/N; /* periodic BC, divide by N not N-1 */
 
   /* set total allocated vector length */
   NEQ = Nvar*udata->N;
 
   /* set the slow step size */
-  hs = RCONST(0.5)*(udata->dx / SUNRabs(c));
+  hs = SUN_RCONST(0.5)*(udata->dx / SUNRabs(c));
 
   /* Initial problem output */
   printf("\n1D Advection-Reaction example problem:\n");
@@ -198,17 +198,17 @@ int main(int argc, char *argv[])
   N_VConst(0.0, umask);
   data = N_VGetArrayPointer(umask);
   if (check_retval((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,0)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,0)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, vmask);
   data = N_VGetArrayPointer(vmask);
   if (check_retval((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,1)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,1)] = SUN_RCONST(1.0);
 
   N_VConst(0.0, wmask);
   data = N_VGetArrayPointer(wmask);
   if (check_retval((void *) data, "N_VGetArrayPointer", 0)) return 1;
-  for (i=0; i<N; i++)  data[IDX(i,2)] = RCONST(1.0);
+  for (i=0; i<N; i++)  data[IDX(i,2)] = SUN_RCONST(1.0);
 
   /*
    * Create the fast integrator and set options
@@ -401,16 +401,16 @@ int main(int argc, char *argv[])
 
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData     udata  = (UserData) user_data;  /* access problem data    */
   sunindextype N      = udata->N;              /* set variable shortcuts */
-  realtype     a      = udata->a;
-  realtype     b      = udata->b;
-  realtype     ep     = udata->ep;
-  realtype*    Ydata  = NULL;
-  realtype*    dYdata = NULL;
-  realtype     u, v, w;
+  sunrealtype     a      = udata->a;
+  sunrealtype     b      = udata->b;
+  sunrealtype     ep     = udata->ep;
+  sunrealtype*    Ydata  = NULL;
+  sunrealtype*    dYdata = NULL;
+  sunrealtype     u, v, w;
   sunindextype i;
 
   /* access data arrays */
@@ -445,15 +445,15 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData     udata  = (UserData) user_data;  /* access problem data    */
   sunindextype N      = udata->N;              /* set variable shortcuts */
-  realtype     c      = udata->c;
-  realtype     dx     = udata->dx;
-  realtype*    Ydata  = NULL;
-  realtype*    dYdata = NULL;
-  realtype     tmp;
+  sunrealtype     c      = udata->c;
+  sunrealtype     dx     = udata->dx;
+  sunrealtype*    Ydata  = NULL;
+  sunrealtype*    dYdata = NULL;
+  sunrealtype     tmp;
   sunindextype i;
 
   /* access data arrays */
@@ -510,15 +510,15 @@ static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Js routine to compute the Jacobian of the fast portion of the ODE RHS. */
-static int Jf(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+static int Jf(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
               void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData     udata = (UserData) user_data;  /* access problem data */
   sunindextype N     = udata->N;              /* set shortcuts */
-  realtype     ep    = udata->ep;
+  sunrealtype     ep    = udata->ep;
   sunindextype i;
-  realtype     u, v, w;
-  realtype*    Ydata = NULL;
+  sunrealtype     u, v, w;
+  sunrealtype*    Ydata = NULL;
 
   /* access solution array */
   Ydata = N_VGetArrayPointer(y);
@@ -563,12 +563,12 @@ static int SetIC(N_Vector y, void *user_data)
 {
   UserData     udata = (UserData) user_data;  /* access problem data    */
   sunindextype N     = udata->N;              /* set variable shortcuts */
-  realtype     a     = udata->a;
-  realtype     b     = udata->b;
-  realtype     dx    = udata->dx;
-  realtype*    data  = NULL;
+  sunrealtype     a     = udata->a;
+  sunrealtype     b     = udata->b;
+  sunrealtype     dx    = udata->dx;
+  sunrealtype*    data  = NULL;
 
-  realtype     x, p;
+  sunrealtype     x, p;
   sunindextype i;
 
   /* Access data array from NVector y */
@@ -577,7 +577,7 @@ static int SetIC(N_Vector y, void *user_data)
   /* Set initial conditions into y */
   for (i=0; i<N; i++) {
     x = i*dx;
-    p = RCONST(0.1) * SUNRexp( -(SUNSQR(x-RCONST(0.5))) / RCONST(0.1) );
+    p = SUN_RCONST(0.1) * SUNRexp( -(SUNSQR(x-SUN_RCONST(0.5))) / SUN_RCONST(0.1) );
     data[IDX(i,0)] =  a  + p;
     data[IDX(i,1)] = b/a + p;
     data[IDX(i,2)] =  b  + p;
diff --git a/examples/arkode/C_serial/ark_brusselator_fp.c b/examples/arkode/C_serial/ark_brusselator_fp.c
index 3c99f2d8de..5fe08ea875 100644
--- a/examples/arkode/C_serial/ark_brusselator_fp.c
+++ b/examples/arkode/C_serial/ark_brusselator_fp.c
@@ -58,7 +58,7 @@
 #include <arkode/arkode_arkstep.h>                  /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>                 /* serial N_Vector types, fcts., macros */
 #include <sunnonlinsol/sunnonlinsol_fixedpoint.h>   /* access to FP nonlinear solver        */
-#include <sundials/sundials_types.h>                /* def. of type 'realtype'              */
+#include <sundials/sundials_types.h>                /* def. of type 'sunrealtype'              */
 #include <sundials/sundials_logger.h>
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -72,8 +72,8 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -82,18 +82,18 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(10.0);    /* final time */
-  realtype dTout = RCONST(1.0);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);    /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);  /* time between outputs */
   sunindextype NEQ = 3;          /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
   int test = 3;                  /* test problem to run */
-  realtype reltol = 1.0e-6;      /* tolerances */
-  realtype abstol = 1.0e-10;
+  sunrealtype reltol = 1.0e-6;      /* tolerances */
+  sunrealtype abstol = 1.0e-10;
   int fp_m = 3;                  /* dimension of acceleration subspace */
   int maxcor = 10;               /* maximum # of nonlinear iterations/step */
-  realtype a, b, ep, u0, v0, w0;
-  realtype rdata[3];
+  sunrealtype a, b, ep, u0, v0, w0;
+  sunrealtype rdata[3];
   int monitor = 0;               /* turn on/off monitoring */
 
   /* general problem variables */
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
   SUNNonlinearSolver NLS = NULL;  /* empty nonlinear solver object */
   void *arkode_mem = NULL;        /* empty ARKode memory structure */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nni, ncfn, netf;
 
@@ -133,26 +133,26 @@ int main(int argc, char *argv[])
 
   /* set up the test problem according to the desired test */
   if (test == 1) {
-    u0 = RCONST(3.9);
-    v0 = RCONST(1.1);
-    w0 = RCONST(2.8);
-    a  = RCONST(1.2);
-    b  = RCONST(2.5);
-    ep = RCONST(1.0e-5);
+    u0 = SUN_RCONST(3.9);
+    v0 = SUN_RCONST(1.1);
+    w0 = SUN_RCONST(2.8);
+    a  = SUN_RCONST(1.2);
+    b  = SUN_RCONST(2.5);
+    ep = SUN_RCONST(1.0e-5);
   } else if (test == 3) {
-    u0 = RCONST(3.0);
-    v0 = RCONST(3.0);
-    w0 = RCONST(3.5);
-    a  = RCONST(0.5);
-    b  = RCONST(3.0);
-    ep = RCONST(5.0e-4);
+    u0 = SUN_RCONST(3.0);
+    v0 = SUN_RCONST(3.0);
+    w0 = SUN_RCONST(3.5);
+    a  = SUN_RCONST(0.5);
+    b  = SUN_RCONST(3.0);
+    ep = SUN_RCONST(5.0e-4);
   } else {
-    u0 = RCONST(1.2);
-    v0 = RCONST(3.1);
-    w0 = RCONST(3.0);
-    a  = RCONST(1.0);
-    b  = RCONST(3.5);
-    ep = RCONST(5.0e-6);
+    u0 = SUN_RCONST(1.2);
+    v0 = SUN_RCONST(3.1);
+    w0 = SUN_RCONST(3.0);
+    a  = SUN_RCONST(1.0);
+    b  = SUN_RCONST(3.5);
+    ep = SUN_RCONST(5.0e-6);
   }
 
   /* Initial problem output */
@@ -261,12 +261,12 @@ int main(int argc, char *argv[])
  *-------------------------------*/
 
 /* fi routine to compute the implicit portion of the ODE RHS. */
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype b  = rdata[1];                     /* access data entries */
-  realtype ep = rdata[2];
-  realtype w = NV_Ith_S(y,2);                 /* access solution values */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype b  = rdata[1];                     /* access data entries */
+  sunrealtype ep = rdata[2];
+  sunrealtype w = NV_Ith_S(y,2);                 /* access solution values */
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = 0.0;
@@ -277,13 +277,13 @@ static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fe routine to compute the explicit portion of the ODE RHS. */
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype a  = rdata[0];                     /* access data entries */
-  realtype u = NV_Ith_S(y,0);                 /* access solution values */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype a  = rdata[0];                     /* access data entries */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access solution values */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = a - (w+1.0)*u + v*u*u;
diff --git a/examples/arkode/C_serial/ark_brusselator_mri.c b/examples/arkode/C_serial/ark_brusselator_mri.c
index 9ce6c623ac..ddbecfe557 100644
--- a/examples/arkode/C_serial/ark_brusselator_mri.c
+++ b/examples/arkode/C_serial/ark_brusselator_mri.c
@@ -38,7 +38,7 @@
 #include <arkode/arkode_mristep.h>    /* prototypes for MRIStep fcts., consts */
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype'              */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype'              */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -51,8 +51,8 @@
 #endif
 
 /* User-supplied functions called by the solver */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -61,16 +61,16 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(2.0);     /* final time */
-  realtype dTout = RCONST(0.1);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(2.0);     /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);  /* time between outputs */
   sunindextype NEQ = 3;          /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
-  realtype hs = RCONST(0.025);   /* slow step size */
-  realtype hf = RCONST(0.001);   /* fast step size */
-  realtype a, b, ep;             /* ODE parameters */
-  realtype u0, v0, w0;           /* initial conditions */
-  realtype rdata[3];             /* user data */
+  sunrealtype hs = SUN_RCONST(0.025);   /* slow step size */
+  sunrealtype hf = SUN_RCONST(0.001);   /* fast step size */
+  sunrealtype a, b, ep;             /* ODE parameters */
+  sunrealtype u0, v0, w0;           /* initial conditions */
+  sunrealtype rdata[3];             /* user data */
 
   /* general problem variables */
   int retval;                               /* reusable error-checking flag */
@@ -79,7 +79,7 @@ int main()
   void *inner_arkode_mem = NULL;            /* empty ARKode memory structure */
   MRIStepInnerStepper inner_stepper = NULL; /* inner stepper */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nsts, nstf, nfse, nfsi, nff, tmp;
 
@@ -93,14 +93,14 @@ int main()
   if (check_retval(&retval, "SUNContext_Create", 1)) return 1;
 
   /* Set up the test problem parameters */
-  a  = RCONST(1.0);
-  b  = RCONST(3.5);
-  ep = RCONST(1.0e-2);
+  a  = SUN_RCONST(1.0);
+  b  = SUN_RCONST(3.5);
+  ep = SUN_RCONST(1.0e-2);
 
   /* Set the initial contions */
-  u0 = RCONST(1.2);
-  v0 = RCONST(3.1);
-  w0 = RCONST(3.0);
+  u0 = SUN_RCONST(1.2);
+  v0 = SUN_RCONST(3.1);
+  w0 = SUN_RCONST(3.0);
 
   /* Initial problem output */
   printf("\nBrusselator ODE test problem:\n");
@@ -242,12 +242,12 @@ int main()
  * ------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype b  = rdata[1];                     /* access data entries */
-  realtype ep = rdata[2];
-  realtype w  = NV_Ith_S(y,2);                /* access solution values */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype b  = rdata[1];                     /* access data entries */
+  sunrealtype ep = rdata[2];
+  sunrealtype w  = NV_Ith_S(y,2);                /* access solution values */
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = 0.0;
@@ -259,13 +259,13 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype a = rdata[0];                      /* access data entries */
-  realtype u = NV_Ith_S(y,0);                 /* access solution values */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype a = rdata[0];                      /* access data entries */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access solution values */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = a - (w+1.0)*u + v*u*u;
diff --git a/examples/arkode/C_serial/ark_heat1D.c b/examples/arkode/C_serial/ark_heat1D.c
index 544d1e1ea0..7e36c58cec 100644
--- a/examples/arkode/C_serial/ark_heat1D.c
+++ b/examples/arkode/C_serial/ark_heat1D.c
@@ -42,7 +42,7 @@
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_pcg.h>  /* access to PCG SUNLinearSolver        */
-#include <sundials/sundials_types.h>  /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>  /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -57,13 +57,13 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals   */
-  realtype dx;     /* mesh spacing          */
-  realtype k;      /* diffusion coefficient */
+  sunrealtype dx;     /* mesh spacing          */
+  sunrealtype k;      /* diffusion coefficient */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp);
 
 /* Private function to check function return values */
@@ -73,15 +73,15 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main() {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);   /* initial time */
-  realtype Tf = RCONST(1.0);   /* final time */
+  sunrealtype T0 = SUN_RCONST(0.0);   /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);   /* final time */
   int Nt = 10;                 /* total number of output times */
-  realtype rtol = 1.e-6;       /* relative tolerance */
-  realtype atol = 1.e-10;      /* absolute tolerance */
+  sunrealtype rtol = 1.e-6;       /* relative tolerance */
+  sunrealtype atol = 1.e-10;      /* absolute tolerance */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 201;        /* spatial mesh size */
-  realtype k = 0.5;            /* heat conductivity */
+  sunrealtype k = 0.5;            /* heat conductivity */
   sunindextype i;
 
   /* general problem variables */
@@ -90,7 +90,7 @@ int main() {
   SUNLinearSolver LS = NULL;   /* empty linear solver object */
   void *arkode_mem = NULL;     /* empty ARKode memory structure */
   FILE *FID, *UFID;
-  realtype t, dTout, tout;
+  sunrealtype t, dTout, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nli, nJv, nlcf, nni, ncfn, netf;
 
@@ -103,7 +103,7 @@ int main() {
   udata = (UserData) malloc(sizeof(*udata));
   udata->N = N;
   udata->k = k;
-  udata->dx = RCONST(1.0)/(N-1);     /* mesh spacing */
+  udata->dx = SUN_RCONST(1.0)/(N-1);     /* mesh spacing */
 
   /* Initial problem output */
   printf("\n1D Heat PDE test problem:\n");
@@ -235,14 +235,14 @@ int main() {
  *--------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N  = udata->N;                   /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype c1, c2;
   sunindextype i, isource;
 
   Y = N_VGetArrayPointer(y);      /* access data arrays */
@@ -253,7 +253,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
   /* iterate over domain, computing all equations */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
   isource = N/2;
   Ydot[0] = 0.0;                 /* left boundary condition */
   for (i=1; i<N-1; i++)
@@ -265,15 +265,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp)
 {
   UserData udata = (UserData) user_data;     /* variable shortcuts */
   sunindextype N = udata->N;
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *V=NULL, *JV=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *V=NULL, *JV=NULL;
+  sunrealtype c1, c2;
   sunindextype i;
 
   V = N_VGetArrayPointer(v);       /* access data arrays */
@@ -284,7 +284,7 @@ static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
 
   /* iterate over domain, computing all Jacobian-vector products */
   c1 = k/dx/dx;
-  c2 = -RCONST(2.0)*k/dx/dx;
+  c2 = -SUN_RCONST(2.0)*k/dx/dx;
   JV[0] = 0.0;
   for (i=1; i<N-1; i++)
     JV[i] = c1*V[i-1] + c2*V[i] + c1*V[i+1];
diff --git a/examples/arkode/C_serial/ark_heat1D_adapt.c b/examples/arkode/C_serial/ark_heat1D_adapt.c
index 28447942b6..867092bc13 100644
--- a/examples/arkode/C_serial/ark_heat1D_adapt.c
+++ b/examples/arkode/C_serial/ark_heat1D_adapt.c
@@ -42,7 +42,7 @@
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
 #include <sunlinsol/sunlinsol_pcg.h>  /* access to PCG SUNLinearSolver        */
-#include <sundials/sundials_types.h>  /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>  /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -55,52 +55,52 @@
 #endif
 
 /* constants */
-#define ZERO        RCONST(0.0)
-#define PT25        RCONST(0.25)
-#define PT4         RCONST(0.4)
-#define PT5         RCONST(0.5)
-#define PT55        RCONST(0.55)
-#define PT7         RCONST(0.7)
-#define ONE         RCONST(1.0)
-#define TWO         RCONST(2.0)
-#define TWOHUNDRED  RCONST(200.0)
-#define FOURHUNDRED RCONST(400.0)
-#define FIVEHUNDRED RCONST(500.0)
-#define SIXHUNDRED  RCONST(600.0)
+#define ZERO        SUN_RCONST(0.0)
+#define PT25        SUN_RCONST(0.25)
+#define PT4         SUN_RCONST(0.4)
+#define PT5         SUN_RCONST(0.5)
+#define PT55        SUN_RCONST(0.55)
+#define PT7         SUN_RCONST(0.7)
+#define ONE         SUN_RCONST(1.0)
+#define TWO         SUN_RCONST(2.0)
+#define TWOHUNDRED  SUN_RCONST(200.0)
+#define FOURHUNDRED SUN_RCONST(400.0)
+#define FIVEHUNDRED SUN_RCONST(500.0)
+#define SIXHUNDRED  SUN_RCONST(600.0)
 
 /* user data structure */
 typedef struct {
   sunindextype N;       /* current number of intervals */
-  realtype *x;          /* current mesh */
-  realtype k;           /* diffusion coefficient */
-  realtype refine_tol;  /* adaptivity tolerance */
+  sunrealtype *x;          /* current mesh */
+  sunrealtype k;           /* diffusion coefficient */
+  sunrealtype refine_tol;  /* adaptivity tolerance */
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp);
 
 /* Private function to check function return values */
-realtype * adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata);
-static int project(sunindextype Nold, realtype *xold, N_Vector yold,
-                   sunindextype Nnew, realtype *xnew, N_Vector ynew);
+sunrealtype * adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata);
+static int project(sunindextype Nold, sunrealtype *xold, N_Vector yold,
+                   sunindextype Nnew, sunrealtype *xnew, N_Vector ynew);
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Main Program */
 int main() {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(1.0);         /* final time */
-  realtype rtol = RCONST(1.e-3);     /* relative tolerance */
-  realtype atol = RCONST(1.e-10);    /* absolute tolerance */
-  realtype hscale = RCONST(1.0);     /* time step change factor on resizes */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);         /* final time */
+  sunrealtype rtol = SUN_RCONST(1.e-3);     /* relative tolerance */
+  sunrealtype atol = SUN_RCONST(1.e-10);    /* absolute tolerance */
+  sunrealtype hscale = SUN_RCONST(1.0);     /* time step change factor on resizes */
   UserData udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N = 21;               /* initial spatial mesh size */
-  realtype refine = RCONST(3.0e-3);  /* adaptivity refinement tolerance */
-  realtype k = RCONST(0.5);          /* heat conductivity */
+  sunrealtype refine = SUN_RCONST(3.0e-3);  /* adaptivity refinement tolerance */
+  sunrealtype k = SUN_RCONST(0.5);          /* heat conductivity */
   sunindextype i;
   long int nni, nni_tot=0, nli, nli_tot=0;
   int iout=0;
@@ -113,8 +113,8 @@ int main() {
   SUNLinearSolver LS = NULL;   /* empty linear solver object */
   void *arkode_mem = NULL;     /* empty ARKode memory structure */
   FILE *XFID, *UFID;
-  realtype t, olddt, newdt;
-  realtype *xnew = NULL;
+  sunrealtype t, olddt, newdt;
+  sunrealtype *xnew = NULL;
   sunindextype Nnew;
 
   /* Create the SUNDIALS context object for this simulation */
@@ -127,7 +127,7 @@ int main() {
   udata->N = N;
   udata->k = k;
   udata->refine_tol = refine;
-  udata->x = malloc(N * sizeof(realtype));
+  udata->x = malloc(N * sizeof(sunrealtype));
   for (i=0; i<N; i++)  udata->x[i] = ONE*i/(N-1);
 
   /* Initial problem output */
@@ -296,14 +296,14 @@ int main() {
  *--------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N = udata->N;                /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype *x = udata->x;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype dxL, dxR;
+  sunrealtype k  = udata->k;
+  sunrealtype *x = udata->x;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype dxL, dxR;
   sunindextype i;
 
   /* access data arrays */
@@ -332,15 +332,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
+static int Jac(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y,
                N_Vector fy, void *user_data, N_Vector tmp)
 {
   UserData udata = (UserData) user_data;     /* variable shortcuts */
   sunindextype N = udata->N;
-  realtype k  = udata->k;
-  realtype *x = udata->x;
-  realtype *V=NULL, *JV=NULL;
-  realtype dxL, dxR;
+  sunrealtype k  = udata->k;
+  sunrealtype *x = udata->x;
+  sunrealtype *V=NULL, *JV=NULL;
+  sunrealtype dxL, dxR;
   sunindextype i;
 
   /* access data arrays */
@@ -376,11 +376,11 @@ static int Jac(N_Vector v, N_Vector Jv, realtype t, N_Vector y,
       Nnew [output] -- the size of the new mesh
       udata [input] -- the current system information
    The return for this function is a pointer to the new mesh. */
-realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
+sunrealtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
 {
   sunindextype i, j;
   int *marks=NULL;
-  realtype ydd, *xold=NULL, *Y=NULL, *xnew=NULL;
+  sunrealtype ydd, *xold=NULL, *Y=NULL, *xnew=NULL;
   sunindextype num_refine, N_new;
 
   /* Access current solution and mesh arrays */
@@ -413,7 +413,7 @@ realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
     if (marks[i] == 1)   num_refine++;
   N_new = udata->N + num_refine;
   *Nnew = N_new;            /* Store new array length */
-  xnew = malloc((N_new) * sizeof(realtype));
+  xnew = malloc((N_new) * sizeof(sunrealtype));
 
 
   /* fill new mesh */
@@ -458,11 +458,11 @@ realtype* adapt_mesh(N_Vector y, sunindextype *Nnew, UserData udata)
       xnew [input] -- the new mesh
       ynew [output] -- the vector defined over the new mesh
                        (allocated prior to calling project) */
-static int project(sunindextype Nold, realtype *xold, N_Vector yold,
-                   sunindextype Nnew, realtype *xnew, N_Vector ynew)
+static int project(sunindextype Nold, sunrealtype *xold, N_Vector yold,
+                   sunindextype Nnew, sunrealtype *xnew, N_Vector ynew)
 {
   sunindextype iv, i, j;
-  realtype *Yold=NULL, *Ynew=NULL;
+  sunrealtype *Yold=NULL, *Ynew=NULL;
 
   /* Access data arrays */
   Yold = N_VGetArrayPointer(yold);    /* access data arrays */
diff --git a/examples/arkode/C_serial/ark_kepler.c b/examples/arkode/C_serial/ark_kepler.c
index 6ff42f8fe5..d3a98e36bb 100644
--- a/examples/arkode/C_serial/ark_kepler.c
+++ b/examples/arkode/C_serial/ark_kepler.c
@@ -585,7 +585,7 @@ int main(int argc, char* argv[])
            expected_order, (long double)ord_max_conv, (long double)ord_avg,
            (long double)ord_est);
 
-    if (ord_max_acc < (expected_order - RCONST(0.5)))
+    if (ord_max_acc < (expected_order - SUN_RCONST(0.5)))
     {
       printf(">>> FAILURE: computed order of accuracy wrt solution is below "
              "expected (%d)\n",
@@ -593,7 +593,7 @@ int main(int argc, char* argv[])
       return 1;
     }
 
-    if (ord_max_conv < (expected_order - RCONST(0.5)))
+    if (ord_max_conv < (expected_order - SUN_RCONST(0.5)))
     {
       printf(">>> FAILURE: computed order of accuracy wrt Hamiltonian is below "
              "expected (%d)\n",
diff --git a/examples/arkode/C_serial/ark_kepler.h b/examples/arkode/C_serial/ark_kepler.h
index c78ec86d42..f91d6b1e04 100644
--- a/examples/arkode/C_serial/ark_kepler.h
+++ b/examples/arkode/C_serial/ark_kepler.h
@@ -53,7 +53,7 @@ int ComputeConvergence(int num_dt, sunrealtype* orders,
     *ord_avg += orders[i - 1];
     *ord_max = SUNMAX(*ord_max, orders[i - 1]);
   }
-  *ord_avg = *ord_avg / ((realtype)num_dt - 1);
+  *ord_avg = *ord_avg / ((sunrealtype)num_dt - 1);
   det      = a11 * a22 - a12 * a21;
   *ord_est = (a11 * b2 - a21 * b1) / det;
   return 0;
diff --git a/examples/arkode/C_serial/ark_kpr_mri.c b/examples/arkode/C_serial/ark_kpr_mri.c
index 6b7752c0c8..d7ce20680b 100644
--- a/examples/arkode/C_serial/ark_kpr_mri.c
+++ b/examples/arkode/C_serial/ark_kpr_mri.c
@@ -80,7 +80,7 @@
 #include <nvector/nvector_serial.h>     /* serial N_Vector type, fcts., macros  */
 #include <sunmatrix/sunmatrix_dense.h>  /* dense matrix type, fcts., macros     */
 #include <sunlinsol/sunlinsol_dense.h>  /* dense linear solver                  */
-#include <sundials/sundials_math.h>     /* def. math fcns, 'realtype'           */
+#include <sundials/sundials_math.h>     /* def. math fcns, 'sunrealtype'           */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM ".20Lg"
@@ -92,32 +92,32 @@
 #define FSYM "f"
 #endif
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* User-supplied functions called by the solver */
-static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Js(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int fse(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fsi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fn(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Js(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jsi(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jsi(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jn(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
-static realtype r(realtype t, void *user_data);
-static realtype s(realtype t, void *user_data);
-static realtype rdot(realtype t, void *user_data);
-static realtype sdot(realtype t, void *user_data);
-static realtype utrue(realtype t, void *user_data);
-static realtype vtrue(realtype t, void *user_data);
-static int Ytrue(realtype t, N_Vector y, void *user_data);
+static sunrealtype r(sunrealtype t, void *user_data);
+static sunrealtype s(sunrealtype t, void *user_data);
+static sunrealtype rdot(sunrealtype t, void *user_data);
+static sunrealtype sdot(sunrealtype t, void *user_data);
+static sunrealtype utrue(sunrealtype t, void *user_data);
+static sunrealtype vtrue(sunrealtype t, void *user_data);
+static int Ytrue(sunrealtype t, N_Vector y, void *user_data);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 
@@ -127,18 +127,18 @@ int main(int argc, char *argv[])
   SUNContext ctx;
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(5.0);     /* final time */
-  realtype dTout = RCONST(0.1);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(5.0);     /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);  /* time between outputs */
   sunindextype NEQ = 2;          /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
   int solve_type = 0;            /* problem configuration type */
-  realtype hs = RCONST(0.01);    /* slow step size */
-  realtype e = RCONST(0.5);      /* fast/slow coupling strength */
-  realtype G = RCONST(-100.0);   /* stiffness at slow time scale */
-  realtype w = RCONST(100.0);    /* time-scale separation factor */
-  realtype reltol = RCONST(0.01);
-  realtype abstol = 1e-11;
+  sunrealtype hs = SUN_RCONST(0.01);    /* slow step size */
+  sunrealtype e = SUN_RCONST(0.5);      /* fast/slow coupling strength */
+  sunrealtype G = SUN_RCONST(-100.0);   /* stiffness at slow time scale */
+  sunrealtype w = SUN_RCONST(100.0);    /* time-scale separation factor */
+  sunrealtype reltol = SUN_RCONST(0.01);
+  sunrealtype abstol = 1e-11;
 
   /* general problem variables */
   int retval;                               /* reusable error-checking flag */
@@ -152,12 +152,12 @@ int main(int argc, char *argv[])
   SUNLinearSolver LSf = NULL;               /* fast linear solver object    */
   SUNMatrix As = NULL;                      /* matrix for slow solver       */
   SUNLinearSolver LSs = NULL;               /* slow linear solver object    */
-  booleantype implicit_slow;
-  booleantype imex_slow = SUNFALSE;
-  booleantype deduce = SUNFALSE;
+  sunbooleantype implicit_slow;
+  sunbooleantype imex_slow = SUNFALSE;
+  sunbooleantype deduce = SUNFALSE;
   FILE *UFID;
-  realtype hf, gamma, beta, t, tout, rpar[3];
-  realtype uerr, verr, uerrtot, verrtot, errtot;
+  sunrealtype hf, gamma, beta, t, tout, rpar[3];
+  sunrealtype uerr, verr, uerrtot, verrtot, errtot;
   int iout;
   long int nsts, nstf, nfse, nfsi, nff, nnif, nncf, njef, nnis, nncs, njes, tmp;
 
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
   if (argc > 3)  G = SUNStrToReal(argv[3]);
   if (argc > 4)  w = SUNStrToReal(argv[4]);
   if (argc > 5)  e = SUNStrToReal(argv[5]);
-  if (argc > 6)  deduce = (booleantype) atoi(argv[6]);
+  if (argc > 6)  deduce = (sunbooleantype) atoi(argv[6]);
 
   /* Check arguments for validity */
   /*   0 <= solve_type <= 9      */
@@ -293,14 +293,14 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNTRUE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
     B->A[2][0] = -ONE;
     B->A[2][1] = TWO;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = TWO/RCONST(3.0);
-    B->b[2] = ONE/RCONST(6.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = TWO/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(6.0);
     B->d[1] = ONE;
-    B->c[1] = RCONST(0.5);
+    B->c[1] = SUN_RCONST(0.5);
     B->c[2] = ONE;
     B->q=3;
     B->p=2;
@@ -313,14 +313,14 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNTRUE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
     B->A[2][0] = -ONE;
     B->A[2][1] = TWO;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = TWO/RCONST(3.0);
-    B->b[2] = ONE/RCONST(6.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = TWO/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(6.0);
     B->d[1] = ONE;
-    B->c[1] = RCONST(0.5);
+    B->c[1] = SUN_RCONST(0.5);
     B->c[2] = ONE;
     B->q=3;
     B->p=2;
@@ -334,15 +334,15 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(4, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
-    B->A[2][1] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
+    B->A[2][1] = SUN_RCONST(0.5);
     B->A[3][2] = ONE;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = ONE/RCONST(3.0);
-    B->b[2] = ONE/RCONST(3.0);
-    B->b[3] = ONE/RCONST(6.0);
-    B->c[1] = RCONST(0.5);
-    B->c[2] = RCONST(0.5);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = ONE/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(3.0);
+    B->b[3] = ONE/SUN_RCONST(6.0);
+    B->c[1] = SUN_RCONST(0.5);
+    B->c[2] = SUN_RCONST(0.5);
     B->c[3] = ONE;
     B->q=4;
     retval = ARKStepSetTables(inner_arkode_mem, 4, 0, NULL, B);
@@ -354,18 +354,18 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    beta  = SUNRsqrt(RCONST(3.0))/RCONST(6.0) + RCONST(0.5);
-    gamma = (-ONE/RCONST(8.0))*(SUNRsqrt(RCONST(3.0))+ONE);
-    B->A[1][0] = RCONST(4.0)*gamma+TWO*beta;
-    B->A[1][1] = ONE-RCONST(4.0)*gamma-TWO*beta;
-    B->A[2][0] = RCONST(0.5)-beta-gamma;
+    beta  = SUNRsqrt(SUN_RCONST(3.0))/SUN_RCONST(6.0) + SUN_RCONST(0.5);
+    gamma = (-ONE/SUN_RCONST(8.0))*(SUNRsqrt(SUN_RCONST(3.0))+ONE);
+    B->A[1][0] = SUN_RCONST(4.0)*gamma+TWO*beta;
+    B->A[1][1] = ONE-SUN_RCONST(4.0)*gamma-TWO*beta;
+    B->A[2][0] = SUN_RCONST(0.5)-beta-gamma;
     B->A[2][1] = gamma;
     B->A[2][2] = beta;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = ONE/RCONST(6.0);
-    B->b[2] = TWO/RCONST(3.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = ONE/SUN_RCONST(6.0);
+    B->b[2] = TWO/SUN_RCONST(3.0);
     B->c[1] = ONE;
-    B->c[2] = RCONST(0.5);
+    B->c[2] = SUN_RCONST(0.5);
     B->q=3;
     retval = ARKStepSetTables(inner_arkode_mem, 3, 0, B, NULL);
     if (check_retval(&retval, "ARKStepSetTables", 1)) return 1;
@@ -387,14 +387,14 @@ int main(int argc, char *argv[])
     if (check_retval((void *) inner_arkode_mem, "ARKStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(3, SUNTRUE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = RCONST(0.5);
+    B->A[1][0] = SUN_RCONST(0.5);
     B->A[2][0] = -ONE;
     B->A[2][1] = TWO;
-    B->b[0] = ONE/RCONST(6.0);
-    B->b[1] = TWO/RCONST(3.0);
-    B->b[2] = ONE/RCONST(6.0);
+    B->b[0] = ONE/SUN_RCONST(6.0);
+    B->b[1] = TWO/SUN_RCONST(3.0);
+    B->b[2] = ONE/SUN_RCONST(6.0);
     B->d[1] = ONE;
-    B->c[1] = RCONST(0.5);
+    B->c[1] = SUN_RCONST(0.5);
     B->c[2] = ONE;
     B->q=3;
     B->p=2;
@@ -455,10 +455,10 @@ int main(int argc, char *argv[])
     if (check_retval((void *)arkode_mem, "MRIStepCreate", 0)) return 1;
     B = ARKodeButcherTable_Alloc(2, SUNFALSE);
     if (check_retval((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-    B->A[1][0] = TWO/RCONST(3.0);
-    B->b[0] = RCONST(0.25);
-    B->b[1] = RCONST(0.75);
-    B->c[1] = TWO/RCONST(3.0);
+    B->A[1][0] = TWO/SUN_RCONST(3.0);
+    B->b[0] = SUN_RCONST(0.25);
+    B->b[1] = SUN_RCONST(0.75);
+    B->c[1] = TWO/SUN_RCONST(3.0);
     B->q=2;
     C = MRIStepCoupling_MIStoMRI(B, 2, 0);
     if (check_retval((void *)C, "MRIStepCoupling_MIStoMRI", 0)) return 1;
@@ -680,13 +680,13 @@ int main(int argc, char *argv[])
  * ------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype tmp1, tmp2;
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype tmp1, tmp2;
 
   /* fill in the RHS function:
      [0  0]*[(-1+u^2-r(t))/(2*u)] + [         0          ]
@@ -701,14 +701,14 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype tmp1, tmp2;
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype tmp1, tmp2;
 
   /* fill in the RHS function:
      [G e]*[(-1+u^2-r(t))/(2*u))] + [rdot(t)/(2*u)]
@@ -723,10 +723,10 @@ static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fse routine to compute the slow portion of the ODE RHS. */
-static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fse(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype u = NV_Ith_S(y,0);
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype u = NV_Ith_S(y,0);
 
   /* fill in the slow explicit RHS function:
      [rdot(t)/(2*u)]
@@ -739,14 +739,14 @@ static int fse(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fsi routine to compute the slow portion of the ODE RHS.(currently same as fse) */
-static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fsi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype tmp1, tmp2;
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype tmp1, tmp2;
 
   /* fill in the slow implicit RHS function:
      [G e]*[(-1+u^2-r(t))/(2*u))]
@@ -760,14 +760,14 @@ static int fsi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return 0;
 }
 
-static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fn(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
-  realtype tmp1, tmp2;
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype tmp1, tmp2;
 
   /* fill in the RHS function:
      [G e]*[(-1+u^2-r(t))/(2*u))] + [rdot(t)/(2*u)]
@@ -781,20 +781,20 @@ static int fn(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return 0;
 }
 
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   N_VConst(ZERO, ydot);
   return(0);
 }
 
-static int Js(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Js(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
 
   /* fill in the Jacobian:
      [G/2 + (G*(1+r(t))-rdot(t))/(2*u^2)   e/2+e*(2+s(t))/(2*v^2)]
@@ -808,14 +808,14 @@ static int Js(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
   return 0;
 }
 
-static int Jsi(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jsi(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
 
   /* fill in the Jacobian:
      [G/2 + (G*(1+r(t)))/(2*u^2)   e/2 + e*(2+s(t))/(2*v^2)]
@@ -829,14 +829,14 @@ static int Jsi(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data
   return 0;
 }
 
-static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int Jn(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rpar = (realtype *) user_data;
-  const realtype G = rpar[0];
-  const realtype e = rpar[2];
-  const realtype u = NV_Ith_S(y,0);
-  const realtype v = NV_Ith_S(y,1);
+  sunrealtype *rpar = (sunrealtype *) user_data;
+  const sunrealtype G = rpar[0];
+  const sunrealtype e = rpar[2];
+  const sunrealtype u = NV_Ith_S(y,0);
+  const sunrealtype v = NV_Ith_S(y,1);
 
   /* fill in the Jacobian:
      [G/2 + (G*(1+r(t))-rdot(t))/(2*u^2)     e/2 + e*(2+s(t))/(2*v^2)]
@@ -855,33 +855,33 @@ static int Jn(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
  * Private helper functions
  * ------------------------------*/
 
-static realtype r(realtype t, void *user_data)
+static sunrealtype r(sunrealtype t, void *user_data)
 {
-  return( RCONST(0.5)*cos(t) );
+  return( SUN_RCONST(0.5)*cos(t) );
 }
-static realtype s(realtype t, void *user_data)
+static sunrealtype s(sunrealtype t, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
+  sunrealtype *rpar = (sunrealtype *) user_data;
   return( cos(rpar[1]*t) );
 }
-static realtype rdot(realtype t, void *user_data)
+static sunrealtype rdot(sunrealtype t, void *user_data)
 {
-  return( -RCONST(0.5)*sin(t) );
+  return( -SUN_RCONST(0.5)*sin(t) );
 }
-static realtype sdot(realtype t, void *user_data)
+static sunrealtype sdot(sunrealtype t, void *user_data)
 {
-  realtype *rpar = (realtype *) user_data;
+  sunrealtype *rpar = (sunrealtype *) user_data;
   return( -rpar[1]*sin(rpar[1]*t) );
 }
-static realtype utrue(realtype t, void *user_data)
+static sunrealtype utrue(sunrealtype t, void *user_data)
 {
   return( SUNRsqrt(ONE+r(t,user_data)) );
 }
-static realtype vtrue(realtype t, void *user_data)
+static sunrealtype vtrue(sunrealtype t, void *user_data)
 {
   return( SUNRsqrt(TWO+s(t,user_data)) );
 }
-static int Ytrue(realtype t, N_Vector y, void *user_data)
+static int Ytrue(sunrealtype t, N_Vector y, void *user_data)
 {
   NV_Ith_S(y,0) = utrue(t,user_data);
   NV_Ith_S(y,1) = vtrue(t,user_data);
diff --git a/examples/arkode/C_serial/ark_onewaycouple_mri.c b/examples/arkode/C_serial/ark_onewaycouple_mri.c
index 6f3bd3845b..96ca69f08a 100644
--- a/examples/arkode/C_serial/ark_onewaycouple_mri.c
+++ b/examples/arkode/C_serial/ark_onewaycouple_mri.c
@@ -46,7 +46,7 @@
 #include <arkode/arkode_mristep.h>    /* prototypes for MRIStep fcts., consts */
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype'              */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype'              */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -59,14 +59,14 @@
 #endif
 
 /* User-supplied functions called by the solver */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to compute the analytic solution */
-static int ans(realtype t, N_Vector ytrue, void *user_data);
+static int ans(sunrealtype t, N_Vector ytrue, void *user_data);
 
 /* Private function to compute the max error in the solution */
-static int err(N_Vector y, N_Vector ytrue, realtype* e);
+static int err(N_Vector y, N_Vector ytrue, sunrealtype* e);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -75,14 +75,14 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(1.0);     /* final time */
-  realtype dTout = RCONST(0.1);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);     /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);  /* time between outputs */
   sunindextype NEQ = 3;          /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
-  realtype hs = RCONST(0.001);   /* slow step size */
-  realtype hf = RCONST(0.0001);  /* fast step size */
-  realtype u0, v0, w0;           /* initial conditions */
+  sunrealtype hs = SUN_RCONST(0.001);   /* slow step size */
+  sunrealtype hf = SUN_RCONST(0.0001);  /* fast step size */
+  sunrealtype u0, v0, w0;           /* initial conditions */
 
   /* general problem variables */
   int retval;                               /* reusable error-checking flag */
@@ -92,8 +92,8 @@ int main()
   void *inner_arkode_mem = NULL;            /* empty ARKode memory structure */
   MRIStepInnerStepper inner_stepper = NULL; /* inner stepper */
   FILE *UFID;
-  realtype t, tout;
-  realtype error = RCONST(0.0);
+  sunrealtype t, tout;
+  sunrealtype error = SUN_RCONST(0.0);
   int iout;
   long int nsts, nstf, nfse, nfsi, nff, tmp;
 
@@ -107,9 +107,9 @@ int main()
   if (check_retval(&retval, "SUNContext_Create", 1)) return 1;
 
   /* Set the initial contions */
-  u0 = RCONST(1.0);
-  v0 = RCONST(0.0);
-  w0 = RCONST(2.0);
+  u0 = SUN_RCONST(1.0);
+  v0 = SUN_RCONST(0.0);
+  w0 = SUN_RCONST(2.0);
 
   /* Initial problem output */
   printf("\nOne way coupling ODE test problem:\n");
@@ -250,13 +250,13 @@ int main()
  * ------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype w = NV_Ith_S(y,2);                 /* access solution values */
+  sunrealtype w = NV_Ith_S(y,2);                 /* access solution values */
 
   /* fill in the RHS function */
-  NV_Ith_S(ydot,0) = RCONST(0.0);
-  NV_Ith_S(ydot,1) = RCONST(0.0);
+  NV_Ith_S(ydot,0) = SUN_RCONST(0.0);
+  NV_Ith_S(ydot,1) = SUN_RCONST(0.0);
   NV_Ith_S(ydot,2) = -w;
 
   /* Return with success */
@@ -264,11 +264,11 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype c1 = RCONST(50.0);                 /* problem constant */
-  realtype u  = NV_Ith_S(y,0);                /* access solution values */
-  realtype v  = NV_Ith_S(y,1);
+  sunrealtype c1 = SUN_RCONST(50.0);                 /* problem constant */
+  sunrealtype u  = NV_Ith_S(y,0);                /* access solution values */
+  sunrealtype v  = NV_Ith_S(y,1);
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = -c1*v;
@@ -284,12 +284,12 @@ static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * ------------------------------------*/
 
 /* function to compute the analytic solution of the ODE */
-static int ans(realtype t, N_Vector ytrue, void *user_data)
+static int ans(sunrealtype t, N_Vector ytrue, void *user_data)
 {
-  realtype c1 = RCONST(50.0);
-  realtype c2 = RCONST(5051.0)/RCONST(2501.0);
-  realtype c3 = RCONST(49.0)/RCONST(2501.0);
-  realtype c4 = RCONST(51.0)/RCONST(2501.0);
+  sunrealtype c1 = SUN_RCONST(50.0);
+  sunrealtype c2 = SUN_RCONST(5051.0)/SUN_RCONST(2501.0);
+  sunrealtype c3 = SUN_RCONST(49.0)/SUN_RCONST(2501.0);
+  sunrealtype c4 = SUN_RCONST(51.0)/SUN_RCONST(2501.0);
 
   /* fill in the solution vector */
   NV_Ith_S(ytrue,0) = cos(c1*t);
@@ -301,10 +301,10 @@ static int ans(realtype t, N_Vector ytrue, void *user_data)
 }
 
 /* function to compute the max error in the solution */
-static int err(N_Vector y, N_Vector ytrue, realtype* e)
+static int err(N_Vector y, N_Vector ytrue, sunrealtype* e)
 {
   /* compute the error and store it in ytrue */
-  N_VLinearSum(RCONST(1.0), y, RCONST(-1.0), ytrue, ytrue);
+  N_VLinearSum(SUN_RCONST(1.0), y, SUN_RCONST(-1.0), ytrue, ytrue);
 
   /* compute the max norm of the error */
   *e = N_VMaxNorm(ytrue);
diff --git a/examples/arkode/C_serial/ark_reaction_diffusion_mri.c b/examples/arkode/C_serial/ark_reaction_diffusion_mri.c
index 86a65f42d3..0716c41ef0 100644
--- a/examples/arkode/C_serial/ark_reaction_diffusion_mri.c
+++ b/examples/arkode/C_serial/ark_reaction_diffusion_mri.c
@@ -47,7 +47,7 @@
 #include <arkode/arkode_mristep.h>    /* prototypes for MRIStep fcts., consts */
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>  /* defs. of realtype, sunindextype, etc */
+#include <sundials/sundials_types.h>  /* defs. of sunrealtype, sunindextype, etc */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -62,14 +62,14 @@
 /* user data structure */
 typedef struct {
   sunindextype N;  /* number of intervals   */
-  realtype dx;     /* mesh spacing          */
-  realtype k;      /* diffusion coefficient */
-  realtype lam;
+  sunrealtype dx;     /* mesh spacing          */
+  sunrealtype k;      /* diffusion coefficient */
+  sunrealtype lam;
 } *UserData;
 
 /* User-supplied Functions Called by the Solver */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to set initial condition */
 static int SetInitialCondition(N_Vector y, UserData udata);
@@ -81,18 +81,18 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main() {
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(3.0);     /* final time */
-  realtype dTout = RCONST(0.1);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(3.0);     /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);  /* time between outputs */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
-  realtype hs = RCONST(0.001);   /* slow step size */
-  realtype hf = RCONST(0.00002); /* fast step size */
+  sunrealtype hs = SUN_RCONST(0.001);   /* slow step size */
+  sunrealtype hf = SUN_RCONST(0.00002); /* fast step size */
   UserData udata = NULL;         /* user data */
 
-  realtype *data;                /* array for solution output */
-  realtype L = RCONST(5.0);      /* domain length */
+  sunrealtype *data;                /* array for solution output */
+  sunrealtype L = SUN_RCONST(5.0);      /* domain length */
   sunindextype N = 1001;         /* number of mesh points */
-  realtype ep = RCONST(1e-2);
+  sunrealtype ep = SUN_RCONST(1e-2);
   sunindextype i;
 
   /* general problem variables */
@@ -102,7 +102,7 @@ int main() {
   void *inner_arkode_mem = NULL;            /* empty ARKode memory structure */
   MRIStepInnerStepper inner_stepper = NULL; /* inner stepper */
   FILE *FID, *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
 
   /* Create the SUNDIALS context object for this simulation */
@@ -117,9 +117,9 @@ int main() {
   /* allocate and fill user data structure */
   udata = (UserData) malloc(sizeof(*udata));
   udata->N   = N;
-  udata->dx  = L / (RCONST(1.0)*N - RCONST(1.0));
-  udata->k   = RCONST(1e-4)/ep;
-  udata->lam = RCONST(0.5)*sqrt(RCONST(2.0) * ep * RCONST(1e4));
+  udata->dx  = L / (SUN_RCONST(1.0)*N - SUN_RCONST(1.0));
+  udata->k   = SUN_RCONST(1e-4)/ep;
+  udata->lam = SUN_RCONST(0.5)*sqrt(SUN_RCONST(2.0) * ep * SUN_RCONST(1e4));
 
   /* Initial problem output */
   printf("\n1D reaction-diffusion PDE test problem:\n");
@@ -255,11 +255,11 @@ int main() {
  * ------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N = udata->N;                /* set variable shortcuts */
-  realtype *Y=NULL, *Ydot=NULL;
+  sunrealtype *Y=NULL, *Ydot=NULL;
   sunindextype i;
 
   /* access state array data */
@@ -272,7 +272,7 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
   /* iterate over domain, computing reaction term */
   for (i = 0; i < N; i++)
-    Ydot[i] = Y[i] * Y[i] * (RCONST(1.0) - Y[i]);
+    Ydot[i] = Y[i] * Y[i] * (SUN_RCONST(1.0) - Y[i]);
 
   /* Return with success */
   return 0;
@@ -280,14 +280,14 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N = udata->N;                /* set variable shortcuts */
-  realtype k  = udata->k;
-  realtype dx = udata->dx;
-  realtype *Y=NULL, *Ydot=NULL;
-  realtype c1, c2;
+  sunrealtype k  = udata->k;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Y=NULL, *Ydot=NULL;
+  sunrealtype c1, c2;
   sunindextype i;
 
   /* access state array data */
@@ -300,7 +300,7 @@ static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
   /* iterate over domain, computing diffusion term */
   c1 = k/dx/dx;
-  c2 = RCONST(2.0)*k/dx/dx;
+  c2 = SUN_RCONST(2.0)*k/dx/dx;
 
   /* left boundary condition */
   Ydot[0] = c2*(Y[1] - Y[0]);
@@ -324,9 +324,9 @@ static int SetInitialCondition(N_Vector y, UserData user_data)
 {
   UserData udata = (UserData) user_data;    /* access problem data */
   sunindextype N = udata->N;                /* set variable shortcuts */
-  realtype lam = udata->lam;
-  realtype dx = udata->dx;
-  realtype *Y=NULL;
+  sunrealtype lam = udata->lam;
+  sunrealtype dx = udata->dx;
+  sunrealtype *Y=NULL;
   sunindextype i;
 
   /* access state array data */
@@ -335,7 +335,7 @@ static int SetInitialCondition(N_Vector y, UserData user_data)
 
   /* set initial condition */
   for (i = 0; i < N; i++)
-    Y[i] = RCONST(1.0)/(1 + exp(lam*(i*dx-RCONST(1.0))));
+    Y[i] = SUN_RCONST(1.0)/(1 + exp(lam*(i*dx-SUN_RCONST(1.0))));
 
   /* Return with success */
   return 0;
diff --git a/examples/arkode/C_serial/ark_robertson.c b/examples/arkode/C_serial/ark_robertson.c
index 299b90e661..8d85c7e110 100644
--- a/examples/arkode/C_serial/ark_robertson.c
+++ b/examples/arkode/C_serial/ark_robertson.c
@@ -39,7 +39,7 @@
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_dense.h>  /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>  /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>    /* defs. of 'realtype', 'sunindextype'  */
+#include <sundials/sundials_types.h>    /* defs. of 'sunrealtype', 'sunindextype'  */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -52,23 +52,23 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(1.e11);   /* final time */
-  realtype dTout = (Tf-T0)/100;  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.e11);   /* final time */
+  sunrealtype dTout = (Tf-T0)/100;  /* time between outputs */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
   sunindextype NEQ = 3;          /* number of dependent vars. */
 
@@ -79,16 +79,16 @@ int main()
   SUNLinearSolver LS = NULL;     /* empty linear solver object */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
   FILE *UFID, *FID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
 
   /* set up the initial conditions, tolerances, initial time step size */
-  realtype u0 = RCONST(1.0);
-  realtype v0 = RCONST(0.0);
-  realtype w0 = RCONST(0.0);
-  realtype reltol = RCONST(1.0e-4);
-  realtype abstol = RCONST(1.0e-11);
-  realtype h0 = RCONST(1.0e-4) * reltol;
+  sunrealtype u0 = SUN_RCONST(1.0);
+  sunrealtype v0 = SUN_RCONST(0.0);
+  sunrealtype w0 = SUN_RCONST(0.0);
+  sunrealtype reltol = SUN_RCONST(1.0e-4);
+  sunrealtype abstol = SUN_RCONST(1.0e-11);
+  sunrealtype h0 = SUN_RCONST(1.0e-4) * reltol;
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -120,7 +120,7 @@ int main()
   if (check_flag(&flag, "ARKStepSetMaxErrTestFails", 1)) return 1;
   flag = ARKStepSetMaxNonlinIters(arkode_mem, 8);             /* Increase max nonlin iters  */
   if (check_flag(&flag, "ARKStepSetMaxNonlinIters", 1)) return 1;
-  flag = ARKStepSetNonlinConvCoef(arkode_mem, RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
   if (check_flag(&flag, "ARKStepSetNonlinConvCoef", 1)) return 1;
   flag = ARKStepSetMaxNumSteps(arkode_mem, 100000);           /* Increase max num steps */
   if (check_flag(&flag, "ARKStepSetMaxNumSteps", 1)) return 1;
@@ -203,11 +203,11 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype u = NV_Ith_S(y,0);   /* access current solution */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype u = NV_Ith_S(y,0);   /* access current solution */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* Fill in ODE RHS function */
   NV_Ith_S(ydot,0) = -0.04*u + 1.e4*v*w;
@@ -218,11 +218,11 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype v = NV_Ith_S(y,1);   /* access current solution */
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype v = NV_Ith_S(y,1);   /* access current solution */
+  sunrealtype w = NV_Ith_S(y,2);
   SUNMatZero(J);                /* initialize Jacobian to zero */
 
   /* Fill in the Jacobian of the ODE RHS function */
@@ -280,23 +280,23 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 1e11s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
-  realtype ZERO=RCONST(0.0);
-  realtype ONE=RCONST(1.0);
+  sunrealtype err;               /* wrms error                       */
+  sunrealtype ZERO=SUN_RCONST(0.0);
+  sunrealtype ONE=SUN_RCONST(1.0);
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(2.0833403356917897e-08);
-  NV_Ith_S(ref,1) = RCONST(8.1470714598028223e-14);
-  NV_Ith_S(ref,2) = RCONST(9.9999997916651040e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(2.0833403356917897e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(8.1470714598028223e-14);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999997916651040e-01);
 
   /* compute the error weight vector */
   N_VAbs(ref, ewt);
diff --git a/examples/arkode/C_serial/ark_robertson_constraints.c b/examples/arkode/C_serial/ark_robertson_constraints.c
index 827e890e2b..32e4ca483c 100644
--- a/examples/arkode/C_serial/ark_robertson_constraints.c
+++ b/examples/arkode/C_serial/ark_robertson_constraints.c
@@ -40,7 +40,7 @@
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_dense.h>  /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>  /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>    /* defs. of 'realtype', 'sunindextype'  */
+#include <sundials/sundials_types.h>    /* defs. of 'sunrealtype', 'sunindextype'  */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -53,25 +53,25 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main()
 {
-  realtype ONE = RCONST(1.0);
+  sunrealtype ONE = SUN_RCONST(1.0);
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(1.e11);   /* final time */
-  realtype dTout = (Tf-T0)/100;  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.e11);   /* final time */
+  sunrealtype dTout = (Tf-T0)/100;  /* time between outputs */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
   sunindextype NEQ = 3;          /* number of dependent vars. */
 
@@ -83,17 +83,17 @@ int main()
   SUNLinearSolver LS = NULL;     /* empty linear solver object */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, nnf, ncfn, netf, nctf;
 
   /* set up the initial conditions, tolerances, initial time step size */
-  realtype u0 = RCONST(1.0);
-  realtype v0 = RCONST(0.0);
-  realtype w0 = RCONST(0.0);
-  realtype reltol = RCONST(1.0e-3);
-  realtype abstol = RCONST(1.0e-7);
-  realtype h0 = RCONST(1.0e-4) * reltol;
+  sunrealtype u0 = SUN_RCONST(1.0);
+  sunrealtype v0 = SUN_RCONST(0.0);
+  sunrealtype w0 = SUN_RCONST(0.0);
+  sunrealtype reltol = SUN_RCONST(1.0e-3);
+  sunrealtype abstol = SUN_RCONST(1.0e-7);
+  sunrealtype h0 = SUN_RCONST(1.0e-4) * reltol;
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -130,7 +130,7 @@ int main()
   if (check_flag(&flag, "ARKStepSetMaxErrTestFails", 1)) return 1;
   flag = ARKStepSetMaxNonlinIters(arkode_mem, 8);             /* Increase max nonlin iters  */
   if (check_flag(&flag, "ARKStepSetMaxNonlinIters", 1)) return 1;
-  flag = ARKStepSetNonlinConvCoef(arkode_mem, RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
   if (check_flag(&flag, "ARKStepSetNonlinConvCoef", 1)) return 1;
   flag = ARKStepSetMaxNumSteps(arkode_mem, 100000);           /* Increase max num steps */
   if (check_flag(&flag, "ARKStepSetMaxNumSteps", 1)) return 1;
@@ -244,11 +244,11 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype u = NV_Ith_S(y,0);   /* access current solution */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype u = NV_Ith_S(y,0);   /* access current solution */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* Fill in ODE RHS function */
   NV_Ith_S(ydot,0) = -0.04*u + 1.e4*v*w;
@@ -259,11 +259,11 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype v = NV_Ith_S(y,1);   /* access current solution */
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype v = NV_Ith_S(y,1);   /* access current solution */
+  sunrealtype w = NV_Ith_S(y,2);
   SUNMatZero(J);                /* initialize Jacobian to zero */
 
   /* Fill in the Jacobian of the ODE RHS function */
@@ -321,23 +321,23 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 1e11s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
-  realtype ZERO=RCONST(0.0);
-  realtype ONE=RCONST(1.0);
+  sunrealtype err;               /* wrms error                       */
+  sunrealtype ZERO=SUN_RCONST(0.0);
+  sunrealtype ONE=SUN_RCONST(1.0);
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(2.0833403356917897e-08);
-  NV_Ith_S(ref,1) = RCONST(8.1470714598028223e-14);
-  NV_Ith_S(ref,2) = RCONST(9.9999997916651040e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(2.0833403356917897e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(8.1470714598028223e-14);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999997916651040e-01);
 
   /* compute the error weight vector */
   N_VAbs(ref, ewt);
diff --git a/examples/arkode/C_serial/ark_robertson_root.c b/examples/arkode/C_serial/ark_robertson_root.c
index f2c4331d3b..d59a7e0b84 100644
--- a/examples/arkode/C_serial/ark_robertson_root.c
+++ b/examples/arkode/C_serial/ark_robertson_root.c
@@ -42,7 +42,7 @@
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_dense.h>  /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>  /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>    /* defs. of 'realtype', 'sunindextype'  */
+#include <sundials/sundials_types.h>    /* defs. of 'sunrealtype', 'sunindextype'  */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -55,10 +55,10 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
@@ -67,9 +67,9 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype T1 = RCONST(0.4);     /* first output time */
-  realtype TMult = RCONST(10.0); /* output time multiplication factor */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype T1 = SUN_RCONST(0.4);     /* first output time */
+  sunrealtype TMult = SUN_RCONST(10.0); /* output time multiplication factor */
   int Nt = 12;                   /* total number of output times */
   sunindextype NEQ = 3;              /* number of dependent vars. */
  
@@ -85,15 +85,15 @@ int main()
   SUNLinearSolver LS = NULL;     /* empty linear solver object */
   void *arkode_mem = NULL;       /* empty ARKode memory structure */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nst, nst_a, nfe, nfi, nsetups, nje, nfeLS, nni, nnf, ncfn, netf, nge;
 
   /* set up the initial conditions */
-  realtype u0 = RCONST(1.0);
-  realtype v0 = RCONST(0.0);
-  realtype w0 = RCONST(0.0);
-  realtype reltol = RCONST(1.0e-4);
+  sunrealtype u0 = SUN_RCONST(1.0);
+  sunrealtype v0 = SUN_RCONST(0.0);
+  sunrealtype w0 = SUN_RCONST(0.0);
+  sunrealtype reltol = SUN_RCONST(1.0e-4);
 
   /* Create the SUNDIALS context object for this simulation */
   SUNContext ctx;
@@ -115,9 +115,9 @@ int main()
   if (check_flag((void *) atols, "N_VNew_Serial", 0)) return 1;
 
   /* Set absolute tolerances */
-  NV_Ith_S(atols,0) = RCONST(1.0e-8);
-  NV_Ith_S(atols,1) = RCONST(1.0e-11);
-  NV_Ith_S(atols,2) = RCONST(1.0e-8);
+  NV_Ith_S(atols,0) = SUN_RCONST(1.0e-8);
+  NV_Ith_S(atols,1) = SUN_RCONST(1.0e-11);
+  NV_Ith_S(atols,2) = SUN_RCONST(1.0e-8);
 
   /* Call ARKStepCreate to initialize the ARK timestepper module and
      specify the right-hand side function in y'=f(t,y), the inital time
@@ -131,7 +131,7 @@ int main()
   if (check_flag(&flag, "ARKStepSetMaxErrTestFails", 1)) return 1;
   flag = ARKStepSetMaxNonlinIters(arkode_mem, 8);             /* Increase max nonlin iters  */
   if (check_flag(&flag, "ARKStepSetMaxNonlinIters", 1)) return 1;
-  flag = ARKStepSetNonlinConvCoef(arkode_mem, RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
+  flag = ARKStepSetNonlinConvCoef(arkode_mem, SUN_RCONST(1.e-7)); /* Set nonlinear convergence coeff. */
   if (check_flag(&flag, "ARKStepSetNonlinConvCoef", 1)) return 1;
   flag = ARKStepSetMaxNumSteps(arkode_mem, 100000);           /* Increase max num steps */
   if (check_flag(&flag, "ARKStepSetMaxNumSteps", 1)) return 1;
@@ -252,11 +252,11 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype u = NV_Ith_S(y,0);   /* access current solution */
-  realtype v = NV_Ith_S(y,1);
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype u = NV_Ith_S(y,0);   /* access current solution */
+  sunrealtype v = NV_Ith_S(y,1);
+  sunrealtype w = NV_Ith_S(y,2);
 
   /* Fill in ODE RHS function */
   NV_Ith_S(ydot,0) = -0.04*u + 1.e4*v*w;
@@ -267,11 +267,11 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype v = NV_Ith_S(y,1);   /* access current solution */
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype v = NV_Ith_S(y,1);   /* access current solution */
+  sunrealtype w = NV_Ith_S(y,2);
   SUNMatZero(J);                /* initialize Jacobian to zero */
 
   /* Fill in the Jacobian of the ODE RHS function */
@@ -289,13 +289,13 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 }
 
 /* g routine to compute the root-finding function g(t,y). */
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype u = NV_Ith_S(y,0);    /* access current solution */
-  realtype w = NV_Ith_S(y,2);
+  sunrealtype u = NV_Ith_S(y,0);    /* access current solution */
+  sunrealtype w = NV_Ith_S(y,2);
 
-  gout[0] = u - RCONST(0.0001);  /* check for u == 1e-4 */
-  gout[1] = w - RCONST(0.01);    /* check for w == 1e-2 */
+  gout[0] = u - SUN_RCONST(0.0001);  /* check for u == 1e-4 */
+  gout[1] = w - SUN_RCONST(0.01);    /* check for w == 1e-2 */
 
   return 0;                      /* Return with success */
 }
diff --git a/examples/arkode/C_serial/ark_twowaycouple_mri.c b/examples/arkode/C_serial/ark_twowaycouple_mri.c
index e9151211fd..e66ca48a13 100644
--- a/examples/arkode/C_serial/ark_twowaycouple_mri.c
+++ b/examples/arkode/C_serial/ark_twowaycouple_mri.c
@@ -37,7 +37,7 @@
 #include <arkode/arkode_mristep.h>    /* prototypes for MRIStep fcts., consts */
 #include <arkode/arkode_arkstep.h>    /* prototypes for ARKStep fcts., consts */
 #include <nvector/nvector_serial.h>   /* serial N_Vector types, fcts., macros */
-#include <sundials/sundials_types.h>  /* def. of type 'realtype'              */
+#include <sundials/sundials_types.h>  /* def. of type 'sunrealtype'              */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -50,8 +50,8 @@
 #endif
 
 /* User-supplied functions called by the solver */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -60,14 +60,14 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);     /* initial time */
-  realtype Tf = RCONST(2.0);     /* final time */
-  realtype dTout = RCONST(0.1);  /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);     /* initial time */
+  sunrealtype Tf = SUN_RCONST(2.0);     /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);  /* time between outputs */
   sunindextype NEQ = 3;          /* number of dependent vars. */
   int Nt = (int) ceil(Tf/dTout); /* number of output times */
-  realtype hs = RCONST(0.001);   /* slow step size */
-  realtype hf = RCONST(0.00002); /* fast step size */
-  realtype u0, v0, w0;           /* initial conditions */
+  sunrealtype hs = SUN_RCONST(0.001);   /* slow step size */
+  sunrealtype hf = SUN_RCONST(0.00002); /* fast step size */
+  sunrealtype u0, v0, w0;           /* initial conditions */
 
   /* general problem variables */
   int retval;                               /* reusable error-checking flag */
@@ -76,7 +76,7 @@ int main()
   void *inner_arkode_mem = NULL;            /* ARKode memory structure      */
   MRIStepInnerStepper inner_stepper = NULL; /* inner stepper                */
   FILE *UFID;
-  realtype t, tout;
+  sunrealtype t, tout;
   int iout;
   long int nsts, nstf, nfse, nfsi, nff, tmp;
 
@@ -90,9 +90,9 @@ int main()
    */
 
   /* Set the initial contions */
-  u0 = RCONST(9001.0)/RCONST(10001.0);
-  v0 = RCONST(-1.0e5)/RCONST(10001.0);
-  w0 = RCONST(1000.0);
+  u0 = SUN_RCONST(9001.0)/SUN_RCONST(10001.0);
+  v0 = SUN_RCONST(-1.0e5)/SUN_RCONST(10001.0);
+  w0 = SUN_RCONST(1000.0);
 
   /* Initial problem output */
   printf("\nTwo way coupling ODE test problem:\n");
@@ -220,11 +220,11 @@ int main()
  * ------------------------------*/
 
 /* ff routine to compute the fast portion of the ODE RHS. */
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype c1 = RCONST(100.0);                /* problem constant */
-  realtype u  = NV_Ith_S(y,0);                /* access solution values */
-  realtype v  = NV_Ith_S(y,1);
+  sunrealtype c1 = SUN_RCONST(100.0);                /* problem constant */
+  sunrealtype u  = NV_Ith_S(y,0);                /* access solution values */
+  sunrealtype v  = NV_Ith_S(y,1);
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = c1 * v;
@@ -236,13 +236,13 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 /* fs routine to compute the slow portion of the ODE RHS. */
-static int fs(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fs(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype w = NV_Ith_S(y,2);                 /* access solution values */
+  sunrealtype w = NV_Ith_S(y,2);                 /* access solution values */
 
   /* fill in the RHS function */
   NV_Ith_S(ydot,0) = w;
-  NV_Ith_S(ydot,1) = RCONST(0.0);
+  NV_Ith_S(ydot,1) = SUN_RCONST(0.0);
   NV_Ith_S(ydot,2) = -w;
 
   /* Return with success */
diff --git a/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp b/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp
index 45eae942b2..dead0697c7 100644
--- a/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp
+++ b/examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.cpp
@@ -60,33 +60,33 @@ using namespace std;
 // Problem Constants
 
 #define GROUPSIZE 3            // number of equations per group
-#define Y1    RCONST(1.0)      // initial y components
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   // scalar relative tolerance
-#define ATOL1 RCONST(1.0e-8)   // vector absolute tolerance components
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      // initial time
-#define T1    RCONST(0.1)      // first output time
-#define TMULT RCONST(10.0)     // output time factor
+#define Y1    SUN_RCONST(1.0)      // initial y components
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   // scalar relative tolerance
+#define ATOL1 SUN_RCONST(1.0e-8)   // vector absolute tolerance components
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      // initial time
+#define T1    SUN_RCONST(0.1)      // first output time
+#define TMULT SUN_RCONST(10.0)     // output time factor
 #define NOUT  10               // number of output times
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 // Functions Called by the Solver
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // Private function to output results
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 
 // Private function to print final statistics
 static void PrintFinalStats(void *cvode_mem, bool direct);
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
   if (check_retval((void *)abstol, "N_VClone", 0)) return 1;
 
   // Initialize y
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   for (sunindextype groupj = 0; groupj < neq; groupj += GROUPSIZE)
   {
     ydata[groupj]     = Y1;
@@ -174,10 +174,10 @@ int main(int argc, char *argv[])
   N_VCopyToDevice_Sycl(y);
 
   // Set the scalar relative tolerance
-  realtype reltol = RTOL;
+  sunrealtype reltol = RTOL;
 
   // Set the vector absolute tolerance
-  realtype* abstol_data = N_VGetArrayPointer(abstol);
+  sunrealtype* abstol_data = N_VGetArrayPointer(abstol);
   for (sunindextype groupj = 0; groupj < neq; groupj += GROUPSIZE)
   {
     abstol_data[groupj]     = ATOL1;
@@ -254,8 +254,8 @@ int main(int argc, char *argv[])
     printf("  output disabled\n");
 
   int      iout = 0;
-  realtype tout = T1;
-  realtype t;
+  sunrealtype tout = T1;
+  sunrealtype t;
 
   // Start timer
   chrono::time_point<chrono::steady_clock> tstart = chrono::steady_clock::now();
@@ -316,11 +316,11 @@ int main(int argc, char *argv[])
 
 
 // Compute the right-hand side function, ydot = f(t, y).
-static int f(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
   UserData* udata    = (UserData*) user_data;
-  realtype* ydata    = N_VGetDeviceArrayPointer(y);
-  realtype* ydotdata = N_VGetDeviceArrayPointer(ydot);
+  sunrealtype* ydata    = N_VGetDeviceArrayPointer(y);
+  sunrealtype* ydotdata = N_VGetDeviceArrayPointer(ydot);
 
   const size_t       ngroups = static_cast<size_t>(udata->ngroups);
   const sunindextype N       = GROUPSIZE;
@@ -331,12 +331,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void* user_data)
     {
       sunindextype groupj = idx[0];
 
-      realtype y1 = ydata[N * groupj];
-      realtype y2 = ydata[N * groupj + 1];
-      realtype y3 = ydata[N * groupj + 2];
+      sunrealtype y1 = ydata[N * groupj];
+      sunrealtype y2 = ydata[N * groupj + 1];
+      sunrealtype y3 = ydata[N * groupj + 2];
 
-      realtype yd1 = RCONST(-0.04) * y1 + RCONST(1.0e4) * y2 * y3;
-      realtype yd3 = RCONST(3.0e7) * y2 * y2;
+      sunrealtype yd1 = SUN_RCONST(-0.04) * y1 + SUN_RCONST(1.0e4) * y2 * y3;
+      sunrealtype yd3 = SUN_RCONST(3.0e7) * y2 * y2;
 
       ydotdata[N * groupj]     = yd1;
       ydotdata[N * groupj + 1] = -yd1 - yd3;
@@ -351,12 +351,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void* user_data)
 
 
 // Compute the right-hand side Jacobian, J(t,y) = df/dy.
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData* udata = (UserData*) user_data;
-  realtype* Jdata = SUNMatrix_OneMklDense_Data(J);
-  realtype* ydata = N_VGetDeviceArrayPointer(y);
+  sunrealtype* Jdata = SUNMatrix_OneMklDense_Data(J);
+  sunrealtype* ydata = N_VGetDeviceArrayPointer(y);
 
   const size_t       ngroups = static_cast<size_t>(udata->ngroups);
   const sunindextype N       = GROUPSIZE;
@@ -369,22 +369,22 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
       sunindextype groupj = idx[0];
 
       // get y values
-      realtype y2 = ydata[N * groupj + 1];
-      realtype y3 = ydata[N * groupj + 2];
+      sunrealtype y2 = ydata[N * groupj + 1];
+      sunrealtype y3 = ydata[N * groupj + 2];
 
       // first col of block
-      Jdata[NN * groupj]     = RCONST(-0.04);
-      Jdata[NN * groupj + 1] = RCONST(0.04);
+      Jdata[NN * groupj]     = SUN_RCONST(-0.04);
+      Jdata[NN * groupj + 1] = SUN_RCONST(0.04);
       Jdata[NN * groupj + 2] = ZERO;
 
       // second col of block
-      Jdata[NN * groupj + 3] = RCONST(1.0e4) * y3;
-      Jdata[NN * groupj + 4] = RCONST(-1.0e4) * y3 - RCONST(6.0e7) * y2;
-      Jdata[NN * groupj + 5] = RCONST(6.0e7) * y2;
+      Jdata[NN * groupj + 3] = SUN_RCONST(1.0e4) * y3;
+      Jdata[NN * groupj + 4] = SUN_RCONST(-1.0e4) * y3 - SUN_RCONST(6.0e7) * y2;
+      Jdata[NN * groupj + 5] = SUN_RCONST(6.0e7) * y2;
 
       // third col of block
-      Jdata[NN * groupj + 6] = RCONST(1.0e4) * y2;
-      Jdata[NN * groupj + 7] = RCONST(-1.0e4) * y2;
+      Jdata[NN * groupj + 6] = SUN_RCONST(1.0e4) * y2;
+      Jdata[NN * groupj + 7] = SUN_RCONST(-1.0e4) * y2;
       Jdata[NN * groupj + 8] = ZERO;
     });
   });
@@ -395,14 +395,14 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 }
 
 
-static int PSolve(realtype t, N_Vector y, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector y, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   UserData* udata = (UserData*) user_data;
-  realtype* ydata = N_VGetDeviceArrayPointer(y);
-  realtype* rdata = N_VGetDeviceArrayPointer(r);
-  realtype* zdata = N_VGetDeviceArrayPointer(z);
+  sunrealtype* ydata = N_VGetDeviceArrayPointer(y);
+  sunrealtype* rdata = N_VGetDeviceArrayPointer(r);
+  sunrealtype* zdata = N_VGetDeviceArrayPointer(z);
 
   const size_t       ngroups = static_cast<size_t>(udata->ngroups);
   const sunindextype N       = GROUPSIZE;
@@ -423,14 +423,14 @@ static int PSolve(realtype t, N_Vector y, N_Vector f, N_Vector r,
       // [   0       -d       1 ] [ z2 ]   [ r2 ]
 
       // get y values
-      realtype y2 = ydata[i1];
-      realtype y3 = ydata[i2];
+      sunrealtype y2 = ydata[i1];
+      sunrealtype y3 = ydata[i2];
 
       // set matrix values
-      realtype a = gamma * RCONST(0.04);
-      realtype b = gamma * RCONST(1.0e4) * y3;
-      realtype c = gamma * RCONST(1.0e4) * y2;
-      realtype d = gamma * RCONST(6.0e7) * y2;
+      sunrealtype a = gamma * SUN_RCONST(0.04);
+      sunrealtype b = gamma * SUN_RCONST(1.0e4) * y3;
+      sunrealtype c = gamma * SUN_RCONST(1.0e4) * y2;
+      sunrealtype d = gamma * SUN_RCONST(6.0e7) * y2;
 
       // Initial Jacobi iteration with zero guess
 
@@ -447,9 +447,9 @@ static int PSolve(realtype t, N_Vector y, N_Vector f, N_Vector r,
 
       for (int i = 1; i < 10; ++i)
       {
-        realtype z0 = zdata[i0];
-        realtype z1 = zdata[i1];
-        realtype z2 = zdata[i2];
+        sunrealtype z0 = zdata[i0];
+        sunrealtype z1 = zdata[i1];
+        sunrealtype z2 = zdata[i2];
 
         // z0 = (r0 + b * z1 + x * z2 / (1 + a)
         zdata[i0] = (rdata[i0] + b * z1 + c * z2) / (ONE + a);
@@ -472,7 +472,7 @@ static int PSolve(realtype t, N_Vector y, N_Vector f, N_Vector r,
 
 
 // Output solution
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/CXX_parallel/cv_heat2D_p.cpp b/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
index b7a896014f..b37e77c7b6 100644
--- a/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
+++ b/examples/cvode/CXX_parallel/cv_heat2D_p.cpp
@@ -60,11 +60,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -78,18 +78,18 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -99,8 +99,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -137,10 +137,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -149,10 +149,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -161,8 +161,8 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      maxsteps;    // max number of steps between outputs
 
   // Linear solver and preconditioner settings
@@ -170,7 +170,7 @@ struct UserData
   bool     prec;      // preconditioner on/off
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Inverse of Jacobian diagonal for preconditioner
   N_Vector d;
@@ -196,14 +196,14 @@ struct UserData
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -236,10 +236,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -249,7 +249,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -416,9 +416,9 @@ int main(int argc, char* argv[])
     // Loop over output times
     // -----------------------
 
-    realtype t     = ZERO;
-    realtype dTout = udata->tf / udata->nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata->tf / udata->nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = OpenOutput(udata);
@@ -473,12 +473,12 @@ int main(int argc, char* argv[])
       flag = SolutionError(t, u, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       if (outproc)
       {
         cout << scientific;
-        cout << setprecision(numeric_limits<realtype>::digits10);
+        cout << setprecision(numeric_limits<sunrealtype>::digits10);
         cout << "  Max error = " << maxerr << endl;
       }
     }
@@ -616,23 +616,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -699,7 +699,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -729,15 +729,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -746,15 +746,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -794,10 +794,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -898,8 +898,8 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   // Start timer
   double t1 = MPI_Wtime();
@@ -908,17 +908,17 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
   UserData *udata = (UserData *) user_data;
 
   // Access data array
-  realtype *diag = N_VGetArrayPointer(udata->d);
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // Constants for computing diffusion
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Set all entries of d to the inverse diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE / (ONE - gamma * cc);
+  sunrealtype c = ONE / (ONE - gamma * cc);
   N_VConst(c, udata->d);
 
   // Stop timer
@@ -932,8 +932,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   // Start timer
@@ -1033,7 +1033,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1255,8 +1255,8 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol     = RCONST(1.e-5);   // relative tolerance
-  udata->atol     = RCONST(1.e-10);  // absolute tolerance
+  udata->rtol     = SUN_RCONST(1.e-5);   // relative tolerance
+  udata->atol     = SUN_RCONST(1.e-10);  // absolute tolerance
   udata->maxsteps = 0;               // use default
 
   // Linear solver and preconditioner options
@@ -1447,11 +1447,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1466,7 +1466,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1487,7 +1487,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -1580,7 +1580,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -1631,7 +1631,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -1642,7 +1642,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -1650,10 +1650,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -1669,7 +1669,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -1687,7 +1687,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -1700,7 +1700,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -1793,8 +1793,8 @@ static int OutputStats(void *cvode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step    = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter = " << avgli  << endl;
   cout << endl;
diff --git a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp
index 2558368073..95578b722d 100644
--- a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp
+++ b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp
@@ -61,11 +61,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -85,18 +85,18 @@ struct UserData
   sundials::Context& sunctx;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -106,8 +106,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -144,10 +144,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -156,10 +156,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -168,8 +168,8 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      maxsteps;    // max number of steps between outputs
 
   // Linear solver and preconditioner settings
@@ -177,7 +177,7 @@ struct UserData
   bool     prec;      // preconditioner on/off
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // hypre PFMG settings (hypre defaults)
   HYPRE_Int pfmg_relax;  // type of relaxation:
@@ -244,7 +244,7 @@ SUNMatrix_ID Hypre5ptMatrix_GetID(SUNMatrix A);
 SUNMatrix Hypre5ptMatrix_Clone(SUNMatrix A);
 void Hypre5ptMatrix_Destroy(SUNMatrix A);
 int Hypre5ptMatrix_Copy(SUNMatrix A, SUNMatrix B);
-int Hypre5ptMatrix_ScaleAddI(realtype c, SUNMatrix A);
+int Hypre5ptMatrix_ScaleAddI(sunrealtype c, SUNMatrix A);
 
 // -----------------------------------------------------------------------------
 // Custom hypre linear solver definition
@@ -280,7 +280,7 @@ SUNLinearSolver_Type HypreLS_GetType(SUNLinearSolver S);
 int HypreLS_Initialize(SUNLinearSolver S);
 int HypreLS_Setup(SUNLinearSolver S, SUNMatrix A);
 int HypreLS_Solve(SUNLinearSolver S, SUNMatrix A,
-                   N_Vector x, N_Vector b, realtype tol);
+                   N_Vector x, N_Vector b, sunrealtype tol);
 int HypreLS_NumIters(SUNLinearSolver S);
 int HypreLS_Free(SUNLinearSolver S);
 
@@ -289,10 +289,10 @@ int HypreLS_Free(SUNLinearSolver S);
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Jacobian evaluation function
-static int Jac(realtype t, N_Vector u, N_Vector f, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector f, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
@@ -319,10 +319,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -332,7 +332,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -481,9 +481,9 @@ int main(int argc, char* argv[])
     // Loop over output times
     // -----------------------
 
-    realtype t     = ZERO;
-    realtype dTout = udata->tf / udata->nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata->tf / udata->nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = OpenOutput(udata);
@@ -538,12 +538,12 @@ int main(int argc, char* argv[])
       flag = SolutionError(t, u, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       if (outproc)
       {
         cout << scientific;
-        cout << setprecision(numeric_limits<realtype>::digits10);
+        cout << setprecision(numeric_limits<sunrealtype>::digits10);
         cout << "  Max error = " << maxerr << endl;
       }
     }
@@ -681,23 +681,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -764,7 +764,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -794,15 +794,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -811,15 +811,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -859,10 +859,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -963,7 +963,7 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Jac function to compute the ODE RHS function Jacobian, (df/dy)(t,y).
-static int Jac(realtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   // Shortcuts to hypre matrix and grid extents, work array, etc.
@@ -1012,9 +1012,9 @@ static int Jac(realtype t, N_Vector y, N_Vector ydot, SUNMatrix J,
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1357,7 +1357,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1580,8 +1580,8 @@ UserData::UserData(sundials::Context& sunctx)
   ipN = -1;
 
   // Integrator settings
-  rtol     = RCONST(1.e-5);   // relative tolerance
-  atol     = RCONST(1.e-10);  // absolute tolerance
+  rtol     = SUN_RCONST(1.e-5);   // relative tolerance
+  atol     = SUN_RCONST(1.e-10);  // absolute tolerance
   maxsteps = 0;               // use default
 
   // Linear solver and preconditioner options
@@ -1770,11 +1770,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -1789,7 +1789,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1810,7 +1810,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -1907,7 +1907,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -1958,7 +1958,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -1969,7 +1969,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -1977,10 +1977,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -1996,7 +1996,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2014,7 +2014,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2027,7 +2027,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -2117,8 +2117,8 @@ static int OutputStats(void *cvode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step    = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter = " << avgli  << endl;
   cout << endl;
@@ -2372,7 +2372,7 @@ int Hypre5ptMatrix_Copy(SUNMatrix A, SUNMatrix B)
   return(SUNMAT_SUCCESS);
 }
 
-int Hypre5ptMatrix_ScaleAddI(realtype c, SUNMatrix A)
+int Hypre5ptMatrix_ScaleAddI(sunrealtype c, SUNMatrix A)
 {
   int flag;
 
@@ -2618,7 +2618,7 @@ int HypreLS_Setup(SUNLinearSolver LS, SUNMatrix A)
 }
 
 int HypreLS_Solve(SUNLinearSolver LS, SUNMatrix A,
-                  N_Vector x, N_Vector b, realtype tol)
+                  N_Vector x, N_Vector b, sunrealtype tol)
 {
   int flag;
 
diff --git a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
index fb783c1cea..dbb2732460 100644
--- a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
+++ b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp
@@ -61,11 +61,11 @@
 
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -85,18 +85,18 @@ struct UserData
   sundials::Context& sunctx;
 
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Final time
-  realtype tf;
+  sunrealtype tf;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -106,8 +106,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -144,10 +144,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -156,10 +156,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -168,8 +168,8 @@ struct UserData
   MPI_Request reqSN;
 
   // Integrator settings
-  realtype rtol;        // relative tolerance
-  realtype atol;        // absolute tolerance
+  sunrealtype rtol;        // relative tolerance
+  sunrealtype atol;        // absolute tolerance
   int      maxsteps;    // max number of steps between outputs
 
   // Linear solver and preconditioner settings
@@ -178,7 +178,7 @@ struct UserData
   bool     matvec;    // use hypre matrix-vector product
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // hypre objects
   HYPRE_StructGrid    grid;
@@ -233,18 +233,18 @@ struct UserData
 // -----------------------------------------------------------------------------
 
 // ODE right hand side function
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data);
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp);
 
 // Preconditioner setup and solve functions
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data);
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data);
 
 // -----------------------------------------------------------------------------
@@ -264,7 +264,7 @@ static int SetupHypre(UserData *udata);
 
 // Fill Jacobian and A = I - gamma * J
 static int Jac(UserData *udata);
-static int ScaleAddI(UserData *udata, realtype gamma);
+static int ScaleAddI(UserData *udata, sunrealtype gamma);
 
 // -----------------------------------------------------------------------------
 // UserData and input functions
@@ -278,10 +278,10 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc);
 // -----------------------------------------------------------------------------
 
 // Compute the true solution
-static int Solution(realtype t, N_Vector u, UserData *udata);
+static int Solution(sunrealtype t, N_Vector u, UserData *udata);
 
 // Compute the solution error solution
-static int SolutionError(realtype t, N_Vector u,  N_Vector e, UserData *udata);
+static int SolutionError(sunrealtype t, N_Vector u,  N_Vector e, UserData *udata);
 
 // Print the command line options
 static void InputHelp();
@@ -291,7 +291,7 @@ static int PrintUserData(UserData *udata);
 
 // Output solution and error
 static int OpenOutput(UserData *udata);
-static int WriteOutput(realtype t, N_Vector u, UserData *udata);
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata);
 static int CloseOutput(UserData *udata);
 
 // Print integration statistics
@@ -465,9 +465,9 @@ int main(int argc, char* argv[])
     // Loop over output times
     // -----------------------
 
-    realtype t     = ZERO;
-    realtype dTout = udata->tf / udata->nout;
-    realtype tout  = dTout;
+    sunrealtype t     = ZERO;
+    sunrealtype dTout = udata->tf / udata->nout;
+    sunrealtype tout  = dTout;
 
     // Inital output
     flag = OpenOutput(udata);
@@ -522,12 +522,12 @@ int main(int argc, char* argv[])
       flag = SolutionError(t, u, udata->e, udata);
       if (check_flag(&flag, "SolutionError", 1)) return 1;
 
-      realtype maxerr = N_VMaxNorm(udata->e);
+      sunrealtype maxerr = N_VMaxNorm(udata->e);
 
       if (outproc)
       {
         cout << scientific;
-        cout << setprecision(numeric_limits<realtype>::digits10);
+        cout << setprecision(numeric_limits<sunrealtype>::digits10);
         cout << "  Max error = " << maxerr << endl;
       }
     }
@@ -664,23 +664,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -747,7 +747,7 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
 // -----------------------------------------------------------------------------
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector f, void *user_data)
 {
   int          flag;
   sunindextype i, j;
@@ -777,15 +777,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_flag((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -794,15 +794,15 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   // Iterate over subdomain and compute rhs forcing term
   if (udata->forcing)
   {
-    realtype x, y;
-    realtype sin_sqr_x, sin_sqr_y;
-    realtype cos_sqr_x, cos_sqr_y;
+    sunrealtype x, y;
+    sunrealtype sin_sqr_x, sin_sqr_y;
+    sunrealtype cos_sqr_x, cos_sqr_y;
 
-    realtype bx = (udata->kx) * TWO * PI * PI;
-    realtype by = (udata->ky) * TWO * PI * PI;
+    sunrealtype bx = (udata->kx) * TWO * PI * PI;
+    sunrealtype by = (udata->ky) * TWO * PI * PI;
 
-    realtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
-    realtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
+    sunrealtype sin_t_cos_t = sin(PI * t) * cos(PI * t);
+    sunrealtype cos_sqr_t   = cos(PI * t) * cos(PI * t);
 
     for (j = jstart; j < jend; j++)
     {
@@ -842,10 +842,10 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
   if (check_flag(&flag, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -946,7 +946,7 @@ static int f(realtype t, N_Vector u, N_Vector f, void *user_data)
 }
 
 // Jacobian-vector product function
-static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
+static int JTimes(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector y, N_Vector fy,
                   void *user_data, N_Vector tmp)
 {
   int flag;
@@ -998,8 +998,8 @@ static int JTimes(N_Vector v, N_Vector Jv, realtype t, N_Vector y, N_Vector fy,
 }
 
 // Preconditioner setup routine
-static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
-                  booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok,
+                  sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   int flag;
 
@@ -1087,8 +1087,8 @@ static int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok,
 }
 
 // Preconditioner solve routine for Pz = r
-static int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r,
-                  N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r,
+                  N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                   void *user_data)
 {
   int flag;
@@ -1366,9 +1366,9 @@ static int Jac(UserData *udata)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1634,7 +1634,7 @@ static int Jac(UserData *udata)
 }
 
 // Fill A = I - gamma * J matrix
-static int ScaleAddI(UserData *udata, realtype gamma)
+static int ScaleAddI(UserData *udata, sunrealtype gamma)
 {
   int flag;
 
@@ -1763,7 +1763,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1986,8 +1986,8 @@ UserData::UserData(sundials::Context& sunctx)
   ipN = -1;
 
   // Integrator settings
-  rtol     = RCONST(1.e-5);   // relative tolerance
-  atol     = RCONST(1.e-10);  // absolute tolerance
+  rtol     = SUN_RCONST(1.e-5);   // relative tolerance
+  atol     = SUN_RCONST(1.e-10);  // absolute tolerance
   maxsteps = 0;               // use default
 
   // Linear solver and preconditioner options
@@ -2219,11 +2219,11 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // -----------------------------------------------------------------------------
 
 // Compute the exact solution
-static int Solution(realtype t, N_Vector u, UserData *udata)
+static int Solution(sunrealtype t, N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype cos_sqr_t;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype cos_sqr_t;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Constants for computing solution
   cos_sqr_t = cos(PI * t) * cos(PI * t);
@@ -2238,7 +2238,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -2259,7 +2259,7 @@ static int Solution(realtype t, N_Vector u, UserData *udata)
 }
 
 // Compute the solution error
-static int SolutionError(realtype t, N_Vector u, N_Vector e, UserData *udata)
+static int SolutionError(sunrealtype t, N_Vector u, N_Vector e, UserData *udata)
 {
   // Compute true solution
   int flag = Solution(t, e, udata);
@@ -2358,7 +2358,7 @@ static int OpenOutput(UserData *udata)
   if (udata->output > 0 && outproc)
   {
     cout << scientific;
-    cout << setprecision(numeric_limits<realtype>::digits10);
+    cout << setprecision(numeric_limits<sunrealtype>::digits10);
     if (udata->forcing)
     {
       cout << "          t           ";
@@ -2409,7 +2409,7 @@ static int OpenOutput(UserData *udata)
     udata->uout.open(fname.str());
 
     udata->uout << scientific;
-    udata->uout << setprecision(numeric_limits<realtype>::digits10);
+    udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     if (udata->forcing)
     {
@@ -2420,7 +2420,7 @@ static int OpenOutput(UserData *udata)
       udata->eout.open(fname.str());
 
       udata->eout << scientific;
-      udata->eout << setprecision(numeric_limits<realtype>::digits10);
+      udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
     }
   }
 
@@ -2428,10 +2428,10 @@ static int OpenOutput(UserData *udata)
 }
 
 // Write output
-static int WriteOutput(realtype t, N_Vector u, UserData *udata)
+static int WriteOutput(sunrealtype t, N_Vector u, UserData *udata)
 {
   int      flag;
-  realtype max;
+  sunrealtype max;
   bool     outproc = (udata->myid_c == 0);
 
   if (udata->output > 0)
@@ -2447,7 +2447,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     }
 
     // Compute rms norm of the state
-    realtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
+    sunrealtype urms = sqrt(N_VDotProd(u, u) / udata->nx / udata->ny);
 
     // Output current status
     if (outproc)
@@ -2465,7 +2465,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
     // Write solution and error to disk
     if (udata->output == 2)
     {
-      realtype *uarray = N_VGetArrayPointer(u);
+      sunrealtype *uarray = N_VGetArrayPointer(u);
       if (check_flag((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
       udata->uout << t << " ";
@@ -2478,7 +2478,7 @@ static int WriteOutput(realtype t, N_Vector u, UserData *udata)
       if (udata->forcing)
       {
         // Output error to disk
-        realtype *earray = N_VGetArrayPointer(udata->e);
+        sunrealtype *earray = N_VGetArrayPointer(udata->e);
         if (check_flag((void *) earray, "N_VGetArrayPointer", 0)) return -1;
 
         udata->eout << t << " ";
@@ -2571,8 +2571,8 @@ static int OutputStats(void *cvode_mem, UserData* udata)
   cout << endl;
 
   // Compute average nls iters per step attempt and ls iters per nls iter
-  realtype avgnli = (realtype) nni / (realtype) nst;
-  realtype avgli  = (realtype) nli / (realtype) nni;
+  sunrealtype avgnli = (sunrealtype) nni / (sunrealtype) nst;
+  sunrealtype avgli  = (sunrealtype) nli / (sunrealtype) nni;
   cout << "  Avg NLS iters per step    = " << avgnli << endl;
   cout << "  Avg LS iters per NLS iter = " << avgli  << endl;
   cout << endl;
diff --git a/examples/cvode/CXX_serial/cv_heat2D.cpp b/examples/cvode/CXX_serial/cv_heat2D.cpp
index 5c839e3281..21e0c6f008 100644
--- a/examples/cvode/CXX_serial/cv_heat2D.cpp
+++ b/examples/cvode/CXX_serial/cv_heat2D.cpp
@@ -61,9 +61,9 @@
 int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data);
 
 // Preconditioner Setup and Solve functions
-int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok, booleantype* jcurPtr, realtype gamma, void* user_data);
+int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok, sunbooleantype* jcurPtr, sunrealtype gamma, void* user_data);
 
-int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r, N_Vector z, realtype gamma, realtype delta, int lr,
+int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r, N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
            void* user_data);
 
 // -----------------------------------------------------------------------------
@@ -352,7 +352,7 @@ int f(sunrealtype t, N_Vector u, N_Vector f, void* user_data)
 }
 
 // Preconditioner setup routine
-int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok, booleantype* jcurPtr, realtype gamma, void* user_data)
+int PSetup(sunrealtype t, N_Vector u, N_Vector f, sunbooleantype jok, sunbooleantype* jcurPtr, sunrealtype gamma, void* user_data)
 {
   // Access problem data
   auto udata = static_cast<UserData*>(user_data);
@@ -376,7 +376,7 @@ int PSetup(realtype t, N_Vector u, N_Vector f, booleantype jok, booleantype* jcu
 }
 
 // Preconditioner solve routine for Pz = r
-int PSolve(realtype t, N_Vector u, N_Vector f, N_Vector r, N_Vector z, realtype gamma, realtype delta, int lr,
+int PSolve(sunrealtype t, N_Vector u, N_Vector f, N_Vector r, N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
            void* user_data)
 {
   // Access user_data structure
diff --git a/examples/cvode/CXX_serial/cv_heat2D.hpp b/examples/cvode/CXX_serial/cv_heat2D.hpp
index c9a8d4259b..c8a2878381 100644
--- a/examples/cvode/CXX_serial/cv_heat2D.hpp
+++ b/examples/cvode/CXX_serial/cv_heat2D.hpp
@@ -32,11 +32,11 @@
 #include <example_utilities.hpp>
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // -----------------------------------------------------------------------------
 // User data structure
diff --git a/examples/cvode/CXX_serial/cv_kpr.cpp b/examples/cvode/CXX_serial/cv_kpr.cpp
index 4065b6fe35..0a8847c19e 100644
--- a/examples/cvode/CXX_serial/cv_kpr.cpp
+++ b/examples/cvode/CXX_serial/cv_kpr.cpp
@@ -40,10 +40,10 @@
 // -----------------------------------------------------------------------------
 
 // ODE right-hand side function
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 // Jacobian of RHS function
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
@@ -66,11 +66,11 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0] = utrue;
   ydata[1] = vtrue;
 
@@ -105,17 +105,17 @@ int main(int argc, char* argv[])
   }
 
   // Attach user data pointer
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag = CVodeSetUserData(cvode_mem, udata);
   if (check_flag(flag, "CVodeSetUserData")) return 1;
 
   // Initial time and fist output time
-  realtype tret = ZERO;
-  realtype tout = tret + opts.dtout;
+  sunrealtype tret = ZERO;
+  sunrealtype tout = tret + opts.dtout;
 
   // Output initial contion
   std::cout << std::scientific;
-  std::cout << std::setprecision(std::numeric_limits<realtype>::digits10);
+  std::cout << std::setprecision(std::numeric_limits<sunrealtype>::digits10);
   std::cout << "           t              ";
   std::cout << "          u              ";
   std::cout << "          v              ";
@@ -172,22 +172,22 @@ int main(int argc, char* argv[])
  *   [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ]
  * ---------------------------------------------------------------------------*/
 
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* fdata = N_VGetArrayPointer(ydot);
+  sunrealtype* fdata = N_VGetArrayPointer(ydot);
   fdata[0] = a * tmp1 + b * tmp2 + rdot(t) / (TWO * u);
   fdata[1] = c * tmp1 + d * tmp2 + sdot(t) / (TWO * v);
 
@@ -200,20 +200,20 @@ int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-sdot(t))/(2u^2) ]
  * ---------------------------------------------------------------------------*/
 
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  realtype* Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   Jdata[0] = a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u);
   Jdata[1] = c / TWO +  c * (ONE + r(t)) / (TWO * u * u);
diff --git a/examples/cvode/CXX_serial/cv_kpr.hpp b/examples/cvode/CXX_serial/cv_kpr.hpp
index 67dac6b065..683392309e 100644
--- a/examples/cvode/CXX_serial/cv_kpr.hpp
+++ b/examples/cvode/CXX_serial/cv_kpr.hpp
@@ -32,11 +32,11 @@
 #include <example_utilities.hpp>
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 // -----------------------------------------------------------------------------
 // Problem options
@@ -45,8 +45,8 @@
 struct Options
 {
   // Relative and absolute tolerances
-  sunrealtype rtol = RCONST(1.0e-6);
-  sunrealtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Finite difference Jacobian
   bool fd_jac = false;
diff --git a/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp b/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp
index 44fe80d7b7..850d0eddbc 100644
--- a/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp
+++ b/examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.cpp
@@ -47,17 +47,17 @@
 
 // Real Constants
 
-#define ATOL  RCONST(1.0e-5) // scalar absolute tolerance
-#define T0    RCONST(0.0)    // initial time
-#define T1    RCONST(0.1)    // first output time
-#define DTOUT RCONST(0.1)    // output time increment
+#define ATOL  SUN_RCONST(1.0e-5) // scalar absolute tolerance
+#define T0    SUN_RCONST(0.0)    // initial time
+#define T1    SUN_RCONST(0.1)    // first output time
+#define DTOUT SUN_RCONST(0.1)    // output time increment
 #define NOUT  10             // number of output times
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -82,25 +82,25 @@ struct UserData
   sunindextype MX      = 10;                // interior nodes in the x-direction
   sunindextype MY      = 5;                 // interior nodes in the y-direction
   sunindextype NEQ     = MX * MY;           // number of equations
-  realtype     xmax    = RCONST(2.0);       // x-domain boundary
-  realtype     ymax    = RCONST(1.0);       // y-domain boundary
-  realtype     dx      = xmax / (MX + 1);   // x-direction mesh spacing
-  realtype     dy      = ymax / (MY + 1);   // y-directino mesh spacing
-  realtype     hdcoef  = ONE / (dx * dx);   // x-diffusion
-  realtype     vdcoef  = ONE / (dy * dy);   // y-diffusion
-  realtype     hacoef  = HALF / (TWO * dx); // x-advection
+  sunrealtype     xmax    = SUN_RCONST(2.0);       // x-domain boundary
+  sunrealtype     ymax    = SUN_RCONST(1.0);       // y-domain boundary
+  sunrealtype     dx      = xmax / (MX + 1);   // x-direction mesh spacing
+  sunrealtype     dy      = ymax / (MY + 1);   // y-directino mesh spacing
+  sunrealtype     hdcoef  = ONE / (dx * dx);   // x-diffusion
+  sunrealtype     vdcoef  = ONE / (dy * dy);   // y-diffusion
+  sunrealtype     hacoef  = HALF / (TWO * dx); // x-advection
 };
 
 // Functions Called by the Solver
-static int f(realtype t, N_Vector u, N_Vector udot, void* user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void* user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void* user_data, N_Vector tmp);
 
 // Private Helper Functions
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax,
                         UserData* data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void* cvode_mem);
 
 // Private function to check function return values
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
   if (check_retval((void*)u, "N_VNew_Sycl", 0)) return 1;
 
   // Extract host pointer to solution vector data on the host
-  realtype* udata = N_VGetArrayPointer(u);
+  sunrealtype* udata = N_VGetArrayPointer(u);
 
   // Load initial profile into u vector
   for (sunindextype tid = 0; tid < data.NEQ; tid++)
@@ -150,8 +150,8 @@ int main(int argc, char** argv)
     sunindextype i = tid / data.MY; // x-node index
     sunindextype j = tid % data.MY; // y-node index
 
-    realtype x = (i + 1) * data.dx; // x location
-    realtype y = (j + 1) * data.dy; // y location
+    sunrealtype x = (i + 1) * data.dx; // x location
+    sunrealtype y = (j + 1) * data.dy; // y location
 
     udata[tid] =
       x * (data.xmax - x) * y * (data.ymax - y) * std::exp(FIVE * x * y);
@@ -169,8 +169,8 @@ int main(int argc, char** argv)
   if (check_retval(&retval, "CVodeInit", 1)) return 1;
 
   // Specify the scalar relative tolerance and scalar absolute tolerance
-  realtype reltol = ZERO;
-  realtype abstol = ATOL;
+  sunrealtype reltol = ZERO;
+  sunrealtype abstol = ATOL;
   retval = CVodeSStolerances(cvode_mem, reltol, abstol);
   if (check_retval(&retval, "CVodeSStolerances", 1)) return 1;
 
@@ -191,11 +191,11 @@ int main(int argc, char** argv)
   if (check_retval(&retval, "CVodeSetJacTimesVecFn", 1)) return 1;
 
   // In loop over output points: call CVODE, print results, test for errors
-  realtype umax = N_VMaxNorm(u);
+  sunrealtype umax = N_VMaxNorm(u);
   PrintHeader(reltol, abstol, umax, &data);
 
-  realtype tout = T1; // output time
-  realtype t;         // CVODE return time
+  sunrealtype tout = T1; // output time
+  sunrealtype t;         // CVODE return time
   long int nst;       // number of time steps
 
   for (int iout = 0; iout < NOUT; iout++)
@@ -230,20 +230,20 @@ int main(int argc, char** argv)
  * ---------------------------------------------------------------------------*/
 
 // Compute the ODE right-hand side function f(t,u).
-static int f(realtype t, N_Vector u, N_Vector udot, void* user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void* user_data)
 {
   UserData* data = static_cast<UserData*>(user_data);
 
   // Extract needed constants from data
   const size_t   MX    = static_cast<size_t>(data->MX);
   const size_t   MY    = static_cast<size_t>(data->MY);
-  const realtype hordc = data->hdcoef;
-  const realtype horac = data->hacoef;
-  const realtype verdc = data->vdcoef;
+  const sunrealtype hordc = data->hdcoef;
+  const sunrealtype horac = data->hacoef;
+  const sunrealtype verdc = data->vdcoef;
 
   // Extract pointers to vector data
-  const realtype* udata  = N_VGetDeviceArrayPointer(u);
-  realtype*       dudata = N_VGetDeviceArrayPointer(udot);
+  const sunrealtype* udata  = N_VGetDeviceArrayPointer(u);
+  sunrealtype*       dudata = N_VGetDeviceArrayPointer(udot);
 
   data->myQueue->submit([&](sycl::handler& h)
   {
@@ -253,16 +253,16 @@ static int f(realtype t, N_Vector u, N_Vector udot, void* user_data)
       sunindextype j   = idx[1];
       sunindextype tid = i * MY + j;
 
-      realtype uij = udata[tid];
-      realtype udn = (j ==      0) ? ZERO : udata[tid - 1];
-      realtype uup = (j == MY - 1) ? ZERO : udata[tid + 1];
-      realtype ult = (i ==      0) ? ZERO : udata[tid - MY];
-      realtype urt = (i == MX - 1) ? ZERO : udata[tid + MY];
+      sunrealtype uij = udata[tid];
+      sunrealtype udn = (j ==      0) ? ZERO : udata[tid - 1];
+      sunrealtype uup = (j == MY - 1) ? ZERO : udata[tid + 1];
+      sunrealtype ult = (i ==      0) ? ZERO : udata[tid - MY];
+      sunrealtype urt = (i == MX - 1) ? ZERO : udata[tid + MY];
 
       // Set diffusion and advection terms and load into udot
-      realtype hdiff = hordc * (ult - TWO * uij + urt);
-      realtype vdiff = verdc * (uup - TWO * uij + udn);
-      realtype hadv  = horac * (urt - ult);
+      sunrealtype hdiff = hordc * (ult - TWO * uij + urt);
+      sunrealtype vdiff = verdc * (uup - TWO * uij + udn);
+      sunrealtype hadv  = horac * (urt - ult);
 
       dudata[tid] = hdiff + vdiff + hadv;
     });
@@ -273,7 +273,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void* user_data)
 
 
 // Jacobian-times-vector routine.
-static int jtv(N_Vector v, N_Vector Jv, realtype t, N_Vector u, N_Vector fu,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t, N_Vector u, N_Vector fu,
                void* user_data, N_Vector tmp)
 {
   UserData* data = static_cast<UserData*>(user_data);
@@ -281,13 +281,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t, N_Vector u, N_Vector fu,
   // Extract needed constants from data
   const size_t   MX    = static_cast<size_t>(data->MX);
   const size_t   MY    = static_cast<size_t>(data->MY);
-  const realtype hordc = data->hdcoef;
-  const realtype horac = data->hacoef;
-  const realtype verdc = data->vdcoef;
+  const sunrealtype hordc = data->hdcoef;
+  const sunrealtype horac = data->hacoef;
+  const sunrealtype verdc = data->vdcoef;
 
   // Extract pointers to vector data
-  const realtype *vdata  = N_VGetDeviceArrayPointer(v);
-  realtype       *Jvdata = N_VGetDeviceArrayPointer(Jv);
+  const sunrealtype *vdata  = N_VGetDeviceArrayPointer(v);
+  sunrealtype       *Jvdata = N_VGetDeviceArrayPointer(Jv);
 
   data->myQueue->submit([&](sycl::handler& h)
   {
@@ -315,7 +315,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t, N_Vector u, N_Vector fu,
  * ---------------------------------------------------------------------------*/
 
 // Print first lines of output (problem description)
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax,
                         UserData* data)
 {
   std::cout << "\n2-D Advection-Diffusion Equation" << std::endl;
@@ -328,7 +328,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
 }
 
 // Print current value
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
   std::cout << "At t = " << t << "   max.norm(u) = "<< umax
             << "   nst = " << nst << std::endl;
diff --git a/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.c b/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.c
index 3130ea284e..36cd2c31ce 100644
--- a/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.c
+++ b/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.c
@@ -66,7 +66,7 @@
 #include <nvector/nvector_parallel.h>       /* access to MPI-parallel N_Vector          */
 #include <sunlinsol/sunlinsol_spgmr.h>      /* access to SPGMR SUNLinearSolver          */
 #include <sundials/sundials_dense.h>        /* prototypes for small dense fcts.         */
-#include <sundials/sundials_types.h>        /* definitions of realtype, booleantype     */
+#include <sundials/sundials_types.h>        /* definitions of sunrealtype, sunbooleantype     */
 
 /* helpful macros */
 
@@ -77,27 +77,27 @@
 /* Problem Constants */
 
 #define NVARS        2                    /* number of species         */
-#define KH           RCONST(4.0e-6)       /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)        /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)       /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
-
-#define T0           RCONST(0.0)          /* initial time */
+#define KH           SUN_RCONST(4.0e-6)       /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)        /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)       /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
+
+#define T0           SUN_RCONST(0.0)          /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
-#define XMIN         RCONST(0.0)          /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMIN         SUN_RCONST(0.0)          /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -110,8 +110,8 @@
                                     /* Spatial mesh is MX by MY */
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -121,7 +121,7 @@
 /* IJth is defined in order to write code which indexes into dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -135,24 +135,24 @@
 
 typedef struct {
 
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype c1ext[(MXSUB+2)*(MYSUB+2)];
-  realtype c2ext[(MXSUB+2)*(MYSUB+2)];
-  realtype SendBufferE[NVARS*MYSUB];
-  realtype SendBufferW[NVARS*MYSUB];
-  realtype SendBufferN[NVARS*MXSUB];
-  realtype SendBufferS[NVARS*MXSUB];
-  realtype RecvBufferE[NVARS*MYSUB];
-  realtype RecvBufferW[NVARS*MYSUB];
-  realtype RecvBufferN[NVARS*MXSUB];
-  realtype RecvBufferS[NVARS*MXSUB];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype c1ext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype c2ext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype SendBufferE[NVARS*MYSUB];
+  sunrealtype SendBufferW[NVARS*MYSUB];
+  sunrealtype SendBufferN[NVARS*MXSUB];
+  sunrealtype SendBufferS[NVARS*MXSUB];
+  sunrealtype RecvBufferE[NVARS*MYSUB];
+  sunrealtype RecvBufferW[NVARS*MYSUB];
+  sunrealtype RecvBufferN[NVARS*MXSUB];
+  sunrealtype RecvBufferS[NVARS*MXSUB];
   int my_pe, isubx, isuby;
   int nvmxsub2;
   MPI_Comm comm;
   MPI_Request request[8];
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
@@ -163,26 +163,26 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
-static void BSend(realtype c1data[], realtype c2data[], UserData data);
+static void BSend(sunrealtype c1data[], sunrealtype c2data[], UserData data);
 static void BRecvPost(UserData data);
 static void BRecvWait(UserData data);
 static void PrepareExt(N_Vector u, UserData data);
-static void fcalc(realtype t, N_Vector udot, UserData data);
+static void fcalc(sunrealtype t, N_Vector udot, UserData data);
 
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 
@@ -196,7 +196,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u, c[2];
   UserData data;
   SUNLinearSolver LS;
@@ -328,11 +328,11 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -378,8 +378,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 {
   int lx, ly, jx, jy;
   sunindextype offset;
-  realtype x, y, cx, cy, xmid, ymid;
-  realtype *c1data, *c2data;
+  sunrealtype x, y, cx, cy, xmid, ymid;
+  sunrealtype *c1data, *c2data;
 
   /* Set pointer to data array in vector u */
   c1data = N_VGetSubvectorArrayPointer_MPIManyVector(u,0);
@@ -389,18 +389,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + (data->isuby)*MYSUB;
     y = YMIN + jy*(data->dy);
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + (data->isubx)*MXSUB;
       x = XMIN + jx*(data->dx);
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       c1data[offset] = C1_SCALE*cx*cy;
       c2data[offset] = C2_SCALE*cx*cy;
       offset++;
@@ -411,10 +411,10 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int qu, retval;
-  realtype hu, *c1data, *c2data, tempu[2];
+  sunrealtype hu, *c1data, *c2data, tempu[2];
   int npelast;
   long int nst;
   MPI_Status status;
@@ -552,7 +552,7 @@ static void BRecvPost(UserData data)
 
 /* Routine to send boundary data to neighboring PEs */
 
-static void BSend(realtype c1data[], realtype c2data[], UserData data)
+static void BSend(sunrealtype c1data[], sunrealtype c2data[], UserData data)
 {
   int ly, lx, retval;
   sunindextype offsetu;
@@ -663,7 +663,7 @@ static void BRecvWait(UserData data)
 
 static void PrepareExt(N_Vector u, UserData data)
 {
-  realtype *c1data, *c2data;
+  sunrealtype *c1data, *c2data;
   int lx, ly;
 
   /* Access data arrays from u, and extended work arrays c1ext and c2ext */
@@ -724,13 +724,13 @@ static void PrepareExt(N_Vector u, UserData data)
 }
 
 
-static void fcalc(realtype t, N_Vector udot, UserData data)
+static void fcalc(sunrealtype t, N_Vector udot, UserData data)
 {
-  realtype *c1dot, *c2dot;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef;
+  sunrealtype *c1dot, *c2dot;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef;
   int lx, ly, jy;
   sunindextype offset;
 
@@ -741,12 +741,12 @@ static void fcalc(realtype t, N_Vector udot, UserData data)
   /* Set diurnal rate coefficients as functions of t, and save q4 in
   data block for use by preconditioner evaluation routine */
   s = sin((data->om)*t);
-  if (s > RCONST(0.0)) {
+  if (s > SUN_RCONST(0.0)) {
     q3 = exp(-A3/s);
     q4coef = exp(-A4/s);
   } else {
-    q3 = RCONST(0.0);
-    q4coef = RCONST(0.0);
+    q3 = SUN_RCONST(0.0);
+    q4coef = SUN_RCONST(0.0);
   }
   data->q4 = q4coef;
 
@@ -757,10 +757,10 @@ static void fcalc(realtype t, N_Vector udot, UserData data)
     jy = ly + (data->isuby)*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*(data->dy);
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*(data->dy);
     yup = ydn + data->dy;
-    cydn = (data->vdco)*exp(RCONST(0.2)*ydn);
-    cyup = (data->vdco)*exp(RCONST(0.2)*yup);
+    cydn = (data->vdco)*exp(SUN_RCONST(0.2)*ydn);
+    cyup = (data->vdco)*exp(SUN_RCONST(0.2)*yup);
 
     /* Loop over x-direction */
     for (lx=0; lx<MXSUB; lx++) {
@@ -783,7 +783,7 @@ static void fcalc(realtype t, N_Vector udot, UserData data)
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -791,8 +791,8 @@ static void fcalc(realtype t, N_Vector udot, UserData data)
       vertd2 = cyup*(c2up - c2) - cydn*(c2 - c2dn);
 
       /* Set horizontal diffusion and advection terms */
-      hord1 = (data->hdco)*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = (data->hdco)*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = (data->hdco)*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = (data->hdco)*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = (data->haco)*(c1rt - c1lt);
       horad2 = (data->haco)*(c2rt - c2lt);
 
@@ -810,7 +810,7 @@ static void fcalc(realtype t, N_Vector udot, UserData data)
    subgrid boundary data and to copy data from u into uext.
    Then calculate f by a call to fcalc. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   /* Call PrepareExt to set up work arrays for calculation of RHS
      (includes inter-processor communication) */
@@ -823,15 +823,15 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 }
 
 /* Preconditioner setup routine. Generate and preprocess P. */
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   sunindextype retval;
   sunindextype *(*pivot)[MYSUB];
   sunindextype lx, ly, jy;
-  realtype *c1data, *c2data, **a, **j;
+  sunrealtype *c1data, *c2data, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, pointer to u's data,
@@ -858,11 +858,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
        computed on the last f call).  Load into P. */
     for (ly=0; ly<MYSUB; ly++) {
       jy = ly + (data->isuby)*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*(data->dy);
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*(data->dy);
       yup = ydn + (data->dy);
-      cydn = (data->vdco)*exp(RCONST(0.2)*ydn);
-      cyup = (data->vdco)*exp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*(data->hdco));
+      cydn = (data->vdco)*exp(SUN_RCONST(0.2)*ydn);
+      cyup = (data->vdco)*exp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*(data->hdco));
       for (lx = 0; lx < MXSUB; lx++) {
         c1 = c1data[lx+ly*MXSUB];
         c2 = c2data[lx+ly*MXSUB];
@@ -898,13 +898,13 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
 }
 
 /* Preconditioner solve routine */
-static int PSolve(realtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   sunindextype *(*pivot)[MYSUB];
   int lx, ly;
-  realtype *z1data, *z2data, v[2];
+  sunrealtype *z1data, *z2data, v[2];
   UserData data;
 
   /* Extract the P and pivot arrays from user_data */
@@ -915,7 +915,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
   z1data = N_VGetSubvectorArrayPointer_MPIManyVector(z,0);
   z2data = N_VGetSubvectorArrayPointer_MPIManyVector(z,1);
   for (lx=0; lx<MXSUB; lx++) {
diff --git a/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c b/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c
index d10c14b32d..9e097f89a2 100644
--- a/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c
+++ b/examples/cvode/C_openmp/cvAdvDiff_bnd_omp.c
@@ -58,7 +58,7 @@
 #include <nvector/nvector_openmp.h>    /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -66,22 +66,22 @@
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -99,15 +99,15 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
   int nthreads;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -116,8 +116,8 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /*
@@ -129,7 +129,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNMatrix A;
@@ -248,10 +248,10 @@ int main(int argc, char *argv[])
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   sunindextype i, j;
   UserData data;
 
@@ -295,12 +295,12 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunindextype i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -350,8 +350,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 static void SetIC(N_Vector u, UserData data)
 {
   sunindextype i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   i = j = 0;
 
@@ -377,7 +377,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -400,7 +400,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c b/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c
index d051c7e967..27a0a5230f 100644
--- a/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c
+++ b/examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.c
@@ -44,7 +44,7 @@
 
 #include <cvode/cvode.h>               /* prototypes for CVODE fcts., consts. */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver     */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 #include <sundials/sundials_math.h>    /* definition of ABS and EXP   */
 #include <nvector/nvector_openmpdev.h> /* OpenMPDEV N_Vector types, fcts., macros */
 
@@ -54,23 +54,23 @@
 
 /* Real Constants */
 
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* Type : _UserData (contains model and discretization parameters) */
 typedef struct {
   sunindextype MX, MY, NEQ;
-  realtype dx, dy, XMAX, YMAX;
-  realtype hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, XMAX, YMAX;
+  sunrealtype hdcoef, hacoef, vdcoef;
 } *UserData;
 
 /*typedef _UserData *UserData;*/
@@ -80,14 +80,14 @@ static UserData SetUserData(int argc, char** argv);
 static void SetIC(N_Vector u, UserData data);
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp);
 
 /* Private Helper Functions */
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -103,7 +103,7 @@ static int check_retval(void *flagvalue, const char *funcname, int opt);
 int main(int argc, char** argv)
 {
   SUNContext sunctx;
-  realtype reltol, abstol, t, tout, umax;
+  sunrealtype reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -201,8 +201,8 @@ UserData SetUserData(int argc, char *argv[])
 {
   const sunindextype MX = 10;
   const sunindextype MY = 5;
-  const realtype XMAX = RCONST(2.0);    /* domain boundaries         */
-  const realtype YMAX = RCONST(1.0);
+  const sunrealtype XMAX = SUN_RCONST(2.0);    /* domain boundaries         */
+  const sunrealtype YMAX = SUN_RCONST(1.0);
 
   /* Allocate user data structure */
   UserData ud = (UserData) malloc(sizeof *ud);
@@ -228,18 +228,18 @@ static void SetIC(N_Vector u, UserData data)
 {
   /* Extract needed constants from data */
 
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
-  const realtype xmax = data->XMAX;
-  const realtype ymax = data->YMAX;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
+  const sunrealtype xmax = data->XMAX;
+  const sunrealtype ymax = data->YMAX;
   const sunindextype MY = data->MY;
   const sunindextype NEQ = data->NEQ;
 
   /* Extract pointer to solution vector data on the host */
-  realtype *udata = N_VGetHostArrayPointer_OpenMPDEV(u);
+  sunrealtype *udata = N_VGetHostArrayPointer_OpenMPDEV(u);
 
   sunindextype i, j, tid;
-  realtype x, y;
+  sunrealtype x, y;
 
 
   /* Load initial profile into u vector */
@@ -265,9 +265,9 @@ static void SetIC(N_Vector u, UserData data)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
+  sunrealtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
   sunindextype i, j, k;
   int dev;
 
@@ -276,13 +276,13 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *udata = N_VGetDeviceArrayPointer_OpenMPDEV(u);
-  realtype *dudata      = N_VGetDeviceArrayPointer_OpenMPDEV(udot);
+  const sunrealtype *udata = N_VGetDeviceArrayPointer_OpenMPDEV(u);
+  sunrealtype *dudata      = N_VGetDeviceArrayPointer_OpenMPDEV(udot);
 
   /* Get device */
   dev = omp_get_default_device();
@@ -314,7 +314,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
@@ -326,13 +326,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *vdata = N_VGetDeviceArrayPointer_OpenMPDEV(v);
-  realtype *Jvdata      = N_VGetDeviceArrayPointer_OpenMPDEV(Jv);
+  const sunrealtype *vdata = N_VGetDeviceArrayPointer_OpenMPDEV(v);
+  sunrealtype *Jvdata      = N_VGetDeviceArrayPointer_OpenMPDEV(Jv);
 
   N_VConst(ZERO, Jv);
 
@@ -364,7 +364,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %ld X %ld\n", (long int) data->MX, (long int) data->MY);
@@ -387,7 +387,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserDat
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvode/cuda/cvAdvDiff_diag_cuda.cu b/examples/cvode/cuda/cvAdvDiff_diag_cuda.cu
index ad84004e37..74589d4d72 100644
--- a/examples/cvode/cuda/cvAdvDiff_diag_cuda.cu
+++ b/examples/cvode/cuda/cvAdvDiff_diag_cuda.cu
@@ -47,43 +47,43 @@
 #include <cvode/cvode.h>                  /* prototypes for CVODE fcts., consts.  */
 #include <cvode/cvode_diag.h>             /* prototypes for CVODE diagonal solver */
 #include <nvector/nvector_cuda.h>         /* access to cuda N_Vector              */
-#include <sundials/sundials_types.h>      /* definition of type realtype          */
+#include <sundials/sundials_types.h>      /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1e-10)  /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1e-10)  /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains mesh spacing and problem parameters. */
 
 typedef struct {
-  realtype dx;
-  realtype hdcoef;
-  realtype hacoef;
+  sunrealtype dx;
+  sunrealtype hdcoef;
+  sunrealtype hacoef;
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx);
+static void SetIC(N_Vector u, sunrealtype dx);
 
 static void PrintIntro(int toltype, int usefused);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -94,7 +94,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -128,9 +128,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   SetIC(u, dx);  /* Initialize u vector */
 
@@ -203,12 +203,12 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx)
+static void SetIC(N_Vector u, sunrealtype dx)
 {
   int i;
   sunindextype N;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetHostArrayPointer_Cuda(u);
@@ -217,7 +217,7 @@ static void SetIC(N_Vector u, realtype dx)
   /* Load initial profile into u vector */
   for (i=1; i<=N; i++) {
     x = i*dx;
-    udata[i-1] = x*(XMAX - x)*exp(RCONST(2.0)*x);
+    udata[i-1] = x*(XMAX - x)*exp(SUN_RCONST(2.0)*x);
   }
   N_VCopyToDevice_Cuda(u);
 }
@@ -241,7 +241,7 @@ static void PrintIntro(int toltype, int usefused)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -284,11 +284,11 @@ static void PrintFinalStats(void *cvode_mem)
 
 __global__
 static void f_kernel(sunindextype N,
-                     realtype hordc, realtype horac,
-                     const realtype* u, realtype* udot)
+                     sunrealtype hordc, sunrealtype horac,
+                     const sunrealtype* u, sunrealtype* udot)
 {
   sunindextype i = blockDim.x*blockIdx.x + threadIdx.x;
-  realtype ui, ult, urt, hdiff, hadv;
+  sunrealtype ui, ult, urt, hdiff, hadv;
 
   if (i < N) {
     /* Extract u at x_i and two neighboring points */
@@ -297,16 +297,16 @@ static void f_kernel(sunindextype N,
     urt = (i == N-1) ? ZERO : u[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     udot[i] = hdiff + hadv;
   }
 }
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype hordc, horac;
-  realtype *udata, *dudata;
+  sunrealtype hordc, horac;
+  sunrealtype *udata, *dudata;
   sunindextype N;
   size_t grid, block;
   UserData data;
diff --git a/examples/cvode/cuda/cvAdvDiff_kry_cuda.cu b/examples/cvode/cuda/cvAdvDiff_kry_cuda.cu
index d05254584a..968aecd550 100644
--- a/examples/cvode/cuda/cvAdvDiff_kry_cuda.cu
+++ b/examples/cvode/cuda/cvAdvDiff_kry_cuda.cu
@@ -45,24 +45,24 @@
 
 #include <cvode/cvode.h>               /* prototypes for CVODE fcts., consts. */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver     */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 #include <sundials/sundials_math.h>    /* definition of ABS and EXP   */
 
 #include <nvector/nvector_cuda.h>
 
 /* Real Constants */
 
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -85,11 +85,11 @@
  * CUDA kernels
  */
 
-__global__ void fKernel(const realtype *u, realtype *udot,
+__global__ void fKernel(const sunrealtype *u, sunrealtype *udot,
                                sunindextype MX, sunindextype MY,
-                               realtype hordc, realtype horac, realtype verdc)
+                               sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
-  realtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
+  sunrealtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
   sunindextype i, j, tid;
 
   /* Loop over all grid points. */
@@ -115,9 +115,9 @@ __global__ void fKernel(const realtype *u, realtype *udot,
 
 }
 
-__global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
+__global__ void jtvKernel(const sunrealtype *vdata, sunrealtype *Jvdata,
                           sunindextype MX, sunindextype MY,
-                          realtype hordc, realtype horac, realtype verdc)
+                          sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
   sunindextype i, j, tid;
 
@@ -145,8 +145,8 @@ __global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
 /* Type : _UserData (contains model and discretization parameters) */
 struct _UserData {
   sunindextype MX, MY, NEQ;
-  realtype dx, dy, XMAX, YMAX;
-  realtype hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, XMAX, YMAX;
+  sunrealtype hdcoef, hacoef, vdcoef;
 };
 
 typedef _UserData *UserData;
@@ -156,14 +156,14 @@ static UserData SetUserData(int argc, char** argv);
 static void SetIC(N_Vector u, UserData data);
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp);
 
 /* Private Helper Functions */
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -178,7 +178,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 int main(int argc, char** argv)
 {
-  realtype reltol, abstol, t, tout, umax;
+  sunrealtype reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -296,8 +296,8 @@ UserData SetUserData(int argc, char *argv[])
 {
   const sunindextype MX = 10;
   const sunindextype MY = 5;
-  const realtype XMAX = RCONST(2.0);    /* domain boundaries         */
-  const realtype YMAX = RCONST(1.0);
+  const sunrealtype XMAX = SUN_RCONST(2.0);    /* domain boundaries         */
+  const sunrealtype YMAX = SUN_RCONST(1.0);
 
   /* Allocate user data structure */
   UserData ud = (UserData) malloc(sizeof *ud);
@@ -323,18 +323,18 @@ static void SetIC(N_Vector u, UserData data)
 {
   /* Extract needed constants from data */
 
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
-  const realtype xmax = data->XMAX;
-  const realtype ymax = data->YMAX;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
+  const sunrealtype xmax = data->XMAX;
+  const sunrealtype ymax = data->YMAX;
   const sunindextype MY = data->MY;
   const sunindextype NEQ = data->NEQ;
 
   /* Extract pointer to solution vector data on the host */
-  realtype *udata = N_VGetHostArrayPointer_Cuda(u);
+  sunrealtype *udata = N_VGetHostArrayPointer_Cuda(u);
 
   sunindextype i, j, tid;
-  realtype x, y;
+  sunrealtype x, y;
 
 
   /* Load initial profile into u vector */
@@ -360,20 +360,20 @@ static void SetIC(N_Vector u, UserData data)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data = (UserData) user_data;
 
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *udata = N_VGetDeviceArrayPointer_Cuda(u);
-  realtype *dudata      = N_VGetDeviceArrayPointer_Cuda(udot);
+  const sunrealtype *udata = N_VGetDeviceArrayPointer_Cuda(u);
+  sunrealtype *dudata      = N_VGetDeviceArrayPointer_Cuda(udot);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -386,7 +386,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
@@ -395,13 +395,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *vdata = N_VGetDeviceArrayPointer_Cuda(v);
-  realtype *Jvdata      = N_VGetDeviceArrayPointer_Cuda(Jv);
+  const sunrealtype *vdata = N_VGetDeviceArrayPointer_Cuda(v);
+  sunrealtype *Jvdata      = N_VGetDeviceArrayPointer_Cuda(Jv);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -421,7 +421,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax,
                         UserData data)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
@@ -435,7 +435,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
   printf("At t = %4.2" FSYM "   max.norm(u) =%14.6" ESYM "   nst = %4ld\n", t, umax, nst);
   return;
diff --git a/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.cu b/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.cu
index a88d9180b8..13df5a617a 100644
--- a/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.cu
+++ b/examples/cvode/cuda/cvAdvDiff_kry_cuda_managed.cu
@@ -45,24 +45,24 @@
 
 #include <cvode/cvode.h>               /* prototypes for CVODE fcts., consts. */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver     */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 #include <sundials/sundials_math.h>    /* definition of ABS and EXP   */
 
 #include <nvector/nvector_cuda.h>
 
 /* Real Constants */
 
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -85,11 +85,11 @@
  * CUDA kernels
  */
 
-__global__ void fKernel(const realtype *u, realtype *udot,
+__global__ void fKernel(const sunrealtype *u, sunrealtype *udot,
                                sunindextype MX, sunindextype MY,
-                               realtype hordc, realtype horac, realtype verdc)
+                               sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
-  realtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
+  sunrealtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
   sunindextype i, j, tid;
 
   /* Loop over all grid points. */
@@ -115,9 +115,9 @@ __global__ void fKernel(const realtype *u, realtype *udot,
 
 }
 
-__global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
+__global__ void jtvKernel(const sunrealtype *vdata, sunrealtype *Jvdata,
                           sunindextype MX, sunindextype MY,
-                          realtype hordc, realtype horac, realtype verdc)
+                          sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
   sunindextype i, j, tid;
 
@@ -145,8 +145,8 @@ __global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
 /* Type : _UserData (contains model and discretization parameters) */
 struct _UserData {
   sunindextype MX, MY, NEQ;
-  realtype dx, dy, XMAX, YMAX;
-  realtype hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, XMAX, YMAX;
+  sunrealtype hdcoef, hacoef, vdcoef;
 };
 
 typedef _UserData *UserData;
@@ -156,14 +156,14 @@ static UserData SetUserData(int argc, char** argv);
 static void SetIC(N_Vector u, UserData data);
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp);
 
 /* Private Helper Functions */
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -179,7 +179,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char** argv)
 {
   SUNContext sunctx;
-  realtype reltol, abstol, t, tout, umax;
+  sunrealtype reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -300,8 +300,8 @@ UserData SetUserData(int argc, char *argv[])
 {
   const sunindextype MX = 10;
   const sunindextype MY = 5;
-  const realtype XMAX = RCONST(2.0);    /* domain boundaries         */
-  const realtype YMAX = RCONST(1.0);
+  const sunrealtype XMAX = SUN_RCONST(2.0);    /* domain boundaries         */
+  const sunrealtype YMAX = SUN_RCONST(1.0);
 
   /* Allocate user data structure */
   UserData ud = (UserData) malloc(sizeof *ud);
@@ -327,18 +327,18 @@ static void SetIC(N_Vector u, UserData data)
 {
   /* Extract needed constants from data */
 
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
-  const realtype xmax = data->XMAX;
-  const realtype ymax = data->YMAX;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
+  const sunrealtype xmax = data->XMAX;
+  const sunrealtype ymax = data->YMAX;
   const sunindextype MY = data->MY;
   const sunindextype NEQ = data->NEQ;
 
   /* Extract pointer to solution vector data on the host */
-  realtype *udata = N_VGetHostArrayPointer_Cuda(u);
+  sunrealtype *udata = N_VGetHostArrayPointer_Cuda(u);
 
   sunindextype i, j, tid;
-  realtype x, y;
+  sunrealtype x, y;
 
 
   /* Load initial profile into u vector */
@@ -363,20 +363,20 @@ static void SetIC(N_Vector u, UserData data)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data = (UserData) user_data;
 
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *udata = N_VGetDeviceArrayPointer_Cuda(u);
-  realtype *dudata      = N_VGetDeviceArrayPointer_Cuda(udot);
+  const sunrealtype *udata = N_VGetDeviceArrayPointer_Cuda(u);
+  sunrealtype *dudata      = N_VGetDeviceArrayPointer_Cuda(udot);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -389,7 +389,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
@@ -398,13 +398,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *vdata = N_VGetDeviceArrayPointer_Cuda(v);
-  realtype *Jvdata      = N_VGetDeviceArrayPointer_Cuda(Jv);
+  const sunrealtype *vdata = N_VGetDeviceArrayPointer_Cuda(v);
+  sunrealtype *Jvdata      = N_VGetDeviceArrayPointer_Cuda(Jv);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -424,7 +424,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax,
                         UserData data)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
@@ -438,7 +438,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
   printf("At t = %4.2" FSYM "   max.norm(u) =%14.6" ESYM "   nst = %4ld\n", t, umax, nst);
   return;
diff --git a/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.cu b/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.cu
index 666f10bfb3..de8ef27a7d 100644
--- a/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.cu
+++ b/examples/cvode/cuda/cvRoberts_block_cusolversp_batchqr.cu
@@ -43,45 +43,45 @@
 #include <nvector/nvector_cuda.h>                     /* access to cuda N_Vector                       */
 #include <sunmatrix/sunmatrix_cusparse.h>             /* access to cusparse SUNMatrix                  */
 #include <sunlinsol/sunlinsol_cusolversp_batchqr.h>   /* access to cuSolverSp batch QR SUNLinearSolver */
-#include <sundials/sundials_types.h>                  /* defs. of realtype, int                        */
+#include <sundials/sundials_types.h>                  /* defs. of sunrealtype, int                        */
 
 /* Problem Constants */
 
 #define GROUPSIZE 3            /* number of equations per group */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 __global__
-static void f_kernel(realtype t, realtype* y, realtype* ydot,
+static void f_kernel(sunrealtype t, sunrealtype* y, sunrealtype* ydot,
                      int neq, int ngroups);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 __global__
-static void j_kernel(int ngroups, int nnzper, realtype* ydata, realtype *Jdata);
+static void j_kernel(int ngroups, int nnzper, sunrealtype* ydata, sunrealtype *Jdata);
 
 /* Private function to initialize the Jacobian sparsity pattern */
 static int JacInit(SUNMatrix J);
 
 /* Private function to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 
 /* Private function to print final statistics */
 
@@ -106,8 +106,8 @@ typedef struct {
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype reltol, t, tout;
-  realtype *ydata, *abstol_data;
+  sunrealtype reltol, t, tout;
+  sunrealtype *ydata, *abstol_data;
   N_Vector y, abstol;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -275,10 +275,10 @@ int main(int argc, char *argv[])
    to do the actual computation. At the very least, doing this
    saves moving the vector data in y and ydot to/from the device
    every evaluation of f. */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData *udata;
-  realtype *ydata, *ydotdata;
+  sunrealtype *ydata, *ydotdata;
 
   udata = (UserData*) user_data;
   ydata = N_VGetDeviceArrayPointer_Cuda(y);
@@ -302,18 +302,18 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 /* Right hand side function evalutation kernel. */
 __global__
-static void f_kernel(realtype t, realtype* ydata, realtype* ydotdata,
+static void f_kernel(sunrealtype t, sunrealtype* ydata, sunrealtype* ydotdata,
                      int neq, int ngroups)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   int i = blockIdx.x*blockDim.x + threadIdx.x;
   int groupj = i*GROUPSIZE;
 
   if (i < neq) {
     y1 = ydata[groupj]; y2 = ydata[groupj+1]; y3 = ydata[groupj+2];
 
-    yd1 = ydotdata[groupj]   = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-    yd3 = ydotdata[groupj+2] = RCONST(3.0e7)*y2*y2;
+    yd1 = ydotdata[groupj]   = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+    yd3 = ydotdata[groupj+2] = SUN_RCONST(3.0e7)*y2*y2;
     ydotdata[groupj+1] = -yd1 - yd3;
   }
 }
@@ -365,12 +365,12 @@ static int JacInit(SUNMatrix J)
  * This is done on the GPU.
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData *udata = (UserData*) user_data;
   int nnzper;
-  realtype *Jdata, *ydata;
+  sunrealtype *Jdata, *ydata;
   unsigned block_size, grid_size;
 
   nnzper  = GROUPSIZE * GROUPSIZE;
@@ -395,10 +395,10 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 
 /* Jacobian evaluation GPU kernel */
 __global__
-static void j_kernel(int ngroups, int nnzper, realtype* ydata, realtype *Jdata)
+static void j_kernel(int ngroups, int nnzper, sunrealtype* ydata, sunrealtype *Jdata)
 {
   int groupj;
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   for (groupj = blockIdx.x*blockDim.x + threadIdx.x;
        groupj < ngroups;
@@ -409,18 +409,18 @@ static void j_kernel(int ngroups, int nnzper, realtype* ydata, realtype *Jdata)
     y3 = ydata[GROUPSIZE*groupj + 2];
 
     /* first row of block */
-    Jdata[nnzper*groupj]       = RCONST(-0.04);
-    Jdata[nnzper*groupj + 1]   = RCONST(1.0e4)*y3;
-    Jdata[nnzper*groupj + 2]   = RCONST(1.0e4)*y2;
+    Jdata[nnzper*groupj]       = SUN_RCONST(-0.04);
+    Jdata[nnzper*groupj + 1]   = SUN_RCONST(1.0e4)*y3;
+    Jdata[nnzper*groupj + 2]   = SUN_RCONST(1.0e4)*y2;
 
     /* second row of block */
-    Jdata[nnzper*groupj + 3]   = RCONST(0.04);
-    Jdata[nnzper*groupj + 4]   = (RCONST(-1.0e4)*y3) - (RCONST(6.0e7)*y2);
-    Jdata[nnzper*groupj + 5]   = RCONST(-1.0e4)*y2;
+    Jdata[nnzper*groupj + 3]   = SUN_RCONST(0.04);
+    Jdata[nnzper*groupj + 4]   = (SUN_RCONST(-1.0e4)*y3) - (SUN_RCONST(6.0e7)*y2);
+    Jdata[nnzper*groupj + 5]   = SUN_RCONST(-1.0e4)*y2;
 
     /* third row of block */
     Jdata[nnzper*groupj + 6]   = ZERO;
-    Jdata[nnzper*groupj + 7]   = RCONST(6.0e7)*y2;
+    Jdata[nnzper*groupj + 7]   = SUN_RCONST(6.0e7)*y2;
     Jdata[nnzper*groupj + 8]   = ZERO;
   }
 }
@@ -431,7 +431,7 @@ static void j_kernel(int ngroups, int nnzper, realtype* ydata, realtype *Jdata)
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp b/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
index a363985c7b..fcd4e38d46 100644
--- a/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
+++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.hpp
@@ -43,11 +43,11 @@
 #include <example_utilities.hpp>
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // -----------------------------------------------------------------------------
 // User data structure
diff --git a/examples/cvode/ginkgo/cv_kpr_ginkgo.cpp b/examples/cvode/ginkgo/cv_kpr_ginkgo.cpp
index 7452dbdefb..f700ebdb72 100644
--- a/examples/cvode/ginkgo/cv_kpr_ginkgo.cpp
+++ b/examples/cvode/ginkgo/cv_kpr_ginkgo.cpp
@@ -46,10 +46,10 @@ using SUNGkoSolverType = sundials::ginkgo::LinearSolver<GkoSolverType, GkoMatrix
 // -----------------------------------------------------------------------------
 
 // ODE right-hand side function
-int f(realtype t, N_Vector y, N_Vector ydot, void* user_data);
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data);
 
 // Jacobian of RHS function
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
 // Main Program
@@ -71,11 +71,11 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0]        = utrue;
   ydata[1]        = vtrue;
 
@@ -117,17 +117,17 @@ int main(int argc, char* argv[])
   if (check_flag(flag, "CVodeSetJacFn")) return 1;
 
   // Attach user data pointer
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag              = CVodeSetUserData(cvode_mem, udata);
   if (check_flag(flag, "CVodeSetUserData")) return 1;
 
   // Initial time and fist output time
-  realtype tret = ZERO;
-  realtype tout = tret + opts.dtout;
+  sunrealtype tret = ZERO;
+  sunrealtype tout = tret + opts.dtout;
 
   // Output initial contion
   std::cout << std::scientific;
-  std::cout << std::setprecision(std::numeric_limits<realtype>::digits10);
+  std::cout << std::setprecision(std::numeric_limits<sunrealtype>::digits10);
   std::cout << "           t              ";
   std::cout << "          u              ";
   std::cout << "          v              ";
@@ -173,22 +173,22 @@ int main(int argc, char* argv[])
  *   [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ]
  * ---------------------------------------------------------------------------*/
 
-int f(realtype t, N_Vector y, N_Vector ydot, void* user_data)
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void* user_data)
 {
-  realtype* udata  = (realtype*)user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata  = (sunrealtype*)user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata  = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata  = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* fdata = N_VGetArrayPointer(ydot);
+  sunrealtype* fdata = N_VGetArrayPointer(ydot);
   fdata[0]        = a * tmp1 + b * tmp2 + rdot(t) / (TWO * u);
   fdata[1]        = c * tmp1 + d * tmp2 + sdot(t) / (TWO * v);
 
@@ -201,20 +201,20 @@ int f(realtype t, N_Vector y, N_Vector ydot, void* user_data)
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-sdot(t))/(2u^2) ]
  * ---------------------------------------------------------------------------*/
 
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype* udata  = (realtype*)user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata  = (sunrealtype*)user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   auto J_gko      = static_cast<SUNGkoMatrixType*>(J->content)->GkoMtx();
   auto J_data     = J_gko->get_values();
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   // Ginkgo dense matrix is stored in row-major format
   J_data[0] = a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u);
diff --git a/examples/cvode/ginkgo/cv_kpr_ginkgo.hpp b/examples/cvode/ginkgo/cv_kpr_ginkgo.hpp
index 503ca7e1ea..6bb453d01b 100644
--- a/examples/cvode/ginkgo/cv_kpr_ginkgo.hpp
+++ b/examples/cvode/ginkgo/cv_kpr_ginkgo.hpp
@@ -32,11 +32,11 @@
 #include <example_utilities.hpp>
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 // -----------------------------------------------------------------------------
 // Problem options
@@ -45,8 +45,8 @@
 struct Options
 {
   // Relative and absolute tolerances
-  sunrealtype rtol = RCONST(1.0e-6);
-  sunrealtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Output options
   sunrealtype dtout = ONE; // output interval
diff --git a/examples/cvode/hip/cvAdvDiff_diag_hip.cpp b/examples/cvode/hip/cvAdvDiff_diag_hip.cpp
index 82ec667db5..d68fc4d4a9 100644
--- a/examples/cvode/hip/cvAdvDiff_diag_hip.cpp
+++ b/examples/cvode/hip/cvAdvDiff_diag_hip.cpp
@@ -45,43 +45,43 @@
 #include <cvode/cvode.h>              /* prototypes for CVODE fcts., consts.  */
 #include <cvode/cvode_diag.h>         /* prototypes for CVODE diagonal solver */
 #include <nvector/nvector_hip.h>      /* access to hip N_Vector               */
-#include <sundials/sundials_types.h>  /* definition of type realtype          */
+#include <sundials/sundials_types.h>  /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1e-10)  /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1e-10)  /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains mesh spacing and problem parameters. */
 
 typedef struct {
-  realtype dx;
-  realtype hdcoef;
-  realtype hacoef;
+  sunrealtype dx;
+  sunrealtype hdcoef;
+  sunrealtype hacoef;
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx);
+static void SetIC(N_Vector u, sunrealtype dx);
 
 static void PrintIntro(int toltype, int usefused);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -92,7 +92,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   sundials::Context sunctx;
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -122,9 +122,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   SetIC(u, dx);  /* Initialize u vector */
 
@@ -196,12 +196,12 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx)
+static void SetIC(N_Vector u, sunrealtype dx)
 {
   int i;
   sunindextype N;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetHostArrayPointer_Hip(u);
@@ -210,7 +210,7 @@ static void SetIC(N_Vector u, realtype dx)
   /* Load initial profile into u vector */
   for (i=1; i<=N; i++) {
     x = i*dx;
-    udata[i-1] = x*(XMAX - x)*exp(RCONST(2.0)*x);
+    udata[i-1] = x*(XMAX - x)*exp(SUN_RCONST(2.0)*x);
   }
   N_VCopyToDevice_Hip(u);
 }
@@ -234,7 +234,7 @@ static void PrintIntro(int toltype, int usefused)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -277,11 +277,11 @@ static void PrintFinalStats(void *cvode_mem)
 
 __global__
 static void f_kernel(sunindextype N,
-                     realtype hordc, realtype horac,
-                     const realtype* u, realtype* udot)
+                     sunrealtype hordc, sunrealtype horac,
+                     const sunrealtype* u, sunrealtype* udot)
 {
   sunindextype i = blockDim.x*blockIdx.x + threadIdx.x;
-  realtype ui, ult, urt, hdiff, hadv;
+  sunrealtype ui, ult, urt, hdiff, hadv;
 
   if (i < N) {
     /* Extract u at x_i and two neighboring points */
@@ -290,16 +290,16 @@ static void f_kernel(sunindextype N,
     urt = (i == N-1) ? ZERO : u[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     udot[i] = hdiff + hadv;
   }
 }
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype hordc, horac;
-  realtype *udata, *dudata;
+  sunrealtype hordc, horac;
+  sunrealtype *udata, *dudata;
   sunindextype N;
   size_t grid, block;
   UserData data;
diff --git a/examples/cvode/hip/cvAdvDiff_kry_hip.cpp b/examples/cvode/hip/cvAdvDiff_kry_hip.cpp
index 0539d17f37..daf7760f56 100644
--- a/examples/cvode/hip/cvAdvDiff_kry_hip.cpp
+++ b/examples/cvode/hip/cvAdvDiff_kry_hip.cpp
@@ -43,24 +43,24 @@
 
 #include <cvode/cvode.h>               /* prototypes for CVODE fcts., consts. */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver     */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 #include <sundials/sundials_math.h>    /* definition of ABS and EXP   */
 
 #include <nvector/nvector_hip.h>
 
 /* Real Constants */
 
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -83,11 +83,11 @@
  * HIP kernels
  */
 
-__global__ void fKernel(const realtype *u, realtype *udot,
+__global__ void fKernel(const sunrealtype *u, sunrealtype *udot,
                                sunindextype MX, sunindextype MY,
-                               realtype hordc, realtype horac, realtype verdc)
+                               sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
-  realtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
+  sunrealtype uij, udn, uup, ult, urt, hdiff, hadv, vdiff;
   sunindextype i, j, tid;
 
   /* Loop over all grid points. */
@@ -113,9 +113,9 @@ __global__ void fKernel(const realtype *u, realtype *udot,
 
 }
 
-__global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
+__global__ void jtvKernel(const sunrealtype *vdata, sunrealtype *Jvdata,
                           sunindextype MX, sunindextype MY,
-                          realtype hordc, realtype horac, realtype verdc)
+                          sunrealtype hordc, sunrealtype horac, sunrealtype verdc)
 {
   sunindextype i, j, tid;
 
@@ -143,8 +143,8 @@ __global__ void jtvKernel(const realtype *vdata, realtype *Jvdata,
 /* Type : _UserData (contains model and discretization parameters) */
 struct _UserData {
   sunindextype MX, MY, NEQ;
-  realtype dx, dy, XMAX, YMAX;
-  realtype hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, XMAX, YMAX;
+  sunrealtype hdcoef, hacoef, vdcoef;
 };
 
 typedef _UserData *UserData;
@@ -154,14 +154,14 @@ static UserData SetUserData(int argc, char** argv);
 static void SetIC(N_Vector u, UserData data);
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp);
 
 /* Private Helper Functions */
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -177,7 +177,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char** argv)
 {
   sundials::Context sunctx;
-  realtype reltol, abstol, t, tout, umax;
+  sunrealtype reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -292,8 +292,8 @@ UserData SetUserData(int argc, char *argv[])
 {
   const sunindextype MX = 10;
   const sunindextype MY = 5;
-  const realtype XMAX = RCONST(2.0);    /* domain boundaries         */
-  const realtype YMAX = RCONST(1.0);
+  const sunrealtype XMAX = SUN_RCONST(2.0);    /* domain boundaries         */
+  const sunrealtype YMAX = SUN_RCONST(1.0);
 
   /* Allocate user data structure */
   UserData ud = (UserData) malloc(sizeof *ud);
@@ -319,18 +319,18 @@ static void SetIC(N_Vector u, UserData data)
 {
   /* Extract needed constants from data */
 
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
-  const realtype xmax = data->XMAX;
-  const realtype ymax = data->YMAX;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
+  const sunrealtype xmax = data->XMAX;
+  const sunrealtype ymax = data->YMAX;
   const sunindextype MY = data->MY;
   const sunindextype NEQ = data->NEQ;
 
   /* Extract pointer to solution vector data on the host */
-  realtype *udata = N_VGetHostArrayPointer_Hip(u);
+  sunrealtype *udata = N_VGetHostArrayPointer_Hip(u);
 
   sunindextype i, j, tid;
-  realtype x, y;
+  sunrealtype x, y;
 
 
   /* Load initial profile into u vector */
@@ -356,20 +356,20 @@ static void SetIC(N_Vector u, UserData data)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data = (UserData) user_data;
 
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *udata = N_VGetDeviceArrayPointer_Hip(u);
-  realtype *dudata      = N_VGetDeviceArrayPointer_Hip(udot);
+  const sunrealtype *udata = N_VGetDeviceArrayPointer_Hip(u);
+  sunrealtype *dudata      = N_VGetDeviceArrayPointer_Hip(udot);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -382,7 +382,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
@@ -391,13 +391,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
   /* Extract needed constants from data */
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *vdata = N_VGetDeviceArrayPointer_Hip(v);
-  realtype *Jvdata      = N_VGetDeviceArrayPointer_Hip(Jv);
+  const sunrealtype *vdata = N_VGetDeviceArrayPointer_Hip(v);
+  sunrealtype *Jvdata      = N_VGetDeviceArrayPointer_Hip(Jv);
 
   unsigned block = 256;
   unsigned grid = (MX*MY + block - 1) / block;
@@ -417,7 +417,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax,
                         UserData data)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
@@ -431,7 +431,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax,
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
   printf("At t = %4.2" FSYM "   max.norm(u) =%14.6" ESYM "   nst = %4ld\n", t, umax, nst);
   return;
diff --git a/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.cpp b/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.cpp
index 58a136a74f..cfe764e1fb 100644
--- a/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.cpp
+++ b/examples/cvode/kokkos/cv_bruss_batched_kokkos_2D.cpp
@@ -102,8 +102,8 @@ using ExecSpace = Kokkos::Serial;
 using MemSpace  = Kokkos::HostSpace;
 #endif
 
-using Vec1D     = Kokkos::View<realtype*, MemSpace>;
-using Vec2D     = Kokkos::View<realtype**, Kokkos::LayoutRight, MemSpace>;
+using Vec1D     = Kokkos::View<sunrealtype*, MemSpace>;
+using Vec2D     = Kokkos::View<sunrealtype**, Kokkos::LayoutRight, MemSpace>;
 using Vec2DHost = Vec2D::HostMirror;
 using VecType   = sundials::kokkos::Vector<ExecSpace>;
 using MatType   = sundials::kokkos::DenseMatrix<ExecSpace>;
diff --git a/examples/cvode/magma/cv_bruss_batched_magma.cpp b/examples/cvode/magma/cv_bruss_batched_magma.cpp
index e74a157aad..cf7b159b5d 100644
--- a/examples/cvode/magma/cv_bruss_batched_magma.cpp
+++ b/examples/cvode/magma/cv_bruss_batched_magma.cpp
@@ -163,9 +163,9 @@ struct UserData {
 
 int main(int argc, char *argv[])
 {
-  const sunrealtype T0 = RCONST(0.0);     /* initial time                   */
-  const sunrealtype Tf = RCONST(10.0);    /* final time                    */
-  const sunrealtype dTout = RCONST(1.0);  /* time between outputs          */
+  const sunrealtype T0 = SUN_RCONST(0.0);     /* initial time                   */
+  const sunrealtype Tf = SUN_RCONST(10.0);    /* final time                    */
+  const sunrealtype dTout = SUN_RCONST(1.0);  /* time between outputs          */
   const int Nt = (int) ceil(Tf/dTout);    /* number of output times        */
   const sunrealtype reltol = 1.0e-6;      /* relative integrator tolerance */
   int retval;
@@ -209,26 +209,26 @@ int main(int argc, char *argv[])
   /* Set the Reaction parameters according to test_type_type */
   for (int batchj = 0; batchj < udata.nbatches; ++batchj) {
     if (test_type == 1) {
-      udata.u0[batchj] = RCONST(3.9);
-      udata.v0[batchj] = RCONST(1.1);
-      udata.w0[batchj] = RCONST(2.8);
-      udata.a[batchj]  = RCONST(1.2);
-      udata.b[batchj]  = RCONST(2.5);
-      udata.ep[batchj] = RCONST(1.0e-5);
+      udata.u0[batchj] = SUN_RCONST(3.9);
+      udata.v0[batchj] = SUN_RCONST(1.1);
+      udata.w0[batchj] = SUN_RCONST(2.8);
+      udata.a[batchj]  = SUN_RCONST(1.2);
+      udata.b[batchj]  = SUN_RCONST(2.5);
+      udata.ep[batchj] = SUN_RCONST(1.0e-5);
     } else if (test_type == 2) {
-      udata.u0[batchj] = RCONST(3.0);
-      udata.v0[batchj] = RCONST(3.0);
-      udata.w0[batchj] = RCONST(3.5);
-      udata.a[batchj]  = RCONST(0.5);
-      udata.b[batchj]  = RCONST(3.0);
-      udata.ep[batchj] = RCONST(5.0e-4);
+      udata.u0[batchj] = SUN_RCONST(3.0);
+      udata.v0[batchj] = SUN_RCONST(3.0);
+      udata.w0[batchj] = SUN_RCONST(3.5);
+      udata.a[batchj]  = SUN_RCONST(0.5);
+      udata.b[batchj]  = SUN_RCONST(3.0);
+      udata.ep[batchj] = SUN_RCONST(5.0e-4);
     } else if (test_type == 3) {
-      udata.u0[batchj] = RCONST(1.2);
-      udata.v0[batchj] = RCONST(3.1);
-      udata.w0[batchj] = RCONST(3.0);
-      udata.a[batchj]  = RCONST(1.0);
-      udata.b[batchj]  = RCONST(3.5);
-      udata.ep[batchj] = RCONST(5.0e-6);
+      udata.u0[batchj] = SUN_RCONST(1.2);
+      udata.v0[batchj] = SUN_RCONST(3.1);
+      udata.w0[batchj] = SUN_RCONST(3.0);
+      udata.a[batchj]  = SUN_RCONST(1.0);
+      udata.b[batchj]  = SUN_RCONST(3.5);
+      udata.ep[batchj] = SUN_RCONST(5.0e-6);
     }
   }
 
diff --git a/examples/cvode/parallel/cvAdvDiff_diag_p.c b/examples/cvode/parallel/cvAdvDiff_diag_p.c
index e6e2f74916..6edd6aa0ff 100644
--- a/examples/cvode/parallel/cvAdvDiff_diag_p.c
+++ b/examples/cvode/parallel/cvAdvDiff_diag_p.c
@@ -44,48 +44,48 @@
 #include <cvode/cvode.h>                  /* prototypes for CVODE fcts., consts. */
 #include <cvode/cvode_diag.h>             /* prototypes for CVODE diagonal solver */
 #include <nvector/nvector_parallel.h>     /* access to MPI-parallel N_Vector     */
-#include <sundials/sundials_types.h>      /* definition of type realtype         */
+#include <sundials/sundials_types.h>      /* definition of type sunrealtype         */
 #include <sundials/sundials_logger.h>
 
 #include <mpi.h> /* MPI constants and types */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains grid constants, parallel machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
 {
   SUNContext sunctx;
   SUNLogger logger;
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -185,9 +185,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   SetIC(u, dx, local_N, my_base);  /* Initialize u vector */
 
@@ -251,13 +251,13 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer(u);
@@ -267,7 +267,7 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
   for (i=1; i<=my_length; i++) {
     iglobal = my_base + i;
     x = iglobal*dx;
-    udata[i-1] = x*(XMAX - x)*exp(RCONST(2.0)*x);
+    udata[i-1] = x*(XMAX - x)*exp(SUN_RCONST(2.0)*x);
   }
 }
 
@@ -284,7 +284,7 @@ static void PrintIntro(int npes)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -325,10 +325,10 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
   int npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   sunindextype i, my_length;
   UserData data;
@@ -383,7 +383,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i-1] = hdiff + hadv;
   }
diff --git a/examples/cvode/parallel/cvAdvDiff_non_p.c b/examples/cvode/parallel/cvAdvDiff_non_p.c
index 6ad6d7ddae..cbb8768b9e 100644
--- a/examples/cvode/parallel/cvAdvDiff_non_p.c
+++ b/examples/cvode/parallel/cvAdvDiff_non_p.c
@@ -44,47 +44,47 @@
 #include <cvode/cvode.h>                          /* prototypes for CVODE fcts., consts.          */
 #include <nvector/nvector_parallel.h>             /* access to MPI-parallel N_Vector              */
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
-#include <sundials/sundials_types.h>              /* definition of type realtype                  */
+#include <sundials/sundials_types.h>              /* definition of type sunrealtype                  */
 
 #include <mpi.h> /* MPI constants and types */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains grid constants, parallel machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -94,7 +94,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 
 int main(int argc, char *argv[])
 {
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -139,9 +139,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   SetIC(u, dx, local_N, my_base);  /* Initialize u vector */
 
@@ -210,13 +210,13 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer(u);
@@ -226,7 +226,7 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
   for (i=1; i<=my_length; i++) {
     iglobal = my_base + i;
     x = iglobal*dx;
-    udata[i-1] = x*(XMAX - x)*exp(RCONST(2.0)*x);
+    udata[i-1] = x*(XMAX - x)*exp(SUN_RCONST(2.0)*x);
   }
 }
 
@@ -242,7 +242,7 @@ static void PrintIntro(int npes)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -283,10 +283,10 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
   int npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   sunindextype i, my_length;
   UserData data;
@@ -341,7 +341,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i-1] = hdiff + hadv;
   }
diff --git a/examples/cvode/parallel/cvDiurnal_kry_bbd_p.c b/examples/cvode/parallel/cvDiurnal_kry_bbd_p.c
index 846c56d198..c14316912e 100644
--- a/examples/cvode/parallel/cvDiurnal_kry_bbd_p.c
+++ b/examples/cvode/parallel/cvDiurnal_kry_bbd_p.c
@@ -66,7 +66,7 @@
 #include <nvector/nvector_parallel.h>  /* access to MPI-parallel N_Vector      */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <cvode/cvode_bbdpre.h>        /* access to CVBBDPRE module            */
-#include <sundials/sundials_types.h>   /* definitions of realtype, booleantype */
+#include <sundials/sundials_types.h>   /* definitions of sunrealtype, sunbooleantype */
 
 #include <mpi.h> /* MPI constants and types */
 
@@ -78,30 +78,30 @@
 
 /* Problem Constants */
 
-#define ZERO         RCONST(0.0)
+#define ZERO         SUN_RCONST(0.0)
 
 #define NVARS        2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                /* initial time */
 #define NOUT         12                  /* number of output times */
-#define TWOHR        RCONST(7200.0)      /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)      /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898) /* pi */
+#define TWOHR        SUN_RCONST(7200.0)      /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)      /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898) /* pi */
 
 #define XMIN         ZERO                /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)        /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)        /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -114,8 +114,8 @@
                                     /* Spatial mesh is MX by MY */
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -124,8 +124,8 @@
    grid constants, processor indices, MPI communicator */
 
 typedef struct {
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, Nlocal;
   MPI_Comm comm;
@@ -139,30 +139,30 @@ static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
 		       sunindextype mukeep, sunindextype mlkeep);
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[]);
+                  sunrealtype uarray[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[]);
+		      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
 
-static void fucomm(realtype t, N_Vector u, void *user_data);
+static void fucomm(sunrealtype t, N_Vector u, void *user_data);
 
 /* Prototype of function called by the solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Prototype of functions called by the CVBBDPRE module */
 
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
   UserData data;
   SUNLinearSolver LS;
   void *cvode_mem;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   int iout, my_pe, npes, retval, jpre;
   sunindextype neq, local_N, mudq, mldq, mukeep, mlkeep;
@@ -331,11 +331,11 @@ static void InitUserData(int my_pe, sunindextype local_N, MPI_Comm comm,
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -358,8 +358,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   int isubx, isuby;
   int lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *uarray;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *uarray;
 
   /* Set pointer to data array in vector u */
 
@@ -375,18 +375,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   and jx and jy are the global mesh point indices. */
 
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       uarray[offset  ] = C1_SCALE*cx*cy;
       uarray[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -413,12 +413,12 @@ static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int qu, retval, npelast;
   long int nst;
   sunindextype i0, i1;
-  realtype hu, *uarray, tempu[2];
+  sunrealtype hu, *uarray, tempu[2];
   MPI_Status status;
 
   npelast = NPEX*NPEY - 1;
@@ -529,11 +529,11 @@ static void PrintFinalStats(void *cvode_mem)
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[])
+                  sunrealtype uarray[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
 
@@ -575,7 +575,7 @@ static void BSend(MPI_Comm comm,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -583,11 +583,11 @@ static void BSend(MPI_Comm comm,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[])
+		      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -617,19 +617,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -672,10 +672,10 @@ static void BRecvWait(MPI_Request request[],
 /* fucomm routine.  This routine performs all inter-processor
    communication of data in u needed to calculate f.         */
 
-static void fucomm(realtype t, N_Vector u, void *user_data)
+static void fucomm(sunrealtype t, N_Vector u, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -710,7 +710,7 @@ static void fucomm(realtype t, N_Vector u, void *user_data)
 /* f routine.  Evaluate f(t,y).  First call fucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to flocal. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data;
 
@@ -733,19 +733,19 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
    inter-processor communication of data needed to calculate f has already
    been done, and this data is in the work array uext.                    */
 
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
   UserData data;
-  realtype *uarray, *duarray;
+  sunrealtype *uarray, *duarray;
 
   uarray = N_VGetArrayPointer(u);
   duarray = N_VGetArrayPointer(udot);
@@ -829,10 +829,10 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -862,8 +862,8 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
diff --git a/examples/cvode/parallel/cvDiurnal_kry_p.c b/examples/cvode/parallel/cvDiurnal_kry_p.c
index 5dcc94d97f..d56bb58111 100644
--- a/examples/cvode/parallel/cvDiurnal_kry_p.c
+++ b/examples/cvode/parallel/cvDiurnal_kry_p.c
@@ -63,7 +63,7 @@
 #include <nvector/nvector_parallel.h>  /* access to MPI-parallel N_Vector        */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver        */
 #include <sundials/sundials_dense.h>   /* prototypes for small dense fcts.       */
-#include <sundials/sundials_types.h>   /* definitions of realtype, booleantype   */
+#include <sundials/sundials_types.h>   /* definitions of sunrealtype, sunbooleantype   */
 
 #include <mpi.h> /* MPI constants and types */
 
@@ -76,27 +76,27 @@
 /* Problem Constants */
 
 #define NVARS        2                    /* number of species         */
-#define KH           RCONST(4.0e-6)       /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)        /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)       /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
-
-#define T0           RCONST(0.0)          /* initial time */
+#define KH           SUN_RCONST(4.0e-6)       /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)        /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)       /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
+
+#define T0           SUN_RCONST(0.0)          /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
-#define XMIN         RCONST(0.0)          /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMIN         SUN_RCONST(0.0)          /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -109,8 +109,8 @@
                                     /* Spatial mesh is MX by MY */
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -120,7 +120,7 @@
 /* IJth is defined in order to write code which indexes into dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -134,14 +134,14 @@
 
 typedef struct {
 
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   int nvmxsub, nvmxsub2;
   MPI_Comm comm;
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
@@ -152,36 +152,36 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[]);
+                  sunrealtype udata[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[]);
+		      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
-static void ucomm(realtype t, N_Vector u, UserData data);
-static void fcalc(realtype t, realtype udata[], realtype dudata[],
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
+static void ucomm(sunrealtype t, N_Vector u, UserData data);
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[],
                   UserData data);
 
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 
@@ -195,7 +195,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -316,11 +316,11 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -369,8 +369,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 {
   int isubx, isuby, lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *udata;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u */
   udata = N_VGetArrayPointer(u);
@@ -383,18 +383,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       udata[offset  ] = C1_SCALE*cx*cy;
       udata[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -405,10 +405,10 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int qu, retval;
-  realtype hu, *udata, tempu[2];
+  sunrealtype hu, *udata, tempu[2];
   int npelast;
   long int nst;
   sunindextype i0, i1;
@@ -514,11 +514,11 @@ static void PrintFinalStats(void *cvode_mem)
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[])
+                  sunrealtype udata[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -555,7 +555,7 @@ static void BSend(MPI_Comm comm,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -563,11 +563,11 @@ static void BSend(MPI_Comm comm,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[])
+		      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -596,19 +596,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -651,10 +651,10 @@ static void BRecvWait(MPI_Request request[],
 /* ucomm routine.  This routine performs all communication
    between processors of data needed to calculate f. */
 
-static void ucomm(realtype t, N_Vector u, UserData data)
+static void ucomm(sunrealtype t, N_Vector u, UserData data)
 {
 
-  realtype *udata, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *udata, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -683,14 +683,14 @@ static void ucomm(realtype t, N_Vector u, UserData data)
    between processors of data needed to calculate f has already been done,
    and this data is in the work array uext. */
 
-static void fcalc(realtype t, realtype udata[],
-                  realtype dudata[], UserData data)
+static void fcalc(sunrealtype t, sunrealtype udata[],
+                  sunrealtype dudata[], UserData data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
@@ -751,12 +751,12 @@ static void fcalc(realtype t, realtype udata[],
   /* Set diurnal rate coefficients as functions of t, and save q4 in
   data block for use by preconditioner evaluation routine */
   s = sin((data->om)*t);
-  if (s > RCONST(0.0)) {
+  if (s > SUN_RCONST(0.0)) {
     q3 = exp(-A3/s);
     q4coef = exp(-A4/s);
   } else {
-    q3 = RCONST(0.0);
-    q4coef = RCONST(0.0);
+    q3 = SUN_RCONST(0.0);
+    q4coef = SUN_RCONST(0.0);
   }
   data->q4 = q4coef;
 
@@ -766,10 +766,10 @@ static void fcalc(realtype t, realtype udata[],
     jy = ly + isuby*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -780,7 +780,7 @@ static void fcalc(realtype t, realtype udata[],
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -796,8 +796,8 @@ static void fcalc(realtype t, realtype udata[],
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
@@ -815,9 +815,9 @@ static void fcalc(realtype t, realtype udata[],
 /* f routine.  Evaluate f(t,y).  First call ucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to fcalc. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype *udata, *dudata;
+  sunrealtype *udata, *dudata;
   UserData data;
 
   udata = N_VGetArrayPointer(u);
@@ -834,17 +834,17 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 }
 
 /* Preconditioner setup routine. Generate and preprocess P. */
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   int nvmxsub, offset;
   sunindextype retval;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly, jy, isuby;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, pointer to u's data,
@@ -882,11 +882,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
      computed on the last f call).  Load into P. */
     for (ly = 0; ly < MYSUB; ly++) {
       jy = ly + isuby*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*hordco);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*hordco);
       for (lx = 0; lx < MXSUB; lx++) {
         offset = lx*NVARS + ly*nvmxsub;
         c1 = udata[offset];
@@ -923,16 +923,16 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
 }
 
 /* Preconditioner solve routine */
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   int nvmxsub;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data */
@@ -943,7 +943,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
 
   nvmxsub = data->nvmxsub;
   zdata = N_VGetArrayPointer(z);
diff --git a/examples/cvode/parhyp/cvAdvDiff_non_ph.c b/examples/cvode/parhyp/cvAdvDiff_non_ph.c
index 94dbb72e49..3db5ab43aa 100644
--- a/examples/cvode/parhyp/cvAdvDiff_non_ph.c
+++ b/examples/cvode/parhyp/cvAdvDiff_non_ph.c
@@ -48,7 +48,7 @@
 #include <math.h>
 
 #include <cvode/cvode.h>                          /* prototypes for CVODE fcts.                   */
-#include <sundials/sundials_types.h>              /* definition of realtype                       */
+#include <sundials/sundials_types.h>              /* definition of sunrealtype                       */
 #include <sundials/sundials_math.h>               /* definition of EXP                            */
 #include <nvector/nvector_parhyp.h>               /* nvector implementation                       */
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
@@ -60,41 +60,41 @@
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains grid constants, parhyp machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(HYPRE_IJVector Uij, realtype dx, sunindextype my_length,
+static void SetIC(HYPRE_IJVector Uij, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -104,7 +104,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 
 int main(int argc, char *argv[])
 {
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -154,9 +154,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   /* Initialize solution vector. */
   SetIC(Uij, dx, local_N, my_base);
@@ -232,23 +232,23 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(HYPRE_IJVector Uij, realtype dx, sunindextype my_length,
+static void SetIC(HYPRE_IJVector Uij, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   HYPRE_Int *iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
-  udata   = (realtype*) malloc(my_length*sizeof(realtype));
+  udata   = (sunrealtype*) malloc(my_length*sizeof(sunrealtype));
   iglobal = (HYPRE_Int*) malloc(my_length*sizeof(HYPRE_Int));
 
   /* Load initial profile into u vector */
   for (i = 0; i < my_length; i++) {
     iglobal[i] = my_base + i;
     x = (iglobal[i] + 1)*dx;
-    udata[i] = x*(XMAX - x)*SUNRexp(RCONST(2.0)*x);
+    udata[i] = x*(XMAX - x)*SUNRexp(SUN_RCONST(2.0)*x);
   }
   HYPRE_IJVectorSetValues(Uij, my_length, iglobal, udata);
   free(iglobal);
@@ -267,7 +267,7 @@ static void PrintIntro(int npes)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -308,10 +308,10 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *udotdata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *udotdata, *z;
   int i;
   int npes, my_pe, my_length, my_pe_m1, my_pe_p1, last_pe;
   UserData data;
@@ -376,7 +376,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     udotdata[i-1] = hdiff + hadv;
   }
diff --git a/examples/cvode/petsc/cvAdvDiff_petsc.c b/examples/cvode/petsc/cvAdvDiff_petsc.c
index d70bcc5613..4cee5d6550 100644
--- a/examples/cvode/petsc/cvAdvDiff_petsc.c
+++ b/examples/cvode/petsc/cvAdvDiff_petsc.c
@@ -49,46 +49,46 @@
 #include <cvode/cvode.h>                          /* prototypes for CVODE fcts., consts.          */
 #include <nvector/nvector_petsc.h>                /* access to the PETSc N_Vector                 */
 #include "sunnonlinsol/sunnonlinsol_petscsnes.h"  /* access to the fixed point SUNNonlinearSolver */
-#include <sundials/sundials_types.h>              /* definition of type realtype                  */
+#include <sundials/sundials_types.h>              /* definition of type sunrealtype                  */
 #include <sundials/sundials_math.h>               /* definition of ABS and EXP                    */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains grid constants, parallel machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -107,7 +107,7 @@ int main(int argc, char *argv[])
   long int nst;
   PetscErrorCode ptcerr;
   sunindextype local_N, nperpe, nrem, my_base;
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   MPI_Comm comm;
 
   SNES snes;
@@ -151,9 +151,9 @@ int main(int argc, char *argv[])
   data->my_pe = my_pe;
 
   /* Set grid coefficients */
-  dx = data->dx = XMAX/((realtype)(MX+1));
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   /* Set the tolerances */
   reltol = ZERO;
@@ -232,11 +232,11 @@ int main(int argc, char *argv[])
 /************************ Private Helper Functions ***********************/
 
 /* Set initial conditions in u vector */
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i, iglobal;
-  realtype x;
+  sunrealtype x;
   Vec uvec;
 
   /* Set pointer to data array and get local length of u. */
@@ -245,7 +245,7 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
   /* Load initial profile into u vector */
   for (i=1; i<=my_length; i++) {
     iglobal = my_base + i; x = iglobal*dx;
-    VecSetValue(uvec, iglobal-1, x*(XMAX - x)*SUNRexp(RCONST(2.0)*x), INSERT_VALUES);
+    VecSetValue(uvec, iglobal-1, x*(XMAX - x)*SUNRexp(SUN_RCONST(2.0)*x), INSERT_VALUES);
   }
 
   VecAssemblyBegin(uvec);
@@ -260,7 +260,7 @@ static void PrintIntro(int npes)
 }
 
 /* Print data */
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -298,11 +298,11 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   PetscErrorCode ptcerr;
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
   sunindextype my_length;
   int i, npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   UserData data;
@@ -357,7 +357,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i-1] = hdiff + hadv;
 
diff --git a/examples/cvode/raja/cvAdvDiff_kry_raja.cpp b/examples/cvode/raja/cvAdvDiff_kry_raja.cpp
index d4ceb02206..43c8f0085a 100644
--- a/examples/cvode/raja/cvAdvDiff_kry_raja.cpp
+++ b/examples/cvode/raja/cvAdvDiff_kry_raja.cpp
@@ -66,24 +66,24 @@
 
 /* Real Constants */
 
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 
 /* Type : _UserData (contains model and discretization parameters) */
 struct _UserData {
   sunindextype MX, MY, NEQ;
-  realtype dx, dy, XMAX, YMAX;
-  realtype hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, XMAX, YMAX;
+  sunrealtype hdcoef, hacoef, vdcoef;
 };
 
 typedef _UserData *UserData;
@@ -93,14 +93,14 @@ static UserData SetUserData(int argc, char** argv);
 static void SetIC(N_Vector u, UserData data);
 
 /* Functions Called by the Solver */
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp);
 
 /* Private Helper Functions */
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -116,7 +116,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char** argv)
 {
   sundials::Context sunctx;
-  realtype reltol, abstol, t, tout, umax;
+  sunrealtype reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -215,8 +215,8 @@ UserData SetUserData(int argc, char *argv[])
 {
   const sunindextype MX = 10;
   const sunindextype MY = 5;
-  const realtype XMAX = RCONST(2.0);    /* domain boundaries         */
-  const realtype YMAX = RCONST(1.0);
+  const sunrealtype XMAX = SUN_RCONST(2.0);    /* domain boundaries         */
+  const sunrealtype YMAX = SUN_RCONST(1.0);
 
   /* Allocate user data structure */
   UserData ud = (UserData) malloc(sizeof *ud);
@@ -243,18 +243,18 @@ static void SetIC(N_Vector u, UserData data)
 {
   /* Extract needed constants from data */
 
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
-  const realtype xmax = data->XMAX;
-  const realtype ymax = data->YMAX;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
+  const sunrealtype xmax = data->XMAX;
+  const sunrealtype ymax = data->YMAX;
   const sunindextype MY = data->MY;
   const sunindextype NEQ = data->NEQ;
 
   /* Extract pointer to solution vector data on the host */
-  realtype *udata = N_VGetHostArrayPointer_Raja(u);
+  sunrealtype *udata = N_VGetHostArrayPointer_Raja(u);
 
   sunindextype i, j, tid;
-  realtype x, y;
+  sunrealtype x, y;
 
 
   /* Load initial profile into u vector */
@@ -280,7 +280,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data = (UserData) user_data;
 
@@ -288,13 +288,13 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
   const sunindextype NEQ = data->NEQ;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *udata = N_VGetDeviceArrayPointer_Raja(u);
-  realtype *dudata      = N_VGetDeviceArrayPointer_Raja(udot);
+  const sunrealtype *udata = N_VGetDeviceArrayPointer_Raja(u);
+  sunrealtype *dudata      = N_VGetDeviceArrayPointer_Raja(udot);
 
   const sunindextype zero = 0;
 
@@ -303,18 +303,18 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
       sunindextype i = index/MY;
       sunindextype j = index%MY;
 
-      realtype uab = udata[index];
+      sunrealtype uab = udata[index];
 
-      realtype udn = (j == 0)    ? ZERO : udata[index - 1];
-      realtype uup = (j == MY-1) ? ZERO : udata[index + 1];
-      realtype ult = (i == 0)    ? ZERO : udata[index - MY];
-      realtype urt = (i == MX-1) ? ZERO : udata[index + MY];
+      sunrealtype udn = (j == 0)    ? ZERO : udata[index - 1];
+      sunrealtype uup = (j == MY-1) ? ZERO : udata[index + 1];
+      sunrealtype ult = (i == 0)    ? ZERO : udata[index - MY];
+      sunrealtype urt = (i == MX-1) ? ZERO : udata[index + MY];
 
       /* Set diffusion and advection terms and load into udot */
 
-      realtype hdiff = hordc*(ult -TWO*uab + urt);
-      realtype hadv  = horac*(urt - ult);
-      realtype vdiff = verdc*(udn -TWO*uab + uup);
+      sunrealtype hdiff = hordc*(ult -TWO*uab + urt);
+      sunrealtype hadv  = horac*(urt - ult);
+      sunrealtype vdiff = verdc*(udn -TWO*uab + uup);
 
       dudata[index] = hdiff + hadv + vdiff;
     }
@@ -326,7 +326,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
@@ -336,13 +336,13 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
   const sunindextype MX  = data->MX;
   const sunindextype MY  = data->MY;
   const sunindextype NEQ = data->NEQ;
-  const realtype hordc   = data->hdcoef;
-  const realtype horac   = data->hacoef;
-  const realtype verdc   = data->vdcoef;
+  const sunrealtype hordc   = data->hdcoef;
+  const sunrealtype horac   = data->hacoef;
+  const sunrealtype verdc   = data->vdcoef;
 
   /* Extract pointers to vector data */
-  const realtype *vdata = N_VGetDeviceArrayPointer_Raja(v);
-  realtype *Jvdata      = N_VGetDeviceArrayPointer_Raja(Jv);
+  const sunrealtype *vdata = N_VGetDeviceArrayPointer_Raja(v);
+  sunrealtype *Jvdata      = N_VGetDeviceArrayPointer_Raja(Jv);
 
   const sunindextype zero = 0;
 
@@ -372,7 +372,7 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserData data)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax, UserData data)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %ld X %ld\n", (long) data->MX, (long) data->MY);
@@ -395,7 +395,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax, UserDat
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvode/serial/cvAdvDiff_bnd.c b/examples/cvode/serial/cvAdvDiff_bnd.c
index 4a6bfbc9ab..a32dec8b02 100644
--- a/examples/cvode/serial/cvAdvDiff_bnd.c
+++ b/examples/cvode/serial/cvAdvDiff_bnd.c
@@ -44,27 +44,27 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 #include <sundials/sundials_math.h>    /* definition of ABS and EXP            */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -82,15 +82,15 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
   SUNProfiler profobj;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -99,8 +99,8 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
@@ -112,7 +112,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 
 int main(void)
 {
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNMatrix A;
@@ -237,10 +237,10 @@ int main(void)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   int i, j;
   UserData data;
 
@@ -286,12 +286,12 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunindextype i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -343,8 +343,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 static void SetIC(N_Vector u, UserData data)
 {
   int i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   /* Extract needed constants from data */
 
@@ -368,7 +368,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -389,7 +389,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvode/serial/cvAdvDiff_bndL.c b/examples/cvode/serial/cvAdvDiff_bndL.c
index 278c1d17b6..b8d1e26524 100644
--- a/examples/cvode/serial/cvAdvDiff_bndL.c
+++ b/examples/cvode/serial/cvAdvDiff_bndL.c
@@ -41,27 +41,27 @@
 #include <nvector/nvector_serial.h>          /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>        /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_lapackband.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>         /* definition of type realtype          */
+#include <sundials/sundials_types.h>         /* definition of type sunrealtype          */
 #include <sundials/sundials_math.h>          /* definition of ABS and EXP            */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -79,14 +79,14 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -95,8 +95,8 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
@@ -109,7 +109,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 int main(void)
 {
   SUNContext sunctx;
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNMatrix A;
@@ -217,10 +217,10 @@ int main(void)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   int i, j;
   UserData data;
 
@@ -262,12 +262,12 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   int i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -315,8 +315,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 static void SetIC(N_Vector u, UserData data)
 {
   int i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   /* Extract needed constants from data */
 
@@ -340,7 +340,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -358,7 +358,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvode/serial/cvAnalytic_mels.c b/examples/cvode/serial/cvAnalytic_mels.c
index 8833e9f4f3..980eec302f 100644
--- a/examples/cvode/serial/cvAnalytic_mels.c
+++ b/examples/cvode/serial/cvAnalytic_mels.c
@@ -33,7 +33,7 @@
 #include <math.h>
 #include <cvode/cvode.h>               /* prototypes for CVODE fcts., consts.  */
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -46,17 +46,17 @@
 #endif
 
 /* User-supplied functions called by CVode */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Custom linear solver data structure, accessor macros, and routines */
 static SUNLinearSolver MatrixEmbeddedLS(void *cvode_mem);
 static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S);
 static int MatrixEmbeddedLSSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol);
+                                 N_Vector b, sunrealtype tol);
 static int MatrixEmbeddedLSFree(SUNLinearSolver S);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -68,20 +68,20 @@ static SUNContext sunctx = NULL;
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
-  realtype dTout = RCONST(1.0);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);      /* time between outputs */
   sunindextype NEQ = 1;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-6);  /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  /* stiffness parameter */
 
   /* general problem variables */
   int retval;                     /* reusable error-checking flag */
   N_Vector y = NULL;              /* empty vector for storing solution */
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *cvode_mem = NULL;         /* empty CVode memory structure */
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nfe, nsetups, nje, nfeLS, nni, ncfn, netf;
 
   /* Create the SUNDIALS context */
@@ -97,7 +97,7 @@ int main()
   /* Initialize data structures */
   y = N_VNew_Serial(NEQ, sunctx);          /* Create serial vector for solution */
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return 1;
-  N_VConst(RCONST(0.0), y);        /* Specify initial condition */
+  N_VConst(SUN_RCONST(0.0), y);        /* Specify initial condition */
 
   /* Call CVodeCreate to create the solver memory and specify the
    * Backward Differentiation Formula */
@@ -193,14 +193,14 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype u = NV_Ith_S(y,0);                 /* access current solution value */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access current solution value */
 
   /* fill in the RHS function: "NV_Ith_S" accesses the 0th entry of ydot */
-  NV_Ith_S(ydot,0) = lamda*u + RCONST(1.0)/(RCONST(1.0)+t*t) - lamda*atan(t);
+  NV_Ith_S(ydot,0) = lamda*u + SUN_RCONST(1.0)/(SUN_RCONST(1.0)+t*t) - lamda*atan(t);
 
   return 0;                                   /* return with success */
 }
@@ -236,15 +236,15 @@ static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S)
 
 /* linear solve routine */
 static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol)
+                                 N_Vector b, sunrealtype tol)
 {
   /* temporary variables */
   int       retval;
   N_Vector  y, ypred, fn, zn1;
-  realtype  tcur, gamma, rl1;
+  sunrealtype  tcur, gamma, rl1;
   void      *user_data;
-  realtype  *rdata;
-  realtype  lamda;
+  sunrealtype  *rdata;
+  sunrealtype  lamda;
 
   /* retrieve implicit system data from CVode */
   retval = CVodeGetNonlinearSystemData(LS->content, &tcur, &ypred, &y, &fn,
@@ -253,7 +253,7 @@ static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
     return(-1);
 
   /* extract stiffness parameter from user_data */
-  rdata = (realtype *) user_data;
+  rdata = (sunrealtype *) user_data;
   lamda = rdata[0];
 
   /* perform linear solve: (1-gamma*lamda)*x = b */
@@ -312,18 +312,18 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;     /* answer pass (0) or fail (1) flag     */
-  realtype ans, err, ewt;  /* answer data, error, and error weight */
+  sunrealtype ans, err, ewt;  /* answer data, error, and error weight */
 
   /* compute solution error */
   ans = atan(t);
-  ewt = RCONST(1.0) / (rtol * fabs(ans) + atol);
+  ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol);
   err = ewt * fabs(NV_Ith_S(y,0) - ans);
 
   /* is the solution within the tolerances? */
-  passfail = (err < RCONST(1.0)) ? 0 : 1;
+  passfail = (err < SUN_RCONST(1.0)) ? 0 : 1;
 
   if (passfail) {
     fprintf(stdout, "\nSUNDIALS_WARNING: check_ans error=%"GSYM"\n\n", err);
diff --git a/examples/cvode/serial/cvDirectDemo_ls.c b/examples/cvode/serial/cvDirectDemo_ls.c
index 63387f2a34..cdcfe062a1 100644
--- a/examples/cvode/serial/cvDirectDemo_ls.c
+++ b/examples/cvode/serial/cvDirectDemo_ls.c
@@ -73,7 +73,7 @@
 #include <cvode/cvode_diag.h>                     /* access to CVDIAG linear solver               */
 #include "sunnonlinsol/sunnonlinsol_newton.h"     /* access to the newton SUNNonlinearSolver      */
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
-#include <sundials/sundials_types.h>              /* definition of realtype                       */
+#include <sundials/sundials_types.h>              /* definition of sunrealtype                       */
 
 /* helpful macros */
 
@@ -83,38 +83,38 @@
 
 /* Shared Problem Constants */
 
-#define ATOL RCONST(1.0e-6)
-#define RTOL RCONST(0.0)
+#define ATOL SUN_RCONST(1.0e-6)
+#define RTOL SUN_RCONST(0.0)
 
-#define ZERO   RCONST(0.0)
-#define ONE    RCONST(1.0)
-#define TWO    RCONST(2.0)
-#define THIRTY RCONST(30.0)
+#define ZERO   SUN_RCONST(0.0)
+#define ONE    SUN_RCONST(1.0)
+#define TWO    SUN_RCONST(2.0)
+#define THIRTY SUN_RCONST(30.0)
 
 /* Problem #1 Constants */
 
 #define P1_NEQ        2
-#define P1_ETA        RCONST(3.0)
+#define P1_ETA        SUN_RCONST(3.0)
 #define P1_NOUT       4
-#define P1_T0         RCONST(0.0)
-#define P1_T1         RCONST(1.39283880203)
-#define P1_DTOUT      RCONST(2.214773875)
-#define P1_TOL_FACTOR RCONST(1.0e4)
+#define P1_T0         SUN_RCONST(0.0)
+#define P1_T1         SUN_RCONST(1.39283880203)
+#define P1_DTOUT      SUN_RCONST(2.214773875)
+#define P1_TOL_FACTOR SUN_RCONST(1.0e4)
 
 /* Problem #2 Constants */
 
 #define P2_MESHX      5
 #define P2_MESHY      5
 #define P2_NEQ        P2_MESHX*P2_MESHY
-#define P2_ALPH1      RCONST(1.0)
-#define P2_ALPH2      RCONST(1.0)
+#define P2_ALPH1      SUN_RCONST(1.0)
+#define P2_ALPH2      SUN_RCONST(1.0)
 #define P2_NOUT       5
 #define P2_ML         5
 #define P2_MU         0
-#define P2_T0         RCONST(0.0)
-#define P2_T1         RCONST(0.01)
-#define P2_TOUT_MULT  RCONST(10.0)
-#define P2_TOL_FACTOR RCONST(1.0e3)
+#define P2_T0         SUN_RCONST(0.0)
+#define P2_T1         SUN_RCONST(0.01)
+#define P2_TOUT_MULT  SUN_RCONST(10.0)
+#define P2_TOL_FACTOR SUN_RCONST(1.0e3)
 
 /* Linear Solver Options */
 
@@ -125,28 +125,28 @@ enum {FUNC, DENSE_USER, DENSE_DQ, DIAG, BAND_USER, BAND_DQ};
 static int  Problem1(void);
 static void PrintIntro1(void);
 static void PrintHeader1(void);
-static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype hu);
+static void PrintOutput1(sunrealtype t, sunrealtype y0, sunrealtype y1, int qu, sunrealtype hu);
 static int  Problem2(void);
 static void PrintIntro2(void);
 static void PrintHeader2(void);
-static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu);
-static realtype MaxError(N_Vector y, realtype t);
+static void PrintOutput2(sunrealtype t, sunrealtype erm, int qu, sunrealtype hu);
+static sunrealtype MaxError(N_Vector y, sunrealtype t);
 static int PrepareNextRun(SUNContext sunctx, void *cvode_mem, int lmm, int miter,
                           N_Vector y, SUNMatrix* A, sunindextype mu,
                           sunindextype ml, SUNLinearSolver* LS,
                           SUNNonlinearSolver* NLS);
-static void PrintErrOutput(realtype tol_factor);
-static void PrintFinalStats(void *cvode_mem, int miter, realtype ero);
+static void PrintErrOutput(sunrealtype tol_factor);
+static void PrintFinalStats(void *cvode_mem, int miter, sunrealtype ero);
 static void PrintErrInfo(int nerr);
 
 /* Functions Called by the Solver */
 
-static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f1(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac1(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int f2(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac2(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
@@ -168,16 +168,16 @@ int main(void)
 
 static int Problem1(void)
 {
-  realtype reltol=RTOL, abstol=ATOL, t, tout, ero, er;
+  sunrealtype reltol=RTOL, abstol=ATOL, t, tout, ero, er;
   int miter, retval, temp_retval, iout, nerr=0;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNNonlinearSolver NLS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int qu;
-  realtype hu;
+  sunrealtype hu;
   SUNContext sunctx;
 
   y = NULL;
@@ -347,7 +347,7 @@ static void PrintHeader1(void)
   return;
 }
 
-static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype hu)
+static void PrintOutput1(sunrealtype t, sunrealtype y0, sunrealtype y1, int qu, sunrealtype hu)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("%10.5Lf    %12.5Le   %12.5Le   %2d    %6.4Le\n", t, y0, y1, qu, hu);
@@ -360,9 +360,9 @@ static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype
   return;
 }
 
-static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f1(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y0, y1;
+  sunrealtype y0, y1;
 
   y0 = NV_Ith_S(y,0);
   y1 = NV_Ith_S(y,1);
@@ -373,10 +373,10 @@ static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac1(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y0, y1;
+  sunrealtype y0, y1;
 
   y0 = NV_Ith_S(y,0);
   y1 = NV_Ith_S(y,1);
@@ -390,16 +390,16 @@ static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
 
 static int Problem2(void)
 {
-  realtype reltol=RTOL, abstol=ATOL, t, tout, er, erm, ero;
+  sunrealtype reltol=RTOL, abstol=ATOL, t, tout, er, erm, ero;
   int miter, retval, temp_retval, nerr=0;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNNonlinearSolver NLS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int qu, iout;
-  realtype hu;
+  sunrealtype hu;
   SUNContext sunctx;
 
   y = NULL;
@@ -572,7 +572,7 @@ static void PrintHeader2(void)
   return;
 }
 
-static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu)
+static void PrintOutput2(sunrealtype t, sunrealtype erm, int qu, sunrealtype hu)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("%10.3Lf  %12.4Le   %2d   %12.4Le\n", t, erm, qu, hu);
@@ -585,10 +585,10 @@ static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu)
   return;
 }
 
-static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f2(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   sunindextype i, j, k;
-  realtype d, *ydata, *dydata;
+  sunrealtype d, *ydata, *dydata;
 
   ydata  = N_VGetArrayPointer(y);
   dydata = N_VGetArrayPointer(ydot);
@@ -613,11 +613,11 @@ static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac2(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   int i, j, k;
-  realtype *kthCol;
+  sunrealtype *kthCol;
 
   /*
      The components of f(t,y) which depend on y    are
@@ -648,10 +648,10 @@ static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
   return(0);
 }
 
-static realtype MaxError(N_Vector y, realtype t)
+static sunrealtype MaxError(N_Vector y, sunrealtype t)
 {
   sunindextype i, j, k;
-  realtype *ydata, er, ex=ZERO, yt, maxError=ZERO, ifact_inv, jfact_inv=ONE;
+  sunrealtype *ydata, er, ex=ZERO, yt, maxError=ZERO, ifact_inv, jfact_inv=ONE;
 
   if (t == ZERO) return(ZERO);
 
@@ -815,7 +815,7 @@ static int PrepareNextRun(SUNContext sunctx, void *cvode_mem, int lmm, int miter
   return(retval);
 }
 
-static void PrintErrOutput(realtype tol_factor)
+static void PrintErrOutput(sunrealtype tol_factor)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("\n\n Error exceeds %Lg * tolerance \n\n", tol_factor);
@@ -828,7 +828,7 @@ static void PrintErrOutput(realtype tol_factor)
   return;
 }
 
-static void PrintFinalStats(void *cvode_mem, int miter, realtype ero)
+static void PrintFinalStats(void *cvode_mem, int miter, sunrealtype ero)
 {
   long int lenrw, leniw, lenrwLS, leniwLS;
   long int nst, nfe, nsetups, nni, ncfn, netf, nje, nfeLS;
diff --git a/examples/cvode/serial/cvDisc_dns.c b/examples/cvode/serial/cvDisc_dns.c
index d7069318a2..fe13160568 100644
--- a/examples/cvode/serial/cvDisc_dns.c
+++ b/examples/cvode/serial/cvDisc_dns.c
@@ -23,7 +23,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial NVector                 */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix                */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver          */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype          */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype          */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -43,7 +43,7 @@
 
 /* User provided routine called by the solver to compute
  * the function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *f_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *f_data);
 
 /* Function for checking return values */
 static int check_retval(void *flagvalue, const char *funcname, int opt);
@@ -57,15 +57,15 @@ int main()
 
   N_Vector y;
   int flag, retval;
-  realtype reltol, abstol, t0, t1, t2, t;
+  sunrealtype reltol, abstol, t0, t1, t2, t;
   long int nst1, nst2, nst;
 
-  reltol = RCONST(1.0e-3);
-  abstol = RCONST(1.0e-4);
+  reltol = SUN_RCONST(1.0e-3);
+  abstol = SUN_RCONST(1.0e-4);
 
-  t0 = RCONST(0.0);
-  t1 = RCONST(1.0);
-  t2 = RCONST(2.0);
+  t0 = SUN_RCONST(0.0);
+  t1 = SUN_RCONST(1.0);
+  t2 = SUN_RCONST(2.0);
 
   /* Create the SUNDIALS context */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -75,7 +75,7 @@ int main()
   y = N_VNew_Serial(NEQ, sunctx);
 
   /* Set initial condition */
-  NV_Ith_S(y,0) = RCONST(1.0);
+  NV_Ith_S(y,0) = SUN_RCONST(1.0);
 
   /*
    * ------------------------------------------------------------
@@ -149,7 +149,7 @@ int main()
   /* ---- Integrate from the discontinuity */
 
   /* Include discontinuity */
-  NV_Ith_S(y,0) = RCONST(1.0);
+  NV_Ith_S(y,0) = SUN_RCONST(1.0);
 
   /* Reinitialize the solver */
   retval = CVodeReInit(cvode_mem, t1, y);
@@ -190,7 +190,7 @@ int main()
   printf("\nDiscontinuity in RHS: Case 1 - explicit treatment\n\n");
 
   /* Set initial condition */
-  NV_Ith_S(y,0) = RCONST(1.0);
+  NV_Ith_S(y,0) = SUN_RCONST(1.0);
 
   /* Reinitialize the solver. CVodeReInit does not reallocate memory
    * so it can only be used when the new problem size is the same as
@@ -263,7 +263,7 @@ int main()
   printf("\nDiscontinuity in RHS: Case 2 - let CVODE deal with it\n\n");
 
   /* Set initial condition */
-  NV_Ith_S(y,0) = RCONST(1.0);
+  NV_Ith_S(y,0) = SUN_RCONST(1.0);
 
   /* Reinitialize the solver. CVodeReInit does not reallocate memory
    * so it can only be used when the new problem size is the same as
@@ -335,7 +335,7 @@ int main()
  *   flag = RHS2 -> y' = -5*y
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *f_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *f_data)
 {
   int *flag;
 
diff --git a/examples/cvode/serial/cvDiurnal_kry.c b/examples/cvode/serial/cvDiurnal_kry.c
index 31a659cec6..16171449fa 100644
--- a/examples/cvode/serial/cvDiurnal_kry.c
+++ b/examples/cvode/serial/cvDiurnal_kry.c
@@ -45,7 +45,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -55,34 +55,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                 /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
 #define XMIN         ZERO                 /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)         /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)         /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -91,8 +91,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM)  /* NEQ = number of equations */
@@ -112,7 +112,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -124,9 +124,9 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MX][MY], **Jbd[MX][MY];
+  sunrealtype **P[MX][MY], **Jbd[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
 } *UserData;
 
 /* Private Helper Functions */
@@ -134,8 +134,8 @@ typedef struct {
 static UserData AllocUserData(void);
 static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -143,17 +143,17 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector y, N_Vector fy,
                void *user_data, N_Vector tmp);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
 
 /*
@@ -165,7 +165,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
 int main()
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -305,11 +305,11 @@ static void FreeUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -319,12 +319,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy=0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -333,11 +333,11 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -465,13 +465,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute RHS function f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int jx, jy, idn, iup, ileft, iright;
   UserData data;
 
@@ -504,10 +504,10 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
@@ -558,18 +558,18 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
-  realtype c1, c2;
-  realtype v1, v2, v1dn, v2dn, v1up, v2up, v1lt, v2lt, v1rt, v2rt;
-  realtype Jv1, Jv2;
-  realtype cydn, cyup;
-  realtype s, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype c1, c2;
+  sunrealtype v1, v2, v1dn, v2dn, v1up, v2up, v1lt, v2lt, v1rt, v2rt;
+  sunrealtype Jv1, Jv2;
+  sunrealtype cydn, cyup;
+  sunrealtype s, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int jx, jy, idn, iup, ileft, iright;
-  realtype *udata, *vdata, *Jvdata;
+  sunrealtype *udata, *vdata, *Jvdata;
   UserData data;
 
   data = (UserData) user_data;
@@ -601,11 +601,11 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
 
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
 
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
@@ -695,14 +695,14 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Preconditioner setup routine. Generate and preprocess P. */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MY], **(*Jbd)[MY];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MY], **(*Jbd)[MY];
   sunindextype *(*pivot)[MY], retval;
   int jx, jy;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, and of pointer to u's data */
@@ -739,10 +739,10 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
        computed on the last f call).  Load into P. */
 
     for (jy=0; jy < MY; jy++) {
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
       diag = -(cydn + cyup + TWO*hordco);
       for (jx=0; jx < MX; jx++) {
         c1 = IJKth(udata,1,jx,jy);
@@ -782,13 +782,13 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
 
 /* Preconditioner solve routine */
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data)
 {
-  realtype **(*P)[MY];
+  sunrealtype **(*P)[MY];
   sunindextype *(*pivot)[MY];
   int jx, jy;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data. */
diff --git a/examples/cvode/serial/cvDiurnal_kry_bp.c b/examples/cvode/serial/cvDiurnal_kry_bp.c
index 0413316242..62771cfe95 100644
--- a/examples/cvode/serial/cvDiurnal_kry_bp.c
+++ b/examples/cvode/serial/cvDiurnal_kry_bp.c
@@ -44,7 +44,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <cvode/cvode_bandpre.h>       /* access to CVBANDPRE module           */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -54,34 +54,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                /* initial time */
 #define NOUT         12                  /* number of output times */
-#define TWOHR        RCONST(7200.0)      /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)      /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898) /* pi */
+#define TWOHR        SUN_RCONST(7200.0)      /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)      /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898) /* pi */
 
 #define XMIN         ZERO                /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)        /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)        /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)        /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)        /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -90,8 +90,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)   /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)    /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)   /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)    /* value of C1 or C2 at which tolerances */
                                  /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)     /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM) /* NEQ = number of equations */
@@ -111,7 +111,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in cvode_bandpre.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -123,15 +123,15 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void InitUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
 static void PrintIntro(sunindextype mu, sunindextype ml);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -139,7 +139,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Function Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /*
  *-------------------------------
@@ -150,7 +150,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
 int main()
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -286,11 +286,11 @@ static void InitUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -300,12 +300,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy=0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -324,11 +324,11 @@ static void PrintIntro(sunindextype mu, sunindextype ml)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -465,13 +465,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute RHS function f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int jx, jy, idn, iup, ileft, iright;
   UserData data;
 
@@ -504,10 +504,10 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
diff --git a/examples/cvode/serial/cvKrylovDemo_ls.c b/examples/cvode/serial/cvKrylovDemo_ls.c
index dc89dfc91f..5133974e18 100644
--- a/examples/cvode/serial/cvKrylovDemo_ls.c
+++ b/examples/cvode/serial/cvKrylovDemo_ls.c
@@ -52,7 +52,7 @@
 #include <sunnonlinsol/sunnonlinsol_newton.h> /* access to Newton SUNNonlinearSolver         */
 #include <nvector/nvector_serial.h>           /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>          /* use generic DENSE solver in preconditioning */
-#include <sundials/sundials_types.h>          /* definition of realtype                      */
+#include <sundials/sundials_types.h>          /* definition of sunrealtype                      */
 #include <sundials/sundials_logger.h>
 
 /* helpful macros */
@@ -73,34 +73,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                 /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
 #define XMIN         ZERO                 /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)         /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)         /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -109,8 +109,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM)  /* NEQ = number of equations */
@@ -137,7 +137,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in
    sundials_dense.h work with matrices stored by column in a 2-dimensional
    array. In C, arrays are indexed starting at 0, not 1. */
@@ -150,9 +150,9 @@
    solution vector, and linsolver type */
 
 typedef struct {
-  realtype **P[MX][MY], **Jbd[MX][MY];
+  sunrealtype **P[MX][MY], **Jbd[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
   N_Vector u;
   int linsolver;
 } *UserData;
@@ -162,21 +162,21 @@ typedef struct {
 static UserData AllocUserData(void);
 static void InitUserData(UserData data, N_Vector u);
 static void FreeUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintStats(void *cvode_mem, int linsolver, int stats);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 static int myMonitorFunction(void *cvode_mem, void *user_data);
@@ -189,7 +189,7 @@ static int myMonitorFunction(void *cvode_mem, void *user_data);
 
 int main(int argc, char* argv[])
 {
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -197,7 +197,7 @@ int main(int argc, char* argv[])
   void *cvode_mem;
   int linsolver, iout, retval;
   int nrmfactor;   /* LS norm conversion factor flag */
-  realtype nrmfac; /* LS norm conversion factor      */
+  sunrealtype nrmfac; /* LS norm conversion factor      */
   int monitor;     /* LS resiudal monitoring flag    */
   SUNContext sunctx;
   SUNLogger logger;
@@ -386,7 +386,7 @@ int main(int argc, char* argv[])
 
     case(1):
       /* use the square root of the vector length */
-      nrmfac = SQRT((realtype)NEQ);
+      nrmfac = SQRT((sunrealtype)NEQ);
       break;
     case(2):
       /* compute with dot product */
@@ -483,11 +483,11 @@ static void FreeUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -497,12 +497,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy=0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -511,11 +511,11 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -640,13 +640,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute RHS function f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int jx, jy, idn, iup, ileft, iright;
   UserData data;
 
@@ -679,10 +679,10 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
@@ -732,14 +732,14 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Preconditioner setup routine. Generate and preprocess P. */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MY], **(*Jbd)[MY];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MY], **(*Jbd)[MY];
   sunindextype *(*pivot)[MY], retval;
   int jx, jy;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, and of pointer to u's data */
@@ -776,10 +776,10 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
        computed on the last f call).  Load into P. */
 
     for (jy=0; jy < MY; jy++) {
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
       diag = -(cydn + cyup + TWO*hordco);
       for (jx=0; jx < MX; jx++) {
         c1 = IJKth(udata,1,jx,jy);
@@ -819,15 +819,15 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
 
 /* Preconditioner solve routine */
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MY];
+  sunrealtype **(*P)[MY];
   sunindextype *(*pivot)[MY];
   int jx, jy;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data. */
@@ -858,7 +858,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
 static int myMonitorFunction(void* cvode_mem, void* user_data)
 {
   UserData data = (UserData) user_data;
-  realtype t = 0;
+  sunrealtype t = 0;
 
   CVodeGetCurrentTime(cvode_mem, &t);
   PrintOutput(cvode_mem, data->u, t);
diff --git a/examples/cvode/serial/cvKrylovDemo_prec.c b/examples/cvode/serial/cvKrylovDemo_prec.c
index 451d90d99c..28fa57da82 100644
--- a/examples/cvode/serial/cvKrylovDemo_prec.c
+++ b/examples/cvode/serial/cvKrylovDemo_prec.c
@@ -106,7 +106,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h>  /* access to SPGMR SUNLinearSolver             */
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>    /* use generic DENSE solver in preconditioning */
-#include <sundials/sundials_types.h>    /* definition of realtype                      */
+#include <sundials/sundials_types.h>    /* definition of sunrealtype                      */
 
 /* helpful macros */
 
@@ -120,17 +120,17 @@
 
 /* Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Problem Specification Constants */
 
 #define AA    ONE               /* AA = a */
-#define EE    RCONST(1.0e4)     /* EE = e */
-#define GG    RCONST(0.5e-6)    /* GG = g */
+#define EE    SUN_RCONST(1.0e4)     /* EE = e */
+#define GG    SUN_RCONST(0.5e-6)    /* GG = g */
 #define BB    ONE               /* BB = b */
 #define DPREY ONE
-#define DPRED RCONST(0.5)
+#define DPRED SUN_RCONST(0.5)
 #define ALPH  ONE
 #define NP    3
 #define NS    (2*NP)
@@ -142,8 +142,8 @@
 #define MXNS  (MX*NS)
 #define AX    ONE
 #define AY    ONE
-#define DX    (AX/(realtype)(MX-1))
-#define DY    (AY/(realtype)(MY-1))
+#define DX    (AX/(sunrealtype)(MX-1))
+#define DY    (AY/(sunrealtype)(MY-1))
 #define MP    NS
 #define MQ    (MX*MY)
 #define MXMP  (MX*MP)
@@ -156,8 +156,8 @@
 
 #define NEQ  (NS*MX*MY)
 #define T0   ZERO
-#define RTOL RCONST(1.0e-5)
-#define ATOL RCONST(1.0e-5)
+#define RTOL SUN_RCONST(1.0e-5)
+#define ATOL SUN_RCONST(1.0e-5)
 
 /* Spgmr/CVLS Constants */
 
@@ -166,8 +166,8 @@
 
 /* Output Constants */
 
-#define T1        RCONST(1.0e-8)
-#define TOUT_MULT RCONST(10.0)
+#define T1        SUN_RCONST(1.0e-8)
+#define TOUT_MULT SUN_RCONST(10.0)
 #define DTOUT     ONE
 #define NOUT      18
 
@@ -178,15 +178,15 @@
 /* Structure for user data */
 
 typedef struct {
-  realtype **P[NGRP];
+  sunrealtype **P[NGRP];
   sunindextype *pivot[NGRP];
   int ns, mxns;
   int mp, mq, mx, my, ngrp, ngx, ngy, mxmp;
   int jgx[NGX+1], jgy[NGY+1], jigx[MX], jigy[MY];
   int jxr[NGX], jyr[NGY];
-  realtype acoef[NS][NS], bcoef[NS], diff[NS];
-  realtype cox[NS], coy[NS], dx, dy, srur;
-  realtype fsave[NEQ];
+  sunrealtype acoef[NS][NS], bcoef[NS], diff[NS];
+  sunrealtype cox[NS], coy[NS], dx, dy, srur;
+  sunrealtype fsave[NEQ];
   N_Vector tmp;
   N_Vector rewt;
   void *cvode_mem;
@@ -200,33 +200,33 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[]);
 static void CInit(N_Vector c, WebData wdata);
 static void PrintIntro(void);
 static void PrintHeader(int jpre, int gstype);
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t);
-static void PrintOutput(void *cvode_mem, realtype t);
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t);
+static void PrintOutput(void *cvode_mem, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void FreeUserData(WebData wdata);
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-		     realtype rate[], WebData wdata);
-static void fblock (realtype t, realtype cdata[], int jx, int jy,
-		    realtype cdotdata[], WebData wdata);
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata);
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+		     sunrealtype rate[], WebData wdata);
+static void fblock (sunrealtype t, sunrealtype cdata[], int jx, int jy,
+		    sunrealtype cdotdata[], WebData wdata);
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata);
 
 /* Small Vector Kernels */
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_sum_prods(realtype u[], realtype p[], realtype q[], realtype v[],
-                        realtype w[], int n);
-static void v_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_zero(realtype u[], int n);
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[], sunrealtype v[],
+                        sunrealtype w[], int n);
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_zero(sunrealtype u[], int n);
 
 /* Functions Called By The Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype tn, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
 /* Private function to check function return values */
 
@@ -239,12 +239,12 @@ static SUNContext sunctx = NULL;
 
 int main()
 {
-  realtype abstol=ATOL, reltol=RTOL, t, tout;
+  sunrealtype abstol=ATOL, reltol=RTOL, t, tout;
   N_Vector c;
   WebData wdata;
   SUNLinearSolver LS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int jpre, gstype, retval;
   int ns, mxns, iout;
 
@@ -332,7 +332,7 @@ int main()
         PrintOutput(cvode_mem, t);
         if (firstrun && (iout % 3 == 0)) PrintAllSpecies(c, ns, mxns, t);
         if(check_retval(&retval, "CVode", 1)) break;
-        if (tout > RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
+        if (tout > SUN_RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
       }
 
       /* Print final statistics, and loop for next case */
@@ -371,8 +371,8 @@ static WebData AllocUserData(void)
 static void InitUserData(WebData wdata)
 {
   int i, j, ns;
-  realtype *bcoef, *diff, *cox, *coy, dx, dy;
-  realtype (*acoef)[NS];
+  sunrealtype *bcoef, *diff, *cox, *coy, dx, dy;
+  sunrealtype (*acoef)[NS];
 
   acoef = wdata->acoef;
   bcoef = wdata->bcoef;
@@ -411,7 +411,7 @@ static void InitUserData(WebData wdata)
   wdata->mq = MQ;
   wdata->mx = MX;
   wdata->my = MY;
-  wdata->srur = sqrt(UNIT_ROUNDOFF);
+  wdata->srur = sqrt(SUN_UNIT_ROUNDOFF);
   wdata->mxmp = MXMP;
   wdata->ngrp = NGRP;
   wdata->ngx = NGX;
@@ -452,7 +452,7 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[])
 static void CInit(N_Vector c, WebData wdata)
 {
   int jx, jy, ns, mxns, ioff, iyoff, i, ici;
-  realtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
+  sunrealtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -460,8 +460,8 @@ static void CInit(N_Vector c, WebData wdata)
   dx = wdata->dx;
   dy = wdata->dy;
 
-  x_factor = RCONST(4.0)/SQR(AX);
-  y_factor = RCONST(4.0)/SQR(AY);
+  x_factor = SUN_RCONST(4.0)/SQR(AX);
+  y_factor = SUN_RCONST(4.0)/SQR(AY);
   for (jy = 0; jy < MY; jy++) {
     y = jy*dy;
     argy = SQR(y_factor*y*(AY-y));
@@ -472,7 +472,7 @@ static void CInit(N_Vector c, WebData wdata)
       ioff = iyoff + ns*jx;
       for (i = 1; i <= ns; i++) {
         ici = ioff + i-1;
-        cdata[ici] = RCONST(10.0) + i*argx*argy;
+        cdata[ici] = SUN_RCONST(10.0) + i*argx*argy;
       }
     }
   }
@@ -541,10 +541,10 @@ static void PrintHeader(int jpre, int gstype)
     printf("\nGram-Schmidt method type is    gstype = %s\n\n\n", "SUN_CLASSICAL_GS");
 }
 
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t)
 {
   int i, jx ,jy;
-  realtype *cdata;
+  sunrealtype *cdata;
 
   cdata = N_VGetArrayPointer(c);
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -572,11 +572,11 @@ static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
   }
 }
 
-static void PrintOutput(void *cvode_mem, realtype t)
+static void PrintOutput(void *cvode_mem, sunrealtype t)
 {
   long int nst, nfe, nni;
   int qu, retval;
-  realtype hu;
+  sunrealtype hu;
 
   retval = CVodeGetNumSteps(cvode_mem, &nst);
   check_retval(&retval, "CVodeGetNumSteps", 1);
@@ -608,7 +608,7 @@ static void PrintFinalStats(void *cvode_mem)
   long int nst, nfe, nsetups, nni, ncfn, netf;
   long int nli, npe, nps, ncfl, nfeLS;
   int retval;
-  realtype avdim;
+  sunrealtype avdim;
 
   retval = CVodeGetWorkSpace(cvode_mem, &lenrw, &leniw);
   check_retval(&retval, "CVodeGetWorkSpace", 1);
@@ -655,7 +655,7 @@ static void PrintFinalStats(void *cvode_mem)
   printf(" Number of error test failures         = %4ld \n", netf);
   printf(" Number of nonlinear conv. failures    = %4ld \n", ncfn);
   printf(" Number of linear convergence failures = %4ld \n", ncfl);
-  avdim = (nni > 0) ? ((realtype)nli)/((realtype)nni) : ZERO;
+  avdim = (nni > 0) ? ((sunrealtype)nli)/((sunrealtype)nni) : ZERO;
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf(" Average Krylov subspace dimension     = %.3Lf \n", avdim);
 #else
@@ -686,11 +686,11 @@ static void FreeUserData(WebData wdata)
  returns it in cdot. The interaction rates are computed by calls to WebRates,
  and these are saved in fsave for use in preconditioning.
 */
-static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
+static int f(sunrealtype t, N_Vector c, N_Vector cdot,void *user_data)
 {
   int i, ic, ici, idxl, idxu, jx, ns, mxns, iyoff, jy, idyu, idyl;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
-  realtype *cdata, *cdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
+  sunrealtype *cdata, *cdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -741,12 +741,12 @@ static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
   c_1, ... ,c_ns (stored in c[0],...,c[ns-1]), at one spatial point
   and at time t.
 */
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata)
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -777,16 +777,16 @@ static void WebRates(realtype x, realtype y, realtype t, realtype c[],
  of a block-diagonal preconditioner. The blocks are of size mp, and
  there are ngrp=ngx*ngy blocks computed in the block-grouping scheme.
 */
-static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype ier;
   sunindextype **pivot;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   WebData wdata;
   void *cvode_mem;
   N_Vector rewt;
@@ -799,7 +799,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   if(check_retval(&retval, "CVodeGetErrWeights", 1)) return(1);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -820,7 +820,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   f1 = N_VGetArrayPointer(wdata->tmp);
 
   fac = N_VWrmsNorm (fc, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -864,11 +864,11 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   system, namely block (jx,jy), for use in preconditioning.
   Here jx and jy count from 0.
 */
-static void fblock(realtype t, realtype cdata[], int jx, int jy,
-                   realtype cdotdata[], WebData wdata)
+static void fblock(sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                   sunrealtype cdotdata[], WebData wdata)
 {
   int iblok, ic;
-  realtype x, y;
+  sunrealtype x, y;
 
   iblok = jx + jy*(wdata->mx);
   y = jy*(wdata->dy);
@@ -887,10 +887,10 @@ static void fblock(realtype t, realtype cdata[], int jx, int jy,
   Then it computes ((I - gamma*Jr)-inverse)*z, using LU factors of the
   blocks in P, and pivot information in pivot, and returns the result in z.
 */
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data)
 {
-  realtype   ***P;
+  sunrealtype   ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -937,12 +937,12 @@ static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
   Some inner loops of length ns are implemented with the small
   vector kernels v_sum_prods, v_prod, v_inc_by_prod.
 */
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata)
 {
   int jx, jy, mx, my, x_loc, y_loc;
   int ns, mxns, i, iyoff, ic, iter;
-  realtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
-  realtype temp, *cox, *coy, *xd, *zd;
+  sunrealtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
+  sunrealtype temp, *cox, *coy, *xd, *zd;
 
   xd = N_VGetArrayPointer(x);
   zd = N_VGetArrayPointer(z);
@@ -957,11 +957,11 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
      Load local arrays beta, beta2, gam, gam2, and cof1. */
 
   for (i = 0; i < ns; i++) {
-    temp = ONE/(ONE + RCONST(2.0)*gamma*(cox[i] + coy[i]));
+    temp = ONE/(ONE + SUN_RCONST(2.0)*gamma*(cox[i] + coy[i]));
     beta[i] = gamma*cox[i]*temp;
-    beta2[i] = RCONST(2.0)*beta[i];
+    beta2[i] = SUN_RCONST(2.0)*beta[i];
     gam[i] = gamma*coy[i]*temp;
-    gam2[i] = RCONST(2.0)*gam[i];
+    gam2[i] = SUN_RCONST(2.0)*gam[i];
     cof1[i] = temp;
   }
 
@@ -1108,26 +1108,26 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
   }
 }
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] += v[i]*w[i];
 }
 
-static void v_sum_prods(realtype u[], realtype p[], realtype q[],
-                        realtype v[], realtype w[], int n)
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[],
+                        sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = p[i]*q[i] + v[i]*w[i];
 }
 
-static void v_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = v[i]*w[i];
 }
 
-static void v_zero(realtype u[], int n)
+static void v_zero(sunrealtype u[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = ZERO;
diff --git a/examples/cvode/serial/cvParticle_dns.c b/examples/cvode/serial/cvParticle_dns.c
index 5ae77a5b0e..10fcd3b911 100644
--- a/examples/cvode/serial/cvParticle_dns.c
+++ b/examples/cvode/serial/cvParticle_dns.c
@@ -70,21 +70,21 @@
 #endif
 
 /* Problem Constants */
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 /* User-defined data structure */
 typedef struct UserData_
 {
-  realtype alpha; /* particle velocity */
+  sunrealtype alpha; /* particle velocity */
 
   int      orbits; /* number of orbits */
-  realtype torbit; /* orbit time       */
+  sunrealtype torbit; /* orbit time       */
 
-  realtype rtol; /* integration tolerances */
-  realtype atol;
+  sunrealtype rtol; /* integration tolerances */
+  sunrealtype atol;
 
   int proj;    /* enable/disable solution projection */
   int projerr; /* enable/disable error projection */
@@ -95,20 +95,20 @@ typedef struct UserData_
 } *UserData;
 
 /* Functions provided to CVODE */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Proj(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj,
+static int Proj(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj,
                 N_Vector err, void *user_data);
 
 /* Utility functions */
 static int InitUserData(int *argc, char ***argv, UserData udata);
 static int PrintUserData(UserData udata);
 static void InputHelp();
-static int ComputeSolution(realtype t, N_Vector y, UserData udata);
-static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
+static int ComputeSolution(sunrealtype t, N_Vector y, UserData udata);
+static int ComputeError(sunrealtype t, N_Vector y, N_Vector e, sunrealtype *ec,
                         UserData udata);
-static int WriteOutput(realtype t, N_Vector y, N_Vector e, realtype ec,
+static int WriteOutput(sunrealtype t, N_Vector y, N_Vector e, sunrealtype ec,
                        int screenfile, FILE *YFID, FILE *EFID);
 static int PrintStats(void *cvode_mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -123,16 +123,16 @@ int main(int argc, char* argv[])
   int      retval;          /* reusable return flag       */
   int      out      = 0;    /* output counter             */
   int      totalout = 0;    /* output counter             */
-  realtype t        = ZERO; /* current integration time   */
-  realtype dtout    = ZERO; /* output spacing             */
-  realtype tout     = ZERO; /* next output time           */
-  realtype ec       = ZERO; /* constraint error           */
+  sunrealtype t        = ZERO; /* current integration time   */
+  sunrealtype dtout    = ZERO; /* output spacing             */
+  sunrealtype tout     = ZERO; /* next output time           */
+  sunrealtype ec       = ZERO; /* constraint error           */
   UserData udata    = NULL; /* user data structure        */
 
   SUNContext      sunctx     = NULL; /* SUNDIALS context     */
   void            *cvode_mem = NULL; /* CVODE memory         */
   N_Vector         y         = NULL; /* solution vector      */
-  realtype        *ydata     = NULL; /* solution vector data */
+  sunrealtype        *ydata     = NULL; /* solution vector data */
   N_Vector         e         = NULL; /* error vector         */
   SUNMatrix        A         = NULL; /* Jacobian matrix      */
   SUNLinearSolver  LS        = NULL; /* linear solver        */
@@ -312,11 +312,11 @@ int main(int argc, char* argv[])
 
 
 /* Compute the right-hand side function, y' = f(t,y) */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData  udata = (UserData) user_data;
-  realtype *ydata = N_VGetArrayPointer(y);
-  realtype *fdata = N_VGetArrayPointer(ydot);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *fdata = N_VGetArrayPointer(ydot);
 
   fdata[0] = -(udata->alpha) * ydata[1];
   fdata[1] =  (udata->alpha) * ydata[0];
@@ -326,11 +326,11 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Compute the Jacobian of the right-hand side function, J(t,y) = df/dy */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData  udata = (UserData) user_data;
-  realtype *Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype *Jdata = SUNDenseMatrix_Data(J);
 
   Jdata[0] =  ZERO;
   Jdata[1] = -(udata->alpha);
@@ -341,16 +341,16 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 }
 
 /* Project the solution onto the constraint manifold */
-static int Proj(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj,
+static int Proj(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj,
                 N_Vector err, void *user_data)
 {
-  realtype *ydata = N_VGetArrayPointer(ycur);
-  realtype *cdata = N_VGetArrayPointer(corr);
-  realtype *edata = NULL;
-  realtype  x = ydata[0];
-  realtype  y = ydata[1];
-  realtype  xp, yp, r;
-  realtype  errxp, erryp;
+  sunrealtype *ydata = N_VGetArrayPointer(ycur);
+  sunrealtype *cdata = N_VGetArrayPointer(corr);
+  sunrealtype *edata = NULL;
+  sunrealtype  x = ydata[0];
+  sunrealtype  y = ydata[1];
+  sunrealtype  xp, yp, r;
+  sunrealtype  errxp, erryp;
 
   /* project onto the unit circle */
   r = SQRT(x * x + y * y);
@@ -392,8 +392,8 @@ static int InitUserData(int *argc, char ***argv, UserData udata)
   udata->orbits = 100;
   udata->torbit = (TWO * PI) / udata->alpha;
 
-  udata->rtol = RCONST(1.0e-4);
-  udata->atol = RCONST(1.0e-9);
+  udata->rtol = SUN_RCONST(1.0e-4);
+  udata->atol = SUN_RCONST(1.0e-9);
 
   udata->proj    = 1;
   udata->projerr = 0;
@@ -502,9 +502,9 @@ static void InputHelp()
 
 
 /* Compute the analytical solution */
-static int ComputeSolution(realtype t, N_Vector y, UserData udata)
+static int ComputeSolution(sunrealtype t, N_Vector y, UserData udata)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
 
   ydata[0] = COS((udata->alpha) * t);
   ydata[1] = SIN((udata->alpha) * t);
@@ -514,10 +514,10 @@ static int ComputeSolution(realtype t, N_Vector y, UserData udata)
 
 
 /* Compute the error in the solution and constraint */
-static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
+static int ComputeError(sunrealtype t, N_Vector y, N_Vector e, sunrealtype *ec,
                         UserData udata)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   int retval;
 
   /* solution error */
@@ -532,11 +532,11 @@ static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
 }
 
 /* Output the solution to the screen or disk */
-static int WriteOutput(realtype t, N_Vector y, N_Vector e, realtype ec,
+static int WriteOutput(sunrealtype t, N_Vector y, N_Vector e, sunrealtype ec,
                        int screenfile, FILE* YFID, FILE* EFID)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
-  realtype *edata = N_VGetArrayPointer(e);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *edata = N_VGetArrayPointer(e);
 
   if (screenfile == 0)
   {
diff --git a/examples/cvode/serial/cvPendulum_dns.c b/examples/cvode/serial/cvPendulum_dns.c
index a090ef2c07..c9fb2a6115 100644
--- a/examples/cvode/serial/cvPendulum_dns.c
+++ b/examples/cvode/serial/cvPendulum_dns.c
@@ -96,27 +96,27 @@
 #endif
 
 /* Problem Constants */
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define GRAV  RCONST(13.750371636040745654980191559621114395801712)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define GRAV  SUN_RCONST(13.750371636040745654980191559621114395801712)
 
 /* Functions provided to CVODE */
-static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data);
+static int fref(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data);
 
-static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data);
-static int proj(realtype t, N_Vector yy, N_Vector corr,
-                realtype epsProj, N_Vector err, void *pdata);
+static int f(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data);
+static int proj(sunrealtype t, N_Vector yy, N_Vector corr,
+                sunrealtype epsProj, N_Vector err, void *pdata);
 
 /* Functions to integrate the Cartesian and reference solutions */
-int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
-           realtype tf, int nout, booleantype proj, booleantype projerr,
+int GetSol(void *cvode_mem, N_Vector yy0, sunrealtype rtol, sunrealtype atol,
+           sunrealtype tf, int nout, sunbooleantype proj, sunbooleantype projerr,
            N_Vector yref);
 
-int RefSol(realtype tf, N_Vector yref, int nout);
+int RefSol(sunrealtype tf, N_Vector yref, int nout);
 
 /* Utility functions */
-static int ReadInputs(int *argc, char ***argv, realtype *rtol, realtype *atol,
-                      realtype *tf, int *nout, booleantype *projerr);
+static int ReadInputs(int *argc, char ***argv, sunrealtype *rtol, sunrealtype *atol,
+                      sunrealtype *tf, int *nout, sunbooleantype *projerr);
 static void InputHelp();
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -132,14 +132,14 @@ int main(int argc, char* argv[])
   int         i;
   int         retval;                   /* reusable return flag    */
   int         nout    = 1;              /* number of outputs       */
-  realtype    rtol    = RCONST(1.0e-5); /* base relative tolerance */
-  realtype    atol    = RCONST(1.0e-5); /* base absolute tolerance */
-  realtype    tf      = RCONST(30.0);   /* final integration time  */
-  booleantype projerr = SUNTRUE;        /* enable error projection */
+  sunrealtype    rtol    = SUN_RCONST(1.0e-5); /* base relative tolerance */
+  sunrealtype    atol    = SUN_RCONST(1.0e-5); /* base absolute tolerance */
+  sunrealtype    tf      = SUN_RCONST(30.0);   /* final integration time  */
+  sunbooleantype projerr = SUNTRUE;        /* enable error projection */
 
   void            *cvode_mem = NULL; /* CVODE memory              */
   N_Vector         yy0       = NULL; /* initial condition vector  */
-  realtype        *yy0data   = NULL; /* vector data               */
+  sunrealtype        *yy0data   = NULL; /* vector data               */
   N_Vector         yref      = NULL; /* reference solution vector */
   SUNMatrix        A         = NULL; /* Jacobian matrix           */
   SUNLinearSolver  LS        = NULL; /* linear solver             */
@@ -216,8 +216,8 @@ int main(int argc, char* argv[])
     if (check_retval(&retval, "GetSol", 1)) return(1);
 
     /* Reduce tolerance for next run */
-    rtol /= RCONST(10.0);
-    atol /= RCONST(10.0);
+    rtol /= SUN_RCONST(10.0);
+    atol /= SUN_RCONST(10.0);
   }
 
   /* Free memory */
@@ -238,23 +238,23 @@ int main(int argc, char* argv[])
 
 
 /* Compute the Cartesian system solution */
-int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
-           realtype tf, int nout, booleantype proj, booleantype projerr,
+int GetSol(void *cvode_mem, N_Vector yy0, sunrealtype rtol, sunrealtype atol,
+           sunrealtype tf, int nout, sunbooleantype proj, sunbooleantype projerr,
            N_Vector yref)
 {
   char      outname[100];  /* output file name */
   FILE     *FID    = NULL; /* output file      */
   N_Vector  yy     = NULL; /* solution vector  */
-  realtype *yydata = NULL; /* vector data      */
+  sunrealtype *yydata = NULL; /* vector data      */
 
   int      retval; /* reusable return flag */
   int      out;    /* output counter       */
-  realtype dtout;  /* output frequency     */
-  realtype tout;   /* output time          */
-  realtype t;      /* return time          */
-  realtype x, y;   /* position values      */
-  realtype xd, yd; /* velocity values      */
-  realtype g;      /* constraint value     */
+  sunrealtype dtout;  /* output frequency     */
+  sunrealtype tout;   /* output time          */
+  sunrealtype t;      /* return time          */
+  sunrealtype x, y;   /* position values      */
+  sunrealtype xd, yd; /* velocity values      */
+  sunrealtype g;      /* constraint value     */
 
   /* Integrator stats */
   long int nst, nfe, nsetups, nje, nfeLS, ncfn, netf;
@@ -417,22 +417,22 @@ int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
 
 
 /* Compute the reference system solution */
-int RefSol(realtype tf, N_Vector yref, int nout)
+int RefSol(sunrealtype tf, N_Vector yref, int nout)
 {
   FILE            *FID       = NULL; /* output file     */
   void            *cvode_mem = NULL; /* CVODE memory    */
   N_Vector         yy        = NULL; /* solution vector */
-  realtype        *yydata    = NULL; /* vector data     */
+  sunrealtype        *yydata    = NULL; /* vector data     */
   SUNMatrix        A         = NULL; /* Jacobian matrix */
   SUNLinearSolver  LS        = NULL; /* linear solver   */
 
   int      retval;                /* reusable return flag  */
   int      out;                   /* output counter        */
-  realtype dtout;                 /* output frequency      */
-  realtype tout;                  /* output time           */
-  realtype t;                     /* return time           */
-  realtype th, thd;               /* theta and theta dot   */
-  realtype tol = RCONST(1.0e-14); /* integration tolerance */
+  sunrealtype dtout;                 /* output frequency      */
+  sunrealtype tout;                  /* output time           */
+  sunrealtype t;                     /* return time           */
+  sunrealtype th, thd;               /* theta and theta dot   */
+  sunrealtype tol = SUN_RCONST(1.0e-14); /* integration tolerance */
 
   /* Create the solution vector */
   yy = N_VNew_Serial(2, sunctx);
@@ -564,10 +564,10 @@ int RefSol(realtype tf, N_Vector yref, int nout)
 
 
 /* ODE RHS function for the reference system */
-static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data)
+static int fref(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data)
 {
-  realtype *yydata = NULL; /* yy vector data */
-  realtype *fydata = NULL; /* fy vector data */
+  sunrealtype *yydata = NULL; /* yy vector data */
+  sunrealtype *fydata = NULL; /* fy vector data */
 
   /* Get vector array pointers */
   yydata = N_VGetArrayPointer(yy);
@@ -580,14 +580,14 @@ static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data)
 
 
 /* ODE RHS function for the Cartesian system */
-static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data)
+static int f(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data)
 {
-  realtype *yydata = NULL; /* yy vector data */
-  realtype *fydata = NULL; /* fy vector data */
+  sunrealtype *yydata = NULL; /* yy vector data */
+  sunrealtype *fydata = NULL; /* fy vector data */
 
-  realtype x, y;   /* positions  */
-  realtype xd, yd; /* velocities */
-  realtype tmp;
+  sunrealtype x, y;   /* positions  */
+  sunrealtype xd, yd; /* velocities */
+  sunrealtype tmp;
 
   /* Get vector array pointers */
   yydata = N_VGetArrayPointer(yy);
@@ -613,19 +613,19 @@ static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data)
 
 
 /* Projection function */
-static int proj(realtype t, N_Vector yy, N_Vector corr,
-                realtype epsProj, N_Vector err, void *pdata)
+static int proj(sunrealtype t, N_Vector yy, N_Vector corr,
+                sunrealtype epsProj, N_Vector err, void *pdata)
 {
-  realtype *yydata = NULL; /* yy vector data   */
-  realtype *cdata  = NULL; /* corr vector data */
-  realtype *edata  = NULL; /* err vector data */
+  sunrealtype *yydata = NULL; /* yy vector data   */
+  sunrealtype *cdata  = NULL; /* corr vector data */
+  sunrealtype *edata  = NULL; /* err vector data */
 
-  realtype x, y, x_new, y_new;     /* positions  */
-  realtype xd, yd, xd_new, yd_new; /* velocities */
+  sunrealtype x, y, x_new, y_new;     /* positions  */
+  sunrealtype xd, yd, xd_new, yd_new; /* velocities */
 
-  realtype e1, e2, e3, e4;
-  realtype e1_new, e2_new, e3_new, e4_new;
-  realtype R;
+  sunrealtype e1, e2, e3, e4;
+  sunrealtype e1_new, e2_new, e3_new, e4_new;
+  sunrealtype R;
 
   /* Get vector array pointers */
 
@@ -697,8 +697,8 @@ static int proj(realtype t, N_Vector yy, N_Vector corr,
 
 
 /* Read command line unputs */
-static int ReadInputs(int *argc, char ***argv, realtype *rtol, realtype *atol,
-                      realtype *tf, int *nout, booleantype *projerr)
+static int ReadInputs(int *argc, char ***argv, sunrealtype *rtol, sunrealtype *atol,
+                      sunrealtype *tf, int *nout, sunbooleantype *projerr)
 {
   int arg_idx = 1;
 
diff --git a/examples/cvode/serial/cvRoberts_block_klu.c b/examples/cvode/serial/cvRoberts_block_klu.c
index 44923dad41..b3558a65c9 100644
--- a/examples/cvode/serial/cvRoberts_block_klu.c
+++ b/examples/cvode/serial/cvRoberts_block_klu.c
@@ -43,7 +43,7 @@
 #include <nvector/nvector_serial.h>     /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h> /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>    /* access to KLU sparse direct solver   */
-#include <sundials/sundials_types.h>    /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>    /* defs. of sunrealtype, sunindextype      */
 
 /* User-defined vector and matrix accessor macro: Ith */
 
@@ -61,30 +61,30 @@
 /* Problem Constants */
 
 #define GROUPSIZE 3            /* number of equations per group */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 
 /* Private function to print final statistics */
 
@@ -109,7 +109,7 @@ typedef struct {
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype reltol, t, tout;
+  sunrealtype reltol, t, tout;
   N_Vector y, abstol;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -250,19 +250,19 @@ int main(int argc, char *argv[])
  * Functions called by the solver
  *-------------------------------
  */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData *udata;
   sunindextype groupj;
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   udata = (UserData*) user_data;
 
   for (groupj = 0; groupj < udata->neq; groupj += GROUPSIZE) {
     y1 = Ith(y,1+groupj); y2 = Ith(y,2+groupj); y3 = Ith(y,3+groupj);
 
-    yd1 = Ith(ydot,1+groupj) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-    yd3 = Ith(ydot,3+groupj) = RCONST(3.0e7)*y2*y2;
+    yd1 = Ith(ydot,1+groupj) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+    yd3 = Ith(ydot,3+groupj) = SUN_RCONST(3.0e7)*y2*y2;
           Ith(ydot,2+groupj) = -yd1 - yd3;
   }
 
@@ -273,15 +273,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData *udata = (UserData*) user_data;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(J);
   sunindextype *colvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
-  realtype *ydata;
-  realtype y2, y3;
+  sunrealtype *data = SUNSparseMatrix_Data(J);
+  sunrealtype *ydata;
+  sunrealtype y2, y3;
   sunindextype groupj, nnzper;
 
   ydata = N_VGetArrayPointer(y);
@@ -302,24 +302,24 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
     rowptrs[GROUPSIZE*groupj + 2] = 9 + nnzper*groupj;
 
     /* first row of block */
-    data[nnzper*groupj]     = RCONST(-0.04);
-    data[nnzper*groupj + 1] = RCONST(1.0e4)*y3;
-    data[nnzper*groupj + 2] = RCONST(1.0e4)*y2;
+    data[nnzper*groupj]     = SUN_RCONST(-0.04);
+    data[nnzper*groupj + 1] = SUN_RCONST(1.0e4)*y3;
+    data[nnzper*groupj + 2] = SUN_RCONST(1.0e4)*y2;
     colvals[nnzper*groupj]     = GROUPSIZE*groupj;
     colvals[nnzper*groupj + 1] = GROUPSIZE*groupj + 1;
     colvals[nnzper*groupj + 2] = GROUPSIZE*groupj + 2;
 
     /* second row of block */
-    data[nnzper*groupj + 3] = RCONST(0.04);
-    data[nnzper*groupj + 4] = (RCONST(-1.0e4)*y3) - (RCONST(6.0e7)*y2);
-    data[nnzper*groupj + 5] = RCONST(-1.0e4)*y2;
+    data[nnzper*groupj + 3] = SUN_RCONST(0.04);
+    data[nnzper*groupj + 4] = (SUN_RCONST(-1.0e4)*y3) - (SUN_RCONST(6.0e7)*y2);
+    data[nnzper*groupj + 5] = SUN_RCONST(-1.0e4)*y2;
     colvals[nnzper*groupj + 3] = GROUPSIZE*groupj;
     colvals[nnzper*groupj + 4] = GROUPSIZE*groupj + 1;
     colvals[nnzper*groupj + 5] = GROUPSIZE*groupj + 2;
 
     /* third row of block */
     data[nnzper*groupj + 6] = ZERO;
-    data[nnzper*groupj + 7] = RCONST(6.0e7)*y2;
+    data[nnzper*groupj + 7] = SUN_RCONST(6.0e7)*y2;
     data[nnzper*groupj + 8] = ZERO;
     colvals[nnzper*groupj + 6] = GROUPSIZE*groupj;
     colvals[nnzper*groupj + 7] = GROUPSIZE*groupj + 1;
@@ -335,7 +335,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRoberts_dns.c b/examples/cvode/serial/cvRoberts_dns.c
index 41d792bb3d..af63236d44 100644
--- a/examples/cvode/serial/cvRoberts_dns.c
+++ b/examples/cvode/serial/cvRoberts_dns.c
@@ -71,32 +71,32 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to check function return values */
@@ -105,7 +105,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
 
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 
 /*
@@ -117,7 +117,7 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -250,14 +250,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -267,13 +267,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -282,23 +282,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -310,7 +310,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
@@ -369,26 +369,26 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
-  realtype ONE=RCONST(1.0);
+  sunrealtype err;               /* wrms error                       */
+  sunrealtype ONE=SUN_RCONST(1.0);
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083495894337328e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833399429795671e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791629776e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083495894337328e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833399429795671e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791629776e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/cvode/serial/cvRoberts_dnsL.c b/examples/cvode/serial/cvRoberts_dnsL.c
index fb59111012..5c6e9cf572 100644
--- a/examples/cvode/serial/cvRoberts_dnsL.c
+++ b/examples/cvode/serial/cvRoberts_dnsL.c
@@ -60,32 +60,32 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -106,7 +106,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -228,14 +228,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -245,13 +245,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -260,23 +260,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -288,7 +288,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRoberts_dns_constraints.c b/examples/cvode/serial/cvRoberts_dns_constraints.c
index d70e103fda..24d73c37ee 100644
--- a/examples/cvode/serial/cvRoberts_dns_constraints.c
+++ b/examples/cvode/serial/cvRoberts_dns_constraints.c
@@ -73,33 +73,33 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-6)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-11)
-#define ATOL3 RCONST(1.0e-5)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-6)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-11)
+#define ATOL3 SUN_RCONST(1.0e-5)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -112,7 +112,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
 
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 
 /*
@@ -124,7 +124,7 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   N_Vector constraints;
@@ -262,14 +262,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -279,13 +279,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -294,23 +294,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -322,7 +322,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
@@ -420,25 +420,25 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
+  sunrealtype err;               /* wrms error                       */
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083495894337328e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833399429795671e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791629776e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083495894337328e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833399429795671e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791629776e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/cvode/serial/cvRoberts_dns_negsol.c b/examples/cvode/serial/cvRoberts_dns_negsol.c
index 350fbc84b1..4c828a19bf 100644
--- a/examples/cvode/serial/cvRoberts_dns_negsol.c
+++ b/examples/cvode/serial/cvRoberts_dns_negsol.c
@@ -36,32 +36,32 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-7)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-13)
-#define ATOL3 RCONST(1.0e-5)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-7)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-13)
+#define ATOL3 SUN_RCONST(1.0e-5)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  14               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 
 /* Private function to print final statistics */
 
@@ -81,14 +81,14 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
   SUNLinearSolver LS;
   void *cvode_mem;
   int retval, iout;
-  booleantype check_negative;
+  sunbooleantype check_negative;
 
   y = NULL;
   abstol = NULL;
@@ -206,20 +206,20 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
-  booleantype *check_negative;
+  sunrealtype y1, y2, y3, yd1, yd3;
+  sunbooleantype *check_negative;
 
-  check_negative = (booleantype *)user_data;
+  check_negative = (sunbooleantype *)user_data;
 
   y1 = NV_Ith_S(y,0); y2 = NV_Ith_S(y,1); y3 = NV_Ith_S(y,2);
 
   if ( *check_negative && (y1<0 || y2<0 || y3<0) )
     return(1);
 
-  yd1 = NV_Ith_S(ydot,0) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = NV_Ith_S(ydot,2) = RCONST(3.0e7)*y2*y2;
+  yd1 = NV_Ith_S(ydot,0) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = NV_Ith_S(ydot,2) = SUN_RCONST(3.0e7)*y2*y2;
         NV_Ith_S(ydot,1) = -yd1 - yd3;
 
   return(0);
@@ -231,7 +231,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRoberts_dns_uw.c b/examples/cvode/serial/cvRoberts_dns_uw.c
index 330354497e..6475f7a68d 100644
--- a/examples/cvode/serial/cvRoberts_dns_uw.c
+++ b/examples/cvode/serial/cvRoberts_dns_uw.c
@@ -73,34 +73,34 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -121,7 +121,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -231,14 +231,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -248,13 +248,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -263,23 +263,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -292,7 +292,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -315,7 +315,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRoberts_klu.c b/examples/cvode/serial/cvRoberts_klu.c
index 55ee6f1ffb..eed7b87537 100644
--- a/examples/cvode/serial/cvRoberts_klu.c
+++ b/examples/cvode/serial/cvRoberts_klu.c
@@ -57,32 +57,32 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -103,7 +103,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -225,14 +225,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -242,13 +242,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -257,18 +257,18 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
 
@@ -276,31 +276,31 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   colptrs[0] = 0;
 
   rowvals[0] = 0;
-  data[0]    = RCONST(-0.04);
+  data[0]    = SUN_RCONST(-0.04);
 
   rowvals[1] = 1;
-  data[1]    = RCONST(0.04);
+  data[1]    = SUN_RCONST(0.04);
 
   /* second column entries start at data[2], three entries (rows 0, 1, and 2) */
   colptrs[1] = 2;
 
   rowvals[2] = 0;
-  data[2]    = RCONST(1.0e4) * yval[2];
+  data[2]    = SUN_RCONST(1.0e4) * yval[2];
 
   rowvals[3] = 1;
-  data[3]    = (RCONST(-1.0e4) * yval[2]) - (RCONST(6.0e7) * yval[1]);
+  data[3]    = (SUN_RCONST(-1.0e4) * yval[2]) - (SUN_RCONST(6.0e7) * yval[1]);
 
   rowvals[4] = 2;
-  data[4]    = RCONST(6.0e7) * yval[1];
+  data[4]    = SUN_RCONST(6.0e7) * yval[1];
 
   /* third column entries start at data[5], two entries (rows 0 and 1) */
   colptrs[2] = 5;
 
   rowvals[5] = 0;
-  data[5]    = RCONST(1.0e4) * yval[1];
+  data[5]    = SUN_RCONST(1.0e4) * yval[1];
 
   rowvals[6] = 1;
-  data[6]    = RCONST(-1.0e4) * yval[1];
+  data[6]    = SUN_RCONST(-1.0e4) * yval[1];
 
   /* number of non-zeros */
   colptrs[3] = 7;
@@ -314,7 +314,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRoberts_sps.c b/examples/cvode/serial/cvRoberts_sps.c
index 466011df9e..cf43b9b80f 100644
--- a/examples/cvode/serial/cvRoberts_sps.c
+++ b/examples/cvode/serial/cvRoberts_sps.c
@@ -57,32 +57,32 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -103,7 +103,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -225,14 +225,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -242,13 +242,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -257,18 +257,18 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
 
@@ -276,31 +276,31 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   colptrs[0] = 0;
 
   rowvals[0] = 0;
-  data[0]    = RCONST(-0.04);
+  data[0]    = SUN_RCONST(-0.04);
 
   rowvals[1] = 1;
-  data[1]    = RCONST(0.04);
+  data[1]    = SUN_RCONST(0.04);
 
   /* second column entries start at data[2], three entries (rows 0, 1, and 2) */
   colptrs[1] = 2;
 
   rowvals[2] = 0;
-  data[2]    = RCONST(1.0e4) * yval[2];
+  data[2]    = SUN_RCONST(1.0e4) * yval[2];
 
   rowvals[3] = 1;
-  data[3]    = (RCONST(-1.0e4) * yval[2]) - (RCONST(6.0e7) * yval[1]);
+  data[3]    = (SUN_RCONST(-1.0e4) * yval[2]) - (SUN_RCONST(6.0e7) * yval[1]);
 
   rowvals[4] = 2;
-  data[4]    = RCONST(6.0e7) * yval[1];
+  data[4]    = SUN_RCONST(6.0e7) * yval[1];
 
   /* third column entries start at data[5], two entries (rows 0 and 1) */
   colptrs[2] = 5;
 
   rowvals[5] = 0;
-  data[5]    = RCONST(1.0e4) * yval[1];
+  data[5]    = SUN_RCONST(1.0e4) * yval[1];
 
   rowvals[6] = 1;
-  data[6]    = RCONST(-1.0e4) * yval[1];
+  data[6]    = SUN_RCONST(-1.0e4) * yval[1];
 
   /* number of non-zeros */
   colptrs[3] = 7;
@@ -314,7 +314,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvode/serial/cvRocket_dns.c b/examples/cvode/serial/cvRocket_dns.c
index 3fc51ee4ce..33a03a659c 100644
--- a/examples/cvode/serial/cvRocket_dns.c
+++ b/examples/cvode/serial/cvRocket_dns.c
@@ -59,25 +59,25 @@
 
 #define NEQ 2 /* number of equations  */
 
-#define Force  RCONST(2200.0) /* engine force */
-#define massr  RCONST(10.0)   /* rocket mass (empty) */
-#define massf0 RCONST(1.0)    /* initial fuel mass */
-#define brate  RCONST(0.1)    /* fuel burn rate */
-#define Drag   RCONST(0.3)    /* Drag coefficient */
-#define grav   RCONST(32.0)   /* acceleration due to gravity */
-#define Hcut   RCONST(4000.0) /* height of engine cutoff */
-
-#define Y1    RCONST(0.0) /* initial y components */
-#define Y2    RCONST(0.0)
-#define RTOL  RCONST(1.0e-5) /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-2) /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-1)
-#define T0    RCONST(0.0) /* initial time           */
-#define T1    RCONST(1.0) /* first output time      */
-#define TINC  RCONST(1.0) /* output time increment  */
+#define Force  SUN_RCONST(2200.0) /* engine force */
+#define massr  SUN_RCONST(10.0)   /* rocket mass (empty) */
+#define massf0 SUN_RCONST(1.0)    /* initial fuel mass */
+#define brate  SUN_RCONST(0.1)    /* fuel burn rate */
+#define Drag   SUN_RCONST(0.3)    /* Drag coefficient */
+#define grav   SUN_RCONST(32.0)   /* acceleration due to gravity */
+#define Hcut   SUN_RCONST(4000.0) /* height of engine cutoff */
+
+#define Y1    SUN_RCONST(0.0) /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-5) /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-2) /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-1)
+#define T0    SUN_RCONST(0.0) /* initial time           */
+#define T1    SUN_RCONST(1.0) /* first output time      */
+#define TINC  SUN_RCONST(1.0) /* output time increment  */
 #define NOUT  70          /* number of output times */
 
-#define ZERO RCONST(0.0)
+#define ZERO SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
@@ -306,7 +306,7 @@ static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void* user_d
   /* Jdata is column-major */
   sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  Jdata[1] = RCONST(1.0);
+  Jdata[1] = SUN_RCONST(1.0);
   Jdata[3] = -Drag;
 
   return (0);
diff --git a/examples/cvode/superludist/cvAdvDiff_sludist.cpp b/examples/cvode/superludist/cvAdvDiff_sludist.cpp
index 1b9ef77f15..f5d5e4f9c6 100644
--- a/examples/cvode/superludist/cvAdvDiff_sludist.cpp
+++ b/examples/cvode/superludist/cvAdvDiff_sludist.cpp
@@ -49,52 +49,52 @@
 #include <nvector/nvector_parallel.h>             /* access to MPI-parallel N_Vector              */
 #include <sunlinsol/sunlinsol_superludist.h>      /* access to the SuperLU-DIST SUNLinearSolver   */
 #include <sunmatrix/sunmatrix_slunrloc.h>         /* access to the SuperLU SLU_NR_loc SUNMatrix   */
-#include <sundials/sundials_types.h>              /* definition of type realtype                  */
+#include <sundials/sundials_types.h>              /* definition of type sunrealtype                  */
 
 #include <mpi.h> /* MPI constants and types */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO  RCONST(0.0)
-#define HALF  RCONST(0.5)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FIVE  RCONST(5.0)
+#define ZERO  SUN_RCONST(0.0)
+#define HALF  SUN_RCONST(0.5)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FIVE  SUN_RCONST(5.0)
 
 /* Type : UserData
    contains grid constants, parallel machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 {
   MPI_Comm comm;
   SUNContext sunctx;
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   UserData data;
   void *cvode_mem;
   int iout, retval, my_pe, npes, nprow, npcol;
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
   superlu_dist_options_t options;
   SuperMatrix Asuper;
   sunindextype *rowptr, *colind;
-  realtype *matdata;
+  sunrealtype *matdata;
 
   N_Vector u;
   SUNMatrix A;
@@ -182,7 +182,7 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
   data->hdcoef = ONE/(dx*dx);
   data->hacoef = HALF/(TWO*dx);
 
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
     local_NNZ = 3*local_N;
 
   /* Create the SuperLU-DIST SuperMatrix which will be wrapped as A */
-  matdata = (realtype *) malloc(local_NNZ*sizeof(realtype));
+  matdata = (sunrealtype *) malloc(local_NNZ*sizeof(sunrealtype));
   colind  = (sunindextype *) calloc(local_NNZ, sizeof(sunindextype));
   rowptr  = (sunindextype *) calloc((local_N+1), sizeof(sunindextype));
   dCreate_CompRowLoc_Matrix_dist(&Asuper, NEQ, NEQ, local_NNZ, local_N, my_base, matdata, colind, rowptr,
@@ -290,13 +290,13 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer(u);
@@ -322,7 +322,7 @@ static void PrintIntro(int npes)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -363,10 +363,10 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
   int i;
   int npes, my_pe, my_length, my_pe_m1, my_pe_p1, last_pe;
   UserData data;
@@ -431,12 +431,12 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunindextype i, j;
-  realtype *nzval, hordc, horac;
+  sunrealtype *nzval, hordc, horac;
   UserData data;
   SuperMatrix *Jsuper;
   NRformat_loc *Jstore;
@@ -455,14 +455,14 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 
   Jsuper = SUNMatrix_SLUNRloc_SuperMatrix(J);
   Jstore = (NRformat_loc *) Jsuper->Store;
-  nzval  = (realtype *) Jstore->nzval;
+  nzval  = (sunrealtype *) Jstore->nzval;
   sunindextype *colind = Jstore->colind;
   sunindextype *rowptr = Jstore->rowptr;
 
   /* set non-zero Jacobian entries */
   for (i=0; i < Jstore->m_loc; i++) {
-    booleantype first_local_row;
-    booleantype first_row, last_row;
+    sunbooleantype first_local_row;
+    sunbooleantype first_row, last_row;
 
     /* global row index */
     j = Jstore->fst_row + i;
diff --git a/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c b/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c
index 942efc38f6..a4bb4bef9a 100644
--- a/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c
+++ b/examples/cvodes/C_openmp/cvsAdvDiff_bnd_omp.c
@@ -58,7 +58,7 @@
 #include <nvector/nvector_openmp.h>    /* serial N_Vector types, fcts., macros */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* definition of type realtype */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype */
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -66,22 +66,22 @@
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -99,15 +99,15 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
   int nthreads;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -116,8 +116,8 @@ static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /*
@@ -129,7 +129,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNMatrix A;
@@ -247,10 +247,10 @@ int main(int argc, char *argv[])
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   sunindextype i, j;
   UserData data;
 
@@ -294,11 +294,11 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunindextype i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -348,8 +348,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
 static void SetIC(N_Vector u, UserData data)
 {
   sunindextype i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   i = j = 0;
 
@@ -375,7 +375,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -398,7 +398,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.c b/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.c
index 70cd075671..4918ba26d9 100644
--- a/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.c
+++ b/examples/cvodes/parallel/cvsAdvDiff_ASAp_non_p.c
@@ -62,48 +62,48 @@
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)   /* domain boundary            */
+#define XMAX  SUN_RCONST(2.0)   /* domain boundary            */
 #define MX    20            /* mesh dimension             */
 #define NEQ   MX            /* number of equations        */
-#define ATOL  RCONST(1.e-5) /* scalar absolute tolerance  */
-#define T0    RCONST(0.0)   /* initial time               */
-#define TOUT  RCONST(2.5)   /* output time increment      */
+#define ATOL  SUN_RCONST(1.e-5) /* scalar absolute tolerance  */
+#define T0    SUN_RCONST(0.0)   /* initial time               */
+#define TOUT  SUN_RCONST(2.5)   /* output time increment      */
 
 /* Adjoint Problem Constants */
 
 #define NP    2            /* number of parameters       */
 #define STEPS 200          /* steps between check points */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[2];            /* model parameters                         */
-  realtype dx;              /* spatial discretization grid              */
-  realtype hdcoef, hacoef;  /* diffusion and advection coefficients     */
+  sunrealtype p[2];            /* model parameters                         */
+  sunrealtype dx;              /* spatial discretization grid              */
+  sunrealtype hdcoef, hacoef;  /* diffusion and advection coefficients     */
   sunindextype local_N;
   int npes, my_pe;          /* total number of processes and current ID */
   sunindextype nperpe, nrem;
   MPI_Comm comm;            /* MPI communicator                         */
-  realtype *z1, *z2;        /* work space                               */
+  sunrealtype *z1, *z2;        /* work space                               */
 } *UserData;
 
 /* Prototypes of user-supplied funcitons */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int fB(realtype t, N_Vector u,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int fB(sunrealtype t, N_Vector u,
               N_Vector uB, N_Vector uBdot, void *user_dataB);
 
 /* Prototypes of private functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length, sunindextype my_base);
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length, sunindextype my_base);
 static void SetICback(N_Vector uB, sunindextype my_base);
-static realtype Xintgr(realtype *z, sunindextype l, realtype dx);
-static realtype Compute_g(N_Vector u, UserData data);
-static void PrintOutput(realtype g_val, N_Vector uB, UserData data);
+static sunrealtype Xintgr(sunrealtype *z, sunindextype l, sunrealtype dx);
+static sunrealtype Compute_g(N_Vector u, UserData data);
+static void PrintOutput(sunrealtype g_val, N_Vector uB, UserData data);
 static int check_retval(void *returnvalue, const char *funcname, int opt, int id);
 
 /*
@@ -119,12 +119,12 @@ int main(int argc, char *argv[])
   void *cvode_mem;
 
   N_Vector u;
-  realtype reltol, abstol;
+  sunrealtype reltol, abstol;
 
   int indexB;
   N_Vector uB;
 
-  realtype dx, t, g_val;
+  sunrealtype dx, t, g_val;
   int retval, my_pe, nprocs, npes, ncheck;
   sunindextype local_N=0, nperpe, nrem, my_base=-1;
 
@@ -182,8 +182,8 @@ int main(int argc, char *argv[])
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data , "malloc", 2, my_pe)) MPI_Abort(comm, 1);
   data->p[0] = ONE;
-  data->p[1] = RCONST(0.5);
-  dx = data->dx = XMAX/((realtype)(MX+1));
+  data->p[1] = SUN_RCONST(0.5);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));
   data->hdcoef = data->p[0]/(dx*dx);
   data->hacoef = data->p[1]/(TWO*dx);
   data->comm = comm;
@@ -258,9 +258,9 @@ int main(int argc, char *argv[])
   } else {
 
     /* Allocate work space */
-    data->z1 = (realtype *)malloc(local_N*sizeof(realtype));
+    data->z1 = (sunrealtype *)malloc(local_N*sizeof(sunrealtype));
     if (check_retval((void *)data->z1, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
-    data->z2 = (realtype *)malloc(local_N*sizeof(realtype));
+    data->z2 = (sunrealtype *)malloc(local_N*sizeof(sunrealtype));
     if (check_retval((void *)data->z2, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
 
   }
@@ -332,11 +332,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,u) for forward phase.
  */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype uLeft, uRight, ui, ult, urt;
-  realtype hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata;
+  sunrealtype uLeft, uRight, ui, ult, urt;
+  sunrealtype hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata;
   sunindextype i, my_length;
   int npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   UserData data;
@@ -402,18 +402,18 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
  * fB routine. Compute right hand side of backward problem
  */
 
-static int fB(realtype t, N_Vector u,
+static int fB(sunrealtype t, N_Vector u,
               N_Vector uB, N_Vector uBdot, void *user_dataB)
 {
-  realtype *uBdata, *duBdata, *udata;
-  realtype uBLeft, uBRight, uBi, uBlt, uBrt;
-  realtype uLeft, uRight, ui, ult, urt;
-  realtype dx, hordc, horac, hdiff, hadv;
-  realtype *z1, *z2, intgr1, intgr2;
+  sunrealtype *uBdata, *duBdata, *udata;
+  sunrealtype uBLeft, uBRight, uBi, uBlt, uBrt;
+  sunrealtype uLeft, uRight, ui, ult, urt;
+  sunrealtype dx, hordc, horac, hdiff, hadv;
+  sunrealtype *z1, *z2, intgr1, intgr2;
   sunindextype i, my_length;
   int j, npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   UserData data;
-  realtype data_in[2], data_out[2];
+  sunrealtype data_in[2], data_out[2];
   MPI_Status status;
   MPI_Comm comm;
 
@@ -540,12 +540,12 @@ static int fB(realtype t, N_Vector u,
  * Set initial conditions in u vector
  */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length, sunindextype my_base)
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length, sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u */
   udata = N_VGetArrayPointer_Parallel(u);
@@ -566,7 +566,7 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length, sunindextype
 static void SetICback(N_Vector uB, sunindextype my_base)
 {
   int i;
-  realtype *uBdata;
+  sunrealtype *uBdata;
   sunindextype my_length;
 
   /* Set pointer to data array and get local length of uB */
@@ -582,12 +582,12 @@ static void SetICback(N_Vector uB, sunindextype my_base)
  * Compute local value of the space integral int_x z(x) dx
  */
 
-static realtype Xintgr(realtype *z, sunindextype l, realtype dx)
+static sunrealtype Xintgr(sunrealtype *z, sunindextype l, sunrealtype dx)
 {
-  realtype my_intgr;
+  sunrealtype my_intgr;
   sunindextype i;
 
-  my_intgr = RCONST(0.5)*(z[0] + z[l-1]);
+  my_intgr = SUN_RCONST(0.5)*(z[0] + z[l-1]);
   for (i = 1; i < l-1; i++)
     my_intgr += z[i];
   my_intgr *= dx;
@@ -599,9 +599,9 @@ static realtype Xintgr(realtype *z, sunindextype l, realtype dx)
  * Compute value of g(u)
  */
 
-static realtype Compute_g(N_Vector u, UserData data)
+static sunrealtype Compute_g(N_Vector u, UserData data)
 {
-  realtype intgr, my_intgr, dx, *udata;
+  sunrealtype intgr, my_intgr, dx, *udata;
   sunindextype my_length;
   int npes, my_pe, i;
   MPI_Status status;
@@ -634,14 +634,14 @@ static realtype Compute_g(N_Vector u, UserData data)
  * Print output after backward integration
  */
 
-static void PrintOutput(realtype g_val, N_Vector uB, UserData data)
+static void PrintOutput(sunrealtype g_val, N_Vector uB, UserData data)
 {
   MPI_Comm comm;
   MPI_Status status;
   int j, npes, my_pe;
   sunindextype i, Ni, indx, local_N, nperpe, nrem;
-  realtype *uBdata;
-  realtype *mu;
+  sunrealtype *uBdata;
+  sunrealtype *mu;
 
   comm = data->comm;
   npes = data->npes;
@@ -665,7 +665,7 @@ static void PrintOutput(realtype g_val, N_Vector uB, UserData data)
     printf("dgdp(tf)\n  [ 1]: %8e\n  [ 2]: %8e\n\n", -uBdata[0], -uBdata[1]);
 #endif
 
-    mu = (realtype *)malloc(NEQ*sizeof(realtype));
+    mu = (sunrealtype *)malloc(NEQ*sizeof(sunrealtype));
     if (check_retval((void *)mu, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
 
     indx = 0;
diff --git a/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p.c b/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p.c
index f7b6aec3ee..0726e0d8ed 100644
--- a/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p.c
+++ b/examples/cvodes/parallel/cvsAdvDiff_FSA_non_p.c
@@ -68,46 +68,46 @@
 #include <mpi.h>
 
 /* Problem Constants */
-#define XMAX  RCONST(2.0)   /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)   /* domain boundary           */
 #define MX    10            /* mesh dimension            */
 #define NEQ   MX            /* number of equations       */
-#define ATOL  RCONST(1.e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)   /* initial time              */
-#define T1    RCONST(0.5)   /* first output time         */
-#define DTOUT RCONST(0.5)   /* output time increment     */
+#define ATOL  SUN_RCONST(1.e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)   /* initial time              */
+#define T1    SUN_RCONST(0.5)   /* first output time         */
+#define DTOUT SUN_RCONST(0.5)   /* output time increment     */
 #define NOUT  10            /* number of output times    */
 
 #define NP    2
 #define NS    2
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Type : UserData
    contains problem parameters, grid constants, work array. */
 
 typedef struct {
-  realtype *p;
-  realtype dx;
+  sunrealtype *p;
+  sunrealtype dx;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 
 /* Prototypes of user-supplied functins */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con);
 static void WrongArgs(int my_pe, char *name);
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length, sunindextype my_base);
-static void PrintOutput(void *cvode_mem, int my_pe, realtype t, N_Vector u);
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length, sunindextype my_base);
+static void PrintOutput(void *cvode_mem, int my_pe, sunrealtype t, N_Vector u);
 static void PrintOutputS(int my_pe, N_Vector *uS);
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth);
 static int check_retval(void *returnvalue, const char *funcname, int opt, int id);
 
 /*
@@ -118,17 +118,17 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 
 int main(int argc, char *argv[])
 {
-  realtype dx, reltol, abstol, t, tout;
+  sunrealtype dx, reltol, abstol, t, tout;
   N_Vector u;
   UserData data;
   void *cvode_mem;
   int iout, retval, my_pe, npes;
   sunindextype local_N, nperpe, nrem, my_base;
 
-  realtype *pbar;
+  sunrealtype *pbar;
   int is, *plist;
   N_Vector *uS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   SUNNonlinearSolver NLS, NLSsens;
@@ -171,11 +171,11 @@ int main(int argc, char *argv[])
   data->comm = comm;
   data->npes = npes;
   data->my_pe = my_pe;
-  data->p = (realtype *) malloc(NP * sizeof(realtype));
+  data->p = (sunrealtype *) malloc(NP * sizeof(sunrealtype));
   if(check_retval((void *)data->p, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
-  dx = data->dx = XMAX/((realtype)(MX+1));
-  data->p[0] = RCONST(1.0);
-  data->p[1] = RCONST(0.5);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));
+  data->p[0] = SUN_RCONST(1.0);
+  data->p[1] = SUN_RCONST(0.5);
 
   /* INITIAL STATES */
   u = N_VNew_Parallel(comm, local_N, NEQ, sunctx);    /* Allocate u vector */
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
     for(is=0; is<NS; is++)
       plist[is] = is; /* sensitivity w.r.t. i-th parameter */
 
-    pbar  = (realtype *) malloc(NS * sizeof(realtype));
+    pbar  = (sunrealtype *) malloc(NS * sizeof(sunrealtype));
     if(check_retval((void *)pbar, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
     for(is=0; is<NS; is++) pbar[is] = data->p[plist[is]];
 
@@ -335,11 +335,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,u).
  */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
-  realtype dx;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
+  sunrealtype dx;
   int npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   sunindextype i, my_length;
   UserData data;
@@ -353,7 +353,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
   data  = (UserData) user_data;
   dx    = data->dx;
   hordc = data->p[0]/(dx*dx);
-  horac = data->p[1]/(RCONST(2.0)*dx);
+  horac = data->p[1]/(SUN_RCONST(2.0)*dx);
 
   /* Extract parameters for parallel computation. */
   comm = data->comm;
@@ -395,7 +395,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i-1] = hdiff + hadv;
   }
@@ -414,7 +414,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -468,13 +468,13 @@ static void WrongArgs(int my_pe, char *name)
  * Set initial conditions in u vector
  */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer_Parallel(u);
@@ -492,11 +492,11 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
  * Print current t, step count, order, stepsize, and max norm of solution
  */
 
-static void PrintOutput(void *cvode_mem, int my_pe, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, int my_pe, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, umax;
+  sunrealtype hu, umax;
 
   retval = CVodeGetNumSteps(cvode_mem, &nst);
   check_retval(&retval, "CVodeGetNumSteps", 1, my_pe);
@@ -537,7 +537,7 @@ static void PrintOutput(void *cvode_mem, int my_pe, realtype t, N_Vector u)
 
 static void PrintOutputS(int my_pe, N_Vector *uS)
 {
-  realtype smax;
+  sunrealtype smax;
 
   smax = N_VMaxNorm(uS[0]);
   if (my_pe == 0) {
@@ -569,8 +569,8 @@ static void PrintOutputS(int my_pe, N_Vector *uS)
  * Print some final statistics located in the iopt array
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth)
 {
   long int nst;
   long int nfe, nsetups, nni, ncfn, netf;
diff --git a/examples/cvodes/parallel/cvsAdvDiff_non_p.c b/examples/cvodes/parallel/cvsAdvDiff_non_p.c
index d78e982188..94218000bd 100644
--- a/examples/cvodes/parallel/cvsAdvDiff_non_p.c
+++ b/examples/cvodes/parallel/cvsAdvDiff_non_p.c
@@ -43,47 +43,47 @@
 
 #include <cvodes/cvodes.h>                        /* prototypes for CVODE fcts. */
 #include <nvector/nvector_parallel.h>             /* definition of N_Vector and macros */
-#include <sundials/sundials_types.h>              /* definition of realtype */
+#include <sundials/sundials_types.h>              /* definition of sunrealtype */
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
 #include <mpi.h>                                  /* MPI constants and types */
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
-#define XMAX  RCONST(2.0)    /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)    /* domain boundary           */
 #define MX    10             /* mesh dimension            */
 #define NEQ   MX             /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
 #define T0    ZERO           /* initial time              */
-#define T1    RCONST(0.5)    /* first output time         */
-#define DTOUT RCONST(0.5)    /* output time increment     */
+#define T1    SUN_RCONST(0.5)    /* first output time         */
+#define DTOUT SUN_RCONST(0.5)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
 /* Type : UserData
    contains grid constants, parallel machine parameters, work array. */
 
 typedef struct {
-  realtype dx, hdcoef, hacoef;
+  sunrealtype dx, hdcoef, hacoef;
   int npes, my_pe;
   MPI_Comm comm;
-  realtype z[100];
+  sunrealtype z[100];
 } *UserData;
 
 /* Private Helper Functions */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base);
 
 static void PrintIntro(int npes);
 
-static void PrintData(realtype t, realtype umax, long int nst);
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst);
 
 static void PrintFinalStats(void *cvode_mem);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
 
@@ -93,7 +93,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 
 int main(int argc, char *argv[])
 {
-  realtype dx, reltol, abstol, t, tout, umax;
+  sunrealtype dx, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -139,9 +139,9 @@ int main(int argc, char *argv[])
   reltol = ZERO;  /* Set the tolerances */
   abstol = ATOL;
 
-  dx = data->dx = XMAX/((realtype)(MX+1));  /* Set grid coefficients in data */
-  data->hdcoef = RCONST(1.0)/(dx*dx);
-  data->hacoef = RCONST(0.5)/(RCONST(2.0)*dx);
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));  /* Set grid coefficients in data */
+  data->hdcoef = SUN_RCONST(1.0)/(dx*dx);
+  data->hacoef = SUN_RCONST(0.5)/(SUN_RCONST(2.0)*dx);
 
   SetIC(u, dx, local_N, my_base);  /* Initialize u vector */
 
@@ -210,13 +210,13 @@ int main(int argc, char *argv[])
 
 /* Set initial conditions in u vector */
 
-static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
+static void SetIC(N_Vector u, sunrealtype dx, sunindextype my_length,
                   sunindextype my_base)
 {
   int i;
   sunindextype iglobal;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer(u);
@@ -226,7 +226,7 @@ static void SetIC(N_Vector u, realtype dx, sunindextype my_length,
   for (i=1; i<=my_length; i++) {
     iglobal = my_base + i;
     x = iglobal*dx;
-    udata[i-1] = x*(XMAX - x)*exp(RCONST(2.0)*x);
+    udata[i-1] = x*(XMAX - x)*exp(SUN_RCONST(2.0)*x);
   }
 }
 
@@ -242,7 +242,7 @@ static void PrintIntro(int npes)
 
 /* Print data */
 
-static void PrintData(realtype t, realtype umax, long int nst)
+static void PrintData(sunrealtype t, sunrealtype umax, long int nst)
 {
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -283,10 +283,10 @@ static void PrintFinalStats(void *cvode_mem)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype *udata, *dudata, *z;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype *udata, *dudata, *z;
   int npes, my_pe, my_pe_m1, my_pe_p1, last_pe;
   sunindextype i, my_length;
   UserData data;
@@ -341,7 +341,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
     urt = z[i+1];
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i-1] = hdiff + hadv;
   }
diff --git a/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.c b/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.c
index 6efcb730d4..28c63f3db1 100644
--- a/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.c
+++ b/examples/cvodes/parallel/cvsAtmDisp_ASAi_kry_bbd_p.c
@@ -45,76 +45,76 @@
 
 /* Domain definition */
 
-#define XMIN RCONST(0.0)
-#define XMAX RCONST(20.0)
+#define XMIN SUN_RCONST(0.0)
+#define XMAX SUN_RCONST(20.0)
 #define MX   80    /* no. of divisions in x dir. */
 #define NPX  2     /* no. of procs. in x dir.    */
 
-#define YMIN RCONST(0.0)
-#define YMAX RCONST(20.0)
+#define YMIN SUN_RCONST(0.0)
+#define YMAX SUN_RCONST(20.0)
 #define MY   80    /* no. of divisions in y dir. */
 #define NPY  2     /* no. of procs. in y dir.    */
 
 #ifdef USE3D
-#define ZMIN RCONST(0.0)
-#define ZMAX RCONST(20.0)
+#define ZMIN SUN_RCONST(0.0)
+#define ZMAX SUN_RCONST(20.0)
 #define MZ   40    /* no. of divisions in z dir. */
 #define NPZ  2     /* no. of procs. in z dir.    */
 #endif
 
 /* Parameters for source Gaussians */
 
-#define G1_AMPL   RCONST(1.0)
-#define G1_SIGMA  RCONST(1.7)
-#define G1_X      RCONST(4.0)
-#define G1_Y      RCONST(8.0)
+#define G1_AMPL   SUN_RCONST(1.0)
+#define G1_SIGMA  SUN_RCONST(1.7)
+#define G1_X      SUN_RCONST(4.0)
+#define G1_Y      SUN_RCONST(8.0)
 #ifdef USE3D
-#define G1_Z      RCONST(8.0)
+#define G1_Z      SUN_RCONST(8.0)
 #endif
 
-#define G2_AMPL   RCONST(0.8)
-#define G2_SIGMA  RCONST(3.0)
-#define G2_X      RCONST(16.0)
-#define G2_Y      RCONST(12.0)
+#define G2_AMPL   SUN_RCONST(0.8)
+#define G2_SIGMA  SUN_RCONST(3.0)
+#define G2_X      SUN_RCONST(16.0)
+#define G2_Y      SUN_RCONST(12.0)
 #ifdef USE3D
-#define G2_Z      RCONST(12.0)
+#define G2_Z      SUN_RCONST(12.0)
 #endif
 
-#define G_MIN     RCONST(1.0e-5)
+#define G_MIN     SUN_RCONST(1.0e-5)
 
 /* Diffusion coeff., max. velocity, domain width in y dir. */
 
-#define DIFF_COEF RCONST(1.0)
-#define V_MAX     RCONST(1.0)
-#define L         ((YMAX-YMIN)/RCONST(2.0))
+#define DIFF_COEF SUN_RCONST(1.0)
+#define V_MAX     SUN_RCONST(1.0)
+#define L         ((YMAX-YMIN)/SUN_RCONST(2.0))
 #define V_COEFF   V_MAX/L/L
 
 /* Initial and final times */
 
-#define ti    RCONST(0.0)
-#define tf    RCONST(10.0)
+#define ti    SUN_RCONST(0.0)
+#define tf    SUN_RCONST(10.0)
 
 /* Integration tolerances */
 
-#define RTOL    RCONST(1.0e-8) /* states */
-#define ATOL    RCONST(1.0e-6)
+#define RTOL    SUN_RCONST(1.0e-8) /* states */
+#define ATOL    SUN_RCONST(1.0e-6)
 
-#define RTOL_Q  RCONST(1.0e-8) /* forward quadrature */
-#define ATOL_Q  RCONST(1.0e-6)
+#define RTOL_Q  SUN_RCONST(1.0e-8) /* forward quadrature */
+#define ATOL_Q  SUN_RCONST(1.0e-6)
 
-#define RTOL_B  RCONST(1.0e-8) /* adjoint variables */
-#define ATOL_B  RCONST(1.0e-6)
+#define RTOL_B  SUN_RCONST(1.0e-8) /* adjoint variables */
+#define ATOL_B  SUN_RCONST(1.0e-6)
 
-#define RTOL_QB RCONST(1.0e-8) /* backward quadratures */
-#define ATOL_QB RCONST(1.0e-6)
+#define RTOL_QB SUN_RCONST(1.0e-8) /* backward quadratures */
+#define ATOL_QB SUN_RCONST(1.0e-6)
 
 /* Steps between check points */
 
 #define STEPS 200
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /*
  *------------------------------------------------------------------
@@ -143,11 +143,11 @@
 
 typedef struct {
   /* Domain */
-  realtype xmin[DIM];  /* "left" boundaries */
-  realtype xmax[DIM];  /* "right" boundaries */
+  sunrealtype xmin[DIM];  /* "left" boundaries */
+  sunrealtype xmax[DIM];  /* "right" boundaries */
   int m[DIM];          /* number of grid points */
-  realtype dx[DIM];    /* grid spacing */
-  realtype dOmega;     /* differential volume */
+  sunrealtype dx[DIM];    /* grid spacing */
+  sunrealtype dOmega;     /* differential volume */
 
   /* Parallel stuff */
   MPI_Comm comm;       /* MPI communicator */
@@ -158,9 +158,9 @@ typedef struct {
   int nbr_right[DIM];  /* MPI ID of "right" neighbor */
   int m_start[DIM];    /* "left" index in the global domain */
   int l_m[DIM];        /* number of local grid points */
-  realtype *y_ext;     /* extended data array */
-  realtype *buf_send;  /* Send buffer */
-  realtype *buf_recv;  /* Receive buffer */
+  sunrealtype *y_ext;     /* extended data array */
+  sunrealtype *buf_send;  /* Send buffer */
+  sunrealtype *buf_recv;  /* Receive buffer */
   int buf_size;        /* Buffer size */
 
   /* Source */
@@ -174,20 +174,20 @@ typedef struct {
  *------------------------------------------------------------------
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f_local(sunindextype Nlocal, realtype t, N_Vector y,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f_local(sunindextype Nlocal, sunrealtype t, N_Vector y,
                    N_Vector ydot, void *user_data);
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
 
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
               void *user_dataB);
-static int fB_local(sunindextype NlocalB, realtype t,
+static int fB_local(sunindextype NlocalB, sunrealtype t,
                     N_Vector y, N_Vector yB, N_Vector yBdot,
                     void *user_dataB);
 
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB);
 
 /*
@@ -199,8 +199,8 @@ static int fQB(realtype t, N_Vector y, N_Vector yB,
 static void SetData(ProblemData d, MPI_Comm comm, int npes, int myId,
                     sunindextype *neq, sunindextype *l_neq);
 static void SetSource(ProblemData d);
-static void f_comm(sunindextype Nlocal, realtype t, N_Vector y, void *user_data);
-static void Load_yext(realtype *src, ProblemData d);
+static void f_comm(sunindextype Nlocal, sunrealtype t, N_Vector y, void *user_data);
+static void Load_yext(sunrealtype *src, ProblemData d);
 static void PrintHeader();
 static int PrintFinalStats(void *cvode_mem);
 static void OutputGradient(int myId, N_Vector qB, ProblemData d);
@@ -227,19 +227,19 @@ int main(int argc, char *argv[])
   void *cvode_mem;
   SUNLinearSolver LS;
   N_Vector y, q;
-  realtype abstol, reltol, abstolQ, reltolQ;
+  sunrealtype abstol, reltol, abstolQ, reltolQ;
   sunindextype mudq, mldq, mukeep, mlkeep;
 
   int indexB;
   N_Vector yB, qB;
-  realtype abstolB, reltolB, abstolQB, reltolQB;
+  sunrealtype abstolB, reltolB, abstolQB, reltolQB;
   sunindextype mudqB, mldqB, mukeepB, mlkeepB;
 
-  realtype tret, *qdata, G;
+  sunrealtype tret, *qdata, G;
 
   int ncheckpnt, retval;
 
-  booleantype output;
+  sunbooleantype output;
 
   /* Initialize MPI and set Ids */
   MPI_Init(&argc, &argv);
@@ -561,7 +561,7 @@ static void SetData(ProblemData d, MPI_Comm comm, int npes, int myId,
 
   size = 1;
   FOR_DIM size *= d->l_m[dim]+2;
-  d->y_ext = (realtype *) malloc( size*sizeof(realtype));
+  d->y_ext = (sunrealtype *) malloc( size*sizeof(sunrealtype));
 
   /* Initialize Buffer field.
      Size of buffer is checked when needed */
@@ -585,8 +585,8 @@ static void SetData(ProblemData d, MPI_Comm comm, int npes, int myId,
 static void SetSource(ProblemData d)
 {
   int *l_m, *m_start;
-  realtype *xmin, *dx;
-  realtype x[DIM], g, *pdata;
+  sunrealtype *xmin, *dx;
+  sunrealtype x[DIM], g, *pdata;
   int i[DIM];
 
   l_m  = d->l_m;
@@ -644,14 +644,14 @@ static void SetSource(ProblemData d)
  *------------------------------------------------------------------
  */
 
-static void f_comm(sunindextype N_local, realtype t, N_Vector y, void *user_data)
+static void f_comm(sunindextype N_local, sunrealtype t, N_Vector y, void *user_data)
 {
   int id, n[DIM], proc_cond[DIM], nbr[DIM][2];
   ProblemData d;
-  realtype *yextdata, *ydata;
+  sunrealtype *yextdata, *ydata;
   int l_m[DIM], dim;
   int c, i[DIM], l[DIM-1];
-  realtype *buf_send, *buf_recv;
+  sunrealtype *buf_send, *buf_recv;
   MPI_Status stat;
   MPI_Comm comm;
   int dir, size = 1, small = INT_MAX;
@@ -677,8 +677,8 @@ static void f_comm(sunindextype N_local, realtype t, N_Vector y, void *user_data
 
   /* Adjust buffer size if necessary */
   if( d->buf_size < size ) {
-    d->buf_send = (realtype*) realloc( d->buf_send, size * sizeof(realtype));
-    d->buf_recv = (realtype*) realloc( d->buf_recv, size * sizeof(realtype));
+    d->buf_send = (sunrealtype*) realloc( d->buf_send, size * sizeof(sunrealtype));
+    d->buf_recv = (sunrealtype*) realloc( d->buf_recv, size * sizeof(sunrealtype));
     d->buf_size = size;
   }
 
@@ -754,7 +754,7 @@ static void f_comm(sunindextype N_local, realtype t, N_Vector y, void *user_data
  *------------------------------------------------------------------
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   ProblemData d;
   sunindextype l_neq=1;
@@ -772,13 +772,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int f_local(sunindextype Nlocal, realtype t, N_Vector y,
+static int f_local(sunindextype Nlocal, sunrealtype t, N_Vector y,
                    N_Vector ydot, void *user_data)
 {
-  realtype *Ydata, *dydata, *pdata;
-  realtype dx[DIM], c, v[DIM], cl[DIM], cr[DIM];
-  realtype adv[DIM], diff[DIM];
-  realtype xmin[DIM], x[DIM], x1;
+  sunrealtype *Ydata, *dydata, *pdata;
+  sunrealtype dx[DIM], c, v[DIM], cl[DIM], cr[DIM];
+  sunrealtype adv[DIM], diff[DIM];
+  sunrealtype xmin[DIM], x[DIM], x1;
   int i[DIM], l_m[DIM], m_start[DIM], nbr_left[DIM], nbr_right[DIM], id;
   ProblemData d;
   int dim;
@@ -869,17 +869,17 @@ static int f_local(sunindextype Nlocal, realtype t, N_Vector y,
  *------------------------------------------------------------------
  */
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
   ProblemData d;
-  realtype *dqdata;
+  sunrealtype *dqdata;
 
   d = (ProblemData) user_data;
 
   dqdata = N_VGetArrayPointer(qdot);
 
   dqdata[0] = N_VDotProd(y,y);
-  dqdata[0] *= RCONST(0.5) * (d->dOmega);
+  dqdata[0] *= SUN_RCONST(0.5) * (d->dOmega);
 
   return(0);
 }
@@ -891,7 +891,7 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
  *------------------------------------------------------------------
  */
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
               void *user_dataB)
 {
   ProblemData d;
@@ -910,14 +910,14 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
   return(0);
 }
 
-static int fB_local(sunindextype NlocalB, realtype t,
+static int fB_local(sunindextype NlocalB, sunrealtype t,
                     N_Vector y, N_Vector yB, N_Vector dyB,
                     void *user_dataB)
 {
-  realtype *YBdata, *dyBdata, *ydata;
-  realtype dx[DIM], c, v[DIM], cl[DIM], cr[DIM];
-  realtype adv[DIM], diff[DIM];
-  realtype xmin[DIM], x[DIM], x1;
+  sunrealtype *YBdata, *dyBdata, *ydata;
+  sunrealtype dx[DIM], c, v[DIM], cl[DIM], cr[DIM];
+  sunrealtype adv[DIM], diff[DIM];
+  sunrealtype xmin[DIM], x[DIM], x1;
   int i[DIM], l_m[DIM], m_start[DIM], nbr_left[DIM], nbr_right[DIM], id;
   ProblemData d;
   int dim;
@@ -1008,7 +1008,7 @@ static int fB_local(sunindextype NlocalB, realtype t,
  *------------------------------------------------------------------
  */
 
-static int fQB(realtype t, N_Vector y, N_Vector yB, N_Vector qBdot,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector qBdot,
                void *user_dataB)
 {
   ProblemData d;
@@ -1028,7 +1028,7 @@ static int fQB(realtype t, N_Vector y, N_Vector yB, N_Vector qBdot,
  *------------------------------------------------------------------
  */
 
-static void Load_yext(realtype *src, ProblemData d)
+static void Load_yext(sunrealtype *src, ProblemData d)
 {
   int i[DIM], l_m[DIM], dim;
 
@@ -1158,8 +1158,8 @@ static void OutputGradient(int myId, N_Vector qB, ProblemData d)
   FILE *fid;
   char filename[20];
   int *l_m, *m_start, i[DIM],ip;
-  realtype *xmin, *dx;
-  realtype x[DIM], *pdata, p, *qBdata, g;
+  sunrealtype *xmin, *dx;
+  sunrealtype x[DIM], *pdata, p, *qBdata, g;
 
   sprintf(filename,"grad%03d.m",myId);
   fid = fopen(filename,"w");
diff --git a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p.c b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p.c
index 2986dee511..23d8fa282f 100644
--- a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p.c
+++ b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p.c
@@ -81,7 +81,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h>  /* defs. for SUNLinSol_SPGMR fcts. and constants */
 #include <nvector/nvector_parallel.h>   /* defs of par. NVECTOR fcts. and macros */
 #include <sundials/sundials_dense.h>    /* generic DENSE solver used in prec. */
-#include <sundials/sundials_types.h>    /* def. of realtype */
+#include <sundials/sundials_types.h>    /* def. of sunrealtype */
 
 #include <mpi.h>
 
@@ -94,19 +94,19 @@
 /* Problem Constants */
 
 #define NVARS     2              /* number of species                    */
-#define C1_SCALE  RCONST(1.0e6)  /* coefficients in initial profiles     */
-#define C2_SCALE  RCONST(1.0e12)
+#define C1_SCALE  SUN_RCONST(1.0e6)  /* coefficients in initial profiles     */
+#define C2_SCALE  SUN_RCONST(1.0e12)
 
-#define T0        RCONST(0.0)    /* initial time                         */
+#define T0        SUN_RCONST(0.0)    /* initial time                         */
 #define NOUT      12             /* number of output times               */
-#define TWOHR     RCONST(7200.0) /* number of seconds in two hours       */
-#define HALFDAY   RCONST(4.32e4) /* number of seconds in a half day      */
-#define PI        RCONST(3.1415926535898)   /* pi                        */
+#define TWOHR     SUN_RCONST(7200.0) /* number of seconds in two hours       */
+#define HALFDAY   SUN_RCONST(4.32e4) /* number of seconds in a half day      */
+#define PI        SUN_RCONST(3.1415926535898)   /* pi                        */
 
-#define XMIN      RCONST(0.0)    /* grid boundaries in x                 */
-#define XMAX      RCONST(20.0)
-#define YMIN      RCONST(30.0)   /* grid boundaries in y                 */
-#define YMAX      RCONST(50.0)
+#define XMIN      SUN_RCONST(0.0)    /* grid boundaries in x                 */
+#define XMAX      SUN_RCONST(20.0)
+#define YMIN      SUN_RCONST(30.0)   /* grid boundaries in y                 */
+#define YMAX      SUN_RCONST(50.0)
 
 #define NPEX      2              /* no. PEs in x direction of PE array   */
 #define NPEY      2              /* no. PEs in y direction of PE array   */
@@ -120,8 +120,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL      RCONST(1.0e-5) /* scalar relative tolerance             */
-#define FLOOR     RCONST(100.0)  /* value of C1 or C2 at which tols.      */
+#define RTOL      SUN_RCONST(1.0e-5) /* scalar relative tolerance             */
+#define FLOOR     SUN_RCONST(100.0)  /* value of C1 or C2 at which tols.      */
                                  /* change from relative to absolute      */
 #define ATOL      (RTOL*FLOOR)   /* scalar absolute tolerance             */
 
@@ -129,7 +129,7 @@
 #define NP        8              /* number of problem parameters          */
 #define NS        2              /* number of sensitivities               */
 
-#define ZERO      RCONST(0.0)
+#define ZERO      SUN_RCONST(0.0)
 
 
 /* User-defined matrix accessor macro: IJth */
@@ -137,7 +137,7 @@
 /* IJth is defined in order to write code which indexes into small dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -151,35 +151,35 @@
 
 typedef struct {
 
-  realtype *p;
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype *p;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2;
   MPI_Comm comm;
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
 
 /* Functions Called by the CVODES Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
-                  N_Vector r, N_Vector z, realtype gamma,
-                  realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
+                  N_Vector r, N_Vector z, sunrealtype gamma,
+                  sunrealtype delta, int lr, void *user_data);
 
 /* Private Helper Functions */
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con);
 static void WrongArgs(int my_pe, char *name);
 
 static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
@@ -188,20 +188,20 @@ static void SetInitialProfiles(N_Vector u, UserData data);
 
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, sunindextype dsizex,
-                  sunindextype dsizey, realtype udata[]);
+                  sunindextype dsizey, sunrealtype udata[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby, sunindextype dsizex,
-                      sunindextype dsizey, realtype uext[], realtype buffer[]);
+                      sunindextype dsizey, sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[], int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[], realtype buffer[]);
-static void ucomm(realtype t, N_Vector u, UserData data);
-static void fcalc(realtype t, realtype udata[], realtype dudata[], UserData data);
+                      sunindextype dsizex, sunrealtype uext[], sunrealtype buffer[]);
+static void ucomm(sunrealtype t, N_Vector u, UserData data);
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[], UserData data);
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        realtype t, N_Vector u);
+                        sunrealtype t, N_Vector u);
 static void PrintOutputS(int my_pe, MPI_Comm comm, N_Vector *uS);
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth);
 static int check_retval(void *returnvalue, const char *funcname, int opt, int id);
 
 /*
@@ -213,7 +213,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -222,10 +222,10 @@ int main(int argc, char *argv[])
   sunindextype neq, local_N;
   MPI_Comm comm;
 
-  realtype *pbar;
+  sunrealtype *pbar;
   int is, *plist;
   N_Vector *uS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   u = NULL;
@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
   data->p = NULL;
-  data->p = (realtype *) malloc(NP*sizeof(realtype));
+  data->p = (sunrealtype *) malloc(NP*sizeof(sunrealtype));
   if (check_retval((void *)data->p, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
   InitUserData(my_pe, comm, data);
 
@@ -316,7 +316,7 @@ int main(int argc, char *argv[])
     if (check_retval((void *)plist, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
     for (is=0; is<NS; is++) plist[is] = is;
 
-    pbar = (realtype *) malloc(NS*sizeof(realtype));
+    pbar = (sunrealtype *) malloc(NS*sizeof(sunrealtype));
     if (check_retval((void *)pbar, "malloc", 2, my_pe)) MPI_Abort(comm, 1);
     for (is=0; is<NS; is++) pbar[is] = data->p[plist[is]];
 
@@ -409,9 +409,9 @@ int main(int argc, char *argv[])
  * subgrid boundary data into uext.  Then calculate f by a call to fcalc.
  */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype *udata, *dudata;
+  sunrealtype *udata, *dudata;
   UserData data;
 
   udata = N_VGetArrayPointer(u);
@@ -431,17 +431,17 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
  * Preconditioner setup routine. Generate and preprocess P.
  */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   sunindextype *(*pivot)[MYSUB], retval, nvmxsub, offset;
   int lx, ly, jy, isuby;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
-  realtype Q1, Q2, C3;
+  sunrealtype Q1, Q2, C3;
 
   /* Make local copies of pointers in user_data, pointer to u's data,
      and PE index pair */
@@ -477,11 +477,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
        computed on the last f call).  Load into P. */
     for (ly = 0; ly < MYSUB; ly++) {
       jy = ly + isuby*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*hordco);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*hordco);
       for (lx = 0; lx < MXSUB; lx++) {
         offset = lx*NVARS + ly*nvmxsub;
         c1 = udata[offset];
@@ -521,14 +521,14 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
  * Preconditioner solve routine
  */
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
-                  N_Vector r, N_Vector z, realtype gamma,
-                  realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
+                  N_Vector r, N_Vector z, sunrealtype gamma,
+                  sunrealtype delta, int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   sunindextype *(*pivot)[MYSUB], nvmxsub;
   int lx, ly;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data */
@@ -539,7 +539,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
 
   nvmxsub = data->nvmxsub;
   zdata = N_VGetArrayPointer(z);
@@ -565,7 +565,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
  */
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -624,25 +624,25 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 {
   int isubx, isuby;
   int  lx, ly;
-  realtype KH, VEL, KV0;
+  sunrealtype KH, VEL, KV0;
 
   /* Set problem parameters */
-  data->p[0]  = RCONST(1.63e-16);      /* Q1  coeffs. q1, q2, c3             */
-  data->p[1]  = RCONST(4.66e-16);      /* Q2                                 */
-  data->p[2]  = RCONST(3.7e16);        /* C3                                 */
-  data->p[3]  = RCONST(22.62);         /* A3  coeff. in expression for q3(t) */
-  data->p[4]  = RCONST(7.601);         /* A4  coeff. in expression for q4(t) */
-  KH  = data->p[5]  = RCONST(4.0e-6);  /* KH  horizontal diffusivity Kh      */
-  VEL = data->p[6]  = RCONST(0.001);   /* VEL advection velocity V           */
-  KV0 = data->p[7]  = RCONST(1.0e-8);  /* KV0 coeff. in Kv(z)                */
+  data->p[0]  = SUN_RCONST(1.63e-16);      /* Q1  coeffs. q1, q2, c3             */
+  data->p[1]  = SUN_RCONST(4.66e-16);      /* Q2                                 */
+  data->p[2]  = SUN_RCONST(3.7e16);        /* C3                                 */
+  data->p[3]  = SUN_RCONST(22.62);         /* A3  coeff. in expression for q3(t) */
+  data->p[4]  = SUN_RCONST(7.601);         /* A4  coeff. in expression for q4(t) */
+  KH  = data->p[5]  = SUN_RCONST(4.0e-6);  /* KH  horizontal diffusivity Kh      */
+  VEL = data->p[6]  = SUN_RCONST(0.001);   /* VEL advection velocity V           */
+  KV0 = data->p[7]  = SUN_RCONST(1.0e-8);  /* KV0 coeff. in Kv(z)                */
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -697,8 +697,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 {
   int isubx, isuby;
   sunindextype lx, ly, jx, jy, offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *udata;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u */
   udata = N_VGetArrayPointer(u);
@@ -711,18 +711,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       udata[offset  ] = C1_SCALE*cx*cy;
       udata[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -736,11 +736,11 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[])
+                  sunrealtype udata[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -778,7 +778,7 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *  1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+ *  1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
  *     passed to both the BRecvPost and BRecvWait functions, and should not
  *     be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
@@ -787,12 +787,12 @@ static void BSend(MPI_Comm comm, int my_pe, int isubx,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby,
                       sunindextype dsizex, sunindextype dsizey,
-                      realtype uext[], realtype buffer[])
+                      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
 
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -822,18 +822,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *  1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+ *  1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
  *     passed to both the BRecvPost and BRecvWait functions, and should not
  *     be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
  */
 
 static void BRecvWait(MPI_Request request[], int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[], realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[], sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -879,9 +879,9 @@ static void BRecvWait(MPI_Request request[], int isubx, int isuby,
  * between processors of data needed to calculate f.
  */
 
-static void ucomm(realtype t, N_Vector u, UserData data)
+static void ucomm(sunrealtype t, N_Vector u, UserData data)
 {
-  realtype *udata, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *udata, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -912,16 +912,16 @@ static void ucomm(realtype t, N_Vector u, UserData data)
  * and this data is in the work array uext.
  */
 
-static void fcalc(realtype t, realtype udata[], realtype dudata[], UserData data)
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[], UserData data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
-  realtype Q1, Q2, C3, A3, A4;
+  sunrealtype Q1, Q2, C3, A3, A4;
 
   /* Get subgrid indices, data sizes, extended work array uext */
   isubx = data->isubx;   isuby = data->isuby;
@@ -1002,8 +1002,8 @@ static void fcalc(realtype t, realtype udata[], realtype dudata[], UserData data
     /* Set vertical diffusion coefficients at jy +- 1/2 */
     ydn = YMIN + (jy - .5)*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -1014,7 +1014,7 @@ static void fcalc(realtype t, realtype udata[], realtype dudata[], UserData data
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -1049,11 +1049,11 @@ static void fcalc(realtype t, realtype udata[], realtype dudata[], UserData data
  */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        realtype t, N_Vector u)
+                        sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, npelast, retval;
-  realtype hu, *udata, tempu[2];
+  sunrealtype hu, *udata, tempu[2];
   sunindextype i0, i1;
   MPI_Status status;
 
@@ -1123,7 +1123,7 @@ static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
 
 static void PrintOutputS(int my_pe, MPI_Comm comm, N_Vector *uS)
 {
-  realtype *sdata, temps[2];
+  sunrealtype *sdata, temps[2];
   int npelast;
   sunindextype i0, i1;
   MPI_Status status;
@@ -1209,8 +1209,8 @@ static void PrintOutputS(int my_pe, MPI_Comm comm, N_Vector *uS)
  * Print final statistics from the CVODES memory.
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth)
 {
   long int nst;
   long int nfe, nsetups, nni, ncfn, netf;
diff --git a/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.c b/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.c
index 478fb850a6..4b45c8a183 100644
--- a/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.c
+++ b/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.c
@@ -67,7 +67,7 @@
 #include <cvodes/cvodes_bbdpre.h>       /* prototypes for CVBBDPRE module */
 #include <sunlinsol/sunlinsol_spgmr.h>  /* prototypes and constants for SUNLinSol_SPGMR solver */
 #include <nvector/nvector_parallel.h>   /* definition N_Vector */
-#include <sundials/sundials_types.h>    /* definitions of realtype, booleantype */
+#include <sundials/sundials_types.h>    /* definitions of sunrealtype, sunbooleantype */
 
 #include <mpi.h>                        /* MPI constants and types */
 
@@ -79,30 +79,30 @@
 
 /* Problem Constants */
 
-#define ZERO         RCONST(0.0)
+#define ZERO         SUN_RCONST(0.0)
 
 #define NVARS        2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                /* initial time */
 #define NOUT         12                  /* number of output times */
-#define TWOHR        RCONST(7200.0)      /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)      /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898) /* pi */
+#define TWOHR        SUN_RCONST(7200.0)      /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)      /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898) /* pi */
 
 #define XMIN         ZERO                /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)        /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)        /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -115,8 +115,8 @@
                                     /* Spatial mesh is MX by MY */
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -125,8 +125,8 @@
    grid constants, processor indices, MPI communicator */
 
 typedef struct {
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, Nlocal;
   MPI_Comm comm;
@@ -140,30 +140,30 @@ static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
 		       sunindextype mukeep, sunindextype mlkeep);
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[]);
+                  sunrealtype uarray[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[]);
+		      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
 
-static void fucomm(realtype t, N_Vector u, void *user_data);
+static void fucomm(sunrealtype t, N_Vector u, void *user_data);
 
 /* Prototype of function called by the solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Prototype of functions called by the CVBBDPRE module */
 
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data);
 
 /* Private function to check function return values */
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
   UserData data;
   SUNLinearSolver LS;
   void *cvode_mem;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   int iout, my_pe, npes, retval, jpre;
   sunindextype neq, local_N, mudq, mldq, mukeep, mlkeep;
@@ -333,11 +333,11 @@ static void InitUserData(int my_pe, sunindextype local_N, MPI_Comm comm,
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -360,8 +360,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   int isubx, isuby;
   int lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *uarray;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *uarray;
 
   /* Set pointer to data array in vector u */
 
@@ -377,18 +377,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   and jx and jy are the global mesh point indices. */
 
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       uarray[offset  ] = C1_SCALE*cx*cy;
       uarray[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -415,12 +415,12 @@ static void PrintIntro(int npes, sunindextype mudq, sunindextype mldq,
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int qu, retval, npelast;
   sunindextype i0, i1;
   long int nst;
-  realtype hu, *uarray, tempu[2];
+  sunrealtype hu, *uarray, tempu[2];
   MPI_Status status;
 
   npelast = NPEX*NPEY - 1;
@@ -531,11 +531,11 @@ static void PrintFinalStats(void *cvode_mem)
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype uarray[])
+                  sunrealtype uarray[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
 
@@ -577,7 +577,7 @@ static void BSend(MPI_Comm comm,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -585,11 +585,11 @@ static void BSend(MPI_Comm comm,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[])
+		      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -619,19 +619,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -674,10 +674,10 @@ static void BRecvWait(MPI_Request request[],
 /* fucomm routine.  This routine performs all inter-processor
    communication of data in u needed to calculate f.         */
 
-static void fucomm(realtype t, N_Vector u, void *user_data)
+static void fucomm(sunrealtype t, N_Vector u, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -712,7 +712,7 @@ static void fucomm(realtype t, N_Vector u, void *user_data)
 /* f routine.  Evaluate f(t,y).  First call fucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to flocal. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
   UserData data;
 
@@ -735,19 +735,19 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
    inter-processor communication of data needed to calculate f has already
    been done, and this data is in the work array uext.                    */
 
-static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
+static int flocal(sunindextype Nlocal, sunrealtype t, N_Vector u,
                   N_Vector udot, void *user_data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
   UserData data;
-  realtype *uarray, *duarray;
+  sunrealtype *uarray, *duarray;
 
   uarray = N_VGetArrayPointer_Parallel(u);
   duarray = N_VGetArrayPointer_Parallel(udot);
@@ -831,10 +831,10 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -864,8 +864,8 @@ static int flocal(sunindextype Nlocal, realtype t, N_Vector u,
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
diff --git a/examples/cvodes/parallel/cvsDiurnal_kry_p.c b/examples/cvodes/parallel/cvsDiurnal_kry_p.c
index ce55ed2ce5..ebc6a0494a 100644
--- a/examples/cvodes/parallel/cvsDiurnal_kry_p.c
+++ b/examples/cvodes/parallel/cvsDiurnal_kry_p.c
@@ -54,7 +54,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h>  /* prototypes and constants for SUNLinSol_SPGMR solver */
 #include <nvector/nvector_parallel.h>   /* definition N_Vector  */
 #include <sundials/sundials_dense.h>    /* prototypes for small dense matrix fcts. */
-#include <sundials/sundials_types.h>    /* definitions of realtype, booleantype */
+#include <sundials/sundials_types.h>    /* definitions of sunrealtype, sunbooleantype */
 
 #include <mpi.h>                       /* MPI constants and types */
 
@@ -67,27 +67,27 @@
 /* Problem Constants */
 
 #define NVARS        2                    /* number of species         */
-#define KH           RCONST(4.0e-6)       /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)        /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)       /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
-
-#define T0           RCONST(0.0)          /* initial time */
+#define KH           SUN_RCONST(4.0e-6)       /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)        /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)       /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)     /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
+
+#define T0           SUN_RCONST(0.0)          /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
-#define XMIN         RCONST(0.0)          /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
+#define XMIN         SUN_RCONST(0.0)          /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
 
 #define NPEX         2              /* no. PEs in x direction of PE array */
 #define NPEY         2              /* no. PEs in y direction of PE array */
@@ -100,8 +100,8 @@
                                     /* Spatial mesh is MX by MY */
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 
@@ -111,7 +111,7 @@
 /* IJth is defined in order to write code which indexes into dense
    matrices with a (row,column) pair, where 1 <= row,column <= NVARS.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NVARS. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -125,14 +125,14 @@
 
 typedef struct {
 
-  realtype q4, om, dx, dy, hdco, haco, vdco;
-  realtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype uext[NVARS*(MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmxsub2;
   MPI_Comm comm;
 
   /* For preconditioner */
-  realtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB], **Jbd[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
 
 } *UserData;
@@ -143,36 +143,36 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector u, UserData data);
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t);
+                        N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[]);
+                  sunrealtype udata[]);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[]);
+		      sunrealtype uext[], sunrealtype buffer[]);
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[]);
-static void ucomm(realtype t, N_Vector u, UserData data);
-static void fcalc(realtype t, realtype udata[], realtype dudata[],
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[]);
+static void ucomm(sunrealtype t, N_Vector u, UserData data);
+static void fcalc(sunrealtype t, sunrealtype udata[], sunrealtype dudata[],
                   UserData data);
 
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
-                  N_Vector r, N_Vector z, realtype gamma,
-                  realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
+                  N_Vector r, N_Vector z, sunrealtype gamma,
+                  sunrealtype delta, int lr, void *user_data);
 
 
 /* Private function to check function return values */
@@ -185,7 +185,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -306,11 +306,11 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 
   /* Set problem constants */
   data->om = PI/HALFDAY;
-  data->dx = (XMAX-XMIN)/((realtype)(MX-1));
-  data->dy = (YMAX-YMIN)/((realtype)(MY-1));
+  data->dx = (XMAX-XMIN)/((sunrealtype)(MX-1));
+  data->dy = (YMAX-YMIN)/((sunrealtype)(MY-1));
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
-  data->vdco = (RCONST(1.0)/SQR(data->dy))*KV0;
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
+  data->vdco = (SUN_RCONST(1.0)/SQR(data->dy))*KV0;
 
   /* Set machine-related constants */
   data->comm = comm;
@@ -359,8 +359,8 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 {
   int isubx, isuby, lx, ly, jx, jy;
   sunindextype offset;
-  realtype dx, dy, x, y, cx, cy, xmid, ymid;
-  realtype *udata;
+  sunrealtype dx, dy, x, y, cx, cy, xmid, ymid;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u */
   udata = N_VGetArrayPointer(u);
@@ -373,18 +373,18 @@ static void SetInitialProfiles(N_Vector u, UserData data)
   Here lx and ly are local mesh point indices on the local subgrid,
   and jx and jy are the global mesh point indices. */
   offset = 0;
-  xmid = RCONST(0.5)*(XMIN + XMAX);
-  ymid = RCONST(0.5)*(YMIN + YMAX);
+  xmid = SUN_RCONST(0.5)*(XMIN + XMAX);
+  ymid = SUN_RCONST(0.5)*(YMIN + YMAX);
   for (ly = 0; ly < MYSUB; ly++) {
     jy = ly + isuby*MYSUB;
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - ymid));
-    cy = RCONST(1.0) - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - ymid));
+    cy = SUN_RCONST(1.0) - cy + SUN_RCONST(0.5)*SQR(cy);
     for (lx = 0; lx < MXSUB; lx++) {
       jx = lx + isubx*MXSUB;
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - xmid));
-      cx = RCONST(1.0) - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - xmid));
+      cx = SUN_RCONST(1.0) - cx + SUN_RCONST(0.5)*SQR(cx);
       udata[offset  ] = C1_SCALE*cx*cy;
       udata[offset+1] = C2_SCALE*cx*cy;
       offset = offset + 2;
@@ -395,10 +395,10 @@ static void SetInitialProfiles(N_Vector u, UserData data)
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
 static void PrintOutput(void *cvode_mem, int my_pe, MPI_Comm comm,
-                        N_Vector u, realtype t)
+                        N_Vector u, sunrealtype t)
 {
   int qu, retval;
-  realtype hu, *udata, tempu[2];
+  sunrealtype hu, *udata, tempu[2];
   int npelast;
   long int  nst;
   sunindextype i0, i1;
@@ -504,11 +504,11 @@ static void PrintFinalStats(void *cvode_mem)
 static void BSend(MPI_Comm comm,
                   int my_pe, int isubx, int isuby,
                   sunindextype dsizex, sunindextype dsizey,
-                  realtype udata[])
+                  sunrealtype udata[])
 {
   int i, ly;
   sunindextype offsetu, offsetbuf;
-  realtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
+  sunrealtype bufleft[NVARS*MYSUB], bufright[NVARS*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -545,7 +545,7 @@ static void BSend(MPI_Comm comm,
 
 /* Routine to start receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
@@ -553,11 +553,11 @@ static void BSend(MPI_Comm comm,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[],
                       int my_pe, int isubx, int isuby,
 		      sunindextype dsizex, sunindextype dsizey,
-		      realtype uext[], realtype buffer[])
+		      sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of uext */
   if (isuby != 0)
@@ -586,19 +586,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[],
 
 /* Routine to finish receiving boundary data from neighboring PEs.
    Notes:
-   1) buffer should be able to hold 2*NVARS*MYSUB realtype entries, should be
+   1) buffer should be able to hold 2*NVARS*MYSUB sunrealtype entries, should be
    passed to both the BRecvPost and BRecvWait functions, and should not
    be manipulated between the two calls.
    2) request should have 4 entries, and should be passed in both calls also. */
 
 static void BRecvWait(MPI_Request request[],
                       int isubx, int isuby,
-                      sunindextype dsizex, realtype uext[],
-                      realtype buffer[])
+                      sunindextype dsizex, sunrealtype uext[],
+                      sunrealtype buffer[])
 {
   int i, ly;
   sunindextype dsizex2, offsetue, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NVARS*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NVARS;
@@ -641,10 +641,10 @@ static void BRecvWait(MPI_Request request[],
 /* ucomm routine.  This routine performs all communication
    between processors of data needed to calculate f. */
 
-static void ucomm(realtype t, N_Vector u, UserData data)
+static void ucomm(sunrealtype t, N_Vector u, UserData data)
 {
 
-  realtype *udata, *uext, buffer[2*NVARS*MYSUB];
+  sunrealtype *udata, *uext, buffer[2*NVARS*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby;
   sunindextype nvmxsub, nvmysub;
@@ -673,14 +673,14 @@ static void ucomm(realtype t, N_Vector u, UserData data)
    between processors of data needed to calculate f has already been done,
    and this data is in the work array uext. */
 
-static void fcalc(realtype t, realtype udata[],
-                  realtype dudata[], UserData data)
+static void fcalc(sunrealtype t, sunrealtype udata[],
+                  sunrealtype dudata[], UserData data)
 {
-  realtype *uext;
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *uext;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int i, lx, ly, jy;
   int isubx, isuby;
   sunindextype nvmxsub, nvmxsub2, offsetu, offsetue;
@@ -741,12 +741,12 @@ static void fcalc(realtype t, realtype udata[],
   /* Set diurnal rate coefficients as functions of t, and save q4 in
   data block for use by preconditioner evaluation routine */
   s = sin((data->om)*t);
-  if (s > RCONST(0.0)) {
+  if (s > SUN_RCONST(0.0)) {
     q3 = exp(-A3/s);
     q4coef = exp(-A4/s);
   } else {
-    q3 = RCONST(0.0);
-    q4coef = RCONST(0.0);
+    q3 = SUN_RCONST(0.0);
+    q4coef = SUN_RCONST(0.0);
   }
   data->q4 = q4coef;
 
@@ -756,10 +756,10 @@ static void fcalc(realtype t, realtype udata[],
     jy = ly + isuby*MYSUB;
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     for (lx = 0; lx < MXSUB; lx++) {
 
       /* Extract c1 and c2, and set kinetic rate terms */
@@ -770,7 +770,7 @@ static void fcalc(realtype t, realtype udata[],
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms */
@@ -786,8 +786,8 @@ static void fcalc(realtype t, realtype udata[],
       c2lt = uext[offsetue-1];
       c1rt = uext[offsetue+2];
       c2rt = uext[offsetue+3];
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
@@ -805,9 +805,9 @@ static void fcalc(realtype t, realtype udata[],
 /* f routine.  Evaluate f(t,y).  First call ucomm to do communication of
    subgrid boundary data into uext.  Then calculate f by a call to fcalc. */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype *udata, *dudata;
+  sunrealtype *udata, *dudata;
   UserData data;
 
   udata = N_VGetArrayPointer(u);
@@ -824,16 +824,16 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 }
 
 /* Preconditioner setup routine. Generate and preprocess P. */
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MYSUB], **(*Jbd)[MYSUB];
   sunindextype nvmxsub, offset;
   sunindextype *(*pivot)[MYSUB], retval;
   int lx, ly, jy, isuby;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, pointer to u's data,
@@ -871,11 +871,11 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
      computed on the last f call).  Load into P. */
     for (ly = 0; ly < MYSUB; ly++) {
       jy = ly + isuby*MYSUB;
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
-      diag = -(cydn + cyup + RCONST(2.0)*hordco);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
+      diag = -(cydn + cyup + SUN_RCONST(2.0)*hordco);
       for (lx = 0; lx < MXSUB; lx++) {
         offset = lx*NVARS + ly*nvmxsub;
         c1 = udata[offset];
@@ -912,15 +912,15 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
 }
 
 /* Preconditioner solve routine */
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
-                  N_Vector r, N_Vector z, realtype gamma,
-                  realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
+                  N_Vector r, N_Vector z, sunrealtype gamma,
+                  sunrealtype delta, int lr, void *user_data)
 {
-  realtype **(*P)[MYSUB];
+  sunrealtype **(*P)[MYSUB];
   sunindextype nvmxsub;
   sunindextype *(*pivot)[MYSUB];
   int lx, ly;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data */
@@ -931,7 +931,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
   /* Solve the block-diagonal system Px = r using LU factors stored
      in P and pivot data in pivot, and return the solution in z.
      First copy vector r to z. */
-  N_VScale(RCONST(1.0), r, z);
+  N_VScale(SUN_RCONST(1.0), r, z);
 
   nvmxsub = data->nvmxsub;
   zdata = N_VGetArrayPointer(z);
diff --git a/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c b/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c
index f5da23b9c3..0efcaabd46 100644
--- a/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c
+++ b/examples/cvodes/serial/cvsAdvDiff_ASAi_bnd.c
@@ -55,28 +55,28 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 #include <sundials/sundials_math.h>    /* definition of SUNRabs and SUNRexp    */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)   /* domain boundaries             */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)   /* domain boundaries             */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    40            /* mesh dimensions               */
 #define MY    20
 #define NEQ   MX*MY         /* number of equations           */
-#define ATOL  RCONST(1.e-5)
-#define RTOLB RCONST(1.e-6)
-#define T0    RCONST(0.0)   /* initial time                  */
-#define T1    RCONST(0.1)   /* first output time             */
-#define DTOUT RCONST(0.1)   /* output time increment         */
+#define ATOL  SUN_RCONST(1.e-5)
+#define RTOLB SUN_RCONST(1.e-6)
+#define T0    SUN_RCONST(0.0)   /* initial time                  */
+#define T1    SUN_RCONST(0.1)   /* first output time             */
+#define DTOUT SUN_RCONST(0.1)   /* output time increment         */
 #define NOUT  10            /* number of output times        */
-#define TOUT  RCONST(1.0)   /* final time                    */
+#define TOUT  SUN_RCONST(1.0)   /* final time                    */
 #define NSTEP 50            /* check point saved every NSTEP */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 /* User-defined vector access macro IJth */
 
@@ -95,19 +95,19 @@
    contains grid constants */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int fB(realtype tB, N_Vector u, N_Vector uB, N_Vector uBdot, void *user_dataB);
+static int fB(sunrealtype tB, N_Vector u, N_Vector uB, N_Vector uBdot, void *user_dataB);
 
-static int JacB(realtype tB, N_Vector u, N_Vector uB, N_Vector fuB, SUNMatrix JB,
+static int JacB(sunrealtype tB, N_Vector u, N_Vector uB, N_Vector fuB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
 /* Prototypes of private functions */
@@ -131,12 +131,12 @@ int main(int argc, char *argv[])
   SUNMatrix A, AB;
   SUNLinearSolver LS, LSB;
 
-  realtype dx, dy, reltol, abstol, t;
+  sunrealtype dx, dy, reltol, abstol, t;
   N_Vector u;
 
   int indexB;
 
-  realtype reltolB, abstolB;
+  sunrealtype reltolB, abstolB;
   N_Vector uB;
 
   int retval, ncheck;
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
   dx = data->dx = XMAX/(MX+1);
   dy = data->dy = YMAX/(MY+1);
   data->hdcoef = ONE/(dx*dx);
-  data->hacoef = RCONST(1.5)/(TWO*dx);
+  data->hacoef = SUN_RCONST(1.5)/(TWO*dx);
   data->vdcoef = ONE/(dy*dy);
 
   /* Set the tolerances for the forward integration */
@@ -294,10 +294,10 @@ int main(int argc, char *argv[])
  * f routine. right-hand side of forward ODE.
  */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   int i, j;
   UserData data;
 
@@ -341,11 +341,11 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
  * Jac function. Jacobian of forward ODE.
  */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   int i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -385,14 +385,14 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
  * fB function. Right-hand side of backward ODE.
  */
 
-static int fB(realtype tB, N_Vector u, N_Vector uB, N_Vector uBdot,
+static int fB(sunrealtype tB, N_Vector u, N_Vector uB, N_Vector uBdot,
               void *user_dataB)
 {
   UserData data;
-  realtype *uBdata, *duBdata;
-  realtype hordc, horac, verdc;
-  realtype uBij, uBdn, uBup, uBlt, uBrt;
-  realtype hdiffB, hadvB, vdiffB;
+  sunrealtype *uBdata, *duBdata;
+  sunrealtype hordc, horac, verdc;
+  sunrealtype uBij, uBdn, uBup, uBlt, uBrt;
+  sunrealtype hdiffB, hadvB, vdiffB;
   int i, j;
 
   uBdata = N_VGetArrayPointer(uB);
@@ -435,11 +435,11 @@ static int fB(realtype tB, N_Vector u, N_Vector uB, N_Vector uBdot,
  * JacB function. Jacobian of backward ODE
  */
 
-static int JacB(realtype tB, N_Vector u, N_Vector uB, N_Vector fuB, SUNMatrix JB,
+static int JacB(sunrealtype tB, N_Vector u, N_Vector uB, N_Vector fuB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
   int i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /* The Jacobian of the adjoint system is: JB = -J^T */
@@ -480,8 +480,8 @@ static int JacB(realtype tB, N_Vector u, N_Vector uB, N_Vector fuB, SUNMatrix JB
 static void SetIC(N_Vector u, UserData data)
 {
   int i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   /* Extract needed constants from data */
 
@@ -498,7 +498,7 @@ static void SetIC(N_Vector u, UserData data)
     y = j*dy;
     for (i=1; i <= MX; i++) {
       x = i*dx;
-      IJth(udata,i,j) = x*(XMAX - x)*y*(YMAX - y)*SUNRexp(RCONST(5.0)*x*y);
+      IJth(udata,i,j) = x*(XMAX - x)*y*(YMAX - y)*SUNRexp(SUN_RCONST(5.0)*x*y);
     }
   }
 
@@ -510,7 +510,7 @@ static void SetIC(N_Vector u, UserData data)
 
 static void PrintOutput(N_Vector uB, UserData data)
 {
-  realtype *uBdata, uBij, uBmax, x, y, dx, dy;
+  sunrealtype *uBdata, uBij, uBmax, x, y, dx, dy;
   int i, j;
 
   x = y = ZERO;
diff --git a/examples/cvodes/serial/cvsAdvDiff_FSA_non.c b/examples/cvodes/serial/cvsAdvDiff_FSA_non.c
index 7d3d5a6207..7e084b26e7 100644
--- a/examples/cvodes/serial/cvsAdvDiff_FSA_non.c
+++ b/examples/cvodes/serial/cvsAdvDiff_FSA_non.c
@@ -60,43 +60,43 @@
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
 
 /* Problem Constants */
-#define XMAX  RCONST(2.0)   /* domain boundary           */
+#define XMAX  SUN_RCONST(2.0)   /* domain boundary           */
 #define MX    10            /* mesh dimension            */
 #define NEQ   MX            /* number of equations       */
-#define ATOL  RCONST(1.e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)   /* initial time              */
-#define T1    RCONST(0.5)   /* first output time         */
-#define DTOUT RCONST(0.5)   /* output time increment     */
+#define ATOL  SUN_RCONST(1.e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)   /* initial time              */
+#define T1    SUN_RCONST(0.5)   /* first output time         */
+#define DTOUT SUN_RCONST(0.5)   /* output time increment     */
 #define NOUT  10            /* number of output times    */
 
 #define NP    2
 #define NS    2
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Type : UserData
    contains problem parameters, grid constants, work array. */
 
 typedef struct {
-  realtype *p;
-  realtype dx;
+  sunrealtype *p;
+  sunrealtype dx;
 } *UserData;
 
 /* Functions Called by the CVODES Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /* Private Helper Functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-			booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+			sunbooleantype *err_con);
 static void WrongArgs(char *name);
-static void SetIC(N_Vector u, realtype dx);
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u);
+static void SetIC(N_Vector u, sunrealtype dx);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u);
 static void PrintOutputS(N_Vector *uS);
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth);
 
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -110,14 +110,14 @@ int main(int argc, char *argv[])
 {
   void *cvode_mem;
   UserData data;
-  realtype dx, reltol, abstol, t, tout;
+  sunrealtype dx, reltol, abstol, t, tout;
   N_Vector u;
   int iout, retval;
 
-  realtype *pbar;
+  sunrealtype *pbar;
   int is, *plist;
   N_Vector *uS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   SUNNonlinearSolver NLS, NLSsens;
@@ -142,10 +142,10 @@ int main(int argc, char *argv[])
   /* Set user data */
   data = (UserData) malloc(sizeof *data); /* Allocate data memory */
   if(check_retval((void *)data, "malloc", 2)) return(1);
-  data->p = (realtype *) malloc(NP * sizeof(realtype));
-  dx = data->dx = XMAX/((realtype)(MX+1));
-  data->p[0] = RCONST(1.0);
-  data->p[1] = RCONST(0.5);
+  data->p = (sunrealtype *) malloc(NP * sizeof(sunrealtype));
+  dx = data->dx = XMAX/((sunrealtype)(MX+1));
+  data->p[0] = SUN_RCONST(1.0);
+  data->p[1] = SUN_RCONST(0.5);
 
   /* Allocate and set initial states */
   u = N_VNew_Serial(NEQ, sunctx);
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
     if(check_retval((void *)plist, "malloc", 2)) return(1);
     for(is=0; is<NS; is++) plist[is] = is;
 
-    pbar  = (realtype *) malloc(NS * sizeof(realtype));
+    pbar  = (sunrealtype *) malloc(NS * sizeof(sunrealtype));
     if(check_retval((void *)pbar, "malloc", 2)) return(1);
     for(is=0; is<NS; is++) pbar[is] = data->p[plist[is]];
 
@@ -293,11 +293,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,u).
  */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype ui, ult, urt, hordc, horac, hdiff, hadv;
-  realtype dx;
-  realtype *udata, *dudata;
+  sunrealtype ui, ult, urt, hordc, horac, hdiff, hadv;
+  sunrealtype dx;
+  sunrealtype *udata, *dudata;
   int i;
   UserData data;
 
@@ -308,7 +308,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
   data = (UserData) user_data;
   dx    = data->dx;
   hordc = data->p[0]/(dx*dx);
-  horac = data->p[1]/(RCONST(2.0)*dx);
+  horac = data->p[1]/(SUN_RCONST(2.0)*dx);
 
   /* Loop over all grid points. */
   for (i=0; i<NEQ; i++) {
@@ -325,7 +325,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
       urt = ZERO;
 
     /* Set diffusion and advection terms and load into udot */
-    hdiff = hordc*(ult - RCONST(2.0)*ui + urt);
+    hdiff = hordc*(ult - SUN_RCONST(2.0)*ui + urt);
     hadv = horac*(urt - ult);
     dudata[i] = hdiff + hadv;
   }
@@ -344,7 +344,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -396,11 +396,11 @@ static void WrongArgs(char *name)
  * Set initial conditions in u vector.
  */
 
-static void SetIC(N_Vector u, realtype dx)
+static void SetIC(N_Vector u, sunrealtype dx)
 {
   int i;
-  realtype x;
-  realtype *udata;
+  sunrealtype x;
+  sunrealtype *udata;
 
   /* Set pointer to data array and get local length of u. */
   udata = N_VGetArrayPointer(u);
@@ -408,7 +408,7 @@ static void SetIC(N_Vector u, realtype dx)
   /* Load initial profile into u vector */
   for (i=0; i<NEQ; i++) {
     x = (i+1)*dx;
-    udata[i] = x*(XMAX - x)*SUNRexp(RCONST(2.0)*x);
+    udata[i] = x*(XMAX - x)*SUNRexp(SUN_RCONST(2.0)*x);
   }
 }
 
@@ -416,11 +416,11 @@ static void SetIC(N_Vector u, realtype dx)
  * Print current t, step count, order, stepsize, and max norm of solution
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu;
+  sunrealtype hu;
 
   retval = CVodeGetNumSteps(cvode_mem, &nst);
   check_retval(&retval, "CVodeGetNumSteps", 1);
@@ -478,8 +478,8 @@ static void PrintOutputS(N_Vector *uS)
  * Print some final statistics located in the CVODES memory
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth)
 {
   long int nst;
   long int nfe, nsetups, nni, ncfn, netf;
diff --git a/examples/cvodes/serial/cvsAdvDiff_bnd.c b/examples/cvodes/serial/cvsAdvDiff_bnd.c
index 9a611e3e2e..70dc04f305 100644
--- a/examples/cvodes/serial/cvsAdvDiff_bnd.c
+++ b/examples/cvodes/serial/cvsAdvDiff_bnd.c
@@ -44,27 +44,27 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 #include <sundials/sundials_math.h>    /* definition of SUNRabs and SUNRexp    */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -82,14 +82,14 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -98,8 +98,8 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /*
@@ -111,7 +111,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
 int main(void)
 {
   SUNContext sunctx;
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   void *cvode_mem;
@@ -216,10 +216,10 @@ int main(void)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   int i, j;
   UserData data;
 
@@ -261,11 +261,11 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunindextype i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -312,8 +312,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu, SUNMatrix J,
 static void SetIC(N_Vector u, UserData data)
 {
   int i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   /* Extract needed constants from data */
 
@@ -337,7 +337,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -358,7 +358,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvodes/serial/cvsAdvDiff_bndL.c b/examples/cvodes/serial/cvsAdvDiff_bndL.c
index f03b5bece2..eb3bdd5ac7 100644
--- a/examples/cvodes/serial/cvsAdvDiff_bndL.c
+++ b/examples/cvodes/serial/cvsAdvDiff_bndL.c
@@ -41,27 +41,27 @@
 #include <nvector/nvector_serial.h>          /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>        /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_lapackband.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>         /* definition of type realtype          */
+#include <sundials/sundials_types.h>         /* definition of type sunrealtype          */
 #include <sundials/sundials_math.h>          /* definition of ABS and EXP            */
 
 /* Problem Constants */
 
-#define XMAX  RCONST(2.0)    /* domain boundaries         */
-#define YMAX  RCONST(1.0)
+#define XMAX  SUN_RCONST(2.0)    /* domain boundaries         */
+#define YMAX  SUN_RCONST(1.0)
 #define MX    10             /* mesh dimensions           */
 #define MY    5
 #define NEQ   MX*MY          /* number of equations       */
-#define ATOL  RCONST(1.0e-5) /* scalar absolute tolerance */
-#define T0    RCONST(0.0)    /* initial time              */
-#define T1    RCONST(0.1)    /* first output time         */
-#define DTOUT RCONST(0.1)    /* output time increment     */
+#define ATOL  SUN_RCONST(1.0e-5) /* scalar absolute tolerance */
+#define T0    SUN_RCONST(0.0)    /* initial time              */
+#define T1    SUN_RCONST(0.1)    /* first output time         */
+#define DTOUT SUN_RCONST(0.1)    /* output time increment     */
 #define NOUT  10             /* number of output times    */
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FIVE RCONST(5.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FIVE SUN_RCONST(5.0)
 
 /* User-defined vector access macro IJth */
 
@@ -79,14 +79,14 @@
 /* Type : UserData (contains grid constants) */
 
 typedef struct {
-  realtype dx, dy, hdcoef, hacoef, vdcoef;
+  sunrealtype dx, dy, hdcoef, hacoef, vdcoef;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void SetIC(N_Vector u, UserData data);
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax);
-static void PrintOutput(realtype t, realtype umax, long int nst);
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax);
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -95,8 +95,8 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
@@ -109,7 +109,7 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 int main(void)
 {
   SUNContext sunctx;
-  realtype dx, dy, reltol, abstol, t, tout, umax;
+  sunrealtype dx, dy, reltol, abstol, t, tout, umax;
   N_Vector u;
   UserData data;
   SUNMatrix A;
@@ -215,10 +215,10 @@ int main(void)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u,N_Vector udot, void *user_data)
 {
-  realtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
-  realtype *udata, *dudata;
+  sunrealtype uij, udn, uup, ult, urt, hordc, horac, verdc, hdiff, hadv, vdiff;
+  sunrealtype *udata, *dudata;
   int i, j;
   UserData data;
 
@@ -260,12 +260,12 @@ static int f(realtype t, N_Vector u,N_Vector udot, void *user_data)
 
 /* Jacobian routine. Compute J(t,u). */
 
-static int Jac(realtype t, N_Vector u, N_Vector fu,
+static int Jac(sunrealtype t, N_Vector u, N_Vector fu,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   int i, j, k;
-  realtype *kthCol, hordc, horac, verdc;
+  sunrealtype *kthCol, hordc, horac, verdc;
   UserData data;
 
   /*
@@ -313,8 +313,8 @@ static int Jac(realtype t, N_Vector u, N_Vector fu,
 static void SetIC(N_Vector u, UserData data)
 {
   int i, j;
-  realtype x, y, dx, dy;
-  realtype *udata;
+  sunrealtype x, y, dx, dy;
+  sunrealtype *udata;
 
   /* Extract needed constants from data */
 
@@ -338,7 +338,7 @@ static void SetIC(N_Vector u, UserData data)
 
 /* Print first lines of output (problem description) */
 
-static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
+static void PrintHeader(sunrealtype reltol, sunrealtype abstol, sunrealtype umax)
 {
   printf("\n2-D Advection-Diffusion Equation\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -356,7 +356,7 @@ static void PrintHeader(realtype reltol, realtype abstol, realtype umax)
 
 /* Print current value */
 
-static void PrintOutput(realtype t, realtype umax, long int nst)
+static void PrintOutput(sunrealtype t, sunrealtype umax, long int nst)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %4.2Lf   max.norm(u) =%14.6Le   nst = %4ld\n", t, umax, nst);
diff --git a/examples/cvodes/serial/cvsAnalytic_mels.c b/examples/cvodes/serial/cvsAnalytic_mels.c
index b4bf5cbc48..e5b0e019da 100644
--- a/examples/cvodes/serial/cvsAnalytic_mels.c
+++ b/examples/cvodes/serial/cvsAnalytic_mels.c
@@ -33,7 +33,7 @@
 #include <math.h>
 #include <cvodes/cvodes.h>             /* prototypes for CVODE fcts., consts.  */
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -46,17 +46,17 @@
 #endif
 
 /* User-supplied functions called by CVode */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Custom linear solver data structure, accessor macros, and routines */
 static SUNLinearSolver MatrixEmbeddedLS(void *cvode_mem);
 static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S);
 static int MatrixEmbeddedLSSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol);
+                                 N_Vector b, sunrealtype tol);
 static int MatrixEmbeddedLSFree(SUNLinearSolver S);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -68,20 +68,20 @@ static SUNContext sunctx;
 int main()
 {
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(10.0);        /* final time */
-  realtype dTout = RCONST(1.0);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(10.0);        /* final time */
+  sunrealtype dTout = SUN_RCONST(1.0);      /* time between outputs */
   sunindextype NEQ = 1;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-6);  /* tolerances */
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  /* stiffness parameter */
 
   /* general problem variables */
   int retval;                     /* reusable error-checking flag */
   N_Vector y = NULL;              /* empty vector for storing solution */
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *cvode_mem = NULL;         /* empty CVode memory structure */
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nfe, nsetups, nje, nfeLS, nni, ncfn, netf;
 
   /* Initial diagnostics output */
@@ -97,7 +97,7 @@ int main()
   /* Initialize data structures */
   y = N_VNew_Serial(NEQ, sunctx);          /* Create serial vector for solution */
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return 1;
-  N_VConst(RCONST(0.0), y);        /* Specify initial condition */
+  N_VConst(SUN_RCONST(0.0), y);        /* Specify initial condition */
 
   /* Call CVodeCreate to create the solver memory and specify the
    * Backward Differentiation Formula */
@@ -193,14 +193,14 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype u = NV_Ith_S(y,0);                 /* access current solution value */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lamda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access current solution value */
 
   /* fill in the RHS function: "NV_Ith_S" accesses the 0th entry of ydot */
-  NV_Ith_S(ydot,0) = lamda*u + RCONST(1.0)/(RCONST(1.0)+t*t) - lamda*atan(t);
+  NV_Ith_S(ydot,0) = lamda*u + SUN_RCONST(1.0)/(SUN_RCONST(1.0)+t*t) - lamda*atan(t);
 
   return 0;                                   /* return with success */
 }
@@ -236,15 +236,15 @@ static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S)
 
 /* linear solve routine */
 static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol)
+                                 N_Vector b, sunrealtype tol)
 {
   /* temporary variables */
   int       retval;
   N_Vector  y, ypred, fn, zn1;
-  realtype  tcur, gamma, rl1;
+  sunrealtype  tcur, gamma, rl1;
   void      *user_data;
-  realtype  *rdata;
-  realtype  lamda;
+  sunrealtype  *rdata;
+  sunrealtype  lamda;
 
   /* retrieve implicit system data from CVode */
   retval = CVodeGetNonlinearSystemData(LS->content, &tcur, &ypred, &y, &fn,
@@ -253,7 +253,7 @@ static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
     return(-1);
 
   /* extract stiffness parameter from user_data */
-  rdata = (realtype *) user_data;
+  rdata = (sunrealtype *) user_data;
   lamda = rdata[0];
 
   /* perform linear solve: (1-gamma*lamda)*x = b */
@@ -312,18 +312,18 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;     /* answer pass (0) or fail (1) flag     */
-  realtype ans, err, ewt;  /* answer data, error, and error weight */
+  sunrealtype ans, err, ewt;  /* answer data, error, and error weight */
 
   /* compute solution error */
   ans = atan(t);
-  ewt = RCONST(1.0) / (rtol * fabs(ans) + atol);
+  ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol);
   err = ewt * fabs(NV_Ith_S(y,0) - ans);
 
   /* is the solution within the tolerances? */
-  passfail = (err < RCONST(1.0)) ? 0 : 1;
+  passfail = (err < SUN_RCONST(1.0)) ? 0 : 1;
 
   if (passfail) {
     fprintf(stdout, "\nSUNDIALS_WARNING: check_ans error=%"GSYM"\n\n", err);
diff --git a/examples/cvodes/serial/cvsDirectDemo_ls.c b/examples/cvodes/serial/cvsDirectDemo_ls.c
index 7f0e97858e..59d119b098 100644
--- a/examples/cvodes/serial/cvsDirectDemo_ls.c
+++ b/examples/cvodes/serial/cvsDirectDemo_ls.c
@@ -73,7 +73,7 @@
 #include <cvodes/cvodes_diag.h>                   /* access to CVDIAG linear solver               */
 #include "sunnonlinsol/sunnonlinsol_newton.h"     /* access to the newton SUNNonlinearSolver      */
 #include "sunnonlinsol/sunnonlinsol_fixedpoint.h" /* access to the fixed point SUNNonlinearSolver */
-#include <sundials/sundials_types.h>              /* definition of realtype                       */
+#include <sundials/sundials_types.h>              /* definition of sunrealtype                       */
 
 /* helpful macros */
 
@@ -83,38 +83,38 @@
 
 /* Shared Problem Constants */
 
-#define ATOL RCONST(1.0e-6)
-#define RTOL RCONST(0.0)
+#define ATOL SUN_RCONST(1.0e-6)
+#define RTOL SUN_RCONST(0.0)
 
-#define ZERO   RCONST(0.0)
-#define ONE    RCONST(1.0)
-#define TWO    RCONST(2.0)
-#define THIRTY RCONST(30.0)
+#define ZERO   SUN_RCONST(0.0)
+#define ONE    SUN_RCONST(1.0)
+#define TWO    SUN_RCONST(2.0)
+#define THIRTY SUN_RCONST(30.0)
 
 /* Problem #1 Constants */
 
 #define P1_NEQ        2
-#define P1_ETA        RCONST(3.0)
+#define P1_ETA        SUN_RCONST(3.0)
 #define P1_NOUT       4
-#define P1_T0         RCONST(0.0)
-#define P1_T1         RCONST(1.39283880203)
-#define P1_DTOUT      RCONST(2.214773875)
-#define P1_TOL_FACTOR RCONST(1.0e4)
+#define P1_T0         SUN_RCONST(0.0)
+#define P1_T1         SUN_RCONST(1.39283880203)
+#define P1_DTOUT      SUN_RCONST(2.214773875)
+#define P1_TOL_FACTOR SUN_RCONST(1.0e4)
 
 /* Problem #2 Constants */
 
 #define P2_MESHX      5
 #define P2_MESHY      5
 #define P2_NEQ        P2_MESHX*P2_MESHY
-#define P2_ALPH1      RCONST(1.0)
-#define P2_ALPH2      RCONST(1.0)
+#define P2_ALPH1      SUN_RCONST(1.0)
+#define P2_ALPH2      SUN_RCONST(1.0)
 #define P2_NOUT       5
 #define P2_ML         5
 #define P2_MU         0
-#define P2_T0         RCONST(0.0)
-#define P2_T1         RCONST(0.01)
-#define P2_TOUT_MULT  RCONST(10.0)
-#define P2_TOL_FACTOR RCONST(1.0e3)
+#define P2_T0         SUN_RCONST(0.0)
+#define P2_T1         SUN_RCONST(0.01)
+#define P2_TOUT_MULT  SUN_RCONST(10.0)
+#define P2_TOL_FACTOR SUN_RCONST(1.0e3)
 
 /* Linear Solver Options */
 
@@ -125,28 +125,28 @@ enum {FUNC, DENSE_USER, DENSE_DQ, DIAG, BAND_USER, BAND_DQ};
 static int  Problem1(void);
 static void PrintIntro1(void);
 static void PrintHeader1(void);
-static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype hu);
+static void PrintOutput1(sunrealtype t, sunrealtype y0, sunrealtype y1, int qu, sunrealtype hu);
 static int  Problem2(void);
 static void PrintIntro2(void);
 static void PrintHeader2(void);
-static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu);
-static realtype MaxError(N_Vector y, realtype t);
+static void PrintOutput2(sunrealtype t, sunrealtype erm, int qu, sunrealtype hu);
+static sunrealtype MaxError(N_Vector y, sunrealtype t);
 static int PrepareNextRun(SUNContext sunctx, void *cvode_mem, int lmm, int miter,
                           N_Vector y, SUNMatrix* A, sunindextype mu,
                           sunindextype ml, SUNLinearSolver* LS,
                           SUNNonlinearSolver* NLS);
-static void PrintErrOutput(realtype tol_factor);
-static void PrintFinalStats(void *cvode_mem, int miter, realtype ero);
+static void PrintErrOutput(sunrealtype tol_factor);
+static void PrintFinalStats(void *cvode_mem, int miter, sunrealtype ero);
 static void PrintErrInfo(int nerr);
 
 /* Functions Called by the Solver */
 
-static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f1(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac1(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+static int f2(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac2(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
@@ -168,16 +168,16 @@ int main(void)
 
 static int Problem1(void)
 {
-  realtype reltol=RTOL, abstol=ATOL, t, tout, ero, er;
+  sunrealtype reltol=RTOL, abstol=ATOL, t, tout, ero, er;
   int miter, retval, temp_retval, iout, nerr=0;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNNonlinearSolver NLS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int qu;
-  realtype hu;
+  sunrealtype hu;
   SUNContext sunctx;
 
   y = NULL;
@@ -346,7 +346,7 @@ static void PrintHeader1(void)
   return;
 }
 
-static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype hu)
+static void PrintOutput1(sunrealtype t, sunrealtype y0, sunrealtype y1, int qu, sunrealtype hu)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("%10.5Lf    %12.5Le   %12.5Le   %2d    %6.4Le\n", t, y0, y1, qu, hu);
@@ -359,9 +359,9 @@ static void PrintOutput1(realtype t, realtype y0, realtype y1, int qu, realtype
   return;
 }
 
-static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f1(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y0, y1;
+  sunrealtype y0, y1;
 
   y0 = NV_Ith_S(y,0);
   y1 = NV_Ith_S(y,1);
@@ -372,10 +372,10 @@ static int f1(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac1(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y0, y1;
+  sunrealtype y0, y1;
 
   y0 = NV_Ith_S(y,0);
   y1 = NV_Ith_S(y,1);
@@ -389,16 +389,16 @@ static int Jac1(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
 
 static int Problem2(void)
 {
-  realtype reltol=RTOL, abstol=ATOL, t, tout, er, erm, ero;
+  sunrealtype reltol=RTOL, abstol=ATOL, t, tout, er, erm, ero;
   int miter, retval, temp_retval, nerr=0;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNNonlinearSolver NLS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int qu, iout;
-  realtype hu;
+  sunrealtype hu;
   SUNContext sunctx;
 
   y = NULL;
@@ -571,7 +571,7 @@ static void PrintHeader2(void)
   return;
 }
 
-static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu)
+static void PrintOutput2(sunrealtype t, sunrealtype erm, int qu, sunrealtype hu)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("%10.3Lf  %12.4Le   %2d   %12.4Le\n", t, erm, qu, hu);
@@ -584,10 +584,10 @@ static void PrintOutput2(realtype t, realtype erm, int qu, realtype hu)
   return;
 }
 
-static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f2(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   sunindextype i, j, k;
-  realtype d, *ydata, *dydata;
+  sunrealtype d, *ydata, *dydata;
 
   ydata  = N_VGetArrayPointer(y);
   dydata = N_VGetArrayPointer(ydot);
@@ -612,11 +612,11 @@ static int f2(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac2(sunrealtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   int i, j, k;
-  realtype *kthCol;
+  sunrealtype *kthCol;
 
   /*
      The components of f(t,y) which depend on y    are
@@ -647,10 +647,10 @@ static int Jac2(realtype tn, N_Vector y, N_Vector fy, SUNMatrix J,
   return(0);
 }
 
-static realtype MaxError(N_Vector y, realtype t)
+static sunrealtype MaxError(N_Vector y, sunrealtype t)
 {
   sunindextype i, j, k;
-  realtype *ydata, er, ex=ZERO, yt, maxError=ZERO, ifact_inv, jfact_inv=ONE;
+  sunrealtype *ydata, er, ex=ZERO, yt, maxError=ZERO, ifact_inv, jfact_inv=ONE;
 
   if (t == ZERO) return(ZERO);
 
@@ -814,7 +814,7 @@ static int PrepareNextRun(SUNContext sunctx, void *cvode_mem, int lmm, int miter
   return(retval);
 }
 
-static void PrintErrOutput(realtype tol_factor)
+static void PrintErrOutput(sunrealtype tol_factor)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("\n\n Error exceeds %Lg * tolerance \n\n", tol_factor);
@@ -827,7 +827,7 @@ static void PrintErrOutput(realtype tol_factor)
   return;
 }
 
-static void PrintFinalStats(void *cvode_mem, int miter, realtype ero)
+static void PrintFinalStats(void *cvode_mem, int miter, sunrealtype ero)
 {
   long int lenrw, leniw, lenrwLS, leniwLS;
   long int nst, nfe, nsetups, nni, ncfn, netf, nje, nfeLS;
diff --git a/examples/cvodes/serial/cvsDiurnal_FSA_kry.c b/examples/cvodes/serial/cvsDiurnal_FSA_kry.c
index fb3f4c662b..384e490dac 100644
--- a/examples/cvodes/serial/cvsDiurnal_FSA_kry.c
+++ b/examples/cvodes/serial/cvsDiurnal_FSA_kry.c
@@ -61,7 +61,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -72,21 +72,21 @@
 /* Problem Constants */
 
 #define NUM_SPECIES  2                /* number of species */
-#define C1_SCALE     RCONST(1.0e6)    /* coefficients in initial profiles */
-#define C2_SCALE     RCONST(1.0e12)
+#define C1_SCALE     SUN_RCONST(1.0e6)    /* coefficients in initial profiles */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
-#define T0           RCONST(0.0)      /* initial time */
+#define T0           SUN_RCONST(0.0)      /* initial time */
 #define NOUT         12               /* number of output times */
-#define TWOHR        RCONST(7200.0)   /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)   /* number of seconds in a half day */
-#define PI           RCONST(3.1415926535898)   /* pi */
+#define TWOHR        SUN_RCONST(7200.0)   /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)   /* number of seconds in a half day */
+#define PI           SUN_RCONST(3.1415926535898)   /* pi */
 
-#define XMIN         RCONST(0.0)      /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define ZMIN         RCONST(30.0)     /* grid boundaries in z  */
-#define ZMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)     /* grid midpoints in x,z */
-#define ZMID         RCONST(40.0)
+#define XMIN         SUN_RCONST(0.0)      /* grid boundaries in x  */
+#define XMAX         SUN_RCONST(20.0)
+#define ZMIN         SUN_RCONST(30.0)     /* grid boundaries in z  */
+#define ZMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)     /* grid midpoints in x,z */
+#define ZMID         SUN_RCONST(40.0)
 
 #define MX           15               /* MX = number of x mesh points */
 #define MZ           15               /* MZ = number of z mesh points */
@@ -94,8 +94,8 @@
 #define MM           (MX*MZ)          /* MM = MX*MZ */
 
 /* CVodeInit Constants */
-#define RTOL         RCONST(1.0e-5)   /* scalar relative tolerance */
-#define FLOOR        RCONST(100.0)    /* value of C1 or C2 at which tolerances */
+#define RTOL         SUN_RCONST(1.0e-5)   /* scalar relative tolerance */
+#define FLOOR        SUN_RCONST(100.0)    /* value of C1 or C2 at which tolerances */
                                       /* change from relative to absolute      */
 #define ATOL         (RTOL*FLOOR)     /* scalar absolute tolerance */
 #define NEQ          (NUM_SPECIES*MM) /* NEQ = number of equations */
@@ -104,8 +104,8 @@
 #define NP           8
 #define NS           2
 
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
 
 /* User-defined vector and matrix accessor macros: IJKth, IJth */
 
@@ -122,7 +122,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -135,38 +135,38 @@
    problem parameters, and problem constants     */
 
 typedef struct {
-  realtype *p;
-  realtype **P[MX][MZ], **Jbd[MX][MZ];
+  sunrealtype *p;
+  sunrealtype **P[MX][MZ], **Jbd[MX][MZ];
   sunindextype *pivot[MX][MZ];
-  realtype q4, om, dx, dz, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dz, hdco, haco, vdco;
 } *UserData;
 
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype tn, N_Vector y, N_Vector fy, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector y, N_Vector fy, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector y, N_Vector fy,
+static int PSolve(sunrealtype tn, N_Vector y, N_Vector fy,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con);
 static void WrongArgs(char *name);
 static UserData AllocUserData(void);
 static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
-static void SetInitialProfiles(N_Vector y, realtype dx, realtype dz);
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector y);
+static void SetInitialProfiles(N_Vector y, sunrealtype dx, sunrealtype dz);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector y);
 static void PrintOutputS(N_Vector *uS);
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -181,14 +181,14 @@ int main(int argc, char *argv[])
   void *cvode_mem;
   SUNLinearSolver LS;
   UserData data;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector y;
   int iout, retval;
 
-  realtype *pbar;
+  sunrealtype *pbar;
   int is, *plist;
   N_Vector *uS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   pbar = NULL;
@@ -259,7 +259,7 @@ int main(int argc, char *argv[])
     if(check_retval((void *)plist, "malloc", 2)) return(1);
     for(is=0; is<NS; is++) plist[is] = is;
 
-    pbar = (realtype *) malloc(NS * sizeof(realtype));
+    pbar = (sunrealtype *) malloc(NS * sizeof(sunrealtype));
     if(check_retval((void *)pbar, "malloc", 2)) return(1);
     for(is=0; is<NS; is++) pbar[is] = data->p[plist[is]];
 
@@ -347,16 +347,16 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, czdn, czup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, zdn, zup;
-  realtype q4coef, delz, verdco, hordco, horaco;
-  realtype *ydata, *dydata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, czdn, czup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, zdn, zup;
+  sunrealtype q4coef, delz, verdco, hordco, horaco;
+  sunrealtype *ydata, *dydata;
   int jx, jz, idn, iup, ileft, iright;
   UserData data;
-  realtype Q1, Q2, C3, A3, A4;
+  sunrealtype Q1, Q2, C3, A3, A4;
 
   data = (UserData) user_data;
   ydata = N_VGetArrayPointer(y);
@@ -395,10 +395,10 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
     /* Set vertical diffusion coefficients at jz +- 1/2 */
 
-    zdn = ZMIN + (jz - RCONST(0.5))*delz;
+    zdn = ZMIN + (jz - SUN_RCONST(0.5))*delz;
     zup = zdn + delz;
-    czdn = verdco*exp(RCONST(0.2)*zdn);
-    czup = verdco*exp(RCONST(0.2)*zup);
+    czdn = verdco*exp(SUN_RCONST(0.2)*zdn);
+    czup = verdco*exp(SUN_RCONST(0.2)*zup);
     idn = (jz == 0) ? 1 : -1;
     iup = (jz == MZ-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
@@ -411,7 +411,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
       qq2 = Q2*c1*c2;
       qq3 = q3*C3;
       qq4 = q4coef*c2;
-      rkin1 = -qq1 - qq2 + RCONST(2.0)*qq3 + qq4;
+      rkin1 = -qq1 - qq2 + SUN_RCONST(2.0)*qq3 + qq4;
       rkin2 = qq1 - qq2 - qq4;
 
       /* Set vertical diffusion terms. */
@@ -431,8 +431,8 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
       c2lt = IJKth(ydata,2,jx+ileft,jz);
       c1rt = IJKth(ydata,1,jx+iright,jz);
       c2rt = IJKth(ydata,2,jx+iright,jz);
-      hord1 = hordco*(c1rt - RCONST(2.0)*c1 + c1lt);
-      hord2 = hordco*(c2rt - RCONST(2.0)*c2 + c2lt);
+      hord1 = hordco*(c1rt - SUN_RCONST(2.0)*c1 + c1lt);
+      hord2 = hordco*(c2rt - SUN_RCONST(2.0)*c2 + c2lt);
       horad1 = horaco*(c1rt - c1lt);
       horad2 = horaco*(c2rt - c2lt);
 
@@ -450,17 +450,17 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Preconditioner setup routine. Generate and preprocess P.
  */
 
-static int Precond(realtype tn, N_Vector y, N_Vector fy, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector y, N_Vector fy, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, czdn, czup, diag, zdn, zup, q4coef, delz, verdco, hordco;
-  realtype **(*P)[MZ], **(*Jbd)[MZ];
+  sunrealtype c1, c2, czdn, czup, diag, zdn, zup, q4coef, delz, verdco, hordco;
+  sunrealtype **(*P)[MZ], **(*Jbd)[MZ];
   sunindextype retval;
   sunindextype *(*pivot)[MZ];
   int jx, jz;
-  realtype *ydata, **a, **j;
+  sunrealtype *ydata, **a, **j;
   UserData data;
-  realtype Q1, Q2, C3;
+  sunrealtype Q1, Q2, C3;
 
   /* Make local copies of pointers in user_data, and of pointer to y's data */
   data = (UserData) user_data;
@@ -500,11 +500,11 @@ static int Precond(realtype tn, N_Vector y, N_Vector fy, booleantype jok,
      computed on the last f call).  Load into P. */
 
     for (jz=0; jz < MZ; jz++) {
-      zdn = ZMIN + (jz - RCONST(0.5))*delz;
+      zdn = ZMIN + (jz - SUN_RCONST(0.5))*delz;
       zup = zdn + delz;
-      czdn = verdco*exp(RCONST(0.2)*zdn);
-      czup = verdco*exp(RCONST(0.2)*zup);
-      diag = -(czdn + czup + RCONST(2.0)*hordco);
+      czdn = verdco*exp(SUN_RCONST(0.2)*zdn);
+      czup = verdco*exp(SUN_RCONST(0.2)*zup);
+      diag = -(czdn + czup + SUN_RCONST(2.0)*hordco);
       for (jx=0; jx < MX; jx++) {
         c1 = IJKth(ydata,1,jx,jz);
         c2 = IJKth(ydata,2,jx,jz);
@@ -545,15 +545,15 @@ static int Precond(realtype tn, N_Vector y, N_Vector fy, booleantype jok,
  * Preconditioner solve routine
  */
 
-static int PSolve(realtype tn, N_Vector y, N_Vector fy,
+static int PSolve(sunrealtype tn, N_Vector y, N_Vector fy,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MZ];
+  sunrealtype **(*P)[MZ];
   sunindextype *(*pivot)[MZ];
   int jx, jz;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data. */
@@ -589,7 +589,7 @@ static int PSolve(realtype tn, N_Vector y, N_Vector fy,
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -656,7 +656,7 @@ static UserData AllocUserData(void)
     }
   }
 
-  data->p = (realtype *) malloc(NP*sizeof(realtype));
+  data->p = (sunrealtype *) malloc(NP*sizeof(sunrealtype));
 
   return(data);
 }
@@ -667,23 +667,23 @@ static UserData AllocUserData(void)
 
 static void InitUserData(UserData data)
 {
-  realtype Q1, Q2, C3, A3, A4, KH, VEL, KV0;
+  sunrealtype Q1, Q2, C3, A3, A4, KH, VEL, KV0;
 
   /* Set problem parameters */
-  Q1 = RCONST(1.63e-16); /* Q1  coefficients q1, q2, c3             */
-  Q2 = RCONST(4.66e-16); /* Q2                                      */
-  C3 = RCONST(3.7e16);   /* C3                                      */
-  A3 = RCONST(22.62);    /* A3  coefficient in expression for q3(t) */
-  A4 = RCONST(7.601);    /* A4  coefficient in expression for q4(t) */
-  KH = RCONST(4.0e-6);   /* KH  horizontal diffusivity Kh           */
-  VEL = RCONST(0.001);   /* VEL advection velocity V                */
-  KV0 = RCONST(1.0e-8);  /* KV0 coefficient in Kv(z)                */
+  Q1 = SUN_RCONST(1.63e-16); /* Q1  coefficients q1, q2, c3             */
+  Q2 = SUN_RCONST(4.66e-16); /* Q2                                      */
+  C3 = SUN_RCONST(3.7e16);   /* C3                                      */
+  A3 = SUN_RCONST(22.62);    /* A3  coefficient in expression for q3(t) */
+  A4 = SUN_RCONST(7.601);    /* A4  coefficient in expression for q4(t) */
+  KH = SUN_RCONST(4.0e-6);   /* KH  horizontal diffusivity Kh           */
+  VEL = SUN_RCONST(0.001);   /* VEL advection velocity V                */
+  KV0 = SUN_RCONST(1.0e-8);  /* KV0 coefficient in Kv(z)                */
 
   data->om = PI/HALFDAY;
   data->dx = (XMAX-XMIN)/(MX-1);
   data->dz = (ZMAX-ZMIN)/(MZ-1);
   data->hdco = KH/SQR(data->dx);
-  data->haco = VEL/(RCONST(2.0)*data->dx);
+  data->haco = VEL/(SUN_RCONST(2.0)*data->dx);
   data->vdco = (ONE/SQR(data->dz))*KV0;
 
   data->p[0] = Q1;
@@ -721,11 +721,11 @@ static void FreeUserData(UserData data)
  * Set initial conditions in y
  */
 
-static void SetInitialProfiles(N_Vector y, realtype dx, realtype dz)
+static void SetInitialProfiles(N_Vector y, sunrealtype dx, sunrealtype dz)
 {
   int jx, jz;
-  realtype x, z, cx, cz;
-  realtype *ydata;
+  sunrealtype x, z, cx, cz;
+  sunrealtype *ydata;
 
   /* Set pointer to data array in vector y. */
 
@@ -735,12 +735,12 @@ static void SetInitialProfiles(N_Vector y, realtype dx, realtype dz)
 
   for (jz=0; jz < MZ; jz++) {
     z = ZMIN + jz*dz;
-    cz = SQR(RCONST(0.1)*(z - ZMID));
-    cz = ONE - cz + RCONST(0.5)*SQR(cz);
+    cz = SQR(SUN_RCONST(0.1)*(z - ZMID));
+    cz = ONE - cz + SUN_RCONST(0.5)*SQR(cz);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(ydata,1,jx,jz) = C1_SCALE*cx*cz;
       IJKth(ydata,2,jx,jz) = C2_SCALE*cx*cz;
     }
@@ -751,12 +751,12 @@ static void SetInitialProfiles(N_Vector y, realtype dx, realtype dz)
  * Print current t, step count, order, stepsize, and sampled c1,c2 values
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector y)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector y)
 {
   long int nst;
   int qu, retval;
-  realtype hu;
-  realtype *ydata;
+  sunrealtype hu;
+  sunrealtype *ydata;
 
   ydata = N_VGetArrayPointer(y);
 
@@ -799,7 +799,7 @@ static void PrintOutput(void *cvode_mem, realtype t, N_Vector y)
 
 static void PrintOutputS(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
 
@@ -846,8 +846,8 @@ static void PrintOutputS(N_Vector *uS)
  * Print final statistics contained in iopt
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi,
-                            booleantype err_con, int sensi_meth)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi,
+                            sunbooleantype err_con, int sensi_meth)
 {
   long int nst;
   long int nfe, nsetups, nni, ncfn, netf;
diff --git a/examples/cvodes/serial/cvsDiurnal_kry.c b/examples/cvodes/serial/cvsDiurnal_kry.c
index 14e540c656..ab13d90c44 100644
--- a/examples/cvodes/serial/cvsDiurnal_kry.c
+++ b/examples/cvodes/serial/cvsDiurnal_kry.c
@@ -45,7 +45,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -55,34 +55,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                 /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
 #define XMIN         ZERO                 /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)         /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)         /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -91,8 +91,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM)  /* NEQ = number of equations */
@@ -112,7 +112,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in sundials_dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -124,9 +124,9 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MX][MY], **Jbd[MX][MY];
+  sunrealtype **P[MX][MY], **Jbd[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
 } *UserData;
 
 /* Private Helper Functions */
@@ -134,26 +134,26 @@ typedef struct {
 static UserData AllocUserData(void);
 static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector y, N_Vector fy,
                void *user_data, N_Vector tmp);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr, realtype gamma,
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr, sunrealtype gamma,
                    void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 
@@ -166,7 +166,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
 int main()
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -306,11 +306,11 @@ static void FreeUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -320,12 +320,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy=0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -334,11 +334,11 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -466,13 +466,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute RHS function f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int jx, jy, idn, iup, ileft, iright;
   UserData data;
 
@@ -505,10 +505,10 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
@@ -559,18 +559,18 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Jacobian-times-vector routine. */
 
-static int jtv(N_Vector v, N_Vector Jv, realtype t,
+static int jtv(N_Vector v, N_Vector Jv, sunrealtype t,
                N_Vector u, N_Vector fu,
                void *user_data, N_Vector tmp)
 {
-  realtype c1, c2;
-  realtype v1, v2, v1dn, v2dn, v1up, v2up, v1lt, v2lt, v1rt, v2rt;
-  realtype Jv1, Jv2;
-  realtype cydn, cyup;
-  realtype s, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype c1, c2;
+  sunrealtype v1, v2, v1dn, v2dn, v1up, v2up, v1lt, v2lt, v1rt, v2rt;
+  sunrealtype Jv1, Jv2;
+  sunrealtype cydn, cyup;
+  sunrealtype s, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
   int jx, jy, idn, iup, ileft, iright;
-  realtype *udata, *vdata, *Jvdata;
+  sunrealtype *udata, *vdata, *Jvdata;
   UserData data;
 
   data = (UserData) user_data;
@@ -602,11 +602,11 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
 
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
 
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
@@ -696,15 +696,15 @@ static int jtv(N_Vector v, N_Vector Jv, realtype t,
 
 /* Preconditioner setup routine. Generate and preprocess P. */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu,
-                   booleantype jok, booleantype *jcurPtr, realtype gamma,
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu,
+                   sunbooleantype jok, sunbooleantype *jcurPtr, sunrealtype gamma,
                    void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MY], **(*Jbd)[MY];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MY], **(*Jbd)[MY];
   sunindextype *(*pivot)[MY], retval;
   int jx, jy;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, and of pointer to u's data */
@@ -741,10 +741,10 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
        computed on the last f call).  Load into P. */
 
     for (jy=0; jy < MY; jy++) {
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
       diag = -(cydn + cyup + TWO*hordco);
       for (jx=0; jx < MX; jx++) {
         c1 = IJKth(udata,1,jx,jy);
@@ -784,15 +784,15 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu,
 
 /* Preconditioner solve routine */
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MY];
+  sunrealtype **(*P)[MY];
   sunindextype *(*pivot)[MY];
   int jx, jy;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data. */
diff --git a/examples/cvodes/serial/cvsDiurnal_kry_bp.c b/examples/cvodes/serial/cvsDiurnal_kry_bp.c
index 42da5cceb3..0a82e88e09 100644
--- a/examples/cvodes/serial/cvsDiurnal_kry_bp.c
+++ b/examples/cvodes/serial/cvsDiurnal_kry_bp.c
@@ -45,7 +45,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <cvodes/cvodes_bandpre.h>     /* access to CVBANDPRE module           */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -55,34 +55,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                /* initial time */
 #define NOUT         12                  /* number of output times */
-#define TWOHR        RCONST(7200.0)      /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)      /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898) /* pi */
+#define TWOHR        SUN_RCONST(7200.0)      /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)      /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898) /* pi */
 
 #define XMIN         ZERO                /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)        /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)        /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)        /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)        /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -91,8 +91,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)   /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)    /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)   /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)    /* value of C1 or C2 at which tolerances */
                                  /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)     /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM) /* NEQ = number of equations */
@@ -112,7 +112,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the small matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the small matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in dense.h
    work with matrices stored by column in a 2-dimensional array. In C,
    arrays are indexed starting at 0, not 1. */
@@ -124,15 +124,15 @@
    contains problem constants */
 
 typedef struct {
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
 } *UserData;
 
 /* Private Helper Functions */
 
 static void InitUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
 static void PrintIntro(sunindextype mu, sunindextype ml);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 
 /* Private function to check function return values */
@@ -140,7 +140,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Function Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
 /*
  *-------------------------------
@@ -151,7 +151,7 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
 int main()
 {
   SUNContext sunctx;
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -287,11 +287,11 @@ static void InitUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -301,12 +301,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy = 0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx = 0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -325,11 +325,11 @@ static void PrintIntro(sunindextype mu, sunindextype ml)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u,realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u,sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -466,13 +466,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot,void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot,void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int idn, iup, ileft, iright, jx, jy;
   UserData data;
 
@@ -505,10 +505,10 @@ static int f(realtype t, N_Vector u, N_Vector udot,void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx = 0; jx < MX; jx++) {
diff --git a/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c b/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c
index 5f882002c6..410e24c591 100644
--- a/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c
+++ b/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c
@@ -95,7 +95,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -109,18 +109,18 @@
 
 /* Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* Problem Specification Constants */
 
 #define AA    ONE               /* AA = a */
-#define EE    RCONST(1.0e4)     /* EE = e */
-#define GG    RCONST(0.5e-6)    /* GG = g */
+#define EE    SUN_RCONST(1.0e4)     /* EE = e */
+#define GG    SUN_RCONST(0.5e-6)    /* GG = g */
 #define BB    ONE               /* BB = b */
 #define DPREY ONE
-#define DPRED RCONST(0.5)
+#define DPRED SUN_RCONST(0.5)
 #define ALPH  ONE
 #define NP    3
 #define NS    (2*NP)
@@ -132,8 +132,8 @@
 #define MXNS  (MX*NS)
 #define AX    ONE
 #define AY    ONE
-#define DX    (AX/(realtype)(MX-1))
-#define DY    (AY/(realtype)(MY-1))
+#define DX    (AX/(sunrealtype)(MX-1))
+#define DY    (AY/(sunrealtype)(MY-1))
 #define MP    NS
 #define MQ    (MX*MY)
 #define MXMP  (MX*MP)
@@ -146,12 +146,12 @@
 
 #define NEQ   (NS*MX*MY)
 #define T0    ZERO
-#define RTOL  RCONST(1.0e-5)
-#define ATOL  RCONST(1.0e-5)
+#define RTOL  SUN_RCONST(1.0e-5)
+#define ATOL  SUN_RCONST(1.0e-5)
 
 /* Output Constants */
 
-#define TOUT RCONST(10.0)
+#define TOUT SUN_RCONST(10.0)
 
 /* Note: The value for species i at mesh point (j,k) is stored in */
 /* component number (i-1) + j*NS + k*NS*MX of an N_Vector,        */
@@ -160,15 +160,15 @@
 /* Structure for user data */
 
 typedef struct {
-  realtype **P[NGRP];
+  sunrealtype **P[NGRP];
   sunindextype *pivot[NGRP];
   int ns, mxns, mp, mq, mx, my, ngrp, ngx, ngy, mxmp;
   int jgx[NGX+1], jgy[NGY+1], jigx[MX], jigy[MY];
   int jxr[NGX], jyr[NGY];
-  realtype acoef[NS][NS], bcoef[NS], diff[NS];
-  realtype cox[NS], coy[NS], dx, dy, srur;
-  realtype fsave[NEQ];
-  realtype fBsave[NEQ];
+  sunrealtype acoef[NS][NS], bcoef[NS], diff[NS];
+  sunrealtype cox[NS], coy[NS], dx, dy, srur;
+  sunrealtype fsave[NEQ];
+  sunrealtype fBsave[NEQ];
   N_Vector rewt;
   N_Vector vtemp;
   N_Vector rewtB;
@@ -185,29 +185,29 @@ typedef struct {
 
 /* Prototypes for user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype t, N_Vector c, N_Vector fc,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector c, N_Vector fc,
+static int PSolve(sunrealtype t, N_Vector c, N_Vector fc,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
-static int fB(realtype t, N_Vector c, N_Vector cB,
+static int fB(sunrealtype t, N_Vector c, N_Vector cB,
                N_Vector cBdot, void *user_data);
 
-static int PrecondB(realtype t, N_Vector c,
-                    N_Vector cB, N_Vector fcB, booleantype jok,
-                    booleantype *jcurPtr, realtype gamma,
+static int PrecondB(sunrealtype t, N_Vector c,
+                    N_Vector cB, N_Vector fcB, sunbooleantype jok,
+                    sunbooleantype *jcurPtr, sunrealtype gamma,
                     void *user_data);
 
-static int PSolveB(realtype t, N_Vector c,
+static int PSolveB(sunrealtype t, N_Vector c,
                    N_Vector cB, N_Vector fcB,
                    N_Vector r, N_Vector z,
-                   realtype gamma, realtype delta,
+                   sunrealtype gamma, sunrealtype delta,
                    int lr, void *user_data);
 
 /* Prototypes for private functions */
@@ -218,23 +218,23 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[]);
 static void CInit(N_Vector c, WebData wdata);
 static void PrintOutput(N_Vector c, int ns, int mxns, WebData wdata);
 static void FreeUserData(WebData wdata);
-static void WebRates(realtype x, realtype y, realtype t, realtype c[], realtype rate[],
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype rate[],
                      WebData wdata);
-static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype cB[],
-                      realtype rate[], realtype rateB[], WebData wdata);
-static void fblock (realtype t, realtype cdata[], int jx, int jy, realtype cdotdata[],
+static void WebRatesB(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype cB[],
+                      sunrealtype rate[], sunrealtype rateB[], WebData wdata);
+static void fblock (sunrealtype t, sunrealtype cdata[], int jx, int jy, sunrealtype cdotdata[],
                     WebData wdata);
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata);
-static realtype doubleIntgr(N_Vector c, int i, WebData wdata);
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata);
+static sunrealtype doubleIntgr(N_Vector c, int i, WebData wdata);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Small Vector Kernels */
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_sum_prods(realtype u[], realtype p[], realtype q[], realtype v[],
-                        realtype w[], int n);
-static void v_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_zero(realtype u[], int n);
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[], sunrealtype v[],
+                        sunrealtype w[], int n);
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_zero(sunrealtype u[], int n);
 
 /* SUNDIALS context */
 static SUNContext sunctx;
@@ -247,7 +247,7 @@ static SUNContext sunctx;
 
 int main(int argc, char *argv[])
 {
-  realtype abstol=ATOL, reltol=RTOL, t;
+  sunrealtype abstol=ATOL, reltol=RTOL, t;
   N_Vector c;
   WebData wdata;
   void *cvode_mem;
@@ -257,7 +257,7 @@ int main(int argc, char *argv[])
 
   int indexB;
 
-  realtype reltolB=RTOL, abstolB=ATOL;
+  sunrealtype reltolB=RTOL, abstolB=ATOL;
   N_Vector cB;
 
   c = NULL;
@@ -407,11 +407,11 @@ int main(int argc, char *argv[])
  * and these are saved in fsave for use in preconditioning.
  */
 
-static int f(realtype t, N_Vector c, N_Vector cdot, void *user_data)
+static int f(sunrealtype t, N_Vector c, N_Vector cdot, void *user_data)
 {
   int i, ic, ici, idxl, idxu, idyl, idyu, iyoff, jx, jy, ns, mxns;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
-  realtype *cdata, *cdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
+  sunrealtype *cdata, *cdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -477,17 +477,17 @@ static int f(realtype t, N_Vector c, N_Vector cdot, void *user_data)
  * scheme.
  */
 
-static int Precond(realtype t, N_Vector c, N_Vector fc,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
   sunindextype denseretval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   WebData wdata;
   N_Vector rewt;
 
@@ -499,7 +499,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
   cdata = N_VGetArrayPointer(c);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -520,7 +520,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
   f1 = N_VGetArrayPointer(wdata->vtemp);
 
   fac = N_VWrmsNorm (fc, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*(NEQ+1)*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*(NEQ+1)*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -570,12 +570,12 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
  * blocks in P, and pivot information in pivot, and returns the result in z.
  */
 
-static int PSolve(realtype t, N_Vector c, N_Vector fc,
+static int PSolve(sunrealtype t, N_Vector c, N_Vector fc,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -623,15 +623,15 @@ static int PSolve(realtype t, N_Vector c, N_Vector fc,
  * interaction rates are computed by calls to WebRatesB.
  */
 
-static int fB(realtype t, N_Vector c, N_Vector cB,
+static int fB(sunrealtype t, N_Vector c, N_Vector cB,
               N_Vector cBdot, void *user_data)
 {
   int i, ic, ici, idxl, idxu, idyl, idyu, iyoff, jx, jy, ns, mxns;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, *fBsave, dx, dy;
-  realtype *cdata, *cBdata, *cBdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, *fBsave, dx, dy;
+  sunrealtype *cdata, *cBdata, *cBdotdata;
   WebData wdata;
 
-  realtype gu[NS];
+  sunrealtype gu[NS];
 
   wdata = (WebData) user_data;
   cdata = N_VGetArrayPointer(c);
@@ -687,18 +687,18 @@ static int fB(realtype t, N_Vector c, N_Vector cB,
  * Preconditioner setup function for the backward problem
  */
 
-static int PrecondB(realtype t, N_Vector c,
-                    N_Vector cB, N_Vector fcB, booleantype jok,
-                    booleantype *jcurPtr, realtype gamma,
+static int PrecondB(sunrealtype t, N_Vector c,
+                    N_Vector cB, N_Vector fcB, sunbooleantype jok,
+                    sunbooleantype *jcurPtr, sunrealtype gamma,
                     void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   sunindextype denseretval;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   void *cvode_mem;
   WebData wdata;
   N_Vector rewt;
@@ -713,7 +713,7 @@ static int PrecondB(realtype t, N_Vector c,
   cdata = N_VGetArrayPointer(c);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -733,7 +733,7 @@ static int PrecondB(realtype t, N_Vector c,
 
   f1 = N_VGetArrayPointer(wdata->vtempB);
   fac = N_VWrmsNorm (fcB, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -776,13 +776,13 @@ static int PrecondB(realtype t, N_Vector c,
  * Preconditioner solve function for the backward problem
  */
 
-static int PSolveB(realtype t, N_Vector c,
+static int PSolveB(sunrealtype t, N_Vector c,
                    N_Vector cB, N_Vector fcB,
                    N_Vector r, N_Vector z,
-                   realtype gamma, realtype delta,
+                   sunrealtype gamma, sunrealtype delta,
                    int lr, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -856,8 +856,8 @@ static WebData AllocUserData(void)
 static void InitUserData(WebData wdata)
 {
   int i, j, ns;
-  realtype *bcoef, *diff, *cox, *coy, dx, dy;
-  realtype (*acoef)[NS];
+  sunrealtype *bcoef, *diff, *cox, *coy, dx, dy;
+  sunrealtype (*acoef)[NS];
 
   acoef = wdata->acoef;
   bcoef = wdata->bcoef;
@@ -896,7 +896,7 @@ static void InitUserData(WebData wdata)
   wdata->mq = MQ;
   wdata->mx = MX;
   wdata->my = MY;
-  wdata->srur = sqrt(UNIT_ROUNDOFF);
+  wdata->srur = sqrt(SUN_UNIT_ROUNDOFF);
   wdata->mxmp = MXMP;
   wdata->ngrp = NGRP;
   wdata->ngx = NGX;
@@ -941,7 +941,7 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[])
 static void CInit(N_Vector c, WebData wdata)
 {
   int i, ici, ioff, iyoff, jx, jy, ns, mxns;
-  realtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
+  sunrealtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -949,8 +949,8 @@ static void CInit(N_Vector c, WebData wdata)
   dx = wdata->dx;
   dy = wdata->dy;
 
-  x_factor = RCONST(4.0)/SQR(AX);
-  y_factor = RCONST(4.0)/SQR(AY);
+  x_factor = SUN_RCONST(4.0)/SQR(AX);
+  y_factor = SUN_RCONST(4.0)/SQR(AY);
   for (jy = 0; jy < MY; jy++) {
     y = jy*dy;
     argy = SQR(y_factor*y*(AY-y));
@@ -961,7 +961,7 @@ static void CInit(N_Vector c, WebData wdata)
       ioff = iyoff + ns*jx;
       for (i = 1; i <= ns; i++) {
         ici = ioff + i-1;
-        cdata[ici] = RCONST(10.0) + i*argx*argy;
+        cdata[ici] = SUN_RCONST(10.0) + i*argx*argy;
 
         /*if(i==1) cdata[ici] += ONE;*/
 
@@ -979,12 +979,12 @@ static void CInit(N_Vector c, WebData wdata)
  * and at time t.
  */
 
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata)
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -1006,12 +1006,12 @@ static void WebRates(realtype x, realtype y, realtype t, realtype c[],
  * This routine computes the interaction rates for the backward problem
  */
 
-static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype cB[],
-                      realtype rate[], realtype rateB[], WebData wdata)
+static void WebRatesB(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype cB[],
+                      sunrealtype rate[], sunrealtype rateB[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -1042,11 +1042,11 @@ static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype
  * Here jx and jy count from 0.
  */
 
-static void fblock(realtype t, realtype cdata[], int jx, int jy,
-                   realtype cdotdata[], WebData wdata)
+static void fblock(sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                   sunrealtype cdotdata[], WebData wdata)
 {
   int iblok, ic;
-  realtype x, y;
+  sunrealtype x, y;
 
   iblok = jx + jy*(wdata->mx);
   y = jy*(wdata->dy);
@@ -1065,11 +1065,11 @@ static void fblock(realtype t, realtype cdata[], int jx, int jy,
  * vector kernels v_sum_prods, v_prod, v_inc_by_prod.
  */
 
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata)
 {
   int i, ic, iter, iyoff, jx, jy, ns, mxns, mx, my, x_loc, y_loc;
-  realtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
-  realtype temp, *cox, *coy, *xd, *zd;
+  sunrealtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
+  sunrealtype temp, *cox, *coy, *xd, *zd;
 
   xd = N_VGetArrayPointer(x);
   zd = N_VGetArrayPointer(z);
@@ -1217,26 +1217,26 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
   }
 }
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] += v[i]*w[i];
 }
 
-static void v_sum_prods(realtype u[], realtype p[], realtype q[],
-                        realtype v[], realtype w[], int n)
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[],
+                        sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = p[i]*q[i] + v[i]*w[i];
 }
 
-static void v_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = v[i]*w[i];
 }
 
-static void v_zero(realtype u[], int n)
+static void v_zero(sunrealtype u[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = ZERO;
@@ -1249,7 +1249,7 @@ static void v_zero(realtype u[], int n)
 static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata)
 {
   int i, jx, jy;
-  realtype *cdata, cij, cmax, x, y;
+  sunrealtype *cdata, cij, cmax, x, y;
 
   x = y = ZERO;
 
@@ -1295,12 +1295,12 @@ static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata)
  * Compute double space integral
  */
 
-static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
+static sunrealtype doubleIntgr(N_Vector c, int i, WebData wdata)
 {
-  realtype *cdata;
+  sunrealtype *cdata;
   int ns, mx, my, mxns;
-  realtype dx, dy;
-  realtype intgr_xy, intgr_x;
+  sunrealtype dx, dy;
+  sunrealtype intgr_xy, intgr_x;
   int jx, jy;
 
   cdata = N_VGetArrayPointer(c);
@@ -1318,7 +1318,7 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
     intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
   }
   intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-  intgr_x *= RCONST(0.5)*dx;
+  intgr_x *= SUN_RCONST(0.5)*dx;
 
   intgr_xy = intgr_x;
 
@@ -1329,7 +1329,7 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
       intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
     }
     intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-    intgr_x *= RCONST(0.5)*dx;
+    intgr_x *= SUN_RCONST(0.5)*dx;
 
     intgr_xy += TWO*intgr_x;
 
@@ -1341,11 +1341,11 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
     intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
   }
   intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-  intgr_x *= RCONST(0.5)*dx;
+  intgr_x *= SUN_RCONST(0.5)*dx;
 
   intgr_xy += intgr_x;
 
-  intgr_xy *= RCONST(0.5)*dy;
+  intgr_xy *= SUN_RCONST(0.5)*dy;
 
   return(intgr_xy);
 }
diff --git a/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c b/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c
index 72bb2cb225..342c46ef09 100644
--- a/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c
+++ b/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c
@@ -88,7 +88,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -102,18 +102,18 @@
 
 /* Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* Problem Specification Constants */
 
 #define AA    ONE               /* AA = a */
-#define EE    RCONST(1.0e4)     /* EE = e */
-#define GG    RCONST(0.5e-6)    /* GG = g */
+#define EE    SUN_RCONST(1.0e4)     /* EE = e */
+#define GG    SUN_RCONST(0.5e-6)    /* GG = g */
 #define BB    ONE               /* BB = b */
 #define DPREY ONE
-#define DPRED RCONST(0.5)
+#define DPRED SUN_RCONST(0.5)
 #define ALPH  ONE
 #define NP    3
 #define NS    (2*NP)
@@ -125,8 +125,8 @@
 #define MXNS  (MX*NS)
 #define AX    ONE
 #define AY    ONE
-#define DX    (AX/(realtype)(MX-1))
-#define DY    (AY/(realtype)(MY-1))
+#define DX    (AX/(sunrealtype)(MX-1))
+#define DY    (AY/(sunrealtype)(MY-1))
 #define MP    NS
 #define MQ    (MX*MY)
 #define MXMP  (MX*MP)
@@ -139,12 +139,12 @@
 
 #define NEQ   (NS*MX*MY)
 #define T0    ZERO
-#define RTOL  RCONST(1.0e-5)
-#define ATOL  RCONST(1.0e-5)
+#define RTOL  SUN_RCONST(1.0e-5)
+#define ATOL  SUN_RCONST(1.0e-5)
 
 /* Output Constants */
 
-#define TOUT RCONST(10.0)
+#define TOUT SUN_RCONST(10.0)
 
 /* Note: The value for species i at mesh point (j,k) is stored in */
 /* component number (i-1) + j*NS + k*NS*MX of an N_Vector,        */
@@ -153,15 +153,15 @@
 /* Structure for user data */
 
 typedef struct {
-  realtype **P[NGRP];
+  sunrealtype **P[NGRP];
   sunindextype *pivot[NGRP];
   int ns, mxns, mp, mq, mx, my, ngrp, ngx, ngy, mxmp;
   int jgx[NGX+1], jgy[NGY+1], jigx[MX], jigy[MY];
   int jxr[NGX], jyr[NGY];
-  realtype acoef[NS][NS], bcoef[NS], diff[NS];
-  realtype cox[NS], coy[NS], dx, dy, srur;
-  realtype fsave[NEQ];
-  realtype fBsave[NEQ];
+  sunrealtype acoef[NS][NS], bcoef[NS], diff[NS];
+  sunrealtype cox[NS], coy[NS], dx, dy, srur;
+  sunrealtype fsave[NEQ];
+  sunrealtype fBsave[NEQ];
   N_Vector rewt;
   N_Vector vtemp;
   void *cvode_mem;
@@ -176,29 +176,29 @@ typedef struct {
 
 /* Prototypes for user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype t, N_Vector c, N_Vector fc,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data);
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype t, N_Vector c, N_Vector fc,
+static int PSolve(sunrealtype t, N_Vector c, N_Vector fc,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
-static int fB(realtype t, N_Vector c, N_Vector cB,
+static int fB(sunrealtype t, N_Vector c, N_Vector cB,
                N_Vector cBdot, void *user_data);
 
-static int PrecondB(realtype t, N_Vector c,
-                    N_Vector cB, N_Vector fcB, booleantype jok,
-                    booleantype *jcurPtr, realtype gamma,
+static int PrecondB(sunrealtype t, N_Vector c,
+                    N_Vector cB, N_Vector fcB, sunbooleantype jok,
+                    sunbooleantype *jcurPtr, sunrealtype gamma,
                     void *user_data);
 
-static int PSolveB(realtype t, N_Vector c,
+static int PSolveB(sunrealtype t, N_Vector c,
                    N_Vector cB, N_Vector fcB,
                    N_Vector r, N_Vector z,
-                   realtype gamma, realtype delta,
+                   sunrealtype gamma, sunrealtype delta,
                    int lr, void *user_data);
 
 /* Prototypes for private functions */
@@ -210,23 +210,23 @@ static void CInit(N_Vector c, WebData wdata);
 static void CbInit(N_Vector c, int is, WebData wdata);
 static void PrintOutput(N_Vector c, int ns, int mxns, WebData wdata);
 static void FreeUserData(WebData wdata);
-static void WebRates(realtype x, realtype y, realtype t, realtype c[], realtype rate[],
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype rate[],
                      WebData wdata);
-static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype cB[],
-                      realtype rate[], realtype rateB[], WebData wdata);
-static void fblock (realtype t, realtype cdata[], int jx, int jy, realtype cdotdata[],
+static void WebRatesB(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype cB[],
+                      sunrealtype rate[], sunrealtype rateB[], WebData wdata);
+static void fblock (sunrealtype t, sunrealtype cdata[], int jx, int jy, sunrealtype cdotdata[],
                     WebData wdata);
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata);
-static realtype doubleIntgr(N_Vector c, int i, WebData wdata);
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata);
+static sunrealtype doubleIntgr(N_Vector c, int i, WebData wdata);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Small Vector Kernels */
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_sum_prods(realtype u[], realtype p[], realtype q[], realtype v[],
-                        realtype w[], int n);
-static void v_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_zero(realtype u[], int n);
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[], sunrealtype v[],
+                        sunrealtype w[], int n);
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_zero(sunrealtype u[], int n);
 
 /* SUNDIALS context */
 static SUNContext sunctx;
@@ -239,7 +239,7 @@ static SUNContext sunctx;
 
 int main(int argc, char *argv[])
 {
-  realtype abstol=ATOL, reltol=RTOL, t;
+  sunrealtype abstol=ATOL, reltol=RTOL, t;
   N_Vector c;
   WebData wdata;
   void *cvode_mem;
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 
   int indexB;
 
-  realtype reltolB=RTOL, abstolB=ATOL;
+  sunrealtype reltolB=RTOL, abstolB=ATOL;
   N_Vector cB;
 
   c = NULL;
@@ -397,11 +397,11 @@ int main(int argc, char *argv[])
  * and these are saved in fsave for use in preconditioning.
  */
 
-static int f(realtype t, N_Vector c, N_Vector cdot, void *user_data)
+static int f(sunrealtype t, N_Vector c, N_Vector cdot, void *user_data)
 {
   int i, ic, ici, idxl, idxu, idyl, idyu, iyoff, jx, jy, ns, mxns;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
-  realtype *cdata, *cdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
+  sunrealtype *cdata, *cdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -464,17 +464,17 @@ static int f(realtype t, N_Vector c, N_Vector cdot, void *user_data)
  * scheme.
  */
 
-static int Precond(realtype t, N_Vector c, N_Vector fc,
-                   booleantype jok, booleantype *jcurPtr,
-                   realtype gamma, void *user_data)
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc,
+                   sunbooleantype jok, sunbooleantype *jcurPtr,
+                   sunrealtype gamma, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
   sunindextype denseretval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   WebData wdata;
   N_Vector rewt;
 
@@ -486,7 +486,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
   cdata = N_VGetArrayPointer(c);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -507,7 +507,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
   f1 = N_VGetArrayPointer(wdata->vtemp);
 
   fac = N_VWrmsNorm (fc, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -557,12 +557,12 @@ static int Precond(realtype t, N_Vector c, N_Vector fc,
  * blocks in P, and pivot information in pivot, and returns the result in z.
  */
 
-static int PSolve(realtype t, N_Vector c, N_Vector fc,
+static int PSolve(sunrealtype t, N_Vector c, N_Vector fc,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -607,12 +607,12 @@ static int PSolve(realtype t, N_Vector c, N_Vector fc,
  * interaction rates are computed by calls to WebRatesB.
  */
 
-static int fB(realtype t, N_Vector c, N_Vector cB,
+static int fB(sunrealtype t, N_Vector c, N_Vector cB,
               N_Vector cBdot, void *user_data)
 {
   int i, ic, ici, idxl, idxu, idyl, idyu, iyoff, jx, jy, ns, mxns;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, *fBsave, dx, dy;
-  realtype *cdata, *cBdata, *cBdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, *fBsave, dx, dy;
+  sunrealtype *cdata, *cBdata, *cBdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -665,18 +665,18 @@ static int fB(realtype t, N_Vector c, N_Vector cB,
  * Preconditioner setup function for the backward problem
  */
 
-static int PrecondB(realtype t, N_Vector c,
-                    N_Vector cB, N_Vector fcB, booleantype jok,
-                    booleantype *jcurPtr, realtype gamma,
+static int PrecondB(sunrealtype t, N_Vector c,
+                    N_Vector cB, N_Vector fcB, sunbooleantype jok,
+                    sunbooleantype *jcurPtr, sunrealtype gamma,
                     void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   sunindextype denseretval;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   void *cvode_mem;
   WebData wdata;
   N_Vector rewt;
@@ -691,7 +691,7 @@ static int PrecondB(realtype t, N_Vector c,
   cdata = N_VGetArrayPointer(c);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -711,7 +711,7 @@ static int PrecondB(realtype t, N_Vector c,
 
   f1 = N_VGetArrayPointer(wdata->vtemp);
   fac = N_VWrmsNorm (fcB, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -754,13 +754,13 @@ static int PrecondB(realtype t, N_Vector c,
  * Preconditioner solve function for the backward problem
  */
 
-static int PSolveB(realtype t, N_Vector c,
+static int PSolveB(sunrealtype t, N_Vector c,
                    N_Vector cB, N_Vector fcB,
                    N_Vector r, N_Vector z,
-                   realtype gamma, realtype delta,
+                   sunrealtype gamma, sunrealtype delta,
                    int lr, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -832,8 +832,8 @@ static WebData AllocUserData(void)
 static void InitUserData(WebData wdata)
 {
   int i, j, ns;
-  realtype *bcoef, *diff, *cox, *coy, dx, dy;
-  realtype (*acoef)[NS];
+  sunrealtype *bcoef, *diff, *cox, *coy, dx, dy;
+  sunrealtype (*acoef)[NS];
 
   acoef = wdata->acoef;
   bcoef = wdata->bcoef;
@@ -872,7 +872,7 @@ static void InitUserData(WebData wdata)
   wdata->mq = MQ;
   wdata->mx = MX;
   wdata->my = MY;
-  wdata->srur = sqrt(UNIT_ROUNDOFF);
+  wdata->srur = sqrt(SUN_UNIT_ROUNDOFF);
   wdata->mxmp = MXMP;
   wdata->ngrp = NGRP;
   wdata->ngx = NGX;
@@ -917,7 +917,7 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[])
 static void CInit(N_Vector c, WebData wdata)
 {
   int i, ici, ioff, iyoff, jx, jy, ns, mxns;
-  realtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
+  sunrealtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -925,8 +925,8 @@ static void CInit(N_Vector c, WebData wdata)
   dx = wdata->dx;
   dy = wdata->dy;
 
-  x_factor = RCONST(4.0)/SQR(AX);
-  y_factor = RCONST(4.0)/SQR(AY);
+  x_factor = SUN_RCONST(4.0)/SQR(AX);
+  y_factor = SUN_RCONST(4.0)/SQR(AY);
   for (jy = 0; jy < MY; jy++) {
     y = jy*dy;
     argy = SQR(y_factor*y*(AY-y));
@@ -937,7 +937,7 @@ static void CInit(N_Vector c, WebData wdata)
       ioff = iyoff + ns*jx;
       for (i = 1; i <= ns; i++) {
         ici = ioff + i-1;
-        cdata[ici] = RCONST(10.0) + i*argx*argy;
+        cdata[ici] = SUN_RCONST(10.0) + i*argx*argy;
       }
     }
   }
@@ -950,9 +950,9 @@ static void CInit(N_Vector c, WebData wdata)
 static void CbInit(N_Vector c, int is, WebData wdata)
 {
   int i, ici, ioff, iyoff, jx, jy, ns, mxns;
-  realtype *cdata;
+  sunrealtype *cdata;
 
-  realtype gu[NS];
+  sunrealtype gu[NS];
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -979,12 +979,12 @@ static void CbInit(N_Vector c, int is, WebData wdata)
  * and at time t.
  */
 
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata)
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -1006,12 +1006,12 @@ static void WebRates(realtype x, realtype y, realtype t, realtype c[],
  * This routine computes the interaction rates for the backward problem
  */
 
-static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype cB[],
-                      realtype rate[], realtype rateB[], WebData wdata)
+static void WebRatesB(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[], sunrealtype cB[],
+                      sunrealtype rate[], sunrealtype rateB[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -1042,11 +1042,11 @@ static void WebRatesB(realtype x, realtype y, realtype t, realtype c[], realtype
  * Here jx and jy count from 0.
  */
 
-static void fblock(realtype t, realtype cdata[], int jx, int jy,
-                   realtype cdotdata[], WebData wdata)
+static void fblock(sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                   sunrealtype cdotdata[], WebData wdata)
 {
   int iblok, ic;
-  realtype x, y;
+  sunrealtype x, y;
 
   iblok = jx + jy*(wdata->mx);
   y = jy*(wdata->dy);
@@ -1065,11 +1065,11 @@ static void fblock(realtype t, realtype cdata[], int jx, int jy,
  * vector kernels v_sum_prods, v_prod, v_inc_by_prod.
  */
 
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata)
 {
   int i, ic, iter, iyoff, jx, jy, ns, mxns, mx, my, x_loc, y_loc;
-  realtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
-  realtype temp, *cox, *coy, *xd, *zd;
+  sunrealtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
+  sunrealtype temp, *cox, *coy, *xd, *zd;
 
   xd = N_VGetArrayPointer(x);
   zd = N_VGetArrayPointer(z);
@@ -1217,26 +1217,26 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
   }
 }
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] += v[i]*w[i];
 }
 
-static void v_sum_prods(realtype u[], realtype p[], realtype q[],
-                        realtype v[], realtype w[], int n)
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[],
+                        sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = p[i]*q[i] + v[i]*w[i];
 }
 
-static void v_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = v[i]*w[i];
 }
 
-static void v_zero(realtype u[], int n)
+static void v_zero(sunrealtype u[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = ZERO;
@@ -1249,7 +1249,7 @@ static void v_zero(realtype u[], int n)
 static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata)
 {
   int i, jx, jy;
-  realtype *cdata, cij, cmax, x, y;
+  sunrealtype *cdata, cij, cmax, x, y;
 
   x = y = ZERO;
 
@@ -1295,12 +1295,12 @@ static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata)
  * Compute double space integral
  */
 
-static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
+static sunrealtype doubleIntgr(N_Vector c, int i, WebData wdata)
 {
-  realtype *cdata;
+  sunrealtype *cdata;
   int ns, mx, my, mxns;
-  realtype dx, dy;
-  realtype intgr_xy, intgr_x;
+  sunrealtype dx, dy;
+  sunrealtype intgr_xy, intgr_x;
   int jx, jy;
 
   cdata = N_VGetArrayPointer(c);
@@ -1318,7 +1318,7 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
     intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
   }
   intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-  intgr_x *= RCONST(0.5)*dx;
+  intgr_x *= SUN_RCONST(0.5)*dx;
 
   intgr_xy = intgr_x;
 
@@ -1329,7 +1329,7 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
       intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
     }
     intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-    intgr_x *= RCONST(0.5)*dx;
+    intgr_x *= SUN_RCONST(0.5)*dx;
 
     intgr_xy += TWO*intgr_x;
 
@@ -1341,11 +1341,11 @@ static realtype doubleIntgr(N_Vector c, int i, WebData wdata)
     intgr_x += TWO*cdata[(i-1) + jx*ns + jy*mxns];
   }
   intgr_x += cdata[(i-1)+(mx-1)*ns+jy*mxns];
-  intgr_x *= RCONST(0.5)*dx;
+  intgr_x *= SUN_RCONST(0.5)*dx;
 
   intgr_xy += intgr_x;
 
-  intgr_xy *= RCONST(0.5)*dy;
+  intgr_xy *= SUN_RCONST(0.5)*dy;
 
   return(intgr_xy);
 }
diff --git a/examples/cvodes/serial/cvsHessian_ASA_FSA.c b/examples/cvodes/serial/cvsHessian_ASA_FSA.c
index 7328a96028..3d6db9f490 100644
--- a/examples/cvodes/serial/cvsHessian_ASA_FSA.c
+++ b/examples/cvodes/serial/cvsHessian_ASA_FSA.c
@@ -44,35 +44,35 @@
 
 #define Ith(v,i)    NV_Ith_S(v,i-1)
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 typedef struct {
-  realtype p1, p2;
+  sunrealtype p1, p2;
 } *UserData;
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
-static int fS(int Ns, realtype t,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fS(int Ns, sunrealtype t,
               N_Vector y, N_Vector ydot,
               N_Vector *yS, N_Vector *ySdot,
               void *user_data,
               N_Vector tmp1, N_Vector tmp2);
-static int fQS(int Ns, realtype t,
+static int fQS(int Ns, sunrealtype t,
                N_Vector y, N_Vector *yS,
                N_Vector yQdot, N_Vector *yQSdot,
                void *user_data,
                N_Vector tmp, N_Vector tmpQ);
 
-static int fB1(realtype t, N_Vector y, N_Vector *yS,
+static int fB1(sunrealtype t, N_Vector y, N_Vector *yS,
                N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int fQB1(realtype t, N_Vector y, N_Vector *yS,
+static int fQB1(sunrealtype t, N_Vector y, N_Vector *yS,
                 N_Vector yB, N_Vector qBdot, void *user_dataB);
 
 
-static int fB2(realtype t, N_Vector y, N_Vector *yS,
+static int fB2(sunrealtype t, N_Vector y, N_Vector *yS,
                N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int fQB2(realtype t, N_Vector y, N_Vector *yS,
+static int fQB2(sunrealtype t, N_Vector y, N_Vector *yS,
                 N_Vector yB, N_Vector qBdot, void *user_dataB);
 
 int PrintFwdStats(void *cvode_mem);
@@ -100,10 +100,10 @@ int main(int argc, char *argv[])
   sunindextype Neq, Np2;
   int Np;
 
-  realtype t0, tf;
+  sunrealtype t0, tf;
 
-  realtype reltol;
-  realtype abstol, abstolQ, abstolB, abstolQB;
+  sunrealtype reltol;
+  sunrealtype abstol, abstolQ, abstolB, abstolQB;
 
   N_Vector y, yQ;
   N_Vector *yS, *yQS;
@@ -114,12 +114,12 @@ int main(int argc, char *argv[])
   int indexB1, indexB2;
 
   int retval;
-  realtype time;
+  sunrealtype time;
 
-  realtype dp;
-  realtype G, Gp, Gm;
-  realtype grdG_fwd[2], grdG_bck[2], grdG_cntr[2];
-  realtype H11, H22;
+  sunrealtype dp;
+  sunrealtype G, Gp, Gm;
+  sunrealtype grdG_fwd[2], grdG_bck[2], grdG_cntr[2];
+  sunrealtype H11, H22;
 
   data = NULL;
   y = yQ = NULL;
@@ -132,8 +132,8 @@ int main(int argc, char *argv[])
   /* User data structure */
 
   data = (UserData) malloc(sizeof *data);
-  data->p1 = RCONST(1.0);
-  data->p2 = RCONST(2.0);
+  data->p1 = SUN_RCONST(1.0);
+  data->p2 = SUN_RCONST(2.0);
 
   /* Problem size, integration interval, and tolerances */
 
@@ -437,7 +437,7 @@ int main(int argc, char *argv[])
 
   /* Finite difference tests */
 
-  dp = RCONST(1.0e-2);
+  dp = SUN_RCONST(1.0e-2);
 
   printf("-----------------------\n");
   printf("Finite Difference tests\n");
@@ -631,11 +631,11 @@ int main(int argc, char *argv[])
  */
 
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
   UserData data;
-  realtype p1, p2;
+  sunrealtype p1, p2;
 
   data = (UserData) user_data;
   p1 = data->p1;
@@ -652,9 +652,9 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   return(0);
 }
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
 
   y1 = Ith(y,1);
   y2 = Ith(y,2);
@@ -665,17 +665,17 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
   return(0);
 }
 
-static int fS(int Ns, realtype t,
+static int fS(int Ns, sunrealtype t,
               N_Vector y, N_Vector ydot,
               N_Vector *yS, N_Vector *ySdot,
               void *user_data,
               N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype fys1, fys2, fys3;
-  realtype p1, p2;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype fys1, fys2, fys3;
+  sunrealtype p1, p2;
 
   data = (UserData) user_data;
   p1 = data->p1;
@@ -716,14 +716,14 @@ static int fS(int Ns, realtype t,
   return(0);
 }
 
-static int fQS(int Ns, realtype t,
+static int fQS(int Ns, sunrealtype t,
                N_Vector y, N_Vector *yS,
                N_Vector yQdot, N_Vector *yQSdot,
                void *user_data,
                N_Vector tmp, N_Vector tmpQ)
 {
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
 
   y1 = Ith(y,1);
   y2 = Ith(y,2);
@@ -750,15 +750,15 @@ static int fQS(int Ns, realtype t,
   return(0);
 }
 
-static int fB1(realtype t, N_Vector y, N_Vector *yS,
+static int fB1(sunrealtype t, N_Vector y, N_Vector *yS,
                N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype p1, p2;
-  realtype y1, y2, y3;  /* solution */
-  realtype s1, s2, s3;  /* sensitivity 1 */
-  realtype l1, l2, l3;  /* lambda */
-  realtype m1, m2, m3;  /* mu */
+  sunrealtype p1, p2;
+  sunrealtype y1, y2, y3;  /* solution */
+  sunrealtype s1, s2, s3;  /* sensitivity 1 */
+  sunrealtype l1, l2, l3;  /* lambda */
+  sunrealtype m1, m2, m3;  /* mu */
 
   data = (UserData) user_dataB;
   p1 = data->p1;
@@ -792,15 +792,15 @@ static int fB1(realtype t, N_Vector y, N_Vector *yS,
   return(0);
 }
 
-static int fQB1(realtype t, N_Vector y, N_Vector *yS,
+static int fQB1(sunrealtype t, N_Vector y, N_Vector *yS,
                 N_Vector yB, N_Vector qBdot, void *user_dataB)
 {
   UserData data;
-  realtype p2;
-  realtype y1, y2, y3;  /* solution */
-  realtype s1, s2, s3;  /* sensitivity 1 */
-  realtype l1, l3;      /* lambda */
-  realtype m1, m3;      /* mu */
+  sunrealtype p2;
+  sunrealtype y1, y2, y3;  /* solution */
+  sunrealtype s1, s2, s3;  /* sensitivity 1 */
+  sunrealtype l1, l3;      /* lambda */
+  sunrealtype m1, m3;      /* mu */
 
   data = (UserData) user_dataB;
 
@@ -832,15 +832,15 @@ static int fQB1(realtype t, N_Vector y, N_Vector *yS,
 
 
 
-static int fB2(realtype t, N_Vector y, N_Vector *yS,
+static int fB2(sunrealtype t, N_Vector y, N_Vector *yS,
                N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype p1, p2;
-  realtype y1, y2, y3;  /* solution */
-  realtype s1, s2, s3;  /* sensitivity 2 */
-  realtype l1, l2, l3;  /* lambda */
-  realtype m1, m2, m3;  /* mu */
+  sunrealtype p1, p2;
+  sunrealtype y1, y2, y3;  /* solution */
+  sunrealtype s1, s2, s3;  /* sensitivity 2 */
+  sunrealtype l1, l2, l3;  /* lambda */
+  sunrealtype m1, m2, m3;  /* mu */
 
   data = (UserData) user_dataB;
   p1 = data->p1;
@@ -875,15 +875,15 @@ static int fB2(realtype t, N_Vector y, N_Vector *yS,
 }
 
 
-static int fQB2(realtype t, N_Vector y, N_Vector *yS,
+static int fQB2(sunrealtype t, N_Vector y, N_Vector *yS,
                 N_Vector yB, N_Vector qBdot, void *user_dataB)
 {
   UserData data;
-  realtype p2;
-  realtype y1, y2, y3;  /* solution */
-  realtype s1, s2, s3;  /* sensitivity 2 */
-  realtype l1, l3;  /* lambda */
-  realtype m1, m3;  /* mu */
+  sunrealtype p2;
+  sunrealtype y1, y2, y3;  /* solution */
+  sunrealtype s1, s2, s3;  /* sensitivity 2 */
+  sunrealtype l1, l3;  /* lambda */
+  sunrealtype m1, m3;  /* mu */
 
   data = (UserData) user_dataB;
 
@@ -927,7 +927,7 @@ int PrintFwdStats(void *cvode_mem)
   long int nfQSe, netfQS;
 
   int qlast, qcur;
-  realtype h0u, hlast, hcur, tcur;
+  sunrealtype h0u, hlast, hcur, tcur;
 
   int retval;
 
@@ -974,7 +974,7 @@ int PrintBckStats(void *cvode_mem, int idx)
   long int nfQe, netfQ;
 
   int qlast, qcur;
-  realtype h0u, hlast, hcur, tcur;
+  sunrealtype h0u, hlast, hcur, tcur;
 
   int retval;
 
diff --git a/examples/cvodes/serial/cvsKrylovDemo_ls.c b/examples/cvodes/serial/cvsKrylovDemo_ls.c
index e76ccfa5dc..f9d38416f7 100644
--- a/examples/cvodes/serial/cvsKrylovDemo_ls.c
+++ b/examples/cvodes/serial/cvsKrylovDemo_ls.c
@@ -52,7 +52,7 @@
 #include <sunnonlinsol/sunnonlinsol_newton.h> /* access to Newton SUNNonlinearSolver         */
 #include <nvector/nvector_serial.h>           /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>          /* use generic DENSE solver in preconditioning */
-#include <sundials/sundials_types.h>          /* definition of realtype                      */
+#include <sundials/sundials_types.h>          /* definition of sunrealtype                      */
 
 /* helpful macros */
 
@@ -72,34 +72,34 @@
 
 /* Problem Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 #define NUM_SPECIES  2                 /* number of species         */
-#define KH           RCONST(4.0e-6)    /* horizontal diffusivity Kh */
-#define VEL          RCONST(0.001)     /* advection velocity V      */
-#define KV0          RCONST(1.0e-8)    /* coefficient in Kv(y)      */
-#define Q1           RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
-#define Q2           RCONST(4.66e-16)
-#define C3           RCONST(3.7e16)
-#define A3           RCONST(22.62)     /* coefficient in expression for q3(t) */
-#define A4           RCONST(7.601)     /* coefficient in expression for q4(t) */
-#define C1_SCALE     RCONST(1.0e6)     /* coefficients in initial profiles    */
-#define C2_SCALE     RCONST(1.0e12)
+#define KH           SUN_RCONST(4.0e-6)    /* horizontal diffusivity Kh */
+#define VEL          SUN_RCONST(0.001)     /* advection velocity V      */
+#define KV0          SUN_RCONST(1.0e-8)    /* coefficient in Kv(y)      */
+#define Q1           SUN_RCONST(1.63e-16)  /* coefficients q1, q2, c3   */
+#define Q2           SUN_RCONST(4.66e-16)
+#define C3           SUN_RCONST(3.7e16)
+#define A3           SUN_RCONST(22.62)     /* coefficient in expression for q3(t) */
+#define A4           SUN_RCONST(7.601)     /* coefficient in expression for q4(t) */
+#define C1_SCALE     SUN_RCONST(1.0e6)     /* coefficients in initial profiles    */
+#define C2_SCALE     SUN_RCONST(1.0e12)
 
 #define T0           ZERO                 /* initial time */
 #define NOUT         12                   /* number of output times */
-#define TWOHR        RCONST(7200.0)       /* number of seconds in two hours  */
-#define HALFDAY      RCONST(4.32e4)       /* number of seconds in a half day */
-#define PI       RCONST(3.1415926535898)  /* pi */
+#define TWOHR        SUN_RCONST(7200.0)       /* number of seconds in two hours  */
+#define HALFDAY      SUN_RCONST(4.32e4)       /* number of seconds in a half day */
+#define PI       SUN_RCONST(3.1415926535898)  /* pi */
 
 #define XMIN         ZERO                 /* grid boundaries in x  */
-#define XMAX         RCONST(20.0)
-#define YMIN         RCONST(30.0)         /* grid boundaries in y  */
-#define YMAX         RCONST(50.0)
-#define XMID         RCONST(10.0)         /* grid midpoints in x,y */
-#define YMID         RCONST(40.0)
+#define XMAX         SUN_RCONST(20.0)
+#define YMIN         SUN_RCONST(30.0)         /* grid boundaries in y  */
+#define YMAX         SUN_RCONST(50.0)
+#define XMID         SUN_RCONST(10.0)         /* grid midpoints in x,y */
+#define YMID         SUN_RCONST(40.0)
 
 #define MX           10             /* MX = number of x mesh points */
 #define MY           10             /* MY = number of y mesh points */
@@ -108,8 +108,8 @@
 
 /* CVodeInit Constants */
 
-#define RTOL    RCONST(1.0e-5)    /* scalar relative tolerance */
-#define FLOOR   RCONST(100.0)     /* value of C1 or C2 at which tolerances */
+#define RTOL    SUN_RCONST(1.0e-5)    /* scalar relative tolerance */
+#define FLOOR   SUN_RCONST(100.0)     /* value of C1 or C2 at which tolerances */
                                   /* change from relative to absolute      */
 #define ATOL    (RTOL*FLOOR)      /* scalar absolute tolerance */
 #define NEQ     (NUM_SPECIES*MM)  /* NEQ = number of equations */
@@ -136,7 +136,7 @@
    For each mesh point (j,k), the elements for species i and i+1 are
    contiguous within vdata.
 
-   IJth(a,i,j) references the (i,j)th entry of the matrix realtype **a,
+   IJth(a,i,j) references the (i,j)th entry of the matrix sunrealtype **a,
    where 1 <= i,j <= NUM_SPECIES. The small matrix routines in
    sundials_dense.h work with matrices stored by column in a 2-dimensional
    array. In C, arrays are indexed starting at 0, not 1. */
@@ -149,9 +149,9 @@
    solution vector, and linsolver type */
 
 typedef struct {
-  realtype **P[MX][MY], **Jbd[MX][MY];
+  sunrealtype **P[MX][MY], **Jbd[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype q4, om, dx, dy, hdco, haco, vdco;
+  sunrealtype q4, om, dx, dy, hdco, haco, vdco;
 } *UserData;
 
 /* Private Helper Functions */
@@ -159,21 +159,21 @@ typedef struct {
 static UserData AllocUserData(void);
 static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy);
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t);
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy);
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem, int linsolver);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data);
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data);
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data);
 
 
@@ -185,7 +185,7 @@ static int PSolve(realtype tn, N_Vector u, N_Vector fu,
 
 int main(int argc, char* argv[])
 {
-  realtype abstol, reltol, t, tout;
+  sunrealtype abstol, reltol, t, tout;
   N_Vector u;
   UserData data;
   SUNLinearSolver LS;
@@ -193,7 +193,7 @@ int main(int argc, char* argv[])
   void *cvode_mem;
   int linsolver, iout, retval;
   int nrmfactor;   /* LS norm conversion factor flag */
-  realtype nrmfac; /* LS norm conversion factor      */
+  sunrealtype nrmfac; /* LS norm conversion factor      */
   int monitor;     /* LS resiudal monitoring flag    */
   SUNContext sunctx;
   SUNLogger logger;
@@ -370,7 +370,7 @@ int main(int argc, char* argv[])
 
     case(1):
       /* use the square root of the vector length */
-      nrmfac = SQRT((realtype)NEQ);
+      nrmfac = SQRT((sunrealtype)NEQ);
       break;
     case(2):
       /* compute with dot product */
@@ -466,11 +466,11 @@ static void FreeUserData(UserData data)
 
 /* Set initial conditions in u */
 
-static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
+static void SetInitialProfiles(N_Vector u, sunrealtype dx, sunrealtype dy)
 {
   int jx, jy;
-  realtype x, y, cx, cy;
-  realtype *udata;
+  sunrealtype x, y, cx, cy;
+  sunrealtype *udata;
 
   /* Set pointer to data array in vector u. */
 
@@ -480,12 +480,12 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
   for (jy=0; jy < MY; jy++) {
     y = YMIN + jy*dy;
-    cy = SQR(RCONST(0.1)*(y - YMID));
-    cy = ONE - cy + RCONST(0.5)*SQR(cy);
+    cy = SQR(SUN_RCONST(0.1)*(y - YMID));
+    cy = ONE - cy + SUN_RCONST(0.5)*SQR(cy);
     for (jx=0; jx < MX; jx++) {
       x = XMIN + jx*dx;
-      cx = SQR(RCONST(0.1)*(x - XMID));
-      cx = ONE - cx + RCONST(0.5)*SQR(cx);
+      cx = SQR(SUN_RCONST(0.1)*(x - XMID));
+      cx = ONE - cx + SUN_RCONST(0.5)*SQR(cx);
       IJKth(udata,1,jx,jy) = C1_SCALE*cx*cy;
       IJKth(udata,2,jx,jy) = C2_SCALE*cx*cy;
     }
@@ -494,11 +494,11 @@ static void SetInitialProfiles(N_Vector u, realtype dx, realtype dy)
 
 /* Print current t, step count, order, stepsize, and sampled c1,c2 values */
 
-static void PrintOutput(void *cvode_mem, N_Vector u, realtype t)
+static void PrintOutput(void *cvode_mem, N_Vector u, sunrealtype t)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
   int mxh = MX/2 - 1, myh = MY/2 - 1, mx1 = MX - 1, my1 = MY - 1;
 
   udata = N_VGetArrayPointer(u);
@@ -629,13 +629,13 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* f routine. Compute RHS function f(t,u). */
 
-static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
+static int f(sunrealtype t, N_Vector u, N_Vector udot, void *user_data)
 {
-  realtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
-  realtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
-  realtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
-  realtype q4coef, dely, verdco, hordco, horaco;
-  realtype *udata, *dudata;
+  sunrealtype q3, c1, c2, c1dn, c2dn, c1up, c2up, c1lt, c2lt;
+  sunrealtype c1rt, c2rt, cydn, cyup, hord1, hord2, horad1, horad2;
+  sunrealtype qq1, qq2, qq3, qq4, rkin1, rkin2, s, vertd1, vertd2, ydn, yup;
+  sunrealtype q4coef, dely, verdco, hordco, horaco;
+  sunrealtype *udata, *dudata;
   int jx, jy, idn, iup, ileft, iright;
   UserData data;
 
@@ -668,10 +668,10 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
     /* Set vertical diffusion coefficients at jy +- 1/2 */
 
-    ydn = YMIN + (jy - RCONST(0.5))*dely;
+    ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
     yup = ydn + dely;
-    cydn = verdco*exp(RCONST(0.2)*ydn);
-    cyup = verdco*exp(RCONST(0.2)*yup);
+    cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+    cyup = verdco*exp(SUN_RCONST(0.2)*yup);
     idn = (jy == 0) ? 1 : -1;
     iup = (jy == MY-1) ? -1 : 1;
     for (jx=0; jx < MX; jx++) {
@@ -721,14 +721,14 @@ static int f(realtype t, N_Vector u, N_Vector udot, void *user_data)
 
 /* Preconditioner setup routine. Generate and preprocess P. */
 
-static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype tn, N_Vector u, N_Vector fu, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
-  realtype **(*P)[MY], **(*Jbd)[MY];
+  sunrealtype c1, c2, cydn, cyup, diag, ydn, yup, q4coef, dely, verdco, hordco;
+  sunrealtype **(*P)[MY], **(*Jbd)[MY];
   sunindextype *(*pivot)[MY], retval;
   int jx, jy;
-  realtype *udata, **a, **j;
+  sunrealtype *udata, **a, **j;
   UserData data;
 
   /* Make local copies of pointers in user_data, and of pointer to u's data */
@@ -765,10 +765,10 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
        computed on the last f call).  Load into P. */
 
     for (jy=0; jy < MY; jy++) {
-      ydn = YMIN + (jy - RCONST(0.5))*dely;
+      ydn = YMIN + (jy - SUN_RCONST(0.5))*dely;
       yup = ydn + dely;
-      cydn = verdco*exp(RCONST(0.2)*ydn);
-      cyup = verdco*exp(RCONST(0.2)*yup);
+      cydn = verdco*exp(SUN_RCONST(0.2)*ydn);
+      cyup = verdco*exp(SUN_RCONST(0.2)*yup);
       diag = -(cydn + cyup + TWO*hordco);
       for (jx=0; jx < MX; jx++) {
         c1 = IJKth(udata,1,jx,jy);
@@ -808,15 +808,15 @@ static int Precond(realtype tn, N_Vector u, N_Vector fu, booleantype jok,
 
 /* Preconditioner solve routine */
 
-static int PSolve(realtype tn, N_Vector u, N_Vector fu,
+static int PSolve(sunrealtype tn, N_Vector u, N_Vector fu,
                   N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta,
+                  sunrealtype gamma, sunrealtype delta,
                   int lr, void *user_data)
 {
-  realtype **(*P)[MY];
+  sunrealtype **(*P)[MY];
   sunindextype *(*pivot)[MY];
   int jx, jy;
-  realtype *zdata, *v;
+  sunrealtype *zdata, *v;
   UserData data;
 
   /* Extract the P and pivot arrays from user_data. */
diff --git a/examples/cvodes/serial/cvsKrylovDemo_prec.c b/examples/cvodes/serial/cvsKrylovDemo_prec.c
index 141bf79ecd..f47e869c7e 100644
--- a/examples/cvodes/serial/cvsKrylovDemo_prec.c
+++ b/examples/cvodes/serial/cvsKrylovDemo_prec.c
@@ -105,7 +105,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h>  /* access to SPGMR SUNLinearSolver             */
 #include <nvector/nvector_serial.h>     /* serial N_Vector types, fct. and macros      */
 #include <sundials/sundials_dense.h>    /* use generic DENSE solver in preconditioning */
-#include <sundials/sundials_types.h>    /* definition of realtype                      */
+#include <sundials/sundials_types.h>    /* definition of sunrealtype                      */
 
 /* helpful macros */
 
@@ -119,17 +119,17 @@
 
 /* Constants */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Problem Specification Constants */
 
 #define AA    ONE               /* AA = a */
-#define EE    RCONST(1.0e4)     /* EE = e */
-#define GG    RCONST(0.5e-6)    /* GG = g */
+#define EE    SUN_RCONST(1.0e4)     /* EE = e */
+#define GG    SUN_RCONST(0.5e-6)    /* GG = g */
 #define BB    ONE               /* BB = b */
 #define DPREY ONE
-#define DPRED RCONST(0.5)
+#define DPRED SUN_RCONST(0.5)
 #define ALPH  ONE
 #define NP    3
 #define NS    (2*NP)
@@ -141,8 +141,8 @@
 #define MXNS  (MX*NS)
 #define AX    ONE
 #define AY    ONE
-#define DX    (AX/(realtype)(MX-1))
-#define DY    (AY/(realtype)(MY-1))
+#define DX    (AX/(sunrealtype)(MX-1))
+#define DY    (AY/(sunrealtype)(MY-1))
 #define MP    NS
 #define MQ    (MX*MY)
 #define MXMP  (MX*MP)
@@ -155,8 +155,8 @@
 
 #define NEQ  (NS*MX*MY)
 #define T0   ZERO
-#define RTOL RCONST(1.0e-5)
-#define ATOL RCONST(1.0e-5)
+#define RTOL SUN_RCONST(1.0e-5)
+#define ATOL SUN_RCONST(1.0e-5)
 
 /* Spgmr/CVLS Constants */
 
@@ -165,8 +165,8 @@
 
 /* Output Constants */
 
-#define T1        RCONST(1.0e-8)
-#define TOUT_MULT RCONST(10.0)
+#define T1        SUN_RCONST(1.0e-8)
+#define TOUT_MULT SUN_RCONST(10.0)
 #define DTOUT     ONE
 #define NOUT      18
 
@@ -177,15 +177,15 @@
 /* Structure for user data */
 
 typedef struct {
-  realtype **P[NGRP];
+  sunrealtype **P[NGRP];
   sunindextype *pivot[NGRP];
   int ns, mxns;
   int mp, mq, mx, my, ngrp, ngx, ngy, mxmp;
   int jgx[NGX+1], jgy[NGY+1], jigx[MX], jigy[MY];
   int jxr[NGX], jyr[NGY];
-  realtype acoef[NS][NS], bcoef[NS], diff[NS];
-  realtype cox[NS], coy[NS], dx, dy, srur;
-  realtype fsave[NEQ];
+  sunrealtype acoef[NS][NS], bcoef[NS], diff[NS];
+  sunrealtype cox[NS], coy[NS], dx, dy, srur;
+  sunrealtype fsave[NEQ];
   N_Vector tmp;
   N_Vector rewt;
   void *cvode_mem;
@@ -199,33 +199,33 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[]);
 static void CInit(N_Vector c, WebData wdata);
 static void PrintIntro(void);
 static void PrintHeader(int jpre, int gstype);
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t);
-static void PrintOutput(void *cvode_mem, realtype t);
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t);
+static void PrintOutput(void *cvode_mem, sunrealtype t);
 static void PrintFinalStats(void *cvode_mem);
 static void FreeUserData(WebData wdata);
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-		     realtype rate[], WebData wdata);
-static void fblock (realtype t, realtype cdata[], int jx, int jy,
-		    realtype cdotdata[], WebData wdata);
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata);
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+		     sunrealtype rate[], WebData wdata);
+static void fblock (sunrealtype t, sunrealtype cdata[], int jx, int jy,
+		    sunrealtype cdotdata[], WebData wdata);
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata);
 
 /* Small Vector Kernels */
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_sum_prods(realtype u[], realtype p[], realtype q[], realtype v[],
-                        realtype w[], int n);
-static void v_prod(realtype u[], realtype v[], realtype w[], int n);
-static void v_zero(realtype u[], int n);
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[], sunrealtype v[],
+                        sunrealtype w[], int n);
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n);
+static void v_zero(sunrealtype u[], int n);
 
 /* Functions Called By The Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Precond(realtype tn, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data);
+static int Precond(sunrealtype tn, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
 
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data);
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data);
 
 /* Private function to check function return values */
 
@@ -238,12 +238,12 @@ static SUNContext sunctx;
 
 int main()
 {
-  realtype abstol=ATOL, reltol=RTOL, t, tout;
+  sunrealtype abstol=ATOL, reltol=RTOL, t, tout;
   N_Vector c;
   WebData wdata;
   SUNLinearSolver LS;
   void *cvode_mem;
-  booleantype firstrun;
+  sunbooleantype firstrun;
   int jpre, gstype, retval;
   int ns, mxns, iout;
 
@@ -331,7 +331,7 @@ int main()
         PrintOutput(cvode_mem, t);
         if (firstrun && (iout % 3 == 0)) PrintAllSpecies(c, ns, mxns, t);
         if(check_retval(&retval, "CVode", 1)) break;
-        if (tout > RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
+        if (tout > SUN_RCONST(0.9)) tout += DTOUT; else tout *= TOUT_MULT;
       }
 
       /* Print final statistics, and loop for next case */
@@ -369,8 +369,8 @@ static WebData AllocUserData(void)
 static void InitUserData(WebData wdata)
 {
   int i, j, ns;
-  realtype *bcoef, *diff, *cox, *coy, dx, dy;
-  realtype (*acoef)[NS];
+  sunrealtype *bcoef, *diff, *cox, *coy, dx, dy;
+  sunrealtype (*acoef)[NS];
 
   acoef = wdata->acoef;
   bcoef = wdata->bcoef;
@@ -409,7 +409,7 @@ static void InitUserData(WebData wdata)
   wdata->mq = MQ;
   wdata->mx = MX;
   wdata->my = MY;
-  wdata->srur = sqrt(UNIT_ROUNDOFF);
+  wdata->srur = sqrt(SUN_UNIT_ROUNDOFF);
   wdata->mxmp = MXMP;
   wdata->ngrp = NGRP;
   wdata->ngx = NGX;
@@ -450,7 +450,7 @@ static void SetGroups(int m, int ng, int jg[], int jig[], int jr[])
 static void CInit(N_Vector c, WebData wdata)
 {
   int jx, jy, ns, mxns, ioff, iyoff, i, ici;
-  realtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
+  sunrealtype argx, argy, x, y, dx, dy, x_factor, y_factor, *cdata;
 
   cdata = N_VGetArrayPointer(c);
   ns = wdata->ns;
@@ -458,8 +458,8 @@ static void CInit(N_Vector c, WebData wdata)
   dx = wdata->dx;
   dy = wdata->dy;
 
-  x_factor = RCONST(4.0)/SQR(AX);
-  y_factor = RCONST(4.0)/SQR(AY);
+  x_factor = SUN_RCONST(4.0)/SQR(AX);
+  y_factor = SUN_RCONST(4.0)/SQR(AY);
   for (jy = 0; jy < MY; jy++) {
     y = jy*dy;
     argy = SQR(y_factor*y*(AY-y));
@@ -470,7 +470,7 @@ static void CInit(N_Vector c, WebData wdata)
       ioff = iyoff + ns*jx;
       for (i = 1; i <= ns; i++) {
         ici = ioff + i-1;
-        cdata[ici] = RCONST(10.0) + i*argx*argy;
+        cdata[ici] = SUN_RCONST(10.0) + i*argx*argy;
       }
     }
   }
@@ -539,10 +539,10 @@ static void PrintHeader(int jpre, int gstype)
     printf("\nGram-Schmidt method type is    gstype = %s\n\n\n", "SUN_CLASSICAL_GS");
 }
 
-static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
+static void PrintAllSpecies(N_Vector c, int ns, int mxns, sunrealtype t)
 {
   int i, jx ,jy;
-  realtype *cdata;
+  sunrealtype *cdata;
 
   cdata = N_VGetArrayPointer(c);
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -570,11 +570,11 @@ static void PrintAllSpecies(N_Vector c, int ns, int mxns, realtype t)
   }
 }
 
-static void PrintOutput(void *cvode_mem, realtype t)
+static void PrintOutput(void *cvode_mem, sunrealtype t)
 {
   long int nst, nfe, nni;
   int qu, retval;
-  realtype hu;
+  sunrealtype hu;
 
   retval = CVodeGetNumSteps(cvode_mem, &nst);
   check_retval(&retval, "CVodeGetNumSteps", 1);
@@ -606,7 +606,7 @@ static void PrintFinalStats(void *cvode_mem)
   long int nst, nfe, nsetups, nni, ncfn, netf;
   long int nli, npe, nps, ncfl, nfeLS;
   int retval;
-  realtype avdim;
+  sunrealtype avdim;
 
   retval = CVodeGetWorkSpace(cvode_mem, &lenrw, &leniw);
   check_retval(&retval, "CVodeGetWorkSpace", 1);
@@ -653,7 +653,7 @@ static void PrintFinalStats(void *cvode_mem)
   printf(" Number of error test failures         = %4ld \n", netf);
   printf(" Number of nonlinear conv. failures    = %4ld \n", ncfn);
   printf(" Number of linear convergence failures = %4ld \n", ncfl);
-  avdim = (nni > 0) ? ((realtype)nli)/((realtype)nni) : ZERO;
+  avdim = (nni > 0) ? ((sunrealtype)nli)/((sunrealtype)nni) : ZERO;
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf(" Average Krylov subspace dimension     = %.3Lf \n", avdim);
 #else
@@ -684,11 +684,11 @@ static void FreeUserData(WebData wdata)
  returns it in cdot. The interaction rates are computed by calls to WebRates,
  and these are saved in fsave for use in preconditioning.
 */
-static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
+static int f(sunrealtype t, N_Vector c, N_Vector cdot,void *user_data)
 {
   int i, ic, ici, idxl, idxu, jx, ns, mxns, iyoff, jy, idyu, idyl;
-  realtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
-  realtype *cdata, *cdotdata;
+  sunrealtype dcxli, dcxui, dcyli, dcyui, x, y, *cox, *coy, *fsave, dx, dy;
+  sunrealtype *cdata, *cdotdata;
   WebData wdata;
 
   wdata = (WebData) user_data;
@@ -739,12 +739,12 @@ static int f(realtype t, N_Vector c, N_Vector cdot,void *user_data)
   c_1, ... ,c_ns (stored in c[0],...,c[ns-1]), at one spatial point
   and at time t.
 */
-static void WebRates(realtype x, realtype y, realtype t, realtype c[],
-                     realtype rate[], WebData wdata)
+static void WebRates(sunrealtype x, sunrealtype y, sunrealtype t, sunrealtype c[],
+                     sunrealtype rate[], WebData wdata)
 {
   int i, j, ns;
-  realtype fac, *bcoef;
-  realtype (*acoef)[NS];
+  sunrealtype fac, *bcoef;
+  sunrealtype (*acoef)[NS];
 
   ns = wdata->ns;
   acoef = wdata->acoef;
@@ -775,16 +775,16 @@ static void WebRates(realtype x, realtype y, realtype t, realtype c[],
  of a block-diagonal preconditioner. The blocks are of size mp, and
  there are ngrp=ngx*ngy blocks computed in the block-grouping scheme.
 */
-static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
-                   booleantype *jcurPtr, realtype gamma, void *user_data)
+static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok,
+                   sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
-  realtype ***P;
+  sunrealtype ***P;
   sunindextype **pivot;
   int i, if0, if00, ig, igx, igy, j, jj, jx, jy;
   int *jxr, *jyr, ngrp, ngx, ngy, mxmp, mp, retval;
   sunindextype denseretval;
-  realtype uround, fac, r, r0, save, srur;
-  realtype *f1, *fsave, *cdata, *rewtdata;
+  sunrealtype uround, fac, r, r0, save, srur;
+  sunrealtype *f1, *fsave, *cdata, *rewtdata;
   WebData wdata;
   void *cvode_mem;
   N_Vector rewt;
@@ -797,7 +797,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   if(check_retval(&retval, "CVodeGetErrWeights", 1)) return(1);
   rewtdata = N_VGetArrayPointer(rewt);
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
 
   P = wdata->P;
   pivot = wdata->pivot;
@@ -818,7 +818,7 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   f1 = N_VGetArrayPointer(wdata->tmp);
 
   fac = N_VWrmsNorm (fc, rewt);
-  r0 = RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
+  r0 = SUN_RCONST(1000.0)*fabs(gamma)*uround*NEQ*fac;
   if (r0 == ZERO) r0 = ONE;
 
   for (igy = 0; igy < ngy; igy++) {
@@ -862,11 +862,11 @@ static int Precond(realtype t, N_Vector c, N_Vector fc, booleantype jok,
   system, namely block (jx,jy), for use in preconditioning.
   Here jx and jy count from 0.
 */
-static void fblock(realtype t, realtype cdata[], int jx, int jy,
-                   realtype cdotdata[], WebData wdata)
+static void fblock(sunrealtype t, sunrealtype cdata[], int jx, int jy,
+                   sunrealtype cdotdata[], WebData wdata)
 {
   int iblok, ic;
-  realtype x, y;
+  sunrealtype x, y;
 
   iblok = jx + jy*(wdata->mx);
   y = jy*(wdata->dy);
@@ -885,10 +885,10 @@ static void fblock(realtype t, realtype cdata[], int jx, int jy,
   Then it computes ((I - gamma*Jr)-inverse)*z, using LU factors of the
   blocks in P, and pivot information in pivot, and returns the result in z.
 */
-static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
-                  realtype gamma, realtype delta, int lr, void *user_data)
+static int PSolve(sunrealtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
+                  sunrealtype gamma, sunrealtype delta, int lr, void *user_data)
 {
-  realtype   ***P;
+  sunrealtype   ***P;
   sunindextype **pivot;
   int jx, jy, igx, igy, iv, ig, *jigx, *jigy, mx, my, ngx, mp;
   WebData wdata;
@@ -935,12 +935,12 @@ static int PSolve(realtype tn, N_Vector c, N_Vector fc, N_Vector r, N_Vector z,
   Some inner loops of length ns are implemented with the small
   vector kernels v_sum_prods, v_prod, v_inc_by_prod.
 */
-static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
+static void GSIter(sunrealtype gamma, N_Vector z, N_Vector x, WebData wdata)
 {
   int jx, jy, mx, my, x_loc, y_loc;
   int ns, mxns, i, iyoff, ic, iter;
-  realtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
-  realtype temp, *cox, *coy, *xd, *zd;
+  sunrealtype beta[NS], beta2[NS], cof1[NS], gam[NS], gam2[NS];
+  sunrealtype temp, *cox, *coy, *xd, *zd;
 
   xd = N_VGetArrayPointer(x);
   zd = N_VGetArrayPointer(z);
@@ -955,11 +955,11 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
      Load local arrays beta, beta2, gam, gam2, and cof1. */
 
   for (i = 0; i < ns; i++) {
-    temp = ONE/(ONE + RCONST(2.0)*gamma*(cox[i] + coy[i]));
+    temp = ONE/(ONE + SUN_RCONST(2.0)*gamma*(cox[i] + coy[i]));
     beta[i] = gamma*cox[i]*temp;
-    beta2[i] = RCONST(2.0)*beta[i];
+    beta2[i] = SUN_RCONST(2.0)*beta[i];
     gam[i] = gamma*coy[i]*temp;
-    gam2[i] = RCONST(2.0)*gam[i];
+    gam2[i] = SUN_RCONST(2.0)*gam[i];
     cof1[i] = temp;
   }
 
@@ -1106,26 +1106,26 @@ static void GSIter(realtype gamma, N_Vector z, N_Vector x, WebData wdata)
   }
 }
 
-static void v_inc_by_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_inc_by_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] += v[i]*w[i];
 }
 
-static void v_sum_prods(realtype u[], realtype p[], realtype q[],
-                        realtype v[], realtype w[], int n)
+static void v_sum_prods(sunrealtype u[], sunrealtype p[], sunrealtype q[],
+                        sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = p[i]*q[i] + v[i]*w[i];
 }
 
-static void v_prod(realtype u[], realtype v[], realtype w[], int n)
+static void v_prod(sunrealtype u[], sunrealtype v[], sunrealtype w[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = v[i]*w[i];
 }
 
-static void v_zero(realtype u[], int n)
+static void v_zero(sunrealtype u[], int n)
 {
   int i;
   for (i=0; i < n; i++) u[i] = ZERO;
diff --git a/examples/cvodes/serial/cvsParticle_dns.c b/examples/cvodes/serial/cvsParticle_dns.c
index 08b8573fb2..debe2da355 100644
--- a/examples/cvodes/serial/cvsParticle_dns.c
+++ b/examples/cvodes/serial/cvsParticle_dns.c
@@ -70,21 +70,21 @@
 #endif
 
 /* Problem Constants */
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 /* User-defined data structure */
 typedef struct UserData_
 {
-  realtype alpha; /* particle velocity */
+  sunrealtype alpha; /* particle velocity */
 
   int      orbits; /* number of orbits */
-  realtype torbit; /* orbit time       */
+  sunrealtype torbit; /* orbit time       */
 
-  realtype rtol; /* integration tolerances */
-  realtype atol;
+  sunrealtype rtol; /* integration tolerances */
+  sunrealtype atol;
 
   int proj;    /* enable/disable solution projection */
   int projerr; /* enable/disable error projection */
@@ -95,20 +95,20 @@ typedef struct UserData_
 } *UserData;
 
 /* Functions provided to CVODES */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int Proj(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj,
+static int Proj(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj,
                 N_Vector err, void *user_data);
 
 /* Utility functions */
 static int InitUserData(int *argc, char ***argv, UserData udata);
 static int PrintUserData(UserData udata);
 static void InputHelp();
-static int ComputeSolution(realtype t, N_Vector y, UserData udata);
-static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
+static int ComputeSolution(sunrealtype t, N_Vector y, UserData udata);
+static int ComputeError(sunrealtype t, N_Vector y, N_Vector e, sunrealtype *ec,
                         UserData udata);
-static int WriteOutput(realtype t, N_Vector y, N_Vector e, realtype ec,
+static int WriteOutput(sunrealtype t, N_Vector y, N_Vector e, sunrealtype ec,
                        int screenfile, FILE *YFID, FILE *EFID);
 static int PrintStats(void *cvode_mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -123,16 +123,16 @@ int main(int argc, char* argv[])
   int      retval;          /* reusable return flag       */
   int      out      = 0;    /* output counter             */
   int      totalout = 0;    /* output counter             */
-  realtype t        = ZERO; /* current integration time   */
-  realtype dtout    = ZERO; /* output spacing             */
-  realtype tout     = ZERO; /* next output time           */
-  realtype ec       = ZERO; /* constraint error           */
+  sunrealtype t        = ZERO; /* current integration time   */
+  sunrealtype dtout    = ZERO; /* output spacing             */
+  sunrealtype tout     = ZERO; /* next output time           */
+  sunrealtype ec       = ZERO; /* constraint error           */
   UserData udata    = NULL; /* user data structure        */
 
   SUNContext      sunctx     = NULL; /* SUNDIALS context     */
   void            *cvode_mem = NULL; /* CVODES memory        */
   N_Vector         y         = NULL; /* solution vector      */
-  realtype        *ydata     = NULL; /* solution vector data */
+  sunrealtype        *ydata     = NULL; /* solution vector data */
   N_Vector         e         = NULL; /* error vector         */
   SUNMatrix        A         = NULL; /* Jacobian matrix      */
   SUNLinearSolver  LS        = NULL; /* linear solver        */
@@ -312,11 +312,11 @@ int main(int argc, char* argv[])
 
 
 /* Compute the right-hand side function, y' = f(t,y) */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   UserData  udata = (UserData) user_data;
-  realtype *ydata = N_VGetArrayPointer(y);
-  realtype *fdata = N_VGetArrayPointer(ydot);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *fdata = N_VGetArrayPointer(ydot);
 
   fdata[0] = -(udata->alpha) * ydata[1];
   fdata[1] =  (udata->alpha) * ydata[0];
@@ -326,11 +326,11 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 /* Compute the Jacobian of the right-hand side function, J(t,y) = df/dy */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData  udata = (UserData) user_data;
-  realtype *Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype *Jdata = SUNDenseMatrix_Data(J);
 
   Jdata[0] =  ZERO;
   Jdata[1] = -(udata->alpha);
@@ -341,16 +341,16 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 }
 
 /* Project the solution onto the constraint manifold */
-static int Proj(realtype t, N_Vector ycur, N_Vector corr, realtype epsProj,
+static int Proj(sunrealtype t, N_Vector ycur, N_Vector corr, sunrealtype epsProj,
                 N_Vector err, void *user_data)
 {
-  realtype *ydata = N_VGetArrayPointer(ycur);
-  realtype *cdata = N_VGetArrayPointer(corr);
-  realtype *edata = NULL;
-  realtype  x = ydata[0];
-  realtype  y = ydata[1];
-  realtype  xp, yp, r;
-  realtype  errxp, erryp;
+  sunrealtype *ydata = N_VGetArrayPointer(ycur);
+  sunrealtype *cdata = N_VGetArrayPointer(corr);
+  sunrealtype *edata = NULL;
+  sunrealtype  x = ydata[0];
+  sunrealtype  y = ydata[1];
+  sunrealtype  xp, yp, r;
+  sunrealtype  errxp, erryp;
 
   /* project onto the unit circle */
   r = SQRT(x * x + y * y);
@@ -392,8 +392,8 @@ static int InitUserData(int *argc, char ***argv, UserData udata)
   udata->orbits = 100;
   udata->torbit = (TWO * PI) / udata->alpha;
 
-  udata->rtol = RCONST(1.0e-4);
-  udata->atol = RCONST(1.0e-9);
+  udata->rtol = SUN_RCONST(1.0e-4);
+  udata->atol = SUN_RCONST(1.0e-9);
 
   udata->proj    = 1;
   udata->projerr = 0;
@@ -502,9 +502,9 @@ static void InputHelp()
 
 
 /* Compute the analytical solution */
-static int ComputeSolution(realtype t, N_Vector y, UserData udata)
+static int ComputeSolution(sunrealtype t, N_Vector y, UserData udata)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
 
   ydata[0] = COS((udata->alpha) * t);
   ydata[1] = SIN((udata->alpha) * t);
@@ -514,10 +514,10 @@ static int ComputeSolution(realtype t, N_Vector y, UserData udata)
 
 
 /* Compute the error in the solution and constraint */
-static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
+static int ComputeError(sunrealtype t, N_Vector y, N_Vector e, sunrealtype *ec,
                         UserData udata)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
   int retval;
 
   /* solution error */
@@ -532,11 +532,11 @@ static int ComputeError(realtype t, N_Vector y, N_Vector e, realtype *ec,
 }
 
 /* Output the solution to the screen or disk */
-static int WriteOutput(realtype t, N_Vector y, N_Vector e, realtype ec,
+static int WriteOutput(sunrealtype t, N_Vector y, N_Vector e, sunrealtype ec,
                        int screenfile, FILE* YFID, FILE* EFID)
 {
-  realtype *ydata = N_VGetArrayPointer(y);
-  realtype *edata = N_VGetArrayPointer(e);
+  sunrealtype *ydata = N_VGetArrayPointer(y);
+  sunrealtype *edata = N_VGetArrayPointer(e);
 
   if (screenfile == 0)
   {
diff --git a/examples/cvodes/serial/cvsPendulum_dns.c b/examples/cvodes/serial/cvsPendulum_dns.c
index ce7e5e60d9..66424e4a2b 100644
--- a/examples/cvodes/serial/cvsPendulum_dns.c
+++ b/examples/cvodes/serial/cvsPendulum_dns.c
@@ -96,27 +96,27 @@
 #endif
 
 /* Problem Constants */
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define GRAV  RCONST(13.750371636040745654980191559621114395801712)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define GRAV  SUN_RCONST(13.750371636040745654980191559621114395801712)
 
 /* Functions provided to CVODES */
-static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data);
+static int fref(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data);
 
-static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data);
-static int proj(realtype t, N_Vector yy, N_Vector corr,
-                realtype epsProj, N_Vector err, void *pdata);
+static int f(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data);
+static int proj(sunrealtype t, N_Vector yy, N_Vector corr,
+                sunrealtype epsProj, N_Vector err, void *pdata);
 
 /* Functions to integrate the Cartesian and reference solutions */
-int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
-           realtype tf, int nout, booleantype proj, booleantype projerr,
+int GetSol(void *cvode_mem, N_Vector yy0, sunrealtype rtol, sunrealtype atol,
+           sunrealtype tf, int nout, sunbooleantype proj, sunbooleantype projerr,
            N_Vector yref);
 
-int RefSol(realtype tf, N_Vector yref, int nout);
+int RefSol(sunrealtype tf, N_Vector yref, int nout);
 
 /* Utility functions */
-static int ReadInputs(int *argc, char ***argv, realtype *rtol, realtype *atol,
-                      realtype *tf, int *nout, booleantype *projerr);
+static int ReadInputs(int *argc, char ***argv, sunrealtype *rtol, sunrealtype *atol,
+                      sunrealtype *tf, int *nout, sunbooleantype *projerr);
 static void InputHelp();
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -132,14 +132,14 @@ int main(int argc, char* argv[])
   int         i;
   int         retval;                   /* reusable return flag    */
   int         nout    = 1;              /* number of outputs       */
-  realtype    rtol    = RCONST(1.0e-5); /* base relative tolerance */
-  realtype    atol    = RCONST(1.0e-5); /* base absolute tolerance */
-  realtype    tf      = RCONST(30.0);   /* final integration time  */
-  booleantype projerr = SUNTRUE;        /* enable error projection */
+  sunrealtype    rtol    = SUN_RCONST(1.0e-5); /* base relative tolerance */
+  sunrealtype    atol    = SUN_RCONST(1.0e-5); /* base absolute tolerance */
+  sunrealtype    tf      = SUN_RCONST(30.0);   /* final integration time  */
+  sunbooleantype projerr = SUNTRUE;        /* enable error projection */
 
   void            *cvode_mem = NULL; /* CVODES memory             */
   N_Vector         yy0       = NULL; /* initial condition vector  */
-  realtype        *yy0data   = NULL; /* vector data               */
+  sunrealtype        *yy0data   = NULL; /* vector data               */
   N_Vector         yref      = NULL; /* reference solution vector */
   SUNMatrix        A         = NULL; /* Jacobian matrix           */
   SUNLinearSolver  LS        = NULL; /* linear solver             */
@@ -216,8 +216,8 @@ int main(int argc, char* argv[])
     if (check_retval(&retval, "GetSol", 1)) return(1);
 
     /* Reduce tolerance for next run */
-    rtol /= RCONST(10.0);
-    atol /= RCONST(10.0);
+    rtol /= SUN_RCONST(10.0);
+    atol /= SUN_RCONST(10.0);
   }
 
   /* Free memory */
@@ -238,23 +238,23 @@ int main(int argc, char* argv[])
 
 
 /* Compute the Cartesian system solution */
-int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
-           realtype tf, int nout, booleantype proj, booleantype projerr,
+int GetSol(void *cvode_mem, N_Vector yy0, sunrealtype rtol, sunrealtype atol,
+           sunrealtype tf, int nout, sunbooleantype proj, sunbooleantype projerr,
            N_Vector yref)
 {
   char      outname[100];  /* output file name */
   FILE     *FID    = NULL; /* output file      */
   N_Vector  yy     = NULL; /* solution vector  */
-  realtype *yydata = NULL; /* vector data      */
+  sunrealtype *yydata = NULL; /* vector data      */
 
   int      retval; /* reusable return flag */
   int      out;    /* output counter       */
-  realtype dtout;  /* output frequency     */
-  realtype tout;   /* output time          */
-  realtype t;      /* return time          */
-  realtype x, y;   /* position values      */
-  realtype xd, yd; /* velocity values      */
-  realtype g;      /* constraint value     */
+  sunrealtype dtout;  /* output frequency     */
+  sunrealtype tout;   /* output time          */
+  sunrealtype t;      /* return time          */
+  sunrealtype x, y;   /* position values      */
+  sunrealtype xd, yd; /* velocity values      */
+  sunrealtype g;      /* constraint value     */
 
   /* Integrator stats */
   long int nst, nfe, nsetups, nje, nfeLS, ncfn, netf;
@@ -417,22 +417,22 @@ int GetSol(void *cvode_mem, N_Vector yy0, realtype rtol, realtype atol,
 
 
 /* Compute the reference system solution */
-int RefSol(realtype tf, N_Vector yref, int nout)
+int RefSol(sunrealtype tf, N_Vector yref, int nout)
 {
   FILE            *FID       = NULL; /* output file     */
   void            *cvode_mem = NULL; /* CVODES memory   */
   N_Vector         yy        = NULL; /* solution vector */
-  realtype        *yydata    = NULL; /* vector data     */
+  sunrealtype        *yydata    = NULL; /* vector data     */
   SUNMatrix        A         = NULL; /* Jacobian matrix */
   SUNLinearSolver  LS        = NULL; /* linear solver   */
 
   int      retval;                /* reusable return flag  */
   int      out;                   /* output counter        */
-  realtype dtout;                 /* output frequency      */
-  realtype tout;                  /* output time           */
-  realtype t;                     /* return time           */
-  realtype th, thd;               /* theta and theta dot   */
-  realtype tol = RCONST(1.0e-14); /* integration tolerance */
+  sunrealtype dtout;                 /* output frequency      */
+  sunrealtype tout;                  /* output time           */
+  sunrealtype t;                     /* return time           */
+  sunrealtype th, thd;               /* theta and theta dot   */
+  sunrealtype tol = SUN_RCONST(1.0e-14); /* integration tolerance */
 
   /* Create the solution vector */
   yy = N_VNew_Serial(2, sunctx);
@@ -564,10 +564,10 @@ int RefSol(realtype tf, N_Vector yref, int nout)
 
 
 /* ODE RHS function for the reference system */
-static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data)
+static int fref(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data)
 {
-  realtype *yydata = NULL; /* yy vector data */
-  realtype *fydata = NULL; /* fy vector data */
+  sunrealtype *yydata = NULL; /* yy vector data */
+  sunrealtype *fydata = NULL; /* fy vector data */
 
   /* Get vector array pointers */
   yydata = N_VGetArrayPointer(yy);
@@ -580,14 +580,14 @@ static int fref(realtype t, N_Vector yy, N_Vector fy, void *f_data)
 
 
 /* ODE RHS function for the Cartesian system */
-static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data)
+static int f(sunrealtype t, N_Vector yy, N_Vector fy, void *f_data)
 {
-  realtype *yydata = NULL; /* yy vector data */
-  realtype *fydata = NULL; /* fy vector data */
+  sunrealtype *yydata = NULL; /* yy vector data */
+  sunrealtype *fydata = NULL; /* fy vector data */
 
-  realtype x, y;   /* positions  */
-  realtype xd, yd; /* velocities */
-  realtype tmp;
+  sunrealtype x, y;   /* positions  */
+  sunrealtype xd, yd; /* velocities */
+  sunrealtype tmp;
 
   /* Get vector array pointers */
   yydata = N_VGetArrayPointer(yy);
@@ -613,19 +613,19 @@ static int f(realtype t, N_Vector yy, N_Vector fy, void *f_data)
 
 
 /* Projection function */
-static int proj(realtype t, N_Vector yy, N_Vector corr,
-                realtype epsProj, N_Vector err, void *pdata)
+static int proj(sunrealtype t, N_Vector yy, N_Vector corr,
+                sunrealtype epsProj, N_Vector err, void *pdata)
 {
-  realtype *yydata = NULL; /* yy vector data   */
-  realtype *cdata  = NULL; /* corr vector data */
-  realtype *edata  = NULL; /* err vector data */
+  sunrealtype *yydata = NULL; /* yy vector data   */
+  sunrealtype *cdata  = NULL; /* corr vector data */
+  sunrealtype *edata  = NULL; /* err vector data */
 
-  realtype x, y, x_new, y_new;     /* positions  */
-  realtype xd, yd, xd_new, yd_new; /* velocities */
+  sunrealtype x, y, x_new, y_new;     /* positions  */
+  sunrealtype xd, yd, xd_new, yd_new; /* velocities */
 
-  realtype e1, e2, e3, e4;
-  realtype e1_new, e2_new, e3_new, e4_new;
-  realtype R;
+  sunrealtype e1, e2, e3, e4;
+  sunrealtype e1_new, e2_new, e3_new, e4_new;
+  sunrealtype R;
 
   /* Get vector array pointers */
 
@@ -697,8 +697,8 @@ static int proj(realtype t, N_Vector yy, N_Vector corr,
 
 
 /* Read command line unputs */
-static int ReadInputs(int *argc, char ***argv, realtype *rtol, realtype *atol,
-                      realtype *tf, int *nout, booleantype *projerr)
+static int ReadInputs(int *argc, char ***argv, sunrealtype *rtol, sunrealtype *atol,
+                      sunrealtype *tf, int *nout, sunbooleantype *projerr)
 {
   int arg_idx = 1;
 
diff --git a/examples/cvodes/serial/cvsRoberts_ASAi_dns.c b/examples/cvodes/serial/cvsRoberts_ASAi_dns.c
index 232ff1e0af..611cf8d520 100644
--- a/examples/cvodes/serial/cvsRoberts_ASAi_dns.c
+++ b/examples/cvodes/serial/cvsRoberts_ASAi_dns.c
@@ -59,7 +59,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -71,56 +71,56 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-6)  /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-6)  /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-8)  /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-14)
-#define ATOL3    RCONST(1e-6)
+#define ATOL1    SUN_RCONST(1e-8)  /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-14)
+#define ATOL3    SUN_RCONST(1e-6)
 
-#define ATOLl    RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
-#define ATOLq    RCONST(1e-6)  /* absolute tolerance for quadratures   */
+#define ATOLl    SUN_RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
+#define ATOLq    SUN_RCONST(1e-6)  /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e7)   /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e7)   /* final time                           */
 
-#define TB1      RCONST(4e7)   /* starting point for adjoint problem   */
-#define TB2      RCONST(50.0)  /* starting point for adjoint problem   */
-#define TBout1   RCONST(40.0)  /* intermediate t for adjoint problem   */
+#define TB1      SUN_RCONST(4e7)   /* starting point for adjoint problem   */
+#define TB2      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
+#define TBout1   SUN_RCONST(40.0)  /* intermediate t for adjoint problem   */
 
 #define STEPS    150           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ZERO     RCONST(0.0)
+#define ZERO     SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int fB(realtype t, N_Vector y,
+static int fB(sunrealtype t, N_Vector y,
               N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB);
 
 
 /* Prototypes of private functions */
 
-static void PrintHead(realtype tB0);
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB);
+static void PrintHead(sunrealtype tB0);
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -139,17 +139,17 @@ int main(int argc, char *argv[])
   void *cvode_mem;
   FILE* FID;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector y, q;
 
   int steps;
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, qB;
 
-  realtype time;
+  sunrealtype time;
   int retval, ncheck;
 
   CVadjCheckPointRec *ckpnt;
@@ -174,9 +174,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS simulation context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -185,7 +185,7 @@ int main(int argc, char *argv[])
   /* Initialize y */
   y = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return(1);
-  Ith(y,1) = RCONST(1.0);
+  Ith(y,1) = SUN_RCONST(1.0);
   Ith(y,2) = ZERO;
   Ith(y,3) = ZERO;
 
@@ -542,11 +542,11 @@ int main(int argc, char *argv[])
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -563,12 +563,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -585,7 +585,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fQ routine. Compute fQ(t,y).
 */
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(y,3);
 
@@ -599,7 +599,7 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -620,13 +620,13 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * fB routine. Compute fB(t,y,yB).
 */
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype l21, l32;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32;
 
   data = (UserData) user_dataB;
 
@@ -645,8 +645,8 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
 
   /* Load yBdot */
   Ith(yBdot,1) = - p1*l21;
-  Ith(yBdot,2) = p2*y3*l21 - RCONST(2.0)*p3*y2*l32;
-  Ith(yBdot,3) = p2*y2*l21 - RCONST(1.0);
+  Ith(yBdot,2) = p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l32;
+  Ith(yBdot,3) = p2*y2*l21 - SUN_RCONST(1.0);
 
   return(0);
 }
@@ -655,12 +655,12 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
  * JacB routine. Compute JB(t,y,yB).
  */
 
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
 
   data = (UserData) user_dataB;
 
@@ -672,7 +672,7 @@ static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
 
   /* Load JB */
   IJth(JB,1,1) = p1;     IJth(JB,1,2) = -p1;             IJth(JB,1,3) = ZERO;
-  IJth(JB,2,1) = -p2*y3; IJth(JB,2,2) = p2*y3+2.0*p3*y2; IJth(JB,2,3) = RCONST(-2.0)*p3*y2;
+  IJth(JB,2,1) = -p2*y3; IJth(JB,2,2) = p2*y3+2.0*p3*y2; IJth(JB,2,3) = SUN_RCONST(-2.0)*p3*y2;
   IJth(JB,3,1) = -p2*y2; IJth(JB,3,2) = p2*y2;           IJth(JB,3,3) = ZERO;
 
   return(0);
@@ -682,12 +682,12 @@ static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
  * fQB routine. Compute integrand for quadratures
 */
 
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, l3;
-  realtype l21, l32, y23;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32, y23;
 
   /* The y vector */
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
@@ -717,7 +717,7 @@ static int fQB(realtype t, N_Vector y, N_Vector yB,
  * Print heading for backward integration
  */
 
-static void PrintHead(realtype tB0)
+static void PrintHead(sunrealtype tB0)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("Backward integration from tB0 = %12.4Le\n\n",tB0);
@@ -732,7 +732,7 @@ static void PrintHead(realtype tB0)
  * Print intermediate results during backward integration
  */
 
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -764,7 +764,7 @@ static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
  * Print final results of backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c b/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
index 21538d367d..771f4366fa 100644
--- a/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
+++ b/examples/cvodes/serial/cvsRoberts_ASAi_dns_constraints.c
@@ -61,7 +61,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -73,56 +73,56 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-4)  /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-4)  /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-4)  /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-8)
-#define ATOL3    RCONST(1e-4)
+#define ATOL1    SUN_RCONST(1e-4)  /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-8)
+#define ATOL3    SUN_RCONST(1e-4)
 
-#define ATOLl    RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
-#define ATOLq    RCONST(1e-6)  /* absolute tolerance for quadratures   */
+#define ATOLl    SUN_RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
+#define ATOLq    SUN_RCONST(1e-6)  /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e7)   /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e7)   /* final time                           */
 
-#define TB1      RCONST(4e7)   /* starting point for adjoint problem   */
-#define TB2      RCONST(50.0)  /* starting point for adjoint problem   */
-#define TBout1   RCONST(40.0)  /* intermediate t for adjoint problem   */
+#define TB1      SUN_RCONST(4e7)   /* starting point for adjoint problem   */
+#define TB2      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
+#define TBout1   SUN_RCONST(40.0)  /* intermediate t for adjoint problem   */
 
 #define STEPS    150           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ZERO     RCONST(0.0)
-#define ONE      RCONST(1.0)
+#define ZERO     SUN_RCONST(0.0)
+#define ONE      SUN_RCONST(1.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int fB(realtype t, N_Vector y,
+static int fB(sunrealtype t, N_Vector y,
               N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB);
 
 
 /* Prototypes of private functions */
 
-static void PrintHead(realtype tB0);
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB);
+static void PrintHead(sunrealtype tB0);
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -141,17 +141,17 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS, LSB;
   void *cvode_mem;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector y, q, constraints;
 
   int steps;
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, qB, constraintsB;
 
-  realtype time;
+  sunrealtype time;
   int retval, ncheck;
 
   long int nst, nstB;
@@ -180,9 +180,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS simulation context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
   /* Initialize y */
   y = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return(1);
-  Ith(y,1) = RCONST(1.0);
+  Ith(y,1) = SUN_RCONST(1.0);
   Ith(y,2) = ZERO;
   Ith(y,3) = ZERO;
 
@@ -540,11 +540,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
 */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -561,12 +561,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -583,7 +583,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fQ routine. Compute fQ(t,y).
 */
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(y,3);
 
@@ -597,7 +597,7 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -618,13 +618,13 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * fB routine. Compute fB(t,y,yB).
 */
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype l21, l32;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32;
 
   data = (UserData) user_dataB;
 
@@ -643,8 +643,8 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
 
   /* Load yBdot */
   Ith(yBdot,1) = - p1*l21;
-  Ith(yBdot,2) = p2*y3*l21 - RCONST(2.0)*p3*y2*l32;
-  Ith(yBdot,3) = p2*y2*l21 - RCONST(1.0);
+  Ith(yBdot,2) = p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l32;
+  Ith(yBdot,3) = p2*y2*l21 - SUN_RCONST(1.0);
 
   return(0);
 }
@@ -653,12 +653,12 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
  * JacB routine. Compute JB(t,y,yB).
  */
 
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
 
   data = (UserData) user_dataB;
 
@@ -670,7 +670,7 @@ static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
 
   /* Load JB */
   IJth(JB,1,1) = p1;     IJth(JB,1,2) = -p1;             IJth(JB,1,3) = ZERO;
-  IJth(JB,2,1) = -p2*y3; IJth(JB,2,2) = p2*y3+2.0*p3*y2; IJth(JB,2,3) = RCONST(-2.0)*p3*y2;
+  IJth(JB,2,1) = -p2*y3; IJth(JB,2,2) = p2*y3+2.0*p3*y2; IJth(JB,2,3) = SUN_RCONST(-2.0)*p3*y2;
   IJth(JB,3,1) = -p2*y2; IJth(JB,3,2) = p2*y2;           IJth(JB,3,3) = ZERO;
 
   return(0);
@@ -680,12 +680,12 @@ static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
  * fQB routine. Compute integrand for quadratures
 */
 
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, l3;
-  realtype l21, l32, y23;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32, y23;
 
   /* The y vector */
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
@@ -715,7 +715,7 @@ static int fQB(realtype t, N_Vector y, N_Vector yB,
  * Print heading for backward integration
  */
 
-static void PrintHead(realtype tB0)
+static void PrintHead(sunrealtype tB0)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("Backward integration from tB0 = %12.4Le\n\n",tB0);
@@ -730,7 +730,7 @@ static void PrintHead(realtype tB0)
  * Print intermediate results during backward integration
  */
 
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -762,7 +762,7 @@ static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
  * Print final results of backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/cvodes/serial/cvsRoberts_ASAi_klu.c b/examples/cvodes/serial/cvsRoberts_ASAi_klu.c
index 2ca8508d1d..3976e69a6b 100644
--- a/examples/cvodes/serial/cvsRoberts_ASAi_klu.c
+++ b/examples/cvodes/serial/cvsRoberts_ASAi_klu.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_serial.h>     /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h> /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>    /* access to KLU SUNLinearSolver        */
-#include <sundials/sundials_types.h>    /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>    /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>     /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -73,56 +73,56 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-6)  /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-6)  /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-8)  /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-14)
-#define ATOL3    RCONST(1e-6)
+#define ATOL1    SUN_RCONST(1e-8)  /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-14)
+#define ATOL3    SUN_RCONST(1e-6)
 
-#define ATOLl    RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
-#define ATOLq    RCONST(1e-6)  /* absolute tolerance for quadratures   */
+#define ATOLl    SUN_RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
+#define ATOLq    SUN_RCONST(1e-6)  /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e7)   /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e7)   /* final time                           */
 
-#define TB1      RCONST(4e7)   /* starting point for adjoint problem   */
-#define TB2      RCONST(50.0)  /* starting point for adjoint problem   */
-#define TBout1   RCONST(40.0)  /* intermediate t for adjoint problem   */
+#define TB1      SUN_RCONST(4e7)   /* starting point for adjoint problem   */
+#define TB2      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
+#define TBout1   SUN_RCONST(40.0)  /* intermediate t for adjoint problem   */
 
 #define STEPS    150           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ZERO     RCONST(0.0)
+#define ZERO     SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int fB(realtype t, N_Vector y,
+static int fB(sunrealtype t, N_Vector y,
               N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB);
 
 
 /* Prototypes of private functions */
 
-static void PrintHead(realtype tB0);
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB);
+static void PrintHead(sunrealtype tB0);
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -140,17 +140,17 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS, LSB;
   void *cvode_mem;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector y, q;
 
   int steps;
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, qB;
 
-  realtype time;
+  sunrealtype time;
   int retval, nnz, ncheck;
 
   long int nst, nstB;
@@ -177,9 +177,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS simulation context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
   /* Initialize y */
   y = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return(1);
-  Ith(y,1) = RCONST(1.0);
+  Ith(y,1) = SUN_RCONST(1.0);
   Ith(y,2) = ZERO;
   Ith(y,3) = ZERO;
 
@@ -524,11 +524,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
 */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -545,15 +545,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
+  sunrealtype *data = SUNSparseMatrix_Data(J);
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(y);
 
@@ -595,7 +595,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fQ routine. Compute fQ(t,y).
 */
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(y,3);
 
@@ -609,7 +609,7 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -630,13 +630,13 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * fB routine. Compute fB(t,y,yB).
 */
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype l21, l32;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32;
 
   data = (UserData) user_dataB;
 
@@ -655,8 +655,8 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
 
   /* Load yBdot */
   Ith(yBdot,1) = - p1*l21;
-  Ith(yBdot,2) = p2*y3*l21 - RCONST(2.0)*p3*y2*l32;
-  Ith(yBdot,3) = p2*y2*l21 - RCONST(1.0);
+  Ith(yBdot,2) = p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l32;
+  Ith(yBdot,3) = p2*y2*l21 - SUN_RCONST(1.0);
 
   return(0);
 }
@@ -665,17 +665,17 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
  * JacB routine. Compute JB(t,y,yB).
  */
 
-static int JacB(realtype t,
+static int JacB(sunrealtype t,
                 N_Vector y, N_Vector yB, N_Vector fyB,
                 SUNMatrix JB, void *user_dataB,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
-  realtype *yvalB;
+  sunrealtype *yvalB;
   sunindextype *colptrsB = SUNSparseMatrix_IndexPointers(JB);
   sunindextype *rowvalsB = SUNSparseMatrix_IndexValues(JB);
-  realtype *dataB = SUNSparseMatrix_Data(JB);
+  sunrealtype *dataB = SUNSparseMatrix_Data(JB);
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yvalB = N_VGetArrayPointer(y);
 
@@ -705,7 +705,7 @@ static int JacB(realtype t,
 
   dataB[6] = ZERO;
   rowvalsB[6] = 0;
-  dataB[7] = RCONST(-2.0)*p3*yvalB[1];
+  dataB[7] = SUN_RCONST(-2.0)*p3*yvalB[1];
   rowvalsB[7] = 1;
   dataB[8] = ZERO;
   rowvalsB[8] = 2;
@@ -717,12 +717,12 @@ static int JacB(realtype t,
  * fQB routine. Compute integrand for quadratures
 */
 
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, l3;
-  realtype l21, l32, y23;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32, y23;
 
   /* The y vector */
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
@@ -752,7 +752,7 @@ static int fQB(realtype t, N_Vector y, N_Vector yB,
  * Print heading for backward integration
  */
 
-static void PrintHead(realtype tB0)
+static void PrintHead(sunrealtype tB0)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("Backward integration from tB0 = %12.4Le\n\n",tB0);
@@ -767,7 +767,7 @@ static void PrintHead(realtype tB0)
  * Print intermediate results during backward integration
  */
 
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -799,7 +799,7 @@ static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
  * Print final results of backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/cvodes/serial/cvsRoberts_ASAi_sps.c b/examples/cvodes/serial/cvsRoberts_ASAi_sps.c
index cc7c943b77..7850ff4249 100644
--- a/examples/cvodes/serial/cvsRoberts_ASAi_sps.c
+++ b/examples/cvodes/serial/cvsRoberts_ASAi_sps.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT SUNLinearSolver  */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -73,56 +73,56 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-6)  /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-6)  /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-8)  /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-14)
-#define ATOL3    RCONST(1e-6)
+#define ATOL1    SUN_RCONST(1e-8)  /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-14)
+#define ATOL3    SUN_RCONST(1e-6)
 
-#define ATOLl    RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
-#define ATOLq    RCONST(1e-6)  /* absolute tolerance for quadratures   */
+#define ATOLl    SUN_RCONST(1e-8)  /* absolute tolerance for adjoint vars. */
+#define ATOLq    SUN_RCONST(1e-6)  /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e7)   /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e7)   /* final time                           */
 
-#define TB1      RCONST(4e7)   /* starting point for adjoint problem   */
-#define TB2      RCONST(50.0)  /* starting point for adjoint problem   */
-#define TBout1   RCONST(40.0)  /* intermediate t for adjoint problem   */
+#define TB1      SUN_RCONST(4e7)   /* starting point for adjoint problem   */
+#define TB2      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
+#define TBout1   SUN_RCONST(40.0)  /* intermediate t for adjoint problem   */
 
 #define STEPS    150           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ZERO     RCONST(0.0)
+#define ZERO     SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data);
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int fB(realtype t, N_Vector y,
+static int fB(sunrealtype t, N_Vector y,
               N_Vector yB, N_Vector yBdot, void *user_dataB);
-static int JacB(realtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
+static int JacB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB, SUNMatrix JB,
                 void *user_dataB, N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB);
 
 
 /* Prototypes of private functions */
 
-static void PrintHead(realtype tB0);
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB);
+static void PrintHead(sunrealtype tB0);
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB);
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -140,17 +140,17 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS, LSB;
   void *cvode_mem;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector y, q;
 
   int steps;
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, qB;
 
-  realtype time;
+  sunrealtype time;
   int retval, nthreads, nnz, ncheck;
 
   long int nst, nstB;
@@ -177,9 +177,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS simulation context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -188,7 +188,7 @@ int main(int argc, char *argv[])
   /* Initialize y */
   y = N_VNew_Serial(NEQ, sunctx);
   if (check_retval((void *)y, "N_VNew_Serial", 0)) return(1);
-  Ith(y,1) = RCONST(1.0);
+  Ith(y,1) = SUN_RCONST(1.0);
   Ith(y,2) = ZERO;
   Ith(y,3) = ZERO;
 
@@ -525,11 +525,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -546,15 +546,15 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y).
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
+  sunrealtype *data = SUNSparseMatrix_Data(J);
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(y);
 
@@ -596,7 +596,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fQ routine. Compute fQ(t,y).
  */
 
-static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
+static int fQ(sunrealtype t, N_Vector y, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(y,3);
 
@@ -610,7 +610,7 @@ static int fQ(realtype t, N_Vector y, N_Vector qdot, void *user_data)
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -631,13 +631,13 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * fB routine. Compute fB(t,y,yB).
  */
 
-static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
+static int fB(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype l21, l32;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32;
 
   data = (UserData) user_dataB;
 
@@ -656,8 +656,8 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
 
   /* Load yBdot */
   Ith(yBdot,1) = - p1*l21;
-  Ith(yBdot,2) = p2*y3*l21 - RCONST(2.0)*p3*y2*l32;
-  Ith(yBdot,3) = p2*y2*l21 - RCONST(1.0);
+  Ith(yBdot,2) = p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l32;
+  Ith(yBdot,3) = p2*y2*l21 - SUN_RCONST(1.0);
 
   return(0);
 }
@@ -666,17 +666,17 @@ static int fB(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot, void *user_da
  * JacB routine. Compute JB(t,y,yB).
  */
 
-static int JacB(realtype t,
+static int JacB(sunrealtype t,
                 N_Vector y, N_Vector yB, N_Vector fyB,
                 SUNMatrix JB, void *user_dataB,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
-  realtype *yvalB;
+  sunrealtype *yvalB;
   sunindextype *colptrsB = SUNSparseMatrix_IndexPointers(JB);
   sunindextype *rowvalsB = SUNSparseMatrix_IndexValues(JB);
-  realtype *dataB = SUNSparseMatrix_Data(JB);
+  sunrealtype *dataB = SUNSparseMatrix_Data(JB);
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yvalB = N_VGetArrayPointer(y);
 
@@ -706,7 +706,7 @@ static int JacB(realtype t,
 
   dataB[6] = ZERO;
   rowvalsB[6] = 0;
-  dataB[7] = RCONST(-2.0)*p3*yvalB[1];
+  dataB[7] = SUN_RCONST(-2.0)*p3*yvalB[1];
   rowvalsB[7] = 1;
   dataB[8] = ZERO;
   rowvalsB[8] = 2;
@@ -718,12 +718,12 @@ static int JacB(realtype t,
  * fQB routine. Compute integrand for quadratures
  */
 
-static int fQB(realtype t, N_Vector y, N_Vector yB,
+static int fQB(sunrealtype t, N_Vector y, N_Vector yB,
                N_Vector qBdot, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, l3;
-  realtype l21, l32, y23;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, l3;
+  sunrealtype l21, l32, y23;
 
   /* The y vector */
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
@@ -753,7 +753,7 @@ static int fQB(realtype t, N_Vector y, N_Vector yB,
  * Print heading for backward integration
  */
 
-static void PrintHead(realtype tB0)
+static void PrintHead(sunrealtype tB0)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("Backward integration from tB0 = %12.4Le\n\n",tB0);
@@ -768,7 +768,7 @@ static void PrintHead(realtype tB0)
  * Print intermediate results during backward integration
  */
 
-static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
+static void PrintOutput1(sunrealtype time, sunrealtype t, N_Vector y, N_Vector yB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -800,7 +800,7 @@ static void PrintOutput1(realtype time, realtype t, N_Vector y, N_Vector yB)
  * Print final results of backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector y, N_Vector yB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/cvodes/serial/cvsRoberts_FSA_dns.c b/examples/cvodes/serial/cvsRoberts_FSA_dns.c
index be09dedeab..bd2863d82f 100644
--- a/examples/cvodes/serial/cvsRoberts_FSA_dns.c
+++ b/examples/cvodes/serial/cvsRoberts_FSA_dns.c
@@ -92,37 +92,37 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
+  sunrealtype p[3];           /* problem parameters */
 } *UserData;
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2);
 
@@ -130,14 +130,14 @@ static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u);
 static void PrintOutputS(N_Vector *uS);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 
 static void WrongArgs(char *name);
 
@@ -155,7 +155,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -165,10 +165,10 @@ int main(int argc, char *argv[])
   FILE* FID;
   char fname[256];
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   data = NULL;
@@ -186,9 +186,9 @@ int main(int argc, char *argv[])
   if (check_retval((void *)data, "malloc", 2)) return(1);
 
   /* Initialize sensitivity variables (reaction rates for this problem) */
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -371,11 +371,11 @@ int main(int argc, char *argv[])
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -392,12 +392,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -414,15 +414,15 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fS routine. Compute sensitivity r.h.s.
  */
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2, sd3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2, sd3;
 
   data = (UserData) user_data;
   p1 = data->p[0]; p2 = data->p[1]; p3 = data->p[2];
@@ -463,7 +463,7 @@ static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -491,7 +491,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -543,11 +543,11 @@ static void WrongArgs(char *name)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -584,7 +584,7 @@ static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
 
 static void PrintOutputS(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
diff --git a/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.c b/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.c
index c8f4c4e437..4dd54b49d2 100644
--- a/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.c
+++ b/examples/cvodes/serial/cvsRoberts_FSA_dns_Switch.c
@@ -35,7 +35,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial NVector                 */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix                */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver          */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype          */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype          */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -50,33 +50,33 @@
 /* Problem Constants */
 #define MXSTEPS 2000            /* max number of steps */
 #define NEQ     3               /* number of equations */
-#define T0      RCONST(0.0)     /* initial time        */
-#define T1      RCONST(4.0e10)  /* first output time   */
+#define T0      SUN_RCONST(0.0)     /* initial time        */
+#define T1      SUN_RCONST(4.0e10)  /* first output time   */
 
-#define ZERO    RCONST(0.0)
+#define ZERO    SUN_RCONST(0.0)
 
 /* Type : UserData */
 typedef struct {
-  booleantype sensi;     /* turn on (T) or off (F) sensitivity analysis    */
-  booleantype errconS;   /* full (T) or partial error control (F)          */
-  booleantype fsDQ;      /* user provided r.h.s sensitivity analysis (T/F) */
+  sunbooleantype sensi;     /* turn on (T) or off (F) sensitivity analysis    */
+  sunbooleantype errconS;   /* full (T) or partial error control (F)          */
+  sunbooleantype fsDQ;      /* user provided r.h.s sensitivity analysis (T/F) */
   int meth;              /* sensitivity method                             */
-  realtype p[3];         /* sensitivity variables                          */
+  sunrealtype p[3];         /* sensitivity variables                          */
 } *UserData;
 
 /* User provided routine called by the solver to compute
  * the function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *udata);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *udata);
 
 /* User provided routine called by the solver to
  * approximate the Jacobian J(t,y).  */
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *udata,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* User provided routine called by the solver to compute
  * r.h.s. sensititivy. */
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *udata, N_Vector tmp1, N_Vector tmp2);
 
@@ -98,11 +98,11 @@ int main(int argc, char *argv[])
   UserData data;
   void *cvode_mem;
 
-  realtype reltol;
+  sunrealtype reltol;
   N_Vector y0, y, abstol;
 
   int Ns;
-  realtype *pbar;
+  sunrealtype *pbar;
   int is, *plist, retval;
   N_Vector *yS0, *yS;
 
@@ -118,9 +118,9 @@ int main(int argc, char *argv[])
   data = (UserData) malloc(sizeof *data);
 
   /* Initialize sensitivity variables (reaction rates for this problem) */
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Allocate initial condition vector and set context */
   y0 = N_VNew_Serial(NEQ, sunctx);
@@ -134,15 +134,15 @@ int main(int argc, char *argv[])
   if (check_retval((void *)abstol, "N_VClone", 0)) return(1);
 
   /* Set initial conditions */
-  NV_Ith_S(y0,0) = RCONST(1.0);
-  NV_Ith_S(y0,1) = RCONST(0.0);
-  NV_Ith_S(y0,2) = RCONST(0.0);
+  NV_Ith_S(y0,0) = SUN_RCONST(1.0);
+  NV_Ith_S(y0,1) = SUN_RCONST(0.0);
+  NV_Ith_S(y0,2) = SUN_RCONST(0.0);
 
   /* Set integration tolerances */
-  reltol = RCONST(1e-6);
-  NV_Ith_S(abstol,0) = RCONST(1e-8);
-  NV_Ith_S(abstol,1) = RCONST(1e-14);
-  NV_Ith_S(abstol,2) = RCONST(1e-6);
+  reltol = SUN_RCONST(1e-6);
+  NV_Ith_S(abstol,0) = SUN_RCONST(1e-8);
+  NV_Ith_S(abstol,1) = SUN_RCONST(1e-14);
+  NV_Ith_S(abstol,2) = SUN_RCONST(1e-6);
 
   /* Call CVodeCreate to create the solver memory and specify the
    * Backward Differentiation Formula */
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 
   Ns = 3;
 
-  pbar = (realtype *) malloc(Ns * sizeof(realtype));
+  pbar = (sunrealtype *) malloc(Ns * sizeof(sunrealtype));
   pbar[0] = data->p[0];
   pbar[1] = data->p[1];
   pbar[2] = data->p[2];
@@ -235,9 +235,9 @@ int main(int argc, char *argv[])
     Reinitialize and run CVODES
   */
 
-  data->p[0] = RCONST(0.05);
-  data->p[1] = RCONST(2.0e4);
-  data->p[2] = RCONST(2.9e7);
+  data->p[0] = SUN_RCONST(0.05);
+  data->p[1] = SUN_RCONST(2.0e4);
+  data->p[2] = SUN_RCONST(2.9e7);
 
   data->sensi = SUNFALSE;
 
@@ -257,9 +257,9 @@ int main(int argc, char *argv[])
     Reinitialize and run CVODES
   */
 
-  data->p[0] = RCONST(0.06);
-  data->p[1] = RCONST(3.0e4);
-  data->p[2] = RCONST(2.8e7);
+  data->p[0] = SUN_RCONST(0.06);
+  data->p[1] = SUN_RCONST(3.0e4);
+  data->p[2] = SUN_RCONST(2.8e7);
 
   data->sensi = SUNTRUE;
   data->fsDQ  = SUNTRUE;
@@ -341,7 +341,7 @@ int main(int argc, char *argv[])
 
 static int runCVode(void *cvode_mem, N_Vector y, N_Vector *yS, UserData data)
 {
-  realtype t;
+  sunrealtype t;
   int retval;
 
   /* Print header for current run */
@@ -369,11 +369,11 @@ static int runCVode(void *cvode_mem, N_Vector y, N_Vector *yS, UserData data)
  * f routine. Compute f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *udata)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *udata)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = NV_Ith_S(y,0); y2 = NV_Ith_S(y,1); y3 = NV_Ith_S(y,2);
   data = (UserData) udata;
@@ -391,13 +391,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *udata)
  * Jacobian routine. Compute J(t,y).
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *udata,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = NV_Ith_S(y,1); y3 = NV_Ith_S(y,2);
   data = (UserData) udata;
@@ -414,15 +414,15 @@ static int Jac(realtype t, N_Vector y, N_Vector fy,
  * fS routine. Compute sensitivity r.h.s.
  */
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *udata, N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2, sd3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2, sd3;
 
   data = (UserData) udata;
   p1 = data->p[0]; p2 = data->p[1]; p3 = data->p[2];
diff --git a/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints.c b/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints.c
index eb0d685996..a3df89a0bb 100644
--- a/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints.c
+++ b/examples/cvodes/serial/cvsRoberts_FSA_dns_constraints.c
@@ -60,7 +60,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* definition of ABS */
 
 /* User-defined vector and matrix accessor macros: Ith, IJth */
@@ -84,38 +84,38 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-6)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-11)
-#define ATOL3 RCONST(1.0e-5)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-6)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-11)
+#define ATOL3 SUN_RCONST(1.0e-5)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
+  sunrealtype p[3];           /* problem parameters */
 } *UserData;
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2);
 
@@ -123,18 +123,18 @@ static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u);
 static void PrintOutputS(N_Vector *uS);
 
 /* Private function to print final statistics */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 
 static void WrongArgs(char *name);
 
@@ -150,7 +150,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector constraints;
   SUNMatrix A;
@@ -159,10 +159,10 @@ int main(int argc, char *argv[])
   int retval, iout;
   UserData data;
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   data = NULL;
@@ -181,9 +181,9 @@ int main(int argc, char *argv[])
   if (check_retval((void *)data, "malloc", 2)) return(1);
 
   /* Initialize sensitivity variables (reaction rates for this problem) */
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -355,11 +355,11 @@ int main(int argc, char *argv[])
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -376,12 +376,12 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -398,15 +398,15 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fS routine. Compute sensitivity r.h.s.
  */
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2, sd3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2, sd3;
 
   data = (UserData) user_data;
   p1 = data->p[0]; p2 = data->p[1]; p3 = data->p[2];
@@ -447,7 +447,7 @@ static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -475,7 +475,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -527,11 +527,11 @@ static void WrongArgs(char *name)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -568,7 +568,7 @@ static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
 
 static void PrintOutputS(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
@@ -608,7 +608,7 @@ static void PrintOutputS(N_Vector *uS)
  * Get and print some final statistics
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi)
 {
   long int nst, nfe, nsetups, nje, nni, nnf, ncfn, netf, nfeLS;
   long int nfSe, nfeS, nsetupsS, nniS, nnfS, ncfnS, netfS;
diff --git a/examples/cvodes/serial/cvsRoberts_FSA_klu.c b/examples/cvodes/serial/cvsRoberts_FSA_klu.c
index 831713053c..9ab96e9bda 100644
--- a/examples/cvodes/serial/cvsRoberts_FSA_klu.c
+++ b/examples/cvodes/serial/cvsRoberts_FSA_klu.c
@@ -58,7 +58,7 @@
 #include <nvector/nvector_serial.h>     /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h> /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>    /* access to KLU sparse direct solver   */
-#include <sundials/sundials_types.h>    /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>    /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>     /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* User-defined vector accessor macro: Ith */
@@ -78,37 +78,37 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
+  sunrealtype p[3];           /* problem parameters */
 } *UserData;
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2);
 
@@ -116,18 +116,18 @@ static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u);
 static void PrintOutputS(N_Vector *uS);
 
 /* Private function to print final statistics */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 
 static void WrongArgs(char *name);
 
@@ -143,7 +143,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -151,10 +151,10 @@ int main(int argc, char *argv[])
   int retval, iout;
   UserData data;
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   data = NULL;
@@ -170,9 +170,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -333,11 +333,11 @@ int main(int argc, char *argv[])
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -354,24 +354,24 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
   UserData     userdata = (UserData) user_data;
-  realtype     p1 = userdata->p[0];
-  realtype     p2 = userdata->p[1];
-  realtype     p3 = userdata->p[2];
+  sunrealtype     p1 = userdata->p[0];
+  sunrealtype     p2 = userdata->p[1];
+  sunrealtype     p3 = userdata->p[2];
 
   /* first column entries start at data[0], two entries (rows 0 and 1) */
   colptrs[0] = 0;
@@ -413,15 +413,15 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fS routine. Compute sensitivity r.h.s.
  */
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2, sd3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2, sd3;
 
   data = (UserData) user_data;
   p1 = data->p[0]; p2 = data->p[1]; p3 = data->p[2];
@@ -462,7 +462,7 @@ static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -490,7 +490,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -542,11 +542,11 @@ static void WrongArgs(char *name)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -583,7 +583,7 @@ static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
 
 static void PrintOutputS(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
@@ -623,7 +623,7 @@ static void PrintOutputS(N_Vector *uS)
  * Get and print some final statistics
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi)
 {
   long int nst, nfe, nsetups, nje, nni, nnf, ncfn, netf;
   long int nfSe, nfeS, nsetupsS, nniS, nnfS, ncfnS, netfS;
diff --git a/examples/cvodes/serial/cvsRoberts_FSA_sps.c b/examples/cvodes/serial/cvsRoberts_FSA_sps.c
index 265bf0149b..3a801fe037 100644
--- a/examples/cvodes/serial/cvsRoberts_FSA_sps.c
+++ b/examples/cvodes/serial/cvsRoberts_FSA_sps.c
@@ -58,7 +58,7 @@
 #include <nvector/nvector_serial.h>         /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>     /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h>  /* access to SuperLUMT linear solver    */
-#include <sundials/sundials_types.h>        /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>        /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>         /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* User-defined vector accessor macro: Ith */
@@ -78,37 +78,37 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
+  sunrealtype p[3];           /* problem parameters */
 } *UserData;
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2);
 
@@ -116,18 +116,18 @@ static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u);
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u);
 static void PrintOutputS(N_Vector *uS);
 
 /* Private function to print final statistics */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi);
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 
 static void WrongArgs(char *name);
 
@@ -143,7 +143,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main(int argc, char *argv[])
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -151,10 +151,10 @@ int main(int argc, char *argv[])
   int retval, iout;
   UserData data;
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   data = NULL;
@@ -170,9 +170,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Create the SUNDIALS context that all SUNDIALS objects require */
   retval = SUNContext_Create(NULL, &sunctx);
@@ -333,11 +333,11 @@ int main(int argc, char *argv[])
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
   data = (UserData) user_data;
@@ -354,24 +354,24 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
   UserData     userdata = (UserData) user_data;
-  realtype     p1 = userdata->p[0];
-  realtype     p2 = userdata->p[1];
-  realtype     p3 = userdata->p[2];
+  sunrealtype     p1 = userdata->p[0];
+  sunrealtype     p2 = userdata->p[1];
+  sunrealtype     p3 = userdata->p[2];
 
   /* first column entries start at data[0], two entries (rows 0 and 1) */
   colptrs[0] = 0;
@@ -413,15 +413,15 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  * fS routine. Compute sensitivity r.h.s.
  */
 
-static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
+static int fS(int Ns, sunrealtype t, N_Vector y, N_Vector ydot,
               int iS, N_Vector yS, N_Vector ySdot,
               void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2, sd3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2, sd3;
 
   data = (UserData) user_data;
   p1 = data->p[0]; p2 = data->p[1]; p3 = data->p[2];
@@ -462,7 +462,7 @@ static int fS(int Ns, realtype t, N_Vector y, N_Vector ydot,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -490,7 +490,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -542,11 +542,11 @@ static void WrongArgs(char *name)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
+static void PrintOutput(void *cvode_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -583,7 +583,7 @@ static void PrintOutput(void *cvode_mem, realtype t, N_Vector u)
 
 static void PrintOutputS(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
@@ -623,7 +623,7 @@ static void PrintOutputS(N_Vector *uS)
  * Get and print some final statistics
  */
 
-static void PrintFinalStats(void *cvode_mem, booleantype sensi)
+static void PrintFinalStats(void *cvode_mem, sunbooleantype sensi)
 {
   long int nst, nfe, nsetups, nje, nni, nnf, ncfn, netf;
   long int nfSe, nfeS, nsetupsS, nniS, nnfS, ncfnS, netfS;
diff --git a/examples/cvodes/serial/cvsRoberts_dns.c b/examples/cvodes/serial/cvsRoberts_dns.c
index 08372267da..bd23804f65 100644
--- a/examples/cvodes/serial/cvsRoberts_dns.c
+++ b/examples/cvodes/serial/cvsRoberts_dns.c
@@ -71,32 +71,32 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to check function return values */
@@ -105,7 +105,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
 
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 
 /*
@@ -117,7 +117,7 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -250,14 +250,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -267,13 +267,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -282,23 +282,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -310,7 +310,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
@@ -369,26 +369,26 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
-  realtype ONE=RCONST(1.0);
+  sunrealtype err;               /* wrms error                       */
+  sunrealtype ONE=SUN_RCONST(1.0);
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083495894337328e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833399429795671e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791629776e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083495894337328e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833399429795671e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791629776e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/cvodes/serial/cvsRoberts_dnsL.c b/examples/cvodes/serial/cvsRoberts_dnsL.c
index 0ae7f8e327..6105636d58 100644
--- a/examples/cvodes/serial/cvsRoberts_dnsL.c
+++ b/examples/cvodes/serial/cvsRoberts_dnsL.c
@@ -60,32 +60,32 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -106,7 +106,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -228,14 +228,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -245,13 +245,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -260,23 +260,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -288,7 +288,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvodes/serial/cvsRoberts_dns_constraints.c b/examples/cvodes/serial/cvsRoberts_dns_constraints.c
index 2bd6a1843a..04dc0ffaa3 100644
--- a/examples/cvodes/serial/cvsRoberts_dns_constraints.c
+++ b/examples/cvodes/serial/cvsRoberts_dns_constraints.c
@@ -73,33 +73,33 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-6)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-11)
-#define ATOL3 RCONST(1.0e-5)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-6)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-11)
+#define ATOL3 SUN_RCONST(1.0e-5)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -112,7 +112,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
 
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 
 /*
@@ -124,7 +124,7 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   N_Vector constraints;
@@ -262,14 +262,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -279,13 +279,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -294,23 +294,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -322,7 +322,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
@@ -420,25 +420,25 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) flag */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
+  sunrealtype err;               /* wrms error                       */
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083495894337328e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833399429795671e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791629776e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083495894337328e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833399429795671e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791629776e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/cvodes/serial/cvsRoberts_dns_uw.c b/examples/cvodes/serial/cvsRoberts_dns_uw.c
index 6efbba95cd..4bb3f26ffb 100644
--- a/examples/cvodes/serial/cvsRoberts_dns_uw.c
+++ b/examples/cvodes/serial/cvsRoberts_dns_uw.c
@@ -73,34 +73,34 @@
 /* Problem Constants */
 
 #define NEQ   3                /* number of equations  */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -121,7 +121,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -231,14 +231,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -248,13 +248,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -263,23 +263,23 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
 
   y2 = Ith(y,2); y3 = Ith(y,3);
 
-  IJth(J,1,1) = RCONST(-0.04);
-  IJth(J,1,2) = RCONST(1.0e4)*y3;
-  IJth(J,1,3) = RCONST(1.0e4)*y2;
+  IJth(J,1,1) = SUN_RCONST(-0.04);
+  IJth(J,1,2) = SUN_RCONST(1.0e4)*y3;
+  IJth(J,1,3) = SUN_RCONST(1.0e4)*y2;
 
-  IJth(J,2,1) = RCONST(0.04);
-  IJth(J,2,2) = RCONST(-1.0e4)*y3-RCONST(6.0e7)*y2;
-  IJth(J,2,3) = RCONST(-1.0e4)*y2;
+  IJth(J,2,1) = SUN_RCONST(0.04);
+  IJth(J,2,2) = SUN_RCONST(-1.0e4)*y3-SUN_RCONST(6.0e7)*y2;
+  IJth(J,2,3) = SUN_RCONST(-1.0e4)*y2;
 
   IJth(J,3,1) = ZERO;
-  IJth(J,3,2) = RCONST(6.0e7)*y2;
+  IJth(J,3,2) = SUN_RCONST(6.0e7)*y2;
   IJth(J,3,3) = ZERO;
 
   return(0);
@@ -292,7 +292,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -315,7 +315,7 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvodes/serial/cvsRoberts_klu.c b/examples/cvodes/serial/cvsRoberts_klu.c
index 4027ed13fc..0d7e58cd7d 100644
--- a/examples/cvodes/serial/cvsRoberts_klu.c
+++ b/examples/cvodes/serial/cvsRoberts_klu.c
@@ -57,32 +57,32 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -103,7 +103,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -225,14 +225,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -242,13 +242,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -257,18 +257,18 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
 
@@ -276,31 +276,31 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   colptrs[0] = 0;
 
   rowvals[0] = 0;
-  data[0]    = RCONST(-0.04);
+  data[0]    = SUN_RCONST(-0.04);
 
   rowvals[1] = 1;
-  data[1]    = RCONST(0.04);
+  data[1]    = SUN_RCONST(0.04);
 
   /* second column entries start at data[2], three entries (rows 0, 1, and 2) */
   colptrs[1] = 2;
 
   rowvals[2] = 0;
-  data[2]    = RCONST(1.0e4) * yval[2];
+  data[2]    = SUN_RCONST(1.0e4) * yval[2];
 
   rowvals[3] = 1;
-  data[3]    = (RCONST(-1.0e4) * yval[2]) - (RCONST(6.0e7) * yval[1]);
+  data[3]    = (SUN_RCONST(-1.0e4) * yval[2]) - (SUN_RCONST(6.0e7) * yval[1]);
 
   rowvals[4] = 2;
-  data[4]    = RCONST(6.0e7) * yval[1];
+  data[4]    = SUN_RCONST(6.0e7) * yval[1];
 
   /* third column entries start at data[5], two entries (rows 0 and 1) */
   colptrs[2] = 5;
 
   rowvals[5] = 0;
-  data[5]    = RCONST(1.0e4) * yval[1];
+  data[5]    = SUN_RCONST(1.0e4) * yval[1];
 
   rowvals[6] = 1;
-  data[6]    = RCONST(-1.0e4) * yval[1];
+  data[6]    = SUN_RCONST(-1.0e4) * yval[1];
 
   /* number of non-zeros */
   colptrs[3] = 7;
@@ -314,7 +314,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/cvodes/serial/cvsRoberts_sps.c b/examples/cvodes/serial/cvsRoberts_sps.c
index e36a57638c..25b5e48e2c 100644
--- a/examples/cvodes/serial/cvsRoberts_sps.c
+++ b/examples/cvodes/serial/cvsRoberts_sps.c
@@ -57,32 +57,32 @@
 
 #define NEQ   3                /* number of equations  */
 #define NNZ   7                /* number of non-zero entries in the Jacobian */
-#define Y1    RCONST(1.0)      /* initial y components */
-#define Y2    RCONST(0.0)
-#define Y3    RCONST(0.0)
-#define RTOL  RCONST(1.0e-4)   /* scalar relative tolerance            */
-#define ATOL1 RCONST(1.0e-8)   /* vector absolute tolerance components */
-#define ATOL2 RCONST(1.0e-14)
-#define ATOL3 RCONST(1.0e-6)
-#define T0    RCONST(0.0)      /* initial time           */
-#define T1    RCONST(0.4)      /* first output time      */
-#define TMULT RCONST(10.0)     /* output time factor     */
+#define Y1    SUN_RCONST(1.0)      /* initial y components */
+#define Y2    SUN_RCONST(0.0)
+#define Y3    SUN_RCONST(0.0)
+#define RTOL  SUN_RCONST(1.0e-4)   /* scalar relative tolerance            */
+#define ATOL1 SUN_RCONST(1.0e-8)   /* vector absolute tolerance components */
+#define ATOL2 SUN_RCONST(1.0e-14)
+#define ATOL3 SUN_RCONST(1.0e-6)
+#define T0    SUN_RCONST(0.0)      /* initial time           */
+#define T1    SUN_RCONST(0.4)      /* first output time      */
+#define TMULT SUN_RCONST(10.0)     /* output time factor     */
 #define NOUT  12               /* number of output times */
 
-#define ZERO  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
 
 /* Functions Called by the Solver */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data);
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private functions to output results */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3);
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3);
 static void PrintRootInfo(int root_f1, int root_f2);
 
 /* Private function to print final statistics */
@@ -103,7 +103,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype t, tout;
+  sunrealtype t, tout;
   N_Vector y;
   N_Vector abstol;
   SUNMatrix A;
@@ -225,14 +225,14 @@ int main()
  * f routine. Compute function f(t,y).
  */
 
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype y1, y2, y3, yd1, yd3;
+  sunrealtype y1, y2, y3, yd1, yd3;
 
   y1 = Ith(y,1); y2 = Ith(y,2); y3 = Ith(y,3);
 
-  yd1 = Ith(ydot,1) = RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3;
-  yd3 = Ith(ydot,3) = RCONST(3.0e7)*y2*y2;
+  yd1 = Ith(ydot,1) = SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3;
+  yd3 = Ith(ydot,3) = SUN_RCONST(3.0e7)*y2*y2;
         Ith(ydot,2) = -yd1 - yd3;
 
   return(0);
@@ -242,13 +242,13 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  * g routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
+static int g(sunrealtype t, N_Vector y, sunrealtype *gout, void *user_data)
 {
-  realtype y1, y3;
+  sunrealtype y1, y3;
 
   y1 = Ith(y,1); y3 = Ith(y,3);
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -257,18 +257,18 @@ static int g(realtype t, N_Vector y, realtype *gout, void *user_data)
  * Jacobian routine. Compute J(t,y) = df/dy. *
  */
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   /* State at which to evaluate the Jacobian */
-  realtype *yval = N_VGetArrayPointer(y);
+  sunrealtype *yval = N_VGetArrayPointer(y);
 
   /* J is stored in CSC format:
      data    = non-zero matrix entries stored column-wise (length NNZ)
      rowvals = row index for each non-zero matrix entry (length NNZ)
      colptrs = i-th entry is the index in data where the first non-zero matrix
                entry of the i-th column is stored (length NEQ + 1) */
-  realtype     *data    = SUNSparseMatrix_Data(J);
+  sunrealtype     *data    = SUNSparseMatrix_Data(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
 
@@ -276,31 +276,31 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
   colptrs[0] = 0;
 
   rowvals[0] = 0;
-  data[0]    = RCONST(-0.04);
+  data[0]    = SUN_RCONST(-0.04);
 
   rowvals[1] = 1;
-  data[1]    = RCONST(0.04);
+  data[1]    = SUN_RCONST(0.04);
 
   /* second column entries start at data[2], three entries (rows 0, 1, and 2) */
   colptrs[1] = 2;
 
   rowvals[2] = 0;
-  data[2]    = RCONST(1.0e4) * yval[2];
+  data[2]    = SUN_RCONST(1.0e4) * yval[2];
 
   rowvals[3] = 1;
-  data[3]    = (RCONST(-1.0e4) * yval[2]) - (RCONST(6.0e7) * yval[1]);
+  data[3]    = (SUN_RCONST(-1.0e4) * yval[2]) - (SUN_RCONST(6.0e7) * yval[1]);
 
   rowvals[4] = 2;
-  data[4]    = RCONST(6.0e7) * yval[1];
+  data[4]    = SUN_RCONST(6.0e7) * yval[1];
 
   /* third column entries start at data[5], two entries (rows 0 and 1) */
   colptrs[2] = 5;
 
   rowvals[5] = 0;
-  data[5]    = RCONST(1.0e4) * yval[1];
+  data[5]    = SUN_RCONST(1.0e4) * yval[1];
 
   rowvals[6] = 1;
-  data[6]    = RCONST(-1.0e4) * yval[1];
+  data[6]    = SUN_RCONST(-1.0e4) * yval[1];
 
   /* number of non-zeros */
   colptrs[3] = 7;
@@ -314,7 +314,7 @@ static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
  *-------------------------------
  */
 
-static void PrintOutput(realtype t, realtype y1, realtype y2, realtype y3)
+static void PrintOutput(sunrealtype t, sunrealtype y1, sunrealtype y2, sunrealtype y3)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("At t = %0.4Le      y =%14.6Le  %14.6Le  %14.6Le\n", t, y1, y2, y3);
diff --git a/examples/ida/C_openmp/idaFoodWeb_bnd_omp.c b/examples/ida/C_openmp/idaFoodWeb_bnd_omp.c
index 3e64de23fb..97c611db2c 100644
--- a/examples/ida/C_openmp/idaFoodWeb_bnd_omp.c
+++ b/examples/ida/C_openmp/idaFoodWeb_bnd_omp.c
@@ -125,30 +125,30 @@
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -164,15 +164,15 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
   N_Vector rates;
   int nthreads;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
 /* Prototypes for private Helper Functions. */
@@ -180,13 +180,13 @@ static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol);
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t);
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *ida_mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
   N_Vector cc, cp, id;
   int iout, retval;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   int num_threads;
   SUNContext ctx;
 
@@ -283,7 +283,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -350,11 +350,11 @@ int main(int argc, char *argv[])
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   jx = jy = is = 0;
@@ -401,7 +401,7 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -452,8 +452,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = NV_DATA_OMP(cc);
   cpv = NV_DATA_OMP(cp);
@@ -466,17 +466,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-	  ccv[loc+is] = RCONST(1.0e5);
+	  ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -502,7 +502,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_bnd_omp: Predator-prey DAE OpenMP example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -531,11 +531,11 @@ static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtyp
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t)
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(ida_mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -609,11 +609,11 @@ static void PrintFinalStats(void *ida_mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -663,11 +663,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -680,13 +680,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/ida/C_openmp/idaFoodWeb_kry_omp.c b/examples/ida/C_openmp/idaFoodWeb_kry_omp.c
index f178605e73..3dd64eb005 100644
--- a/examples/ida/C_openmp/idaFoodWeb_kry_omp.c
+++ b/examples/ida/C_openmp/idaFoodWeb_kry_omp.c
@@ -130,30 +130,30 @@
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -169,9 +169,9 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
-  realtype **PP[MX][MY];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype **PP[MX][MY];
   sunindextype *pivot[MX][MY];
   N_Vector rates;
   N_Vector ewt;
@@ -181,28 +181,28 @@ typedef struct {
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
-static int Precond(realtype tt, N_Vector cc, N_Vector cp,
-                   N_Vector rr, realtype cj, void *user_data);
+static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp,
+                   N_Vector rr, sunrealtype cj, void *user_data);
 
-static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolve(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, N_Vector rvec, N_Vector zvec,
-		  realtype cj, realtype delta, void *user_data);
+		  sunrealtype cj, sunrealtype delta, void *user_data);
 
 /* Prototypes for private Helper Functions. */
 
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(int maxl, realtype rtol, realtype atol);
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t);
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *ida_mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
   N_Vector cc, cp, id;
   int iout, jx, jy, retval;
   int maxl;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   int num_threads;
   SUNContext ctx;
 
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -382,11 +382,11 @@ int main(int argc, char *argv[])
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   jx = jy = is = 0;
@@ -421,25 +421,25 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 }
 
 
-static int Precond(realtype tt, N_Vector cc, N_Vector cp,
-                   N_Vector rr, realtype cj, void *user_data)
+static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp,
+                   N_Vector rr, sunrealtype cj, void *user_data)
 {
   int retval;
   sunindextype ret;
-  realtype uround, xx, yy, del_x, del_y;
-  realtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
-  realtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
+  sunrealtype uround, xx, yy, del_x, del_y;
+  sunrealtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
+  sunrealtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
   int is, js, jx, jy;
   void *ida_mem;
   N_Vector ewt;
-  realtype hh;
+  sunrealtype hh;
   UserData webdata;
 
   webdata = (UserData) user_data;
   del_x = webdata->dx;
   del_y = webdata->dy;
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
   sqru = sqrt(uround);
 
   ida_mem = webdata->ida_mem;
@@ -489,11 +489,11 @@ static int Precond(realtype tt, N_Vector cc, N_Vector cp,
 }
 
 
-static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolve(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, N_Vector rvec, N_Vector zvec,
-		  realtype cj, realtype dalta, void *user_data)
+		  sunrealtype cj, sunrealtype dalta, void *user_data)
 {
-  realtype **Pxy, *zxy;
+  sunrealtype **Pxy, *zxy;
   sunindextype *pivot;
   sunindextype jx, jy;
   UserData webdata;
@@ -533,7 +533,7 @@ static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -584,8 +584,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = NV_DATA_OMP(cc);
   cpv = NV_DATA_OMP(cp);
@@ -598,17 +598,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-	  ccv[loc+is] = RCONST(1.0e5);
+	  ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -634,7 +634,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(int maxl, realtype rtol, realtype atol)
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_kry_omp: Predator-prey DAE OpenMP example problem using Krylov solver for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -662,11 +662,11 @@ static void PrintHeader(int maxl, realtype rtol, realtype atol)
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t)
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(ida_mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -740,11 +740,11 @@ static void PrintFinalStats(void *ida_mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -794,11 +794,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -811,13 +811,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/ida/cuda/idaHeat2D_kry_cuda.cu b/examples/ida/cuda/idaHeat2D_kry_cuda.cu
index 3744041331..68d0be8607 100644
--- a/examples/ida/cuda/idaHeat2D_kry_cuda.cu
+++ b/examples/ida/cuda/idaHeat2D_kry_cuda.cu
@@ -35,7 +35,7 @@
 #include <ida/ida.h>                   /* prototypes for IDA methods            */
 #include <nvector/nvector_cuda.h>      /* access to CUDA N_Vector               */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype           */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype           */
 
 
 /* Problem Constants */
@@ -43,18 +43,18 @@
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* User data type */
 
 struct _UserData {
   sunindextype mm;  /* number of grid points in one dimension */
   sunindextype neq; /* number of equations */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 };
 
@@ -62,24 +62,24 @@ typedef _UserData *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data);
+               sunrealtype c_j, void *prec_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data);
+               sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu);
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 
@@ -90,8 +90,8 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
  */
 
 __global__
-void resHeatKernel(const realtype *uu, const realtype *up, realtype *rr,
-                   sunindextype mm, realtype coeff)
+void resHeatKernel(const sunrealtype *uu, const sunrealtype *up, sunrealtype *rr,
+                   sunindextype mm, sunrealtype coeff)
 {
   sunindextype i, j, tid;
 
@@ -107,15 +107,15 @@ void resHeatKernel(const realtype *uu, const realtype *up, realtype *rr,
       rr[tid] = uu[tid];
     } else {
       /* Loop over interior points; set res = up - (central difference). */
-      realtype dif1 = uu[tid-1]  + uu[tid+1]  - TWO * uu[tid];
-      realtype dif2 = uu[tid-mm] + uu[tid+mm] - TWO * uu[tid];
+      sunrealtype dif1 = uu[tid-1]  + uu[tid+1]  - TWO * uu[tid];
+      sunrealtype dif2 = uu[tid-mm] + uu[tid+mm] - TWO * uu[tid];
       rr[tid] = up[tid] - coeff * ( dif1 + dif2 );
     }
   }
 }
 
 __global__
-void PsetupHeatKernel(realtype *ppv, sunindextype mm, realtype c_j, realtype coeff)
+void PsetupHeatKernel(sunrealtype *ppv, sunindextype mm, sunrealtype c_j, sunrealtype coeff)
 {
   sunindextype i, j, tid;
 
@@ -137,7 +137,7 @@ void PsetupHeatKernel(realtype *ppv, sunindextype mm, realtype c_j, realtype coe
 }
 
 __global__
-void setInitHeatKernel(realtype *up, sunindextype mm)
+void setInitHeatKernel(sunrealtype *up, sunindextype mm)
 {
   sunindextype i, j, tid;
 
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
   UserData data;
   N_Vector uu, up, constraints, res;
   int ier, iout;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -222,9 +222,9 @@ int main(int argc, char *argv[])
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -380,17 +380,17 @@ int main(int argc, char *argv[])
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   sunindextype mm;
-  realtype coeff;
+  sunrealtype coeff;
   UserData data;
 
-  const realtype *uu_data = N_VGetDeviceArrayPointer_Cuda(uu);
-  const realtype *up_data = N_VGetDeviceArrayPointer_Cuda(up);
-  realtype *rr_data = N_VGetDeviceArrayPointer_Cuda(rr);
+  const sunrealtype *uu_data = N_VGetDeviceArrayPointer_Cuda(uu);
+  const sunrealtype *up_data = N_VGetDeviceArrayPointer_Cuda(up);
+  sunrealtype *rr_data = N_VGetDeviceArrayPointer_Cuda(rr);
 
   data = (UserData) user_data;
 
@@ -422,18 +422,18 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data)
+               sunrealtype c_j, void *prec_data)
 {
   sunindextype mm;
-  realtype *ppv;
+  sunrealtype *ppv;
   UserData data;
 
   data = (UserData) prec_data;
   ppv = N_VGetDeviceArrayPointer_Cuda(data->pp);
   mm = data->mm;
-  realtype coeff = data->coeff;
+  sunrealtype coeff = data->coeff;
 
   unsigned block = 256;
   unsigned grid = (mm*mm + block - 1) / block;
@@ -450,10 +450,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data)
+               sunrealtype c_j, sunrealtype delta, void *prec_data)
 {
   UserData data;
   data = (UserData) prec_data;
@@ -475,7 +475,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, i, j;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -486,7 +486,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     yfact = data->dx * j;
     for (i = 0; i < mm; i++) {
       xfact = data->dx * i;
-      udata[mm*j + i] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[mm*j + i] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -516,7 +516,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry: Heat equation, serial example problem for IDA \n");
   printf("         Discretized heat equation on 2D unit square. \n");
@@ -539,9 +539,9 @@ static void PrintHeader(realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, ier;
 
diff --git a/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu b/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu
index 5b1eb5d929..a2ad87c3ea 100644
--- a/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu
+++ b/examples/ida/mpicuda/idaHeat2D_kry_p_mpicuda.cu
@@ -46,9 +46,9 @@
 #include <sundials/sundials_mpi_types.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11    /* Number of output times */
 
@@ -63,49 +63,49 @@
 typedef struct {
   int thispe, npex, npey, ixsub, jysub;
   sunindextype mx, my, mxsub, mysub;
-  realtype     dx, dy, coeffx, coeffy, coeffxy;
-  realtype    *uext; /* device array */
-  realtype    *host_send_buff;
-  realtype    *host_recv_buff;
-  realtype    *dev_send_buff;
-  realtype    *dev_recv_buff;
+  sunrealtype     dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype    *uext; /* device array */
+  sunrealtype    *host_send_buff;
+  sunrealtype    *host_recv_buff;
+  sunrealtype    *dev_send_buff;
+  sunrealtype    *dev_recv_buff;
   N_Vector     pp;    /* vector of diagonal preconditioner elements */
   MPI_Comm  comm;
 } *UserData;
 
 /* User-supplied residual function and supporting routines */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up,
             N_Vector rr, void *user_data);
 
 static int rescomm(N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up,
                     N_Vector res,  void *user_data);
 
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype *uarray, realtype *dev_send_buff, realtype *host_send_buff);
+                 const sunrealtype *uarray, sunrealtype *dev_send_buff, sunrealtype *host_send_buff);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *host_recv_buff);
+                     sunrealtype *host_recv_buff);
 
 static int BRecvWait(MPI_Request request[],
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *uext, const realtype *host_recv_buff, realtype *dev_recv_buff);
+                     sunrealtype *uext, const sunrealtype *host_recv_buff, sunrealtype *dev_recv_buff);
 
 /* User-supplied preconditioner routines */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
-               N_Vector rvec, N_Vector zvec, realtype c_j,
-               realtype delta, void *user_data);
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+               N_Vector rvec, N_Vector zvec, sunrealtype c_j,
+               sunrealtype delta, void *user_data);
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data);
 
 /* Private function to check function return values */
 
@@ -118,9 +118,9 @@ static int DeleteUserData(UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -134,9 +134,9 @@ static int check_flag(void *flagvalue, const char *funcname, int opt, int id);
  */
 
 __global__
-void PsetupHeatKernel(realtype *ppv, sunindextype mx, sunindextype my,
+void PsetupHeatKernel(sunrealtype *ppv, sunindextype mx, sunindextype my,
                       sunindextype ibc, sunindextype jbc,
-                      sunindextype i0, sunindextype j0, realtype pelinv)
+                      sunindextype i0, sunindextype j0, sunrealtype pelinv)
 {
   sunindextype i, j, tid;
 
@@ -154,7 +154,7 @@ void PsetupHeatKernel(realtype *ppv, sunindextype mx, sunindextype my,
 
 
 __global__
-void CopyLocalToExtendedArray(const realtype *uuv, realtype *uext,
+void CopyLocalToExtendedArray(const sunrealtype *uuv, sunrealtype *uext,
                               sunindextype mx, sunindextype my)
 {
   sunindextype i, j, tid;
@@ -172,11 +172,11 @@ void CopyLocalToExtendedArray(const realtype *uuv, realtype *uext,
 
 
 __global__
-void LocalResidualKernel(const realtype *uext, const realtype *upv, realtype *resv,
+void LocalResidualKernel(const sunrealtype *uext, const sunrealtype *upv, sunrealtype *resv,
                          sunindextype mx, sunindextype my,
                          sunindextype ibc, sunindextype jbc,
                          sunindextype i0, sunindextype j0,
-                         realtype coeffx, realtype coeffy, realtype coeffxy)
+                         sunrealtype coeffx, sunrealtype coeffy, sunrealtype coeffxy)
 {
   sunindextype i, j, tid;
 
@@ -190,16 +190,16 @@ void LocalResidualKernel(const realtype *uext, const realtype *upv, realtype *re
     sunindextype locu  = i + j*mx;
     sunindextype locue = (i+1) + (j+1)*(mx+2);
 
-    realtype termx   = coeffx * (uext[locue-1]      + uext[locue+1]);
-    realtype termy   = coeffy * (uext[locue-(mx+2)] + uext[locue+(mx+2)]);
-    realtype termctr = coeffxy * uext[locue];
+    sunrealtype termx   = coeffx * (uext[locue-1]      + uext[locue+1]);
+    sunrealtype termy   = coeffy * (uext[locue-(mx+2)] + uext[locue+(mx+2)]);
+    sunrealtype termctr = coeffxy * uext[locue];
     resv[locu] = upv[locu] - (termx + termy - termctr);
   }
 }
 
 
 __global__
-void CopyToBottomBuffer(const realtype *uarray, realtype *bufbottom,
+void CopyToBottomBuffer(const sunrealtype *uarray, sunrealtype *bufbottom,
                         sunindextype mx)
 {
   sunindextype tid;
@@ -214,7 +214,7 @@ void CopyToBottomBuffer(const realtype *uarray, realtype *bufbottom,
 
 
 __global__
-void CopyToTopBuffer(const realtype *uarray, realtype *buftop,
+void CopyToTopBuffer(const sunrealtype *uarray, sunrealtype *buftop,
                      sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -229,7 +229,7 @@ void CopyToTopBuffer(const realtype *uarray, realtype *buftop,
 
 
 __global__
-void CopyToLeftBuffer(const realtype *uarray, realtype *bufleft,
+void CopyToLeftBuffer(const sunrealtype *uarray, sunrealtype *bufleft,
                       sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -244,7 +244,7 @@ void CopyToLeftBuffer(const realtype *uarray, realtype *bufleft,
 
 
 __global__
-void CopyToRightBuffer(const realtype *uarray, realtype *bufright,
+void CopyToRightBuffer(const sunrealtype *uarray, sunrealtype *bufright,
                        sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -259,7 +259,7 @@ void CopyToRightBuffer(const realtype *uarray, realtype *bufright,
 
 
 __global__
-void CopyFromBottomBuffer(const realtype *bufbottom, realtype *uext,
+void CopyFromBottomBuffer(const sunrealtype *bufbottom, sunrealtype *uext,
                           sunindextype mx)
 {
   sunindextype tid;
@@ -274,7 +274,7 @@ void CopyFromBottomBuffer(const realtype *bufbottom, realtype *uext,
 
 
 __global__
-void CopyFromTopBuffer(const realtype *buftop, realtype *uext,
+void CopyFromTopBuffer(const sunrealtype *buftop, sunrealtype *uext,
                        sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -289,7 +289,7 @@ void CopyFromTopBuffer(const realtype *buftop, realtype *uext,
 
 
 __global__
-void CopyFromLeftBuffer(const realtype *bufleft, realtype *uext,
+void CopyFromLeftBuffer(const sunrealtype *bufleft, sunrealtype *uext,
                         sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -304,7 +304,7 @@ void CopyFromLeftBuffer(const realtype *bufleft, realtype *uext,
 
 
 __global__
-void CopyFromRightBuffer(const realtype *bufright, realtype *uext,
+void CopyFromRightBuffer(const sunrealtype *bufright, sunrealtype *uext,
                          sunindextype mx, sunindextype my)
 {
   sunindextype tid;
@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
   UserData data;
   int iout, thispe, ier, npes;
   sunindextype local_N;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uulocal, uu, up, constraints, id, res;
   SUNContext ctx;
 
@@ -411,11 +411,11 @@ int main(int argc, char *argv[])
   /* Set constraints to all 1's for nonnegative solution values. */
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -515,7 +515,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   int retval = 0;
@@ -548,8 +548,8 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  *
  */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data)
 {
   sunindextype ibc, i0, jbc, j0;
 
@@ -561,10 +561,10 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
   const int npey  = data->npey;
   const sunindextype mxsub = data->mxsub;
   const sunindextype mysub = data->mysub;
-  realtype *ppv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(data->pp));
+  sunrealtype *ppv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(data->pp));
 
   /* Calculate the value for the inverse element of the diagonal preconditioner */
-  const realtype pelinv = ONE/(c_j + data->coeffxy);
+  const sunrealtype pelinv = ONE/(c_j + data->coeffxy);
 
   /* Initially set all pp elements on the device to one. */
   N_VConst(ONE, data->pp);
@@ -589,9 +589,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
  * computed in PsetupHeat), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data = (UserData) user_data;
 
@@ -628,14 +628,14 @@ static int rescomm(N_Vector uu, N_Vector up, void* user_data)
   const sunindextype mysub = data->mysub;
 
   /* Get pointers to buffers and extended solution vector data array uext. */
-  realtype *uext = data->uext;
-  realtype *host_send_buff = data->host_send_buff;
-  realtype *host_recv_buff = data->host_recv_buff;
-  realtype *dev_send_buff  = data->dev_send_buff;
-  realtype *dev_recv_buff  = data->dev_recv_buff;
+  sunrealtype *uext = data->uext;
+  sunrealtype *host_send_buff = data->host_send_buff;
+  sunrealtype *host_recv_buff = data->host_recv_buff;
+  sunrealtype *dev_send_buff  = data->dev_send_buff;
+  sunrealtype *dev_recv_buff  = data->dev_recv_buff;
 
   /* Get solution vector data. */
-  const realtype *uarray = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
+  const sunrealtype *uarray = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
 
   /* Set array of MPI requests */
   MPI_Request request[4];
@@ -659,7 +659,7 @@ static int rescomm(N_Vector uu, N_Vector up, void* user_data)
  * has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
                     void *user_data)
 {
   UserData data = (UserData) user_data;
@@ -671,15 +671,15 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
   const int npey  = data->npey;
   const sunindextype mxsub  = data->mxsub;
   const sunindextype mysub  = data->mysub;
-  const realtype coeffx  = data->coeffx;
-  const realtype coeffy  = data->coeffy;
-  const realtype coeffxy = data->coeffxy;
+  const sunrealtype coeffx  = data->coeffx;
+  const sunrealtype coeffy  = data->coeffy;
+  const sunrealtype coeffxy = data->coeffxy;
 
   /* Vector data arrays, extended work array uext. */
-  const realtype *uuv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
-  const realtype *upv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(up));
-  realtype *resv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(rr));
-  realtype *uext = data->uext;
+  const sunrealtype *uuv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
+  const sunrealtype *upv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(up));
+  sunrealtype *resv = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(rr));
+  sunrealtype *uext = data->uext;
 
   sunindextype ibc, i0, jbc, j0;
 
@@ -720,22 +720,22 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype *uarray, realtype *dev_send_buff,
-                 realtype *host_send_buff)
+                 const sunrealtype *uarray, sunrealtype *dev_send_buff,
+                 sunrealtype *host_send_buff)
 {
   cudaError_t err;
 
   /* Have left, right, top and bottom device buffers use the same dev_send_buff. */
-  realtype *d_bufleft   = dev_send_buff;
-  realtype *d_bufright  = dev_send_buff + mysub;
-  realtype *d_buftop    = dev_send_buff + 2*mysub;
-  realtype *d_bufbottom = dev_send_buff + 2*mysub + mxsub;
+  sunrealtype *d_bufleft   = dev_send_buff;
+  sunrealtype *d_bufright  = dev_send_buff + mysub;
+  sunrealtype *d_buftop    = dev_send_buff + 2*mysub;
+  sunrealtype *d_bufbottom = dev_send_buff + 2*mysub + mxsub;
 
   /* Have left, right, top and bottom host buffers use the same host_send_buff. */
-  realtype *h_bufleft   = host_send_buff;
-  realtype *h_bufright  = host_send_buff + mysub;
-  realtype *h_buftop    = host_send_buff + 2*mysub;
-  realtype *h_bufbottom = host_send_buff + 2*mysub + mxsub;
+  sunrealtype *h_bufleft   = host_send_buff;
+  sunrealtype *h_bufright  = host_send_buff + mysub;
+  sunrealtype *h_buftop    = host_send_buff + 2*mysub;
+  sunrealtype *h_bufbottom = host_send_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, send data from bottom x-line of u.  (via bufbottom) */
 
@@ -746,7 +746,7 @@ static int BSend(MPI_Comm comm, int thispe,
     CopyToBottomBuffer<<<grid, block>>>(uarray, d_bufbottom, mxsub);
 
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufbottom, d_bufbottom, mxsub*sizeof(realtype),
+    err = cudaMemcpy(h_bufbottom, d_bufbottom, mxsub*sizeof(sunrealtype),
                      cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Bottom buffer: Copy from device to host failed with code %d... \n", err);
@@ -765,7 +765,7 @@ static int BSend(MPI_Comm comm, int thispe,
     CopyToTopBuffer<<<grid, block>>>(uarray, d_buftop, mxsub, mysub);
 
     // Copy buffer to the host
-    err = cudaMemcpy(h_buftop, d_buftop, mxsub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_buftop, d_buftop, mxsub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Top buffer: Copy from device to host failed ... \n");
       return -1;
@@ -783,7 +783,7 @@ static int BSend(MPI_Comm comm, int thispe,
     CopyToLeftBuffer<<<grid, block>>>(uarray, d_bufleft, mxsub, mysub);
 
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufleft, d_bufleft, mysub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_bufleft, d_bufleft, mysub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Left buffer: Copy from device to host failed ... \n");
       return -1;
@@ -801,7 +801,7 @@ static int BSend(MPI_Comm comm, int thispe,
     CopyToRightBuffer<<<grid, block>>>(uarray, d_bufright, mxsub, mysub);
 
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufright, d_bufright, mysub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_bufright, d_bufright, mysub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Right buffer: Copy from device to host failed ... \n");
       return -1;
@@ -817,7 +817,7 @@ static int BSend(MPI_Comm comm, int thispe,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*(MYSUB+MYSUB) realtype entries, should
+ *   1) buffer should be able to hold 2*(MYSUB+MYSUB) sunrealtype entries, should
  *      be passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -827,13 +827,13 @@ static int BSend(MPI_Comm comm, int thispe,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *host_recv_buff)
+                     sunrealtype *host_recv_buff)
 {
   /* Have left, right, top and bottom buffers use the same host_recv_buff. */
-  realtype *bufleft   = host_recv_buff;
-  realtype *bufright  = host_recv_buff + mysub;
-  realtype *buftop    = host_recv_buff + 2*mysub;
-  realtype *bufbottom = host_recv_buff + 2*mysub + mxsub;
+  sunrealtype *bufleft   = host_recv_buff;
+  sunrealtype *bufright  = host_recv_buff + mysub;
+  sunrealtype *buftop    = host_recv_buff + 2*mysub;
+  sunrealtype *bufbottom = host_recv_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0) {
@@ -866,7 +866,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -876,26 +876,26 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
                      int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *uext, const realtype *host_recv_buff, realtype *dev_recv_buff)
+                     sunrealtype *uext, const sunrealtype *host_recv_buff, sunrealtype *dev_recv_buff)
 {
   cudaError_t err;
   MPI_Status status;
 
-  const realtype *h_bufleft   = host_recv_buff;
-  const realtype *h_bufright  = host_recv_buff + mysub;
-  const realtype *h_buftop    = host_recv_buff + 2*mysub;
-  const realtype *h_bufbottom = host_recv_buff + 2*mysub + mxsub;
+  const sunrealtype *h_bufleft   = host_recv_buff;
+  const sunrealtype *h_bufright  = host_recv_buff + mysub;
+  const sunrealtype *h_buftop    = host_recv_buff + 2*mysub;
+  const sunrealtype *h_bufbottom = host_recv_buff + 2*mysub + mxsub;
 
-  realtype *d_bufleft   = dev_recv_buff;
-  realtype *d_bufright  = dev_recv_buff + mysub;
-  realtype *d_buftop    = dev_recv_buff + 2*mysub;
-  realtype *d_bufbottom = dev_recv_buff + 2*mysub + mxsub;
+  sunrealtype *d_bufleft   = dev_recv_buff;
+  sunrealtype *d_bufright  = dev_recv_buff + mysub;
+  sunrealtype *d_buftop    = dev_recv_buff + 2*mysub;
+  sunrealtype *d_bufbottom = dev_recv_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0) {
     MPI_Wait(&request[0], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufbottom, h_bufbottom, mxsub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufbottom, h_bufbottom, mxsub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -910,7 +910,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (jysub != npey-1) {
     MPI_Wait(&request[1], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_buftop, h_buftop, mxsub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_buftop, h_buftop, mxsub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -925,7 +925,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (ixsub != 0) {
     MPI_Wait(&request[2], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufleft, h_bufleft, mysub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufleft, h_bufleft, mysub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -940,7 +940,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (ixsub != npex-1) {
     MPI_Wait(&request[3], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufright, h_bufright, mysub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufright, h_bufright, mysub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -1013,7 +1013,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local extended vector (includes ghost nodes) */
-  err = cudaMalloc((void**) &data->uext, (mxsub + 2)*(mysub +2)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->uext, (mxsub + 2)*(mysub +2)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate uext ... \n");
     N_VDestroy(data->pp);
@@ -1022,7 +1022,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local host send buffer */
-  data->host_send_buff = (realtype*) malloc(2*(mxsub + mysub)*sizeof(realtype));
+  data->host_send_buff = (sunrealtype*) malloc(2*(mxsub + mysub)*sizeof(sunrealtype));
   if(data->host_send_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -1030,7 +1030,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
     return -1;
   }
 
-  data->host_recv_buff = (realtype*) malloc(2*(mxsub + mysub)*sizeof(realtype));
+  data->host_recv_buff = (sunrealtype*) malloc(2*(mxsub + mysub)*sizeof(sunrealtype));
   if(data->host_recv_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -1040,7 +1040,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local device send buffer */
-  err = cudaMalloc((void**) &data->dev_send_buff, 2*(mxsub + mysub)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->dev_send_buff, 2*(mxsub + mysub)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate dev_send_buff ... \n");
     N_VDestroy(data->pp);
@@ -1052,7 +1052,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local device send buffer */
-  err = cudaMalloc((void**) &data->dev_recv_buff, 2*(mxsub + mysub)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->dev_recv_buff, 2*(mxsub + mysub)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate dev_recv_buff ... \n");
     N_VDestroy(data->pp);
@@ -1093,17 +1093,17 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
                              N_Vector res, UserData data)
 {
   sunindextype i, iloc, j, jloc, loc;
-  realtype xfact, yfact;
+  sunrealtype xfact, yfact;
 
   /* Initialize uu. */
 
   // Get host pointer
-  realtype *uudata = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
-  realtype *iddata = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(id));
+  sunrealtype *uudata = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(uu));
+  sunrealtype *iddata = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(id));
 
   /* Set mesh spacings and subgrid indices for this PE. */
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
   const int ixsub = data->ixsub;
   const int jysub = data->jysub;
 
@@ -1125,7 +1125,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = dx*i;
       loc = iloc + jloc*mxsub;
-      uudata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      uudata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
 
       if (i == 0 || i == data->mx - 1 || j == 0 || j == data->my - 1)
         iddata[loc] = ZERO;
@@ -1155,7 +1155,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data)
 {
   printf("\nidaHeat2D_kry_p: Heat equation, parallel example problem for IDA\n");
   printf("            Discretized heat equation on 2D unit square.\n");
@@ -1188,9 +1188,9 @@ static void PrintHeader(realtype rtol, realtype atol, UserData data)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, ier;
 
diff --git a/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp b/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp
index 3fbe575de4..5c635297df 100644
--- a/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp
+++ b/examples/ida/mpiraja/idaHeat2D_kry_p_mpiraja.cpp
@@ -61,9 +61,9 @@
 
 /* Problem Constants */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11    /* Number of output times */
 
@@ -78,49 +78,49 @@
 typedef struct {
   int thispe, npex, npey, ixsub, jysub;
   sunindextype mx, my, mxsub, mysub;
-  realtype     dx, dy, coeffx, coeffy, coeffxy;
-  realtype    *uext; /* device array */
-  realtype    *host_send_buff;
-  realtype    *host_recv_buff;
-  realtype    *dev_send_buff;
-  realtype    *dev_recv_buff;
+  sunrealtype     dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype    *uext; /* device array */
+  sunrealtype    *host_send_buff;
+  sunrealtype    *host_recv_buff;
+  sunrealtype    *dev_send_buff;
+  sunrealtype    *dev_recv_buff;
   N_Vector     pp;    /* vector of diagonal preconditioner elements */
   MPI_Comm     comm;
 } *UserData;
 
 /* User-supplied residual function and supporting routines */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up,
             N_Vector rr, void *user_data);
 
 static int rescomm(N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up,
                     N_Vector res,  void *user_data);
 
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype *uarray, realtype *dev_send_buff, realtype *host_send_buff);
+                 const sunrealtype *uarray, sunrealtype *dev_send_buff, sunrealtype *host_send_buff);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *host_recv_buff);
+                     sunrealtype *host_recv_buff);
 
 static int BRecvWait(MPI_Request request[],
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *uext, const realtype *host_recv_buff, realtype *dev_recv_buff);
+                     sunrealtype *uext, const sunrealtype *host_recv_buff, sunrealtype *dev_recv_buff);
 
 /* User-supplied preconditioner routines */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
-               N_Vector rvec, N_Vector zvec, realtype c_j,
-               realtype delta, void *user_data);
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+               N_Vector rvec, N_Vector zvec, sunrealtype c_j,
+               sunrealtype delta, void *user_data);
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data);
 
 /* Private function to check function return values */
 
@@ -133,9 +133,9 @@ static int DeleteUserData(UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
   UserData data;
   int iout, thispe, ier, npes;
   sunindextype local_N;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uulocal, uu, up, constraints, id, res;
   SUNContext ctx;
 
@@ -234,11 +234,11 @@ int main(int argc, char *argv[])
   /* Set constraints to all 1's for nonnegative solution values. */
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -348,7 +348,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   int retval = 0;
@@ -381,8 +381,8 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  *
  */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data)
 {
   const sunindextype zero = 0;
   sunindextype ibc, i0, jbc, j0;
@@ -395,10 +395,10 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
   const int npey  = data->npey;
   const sunindextype mxsub = data->mxsub;
   const sunindextype mysub = data->mysub;
-  realtype *ppv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(data->pp));
+  sunrealtype *ppv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(data->pp));
 
   /* Calculate the value for the inverse element of the diagonal preconditioner */
-  const realtype pelinv = ONE/(c_j + data->coeffxy);
+  const sunrealtype pelinv = ONE/(c_j + data->coeffxy);
 
   /* Initially set all pp elements on the device to one. */
   N_VConst(ONE, data->pp);
@@ -428,9 +428,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
  * computed in PsetupHeat), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data = (UserData) user_data;
 
@@ -467,14 +467,14 @@ static int rescomm(N_Vector uu, N_Vector up, void* user_data)
   const sunindextype mysub = data->mysub;
 
   /* Get pointers to buffers and extended solution vector data array uext. */
-  realtype *uext = data->uext;
-  realtype *host_send_buff = data->host_send_buff;
-  realtype *host_recv_buff = data->host_recv_buff;
-  realtype *dev_send_buff  = data->dev_send_buff;
-  realtype *dev_recv_buff  = data->dev_recv_buff;
+  sunrealtype *uext = data->uext;
+  sunrealtype *host_send_buff = data->host_send_buff;
+  sunrealtype *host_recv_buff = data->host_recv_buff;
+  sunrealtype *dev_send_buff  = data->dev_send_buff;
+  sunrealtype *dev_recv_buff  = data->dev_recv_buff;
 
   /* Get solution vector data. */
-  const realtype *uarray = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
+  const sunrealtype *uarray = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
 
   /* Set array of MPI requests */
   MPI_Request request[4];
@@ -498,7 +498,7 @@ static int rescomm(N_Vector uu, N_Vector up, void* user_data)
  * has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
                     void *user_data)
 {
   UserData data = (UserData) user_data;
@@ -511,15 +511,15 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
   const sunindextype mxsub  = data->mxsub;
   const sunindextype mxsub2 = data->mxsub + 2;
   const sunindextype mysub  = data->mysub;
-  const realtype coeffx  = data->coeffx;
-  const realtype coeffy  = data->coeffy;
-  const realtype coeffxy = data->coeffxy;
+  const sunrealtype coeffx  = data->coeffx;
+  const sunrealtype coeffy  = data->coeffy;
+  const sunrealtype coeffxy = data->coeffxy;
 
   /* Vector data arrays, extended work array uext. */
-  const realtype *uuv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
-  const realtype *upv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(up));
-  realtype *resv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(rr));
-  realtype *uext = data->uext;
+  const sunrealtype *uuv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
+  const sunrealtype *upv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(up));
+  sunrealtype *resv = N_VGetDeviceArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(rr));
+  sunrealtype *uext = data->uext;
 
   const sunindextype zero = 0;
   sunindextype ibc, i0, jbc, j0;
@@ -557,9 +557,9 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
       sunindextype locu  = i + j*mxsub;
       sunindextype locue = (i+1) + (j+1)*mxsub2;
 
-      realtype termx   = coeffx * (uext[locue-1]      + uext[locue+1]);
-      realtype termy   = coeffy * (uext[locue-mxsub2] + uext[locue+mxsub2]);
-      realtype termctr = coeffxy * uext[locue];
+      sunrealtype termx   = coeffx * (uext[locue-1]      + uext[locue+1]);
+      sunrealtype termy   = coeffy * (uext[locue-mxsub2] + uext[locue+mxsub2]);
+      sunrealtype termctr = coeffxy * uext[locue];
       resv[locu] = upv[locu] - (termx + termy - termctr);
     }
   );
@@ -575,21 +575,21 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype *uarray, realtype *dev_send_buff, realtype *host_send_buff)
+                 const sunrealtype *uarray, sunrealtype *dev_send_buff, sunrealtype *host_send_buff)
 {
   cudaError_t err;
   const sunindextype zero = 0;
   /* Have left, right, top and bottom device buffers use the same dev_send_buff. */
-  realtype *d_bufleft   = dev_send_buff;
-  realtype *d_bufright  = dev_send_buff + mysub;
-  realtype *d_buftop    = dev_send_buff + 2*mysub;
-  realtype *d_bufbottom = dev_send_buff + 2*mysub + mxsub;
+  sunrealtype *d_bufleft   = dev_send_buff;
+  sunrealtype *d_bufright  = dev_send_buff + mysub;
+  sunrealtype *d_buftop    = dev_send_buff + 2*mysub;
+  sunrealtype *d_bufbottom = dev_send_buff + 2*mysub + mxsub;
 
   /* Have left, right, top and bottom host buffers use the same host_send_buff. */
-  realtype *h_bufleft   = host_send_buff;
-  realtype *h_bufright  = host_send_buff + mysub;
-  realtype *h_buftop    = host_send_buff + 2*mysub;
-  realtype *h_bufbottom = host_send_buff + 2*mysub + mxsub;
+  sunrealtype *h_bufleft   = host_send_buff;
+  sunrealtype *h_bufright  = host_send_buff + mysub;
+  sunrealtype *h_buftop    = host_send_buff + 2*mysub;
+  sunrealtype *h_bufbottom = host_send_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, send data from bottom x-line of u.  (via bufbottom) */
 
@@ -601,7 +601,7 @@ static int BSend(MPI_Comm comm, int thispe,
       }
     );
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufbottom, d_bufbottom, mxsub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_bufbottom, d_bufbottom, mxsub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Bottom buffer: Copy from device to host failed with code %d... \n", err);
       return -1;
@@ -620,7 +620,7 @@ static int BSend(MPI_Comm comm, int thispe,
       }
     );
     // Copy buffer to the host
-    err = cudaMemcpy(h_buftop, d_buftop, mxsub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_buftop, d_buftop, mxsub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Top buffer: Copy from device to host failed ... \n");
       return -1;
@@ -639,7 +639,7 @@ static int BSend(MPI_Comm comm, int thispe,
       }
     );
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufleft, d_bufleft, mysub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_bufleft, d_bufleft, mysub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Left buffer: Copy from device to host failed ... \n");
       return -1;
@@ -658,7 +658,7 @@ static int BSend(MPI_Comm comm, int thispe,
       }
     );
     // Copy buffer to the host
-    err = cudaMemcpy(h_bufright, d_bufright, mysub*sizeof(realtype), cudaMemcpyDeviceToHost);
+    err = cudaMemcpy(h_bufright, d_bufright, mysub*sizeof(sunrealtype), cudaMemcpyDeviceToHost);
     if (err != cudaSuccess) {
       printf("Right buffer: Copy from device to host failed ... \n");
       return -1;
@@ -674,7 +674,7 @@ static int BSend(MPI_Comm comm, int thispe,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*(MYSUB+MYSUB) realtype entries, should
+ *   1) buffer should be able to hold 2*(MYSUB+MYSUB) sunrealtype entries, should
  *      be passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -684,13 +684,13 @@ static int BSend(MPI_Comm comm, int thispe,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *host_recv_buff)
+                     sunrealtype *host_recv_buff)
 {
   /* Have left, right, top and bottom buffers use the same host_recv_buff. */
-  realtype *bufleft   = host_recv_buff;
-  realtype *bufright  = host_recv_buff + mysub;
-  realtype *buftop    = host_recv_buff + 2*mysub;
-  realtype *bufbottom = host_recv_buff + 2*mysub + mxsub;
+  sunrealtype *bufleft   = host_recv_buff;
+  sunrealtype *bufright  = host_recv_buff + mysub;
+  sunrealtype *buftop    = host_recv_buff + 2*mysub;
+  sunrealtype *bufbottom = host_recv_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0) {
@@ -723,7 +723,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -733,21 +733,21 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
                      int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype *uext, const realtype *host_recv_buff, realtype *dev_recv_buff)
+                     sunrealtype *uext, const sunrealtype *host_recv_buff, sunrealtype *dev_recv_buff)
 {
   cudaError_t err;
   MPI_Status status;
   const sunindextype zero = 0;
 
-  const realtype *h_bufleft   = host_recv_buff;
-  const realtype *h_bufright  = host_recv_buff + mysub;
-  const realtype *h_buftop    = host_recv_buff + 2*mysub;
-  const realtype *h_bufbottom = host_recv_buff + 2*mysub + mxsub;
+  const sunrealtype *h_bufleft   = host_recv_buff;
+  const sunrealtype *h_bufright  = host_recv_buff + mysub;
+  const sunrealtype *h_buftop    = host_recv_buff + 2*mysub;
+  const sunrealtype *h_bufbottom = host_recv_buff + 2*mysub + mxsub;
 
-  realtype *d_bufleft   = dev_recv_buff;
-  realtype *d_bufright  = dev_recv_buff + mysub;
-  realtype *d_buftop    = dev_recv_buff + 2*mysub;
-  realtype *d_bufbottom = dev_recv_buff + 2*mysub + mxsub;
+  sunrealtype *d_bufleft   = dev_recv_buff;
+  sunrealtype *d_bufright  = dev_recv_buff + mysub;
+  sunrealtype *d_buftop    = dev_recv_buff + 2*mysub;
+  sunrealtype *d_bufbottom = dev_recv_buff + 2*mysub + mxsub;
 
   const sunindextype mxsub2 = mxsub + 2;
   const sunindextype mysub1 = mysub + 1;
@@ -756,7 +756,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (jysub != 0) {
     MPI_Wait(&request[0], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufbottom, h_bufbottom, mxsub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufbottom, h_bufbottom, mxsub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -773,7 +773,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (jysub != npey-1) {
     MPI_Wait(&request[1], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_buftop, h_buftop, mxsub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_buftop, h_buftop, mxsub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -790,7 +790,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (ixsub != 0) {
     MPI_Wait(&request[2], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufleft, h_bufleft, mysub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufleft, h_bufleft, mysub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -807,7 +807,7 @@ static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
   if (ixsub != npex-1) {
     MPI_Wait(&request[3], &status);
     /* Copy the buffer from the host to the device */
-    err = cudaMemcpy(d_bufright, h_bufright, mysub*sizeof(realtype), cudaMemcpyHostToDevice);
+    err = cudaMemcpy(d_bufright, h_bufright, mysub*sizeof(sunrealtype), cudaMemcpyHostToDevice);
     if (err != cudaSuccess) {
       printf("Copy from host to device failed ... \n");
       return -1;
@@ -882,7 +882,7 @@ static int AllocUserData(MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local extended vector (includes ghost nodes) */
-  err = cudaMalloc((void**) &data->uext, (mxsub + 2)*(mysub +2)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->uext, (mxsub + 2)*(mysub +2)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate uext ... \n");
     N_VDestroy(data->pp);
@@ -891,7 +891,7 @@ static int AllocUserData(MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local host send buffer */
-  data->host_send_buff = (realtype*) malloc(2*(mxsub + mysub)*sizeof(realtype));
+  data->host_send_buff = (sunrealtype*) malloc(2*(mxsub + mysub)*sizeof(sunrealtype));
   if(data->host_send_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -899,7 +899,7 @@ static int AllocUserData(MPI_Comm comm, N_Vector uu, UserData data)
     return -1;
   }
 
-  data->host_recv_buff = (realtype*) malloc(2*(mxsub + mysub)*sizeof(realtype));
+  data->host_recv_buff = (sunrealtype*) malloc(2*(mxsub + mysub)*sizeof(sunrealtype));
   if(data->host_recv_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -909,7 +909,7 @@ static int AllocUserData(MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local device send buffer */
-  err = cudaMalloc((void**) &data->dev_send_buff, 2*(mxsub + mysub)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->dev_send_buff, 2*(mxsub + mysub)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate dev_send_buff ... \n");
     N_VDestroy(data->pp);
@@ -921,7 +921,7 @@ static int AllocUserData(MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local device send buffer */
-  err = cudaMalloc((void**) &data->dev_recv_buff, 2*(mxsub + mysub)*sizeof(realtype));
+  err = cudaMalloc((void**) &data->dev_recv_buff, 2*(mxsub + mysub)*sizeof(sunrealtype));
   if(err != cudaSuccess) {
     printf("Failed to allocate dev_recv_buff ... \n");
     N_VDestroy(data->pp);
@@ -962,17 +962,17 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
                              N_Vector res, UserData data)
 {
   sunindextype i, iloc, j, jloc, loc;
-  realtype xfact, yfact;
+  sunrealtype xfact, yfact;
 
   /* Initialize uu. */
 
   // Get host pointer
-  realtype *uudata = N_VGetHostArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
-  realtype *iddata = N_VGetHostArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(id));
+  sunrealtype *uudata = N_VGetHostArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(uu));
+  sunrealtype *iddata = N_VGetHostArrayPointer_Raja(N_VGetLocalVector_MPIPlusX(id));
 
   /* Set mesh spacings and subgrid indices for this PE. */
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
   const int ixsub = data->ixsub;
   const int jysub = data->jysub;
 
@@ -994,7 +994,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = dx*i;
       loc = iloc + jloc*mxsub;
-      uudata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      uudata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
 
       if (i == 0 || i == data->mx - 1 || j == 0 || j == data->my - 1)
         iddata[loc] = ZERO;
@@ -1024,7 +1024,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data)
 {
   printf("\nidaHeat2D_kry_p: Heat equation, parallel example problem for IDA\n");
   printf("            Discretized heat equation on 2D unit square.\n");
@@ -1057,9 +1057,9 @@ static void PrintHeader(realtype rtol, realtype atol, UserData data)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, ier;
 
diff --git a/examples/ida/parallel/idaFoodWeb_kry_bbd_p.c b/examples/ida/parallel/idaFoodWeb_kry_bbd_p.c
index 9e4d6d0cfc..34fb1fe9ef 100644
--- a/examples/ida/parallel/idaFoodWeb_kry_bbd_p.c
+++ b/examples/ida/parallel/idaFoodWeb_kry_bbd_p.c
@@ -120,8 +120,8 @@
 #define NPREY       1        /* Number of prey (= number of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898) /* pi */
-#define FOURPI      (RCONST(4.0)*PI)        /* 4 pi */
+#define PI          SUN_RCONST(3.1415926535898) /* pi */
+#define FOURPI      (SUN_RCONST(4.0)*PI)        /* 4 pi */
 
 #define MXSUB       10    /* Number of x mesh points per processor subgrid */
 #define MYSUB       10    /* Number of y mesh points per processor subgrid */
@@ -131,23 +131,23 @@
 #define MY          (MYSUB*NPEY)      /* MY = number of y mesh points */
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns. */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns. */
-#define AX          RCONST(1.0)    /* Total range of x variable */
-#define AY          RCONST(1.0)    /* Total range of y variable */
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
-#define ZERO        RCONST(0.)     /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns. */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns. */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
+#define ZERO        SUN_RCONST(0.)     /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
 /* User-defined vector accessor macro IJ_Vptr. */
 
@@ -165,8 +165,8 @@
 typedef struct {
   int ns, np, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
     rhs[NUM_SPECIES], cext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
   MPI_Comm comm;
   N_Vector rates;
@@ -175,34 +175,34 @@ typedef struct {
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector cc, N_Vector cp,
                    void *user_data);
 
 /* Prototypes for supporting functions */
 
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
 
-static realtype dotprod(int size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2);
 
 /* Prototypes for private functions */
 
@@ -215,9 +215,9 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype time,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype time,
                         UserData webdata, MPI_Comm comm);
 
 static void PrintFinalStats(void *ida_mem);
@@ -237,7 +237,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData webdata;
   sunindextype SystemSize, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector cc, cp, res, id;
   int thispe, npes, maxl, iout, retval;
   SUNContext ctx;
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1, thispe)) MPI_Abort(comm, 1);
 
@@ -405,7 +405,7 @@ static void InitUserData(UserData webdata, int thispe, int npes,
                          MPI_Comm comm)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
 
   webdata->jysub = thispe / NPEX;
   webdata->ixsub = thispe - (webdata->jysub)*NPEX;
@@ -472,7 +472,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector res, UserData webdata)
 {
   int ixsub, jysub, mxsub, mysub, np, ix, jy, is;
-  realtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
+  sunrealtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
 
   ixsub = webdata->ixsub;
   jysub = webdata->jysub;
@@ -494,7 +494,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
       idxy = IJ_Vptr(id,ix,jy);
       for (is = 0; is < NUM_SPECIES; is++) {
 	if (is < np)
-           {cxy[is] = RCONST(10.0)+(realtype)(is+1)*xyfactor; idxy[is] = ONE;}
+           {cxy[is] = SUN_RCONST(10.0)+(sunrealtype)(is+1)*xyfactor; idxy[is] = ONE;}
         else { cxy[is] = 1.0e5; idxy[is] = ZERO; }
       }
     }
@@ -524,7 +524,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_kry_bbd_p: Predator-prey DAE parallel example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -557,11 +557,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype tt,
                         UserData webdata, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -719,7 +719,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  * reslocal, for computation of the residuals on this processor.
  */
 
-static int resweb(realtype tt,
+static int resweb(sunrealtype tt,
                   N_Vector cc, N_Vector cp, N_Vector rr,
                   void *user_data)
 {
@@ -750,13 +750,13 @@ static int resweb(realtype tt,
  * and receive-waiting, in routines BRecvPost, BSend, BRecvWait.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector cc, N_Vector cp,
                    void *user_data)
 {
 
   UserData webdata;
-  realtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -793,7 +793,7 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -802,11 +802,11 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -836,18 +836,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -894,11 +894,11 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of cc. */
 
@@ -973,11 +973,11 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector cc, N_Vector cp, N_Vector rr,
                     void *user_data)
 {
-  realtype *cdata, *ratesxy, *cpxy, *resxy,
+  sunrealtype *cdata, *ratesxy, *cpxy, *resxy,
     xx, yy, dcyli, dcyui, dcxli, dcxui;
   int ix, jy, is, i, locc, ylocce, locce;
   UserData webdata;
@@ -1071,11 +1071,11 @@ static int reslocal(sunindextype Nlocal, realtype tt,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -1088,13 +1088,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(int size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1;
   xx2 = x2;
diff --git a/examples/ida/parallel/idaFoodWeb_kry_p.c b/examples/ida/parallel/idaFoodWeb_kry_p.c
index c6410f5171..9a63a090f0 100644
--- a/examples/ida/parallel/idaFoodWeb_kry_p.c
+++ b/examples/ida/parallel/idaFoodWeb_kry_p.c
@@ -126,8 +126,8 @@
 #define NPREY       1        /* Number of prey (= number of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)   /* pi */
-#define FOURPI      (RCONST(4.0)*PI)          /* 4 pi */
+#define PI          SUN_RCONST(3.1415926535898)   /* pi */
+#define FOURPI      (SUN_RCONST(4.0)*PI)          /* 4 pi */
 
 #define MXSUB       10    /* Number of x mesh points per processor subgrid */
 #define MYSUB       10    /* Number of y mesh points per processor subgrid */
@@ -137,23 +137,23 @@
 #define MY          (MYSUB*NPEY)      /* MY = number of y mesh points */
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns. */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns. */
-#define AX          RCONST(1.0)    /* Total range of x variable */
-#define AY          RCONST(1.0)    /* Total range of y variable */
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
-#define ZERO        RCONST(0.)     /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns. */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns. */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
+#define ZERO        SUN_RCONST(0.)     /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
 
 /* User-defined vector accessor macro IJ_Vptr. */
@@ -171,12 +171,12 @@ typedef struct {
   sunindextype ns;
   int np, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
     rhs[NUM_SPECIES], cext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
   MPI_Comm comm;
   N_Vector rates;
-  realtype **PP[MXSUB][MYSUB];
+  sunrealtype **PP[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
   N_Vector ewt;
   void *ida_mem;
@@ -185,37 +185,37 @@ typedef struct {
 
 /* Prototypes for user-supplied and supporting functions. */
 
-static int resweb(realtype time,
+static int resweb(sunrealtype time,
                   N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
-static int Precondbd(realtype tt, N_Vector cc, N_Vector cp,
-                     N_Vector rr, realtype cj, void *user_data);
+static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp,
+                     N_Vector rr, sunrealtype cj, void *user_data);
 
-static int PSolvebd(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolvebd(sunrealtype tt, N_Vector cc, N_Vector cp,
                     N_Vector rr, N_Vector rvec, N_Vector zvec,
-                    realtype cj, realtype delta, void *user_data);
+                    sunrealtype cj, sunrealtype delta, void *user_data);
 
 static int rescomm(N_Vector cc, N_Vector cp, void *user_data);
 
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
+static int reslocal(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data);
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
 
-static realtype dotprod(int size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2);
 
 /* Prototypes for private Helper Functions. */
 
@@ -231,9 +231,9 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector scrtch, UserData webdata);
 
 static void PrintHeader(sunindextype SystemSize, int maxl,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype time,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype time,
                         UserData webdata, MPI_Comm comm);
 
 static void PrintFinalStats(void *ida_mem);
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData webdata;
   sunindextype SystemSize, local_N;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector cc, cp, res, id;
   int thispe, npes, maxl, iout, retval;
   SUNContext ctx;
@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if (check_retval(&retval, "IDACalcIC", 1, thispe))
     MPI_Abort(comm, 1);
@@ -448,7 +448,7 @@ static void InitUserData(UserData webdata, int thispe, int npes,
                          MPI_Comm comm)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
 
   webdata->jysub = thispe / NPEX;
   webdata->ixsub = thispe - (webdata->jysub)*NPEX;
@@ -535,7 +535,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector res, UserData webdata)
 {
   int ixsub, jysub, mxsub, mysub, np, ix, jy, is;
-  realtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
+  sunrealtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
 
   ixsub = webdata->ixsub;
   jysub = webdata->jysub;
@@ -550,13 +550,13 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yy = (jy + jysub*mysub) * dy;
     for (ix = 0; ix < mxsub; ix++) {
       xx = (ix + ixsub*mxsub) * dx;
-      xyfactor = RCONST(16.0)*xx*(ONE - xx)*yy*(ONE - yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE - xx)*yy*(ONE - yy);
       xyfactor *= xyfactor;
 
       cxy = IJ_Vptr(cc,ix,jy);
       idxy = IJ_Vptr(id,ix,jy);
       for (is = 0; is < NUM_SPECIES; is++) {
-        if (is < np) { cxy[is] = RCONST(10.0) + (realtype)(is+1)*xyfactor; idxy[is] = ONE; }
+        if (is < np) { cxy[is] = SUN_RCONST(10.0) + (sunrealtype)(is+1)*xyfactor; idxy[is] = ONE; }
         else { cxy[is] = 1.0e5; idxy[is] = ZERO; }
       }
     }
@@ -581,7 +581,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  */
 
 static void PrintHeader(sunindextype SystemSize, int maxl,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_kry_p: Predator-prey DAE parallel example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -614,11 +614,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * (NOTE: This routine is specific to the case NUM_SPECIES = 2.)
  */
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype tt,
                         UserData webdata, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -771,7 +771,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  *    reslocal, for computation of the residuals on this processor.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   int retval;
@@ -803,7 +803,7 @@ static int rescomm(N_Vector cc, N_Vector cp, void *user_data)
 {
 
   UserData webdata;
-  realtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -841,11 +841,11 @@ static int rescomm(N_Vector cc, N_Vector cp, void *user_data)
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of cc. */
   if (jysub != 0)
@@ -883,7 +883,7 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -892,11 +892,11 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -926,18 +926,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -1013,10 +1013,10 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
+static int reslocal(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data)
 {
-  realtype *cdata, *ratesxy, *cpxy, *resxy,
+  sunrealtype *cdata, *ratesxy, *cpxy, *resxy,
     xx, yy, dcyli, dcyui, dcxli, dcxui;
   int ix, jy, is, i, locc, ylocce, locce;
   UserData webdata;
@@ -1108,11 +1108,11 @@ static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -1125,13 +1125,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(int size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -1148,22 +1148,22 @@ static realtype dotprod(int size, realtype *x1, realtype *x2)
  * Each block is LU-factored, for later solution of the linear systems.
  */
 
-static int Precondbd(realtype tt, N_Vector cc, N_Vector cp,
-                     N_Vector rr, realtype cj, void *user_data)
+static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp,
+                     N_Vector rr, sunrealtype cj, void *user_data)
 {
   int retval, thispe;
   sunindextype ret;
-  realtype uround;
-  realtype xx, yy, *cxy, *ewtxy, cctemp, **Pxy, *ratesxy, *Pxycol, *cpxy;
-  realtype inc, sqru, fac, perturb_rates[NUM_SPECIES];
+  sunrealtype uround;
+  sunrealtype xx, yy, *cxy, *ewtxy, cctemp, **Pxy, *ratesxy, *Pxycol, *cpxy;
+  sunrealtype inc, sqru, fac, perturb_rates[NUM_SPECIES];
   int is, js, ix, jy;
   UserData webdata;
   void *ida_mem;
   N_Vector ewt;
-  realtype hh;
+  sunrealtype hh;
 
   webdata = (UserData)user_data;
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
   sqru = sqrt(uround);
   thispe = webdata->thispe;
 
@@ -1222,11 +1222,11 @@ static int Precondbd(realtype tt, N_Vector cc, N_Vector cp,
  * preconditioner PP, to compute the solution of PP * zvec = rvec.
  */
 
-static int PSolvebd(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolvebd(sunrealtype tt, N_Vector cc, N_Vector cp,
                     N_Vector rr, N_Vector rvec, N_Vector zvec,
-                    realtype cj, realtype delta, void *user_data)
+                    sunrealtype cj, sunrealtype delta, void *user_data)
 {
-  realtype **Pxy, *zxy;
+  sunrealtype **Pxy, *zxy;
   sunindextype *pivot, ix, jy;
   UserData webdata;
 
diff --git a/examples/ida/parallel/idaHeat2D_kry_bbd_p.c b/examples/ida/parallel/idaHeat2D_kry_bbd_p.c
index a057deb334..0e1f8eb544 100644
--- a/examples/ida/parallel/idaHeat2D_kry_bbd_p.c
+++ b/examples/ida/parallel/idaHeat2D_kry_bbd_p.c
@@ -54,9 +54,9 @@
 
 #include <mpi.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -73,34 +73,34 @@
 typedef struct {
   int thispe, mx, my, ixsub, jysub, npex, npey, mxsub, mysub;
   sunindextype n_local;
-  realtype dx, dy, coeffx, coeffy, coeffxy;
-  realtype uext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype uext[(MXSUB+2)*(MYSUB+2)];
   MPI_Comm comm;
 } *UserData;
 
 /* Prototypes of user-supplied and supporting functions */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data);
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[]);
+                 sunrealtype uarray[]);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[]);
+                     sunrealtype uext[], sunrealtype buffer[]);
 
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                     int dsizex, realtype uext[], realtype buffer[]);
+                     int dsizex, sunrealtype uext[], sunrealtype buffer[]);
 
 /* Prototypes of private functions */
 
@@ -109,11 +109,11 @@ static int InitUserData(int thispe, MPI_Comm comm, UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol);
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol);
 
 static void PrintCase(int case_number, sunindextype mudq, sunindextype mukeep);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
   UserData data;
   int thispe, iout, retval, npes;
   sunindextype Neq, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
   SUNContext ctx;
 
@@ -197,12 +197,12 @@ int main(int argc, char *argv[])
   SetInitialProfile(uu, up, id, res, data);
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
 
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data)
 {
   int retval;
@@ -375,11 +375,11 @@ static int heatres(realtype tres, N_Vector uu, N_Vector up,
  * communication of data in u needed to calculate G.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*MYSUB];
   MPI_Comm comm;
   int thispe, ixsub, jysub, mxsub, mysub;
   MPI_Request request[4];
@@ -412,12 +412,12 @@ static int rescomm(sunindextype Nlocal, realtype tt,
  *  has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data)
 {
-  realtype *uext, *uuv, *upv, *resv;
-  realtype termx, termy, termctr;
+  sunrealtype *uext, *uuv, *upv, *resv;
+  sunrealtype termx, termy, termctr;
   int lx, ly, offsetu, offsetue, locu, locue;
   int ixsub, jysub, mxsub, mxsub2, mysub, npex, npey;
   int ixbegin, ixend, jybegin, jyend;
@@ -483,10 +483,10 @@ static int reslocal(sunindextype Nlocal, realtype tres,
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[])
+                 sunrealtype uarray[])
 {
   int ly, offsetu;
-  realtype bufleft[MYSUB], bufright[MYSUB];
+  sunrealtype bufleft[MYSUB], bufright[MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of u. */
 
@@ -528,7 +528,7 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -538,11 +538,11 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[])
+                     sunrealtype uext[], sunrealtype buffer[])
 {
   int offsetue;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0)
@@ -575,7 +575,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -583,11 +583,11 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
  */
 
 static int BRecvWait(MPI_Request request[], int ixsub,
-                     int jysub, int dsizex, realtype uext[],
-                     realtype buffer[])
+                     int jysub, int dsizex, sunrealtype uext[],
+                     sunrealtype buffer[])
 {
   int ly, dsizex2, offsetue;
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2;
@@ -666,7 +666,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
 {
   int i, iloc, j, jloc, offset, loc, ixsub, jysub;
   int ixbegin, ixend, jybegin, jyend;
-  realtype xfact, yfact, *udata, *iddata;
+  sunrealtype xfact, yfact, *udata, *iddata;
 
   /* Initialize uu. */
 
@@ -695,7 +695,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = data->dx * i;
       loc = offset + iloc;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
       if (i == 0 || i == MX-1 || j == 0 || j == MY-1) iddata[loc] = ZERO;
     }
   }
@@ -719,7 +719,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol)
 {
     printf("\nidaHeat2D_kry_bbd_p: Heat equation, parallel example problem for IDA\n");
     printf("                Discretized heat equation on 2D unit square.\n");
@@ -765,9 +765,9 @@ static void PrintCase(int case_number, sunindextype mudq, sunindextype mukeep)
  * Print integrator statistics and max-norm of solution
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype umax, hused;
+  sunrealtype umax, hused;
   int kused, retval;
   long int nst, nni, nre, nli, npe, nps, nreLS, nge;
 
diff --git a/examples/ida/parallel/idaHeat2D_kry_p.c b/examples/ida/parallel/idaHeat2D_kry_p.c
index a09fc40e2a..9a504eea16 100644
--- a/examples/ida/parallel/idaHeat2D_kry_p.c
+++ b/examples/ida/parallel/idaHeat2D_kry_p.c
@@ -52,9 +52,9 @@
 
 #include <mpi.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11    /* Number of output times */
 
@@ -69,47 +69,47 @@
 typedef struct {
   int thispe, npex, npey, ixsub, jysub;
   sunindextype mx, my, mxsub, mysub;
-  realtype     dx, dy, coeffx, coeffy, coeffxy;
-  realtype    *uext;
-  realtype    *send_buff;
-  realtype    *recv_buff;
+  sunrealtype     dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype    *uext;
+  sunrealtype    *send_buff;
+  sunrealtype    *recv_buff;
   N_Vector     pp;    /* vector of diagonal preconditioner elements */
   MPI_Comm     comm;
 } *UserData;
 
 /* User-supplied residual function and supporting routines */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up,
             N_Vector rr, void *user_data);
 
 static int rescomm(N_Vector uu, N_Vector up, UserData data);
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up,
                     N_Vector res,  UserData data);
 
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype uarray[], realtype* send_buffer);
+                 const sunrealtype uarray[], sunrealtype* send_buffer);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype recv_buff[]);
+                     sunrealtype recv_buff[]);
 
 static int BRecvWait(MPI_Request request[],
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype uext[], const realtype recv_buff[]);
+                     sunrealtype uext[], const sunrealtype recv_buff[]);
 
 /* User-supplied preconditioner routines */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
-               N_Vector rvec, N_Vector zvec, realtype c_j,
-               realtype delta, void *user_data);
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+               N_Vector rvec, N_Vector zvec, sunrealtype c_j,
+               sunrealtype delta, void *user_data);
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data);
 
 /* Private function to check function return values */
 
@@ -122,9 +122,9 @@ static int DeleteUserData(UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -144,7 +144,7 @@ int main(int argc, char *argv[])
   UserData data;
   int iout, thispe, retval, npes;
   sunindextype Neq, local_N;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
   SUNContext ctx;
 
@@ -219,11 +219,11 @@ int main(int argc, char *argv[])
   /* Set constraints to all 1's for nonnegative solution values. */
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -323,7 +323,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   int retval = 0;
@@ -356,8 +356,8 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  *
  */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data)
 {
   sunindextype lx, ly, ixbegin, ixend, jybegin, jyend, locu;
 
@@ -369,10 +369,10 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
   const int npey  = data->npey;
   const sunindextype mxsub = data->mxsub;
   const sunindextype mysub = data->mysub;
-  realtype *ppv = N_VGetArrayPointer(data->pp);
+  sunrealtype *ppv = N_VGetArrayPointer(data->pp);
 
   /* Calculate the value for the inverse of the diagonal preconditioner */
-  const realtype pelinv = ONE/(c_j + data->coeffxy);
+  const sunrealtype pelinv = ONE/(c_j + data->coeffxy);
 
   /* Initially set all pp elements to one. */
   N_VConst(ONE, data->pp);
@@ -408,9 +408,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
  * computed in PsetupHeat), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data = (UserData) user_data;
 
@@ -447,10 +447,10 @@ static int rescomm(N_Vector uu, N_Vector up, UserData data)
   const sunindextype mysub = data->mysub;
 
   /* Get solution vector data, buffers, extended array uext. */
-  const realtype *uarray = N_VGetArrayPointer(uu);
-  realtype *uext = data->uext;
-  realtype *send_buffer = data->send_buff;
-  realtype *recv_buff = data->recv_buff;
+  const sunrealtype *uarray = N_VGetArrayPointer(uu);
+  sunrealtype *uext = data->uext;
+  sunrealtype *send_buffer = data->send_buff;
+  sunrealtype *recv_buff = data->recv_buff;
 
   /* Start receiving boundary data from neighboring PEs. */
   BRecvPost(comm, request, thispe, ixsub, jysub, npex, npey, mxsub, mysub, recv_buff);
@@ -471,10 +471,10 @@ static int rescomm(N_Vector uu, N_Vector up, UserData data)
  * has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
                     UserData data)
 {
-  realtype termx, termy, termctr;
+  sunrealtype termx, termy, termctr;
   sunindextype lx, ly;
   sunindextype locu, locue;
   sunindextype ixbegin, ixend, jybegin, jyend;
@@ -489,10 +489,10 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
   const sunindextype mysub = data->mysub;
 
   /* Vector data arrays, extended work array uext. */
-  const realtype *uuv = N_VGetArrayPointer(uu);
-  const realtype *upv = N_VGetArrayPointer(up);
-  realtype *resv = N_VGetArrayPointer(rr);
-  realtype *uext = data->uext;
+  const sunrealtype *uuv = N_VGetArrayPointer(uu);
+  const sunrealtype *upv = N_VGetArrayPointer(up);
+  sunrealtype *resv = N_VGetArrayPointer(rr);
+  sunrealtype *uext = data->uext;
 
   /* Initialize all elements of rr to uu. This sets the boundary
      elements simply without indexing hassles. */
@@ -542,14 +542,14 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
 static int BSend(MPI_Comm comm, int thispe,
                  int ixsub, int jysub, int npex, int npey,
                  sunindextype mxsub, sunindextype mysub,
-                 const realtype uarray[], realtype *send_buffer)
+                 const sunrealtype uarray[], sunrealtype *send_buffer)
 {
   sunindextype lx, ly;
   /* Have left, right, top and bottom buffers use the same send_buffer. */
-  realtype *bufleft   = send_buffer;
-  realtype *bufright  = send_buffer + mysub;
-  realtype *buftop    = send_buffer + 2*mysub;
-  realtype *bufbottom = send_buffer + 2*mysub + mxsub;
+  sunrealtype *bufleft   = send_buffer;
+  sunrealtype *bufright  = send_buffer + mysub;
+  sunrealtype *buftop    = send_buffer + 2*mysub;
+  sunrealtype *bufbottom = send_buffer + 2*mysub + mxsub;
 
   /* If jysub > 0, send data from bottom x-line of u.  (via bufbottom) */
 
@@ -594,7 +594,7 @@ static int BSend(MPI_Comm comm, int thispe,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -604,13 +604,13 @@ static int BSend(MPI_Comm comm, int thispe,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype recv_buff[])
+                     sunrealtype recv_buff[])
 {
   /* Have left, right, top and bottom buffers use the same recv_buff. */
-  realtype *bufleft   = recv_buff;
-  realtype *bufright  = recv_buff + mysub;
-  realtype *buftop    = recv_buff + 2*mysub;
-  realtype *bufbottom = recv_buff + 2*mysub + mxsub;
+  sunrealtype *bufleft   = recv_buff;
+  sunrealtype *bufright  = recv_buff + mysub;
+  sunrealtype *buftop    = recv_buff + 2*mysub;
+  sunrealtype *bufbottom = recv_buff + 2*mysub + mxsub;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0) {
@@ -643,7 +643,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -653,13 +653,13 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
                      int npex, int npey,
                      sunindextype mxsub, sunindextype mysub,
-                     realtype uext[], const realtype recv_buff[])
+                     sunrealtype uext[], const sunrealtype recv_buff[])
 {
   MPI_Status status;
-  const realtype *bufleft   = recv_buff;
-  const realtype *bufright  = recv_buff + mysub;
-  const realtype *buftop    = recv_buff + 2*mysub;
-  const realtype *bufbottom = recv_buff + 2*mysub + mxsub;
+  const sunrealtype *bufleft   = recv_buff;
+  const sunrealtype *bufright  = recv_buff + mysub;
+  const sunrealtype *buftop    = recv_buff + 2*mysub;
+  const sunrealtype *bufbottom = recv_buff + 2*mysub + mxsub;
   sunindextype ly, lx, offsetue;
   const sunindextype mxsub2 = mxsub + 2;
   const sunindextype mysub1 = mysub + 1;
@@ -763,7 +763,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local extended vector (includes ghost nodes) */
-  data->uext = (realtype*) malloc((data->mxsub + 2)*(data->mysub +2)*sizeof(realtype));
+  data->uext = (sunrealtype*) malloc((data->mxsub + 2)*(data->mysub +2)*sizeof(sunrealtype));
   if(data->uext == NULL) {
     N_VDestroy(data->pp);
     MPI_Abort(comm, 1);
@@ -771,7 +771,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
   }
 
   /* Allocate local host send buffer */
-  data->send_buff = (realtype*) malloc(2*(data->mxsub + data->mysub)*sizeof(realtype));
+  data->send_buff = (sunrealtype*) malloc(2*(data->mxsub + data->mysub)*sizeof(sunrealtype));
   if(data->send_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -779,7 +779,7 @@ static int AllocUserData(int thispe, MPI_Comm comm, N_Vector uu, UserData data)
     return -1;
   }
 
-  data->recv_buff = (realtype*) malloc(2*(data->mxsub + data->mysub)*sizeof(realtype));
+  data->recv_buff = (sunrealtype*) malloc(2*(data->mxsub + data->mysub)*sizeof(sunrealtype));
   if(data->recv_buff == NULL) {
     N_VDestroy(data->pp);
     free(data->uext);
@@ -813,16 +813,16 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
                              N_Vector res, UserData data)
 {
   sunindextype i, iloc, j, jloc, loc;
-  realtype xfact, yfact;
+  sunrealtype xfact, yfact;
 
   /* Initialize uu. */
 
-  realtype *uudata = N_VGetArrayPointer(uu);
-  realtype *iddata = N_VGetArrayPointer(id);
+  sunrealtype *uudata = N_VGetArrayPointer(uu);
+  sunrealtype *iddata = N_VGetArrayPointer(id);
 
   /* Set mesh spacings and subgrid indices for this PE. */
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
   const int ixsub = data->ixsub;
   const int jysub = data->jysub;
 
@@ -845,7 +845,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = dx*i;
       loc = iloc + jloc*mxsub;
-      uudata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      uudata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
 
       if (i == 0 || i == data->mx - 1 || j == 0 || j == data->my - 1)
         iddata[loc] = ZERO;
@@ -869,7 +869,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(realtype rtol, realtype atol, UserData data)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData data)
 {
   printf("\nidaHeat2D_kry_p: Heat equation, parallel example problem for IDA\n");
   printf("            Discretized heat equation on 2D unit square.\n");
@@ -902,9 +902,9 @@ static void PrintHeader(realtype rtol, realtype atol, UserData data)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/ida/petsc/idaHeat2D_petsc_snes.c b/examples/ida/petsc/idaHeat2D_petsc_snes.c
index 7939742096..518c9bb295 100644
--- a/examples/ida/petsc/idaHeat2D_petsc_snes.c
+++ b/examples/ida/petsc/idaHeat2D_petsc_snes.c
@@ -69,9 +69,9 @@
 #define DSYM "d"
 #endif
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -93,7 +93,7 @@ typedef struct {
 
 /* User-supplied residual function */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr, void *user_data);
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr, void *user_data);
 int jacHeat(SNES snes, Vec x, Mat Jpre, Mat J, void *user_data);
 
 /* User-supplied preconditioner routines */
@@ -107,9 +107,9 @@ int PsolveHeat(PC pc, Vec x, Vec y);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, void *user_data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol);
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu, SNES snes);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu, SNES snes);
 
 static void PrintFinalStats(void *ida_mem, SNES snes);
 
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
 {
   MPI_Comm comm;
   int iout, thispe, retval, npes;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   sunindextype Neq;
   PetscBool pre, jac;
   /* declare SUNDIALS data structures */
@@ -245,11 +245,11 @@ int main(int argc, char *argv[])
 
   /* Set constraints to all 1's for nonnegative solution values. */
   N_VConst(ONE, constraints);
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
   rtol = ZERO;
-  atol = RCONST(1.0e-4);
+  atol = SUN_RCONST(1.0e-4);
 
   /*
    * Call IDACreate and IDAInit, set integration tolerances, then set optional inputs
@@ -384,7 +384,7 @@ int main(int argc, char *argv[])
  *
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   PetscErrorCode ierr;
@@ -730,7 +730,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry_petscsnes: Heat equation, parallel example problem for IDA\n");
   printf("                         Discretized heat equation on 2D unit square.\n");
@@ -763,9 +763,9 @@ static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu, SNES snes)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu, SNES snes)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, njve, nre, nreLS, npe, nps;
   int kused;
   PetscInt nli;
diff --git a/examples/ida/petsc/idaHeat2D_petsc_spgmr.c b/examples/ida/petsc/idaHeat2D_petsc_spgmr.c
index 47f0221d3d..37d3b744a8 100644
--- a/examples/ida/petsc/idaHeat2D_petsc_spgmr.c
+++ b/examples/ida/petsc/idaHeat2D_petsc_spgmr.c
@@ -61,9 +61,9 @@
 #include <petscdm.h>
 #include <petscdmda.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -84,25 +84,25 @@ typedef struct {
 
 /* User-supplied residual function */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr, void *user_data);
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr, void *user_data);
 
 /* User-supplied preconditioner routines */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp,
-               N_Vector rr, realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp,
+               N_Vector rr, sunrealtype c_j, void *user_data);
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data);
+               sunrealtype c_j, sunrealtype delta, void *user_data);
 
 /* Private function to check function return values */
 
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, void *user_data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol);
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
   UserData data;
   int iout, thispe, retval, npes;
   sunindextype Neq;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
   PetscErrorCode ierr;                  /* PETSc error code  */
   Vec uvec;
@@ -223,12 +223,12 @@ int main(int argc, char *argv[])
 
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
 
   rtol = ZERO;
-  atol = RCONST(1.0e-4);
+  atol = SUN_RCONST(1.0e-4);
 
   /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
  *
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   PetscErrorCode ierr;
@@ -436,8 +436,8 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  *
  */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp,
-               N_Vector rr, realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp,
+               N_Vector rr, sunrealtype c_j, void *user_data)
 {
   PetscErrorCode ierr;
   PetscInt    i, j, Mx, My, xs, ys, xm, ym;
@@ -498,9 +498,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp,
  * computed in PsetupHeat), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data;
 
@@ -607,7 +607,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry_petsc: Heat equation, parallel example problem for IDA\n");
   printf("                     Discretized heat equation on 2D unit square.\n");
@@ -640,9 +640,9 @@ static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, njve, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/ida/raja/idaHeat2D_kry_raja.cpp b/examples/ida/raja/idaHeat2D_kry_raja.cpp
index 8fa5c08abc..4e86d6e849 100644
--- a/examples/ida/raja/idaHeat2D_kry_raja.cpp
+++ b/examples/ida/raja/idaHeat2D_kry_raja.cpp
@@ -39,7 +39,7 @@
 #include <ida/ida.h>                   /* prototypes for IDA methods      */
 #include <nvector/nvector_raja.h>      /* access to RAJA N_Vector         */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* definition of type realtype     */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype     */
 
 #include <RAJA/RAJA.hpp>
 
@@ -58,18 +58,18 @@
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* User data type */
 
 struct _UserData {
   sunindextype mm;  /* number of grid points in one dimension */
   sunindextype neq; /* number of equations */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 };
 
@@ -77,24 +77,24 @@ typedef _UserData *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data);
+               sunrealtype c_j, void *prec_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data);
+               sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu);
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /*
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
   UserData data;
   N_Vector uu, up, constraints, res;
   int ier, iout;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
 
@@ -167,9 +167,9 @@ int main(int argc, char *argv[])
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -325,18 +325,18 @@ int main(int argc, char *argv[])
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   const sunindextype zero = 0;
   sunindextype mm;
-  realtype coeff;
+  sunrealtype coeff;
   UserData data;
 
-  const realtype *uu_data = N_VGetDeviceArrayPointer_Raja(uu);
-  const realtype *up_data = N_VGetDeviceArrayPointer_Raja(up);
-  realtype *rr_data = N_VGetDeviceArrayPointer_Raja(rr);
+  const sunrealtype *uu_data = N_VGetDeviceArrayPointer_Raja(uu);
+  const sunrealtype *up_data = N_VGetDeviceArrayPointer_Raja(up);
+  sunrealtype *rr_data = N_VGetDeviceArrayPointer_Raja(rr);
 
   data = (UserData) user_data;
 
@@ -352,8 +352,8 @@ int resHeat(realtype tt,
         rr_data[loc] = uu_data[loc];
       } else {
         /* Loop over interior points; set res = up - (central difference). */
-        realtype dif1 = uu_data[loc-1]  + uu_data[loc+1]  - TWO * uu_data[loc];
-        realtype dif2 = uu_data[loc-mm] + uu_data[loc+mm] - TWO * uu_data[loc];
+        sunrealtype dif1 = uu_data[loc-1]  + uu_data[loc+1]  - TWO * uu_data[loc];
+        sunrealtype dif2 = uu_data[loc-mm] + uu_data[loc+mm] - TWO * uu_data[loc];
         rr_data[loc] = up_data[loc] - coeff * ( dif1 + dif2 );
       }
     }
@@ -379,19 +379,19 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data)
+               sunrealtype c_j, void *prec_data)
 {
   const sunindextype zero = 0;
   sunindextype mm;
-  realtype *ppv;
+  sunrealtype *ppv;
   UserData data;
 
   data = (UserData) prec_data;
   ppv = N_VGetDeviceArrayPointer_Raja(data->pp);
   mm = data->mm;
-  realtype coeff = data->coeff;
+  sunrealtype coeff = data->coeff;
 
   RAJA::forall< MY_EXEC >(RAJA::RangeSegment(zero, mm*mm),
     [=] RAJA_DEVICE (sunindextype loc) {
@@ -417,10 +417,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data)
+               sunrealtype c_j, sunrealtype delta, void *prec_data)
 {
   UserData data;
   data = (UserData) prec_data;
@@ -443,7 +443,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
 {
   sunindextype mm, mm1, i, j;
   const sunindextype zero = 0;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -454,7 +454,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     yfact = data->dx * j;
     for (i = 0; i < mm; i++) {
       xfact = data->dx * i;
-      udata[mm*j + i] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[mm*j + i] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -490,7 +490,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry: Heat equation, serial example problem for IDA \n");
   printf("         Discretized heat equation on 2D unit square. \n");
@@ -513,9 +513,9 @@ static void PrintHeader(realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, ier;
 
diff --git a/examples/ida/serial/idaAnalytic_mels.c b/examples/ida/serial/idaAnalytic_mels.c
index 807bc5ca87..70b1613ffe 100644
--- a/examples/ida/serial/idaAnalytic_mels.c
+++ b/examples/ida/serial/idaAnalytic_mels.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <ida/ida.h>                          /* prototypes for IDA fcts., consts.    */
 #include <nvector/nvector_serial.h>           /* access to serial N_Vector            */
-#include <sundials/sundials_types.h>          /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>          /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>           /* defs. of SUNRabs, SUNRexp, etc.      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -45,21 +45,21 @@
 #endif
 
 /* User-supplied functions called by IDA */
-int fres(realtype tres, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data);
+int fres(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data);
 
 /* Custom linear solver data structure, accessor macros, and routines */
 static SUNLinearSolver MatrixEmbeddedLS(void *ida_mem, SUNContext ctx);
 static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S);
 static int MatrixEmbeddedLSSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol);
+                                 N_Vector b, sunrealtype tol);
 static int MatrixEmbeddedLSFree(SUNLinearSolver S);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static void analytical_solution(realtype t, N_Vector y, N_Vector yp);
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static void analytical_solution(sunrealtype t, N_Vector y, N_Vector yp);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main(void)
@@ -68,13 +68,13 @@ int main(void)
   SUNContext ctx;
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(1.0);         /* final time */
-  realtype dTout = RCONST(0.1);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);         /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);      /* time between outputs */
   sunindextype NEQ = 2;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-4);  /* tolerances */
-  realtype abstol = RCONST(1.0e-9);
-  realtype alpha  = RCONST(10.0);    /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-4);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-9);
+  sunrealtype alpha  = SUN_RCONST(10.0);    /* stiffness parameter */
 
   /* general problem variables */
   int retval;                     /* reusable error-checking flag */
@@ -82,7 +82,7 @@ int main(void)
   N_Vector yp = NULL;             /* empty vector for storing solution derivative */
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *ida_mem = NULL;           /* empty IDA memory structure */
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nre, nni, netf, ncfn, nreLS;
 
   /* Initial diagnostics output */
@@ -186,15 +186,15 @@ int main(void)
       0 = (1-alpha)/(t-2)*x1 - x1 + (alpha-1)*x2 + 2*exp(t) - x1'(t)
       0 = (t+2)*x1 - (t+2)*exp(t)
 */
-int fres(realtype t, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int fres(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype alpha = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype x1 = NV_Ith_S(yy,0);               /* access current solution values */
-  realtype x2 = NV_Ith_S(yy,1);
-  realtype x1p = NV_Ith_S(yp,0);              /* access current derivative values */
-  realtype ONE = RCONST(1.0);
-  realtype TWO = RCONST(2.0);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype alpha = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype x1 = NV_Ith_S(yy,0);               /* access current solution values */
+  sunrealtype x2 = NV_Ith_S(yy,1);
+  sunrealtype x1p = NV_Ith_S(yp,0);              /* access current derivative values */
+  sunrealtype ONE = SUN_RCONST(1.0);
+  sunrealtype TWO = SUN_RCONST(2.0);
 
   NV_Ith_S(rr,0) = (ONE-alpha)/(t-TWO)*x1 - x1 + (alpha-ONE)*x2 + TWO*exp(t) - x1p;
   NV_Ith_S(rr,1) = (t+TWO)*x1 - (t+TWO)*SUNRexp(t);
@@ -233,18 +233,18 @@ static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S)
 
 /* linear solve routine */
 static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol)
+                                 N_Vector b, sunrealtype tol)
 {
   /* temporary variables */
   int       retval;
   N_Vector  yypred, yppred, yyn, ypn, res;
-  realtype  tcur, cj;
+  sunrealtype  tcur, cj;
   void      *user_data;
-  realtype  *rdata;
-  realtype  alpha;
-  realtype  a11, a12, a21, b1, b2;
-  realtype  ONE   = RCONST(1.0);
-  realtype  TWO   = RCONST(2.0);
+  sunrealtype  *rdata;
+  sunrealtype  alpha;
+  sunrealtype  a11, a12, a21, b1, b2;
+  sunrealtype  ONE   = SUN_RCONST(1.0);
+  sunrealtype  TWO   = SUN_RCONST(2.0);
 
   /* retrieve implicit system data from IDA */
   retval = IDAGetNonlinearSystemData(LS->content, &tcur, &yypred, &yppred,
@@ -253,7 +253,7 @@ static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
     return(-1);
 
   /* extract stiffness parameter from user_data */
-  rdata = (realtype *) user_data;
+  rdata = (sunrealtype *) user_data;
   alpha = rdata[0];
 
   /* perform linear solve: A*x=b
@@ -325,23 +325,23 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 }
 
 /* routine to fill analytical solution and its derivative */
-static void analytical_solution(realtype t, N_Vector y, N_Vector yp)
+static void analytical_solution(sunrealtype t, N_Vector y, N_Vector yp)
 {
   NV_Ith_S(y,0) = SUNRexp(t);
-  NV_Ith_S(y,1) = SUNRexp(t)/(t-RCONST(2.0));
+  NV_Ith_S(y,1) = SUNRexp(t)/(t-SUN_RCONST(2.0));
   NV_Ith_S(yp,0) = SUNRexp(t);
-  NV_Ith_S(yp,1) = SUNRexp(t)/(t-RCONST(2.0)) - SUNRexp(t)/(t-RCONST(2.0))/(t-RCONST(2.0));
+  NV_Ith_S(yp,1) = SUNRexp(t)/(t-SUN_RCONST(2.0)) - SUNRexp(t)/(t-SUN_RCONST(2.0))/(t-SUN_RCONST(2.0));
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) retval */
   N_Vector ytrue;             /* true solution vector               */
   N_Vector ewt;               /* error weight vector                */
   N_Vector abstol;            /* absolute tolerance vector          */
-  realtype err;               /* wrms error                         */
-  realtype ONE = RCONST(1.0);
+  sunrealtype err;               /* wrms error                         */
+  sunrealtype ONE = SUN_RCONST(1.0);
 
   /* create solution and error weight vectors */
   ytrue = N_VClone(y);
@@ -354,8 +354,8 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
   /* compute the error weight vector, loosen atol */
   N_VConst(atol, abstol);
   N_VAbs(ytrue, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), abstol, ewt);
-  if (N_VMin(ewt) <= RCONST(0.0)) {
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), abstol, ewt);
+  if (N_VMin(ewt) <= SUN_RCONST(0.0)) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
   }
diff --git a/examples/ida/serial/idaFoodWeb_bnd.c b/examples/ida/serial/idaFoodWeb_bnd.c
index 1890be4f0d..fc976c344e 100644
--- a/examples/ida/serial/idaFoodWeb_bnd.c
+++ b/examples/ida/serial/idaFoodWeb_bnd.c
@@ -96,37 +96,37 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants. */
 
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -142,14 +142,14 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
   N_Vector rates;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
 /* Prototypes for private Helper Functions. */
@@ -157,13 +157,13 @@ static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol);
-static void PrintOutput(void *mem, N_Vector c, realtype t);
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -179,7 +179,7 @@ int main()
   N_Vector cc, cp, id;
   int iout, retval;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -253,7 +253,7 @@ int main()
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -319,11 +319,11 @@ int main()
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   webdata = (UserData)user_data;
@@ -368,7 +368,7 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -419,8 +419,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = N_VGetArrayPointer(cc);
   cpv = N_VGetArrayPointer(cp);
@@ -433,17 +433,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-	  ccv[loc+is] = RCONST(1.0e5);
+	  ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -469,7 +469,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_bnd: Predator-prey DAE serial example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -497,11 +497,11 @@ static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtyp
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *mem, N_Vector c, realtype t)
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -578,11 +578,11 @@ static void PrintFinalStats(void *mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -629,11 +629,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -646,13 +646,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/ida/serial/idaFoodWeb_kry.c b/examples/ida/serial/idaFoodWeb_kry.c
index 4c1ead2956..fb1eb1c90b 100644
--- a/examples/ida/serial/idaFoodWeb_kry.c
+++ b/examples/ida/serial/idaFoodWeb_kry.c
@@ -96,7 +96,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* helpful macros */
 
@@ -109,30 +109,30 @@
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -148,9 +148,9 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
-  realtype **PP[MX][MY];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype **PP[MX][MY];
   sunindextype *pivot[MX][MY];
   N_Vector rates;
   N_Vector ewt;
@@ -159,30 +159,30 @@ typedef struct {
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
-static int Precond(realtype tt,
+static int Precond(sunrealtype tt,
                    N_Vector cc, N_Vector cp, N_Vector rr,
-                   realtype cj, void *user_data);
+                   sunrealtype cj, void *user_data);
 
-static int PSolve(realtype tt,
+static int PSolve(sunrealtype tt,
                   N_Vector cc, N_Vector cp, N_Vector rr,
                   N_Vector rvec, N_Vector zvec,
-                  realtype cj, realtype delta, void *user_data);
+                  sunrealtype cj, sunrealtype delta, void *user_data);
 
 /* Prototypes for private Helper Functions. */
 
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(int maxl, realtype rtol, realtype atol);
-static void PrintOutput(void *mem, N_Vector c, realtype t);
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -198,7 +198,7 @@ int main()
   N_Vector cc, cp, id;
   int iout, jx, jy, retval;
   int maxl;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   SUNLinearSolver LS;
   SUNContext ctx;
 
@@ -285,7 +285,7 @@ int main()
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -357,11 +357,11 @@ int main()
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   webdata = (UserData)user_data;
@@ -394,26 +394,26 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 }
 
 
-static int Precond(realtype tt,
+static int Precond(sunrealtype tt,
                    N_Vector cc, N_Vector cp, N_Vector rr,
-                   realtype cj, void *user_data)
+                   sunrealtype cj, void *user_data)
 {
   int retval;
   sunindextype ret;
-  realtype uround, xx, yy, del_x, del_y;
-  realtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
-  realtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
+  sunrealtype uround, xx, yy, del_x, del_y;
+  sunrealtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
+  sunrealtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
   int is, js, jx, jy;
   void *mem;
   N_Vector ewt;
-  realtype hh;
+  sunrealtype hh;
   UserData webdata;
 
   webdata = (UserData) user_data;
   del_x = webdata->dx;
   del_y = webdata->dy;
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
   sqru = sqrt(uround);
 
   mem = webdata->ida_mem;
@@ -463,13 +463,13 @@ static int Precond(realtype tt,
 }
 
 
-static int PSolve(realtype tt,
+static int PSolve(sunrealtype tt,
                   N_Vector cc, N_Vector cp, N_Vector rr,
                   N_Vector rvec, N_Vector zvec,
-                  realtype cj, realtype dalta,
+                  sunrealtype cj, sunrealtype dalta,
                   void *user_data)
 {
-  realtype **Pxy, *zxy;
+  sunrealtype **Pxy, *zxy;
   sunindextype *pivot;
   int jx, jy;
   UserData webdata;
@@ -506,7 +506,7 @@ static int PSolve(realtype tt,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -557,8 +557,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = N_VGetArrayPointer(cc);
   cpv = N_VGetArrayPointer(cp) ;
@@ -571,17 +571,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-          ccv[loc+is] = RCONST(1.0e5);
+          ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -607,7 +607,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(int maxl, realtype rtol, realtype atol)
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaFoodWeb_kry: Predator-prey DAE serial example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -635,11 +635,11 @@ static void PrintHeader(int maxl, realtype rtol, realtype atol)
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *mem, N_Vector c, realtype t)
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -713,11 +713,11 @@ static void PrintFinalStats(void *mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -764,11 +764,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -781,13 +781,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/ida/serial/idaHeat2D_bnd.c b/examples/ida/serial/idaHeat2D_bnd.c
index 6f5d86ddc4..38c2ca713e 100644
--- a/examples/ida/serial/idaHeat2D_bnd.c
+++ b/examples/ida/serial/idaHeat2D_bnd.c
@@ -44,34 +44,34 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.1)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define BVAL  SUN_RCONST(0.1)
 
 /* Type: UserData */
 
 typedef struct {
   sunindextype mm;
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
 } *UserData;
 
 /* Prototypes of functions called by IDA */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
 
 /* Prototypes of private functions */
 
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector u);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector u);
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res);
 
@@ -91,7 +91,7 @@ int main(void)
   int retval, iout;
   long int netf, ncfn;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -133,9 +133,9 @@ int main(void)
 
   /* Set remaining input parameters. */
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
   mem = IDACreate(ctx);
@@ -228,11 +228,11 @@ int main(void)
  * while for each boundary point, it is res_i = u_i.
  */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval,
             void *user_data)
 {
   sunindextype mm, i, j, offset, loc;
-  realtype *uv, *upv, *resv, coeff;
+  sunrealtype *uv, *upv, *resv, coeff;
   UserData data;
 
   uv = N_VGetArrayPointer(uu); upv = N_VGetArrayPointer(up); resv = N_VGetArrayPointer(resval);
@@ -250,7 +250,7 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
     for (i = 1; i < mm-1; i++) {
       loc = offset + i;
       resv[loc] = upv[loc] - coeff *
-	  (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - RCONST(4.0)*uv[loc]);
+	  (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - SUN_RCONST(4.0)*uv[loc]);
     }
   }
 
@@ -271,7 +271,7 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res)
 {
-  realtype xfact, yfact, *udata, *updata, *iddata;
+  sunrealtype xfact, yfact, *udata, *updata, *iddata;
   sunindextype mm, mm1, i, j, offset, loc;
 
   mm = data->mm;
@@ -291,7 +291,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -322,7 +322,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_bnd: Heat equation, serial example problem for IDA\n");
   printf("          Discretized heat equation on 2D unit square.\n");
@@ -357,10 +357,10 @@ static void PrintHeader(realtype rtol, realtype atol)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
   int retval;
-  realtype umax, hused;
+  sunrealtype umax, hused;
   long int nst, nni, nje, nre, nreLS;
   int kused;
 
diff --git a/examples/ida/serial/idaHeat2D_klu.c b/examples/ida/serial/idaHeat2D_klu.c
index 111972264c..57dacb35f3 100644
--- a/examples/ida/serial/idaHeat2D_klu.c
+++ b/examples/ida/serial/idaHeat2D_klu.c
@@ -44,7 +44,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>       /* access to KLU linear solver          */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Problem Constants */
@@ -52,39 +52,39 @@
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define BVAL  SUN_RCONST(0.0)
 #define TOTAL 4*MGRID+8*(MGRID-2)+(MGRID-4)*(MGRID+4*(MGRID-2)) /* total num of nonzero elements */
 
 /* Type: UserData */
 
 typedef struct {
   sunindextype mm;
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
 } *UserData;
 
 /* Prototypes of functions called by IDA */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
 
-int jacHeat(realtype tt,  realtype cj,
+int jacHeat(sunrealtype tt,  sunrealtype cj,
             N_Vector yy, N_Vector yp, N_Vector resvec,
             SUNMatrix JJ, void *user_data,
             N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Exact same setup as jacHeat. Function needed for special case MGRID=3  */
-int jacHeat3(realtype tt,  realtype cj,
+int jacHeat3(sunrealtype tt,  sunrealtype cj,
              N_Vector yy, N_Vector yp, N_Vector resvec,
              SUNMatrix JJ, void *user_data,
              N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
 
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector u);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector u);
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res);
 
@@ -103,7 +103,7 @@ int main(void)
   N_Vector uu, up, constraints, id, res;
   int retval, iout;
   long int netf, ncfn;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   SUNMatrix A;
   SUNLinearSolver LS;
   sunindextype nnz;
@@ -146,9 +146,9 @@ int main(void)
 
   /* Set remaining input parameters. */
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-8);
+  atol = SUN_RCONST(1.0e-8);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
   mem = IDACreate(ctx);
@@ -253,11 +253,11 @@ int main(void)
  * while for each boundary point, it is res_i = u_i.
  */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval,
             void *user_data)
 {
   sunindextype mm, i, j, offset, loc;
-  realtype *uv, *upv, *resv, coeff;
+  sunrealtype *uv, *upv, *resv, coeff;
   UserData data;
 
   uv = N_VGetArrayPointer(uu); upv = N_VGetArrayPointer(up); resv = N_VGetArrayPointer(resval);
@@ -275,7 +275,7 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
     for (i = 1; i < mm-1; i++) {
       loc = offset + i;
       resv[loc] = upv[loc] - coeff *
-          (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - RCONST(4.0)*uv[loc]);
+          (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - SUN_RCONST(4.0)*uv[loc]);
     }
   }
 
@@ -284,17 +284,17 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
 }
 
 /* Jacobian matrix setup for MGRID=3  */
-int jacHeat3(realtype tt,  realtype cj,
+int jacHeat3(sunrealtype tt,  sunrealtype cj,
              N_Vector yy, N_Vector yp, N_Vector resvec,
              SUNMatrix JJ, void *user_data,
              N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx) + cj;
+  sunrealtype dx =  ONE/(MGRID - ONE);
+  sunrealtype beta = SUN_RCONST(4.0)/(dx*dx) + cj;
 
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   SUNMatZero(JJ);
 
@@ -347,18 +347,18 @@ int jacHeat3(realtype tt,  realtype cj,
 }
 
 /* Jacobian matrix setup for MGRID>=4  */
-int jacHeat(realtype tt,  realtype cj,
+int jacHeat(sunrealtype tt,  sunrealtype cj,
             N_Vector yy, N_Vector yp, N_Vector resvec,
             SUNMatrix JJ, void *user_data,
             N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype dx =  ONE/(MGRID - ONE);
-  realtype beta = RCONST(4.0)/(dx*dx) + cj;
+  sunrealtype dx =  ONE/(MGRID - ONE);
+  sunrealtype beta = SUN_RCONST(4.0)/(dx*dx) + cj;
   int i,j, repeat=0;
 
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   SUNMatZero(JJ);
 
@@ -604,7 +604,7 @@ int jacHeat(realtype tt,  realtype cj,
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res)
 {
-  realtype xfact, yfact, *udata, *updata, *iddata;
+  sunrealtype xfact, yfact, *udata, *updata, *iddata;
   sunindextype mm, mm1, i, j, offset, loc;
 
   mm = data->mm;
@@ -624,7 +624,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -655,7 +655,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_klu: Heat equation, serial example problem for IDA\n");
   printf("          Discretized heat equation on 2D unit square.\n");
@@ -690,10 +690,10 @@ static void PrintHeader(realtype rtol, realtype atol)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
   int retval;
-  realtype umax, hused;
+  sunrealtype umax, hused;
   long int nst, nni, nje, nre;
   int kused;
 
diff --git a/examples/ida/serial/idaHeat2D_kry.c b/examples/ida/serial/idaHeat2D_kry.c
index fa5f8002b8..2cd19e6075 100644
--- a/examples/ida/serial/idaHeat2D_kry.c
+++ b/examples/ida/serial/idaHeat2D_kry.c
@@ -43,47 +43,47 @@
 #include <ida/ida.h>                   /* prototypes for IDA fcts., consts.    */
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* User data type */
 
 typedef struct {
   sunindextype mm;  /* number of grid points */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 } *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data);
+               sunrealtype c_j, void *prec_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data);
+               sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -98,7 +98,7 @@ int main()
   UserData data;
   N_Vector uu, up, constraints, res;
   int retval, iout;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -150,9 +150,9 @@ int main()
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -308,12 +308,12 @@ int main()
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   sunindextype i, j, offset, loc, mm;
-  realtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
+  sunrealtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
   UserData data;
 
   uu_data = N_VGetArrayPointer(uu);
@@ -359,13 +359,13 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data)
+               sunrealtype c_j, void *prec_data)
 {
 
   sunindextype i, j, offset, loc, mm;
-  realtype *ppv, pelinv;
+  sunrealtype *ppv, pelinv;
   UserData data;
 
   data = (UserData) prec_data;
@@ -397,10 +397,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data)
+               sunrealtype c_j, sunrealtype delta, void *prec_data)
 {
   UserData data;
   data = (UserData) prec_data;
@@ -422,7 +422,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, mm1, i, j, offset, loc;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -437,7 +437,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -466,7 +466,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry: Heat equation, serial example problem for IDA \n");
   printf("         Discretized heat equation on 2D unit square. \n");
@@ -489,9 +489,9 @@ static void PrintHeader(realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/ida/serial/idaKrylovDemo_ls.c b/examples/ida/serial/idaKrylovDemo_ls.c
index b97163ea99..552c3852e5 100644
--- a/examples/ida/serial/idaKrylovDemo_ls.c
+++ b/examples/ida/serial/idaKrylovDemo_ls.c
@@ -48,7 +48,7 @@
 #include <sunlinsol/sunlinsol_spbcgs.h>  /* access to SPBCGS SUNLinearSolver  */
 #include <sunlinsol/sunlinsol_sptfqmr.h> /* access to SPTFQMR SUNLinearSolver */
 #include <nvector/nvector_serial.h>      /* serial N_Vector types, fct. and macros */
-#include <sundials/sundials_types.h>     /* definition of realtype */
+#include <sundials/sundials_types.h>     /* definition of sunrealtype */
 
 /* helpful macros */
 
@@ -67,10 +67,10 @@
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* Linear Solver Loop Constants */
 
@@ -82,31 +82,31 @@
 
 typedef struct {
   sunindextype mm;  /* number of grid points */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 } *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *user_data);
+               sunrealtype c_j, void *user_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data);
+               sunrealtype c_j, sunrealtype delta, void *user_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol, int linsolver);
-static void PrintOutput(void *mem, realtype t, N_Vector uu, int linsolver);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, int linsolver);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu, int linsolver);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -121,11 +121,11 @@ int main(int argc, char* argv[])
   UserData data;
   N_Vector uu, up, constraints, res;
   int retval, iout, linsolver;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
   int nrmfactor;   /* LS norm conversion factor flag */
-  realtype nrmfac; /* LS norm conversion factor      */
+  sunrealtype nrmfac; /* LS norm conversion factor      */
   SUNContext ctx;
 
   mem         = NULL;
@@ -182,9 +182,9 @@ int main(int argc, char* argv[])
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -291,7 +291,7 @@ int main(int argc, char* argv[])
 
     case(1):
       /* use the square root of the vector length */
-      nrmfac = SQRT((realtype)NEQ);
+      nrmfac = SQRT((sunrealtype)NEQ);
       break;
     case(2):
       /* compute with dot product */
@@ -374,12 +374,12 @@ int main(int argc, char* argv[])
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   sunindextype i, j, offset, loc, mm;
-  realtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
+  sunrealtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
   UserData data;
 
   uu_data = N_VGetArrayPointer(uu);
@@ -425,13 +425,13 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *user_data)
+               sunrealtype c_j, void *user_data)
 {
 
   sunindextype i, j, offset, loc, mm;
-  realtype *ppv, pelinv;
+  sunrealtype *ppv, pelinv;
   UserData data;
 
   data = (UserData) user_data;
@@ -463,10 +463,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data;
   data = (UserData) user_data;
@@ -488,7 +488,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, mm1, i, j, offset, loc;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -503,7 +503,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -532,7 +532,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol, int linsolver)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, int linsolver)
 {
   printf("\nidaKrylovDemo_ls: Heat equation, serial example problem for IDA\n");
   printf("               Discretized heat equation on 2D unit square.\n");
@@ -569,9 +569,9 @@ static void PrintHeader(realtype rtol, realtype atol, int linsolver)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu, int linsolver)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu, int linsolver)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/ida/serial/idaRoberts_dns.c b/examples/ida/serial/idaRoberts_dns.c
index a7cc3aae52..7732aa4883 100644
--- a/examples/ida/serial/idaRoberts_dns.c
+++ b/examples/ida/serial/idaRoberts_dns.c
@@ -40,7 +40,7 @@
 #include <sunmatrix/sunmatrix_dense.h>        /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>        /* access to dense SUNLinearSolver      */
 #include <sunnonlinsol/sunnonlinsol_newton.h> /* access to Newton SUNNonlinearSolver  */
-#include <sundials/sundials_types.h>          /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>          /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>           /* defs. of SUNRabs, SUNRexp, etc.      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -58,8 +58,8 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Macro to define dense matrix elements, indexed from 1. */
 
@@ -67,23 +67,23 @@
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 /*
  *--------------------------------------------------------------------
@@ -95,8 +95,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -131,20 +131,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -208,7 +208,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -250,16 +250,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -270,15 +270,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -287,23 +287,23 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
 
   yval = N_VGetArrayPointer(yy);
 
-  IJth(JJ,1,1) = RCONST(-0.04) - cj;
-  IJth(JJ,2,1) = RCONST(0.04);
+  IJth(JJ,1,1) = SUN_RCONST(-0.04) - cj;
+  IJth(JJ,2,1) = SUN_RCONST(0.04);
   IJth(JJ,3,1) = ONE;
-  IJth(JJ,1,2) = RCONST(1.0e4)*yval[2];
-  IJth(JJ,2,2) = RCONST(-1.0e4)*yval[2] - RCONST(6.0e7)*yval[1] - cj;
+  IJth(JJ,1,2) = SUN_RCONST(1.0e4)*yval[2];
+  IJth(JJ,2,2) = SUN_RCONST(-1.0e4)*yval[2] - SUN_RCONST(6.0e7)*yval[1] - cj;
   IJth(JJ,3,2) = ONE;
-  IJth(JJ,1,3) = RCONST(1.0e4)*yval[1];
-  IJth(JJ,2,3) = RCONST(-1.0e4)*yval[1];
+  IJth(JJ,1,3) = SUN_RCONST(1.0e4)*yval[1];
+  IJth(JJ,2,3) = SUN_RCONST(-1.0e4)*yval[1];
   IJth(JJ,3,3) = ONE;
 
   return(0);
@@ -319,9 +319,9 @@ int jacrob(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -356,12 +356,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
@@ -430,25 +430,25 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) retval */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
+  sunrealtype err;               /* wrms error                       */
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083474251394888e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833390772616859e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791631752e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083474251394888e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833390772616859e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791631752e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/ida/serial/idaRoberts_klu.c b/examples/ida/serial/idaRoberts_klu.c
index 3d7462ccaf..50ba414a42 100644
--- a/examples/ida/serial/idaRoberts_klu.c
+++ b/examples/ida/serial/idaRoberts_klu.c
@@ -38,7 +38,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>       /* access to KLU linear solver          */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Problem Constants */
@@ -46,30 +46,30 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrobCSC(realtype tt,  realtype cj,
+int jacrobCSC(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
-int jacrobCSR(realtype tt,  realtype cj,
+int jacrobCSR(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static void PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -84,8 +84,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -118,20 +118,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -188,7 +188,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -219,16 +219,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -239,15 +239,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -256,15 +256,15 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrobCSC(realtype tt,  realtype cj,
+int jacrobCSC(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -276,25 +276,25 @@ int jacrobCSC(realtype tt,  realtype cj,
   colptrs[3] = 9;
 
   /* column 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   rowvals[0] = 0;
-  data[1] = RCONST(0.04);
+  data[1] = SUN_RCONST(0.04);
   rowvals[1] = 1;
   data[2] = ONE;
   rowvals[2] = 2;
 
   /* column 1 */
-  data[3] = RCONST(1.0e4)*yval[2];
+  data[3] = SUN_RCONST(1.0e4)*yval[2];
   rowvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   rowvals[4] = 1;
   data[5] = ONE;
   rowvals[5] = 2;
 
   /* column 2 */
-  data[6] = RCONST(1.0e4)*yval[1];
+  data[6] = SUN_RCONST(1.0e4)*yval[1];
   rowvals[6] = 0;
-  data[7] = RCONST(-1.0e4)*yval[1];
+  data[7] = SUN_RCONST(-1.0e4)*yval[1];
   rowvals[7] = 1;
   data[8] = ONE;
   rowvals[8] = 2;
@@ -305,15 +305,15 @@ int jacrobCSC(realtype tt,  realtype cj,
 /*
  * Define the Jacobian function, where Jacobian is CSR matrix.
  */
-int jacrobCSR(realtype tt,  realtype cj,
+int jacrobCSR(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *colvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -325,19 +325,19 @@ int jacrobCSR(realtype tt,  realtype cj,
   rowptrs[3] = 9;
 
   /* row 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   colvals[0] = 0;
-  data[1] = RCONST(1.0e4)*yval[2];
+  data[1] = SUN_RCONST(1.0e4)*yval[2];
   colvals[1] = 1;
-  data[2] = RCONST(1.0e4)*yval[1];
+  data[2] = SUN_RCONST(1.0e4)*yval[1];
   colvals[2] = 2;
 
   /* row 1 */
-  data[3] = RCONST(0.04);
+  data[3] = SUN_RCONST(0.04);
   colvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   colvals[4] = 1;
-  data[5] = RCONST(-1.0e4)*yval[1];
+  data[5] = SUN_RCONST(-1.0e4)*yval[1];
   colvals[5] = 2;
 
   /* row 2 */
@@ -361,9 +361,9 @@ int jacrobCSR(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -398,12 +398,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/ida/serial/idaRoberts_sps.c b/examples/ida/serial/idaRoberts_sps.c
index e30fbf42bf..cb2f3fd881 100644
--- a/examples/ida/serial/idaRoberts_sps.c
+++ b/examples/ida/serial/idaRoberts_sps.c
@@ -38,7 +38,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT linear solver    */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Problem Constants */
@@ -46,25 +46,25 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static void PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -79,8 +79,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -113,20 +113,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -183,7 +183,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -214,16 +214,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -234,15 +234,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -251,15 +251,15 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -271,25 +271,25 @@ int jacrob(realtype tt,  realtype cj,
   colptrs[3] = 9;
 
   /* column 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   rowvals[0] = 0;
-  data[1] = RCONST(0.04);
+  data[1] = SUN_RCONST(0.04);
   rowvals[1] = 1;
   data[2] = ONE;
   rowvals[2] = 2;
 
   /* column 1 */
-  data[3] = RCONST(1.0e4)*yval[2];
+  data[3] = SUN_RCONST(1.0e4)*yval[2];
   rowvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   rowvals[4] = 1;
   data[5] = ONE;
   rowvals[5] = 2;
 
   /* column 2 */
-  data[6] = RCONST(1.0e4)*yval[1];
+  data[6] = SUN_RCONST(1.0e4)*yval[1];
   rowvals[6] = 0;
-  data[7] = RCONST(-1.0e4)*yval[1];
+  data[7] = SUN_RCONST(-1.0e4)*yval[1];
   rowvals[7] = 1;
   data[8] = ONE;
   rowvals[8] = 2;
@@ -307,9 +307,9 @@ int jacrob(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -344,12 +344,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/ida/serial/idaSlCrank_dns.c b/examples/ida/serial/idaSlCrank_dns.c
index 9610f5f124..85cf007afd 100644
--- a/examples/ida/serial/idaSlCrank_dns.c
+++ b/examples/ida/serial/idaSlCrank_dns.c
@@ -29,38 +29,38 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 /* Problem Constants */
 
 #define NEQ   10
 
-#define TEND  RCONST(10.0)
+#define TEND  SUN_RCONST(10.0)
 #define NOUT  41
 
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
-#define FOUR RCONST(4.0)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
+#define FOUR SUN_RCONST(4.0)
 
 typedef struct {
-  realtype a;
-  realtype J1, J2, m2;
-  realtype k, c, l0;
-  realtype F;
+  sunrealtype a;
+  sunrealtype J1, J2, m2;
+  sunrealtype k, c, l0;
+  sunrealtype F;
 } *UserData;
 
-int ressc(realtype tres, N_Vector yy, N_Vector yp,
+int ressc(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
 void setIC(N_Vector yy, N_Vector yp, UserData data);
-void force(N_Vector yy, realtype *Q, UserData data);
+void force(N_Vector yy, sunrealtype *Q, UserData data);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, realtype atol, N_Vector y);
-static int PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, N_Vector y);
+static int PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static int PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -76,8 +76,8 @@ int main(void)
 
   void *mem;
   N_Vector yy, yp, id;
-  realtype rtol, atol;
-  realtype t0, tf, tout, dt, tret;
+  sunrealtype rtol, atol;
+  sunrealtype t0, tf, tout, dt, tret;
   int retval, iout;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -119,8 +119,8 @@ int main(void)
   NV_Ith_S(id,9) = ZERO;
 
   /* Tolerances */
-  rtol = RCONST(1.0e-6);
-  atol = RCONST(1.0e-6);
+  rtol = SUN_RCONST(1.0e-6);
+  atol = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
@@ -182,10 +182,10 @@ int main(void)
 
 void setIC(N_Vector yy, N_Vector yp, UserData data)
 {
-  realtype pi;
-  realtype a, J1, m2, J2;
-  realtype q, p, x;
-  realtype Q[3];
+  sunrealtype pi;
+  sunrealtype a, J1, m2, J2;
+  sunrealtype q, p, x;
+  sunrealtype Q[3];
 
   N_VConst(ZERO, yy);
   N_VConst(ZERO, yp);
@@ -213,14 +213,14 @@ void setIC(N_Vector yy, N_Vector yp, UserData data)
 
 }
 
-void force(N_Vector yy, realtype *Q, UserData data)
+void force(N_Vector yy, sunrealtype *Q, UserData data)
 {
-  realtype a, k, c, l0, F;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype s1, c1, s2, c2, s21, c21;
-  realtype l2, l, ld;
-  realtype f, fl;
+  sunrealtype a, k, c, l0, F;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype s1, c1, s2, c2, s21, c21;
+  sunrealtype l2, l, ld;
+  sunrealtype f, fl;
 
   a = data->a;
   k = data->k;
@@ -257,16 +257,16 @@ void force(N_Vector yy, realtype *Q, UserData data)
 
 }
 
-int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int ressc(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
   UserData data;
-  realtype Q[3];
-  realtype a, J1, m2, J2;
-  realtype *yval, *ypval, *rval;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype lam1, lam2, mu1, mu2;
-  realtype s1, c1, s2, c2;
+  sunrealtype Q[3];
+  sunrealtype a, J1, m2, J2;
+  sunrealtype *yval, *ypval, *rval;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype lam1, lam2, mu1, mu2;
+  sunrealtype s1, c1, s2, c2;
 
   data = (UserData) user_data;
 
@@ -317,7 +317,7 @@ int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
   return(0);
 }
 
-static void PrintHeader(realtype rtol, realtype atol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, N_Vector y)
 {
   printf("\nidaSlCrank_dns: Slider-Crank DAE serial example problem for IDA\n");
   printf("Linear solver: DENSE, Jacobian is computed by IDA.\n");
@@ -337,12 +337,12 @@ static void PrintHeader(realtype rtol, realtype atol, N_Vector y)
   printf("-----------------------------------------------------------------------\n");
 }
 
-static int PrintOutput(void *mem, realtype t, N_Vector y)
+static int PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.cpp b/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.cpp
index aa910858b0..c005349aca 100644
--- a/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.cpp
+++ b/examples/ida/trilinos/idaHeat2D_kry_p_tpetra.cpp
@@ -60,9 +60,9 @@
 #include <sundials/sundials_types.h>
 #include <sundials/sundials_mpi_types.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11    /* Number of output times */
 
@@ -96,7 +96,7 @@ struct UserData {
   Teuchos::RCP<const Teuchos::Comm<int> > comm;
   int thispe, npex, npey, ixsub, jysub;
   sunindextype mx, my, mxsub, mysub;
-  realtype dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype dx, dy, coeffx, coeffy, coeffxy;
   Kokkos::View<scalar_type*, memory_space> uext; /* device array */
 
   Kokkos::View<scalar_type*, memory_space> send_buff_top;
@@ -123,12 +123,12 @@ struct UserData {
 
 /* User-supplied residual and supporting functions */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up,
             N_Vector rr, void *user_data);
 
 static int rescomm(N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up,
                     N_Vector res,  void *user_data);
 
 static int BSend(N_Vector uu, void *user_data);
@@ -140,12 +140,12 @@ static int BRecvWait(MPI_Request request[], void *user_data);
 
 /* User-supplied preconditioner functions */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
-               N_Vector rvec, N_Vector zvec, realtype c_j,
-               realtype delta, void *user_data);
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+               N_Vector rvec, N_Vector zvec, sunrealtype c_j,
+               sunrealtype delta, void *user_data);
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data);
 
 /* Private function to allocate memory, initialize problem and print output */
 
@@ -156,9 +156,9 @@ static int AllocUserData(int thispe, N_Vector uu, UserData *data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData *data);
 
-static void PrintHeader(realtype rtol, realtype atol, UserData *data);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData *data);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -255,12 +255,12 @@ int main(int argc, char *argv[])
     /* Set constraints to all 1's for nonnegative solution values. */
     N_VConst(ONE, constraints);
 
-    realtype t0 = ZERO;
-    realtype t1 = RCONST(0.01);
+    sunrealtype t0 = ZERO;
+    sunrealtype t1 = SUN_RCONST(0.01);
 
     /* Scalar relative and absolute tolerance. */
-    realtype rtol = ZERO;
-    realtype atol = RCONST(1.0e-3);
+    sunrealtype rtol = ZERO;
+    sunrealtype atol = SUN_RCONST(1.0e-3);
 
     /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
 
     /* Loop over tout, call IDASolve, print output. */
     int iout;
-    realtype tret, tout;
+    sunrealtype tret, tout;
 
     for (tout = t1, iout = 1; iout <= NOUT; iout++, tout *= TWO) {
 
@@ -372,7 +372,7 @@ int main(int argc, char *argv[])
  * BSend, BRecvPost, and BREcvWait handle interprocessor communication
  * of uu required to calculate the residual.
  */
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   int retval = 0;
@@ -404,8 +404,8 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  * pp etc.) are used from the PsetupHeat argument list.
  *
  */
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data)
 {
   /* Unwrap the user data */
   UserData* data = reinterpret_cast<UserData*>(user_data);
@@ -433,7 +433,7 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
 #endif
 
   /* Calculate the value for the inverse element of the diagonal preconditioner */
-  const realtype pelinv = ONE/(c_j + data->coeffxy);
+  const sunrealtype pelinv = ONE/(c_j + data->coeffxy);
 
   ibc = (ixsub == 0) || (ixsub == npex-1);
   i0  = (ixsub == 0);
@@ -461,9 +461,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
  * containing the inverse diagonal Jacobian elements (previously
  * computed in PsetupHeat), returning the result in zvec.
  */
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData* data = reinterpret_cast<UserData*>(user_data);
 
@@ -505,7 +505,7 @@ static int rescomm(N_Vector uu, N_Vector up, void* user_data)
  * that all inter-processor communication of data needed to calculate F
  * has already been done, and that this data is in the work array uext.
  */
-static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
                     void *user_data)
 {
   UserData* data = reinterpret_cast<UserData*>(user_data);
@@ -518,9 +518,9 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
   const sunindextype mxsub  = data->mxsub;
   const sunindextype mxsub2 = data->mxsub + 2;
   const sunindextype mysub  = data->mysub;
-  const realtype coeffx  = data->coeffx;
-  const realtype coeffy  = data->coeffy;
-  const realtype coeffxy = data->coeffxy;
+  const sunrealtype coeffx  = data->coeffx;
+  const sunrealtype coeffy  = data->coeffy;
+  const sunrealtype coeffxy = data->coeffxy;
 
   sunindextype ibc, i0, jbc, j0;
 
@@ -549,7 +549,7 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
   auto rr_1d = Kokkos::subview (rr_2d, Kokkos::ALL(), 0);
 #endif
 
-  Kokkos::View<realtype*, memory_space> uext_1d = data->uext;
+  Kokkos::View<sunrealtype*, memory_space> uext_1d = data->uext;
 
   /* Copy local segment of u vector into the working extended array uext.
      This completes uext prior to the computation of the rr vector.
@@ -581,9 +581,9 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
       sunindextype locu  = i + j*mxsub;
       sunindextype locue = (i+1) + (j+1)*mxsub2;
 
-      realtype termx   = coeffx * (uext_1d(locue-1)      + uext_1d(locue+1));
-      realtype termy   = coeffy * (uext_1d(locue-mxsub2) + uext_1d(locue+mxsub2));
-      realtype termctr = coeffxy * uext_1d(locue);
+      sunrealtype termx   = coeffx * (uext_1d(locue-1)      + uext_1d(locue+1));
+      sunrealtype termy   = coeffy * (uext_1d(locue-mxsub2) + uext_1d(locue+mxsub2));
+      sunrealtype termctr = coeffxy * uext_1d(locue);
       rr_1d(locu) = up_1d(locu) - (termx + termy - termctr);
     }
   );
@@ -614,14 +614,14 @@ static int BSend(N_Vector uu, void *user_data)
   const int mysub = data->mysub;
 
   /* Get pointers to buffers and extended solution vector data array uext. */
-  Kokkos::View<realtype*, memory_space> bufleft   = data->send_buff_left;
-  Kokkos::View<realtype*, memory_space> bufright  = data->send_buff_right;
-  Kokkos::View<realtype*, memory_space> buftop    = data->send_buff_top;
-  Kokkos::View<realtype*, memory_space> bufbottom = data->send_buff_bottom;
-  typename Kokkos::View<realtype*>::HostMirror h_bufleft   =  data->h_send_buff_left;
-  typename Kokkos::View<realtype*>::HostMirror h_bufright  =  data->h_send_buff_right;
-  typename Kokkos::View<realtype*>::HostMirror h_buftop    =  data->h_send_buff_top;
-  typename Kokkos::View<realtype*>::HostMirror h_bufbottom =  data->h_send_buff_bottom;
+  Kokkos::View<sunrealtype*, memory_space> bufleft   = data->send_buff_left;
+  Kokkos::View<sunrealtype*, memory_space> bufright  = data->send_buff_right;
+  Kokkos::View<sunrealtype*, memory_space> buftop    = data->send_buff_top;
+  Kokkos::View<sunrealtype*, memory_space> bufbottom = data->send_buff_bottom;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufleft   =  data->h_send_buff_left;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufright  =  data->h_send_buff_right;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_buftop    =  data->h_send_buff_top;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufbottom =  data->h_send_buff_bottom;
 
   /* Get solution vector data. */
   Teuchos::RCP<vector_type> uuv = N_VGetVector_Trilinos(uu);
@@ -706,7 +706,7 @@ static int BSend(N_Vector uu, void *user_data)
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*(MYSUB+MYSUB) realtype entries, should
+ *   1) buffer should be able to hold 2*(MYSUB+MYSUB) sunrealtype entries, should
  *      be passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -729,10 +729,10 @@ static int BRecvPost(MPI_Request request[], void *user_data)
   const sunindextype mysub = data->mysub;
 
   /* Get left, right, top and bottom host buffers. */
-  typename Kokkos::View<realtype*>::HostMirror h_bufleft   = data->h_recv_buff_left;
-  typename Kokkos::View<realtype*>::HostMirror h_bufright  = data->h_recv_buff_right;
-  typename Kokkos::View<realtype*>::HostMirror h_buftop    = data->h_recv_buff_top;
-  typename Kokkos::View<realtype*>::HostMirror h_bufbottom = data->h_recv_buff_bottom;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufleft   = data->h_recv_buff_left;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufright  = data->h_recv_buff_right;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_buftop    = data->h_recv_buff_top;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufbottom = data->h_recv_buff_bottom;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0) {
@@ -765,7 +765,7 @@ static int BRecvPost(MPI_Request request[], void *user_data)
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -785,17 +785,17 @@ static int BRecvWait(MPI_Request request[], void *user_data)
   const sunindextype mysub = data->mysub;
 
   /* Get pointers to buffers and extended solution vector data array uext. */
-  typename Kokkos::View<realtype*>::HostMirror h_bufleft   = data->h_recv_buff_left;
-  typename Kokkos::View<realtype*>::HostMirror h_bufright  = data->h_recv_buff_right;
-  typename Kokkos::View<realtype*>::HostMirror h_buftop    = data->h_recv_buff_top;
-  typename Kokkos::View<realtype*>::HostMirror h_bufbottom = data->h_recv_buff_bottom;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufleft   = data->h_recv_buff_left;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufright  = data->h_recv_buff_right;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_buftop    = data->h_recv_buff_top;
+  typename Kokkos::View<sunrealtype*>::HostMirror h_bufbottom = data->h_recv_buff_bottom;
 
-  Kokkos::View<realtype*, memory_space> bufleft   = data->recv_buff_left;
-  Kokkos::View<realtype*, memory_space> bufright  = data->recv_buff_right;
-  Kokkos::View<realtype*, memory_space> buftop    = data->recv_buff_top;
-  Kokkos::View<realtype*, memory_space> bufbottom = data->recv_buff_bottom;
+  Kokkos::View<sunrealtype*, memory_space> bufleft   = data->recv_buff_left;
+  Kokkos::View<sunrealtype*, memory_space> bufright  = data->recv_buff_right;
+  Kokkos::View<sunrealtype*, memory_space> buftop    = data->recv_buff_top;
+  Kokkos::View<sunrealtype*, memory_space> bufbottom = data->recv_buff_bottom;
 
-  Kokkos::View<realtype*, memory_space> uext_1d = data->uext;
+  Kokkos::View<sunrealtype*, memory_space> uext_1d = data->uext;
 
   const sunindextype mxsub2 = mxsub + 2;
   const sunindextype mysub1 = mysub + 1;
@@ -941,7 +941,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
                              N_Vector res, UserData *data)
 {
   sunindextype i, iloc, j, jloc, loc;
-  realtype xfact, yfact;
+  sunrealtype xfact, yfact;
 
   /* Initialize uu. */
 
@@ -969,8 +969,8 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
 #endif
 
   /* Set mesh spacings and subgrid indices for this PE. */
-  const realtype dx = data->dx;
-  const realtype dy = data->dy;
+  const sunrealtype dx = data->dx;
+  const sunrealtype dy = data->dy;
   const int ixsub = data->ixsub;
   const int jysub = data->jysub;
 
@@ -992,7 +992,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = dx*i;
       loc = iloc + jloc*mxsub;
-      u_1d(loc) = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      u_1d(loc) = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
 
       if (i == 0 || i == data->mx - 1 || j == 0 || j == data->my - 1)
         id_1d(loc) = ZERO;
@@ -1024,7 +1024,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
 /*
  * Print first lines of output and table heading
  */
-static void PrintHeader(realtype rtol, realtype atol, UserData *data)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, UserData *data)
 {
   printf("\nidaHeat2D_kry_p: Heat equation, parallel example problem for IDA\n");
   printf("            Discretized heat equation on 2D unit square.\n");
@@ -1057,9 +1057,9 @@ static void PrintHeader(realtype rtol, realtype atol, UserData *data)
 /*
  * PrintOutput: print max norm of solution and current solver statistics
  */
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/ida/trilinos/idaHeat2D_kry_tpetra.cpp b/examples/ida/trilinos/idaHeat2D_kry_tpetra.cpp
index ef74111797..89e068cc95 100644
--- a/examples/ida/trilinos/idaHeat2D_kry_tpetra.cpp
+++ b/examples/ida/trilinos/idaHeat2D_kry_tpetra.cpp
@@ -51,25 +51,25 @@
 #include <nvector/trilinos/SundialsTpetraVectorInterface.hpp>
 #include <nvector/nvector_trilinos.h>
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* User data type */
 
 struct UserData {
   sunindextype mm;  /* number of grid points in one dimension */
   sunindextype neq; /* number of equations */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 };
 
@@ -85,24 +85,24 @@ typedef vector_type::map_type map_type;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data);
+               sunrealtype c_j, void *prec_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data);
+               sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData *data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu);
 static int check_retval(void *flagvalue, const char *funcname, int opt);
 
 /*
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
   void *mem;
   N_Vector uu, up, constraints, res;
   int retval, iout;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
 
@@ -198,9 +198,9 @@ int main(int argc, char *argv[])
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -358,13 +358,13 @@ int main(int argc, char *argv[])
  *    res_i = u'_i - (central difference)_i
  * while for each boundary point, it is res_i = u_i.
  */
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   UserData *data = reinterpret_cast<UserData*>(user_data);
   sunindextype mm;
-  realtype coeff;
+  sunrealtype coeff;
 
   Teuchos::RCP<vector_type> uutp = N_VGetVector_Trilinos(uu);
   Teuchos::RCP<vector_type> uptp = N_VGetVector_Trilinos(up);
@@ -399,8 +399,8 @@ int resHeat(realtype tt,
         rr_1d(loc) = uu_1d(loc);
       } else {
         /* Loop over interior points; set res = up - (central difference). */
-        realtype dif1 = uu_1d(loc-1)  + uu_1d(loc+1)  - TWO * uu_1d(loc);
-        realtype dif2 = uu_1d(loc-mm) + uu_1d(loc+mm) - TWO * uu_1d(loc);
+        sunrealtype dif1 = uu_1d(loc-1)  + uu_1d(loc+1)  - TWO * uu_1d(loc);
+        sunrealtype dif2 = uu_1d(loc-mm) + uu_1d(loc+mm) - TWO * uu_1d(loc);
         rr_1d(loc) = up_1d(loc) - coeff * ( dif1 + dif2 );
       }
     }
@@ -426,15 +426,15 @@ int resHeat(realtype tt,
  * In this instance, only cj and data (user data structure, with
  * pp etc.) are used from the PsetupdHeat argument list.
  */
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data)
+               sunrealtype c_j, void *prec_data)
 {
   UserData *data = reinterpret_cast<UserData*>(prec_data);
   sunindextype mm;
 
   mm = data->mm;
-  realtype coeff = data->coeff;
+  sunrealtype coeff = data->coeff;
 
   Teuchos::RCP<vector_type> pptp = N_VGetVector_Trilinos(data->pp);
 
@@ -471,10 +471,10 @@ int PsetupHeat(realtype tt,
  * containing the inverse diagonal Jacobian elements, returning the
  * result in zvec.
  */
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data)
+               sunrealtype c_j, sunrealtype delta, void *prec_data)
 {
   UserData *data = reinterpret_cast<UserData*>(prec_data);
   N_VProd(data->pp, rvec, zvec);
@@ -494,7 +494,7 @@ static int SetInitialProfile(UserData *data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, mm1, i, j;
-  realtype xfact, yfact;
+  sunrealtype xfact, yfact;
 
   mm = data->mm;
 
@@ -517,7 +517,7 @@ static int SetInitialProfile(UserData *data, N_Vector uu, N_Vector up,
     yfact = data->dx * j;
     for (i = 0; i < mm; i++) {
       xfact = data->dx * i;
-      u_1d(mm*j + i) = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      u_1d(mm*j + i) = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -564,7 +564,7 @@ static int SetInitialProfile(UserData *data, N_Vector uu, N_Vector up,
 /*
  * Print first lines of output (problem description)
  */
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidaHeat2D_kry_tpetra: Heat equation, serial example problem for IDA \n");
   printf("         Discretized heat equation on 2D unit square. \n");
@@ -587,9 +587,9 @@ static void PrintHeader(realtype rtol, realtype atol)
 /*
  * PrintOutput: print max norm of solution and current solver statistics
  */
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/idas/C_openmp/idasFoodWeb_bnd_omp.c b/examples/idas/C_openmp/idasFoodWeb_bnd_omp.c
index 171851849e..d5cbe085b3 100644
--- a/examples/idas/C_openmp/idasFoodWeb_bnd_omp.c
+++ b/examples/idas/C_openmp/idasFoodWeb_bnd_omp.c
@@ -125,30 +125,30 @@
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -164,15 +164,15 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
   N_Vector rates;
   int nthreads;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
 /* Prototypes for private Helper Functions. */
@@ -180,13 +180,13 @@ static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol);
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t);
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *ida_mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -204,7 +204,7 @@ int main(int argc, char *argv[])
   N_Vector cc, cp, id;
   int iout, retval;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   int num_threads;
   SUNContext ctx;
 
@@ -284,7 +284,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -351,11 +351,11 @@ int main(int argc, char *argv[])
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   jx = jy = is = 0;
@@ -402,7 +402,7 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -453,8 +453,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = NV_DATA_OMP(cc);
   cpv = NV_DATA_OMP(cp);
@@ -467,17 +467,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-	  ccv[loc+is] = RCONST(1.0e5);
+	  ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -503,7 +503,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasFoodWeb_bnd_omp: Predator-prey DAE OpenMP example problem for IDAS \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -532,11 +532,11 @@ static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtyp
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t)
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(ida_mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -610,11 +610,11 @@ static void PrintFinalStats(void *ida_mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -664,11 +664,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -681,13 +681,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/idas/C_openmp/idasFoodWeb_kry_omp.c b/examples/idas/C_openmp/idasFoodWeb_kry_omp.c
index 9258327cdc..40a8fa46f3 100644
--- a/examples/idas/C_openmp/idasFoodWeb_kry_omp.c
+++ b/examples/idas/C_openmp/idasFoodWeb_kry_omp.c
@@ -130,30 +130,30 @@
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -169,9 +169,9 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
-  realtype **PP[MX][MY];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype **PP[MX][MY];
   sunindextype *pivot[MX][MY];
   N_Vector rates;
   N_Vector ewt;
@@ -181,28 +181,28 @@ typedef struct {
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
-static int Precond(realtype tt, N_Vector cc, N_Vector cp,
-                   N_Vector rr, realtype cj, void *user_data);
+static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp,
+                   N_Vector rr, sunrealtype cj, void *user_data);
 
-static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolve(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, N_Vector rvec, N_Vector zvec,
-                  realtype cj, realtype delta, void *user_data);
+                  sunrealtype cj, sunrealtype delta, void *user_data);
 
 /* Prototypes for private Helper Functions. */
 
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(int maxl, realtype rtol, realtype atol);
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t);
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *ida_mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
   N_Vector cc, cp, id;
   int iout, jx, jy, retval;
   int maxl;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   int num_threads;
   SUNContext ctx;
 
@@ -310,7 +310,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -383,11 +383,11 @@ int main(int argc, char *argv[])
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   jx = jy = is = 0;
@@ -422,25 +422,25 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 }
 
 
-static int Precond(realtype tt, N_Vector cc, N_Vector cp,
-                   N_Vector rr, realtype cj, void *user_data)
+static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp,
+                   N_Vector rr, sunrealtype cj, void *user_data)
 {
   int retval;
   sunindextype ret;
-  realtype uround, xx, yy, del_x, del_y;
-  realtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
-  realtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
+  sunrealtype uround, xx, yy, del_x, del_y;
+  sunrealtype **Pxy, *ratesxy, *Pxycol, *cxy, *cpxy, *ewtxy, cctmp;
+  sunrealtype inc, fac, sqru, perturb_rates[NUM_SPECIES];
   int is, js, jx, jy;
   void *ida_mem;
   N_Vector ewt;
-  realtype hh;
+  sunrealtype hh;
   UserData webdata;
 
   webdata = (UserData) user_data;
   del_x = webdata->dx;
   del_y = webdata->dy;
 
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
   sqru = sqrt(uround);
 
   ida_mem = webdata->ida_mem;
@@ -490,11 +490,11 @@ static int Precond(realtype tt, N_Vector cc, N_Vector cp,
 }
 
 
-static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolve(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, N_Vector rvec, N_Vector zvec,
-                  realtype cj, realtype dalta, void *user_data)
+                  sunrealtype cj, sunrealtype dalta, void *user_data)
 {
-  realtype **Pxy, *zxy;
+  sunrealtype **Pxy, *zxy;
   sunindextype *pivot;
   sunindextype jx, jy;
   UserData webdata;
@@ -534,7 +534,7 @@ static int PSolve(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -585,8 +585,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = NV_DATA_OMP(cc);
   cpv = NV_DATA_OMP(cp);
@@ -599,17 +599,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-          ccv[loc+is] = RCONST(1.0e5);
+          ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -635,7 +635,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(int maxl, realtype rtol, realtype atol)
+static void PrintHeader(int maxl, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasFoodWeb_kry_omp: Predator-prey DAE OpenMP example problem using Krylov solver for IDAS \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -663,11 +663,11 @@ static void PrintHeader(int maxl, realtype rtol, realtype atol)
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector c, realtype t)
+static void PrintOutput(void *ida_mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(ida_mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -741,11 +741,11 @@ static void PrintFinalStats(void *ida_mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -795,11 +795,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -812,13 +812,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.c b/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.c
index 7068eb4997..7de76c0d4b 100644
--- a/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.c
+++ b/examples/idas/parallel/idasBruss_ASAp_kry_bbd_p.c
@@ -85,12 +85,12 @@
 
 /* Problem Constants */
 #define NUM_SPECIES 2
-#define ctL         RCONST(1.0)    /* Domain =[0,L]^2 */
-#define ctA         RCONST(1.0)
-#define ctB         RCONST(3.4)
-#define ctEps       RCONST(2.0e-3)
+#define ctL         SUN_RCONST(1.0)    /* Domain =[0,L]^2 */
+#define ctA         SUN_RCONST(1.0)
+#define ctB         SUN_RCONST(3.4)
+#define ctEps       SUN_RCONST(2.0e-3)
 
-#define PI          RCONST(3.1415926535898) /* pi */
+#define PI          SUN_RCONST(3.1415926535898) /* pi */
 
 #define MXSUB       21    /* Number of x mesh points per processor subgrid */
 #define MYSUB       21    /* Number of y mesh points per processor subgrid */
@@ -101,18 +101,18 @@
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
 
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
 
-#define TBEGIN      RCONST(0.0)   /* Multiplier for tout values */
-#define TEND        RCONST(1.0)    /* Increment for tout values */
+#define TBEGIN      SUN_RCONST(0.0)   /* Multiplier for tout values */
+#define TEND        SUN_RCONST(1.0)    /* Increment for tout values */
 
 #define STEPS       50
 
-#define ZERO        RCONST(0.0)
-#define HALF        RCONST(0.5)
-#define ONE         RCONST(1.0)
-#define TWO         RCONST(2.0)
+#define ZERO        SUN_RCONST(0.0)
+#define HALF        SUN_RCONST(0.5)
+#define ONE         SUN_RCONST(1.0)
+#define TWO         SUN_RCONST(2.0)
 
 /* User-defined vector accessor macro IJ_Vptr. */
 
@@ -129,48 +129,48 @@
 typedef struct {
   int ns, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype A, B, L, eps[NUM_SPECIES];
-  realtype dx, dy;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES];
-  realtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
-  realtype rhs[NUM_SPECIES];
+  sunrealtype A, B, L, eps[NUM_SPECIES];
+  sunrealtype dx, dy;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES];
+  sunrealtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
+  sunrealtype rhs[NUM_SPECIES];
   MPI_Comm comm;
-  realtype rates[2];
+  sunrealtype rates[2];
   sunindextype n_local;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
-static int res(realtype tt, N_Vector uv, N_Vector uvp,
+static int res(sunrealtype tt, N_Vector uv, N_Vector uvp,
                N_Vector rr, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector uv, N_Vector uvp, N_Vector res,
                     void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp, void *user_data);
 
 /* Prototypes for supporting functions */
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub, int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static void ReactRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData data);
 
 /*                  ADJOINT                        */
 
-static int resB(realtype tt, N_Vector yy, N_Vector yp,
+static int resB(sunrealtype tt, N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB);
 
-static int resBlocal(sunindextype Nlocal, realtype tt,
+static int resBlocal(sunindextype Nlocal, sunrealtype tt,
                      N_Vector uv, N_Vector uvp,
                      N_Vector yyB, N_Vector ypB,
                      N_Vector res, void *user_dataB);
@@ -189,9 +189,9 @@ static void SetInitialProfilesB(N_Vector uv, N_Vector uvp,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *mem, N_Vector uv, realtype time,
+static void PrintOutput(void *mem, N_Vector uv, sunrealtype time,
                         UserData data, MPI_Comm comm);
 
 static void PrintSol(void* mem, N_Vector uv, N_Vector uvp, UserData data,
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS_B;
   UserData data;
   sunindextype SystemSize, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector uv, uvp, resid, id, uvB, uvpB, residB;
   int thispe, npes, maxl, retval;
 
@@ -322,7 +322,7 @@ int main(int argc, char *argv[])
 
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1, thispe)) MPI_Abort(comm, 1);
 
@@ -467,7 +467,7 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
                                N_Vector resid, UserData data)
 {
   int ixsub, jysub, mxsub, mysub, ix, jy;
-  realtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
+  sunrealtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
 
   ixsub = data->ixsub;
   jysub = data->jysub;
@@ -486,8 +486,8 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
       x = (ix + ixsub*mxsub) * dx;
       uvxy = IJ_Vptr(uv,ix,jy);
 
-      uvxy[0] = RCONST(1.0) - HALF*cos(PI*y/L);
-      uvxy[1] = RCONST(3.5) - RCONST(2.5)*cos(PI*x/L);
+      uvxy[0] = SUN_RCONST(1.0) - HALF*cos(PI*y/L);
+      uvxy[1] = SUN_RCONST(3.5) - SUN_RCONST(2.5)*cos(PI*x/L);
     }
   }
 
@@ -556,8 +556,8 @@ static void SetInitialProfilesB(N_Vector uv, N_Vector uvp,
                                N_Vector residB, UserData data)
 {
   int ixsub, jysub, mxsub, mysub, ix, jy;
-  realtype *uvxy, *uvBxy, *uvpBxy, npex, npey;
-  realtype B;
+  sunrealtype *uvxy, *uvBxy, *uvpBxy, npex, npey;
+  sunrealtype B;
 
   ixsub = data->ixsub;
   jysub = data->jysub;
@@ -633,7 +633,7 @@ static void SetInitialProfilesB(N_Vector uv, N_Vector uvp,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\n BRUSSELATOR: chemically reacting system\n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -666,11 +666,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector uv, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector uv, sunrealtype tt,
                         UserData data, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -727,7 +727,7 @@ static void PrintSol(void* ida_mem, N_Vector uv, N_Vector uvp,
                      UserData data, MPI_Comm comm)
 {
   FILE* fout;
-  realtype *uvxy;
+  sunrealtype *uvxy;
   int ix, jy, mxsub, mysub, npex, ixsub, jysub, thispe, i, j;
   char szFilename[128];
 
@@ -776,7 +776,7 @@ static void PrintSol(void* ida_mem, N_Vector uv, N_Vector uvp,
 static void PrintAdjSol(N_Vector uvB, N_Vector uvpB, UserData data)
 {
   FILE* fout;
-  realtype *uvxy;
+  sunrealtype *uvxy;
   int ix, jy, mxsub, mysub, thispe;
   char szFilename[128];
 
@@ -915,7 +915,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  * reslocal, for computation of the residuals on this processor.
  */
 
-static int res(realtype tt,
+static int res(sunrealtype tt,
                N_Vector uv, N_Vector uvp, N_Vector rr,
                void *user_data)
 {
@@ -946,13 +946,13 @@ static int res(realtype tt,
  * and receive-waiting, in routines BRecvPost, BSend, BRecvWait.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp,
                    void *user_data)
 {
 
   UserData data;
-  realtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -986,7 +986,7 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -995,11 +995,11 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -1029,18 +1029,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -1087,11 +1087,11 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of uv. */
 
@@ -1162,14 +1162,14 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector uv, N_Vector uvp, N_Vector rr,
                     void *user_data)
 {
-  realtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
+  sunrealtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
   int ixend, ixstart, jystart, jyend;
   int ix, jy, is, i, locc, ylocce, locce;
-  realtype rates[2];
+  sunrealtype rates[2];
   UserData data;
 
   data = (UserData) user_data;
@@ -1307,10 +1307,10 @@ static int reslocal(sunindextype Nlocal, realtype tt,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void ReactRates(realtype xx, realtype yy, realtype *uvval, realtype *rates,
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *uvval, sunrealtype *rates,
                        UserData data)
 {
-  realtype A, B;
+  sunrealtype A, B;
 
   A = data->A; B = data->B;
 
@@ -1323,7 +1323,7 @@ static void ReactRates(realtype xx, realtype yy, realtype *uvval, realtype *rate
 
 
 
-static int resB(realtype tt, N_Vector yy, N_Vector yp,
+static int resB(sunrealtype tt, N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB)
 {
@@ -1346,18 +1346,18 @@ static int resB(realtype tt, N_Vector yy, N_Vector yp,
 
 
 
-static int resBlocal(sunindextype Nlocal, realtype tt,
+static int resBlocal(sunindextype Nlocal, sunrealtype tt,
                      N_Vector uv, N_Vector uvp,
                      N_Vector uvB, N_Vector uvpB, N_Vector rrB,
                      void *user_dataB)
 {
-  realtype *uvBdata, *uvBxy, *uvpBxy, *uvxy, *rrBxy;
-  realtype dx2, dy2;
-  realtype dcxli, dcxui, dcyli, dcyui;
+  sunrealtype *uvBdata, *uvBxy, *uvpBxy, *uvxy, *rrBxy;
+  sunrealtype dx2, dy2;
+  sunrealtype dcxli, dcxui, dcyli, dcyui;
   int locc, locce, ylocce;
   int ix, jy, i, ixstart, ixend, jystart, jyend, is;
   UserData data;
-  realtype B;
+  sunrealtype B;
 
   data = (UserData) user_dataB;
 
diff --git a/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.c b/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.c
index 62042bfd13..7639eec6d0 100644
--- a/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.c
+++ b/examples/idas/parallel/idasBruss_FSA_kry_bbd_p.c
@@ -69,14 +69,14 @@
 
 /* Problem Constants */
 #define NUM_SPECIES 2
-#define ctL         RCONST(1.0)    /* Domain =[0,L]^2 */
-#define ctA         RCONST(1.0)
-#define ctB         RCONST(3.4)
-#define ctEps       RCONST(2.0e-3)
+#define ctL         SUN_RCONST(1.0)    /* Domain =[0,L]^2 */
+#define ctA         SUN_RCONST(1.0)
+#define ctB         SUN_RCONST(3.4)
+#define ctEps       SUN_RCONST(2.0e-3)
 
 #define NS          2
 
-#define PI          RCONST(3.1415926535898) /* pi */
+#define PI          SUN_RCONST(3.1415926535898) /* pi */
 
 #define MXSUB       41    /* Number of x mesh points per processor subgrid */
 #define MYSUB       41    /* Number of y mesh points per processor subgrid */
@@ -88,15 +88,15 @@
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
 
 
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
-#define ZERO        RCONST(0.0)
-#define HALF        RCONST(0.5)
-#define ONE         RCONST(1.0)
+#define ZERO        SUN_RCONST(0.0)
+#define HALF        SUN_RCONST(0.5)
+#define ONE         SUN_RCONST(1.0)
 
 
 /* User-defined vector accessor macro IJ_Vptr. */
@@ -114,43 +114,43 @@
 typedef struct {
   int ns, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype A, B, L, eps[NUM_SPECIES];
-  realtype dx, dy;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES];
-  realtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
-  realtype rhs[NUM_SPECIES];
+  sunrealtype A, B, L, eps[NUM_SPECIES];
+  sunrealtype dx, dy;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES];
+  sunrealtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
+  sunrealtype rhs[NUM_SPECIES];
   MPI_Comm comm;
-  realtype rates[2];
+  sunrealtype rates[2];
   sunindextype n_local;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
-static int res(realtype tt, N_Vector uv, N_Vector uvp,
+static int res(sunrealtype tt, N_Vector uv, N_Vector uvp,
                N_Vector rr, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector uv, N_Vector uvp, N_Vector res,
                     void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp, void *user_data);
 
 /* Integrate over spatial domain. */
-static int integr(MPI_Comm comm, N_Vector uv, void *user_data, realtype *intval);
+static int integr(MPI_Comm comm, N_Vector uv, void *user_data, sunrealtype *intval);
 
 /* Prototypes for supporting functions */
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static void ReactRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData data);
 
 /* Prototypes for private functions */
@@ -162,9 +162,9 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *mem, N_Vector uv, realtype time,
+static void PrintOutput(void *mem, N_Vector uv, sunrealtype time,
                         UserData data, MPI_Comm comm);
 
 static void PrintSol(void* mem, N_Vector uv, N_Vector uvp, UserData data,
@@ -188,12 +188,12 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData data;
   sunindextype SystemSize, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector uv, uvp, resid, id, *uvS, *uvpS;
   int thispe, npes, maxl, iout, retval;
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
-  realtype intval;
+  sunrealtype intval;
 
   uv = uvp = resid = id = NULL;
   uvS = uvpS = NULL;
@@ -311,7 +311,7 @@ int main(int argc, char *argv[])
   if(check_retval(&retval, "IDABBDPrecInit", 1, thispe)) MPI_Abort(comm, 1);
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1, thispe)) MPI_Abort(comm, 1);
 
@@ -431,7 +431,7 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
                                N_Vector resid, UserData data)
 {
   int ixsub, jysub, mxsub, mysub, ix, jy;
-  realtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
+  sunrealtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
 
   ixsub = data->ixsub;
   jysub = data->jysub;
@@ -451,8 +451,8 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
       x = (ix + ixsub*mxsub) * dx;
       uvxy = IJ_Vptr(uv,ix,jy);
 
-      uvxy[0] = RCONST(1.0) - HALF*cos(PI*y/L);
-      uvxy[1] = RCONST(3.5) - RCONST(2.5)*cos(PI*x/L);
+      uvxy[0] = SUN_RCONST(1.0) - HALF*cos(PI*y/L);
+      uvxy[1] = SUN_RCONST(3.5) - SUN_RCONST(2.5)*cos(PI*x/L);
     }
   }
 
@@ -526,7 +526,7 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\n Brusselator PDE -  DAE parallel example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -559,11 +559,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector uv, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector uv, sunrealtype tt,
                         UserData data, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -622,7 +622,7 @@ static void PrintSol(void* ida_mem, N_Vector uv, N_Vector uvp,
                      UserData data, MPI_Comm comm)
 {
   FILE* fout;
-  realtype *uvxy;
+  sunrealtype *uvxy;
   int ix, jy, mxsub, mysub, thispe;
   char szFilename[128];
 
@@ -760,7 +760,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  * reslocal, for computation of the residuals on this processor.
  */
 
-static int res(realtype tt, N_Vector uv, N_Vector uvp,
+static int res(sunrealtype tt, N_Vector uv, N_Vector uvp,
                N_Vector rr, void *user_data)
 {
   int retval;
@@ -789,12 +789,12 @@ static int res(realtype tt, N_Vector uv, N_Vector uvp,
  * The message-passing uses blocking sends, non-blocking receives,
  * and receive-waiting, in routines BRecvPost, BSend, BRecvWait.
  */
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp, void *user_data)
 {
 
   UserData data;
-  realtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -827,7 +827,7 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -835,11 +835,11 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub, int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -868,18 +868,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -926,11 +926,11 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of uv. */
 
@@ -1001,13 +1001,13 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tt, N_Vector uv,
+static int reslocal(sunindextype Nlocal, sunrealtype tt, N_Vector uv,
                     N_Vector uvp, N_Vector rr, void *user_data)
 {
-  realtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
+  sunrealtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
   int ixend, ixstart, jystart, jyend;
   int ix, jy, is, i, locc, ylocce, locce;
-  realtype rates[2];
+  sunrealtype rates[2];
   UserData data;
 
   data = (UserData) user_data;
@@ -1145,10 +1145,10 @@ static int reslocal(sunindextype Nlocal, realtype tt, N_Vector uv,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void ReactRates(realtype xx, realtype yy, realtype *uvval,
-                       realtype *rates, UserData data)
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *uvval,
+                       sunrealtype *rates, UserData data)
 {
-  realtype A, B;
+  sunrealtype A, B;
 
   A = data->A; B = data->B;
 
@@ -1161,14 +1161,14 @@ static void ReactRates(realtype xx, realtype yy, realtype *uvval,
 
 /* Integrate over the spatial domain. Each process computes the integral on its
    grid. Then processes call MPI_REDUCE to compute sum of the local values. */
-static int integr(MPI_Comm comm, N_Vector uv, void *user_data, realtype *intval)
+static int integr(MPI_Comm comm, N_Vector uv, void *user_data, sunrealtype *intval)
 {
   int ix, jy;
   int retval;
-  realtype *uvdata;
+  sunrealtype *uvdata;
   UserData data;
 
-  realtype buf[2];
+  sunrealtype buf[2];
 
   data = (UserData) user_data;
 
diff --git a/examples/idas/parallel/idasBruss_kry_bbd_p.c b/examples/idas/parallel/idasBruss_kry_bbd_p.c
index 2a8b07ed44..8e48071f7a 100644
--- a/examples/idas/parallel/idasBruss_kry_bbd_p.c
+++ b/examples/idas/parallel/idasBruss_kry_bbd_p.c
@@ -59,13 +59,13 @@
 
 /* Problem Constants */
 #define NUM_SPECIES 2
-#define ctL         RCONST(1.0)    /* Domain =[0,L]^2 */
-#define ctA         RCONST(1.0)
-#define ctB         RCONST(3.4)
-#define ctEps       RCONST(2.0e-3)
+#define ctL         SUN_RCONST(1.0)    /* Domain =[0,L]^2 */
+#define ctA         SUN_RCONST(1.0)
+#define ctB         SUN_RCONST(3.4)
+#define ctEps       SUN_RCONST(2.0e-3)
 
 
-#define PI          RCONST(3.1415926535898) /* pi */
+#define PI          SUN_RCONST(3.1415926535898) /* pi */
 
 #define MXSUB       21    /* Number of x mesh points per processor subgrid */
 #define MYSUB       21    /* Number of y mesh points per processor subgrid */
@@ -77,15 +77,15 @@
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
 
 
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
-#define ZERO        RCONST(0.0)
-#define HALF        RCONST(0.5)
-#define ONE         RCONST(1.0)
+#define ZERO        SUN_RCONST(0.0)
+#define HALF        SUN_RCONST(0.5)
+#define ONE         SUN_RCONST(1.0)
 
 
 /* User-defined vector accessor macro IJ_Vptr. */
@@ -103,40 +103,40 @@
 typedef struct {
   int ns, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype A, B, L, eps[NUM_SPECIES];
-  realtype dx, dy;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES];
-  realtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
-  realtype rhs[NUM_SPECIES];
+  sunrealtype A, B, L, eps[NUM_SPECIES];
+  sunrealtype dx, dy;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES];
+  sunrealtype gridext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
+  sunrealtype rhs[NUM_SPECIES];
   MPI_Comm comm;
-  realtype rates[2];
+  sunrealtype rates[2];
   sunindextype n_local;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
-static int res(realtype tt, N_Vector uv, N_Vector uvp,
+static int res(sunrealtype tt, N_Vector uv, N_Vector uvp,
                N_Vector rr, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector uv, N_Vector uvp, N_Vector res,
                     void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp, void *user_data);
 
 /* Prototypes for supporting functions */
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub, int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static void ReactRates(realtype xx, realtype yy, realtype *cxy,
-                       realtype *ratesxy, UserData data);
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy,
+                       sunrealtype *ratesxy, UserData data);
 
 /* Prototypes for private functions */
 static void InitUserData(UserData data, int thispe, int npes,
@@ -148,9 +148,9 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *ida_mem, N_Vector uv, realtype time,
+static void PrintOutput(void *ida_mem, N_Vector uv, sunrealtype time,
                         UserData data, MPI_Comm comm);
 
 static void PrintSol(void* ida_mem, N_Vector uv, N_Vector uvp, UserData data,
@@ -174,7 +174,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData data;
   sunindextype SystemSize, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector uv, uvp, resid, id;
   int thispe, npes, maxl, iout, retval;
 
@@ -269,7 +269,7 @@ int main(int argc, char *argv[])
   if(check_retval(&retval, "IDABBDPrecInit", 1, thispe)) MPI_Abort(comm, 1);
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1, thispe)) MPI_Abort(comm, 1);
 
@@ -364,7 +364,7 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
                                N_Vector resid, UserData data)
 {
   int ixsub, jysub, mxsub, mysub, ix, jy;
-  realtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
+  sunrealtype *idxy, dx, dy, x, y, *uvxy, *uvxy1, L, npex, npey;
 
   ixsub = data->ixsub;
   jysub = data->jysub;
@@ -384,8 +384,8 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
       x = (ix + ixsub*mxsub) * dx;
       uvxy = IJ_Vptr(uv,ix,jy);
 
-      uvxy[0] = RCONST(1.0) - HALF*cos(PI*y/L);
-      uvxy[1] = RCONST(3.5) - RCONST(2.5)*cos(PI*x/L);
+      uvxy[0] = SUN_RCONST(1.0) - HALF*cos(PI*y/L);
+      uvxy[1] = SUN_RCONST(3.5) - SUN_RCONST(2.5)*cos(PI*x/L);
     }
   }
 
@@ -458,7 +458,7 @@ static void SetInitialProfiles(N_Vector uv, N_Vector uvp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasBruss_kry_bbd_p: Brusselator DAE parallel example problem for IDAS \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -491,11 +491,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector uv, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector uv, sunrealtype tt,
                         UserData data, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -554,7 +554,7 @@ static void PrintSol(void* ida_mem, N_Vector uv, N_Vector uvp,
                      UserData data, MPI_Comm comm)
 {
   FILE* fout;
-  realtype *uvxy;
+  sunrealtype *uvxy;
   int ix, jy, mxsub, mysub, thispe;
   char szFilename[128];
 
@@ -692,7 +692,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  * reslocal, for computation of the residuals on this processor.
  */
 
-static int res(realtype tt, N_Vector uv, N_Vector uvp,
+static int res(sunrealtype tt, N_Vector uv, N_Vector uvp,
                N_Vector rr, void *user_data)
 {
   int retval;
@@ -721,12 +721,12 @@ static int res(realtype tt, N_Vector uv, N_Vector uvp,
  * The message-passing uses blocking sends, non-blocking receives,
  * and receive-waiting, in routines BRecvPost, BSend, BRecvWait.
  */
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uv, N_Vector uvp, void *user_data)
 {
 
   UserData data;
-  realtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *gridext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -759,7 +759,7 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -767,11 +767,11 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub, int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -800,18 +800,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -858,11 +858,11 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of uv. */
 
@@ -933,13 +933,13 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tt, N_Vector uv,
+static int reslocal(sunindextype Nlocal, sunrealtype tt, N_Vector uv,
                     N_Vector uvp, N_Vector rr, void *user_data)
 {
-  realtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
+  sunrealtype *uvdata, *uvpxy, *resxy, xx, yy, dcyli, dcyui, dcxli, dcxui, dx2, dy2;
   int ixend, ixstart, jystart, jyend;
   int ix, jy, is, i, locc, ylocce, locce;
-  realtype rates[2];
+  sunrealtype rates[2];
   UserData data;
 
   data = (UserData) user_data;
@@ -1077,10 +1077,10 @@ static int reslocal(sunindextype Nlocal, realtype tt, N_Vector uv,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void ReactRates(realtype xx, realtype yy, realtype *uvval,
-                       realtype *rates, UserData data)
+static void ReactRates(sunrealtype xx, sunrealtype yy, sunrealtype *uvval,
+                       sunrealtype *rates, UserData data)
 {
-  realtype A, B;
+  sunrealtype A, B;
 
   A = data->A; B = data->B;
 
diff --git a/examples/idas/parallel/idasFoodWeb_kry_bbd_p.c b/examples/idas/parallel/idasFoodWeb_kry_bbd_p.c
index af438c1cb3..63c652e236 100644
--- a/examples/idas/parallel/idasFoodWeb_kry_bbd_p.c
+++ b/examples/idas/parallel/idasFoodWeb_kry_bbd_p.c
@@ -120,8 +120,8 @@
 #define NPREY       1        /* Number of prey (= number of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898) /* pi */
-#define FOURPI      (RCONST(4.0)*PI)        /* 4 pi */
+#define PI          SUN_RCONST(3.1415926535898) /* pi */
+#define FOURPI      (SUN_RCONST(4.0)*PI)        /* 4 pi */
 
 #define MXSUB       10    /* Number of x mesh points per processor subgrid */
 #define MYSUB       10    /* Number of y mesh points per processor subgrid */
@@ -131,23 +131,23 @@
 #define MY          (MYSUB*NPEY)      /* MY = number of y mesh points */
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns. */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns. */
-#define AX          RCONST(1.0)    /* Total range of x variable */
-#define AY          RCONST(1.0)    /* Total range of y variable */
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
-#define ZERO        RCONST(0.)     /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns. */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns. */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
+#define ZERO        SUN_RCONST(0.)     /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
 /* User-defined vector accessor macro IJ_Vptr. */
 
@@ -165,8 +165,8 @@
 typedef struct {
   int ns, np, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
     rhs[NUM_SPECIES], cext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
   MPI_Comm comm;
   N_Vector rates;
@@ -175,34 +175,34 @@ typedef struct {
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector rr, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector cc, N_Vector cp,
                    void *user_data);
 
 /* Prototypes for supporting functions */
 
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
 
-static realtype dotprod(int size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2);
 
 /* Prototypes for private functions */
 
@@ -215,9 +215,9 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype time,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype time,
                         UserData webdata, MPI_Comm comm);
 
 static void PrintFinalStats(void *ida_mem);
@@ -238,7 +238,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData webdata;
   sunindextype SystemSize, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector cc, cp, res, id;
   int thispe, npes, maxl, iout, retval;
 
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1, thispe)) MPI_Abort(comm, 1);
 
@@ -405,7 +405,7 @@ static void InitUserData(UserData webdata, int thispe, int npes,
                          MPI_Comm comm)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
 
   webdata->jysub = thispe / NPEX;
   webdata->ixsub = thispe - (webdata->jysub)*NPEX;
@@ -472,7 +472,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector res, UserData webdata)
 {
   int ixsub, jysub, mxsub, mysub, np, ix, jy, is;
-  realtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
+  sunrealtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
 
   ixsub = webdata->ixsub;
   jysub = webdata->jysub;
@@ -494,7 +494,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
       idxy = IJ_Vptr(id,ix,jy);
       for (is = 0; is < NUM_SPECIES; is++) {
 	if (is < np)
-          { cxy[is] = RCONST(10.0) + (realtype)(is+1)*xyfactor; idxy[is] = ONE; }
+          { cxy[is] = SUN_RCONST(10.0) + (sunrealtype)(is+1)*xyfactor; idxy[is] = ONE; }
         else { cxy[is] = 1.0e5; idxy[is] = ZERO; }
       }
     }
@@ -524,7 +524,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
 static void PrintHeader(sunindextype SystemSize, int maxl,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasFoodWeb_kry_bbd_p: Predator-prey DAE parallel example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -557,11 +557,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype tt,
                         UserData webdata, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -719,7 +719,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  * reslocal, for computation of the residuals on this processor.
  */
 
-static int resweb(realtype tt,
+static int resweb(sunrealtype tt,
                   N_Vector cc, N_Vector cp, N_Vector rr,
                   void *user_data)
 {
@@ -750,13 +750,13 @@ static int resweb(realtype tt,
  * and receive-waiting, in routines BRecvPost, BSend, BRecvWait.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector cc, N_Vector cp,
                    void *user_data)
 {
 
   UserData webdata;
-  realtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -793,7 +793,7 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -802,11 +802,11 @@ static int rescomm(sunindextype Nlocal, realtype tt,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -836,18 +836,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -894,11 +894,11 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of cc. */
 
@@ -973,11 +973,11 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tt,
+static int reslocal(sunindextype Nlocal, sunrealtype tt,
                     N_Vector cc, N_Vector cp, N_Vector rr,
                     void *user_data)
 {
-  realtype *cdata, *ratesxy, *cpxy, *resxy,
+  sunrealtype *cdata, *ratesxy, *cpxy, *resxy,
     xx, yy, dcyli, dcyui, dcxli, dcxui;
   int ix, jy, is, i, locc, ylocce, locce;
   UserData webdata;
@@ -1071,11 +1071,11 @@ static int reslocal(sunindextype Nlocal, realtype tt,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -1088,13 +1088,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(int size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1;
   xx2 = x2;
diff --git a/examples/idas/parallel/idasFoodWeb_kry_p.c b/examples/idas/parallel/idasFoodWeb_kry_p.c
index 587d10d5e0..460a202505 100644
--- a/examples/idas/parallel/idasFoodWeb_kry_p.c
+++ b/examples/idas/parallel/idasFoodWeb_kry_p.c
@@ -125,8 +125,8 @@
 #define NPREY       1        /* Number of prey (= number of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)   /* pi */
-#define FOURPI      (RCONST(4.0)*PI)          /* 4 pi */
+#define PI          SUN_RCONST(3.1415926535898)   /* pi */
+#define FOURPI      (SUN_RCONST(4.0)*PI)          /* 4 pi */
 
 #define MXSUB       10    /* Number of x mesh points per processor subgrid */
 #define MYSUB       10    /* Number of y mesh points per processor subgrid */
@@ -136,23 +136,23 @@
 #define MY          (MYSUB*NPEY)      /* MY = number of y mesh points */
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NEQ         (NUM_SPECIES*MX*MY) /* Number of equations in system */
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns. */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns. */
-#define AX          RCONST(1.0)    /* Total range of x variable */
-#define AY          RCONST(1.0)    /* Total range of y variable */
-#define RTOL        RCONST(1.e-5)  /*  rtol tolerance */
-#define ATOL        RCONST(1.e-5)  /*  atol tolerance */
-#define ZERO        RCONST(0.)     /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns. */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns. */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable */
+#define RTOL        SUN_RCONST(1.e-5)  /*  rtol tolerance */
+#define ATOL        SUN_RCONST(1.e-5)  /*  atol tolerance */
+#define ZERO        SUN_RCONST(0.)     /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
 #define NOUT        6
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values */
-#define TADD        RCONST(0.3)    /* Increment for tout values */
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values */
 
 
 /* User-defined vector accessor macro IJ_Vptr. */
@@ -170,12 +170,12 @@ typedef struct {
   sunindextype ns;
   int np, thispe, npes, ixsub, jysub, npex, npey;
   int mxsub, mysub, nsmxsub, nsmxsub2;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES],
     rhs[NUM_SPECIES], cext[(MXSUB+2)*(MYSUB+2)*NUM_SPECIES];
   MPI_Comm comm;
   N_Vector rates;
-  realtype **PP[MXSUB][MYSUB];
+  sunrealtype **PP[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
   N_Vector ewt;
   void *ida_mem;
@@ -184,37 +184,37 @@ typedef struct {
 
 /* Prototypes for user-supplied and supporting functions. */
 
-static int resweb(realtype time,
+static int resweb(sunrealtype time,
                   N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
-static int Precondbd(realtype tt, N_Vector cc, N_Vector cp, N_Vector rr,
-                     realtype cj, void *user_data);
+static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr,
+                     sunrealtype cj, void *user_data);
 
-static int PSolvebd(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolvebd(sunrealtype tt, N_Vector cc, N_Vector cp,
                     N_Vector rr, N_Vector rvec, N_Vector zvec,
-                    realtype cj, realtype delta, void *user_data);
+                    sunrealtype cj, sunrealtype delta, void *user_data);
 
 static int rescomm(N_Vector cc, N_Vector cp, void *user_data);
 
 static void BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype carray[]);
+                  int dsizex, int dsizey, sunrealtype carray[]);
 
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[]);
+                      sunrealtype cext[], sunrealtype buffer[]);
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[]);
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[]);
 
-static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
+static int reslocal(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data);
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
 
-static realtype dotprod(int size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2);
 
 /* Prototypes for private Helper Functions. */
 
@@ -230,9 +230,9 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector scrtch, UserData webdata);
 
 static void PrintHeader(sunindextype SystemSize, int maxl,
-                        realtype rtol, realtype atol);
+                        sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype time,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype time,
                         UserData webdata, MPI_Comm comm);
 
 static void PrintFinalStats(void *ida_mem);
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;
   UserData webdata;
   sunindextype SystemSize, local_N;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   N_Vector cc, cp, res, id;
   int thispe, npes, maxl, iout, retval;
 
@@ -360,7 +360,7 @@ int main(int argc, char *argv[])
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(ida_mem, IDA_YA_YDP_INIT, tout);
   if (check_retval(&retval, "IDACalcIC", 1, thispe))
     MPI_Abort(comm, 1);
@@ -447,7 +447,7 @@ static void InitUserData(UserData webdata, int thispe, int npes,
                          MPI_Comm comm)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2, **acoef, *bcoef, *cox, *coy;
 
   webdata->jysub = thispe / NPEX;
   webdata->ixsub = thispe - (webdata->jysub)*NPEX;
@@ -534,7 +534,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                N_Vector res, UserData webdata)
 {
   int ixsub, jysub, mxsub, mysub, np, ix, jy, is;
-  realtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
+  sunrealtype *cxy, *idxy, *cpxy, dx, dy, xx, yy, xyfactor;
 
   ixsub = webdata->ixsub;
   jysub = webdata->jysub;
@@ -549,13 +549,13 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yy = (jy + jysub*mysub) * dy;
     for (ix = 0; ix < mxsub; ix++) {
       xx = (ix + ixsub*mxsub) * dx;
-      xyfactor = RCONST(16.0)*xx*(ONE - xx)*yy*(ONE - yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE - xx)*yy*(ONE - yy);
       xyfactor *= xyfactor;
 
       cxy = IJ_Vptr(cc,ix,jy);
       idxy = IJ_Vptr(id,ix,jy);
       for (is = 0; is < NUM_SPECIES; is++) {
-        if (is < np) { cxy[is] = RCONST(10.0) + (realtype)(is+1)*xyfactor; idxy[is] = ONE; }
+        if (is < np) { cxy[is] = SUN_RCONST(10.0) + (sunrealtype)(is+1)*xyfactor; idxy[is] = ONE; }
         else { cxy[is] = 1.0e5; idxy[is] = ZERO; }
       }
     }
@@ -580,7 +580,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  */
 
 static void PrintHeader(sunindextype SystemSize, int maxl,
-                        realtype rtol, realtype atol)
+                        sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasFoodWeb_kry_p: Predator-prey DAE parallel example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -613,11 +613,11 @@ static void PrintHeader(sunindextype SystemSize, int maxl,
  * (NOTE: This routine is specific to the case NUM_SPECIES = 2.)
  */
 
-static void PrintOutput(void *ida_mem, N_Vector cc, realtype tt,
+static void PrintOutput(void *ida_mem, N_Vector cc, sunrealtype tt,
                         UserData webdata, MPI_Comm comm)
 {
   MPI_Status status;
-  realtype *cdata, clast[2], hused;
+  sunrealtype *cdata, clast[2], hused;
   long int nst;
   int i, kused, retval, thispe, npelast, ilast;;
 
@@ -770,7 +770,7 @@ static int check_retval(void *returnvalue, const char *funcname, int opt, int id
  *    reslocal, for computation of the residuals on this processor.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   int retval;
@@ -802,7 +802,7 @@ static int rescomm(N_Vector cc, N_Vector cp, void *user_data)
 {
 
   UserData webdata;
-  realtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
   int thispe, ixsub, jysub, nsmxsub, nsmysub;
   MPI_Comm comm;
   MPI_Request request[4];
@@ -840,11 +840,11 @@ static int rescomm(N_Vector cc, N_Vector cp, void *user_data)
  */
 
 static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
-                  int dsizex, int dsizey, realtype cdata[])
+                  int dsizex, int dsizey, sunrealtype cdata[])
 {
   int i;
   int ly, offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of cc. */
   if (jysub != 0)
@@ -882,7 +882,7 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
 
 /*
  * BRecvPost: Start receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
@@ -891,11 +891,11 @@ static void BSend(MPI_Comm comm, int my_pe, int ixsub, int jysub,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int ixsub, int jysub,
                       int dsizex, int dsizey,
-                      realtype cext[], realtype buffer[])
+                      sunrealtype cext[], sunrealtype buffer[])
 {
   int offsetce;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of cext. */
   if (jysub != 0)
@@ -925,18 +925,18 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 
 /*
  * BRecvWait: Finish receiving boundary data from neighboring PEs.
- * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ * (1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  * (2) request should have 4 entries, and is also passed in both calls.
  */
 
 static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                      int dsizex, realtype cext[], realtype buffer[])
+                      int dsizex, sunrealtype cext[], sunrealtype buffer[])
 {
   int i;
   int ly, dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -1012,10 +1012,10 @@ static void BRecvWait(MPI_Request request[], int ixsub, int jysub,
  * for use by the preconditioner setup routine.
  */
 
-static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
+static int reslocal(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector res,
                     void *user_data)
 {
-  realtype *cdata, *ratesxy, *cpxy, *resxy,
+  sunrealtype *cdata, *ratesxy, *cpxy, *resxy,
     xx, yy, dcyli, dcyui, dcxli, dcxui;
   int ix, jy, is, i, locc, ylocce, locce;
   UserData webdata;
@@ -1107,11 +1107,11 @@ static int reslocal(realtype tt, N_Vector cc, N_Vector cp, N_Vector res,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -1124,13 +1124,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(int size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -1147,22 +1147,22 @@ static realtype dotprod(int size, realtype *x1, realtype *x2)
  * Each block is LU-factored, for later solution of the linear systems.
  */
 
-static int Precondbd(realtype tt, N_Vector cc, N_Vector cp,
-                     N_Vector rr, realtype cj, void *user_data)
+static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp,
+                     N_Vector rr, sunrealtype cj, void *user_data)
 {
   int retval, thispe;
   sunindextype ret;
-  realtype uround;
-  realtype xx, yy, *cxy, *ewtxy, cctemp, **Pxy, *ratesxy, *Pxycol, *cpxy;
-  realtype inc, sqru, fac, perturb_rates[NUM_SPECIES];
+  sunrealtype uround;
+  sunrealtype xx, yy, *cxy, *ewtxy, cctemp, **Pxy, *ratesxy, *Pxycol, *cpxy;
+  sunrealtype inc, sqru, fac, perturb_rates[NUM_SPECIES];
   int is, js, ix, jy;
   UserData webdata;
   void *ida_mem;
   N_Vector ewt;
-  realtype hh;
+  sunrealtype hh;
 
   webdata = (UserData)user_data;
-  uround = UNIT_ROUNDOFF;
+  uround = SUN_UNIT_ROUNDOFF;
   sqru = sqrt(uround);
   thispe = webdata->thispe;
 
@@ -1221,11 +1221,11 @@ static int Precondbd(realtype tt, N_Vector cc, N_Vector cp,
  * preconditioner PP, to compute the solution of PP * zvec = rvec.
  */
 
-static int PSolvebd(realtype tt, N_Vector cc, N_Vector cp,
+static int PSolvebd(sunrealtype tt, N_Vector cc, N_Vector cp,
                     N_Vector rr, N_Vector rvec, N_Vector zvec,
-                    realtype cj, realtype delta, void *user_data)
+                    sunrealtype cj, sunrealtype delta, void *user_data)
 {
-  realtype **Pxy, *zxy;
+  sunrealtype **Pxy, *zxy;
   sunindextype *pivot, ix, jy;
   UserData webdata;
 
diff --git a/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p.c b/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p.c
index 6ea9f7d02b..25d6c891d0 100644
--- a/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p.c
+++ b/examples/idas/parallel/idasHeat2D_FSA_kry_bbd_p.c
@@ -57,9 +57,9 @@
 
 #include <mpi.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -76,32 +76,32 @@
 #define NS           2              /* Number of sensitivities (NS<=2) */
 
 typedef struct {
-  realtype p[2];
+  sunrealtype p[2];
   int thispe, mx, my, ixsub, jysub, npex, npey, mxsub, mysub;
   sunindextype n_local;
-  realtype dx, dy, coeffx, coeffy, coeffxy;
-  realtype uext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype uext[(MXSUB+2)*(MYSUB+2)];
   MPI_Comm comm;
 } *UserData;
 
 /* Prototypes of user-supplied and supporting functions */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data);
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data);
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data);
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[]);
+                 sunrealtype uarray[]);
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[]);
+                     sunrealtype uext[], sunrealtype buffer[]);
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                     int dsizex, realtype uext[], realtype buffer[]);
+                     int dsizex, sunrealtype uext[], sunrealtype buffer[]);
 
 /* Prototypes of private functions */
 
@@ -109,16 +109,16 @@ static int InitUserData(int thispe, MPI_Comm comm, UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol,
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol,
                         sunindextype mudq, sunindextype mukeep,
-                        booleantype sensi, int sensi_meth, int err_con);
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu,
-                        booleantype sensi, N_Vector *uuS);
+                        sunbooleantype sensi, int sensi_meth, int err_con);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu,
+                        sunbooleantype sensi, N_Vector *uuS);
 static void PrintFinalStats(void *ida_mem);
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 static void WrongArgs(int my_pe, char *name);
 static int check_retval(void *returnvalue, const char *funcname, int opt, int id);
 
@@ -137,13 +137,13 @@ int main(int argc, char *argv[])
   UserData data;
   int thispe, iout, retval, npes;
   sunindextype Neq, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
 
-  realtype *pbar;
+  sunrealtype *pbar;
   int is;
   N_Vector *uuS, *upS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   ida_mem = NULL;
@@ -211,12 +211,12 @@ int main(int argc, char *argv[])
   SetInitialProfile(uu, up, id, res, data);
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
 
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAInit to initialize solution and various
      IDASet*** functions to specify optional inputs:
@@ -278,7 +278,7 @@ int main(int argc, char *argv[])
        done here as an illustration only, as the default values
        for pbar, if pbar is not supplied, are anyway 1.0) */
 
-    pbar = (realtype *) malloc(NS*sizeof(realtype));
+    pbar = (sunrealtype *) malloc(NS*sizeof(sunrealtype));
     if (check_retval((void *)pbar, "malloc", 2, thispe)) MPI_Abort(comm, 1);
     for (is=0; is<NS; is++) pbar[is] = data->p[is];
 
@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data)
 {
   int retval;
@@ -425,11 +425,11 @@ static int heatres(realtype tres, N_Vector uu, N_Vector up,
  * communication of data in u needed to calculate G.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*MYSUB];
   MPI_Comm comm;
   int thispe, ixsub, jysub, mxsub, mysub;
   MPI_Request request[4];
@@ -462,17 +462,17 @@ static int rescomm(sunindextype Nlocal, realtype tt,
  *  has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data)
 {
-  realtype *uext, *uuv, *upv, *resv;
-  realtype termx, termy;
+  sunrealtype *uext, *uuv, *upv, *resv;
+  sunrealtype termx, termy;
   int lx, ly, offsetu, offsetue, locu, locue;
   int ixsub, jysub, mxsub, mxsub2, mysub, npex, npey;
   int ixbegin, ixend, jybegin, jyend;
   UserData data;
-  realtype p1, p2;
+  sunrealtype p1, p2;
 
   /* Get subgrid indices, array sizes, extended work array uext. */
 
@@ -537,10 +537,10 @@ static int reslocal(sunindextype Nlocal, realtype tres,
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[])
+                 sunrealtype uarray[])
 {
   int ly, offsetu;
-  realtype bufleft[MYSUB], bufright[MYSUB];
+  sunrealtype bufleft[MYSUB], bufright[MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of u. */
 
@@ -582,7 +582,7 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -592,11 +592,11 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[])
+                     sunrealtype uext[], sunrealtype buffer[])
 {
   int offsetue;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0)
@@ -629,7 +629,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -637,11 +637,11 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
  */
 
 static int BRecvWait(MPI_Request request[], int ixsub,
-                     int jysub, int dsizex, realtype uext[],
-                     realtype buffer[])
+                     int jysub, int dsizex, sunrealtype uext[],
+                     sunrealtype buffer[])
 {
   int ly, dsizex2, offsetue;
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2;
@@ -724,7 +724,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
 {
   int i, iloc, j, jloc, offset, loc, ixsub, jysub;
   int ixbegin, ixend, jybegin, jyend;
-  realtype xfact, yfact, *udata, *iddata;
+  sunrealtype xfact, yfact, *udata, *iddata;
 
   /* Initialize uu. */
 
@@ -753,7 +753,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = data->dx * i;
       loc = offset + iloc;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
       if (i == 0 || i == MX-1 || j == 0 || j == MY-1) iddata[loc] = ZERO;
     }
   }
@@ -777,9 +777,9 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol,
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol,
                         sunindextype mudq, sunindextype mukeep,
-                        booleantype sensi, int sensi_meth, int err_con)
+                        sunbooleantype sensi, int sensi_meth, int err_con)
 {
     printf("\nidasHeat2D_FSA_kry_bbd_p: Heat equation, parallel example problem for IDA\n");
     printf("                     Discretized heat equation on 2D unit square.\n");
@@ -831,10 +831,10 @@ static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol,
 /*
  * Print integrator statistics and max-norm of solution
  */
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu,
-                        booleantype sensi, N_Vector *uuS)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu,
+                        sunbooleantype sensi, N_Vector *uuS)
 {
-  realtype umax, hused;
+  sunrealtype umax, hused;
   int kused, retval, is;
   long int nst, nni, nre, nli, npe, nps, nreLS, nge;
 
@@ -916,7 +916,7 @@ static void PrintFinalStats(void *ida_mem)
  */
 
 static void ProcessArgs(int argc, char *argv[], int my_pe,
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
diff --git a/examples/idas/parallel/idasHeat2D_kry_bbd_p.c b/examples/idas/parallel/idasHeat2D_kry_bbd_p.c
index f56ea0cdda..5f8f17bb73 100644
--- a/examples/idas/parallel/idasHeat2D_kry_bbd_p.c
+++ b/examples/idas/parallel/idasHeat2D_kry_bbd_p.c
@@ -54,9 +54,9 @@
 
 #include <mpi.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -73,34 +73,34 @@
 typedef struct {
   int thispe, mx, my, ixsub, jysub, npex, npey, mxsub, mysub;
   int n_local;
-  realtype dx, dy, coeffx, coeffy, coeffxy;
-  realtype uext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype uext[(MXSUB+2)*(MYSUB+2)];
   MPI_Comm comm;
 } *UserData;
 
 /* Prototypes of user-supplied and supporting functions */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data);
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data);
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[]);
+                 sunrealtype uarray[]);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[]);
+                     sunrealtype uext[], sunrealtype buffer[]);
 
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                     int dsizex, realtype uext[], realtype buffer[]);
+                     int dsizex, sunrealtype uext[], sunrealtype buffer[]);
 
 /* Prototypes of private functions */
 
@@ -109,11 +109,11 @@ static int InitUserData(int thispe, MPI_Comm comm, UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol);
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol);
 
 static void PrintCase(int case_number, sunindextype mudq, sunindextype mukeep);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
   UserData data;
   int thispe, iout, retval, npes;
   sunindextype Neq, local_N, mudq, mldq, mukeep, mlkeep;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
 
   ida_mem = NULL;
@@ -197,12 +197,12 @@ int main(int argc, char *argv[])
   SetInitialProfile(uu, up, id, res, data);
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
 
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -349,7 +349,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-static int heatres(realtype tres, N_Vector uu, N_Vector up,
+static int heatres(sunrealtype tres, N_Vector uu, N_Vector up,
                    N_Vector res, void *user_data)
 {
   int retval;
@@ -375,11 +375,11 @@ static int heatres(realtype tres, N_Vector uu, N_Vector up,
  * communication of data in u needed to calculate G.
  */
 
-static int rescomm(sunindextype Nlocal, realtype tt,
+static int rescomm(sunindextype Nlocal, sunrealtype tt,
                    N_Vector uu, N_Vector up, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*MYSUB];
   MPI_Comm comm;
   int thispe, ixsub, jysub, mxsub, mysub;
   MPI_Request request[4];
@@ -412,12 +412,12 @@ static int rescomm(sunindextype Nlocal, realtype tt,
  *  has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(sunindextype Nlocal, realtype tres,
+static int reslocal(sunindextype Nlocal, sunrealtype tres,
                     N_Vector uu, N_Vector up, N_Vector res,
                     void *user_data)
 {
-  realtype *uext, *uuv, *upv, *resv;
-  realtype termx, termy, termctr;
+  sunrealtype *uext, *uuv, *upv, *resv;
+  sunrealtype termx, termy, termctr;
   int lx, ly, offsetu, offsetue, locu, locue;
   int ixsub, jysub, mxsub, mxsub2, mysub, npex, npey;
   int ixbegin, ixend, jybegin, jyend;
@@ -483,10 +483,10 @@ static int reslocal(sunindextype Nlocal, realtype tres,
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub,
                  int jysub, int dsizex, int dsizey,
-                 realtype uarray[])
+                 sunrealtype uarray[])
 {
   int ly, offsetu;
-  realtype bufleft[MYSUB], bufright[MYSUB];
+  sunrealtype bufleft[MYSUB], bufright[MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of u. */
 
@@ -528,7 +528,7 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -538,11 +538,11 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub,
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub,
                      int dsizex, int dsizey,
-                     realtype uext[], realtype buffer[])
+                     sunrealtype uext[], sunrealtype buffer[])
 {
   int offsetue;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0)
@@ -575,7 +575,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -583,11 +583,11 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
  */
 
 static int BRecvWait(MPI_Request request[], int ixsub,
-                     int jysub, int dsizex, realtype uext[],
-                     realtype buffer[])
+                     int jysub, int dsizex, sunrealtype uext[],
+                     sunrealtype buffer[])
 {
   int ly, dsizex2, offsetue;
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2;
@@ -666,7 +666,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
 {
   int i, iloc, j, jloc, offset, loc, ixsub, jysub;
   int ixbegin, ixend, jybegin, jyend;
-  realtype xfact, yfact, *udata, *iddata;
+  sunrealtype xfact, yfact, *udata, *iddata;
 
   /* Initialize uu. */
 
@@ -695,7 +695,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = data->dx * i;
       loc = offset + iloc;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
       if (i == 0 || i == MX-1 || j == 0 || j == MY-1) iddata[loc] = ZERO;
     }
   }
@@ -719,7 +719,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol)
 {
     printf("idasHeat2D_kry_bbd_p: Heat equation, parallel example problem for IDA\n");
     printf("                  Discretized heat equation on 2D unit square.\n");
@@ -765,9 +765,9 @@ static void PrintCase(int case_number, sunindextype mudq, sunindextype mukeep)
  * Print integrator statistics and max-norm of solution
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype umax, hused;
+  sunrealtype umax, hused;
   int kused, retval;
   long int nst, nni, nre, nli, npe, nps, nreLS, nge;
 
diff --git a/examples/idas/parallel/idasHeat2D_kry_p.c b/examples/idas/parallel/idasHeat2D_kry_p.c
index fb06286cbb..3b296c6e1e 100644
--- a/examples/idas/parallel/idasHeat2D_kry_p.c
+++ b/examples/idas/parallel/idasHeat2D_kry_p.c
@@ -52,9 +52,9 @@
 
 #include <mpi.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define NOUT         11             /* Number of output times */
 
@@ -71,40 +71,40 @@
 typedef struct {
   int thispe, npex, npey, ixsub, jysub;
   sunindextype mx, my, mxsub, mysub;
-  realtype    dx, dy, coeffx, coeffy, coeffxy;
-  realtype    uext[(MXSUB+2)*(MYSUB+2)];
+  sunrealtype    dx, dy, coeffx, coeffy, coeffxy;
+  sunrealtype    uext[(MXSUB+2)*(MYSUB+2)];
   N_Vector    pp;    /* vector of diagonal preconditioner elements */
   MPI_Comm    comm;
 } *UserData;
 
 /* User-supplied residual function and supporting routines */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up,
             N_Vector rr, void *user_data);
 
 static int rescomm(N_Vector uu, N_Vector up, void *user_data);
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up,
                     N_Vector res,  void *user_data);
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                 sunindextype dsizex, sunindextype dsizey, realtype uarray[]);
+                 sunindextype dsizex, sunindextype dsizey, sunrealtype uarray[]);
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, sunindextype dsizex,
-                     sunindextype dsizey, realtype uext[], realtype buffer[]);
+                     sunindextype dsizey, sunrealtype uext[], sunrealtype buffer[]);
 
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                     sunindextype dsizex, realtype uext[], realtype buffer[]);
+                     sunindextype dsizex, sunrealtype uext[], sunrealtype buffer[]);
 
 /* User-supplied preconditioner routines */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
-               N_Vector rvec, N_Vector zvec, realtype c_j,
-               realtype delta, void *user_data);
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+               N_Vector rvec, N_Vector zvec, sunrealtype c_j,
+               sunrealtype delta, void *user_data);
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data);
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data);
 
 /* Private function to check function return values */
 
@@ -113,9 +113,9 @@ static int InitUserData(int thispe, MPI_Comm comm, UserData data);
 static int SetInitialProfile(N_Vector uu, N_Vector up, N_Vector id,
                              N_Vector res, UserData data);
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol);
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol);
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu);
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu);
 
 static void PrintFinalStats(void *ida_mem);
 
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
   UserData data;
   int iout, thispe, retval, npes;
   sunindextype Neq, local_N;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   N_Vector uu, up, constraints, id, res;
 
   ida_mem = NULL;
@@ -212,12 +212,12 @@ int main(int argc, char *argv[])
 
   N_VConst(ONE, constraints);
 
-  t0 = ZERO; t1 = RCONST(0.01);
+  t0 = ZERO; t1 = SUN_RCONST(0.01);
 
   /* Scalar relative and absolute tolerance. */
 
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution. */
 
@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
  * of uu required to calculate the residual.
  */
 
-int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+int resHeat(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   int retval;
@@ -350,10 +350,10 @@ int resHeat(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  *
  */
 
-int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-               realtype c_j, void *user_data)
+int PsetupHeat(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+               sunrealtype c_j, void *user_data)
 {
-  realtype *ppv, pelinv;
+  sunrealtype *ppv, pelinv;
   sunindextype lx, ly, ixbegin, ixend, jybegin, jyend, locu, mxsub, mysub;
   int ixsub, jysub, npex, npey;
   UserData data;
@@ -403,9 +403,9 @@ int PsetupHeat(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
  * computed in PsetupHeat), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
+int PsolveHeat(sunrealtype tt, N_Vector uu, N_Vector up,
                N_Vector rr, N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data;
 
@@ -432,7 +432,7 @@ int PsolveHeat(realtype tt, N_Vector uu, N_Vector up,
 static int rescomm(N_Vector uu, N_Vector up, void *user_data)
 {
   UserData data;
-  realtype *uarray, *uext, buffer[2*MYSUB];
+  sunrealtype *uarray, *uext, buffer[2*MYSUB];
   MPI_Comm comm;
   int thispe, ixsub, jysub;
   sunindextype mxsub, mysub;
@@ -466,11 +466,11 @@ static int rescomm(N_Vector uu, N_Vector up, void *user_data)
  * has already been done, and that this data is in the work array uext.
  */
 
-static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
+static int reslocal(sunrealtype tt, N_Vector uu, N_Vector up, N_Vector rr,
                     void *user_data)
 {
-  realtype *uext, *uuv, *upv, *resv;
-  realtype termx, termy, termctr;
+  sunrealtype *uext, *uuv, *upv, *resv;
+  sunrealtype termx, termy, termctr;
   sunindextype lx, ly, offsetu, offsetue, locu, locue;
   int ixsub, jysub, npex, npey;
   sunindextype mxsub, mxsub2, mysub;
@@ -536,10 +536,10 @@ static int reslocal(realtype tt, N_Vector uu, N_Vector up, N_Vector rr,
  */
 
 static int BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
-                 sunindextype dsizex, sunindextype dsizey, realtype uarray[])
+                 sunindextype dsizex, sunindextype dsizey, sunrealtype uarray[])
 {
   sunindextype ly, offsetu;
-  realtype bufleft[MYSUB], bufright[MYSUB];
+  sunrealtype bufleft[MYSUB], bufright[MYSUB];
 
   /* If jysub > 0, send data from bottom x-line of u. */
 
@@ -581,7 +581,7 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have 4 entries, and should be passed in
@@ -590,11 +590,11 @@ static int BSend(MPI_Comm comm, int thispe, int ixsub, int jysub,
 
 static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
                      int ixsub, int jysub, sunindextype dsizex,
-                     sunindextype dsizey, realtype uext[], realtype buffer[])
+                     sunindextype dsizey, sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype offsetue;
   /* Have bufleft and bufright use the same buffer. */
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
 
   /* If jysub > 0, receive data for bottom x-line of uext. */
   if (jysub != 0)
@@ -627,7 +627,7 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  * Notes:
- *   1) buffer should be able to hold 2*MYSUB realtype entries, should be
+ *   1) buffer should be able to hold 2*MYSUB sunrealtype entries, should be
  *      passed to both the BRecvPost and BRecvWait functions, and should not
  *      be manipulated between the two calls.
  *   2) request should have four entries, and should be passed in both
@@ -635,10 +635,10 @@ static int BRecvPost(MPI_Comm comm, MPI_Request request[], int thispe,
  */
 
 static int BRecvWait(MPI_Request request[], int ixsub, int jysub,
-                     sunindextype dsizex, realtype uext[], realtype buffer[])
+                     sunindextype dsizex, sunrealtype uext[], sunrealtype buffer[])
 {
   sunindextype ly, dsizex2, offsetue;
-  realtype *bufleft = buffer, *bufright = buffer+MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2;
@@ -718,7 +718,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
   int ixsub, jysub;
   sunindextype i, iloc, j, jloc, offset, loc;
   sunindextype ixbegin, ixend, jybegin, jyend;
-  realtype xfact, yfact, *udata, *iddata;
+  sunrealtype xfact, yfact, *udata, *iddata;
 
   /* Initialize uu. */
 
@@ -747,7 +747,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
     for (i = ixbegin, iloc = 0; i <= ixend; i++, iloc++) {
       xfact = data->dx * i;
       loc = offset + iloc;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
       if (i == 0 || i == MX-1 || j == 0 || j == MY-1) iddata[loc] = ZERO;
     }
   }
@@ -769,7 +769,7 @@ static int SetInitialProfile(N_Vector uu, N_Vector up,  N_Vector id,
  * Print first lines of output and table heading
  */
 
-static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype Neq, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasHeat2D_p: Heat equation, parallel example problem for IDA\n");
   printf("                Discretized heat equation on 2D unit square.\n");
@@ -802,9 +802,9 @@ static void PrintHeader(sunindextype Neq, realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(int id, void *ida_mem, realtype t, N_Vector uu)
+static void PrintOutput(int id, void *ida_mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/idas/serial/idasAkzoNob_ASAi_dns.c b/examples/idas/serial/idasAkzoNob_ASAi_dns.c
index 38d3a72da2..d927e946c2 100644
--- a/examples/idas/serial/idasAkzoNob_ASAi_dns.c
+++ b/examples/idas/serial/idasAkzoNob_ASAi_dns.c
@@ -34,7 +34,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* def. of SUNRpowerI                   */
 
 /* Accessor macros */
@@ -42,40 +42,40 @@
 
 /* Problem Constants */
 #define NEQ 6
-#define T0  RCONST(0.0)
+#define T0  SUN_RCONST(0.0)
 
-#define TF  RCONST(180.0) /* Final time. */
+#define TF  SUN_RCONST(180.0) /* Final time. */
 
-#define RTOL  RCONST(1.0e-08)
-#define ATOL  RCONST(1.0e-10)
-#define RTOLB RCONST(1.0e-06)
-#define ATOLB RCONST(1.0e-08)
-#define RTOLQ RCONST(1.0e-10)
-#define ATOLQ RCONST(1.0e-12)
+#define RTOL  SUN_RCONST(1.0e-08)
+#define ATOL  SUN_RCONST(1.0e-10)
+#define RTOLB SUN_RCONST(1.0e-06)
+#define ATOLB SUN_RCONST(1.0e-08)
+#define RTOLQ SUN_RCONST(1.0e-10)
+#define ATOLQ SUN_RCONST(1.0e-12)
 
-#define ZERO  RCONST(0.0)
-#define HALF  RCONST(0.5)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define HALF  SUN_RCONST(0.5)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define STEPS 150
 
 typedef struct {
-  realtype k1, k2, k3, k4;
-  realtype K, klA, Ks, pCO2, H;
+  sunrealtype k1, k2, k3, k4;
+  sunrealtype K, klA, Ks, pCO2, H;
 } *UserData;
 
-static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata);
+static int res(sunrealtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata);
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp,
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp,
               N_Vector qdot, void *user_data);
 
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB);
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Main program */
@@ -86,7 +86,7 @@ int main()
   N_Vector yy, yp, rr, q;
   N_Vector yB, ypB;
   int ncheck, retval;
-  realtype time;
+  sunrealtype time;
   long int nst, nstB;
   int indexB;
   SUNMatrix A, AB;
@@ -94,11 +94,11 @@ int main()
   SUNContext ctx;
 
   /* Consistent IC for  y, y'. */
-  const realtype y01 = RCONST(0.444);
-  const realtype y02 = RCONST(0.00123);
-  const realtype y03 = RCONST(0.0);
-  const realtype y04 = RCONST(0.007);
-  const realtype y05 = RCONST(0.0);
+  const sunrealtype y01 = SUN_RCONST(0.444);
+  const sunrealtype y02 = SUN_RCONST(0.00123);
+  const sunrealtype y03 = SUN_RCONST(0.0);
+  const sunrealtype y04 = SUN_RCONST(0.007);
+  const sunrealtype y05 = SUN_RCONST(0.0);
 
   mem = NULL;
   yy = yp = NULL;
@@ -118,15 +118,15 @@ int main()
   data = (UserData) malloc(sizeof(*data));
 
   /* Fill user's data with the appropriate values for coefficients. */
-  data->k1 = RCONST(18.7);
-  data->k2 = RCONST(0.58);
-  data->k3 = RCONST(0.09);
-  data->k4 = RCONST(0.42);
-  data->K = RCONST(34.4);
-  data->klA = RCONST(3.3);
-  data->Ks = RCONST(115.83);
-  data->pCO2 = RCONST(0.9);
-  data->H = RCONST(737.0);
+  data->k1 = SUN_RCONST(18.7);
+  data->k2 = SUN_RCONST(0.58);
+  data->k3 = SUN_RCONST(0.09);
+  data->k4 = SUN_RCONST(0.42);
+  data->K = SUN_RCONST(34.4);
+  data->klA = SUN_RCONST(3.3);
+  data->Ks = SUN_RCONST(115.83);
+  data->pCO2 = SUN_RCONST(0.9);
+  data->H = SUN_RCONST(737.0);
 
   /* Allocate N-vectors. */
   yy = N_VNew_Serial(NEQ, ctx);
@@ -287,16 +287,16 @@ int main()
 }
 
 
-static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata)
+static int res(sunrealtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata)
 {
   UserData data;
-  realtype k1, k2, k3, k4;
-  realtype K, klA, Ks, pCO2, H;
+  sunrealtype k1, k2, k3, k4;
+  sunrealtype K, klA, Ks, pCO2, H;
 
-  realtype y1, y2, y3, y4, y5, y6;
-  realtype yd1, yd2, yd3, yd4, yd5;
+  sunrealtype y1, y2, y3, y4, y5, y6;
+  sunrealtype yd1, yd2, yd3, yd4, yd5;
 
-  realtype r1, r2, r3, r4, r5, Fin;
+  sunrealtype r1, r2, r3, r4, r5, Fin;
 
   data = (UserData) userdata;
   k1 = data->k1;
@@ -343,36 +343,36 @@ static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *user
  * rhsQ routine. Computes quadrature(t,y).
  */
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(yy,1);
 
   return(0);
 }
 
-#define QUARTER   RCONST(0.25)
-#define FOUR      RCONST(4.0)
-#define EIGHT     RCONST(8.0)
+#define QUARTER   SUN_RCONST(0.25)
+#define FOUR      SUN_RCONST(4.0)
+#define EIGHT     SUN_RCONST(8.0)
 
 /*
  * resB routine. Residual for adjoint system.
  */
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB)
 {
   UserData data;
 
-  realtype y1, y2, y3, y4, y5, y6;
+  sunrealtype y1, y2, y3, y4, y5, y6;
 
-  realtype yB1, yB2, yB3, yB4, yB5, yB6;
-  realtype ypB1, ypB2, ypB3, ypB4, ypB5;
+  sunrealtype yB1, yB2, yB3, yB4, yB5, yB6;
+  sunrealtype ypB1, ypB2, ypB3, ypB4, ypB5;
 
-  realtype k1, k2, k3, k4;
-  realtype K, klA, Ks;
+  sunrealtype k1, k2, k3, k4;
+  sunrealtype K, klA, Ks;
 
-  realtype y2tohalf, y1to3, k2overK, tmp1, tmp2;
+  sunrealtype y2tohalf, y1to3, k2overK, tmp1, tmp2;
 
   data = (UserData) user_dataB;
   k1 = data->k1;
@@ -434,7 +434,7 @@ static int resB(realtype tt,
 /*
  * Print results after backward integration
  */
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB)
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB)
 {
 #if defined(SUNDIALS_EXTENDED_PRECISION)
   printf("dG/dy0: \t%12.4Le\n\t\t%12.4Le\n\t\t%12.4Le\n\t\t%12.4Le\n\t\t%12.4Le\n",
diff --git a/examples/idas/serial/idasAkzoNob_dns.c b/examples/idas/serial/idasAkzoNob_dns.c
index dab4a05f36..631fcd5c7f 100644
--- a/examples/idas/serial/idasAkzoNob_dns.c
+++ b/examples/idas/serial/idasAkzoNob_dns.c
@@ -28,7 +28,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -36,35 +36,35 @@
 
 /* Problem Constants */
 #define NEQ 6
-#define T0  RCONST(0.0)
-#define T1  RCONST(1e-8)  /* first time for output */
+#define T0  SUN_RCONST(0.0)
+#define T1  SUN_RCONST(1e-8)  /* first time for output */
 
-#define TF  RCONST(180.0) /* Final time. */
+#define TF  SUN_RCONST(180.0) /* Final time. */
 #define NF  25            /* Total number of outputs. */
 
-#define RTOL  RCONST(1.0e-08)
-#define ATOL  RCONST(1.0e-10)
-#define RTOLQ RCONST(1.0e-10)
-#define ATOLQ RCONST(1.0e-12)
+#define RTOL  SUN_RCONST(1.0e-08)
+#define ATOL  SUN_RCONST(1.0e-10)
+#define RTOLQ SUN_RCONST(1.0e-10)
+#define ATOLQ SUN_RCONST(1.0e-12)
 
-#define ZERO  RCONST(0.0)
-#define HALF  RCONST(0.5)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define HALF  SUN_RCONST(0.5)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 
 typedef struct {
-  realtype k1, k2, k3, k4;
-  realtype K, klA, Ks, pCO2, H;
+  sunrealtype k1, k2, k3, k4;
+  sunrealtype K, klA, Ks, pCO2, H;
 } *UserData;
 
-static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata);
+static int res(sunrealtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp,
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp,
               N_Vector qdot, void *user_data);
 
-static void PrintHeader(realtype rtol, realtype avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, sunrealtype avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static int PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -75,18 +75,18 @@ int main()
   void *mem;
   N_Vector yy, yp, rr, q;
   int retval;
-  realtype time, tout, incr;
+  sunrealtype time, tout, incr;
   int nout;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
 
   /* Consistent IC for  y, y'. */
-  const realtype y01 = RCONST(0.444);
-  const realtype y02 = RCONST(0.00123);
-  const realtype y03 = RCONST(0.0);
-  const realtype y04 = RCONST(0.007);
-  const realtype y05 = RCONST(0.0);
+  const sunrealtype y01 = SUN_RCONST(0.444);
+  const sunrealtype y02 = SUN_RCONST(0.00123);
+  const sunrealtype y03 = SUN_RCONST(0.0);
+  const sunrealtype y04 = SUN_RCONST(0.007);
+  const sunrealtype y05 = SUN_RCONST(0.0);
 
   mem = NULL;
   yy = yp = NULL;
@@ -101,15 +101,15 @@ int main()
   data = (UserData) malloc(sizeof(*data));
 
   /* Fill user's data with the appropriate values for coefficients. */
-  data->k1 = RCONST(18.7);
-  data->k2 = RCONST(0.58);
-  data->k3 = RCONST(0.09);
-  data->k4 = RCONST(0.42);
-  data->K = RCONST(34.4);
-  data->klA = RCONST(3.3);
-  data->Ks = RCONST(115.83);
-  data->pCO2 = RCONST(0.9);
-  data->H = RCONST(737.0);
+  data->k1 = SUN_RCONST(18.7);
+  data->k2 = SUN_RCONST(0.58);
+  data->k3 = SUN_RCONST(0.09);
+  data->k4 = SUN_RCONST(0.42);
+  data->K = SUN_RCONST(34.4);
+  data->klA = SUN_RCONST(3.3);
+  data->Ks = SUN_RCONST(115.83);
+  data->pCO2 = SUN_RCONST(0.9);
+  data->H = SUN_RCONST(737.0);
 
   /* Allocate N-vectors. */
   yy = N_VNew_Serial(NEQ, ctx);
@@ -225,16 +225,16 @@ int main()
 }
 
 
-static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata)
+static int res(sunrealtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *userdata)
 {
   UserData data;
-  realtype k1, k2, k3, k4;
-  realtype K, klA, Ks, pCO2, H;
+  sunrealtype k1, k2, k3, k4;
+  sunrealtype K, klA, Ks, pCO2, H;
 
-  realtype y1, y2, y3, y4, y5, y6;
-  realtype yd1, yd2, yd3, yd4, yd5;
+  sunrealtype y1, y2, y3, y4, y5, y6;
+  sunrealtype yd1, yd2, yd3, yd4, yd5;
 
-  realtype r1, r2, r3, r4, r5, Fin;
+  sunrealtype r1, r2, r3, r4, r5, Fin;
 
   data = (UserData) userdata;
   k1 = data->k1;
@@ -281,14 +281,14 @@ static int res(realtype t, N_Vector yy, N_Vector yd, N_Vector resval, void *user
  * rhsQ routine. Computes quadrature(t,y).
  */
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(yy,1);
 
   return(0);
 }
 
-static void PrintHeader(realtype rtol, realtype avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, sunrealtype avtol, N_Vector y)
 {
   printf("\nidasAkzoNob_dns: Akzo Nobel chemical kinetics DAE serial example problem for IDAS\n");
   printf("Linear solver: DENSE, Jacobian is computed by IDAS.\n");
@@ -309,12 +309,12 @@ static void PrintHeader(realtype rtol, realtype avtol, N_Vector y)
 }
 
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/idas/serial/idasAnalytic_mels.c b/examples/idas/serial/idasAnalytic_mels.c
index fcf37a23f5..183a6fc7e9 100644
--- a/examples/idas/serial/idasAnalytic_mels.c
+++ b/examples/idas/serial/idasAnalytic_mels.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <idas/idas.h>                        /* prototypes for IDAS fcts., consts.   */
 #include <nvector/nvector_serial.h>           /* access to serial N_Vector            */
-#include <sundials/sundials_types.h>          /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>          /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>           /* defs. of SUNRabs, SUNRexp, etc.      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -45,21 +45,21 @@
 #endif
 
 /* User-supplied functions called by IDA */
-int fres(realtype tres, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data);
+int fres(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data);
 
 /* Custom linear solver data structure, accessor macros, and routines */
 static SUNLinearSolver MatrixEmbeddedLS(void *ida_mem, SUNContext ctx);
 static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S);
 static int MatrixEmbeddedLSSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol);
+                                 N_Vector b, sunrealtype tol);
 static int MatrixEmbeddedLSFree(SUNLinearSolver S);
 
 /* Private function to check function return values */
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static void analytical_solution(realtype t, N_Vector y, N_Vector yp);
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static void analytical_solution(sunrealtype t, N_Vector y, N_Vector yp);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main(void)
@@ -68,13 +68,13 @@ int main(void)
   SUNContext ctx;
 
   /* general problem parameters */
-  realtype T0 = RCONST(0.0);         /* initial time */
-  realtype Tf = RCONST(1.0);         /* final time */
-  realtype dTout = RCONST(0.1);      /* time between outputs */
+  sunrealtype T0 = SUN_RCONST(0.0);         /* initial time */
+  sunrealtype Tf = SUN_RCONST(1.0);         /* final time */
+  sunrealtype dTout = SUN_RCONST(0.1);      /* time between outputs */
   sunindextype NEQ = 2;              /* number of dependent vars. */
-  realtype reltol = RCONST(1.0e-4);  /* tolerances */
-  realtype abstol = RCONST(1.0e-9);
-  realtype alpha  = RCONST(10.0);    /* stiffness parameter */
+  sunrealtype reltol = SUN_RCONST(1.0e-4);  /* tolerances */
+  sunrealtype abstol = SUN_RCONST(1.0e-9);
+  sunrealtype alpha  = SUN_RCONST(10.0);    /* stiffness parameter */
 
   /* general problem variables */
   int retval;                     /* reusable error-checking flag */
@@ -82,7 +82,7 @@ int main(void)
   N_Vector yp = NULL;             /* empty vector for storing solution derivative */
   SUNLinearSolver LS = NULL;      /* empty linear solver object */
   void *ida_mem = NULL;           /* empty IDA memory structure */
-  realtype t, tout;
+  sunrealtype t, tout;
   long int nst, nre, nni, netf, ncfn, nreLS;
 
   /* Initial diagnostics output */
@@ -186,15 +186,15 @@ int main(void)
       0 = (1-alpha)/(t-2)*x1 - x1 + (alpha-1)*x2 + 2*exp(t) - x1'(t)
       0 = (t+2)*x1 - (t+2)*exp(t)
 */
-int fres(realtype t, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int fres(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype alpha = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype x1 = NV_Ith_S(yy,0);               /* access current solution values */
-  realtype x2 = NV_Ith_S(yy,1);
-  realtype x1p = NV_Ith_S(yp,0);              /* access current derivative values */
-  realtype ONE = RCONST(1.0);
-  realtype TWO = RCONST(2.0);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype alpha = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype x1 = NV_Ith_S(yy,0);               /* access current solution values */
+  sunrealtype x2 = NV_Ith_S(yy,1);
+  sunrealtype x1p = NV_Ith_S(yp,0);              /* access current derivative values */
+  sunrealtype ONE = SUN_RCONST(1.0);
+  sunrealtype TWO = SUN_RCONST(2.0);
 
   NV_Ith_S(rr,0) = (ONE-alpha)/(t-TWO)*x1 - x1 + (alpha-ONE)*x2 + TWO*exp(t) - x1p;
   NV_Ith_S(rr,1) = (t+TWO)*x1 - (t+TWO)*SUNRexp(t);
@@ -233,18 +233,18 @@ static SUNLinearSolver_Type MatrixEmbeddedLSType(SUNLinearSolver S)
 
 /* linear solve routine */
 static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
-                                 N_Vector b, realtype tol)
+                                 N_Vector b, sunrealtype tol)
 {
   /* temporary variables */
   int       retval;
   N_Vector  yypred, yppred, yyn, ypn, res;
-  realtype  tcur, cj;
+  sunrealtype  tcur, cj;
   void      *user_data;
-  realtype  *rdata;
-  realtype  alpha;
-  realtype  a11, a12, a21, b1, b2;
-  realtype  ONE   = RCONST(1.0);
-  realtype  TWO   = RCONST(2.0);
+  sunrealtype  *rdata;
+  sunrealtype  alpha;
+  sunrealtype  a11, a12, a21, b1, b2;
+  sunrealtype  ONE   = SUN_RCONST(1.0);
+  sunrealtype  TWO   = SUN_RCONST(2.0);
 
   /* retrieve implicit system data from IDA */
   retval = IDAGetNonlinearSystemData(LS->content, &tcur, &yypred, &yppred,
@@ -253,7 +253,7 @@ static int MatrixEmbeddedLSSolve(SUNLinearSolver LS, SUNMatrix A, N_Vector x,
     return(-1);
 
   /* extract stiffness parameter from user_data */
-  rdata = (realtype *) user_data;
+  rdata = (sunrealtype *) user_data;
   alpha = rdata[0];
 
   /* perform linear solve: A*x=b
@@ -325,23 +325,23 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 }
 
 /* routine to fill analytical solution and its derivative */
-static void analytical_solution(realtype t, N_Vector y, N_Vector yp)
+static void analytical_solution(sunrealtype t, N_Vector y, N_Vector yp)
 {
   NV_Ith_S(y,0) = SUNRexp(t);
-  NV_Ith_S(y,1) = SUNRexp(t)/(t-RCONST(2.0));
+  NV_Ith_S(y,1) = SUNRexp(t)/(t-SUN_RCONST(2.0));
   NV_Ith_S(yp,0) = SUNRexp(t);
-  NV_Ith_S(yp,1) = SUNRexp(t)/(t-RCONST(2.0)) - SUNRexp(t)/(t-RCONST(2.0))/(t-RCONST(2.0));
+  NV_Ith_S(yp,1) = SUNRexp(t)/(t-SUN_RCONST(2.0)) - SUNRexp(t)/(t-SUN_RCONST(2.0))/(t-SUN_RCONST(2.0));
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) retval */
   N_Vector ytrue;             /* true solution vector               */
   N_Vector ewt;               /* error weight vector                */
   N_Vector abstol;            /* absolute tolerance vector          */
-  realtype err;               /* wrms error                         */
-  realtype ONE = RCONST(1.0);
+  sunrealtype err;               /* wrms error                         */
+  sunrealtype ONE = SUN_RCONST(1.0);
 
   /* create solution and error weight vectors */
   ytrue = N_VClone(y);
@@ -354,8 +354,8 @@ static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
   /* compute the error weight vector, loosen atol */
   N_VConst(atol, abstol);
   N_VAbs(ytrue, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), abstol, ewt);
-  if (N_VMin(ewt) <= RCONST(0.0)) {
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), abstol, ewt);
+  if (N_VMin(ewt) <= SUN_RCONST(0.0)) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
   }
diff --git a/examples/idas/serial/idasFoodWeb_bnd.c b/examples/idas/serial/idasFoodWeb_bnd.c
index 2b8b239132..84fdb1ecf2 100644
--- a/examples/idas/serial/idasFoodWeb_bnd.c
+++ b/examples/idas/serial/idasFoodWeb_bnd.c
@@ -96,37 +96,37 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants. */
 
 #define NPREY       1              /* No. of prey (= no. of predators). */
 #define NUM_SPECIES 2*NPREY
 
-#define PI          RCONST(3.1415926535898)
-#define FOURPI      (RCONST(4.0)*PI)
+#define PI          SUN_RCONST(3.1415926535898)
+#define FOURPI      (SUN_RCONST(4.0)*PI)
 
 #define MX          20             /* MX = number of x mesh points      */
 #define MY          20             /* MY = number of y mesh points      */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NUM_SPECIES*MX*MY)
-#define AA          RCONST(1.0)    /* Coefficient in above eqns. for a  */
-#define EE          RCONST(10000.) /* Coefficient in above eqns. for a  */
-#define GG          RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
-#define BB          RCONST(1.0)    /* Coefficient in above eqns. for b  */
-#define DPREY       RCONST(1.0)    /* Coefficient in above eqns. for d  */
-#define DPRED       RCONST(0.05)   /* Coefficient in above eqns. for d  */
-#define ALPHA       RCONST(50.)    /* Coefficient alpha in above eqns.  */
-#define BETA        RCONST(1000.)  /* Coefficient beta in above eqns.   */
-#define AX          RCONST(1.0)    /* Total range of x variable         */
-#define AY          RCONST(1.0)    /* Total range of y variable         */
-#define RTOL        RCONST(1.e-5)  /* Relative tolerance                */
-#define ATOL        RCONST(1.e-5)  /* Absolute tolerance                */
+#define AA          SUN_RCONST(1.0)    /* Coefficient in above eqns. for a  */
+#define EE          SUN_RCONST(10000.) /* Coefficient in above eqns. for a  */
+#define GG          SUN_RCONST(0.5e-6) /* Coefficient in above eqns. for a  */
+#define BB          SUN_RCONST(1.0)    /* Coefficient in above eqns. for b  */
+#define DPREY       SUN_RCONST(1.0)    /* Coefficient in above eqns. for d  */
+#define DPRED       SUN_RCONST(0.05)   /* Coefficient in above eqns. for d  */
+#define ALPHA       SUN_RCONST(50.)    /* Coefficient alpha in above eqns.  */
+#define BETA        SUN_RCONST(1000.)  /* Coefficient beta in above eqns.   */
+#define AX          SUN_RCONST(1.0)    /* Total range of x variable         */
+#define AY          SUN_RCONST(1.0)    /* Total range of y variable         */
+#define RTOL        SUN_RCONST(1.e-5)  /* Relative tolerance                */
+#define ATOL        SUN_RCONST(1.e-5)  /* Absolute tolerance                */
 #define NOUT        6              /* Number of output times            */
-#define TMULT       RCONST(10.0)   /* Multiplier for tout values        */
-#define TADD        RCONST(0.3)    /* Increment for tout values         */
-#define ZERO        RCONST(0.)
-#define ONE         RCONST(1.0)
+#define TMULT       SUN_RCONST(10.0)   /* Multiplier for tout values        */
+#define TADD        SUN_RCONST(0.3)    /* Increment for tout values         */
+#define ZERO        SUN_RCONST(0.)
+#define ONE         SUN_RCONST(1.0)
 
 /*
  * User-defined vector and accessor macro: IJ_Vptr.
@@ -142,14 +142,14 @@
 
 typedef struct {
   sunindextype Neq, ns, np, mx, my;
-  realtype dx, dy, **acoef;
-  realtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
+  sunrealtype dx, dy, **acoef;
+  sunrealtype cox[NUM_SPECIES], coy[NUM_SPECIES], bcoef[NUM_SPECIES];
   N_Vector rates;
 } *UserData;
 
 /* Prototypes for functions called by the IDA Solver. */
 
-static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
+static int resweb(sunrealtype time, N_Vector cc, N_Vector cp, N_Vector resval,
                   void *user_data);
 
 /* Prototypes for private Helper Functions. */
@@ -157,13 +157,13 @@ static int resweb(realtype time, N_Vector cc, N_Vector cp, N_Vector resval,
 static void InitUserData(UserData webdata);
 static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata);
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol);
-static void PrintOutput(void *mem, N_Vector c, realtype t);
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t);
 static void PrintFinalStats(void *mem);
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate, UserData webdata);
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata);
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -179,7 +179,7 @@ int main()
   N_Vector cc, cp, id;
   int iout, retval;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, tout, tret;
+  sunrealtype rtol, atol, t0, tout, tret;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -253,7 +253,7 @@ int main()
 
   /* Call IDACalcIC (with default options) to correct the initial values. */
 
-  tout = RCONST(0.001);
+  tout = SUN_RCONST(0.001);
   retval = IDACalcIC(mem, IDA_YA_YDP_INIT, tout);
   if(check_retval(&retval, "IDACalcIC", 1)) return(1);
 
@@ -319,11 +319,11 @@ int main()
  * using cp in the case of prey species.
  */
 
-static int resweb(realtype tt, N_Vector cc, N_Vector cp,
+static int resweb(sunrealtype tt, N_Vector cc, N_Vector cp,
                   N_Vector res,  void *user_data)
 {
   sunindextype jx, jy, is, yloc, loc, np;
-  realtype *resv, *cpv;
+  sunrealtype *resv, *cpv;
   UserData webdata;
 
   webdata = (UserData)user_data;
@@ -368,7 +368,7 @@ static int resweb(realtype tt, N_Vector cc, N_Vector cp,
 static void InitUserData(UserData webdata)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   webdata->mx = MX;
   webdata->my = MY;
@@ -419,8 +419,8 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
                                UserData webdata)
 {
   sunindextype loc, yloc, is, jx, jy, np;
-  realtype xx, yy, xyfactor;
-  realtype *ccv, *cpv, *idv;
+  sunrealtype xx, yy, xyfactor;
+  sunrealtype *ccv, *cpv, *idv;
 
   ccv = N_VGetArrayPointer(cc);
   cpv = N_VGetArrayPointer(cp);
@@ -433,17 +433,17 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
     yloc = NSMX * jy;
     for (jx = 0; jx < MX; jx++) {
       xx = jx * webdata->dx;
-      xyfactor = RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
+      xyfactor = SUN_RCONST(16.0)*xx*(ONE-xx)*yy*(ONE-yy);
       xyfactor *= xyfactor;
       loc = yloc + NUM_SPECIES*jx;
 
       for (is = 0; is < NUM_SPECIES; is++) {
         if (is < np) {
-          ccv[loc+is] = RCONST(10.0) + (realtype)(is+1) * xyfactor;
+          ccv[loc+is] = SUN_RCONST(10.0) + (sunrealtype)(is+1) * xyfactor;
           idv[loc+is] = ONE;
         }
         else {
-	  ccv[loc+is] = RCONST(1.0e5);
+	  ccv[loc+is] = SUN_RCONST(1.0e5);
           idv[loc+is] = ZERO;
         }
       }
@@ -469,7 +469,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector cp, N_Vector id,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtype atol)
+static void PrintHeader(sunindextype mu, sunindextype ml, sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasFoodWeb_bnd: Predator-prey DAE serial example problem for IDA \n\n");
   printf("Number of species ns: %d", NUM_SPECIES);
@@ -497,11 +497,11 @@ static void PrintHeader(sunindextype mu, sunindextype ml, realtype rtol, realtyp
  * are printed for the bottom left and top right grid points only.
  */
 
-static void PrintOutput(void *mem, N_Vector c, realtype t)
+static void PrintOutput(void *mem, N_Vector c, sunrealtype t)
 {
   int i, kused, retval;
   long int nst;
-  realtype *c_bl, *c_tr, hused;
+  sunrealtype *c_bl, *c_tr, hused;
 
   retval = IDAGetLastOrder(mem, &kused);
   check_retval(&retval, "IDAGetLastOrder", 1);
@@ -578,11 +578,11 @@ static void PrintFinalStats(void *mem)
  * The interaction term is computed by the function WebRates.
  */
 
-static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
+static void Fweb(sunrealtype tcalc, N_Vector cc, N_Vector crate,
                  UserData webdata)
 {
   sunindextype jx, jy, is, idyu, idyl, idxu, idxl;
-  realtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
+  sunrealtype xx, yy, *cxy, *ratesxy, *cratexy, dcyli, dcyui, dcxli, dcxui;
 
   /* Loop over grid points, evaluate interaction vector (length ns),
      form diffusion difference terms, and load crate.                    */
@@ -629,11 +629,11 @@ static void Fweb(realtype tcalc, N_Vector cc, N_Vector crate,
  * At a given (x,y), evaluate the array of ns reaction terms R.
  */
 
-static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRates(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                      UserData webdata)
 {
   int is;
-  realtype fac;
+  sunrealtype fac;
 
   for (is = 0; is < NUM_SPECIES; is++)
     ratesxy[is] = dotprod(NUM_SPECIES, cxy, acoef[is]);
@@ -646,13 +646,13 @@ static void WebRates(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * dotprod: dot product routine for realtype arrays, for use by WebRates.
+ * dotprod: dot product routine for sunrealtype arrays, for use by WebRates.
  */
 
-static realtype dotprod(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype dotprod(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
diff --git a/examples/idas/serial/idasHeat2D_bnd.c b/examples/idas/serial/idasHeat2D_bnd.c
index a906902016..b112e92f83 100644
--- a/examples/idas/serial/idasHeat2D_bnd.c
+++ b/examples/idas/serial/idasHeat2D_bnd.c
@@ -44,34 +44,34 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix             */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver       */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define BVAL  RCONST(0.1)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define BVAL  SUN_RCONST(0.1)
 
 /* Type: UserData */
 
 typedef struct {
   sunindextype mm;
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
 } *UserData;
 
 /* Prototypes of functions called by IDA */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval, void *user_data);
 
 /* Prototypes of private functions */
 
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector u);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector u);
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res);
 
@@ -91,7 +91,7 @@ int main(void)
   int retval, iout;
   long int netf, ncfn;
   sunindextype mu, ml;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -133,9 +133,9 @@ int main(void)
 
   /* Set remaining input parameters. */
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
   mem = IDACreate(ctx);
@@ -228,11 +228,11 @@ int main(void)
  * while for each boundary point, it is res_i = u_i.
  */
 
-int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
+int heatres(sunrealtype tres, N_Vector uu, N_Vector up, N_Vector resval,
             void *user_data)
 {
   sunindextype mm, i, j, offset, loc;
-  realtype *uv, *upv, *resv, coeff;
+  sunrealtype *uv, *upv, *resv, coeff;
   UserData data;
 
   uv = N_VGetArrayPointer(uu); upv = N_VGetArrayPointer(up); resv = N_VGetArrayPointer(resval);
@@ -250,7 +250,7 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
     for (i = 1; i < mm-1; i++) {
       loc = offset + i;
       resv[loc] = upv[loc] - coeff *
-	  (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - RCONST(4.0)*uv[loc]);
+	  (uv[loc-1] + uv[loc+1] + uv[loc-mm] + uv[loc+mm] - SUN_RCONST(4.0)*uv[loc]);
     }
   }
 
@@ -271,7 +271,7 @@ int heatres(realtype tres, N_Vector uu, N_Vector up, N_Vector resval,
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector id, N_Vector res)
 {
-  realtype xfact, yfact, *udata, *updata, *iddata;
+  sunrealtype xfact, yfact, *udata, *updata, *iddata;
   sunindextype mm, mm1, i, j, offset, loc;
 
   mm = data->mm;
@@ -291,7 +291,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -322,7 +322,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasHeat2D_bnd: Heat equation, serial example problem for IDA\n");
   printf("              Discretized heat equation on 2D unit square.\n");
@@ -357,10 +357,10 @@ static void PrintHeader(realtype rtol, realtype atol)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
   int retval;
-  realtype umax, hused;
+  sunrealtype umax, hused;
   long int nst, nni, nje, nre, nreLS;
   int kused;
 
diff --git a/examples/idas/serial/idasHeat2D_kry.c b/examples/idas/serial/idasHeat2D_kry.c
index 3a87184365..d4bce7fa14 100644
--- a/examples/idas/serial/idasHeat2D_kry.c
+++ b/examples/idas/serial/idasHeat2D_kry.c
@@ -43,47 +43,47 @@
 #include <idas/idas.h>                 /* prototypes for IDA fcts., consts.    */
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to spgmr SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* definition of type realtype          */
+#include <sundials/sundials_types.h>   /* definition of type sunrealtype          */
 
 /* Problem Constants */
 
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* User data type */
 
 typedef struct {
   sunindextype mm;  /* number of grid points */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 } *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data);
+               sunrealtype c_j, void *prec_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data);
+               sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol);
-static void PrintOutput(void *mem, realtype t, N_Vector uu);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -98,7 +98,7 @@ int main()
   UserData data;
   N_Vector uu, up, constraints, res;
   int retval, iout;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -150,9 +150,9 @@ int main()
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -307,12 +307,12 @@ int main()
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   sunindextype i, j, offset, loc, mm;
-  realtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
+  sunrealtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
   UserData data;
 
   uu_data = N_VGetArrayPointer(uu);
@@ -358,13 +358,13 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *prec_data)
+               sunrealtype c_j, void *prec_data)
 {
 
   sunindextype i, j, offset, loc, mm;
-  realtype *ppv, pelinv;
+  sunrealtype *ppv, pelinv;
   UserData data;
 
   data = (UserData) prec_data;
@@ -396,10 +396,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *prec_data)
+               sunrealtype c_j, sunrealtype delta, void *prec_data)
 {
   UserData data;
   data = (UserData) prec_data;
@@ -421,7 +421,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, mm1, i, j, offset, loc;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -436,7 +436,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -465,7 +465,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol)
 {
   printf("\nidasHeat2D_kry: Heat equation, serial example problem for IDA \n");
   printf("                Discretized heat equation on 2D unit square. \n");
@@ -488,9 +488,9 @@ static void PrintHeader(realtype rtol, realtype atol)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/idas/serial/idasHessian_ASA_FSA.c b/examples/idas/serial/idasHessian_ASA_FSA.c
index 6e4f6500be..48c5b6373c 100644
--- a/examples/idas/serial/idasHessian_ASA_FSA.c
+++ b/examples/idas/serial/idasHessian_ASA_FSA.c
@@ -47,7 +47,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -58,59 +58,59 @@
 #define NEQ      3             /* number of equations                  */
 #define NP       2             /* number of sensitivities              */
 
-#define T0       RCONST(0.0)   /* Initial time. */
-#define TF       RCONST(80.0)  /* Final time. */
+#define T0       SUN_RCONST(0.0)   /* Initial time. */
+#define TF       SUN_RCONST(80.0)  /* Final time. */
 
 /* Tolerances */
-#define RTOL     RCONST(1e-08) /* scalar relative tolerance            */
-#define ATOL     RCONST(1e-10) /* vector absolute tolerance components */
-#define RTOLA    RCONST(1e-08) /* for adjoint integration              */
-#define ATOLA    RCONST(1e-08) /* for adjoint integration              */
+#define RTOL     SUN_RCONST(1e-08) /* scalar relative tolerance            */
+#define ATOL     SUN_RCONST(1e-10) /* vector absolute tolerance components */
+#define RTOLA    SUN_RCONST(1e-08) /* for adjoint integration              */
+#define ATOLA    SUN_RCONST(1e-08) /* for adjoint integration              */
 
 /* Parameters */
-#define P1 RCONST(0.04)
-#define P2 RCONST(1.0e4)
-#define P3 RCONST(3.0e7)
+#define P1 SUN_RCONST(0.04)
+#define P2 SUN_RCONST(1.0e4)
+#define P3 SUN_RCONST(3.0e7)
 
 /* Predefined consts */
-#define HALF RCONST(0.5)
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define HALF SUN_RCONST(0.5)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* User defined struct */
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* residual for forward problem */
-static int res(realtype t, N_Vector yy, N_Vector yp,
+static int res(sunrealtype t, N_Vector yy, N_Vector yp,
                N_Vector resval, void *user_data);
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector yy, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 
-static int rhsQS(int Ns, realtype t, N_Vector yy, N_Vector yp,
+static int rhsQS(int Ns, sunrealtype t, N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS, N_Vector rrQ, N_Vector *rhsvalQS,
                  void *user_data,  N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS);
 
-static int resBS1(realtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS,
+static int resBS1(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS,
                   N_Vector yyB, N_Vector ypB, N_Vector resvalBQ, void *user_dataB);
 
 
-static int rhsQBS1(realtype tt, N_Vector yy, N_Vector yp,
+static int rhsQBS1(sunrealtype tt, N_Vector yy, N_Vector yp,
                    N_Vector *yyS, N_Vector *ypS, N_Vector yyB, N_Vector ypB,
                    N_Vector rhsBQS, void *user_dataB);
 
-static int resBS2(realtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS,
+static int resBS2(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector *yyS, N_Vector *ypS,
                   N_Vector yyB, N_Vector ypB, N_Vector resvalBQ, void *user_dataB);
 
 
-static int rhsQBS2(realtype tt, N_Vector yy, N_Vector yp,
+static int rhsQBS2(sunrealtype tt, N_Vector yy, N_Vector yp,
                    N_Vector *yyS, N_Vector *ypS, N_Vector yyB, N_Vector ypB,
                    N_Vector rhsBQS, void *user_dataB);
 
@@ -123,10 +123,10 @@ int main(int argc, char *argv[])
   N_Vector yyB1, ypB1, qB1, yyB2, ypB2, qB2;
   void *ida_mem;
   UserData data;
-  realtype time, ti, tf;
+  sunrealtype time, ti, tf;
   int retval, nckp, indexB1, indexB2, is;
-  realtype G, Gm, Gp, dp1, dp2, grdG_fwd[2], grdG_bck[2], grdG_cntr[2], H11, H22;
-  realtype rtolFD, atolFD;
+  sunrealtype G, Gm, Gp, dp1, dp2, grdG_fwd[2], grdG_bck[2], grdG_cntr[2], H11, H22;
+  sunrealtype rtolFD, atolFD;
   SUNMatrix A, AB1, AB2;
   SUNLinearSolver LS, LSB1, LSB2;
 
@@ -364,8 +364,8 @@ int main(int argc, char *argv[])
   **********************************/
 
   /* Perturbations are of different magnitudes as p1 and p2 are. */
-  dp1 = RCONST(1.0e-3);
-  dp2 = RCONST(2.5e+2);
+  dp1 = SUN_RCONST(1.0e-3);
+  dp2 = SUN_RCONST(2.5e+2);
 
   printf("\n");
   printf("---------------------------------------------------------\n");
@@ -391,8 +391,8 @@ int main(int argc, char *argv[])
 
   retval = IDAInit(ida_mem, res, ti, yy, yp);
 
-  rtolFD = RCONST(1.0e-12);
-  atolFD = RCONST(1.0e-14);
+  rtolFD = SUN_RCONST(1.0e-12);
+  atolFD = SUN_RCONST(1.0e-14);
 
   retval = IDASStolerances(ida_mem, rtolFD, atolFD);
 
@@ -526,11 +526,11 @@ int main(int argc, char *argv[])
 
 
 
-static int res(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+static int res(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype y1, y2, y3, yp1, yp2, *rval;
+  sunrealtype y1, y2, y3, yp1, yp2, *rval;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1  = Ith(yy,1); y2  = Ith(yy,2); y3  = Ith(yy,3);
   yp1 = Ith(yp,1); yp2 = Ith(yp,2);
@@ -547,18 +547,18 @@ static int res(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_
   return(0);
 }
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector yy, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2;
-  realtype rs1, rs2, rs3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2;
+  sunrealtype rs1, rs2, rs3;
   int is;
 
   data = (UserData) user_data;
@@ -603,10 +603,10 @@ static int resS(int Ns, realtype t,
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
 
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
 
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
   Ith(qdot,1) = HALF*(y1*y1+y2*y2+y3*y3);
@@ -614,7 +614,7 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
   return(0);
 }
 
-static int rhsQS(int Ns, realtype t,
+static int rhsQS(int Ns, sunrealtype t,
                  N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS,
                  N_Vector rrQ, N_Vector *rhsvalQS,
@@ -622,8 +622,8 @@ static int rhsQS(int Ns, realtype t,
                  N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS)
 {
 
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
 
   y1 = Ith(yy,1);
   y2 = Ith(yy,2);
@@ -645,7 +645,7 @@ static int rhsQS(int Ns, realtype t,
 }
 
 /* Residuals for adjoint model. */
-static int resBS1(realtype tt,
+static int resBS1(sunrealtype tt,
                   N_Vector yy, N_Vector yp,
                   N_Vector *yyS, N_Vector *ypS,
                   N_Vector yyB, N_Vector ypB,
@@ -653,12 +653,12 @@ static int resBS1(realtype tt,
 
 {
   UserData data;
-  realtype y1, y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3, m1, m2, m3;
-  realtype lp1, lp2, mp1, mp2;
-  realtype s1, s2, s3;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3, m1, m2, m3;
+  sunrealtype lp1, lp2, mp1, mp2;
+  sunrealtype s1, s2, s3;
+  sunrealtype l21;
 
   data = (UserData) user_dataB;
 
@@ -695,16 +695,16 @@ static int resBS1(realtype tt,
   return(0);
 }
 
-static int rhsQBS1(realtype tt,
+static int rhsQBS1(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rhsBQS, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, m1, m2;
-  realtype s1, s2, s3;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, m1, m2;
+  sunrealtype s1, s2, s3;
+  sunrealtype l21;
 
   /* The y vector */
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
@@ -730,7 +730,7 @@ static int rhsQBS1(realtype tt,
   return(0);
 }
 
-static int resBS2(realtype tt,
+static int resBS2(sunrealtype tt,
                   N_Vector yy, N_Vector yp,
                   N_Vector *yyS, N_Vector *ypS,
                   N_Vector yyB, N_Vector ypB,
@@ -738,12 +738,12 @@ static int resBS2(realtype tt,
 
 {
   UserData data;
-  realtype y1, y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3, m1, m2, m3;
-  realtype lp1, lp2, mp1, mp2;
-  realtype s1, s2, s3;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3, m1, m2, m3;
+  sunrealtype lp1, lp2, mp1, mp2;
+  sunrealtype s1, s2, s3;
+  sunrealtype l21;
 
   data = (UserData) user_dataB;
 
@@ -781,16 +781,16 @@ static int resBS2(realtype tt,
   return(0);
 }
 
-static int rhsQBS2(realtype tt,
+static int rhsQBS2(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rhsBQS, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2, m1, m2;
-  realtype s1, s2, s3;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2, m1, m2;
+  sunrealtype s1, s2, s3;
+  sunrealtype l21;
 
   /* The y vector */
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
diff --git a/examples/idas/serial/idasKrylovDemo_ls.c b/examples/idas/serial/idasKrylovDemo_ls.c
index 35d416c769..5c3c04e749 100644
--- a/examples/idas/serial/idasKrylovDemo_ls.c
+++ b/examples/idas/serial/idasKrylovDemo_ls.c
@@ -48,7 +48,7 @@
 #include <sunlinsol/sunlinsol_spbcgs.h>  /* access to SPBCGS SUNLinearSolver  */
 #include <sunlinsol/sunlinsol_sptfqmr.h> /* access to SPTFQMR SUNLinearSolver */
 #include <nvector/nvector_serial.h>      /* serial N_Vector types, fct. and macros */
-#include <sundials/sundials_types.h>     /* definition of realtype */
+#include <sundials/sundials_types.h>     /* definition of sunrealtype */
 
 /* helpful macros */
 
@@ -67,10 +67,10 @@
 #define NOUT  11
 #define MGRID 10
 #define NEQ   MGRID*MGRID
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define FOUR  RCONST(4.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define FOUR  SUN_RCONST(4.0)
 
 /* Linear Solver Loop Constants */
 
@@ -82,31 +82,31 @@
 
 typedef struct {
   sunindextype mm;  /* number of grid points */
-  realtype dx;
-  realtype coeff;
+  sunrealtype dx;
+  sunrealtype coeff;
   N_Vector pp;  /* vector of prec. diag. elements */
 } *UserData;
 
 /* Prototypes for functions called by IDA */
 
-int resHeat(realtype tres, N_Vector uu, N_Vector up,
+int resHeat(sunrealtype tres, N_Vector uu, N_Vector up,
             N_Vector resval, void *user_data);
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *user_data);
+               sunrealtype c_j, void *user_data);
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data);
+               sunrealtype c_j, sunrealtype delta, void *user_data);
 
 /* Prototypes for private functions */
 
 static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res);
-static void PrintHeader(realtype rtol, realtype atol, int linsolver);
-static void PrintOutput(void *mem, realtype t, N_Vector uu, int linsolver);
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, int linsolver);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu, int linsolver);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -121,11 +121,11 @@ int main(int argc, char* argv[])
   UserData data;
   N_Vector uu, up, constraints, res;
   int retval, iout, linsolver;
-  realtype rtol, atol, t0, t1, tout, tret;
+  sunrealtype rtol, atol, t0, t1, tout, tret;
   long int netf, ncfn, ncfl;
   SUNLinearSolver LS;
   int nrmfactor;   /* LS norm conversion factor flag */
-  realtype nrmfac; /* LS norm conversion factor      */
+  sunrealtype nrmfac; /* LS norm conversion factor      */
   SUNContext ctx;
 
   mem         = NULL;
@@ -181,9 +181,9 @@ int main(int argc, char* argv[])
   /* Assign various parameters. */
 
   t0   = ZERO;
-  t1   = RCONST(0.01);
+  t1   = SUN_RCONST(0.01);
   rtol = ZERO;
-  atol = RCONST(1.0e-3);
+  atol = SUN_RCONST(1.0e-3);
 
   /* Call IDACreate and IDAMalloc to initialize solution */
 
@@ -290,7 +290,7 @@ int main(int argc, char* argv[])
 
     case(1):
       /* use the square root of the vector length */
-      nrmfac = SQRT((realtype)NEQ);
+      nrmfac = SQRT((sunrealtype)NEQ);
       break;
     case(2):
       /* compute with dot product */
@@ -373,12 +373,12 @@ int main(int argc, char* argv[])
  * while for each boundary point, it is res_i = u_i.
  */
 
-int resHeat(realtype tt,
+int resHeat(sunrealtype tt,
             N_Vector uu, N_Vector up, N_Vector rr,
             void *user_data)
 {
   sunindextype i, j, offset, loc, mm;
-  realtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
+  sunrealtype *uu_data, *up_data, *rr_data, coeff, dif1, dif2;
   UserData data;
 
   uu_data = N_VGetArrayPointer(uu);
@@ -424,13 +424,13 @@ int resHeat(realtype tt,
  * pp etc.) are used from the PsetupdHeat argument list.
  */
 
-int PsetupHeat(realtype tt,
+int PsetupHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
-               realtype c_j, void *user_data)
+               sunrealtype c_j, void *user_data)
 {
 
   sunindextype i, j, offset, loc, mm;
-  realtype *ppv, pelinv;
+  sunrealtype *ppv, pelinv;
   UserData data;
 
   data = (UserData) user_data;
@@ -462,10 +462,10 @@ int PsetupHeat(realtype tt,
  * computed in PrecondHeateq), returning the result in zvec.
  */
 
-int PsolveHeat(realtype tt,
+int PsolveHeat(sunrealtype tt,
                N_Vector uu, N_Vector up, N_Vector rr,
                N_Vector rvec, N_Vector zvec,
-               realtype c_j, realtype delta, void *user_data)
+               sunrealtype c_j, sunrealtype delta, void *user_data)
 {
   UserData data;
   data = (UserData) user_data;
@@ -487,7 +487,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
                              N_Vector res)
 {
   sunindextype mm, mm1, i, j, offset, loc;
-  realtype xfact, yfact, *udata, *updata;
+  sunrealtype xfact, yfact, *udata, *updata;
 
   mm = data->mm;
 
@@ -502,7 +502,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
     for (i = 0;i < mm; i++) {
       xfact = data->dx * i;
       loc = offset + i;
-      udata[loc] = RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
+      udata[loc] = SUN_RCONST(16.0) * xfact * (ONE - xfact) * yfact * (ONE - yfact);
     }
   }
 
@@ -531,7 +531,7 @@ static int SetInitialProfile(UserData data, N_Vector uu, N_Vector up,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, realtype atol, int linsolver)
+static void PrintHeader(sunrealtype rtol, sunrealtype atol, int linsolver)
 {
   printf("\nidasKrylovDemo_ls: Heat equation, serial example problem for IDA\n");
   printf("                   Discretized heat equation on 2D unit square.\n");
@@ -568,9 +568,9 @@ static void PrintHeader(realtype rtol, realtype atol, int linsolver)
  * PrintOutput: print max norm of solution and current solver statistics
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector uu, int linsolver)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector uu, int linsolver)
 {
-  realtype hused, umax;
+  sunrealtype hused, umax;
   long int nst, nni, nje, nre, nreLS, nli, npe, nps;
   int kused, retval;
 
diff --git a/examples/idas/serial/idasRoberts_ASAi_dns.c b/examples/idas/serial/idasRoberts_ASAi_dns.c
index 8d864f22ca..e0b6f4a4c7 100644
--- a/examples/idas/serial/idasRoberts_ASAi_dns.c
+++ b/examples/idas/serial/idasRoberts_ASAi_dns.c
@@ -55,7 +55,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -67,68 +67,68 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-06) /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-06) /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-08) /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-12)
-#define ATOL3    RCONST(1e-08)
+#define ATOL1    SUN_RCONST(1e-08) /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-12)
+#define ATOL3    SUN_RCONST(1e-08)
 
-#define ATOLA    RCONST(1e-08) /* absolute tolerance for adjoint vars. */
-#define ATOLQ    RCONST(1e-06) /* absolute tolerance for quadratures   */
+#define ATOLA    SUN_RCONST(1e-08) /* absolute tolerance for adjoint vars. */
+#define ATOLQ    SUN_RCONST(1e-06) /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e10)  /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e10)  /* final time                           */
 
-#define TB1      RCONST(50.0)  /* starting point for adjoint problem   */
+#define TB1      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
 #define TB2      TOUT          /* starting point for adjoint problem   */
 
-#define T1B      RCONST(49.0)  /* for IDACalcICB                       */
+#define T1B      SUN_RCONST(49.0)  /* for IDACalcICB                       */
 
 #define STEPS    100           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ONE     RCONST(1.0)
-#define ZERO    RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define ZERO    SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int res(realtype t, N_Vector yy, N_Vector yp,
+static int res(sunrealtype t, N_Vector yy, N_Vector yp,
                N_Vector resval, void *user_data);
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB);
 
-static int JacB(realtype tt, realtype cjB,
+static int JacB(sunrealtype tt, sunrealtype cjB,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB);
 
 /* Prototypes of private functions */
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
 /*
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
   SUNMatrix A, AB;
   SUNLinearSolver LS, LSB;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector yy, yp, q;
   N_Vector yyTB1, ypTB1;
   N_Vector id;
@@ -156,9 +156,9 @@ int main(int argc, char *argv[])
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, ypB, qB;
-  realtype time;
+  sunrealtype time;
   int retval, ncheck;
 
   IDAadjCheckPointRec *ckpnt;
@@ -189,9 +189,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Initialize y */
   yy = N_VNew_Serial(NEQ, ctx);
@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
   /* Initialize yprime */
   yp = N_VClone(yy);
   if (check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
-  Ith(yp,1) = RCONST(-0.04);
-  Ith(yp,2) = RCONST( 0.04);
+  Ith(yp,1) = SUN_RCONST(-0.04);
+  Ith(yp,2) = SUN_RCONST( 0.04);
   Ith(yp,3) = ZERO;
 
   /* Initialize q */
@@ -449,11 +449,11 @@ int main(int argc, char *argv[])
   /* Both algebraic part from y and the entire y' are computed by IDACalcIC. */
   Ith(yB,1) = ZERO;
   Ith(yB,2) = ZERO;
-  Ith(yB,3) = RCONST(0.50); /* not consistent */
+  Ith(yB,3) = SUN_RCONST(0.50); /* not consistent */
 
   /* Rough guess for ypB. */
-  Ith(ypB,1) = RCONST(0.80);
-  Ith(ypB,2) = RCONST(0.75);
+  Ith(ypB,1) = SUN_RCONST(0.80);
+  Ith(ypB,2) = SUN_RCONST(0.75);
   Ith(ypB,3) = ZERO;
 
   /* Initialize qB */
@@ -545,11 +545,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
 */
 
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
-  realtype y1, y2, y3, yp1, yp2, *rval;
+  sunrealtype y1, y2, y3, yp1, yp2, *rval;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1  = Ith(yy,1); y2  = Ith(yy,2); y3  = Ith(yy,3);
   yp1 = Ith(yp,1); yp2 = Ith(yp,2);
@@ -570,14 +570,14 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(yy,2); y3 = Ith(yy,3);
 
@@ -603,7 +603,7 @@ static int Jac(realtype t, realtype cj,
  * rhsQ routine. Compute fQ(t,y).
 */
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(yy,3);
   return(0);
@@ -616,7 +616,7 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -638,17 +638,17 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * resB routine.
 */
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB, N_Vector rrB,
                  void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype lp1, lp2;
-  realtype l21;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype lp1, lp2;
+  sunrealtype l21;
 
   data = (UserData) user_dataB;
 
@@ -669,22 +669,22 @@ static int resB(realtype tt,
 
   /* Load residual. */
   Ith(rrB,1) = lp1 + p1*l21 - l3;
-  Ith(rrB,2) = lp2 - p2*y3*l21 - RCONST(2.0)*p3*y2*l2-l3;
-  Ith(rrB,3) = - p2*y2*l21 -l3 + RCONST(1.0);
+  Ith(rrB,2) = lp2 - p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l2-l3;
+  Ith(rrB,3) = - p2*y2*l21 -l3 + SUN_RCONST(1.0);
 
   return(0);
 }
 
 /*Jacobian for backward problem. */
-static int JacB(realtype tt, realtype cj,
+static int JacB(sunrealtype tt, sunrealtype cj,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
-  realtype y2, y3;
+  sunrealtype y2, y3;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y2 = Ith(yy,2); y3 = Ith(yy,3);
 
@@ -696,7 +696,7 @@ static int JacB(realtype tt, realtype cj,
   IJth(JB,1,3) = -ONE;
 
   IJth(JB,2,1) = p2*y3;
-  IJth(JB,2,2) = -(p2*y3+RCONST(2.0)*p3*y2)+cj;
+  IJth(JB,2,2) = -(p2*y3+SUN_RCONST(2.0)*p3*y2)+cj;
   IJth(JB,2,3) = -ONE;
 
   IJth(JB,3,1) = p2*y2;
@@ -707,14 +707,14 @@ static int JacB(realtype tt, realtype cj,
   return(0);
 }
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2;
+  sunrealtype l21;
 
   /* The y vector */
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
@@ -743,7 +743,7 @@ static int rhsQB(realtype tt,
  * Print results after backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/idas/serial/idasRoberts_ASAi_klu.c b/examples/idas/serial/idasRoberts_ASAi_klu.c
index ffbe0f287d..f370968eb0 100644
--- a/examples/idas/serial/idasRoberts_ASAi_klu.c
+++ b/examples/idas/serial/idasRoberts_ASAi_klu.c
@@ -56,7 +56,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>       /* access to KLU linear solver          */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -67,68 +67,68 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-06) /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-06) /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-08) /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-12)
-#define ATOL3    RCONST(1e-08)
+#define ATOL1    SUN_RCONST(1e-08) /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-12)
+#define ATOL3    SUN_RCONST(1e-08)
 
-#define ATOLA    RCONST(1e-08) /* absolute tolerance for adjoint vars. */
-#define ATOLQ    RCONST(1e-06) /* absolute tolerance for quadratures   */
+#define ATOLA    SUN_RCONST(1e-08) /* absolute tolerance for adjoint vars. */
+#define ATOLQ    SUN_RCONST(1e-06) /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e10)  /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e10)  /* final time                           */
 
-#define TB1      RCONST(50.0)  /* starting point for adjoint problem   */
+#define TB1      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
 #define TB2      TOUT          /* starting point for adjoint problem   */
 
-#define T1B      RCONST(49.0)  /* for IDACalcICB                       */
+#define T1B      SUN_RCONST(49.0)  /* for IDACalcICB                       */
 
 #define STEPS    100           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ONE     RCONST(1.0)
-#define ZERO    RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define ZERO    SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int res(realtype t, N_Vector yy, N_Vector yp,
+static int res(sunrealtype t, N_Vector yy, N_Vector yp,
                N_Vector resval, void *user_data);
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB);
 
-static int JacB(realtype tt, realtype cjB,
+static int JacB(sunrealtype tt, sunrealtype cjB,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB);
 
 /* Prototypes of private functions */
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
   SUNMatrix A, AB;
   SUNLinearSolver LS, LSB;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector yy, yp, q;
   N_Vector yyTB1, ypTB1;
   N_Vector id;
@@ -156,9 +156,9 @@ int main(int argc, char *argv[])
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, ypB, qB;
-  realtype time;
+  sunrealtype time;
   int retval, nnz, ncheck;
 
   IDAadjCheckPointRec *ckpnt;
@@ -189,9 +189,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Initialize y */
   yy = N_VNew_Serial(NEQ, ctx);
@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
   /* Initialize yprime */
   yp = N_VClone(yy);
   if (check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
-  Ith(yp,1) = RCONST(-0.04);
-  Ith(yp,2) = RCONST( 0.04);
+  Ith(yp,1) = SUN_RCONST(-0.04);
+  Ith(yp,2) = SUN_RCONST( 0.04);
   Ith(yp,3) = ZERO;
 
   /* Initialize q */
@@ -439,11 +439,11 @@ int main(int argc, char *argv[])
   /* Both algebraic part from y and the entire y' are computed by IDACalcIC. */
   Ith(yB,1) = ZERO;
   Ith(yB,2) = ZERO;
-  Ith(yB,3) = RCONST(0.50); /* not consistent */
+  Ith(yB,3) = SUN_RCONST(0.50); /* not consistent */
 
   /* Rough guess for ypB. */
-  Ith(ypB,1) = RCONST(0.80);
-  Ith(ypB,2) = RCONST(0.75);
+  Ith(ypB,1) = SUN_RCONST(0.80);
+  Ith(ypB,2) = SUN_RCONST(0.75);
   Ith(ypB,3) = ZERO;
 
   /* Initialize qB */
@@ -530,11 +530,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
 */
 
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
-  realtype y1, y2, y3,yp1, yp2, *rval;
+  sunrealtype y1, y2, y3,yp1, yp2, *rval;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1  = Ith(yy,1); y2  = Ith(yy,2); y3  = Ith(yy,3);
   yp1 = Ith(yp,1); yp2 = Ith(yp,2);
@@ -555,18 +555,18 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(yy);
 
@@ -611,7 +611,7 @@ static int Jac(realtype t, realtype cj,
  * rhsQ routine. Compute fQ(t,y).
 */
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(yy,3);
   return(0);
@@ -624,7 +624,7 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -646,17 +646,17 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * resB routine.
 */
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB, N_Vector rrB,
                  void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype lp1, lp2;
-  realtype l21;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype lp1, lp2;
+  sunrealtype l21;
 
   data = (UserData) user_dataB;
 
@@ -677,26 +677,26 @@ static int resB(realtype tt,
 
   /* Load residual. */
   Ith(rrB,1) = lp1 + p1*l21 - l3;
-  Ith(rrB,2) = lp2 - p2*y3*l21 - RCONST(2.0)*p3*y2*l2-l3;
-  Ith(rrB,3) = - p2*y2*l21 -l3 + RCONST(1.0);
+  Ith(rrB,2) = lp2 - p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l2-l3;
+  Ith(rrB,3) = - p2*y2*l21 -l3 + SUN_RCONST(1.0);
 
   return(0);
 }
 
 /*Jacobian for backward problem. */
-static int JacB(realtype tt, realtype cjB,
+static int JacB(sunrealtype tt, sunrealtype cjB,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
-  realtype *yvalB;
+  sunrealtype *yvalB;
   sunindextype *colptrsB = SUNSparseMatrix_IndexPointers(JB);
   sunindextype *rowvalsB = SUNSparseMatrix_IndexValues(JB);
-  realtype *dataB = SUNSparseMatrix_Data(JB);
+  sunrealtype *dataB = SUNSparseMatrix_Data(JB);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yvalB = N_VGetArrayPointer(yy);
 
@@ -721,7 +721,7 @@ static int JacB(realtype tt, realtype cjB,
   /* column 1 */
   dataB[3] = p1;
   rowvalsB[3] = 0;
-  dataB[4] = -(p2*yvalB[2]+RCONST(2.0)*p3*yvalB[1])+cjB;
+  dataB[4] = -(p2*yvalB[2]+SUN_RCONST(2.0)*p3*yvalB[1])+cjB;
   rowvalsB[4] = 1;
   dataB[5] = -p2*yvalB[1];
   rowvalsB[5] = 2;
@@ -737,14 +737,14 @@ static int JacB(realtype tt, realtype cjB,
   return(0);
 }
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2;
+  sunrealtype l21;
 
   /* The y vector */
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
@@ -773,7 +773,7 @@ static int rhsQB(realtype tt,
  * Print results after backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/idas/serial/idasRoberts_ASAi_sps.c b/examples/idas/serial/idasRoberts_ASAi_sps.c
index e27e9c2bfe..c5b36bfff9 100644
--- a/examples/idas/serial/idasRoberts_ASAi_sps.c
+++ b/examples/idas/serial/idasRoberts_ASAi_sps.c
@@ -56,7 +56,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT linear solver    */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -67,68 +67,68 @@
 
 #define NEQ      3             /* number of equations                  */
 
-#define RTOL     RCONST(1e-06) /* scalar relative tolerance            */
+#define RTOL     SUN_RCONST(1e-06) /* scalar relative tolerance            */
 
-#define ATOL1    RCONST(1e-08) /* vector absolute tolerance components */
-#define ATOL2    RCONST(1e-12)
-#define ATOL3    RCONST(1e-08)
+#define ATOL1    SUN_RCONST(1e-08) /* vector absolute tolerance components */
+#define ATOL2    SUN_RCONST(1e-12)
+#define ATOL3    SUN_RCONST(1e-08)
 
-#define ATOLA    RCONST(1e-08) /* absolute tolerance for adjoint vars. */
-#define ATOLQ    RCONST(1e-06) /* absolute tolerance for quadratures   */
+#define ATOLA    SUN_RCONST(1e-08) /* absolute tolerance for adjoint vars. */
+#define ATOLQ    SUN_RCONST(1e-06) /* absolute tolerance for quadratures   */
 
-#define T0       RCONST(0.0)   /* initial time                         */
-#define TOUT     RCONST(4e10)  /* final time                           */
+#define T0       SUN_RCONST(0.0)   /* initial time                         */
+#define TOUT     SUN_RCONST(4e10)  /* final time                           */
 
-#define TB1      RCONST(50.0)  /* starting point for adjoint problem   */
+#define TB1      SUN_RCONST(50.0)  /* starting point for adjoint problem   */
 #define TB2      TOUT          /* starting point for adjoint problem   */
 
-#define T1B      RCONST(49.0)  /* for IDACalcICB                       */
+#define T1B      SUN_RCONST(49.0)  /* for IDACalcICB                       */
 
 #define STEPS    100           /* number of steps between check points */
 
 #define NP       3             /* number of problem parameters         */
 
-#define ONE     RCONST(1.0)
-#define ZERO    RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define ZERO    SUN_RCONST(0.0)
 
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];
+  sunrealtype p[3];
 } *UserData;
 
 /* Prototypes of user-supplied functions */
 
-static int res(realtype t, N_Vector yy, N_Vector yp,
+static int res(sunrealtype t, N_Vector yy, N_Vector yp,
                N_Vector resval, void *user_data);
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 static int ewt(N_Vector y, N_Vector w, void *user_data);
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 void *user_dataB);
 
-static int JacB(realtype tt, realtype cjB,
+static int JacB(sunrealtype tt, sunrealtype cjB,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B);
 
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB);
 
 /* Prototypes of private functions */
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB);
 static int check_retval(void *returnvalue, char *funcname, int opt);
 
 /*
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
   SUNMatrix A, AB;
   SUNLinearSolver LS, LSB;
 
-  realtype reltolQ, abstolQ;
+  sunrealtype reltolQ, abstolQ;
   N_Vector yy, yp, q;
   N_Vector yyTB1, ypTB1;
   N_Vector id;
@@ -156,9 +156,9 @@ int main(int argc, char *argv[])
 
   int indexB;
 
-  realtype reltolB, abstolB, abstolQB;
+  sunrealtype reltolB, abstolB, abstolQB;
   N_Vector yB, ypB, qB;
-  realtype time;
+  sunrealtype time;
   int retval, nthreads, nnz, ncheck;
 
   IDAadjCheckPointRec *ckpnt;
@@ -189,9 +189,9 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.04);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
+  data->p[0] = SUN_RCONST(0.04);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
 
   /* Initialize y */
   yy = N_VNew_Serial(NEQ, ctx);
@@ -203,8 +203,8 @@ int main(int argc, char *argv[])
   /* Initialize yprime */
   yp = N_VClone(yy);
   if (check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
-  Ith(yp,1) = RCONST(-0.04);
-  Ith(yp,2) = RCONST( 0.04);
+  Ith(yp,1) = SUN_RCONST(-0.04);
+  Ith(yp,2) = SUN_RCONST( 0.04);
   Ith(yp,3) = ZERO;
 
   /* Initialize q */
@@ -440,11 +440,11 @@ int main(int argc, char *argv[])
   /* Both algebraic part from y and the entire y' are computed by IDACalcIC. */
   Ith(yB,1) = ZERO;
   Ith(yB,2) = ZERO;
-  Ith(yB,3) = RCONST(0.50); /* not consistent */
+  Ith(yB,3) = SUN_RCONST(0.50); /* not consistent */
 
   /* Rough guess for ypB. */
-  Ith(ypB,1) = RCONST(0.80);
-  Ith(ypB,2) = RCONST(0.75);
+  Ith(ypB,1) = SUN_RCONST(0.80);
+  Ith(ypB,2) = SUN_RCONST(0.75);
   Ith(ypB,3) = ZERO;
 
   /* Initialize qB */
@@ -531,11 +531,11 @@ int main(int argc, char *argv[])
  * f routine. Compute f(t,y).
 */
 
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
-  realtype y1, y2, y3,yp1, yp2, *rval;
+  sunrealtype y1, y2, y3,yp1, yp2, *rval;
   UserData data;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   y1  = Ith(yy,1); y2  = Ith(yy,2); y3  = Ith(yy,3);
   yp1 = Ith(yp,1); yp2 = Ith(yp,2);
@@ -556,18 +556,18 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(yy);
 
@@ -612,7 +612,7 @@ static int Jac(realtype t, realtype cj,
  * rhsQ routine. Compute fQ(t,y).
 */
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
   Ith(qdot,1) = Ith(yy,3);
   return(0);
@@ -625,7 +625,7 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
 static int ewt(N_Vector y, N_Vector w, void *user_data)
 {
   int i;
-  realtype yy, ww, rtol, atol[3];
+  sunrealtype yy, ww, rtol, atol[3];
 
   rtol    = RTOL;
   atol[0] = ATOL1;
@@ -647,17 +647,17 @@ static int ewt(N_Vector y, N_Vector w, void *user_data)
  * resB routine.
 */
 
-static int resB(realtype tt,
+static int resB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB, N_Vector rrB,
                  void *user_dataB)
 {
   UserData data;
-  realtype y2, y3;
-  realtype p1, p2, p3;
-  realtype l1, l2, l3;
-  realtype lp1, lp2;
-  realtype l21;
+  sunrealtype y2, y3;
+  sunrealtype p1, p2, p3;
+  sunrealtype l1, l2, l3;
+  sunrealtype lp1, lp2;
+  sunrealtype l21;
 
   data = (UserData) user_dataB;
 
@@ -678,26 +678,26 @@ static int resB(realtype tt,
 
   /* Load residual. */
   Ith(rrB,1) = lp1 + p1*l21 - l3;
-  Ith(rrB,2) = lp2 - p2*y3*l21 - RCONST(2.0)*p3*y2*l2-l3;
-  Ith(rrB,3) = - p2*y2*l21 -l3 + RCONST(1.0);
+  Ith(rrB,2) = lp2 - p2*y3*l21 - SUN_RCONST(2.0)*p3*y2*l2-l3;
+  Ith(rrB,3) = - p2*y2*l21 -l3 + SUN_RCONST(1.0);
 
   return(0);
 }
 
 /*Jacobian for backward problem. */
-static int JacB(realtype tt, realtype cjB,
+static int JacB(sunrealtype tt, sunrealtype cjB,
                 N_Vector yy, N_Vector yp,
                 N_Vector yyB, N_Vector ypB, N_Vector rrB,
                 SUNMatrix JB, void *user_data,
                 N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
-  realtype *yvalB;
+  sunrealtype *yvalB;
   sunindextype *colptrsB = SUNSparseMatrix_IndexPointers(JB);
   sunindextype *rowvalsB = SUNSparseMatrix_IndexValues(JB);
-  realtype *dataB = SUNSparseMatrix_Data(JB);
+  sunrealtype *dataB = SUNSparseMatrix_Data(JB);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yvalB = N_VGetArrayPointer(yy);
 
@@ -722,7 +722,7 @@ static int JacB(realtype tt, realtype cjB,
   /* column 1 */
   dataB[3] = p1;
   rowvalsB[3] = 0;
-  dataB[4] = -(p2*yvalB[2]+RCONST(2.0)*p3*yvalB[1])+cjB;
+  dataB[4] = -(p2*yvalB[2]+SUN_RCONST(2.0)*p3*yvalB[1])+cjB;
   rowvalsB[4] = 1;
   dataB[5] = -p2*yvalB[1];
   rowvalsB[5] = 2;
@@ -738,14 +738,14 @@ static int JacB(realtype tt, realtype cjB,
   return(0);
 }
 
-static int rhsQB(realtype tt,
+static int rhsQB(sunrealtype tt,
                  N_Vector yy, N_Vector yp,
                  N_Vector yyB, N_Vector ypB,
                  N_Vector rrQB, void *user_dataB)
 {
-  realtype y1, y2, y3;
-  realtype l1, l2;
-  realtype l21;
+  sunrealtype y1, y2, y3;
+  sunrealtype l1, l2;
+  sunrealtype l21;
 
   /* The y vector */
   y1 = Ith(yy,1); y2 = Ith(yy,2); y3 = Ith(yy,3);
@@ -774,7 +774,7 @@ static int rhsQB(realtype tt,
  * Print results after backward integration
  */
 
-static void PrintOutput(realtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
+static void PrintOutput(sunrealtype tfinal, N_Vector yB, N_Vector ypB, N_Vector qB)
 {
   printf("--------------------------------------------------------\n");
 #if defined(SUNDIALS_EXTENDED_PRECISION)
diff --git a/examples/idas/serial/idasRoberts_FSA_dns.c b/examples/idas/serial/idasRoberts_FSA_dns.c
index ab8965571f..c109c7c46d 100644
--- a/examples/idas/serial/idasRoberts_FSA_dns.c
+++ b/examples/idas/serial/idasRoberts_FSA_dns.c
@@ -51,7 +51,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -61,48 +61,48 @@
 /* Problem Constants */
 
 #define NEQ   3             /* number of equations  */
-#define T0    RCONST(0.0)   /* initial time */
-#define T1    RCONST(0.4)   /* first output time */
-#define TMULT RCONST(10.0)  /* output time factor */
+#define T0    SUN_RCONST(0.0)   /* initial time */
+#define T1    SUN_RCONST(0.4)   /* first output time */
+#define TMULT SUN_RCONST(10.0)  /* output time factor */
 #define NOUT  12            /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
-  realtype coef;
+  sunrealtype p[3];           /* problem parameters */
+  sunrealtype coef;
 } *UserData;
 
 /* Prototypes of functions by IDAS */
 
-static int res(realtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
+static int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector y, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype tres, N_Vector yy, N_Vector yp,
+static int rhsQ(sunrealtype tres, N_Vector yy, N_Vector yp,
                  N_Vector rrQ, void *user_data);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 static void WrongArgs(char *name);
 
 static void PrintIC(N_Vector y, N_Vector yp);
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS);
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u);
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u);
 static void PrintSensOutput(N_Vector *uS);
 
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -119,16 +119,16 @@ int main(int argc, char *argv[])
   SUNMatrix A;
   SUNLinearSolver LS;
   UserData data;
-  realtype reltol, t, tout;
+  sunrealtype reltol, t, tout;
   N_Vector y, yp, abstol, id;
   int iout, retval;
   FILE* FID;
   char fname[256];
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS, *ypS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   N_Vector yQ, *yQS;
@@ -152,10 +152,10 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.040);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
-  data->coef = RCONST(0.5);
+  data->p[0] = SUN_RCONST(0.040);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
+  data->coef = SUN_RCONST(0.5);
 
   /* Initial conditions */
   y = N_VNew_Serial(NEQ, ctx);
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
   if(check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
 
   /* These initial conditions are NOT consistent. See IDACalcIC below. */
-  Ith(yp,1) = RCONST(0.1);
+  Ith(yp,1) = SUN_RCONST(0.1);
   Ith(yp,2) = ZERO;
   Ith(yp,3) = ZERO;
 
@@ -182,11 +182,11 @@ int main(int argc, char *argv[])
   if (check_retval(&retval, "IDAInit", 1)) return(1);
 
   /* Specify scalar relative tol. and vector absolute tol. */
-  reltol = RCONST(1.0e-6);
+  reltol = SUN_RCONST(1.0e-6);
   abstol = N_VClone(y);
-  Ith(abstol,1) = RCONST(1.0e-8);
-  Ith(abstol,2) = RCONST(1.0e-14);
-  Ith(abstol,3) = RCONST(1.0e-6);
+  Ith(abstol,1) = SUN_RCONST(1.0e-8);
+  Ith(abstol,2) = SUN_RCONST(1.0e-14);
+  Ith(abstol,3) = SUN_RCONST(1.0e-6);
   retval = IDASVtolerances(ida_mem, reltol, abstol);
   if (check_retval(&retval, "IDASVtolerances", 1)) return(1);
 
@@ -399,12 +399,12 @@ int main(int argc, char *argv[])
 /*
  * Residual routine. Compute F(t,y,y',p).
  */
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype yp1, yp2;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype yp1, yp2;
 
   data = (UserData) user_data;
   p1 = data->p[0];
@@ -430,18 +430,18 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * resS routine. Compute sensitivity r.h.s.
  */
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector yy, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2;
-  realtype rs1, rs2, rs3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2;
+  sunrealtype rs1, rs2, rs3;
   int is;
 
   data = (UserData) user_data;
@@ -489,7 +489,7 @@ static int resS(int Ns, realtype t,
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector y, N_Vector yp,
+static int rhsQ(sunrealtype t, N_Vector y, N_Vector yp,
               N_Vector ypQ, void* user_data)
 {
   UserData data;
@@ -517,7 +517,7 @@ static int rhsQ(realtype t, N_Vector y, N_Vector yp,
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -566,7 +566,7 @@ static void WrongArgs(char *name)
 
 static void PrintIC(N_Vector y, N_Vector yp)
 {
-  realtype* data;
+  sunrealtype* data;
 
   data = N_VGetArrayPointer(y);
   printf("\n\nConsistent IC:\n");
@@ -592,7 +592,7 @@ static void PrintIC(N_Vector y, N_Vector yp)
 }
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(yS[0]);
   printf("                  Sensitivity 1  ");
@@ -664,11 +664,11 @@ static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -705,7 +705,7 @@ static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
 
 static void PrintSensOutput(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
diff --git a/examples/idas/serial/idasRoberts_FSA_klu.c b/examples/idas/serial/idasRoberts_FSA_klu.c
index 2df4d48e5b..a789fb5d4e 100644
--- a/examples/idas/serial/idasRoberts_FSA_klu.c
+++ b/examples/idas/serial/idasRoberts_FSA_klu.c
@@ -54,7 +54,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>       /* access to KLU linear solver          */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -64,56 +64,56 @@
 /* Problem Constants */
 
 #define NEQ   3             /* number of equations  */
-#define T0    RCONST(0.0)   /* initial time */
-#define T1    RCONST(0.4)   /* first output time */
-#define TMULT RCONST(10.0)  /* output time factor */
+#define T0    SUN_RCONST(0.0)   /* initial time */
+#define T1    SUN_RCONST(0.4)   /* first output time */
+#define TMULT SUN_RCONST(10.0)  /* output time factor */
 #define NOUT  12            /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
-  realtype coef;
+  sunrealtype p[3];           /* problem parameters */
+  sunrealtype coef;
 } *UserData;
 
 /* Prototypes of functions by IDAS */
 
-static int res(realtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
+static int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector y, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype tres, N_Vector yy, N_Vector yp,
+static int rhsQ(sunrealtype tres, N_Vector yy, N_Vector yp,
                  N_Vector rrQ, void *user_data);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 static void WrongArgs(char *name);
 
 static void PrintIC(N_Vector y, N_Vector yp);
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS);
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u);
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u);
 static void PrintSensOutput(N_Vector *uS);
 
-static void PrintFinalStats(void *ida_mem, booleantype sensi);
+static void PrintFinalStats(void *ida_mem, sunbooleantype sensi);
 
 static int check_retval(void *returnvalue, char *funcname, int opt);
 /*
@@ -129,14 +129,14 @@ int main(int argc, char *argv[])
   SUNMatrix A;
   SUNLinearSolver LS;
   UserData data;
-  realtype reltol, t, tout;
+  sunrealtype reltol, t, tout;
   N_Vector y, yp, abstol, id;
   int iout, retval, nnz;
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS, *ypS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   N_Vector yQ, *yQS;
@@ -159,10 +159,10 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.040);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
-  data->coef = RCONST(0.5);
+  data->p[0] = SUN_RCONST(0.040);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
+  data->coef = SUN_RCONST(0.5);
 
   /* Initial conditions */
   y = N_VNew_Serial(NEQ, ctx);
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
   if(check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
 
   /* These initial conditions are NOT consistent. See IDACalcIC below. */
-  Ith(yp,1) = RCONST(0.1);
+  Ith(yp,1) = SUN_RCONST(0.1);
   Ith(yp,2) = ZERO;
   Ith(yp,3) = ZERO;
 
@@ -189,11 +189,11 @@ int main(int argc, char *argv[])
   if (check_retval(&retval, "IDAInit", 1)) return(1);
 
   /* Specify scalar relative tol. and vector absolute tol. */
-  reltol = RCONST(1.0e-6);
+  reltol = SUN_RCONST(1.0e-6);
   abstol = N_VClone(y);
-  Ith(abstol,1) = RCONST(1.0e-8);
-  Ith(abstol,2) = RCONST(1.0e-14);
-  Ith(abstol,3) = RCONST(1.0e-6);
+  Ith(abstol,1) = SUN_RCONST(1.0e-8);
+  Ith(abstol,2) = SUN_RCONST(1.0e-14);
+  Ith(abstol,3) = SUN_RCONST(1.0e-6);
   retval = IDASVtolerances(ida_mem, reltol, abstol);
   if (check_retval(&retval, "IDASVtolerances", 1)) return(1);
 
@@ -390,12 +390,12 @@ int main(int argc, char *argv[])
 /*
  * Residual routine. Compute F(t,y,y',p).
  */
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype yp1, yp2;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype yp1, yp2;
 
   data = (UserData) user_data;
   p1 = data->p[0];
@@ -421,18 +421,18 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(yy);
 
@@ -474,18 +474,18 @@ static int Jac(realtype t, realtype cj,
  * resS routine. Compute sensitivity r.h.s.
  */
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector yy, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2;
-  realtype rs1, rs2, rs3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2;
+  sunrealtype rs1, rs2, rs3;
   int is;
 
   data = (UserData) user_data;
@@ -533,7 +533,7 @@ static int resS(int Ns, realtype t,
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector y, N_Vector yp,
+static int rhsQ(sunrealtype t, N_Vector y, N_Vector yp,
               N_Vector ypQ, void* user_data)
 {
   UserData data;
@@ -561,7 +561,7 @@ static int rhsQ(realtype t, N_Vector y, N_Vector yp,
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -610,7 +610,7 @@ static void WrongArgs(char *name)
 
 static void PrintIC(N_Vector y, N_Vector yp)
 {
-  realtype* data;
+  sunrealtype* data;
 
   data = N_VGetArrayPointer(y);
   printf("\n\nConsistent IC:\n");
@@ -636,7 +636,7 @@ static void PrintIC(N_Vector y, N_Vector yp)
 }
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(yS[0]);
   printf("                  Sensitivity 1  ");
@@ -708,11 +708,11 @@ static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -749,7 +749,7 @@ static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
 
 static void PrintSensOutput(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
@@ -789,7 +789,7 @@ static void PrintSensOutput(N_Vector *uS)
  * Print some final statistics from the IDAS memory.
  */
 
-static void PrintFinalStats(void *ida_mem, booleantype sensi)
+static void PrintFinalStats(void *ida_mem, sunbooleantype sensi)
 {
   long int nst;
   long int nfe, nsetups, nni, nnf, ncfn, netf;
diff --git a/examples/idas/serial/idasRoberts_FSA_sps.c b/examples/idas/serial/idasRoberts_FSA_sps.c
index 108d997d5b..1cdcdfd07a 100644
--- a/examples/idas/serial/idasRoberts_FSA_sps.c
+++ b/examples/idas/serial/idasRoberts_FSA_sps.c
@@ -54,7 +54,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT linear solver    */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Accessor macros */
@@ -64,56 +64,56 @@
 /* Problem Constants */
 
 #define NEQ   3             /* number of equations  */
-#define T0    RCONST(0.0)   /* initial time */
-#define T1    RCONST(0.4)   /* first output time */
-#define TMULT RCONST(10.0)  /* output time factor */
+#define T0    SUN_RCONST(0.0)   /* initial time */
+#define T1    SUN_RCONST(0.4)   /* first output time */
+#define TMULT SUN_RCONST(10.0)  /* output time factor */
 #define NOUT  12            /* number of output times */
 
 #define NP    3             /* number of problem parameters */
 #define NS    3             /* number of sensitivities computed */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /* Type : UserData */
 
 typedef struct {
-  realtype p[3];           /* problem parameters */
-  realtype coef;
+  sunrealtype p[3];           /* problem parameters */
+  sunrealtype coef;
 } *UserData;
 
 /* Prototypes of functions by IDAS */
 
-static int res(realtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
+static int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector resval, void *user_data);
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector y, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-static int rhsQ(realtype tres, N_Vector yy, N_Vector yp,
+static int rhsQ(sunrealtype tres, N_Vector yy, N_Vector yp,
                  N_Vector rrQ, void *user_data);
 
 /* Prototypes of private functions */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth,
-                        booleantype *err_con);
+                        sunbooleantype *sensi, int *sensi_meth,
+                        sunbooleantype *err_con);
 static void WrongArgs(char *name);
 
 static void PrintIC(N_Vector y, N_Vector yp);
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS);
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u);
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u);
 static void PrintSensOutput(N_Vector *uS);
 
-static void PrintFinalStats(void *ida_mem, booleantype sensi);
+static void PrintFinalStats(void *ida_mem, sunbooleantype sensi);
 
 static int check_retval(void *returnvalue, char *funcname, int opt);
 /*
@@ -129,14 +129,14 @@ int main(int argc, char *argv[])
   SUNMatrix A;
   SUNLinearSolver LS;
   UserData data;
-  realtype reltol, t, tout;
+  sunrealtype reltol, t, tout;
   N_Vector y, yp, abstol, id;
   int iout, retval, nthreads, nnz;
 
-  realtype pbar[NS];
+  sunrealtype pbar[NS];
   int is;
   N_Vector *yS, *ypS;
-  booleantype sensi, err_con;
+  sunbooleantype sensi, err_con;
   int sensi_meth;
 
   N_Vector yQ, *yQS;
@@ -159,10 +159,10 @@ int main(int argc, char *argv[])
   /* User data structure */
   data = (UserData) malloc(sizeof *data);
   if (check_retval((void *)data, "malloc", 2)) return(1);
-  data->p[0] = RCONST(0.040);
-  data->p[1] = RCONST(1.0e4);
-  data->p[2] = RCONST(3.0e7);
-  data->coef = RCONST(0.5);
+  data->p[0] = SUN_RCONST(0.040);
+  data->p[1] = SUN_RCONST(1.0e4);
+  data->p[2] = SUN_RCONST(3.0e7);
+  data->coef = SUN_RCONST(0.5);
 
   /* Initial conditions */
   y = N_VNew_Serial(NEQ, ctx);
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
   if(check_retval((void *)yp, "N_VNew_Serial", 0)) return(1);
 
   /* These initial conditions are NOT consistent. See IDACalcIC below. */
-  Ith(yp,1) = RCONST(0.1);
+  Ith(yp,1) = SUN_RCONST(0.1);
   Ith(yp,2) = ZERO;
   Ith(yp,3) = ZERO;
 
@@ -189,11 +189,11 @@ int main(int argc, char *argv[])
   if (check_retval(&retval, "IDAInit", 1)) return(1);
 
   /* Specify scalar relative tol. and vector absolute tol. */
-  reltol = RCONST(1.0e-6);
+  reltol = SUN_RCONST(1.0e-6);
   abstol = N_VClone(y);
-  Ith(abstol,1) = RCONST(1.0e-8);
-  Ith(abstol,2) = RCONST(1.0e-14);
-  Ith(abstol,3) = RCONST(1.0e-6);
+  Ith(abstol,1) = SUN_RCONST(1.0e-8);
+  Ith(abstol,2) = SUN_RCONST(1.0e-14);
+  Ith(abstol,3) = SUN_RCONST(1.0e-6);
   retval = IDASVtolerances(ida_mem, reltol, abstol);
   if (check_retval(&retval, "IDASVtolerances", 1)) return(1);
 
@@ -391,12 +391,12 @@ int main(int argc, char *argv[])
 /*
  * Residual routine. Compute F(t,y,y',p).
  */
-static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
+static int res(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user_data)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype yp1, yp2;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype yp1, yp2;
 
   data = (UserData) user_data;
   p1 = data->p[0];
@@ -422,18 +422,18 @@ static int res(realtype t, N_Vector yy, N_Vector yp, N_Vector resval, void *user
  * Jacobian routine. Compute J(t,y).
 */
 
-static int Jac(realtype t, realtype cj,
+static int Jac(sunrealtype t, sunrealtype cj,
                N_Vector yy, N_Vector yp, N_Vector resvec,
                SUNMatrix JJ, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   UserData userdata;
-  realtype p1, p2, p3;
+  sunrealtype p1, p2, p3;
 
   yval = N_VGetArrayPointer(yy);
 
@@ -475,18 +475,18 @@ static int Jac(realtype t, realtype cj,
  * resS routine. Compute sensitivity r.h.s.
  */
 
-static int resS(int Ns, realtype t,
+static int resS(int Ns, sunrealtype t,
                 N_Vector yy, N_Vector yp, N_Vector resval,
                 N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                 void *user_data,
                 N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   UserData data;
-  realtype p1, p2, p3;
-  realtype y1, y2, y3;
-  realtype s1, s2, s3;
-  realtype sd1, sd2;
-  realtype rs1, rs2, rs3;
+  sunrealtype p1, p2, p3;
+  sunrealtype y1, y2, y3;
+  sunrealtype s1, s2, s3;
+  sunrealtype sd1, sd2;
+  sunrealtype rs1, rs2, rs3;
   int is;
 
   data = (UserData) user_data;
@@ -534,7 +534,7 @@ static int resS(int Ns, realtype t,
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector y, N_Vector yp,
+static int rhsQ(sunrealtype t, N_Vector y, N_Vector yp,
               N_Vector ypQ, void* user_data)
 {
   UserData data;
@@ -562,7 +562,7 @@ static int rhsQ(realtype t, N_Vector y, N_Vector yp,
  */
 
 static void ProcessArgs(int argc, char *argv[],
-                        booleantype *sensi, int *sensi_meth, booleantype *err_con)
+                        sunbooleantype *sensi, int *sensi_meth, sunbooleantype *err_con)
 {
   *sensi = SUNFALSE;
   *sensi_meth = -1;
@@ -611,7 +611,7 @@ static void WrongArgs(char *name)
 
 static void PrintIC(N_Vector y, N_Vector yp)
 {
-  realtype* data;
+  sunrealtype* data;
 
   data = N_VGetArrayPointer(y);
   printf("\n\nConsistent IC:\n");
@@ -637,7 +637,7 @@ static void PrintIC(N_Vector y, N_Vector yp)
 }
 static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(yS[0]);
   printf("                  Sensitivity 1  ");
@@ -709,11 +709,11 @@ static void PrintSensIC(N_Vector y, N_Vector yp, N_Vector* yS, N_Vector* ypS)
  * Print current t, step count, order, stepsize, and solution.
  */
 
-static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
+static void PrintOutput(void *ida_mem, sunrealtype t, N_Vector u)
 {
   long int nst;
   int qu, retval;
-  realtype hu, *udata;
+  sunrealtype hu, *udata;
 
   udata = N_VGetArrayPointer(u);
 
@@ -750,7 +750,7 @@ static void PrintOutput(void *ida_mem, realtype t, N_Vector u)
 
 static void PrintSensOutput(N_Vector *uS)
 {
-  realtype *sdata;
+  sunrealtype *sdata;
 
   sdata = N_VGetArrayPointer(uS[0]);
   printf("                  Sensitivity 1  ");
@@ -790,7 +790,7 @@ static void PrintSensOutput(N_Vector *uS)
  * Print some final statistics from the IDAS memory.
  */
 
-static void PrintFinalStats(void *ida_mem, booleantype sensi)
+static void PrintFinalStats(void *ida_mem, sunbooleantype sensi)
 {
   long int nst;
   long int nfe, nsetups, nni, nnf, ncfn, netf;
diff --git a/examples/idas/serial/idasRoberts_dns.c b/examples/idas/serial/idasRoberts_dns.c
index 8abb0ab833..02733bf78a 100644
--- a/examples/idas/serial/idasRoberts_dns.c
+++ b/examples/idas/serial/idasRoberts_dns.c
@@ -40,7 +40,7 @@
 #include <sunmatrix/sunmatrix_dense.h>        /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h>        /* access to dense SUNLinearSolver      */
 #include <sunnonlinsol/sunnonlinsol_newton.h> /* access to Newton SUNNonlinearSolver  */
-#include <sundials/sundials_types.h>          /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>          /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>           /* defs. of SUNRabs, SUNRexp, etc.      */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -58,8 +58,8 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Macro to define dense matrix elements, indexed from 1. */
 
@@ -67,23 +67,23 @@
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol);
 
 /*
  *--------------------------------------------------------------------
@@ -95,8 +95,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -131,20 +131,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -208,7 +208,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -250,16 +250,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -270,15 +270,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -287,23 +287,23 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
 
   yval = N_VGetArrayPointer(yy);
 
-  IJth(JJ,1,1) = RCONST(-0.04) - cj;
-  IJth(JJ,2,1) = RCONST(0.04);
+  IJth(JJ,1,1) = SUN_RCONST(-0.04) - cj;
+  IJth(JJ,2,1) = SUN_RCONST(0.04);
   IJth(JJ,3,1) = ONE;
-  IJth(JJ,1,2) = RCONST(1.0e4)*yval[2];
-  IJth(JJ,2,2) = RCONST(-1.0e4)*yval[2] - RCONST(6.0e7)*yval[1] - cj;
+  IJth(JJ,1,2) = SUN_RCONST(1.0e4)*yval[2];
+  IJth(JJ,2,2) = SUN_RCONST(-1.0e4)*yval[2] - SUN_RCONST(6.0e7)*yval[1] - cj;
   IJth(JJ,3,2) = ONE;
-  IJth(JJ,1,3) = RCONST(1.0e4)*yval[1];
-  IJth(JJ,2,3) = RCONST(-1.0e4)*yval[1];
+  IJth(JJ,1,3) = SUN_RCONST(1.0e4)*yval[1];
+  IJth(JJ,2,3) = SUN_RCONST(-1.0e4)*yval[1];
   IJth(JJ,3,3) = ONE;
 
   return(0);
@@ -319,9 +319,9 @@ int jacrob(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -356,12 +356,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
@@ -430,25 +430,25 @@ static int check_retval(void *returnvalue, const char *funcname, int opt)
 
 /* compare the solution at the final time 4e10s to a reference solution computed
    using a relative tolerance of 1e-8 and absoltue tolerance of 1e-14 */
-static int check_ans(N_Vector y, realtype t, realtype rtol, N_Vector atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, N_Vector atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) retval */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
+  sunrealtype err;               /* wrms error                       */
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(y);
   ewt = N_VClone(y);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(5.2083474251394888e-08);
-  NV_Ith_S(ref,1) = RCONST(2.0833390772616859e-13);
-  NV_Ith_S(ref,2) = RCONST(9.9999994791631752e-01);
+  NV_Ith_S(ref,0) = SUN_RCONST(5.2083474251394888e-08);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.0833390772616859e-13);
+  NV_Ith_S(ref,2) = SUN_RCONST(9.9999994791631752e-01);
 
   /* compute the error weight vector, loosen atol */
   N_VAbs(ref, ewt);
-  N_VLinearSum(rtol, ewt, RCONST(10.0), atol, ewt);
+  N_VLinearSum(rtol, ewt, SUN_RCONST(10.0), atol, ewt);
   if (N_VMin(ewt) <= ZERO) {
     fprintf(stderr, "\nSUNDIALS_ERROR: check_ans failed - ewt <= 0\n\n");
     return(-1);
diff --git a/examples/idas/serial/idasRoberts_klu.c b/examples/idas/serial/idasRoberts_klu.c
index bf50848a6d..25bda3a3fc 100644
--- a/examples/idas/serial/idasRoberts_klu.c
+++ b/examples/idas/serial/idasRoberts_klu.c
@@ -38,7 +38,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_klu.h>       /* access to KLU linear solver          */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Problem Constants */
@@ -46,30 +46,30 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrobCSC(realtype tt,  realtype cj,
+int jacrobCSC(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
-int jacrobCSR(realtype tt,  realtype cj,
+int jacrobCSR(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static void PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -84,8 +84,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -118,20 +118,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -188,7 +188,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -219,16 +219,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -239,15 +239,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -256,15 +256,15 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrobCSC(realtype tt,  realtype cj,
+int jacrobCSC(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -276,25 +276,25 @@ int jacrobCSC(realtype tt,  realtype cj,
   colptrs[3] = 9;
 
   /* column 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   rowvals[0] = 0;
-  data[1] = RCONST(0.04);
+  data[1] = SUN_RCONST(0.04);
   rowvals[1] = 1;
   data[2] = ONE;
   rowvals[2] = 2;
 
   /* column 1 */
-  data[3] = RCONST(1.0e4)*yval[2];
+  data[3] = SUN_RCONST(1.0e4)*yval[2];
   rowvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   rowvals[4] = 1;
   data[5] = ONE;
   rowvals[5] = 2;
 
   /* column 2 */
-  data[6] = RCONST(1.0e4)*yval[1];
+  data[6] = SUN_RCONST(1.0e4)*yval[1];
   rowvals[6] = 0;
-  data[7] = RCONST(-1.0e4)*yval[1];
+  data[7] = SUN_RCONST(-1.0e4)*yval[1];
   rowvals[7] = 1;
   data[8] = ONE;
   rowvals[8] = 2;
@@ -305,15 +305,15 @@ int jacrobCSC(realtype tt,  realtype cj,
 /*
  * Define the Jacobian function, where Jacobian is CSR matrix.
  */
-int jacrobCSR(realtype tt,  realtype cj,
+int jacrobCSR(sunrealtype tt,  sunrealtype cj,
               N_Vector yy, N_Vector yp, N_Vector resvec,
               SUNMatrix JJ, void *user_data,
               N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *colvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -325,19 +325,19 @@ int jacrobCSR(realtype tt,  realtype cj,
   rowptrs[3] = 9;
 
   /* row 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   colvals[0] = 0;
-  data[1] = RCONST(1.0e4)*yval[2];
+  data[1] = SUN_RCONST(1.0e4)*yval[2];
   colvals[1] = 1;
-  data[2] = RCONST(1.0e4)*yval[1];
+  data[2] = SUN_RCONST(1.0e4)*yval[1];
   colvals[2] = 2;
 
   /* row 1 */
-  data[3] = RCONST(0.04);
+  data[3] = SUN_RCONST(0.04);
   colvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   colvals[4] = 1;
-  data[5] = RCONST(-1.0e4)*yval[1];
+  data[5] = SUN_RCONST(-1.0e4)*yval[1];
   colvals[5] = 2;
 
   /* row 2 */
@@ -361,9 +361,9 @@ int jacrobCSR(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -398,12 +398,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/idas/serial/idasRoberts_sps.c b/examples/idas/serial/idasRoberts_sps.c
index 6aaf7b66aa..8abf326224 100644
--- a/examples/idas/serial/idasRoberts_sps.c
+++ b/examples/idas/serial/idasRoberts_sps.c
@@ -38,7 +38,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix           */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT linear solver    */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>        /* defs. of SUNRabs, SUNRexp, etc.      */
 
 /* Problem Constants */
@@ -46,25 +46,25 @@
 #define NEQ   3
 #define NOUT  12
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Prototypes of functions called by IDA */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp,
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
 
-static int grob(realtype t, N_Vector yy, N_Vector yp,
-                realtype *gout, void *user_data);
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp,
+                sunrealtype *gout, void *user_data);
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static void PrintRootInfo(int root_f1, int root_f2);
 static void PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -79,8 +79,8 @@ int main(void)
 {
   void *mem;
   N_Vector yy, yp, avtol;
-  realtype rtol, *yval, *ypval, *atval;
-  realtype t0, tout1, tout, tret;
+  sunrealtype rtol, *yval, *ypval, *atval;
+  sunrealtype t0, tout1, tout, tret;
   int iout, retval, retvalr;
   int rootsfound[2];
   SUNMatrix A;
@@ -113,20 +113,20 @@ int main(void)
   yval[2] = ZERO;
 
   ypval = N_VGetArrayPointer(yp);
-  ypval[0]  = RCONST(-0.04);
-  ypval[1]  = RCONST(0.04);
+  ypval[0]  = SUN_RCONST(-0.04);
+  ypval[1]  = SUN_RCONST(0.04);
   ypval[2]  = ZERO;
 
-  rtol = RCONST(1.0e-4);
+  rtol = SUN_RCONST(1.0e-4);
 
   atval = N_VGetArrayPointer(avtol);
-  atval[0] = RCONST(1.0e-8);
-  atval[1] = RCONST(1.0e-6);
-  atval[2] = RCONST(1.0e-6);
+  atval[0] = SUN_RCONST(1.0e-8);
+  atval[1] = SUN_RCONST(1.0e-6);
+  atval[2] = SUN_RCONST(1.0e-6);
 
   /* Integration limits */
   t0 = ZERO;
-  tout1 = RCONST(0.4);
+  tout1 = SUN_RCONST(0.4);
 
   PrintHeader(rtol, avtol, yy);
 
@@ -183,7 +183,7 @@ int main(void)
 
     if (retval == IDA_SUCCESS) {
       iout++;
-      tout *= RCONST(10.0);
+      tout *= SUN_RCONST(10.0);
     }
 
     if (iout == NOUT) break;
@@ -214,16 +214,16 @@ int main(void)
  * Define the system residual function.
  */
 
-int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+int resrob(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype *yval, *ypval, *rval;
+  sunrealtype *yval, *ypval, *rval;
 
   yval = N_VGetArrayPointer(yy);
   ypval = N_VGetArrayPointer(yp);
   rval = N_VGetArrayPointer(rr);
 
-  rval[0]  = RCONST(-0.04)*yval[0] + RCONST(1.0e4)*yval[1]*yval[2];
-  rval[1]  = -rval[0] - RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
+  rval[0]  = SUN_RCONST(-0.04)*yval[0] + SUN_RCONST(1.0e4)*yval[1]*yval[2];
+  rval[1]  = -rval[0] - SUN_RCONST(3.0e7)*yval[1]*yval[1] - ypval[1];
   rval[0] -=  ypval[0];
   rval[2]  =  yval[0] + yval[1] + yval[2] - ONE;
 
@@ -234,15 +234,15 @@ int resrob(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data
  * Root function routine. Compute functions g_i(t,y) for i = 0,1.
  */
 
-static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
+static int grob(sunrealtype t, N_Vector yy, N_Vector yp, sunrealtype *gout,
                 void *user_data)
 {
-  realtype *yval, y1, y3;
+  sunrealtype *yval, y1, y3;
 
   yval = N_VGetArrayPointer(yy);
   y1 = yval[0]; y3 = yval[2];
-  gout[0] = y1 - RCONST(0.0001);
-  gout[1] = y3 - RCONST(0.01);
+  gout[0] = y1 - SUN_RCONST(0.0001);
+  gout[1] = y3 - SUN_RCONST(0.01);
 
   return(0);
 }
@@ -251,15 +251,15 @@ static int grob(realtype t, N_Vector yy, N_Vector yp, realtype *gout,
  * Define the Jacobian function.
  */
 
-int jacrob(realtype tt,  realtype cj,
+int jacrob(sunrealtype tt,  sunrealtype cj,
            N_Vector yy, N_Vector yp, N_Vector resvec,
            SUNMatrix JJ, void *user_data,
            N_Vector tempv1, N_Vector tempv2, N_Vector tempv3)
 {
-  realtype *yval;
+  sunrealtype *yval;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(JJ);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(JJ);
-  realtype *data = SUNSparseMatrix_Data(JJ);
+  sunrealtype *data = SUNSparseMatrix_Data(JJ);
 
   yval = N_VGetArrayPointer(yy);
 
@@ -271,25 +271,25 @@ int jacrob(realtype tt,  realtype cj,
   colptrs[3] = 9;
 
   /* column 0 */
-  data[0] = RCONST(-0.04) - cj;
+  data[0] = SUN_RCONST(-0.04) - cj;
   rowvals[0] = 0;
-  data[1] = RCONST(0.04);
+  data[1] = SUN_RCONST(0.04);
   rowvals[1] = 1;
   data[2] = ONE;
   rowvals[2] = 2;
 
   /* column 1 */
-  data[3] = RCONST(1.0e4)*yval[2];
+  data[3] = SUN_RCONST(1.0e4)*yval[2];
   rowvals[3] = 0;
-  data[4] = (RCONST(-1.0e4)*yval[2]) - (RCONST(6.0e7)*yval[1]) - cj;
+  data[4] = (SUN_RCONST(-1.0e4)*yval[2]) - (SUN_RCONST(6.0e7)*yval[1]) - cj;
   rowvals[4] = 1;
   data[5] = ONE;
   rowvals[5] = 2;
 
   /* column 2 */
-  data[6] = RCONST(1.0e4)*yval[1];
+  data[6] = SUN_RCONST(1.0e4)*yval[1];
   rowvals[6] = 0;
-  data[7] = RCONST(-1.0e4)*yval[1];
+  data[7] = SUN_RCONST(-1.0e4)*yval[1];
   rowvals[7] = 1;
   data[8] = ONE;
   rowvals[8] = 2;
@@ -307,9 +307,9 @@ int jacrob(realtype tt,  realtype cj,
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, N_Vector avtol, N_Vector y)
 {
-  realtype *atval, *yval;
+  sunrealtype *atval, *yval;
 
   atval  = N_VGetArrayPointer(avtol);
   yval  = N_VGetArrayPointer(y);
@@ -344,12 +344,12 @@ static void PrintHeader(realtype rtol, N_Vector avtol, N_Vector y)
  * Print Output
  */
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/idas/serial/idasSlCrank_FSA_dns.c b/examples/idas/serial/idasSlCrank_FSA_dns.c
index b958d03199..5d86efcde5 100644
--- a/examples/idas/serial/idasSlCrank_FSA_dns.c
+++ b/examples/idas/serial/idasSlCrank_FSA_dns.c
@@ -37,7 +37,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #define Ith(v,i)    NV_Ith_S(v,i-1)       /* i-th vector component i= 1..NEQ */
 
@@ -46,45 +46,45 @@
 #define NEQ   10
 #define NP     2
 
-#define TBEGIN  RCONST(0.0)
-#define TEND    RCONST(10.000)
+#define TBEGIN  SUN_RCONST(0.0)
+#define TEND    SUN_RCONST(10.000)
 
-#define RTOLF   RCONST(1.0e-06)
-#define ATOLF   RCONST(1.0e-07)
+#define RTOLF   SUN_RCONST(1.0e-06)
+#define ATOLF   SUN_RCONST(1.0e-07)
 
-#define RTOLQ   RCONST(1.0e-06)
-#define ATOLQ   RCONST(1.0e-08)
+#define RTOLQ   SUN_RCONST(1.0e-06)
+#define ATOLQ   SUN_RCONST(1.0e-08)
 
-#define RTOLFD  RCONST(1.0e-06)
-#define ATOLFD  RCONST(1.0e-08)
+#define RTOLFD  SUN_RCONST(1.0e-06)
+#define ATOLFD  SUN_RCONST(1.0e-08)
 
 
-#define ZERO     RCONST(0.00)
-#define QUARTER  RCONST(0.25)
-#define HALF     RCONST(0.50)
-#define ONE      RCONST(1.00)
-#define TWO      RCONST(2.00)
-#define FOUR     RCONST(4.00)
+#define ZERO     SUN_RCONST(0.00)
+#define QUARTER  SUN_RCONST(0.25)
+#define HALF     SUN_RCONST(0.50)
+#define ONE      SUN_RCONST(1.00)
+#define TWO      SUN_RCONST(2.00)
+#define FOUR     SUN_RCONST(4.00)
 
 typedef struct {
-  realtype a;
-  realtype J1, J2, m1, m2;
-  realtype l0;
-  realtype params[2];
-  realtype F;
+  sunrealtype a;
+  sunrealtype J1, J2, m1, m2;
+  sunrealtype l0;
+  sunrealtype params[2];
+  sunrealtype F;
 } *UserData;
 
-static int ressc(realtype tres, N_Vector yy, N_Vector yp,
+static int ressc(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 
-static int rhsQS(int Ns, realtype t, N_Vector yy, N_Vector yp,
+static int rhsQS(int Ns, sunrealtype t, N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS, N_Vector rrQ, N_Vector *rhsvalQS,
                  void *user_data,  N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS);
 
 
 static void setIC(N_Vector yy, N_Vector yp, UserData data);
-static void force(N_Vector yy, realtype *Q, UserData data);
+static void force(N_Vector yy, sunrealtype *Q, UserData data);
 
 static int PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
@@ -100,11 +100,11 @@ int main(void)
 
   void *mem;
   N_Vector yy, yp, id, q, *yyS, *ypS, *qS;
-  realtype tret;
-  realtype pbar[2];
-  realtype dp, G, Gm[2], Gp[2];
+  sunrealtype tret;
+  sunrealtype pbar[2];
+  sunrealtype dp, G, Gm[2], Gp[2];
   int retval, is;
-  realtype atolS[NP];
+  sunrealtype atolS[NP];
   SUNMatrix A;
   SUNLinearSolver LS;
   SUNContext ctx;
@@ -370,10 +370,10 @@ int main(void)
 
 static void setIC(N_Vector yy, N_Vector yp, UserData data)
 {
-  realtype pi;
-  realtype a, J1, m2, J2;
-  realtype q, p, x;
-  realtype Q[3];
+  sunrealtype pi;
+  sunrealtype a, J1, m2, J2;
+  sunrealtype q, p, x;
+  sunrealtype Q[3];
 
   N_VConst(ZERO, yy);
   N_VConst(ZERO, yp);
@@ -401,14 +401,14 @@ static void setIC(N_Vector yy, N_Vector yp, UserData data)
 
 }
 
-static void force(N_Vector yy, realtype *Q, UserData data)
+static void force(N_Vector yy, sunrealtype *Q, UserData data)
 {
-  realtype a, k, c, l0, F;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype s1, c1, s2, c2, s21, c21;
-  realtype l2, l, ld;
-  realtype f, fl;
+  sunrealtype a, k, c, l0, F;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype s1, c1, s2, c2, s21, c21;
+  sunrealtype l2, l, ld;
+  sunrealtype f, fl;
 
   a = data->a;
   k = data->params[0];
@@ -445,16 +445,16 @@ static void force(N_Vector yy, realtype *Q, UserData data)
 
 }
 
-static int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+static int ressc(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
   UserData data;
-  realtype Q[3];
-  realtype a, J1, m2, J2;
-  realtype *yval, *ypval, *rval;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype lam1, lam2, mu1, mu2;
-  realtype s1, c1, s2, c2;
+  sunrealtype Q[3];
+  sunrealtype a, J1, m2, J2;
+  sunrealtype *yval, *ypval, *rval;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype lam1, lam2, mu1, mu2;
+  sunrealtype s1, c1, s2, c2;
 
   data = (UserData) user_data;
 
@@ -505,10 +505,10 @@ static int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *use
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
-  realtype v1, v2, v3;
-  realtype J1, m2, J2;
+  sunrealtype v1, v2, v3;
+  sunrealtype J1, m2, J2;
   UserData data;
 
   data = (UserData) user_data;
@@ -525,14 +525,14 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
   return(0);
 }
 
-static int rhsQS(int Ns, realtype t, N_Vector yy, N_Vector yp,
+static int rhsQS(int Ns, sunrealtype t, N_Vector yy, N_Vector yp,
                  N_Vector *yyS, N_Vector *ypS, N_Vector rrQ, N_Vector *rhsvalQS,
                  void *user_data,  N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS)
 {
-  realtype v1, v2, v3;
-  realtype J1, m2, J2;
+  sunrealtype v1, v2, v3;
+  sunrealtype J1, m2, J2;
   UserData data;
-  realtype s1, s2, s3;
+  sunrealtype s1, s2, s3;
 
   data = (UserData) user_data;
 
diff --git a/examples/idas/serial/idasSlCrank_dns.c b/examples/idas/serial/idasSlCrank_dns.c
index 143b1eb0df..29a56cbb6b 100644
--- a/examples/idas/serial/idasSlCrank_dns.c
+++ b/examples/idas/serial/idasSlCrank_dns.c
@@ -36,7 +36,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix            */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver      */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #define Ith(v,i)    NV_Ith_S(v,i-1)       /* i-th vector component i= 1..NEQ */
 
@@ -44,42 +44,42 @@
 
 #define NEQ   10
 
-#define TBEGIN  RCONST(0.0)
-#define TEND    RCONST(10.0)
+#define TBEGIN  SUN_RCONST(0.0)
+#define TEND    SUN_RCONST(10.0)
 
 #define NOUT  25
 
-#define RTOLF   RCONST(1.0e-06)
-#define ATOLF   RCONST(1.0e-07)
+#define RTOLF   SUN_RCONST(1.0e-06)
+#define ATOLF   SUN_RCONST(1.0e-07)
 
-#define RTOLQ   RCONST(1.0e-06)
-#define ATOLQ   RCONST(1.0e-08)
+#define RTOLQ   SUN_RCONST(1.0e-06)
+#define ATOLQ   SUN_RCONST(1.0e-08)
 
-#define ZERO     RCONST(0.00)
-#define QUARTER  RCONST(0.25)
-#define HALF     RCONST(0.50)
-#define ONE      RCONST(1.00)
-#define TWO      RCONST(2.00)
-#define FOUR     RCONST(4.00)
+#define ZERO     SUN_RCONST(0.00)
+#define QUARTER  SUN_RCONST(0.25)
+#define HALF     SUN_RCONST(0.50)
+#define ONE      SUN_RCONST(1.00)
+#define TWO      SUN_RCONST(2.00)
+#define FOUR     SUN_RCONST(4.00)
 
 typedef struct {
-  realtype a;
-  realtype J1, J2, m1, m2;
-  realtype l0;
-  realtype params[2];
-  realtype F;
+  sunrealtype a;
+  sunrealtype J1, J2, m1, m2;
+  sunrealtype l0;
+  sunrealtype params[2];
+  sunrealtype F;
 } *UserData;
 
-static int ressc(realtype tres, N_Vector yy, N_Vector yp,
+static int ressc(sunrealtype tres, N_Vector yy, N_Vector yp,
            N_Vector resval, void *user_data);
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data);
 
 static void setIC(N_Vector yy, N_Vector yp, UserData data);
-static void force(N_Vector yy, realtype *Q, UserData data);
+static void force(N_Vector yy, sunrealtype *Q, UserData data);
 
 /* Prototypes of private functions */
-static void PrintHeader(realtype rtol, realtype avtol, N_Vector y);
-static void PrintOutput(void *mem, realtype t, N_Vector y);
+static void PrintHeader(sunrealtype rtol, sunrealtype avtol, N_Vector y);
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y);
 static int PrintFinalStats(void *mem);
 static int check_retval(void *returnvalue, const char *funcname, int opt);
 
@@ -95,7 +95,7 @@ int main(void)
 
   void *mem;
   N_Vector yy, yp, id, q;
-  realtype tret, tout;
+  sunrealtype tret, tout;
   int retval;
   SUNMatrix A;
   SUNLinearSolver LS;
@@ -210,10 +210,10 @@ int main(void)
 
 static void setIC(N_Vector yy, N_Vector yp, UserData data)
 {
-  realtype pi;
-  realtype a, J1, m2, J2;
-  realtype q, p, x;
-  realtype Q[3];
+  sunrealtype pi;
+  sunrealtype a, J1, m2, J2;
+  sunrealtype q, p, x;
+  sunrealtype Q[3];
 
   N_VConst(ZERO, yy);
   N_VConst(ZERO, yp);
@@ -241,14 +241,14 @@ static void setIC(N_Vector yy, N_Vector yp, UserData data)
 
 }
 
-static void force(N_Vector yy, realtype *Q, UserData data)
+static void force(N_Vector yy, sunrealtype *Q, UserData data)
 {
-  realtype a, k, c, l0, F;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype s1, c1, s2, c2, s21, c21;
-  realtype l2, l, ld;
-  realtype f, fl;
+  sunrealtype a, k, c, l0, F;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype s1, c1, s2, c2, s21, c21;
+  sunrealtype l2, l, ld;
+  sunrealtype f, fl;
 
   a = data->a;
   k = data->params[0];
@@ -285,16 +285,16 @@ static void force(N_Vector yy, realtype *Q, UserData data)
 
 }
 
-static int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
+static int ressc(sunrealtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *user_data)
 {
   UserData data;
-  realtype Q[3];
-  realtype a, J1, m2, J2;
-  realtype *yval, *ypval, *rval;
-  realtype q, x, p;
-  realtype qd, xd, pd;
-  realtype lam1, lam2, mu1, mu2;
-  realtype s1, c1, s2, c2;
+  sunrealtype Q[3];
+  sunrealtype a, J1, m2, J2;
+  sunrealtype *yval, *ypval, *rval;
+  sunrealtype q, x, p;
+  sunrealtype qd, xd, pd;
+  sunrealtype lam1, lam2, mu1, mu2;
+  sunrealtype s1, c1, s2, c2;
 
   data = (UserData) user_data;
 
@@ -345,10 +345,10 @@ static int ressc(realtype tres, N_Vector yy, N_Vector yp, N_Vector rr, void *use
   return(0);
 }
 
-static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
+static int rhsQ(sunrealtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_data)
 {
-  realtype v1, v2, v3;
-  realtype J1, m2, J2;
+  sunrealtype v1, v2, v3;
+  sunrealtype J1, m2, J2;
   UserData data;
 
   data = (UserData) user_data;
@@ -365,7 +365,7 @@ static int rhsQ(realtype t, N_Vector yy, N_Vector yp, N_Vector qdot, void *user_
   return(0);
 }
 
-static void PrintHeader(realtype rtol, realtype avtol, N_Vector y)
+static void PrintHeader(sunrealtype rtol, sunrealtype avtol, N_Vector y)
 {
   printf("\nidasSlCrank_dns: Slider-Crank DAE serial example problem for IDAS\n");
   printf("Linear solver: DENSE, Jacobian is computed by IDAS.\n");
@@ -385,12 +385,12 @@ static void PrintHeader(realtype rtol, realtype avtol, N_Vector y)
   printf("-----------------------------------------------------------------------\n");
 }
 
-static void PrintOutput(void *mem, realtype t, N_Vector y)
+static void PrintOutput(void *mem, sunrealtype t, N_Vector y)
 {
-  realtype *yval;
+  sunrealtype *yval;
   int retval, kused;
   long int nst;
-  realtype hused;
+  sunrealtype hused;
 
   yval  = N_VGetArrayPointer(y);
 
diff --git a/examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu b/examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu
index 8b61324436..1f40b587e6 100644
--- a/examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu
+++ b/examples/kinsol/CUDA_mpi/kin_em_mpicuda.cu
@@ -72,12 +72,12 @@
 // -----------------------------------------------------------------------------
 
 __global__
-void PxKernel(realtype *mu, realtype *Px, realtype *x,
-              realtype a1, realtype a2, realtype a3, realtype scale,
+void PxKernel(sunrealtype *mu, sunrealtype *Px, sunrealtype *x,
+              sunrealtype a1, sunrealtype a2, sunrealtype a3, sunrealtype scale,
               sunindextype N)
 {
   // Calculate all P(x_k) for each x value
-  realtype val1, val2, val3;
+  sunrealtype val1, val2, val3;
 
   int tid = blockDim.x * blockIdx.x + threadIdx.x;
 
@@ -93,13 +93,13 @@ void PxKernel(realtype *mu, realtype *Px, realtype *x,
 }
 
 __global__
-void EMKernel(realtype *mu, realtype *mu_top, realtype *mu_bottom,
-              realtype *x, realtype *Px,
-              realtype a1, realtype a2, realtype a3, realtype scale,
+void EMKernel(sunrealtype *mu, sunrealtype *mu_top, sunrealtype *mu_bottom,
+              sunrealtype *x, sunrealtype *Px,
+              sunrealtype a1, sunrealtype a2, sunrealtype a3, sunrealtype scale,
               sunindextype N)
 {
-  realtype val1, val2, val3;
-  realtype frac1, frac2, frac3;
+  sunrealtype val1, val2, val3;
+  sunrealtype frac1, frac2, frac3;
 
   int tid = blockDim.x * blockIdx.x + threadIdx.x;
 
@@ -123,7 +123,7 @@ void EMKernel(realtype *mu, realtype *mu_top, realtype *mu_bottom,
 }
 
 __global__
-void EMKernelFin(realtype *mu, realtype *mu_top, realtype *mu_bottom,
+void EMKernelFin(sunrealtype *mu, sunrealtype *mu_top, sunrealtype *mu_bottom,
                  sunindextype localn)
 {
   int tid = blockDim.x * blockIdx.x + threadIdx.x;
@@ -422,16 +422,16 @@ static int FPFunction(N_Vector u, N_Vector f, void *user_data)
 static int SetupSamples(UserData *udata)
 {
   sunindextype i, j, start, end;
-  realtype mean, val;
+  sunrealtype mean, val;
 
   // Access problem data
-  realtype *samples_local = N_VGetHostArrayPointer_Cuda(udata->samples_local);
+  sunrealtype *samples_local = N_VGetHostArrayPointer_Cuda(udata->samples_local);
   if (check_retval((void *) samples_local, "N_VGetHostArrayPointer_Cuda", 0)) return 1;
 
-  realtype *mu_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(udata->mu_true));
+  sunrealtype *mu_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(udata->mu_true));
   if (check_retval((void *) mu_host, "N_VGetHostArrayPointer_Cuda", 0)) return 1;
 
-  realtype std_dev = ONE;
+  sunrealtype std_dev = ONE;
 
   for (i = 0; i < 3; i++) {
     // Set number of samples with this mean
@@ -449,7 +449,7 @@ static int SetupSamples(UserData *udata)
     // Setup distribution parameters
     mean = mu_host[i];
     std::default_random_engine generator;
-    std::normal_distribution<realtype> distribution(mean, std_dev);
+    std::normal_distribution<sunrealtype> distribution(mean, std_dev);
 
     // Get samples
     for (j = start; j < end; j++) {
@@ -469,7 +469,7 @@ static int SetMus(UserData *udata)
 {
   sunindextype i;
 
-  realtype *mu_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(udata->mu_true));
+  sunrealtype *mu_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(udata->mu_true));
   if (check_retval((void *) mu_host, "N_VGetHostArrayPointer_Cuda", 0)) return 1;
 
   // Fill vectors with uniform random data in [-1,1]
@@ -488,14 +488,14 @@ static int SetMus(UserData *udata)
 
 static int SetStartGuess(N_Vector u, UserData* udata)
 {
-  realtype *u_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(u));
+  sunrealtype *u_host = N_VGetHostArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(u));
   if (check_retval((void *) u_host, "N_VGetHostArrayPointer_Cuda", 0)) return 1;
 
   for (sunindextype i = 0; i < udata->nodes_loc; i++)
   {
-    u_host[3 * i]     = RCONST(0.25);
-    u_host[3 * i + 1] = RCONST(3.0);
-    u_host[3 * i + 2] = RCONST(0.75);
+    u_host[3 * i]     = SUN_RCONST(0.25);
+    u_host[3 * i + 1] = SUN_RCONST(3.0);
+    u_host[3 * i + 2] = SUN_RCONST(0.75);
   }
 
   N_VCopyToDevice_Cuda(N_VGetLocalVector_MPIPlusX(u));
@@ -520,14 +520,14 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // ---------
 
   // Scale value for functions
-  realtype scale = ONE / sqrt(TWO * PI);
+  sunrealtype scale = ONE / sqrt(TWO * PI);
 
   // Get input device pointers
-  realtype *u_dev  = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(u));
-  realtype *x_dev  = N_VGetDeviceArrayPointer_Cuda(udata->samples_local);
+  sunrealtype *u_dev  = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(u));
+  sunrealtype *x_dev  = N_VGetDeviceArrayPointer_Cuda(udata->samples_local);
 
   // Get output device pointer
-  realtype *Px_dev = N_VGetDeviceArrayPointer_Cuda(udata->px);
+  sunrealtype *Px_dev = N_VGetDeviceArrayPointer_Cuda(udata->px);
 
   // Compute Px
   PxKernel<<<grid1, block>>>(u_dev, Px_dev, x_dev,
@@ -539,8 +539,8 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // ---------
 
   // Get output device pointers
-  realtype *mu_bottom_dev = N_VGetDeviceArrayPointer_Cuda(udata->mu_bottom);
-  realtype *mu_top_dev    = N_VGetDeviceArrayPointer_Cuda(udata->mu_top);
+  sunrealtype *mu_bottom_dev = N_VGetDeviceArrayPointer_Cuda(udata->mu_bottom);
+  sunrealtype *mu_top_dev    = N_VGetDeviceArrayPointer_Cuda(udata->mu_top);
 
   // Initilaize output vectors to zero (for sum reduction)
   N_VConst(ZERO, udata->mu_bottom);
@@ -554,7 +554,7 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // EM FINALIZE KERNEL
   // ------------------
 
-  realtype *f_dev = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(f));
+  sunrealtype *f_dev = N_VGetDeviceArrayPointer_Cuda(N_VGetLocalVector_MPIPlusX(f));
 
   EMKernelFin<<<grid2, block>>>(f_dev, mu_top_dev, mu_bottom_dev,
                                 udata->nodes_loc);
@@ -606,7 +606,7 @@ static int InitUserData(UserData *udata)
   udata->nodes = udata->nodes_loc * udata->nprocs_w;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-8);   // relative tolerance
+  udata->rtol        = SUN_RCONST(1.e-8);   // relative tolerance
   udata->maa         = 3;               // 3 vectors in Anderson Acceleration space
   udata->damping     = ONE;             // no damping for Anderson Acceleration
   udata->orthaa      = 0;               // use MGS for Anderson Acceleration
@@ -894,7 +894,7 @@ static int OpenOutput(UserData *udata)
     udata->rout.open(fname.str());
 
     udata->rout << scientific;
-    udata->rout << setprecision(numeric_limits<realtype>::digits10);
+    udata->rout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     // Open output stream for error
     fname.str("");
@@ -904,7 +904,7 @@ static int OpenOutput(UserData *udata)
     udata->eout.open(fname.str());
 
     udata->eout << scientific;
-    udata->eout << setprecision(numeric_limits<realtype>::digits10);
+    udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
@@ -918,12 +918,12 @@ static int WriteOutput(N_Vector u, N_Vector f, UserData *udata)
 
   // r = \|G(u) - u\|_inf
   N_VLinearSum(ONE, f, -ONE, u, udata->vtemp);
-  realtype res = N_VMaxNorm(udata->vtemp);
+  sunrealtype res = N_VMaxNorm(udata->vtemp);
 
   // e = \|u_exact - u\|_inf
   retval = SolutionError(udata->mu_true, u, udata->vtemp, udata);
   if (check_retval(&retval, "SolutionError", 1)) return 1;
-  realtype err = N_VMaxNorm(udata->vtemp);
+  sunrealtype err = N_VMaxNorm(udata->vtemp);
 
   if (outproc)
   {
diff --git a/examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp b/examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp
index 759d6fa69e..6a5e03b543 100644
--- a/examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp
+++ b/examples/kinsol/CUDA_mpi/kin_em_mpicuda.hpp
@@ -31,15 +31,15 @@
 #include "mpi.h"                       // MPI header file
 
 // Macros for problem constants
-#define PI      RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO    RCONST(0.0)
-#define ONE     RCONST(1.0)
-#define HALF    RCONST(0.5)
-#define PTTHREE RCONST(0.3)
-#define PTFOUR  RCONST(0.4)
-#define TWO     RCONST(2.0)
-#define FIVE    RCONST(5.0)
-#define TEN     RCONST(10.0)
+#define PI      SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO    SUN_RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define HALF    SUN_RCONST(0.5)
+#define PTTHREE SUN_RCONST(0.3)
+#define PTFOUR  SUN_RCONST(0.4)
+#define TWO     SUN_RCONST(2.0)
+#define FIVE    SUN_RCONST(5.0)
+#define TEN     SUN_RCONST(10.0)
 
 // Maximum size of output directory string
 #define MXSTR 2048
@@ -56,12 +56,12 @@ using namespace std;
 struct UserData
 {
   // Sigmas
-  realtype sigma;
+  sunrealtype sigma;
 
   // Alphas - mixture proportions
-  realtype alpha1;
-  realtype alpha2;
-  realtype alpha3;
+  sunrealtype alpha1;
+  sunrealtype alpha2;
+  sunrealtype alpha3;
 
   // Global total number of nodes
   sunindextype nodes;
@@ -75,7 +75,7 @@ struct UserData
   int myid;      // process ID in communicator
 
   // Fixed Point Solver settings
-  realtype rtol;        // relative tolerance
+  sunrealtype rtol;        // relative tolerance
   int      maa;         // m for Anderson Acceleration
   double   damping;     // daming for Anderson Acceleration
   int      orthaa;      // orthogonalization routine for AA
diff --git a/examples/kinsol/CXX_parallel/kin_em_p.cpp b/examples/kinsol/CXX_parallel/kin_em_p.cpp
index 70d35e8e26..f26a264427 100644
--- a/examples/kinsol/CXX_parallel/kin_em_p.cpp
+++ b/examples/kinsol/CXX_parallel/kin_em_p.cpp
@@ -354,16 +354,16 @@ static int FPFunction(N_Vector u, N_Vector f, void *user_data)
 static int SetupSamples(UserData *udata)
 {
   sunindextype i, j, start, end;
-  realtype mean, val;
+  sunrealtype mean, val;
 
   // Access problem data
-  realtype *samples_local = N_VGetArrayPointer(udata->samples_local);
+  sunrealtype *samples_local = N_VGetArrayPointer(udata->samples_local);
   if (check_retval((void *) samples_local, "N_VGetArrayPointer", 0)) return 1;
 
-  realtype *mu_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(udata->mu_true));
+  sunrealtype *mu_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(udata->mu_true));
   if (check_retval((void *) mu_host, "N_VGetArrayPointer", 0)) return 1;
 
-  realtype std_dev = ONE;
+  sunrealtype std_dev = ONE;
 
   for (i = 0; i < 3; i++) {
     // Set number of samples with this mean
@@ -381,7 +381,7 @@ static int SetupSamples(UserData *udata)
     // Setup distribution parameters
     mean = mu_host[i];
     std::default_random_engine generator;
-    std::normal_distribution<realtype> distribution(mean, std_dev);
+    std::normal_distribution<sunrealtype> distribution(mean, std_dev);
 
     // Get samples
     for (j = start; j < end; j++) {
@@ -399,7 +399,7 @@ static int SetMus(UserData *udata)
 {
   sunindextype i;
 
-  realtype *mu_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(udata->mu_true));
+  sunrealtype *mu_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(udata->mu_true));
   if (check_retval((void *) mu_host, "N_VGetArrayPointer", 0)) return 1;
 
   // Fill vectors with uniform random data in [-1,1]
@@ -416,14 +416,14 @@ static int SetMus(UserData *udata)
 
 static int SetStartGuess(N_Vector u, UserData* udata)
 {
-  realtype *u_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(u));
+  sunrealtype *u_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(u));
   if (check_retval((void *) u_host, "N_VGetArrayPointer", 0)) return 1;
 
   for (sunindextype i = 0; i < udata->nodes_loc; i++)
   {
-    u_host[3 * i]     = RCONST(0.25);
-    u_host[3 * i + 1] = RCONST(3.0);
-    u_host[3 * i + 2] = RCONST(0.75);
+    u_host[3 * i]     = SUN_RCONST(0.25);
+    u_host[3 * i + 1] = SUN_RCONST(3.0);
+    u_host[3 * i + 2] = SUN_RCONST(0.75);
   }
 
   // Return success
@@ -441,20 +441,20 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // --------------
 
   // Scale value for functions
-  realtype scale = ONE / sqrt(TWO * PI);
+  sunrealtype scale = ONE / sqrt(TWO * PI);
 
   // Get input pointers
-  realtype *u_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(u));
-  realtype *x_host = N_VGetArrayPointer(udata->samples_local);
+  sunrealtype *u_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(u));
+  sunrealtype *x_host = N_VGetArrayPointer(udata->samples_local);
 
   // Get output pointer
-  realtype *px_host  = N_VGetArrayPointer(udata->px);
+  sunrealtype *px_host  = N_VGetArrayPointer(udata->px);
 
   // Px calculation
-  realtype val1, val2, val3;
-  realtype a1 = udata->alpha1;
-  realtype a2 = udata->alpha2;
-  realtype a3 = udata->alpha3;
+  sunrealtype val1, val2, val3;
+  sunrealtype a1 = udata->alpha1;
+  sunrealtype a2 = udata->alpha2;
+  sunrealtype a3 = udata->alpha3;
   for (int i = 0; i < udata->num_samples; i++)
   {
     val1 = x_host[i] - u_host[0];
@@ -471,11 +471,11 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // --------------
 
   // Get output device pointers
-  realtype *mub_host = N_VGetArrayPointer(udata->mu_bottom);
-  realtype *mut_host = N_VGetArrayPointer(udata->mu_top);
+  sunrealtype *mub_host = N_VGetArrayPointer(udata->mu_bottom);
+  sunrealtype *mut_host = N_VGetArrayPointer(udata->mu_top);
 
   // Initialize temporary variables
-  realtype frac1, frac2, frac3;
+  sunrealtype frac1, frac2, frac3;
 
   mub_host[0] = ZERO;
   mub_host[1] = ZERO;
@@ -509,7 +509,7 @@ static int EM(N_Vector u, N_Vector f, void *user_data)
   // EM FINALIZE COMPUTATION
   // -----------------------
 
-  realtype *f_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(f));
+  sunrealtype *f_host = N_VGetArrayPointer(N_VGetLocalVector_MPIPlusX(f));
 
   // Serial EM Fin calculation
   for (int j = 0; j < udata->nodes_loc; j++)
@@ -566,7 +566,7 @@ static int InitUserData(UserData *udata)
   udata->nodes = udata->nodes_loc * udata->nprocs_w;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-8);   // relative tolerance
+  udata->rtol        = SUN_RCONST(1.e-8);   // relative tolerance
   udata->maa         = 3;               // 3 vectors in Anderson Acceleration space
   udata->damping     = ONE;             // no damping for Anderson Acceleration
   udata->orthaa      = 0;               // use MGS for Anderson Acceleration
@@ -855,7 +855,7 @@ static int OpenOutput(UserData *udata)
     udata->rout.open(fname.str());
 
     udata->rout << scientific;
-    udata->rout << setprecision(numeric_limits<realtype>::digits10);
+    udata->rout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     // Open output stream for error
     fname.str("");
@@ -865,7 +865,7 @@ static int OpenOutput(UserData *udata)
     udata->eout.open(fname.str());
 
     udata->eout << scientific;
-    udata->eout << setprecision(numeric_limits<realtype>::digits10);
+    udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
@@ -879,12 +879,12 @@ static int WriteOutput(N_Vector u, N_Vector f, UserData *udata)
 
   // r = \|G(u) - u\|_inf
   N_VLinearSum(ONE, f, -ONE, u, udata->vtemp);
-  realtype res = N_VMaxNorm(udata->vtemp);
+  sunrealtype res = N_VMaxNorm(udata->vtemp);
 
   // e = \|u_exact - u\|_inf
   retval = SolutionError(udata->mu_true, u, udata->vtemp, udata);
   if (check_retval(&retval, "SolutionError", 1)) return 1;
-  realtype err = N_VMaxNorm(udata->vtemp);
+  sunrealtype err = N_VMaxNorm(udata->vtemp);
 
   if (outproc)
   {
diff --git a/examples/kinsol/CXX_parallel/kin_em_p.hpp b/examples/kinsol/CXX_parallel/kin_em_p.hpp
index 12a24535e4..c02f08db89 100644
--- a/examples/kinsol/CXX_parallel/kin_em_p.hpp
+++ b/examples/kinsol/CXX_parallel/kin_em_p.hpp
@@ -31,15 +31,15 @@
 #include "mpi.h"                       // MPI header file
 
 // Macros for problem constants
-#define PI      RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO    RCONST(0.0)
-#define ONE     RCONST(1.0)
-#define HALF    RCONST(0.5)
-#define PTTHREE RCONST(0.3)
-#define PTFOUR  RCONST(0.4)
-#define TWO     RCONST(2.0)
-#define FIVE    RCONST(5.0)
-#define TEN     RCONST(10.0)
+#define PI      SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO    SUN_RCONST(0.0)
+#define ONE     SUN_RCONST(1.0)
+#define HALF    SUN_RCONST(0.5)
+#define PTTHREE SUN_RCONST(0.3)
+#define PTFOUR  SUN_RCONST(0.4)
+#define TWO     SUN_RCONST(2.0)
+#define FIVE    SUN_RCONST(5.0)
+#define TEN     SUN_RCONST(10.0)
 
 // Maximum size of output directory string
 #define MXSTR 2048
@@ -56,12 +56,12 @@ using namespace std;
 struct UserData
 {
   // Sigmas
-  realtype sigma;
+  sunrealtype sigma;
 
   // Alphas - mixture proportions
-  realtype alpha1;
-  realtype alpha2;
-  realtype alpha3;
+  sunrealtype alpha1;
+  sunrealtype alpha2;
+  sunrealtype alpha3;
 
   // Global total number of nodes
   sunindextype nodes;
@@ -75,7 +75,7 @@ struct UserData
   int myid;      // process ID in communicator
 
   // Fixed Point Solver settings
-  realtype rtol;        // relative tolerance
+  sunrealtype rtol;        // relative tolerance
   int      maa;         // m for Anderson Acceleration
   double   damping;     // daming for Anderson Acceleration
   int      orthaa;      // orthogonalization routine for AA
diff --git a/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.cpp b/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.cpp
index 943eb66638..600db1fc80 100644
--- a/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.cpp
+++ b/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.cpp
@@ -239,12 +239,12 @@ int main(int argc, char* argv[])
     retval = SolutionError(u, udata->e, udata);
     if (check_retval(&retval, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     if (outproc)
     {
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl;
       cout << endl;
     }
@@ -386,23 +386,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -493,15 +493,15 @@ static int FPFunction(N_Vector u, N_Vector f, void *user_data)
   sunindextype ny_loc = udata->ny_loc;
 
   // Constants for computing diffusion term
-  realtype cx = udata->kx / (udata->dx * udata->dx);
-  realtype cy = udata->ky / (udata->dy * udata->dy);
-  realtype cc = -TWO * (cx + cy);
+  sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+  sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+  sunrealtype cc = -TWO * (cx + cy);
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_retval((void *) farray, "N_VGetArrayPointer", 0)) return -1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
@@ -524,10 +524,10 @@ static int FPFunction(N_Vector u, N_Vector f, void *user_data)
   if (check_retval(&retval, "WaitRecv", 1)) return -1;
 
   // Iterate over subdomain boundaries and add rhs diffusion term
-  realtype *Warray = udata->Wrecv;
-  realtype *Earray = udata->Erecv;
-  realtype *Sarray = udata->Srecv;
-  realtype *Narray = udata->Nrecv;
+  sunrealtype *Warray = udata->Wrecv;
+  sunrealtype *Earray = udata->Erecv;
+  sunrealtype *Sarray = udata->Srecv;
+  sunrealtype *Narray = udata->Nrecv;
 
   // West face (updates south-west and north-west corners if necessary)
   if (udata->HaveNbrW)
@@ -708,16 +708,16 @@ static int SetupRHS(void *user_data)
   // ------------------------------------------------------
 
   // Access data array
-  realtype *barray = N_VGetArrayPointer(udata->b);
+  sunrealtype *barray = N_VGetArrayPointer(udata->b);
   if (check_retval((void *) barray, "N_VGetArrayPointer", 0)) return 1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
-  realtype cos_sqr_x, cos_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
+  sunrealtype cos_sqr_x, cos_sqr_y;
 
-  realtype bx = (udata->kx) * TWO * PI * PI;
-  realtype by = (udata->ky) * TWO * PI * PI;
+  sunrealtype bx = (udata->kx) * TWO * PI * PI;
+  sunrealtype by = (udata->ky) * TWO * PI * PI;
 
   // Iterate over subdomain and compute forcing term (b)
   for (j = jstart; j < jend; j++)
@@ -772,17 +772,17 @@ static int c(N_Vector u, N_Vector z, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return 1;
 
-  realtype *zarray = N_VGetArrayPointer(z);
+  sunrealtype *zarray = N_VGetArrayPointer(z);
   if (check_retval((void *) zarray, "N_VGetArrayPointer", 0)) return 1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
   N_VConst(ZERO, z);
 
   // Iterate over subdomain and compute z = c(u)
-  realtype u_val;
+  sunrealtype u_val;
 
   for (j = jstart; j < jend; j++)
   {
@@ -872,7 +872,7 @@ static int SendData(N_Vector y, UserData *udata)
   double t1 = MPI_Wtime();
 
   // Access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_retval((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // Send data
@@ -1088,7 +1088,7 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Integrator settings
-  udata->rtol        = RCONST(1.e-8);   // relative tolerance
+  udata->rtol        = SUN_RCONST(1.e-8);   // relative tolerance
   udata->maa         = 60;              // 60 vectors in Anderson Acceleration space
   udata->damping     = ONE;             // no damping for Anderson Acceleration
   udata->orthaa      = 0;               // use MGS for Anderson Acceleration
@@ -1263,8 +1263,8 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // Compute the exact solution
 static int Solution(N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
@@ -1276,7 +1276,7 @@ static int Solution(N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1457,10 +1457,10 @@ static int WriteSolution(N_Vector u, UserData *udata)
   udata->uout.open(fname.str());
 
   udata->uout << scientific;
-  udata->uout << setprecision(numeric_limits<realtype>::digits10);
+  udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
   // Write solution and error to disk
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype i = 0; i < udata->nodes_loc; i++)
@@ -1491,7 +1491,7 @@ static int OpenOutput(UserData *udata)
     udata->rout.open(fname.str());
 
     udata->rout << scientific;
-    udata->rout << setprecision(numeric_limits<realtype>::digits10);
+    udata->rout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     // Open output stream for error
     fname.str("");
@@ -1500,7 +1500,7 @@ static int OpenOutput(UserData *udata)
     udata->eout.open(fname.str());
 
     udata->eout << scientific;
-    udata->eout << setprecision(numeric_limits<realtype>::digits10);
+    udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
@@ -1514,12 +1514,12 @@ static int WriteOutput(N_Vector u, N_Vector f, UserData *udata)
 
   // r = \|G(u) - u\|_2
   N_VLinearSum(ONE, f, -ONE, u, udata->e);
-  realtype res = N_VDotProd(udata->e, udata->e);
+  sunrealtype res = N_VDotProd(udata->e, udata->e);
 
   // e = \|u_exact - u\|_2
   retval = SolutionError(u, udata->e, udata);
   if (check_retval(&retval, "SolutionError", 1)) return 1;
-  realtype err = N_VDotProd(udata->e, udata->e);
+  sunrealtype err = N_VDotProd(udata->e, udata->e);
 
   if (outproc)
   {
diff --git a/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.hpp b/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.hpp
index 5f224a7c13..fe860bda8e 100644
--- a/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.hpp
+++ b/examples/kinsol/CXX_parallel/kin_heat2D_nonlin_p.hpp
@@ -29,18 +29,18 @@
 #include "mpi.h"                       // MPI header file
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define HALF  RCONST(0.5)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define HALF  SUN_RCONST(0.5)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
 
 // Define c function type
-typedef realtype (*cFn)(realtype u_val);
+typedef sunrealtype (*cFn)(sunrealtype u_val);
 
 using namespace std;
 
@@ -51,12 +51,12 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -66,8 +66,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -104,10 +104,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -116,10 +116,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -128,7 +128,7 @@ struct UserData
   MPI_Request reqSN;
 
   // Fixed Point Solver settings
-  realtype rtol;        // relative tolerance
+  sunrealtype rtol;        // relative tolerance
   int      maa;         // m for Anderson Acceleration
   double   damping;     // daming for Anderson Acceleration
   int      orthaa;      // orthogonalization routine for AA
@@ -235,125 +235,125 @@ static int check_retval(void *flagvalue, const string funcname, int opt);
 // -----------------------------------------------------------------------------
 
 // c(u) = u
-realtype c1(realtype u_val)
+sunrealtype c1(sunrealtype u_val)
 {
   return u_val;
 }
 
 // c(u) = u^3 - u
-realtype c2(realtype u_val)
+sunrealtype c2(sunrealtype u_val)
 {
   return u_val * u_val * u_val - u_val;
 }
 
 // c(u) = u - u^2
-realtype c3(realtype u_val)
+sunrealtype c3(sunrealtype u_val)
 {
   return u_val - u_val * u_val;
 }
 
 // c(u) = e^u
-realtype c4(realtype u_val)
+sunrealtype c4(sunrealtype u_val)
 {
   return exp(u_val);
 }
 
 // c(u) = u^4
-realtype c5(realtype u_val)
+sunrealtype c5(sunrealtype u_val)
 {
   return u_val * u_val * u_val * u_val;
 }
 
 // c(u) = cos^2(u) - sin^2(u)
-realtype c6(realtype u_val)
+sunrealtype c6(sunrealtype u_val)
 {
   return (cos(u_val) * cos(u_val)) - (sin(u_val) * sin(u_val));
 }
 
 // c(u) = cos^2(u) - sin^2(u) - e^u
-realtype c7(realtype u_val)
+sunrealtype c7(sunrealtype u_val)
 {
   return (cos(u_val) * cos(u_val)) - (sin(u_val) * sin(u_val)) - exp(u_val);
 }
 
 // c(u) = e^u * u^4 - u * e^{cos(u)}
-realtype c8(realtype u_val)
+sunrealtype c8(sunrealtype u_val)
 {
-  realtype u2 = u_val * u_val;
+  sunrealtype u2 = u_val * u_val;
   return exp(u_val) * u2 * u2 - u_val * exp(cos(u_val));
 }
 
 // c(u) = e^(cos^2(u))
-realtype c9(realtype u_val)
+sunrealtype c9(sunrealtype u_val)
 {
-  realtype cos2u = cos(u_val) * cos(u_val);
+  sunrealtype cos2u = cos(u_val) * cos(u_val);
   return exp(cos2u);
 }
 
 // c(u) = 10(u - u^2)
-realtype c10(realtype u_val)
+sunrealtype c10(sunrealtype u_val)
 {
-  realtype u2 = u_val * u_val;
+  sunrealtype u2 = u_val * u_val;
   return 10.0 * (u_val - u2);
 }
 
 // c(u) = -13 + u + ((5-u)u - 2)u
-realtype c11(realtype u_val)
+sunrealtype c11(sunrealtype u_val)
 {
-  realtype temp = ((5.0 - u_val) * u_val) - 2.0;
+  sunrealtype temp = ((5.0 - u_val) * u_val) - 2.0;
   return -13.0 + u_val + temp * u_val;
 }
 
 // c(u) = sqrt(5) * (u - u^2)
-realtype c12(realtype u_val)
+sunrealtype c12(sunrealtype u_val)
 {
-  realtype temp = sqrt(5);
-  realtype u2 = u_val * u_val;
+  sunrealtype temp = sqrt(5);
+  sunrealtype u2 = u_val * u_val;
   return temp * (u_val - u2);
 }
 
 // c(u) = (u - e^u)^2 + (u + u * sin(u) - cos(u))^2
-realtype c13(realtype u_val)
+sunrealtype c13(sunrealtype u_val)
 {
-  realtype eu   = u_val - exp(u_val);
-  realtype usin = u_val * sin(u_val);
-  realtype temp = (u_val + usin - cos(u_val));
+  sunrealtype eu   = u_val - exp(u_val);
+  sunrealtype usin = u_val * sin(u_val);
+  sunrealtype temp = (u_val + usin - cos(u_val));
   return eu * eu + temp * temp;
 }
 
 // c(u) = u + ue^u + ue^{-u}
-realtype c14(realtype u_val)
+sunrealtype c14(sunrealtype u_val)
 {
-  realtype ueu  = u_val * exp(u_val);
-  realtype ue_u = u_val * exp(-u_val);
+  sunrealtype ueu  = u_val * exp(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
   return u_val + ueu + ue_u;
 }
 
 // c(u) = u + ue^u + ue^{-u} + (u - e^u)^2
-realtype c15(realtype u_val)
+sunrealtype c15(sunrealtype u_val)
 {
-  realtype ueu  = u_val * exp(u_val);
-  realtype ue_u = u_val * exp(-u_val);
-  realtype temp = u_val - exp(u_val);
+  sunrealtype ueu  = u_val * exp(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
+  sunrealtype temp = u_val - exp(u_val);
   return u_val + ueu + ue_u + (temp * temp);
 }
 
 // c(u) = u + ue^u + ue^{-u} + (u - e^u)^2 + (u + usin(u) - cos(u))^2
-realtype c16(realtype u_val)
+sunrealtype c16(sunrealtype u_val)
 {
-  realtype ueu   = u_val * exp(u_val);
-  realtype ue_u  = u_val * exp(-u_val);
-  realtype temp  = u_val - exp(u_val);
-  realtype temp2 = u_val + (u_val * sin(u_val)) - cos(u_val);
+  sunrealtype ueu   = u_val * exp(u_val);
+  sunrealtype ue_u  = u_val * exp(-u_val);
+  sunrealtype temp  = u_val - exp(u_val);
+  sunrealtype temp2 = u_val + (u_val * sin(u_val)) - cos(u_val);
   return u_val + ueu + ue_u + (temp * temp) + (temp2 * temp2);
 }
 
 // c(u) = u + ue^{-u} + e^u*(u + sin(u) - cos(u))^3
-realtype c17(realtype u_val)
+sunrealtype c17(sunrealtype u_val)
 {
-  realtype ue_u = u_val * exp(-u_val);
-  realtype eu   = exp(u_val);
-  realtype temp = u_val + sin(u_val) - cos(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
+  sunrealtype eu   = exp(u_val);
+  sunrealtype temp = u_val + sin(u_val) - cos(u_val);
   return u_val + ue_u + eu * (temp * temp * temp);
 }
 
diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
index 64445583a5..4df38655b0 100644
--- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp
@@ -432,10 +432,10 @@ static int FPFunction(N_Vector u, N_Vector f, void *user_data)
   UserData *udata = (UserData *) user_data;
 
   // Get array pointers
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return 1;
 
-  realtype *farray = N_VGetArrayPointer(f);
+  sunrealtype *farray = N_VGetArrayPointer(f);
   if (check_retval((void *) farray, "N_VGetArrayPointer", 0)) return 1;
 
   // Start timer
@@ -655,7 +655,7 @@ static int PSetup(void *user_data)
 
 // Preconditioner solve routine for Pz = r
 static int PSolve(void *user_data, N_Vector r, N_Vector z,
-                  realtype tol, int lr)
+                  sunrealtype tol, int lr)
 {
   int retval;
 
@@ -915,9 +915,9 @@ static int Jac(UserData *udata)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = ONE / (udata->dx * udata->dx);
-    realtype cy = ONE / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = ONE / (udata->dx * udata->dx);
+    sunrealtype cy = ONE / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1185,8 +1185,8 @@ static int Jac(UserData *udata)
 // Compute the starting guess
 static int InitialGuess(N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
@@ -1198,7 +1198,7 @@ static int InitialGuess(N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return 1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1274,7 +1274,7 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Fixed Point Solver settings
-  udata->rtol        = RCONST(1.e-8);   // relative tolerance
+  udata->rtol        = SUN_RCONST(1.e-8);   // relative tolerance
   udata->maa         = 1;               // 1 Anderson Acceleration vector
   udata->damping     = ONE;             // no damping for Anderson Acceleration
   udata->orthaa      = 0;               // use MGS for Anderson Acceleration
@@ -1283,7 +1283,7 @@ static int InitUserData(UserData *udata)
 
   // Linear solver and preconditioner options
   udata->liniters  = 20;            // max linear iterations
-  udata->epslin    = RCONST(1.e-8); // relative stopping tolerance
+  udata->epslin    = SUN_RCONST(1.e-8); // relative stopping tolerance
 
   // Linear solver object
   udata->LS    = NULL;
@@ -1646,10 +1646,10 @@ static int WriteSolution(N_Vector u, UserData *udata)
   udata->uout.open(fname.str());
 
   udata->uout << scientific;
-  udata->uout << setprecision(numeric_limits<realtype>::digits10);
+  udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
   // Write solution and error to disk
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype i = 0; i < udata->nodes_loc; i++)
@@ -1679,7 +1679,7 @@ static int OpenResOutput(UserData *udata)
     udata->rout.open(fname.str());
 
     udata->rout << scientific;
-    udata->rout << setprecision(numeric_limits<realtype>::digits10);
+    udata->rout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
@@ -1689,7 +1689,7 @@ static int WriteResOutput(UserData *udata)
 {
   bool outproc = (udata->myid_c == 0);
 
-  realtype res = N_VDotProd(udata->e, udata->e);
+  sunrealtype res = N_VDotProd(udata->e, udata->e);
 
   if (outproc)
   {
diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
index fb5a8c6ce1..cc032a97d8 100644
--- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
+++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.hpp
@@ -30,12 +30,12 @@
 #include "mpi.h"                            // MPI header file
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define SIX   RCONST(6.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define SIX   SUN_RCONST(6.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
@@ -49,11 +49,11 @@ using namespace std;
 struct UserData
 {
   // Exponential term coefficient
-  realtype C;
+  sunrealtype C;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -63,8 +63,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -101,16 +101,16 @@ struct UserData
   int ipN;
 
   // Fixed Point Solver settings
-  realtype rtol;        // relative tolerance
+  sunrealtype rtol;        // relative tolerance
   int      maa;         // m for Anderson Acceleration
-  realtype damping;     // daming for Anderson Acceleration
+  sunrealtype damping;     // daming for Anderson Acceleration
   int      orthaa;      // orthogonalization routine for AA
   int      maxits;      // max number of fixed point iterations
 
   // Linear solver and preconditioner settings
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Linear solver object
   SUNLinearSolver LS;  // linear solver memory structure
@@ -174,7 +174,7 @@ static int JTimes(void *user_data, N_Vector v, N_Vector Jv);
 static int PSetup(void *user_data);
 
 static int PSolve(void *user_data, N_Vector r, N_Vector z,
-                  realtype tol, int lr);
+                  sunrealtype tol, int lr);
 
 // -----------------------------------------------------------------------------
 // Helper functions
diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
index 1c0f12a76c..abc9c50a50 100644
--- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
+++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp
@@ -253,12 +253,12 @@ int main(int argc, char* argv[])
     retval = SolutionError(u, udata->e, udata);
     if (check_retval(&retval, "SolutionError", 1)) return 1;
 
-    realtype maxerr = N_VMaxNorm(udata->e);
+    sunrealtype maxerr = N_VMaxNorm(udata->e);
 
     if (outproc)
     {
       cout << scientific;
-      cout << setprecision(numeric_limits<realtype>::digits10);
+      cout << setprecision(numeric_limits<sunrealtype>::digits10);
       cout << "  Max error = " << maxerr << endl;
     }
 
@@ -399,23 +399,23 @@ static int SetupDecomp(MPI_Comm comm_w, UserData *udata)
   // Allocate exchange buffers if necessary
   if (udata->HaveNbrW)
   {
-    udata->Wrecv = new realtype[udata->ny_loc];
-    udata->Wsend = new realtype[udata->ny_loc];
+    udata->Wrecv = new sunrealtype[udata->ny_loc];
+    udata->Wsend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrE)
   {
-    udata->Erecv = new realtype[udata->ny_loc];
-    udata->Esend = new realtype[udata->ny_loc];
+    udata->Erecv = new sunrealtype[udata->ny_loc];
+    udata->Esend = new sunrealtype[udata->ny_loc];
   }
   if (udata->HaveNbrS)
   {
-    udata->Srecv = new realtype[udata->nx_loc];
-    udata->Ssend = new realtype[udata->nx_loc];
+    udata->Srecv = new sunrealtype[udata->nx_loc];
+    udata->Ssend = new sunrealtype[udata->nx_loc];
   }
   if (udata->HaveNbrN)
   {
-    udata->Nrecv = new realtype[udata->nx_loc];
-    udata->Nsend = new realtype[udata->nx_loc];
+    udata->Nrecv = new sunrealtype[udata->nx_loc];
+    udata->Nsend = new sunrealtype[udata->nx_loc];
   }
 
   // MPI neighborhood information
@@ -588,19 +588,19 @@ static int SetupRHS(void *user_data)
   // ----------------------
 
   // Access data array
-  realtype *barray = N_VGetArrayPointer(udata->b);
+  sunrealtype *barray = N_VGetArrayPointer(udata->b);
   if (check_retval((void *) barray, "N_VGetArrayPointer", 0)) return 1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
   N_VConst(ZERO, udata->b);
 
   // Iterate over subdomain and compute forcing term (b)
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
-  realtype cos_sqr_x, cos_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
+  sunrealtype cos_sqr_x, cos_sqr_y;
 
-  realtype bx = (udata->kx) * TWO * PI * PI;
-  realtype by = (udata->ky) * TWO * PI * PI;
+  sunrealtype bx = (udata->kx) * TWO * PI * PI;
+  sunrealtype by = (udata->ky) * TWO * PI * PI;
 
   for (j = jstart; j < jend; j++)
   {
@@ -654,17 +654,17 @@ static int c(N_Vector u, N_Vector z, void *user_data)
   sunindextype jend   = (udata->HaveNbrN) ? ny_loc : ny_loc - 1;
 
   // Access data arrays
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return 1;
 
-  realtype *zarray = N_VGetArrayPointer(z);
+  sunrealtype *zarray = N_VGetArrayPointer(z);
   if (check_retval((void *) zarray, "N_VGetArrayPointer", 0)) return 1;
 
   // Initialize rhs vector to zero (handles boundary conditions)
   N_VConst(ZERO, z);
 
   // Iterate over subdomain and compute z = c(u)
-  realtype u_val;
+  sunrealtype u_val;
 
   for (j = jstart; j < jend; j++)
   {
@@ -848,7 +848,7 @@ static int PSetup(void *user_data)
 
 // Preconditioner solve routine for Pz = r
 static int PSolve(void *user_data, N_Vector r, N_Vector z,
-                  realtype tol, int lr)
+                  sunrealtype tol, int lr)
 {
   int retval;
 
@@ -1108,9 +1108,9 @@ static int Jac(UserData *udata)
       (ilower[1] <= iupper[1]))
   {
     // Jacobian values
-    realtype cx = udata->kx / (udata->dx * udata->dx);
-    realtype cy = udata->ky / (udata->dy * udata->dy);
-    realtype cc = -TWO * (cx + cy);
+    sunrealtype cx = udata->kx / (udata->dx * udata->dx);
+    sunrealtype cy = udata->ky / (udata->dy * udata->dy);
+    sunrealtype cc = -TWO * (cx + cy);
 
     // --------------------------------
     // Set matrix values for all nodes
@@ -1444,7 +1444,7 @@ static int InitUserData(UserData *udata)
   udata->ipN = -1;
 
   // Fixed Point Solver settings
-  udata->rtol        = RCONST(1.e-8);   // relative tolerance
+  udata->rtol        = SUN_RCONST(1.e-8);   // relative tolerance
   udata->maa         = 0;               // no Anderson Acceleration
   udata->damping     = ONE;             // no damping for Anderson Acceleration
   udata->orthaa      = 0;               // use MGS for Anderson Acceleration
@@ -1453,7 +1453,7 @@ static int InitUserData(UserData *udata)
 
   // Linear solver and preconditioner options
   udata->liniters  = 20;            // max linear iterations
-  udata->epslin    = RCONST(1.e-8); // use default (0.05)
+  udata->epslin    = SUN_RCONST(1.e-8); // use default (0.05)
 
   // Linear solver object
   udata->LS    = NULL;
@@ -1690,8 +1690,8 @@ static int ReadInputs(int *argc, char ***argv, UserData *udata, bool outproc)
 // Compute the exact solution
 static int Solution(N_Vector u, UserData *udata)
 {
-  realtype x, y;
-  realtype sin_sqr_x, sin_sqr_y;
+  sunrealtype x, y;
+  sunrealtype sin_sqr_x, sin_sqr_y;
 
   // Initialize u to zero (handles boundary conditions)
   N_VConst(ZERO, u);
@@ -1703,7 +1703,7 @@ static int Solution(N_Vector u, UserData *udata)
   sunindextype jstart = (udata->HaveNbrS) ? 0 : 1;
   sunindextype jend   = (udata->HaveNbrN) ? udata->ny_loc : udata->ny_loc - 1;
 
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return 1;
 
   for (sunindextype j = jstart; j < jend; j++)
@@ -1916,10 +1916,10 @@ static int WriteSolution(N_Vector u, UserData *udata)
   udata->uout.open(fname.str());
 
   udata->uout << scientific;
-  udata->uout << setprecision(numeric_limits<realtype>::digits10);
+  udata->uout << setprecision(numeric_limits<sunrealtype>::digits10);
 
   // Write solution and error to disk
-  realtype *uarray = N_VGetArrayPointer(u);
+  sunrealtype *uarray = N_VGetArrayPointer(u);
   if (check_retval((void *) uarray, "N_VGetArrayPointer", 0)) return -1;
 
   for (sunindextype i = 0; i < udata->nodes_loc; i++)
@@ -1949,7 +1949,7 @@ static int OpenOutput(UserData *udata)
     udata->rout.open(fname.str());
 
     udata->rout << scientific;
-    udata->rout << setprecision(numeric_limits<realtype>::digits10);
+    udata->rout << setprecision(numeric_limits<sunrealtype>::digits10);
 
     // Open output stream for error
     fname.str("");
@@ -1958,7 +1958,7 @@ static int OpenOutput(UserData *udata)
     udata->eout.open(fname.str());
 
     udata->eout << scientific;
-    udata->eout << setprecision(numeric_limits<realtype>::digits10);
+    udata->eout << setprecision(numeric_limits<sunrealtype>::digits10);
   }
 
   return 0;
@@ -1971,12 +1971,12 @@ static int WriteOutput(N_Vector u, N_Vector f, UserData *udata)
 
   // r = \|G(u) - u\|_2
   N_VLinearSum(ONE, f, -ONE, u, udata->e);
-  realtype res = N_VDotProd(udata->e, udata->e);
+  sunrealtype res = N_VDotProd(udata->e, udata->e);
 
   // e = \|u_exact - u\|_2
   retval = SolutionError(u, udata->e, udata);
   if (check_retval(&retval, "SolutionError", 1)) return 1;
-  realtype err = N_VDotProd(udata->e, udata->e);
+  sunrealtype err = N_VDotProd(udata->e, udata->e);
 
   if (outproc)
   {
diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
index 723b93e8f7..6613124895 100644
--- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
+++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.hpp
@@ -31,17 +31,17 @@
 #include "mpi.h"                            // MPI header file
 
 // Macros for problem constants
-#define PI    RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
-#define EIGHT RCONST(8.0)
+#define PI    SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
+#define EIGHT SUN_RCONST(8.0)
 
 // Macro to access (x,y) location in 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
 
 // Define c function type
-typedef realtype (*cFn)(realtype u_val);
+typedef sunrealtype (*cFn)(sunrealtype u_val);
 
 using namespace std;
 
@@ -52,15 +52,15 @@ using namespace std;
 struct UserData
 {
   // Diffusion coefficients in the x and y directions
-  realtype kx;
-  realtype ky;
+  sunrealtype kx;
+  sunrealtype ky;
 
   // Enable/disable forcing
   bool forcing;
 
   // Upper bounds in x and y directions
-  realtype xu;
-  realtype yu;
+  sunrealtype xu;
+  sunrealtype yu;
 
   // Global number of nodes in the x and y directions
   sunindextype nx;
@@ -70,8 +70,8 @@ struct UserData
   sunindextype nodes;
 
   // Mesh spacing in the x and y directions
-  realtype dx;
-  realtype dy;
+  sunrealtype dx;
+  sunrealtype dy;
 
   // Local number of nodes in the x and y directions
   sunindextype nx_loc;
@@ -108,10 +108,10 @@ struct UserData
   int ipN;
 
   // Receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Erecv;
-  realtype *Srecv;
-  realtype *Nrecv;
+  sunrealtype *Wrecv;
+  sunrealtype *Erecv;
+  sunrealtype *Srecv;
+  sunrealtype *Nrecv;
 
   // Receive requests for neighbor exchange
   MPI_Request reqRW;
@@ -120,10 +120,10 @@ struct UserData
   MPI_Request reqRN;
 
   // Send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Esend;
-  realtype *Ssend;
-  realtype *Nsend;
+  sunrealtype *Wsend;
+  sunrealtype *Esend;
+  sunrealtype *Ssend;
+  sunrealtype *Nsend;
 
   // Send requests for neighor exchange
   MPI_Request reqSW;
@@ -132,16 +132,16 @@ struct UserData
   MPI_Request reqSN;
 
   // Fixed Point Solver settings
-  realtype rtol;        // relative tolerance
+  sunrealtype rtol;        // relative tolerance
   int      maa;         // m for Anderson Acceleration
-  realtype damping;     // daming for Anderson Acceleration
+  sunrealtype damping;     // daming for Anderson Acceleration
   int      orthaa;      // orthogonalization routine for AA
   int      maxits;      // max number of fixed point iterations
 
   // Linear solver and preconditioner settings
   int      liniters;  // number of linear iterations
   int      msbp;      // max number of steps between preconditioner setups
-  realtype epslin;    // linear solver tolerance factor
+  sunrealtype epslin;    // linear solver tolerance factor
 
   // Linear solver object
   SUNLinearSolver LS;  // linear solver memory structure
@@ -217,7 +217,7 @@ static int JTimes(void *user_data, N_Vector v, N_Vector Jv);
 static int PSetup(void *user_data);
 
 static int PSolve(void *user_data, N_Vector r, N_Vector z,
-                  realtype tol, int lr);
+                  sunrealtype tol, int lr);
 
 // -----------------------------------------------------------------------------
 // Helper functions
@@ -292,125 +292,125 @@ static int check_retval(void *flagvalue, const string funcname, int opt);
 // -----------------------------------------------------------------------------
 
 // c(u) = u
-realtype c1(realtype u_val)
+sunrealtype c1(sunrealtype u_val)
 {
   return u_val;
 }
 
 // c(u) = u^3 - u
-realtype c2(realtype u_val)
+sunrealtype c2(sunrealtype u_val)
 {
   return u_val * u_val * u_val - u_val;
 }
 
 // c(u) = u - u^2
-realtype c3(realtype u_val)
+sunrealtype c3(sunrealtype u_val)
 {
   return u_val - u_val * u_val;
 }
 
 // c(u) = e^u
-realtype c4(realtype u_val)
+sunrealtype c4(sunrealtype u_val)
 {
   return exp(u_val);
 }
 
 // c(u) = u^4
-realtype c5(realtype u_val)
+sunrealtype c5(sunrealtype u_val)
 {
   return u_val * u_val * u_val * u_val;
 }
 
 // c(u) = cos^2(u) - sin^2(u)
-realtype c6(realtype u_val)
+sunrealtype c6(sunrealtype u_val)
 {
   return (cos(u_val) * cos(u_val)) - (sin(u_val) * sin(u_val));
 }
 
 // c(u) = cos^2(u) - sin^2(u) - e^u
-realtype c7(realtype u_val)
+sunrealtype c7(sunrealtype u_val)
 {
   return (cos(u_val) * cos(u_val)) - (sin(u_val) * sin(u_val)) - exp(u_val);
 }
 
 // c(u) = e^u * u^4 - u * e^{cos(u)}
-realtype c8(realtype u_val)
+sunrealtype c8(sunrealtype u_val)
 {
-  realtype u2 = u_val * u_val;
+  sunrealtype u2 = u_val * u_val;
   return exp(u_val) * u2 * u2 - u_val * exp(cos(u_val));
 }
 
 // c(u) = e^(cos^2(u))
-realtype c9(realtype u_val)
+sunrealtype c9(sunrealtype u_val)
 {
-  realtype cos2u = cos(u_val) * cos(u_val);
+  sunrealtype cos2u = cos(u_val) * cos(u_val);
   return exp(cos2u);
 }
 
 // c(u) = 10(u - u^2)
-realtype c10(realtype u_val)
+sunrealtype c10(sunrealtype u_val)
 {
-  realtype u2 = u_val * u_val;
+  sunrealtype u2 = u_val * u_val;
   return 10.0 * (u_val - u2);
 }
 
 // c(u) = -13 + u + ((5-u)u - 2)u
-realtype c11(realtype u_val)
+sunrealtype c11(sunrealtype u_val)
 {
-  realtype temp = ((5.0 - u_val) * u_val) - 2.0;
+  sunrealtype temp = ((5.0 - u_val) * u_val) - 2.0;
   return -13.0 + u_val + temp * u_val;
 }
 
 // c(u) = sqrt(5) * (u - u^2)
-realtype c12(realtype u_val)
+sunrealtype c12(sunrealtype u_val)
 {
-  realtype temp = sqrt(5);
-  realtype u2 = u_val * u_val;
+  sunrealtype temp = sqrt(5);
+  sunrealtype u2 = u_val * u_val;
   return temp * (u_val - u2);
 }
 
 // c(u) = (u - e^u)^2 + (u + u * sin(u) - cos(u))^2
-realtype c13(realtype u_val)
+sunrealtype c13(sunrealtype u_val)
 {
-  realtype eu   = u_val - exp(u_val);
-  realtype usin = u_val * sin(u_val);
-  realtype temp = (u_val + usin - cos(u_val));
+  sunrealtype eu   = u_val - exp(u_val);
+  sunrealtype usin = u_val * sin(u_val);
+  sunrealtype temp = (u_val + usin - cos(u_val));
   return eu * eu + temp * temp;
 }
 
 // c(u) = u + ue^u + ue^{-u}
-realtype c14(realtype u_val)
+sunrealtype c14(sunrealtype u_val)
 {
-  realtype ueu  = u_val * exp(u_val);
-  realtype ue_u = u_val * exp(-u_val);
+  sunrealtype ueu  = u_val * exp(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
   return u_val + ueu + ue_u;
 }
 
 // c(u) = u + ue^u + ue^{-u} + (u - e^u)^2
-realtype c15(realtype u_val)
+sunrealtype c15(sunrealtype u_val)
 {
-  realtype ueu  = u_val * exp(u_val);
-  realtype ue_u = u_val * exp(-u_val);
-  realtype temp = u_val - exp(u_val);
+  sunrealtype ueu  = u_val * exp(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
+  sunrealtype temp = u_val - exp(u_val);
   return u_val + ueu + ue_u + (temp * temp);
 }
 
 // c(u) = u + ue^u + ue^{-u} + (u - e^u)^2 + (u + usin(u) - cos(u))^2
-realtype c16(realtype u_val)
+sunrealtype c16(sunrealtype u_val)
 {
-  realtype ueu   = u_val * exp(u_val);
-  realtype ue_u  = u_val * exp(-u_val);
-  realtype temp  = u_val - exp(u_val);
-  realtype temp2 = u_val + (u_val * sin(u_val)) - cos(u_val);
+  sunrealtype ueu   = u_val * exp(u_val);
+  sunrealtype ue_u  = u_val * exp(-u_val);
+  sunrealtype temp  = u_val - exp(u_val);
+  sunrealtype temp2 = u_val + (u_val * sin(u_val)) - cos(u_val);
   return u_val + ueu + ue_u + (temp * temp) + (temp2 * temp2);
 }
 
 // c(u) = u + ue^{-u} + e^u*(u + sin(u) - cos(u))^3
-realtype c17(realtype u_val)
+sunrealtype c17(sunrealtype u_val)
 {
-  realtype ue_u = u_val * exp(-u_val);
-  realtype eu   = exp(u_val);
-  realtype temp = u_val + sin(u_val) - cos(u_val);
+  sunrealtype ue_u = u_val * exp(-u_val);
+  sunrealtype eu   = exp(u_val);
+  sunrealtype temp = u_val + sin(u_val) - cos(u_val);
   return u_val + ue_u + eu * (temp * temp * temp);
 }
 
diff --git a/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c b/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c
index 84f81469b0..d550b3137f 100644
--- a/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c
+++ b/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c
@@ -106,7 +106,7 @@
 #include <nvector/nvector_openmp.h>    /* access to OpenMP N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #ifdef _OPENMP
 #include <omp.h>
@@ -123,29 +123,29 @@
 #define NUM_SPECIES     6  /* must equal 2*(number of prey or predators)
                               number of prey = number of predators       */
 
-#define PI       RCONST(3.1415926535898)   /* pi */
+#define PI       SUN_RCONST(3.1415926535898)   /* pi */
 
 #define MX          8              /* MX = number of x mesh points */
 #define MY          8              /* MY = number of y mesh points */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NSMX * MY)    /* number of equations in the system */
-#define AA          RCONST(1.0)    /* value of coefficient AA in above eqns */
-#define EE          RCONST(10000.) /* value of coefficient EE in above eqns */
-#define GG          RCONST(0.5e-6) /* value of coefficient GG in above eqns */
-#define BB          RCONST(1.0)    /* value of coefficient BB in above eqns */
-#define DPREY       RCONST(1.0)    /* value of coefficient dprey above */
-#define DPRED       RCONST(0.5)    /* value of coefficient dpred above */
-#define ALPHA       RCONST(1.0)    /* value of coefficient alpha above */
-#define AX          RCONST(1.0)    /* total range of x variable */
-#define AY          RCONST(1.0)    /* total range of y variable */
-#define FTOL        RCONST(1.e-7)  /* ftol tolerance */
-#define STOL        RCONST(1.e-13) /* stol tolerance */
-#define THOUSAND    RCONST(1000.0) /* one thousand */
-#define ZERO        RCONST(0.0)    /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
-#define TWO         RCONST(2.0)    /* 2. */
-#define PREYIN      RCONST(1.0)    /* initial guess for prey concentrations. */
-#define PREDIN      RCONST(30000.0)/* initial guess for predator concs.      */
+#define AA          SUN_RCONST(1.0)    /* value of coefficient AA in above eqns */
+#define EE          SUN_RCONST(10000.) /* value of coefficient EE in above eqns */
+#define GG          SUN_RCONST(0.5e-6) /* value of coefficient GG in above eqns */
+#define BB          SUN_RCONST(1.0)    /* value of coefficient BB in above eqns */
+#define DPREY       SUN_RCONST(1.0)    /* value of coefficient dprey above */
+#define DPRED       SUN_RCONST(0.5)    /* value of coefficient dpred above */
+#define ALPHA       SUN_RCONST(1.0)    /* value of coefficient alpha above */
+#define AX          SUN_RCONST(1.0)    /* total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* total range of y variable */
+#define FTOL        SUN_RCONST(1.e-7)  /* ftol tolerance */
+#define STOL        SUN_RCONST(1.e-13) /* stol tolerance */
+#define THOUSAND    SUN_RCONST(1000.0) /* one thousand */
+#define ZERO        SUN_RCONST(0.0)    /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
+#define TWO         SUN_RCONST(2.0)    /* 2. */
+#define PREYIN      SUN_RCONST(1.0)    /* initial guess for prey concentrations. */
+#define PREDIN      SUN_RCONST(30000.0)/* initial guess for predator concs.      */
 
 /* User-defined vector access macro: IJ_Vptr */
 
@@ -160,13 +160,13 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MX][MY];
+  sunrealtype **P[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype **acoef, *bcoef;
+  sunrealtype **acoef, *bcoef;
   N_Vector rates;
-  realtype *cox, *coy;
-  realtype ax, ay, dx, dy;
-  realtype uround, sqruround;
+  sunrealtype *cox, *coy;
+  sunrealtype ax, ay, dx, dy;
+  sunrealtype uround, sqruround;
   sunindextype mx, my, ns, np;
   int nthreads;
 } *UserData;
@@ -190,12 +190,12 @@ static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector cc, N_Vector sc);
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol);
+                        sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(N_Vector cc);
 static void PrintFinalStats(void *kmem);
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data);
-static realtype DotProd(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype DotProd(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *retvalvalue, const char *funcname, int opt);
 
 /*
@@ -208,7 +208,7 @@ int main(int argc, char *argv[])
 {
   SUNContext sunctx;
   int globalstrategy;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector cc, sc, constraints;
   UserData data;
   int retval, maxl, maxlrst;
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
 
 static int func(N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
+  sunrealtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
   sunindextype jx, jy, is, idyu, idyl, idxr, idxl;
   UserData data;
 
@@ -409,8 +409,8 @@ static int PrecSetupBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        void *user_data)
 {
-  realtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
-  realtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
+  sunrealtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
+  sunrealtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
   sunindextype i, j, jx, jy, ret;
   UserData data;
 
@@ -478,7 +478,7 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        N_Vector vv, void *user_data)
 {
-  realtype **Pxy, *vxy;
+  sunrealtype **Pxy, *vxy;
   sunindextype *piv, jx, jy;
   UserData data;
 
@@ -511,11 +511,11 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
  * Interaction rate function routine
  */
 
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data)
 {
   sunindextype i;
-  realtype fac;
+  sunrealtype fac;
   UserData data;
 
   data = (UserData)user_data;
@@ -531,13 +531,13 @@ static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * Dot product routine for realtype arrays
+ * Dot product routine for sunrealtype arrays
  */
 
-static realtype DotProd(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype DotProd(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -570,9 +570,9 @@ static UserData AllocUserData(void)
   }
 
   acoef = SUNDlsMat_newDenseMat(NUM_SPECIES, NUM_SPECIES);
-  bcoef = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  cox   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  coy   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
+  bcoef = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  cox   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  coy   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
 
   return(data);
 }
@@ -584,7 +584,7 @@ static UserData AllocUserData(void)
 static void InitUserData(UserData data)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   data->mx = MX;
   data->my = MY;
@@ -594,7 +594,7 @@ static void InitUserData(UserData data)
   data->ay = AY;
   data->dx = (data->ax)/(MX-1);
   data->dy = (data->ay)/(MY-1);
-  data->uround = UNIT_ROUNDOFF;
+  data->uround = SUN_UNIT_ROUNDOFF;
   data->sqruround = sqrt(data->uround);
 
   /* Set up the coefficients a and b plus others found in the equations */
@@ -661,8 +661,8 @@ static void FreeUserData(UserData data)
 static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 {
   int i, jx, jy;
-  realtype *cloc, *sloc;
-  realtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
+  sunrealtype *cloc, *sloc;
+  sunrealtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
 
   /* Initialize arrays ctemp and stemp used in the loading process */
   for (i = 0; i < NUM_SPECIES/2; i++) {
@@ -671,7 +671,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
   }
   for (i = NUM_SPECIES/2; i < NUM_SPECIES; i++) {
     ctemp[i] = PREDIN;
-    stemp[i] = RCONST(0.00001);
+    stemp[i] = SUN_RCONST(0.00001);
   }
 
   /* Load initial profiles into cc and sc vector from ctemp and stemp. */
@@ -692,7 +692,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
  */
 
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol)
+                        sunrealtype fnormtol, sunrealtype scsteptol)
 {
   printf("\nPredator-prey test problem --  KINSol (OpenMP version)\n\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -738,7 +738,7 @@ static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
 static void PrintOutput(N_Vector cc)
 {
   int is, jx, jy;
-  realtype *ct;
+  sunrealtype *ct;
 
   jy = 0; jx = 0;
   ct = IJ_Vptr(cc,jx,jy);
diff --git a/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.c b/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.c
index 86af4b0c2a..ee3b260159 100644
--- a/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.c
+++ b/examples/kinsol/parallel/kinFoodWeb_kry_bbd_p.c
@@ -97,7 +97,7 @@
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <kinsol/kinsol_bbdpre.h>      /* access to BBD preconditioner         */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* access to SUNMAX, SUNRabs, SUNRsqrt  */
 
 #include <mpi.h>
@@ -107,7 +107,7 @@
 #define NUM_SPECIES     6  /* must equal 2*(number of prey or predators)
                               number of prey = number of predators       */
 
-#define PI       RCONST(3.1415926535898)   /* pi */
+#define PI       SUN_RCONST(3.1415926535898)   /* pi */
 
 #define NPEX        2            /* number of processors in the x-direction  */
 #define NPEY        2            /* number of processors in the y-direction  */
@@ -118,22 +118,22 @@
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NSMXSUB2    (NUM_SPECIES * (MXSUB+2))
 #define NEQ         (NUM_SPECIES*MX*MY)  /* number of equations in the system */
-#define AA          RCONST(1.0)    /* value of coefficient AA in above eqns */
-#define EE          RCONST(10000.) /* value of coefficient EE in above eqns */
-#define GG          RCONST(0.5e-6) /* value of coefficient GG in above eqns */
-#define BB          RCONST(1.0)    /* value of coefficient BB in above eqns */
-#define DPREY       RCONST(1.0)    /* value of coefficient dprey above */
-#define DPRED       RCONST(0.5)    /* value of coefficient dpred above */
-#define ALPHA       RCONST(1.0)    /* value of coefficient alpha above */
-#define AX          RCONST(1.0)    /* total range of x variable */
-#define AY          RCONST(1.0)    /* total range of y variable */
-#define FTOL        RCONST(1.e-7)  /* ftol tolerance */
-#define STOL        RCONST(1.e-13) /* stol tolerance */
-#define THOUSAND    RCONST(1000.0) /* one thousand */
-#define ZERO        RCONST(0.0)    /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
-#define PREYIN      RCONST(1.0)    /* initial guess for prey concentrations. */
-#define PREDIN      RCONST(30000.0)/* initial guess for predator concs.      */
+#define AA          SUN_RCONST(1.0)    /* value of coefficient AA in above eqns */
+#define EE          SUN_RCONST(10000.) /* value of coefficient EE in above eqns */
+#define GG          SUN_RCONST(0.5e-6) /* value of coefficient GG in above eqns */
+#define BB          SUN_RCONST(1.0)    /* value of coefficient BB in above eqns */
+#define DPREY       SUN_RCONST(1.0)    /* value of coefficient dprey above */
+#define DPRED       SUN_RCONST(0.5)    /* value of coefficient dpred above */
+#define ALPHA       SUN_RCONST(1.0)    /* value of coefficient alpha above */
+#define AX          SUN_RCONST(1.0)    /* total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* total range of y variable */
+#define FTOL        SUN_RCONST(1.e-7)  /* ftol tolerance */
+#define STOL        SUN_RCONST(1.e-13) /* stol tolerance */
+#define THOUSAND    SUN_RCONST(1000.0) /* one thousand */
+#define ZERO        SUN_RCONST(0.0)    /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
+#define PREYIN      SUN_RCONST(1.0)    /* initial guess for prey concentrations. */
+#define PREDIN      SUN_RCONST(30000.0)/* initial guess for predator concs.      */
 
 /* User-defined vector access macro: IJ_Vptr */
 
@@ -148,13 +148,13 @@
    contains problem constants and extended array */
 
 typedef struct {
-  realtype **acoef, *bcoef;
+  sunrealtype **acoef, *bcoef;
   N_Vector rates;
-  realtype *cox, *coy;
-  realtype ax, ay, dx, dy;
+  sunrealtype *cox, *coy;
+  sunrealtype ax, ay, dx, dy;
   sunindextype Nlocal;
   int mx, my, ns, np;
-  realtype cext[NUM_SPECIES * (MXSUB+2)*(MYSUB+2)];
+  sunrealtype cext[NUM_SPECIES * (MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby, nsmxsub, nsmxsub2;
   MPI_Comm comm;
 } *UserData;
@@ -176,22 +176,22 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc);
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
                         sunindextype mudq, sunindextype mldq,
                         sunindextype mukeep, sunindextype mlkeep,
-                        realtype fnormtol, realtype scsteptol);
+                        sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(int my_pe, MPI_Comm comm, N_Vector cc);
 static void PrintFinalStats(void *kmem);
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data);
-static realtype DotProd(int size, realtype *x1, realtype *x2);
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2);
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, int dsizex, int dsizey,
-                  realtype *cdata);
+                  sunrealtype *cdata);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby,
                       int dsizex, int dsizey,
-                      realtype *cext, realtype *buffer);
+                      sunrealtype *cext, sunrealtype *buffer);
 static void BRecvWait(MPI_Request request[], int isubx,
-                      int isuby, int dsizex, realtype *cext,
-                      realtype *buffer);
+                      int isuby, int dsizex, sunrealtype *cext,
+                      sunrealtype *buffer);
 static int check_retval(void *retvalvalue, const char *funcname, int opt, int id);
 
 /*
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
   SUNContext sunctx;
   int globalstrategy;
   sunindextype Nlocal;
-  realtype fnormtol, scsteptol, dq_rel_uu;
+  sunrealtype fnormtol, scsteptol, dq_rel_uu;
   N_Vector cc, sc, constraints;
   UserData data;
   int retval, maxl, maxlrst;
@@ -368,7 +368,7 @@ int main(int argc, char *argv[])
 static int ccomm(sunindextype Nlocal, N_Vector cc, void *userdata)
 {
 
-  realtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cdata, *cext, buffer[2*NUM_SPECIES*MYSUB];
   UserData data;
   MPI_Comm comm;
   int my_pe, isubx, isuby, nsmxsub, nsmysub;
@@ -402,8 +402,8 @@ static int ccomm(sunindextype Nlocal, N_Vector cc, void *userdata)
 
 static int func_local(sunindextype Nlocal, N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype xx, yy, *cxy, *rxy, *fxy, dcydi, dcyui, dcxli, dcxri;
-  realtype *cext, dely, delx, *cdata;
+  sunrealtype xx, yy, *cxy, *rxy, *fxy, dcydi, dcyui, dcxli, dcxri;
+  sunrealtype *cext, dely, delx, *cdata;
   int i, jx, jy, is, ly;
   int isubx, isuby, nsmxsub, nsmxsub2;
   int shifty, offsetc, offsetce, offsetcl, offsetcr, offsetcd, offsetcu;
@@ -531,11 +531,11 @@ static int func(N_Vector cc, N_Vector fval, void *user_data)
  * Interaction rate function routine
  */
 
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data)
 {
   int i;
-  realtype fac;
+  sunrealtype fac;
   UserData data;
 
   data = (UserData)user_data;
@@ -550,13 +550,13 @@ static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * Dot product routine for realtype arrays
+ * Dot product routine for sunrealtype arrays
  */
 
-static realtype DotProd(int size, realtype *x1, realtype *x2)
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -581,9 +581,9 @@ static UserData AllocUserData(void)
   data = (UserData) malloc(sizeof *data);
 
   acoef = SUNDlsMat_newDenseMat(NUM_SPECIES, NUM_SPECIES);
-  bcoef = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  cox   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  coy   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
+  bcoef = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  cox   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  coy   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
 
   return(data);
 }
@@ -595,7 +595,7 @@ static UserData AllocUserData(void)
 static void InitUserData(int my_pe, sunindextype Nlocal, MPI_Comm comm, UserData data)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   data->mx = MX;
   data->my = MY;
@@ -670,8 +670,8 @@ static void FreeUserData(UserData data)
 static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 {
   int i, jx, jy;
-  realtype *cloc, *sloc;
-  realtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
+  sunrealtype *cloc, *sloc;
+  sunrealtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
 
   /* Initialize arrays ctemp and stemp used in the loading process */
   for (i = 0; i < NUM_SPECIES/2; i++) {
@@ -680,7 +680,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
   }
   for (i = NUM_SPECIES/2; i < NUM_SPECIES; i++) {
     ctemp[i] = PREDIN;
-    stemp[i] = RCONST(0.00001);
+    stemp[i] = SUN_RCONST(0.00001);
   }
 
   /* Load initial profiles into cc and sc vector from ctemp and stemp. */
@@ -704,7 +704,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
                         sunindextype mudq, sunindextype mldq,
 			sunindextype mukeep, sunindextype mlkeep,
-                        realtype fnormtol, realtype scsteptol)
+                        sunrealtype fnormtol, sunrealtype scsteptol)
 {
     printf("\nPredator-prey test problem--  KINSol (parallel-BBD version)\n\n");
     printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -752,7 +752,7 @@ static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
 static void PrintOutput(int my_pe, MPI_Comm comm, N_Vector cc)
 {
   int is, i0, npelast;
-  realtype  *ct, tempc[NUM_SPECIES];
+  sunrealtype  *ct, tempc[NUM_SPECIES];
   MPI_Status status;
 
   npelast = NPEX*NPEY - 1;
@@ -839,11 +839,11 @@ static void PrintFinalStats(void *kmem)
 
 static void BSend(MPI_Comm comm, int my_pe,
                   int isubx, int isuby,
-                  int dsizex, int dsizey, realtype *cdata)
+                  int dsizex, int dsizey, sunrealtype *cdata)
 {
   int i, ly;
   int offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -881,7 +881,7 @@ static void BSend(MPI_Comm comm, int my_pe,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  *  Notes:
- *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
@@ -890,12 +890,12 @@ static void BSend(MPI_Comm comm, int my_pe,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby,
                       int dsizex, int dsizey,
-                      realtype *cext, realtype *buffer)
+                      sunrealtype *cext, sunrealtype *buffer)
 {
   int offsetce;
 
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of cext */
   if (isuby != 0)
@@ -925,19 +925,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  *  Notes:
- *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
  */
 
 static void BRecvWait(MPI_Request request[], int isubx,
-                      int isuby, int dsizex, realtype *cext,
-                      realtype *buffer)
+                      int isuby, int dsizex, sunrealtype *cext,
+                      sunrealtype *buffer)
 {
   int i, ly;
   int dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
diff --git a/examples/kinsol/parallel/kinFoodWeb_kry_p.c b/examples/kinsol/parallel/kinFoodWeb_kry_p.c
index cca1534907..8a03c363a5 100644
--- a/examples/kinsol/parallel/kinFoodWeb_kry_p.c
+++ b/examples/kinsol/parallel/kinFoodWeb_kry_p.c
@@ -91,7 +91,7 @@
 #include <nvector/nvector_parallel.h>  /* access to MPI parallel N_Vector      */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 
 #include <mpi.h>
 
@@ -106,7 +106,7 @@
 #define NUM_SPECIES     6  /* must equal 2*(number of prey or predators)
                               number of prey = number of predators       */
 
-#define PI       RCONST(3.1415926535898)   /* pi */
+#define PI       SUN_RCONST(3.1415926535898)   /* pi */
 
 #define NPEX        2            /* number of processors in the x-direction  */
 #define NPEY        2            /* number of processors in the y-direction  */
@@ -117,22 +117,22 @@
 #define NSMXSUB     (NUM_SPECIES * MXSUB)
 #define NSMXSUB2    (NUM_SPECIES * (MXSUB+2))
 #define NEQ         (NUM_SPECIES*MX*MY)  /* number of equations in the system */
-#define AA          RCONST(1.0)    /* value of coefficient AA in above eqns */
-#define EE          RCONST(10000.) /* value of coefficient EE in above eqns */
-#define GG          RCONST(0.5e-6) /* value of coefficient GG in above eqns */
-#define BB          RCONST(1.0)    /* value of coefficient BB in above eqns */
-#define DPREY       RCONST(1.0)    /* value of coefficient dprey above */
-#define DPRED       RCONST(0.5)    /* value of coefficient dpred above */
-#define ALPHA       RCONST(1.0)    /* value of coefficient alpha above */
-#define AX          RCONST(1.0)    /* total range of x variable */
-#define AY          RCONST(1.0)    /* total range of y variable */
-#define FTOL        RCONST(1.e-7)  /* ftol tolerance */
-#define STOL        RCONST(1.e-13) /* stol tolerance */
-#define THOUSAND    RCONST(1000.0) /* one thousand */
-#define ZERO        RCONST(0.0)    /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
-#define PREYIN      RCONST(1.0)    /* initial guess for prey concentrations. */
-#define PREDIN      RCONST(30000.0)/* initial guess for predator concs.      */
+#define AA          SUN_RCONST(1.0)    /* value of coefficient AA in above eqns */
+#define EE          SUN_RCONST(10000.) /* value of coefficient EE in above eqns */
+#define GG          SUN_RCONST(0.5e-6) /* value of coefficient GG in above eqns */
+#define BB          SUN_RCONST(1.0)    /* value of coefficient BB in above eqns */
+#define DPREY       SUN_RCONST(1.0)    /* value of coefficient dprey above */
+#define DPRED       SUN_RCONST(0.5)    /* value of coefficient dpred above */
+#define ALPHA       SUN_RCONST(1.0)    /* value of coefficient alpha above */
+#define AX          SUN_RCONST(1.0)    /* total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* total range of y variable */
+#define FTOL        SUN_RCONST(1.e-7)  /* ftol tolerance */
+#define STOL        SUN_RCONST(1.e-13) /* stol tolerance */
+#define THOUSAND    SUN_RCONST(1000.0) /* one thousand */
+#define ZERO        SUN_RCONST(0.0)    /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
+#define PREYIN      SUN_RCONST(1.0)    /* initial guess for prey concentrations. */
+#define PREDIN      SUN_RCONST(30000.0)/* initial guess for predator concs.      */
 
 /* User-defined vector access macro: IJ_Vptr */
 
@@ -147,15 +147,15 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MXSUB][MYSUB];
+  sunrealtype **P[MXSUB][MYSUB];
   sunindextype *pivot[MXSUB][MYSUB];
-  realtype **acoef, *bcoef;
+  sunrealtype **acoef, *bcoef;
   N_Vector rates;
-  realtype *cox, *coy;
-  realtype ax, ay, dx, dy;
-  realtype uround, sqruround;
+  sunrealtype *cox, *coy;
+  sunrealtype ax, ay, dx, dy;
+  sunrealtype uround, sqruround;
   int mx, my, ns, np;
-  realtype cext[NUM_SPECIES * (MXSUB+2)*(MYSUB+2)];
+  sunrealtype cext[NUM_SPECIES * (MXSUB+2)*(MYSUB+2)];
   int my_pe, isubx, isuby, nsmxsub, nsmxsub2;
   MPI_Comm comm;
 } *UserData;
@@ -179,23 +179,23 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector cc, N_Vector sc);
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol);
+                        sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(int my_pe, MPI_Comm comm, N_Vector cc);
 static void PrintFinalStats(void *kmem);
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data);
-static realtype DotProd(int size, realtype *x1, realtype *x2);
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2);
 static void BSend(MPI_Comm comm, int my_pe, int isubx,
                   int isuby, int dsizex,
-                  int dsizey, realtype *cdata);
+                  int dsizey, sunrealtype *cdata);
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby,
                       int dsizex, int dsizey,
-                      realtype *cext, realtype *buffer);
+                      sunrealtype *cext, sunrealtype *buffer);
 static void BRecvWait(MPI_Request request[], int isubx,
-                      int isuby, int dsizex, realtype *cext,
-                      realtype *buffer);
-static void ccomm(realtype *cdata, UserData data);
+                      int isuby, int dsizex, sunrealtype *cext,
+                      sunrealtype *buffer);
+static void ccomm(sunrealtype *cdata, UserData data);
 static void fcalcprpr(N_Vector cc, N_Vector fval,void *user_data);
 static int check_retval(void *retvalvalue, const char *funcname, int opt, int id);
 
@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
   SUNContext sunctx;
   int globalstrategy;
   sunindextype local_N;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector cc, sc, constraints;
   UserData data;
   int retval, maxl, maxlrst;
@@ -364,7 +364,7 @@ int main(int argc, char *argv[])
 
 static int funcprpr(N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype *cdata;
+  sunrealtype *cdata;
   UserData data;
 
   cdata = N_VGetArrayPointer(cc);
@@ -387,8 +387,8 @@ static int Precondbd(N_Vector cc, N_Vector cscale,
                      N_Vector fval, N_Vector fscale,
                      void *user_data)
 {
-  realtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
-  realtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
+  sunrealtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
+  sunrealtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
   int i, j, jx, jy;
   sunindextype ret;
   UserData data;
@@ -453,7 +453,7 @@ static int PSolvebd(N_Vector cc, N_Vector cscale,
                     N_Vector fval, N_Vector fscale,
                     N_Vector vv, void *user_data)
 {
-  realtype **Pxy, *vxy;
+  sunrealtype **Pxy, *vxy;
   sunindextype *piv, jx, jy;
   UserData data;
 
@@ -483,11 +483,11 @@ static int PSolvebd(N_Vector cc, N_Vector cscale,
  * Interaction rate function routine
  */
 
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data)
 {
   int i;
-  realtype fac;
+  sunrealtype fac;
   UserData data;
 
   data = (UserData) user_data;
@@ -502,13 +502,13 @@ static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * Dot product routine for realtype arrays
+ * Dot product routine for sunrealtype arrays
  */
 
-static realtype DotProd(int size, realtype *x1, realtype *x2)
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -541,9 +541,9 @@ static UserData AllocUserData(void)
   }
 
   acoef = SUNDlsMat_newDenseMat(NUM_SPECIES, NUM_SPECIES);
-  bcoef = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  cox   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  coy   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
+  bcoef = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  cox   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  coy   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
 
   return(data);
 }
@@ -555,7 +555,7 @@ static UserData AllocUserData(void)
 static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   data->mx = MX;
   data->my = MY;
@@ -565,7 +565,7 @@ static void InitUserData(int my_pe, MPI_Comm comm, UserData data)
   data->ay = AY;
   data->dx = (data->ax)/(MX-1);
   data->dy = (data->ay)/(MY-1);
-  data->uround = UNIT_ROUNDOFF;
+  data->uround = SUN_UNIT_ROUNDOFF;
   data->sqruround = sqrt(data->uround);
   data->my_pe = my_pe;
   data->comm = comm;
@@ -638,8 +638,8 @@ static void FreeUserData(UserData data)
 static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 {
   int i, jx, jy;
-  realtype *cloc, *sloc;
-  realtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
+  sunrealtype *cloc, *sloc;
+  sunrealtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
 
   /* Initialize arrays ctemp and stemp used in the loading process */
   for (i = 0; i < NUM_SPECIES/2; i++) {
@@ -648,7 +648,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
   }
   for (i = NUM_SPECIES/2; i < NUM_SPECIES; i++) {
     ctemp[i] = PREDIN;
-    stemp[i] = RCONST(0.00001);
+    stemp[i] = SUN_RCONST(0.00001);
   }
 
   /* Load initial profiles into cc and sc vector from ctemp and stemp. */
@@ -669,7 +669,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
  */
 
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol)
+                        sunrealtype fnormtol, sunrealtype scsteptol)
 {
   printf("\nPredator-prey test problem --  KINSol (parallel version)\n\n");
 
@@ -718,7 +718,7 @@ static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
 static void PrintOutput(int my_pe, MPI_Comm comm, N_Vector cc)
 {
   int is, i0, npelast;
-  realtype *ct, tempc[NUM_SPECIES];
+  sunrealtype *ct, tempc[NUM_SPECIES];
   MPI_Status status;
 
   npelast = NPEX*NPEY - 1;
@@ -805,11 +805,11 @@ static void PrintFinalStats(void *kmem)
 
 static void BSend(MPI_Comm comm, int my_pe,
                   int isubx, int isuby,
-                  int dsizex, int dsizey, realtype *cdata)
+                  int dsizex, int dsizey, sunrealtype *cdata)
 {
   int i, ly;
   int offsetc, offsetbuf;
-  realtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
+  sunrealtype bufleft[NUM_SPECIES*MYSUB], bufright[NUM_SPECIES*MYSUB];
 
   /* If isuby > 0, send data from bottom x-line of u */
   if (isuby != 0)
@@ -847,7 +847,7 @@ static void BSend(MPI_Comm comm, int my_pe,
 /*
  * Routine to start receiving boundary data from neighboring PEs.
  *  Notes:
- *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *     should not be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
@@ -856,12 +856,12 @@ static void BSend(MPI_Comm comm, int my_pe,
 static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
                       int isubx, int isuby,
                       int dsizex, int dsizey,
-                      realtype *cext, realtype *buffer)
+                      sunrealtype *cext, sunrealtype *buffer)
 {
   int offsetce;
 
   /* Have bufleft and bufright use the same buffer */
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
 
   /* If isuby > 0, receive data for bottom x-line of cext */
   if (isuby != 0)
@@ -891,19 +891,19 @@ static void BRecvPost(MPI_Comm comm, MPI_Request request[], int my_pe,
 /*
  * Routine to finish receiving boundary data from neighboring PEs.
  *  Notes:
- *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB realtype entries,
+ *  1) buffer should be able to hold 2*NUM_SPECIES*MYSUB sunrealtype entries,
  *     should be passed to both the BRecvPost and BRecvWait functions, and
  *  should not be manipulated between the two calls.
  *  2) request should have 4 entries, and should be passed in both calls also.
  */
 
 static void BRecvWait(MPI_Request request[], int isubx,
-                      int isuby, int dsizex, realtype *cext,
-                      realtype *buffer)
+                      int isuby, int dsizex, sunrealtype *cext,
+                      sunrealtype *buffer)
 {
   int i, ly;
   int dsizex2, offsetce, offsetbuf;
-  realtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
+  sunrealtype *bufleft = buffer, *bufright = buffer+NUM_SPECIES*MYSUB;
   MPI_Status status;
 
   dsizex2 = dsizex + 2*NUM_SPECIES;
@@ -948,9 +948,9 @@ static void BRecvWait(MPI_Request request[], int isubx,
  * between processors of data needed to calculate f.
  */
 
-static void ccomm(realtype *cdata, UserData data)
+static void ccomm(sunrealtype *cdata, UserData data)
 {
-  realtype *cext, buffer[2*NUM_SPECIES*MYSUB];
+  sunrealtype *cext, buffer[2*NUM_SPECIES*MYSUB];
   MPI_Comm comm;
   int my_pe, isubx, isuby, nsmxsub, nsmysub;
   MPI_Request request[4];
@@ -979,8 +979,8 @@ static void ccomm(realtype *cdata, UserData data)
 
 static void fcalcprpr(N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype xx, yy, *cxy, *rxy, *fxy, dcydi, dcyui, dcxli, dcxri;
-  realtype *cext, dely, delx, *cdata;
+  sunrealtype xx, yy, *cxy, *rxy, *fxy, dcydi, dcyui, dcxli, dcxri;
+  sunrealtype *cext, dely, delx, *cdata;
   int i, jx, jy, is, ly;
   int isubx, isuby, nsmxsub, nsmxsub2;
   int shifty, offsetc, offsetce, offsetcl, offsetcr, offsetcd, offsetcu;
diff --git a/examples/kinsol/serial/kinAnalytic_fp.c b/examples/kinsol/serial/kinAnalytic_fp.c
index fb3dbe2106..7dd4d9b021 100644
--- a/examples/kinsol/serial/kinAnalytic_fp.c
+++ b/examples/kinsol/serial/kinAnalytic_fp.c
@@ -70,22 +70,22 @@
 /* problem constants */
 #define NEQ 3 /* number of equations */
 
-#define ZERO         RCONST(0.0)             /* real 0.0  */
-#define PTONE        RCONST(0.1)             /* real 0.1  */
-#define HALF         RCONST(0.5)             /* real 0.5  */
-#define PTNINE       RCONST(0.9)             /* real 0.9  */
-#define ONE          RCONST(1.0)             /* real 1.0  */
-#define ONEPTZEROSIX RCONST(1.06)            /* real 1.06 */
-#define ONEPTONE     RCONST(1.1)             /* real 1.1  */
-#define THREE        RCONST(3.0)             /* real 3.0  */
-#define FOUR         RCONST(4.0)             /* real 4.0  */
-#define SIX          RCONST(6.0)             /* real 6.0  */
-#define NINE         RCONST(9.0)             /* real 9.0  */
-#define TEN          RCONST(10.0)            /* real 10.0 */
-#define TWENTY       RCONST(20.0)            /* real 20.0 */
-#define SIXTY        RCONST(60.0)            /* real 60.0 */
-#define EIGHTYONE    RCONST(81.0)            /* real 81.0 */
-#define PI           RCONST(3.1415926535898) /* real pi   */
+#define ZERO         SUN_RCONST(0.0)             /* real 0.0  */
+#define PTONE        SUN_RCONST(0.1)             /* real 0.1  */
+#define HALF         SUN_RCONST(0.5)             /* real 0.5  */
+#define PTNINE       SUN_RCONST(0.9)             /* real 0.9  */
+#define ONE          SUN_RCONST(1.0)             /* real 1.0  */
+#define ONEPTZEROSIX SUN_RCONST(1.06)            /* real 1.06 */
+#define ONEPTONE     SUN_RCONST(1.1)             /* real 1.1  */
+#define THREE        SUN_RCONST(3.0)             /* real 3.0  */
+#define FOUR         SUN_RCONST(4.0)             /* real 4.0  */
+#define SIX          SUN_RCONST(6.0)             /* real 6.0  */
+#define NINE         SUN_RCONST(9.0)             /* real 9.0  */
+#define TEN          SUN_RCONST(10.0)            /* real 10.0 */
+#define TWENTY       SUN_RCONST(20.0)            /* real 20.0 */
+#define SIXTY        SUN_RCONST(60.0)            /* real 60.0 */
+#define EIGHTYONE    SUN_RCONST(81.0)            /* real 81.0 */
+#define PI           SUN_RCONST(3.1415926535898) /* real pi   */
 
 /* analytic solution */
 #define XTRUE HALF
@@ -95,20 +95,20 @@
 /* problem options */
 typedef struct
 {
-  realtype tol;         /* solve tolerance                  */
+  sunrealtype tol;         /* solve tolerance                  */
   long int maxiter;     /* max number of iterations         */
   long int m_aa;        /* number of acceleration vectors   */
   long int delay_aa;    /* number of iterations to delay AA */
   int      orth_aa;     /* orthogonalization method         */
-  realtype damping_fp;  /* damping parameter for FP         */
-  realtype damping_aa;  /* damping parameter for AA         */
+  sunrealtype damping_fp;  /* damping parameter for FP         */
+  sunrealtype damping_aa;  /* damping parameter for AA         */
 } *UserOpt;
 
 /* Nonlinear fixed point function */
 static int FPFunction(N_Vector u, N_Vector f, void *user_data);
 
 /* Check the system solution */
-static int check_ans(N_Vector u, realtype tol);
+static int check_ans(N_Vector u, sunrealtype tol);
 
 /* Set default options */
 static int SetDefaults(UserOpt *uopt);
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
   N_Vector  scale  = NULL;  /* scaling vector      */
   FILE*     infofp = NULL;  /* KINSOL log file     */
   long int  nni, nfe;       /* solver outputs      */
-  realtype* data;           /* vector data array   */
+  sunrealtype* data;           /* vector data array   */
   void*     kmem;           /* KINSOL memory       */
 
   /* Set default options */
@@ -312,9 +312,9 @@ int main(int argc, char *argv[])
  * ---------------------------------------------------------------------------*/
 int FPFunction(N_Vector u, N_Vector g, void* user_data)
 {
-  realtype* udata = NULL;
-  realtype* gdata = NULL;
-  realtype  x, y, z;
+  sunrealtype* udata = NULL;
+  sunrealtype* gdata = NULL;
+  sunrealtype  x, y, z;
 
   /* Get vector data arrays */
   udata = N_VGetArrayPointer(u);
@@ -337,10 +337,10 @@ int FPFunction(N_Vector u, N_Vector g, void* user_data)
 /* -----------------------------------------------------------------------------
  * Check the solution of the nonlinear system and return PASS or FAIL
  * ---------------------------------------------------------------------------*/
-static int check_ans(N_Vector u, realtype tol)
+static int check_ans(N_Vector u, sunrealtype tol)
 {
-  realtype* data = NULL;
-  realtype  ex, ey, ez;
+  sunrealtype* data = NULL;
+  sunrealtype  ex, ey, ez;
 
   /* Get vector data array */
   data = N_VGetArrayPointer(u);
@@ -384,13 +384,13 @@ static int SetDefaults(UserOpt *uopt)
   if (*uopt == NULL) return(-1);
 
   /* Set default options values */
-  (*uopt)->tol        = 100 * SQRT(UNIT_ROUNDOFF);
+  (*uopt)->tol        = 100 * SQRT(SUN_UNIT_ROUNDOFF);
   (*uopt)->maxiter    = 30;
   (*uopt)->m_aa       = 0;            /* no acceleration */
   (*uopt)->delay_aa   = 0;            /* no delay        */
   (*uopt)->orth_aa    = 0;            /* MGS             */
-  (*uopt)->damping_fp = RCONST(1.0);  /* no FP dampig    */
-  (*uopt)->damping_aa = RCONST(1.0);  /* no AA damping   */
+  (*uopt)->damping_fp = SUN_RCONST(1.0);  /* no FP dampig    */
+  (*uopt)->damping_aa = SUN_RCONST(1.0);  /* no AA damping   */
 
   return(0);
 }
diff --git a/examples/kinsol/serial/kinFerTron_dns.c b/examples/kinsol/serial/kinFerTron_dns.c
index d0e28f348c..85e2387caa 100644
--- a/examples/kinsol/serial/kinFerTron_dns.c
+++ b/examples/kinsol/serial/kinFerTron_dns.c
@@ -57,29 +57,29 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector       */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix       */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype */
 
 /* Problem Constants */
 
 #define NVAR   2
 #define NEQ    3*NVAR
 
-#define FTOL   RCONST(1.e-5) /* function tolerance */
-#define STOL   RCONST(1.e-5) /* step tolerance     */
+#define FTOL   SUN_RCONST(1.e-5) /* function tolerance */
+#define STOL   SUN_RCONST(1.e-5) /* step tolerance     */
 
-#define ZERO   RCONST(0.0)
-#define PT25   RCONST(0.25)
-#define PT5    RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
-#define TWO    RCONST(2.0)
+#define ZERO   SUN_RCONST(0.0)
+#define PT25   SUN_RCONST(0.25)
+#define PT5    SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
+#define TWO    SUN_RCONST(2.0)
 
-#define PI     RCONST(3.1415926)
-#define E      RCONST(2.7182818)
+#define PI     SUN_RCONST(3.1415926)
+#define E      SUN_RCONST(2.7182818)
 
 typedef struct {
-  realtype lb[NVAR];
-  realtype ub[NVAR];
+  sunrealtype lb[NVAR];
+  sunrealtype ub[NVAR];
 } *UserData;
 
 /* Accessor macro */
@@ -92,7 +92,7 @@ static int func(N_Vector u, N_Vector f, void *user_data);
 static void SetInitialGuess1(N_Vector u, UserData data);
 static void SetInitialGuess2(N_Vector u, UserData data);
 static int SolveIt(void *kmem, N_Vector u, N_Vector s, int glstr, int mset);
-static void PrintHeader(realtype fnormtol, realtype scsteptol);
+static void PrintHeader(sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(N_Vector u);
 static void PrintFinalStats(void *kmem);
 static int check_retval(void *retvalvalue, const char *funcname, int opt);
@@ -107,7 +107,7 @@ int main()
 {
   SUNContext sunctx;
   UserData data;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector u1, u2, u, s, c;
   int glstr, mset, retval;
   void *kmem;
@@ -324,9 +324,9 @@ static int SolveIt(void *kmem, N_Vector u, N_Vector s, int glstr, int mset)
 
 static int func(N_Vector u, N_Vector f, void *user_data)
 {
-  realtype *udata, *fdata;
-  realtype x1, l1, L1, x2, l2, L2;
-  realtype *lb, *ub;
+  sunrealtype *udata, *fdata;
+  sunrealtype x1, l1, L1, x2, l2, L2;
+  sunrealtype *lb, *ub;
   UserData data;
 
   data = (UserData)user_data;
@@ -365,9 +365,9 @@ static int func(N_Vector u, N_Vector f, void *user_data)
 
 static void SetInitialGuess1(N_Vector u, UserData data)
 {
-  realtype x1, x2;
-  realtype *udata;
-  realtype *lb, *ub;
+  sunrealtype x1, x2;
+  sunrealtype *udata;
+  sunrealtype *lb, *ub;
 
   udata = N_VGetArrayPointer(u);
 
@@ -390,9 +390,9 @@ static void SetInitialGuess1(N_Vector u, UserData data)
 
 static void SetInitialGuess2(N_Vector u, UserData data)
 {
-  realtype x1, x2;
-  realtype *udata;
-  realtype *lb, *ub;
+  sunrealtype x1, x2;
+  sunrealtype *udata;
+  sunrealtype *lb, *ub;
 
   udata = N_VGetArrayPointer(u);
 
@@ -417,7 +417,7 @@ static void SetInitialGuess2(N_Vector u, UserData data)
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype fnormtol, realtype scsteptol)
+static void PrintHeader(sunrealtype fnormtol, sunrealtype scsteptol)
 {
   printf("\nFerraris and Tronconi test problem\n");
   printf("Tolerance parameters:\n");
diff --git a/examples/kinsol/serial/kinFerTron_klu.c b/examples/kinsol/serial/kinFerTron_klu.c
index f3ea52a5b9..6a5c0fe06e 100644
--- a/examples/kinsol/serial/kinFerTron_klu.c
+++ b/examples/kinsol/serial/kinFerTron_klu.c
@@ -57,7 +57,7 @@
 #include <nvector/nvector_serial.h>     /* access to serial N_Vector       */
 #include <sunmatrix/sunmatrix_sparse.h> /* access to sparse SUNMatrix      */
 #include <sunlinsol/sunlinsol_klu.h>    /* access to KLU SUNLinearSolver   */
-#include <sundials/sundials_types.h>    /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>    /* defs. of sunrealtype, sunindextype */
 #include <sundials/sundials_math.h>     /* access to SUNRexp               */
 
 /* Problem Constants */
@@ -65,22 +65,22 @@
 #define NVAR   2
 #define NEQ    3*NVAR
 
-#define FTOL   RCONST(1.e-5) /* function tolerance */
-#define STOL   RCONST(1.e-5) /* step tolerance     */
+#define FTOL   SUN_RCONST(1.e-5) /* function tolerance */
+#define STOL   SUN_RCONST(1.e-5) /* step tolerance     */
 
-#define ZERO   RCONST(0.0)
-#define PT25   RCONST(0.25)
-#define PT5    RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
-#define TWO    RCONST(2.0)
+#define ZERO   SUN_RCONST(0.0)
+#define PT25   SUN_RCONST(0.25)
+#define PT5    SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
+#define TWO    SUN_RCONST(2.0)
 
-#define PI     RCONST(3.1415926)
-#define E      RCONST(2.7182818)
+#define PI     SUN_RCONST(3.1415926)
+#define E      SUN_RCONST(2.7182818)
 
 typedef struct {
-  realtype lb[NVAR];
-  realtype ub[NVAR];
+  sunrealtype lb[NVAR];
+  sunrealtype ub[NVAR];
   int nnz;
 } *UserData;
 
@@ -93,7 +93,7 @@ static int jac(N_Vector y, N_Vector f, SUNMatrix J,
 static void SetInitialGuess1(N_Vector u, UserData data);
 static void SetInitialGuess2(N_Vector u, UserData data);
 static int SolveIt(void *kmem, N_Vector u, N_Vector s, int glstr, int mset);
-static void PrintHeader(realtype fnormtol, realtype scsteptol);
+static void PrintHeader(sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(N_Vector u);
 static void PrintFinalStats(void *kmem);
 static int check_retval(void *retvalvalue, const char *funcname, int opt);
@@ -108,7 +108,7 @@ int main()
 {
   SUNContext sunctx;
   UserData data;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector u1, u2, u, s, c;
   int glstr, mset, retval;
   void *kmem;
@@ -330,9 +330,9 @@ static int SolveIt(void *kmem, N_Vector u, N_Vector s, int glstr, int mset)
 
 static int func(N_Vector u, N_Vector f, void *user_data)
 {
-  realtype *udata, *fdata;
-  realtype x1, l1, L1, x2, l2, L2;
-  realtype *lb, *ub;
+  sunrealtype *udata, *fdata;
+  sunrealtype x1, l1, L1, x2, l2, L2;
+  sunrealtype *lb, *ub;
   UserData params;
 
   params = (UserData)user_data;
@@ -367,10 +367,10 @@ static int func(N_Vector u, N_Vector f, void *user_data)
 static int jac(N_Vector y, N_Vector f, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
-  realtype *yd;
+  sunrealtype *yd;
   sunindextype *rowptrs = SUNSparseMatrix_IndexPointers(J);
   sunindextype *colvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
+  sunrealtype *data = SUNSparseMatrix_Data(J);
 
   yd = N_VGetArrayPointer(y);
 
@@ -437,9 +437,9 @@ static int jac(N_Vector y, N_Vector f, SUNMatrix J,
 
 static void SetInitialGuess1(N_Vector u, UserData data)
 {
-  realtype x1, x2;
-  realtype *udata;
-  realtype *lb, *ub;
+  sunrealtype x1, x2;
+  sunrealtype *udata;
+  sunrealtype *lb, *ub;
 
   udata = N_VGetArrayPointer(u);
 
@@ -462,9 +462,9 @@ static void SetInitialGuess1(N_Vector u, UserData data)
 
 static void SetInitialGuess2(N_Vector u, UserData data)
 {
-  realtype x1, x2;
-  realtype *udata;
-  realtype *lb, *ub;
+  sunrealtype x1, x2;
+  sunrealtype *udata;
+  sunrealtype *lb, *ub;
 
   udata = N_VGetArrayPointer(u);
 
@@ -489,7 +489,7 @@ static void SetInitialGuess2(N_Vector u, UserData data)
  * Print first lines of output (problem description)
  */
 
-static void PrintHeader(realtype fnormtol, realtype scsteptol)
+static void PrintHeader(sunrealtype fnormtol, sunrealtype scsteptol)
 {
   printf("\nFerraris and Tronconi test problem\n");
   printf("Tolerance parameters:\n");
diff --git a/examples/kinsol/serial/kinFoodWeb_kry.c b/examples/kinsol/serial/kinFoodWeb_kry.c
index 8b77f53672..2d835489c6 100644
--- a/examples/kinsol/serial/kinFoodWeb_kry.c
+++ b/examples/kinsol/serial/kinFoodWeb_kry.c
@@ -91,7 +91,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector            */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver      */
 #include <sundials/sundials_dense.h>   /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype      */
 #include <sundials/sundials_math.h>    /* access to SUNMAX, SUNRabs, SUNRsqrt  */
 
 /* Problem Constants */
@@ -99,29 +99,29 @@
 #define NUM_SPECIES     6  /* must equal 2*(number of prey or predators)
                               number of prey = number of predators       */
 
-#define PI       RCONST(3.1415926535898)   /* pi */
+#define PI       SUN_RCONST(3.1415926535898)   /* pi */
 
 #define MX          8              /* MX = number of x mesh points */
 #define MY          8              /* MY = number of y mesh points */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NSMX * MY)    /* number of equations in the system */
-#define AA          RCONST(1.0)    /* value of coefficient AA in above eqns */
-#define EE          RCONST(10000.) /* value of coefficient EE in above eqns */
-#define GG          RCONST(0.5e-6) /* value of coefficient GG in above eqns */
-#define BB          RCONST(1.0)    /* value of coefficient BB in above eqns */
-#define DPREY       RCONST(1.0)    /* value of coefficient dprey above */
-#define DPRED       RCONST(0.5)    /* value of coefficient dpred above */
-#define ALPHA       RCONST(1.0)    /* value of coefficient alpha above */
-#define AX          RCONST(1.0)    /* total range of x variable */
-#define AY          RCONST(1.0)    /* total range of y variable */
-#define FTOL        RCONST(1.e-7)  /* ftol tolerance */
-#define STOL        RCONST(1.e-13) /* stol tolerance */
-#define THOUSAND    RCONST(1000.0) /* one thousand */
-#define ZERO        RCONST(0.0)    /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
-#define TWO         RCONST(2.0)    /* 2. */
-#define PREYIN      RCONST(1.0)    /* initial guess for prey concentrations. */
-#define PREDIN      RCONST(30000.0)/* initial guess for predator concs.      */
+#define AA          SUN_RCONST(1.0)    /* value of coefficient AA in above eqns */
+#define EE          SUN_RCONST(10000.) /* value of coefficient EE in above eqns */
+#define GG          SUN_RCONST(0.5e-6) /* value of coefficient GG in above eqns */
+#define BB          SUN_RCONST(1.0)    /* value of coefficient BB in above eqns */
+#define DPREY       SUN_RCONST(1.0)    /* value of coefficient dprey above */
+#define DPRED       SUN_RCONST(0.5)    /* value of coefficient dpred above */
+#define ALPHA       SUN_RCONST(1.0)    /* value of coefficient alpha above */
+#define AX          SUN_RCONST(1.0)    /* total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* total range of y variable */
+#define FTOL        SUN_RCONST(1.e-7)  /* ftol tolerance */
+#define STOL        SUN_RCONST(1.e-13) /* stol tolerance */
+#define THOUSAND    SUN_RCONST(1000.0) /* one thousand */
+#define ZERO        SUN_RCONST(0.0)    /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
+#define TWO         SUN_RCONST(2.0)    /* 2. */
+#define PREYIN      SUN_RCONST(1.0)    /* initial guess for prey concentrations. */
+#define PREDIN      SUN_RCONST(30000.0)/* initial guess for predator concs.      */
 
 /* User-defined vector access macro: IJ_Vptr */
 
@@ -136,13 +136,13 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MX][MY];
+  sunrealtype **P[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype **acoef, *bcoef;
+  sunrealtype **acoef, *bcoef;
   N_Vector rates;
-  realtype *cox, *coy;
-  realtype ax, ay, dx, dy;
-  realtype uround, sqruround;
+  sunrealtype *cox, *coy;
+  sunrealtype ax, ay, dx, dy;
+  sunrealtype uround, sqruround;
   sunindextype mx, my, ns, np;
 } *UserData;
 
@@ -165,12 +165,12 @@ static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector cc, N_Vector sc);
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol);
+                        sunrealtype fnormtol, sunrealtype scsteptol);
 static void PrintOutput(N_Vector cc);
 static void PrintFinalStats(void *kmem);
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data);
-static realtype DotProd(sunindextype size, realtype *x1, realtype *x2);
+static sunrealtype DotProd(sunindextype size, sunrealtype *x1, sunrealtype *x2);
 static int check_retval(void *retvalvalue, const char *funcname, int opt);
 
 /*
@@ -183,7 +183,7 @@ int main(void)
 {
   SUNContext sunctx;
   int globalstrategy;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector cc, sc, constraints;
   UserData data;
   int retval, maxl, maxlrst;
@@ -310,7 +310,7 @@ int main(void)
 
 static int func(N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
+  sunrealtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
   sunindextype jx, jy, is, idyu, idyl, idxr, idxl;
   UserData data;
 
@@ -373,8 +373,8 @@ static int PrecSetupBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        void *user_data)
 {
-  realtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
-  realtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
+  sunrealtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
+  sunrealtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
   sunindextype i, j, jx, jy, ret;
   UserData data;
 
@@ -438,7 +438,7 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        N_Vector vv, void *user_data)
 {
-  realtype **Pxy, *vxy;
+  sunrealtype **Pxy, *vxy;
   sunindextype *piv, jx, jy;
   UserData data;
 
@@ -468,11 +468,11 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
  * Interaction rate function routine
  */
 
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data)
 {
   sunindextype i;
-  realtype fac;
+  sunrealtype fac;
   UserData data;
 
   data = (UserData)user_data;
@@ -487,13 +487,13 @@ static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * Dot product routine for realtype arrays
+ * Dot product routine for sunrealtype arrays
  */
 
-static realtype DotProd(sunindextype size, realtype *x1, realtype *x2)
+static sunrealtype DotProd(sunindextype size, sunrealtype *x1, sunrealtype *x2)
 {
   sunindextype i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -526,9 +526,9 @@ static UserData AllocUserData(void)
   }
 
   acoef = SUNDlsMat_newDenseMat(NUM_SPECIES, NUM_SPECIES);
-  bcoef = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  cox   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  coy   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
+  bcoef = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  cox   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  coy   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
 
   return(data);
 }
@@ -540,7 +540,7 @@ static UserData AllocUserData(void)
 static void InitUserData(UserData data)
 {
   sunindextype i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   data->mx = MX;
   data->my = MY;
@@ -550,7 +550,7 @@ static void InitUserData(UserData data)
   data->ay = AY;
   data->dx = (data->ax)/(MX-1);
   data->dy = (data->ay)/(MY-1);
-  data->uround = UNIT_ROUNDOFF;
+  data->uround = SUN_UNIT_ROUNDOFF;
   data->sqruround = SUNRsqrt(data->uround);
 
   /* Set up the coefficients a and b plus others found in the equations */
@@ -617,8 +617,8 @@ static void FreeUserData(UserData data)
 static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 {
   int i, jx, jy;
-  realtype *cloc, *sloc;
-  realtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
+  sunrealtype *cloc, *sloc;
+  sunrealtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
 
   /* Initialize arrays ctemp and stemp used in the loading process */
   for (i = 0; i < NUM_SPECIES/2; i++) {
@@ -627,7 +627,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
   }
   for (i = NUM_SPECIES/2; i < NUM_SPECIES; i++) {
     ctemp[i] = PREDIN;
-    stemp[i] = RCONST(0.00001);
+    stemp[i] = SUN_RCONST(0.00001);
   }
 
   /* Load initial profiles into cc and sc vector from ctemp and stemp. */
@@ -648,7 +648,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
  */
 
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol)
+                        sunrealtype fnormtol, sunrealtype scsteptol)
 {
   printf("\nPredator-prey test problem --  KINSol (serial version)\n\n");
   printf("Mesh dimensions = %d X %d\n", MX, MY);
@@ -694,7 +694,7 @@ static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
 static void PrintOutput(N_Vector cc)
 {
   int is, jx, jy;
-  realtype *ct;
+  sunrealtype *ct;
 
   jy = 0; jx = 0;
   ct = IJ_Vptr(cc,jx,jy);
diff --git a/examples/kinsol/serial/kinKrylovDemo_ls.c b/examples/kinsol/serial/kinKrylovDemo_ls.c
index bd819b309a..c9aa659dc3 100644
--- a/examples/kinsol/serial/kinKrylovDemo_ls.c
+++ b/examples/kinsol/serial/kinKrylovDemo_ls.c
@@ -98,7 +98,7 @@
 #include <sunlinsol/sunlinsol_sptfqmr.h> /* access to SPTFQMR SUNLinearSolver    */
 #include <sunlinsol/sunlinsol_spfgmr.h>  /* access to SPFGMR SUNLinearSolver     */
 #include <sundials/sundials_dense.h>     /* use generic dense solver in precond. */
-#include <sundials/sundials_types.h>     /* defs. of realtype, sunindextype      */
+#include <sundials/sundials_types.h>     /* defs. of sunrealtype, sunindextype      */
 
 /* helpful macros */
 
@@ -111,29 +111,29 @@
 #define NUM_SPECIES     6  /* must equal 2*(number of prey or predators)
                               number of prey = number of predators       */
 
-#define PI       RCONST(3.1415926535898)   /* pi */
+#define PI       SUN_RCONST(3.1415926535898)   /* pi */
 
 #define MX          5              /* MX = number of x mesh points */
 #define MY          5              /* MY = number of y mesh points */
 #define NSMX        (NUM_SPECIES * MX)
 #define NEQ         (NSMX * MY)    /* number of equations in the system */
-#define AA          RCONST(1.0)    /* value of coefficient AA in above eqns */
-#define EE          RCONST(10000.) /* value of coefficient EE in above eqns */
-#define GG          RCONST(0.5e-6) /* value of coefficient GG in above eqns */
-#define BB          RCONST(1.0)    /* value of coefficient BB in above eqns */
-#define DPREY       RCONST(1.0)    /* value of coefficient dprey above */
-#define DPRED       RCONST(0.5)    /* value of coefficient dpred above */
-#define ALPHA       RCONST(1.0)    /* value of coefficient alpha above */
-#define AX          RCONST(1.0)    /* total range of x variable */
-#define AY          RCONST(1.0)    /* total range of y variable */
-#define FTOL        RCONST(1.e-7)  /* ftol tolerance */
-#define STOL        RCONST(1.e-13) /* stol tolerance */
-#define THOUSAND    RCONST(1000.0) /* one thousand */
-#define ZERO        RCONST(0.)     /* 0. */
-#define ONE         RCONST(1.0)    /* 1. */
-#define TWO         RCONST(2.0)    /* 2. */
-#define PREYIN      RCONST(1.0)    /* initial guess for prey concentrations. */
-#define PREDIN      RCONST(30000.0)/* initial guess for predator concs.      */
+#define AA          SUN_RCONST(1.0)    /* value of coefficient AA in above eqns */
+#define EE          SUN_RCONST(10000.) /* value of coefficient EE in above eqns */
+#define GG          SUN_RCONST(0.5e-6) /* value of coefficient GG in above eqns */
+#define BB          SUN_RCONST(1.0)    /* value of coefficient BB in above eqns */
+#define DPREY       SUN_RCONST(1.0)    /* value of coefficient dprey above */
+#define DPRED       SUN_RCONST(0.5)    /* value of coefficient dpred above */
+#define ALPHA       SUN_RCONST(1.0)    /* value of coefficient alpha above */
+#define AX          SUN_RCONST(1.0)    /* total range of x variable */
+#define AY          SUN_RCONST(1.0)    /* total range of y variable */
+#define FTOL        SUN_RCONST(1.e-7)  /* ftol tolerance */
+#define STOL        SUN_RCONST(1.e-13) /* stol tolerance */
+#define THOUSAND    SUN_RCONST(1000.0) /* one thousand */
+#define ZERO        SUN_RCONST(0.)     /* 0. */
+#define ONE         SUN_RCONST(1.0)    /* 1. */
+#define TWO         SUN_RCONST(2.0)    /* 2. */
+#define PREYIN      SUN_RCONST(1.0)    /* initial guess for prey concentrations. */
+#define PREDIN      SUN_RCONST(30000.0)/* initial guess for predator concs.      */
 
 /* Linear Solver Loop Constants */
 
@@ -155,13 +155,13 @@
    contains preconditioner blocks, pivot arrays, and problem constants */
 
 typedef struct {
-  realtype **P[MX][MY];
+  sunrealtype **P[MX][MY];
   sunindextype *pivot[MX][MY];
-  realtype **acoef, *bcoef;
+  sunrealtype **acoef, *bcoef;
   N_Vector rates;
-  realtype *cox, *coy;
-  realtype ax, ay, dx, dy;
-  realtype uround, sqruround;
+  sunrealtype *cox, *coy;
+  sunrealtype ax, ay, dx, dy;
+  sunrealtype uround, sqruround;
   int mx, my, ns, np;
 } *UserData;
 
@@ -184,13 +184,13 @@ static void InitUserData(UserData data);
 static void FreeUserData(UserData data);
 static void SetInitialProfiles(N_Vector cc, N_Vector sc);
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol,
+                        sunrealtype fnormtol, sunrealtype scsteptol,
 			int linsolver);
 static void PrintOutput(N_Vector cc);
 static void PrintFinalStats(void *kmem, int linsolver);
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data);
-static realtype DotProd(int size, realtype *x1, realtype *x2);
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2);
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /*
@@ -202,7 +202,7 @@ static int check_flag(void *flagvalue, const char *funcname, int opt);
 int main(void)
 {
   int globalstrategy, linsolver;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector cc, sc, constraints;
   UserData data;
   int flag, maxl, maxlrst;
@@ -412,7 +412,7 @@ int main(void)
 
 static int func(N_Vector cc, N_Vector fval, void *user_data)
 {
-  realtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
+  sunrealtype xx, yy, delx, dely, *cxy, *rxy, *fxy, dcyli, dcyui, dcxli, dcxri;
   int jx, jy, is, idyu, idyl, idxr, idxl;
   UserData data;
 
@@ -475,8 +475,8 @@ static int PrecSetupBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        void *user_data)
 {
-  realtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
-  realtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
+  sunrealtype r, r0, uround, sqruround, xx, yy, delx, dely, csave, fac;
+  sunrealtype *cxy, *scxy, **Pxy, *ratesxy, *Pxycol, perturb_rates[NUM_SPECIES];
   sunindextype ret;
   int i, j, jx, jy;
   UserData data;
@@ -542,7 +542,7 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
                        N_Vector fval, N_Vector fscale,
                        N_Vector vv, void *user_data)
 {
-  realtype **Pxy, *vxy;
+  sunrealtype **Pxy, *vxy;
   sunindextype *piv, jx, jy;
   UserData data;
 
@@ -572,11 +572,11 @@ static int PrecSolveBD(N_Vector cc, N_Vector cscale,
  * Interaction rate function routine
  */
 
-static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
+static void WebRate(sunrealtype xx, sunrealtype yy, sunrealtype *cxy, sunrealtype *ratesxy,
                     void *user_data)
 {
   int i;
-  realtype fac;
+  sunrealtype fac;
   UserData data;
 
   data = (UserData)user_data;
@@ -591,13 +591,13 @@ static void WebRate(realtype xx, realtype yy, realtype *cxy, realtype *ratesxy,
 }
 
 /*
- * Dot product routine for realtype arrays
+ * Dot product routine for sunrealtype arrays
  */
 
-static realtype DotProd(int size, realtype *x1, realtype *x2)
+static sunrealtype DotProd(int size, sunrealtype *x1, sunrealtype *x2)
 {
   int i;
-  realtype *xx1, *xx2, temp = ZERO;
+  sunrealtype *xx1, *xx2, temp = ZERO;
 
   xx1 = x1; xx2 = x2;
   for (i = 0; i < size; i++) temp += (*xx1++) * (*xx2++);
@@ -629,9 +629,9 @@ static UserData AllocUserData(void)
     }
   }
   acoef = SUNDlsMat_newDenseMat(NUM_SPECIES, NUM_SPECIES);
-  bcoef = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  cox   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
-  coy   = (realtype *)malloc(NUM_SPECIES * sizeof(realtype));
+  bcoef = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  cox   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
+  coy   = (sunrealtype *)malloc(NUM_SPECIES * sizeof(sunrealtype));
 
   return(data);
 }
@@ -643,7 +643,7 @@ static UserData AllocUserData(void)
 static void InitUserData(UserData data)
 {
   int i, j, np;
-  realtype *a1,*a2, *a3, *a4, dx2, dy2;
+  sunrealtype *a1,*a2, *a3, *a4, dx2, dy2;
 
   data->mx = MX;
   data->my = MY;
@@ -653,7 +653,7 @@ static void InitUserData(UserData data)
   data->ay = AY;
   data->dx = (data->ax)/(MX-1);
   data->dy = (data->ay)/(MY-1);
-  data->uround = UNIT_ROUNDOFF;
+  data->uround = SUN_UNIT_ROUNDOFF;
   data->sqruround = sqrt(data->uround);
 
   /* Set up the coefficients a and b plus others found in the equations */
@@ -720,8 +720,8 @@ static void FreeUserData(UserData data)
 static void SetInitialProfiles(N_Vector cc, N_Vector sc)
 {
   int i, jx, jy;
-  realtype *cloc, *sloc;
-  realtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
+  sunrealtype *cloc, *sloc;
+  sunrealtype  ctemp[NUM_SPECIES], stemp[NUM_SPECIES];
 
   /* Initialize arrays ctemp and stemp used in the loading process */
   for (i = 0; i < NUM_SPECIES/2; i++) {
@@ -730,7 +730,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
   }
   for (i = NUM_SPECIES/2; i < NUM_SPECIES; i++) {
     ctemp[i] = PREDIN;
-    stemp[i] = RCONST(0.00001);
+    stemp[i] = SUN_RCONST(0.00001);
   }
 
   /* Load initial profiles into cc and sc vector from ctemp and stemp. */
@@ -751,7 +751,7 @@ static void SetInitialProfiles(N_Vector cc, N_Vector sc)
  */
 
 static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
-                        realtype fnormtol, realtype scsteptol,
+                        sunrealtype fnormtol, sunrealtype scsteptol,
 			int linsolver)
 {
   printf("\nPredator-prey test problem --  KINSol (serial version)\n\n");
@@ -819,7 +819,7 @@ static void PrintHeader(int globalstrategy, int maxl, int maxlrst,
 static void PrintOutput(N_Vector cc)
 {
   int is, jx, jy;
-  realtype *ct;
+  sunrealtype *ct;
 
   jy = 0; jx = 0;
   ct = IJ_Vptr(cc,jx,jy);
diff --git a/examples/kinsol/serial/kinLaplace_bnd.c b/examples/kinsol/serial/kinLaplace_bnd.c
index 11cef35e81..d796c7eef1 100644
--- a/examples/kinsol/serial/kinLaplace_bnd.c
+++ b/examples/kinsol/serial/kinLaplace_bnd.c
@@ -32,7 +32,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector       */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix        */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver  */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype */
 #include <sundials/sundials_math.h>    /* access to SUNRexp               */
 
 /* Problem Constants */
@@ -43,11 +43,11 @@
 
 #define SKIP 3              /* no. of points skipped for printing */
 
-#define FTOL RCONST(1.e-12) /* function tolerance */
+#define FTOL SUN_RCONST(1.e-12) /* function tolerance */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* IJth is defined in order to isolate the translation from the
    mathematical 2-dimensional structure of the dependent variable vector
@@ -76,7 +76,7 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, fnorm;
+  sunrealtype fnormtol, fnorm;
   N_Vector y, scale;
   int mset, msubset, retval;
   void *kmem;
@@ -236,10 +236,10 @@ int main()
 
 static int func(N_Vector u, N_Vector f, void *user_data)
 {
-  realtype dx, dy, hdiff, vdiff;
-  realtype hdc, vdc;
-  realtype uij, udn, uup, ult, urt;
-  realtype *udata, *fdata;
+  sunrealtype dx, dy, hdiff, vdiff;
+  sunrealtype hdc, vdc;
+  sunrealtype uij, udn, uup, ult, urt;
+  sunrealtype *udata, *fdata;
 
   int i, j;
 
@@ -284,8 +284,8 @@ static int func(N_Vector u, N_Vector f, void *user_data)
 static void PrintOutput(N_Vector u)
 {
   int i, j;
-  realtype dx, dy, x, y;
-  realtype *udata;
+  sunrealtype dx, dy, x, y;
+  sunrealtype *udata;
 
   dx = ONE/(NX+1);
   dy = ONE/(NY+1);
diff --git a/examples/kinsol/serial/kinLaplace_picard_bnd.c b/examples/kinsol/serial/kinLaplace_picard_bnd.c
index 9a2a772feb..09b82a38fc 100644
--- a/examples/kinsol/serial/kinLaplace_picard_bnd.c
+++ b/examples/kinsol/serial/kinLaplace_picard_bnd.c
@@ -35,7 +35,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector       */
 #include <sunmatrix/sunmatrix_band.h>  /* access to band SUNMatrix        */
 #include <sunlinsol/sunlinsol_band.h>  /* access to band SUNLinearSolver  */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype */
 #include <sundials/sundials_math.h>    /* access to SUNRexp               */
 
 /* Problem Constants */
@@ -46,11 +46,11 @@
 
 #define SKIP 3              /* no. of points skipped for printing */
 
-#define FTOL RCONST(1.e-12) /* function tolerance */
+#define FTOL SUN_RCONST(1.e-12) /* function tolerance */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* IJth is defined in order to isolate the translation from the
    mathematical 2-dimensional structure of the dependent variable vector
@@ -81,7 +81,7 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, fnorm;
+  sunrealtype fnormtol, fnorm;
   N_Vector y, scale;
   int retval;
   void *kmem;
@@ -238,10 +238,10 @@ int main()
 
 static int func(N_Vector u, N_Vector f, void *user_data)
 {
-  realtype dx, dy, hdiff, vdiff;
-  realtype hdc, vdc;
-  realtype uij, udn, uup, ult, urt;
-  realtype *udata, *fdata;
+  sunrealtype dx, dy, hdiff, vdiff;
+  sunrealtype hdc, vdc;
+  sunrealtype uij, udn, uup, ult, urt;
+  sunrealtype *udata, *fdata;
 
   int i, j;
 
@@ -286,9 +286,9 @@ static int func(N_Vector u, N_Vector f, void *user_data)
 static int jac(N_Vector u, N_Vector f, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
-  realtype dx, dy;
-  realtype hdc, vdc;
-  realtype *kthCol;
+  sunrealtype dx, dy;
+  sunrealtype hdc, vdc;
+  sunrealtype *kthCol;
 
   int i, j, k;
 
@@ -335,8 +335,8 @@ static int jac(N_Vector u, N_Vector f, SUNMatrix J,
 static void PrintOutput(N_Vector u)
 {
   int i, j;
-  realtype dx, dy, x, y;
-  realtype *udata;
+  sunrealtype dx, dy, x, y;
+  sunrealtype *udata;
 
   dx = ONE/(NX+1);
   dy = ONE/(NY+1);
diff --git a/examples/kinsol/serial/kinLaplace_picard_kry.c b/examples/kinsol/serial/kinLaplace_picard_kry.c
index 7edd10866b..af3c2abf58 100644
--- a/examples/kinsol/serial/kinLaplace_picard_kry.c
+++ b/examples/kinsol/serial/kinLaplace_picard_kry.c
@@ -33,7 +33,7 @@
 #include <kinsol/kinsol.h>             /* access to KINSOL func., consts. */
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector       */
 #include <sunlinsol/sunlinsol_spgmr.h> /* access to SPGMR SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype */
 #include <sundials/sundials_math.h>    /* access to SUNRexp               */
 
 /* Problem Constants */
@@ -44,11 +44,11 @@
 
 #define SKIP 3              /* no. of points skipped for printing */
 
-#define FTOL RCONST(1.e-12) /* function tolerance */
+#define FTOL SUN_RCONST(1.e-12) /* function tolerance */
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* IJth is defined in order to isolate the translation from the
    mathematical 2-dimensional structure of the dependent variable vector
@@ -64,7 +64,7 @@
 /* Private functions */
 
 static int func(N_Vector u, N_Vector f, void *user_data);
-static int jactimes(N_Vector v, N_Vector Jv, N_Vector u, booleantype *new_u,
+static int jactimes(N_Vector v, N_Vector Jv, N_Vector u, sunbooleantype *new_u,
                     void *user_data);
 static void PrintOutput(N_Vector u);
 static void PrintFinalStats(void *kmem);
@@ -79,7 +79,7 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, fnorm;
+  sunrealtype fnormtol, fnorm;
   N_Vector y, scale;
   int retval;
   void *kmem;
@@ -234,10 +234,10 @@ int main()
 
 static int func(N_Vector u, N_Vector f, void *user_data)
 {
-  realtype dx, dy, hdiff, vdiff;
-  realtype hdc, vdc;
-  realtype uij, udn, uup, ult, urt;
-  realtype *udata, *fdata;
+  sunrealtype dx, dy, hdiff, vdiff;
+  sunrealtype hdc, vdc;
+  sunrealtype uij, udn, uup, ult, urt;
+  sunrealtype *udata, *fdata;
 
   int i, j;
 
@@ -279,13 +279,13 @@ static int func(N_Vector u, N_Vector f, void *user_data)
  * Jacobian vector product function
  */
 
-static int jactimes(N_Vector v, N_Vector Jv, N_Vector u, booleantype *new_u,
+static int jactimes(N_Vector v, N_Vector Jv, N_Vector u, sunbooleantype *new_u,
                     void *user_data)
 {
-  realtype dx, dy, hdiff, vdiff;
-  realtype hdc, vdc;
-  realtype vij, vdn, vup, vlt, vrt;
-  realtype *vdata, *Jvdata;
+  sunrealtype dx, dy, hdiff, vdiff;
+  sunrealtype hdc, vdc;
+  sunrealtype vij, vdn, vup, vlt, vrt;
+  sunrealtype *vdata, *Jvdata;
 
   int i, j;
 
@@ -330,8 +330,8 @@ static int jactimes(N_Vector v, N_Vector Jv, N_Vector u, booleantype *new_u,
 static void PrintOutput(N_Vector u)
 {
   int i, j;
-  realtype dx, dy, x, y;
-  realtype *udata;
+  sunrealtype dx, dy, x, y;
+  sunrealtype *udata;
 
   dx = ONE/(NX+1);
   dy = ONE/(NY+1);
diff --git a/examples/kinsol/serial/kinRoberts_fp.c b/examples/kinsol/serial/kinRoberts_fp.c
index fe69235298..a641834b47 100644
--- a/examples/kinsol/serial/kinRoberts_fp.c
+++ b/examples/kinsol/serial/kinRoberts_fp.c
@@ -34,7 +34,7 @@
 
 #include <kinsol/kinsol.h>           /* access to KINSOL func., consts. */
 #include <nvector/nvector_serial.h>  /* access to serial N_Vector       */
-#include <sundials/sundials_types.h> /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h> /* defs. of sunrealtype, sunindextype */
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
 #define GSYM "Lg"
@@ -49,16 +49,16 @@
 /* Problem Constants */
 
 #define NEQ   3              /* number of equations  */
-#define Y10   RCONST(1.0)    /* initial y components */
-#define Y20   RCONST(0.0)
-#define Y30   RCONST(0.0)
-#define TOL   RCONST(1.e-10) /* function tolerance */
-#define DSTEP RCONST(0.1)    /* Size of the single time step used */
+#define Y10   SUN_RCONST(1.0)    /* initial y components */
+#define Y20   SUN_RCONST(0.0)
+#define Y30   SUN_RCONST(0.0)
+#define TOL   SUN_RCONST(1.e-10) /* function tolerance */
+#define DSTEP SUN_RCONST(0.1)    /* Size of the single time step used */
 
 #define PRIORS 2
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* User-defined vector accessor macro: Ith */
 
@@ -80,7 +80,7 @@ static int funcRoberts(N_Vector u, N_Vector f, void *user_data);
 static void PrintOutput(N_Vector u);
 static void PrintFinalStats(void *kmem);
 static int check_retval(void *retvalvalue, const char *funcname, int opt);
-static int check_ans(N_Vector u, realtype rtol, realtype atol);
+static int check_ans(N_Vector u, sunrealtype rtol, sunrealtype atol);
 
 /*
  *--------------------------------------------------------------------
@@ -91,7 +91,7 @@ static int check_ans(N_Vector u, realtype rtol, realtype atol);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, fnorm;
+  sunrealtype fnormtol, fnorm;
   N_Vector y, scale;
   int retval;
   void *kmem;
@@ -195,7 +195,7 @@ int main()
   PrintFinalStats(kmem);
 
   /* check the solution error */
-  retval = check_ans(y, RCONST(1e-4), RCONST(1e-6));
+  retval = check_ans(y, SUN_RCONST(1e-4), SUN_RCONST(1e-6));
 
   /* -----------
    * Free memory
@@ -221,15 +221,15 @@ int main()
 
 static int funcRoberts(N_Vector y, N_Vector g, void *user_data)
 {
-  realtype y1, y2, y3;
-  realtype yd1, yd3;
+  sunrealtype y1, y2, y3;
+  sunrealtype yd1, yd3;
 
   y1 = Ith(y,1);
   y2 = Ith(y,2);
   y3 = Ith(y,3);
 
-  yd1 = DSTEP * ( RCONST(-0.04)*y1 + RCONST(1.0e4)*y2*y3 );
-  yd3 = DSTEP * RCONST(3.0e2)*y2*y2;
+  yd1 = DSTEP * ( SUN_RCONST(-0.04)*y1 + SUN_RCONST(1.0e4)*y2*y3 );
+  yd3 = DSTEP * SUN_RCONST(3.0e2)*y2*y2;
 
   Ith(g,1) = yd1 + Y10;
   Ith(g,2) = -yd1 - yd3 + Y20;
@@ -244,7 +244,7 @@ static int funcRoberts(N_Vector y, N_Vector g, void *user_data)
 
 static void PrintOutput(N_Vector y)
 {
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
 
   y1 = Ith(y,1);
   y2 = Ith(y,2);
@@ -327,21 +327,21 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt)
 
 /* compare the solution to a reference solution computed with a
    tolerance of 1e-14 */
-static int check_ans(N_Vector u, realtype rtol, realtype atol)
+static int check_ans(N_Vector u, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;        /* answer pass (0) or fail (1) retval */
   N_Vector ref;               /* reference solution vector        */
   N_Vector ewt;               /* error weight vector              */
-  realtype err;               /* wrms error                       */
+  sunrealtype err;               /* wrms error                       */
 
   /* create reference solution and error weight vectors */
   ref = N_VClone(u);
   ewt = N_VClone(u);
 
   /* set the reference solution data */
-  NV_Ith_S(ref,0) = RCONST(9.9678538655358029e-01);
-  NV_Ith_S(ref,1) = RCONST(2.9530060962800345e-03);
-  NV_Ith_S(ref,2) = RCONST(2.6160735013975683e-04);
+  NV_Ith_S(ref,0) = SUN_RCONST(9.9678538655358029e-01);
+  NV_Ith_S(ref,1) = SUN_RCONST(2.9530060962800345e-03);
+  NV_Ith_S(ref,2) = SUN_RCONST(2.6160735013975683e-04);
 
   /* compute the error weight vector */
   N_VAbs(ref, ewt);
diff --git a/examples/kinsol/serial/kinRoboKin_dns.c b/examples/kinsol/serial/kinRoboKin_dns.c
index d0d8ffd3f5..92f8fc66a8 100644
--- a/examples/kinsol/serial/kinRoboKin_dns.c
+++ b/examples/kinsol/serial/kinRoboKin_dns.c
@@ -34,7 +34,7 @@
 #include <nvector/nvector_serial.h>    /* access to serial N_Vector       */
 #include <sunmatrix/sunmatrix_dense.h> /* access to dense SUNMatrix       */
 #include <sunlinsol/sunlinsol_dense.h> /* access to dense SUNLinearSolver */
-#include <sundials/sundials_types.h>   /* defs. of realtype, sunindextype */
+#include <sundials/sundials_types.h>   /* defs. of sunrealtype, sunindextype */
 #include <sundials/sundials_math.h>    /* access to SUNRsqrt              */
 
 /* Problem Constants */
@@ -42,12 +42,12 @@
 #define NVAR  8              /* variables */
 #define NEQ   3*NVAR         /* equations + bounds */
 
-#define FTOL   RCONST(1.e-5) /* function tolerance */
-#define STOL   RCONST(1.e-5) /* step tolerance */
+#define FTOL   SUN_RCONST(1.e-5) /* function tolerance */
+#define STOL   SUN_RCONST(1.e-5) /* step tolerance */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define Ith(v,i)    NV_Ith_S(v,i-1)
 #define IJth(A,i,j) SM_ELEMENT_D(A,i-1,j-1)
@@ -67,7 +67,7 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector y, scale, constraints;
   int mset, retval, i;
   void *kmem;
@@ -193,15 +193,15 @@ int main()
 
 static int func(N_Vector y, N_Vector f, void *user_data)
 {
-  realtype *yd, *fd;
+  sunrealtype *yd, *fd;
 
-  realtype x1, x2, x3, x4, x5, x6, x7, x8;
-  realtype l1, l2, l3, l4, l5, l6, l7, l8;
-  realtype u1, u2, u3, u4, u5, u6, u7, u8;
+  sunrealtype x1, x2, x3, x4, x5, x6, x7, x8;
+  sunrealtype l1, l2, l3, l4, l5, l6, l7, l8;
+  sunrealtype u1, u2, u3, u4, u5, u6, u7, u8;
 
-  realtype eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8;
-  realtype lb1, lb2, lb3, lb4, lb5, lb6, lb7, lb8;
-  realtype ub1, ub2, ub3, ub4, ub5, ub6, ub7, ub8;
+  sunrealtype eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8;
+  sunrealtype lb1, lb2, lb3, lb4, lb5, lb6, lb7, lb8;
+  sunrealtype ub1, ub2, ub3, ub4, ub5, ub6, ub7, ub8;
 
   yd = N_VGetArrayPointer(y);
   fd = N_VGetArrayPointer(f);
@@ -270,8 +270,8 @@ static int jac(N_Vector y, N_Vector f,SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
   int i;
-  realtype *yd;
-  realtype x1, x2, x3, x4, x5, x6, x7, x8;
+  sunrealtype *yd;
+  sunrealtype x1, x2, x3, x4, x5, x6, x7, x8;
 
   yd = N_VGetArrayPointer(y);
 
diff --git a/examples/kinsol/serial/kinRoboKin_slu.c b/examples/kinsol/serial/kinRoboKin_slu.c
index 2adfc7d072..9f79cb4c82 100644
--- a/examples/kinsol/serial/kinRoboKin_slu.c
+++ b/examples/kinsol/serial/kinRoboKin_slu.c
@@ -36,7 +36,7 @@
 #include <nvector/nvector_serial.h>        /* access to serial N_Vector         */
 #include <sunmatrix/sunmatrix_sparse.h>    /* access to sparse SUNMatrix        */
 #include <sunlinsol/sunlinsol_superlumt.h> /* access to SuperLUMT linear solver */
-#include <sundials/sundials_types.h>       /* defs. of realtype, sunindextype   */
+#include <sundials/sundials_types.h>       /* defs. of sunrealtype, sunindextype   */
 #include <sundials/sundials_math.h>        /* access to SUNRsqrt                */
 
 /* Problem Constants */
@@ -44,12 +44,12 @@
 #define NVAR  8              /* variables */
 #define NEQ   3*NVAR         /* equations + bounds */
 
-#define FTOL   RCONST(1.e-5) /* function tolerance */
-#define STOL   RCONST(1.e-5) /* step tolerance */
+#define FTOL   SUN_RCONST(1.e-5) /* function tolerance */
+#define STOL   SUN_RCONST(1.e-5) /* step tolerance */
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
-#define TWO   RCONST(2.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
+#define TWO   SUN_RCONST(2.0)
 
 #define Ith(v,i)    NV_Ith_S(v,i-1)
 
@@ -69,7 +69,7 @@ static int check_retval(void *retvalvalue, const char *funcname, int opt);
 int main()
 {
   SUNContext sunctx;
-  realtype fnormtol, scsteptol;
+  sunrealtype fnormtol, scsteptol;
   N_Vector y, scale, constraints;
   int mset, retval, i;
   void *kmem;
@@ -192,15 +192,15 @@ int main()
 
 static int func(N_Vector y, N_Vector f, void *user_data)
 {
-  realtype *yd, *fd;
+  sunrealtype *yd, *fd;
 
-  realtype x1, x2, x3, x4, x5, x6, x7, x8;
-  realtype l1, l2, l3, l4, l5, l6, l7, l8;
-  realtype u1, u2, u3, u4, u5, u6, u7, u8;
+  sunrealtype x1, x2, x3, x4, x5, x6, x7, x8;
+  sunrealtype l1, l2, l3, l4, l5, l6, l7, l8;
+  sunrealtype u1, u2, u3, u4, u5, u6, u7, u8;
 
-  realtype eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8;
-  realtype lb1, lb2, lb3, lb4, lb5, lb6, lb7, lb8;
-  realtype ub1, ub2, ub3, ub4, ub5, ub6, ub7, ub8;
+  sunrealtype eq1, eq2, eq3, eq4, eq5, eq6, eq7, eq8;
+  sunrealtype lb1, lb2, lb3, lb4, lb5, lb6, lb7, lb8;
+  sunrealtype ub1, ub2, ub3, ub4, ub5, ub6, ub7, ub8;
 
   yd = N_VGetArrayPointer(y);
   fd = N_VGetArrayPointer(f);
@@ -268,11 +268,11 @@ static int func(N_Vector y, N_Vector f, void *user_data)
 static int jac(N_Vector y, N_Vector f, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2)
 {
-  realtype *yd;
-  realtype x1, x2, x3, x4, x5, x6, x7, x8;
+  sunrealtype *yd;
+  sunrealtype x1, x2, x3, x4, x5, x6, x7, x8;
   sunindextype *colptrs = SUNSparseMatrix_IndexPointers(J);
   sunindextype *rowvals = SUNSparseMatrix_IndexValues(J);
-  realtype *data = SUNSparseMatrix_Data(J);
+  sunrealtype *data = SUNSparseMatrix_Data(J);
 
   yd = N_VGetArrayPointer(y);
 
diff --git a/examples/nvector/C_openmp/test_nvector_openmp.c b/examples/nvector/C_openmp/test_nvector_openmp.c
index 8121abf8c8..86829d0826 100644
--- a/examples/nvector/C_openmp/test_nvector_openmp.c
+++ b/examples/nvector/C_openmp/test_nvector_openmp.c
@@ -241,11 +241,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   Xdata = N_VGetArrayPointer(X);
 
@@ -257,29 +257,29 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if data array is non-null */
   return (N_VGetArrayPointer(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
 
   /* set elements [is,ie] of the data array */
-  realtype* xd = N_VGetArrayPointer(X);
+  sunrealtype* xd = N_VGetArrayPointer(X);
   for(i = is; i <= ie; i++) xd[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   return NV_Ith_OMP(X,i);
diff --git a/examples/nvector/cuda/test_nvector_cuda.cu b/examples/nvector/cuda/test_nvector_cuda.cu
index d120908b74..80c66def1a 100644
--- a/examples/nvector/cuda/test_nvector_cuda.cu
+++ b/examples/nvector/cuda/test_nvector_cuda.cu
@@ -130,9 +130,9 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vector with uniform random data in [-1,1] */
-      realtype* xdata = N_VGetHostArrayPointer_Cuda(X);
+      sunrealtype* xdata = N_VGetHostArrayPointer_Cuda(X);
       for (sunindextype j=0; j<length; j++)
-        xdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        xdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       N_VCopyToDevice_Cuda(X);
 
       /* Clone additional vectors for testing */
@@ -158,11 +158,11 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vectors with uniform random data in [-1,1] */
-      realtype* ydata = N_VGetHostArrayPointer_Cuda(Y);
-      realtype* zdata = N_VGetHostArrayPointer_Cuda(Z);
+      sunrealtype* ydata = N_VGetHostArrayPointer_Cuda(Y);
+      sunrealtype* zdata = N_VGetHostArrayPointer_Cuda(Z);
       for (sunindextype j=0; j<length; j++) {
-        ydata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
-        zdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        ydata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
+        zdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       }
       N_VCopyToDevice_Cuda(Y);
       N_VCopyToDevice_Cuda(Z);
@@ -356,11 +356,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   N_VCopyFromDevice_Cuda(X);
   Xdata = N_VGetHostArrayPointer_Cuda(X);
@@ -376,7 +376,7 @@ int check_ans(realtype ans, N_Vector X, sunindextype length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if vector data is non-null */
   if ((N_VGetHostArrayPointer_Cuda(X) == NULL) &&
@@ -385,17 +385,17 @@ booleantype has_data(N_Vector X)
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
 
   /* set elements [is,ie] of the data array */
   N_VCopyFromDevice_Cuda(X);
@@ -404,7 +404,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Cuda(X);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   N_VCopyFromDevice_Cuda(X);
diff --git a/examples/nvector/hip/test_nvector_hip.cpp b/examples/nvector/hip/test_nvector_hip.cpp
index 08901d0234..fa9067ec79 100644
--- a/examples/nvector/hip/test_nvector_hip.cpp
+++ b/examples/nvector/hip/test_nvector_hip.cpp
@@ -129,9 +129,9 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vector with uniform random data in [-1,1] */
-      realtype* xdata = N_VGetHostArrayPointer_Hip(X);
+      sunrealtype* xdata = N_VGetHostArrayPointer_Hip(X);
       for (sunindextype j=0; j<length; j++)
-        xdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        xdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       N_VCopyToDevice_Hip(X);
 
       /* Clone additional vectors for testing */
@@ -157,11 +157,11 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vectors with uniform random data in [-1,1] */
-      realtype* ydata = N_VGetHostArrayPointer_Hip(Y);
-      realtype* zdata = N_VGetHostArrayPointer_Hip(Z);
+      sunrealtype* ydata = N_VGetHostArrayPointer_Hip(Y);
+      sunrealtype* zdata = N_VGetHostArrayPointer_Hip(Z);
       for (sunindextype j=0; j<length; j++) {
-        ydata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
-        zdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        ydata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
+        zdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       }
       N_VCopyToDevice_Hip(Y);
       N_VCopyToDevice_Hip(Z);
@@ -356,11 +356,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   N_VCopyFromDevice_Hip(X);
   Xdata = N_VGetHostArrayPointer_Hip(X);
@@ -375,7 +375,7 @@ int check_ans(realtype ans, N_Vector X, sunindextype length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if vector data is non-null */
   if ((N_VGetHostArrayPointer_Hip(X) == NULL) &&
@@ -384,17 +384,17 @@ booleantype has_data(N_Vector X)
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
 
   /* set elements [is,ie] of the data array */
   N_VCopyFromDevice_Hip(X);
@@ -403,7 +403,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Hip(X);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   N_VCopyFromDevice_Hip(X);
diff --git a/examples/nvector/kokkos/test_nvector_kokkos.cpp b/examples/nvector/kokkos/test_nvector_kokkos.cpp
index b846f1f124..3c351117c4 100644
--- a/examples/nvector/kokkos/test_nvector_kokkos.cpp
+++ b/examples/nvector/kokkos/test_nvector_kokkos.cpp
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
 
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int failure{0};
   auto Xvec{static_cast<VecType*>(X->content)};
@@ -178,19 +178,19 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if vector data is non-null */
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
-void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype val)
+void set_element_range(N_Vector X, sunindextype is, sunindextype ie, sunrealtype val)
 {
   auto Xvec{static_cast<VecType*>(X->content)};
   auto Xdata{Xvec->HostView()};
@@ -201,7 +201,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype va
   sundials::kokkos::CopyToDevice<VecType>(X);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   auto Xvec{static_cast<VecType*>(X->content)};
diff --git a/examples/nvector/manyvector/test_nvector_manyvector.c b/examples/nvector/manyvector/test_nvector_manyvector.c
index 492fb945d7..ea480c3c9b 100644
--- a/examples/nvector/manyvector/test_nvector_manyvector.c
+++ b/examples/nvector/manyvector/test_nvector_manyvector.c
@@ -262,12 +262,12 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
   N_Vector     Xsub[2];
-  realtype     *x0, *x1;
+  sunrealtype     *x0, *x1;
   sunindextype x0len, x1len;
 
   Xsub[0] = N_VGetSubvector_ManyVector(X, 0);
@@ -288,13 +288,13 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* should not be called in these tests */
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
@@ -311,7 +311,7 @@ void set_element(N_Vector X, sunindextype i, realtype val)
   }
 }
 
-void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype val)
+void set_element_range(N_Vector X, sunindextype is, sunindextype ie, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len, i;
@@ -325,7 +325,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype va
   for (i=x0len; i<=ie; i++)  NV_Ith_S(Xsub[1], i-x0len) = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
diff --git a/examples/nvector/mpicuda/test_nvector_mpicuda.cu b/examples/nvector/mpicuda/test_nvector_mpicuda.cu
index d77ffc5d71..e533a0bc94 100644
--- a/examples/nvector/mpicuda/test_nvector_mpicuda.cu
+++ b/examples/nvector/mpicuda/test_nvector_mpicuda.cu
@@ -298,11 +298,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector plusX, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector plusX, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
   N_Vector     X;
 
   X = N_VGetLocalVector_MPIPlusX(plusX);
@@ -317,7 +317,7 @@ int check_ans(realtype ans, N_Vector plusX, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector plusX)
+sunbooleantype has_data(N_Vector plusX)
 {
   N_Vector X = N_VGetLocalVector_MPIPlusX(plusX);
   /* check if vector data is non-null */
@@ -327,17 +327,17 @@ booleantype has_data(N_Vector plusX)
   return SUNTRUE;
 }
 
-void set_element(N_Vector plusX, sunindextype i, realtype val)
+void set_element(N_Vector plusX, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(plusX, i, i, val);
 }
 
 void set_element_range(N_Vector plusX, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
   N_Vector     X;
 
   X = N_VGetLocalVector_MPIPlusX(plusX);
@@ -349,7 +349,7 @@ void set_element_range(N_Vector plusX, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Cuda(X);
 }
 
-realtype get_element(N_Vector plusX, sunindextype i)
+sunrealtype get_element(N_Vector plusX, sunindextype i)
 {
   N_Vector X = N_VGetLocalVector_MPIPlusX(plusX);
 
diff --git a/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel1.c b/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel1.c
index b9e0f228ba..cb5c3f7ab9 100644
--- a/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel1.c
+++ b/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel1.c
@@ -326,12 +326,12 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
   N_Vector     Xsub[2];
-  realtype     *x0, *x1;
+  sunrealtype     *x0, *x1;
   sunindextype x0len, x1len;
 
   Xsub[0] = N_VGetSubvector_MPIManyVector(X, 0);
@@ -352,13 +352,13 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* should not be called in these tests */
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
@@ -375,7 +375,7 @@ void set_element(N_Vector X, sunindextype i, realtype val)
   }
 }
 
-void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype val)
+void set_element_range(N_Vector X, sunindextype is, sunindextype ie, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len, i;
@@ -389,7 +389,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype va
   for (i=x0len; i<=ie; i++)  NV_Ith_P(Xsub[1], i-x0len) = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
diff --git a/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel2.c b/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel2.c
index 6268948a0d..a89beffeba 100644
--- a/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel2.c
+++ b/examples/nvector/mpimanyvector/test_nvector_mpimanyvector_parallel2.c
@@ -345,12 +345,12 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
   N_Vector     Xsub[2];
-  realtype     *x0, *x1;
+  sunrealtype     *x0, *x1;
   sunindextype x0len, x1len;
 
   Xsub[0] = N_VGetSubvector_MPIManyVector(X, 0);
@@ -371,13 +371,13 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* should not be called in these tests */
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
@@ -394,7 +394,7 @@ void set_element(N_Vector X, sunindextype i, realtype val)
   }
 }
 
-void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype val)
+void set_element_range(N_Vector X, sunindextype is, sunindextype ie, sunrealtype val)
 {
   N_Vector     Xsub[2];
   sunindextype x0len, i;
@@ -408,7 +408,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype va
   for (i=x0len; i<=ie; i++)  NV_Ith_P(Xsub[1], i-x0len) = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   N_Vector     Xsub[2];
   sunindextype x0len;
diff --git a/examples/nvector/mpiplusx/test_nvector_mpiplusx.c b/examples/nvector/mpiplusx/test_nvector_mpiplusx.c
index 3e44b0abbc..663b9055f9 100644
--- a/examples/nvector/mpiplusx/test_nvector_mpiplusx.c
+++ b/examples/nvector/mpiplusx/test_nvector_mpiplusx.c
@@ -294,11 +294,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *x0;
+  sunrealtype     *x0;
   sunindextype x0len;
 
   x0len = N_VGetLocalLength_MPIPlusX(X);
@@ -314,15 +314,15 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* should not be called in these tests */
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
-  realtype *data;
+  sunrealtype *data;
 
   data = N_VGetArrayPointer(X);
 
@@ -330,10 +330,10 @@ void set_element(N_Vector X, sunindextype i, realtype val)
   data[i] = val;
 }
 
-void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype val)
+void set_element_range(N_Vector X, sunindextype is, sunindextype ie, sunrealtype val)
 {
   sunindextype x0len, i;
-  realtype *data;
+  sunrealtype *data;
 
   data = N_VGetArrayPointer(X);
   x0len = N_VGetLocalLength_MPIPlusX(X);
@@ -342,9 +342,9 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie, realtype va
   for (i=is; i<x0len; i++)  data[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
-  realtype *data;
+  sunrealtype *data;
 
   data = N_VGetArrayPointer(X);
 
diff --git a/examples/nvector/mpiraja/test_nvector_mpiraja.cpp b/examples/nvector/mpiraja/test_nvector_mpiraja.cpp
index b0e3266b67..019d2a4fdc 100644
--- a/examples/nvector/mpiraja/test_nvector_mpiraja.cpp
+++ b/examples/nvector/mpiraja/test_nvector_mpiraja.cpp
@@ -314,11 +314,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector plusX, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector plusX, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
   N_Vector     X;
 
   X = N_VGetLocalVector_MPIPlusX(plusX);
@@ -333,7 +333,7 @@ int check_ans(realtype ans, N_Vector plusX, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector plusX)
+sunbooleantype has_data(N_Vector plusX)
 {
   N_Vector X = N_VGetLocalVector_MPIPlusX(plusX);
   /* check if vector data is non-null */
@@ -343,17 +343,17 @@ booleantype has_data(N_Vector plusX)
   return SUNTRUE;
 }
 
-void set_element(N_Vector plusX, sunindextype i, realtype val)
+void set_element(N_Vector plusX, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(plusX, i, i, val);
 }
 
 void set_element_range(N_Vector plusX, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
   N_Vector     X;
 
   X = N_VGetLocalVector_MPIPlusX(plusX);
@@ -365,7 +365,7 @@ void set_element_range(N_Vector plusX, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Raja(X);
 }
 
-realtype get_element(N_Vector plusX, sunindextype i)
+sunrealtype get_element(N_Vector plusX, sunindextype i)
 {
   N_Vector X = N_VGetLocalVector_MPIPlusX(plusX);
 
diff --git a/examples/nvector/openmpdev/test_nvector_openmpdev.c b/examples/nvector/openmpdev/test_nvector_openmpdev.c
index ded8ca2b3b..0cd54ea2fb 100644
--- a/examples/nvector/openmpdev/test_nvector_openmpdev.c
+++ b/examples/nvector/openmpdev/test_nvector_openmpdev.c
@@ -239,7 +239,7 @@ int main(int argc, char *argv[])
 int Test_N_VMake_OpenMPDEV(N_Vector X, sunindextype length, int myid)
 {
   int failure = 0;
-  realtype *h_data, *d_data;
+  sunrealtype *h_data, *d_data;
   N_Vector Y;
 
   N_VConst(NEG_HALF, X);
@@ -305,11 +305,11 @@ int Test_N_VMake_OpenMPDEV(N_Vector X, sunindextype length, int myid)
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   N_VCopyFromDevice_OpenMPDEV(X);
   Xdata = N_VGetHostArrayPointer_OpenMPDEV(X);
@@ -322,24 +322,24 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
-  realtype *Xdata = N_VGetHostArrayPointer_OpenMPDEV(X);
+  sunrealtype *Xdata = N_VGetHostArrayPointer_OpenMPDEV(X);
   if (Xdata == NULL)
     return SUNFALSE;
   else
     return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
-  realtype     *xdev;
+  sunrealtype     *xdev;
   int           dev;
   sunindextype  i;
 
@@ -354,9 +354,9 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   }
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
-  realtype *data;
+  sunrealtype *data;
 
   N_VCopyFromDevice_OpenMPDEV(X);
   data = N_VGetHostArrayPointer_OpenMPDEV(X);
diff --git a/examples/nvector/parallel/test_nvector_mpi.c b/examples/nvector/parallel/test_nvector_mpi.c
index b8bdc77367..5cd0fb786c 100644
--- a/examples/nvector/parallel/test_nvector_mpi.c
+++ b/examples/nvector/parallel/test_nvector_mpi.c
@@ -259,11 +259,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   Xdata = N_VGetArrayPointer(X);
 
@@ -275,29 +275,29 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if data array is non-null */
   return (N_VGetArrayPointer(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
 
   /* set elements [is,ie] of the data array */
-  realtype* xd = N_VGetArrayPointer(X);
+  sunrealtype* xd = N_VGetArrayPointer(X);
   for(i = is; i <= ie; i++) xd[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   return NV_Ith_P(X,i);
diff --git a/examples/nvector/parhyp/test_nvector_parhyp.c b/examples/nvector/parhyp/test_nvector_parhyp.c
index 1a09908d0b..5a902552af 100644
--- a/examples/nvector/parhyp/test_nvector_parhyp.c
+++ b/examples/nvector/parhyp/test_nvector_parhyp.c
@@ -276,12 +276,12 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int             failure = 0;
   sunindextype    i;
   HYPRE_ParVector Xvec;
-  realtype        *Xdata;
+  sunrealtype        *Xdata;
 
   Xvec  = N_VGetVector_ParHyp(X);
   Xdata = hypre_VectorData(hypre_ParVectorLocalVector(Xvec));
@@ -294,23 +294,23 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if wrapped hypre ParVector is non-null */
   return (N_VGetVector_ParHyp(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   HYPRE_ParVector  Xvec;
-  realtype        *Xdata;
+  sunrealtype        *Xdata;
   sunindextype     i;
 
   /* set elements [is,ie] of the data array */
@@ -320,10 +320,10 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   for(i = is; i <= ie; i++) Xdata[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   HYPRE_ParVector Xvec;
-  realtype        *Xdata;
+  sunrealtype        *Xdata;
 
   /* get i-th element of data array */
   Xvec  = N_VGetVector_ParHyp(X);
diff --git a/examples/nvector/petsc/test_nvector_petsc.c b/examples/nvector/petsc/test_nvector_petsc.c
index 428cf3fb01..ba6fc134ad 100644
--- a/examples/nvector/petsc/test_nvector_petsc.c
+++ b/examples/nvector/petsc/test_nvector_petsc.c
@@ -272,7 +272,7 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
@@ -292,19 +292,19 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if wrapped PETSc vector is non-null */
   return (N_VGetVector_Petsc(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   Vec           xv;
   PetscScalar  *a;
@@ -319,11 +319,11 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   VecRestoreArray(xv, &a);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   PetscScalar *a;
   Vec         xv;
-  realtype    val;
+  sunrealtype    val;
 
   /* extract the PETSc vector from the N_Vector wrapper */
   xv = N_VGetVector_Petsc(X);
diff --git a/examples/nvector/pthreads/test_nvector_pthreads.c b/examples/nvector/pthreads/test_nvector_pthreads.c
index 89369b98b5..ac3803f739 100644
--- a/examples/nvector/pthreads/test_nvector_pthreads.c
+++ b/examples/nvector/pthreads/test_nvector_pthreads.c
@@ -241,11 +241,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   Xdata = N_VGetArrayPointer(X);
 
@@ -257,29 +257,29 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if data array is non-null */
   return (N_VGetArrayPointer(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
 
   /* set elements [is,ie] of the data array */
-  realtype* xd = N_VGetArrayPointer(X);
+  sunrealtype* xd = N_VGetArrayPointer(X);
   for(i = is; i <= ie; i++) xd[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   return NV_Ith_PT(X,i);
diff --git a/examples/nvector/raja/test_nvector_raja.cpp b/examples/nvector/raja/test_nvector_raja.cpp
index 02ad9c8b3c..0228e84ed3 100644
--- a/examples/nvector/raja/test_nvector_raja.cpp
+++ b/examples/nvector/raja/test_nvector_raja.cpp
@@ -99,9 +99,9 @@ int main(int argc, char *argv[])
     }
 
     /* Fill vector with uniform random data in [-1,1] */
-    realtype* xdata = N_VGetHostArrayPointer_Raja(X);
+    sunrealtype* xdata = N_VGetHostArrayPointer_Raja(X);
     for (sunindextype j=0; j<length; j++)
-      xdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+      xdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
     N_VCopyToDevice_Raja(X);
 
     /* Clone additional vectors for testing */
@@ -123,11 +123,11 @@ int main(int argc, char *argv[])
     }
 
     /* Fill vectors with uniform random data in [-1,1] */
-    realtype* ydata = N_VGetHostArrayPointer_Raja(Y);
-    realtype* zdata = N_VGetHostArrayPointer_Raja(Z);
+    sunrealtype* ydata = N_VGetHostArrayPointer_Raja(Y);
+    sunrealtype* zdata = N_VGetHostArrayPointer_Raja(Z);
     for (sunindextype j=0; j<length; j++) {
-      ydata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
-      zdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+      ydata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
+      zdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
     }
     N_VCopyToDevice_Raja(Y);
     N_VCopyToDevice_Raja(Z);
@@ -290,11 +290,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   N_VCopyFromDevice_Raja(X);
   Xdata = N_VGetHostArrayPointer_Raja(X);
@@ -307,7 +307,7 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if vector data is non-null */
   if ((N_VGetHostArrayPointer_Raja(X) == NULL) &&
@@ -316,17 +316,17 @@ booleantype has_data(N_Vector X)
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
 
   /* set elements [is,ie] of the data array */
   N_VCopyFromDevice_Raja(X);
@@ -335,7 +335,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Raja(X);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   N_VCopyFromDevice_Raja(X);
diff --git a/examples/nvector/serial/test_nvector_serial.c b/examples/nvector/serial/test_nvector_serial.c
index 7c53572eb9..15b6ed9a06 100644
--- a/examples/nvector/serial/test_nvector_serial.c
+++ b/examples/nvector/serial/test_nvector_serial.c
@@ -241,11 +241,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   Xdata = N_VGetArrayPointer(X);
 
@@ -257,29 +257,29 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if data array is non-null */
   return (N_VGetArrayPointer(X) == NULL) ? SUNFALSE : SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
 
   /* set elements [is,ie] of the data array */
-  realtype* xd = N_VGetArrayPointer(X);
+  sunrealtype* xd = N_VGetArrayPointer(X);
   for(i = is; i <= ie; i++) xd[i] = val;
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   return NV_Ith_S(X,i);
diff --git a/examples/nvector/sycl/test_nvector_sycl.cpp b/examples/nvector/sycl/test_nvector_sycl.cpp
index b3b6f5c8dc..523e144ccc 100644
--- a/examples/nvector/sycl/test_nvector_sycl.cpp
+++ b/examples/nvector/sycl/test_nvector_sycl.cpp
@@ -183,9 +183,9 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vector with uniform random data in [-1,1] */
-      realtype* xdata = N_VGetHostArrayPointer_Sycl(X);
+      sunrealtype* xdata = N_VGetHostArrayPointer_Sycl(X);
       for (sunindextype j=0; j<length; j++)
-        xdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        xdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       N_VCopyToDevice_Sycl(X);
 
       /* Clone additional vectors for testing */
@@ -211,11 +211,11 @@ int main(int argc, char *argv[])
       }
 
       /* Fill vectors with uniform random data in [-1,1] */
-      realtype* ydata = N_VGetHostArrayPointer_Sycl(Y);
-      realtype* zdata = N_VGetHostArrayPointer_Sycl(Z);
+      sunrealtype* ydata = N_VGetHostArrayPointer_Sycl(Y);
+      sunrealtype* zdata = N_VGetHostArrayPointer_Sycl(Z);
       for (sunindextype j=0; j<length; j++) {
-        ydata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
-        zdata[j] = ((realtype) rand() / (realtype) RAND_MAX)*2-1;
+        ydata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
+        zdata[j] = ((sunrealtype) rand() / (sunrealtype) RAND_MAX)*2-1;
       }
       N_VCopyToDevice_Sycl(Y);
       N_VCopyToDevice_Sycl(Z);
@@ -405,11 +405,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation specific utility functions for vector tests
  * --------------------------------------------------------------------*/
-int check_ans(realtype ans, N_Vector X, sunindextype length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype length)
 {
   int          failure = 0;
   sunindextype i;
-  realtype     *Xdata;
+  sunrealtype     *Xdata;
 
   N_VCopyFromDevice_Sycl(X);
   Xdata = N_VGetHostArrayPointer_Sycl(X);
@@ -425,7 +425,7 @@ int check_ans(realtype ans, N_Vector X, sunindextype length)
   return (failure > ZERO) ? (1) : (0);
 }
 
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   /* check if vector data is non-null */
   if ((N_VGetHostArrayPointer_Sycl(X) == NULL) &&
@@ -434,17 +434,17 @@ booleantype has_data(N_Vector X)
   return SUNTRUE;
 }
 
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   /* set i-th element of data array */
   set_element_range(X, i, i, val);
 }
 
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   sunindextype i;
-  realtype*    xd;
+  sunrealtype*    xd;
 
   /* set elements [is,ie] of the data array */
   N_VCopyFromDevice_Sycl(X);
@@ -453,7 +453,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
   N_VCopyToDevice_Sycl(X);
 }
 
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   /* get i-th element of data array */
   N_VCopyFromDevice_Sycl(X);
diff --git a/examples/nvector/test_nvector.c b/examples/nvector/test_nvector.c
index 76cf153945..776dbc1742 100644
--- a/examples/nvector/test_nvector.c
+++ b/examples/nvector/test_nvector.c
@@ -365,7 +365,7 @@ int Test_N_VGetArrayPointer(N_Vector W, sunindextype local_length, int myid)
 {
   int      failure = 0;
   double   start_time, stop_time, maxt;
-  realtype *Wdata;
+  sunrealtype *Wdata;
 
   /* check if the required operations are implemented */
   if (W->ops->nvconst == NULL) {
@@ -417,7 +417,7 @@ int Test_N_VSetArrayPointer(N_Vector W, sunindextype local_length, int myid)
   int          failure = 0;
   sunindextype i;
   double       start_time, stop_time, maxt;
-  realtype     *Wdata;
+  sunrealtype     *Wdata;
 
   /* check if the required operations are implemented */
   if (W->ops->nvconst == NULL) {
@@ -427,7 +427,7 @@ int Test_N_VSetArrayPointer(N_Vector W, sunindextype local_length, int myid)
   }
 
   /* create vector data */
-  Wdata = (realtype*) malloc(local_length * sizeof(realtype));
+  Wdata = (sunrealtype*) malloc(local_length * sizeof(sunrealtype));
   for(i=0; i < local_length; i++){
     Wdata[i] = ONE;
   }
@@ -484,7 +484,7 @@ int Test_N_VGetLength(N_Vector W, int myid)
   Wlength = N_VGetLength(W);
 
   /* use N_VConst and N_VDotProd to compute length */
-  N_VConst(RCONST(1.0), W);
+  N_VConst(SUN_RCONST(1.0), W);
   Wlength2 = (sunindextype) N_VDotProd(W, W);
   sync_device(W);
 
@@ -1381,7 +1381,7 @@ int Test_N_VDotProd(N_Vector X, N_Vector Y, sunindextype local_length, int myid)
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype global_length;
-  realtype     ans;
+  sunrealtype     ans;
 
   /* get global length */
   global_length = N_VGetLength(X);
@@ -1396,7 +1396,7 @@ int Test_N_VDotProd(N_Vector X, N_Vector Y, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal global vector length */
-  failure = SUNRCompare(ans, (realtype) global_length);
+  failure = SUNRCompare(ans, (sunrealtype) global_length);
 
   if (failure) {
     printf(">>> FAILED test -- N_VDotProd, Proc %d \n", myid);
@@ -1420,7 +1420,7 @@ int Test_N_VMaxNorm(N_Vector X, sunindextype local_length, int myid)
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans;
+  sunrealtype ans;
 
   /*
    * Case 1: zero vector
@@ -1493,7 +1493,7 @@ int Test_N_VWrmsNorm(N_Vector X, N_Vector W, sunindextype local_length, int myid
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans;
+  sunrealtype ans;
 
   /* fill vector data */
   N_VConst(NEG_HALF, X);
@@ -1531,14 +1531,14 @@ int Test_N_VWrmsNormMask(N_Vector X, N_Vector W, N_Vector ID,
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype global_length;
-  realtype     ans;
-  realtype     fac;
+  sunrealtype     ans;
+  sunrealtype     fac;
 
   /* get global length */
   global_length = N_VGetLength(X);
 
   /* factor used in checking solutions */
-  fac = SUNRsqrt((realtype) (global_length - 1)/(global_length))*HALF*HALF;
+  fac = SUNRsqrt((sunrealtype) (global_length - 1)/(global_length))*HALF*HALF;
 
   /* fill vector data */
   N_VConst(NEG_HALF, X);
@@ -1579,7 +1579,7 @@ int Test_N_VMin(N_Vector X, sunindextype local_length, int myid)
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans;
+  sunrealtype ans;
 
   /* fill vector data */
   N_VConst(TWO, X);
@@ -1647,7 +1647,7 @@ int Test_N_VWL2Norm(N_Vector X, N_Vector W, sunindextype local_length, int myid)
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype global_length;
-  realtype     ans;
+  sunrealtype     ans;
 
   /* get global length */
   global_length = N_VGetLength(X);
@@ -1662,7 +1662,7 @@ int Test_N_VWL2Norm(N_Vector X, N_Vector W, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal 1/4 * sqrt(global_length) */
-  failure = (ans < ZERO) ? 1 : SUNRCompare(ans, HALF*HALF*SUNRsqrt((realtype) global_length));
+  failure = (ans < ZERO) ? 1 : SUNRCompare(ans, HALF*HALF*SUNRsqrt((sunrealtype) global_length));
 
   if (failure) {
     printf(">>> FAILED test -- N_VWL2Norm, Proc %d \n", myid);
@@ -1687,7 +1687,7 @@ int Test_N_VL1Norm(N_Vector X, sunindextype local_length, int myid)
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype global_length;
-  realtype     ans;
+  sunrealtype     ans;
 
   /* get global length */
   global_length = N_VGetLength(X);
@@ -1701,7 +1701,7 @@ int Test_N_VL1Norm(N_Vector X, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal global_length */
-  failure = (ans < ZERO) ? 1 : SUNRCompare(ans, (realtype) global_length);
+  failure = (ans < ZERO) ? 1 : SUNRCompare(ans, (sunrealtype) global_length);
 
   if (failure) {
     printf(">>> FAILED test -- N_VL1Norm, Proc %d \n", myid);
@@ -1809,7 +1809,7 @@ int Test_N_VInvTest(N_Vector X, N_Vector Z, sunindextype local_length, int myid)
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype i;
-  booleantype  ans, exp;
+  sunbooleantype  ans, exp;
 
   if (local_length < 2) {
     printf("Error Test_N_VInvTest: Local vector length is %ld, length must be >= 2\n",
@@ -1905,7 +1905,7 @@ int Test_N_VConstrMask(N_Vector C, N_Vector X, N_Vector M,
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype i;
-  booleantype  test;
+  sunbooleantype  test;
 
   if (local_length < 7) {
     printf("Error Test_N_VConstrMask: Local vector length is %ld, length must be >= 7\n",
@@ -2068,7 +2068,7 @@ int Test_N_VMinQuotient(N_Vector NUM, N_Vector DENOM,
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans;
+  sunrealtype ans;
 
   /*
    * Case 1: Pass
@@ -2118,12 +2118,12 @@ int Test_N_VMinQuotient(N_Vector NUM, N_Vector DENOM,
   sync_device(NUM);
   stop_time = get_time();
 
-  /* ans should equal BIG_REAL */
-  failure = SUNRCompare(ans, BIG_REAL);
+  /* ans should equal SUN_BIG_REAL */
+  failure = SUNRCompare(ans, SUN_BIG_REAL);
 
   if (failure) {
     printf(">>> FAILED test -- N_VMinQuotient Case 2, Proc %d \n", myid);
-    printf("    min = %" FSYM ", expected %" FSYM "\n", ans, BIG_REAL);
+    printf("    min = %" FSYM ", expected %" FSYM "\n", ans, SUN_BIG_REAL);
     fails++;
   } else if (myid == 0) {
     printf("PASSED test -- N_VMinQuotient Case 2 \n");
@@ -2147,7 +2147,7 @@ int Test_N_VLinearCombination(N_Vector X, sunindextype local_length, int myid)
 
   N_Vector Y1, Y2, Y3;
   N_Vector V[3];
-  realtype c[3];
+  sunrealtype c[3];
 
   /* create vectors for testing */
   Y1 = N_VClone(X);
@@ -2425,7 +2425,7 @@ int Test_N_VScaleAddMulti(N_Vector X, sunindextype local_length, int myid)
   int      fails = 0, failure = 0, ierr = 0;
   double   start_time, stop_time, maxt;
 
-  realtype avals[3];
+  sunrealtype avals[3];
   N_Vector *V, *Z;
 
   /* create vectors for testing */
@@ -2606,7 +2606,7 @@ int Test_N_VDotProdMulti(N_Vector X, sunindextype local_length, int myid)
 
   sunindextype  global_length;
   N_Vector     *V;
-  realtype      dotprods[3];
+  sunrealtype      dotprods[3];
 
   /* get global length */
   global_length = N_VGetLength(X);
@@ -2629,7 +2629,7 @@ int Test_N_VDotProdMulti(N_Vector X, sunindextype local_length, int myid)
 
   /* dotprod[0] should equal the global vector length */
   if (ierr == 0)
-    failure = SUNRCompare(dotprods[0], (realtype) global_length);
+    failure = SUNRCompare(dotprods[0], (sunrealtype) global_length);
   else
     failure = 1;
 
@@ -2661,9 +2661,9 @@ int Test_N_VDotProdMulti(N_Vector X, sunindextype local_length, int myid)
 
   /* dotprod[i] should equal -1, +1, and 2 times the global vector length */
   if (ierr == 0) {
-    failure  = SUNRCompare(dotprods[0], (realtype) -1*global_length);
-    failure += SUNRCompare(dotprods[1], (realtype)    global_length);
-    failure += SUNRCompare(dotprods[2], (realtype)  2*global_length);
+    failure  = SUNRCompare(dotprods[0], (sunrealtype) -1*global_length);
+    failure += SUNRCompare(dotprods[1], (sunrealtype)    global_length);
+    failure += SUNRCompare(dotprods[2], (sunrealtype)  2*global_length);
   } else {
     failure = 1;
   }
@@ -3400,7 +3400,7 @@ int Test_N_VScaleVectorArray(N_Vector X, sunindextype local_length, int myid)
   int      fails = 0, failure = 0, ierr = 0;
   double   start_time, stop_time, maxt;
 
-  realtype c[3];
+  sunrealtype c[3];
   N_Vector *Y, *Z;
 
   /* create vectors for testing */
@@ -3644,7 +3644,7 @@ int Test_N_VWrmsNormVectorArray(N_Vector X, sunindextype local_length, int myid)
   int      fails = 0, failure = 0, ierr = 0;
   double   start_time, stop_time, maxt;
 
-  realtype nrm[3];
+  sunrealtype nrm[3];
   N_Vector *Z;
   N_Vector *W;
 
@@ -3746,8 +3746,8 @@ int Test_N_VWrmsNormMaskVectorArray(N_Vector X, sunindextype local_length,
   double       start_time, stop_time, maxt;
   sunindextype global_length;
 
-  realtype fac;
-  realtype nrm[3];
+  sunrealtype fac;
+  sunrealtype nrm[3];
   N_Vector *Z;
   N_Vector *W;
 
@@ -3755,7 +3755,7 @@ int Test_N_VWrmsNormMaskVectorArray(N_Vector X, sunindextype local_length,
   global_length = N_VGetLength(X);
 
   /* factor used in checking solutions */
-  fac = SUNRsqrt((realtype) (global_length - 1)/(global_length));
+  fac = SUNRsqrt((sunrealtype) (global_length - 1)/(global_length));
 
   /* create vectors for testing */
   Z = N_VCloneVectorArray(3, X);
@@ -3863,7 +3863,7 @@ int Test_N_VScaleAddMultiVectorArray(N_Vector V, sunindextype local_length, int
   int      fails = 0, failure = 0, ierr = 0;
   double   start_time, stop_time, maxt;
 
-  realtype  a[3];
+  sunrealtype  a[3];
   N_Vector* X;
   N_Vector* Y[3];
   N_Vector* Z[3];
@@ -4275,7 +4275,7 @@ int Test_N_VLinearCombinationVectorArray(N_Vector V, sunindextype local_length,
   int      fails = 0, failure = 0, ierr = 0;
   double   start_time, stop_time, maxt;
 
-  realtype c[3];
+  sunrealtype c[3];
   N_Vector *Z;
   N_Vector* X[3];
 
@@ -4823,10 +4823,10 @@ int Test_N_VDotProdLocal(N_Vector X, N_Vector Y, sunindextype local_length, int
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, rmyid, locleninv;
+  sunrealtype ans, rmyid, locleninv;
 
   /* fill vector data */
-  rmyid = (realtype) myid;
+  rmyid = (sunrealtype) myid;
   locleninv = ONE/local_length;
   set_element_range(X, 0, local_length-1, rmyid);
   set_element_range(Y, 0, local_length-1, locleninv);
@@ -4837,7 +4837,7 @@ int Test_N_VDotProdLocal(N_Vector X, N_Vector Y, sunindextype local_length, int
   stop_time = get_time();
 
   /* ans should equal rmyid */
-  failure = SUNRCompareTol(ans, rmyid, SUNRsqrt(UNIT_ROUNDOFF));
+  failure = SUNRCompareTol(ans, rmyid, SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VDotProdLocal, Proc %d\n", myid);
@@ -4862,10 +4862,10 @@ int Test_N_VMaxNormLocal(N_Vector X, sunindextype local_length, int myid)
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, myidp1;
+  sunrealtype ans, myidp1;
 
   /* fill vector data */
-  myidp1 = (realtype) (myid+1);
+  myidp1 = (sunrealtype) (myid+1);
   N_VConst(NEG_HALF, X);
   set_element(X, local_length-1, -myidp1);
 
@@ -4875,7 +4875,7 @@ int Test_N_VMaxNormLocal(N_Vector X, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal myidp1 */
-  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, myidp1, SUNRsqrt(UNIT_ROUNDOFF));
+  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, myidp1, SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VMaxNormLocal, Proc %d\n", myid);
@@ -4899,10 +4899,10 @@ int Test_N_VMinLocal(N_Vector X, sunindextype local_length, int myid)
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, negmyid;
+  sunrealtype ans, negmyid;
 
   /* fill vector data */
-  negmyid = (realtype) -myid;
+  negmyid = (sunrealtype) -myid;
   N_VConst(TWO, X);
   set_element(X, local_length-1, negmyid);
 
@@ -4912,7 +4912,7 @@ int Test_N_VMinLocal(N_Vector X, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal negmyid */
-  failure = SUNRCompareTol(ans, negmyid, SUNRsqrt(UNIT_ROUNDOFF));
+  failure = SUNRCompareTol(ans, negmyid, SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VMinLocal, Proc %d\n", myid);
@@ -4936,7 +4936,7 @@ int Test_N_VL1NormLocal(N_Vector X, sunindextype local_length, int myid)
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, val;
+  sunrealtype ans, val;
 
   /* fill vector data */
   val = -(ONE*myid)/local_length;
@@ -4948,8 +4948,8 @@ int Test_N_VL1NormLocal(N_Vector X, sunindextype local_length, int myid)
   stop_time = get_time();
 
   /* ans should equal myid */
-  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (realtype) myid,
-                                       SUNRsqrt(UNIT_ROUNDOFF));
+  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (sunrealtype) myid,
+                                       SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VL1NormLocal, Proc %d\n", myid);
@@ -4973,7 +4973,7 @@ int Test_N_VWSqrSumLocal(N_Vector X, N_Vector W, sunindextype local_length, int
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, xval, wval;
+  sunrealtype ans, xval, wval;
 
   /* fill vector data */
   xval = SUNRsqrt(myid);
@@ -4987,8 +4987,8 @@ int Test_N_VWSqrSumLocal(N_Vector X, N_Vector W, sunindextype local_length, int
   stop_time = get_time();
 
   /* ans should equal myid */
-  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (realtype) myid,
-                                       SUNRsqrt(UNIT_ROUNDOFF));
+  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (sunrealtype) myid,
+                                       SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VWSqrSumLocal, Proc %d\n", myid);
@@ -5013,7 +5013,7 @@ int Test_N_VWSqrSumMaskLocal(N_Vector X, N_Vector W, N_Vector ID,
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans, xval, wval;
+  sunrealtype ans, xval, wval;
 
   /* fill vector data */
   xval = SUNRsqrt(myid);
@@ -5031,8 +5031,8 @@ int Test_N_VWSqrSumMaskLocal(N_Vector X, N_Vector W, N_Vector ID,
   stop_time = get_time();
 
   /* ans should equal myid */
-  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (realtype) myid,
-                                       SUNRsqrt(UNIT_ROUNDOFF));
+  failure = (ans < ZERO) ? 1 : SUNRCompareTol(ans, (sunrealtype) myid,
+                                       SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VWSqrSumMaskLocal, Proc %d\n", myid);
@@ -5056,9 +5056,9 @@ int Test_N_VInvTestLocal(N_Vector X, N_Vector Z, sunindextype local_length, int
 {
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
-  realtype     xval;
+  sunrealtype     xval;
   sunindextype i;
-  booleantype  test;
+  sunbooleantype  test;
 
   if (local_length < 2) {
     printf("Error Test_N_VInvTestLocal: Local vector length is %ld, length must be >= 2\n",
@@ -5150,7 +5150,7 @@ int Test_N_VConstrMaskLocal(N_Vector C, N_Vector X, N_Vector M,
   int          fails = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype i;
-  booleantype  test;
+  sunbooleantype  test;
 
   if (local_length < 7) {
     printf("Error Test_N_VConstrMaskLocal: Local vector length is %ld, length must be >= 7\n",
@@ -5314,7 +5314,7 @@ int Test_N_VMinQuotientLocal(N_Vector NUM, N_Vector DENOM,
 {
   int      fails = 0, failure = 0;
   double   start_time, stop_time, maxt;
-  realtype ans;
+  sunrealtype ans;
 
   /*
    * Case 1: Pass
@@ -5331,7 +5331,7 @@ int Test_N_VMinQuotientLocal(N_Vector NUM, N_Vector DENOM,
   stop_time = get_time();
 
   /* ans should equal myid */
-  failure = SUNRCompareTol(ans, (realtype) myid, SUNRsqrt(UNIT_ROUNDOFF));
+  failure = SUNRCompareTol(ans, (sunrealtype) myid, SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VMinQuotientLocal Case 1, Proc %d \n", myid);
@@ -5360,8 +5360,8 @@ int Test_N_VMinQuotientLocal(N_Vector NUM, N_Vector DENOM,
   sync_device(NUM);
   stop_time = get_time();
 
-  /* ans should equal BIG_REAL */
-  failure = SUNRCompareTol(ans, BIG_REAL, SUNRsqrt(UNIT_ROUNDOFF));
+  /* ans should equal SUN_BIG_REAL */
+  failure = SUNRCompareTol(ans, SUN_BIG_REAL, SUNRsqrt(SUN_UNIT_ROUNDOFF));
 
   if (failure) {
     printf(">>> FAILED test -- N_VMinQuotientLocal Case 2, Proc %d \n", myid);
@@ -5388,7 +5388,7 @@ int Test_N_VDotProdMultiLocal(N_Vector X, sunindextype local_length, int myid)
   double start_time, stop_time, maxt;
 
   N_Vector *V;
-  realtype dotprods[3];
+  sunrealtype dotprods[3];
 
   /* create vectors for testing */
   V = N_VCloneVectorArray(3, X);
@@ -5408,7 +5408,7 @@ int Test_N_VDotProdMultiLocal(N_Vector X, sunindextype local_length, int myid)
 
   /* dotprod[0] should equal the local vector length */
   if (ierr == 0)
-    failure = SUNRCompare(dotprods[0], (realtype) local_length);
+    failure = SUNRCompare(dotprods[0], (sunrealtype) local_length);
   else
     failure = 1;
 
@@ -5440,9 +5440,9 @@ int Test_N_VDotProdMultiLocal(N_Vector X, sunindextype local_length, int myid)
 
   /* dotprod[i] should equal -1, +1, and 2 times the local vector length */
   if (ierr == 0) {
-    failure  = SUNRCompare(dotprods[0], (realtype) -1 * local_length);
-    failure += SUNRCompare(dotprods[1], (realtype)      local_length);
-    failure += SUNRCompare(dotprods[2], (realtype)  2 * local_length);
+    failure  = SUNRCompare(dotprods[0], (sunrealtype) -1 * local_length);
+    failure += SUNRCompare(dotprods[1], (sunrealtype)      local_length);
+    failure += SUNRCompare(dotprods[2], (sunrealtype)  2 * local_length);
   } else {
     failure = 1;
   }
@@ -5476,7 +5476,7 @@ int Test_N_VDotProdMultiAllReduce(N_Vector X, sunindextype local_length,
 
   sunindextype  global_length;
   N_Vector     *V;
-  realtype      dotprods[3];
+  sunrealtype      dotprods[3];
 
   /* only test if the operation is implemented, local vectors (non-MPI) do not
      provide this function */
@@ -5503,7 +5503,7 @@ int Test_N_VDotProdMultiAllReduce(N_Vector X, sunindextype local_length,
 
   /* dotprod[0] should equal the local vector length */
   if (ierr == 0)
-    failure = SUNRCompare(dotprods[0], (realtype) local_length);
+    failure = SUNRCompare(dotprods[0], (sunrealtype) local_length);
   else
     failure = 1;
 
@@ -5526,7 +5526,7 @@ int Test_N_VDotProdMultiAllReduce(N_Vector X, sunindextype local_length,
 
   /* dotprod[0] should equal the global vector length */
   if (ierr == 0)
-    failure = SUNRCompare(dotprods[0], (realtype) global_length);
+    failure = SUNRCompare(dotprods[0], (sunrealtype) global_length);
   else
     failure = 1;
 
@@ -5558,9 +5558,9 @@ int Test_N_VDotProdMultiAllReduce(N_Vector X, sunindextype local_length,
 
   /* dotprod[i] should equal -1, +1, and 2 times the local vector length */
   if (ierr == 0) {
-    failure  = SUNRCompare(dotprods[0], (realtype) -1 * local_length);
-    failure += SUNRCompare(dotprods[1], (realtype)      local_length);
-    failure += SUNRCompare(dotprods[2], (realtype)  2 * local_length);
+    failure  = SUNRCompare(dotprods[0], (sunrealtype) -1 * local_length);
+    failure += SUNRCompare(dotprods[1], (sunrealtype)      local_length);
+    failure += SUNRCompare(dotprods[2], (sunrealtype)  2 * local_length);
   } else {
     failure = 1;
   }
@@ -5584,9 +5584,9 @@ int Test_N_VDotProdMultiAllReduce(N_Vector X, sunindextype local_length,
 
   /* dotprod[i] should equal -1, +1, and 2 times the global vector length */
   if (ierr == 0) {
-    failure  = SUNRCompare(dotprods[0], (realtype) -1 * global_length);
-    failure += SUNRCompare(dotprods[1], (realtype)      global_length);
-    failure += SUNRCompare(dotprods[2], (realtype)  2 * global_length);
+    failure  = SUNRCompare(dotprods[0], (sunrealtype) -1 * global_length);
+    failure += SUNRCompare(dotprods[1], (sunrealtype)      global_length);
+    failure += SUNRCompare(dotprods[2], (sunrealtype)  2 * global_length);
   } else {
     failure = 1;
   }
@@ -5631,7 +5631,7 @@ int Test_N_VBufSize(N_Vector x, sunindextype local_length, int myid)
   }
 
   /* check buffer size */
-  if (size != local_length * ((sunindextype)sizeof(realtype))) {
+  if (size != local_length * ((sunindextype)sizeof(sunrealtype))) {
     printf(">>> FAILED test -- N_VBufSize, Proc %d \n", myid);
     return(1);
   }
@@ -5656,7 +5656,7 @@ int Test_N_VBufPack(N_Vector x, sunindextype local_length, int myid)
   int          flag = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype i, size;
-  realtype     *buf;
+  sunrealtype     *buf;
 
   /* get buffer size */
   flag = N_VBufSize(x, &size);
@@ -5667,7 +5667,7 @@ int Test_N_VBufPack(N_Vector x, sunindextype local_length, int myid)
 
   /* create and initialize buffer */
   buf = NULL;
-  buf = (realtype*) malloc((size_t)size);
+  buf = (sunrealtype*) malloc((size_t)size);
   if (buf == NULL) {
     printf(">>> FAILED test -- malloc failed, Proc %d \n", myid);
     return(1);
@@ -5724,7 +5724,7 @@ int Test_N_VBufUnpack(N_Vector x, sunindextype local_length, int myid)
   int          flag = 0, failure = 0;
   double       start_time, stop_time, maxt;
   sunindextype i, size;
-  realtype     *buf;
+  sunrealtype     *buf;
 
   /* get buffer size */
   flag = N_VBufSize(x, &size);
@@ -5735,7 +5735,7 @@ int Test_N_VBufUnpack(N_Vector x, sunindextype local_length, int myid)
 
   /* create and initialize buffer */
   buf = NULL;
-  buf = (realtype*) malloc((size_t)size);
+  buf = (sunrealtype*) malloc((size_t)size);
   if (buf == NULL) {
     printf(">>> FAILED test -- malloc failed, Proc %d \n", myid);
     return(1);
diff --git a/examples/nvector/test_nvector.h b/examples/nvector/test_nvector.h
index a8a42faa96..910f7719ce 100644
--- a/examples/nvector/test_nvector.h
+++ b/examples/nvector/test_nvector.h
@@ -19,13 +19,13 @@
 #include <sundials/sundials_types.h>
 
 /* define constants */
-#define NEG_TWO  RCONST(-2.0)
-#define NEG_ONE  RCONST(-1.0)
-#define NEG_HALF RCONST(-0.5)
-#define ZERO     RCONST(0.0)
-#define HALF     RCONST(0.5)
-#define ONE      RCONST(1.0)
-#define TWO      RCONST(2.0)
+#define NEG_TWO  SUN_RCONST(-2.0)
+#define NEG_ONE  SUN_RCONST(-1.0)
+#define NEG_HALF SUN_RCONST(-0.5)
+#define ZERO     SUN_RCONST(0.0)
+#define HALF     SUN_RCONST(0.5)
+#define ONE      SUN_RCONST(1.0)
+#define TWO      SUN_RCONST(2.0)
 
 #ifdef __cplusplus  /* wrapper to enable C++ usage */
 extern "C" {
@@ -34,12 +34,12 @@ extern "C" {
 extern SUNContext sunctx;
 
 /* Forward declarations for implementation specific utility functions */
-int check_ans(realtype ans, N_Vector X, sunindextype local_length);
-booleantype has_data(N_Vector X);
-void set_element(N_Vector X, sunindextype i, realtype val);
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length);
+sunbooleantype has_data(N_Vector X);
+void set_element(N_Vector X, sunindextype i, sunrealtype val);
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val);
-realtype get_element(N_Vector X, sunindextype i);
+                       sunrealtype val);
+sunrealtype get_element(N_Vector X, sunindextype i);
 double max_time(N_Vector X, double time);
 void sync_device(N_Vector X);
 
diff --git a/examples/nvector/trilinos/test_nvector_trilinos.cpp b/examples/nvector/trilinos/test_nvector_trilinos.cpp
index d14ffdb463..b0c1273146 100644
--- a/examples/nvector/trilinos/test_nvector_trilinos.cpp
+++ b/examples/nvector/trilinos/test_nvector_trilinos.cpp
@@ -211,7 +211,7 @@ int main (int argc, char *argv[])
 /*
  * Checks if all elements of vector X are _ans_
  */
-int check_ans(realtype ans, N_Vector X, sunindextype local_length)
+int check_ans(sunrealtype ans, N_Vector X, sunindextype local_length)
 {
   Teuchos::RCP<TpetraVectorInterface::vector_type> xv =
     N_VGetVector_Trilinos(X);
@@ -240,7 +240,7 @@ int check_ans(realtype ans, N_Vector X, sunindextype local_length)
 /*
  * Checks if there is a Tpetra vector
  */
-booleantype has_data(N_Vector X)
+sunbooleantype has_data(N_Vector X)
 {
   if (X->content == NULL)
     return SUNFALSE;
@@ -253,7 +253,7 @@ booleantype has_data(N_Vector X)
 /*
  * Sets ith element of vector X to val
  */
-void set_element(N_Vector X, sunindextype i, realtype val)
+void set_element(N_Vector X, sunindextype i, sunrealtype val)
 {
   set_element_range(X, i, i, val);
 }
@@ -262,7 +262,7 @@ void set_element(N_Vector X, sunindextype i, realtype val)
  * Sets elements [is, ie] of vector X to val
  */
 void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
-                       realtype val)
+                       sunrealtype val)
 {
   typedef TpetraVectorInterface::vector_type vector_type;
 #if TRILINOS_MAJOR_VERSION < 14
@@ -294,7 +294,7 @@ void set_element_range(N_Vector X, sunindextype is, sunindextype ie,
 /*
  * Returns ith element of vector X
  */
-realtype get_element(N_Vector X, sunindextype i)
+sunrealtype get_element(N_Vector X, sunindextype i)
 {
   Teuchos::RCP<TpetraVectorInterface::vector_type> xv =
     N_VGetVector_Trilinos(X);
diff --git a/examples/sunlinsol/band/test_fsunlinsol_band_mod.f90 b/examples/sunlinsol/band/test_fsunlinsol_band_mod.f90
index 77e04e2431..73b88e410b 100644
--- a/examples/sunlinsol/band/test_fsunlinsol_band_mod.f90
+++ b/examples/sunlinsol/band/test_fsunlinsol_band_mod.f90
@@ -102,7 +102,7 @@ integer(C_INT) function unit_tests() result(fails)
     ! run tests
     fails = fails + Test_FSUNLinSolInitialize(LS, 0)
     fails = fails + Test_FSUNLinSolSetup(LS, A, 0)
-    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, 0)
+    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, 0)
 
     fails = fails + Test_FSUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0)
     fails = fails + Test_FSUNLinSolLastFlag(LS, 0)
diff --git a/examples/sunlinsol/band/test_sunlinsol_band.c b/examples/sunlinsol/band/test_sunlinsol_band.c
index 8480b09e7b..13428d2304 100644
--- a/examples/sunlinsol/band/test_sunlinsol_band.c
+++ b/examples/sunlinsol/band/test_sunlinsol_band.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
   N_Vector        x, y, b;            /* test vectors               */
   int             print_timing;
   sunindextype    j, k, kstart, kend;
-  realtype        *colj, *xdata;
+  sunrealtype        *colj, *xdata;
   SUNContext      sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -103,10 +103,10 @@ int main(int argc, char *argv[])
     kstart = (j<uband) ? -j : -uband;
     kend = (j>cols-1-lband) ? cols-1-j: lband;
     for (k=kstart; k<=kend; k++)
-      colj[k] = (realtype) rand() / (realtype) RAND_MAX;
+      colj[k] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
     /* x entry */
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   }
 
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_BAND, 0);
@@ -199,11 +199,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/cusolversp/test_sunlinsol_cusolversp_batchqr.cu b/examples/sunlinsol/cusolversp/test_sunlinsol_cusolversp_batchqr.cu
index 4f69a36fde..67e8f63ed2 100644
--- a/examples/sunlinsol/cusolversp/test_sunlinsol_cusolversp_batchqr.cu
+++ b/examples/sunlinsol/cusolversp/test_sunlinsol_cusolversp_batchqr.cu
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;                 /* linear solver object          */
   SUNMatrix       A, B, dA;           /* test matrices                 */
   N_Vector        x, b, d_x, d_xref, d_b;/* test vectors                  */
-  realtype        *matdata, *xdata, *xrefdata;
+  sunrealtype        *matdata, *xdata, *xrefdata;
   int             print_timing;
   sunindextype    i, j;
   SUNContext      sunctx;
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
       sunindextype col = cols[j] + block_size*i;
       sunindextype row = rows[j] + block_size*i;
       matdata = SUNDenseMatrix_Column(B,col);
-      matdata[row] = (realtype) rand() / (realtype) RAND_MAX / N;
+      matdata[row] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
     }
   }
 
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
   xdata = N_VGetHostArrayPointer_Cuda(d_x);
   xrefdata = N_VGetHostArrayPointer_Cuda(d_xref);
   for (i=0; i<N; i++) {
-    realtype tmp = (realtype) rand() / (realtype) RAND_MAX;
+    sunrealtype tmp = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
     xdata[i]    = tmp;
     xrefdata[i] = tmp;
   }
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, dA, 0);
-  fails += Test_SUNLinSolSolve(LS, dA, d_x, d_b, 1000*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, dA, d_x, d_b, 1000*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_CUSOLVERSP_BATCHQR, 0);
@@ -246,11 +246,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length, maxloc;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   cudaDeviceSynchronize();
 
diff --git a/examples/sunlinsol/dense/test_fsunlinsol_dense_mod.f90 b/examples/sunlinsol/dense/test_fsunlinsol_dense_mod.f90
index 7fdfb8dfd4..17806c16ec 100644
--- a/examples/sunlinsol/dense/test_fsunlinsol_dense_mod.f90
+++ b/examples/sunlinsol/dense/test_fsunlinsol_dense_mod.f90
@@ -101,7 +101,7 @@ integer(C_INT) function unit_tests() result(fails)
     ! run tests
     fails = fails + Test_FSUNLinSolInitialize(LS, 0)
     fails = fails + Test_FSUNLinSolSetup(LS, A, 0)
-    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, 0)
+    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, 0)
 
     fails = fails + Test_FSUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0)
     fails = fails + Test_FSUNLinSolLastFlag(LS, 0)
diff --git a/examples/sunlinsol/dense/test_sunlinsol_dense.c b/examples/sunlinsol/dense/test_sunlinsol_dense.c
index 4afb9cf0c7..dbb6f2ce1c 100644
--- a/examples/sunlinsol/dense/test_sunlinsol_dense.c
+++ b/examples/sunlinsol/dense/test_sunlinsol_dense.c
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
   int             print_timing;
   int             print_on_fail;
   sunindextype    j, k;
-  realtype        *colj, *xdata, *colIj;
+  sunrealtype        *colj, *xdata, *colIj;
   SUNContext      sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -94,7 +94,7 @@ int main(int argc, char *argv[])
   for (j=0; j<cols; j++) {
     colj = SUNDenseMatrix_Column(A, j);
     for (k=0; k<rows; k++)
-      colj[k] = (realtype) rand() / (realtype) RAND_MAX / cols;
+      colj[k] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / cols;
   }
 
   /* Create anti-identity matrix */
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
   /* Fill x vector with uniform random data in [0,1] */
   xdata = N_VGetArrayPointer(x);
   for (j=0; j<cols; j++) {
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   }
 
   /* copy A and x into B and y to print in case of solver failure */
@@ -146,7 +146,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_DENSE, 0);
@@ -186,11 +186,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/klu/test_fsunlinsol_klu_mod.f90 b/examples/sunlinsol/klu/test_fsunlinsol_klu_mod.f90
index 551dcb8d54..c99a986a11 100644
--- a/examples/sunlinsol/klu/test_fsunlinsol_klu_mod.f90
+++ b/examples/sunlinsol/klu/test_fsunlinsol_klu_mod.f90
@@ -98,7 +98,7 @@ integer(C_INT) function unit_tests() result(fails)
     ! run tests
     fails = fails + Test_FSUNLinSolInitialize(LS, 0)
     fails = fails + Test_FSUNLinSolSetup(LS, A, 0)
-    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 1000*UNIT_ROUNDOFF, 0)
+    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 1000*SUN_UNIT_ROUNDOFF, 0)
 
     fails = fails + Test_FSUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0)
     fails = fails + Test_FSUNLinSolLastFlag(LS, 0)
diff --git a/examples/sunlinsol/klu/test_sunlinsol_klu.c b/examples/sunlinsol/klu/test_sunlinsol_klu.c
index 4546dcdba6..4f2954f6eb 100644
--- a/examples/sunlinsol/klu/test_sunlinsol_klu.c
+++ b/examples/sunlinsol/klu/test_sunlinsol_klu.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;                 /* linear solver object       */
   SUNMatrix       A, B;               /* test matrices              */
   N_Vector        x, y, b;            /* test vectors               */
-  realtype        *matdata, *xdata;
+  sunrealtype        *matdata, *xdata;
   int             mattype, print_timing;
   sunindextype    i, j, k;
   sun_klu_symbolic *symbolic;
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
     i = rand() % N;
     j = rand() % N;
     matdata = SUNDenseMatrix_Column(B,j);
-    matdata[i] = (realtype) rand() / (realtype) RAND_MAX / N;
+    matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
   }
 
   /* Add identity to matrix */
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
   /* Fill x vector with uniform random data in [0,1] */
   xdata = N_VGetArrayPointer(x);
   for (i=0; i<N; i++)
-    xdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   /* Create sparse matrix from dense, and destroy B */
   A = SUNSparseFromDenseMatrix(B, ZERO, mattype);
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 1000*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 1000*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_KLU, 0);
@@ -182,11 +182,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length, maxloc;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/kokkos/test_sunlinsol_kokkosdense.cpp b/examples/sunlinsol/kokkos/test_sunlinsol_kokkosdense.cpp
index e7d6f3d9b1..a8c34d068f 100644
--- a/examples/sunlinsol/kokkos/test_sunlinsol_kokkosdense.cpp
+++ b/examples/sunlinsol/kokkos/test_sunlinsol_kokkosdense.cpp
@@ -175,7 +175,7 @@ int CompareTol(sunrealtype a, sunrealtype b, sunrealtype tol)
          std::max(10 * std::numeric_limits<sunrealtype>::epsilon(), tol * norm);
 }
 
-int check_vector(N_Vector expected, N_Vector computed, realtype tol)
+int check_vector(N_Vector expected, N_Vector computed, sunrealtype tol)
 {
   int failure = 0;
 
diff --git a/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c b/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c
index 319fd3a23d..6e04a975dd 100644
--- a/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c
+++ b/examples/sunlinsol/lapackband/test_sunlinsol_lapackband.c
@@ -40,7 +40,7 @@ int main(int argc, char *argv[])
   N_Vector        x, y, b;            /* test vectors               */
   int             print_timing, print_matrix_on_fail;
   sunindextype    j, k, kstart, kend;
-  realtype        *colj, *xdata;
+  sunrealtype        *colj, *xdata;
   SUNContext      sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -96,10 +96,10 @@ int main(int argc, char *argv[])
     kstart = (j<uband) ? -j : -uband;
     kend = (j>cols-1-lband) ? cols-1-j: lband;
     for (k=kstart; k<=kend; k++)
-      colj[k] = (realtype) rand() / (realtype) RAND_MAX;
+      colj[k] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
     /* x entry */
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   }
 
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_LAPACKBAND, 0);
@@ -170,11 +170,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90 b/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
index 797c77ced5..927a72f2b3 100644
--- a/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
+++ b/examples/sunlinsol/lapackdense/test_fsunlinsol_lapackdense_mod.f90
@@ -101,7 +101,7 @@ integer(C_INT) function unit_tests() result(fails)
     ! run tests
     fails = fails + Test_FSUNLinSolInitialize(LS, 0)
     fails = fails + Test_FSUNLinSolSetup(LS, A, 0)
-    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, 0)
+    fails = fails + Test_FSUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, 0)
 
     fails = fails + Test_FSUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0)
     fails = fails + Test_FSUNLinSolLastFlag(LS, 0)
diff --git a/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c b/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c
index 41abcb5f06..567fdd65a5 100644
--- a/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c
+++ b/examples/sunlinsol/lapackdense/test_sunlinsol_lapackdense.c
@@ -39,7 +39,7 @@ int main(int argc, char *argv[])
   N_Vector        x, y, b;            /* test vectors               */
   int             print_timing, print_matrix_on_fail;
   sunindextype    j, k;
-  realtype        *colj, *xdata, *colIj;
+  sunrealtype        *colj, *xdata, *colIj;
   SUNContext      sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
   for (j=0; j<cols; j++) {
     colj = SUNDenseMatrix_Column(A, j);
     for (k=0; k<rows; k++)
-      colj[k] = (realtype) rand() / (realtype) RAND_MAX / cols;
+      colj[k] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / cols;
   }
 
   /* Create anti-identity matrix */
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
   /* Fill x vector with uniform random data in [0,1] */
   xdata = N_VGetArrayPointer(x);
   for (j=0; j<cols; j++) {
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   }
 
   /* copy A and x into B and y to print in case of solver failure */
@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_LAPACKDENSE, 0);
@@ -168,11 +168,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp b/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp
index 07842c5366..57f39868b4 100644
--- a/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp
+++ b/examples/sunlinsol/magmadense/test_sunlinsol_magmadense.cpp
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
   N_Vector        x, b;               /* test vectors               */
   int             print_timing;
   sunindextype    i, j, k;
-  realtype        *Adata, *Idata, *xdata;
+  sunrealtype        *Adata, *Idata, *xdata;
   SUNContext      sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -99,22 +99,22 @@ int main(int argc, char *argv[])
   b = N_VClone(x);
 
   /* Allocate host data */
-  Adata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_MagmaDense_LData(A));
-  Idata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_MagmaDense_LData(I));
+  Adata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_MagmaDense_LData(A));
+  Idata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_MagmaDense_LData(I));
 
   /* Fill A matrix with uniform random data in [0,1/cols] */
   for (k=0; k<nblocks; k++)
     for (j=0; j<cols; j++)
       for (i=0; i<rows; i++)
         Adata[k*cols*rows + j*rows + i] =
-            (realtype) rand() / (realtype) RAND_MAX / cols;
+            (sunrealtype) rand() / (sunrealtype) RAND_MAX / cols;
 
   /* Create anti-identity matrix */
   for (k=0; k<nblocks; k++)
     for(j=0; j<cols; j++)
       for (i=0; i<rows; i++)
         Idata[k*cols*rows + j*rows + i] =
-            ((rows-1-i) == j) ? RCONST(1.0) : RCONST(0.0);
+            ((rows-1-i) == j) ? SUN_RCONST(1.0) : SUN_RCONST(0.0);
 
   /* Add anti-identity to ensure the solver needs to do row-swapping */
   for (k=0; k<nblocks; k++)
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
   /* Fill x vector with uniform random data in [0,1] */
   xdata = N_VGetArrayPointer(x);
   for (j=0; j<cols*nblocks; j++)
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   HIP_OR_CUDA( N_VCopyToDevice_Hip(x);,
                N_VCopyToDevice_Cuda(x); )
 
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, RCONST(1e-10), SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, SUN_RCONST(1e-10), SUNTRUE, 0);
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_MAGMADENSE, 0);
   fails += Test_SUNLinSolLastFlag(LS, 0);
@@ -202,10 +202,10 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector actual, N_Vector expected, realtype tol)
+int check_vector(N_Vector actual, N_Vector expected, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
diff --git a/examples/sunlinsol/onemkldense/test_sunlinsol_onemkldense.cpp b/examples/sunlinsol/onemkldense/test_sunlinsol_onemkldense.cpp
index c3adc0a08e..936b161c38 100644
--- a/examples/sunlinsol/onemkldense/test_sunlinsol_onemkldense.cpp
+++ b/examples/sunlinsol/onemkldense/test_sunlinsol_onemkldense.cpp
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
   }
 
   // Allocate host data
-  realtype* Adata = (realtype*) malloc(sizeof(realtype) *
+  sunrealtype* Adata = (sunrealtype*) malloc(sizeof(sunrealtype) *
                                        SUNMatrix_OneMklDense_LData(A));
   if (!Adata)
   {
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
     SUNMatDestroy(I);
   }
 
-  realtype* Idata = (realtype*) malloc(sizeof(realtype) *
+  sunrealtype* Idata = (sunrealtype*) malloc(sizeof(sunrealtype) *
                                        SUNMatrix_OneMklDense_LData(I));
   if (!Idata)
   {
@@ -226,14 +226,14 @@ int main(int argc, char *argv[])
     for (j = 0; j < cols; j++)
       for (i = 0; i < rows; i++)
         Adata[k * cols * rows + j * rows + i] =
-          (realtype) rand() / (realtype) RAND_MAX / cols;
+          (sunrealtype) rand() / (sunrealtype) RAND_MAX / cols;
 
   // Create anti-identity matrix
   for (k = 0; k < nblocks; k++)
     for(j = 0; j < cols; j++)
       for (i = 0; i < rows; i++)
         Idata[k * cols * rows + j * rows + i] =
-          ((rows-1-i) == j) ? RCONST(1.0) : RCONST(0.0);
+          ((rows-1-i) == j) ? SUN_RCONST(1.0) : SUN_RCONST(0.0);
 
   // Add anti-identity to ensure the solver needs to do row-swapping
   for (k = 0; k < nblocks; k++)
@@ -246,9 +246,9 @@ int main(int argc, char *argv[])
   SUNMatrix_OneMklDense_CopyToDevice(I, Idata);
 
   // Fill x vector with uniform random data in [0,1]
-  realtype* xdata = N_VGetArrayPointer(x);
+  sunrealtype* xdata = N_VGetArrayPointer(x);
   for (j = 0; j < cols * nblocks; j++)
-    xdata[j] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   N_VCopyToDevice_Sycl(x);
 
@@ -297,7 +297,7 @@ int main(int argc, char *argv[])
   // Run Tests
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, RCONST(1e-10), SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, SUN_RCONST(1e-10), SUNTRUE, 0);
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_ONEMKLDENSE, 0);
   fails += Test_SUNLinSolLastFlag(LS, 0);
@@ -344,13 +344,13 @@ int main(int argc, char *argv[])
  * ---------------------------------------------------------------------------*/
 
 
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i = 0;
   sunindextype local_length = N_VGetLength(X);
-  realtype* Xdata = N_VGetArrayPointer(X);
-  realtype* Ydata = N_VGetArrayPointer(Y);
+  sunrealtype* Xdata = N_VGetArrayPointer(X);
+  sunrealtype* Ydata = N_VGetArrayPointer(Y);
 
   // Copy data to host
   N_VCopyFromDevice_Sycl(X);
@@ -362,7 +362,7 @@ int check_vector(N_Vector X, N_Vector Y, realtype tol)
 
   if (failure > ZERO)
   {
-    realtype maxerr = ZERO;
+    sunrealtype maxerr = ZERO;
     for(i = 0; i < local_length; i++)
       maxerr = SUNMAX(SUNRabs(Xdata[i] - Ydata[i]), maxerr);
     printf("check err failure: maxerr = %g (tol = %g)\n", maxerr, tol);
diff --git a/examples/sunlinsol/pcg/parallel/test_sunlinsol_pcg_parallel.c b/examples/sunlinsol/pcg/parallel/test_sunlinsol_pcg_parallel.c
index 644079a94d..76807cc872 100644
--- a/examples/sunlinsol/pcg/parallel/test_sunlinsol_pcg_parallel.c
+++ b/examples/sunlinsol/pcg/parallel/test_sunlinsol_pcg_parallel.c
@@ -39,8 +39,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -58,11 +58,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of Nloc (for check_vector routine) */
 sunindextype local_problem_size;
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -361,7 +361,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s, vL, vR, vsL, vsR;
+  sunrealtype *v, *z, *s, vL, vR, vsL, vsR;
   sunindextype i, Nloc;
   int ierr;
   UserData *ProbData;
@@ -426,10 +426,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d, *s;
+  sunrealtype *r, *z, *d, *s;
   sunindextype i;
   UserData *ProbData;
 
@@ -453,9 +453,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -486,11 +486,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/pcg/serial/test_sunlinsol_pcg_serial.c b/examples/sunlinsol/pcg/serial/test_sunlinsol_pcg_serial.c
index d48a0b225a..efe3137ac2 100644
--- a/examples/sunlinsol/pcg/serial/test_sunlinsol_pcg_serial.c
+++ b/examples/sunlinsol/pcg/serial/test_sunlinsol_pcg_serial.c
@@ -38,8 +38,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -54,11 +54,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of the problem size (for check_vector routine) */
 sunindextype problem_size;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -335,7 +335,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s;
+  sunrealtype *v, *z, *s;
   sunindextype i, N;
   UserData *ProbData;
 
@@ -367,10 +367,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d, *s;
+  sunrealtype *r, *z, *d, *s;
   sunindextype i;
   UserData *ProbData;
 
@@ -394,9 +394,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -427,11 +427,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int      failure = 0;
   long int i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spbcgs/parallel/test_sunlinsol_spbcgs_parallel.c b/examples/sunlinsol/spbcgs/parallel/test_sunlinsol_spbcgs_parallel.c
index e829cc4665..4b67992d36 100644
--- a/examples/sunlinsol/spbcgs/parallel/test_sunlinsol_spbcgs_parallel.c
+++ b/examples/sunlinsol/spbcgs/parallel/test_sunlinsol_spbcgs_parallel.c
@@ -39,8 +39,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -59,11 +59,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of Nloc (for check_vector routine) */
 sunindextype local_problem_size;
@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -452,7 +452,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
+  sunrealtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
   sunindextype i, Nloc;
   int ierr;
   UserData *ProbData;
@@ -519,10 +519,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -544,9 +544,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -577,11 +577,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spbcgs/serial/test_sunlinsol_spbcgs_serial.c b/examples/sunlinsol/spbcgs/serial/test_sunlinsol_spbcgs_serial.c
index 4154b15728..7bea073e27 100644
--- a/examples/sunlinsol/spbcgs/serial/test_sunlinsol_spbcgs_serial.c
+++ b/examples/sunlinsol/spbcgs/serial/test_sunlinsol_spbcgs_serial.c
@@ -38,8 +38,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -55,11 +55,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of the problem size (for check_vector routine) */
 sunindextype problem_size;
@@ -98,7 +98,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -423,7 +423,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2;
+  sunrealtype *v, *z, *s1, *s2;
   sunindextype i, N;
   UserData *ProbData;
 
@@ -457,10 +457,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -482,9 +482,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -515,11 +515,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spfgmr/parallel/test_sunlinsol_spfgmr_parallel.c b/examples/sunlinsol/spfgmr/parallel/test_sunlinsol_spfgmr_parallel.c
index 95bd497d3e..0fd34e785a 100644
--- a/examples/sunlinsol/spfgmr/parallel/test_sunlinsol_spfgmr_parallel.c
+++ b/examples/sunlinsol/spfgmr/parallel/test_sunlinsol_spfgmr_parallel.c
@@ -39,8 +39,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -59,11 +59,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of Nloc (for check_vector routine) */
 sunindextype local_problem_size;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             gstype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -441,7 +441,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
+  sunrealtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
   sunindextype i, Nloc;
   int ierr;
   UserData *ProbData;
@@ -508,10 +508,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -533,9 +533,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -566,11 +566,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int      failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spfgmr/serial/test_sunlinsol_spfgmr_serial.c b/examples/sunlinsol/spfgmr/serial/test_sunlinsol_spfgmr_serial.c
index ae6d0ab55e..b7537d8509 100644
--- a/examples/sunlinsol/spfgmr/serial/test_sunlinsol_spfgmr_serial.c
+++ b/examples/sunlinsol/spfgmr/serial/test_sunlinsol_spfgmr_serial.c
@@ -38,8 +38,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -55,11 +55,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of the problem size (for check_vector routine) */
 sunindextype problem_size;
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             gstype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -413,7 +413,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2;
+  sunrealtype *v, *z, *s1, *s2;
   sunindextype i, N;
   UserData *ProbData;
 
@@ -447,10 +447,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -472,9 +472,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -505,11 +505,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int      failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spgmr/parallel/test_sunlinsol_spgmr_parallel.c b/examples/sunlinsol/spgmr/parallel/test_sunlinsol_spgmr_parallel.c
index 100b96a822..42bcd041e5 100644
--- a/examples/sunlinsol/spgmr/parallel/test_sunlinsol_spgmr_parallel.c
+++ b/examples/sunlinsol/spgmr/parallel/test_sunlinsol_spgmr_parallel.c
@@ -39,8 +39,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -59,11 +59,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of Nloc (for check_vector routine) */
 sunindextype local_problem_size;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             gstype, pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -448,7 +448,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
+  sunrealtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
   sunindextype i, Nloc;
   int ierr;
   UserData *ProbData;
@@ -515,10 +515,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -540,9 +540,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -573,11 +573,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/spgmr/serial/test_sunlinsol_spgmr_serial.c b/examples/sunlinsol/spgmr/serial/test_sunlinsol_spgmr_serial.c
index 112a10f5d0..b9d81c712c 100644
--- a/examples/sunlinsol/spgmr/serial/test_sunlinsol_spgmr_serial.c
+++ b/examples/sunlinsol/spgmr/serial/test_sunlinsol_spgmr_serial.c
@@ -38,8 +38,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -55,11 +55,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of the problem size (for check_vector routine) */
 sunindextype problem_size;
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             gstype, pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -420,7 +420,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2;
+  sunrealtype *v, *z, *s1, *s2;
   sunindextype i, N;
   UserData *ProbData;
 
@@ -454,10 +454,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -479,9 +479,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -512,11 +512,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/sptfqmr/parallel/test_sunlinsol_sptfqmr_parallel.c b/examples/sunlinsol/sptfqmr/parallel/test_sunlinsol_sptfqmr_parallel.c
index 423805a37c..e74332086b 100644
--- a/examples/sunlinsol/sptfqmr/parallel/test_sunlinsol_sptfqmr_parallel.c
+++ b/examples/sunlinsol/sptfqmr/parallel/test_sunlinsol_sptfqmr_parallel.c
@@ -39,8 +39,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -59,11 +59,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of Nloc (for check_vector routine) */
 sunindextype local_problem_size;
@@ -104,7 +104,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -455,7 +455,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
+  sunrealtype *v, *z, *s1, *s2, vL, vR, vsL, vsR;
   sunindextype i, Nloc;
   int ierr;
   UserData *ProbData;
@@ -522,10 +522,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -547,9 +547,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -580,11 +580,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/sptfqmr/serial/test_sunlinsol_sptfqmr_serial.c b/examples/sunlinsol/sptfqmr/serial/test_sunlinsol_sptfqmr_serial.c
index 5028949d07..47268df199 100644
--- a/examples/sunlinsol/sptfqmr/serial/test_sunlinsol_sptfqmr_serial.c
+++ b/examples/sunlinsol/sptfqmr/serial/test_sunlinsol_sptfqmr_serial.c
@@ -38,8 +38,8 @@
 #endif
 
 /* constants */
-#define FIVE      RCONST(5.0)
-#define THOUSAND  RCONST(1000.0)
+#define FIVE      SUN_RCONST(5.0)
+#define THOUSAND  SUN_RCONST(1000.0)
 
 /* user data structure */
 typedef struct {
@@ -55,11 +55,11 @@ int ATimes(void* ProbData, N_Vector v, N_Vector z);
 /*    preconditioner setup */
 int PSetup(void* ProbData);
 /*    preconditioner solve */
-int PSolve(void* ProbData, N_Vector r, N_Vector z, realtype tol, int lr);
+int PSolve(void* ProbData, N_Vector r, N_Vector z, sunrealtype tol, int lr);
 /*    checks function return values  */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 /*    uniform random number generator in [0,1] */
-static realtype urand();
+static sunrealtype urand();
 
 /* global copy of the problem size (for check_vector routine) */
 sunindextype problem_size;
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
   UserData        ProbData;         /* problem data structure    */
   int             pretype, maxl, print_timing;
   sunindextype    i;
-  realtype        *vecdata;
+  sunrealtype        *vecdata;
   double          tol;
   SUNContext      sunctx;
 
@@ -428,7 +428,7 @@ int main(int argc, char *argv[])
 int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 {
   /* local variables */
-  realtype *v, *z, *s1, *s2;
+  sunrealtype *v, *z, *s1, *s2;
   sunindextype i, N;
   UserData *ProbData;
 
@@ -462,10 +462,10 @@ int ATimes(void* Data, N_Vector v_vec, N_Vector z_vec)
 int PSetup(void* Data) { return 0; }
 
 /* preconditioner solve */
-int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
+int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, sunrealtype tol, int lr)
 {
   /* local variables */
-  realtype *r, *z, *d;
+  sunrealtype *r, *z, *d;
   sunindextype i;
   UserData *ProbData;
 
@@ -487,9 +487,9 @@ int PSolve(void* Data, N_Vector r_vec, N_Vector z_vec, realtype tol, int lr)
 }
 
 /* uniform random number generator */
-static realtype urand()
+static sunrealtype urand()
 {
-  return ((realtype) rand() / (realtype) RAND_MAX);
+  return ((sunrealtype) rand() / (sunrealtype) RAND_MAX);
 }
 
 /* Check function return value based on "opt" input:
@@ -520,11 +520,11 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/superludist/test_sunlinsol_superludist.cpp b/examples/sunlinsol/superludist/test_sunlinsol_superludist.cpp
index a4b23609c4..b43c2d5f42 100644
--- a/examples/sunlinsol/superludist/test_sunlinsol_superludist.cpp
+++ b/examples/sunlinsol/superludist/test_sunlinsol_superludist.cpp
@@ -34,7 +34,7 @@
 #define LOG_PROCESS_TO_FILE 0
 
 /* helper functions */
-int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
+int csr_from_dense(SUNMatrix Ad, sunrealtype droptol, sunrealtype **matdata,
                    sunindextype **colind, sunindextype **rowptrs);
 
 /* ----------------------------------------------------------------------
@@ -53,8 +53,8 @@ int main(int argc, char *argv[])
   SUNMatrix       A, D;                 /* test matrices              */
   SuperMatrix     *Asuper;              /* SuperMatrices of A         */
   N_Vector        gx, gy, gb, x, y, b;  /* test vectors               */
-  realtype        *matdata;             /* underlying data arrays     */
-  realtype        *xdata, *ydata, *bdata;
+  sunrealtype        *matdata;             /* underlying data arrays     */
+  sunrealtype        *xdata, *ydata, *bdata;
   sunindextype    *rowptrs, *colind;
   gridinfo_t      grid;                 /* SuperLU-DIST process grid  */
   xLUstruct_t     lu;
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
       i = rand() % N;
       j = rand() % N;
       matdata = SUNDenseMatrix_Column(D,j);
-      matdata[i] = (realtype) rand() / (realtype) RAND_MAX / N;
+      matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
     }
 
     /* Add identity to matrix */
@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
 
     /* fill x with random data */
     for (i=0; i<N; i++)
-      xdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+      xdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
     /* copy x into y to print in case of solver failure */
     N_VScale(ONE, gx, gy);
@@ -207,7 +207,7 @@ int main(int argc, char *argv[])
     /* distribute matrix and vectors */
     for (i=1; i<nprocs; i++) {
       sunindextype *coltemp, *rowtemp;
-      realtype *datatemp;
+      sunrealtype *datatemp;
       sunindextype fst_rowi, M_loci;
 
       M_loci   = (i == (nprocs-1)) ? M_loc + M_rem : Mnprocs;
@@ -276,7 +276,7 @@ int main(int argc, char *argv[])
     MPI_Recv(&NNZ_local, 1, MPI_SUNINDEXTYPE, 0, grid.iam, grid.comm, &mpistatus);
 
     /* Allocate memory for matrix members */
-    matdata = (realtype*) SUPERLU_MALLOC(NNZ_local*sizeof(realtype));
+    matdata = (sunrealtype*) SUPERLU_MALLOC(NNZ_local*sizeof(sunrealtype));
     colind  = (sunindextype*) SUPERLU_MALLOC(NNZ_local*sizeof(sunindextype));
     rowptrs = (sunindextype*) SUPERLU_MALLOC((M_loc+1)*sizeof(sunindextype));
 
@@ -374,7 +374,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, grid.iam);
   fails += Test_SUNLinSolSetup(LS, A, grid.iam);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*UNIT_ROUNDOFF, SUNTRUE, grid.iam);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 100*SUN_UNIT_ROUNDOFF, SUNTRUE, grid.iam);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, grid.iam);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_SUPERLUDIST, grid.iam);
@@ -432,11 +432,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length, maxloc;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
@@ -463,7 +463,7 @@ int check_vector(N_Vector X, N_Vector Y, realtype tol)
     return(0);
 }
 
-int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
+int csr_from_dense(SUNMatrix Ad, sunrealtype droptol, sunrealtype **matdata,
                    sunindextype **colind, sunindextype **rowptrs)
 {
   sunindextype i, j, nnz;
@@ -485,7 +485,7 @@ int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
       nnz += (std::abs(SM_ELEMENT_D(Ad,i,j)) > droptol);
 
   /* allocate */
-  (*matdata) = (realtype*) malloc(nnz*sizeof(realtype));
+  (*matdata) = (sunrealtype*) malloc(nnz*sizeof(sunrealtype));
   (*colind)  = (sunindextype*) malloc(nnz*sizeof(sunindextype));
   (*rowptrs) = (sunindextype*) malloc((M+1)*sizeof(sunindextype));
 
diff --git a/examples/sunlinsol/superlumt/test_sunlinsol_superlumt.c b/examples/sunlinsol/superlumt/test_sunlinsol_superlumt.c
index 141ce9a092..802dc14bd6 100644
--- a/examples/sunlinsol/superlumt/test_sunlinsol_superlumt.c
+++ b/examples/sunlinsol/superlumt/test_sunlinsol_superlumt.c
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS;                 /* linear solver object       */
   SUNMatrix       A, B;               /* test matrices              */
   N_Vector        x, y, b;            /* test vectors               */
-  realtype        *matdata, *xdata;
+  sunrealtype        *matdata, *xdata;
   int             mattype, num_threads, print_timing;
   sunindextype    i, j, k;
   SUNContext      sunctx;
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
     i = rand() % N;
     j = rand() % N;
     matdata = SUNDenseMatrix_Column(B,j);
-    matdata[i] = (realtype) rand() / (realtype) RAND_MAX / N;
+    matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
   }
 
   /* Add identity to matrix */
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
   /* Fill x vector with uniform random data in [0,1] */
   xdata = N_VGetArrayPointer(x);
   for (i=0; i<N; i++)
-    xdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    xdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   /* Create sparse matrix from dense, and destroy B */
   A = SUNSparseFromDenseMatrix(B, ZERO, mattype);
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
   /* Run Tests */
   fails += Test_SUNLinSolInitialize(LS, 0);
   fails += Test_SUNLinSolSetup(LS, A, 0);
-  fails += Test_SUNLinSolSolve(LS, A, x, b, 1000*UNIT_ROUNDOFF, SUNTRUE, 0);
+  fails += Test_SUNLinSolSolve(LS, A, x, b, 1000*SUN_UNIT_ROUNDOFF, SUNTRUE, 0);
 
   fails += Test_SUNLinSolGetType(LS, SUNLINEARSOLVER_DIRECT, 0);
   fails += Test_SUNLinSolGetID(LS, SUNLINEARSOLVER_SUPERLUMT, 0);
@@ -161,11 +161,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length, maxloc;
-  realtype *Xdata, *Ydata, maxerr;
+  sunrealtype *Xdata, *Ydata, maxerr;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
diff --git a/examples/sunlinsol/test_sunlinsol.c b/examples/sunlinsol/test_sunlinsol.c
index 672c828c7d..8fadff2c49 100644
--- a/examples/sunlinsol/test_sunlinsol.c
+++ b/examples/sunlinsol/test_sunlinsol.c
@@ -421,7 +421,7 @@ int Test_SUNLinSolSetup(SUNLinearSolver S, SUNMatrix A, int myid)
  * 'setup' by the Test_SUNLinSolSetup() function prior to this call.
  * --------------------------------------------------------------------*/
 int Test_SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                        N_Vector b, realtype tol, booleantype zeroguess,
+                        N_Vector b, sunrealtype tol, sunbooleantype zeroguess,
                         int myid)
 {
   int       failure;
@@ -435,7 +435,7 @@ int Test_SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   if (zeroguess)
     N_VConst(ZERO, y);
   else
-    N_VAddConst(x, SUNRsqrt(UNIT_ROUNDOFF), y);
+    N_VAddConst(x, SUNRsqrt(SUN_UNIT_ROUNDOFF), y);
 
   sync_device();
 
diff --git a/examples/sunlinsol/test_sunlinsol.h b/examples/sunlinsol/test_sunlinsol.h
index 7ae8aa000c..c653a39c4d 100644
--- a/examples/sunlinsol/test_sunlinsol.h
+++ b/examples/sunlinsol/test_sunlinsol.h
@@ -20,14 +20,14 @@
 #include <math.h>
 
 /* define constatnts */
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 #ifdef __cplusplus /* wrapper to enable C++ usage */
 extern "C" {
 #endif
 /* Forward declarations for implementation specific utility functions */
-int check_vector(N_Vector expected, N_Vector computed, realtype tol);
+int check_vector(N_Vector expected, N_Vector computed, sunrealtype tol);
 void sync_device();
 
 /* Test function declarations */
@@ -44,7 +44,7 @@ int Test_SUNLinSolSetScalingVectors(SUNLinearSolver S, N_Vector s1, N_Vector s2,
 int Test_SUNLinSolSetZeroGuess(SUNLinearSolver S, int myid);
 int Test_SUNLinSolInitialize(SUNLinearSolver S, int myid);
 int Test_SUNLinSolSetup(SUNLinearSolver S, SUNMatrix A, int myid);
-int Test_SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x, N_Vector b, realtype tol, booleantype zeroguess,
+int Test_SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x, N_Vector b, sunrealtype tol, sunbooleantype zeroguess,
                         int myid);
 
 /* Timing function */
diff --git a/examples/sunmatrix/band/test_sunmatrix_band.c b/examples/sunmatrix/band/test_sunmatrix_band.c
index fe05a425fb..73aecb80f9 100644
--- a/examples/sunmatrix/band/test_sunmatrix_band.c
+++ b/examples/sunmatrix/band/test_sunmatrix_band.c
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
   N_Vector     x, y;                 /* test vectors               */
   int          print_timing;
   sunindextype i, j, k, kstart, kend, jstart, jend;
-  realtype     *colj, *xdata, *ydata;
+  sunrealtype     *colj, *xdata, *ydata;
   SUNContext   sunctx;
 
   if (SUNContext_Create(NULL, &sunctx)) {
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
 
     /* identity matrix */
     colj = SUNBandMatrix_Column(I, j);
-    colj[0] = RCONST(1.0);
+    colj[0] = SUN_RCONST(1.0);
 
     /* A matrix */
     colj = SUNBandMatrix_Column(A, j);
@@ -122,7 +122,7 @@ int main(int argc, char *argv[])
     xdata[i] = i;
 
     /* y vector */
-    ydata[i] = RCONST(0.0);
+    ydata[i] = SUN_RCONST(0.0);
     jstart = SUNMAX(0, i-lband);
     jend = SUNMIN(cols-1, i+uband);
     for (j=jstart; j<=jend; j++)
@@ -167,11 +167,11 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Implementation-specific 'check' routines
  * --------------------------------------------------------------------*/
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, j, istart, iend;
-  realtype *Acolj, *Bcolj;
+  sunrealtype *Acolj, *Bcolj;
 
   /* check matrix type and dimensions */
   if (SUNMatGetID(A) != SUNMatGetID(B))
@@ -214,11 +214,11 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
     return(0);
 }
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, j, istart, iend;
-  realtype *Acolj;
+  sunrealtype *Acolj;
 
   /* check matrix data */
   for (j=0; j<SUNBandMatrix_Columns(A); j++) {
@@ -245,11 +245,11 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
     return(0);
 }
 
-int check_vector(N_Vector X, N_Vector Y, realtype tol)
+int check_vector(N_Vector X, N_Vector Y, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i, local_length;
-  realtype *Xdata, *Ydata;
+  sunrealtype *Xdata, *Ydata;
 
   Xdata = N_VGetArrayPointer(X);
   Ydata = N_VGetArrayPointer(Y);
@@ -266,16 +266,16 @@ int check_vector(N_Vector X, N_Vector Y, realtype tol)
     return(0);
 }
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
-  realtype *Adata = SUNBandMatrix_Data(A);
+  sunrealtype *Adata = SUNBandMatrix_Data(A);
   if (Adata == NULL)
     return SUNFALSE;
   else
     return SUNTRUE;
 }
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   return SUNTRUE;
 }
diff --git a/examples/sunmatrix/cusparse/test_sunmatrix_cusparse.cu b/examples/sunmatrix/cusparse/test_sunmatrix_cusparse.cu
index f502139641..e1737a7702 100644
--- a/examples/sunmatrix/cusparse/test_sunmatrix_cusparse.cu
+++ b/examples/sunmatrix/cusparse/test_sunmatrix_cusparse.cu
@@ -79,9 +79,9 @@ int main(int argc, char *argv[])
   int          block_nnz_max;              /* max number of nnz in block */
   int          mattype;                    /* matrix storage type        */
   N_Vector     x, y, d_x, d_y;             /* test vectors               */
-  realtype*    vecdata;                    /* pointers to vector data    */
+  sunrealtype*    vecdata;                    /* pointers to vector data    */
   SUNMatrix    A, B, C, D, dA, dB, dI;     /* test matrices              */
-  realtype*    matdata;                    /* pointer to matrix data     */
+  sunrealtype*    matdata;                    /* pointer to matrix data     */
   int          print_timing, square;
   int          matrix_to_use;
   sunindextype i, j;
@@ -201,10 +201,10 @@ int main(int argc, char *argv[])
           sunindextype col = cols[j] + blkcols*i;
           sunindextype row = rows[j] + blkrows*i;
           matdata = SUNDenseMatrix_Column(D,col);
-          matdata[row] = (realtype) rand() / (realtype) RAND_MAX / N;
+          matdata[row] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
         }
     }
-    if (SUNMatScaleAddI(RCONST(1.0), D)) {
+    if (SUNMatScaleAddI(SUN_RCONST(1.0), D)) {
       printf("ERROR: SUNMatScaleAddI failed for dense matrix D\n");
       return(-1);
     }
@@ -216,10 +216,10 @@ int main(int argc, char *argv[])
           sunindextype col = cols[j] + blkcols*i;
           sunindextype row = rows[j] + blkrows*i;
           matdata = SUNDenseMatrix_Column(C,col);
-          matdata[row] = (realtype) rand() / (realtype) RAND_MAX / N;
+          matdata[row] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
         }
     }
-    if (SUNMatScaleAddI(RCONST(1.0), C)) {
+    if (SUNMatScaleAddI(SUN_RCONST(1.0), C)) {
       printf("ERROR: SUNMatScaleAddI failed for dense matrix C\n");
       return(-1);
     }
@@ -243,14 +243,14 @@ int main(int argc, char *argv[])
     N = blkcols * nblocks;
 
     D = SUNDenseMatrix(M, N, sunctx);
-    SUNMatScaleAddI(RCONST(0.0), D);
-    if (SUNMatScaleAddI(RCONST(0.0), D)) {
+    SUNMatScaleAddI(SUN_RCONST(0.0), D);
+    if (SUNMatScaleAddI(SUN_RCONST(0.0), D)) {
       printf("ERROR: SUNMatScaleAddI failed for dense matrix D\n");
       return(-1);
     }
 
     C = SUNDenseMatrix(M, N, sunctx);
-    if (SUNMatScaleAddI(RCONST(0.0), C)) {
+    if (SUNMatScaleAddI(SUN_RCONST(0.0), C)) {
       printf("ERROR: SUNMatScaleAddI failed for dense matrix C\n");
       return(-1);
     }
@@ -279,7 +279,7 @@ int main(int argc, char *argv[])
     }
     SUNMatDestroy(cscA);
 
-    if (SUNMatScaleAddI(RCONST(1.0), A)) {
+    if (SUNMatScaleAddI(SUN_RCONST(1.0), A)) {
       printf("ERROR: SUNMatScaleAddI failed on matrix that read\n");
       return(-1);
     }
@@ -386,7 +386,7 @@ int main(int argc, char *argv[])
   /* Fill vector on the host */
   vecdata = N_VGetArrayPointer(x);
   for(i=0; i<N; i++)
-    vecdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    vecdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
 
   /* Compute reference y on the host */
   if (SUNMatMatvec(A, x, y)) {
@@ -468,7 +468,7 @@ int main(int argc, char *argv[])
 int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
 {
   int print_all_ranks = 0;
-  realtype  tol = 100*UNIT_ROUNDOFF;
+  sunrealtype  tol = 100*SUN_UNIT_ROUNDOFF;
   SUNMatrix B = SUNMatClone(I);
 
   /* check cloned matrix */
@@ -491,7 +491,7 @@ int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
   SUNMatrix_cuSparse_SetKernelExecPolicy(B, &exec_policy);
 
   /* try out an operation */
-  if (SUNMatScaleAddI(RCONST(-1.0), B)) {
+  if (SUNMatScaleAddI(SUN_RCONST(-1.0), B)) {
     TEST_STATUS(">>> FAILED test -- SetKernelExecPolicy \n", myid);
     TEST_STATUS("    SUNMatScaleAddI returned nonzero \n \n", myid);
     SUNMatDestroy(B);
@@ -516,11 +516,11 @@ int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
  /* ----------------------------------------------------------------------
   * Check matrix
   * --------------------------------------------------------------------*/
- int check_matrix(SUNMatrix dA, SUNMatrix dB, realtype tol)
+ int check_matrix(SUNMatrix dA, SUNMatrix dB, sunrealtype tol)
  {
    int failure = 0;
    SUNMatrix A, B;
-   realtype *Adata, *Bdata;
+   sunrealtype *Adata, *Bdata;
    sunindextype *Aindexptrs, *Bindexptrs;
    sunindextype *Aindexvals, *Bindexvals;
    sunindextype i, ANP, Annz, Bnnz;
@@ -614,14 +614,14 @@ int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
    return(0);
  }
 
- int check_matrix_entry(SUNMatrix dA, realtype val, realtype tol)
+ int check_matrix_entry(SUNMatrix dA, sunrealtype val, sunrealtype tol)
  {
    int failure = 0;
-   realtype *Adata;
+   sunrealtype *Adata;
    sunindextype i;
 
    /* copy matrix data to host for the checks */
-   Adata = (realtype*) malloc(SUNMatrix_cuSparse_NNZ(dA)*sizeof(realtype));
+   Adata = (sunrealtype*) malloc(SUNMatrix_cuSparse_NNZ(dA)*sizeof(sunrealtype));
    failure = SUNMatrix_cuSparse_CopyFromDevice(dA, Adata, NULL, NULL);
    cudaDeviceSynchronize();
 
@@ -638,10 +638,10 @@ int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
      return(0);
  }
 
- int check_vector(N_Vector expected, N_Vector computed, realtype tol)
+ int check_vector(N_Vector expected, N_Vector computed, sunrealtype tol)
  {
    int failure = 0;
-   realtype *xdata, *ydata;
+   sunrealtype *xdata, *ydata;
    sunindextype xldata, yldata;
    sunindextype i;
 
@@ -674,16 +674,16 @@ int Test_SetKernelExecPolicy(SUNMatrix I, int myid)
      return(0);
  }
 
- booleantype has_data(SUNMatrix A)
+ sunbooleantype has_data(SUNMatrix A)
  {
-   realtype *Adata = SUNMatrix_cuSparse_Data(A);
+   sunrealtype *Adata = SUNMatrix_cuSparse_Data(A);
    if (Adata == NULL)
      return SUNFALSE;
    else
      return SUNTRUE;
  }
 
- booleantype is_square(SUNMatrix A)
+ sunbooleantype is_square(SUNMatrix A)
  {
    if (SUNMatrix_cuSparse_Rows(A) == SUNMatrix_cuSparse_Columns(A))
      return SUNTRUE;
diff --git a/examples/sunmatrix/dense/test_sunmatrix_dense.c b/examples/sunmatrix/dense/test_sunmatrix_dense.c
index 7fc49eb307..81f8aa260a 100644
--- a/examples/sunmatrix/dense/test_sunmatrix_dense.c
+++ b/examples/sunmatrix/dense/test_sunmatrix_dense.c
@@ -45,9 +45,9 @@ int main(int argc, char *argv[])
   int          fails = 0;        /* counter for test failures  */
   sunindextype matrows, matcols; /* vector length              */
   N_Vector     x, y;             /* test vectors               */
-  realtype     *xdata, *ydata;   /* pointers to vector data    */
+  sunrealtype     *xdata, *ydata;   /* pointers to vector data    */
   SUNMatrix    A, I;             /* test matrices              */
-  realtype     *Adata, *Idata;   /* pointers to matrix data    */
+  sunrealtype     *Adata, *Idata;   /* pointers to matrix data    */
   int          print_timing, square;
   sunindextype i, j, m, n;
   SUNContext   sunctx;
@@ -166,10 +166,10 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Check matrix
  * --------------------------------------------------------------------*/
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
-  realtype *Adata, *Bdata;
+  sunrealtype *Adata, *Bdata;
   sunindextype Aldata, Bldata;
   sunindextype i;
 
@@ -197,10 +197,10 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
     return(0);
 }
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
-  realtype *Adata;
+  sunrealtype *Adata;
   sunindextype Aldata;
   sunindextype i;
 
@@ -227,10 +227,10 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
     return(0);
 }
 
-int check_vector(N_Vector x, N_Vector y, realtype tol)
+int check_vector(N_Vector x, N_Vector y, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
@@ -265,16 +265,16 @@ int check_vector(N_Vector x, N_Vector y, realtype tol)
     return(0);
 }
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
-  realtype *Adata = SUNDenseMatrix_Data(A);
+  sunrealtype *Adata = SUNDenseMatrix_Data(A);
   if (Adata == NULL)
     return SUNFALSE;
   else
     return SUNTRUE;
 }
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   if (SUNDenseMatrix_Rows(A) == SUNDenseMatrix_Columns(A))
     return SUNTRUE;
diff --git a/examples/sunmatrix/dreadrb.c b/examples/sunmatrix/dreadrb.c
index 16ea19abde..31683a37bb 100644
--- a/examples/sunmatrix/dreadrb.c
+++ b/examples/sunmatrix/dreadrb.c
@@ -62,7 +62,7 @@
  * Purpose
  * =======
  *
- * Read a realtype PRECISION matrix stored in Rutherford-Boeing format
+ * Read a sunrealtype PRECISION matrix stored in Rutherford-Boeing format
  * as described below.
  *
  * Line 1 (A72, A8)
@@ -206,7 +206,7 @@ static int ReadVector(FILE *fp, sunindextype n, sunindextype *where, sunindextyp
     return 0;
 }
 
-static int dReadValues(FILE *fp, sunindextype n, realtype *destination,
+static int dReadValues(FILE *fp, sunindextype n, sunrealtype *destination,
         sunindextype perline, sunindextype persize)
 {
     register sunindextype i, j, k, s;
@@ -239,12 +239,12 @@ static int dReadValues(FILE *fp, sunindextype n, realtype *destination,
  * </pre>
  */
 static void
-FormFullA(sunindextype n, sunindextype *nonz, realtype **nzval, sunindextype **rowind, sunindextype **colptr)
+FormFullA(sunindextype n, sunindextype *nonz, sunrealtype **nzval, sunindextype **rowind, sunindextype **colptr)
 {
     register sunindextype i, j, k, col, new_nnz;
     sunindextype *t_rowind, *t_colptr, *al_rowind, *al_colptr, *a_rowind, *a_colptr;
     sunindextype *marker;
-    realtype *t_val, *al_val, *a_val;
+    sunrealtype *t_val, *al_val, *a_val;
 
     al_rowind = *rowind;
     al_colptr = *colptr;
@@ -256,7 +256,7 @@ FormFullA(sunindextype n, sunindextype *nonz, realtype **nzval, sunindextype **r
 	DREADRB_ABORT("malloc t_colptr[]");
     if ( !(t_rowind = (sunindextype *) malloc( *nonz * sizeof(sunindextype)) ) )
 	DREADRB_ABORT("malloc fails for t_rowind[]");
-    if ( !(t_val = (realtype*) malloc( *nonz * sizeof(realtype)) ) )
+    if ( !(t_val = (sunrealtype*) malloc( *nonz * sizeof(sunrealtype)) ) )
 	DREADRB_ABORT("malloc fails for t_val[]");
 
     /* Get counts of each column of T, and set up column pointers */
@@ -285,7 +285,7 @@ FormFullA(sunindextype n, sunindextype *nonz, realtype **nzval, sunindextype **r
 	DREADRB_ABORT("malloc a_colptr[]");
     if ( !(a_rowind = (sunindextype *) malloc( new_nnz * sizeof(sunindextype)) ) )
 	DREADRB_ABORT("malloc fails for a_rowind[]");
-    if ( !(a_val = (realtype*) malloc( new_nnz * sizeof(realtype)) ) )
+    if ( !(a_val = (sunrealtype*) malloc( new_nnz * sizeof(sunrealtype)) ) )
 	DREADRB_ABORT("malloc fails for a_val[]");
 
     a_colptr[0] = 0;
@@ -330,7 +330,7 @@ dreadrb_dist(int iam, FILE *fp, SUNMatrix *Aout, SUNContext sunctx)
     register sunindextype i, numer_lines = 0;
     sunindextype tmp, colnum, colsize, rownum, rowsize, valnum, valsize, nrow, ncol, nonz;
     sunindextype *rowind, *colptr;
-    realtype *nzval;
+    sunrealtype *nzval;
     char buf[100], type[4];
     int sym;
     SUNMatrix A;
diff --git a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
index f0e3bc2685..4512d6ad43 100644
--- a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
+++ b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp
@@ -299,7 +299,7 @@ int main(int argc, char* argv[])
 /* ----------------------------------------------------------------------
  * Check matrix
  * --------------------------------------------------------------------*/
-int check_matrix_csr(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix_csr(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure{0};
   auto Amat{
@@ -334,7 +334,7 @@ int check_matrix_csr(SUNMatrix A, SUNMatrix B, realtype tol)
   return failure > 0;
 }
 
-int check_matrix_dense(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix_dense(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure{0};
   auto Amat{
@@ -365,14 +365,14 @@ int check_matrix_dense(SUNMatrix A, SUNMatrix B, realtype tol)
   return failure > 0;
 }
 
-extern "C" int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+extern "C" int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   if (using_csr_matrix_type) return check_matrix_csr(A, B, tol);
   else if (using_dense_matrix_type) return check_matrix_dense(A, B, tol);
   else return 1;
 }
 
-int check_matrix_entry_csr(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry_csr(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure{0};
   auto Amat{
@@ -400,7 +400,7 @@ int check_matrix_entry_csr(SUNMatrix A, realtype val, realtype tol)
   return failure > 0;
 }
 
-int check_matrix_entry_dense(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry_dense(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure{0};
   auto Amat{
@@ -428,7 +428,7 @@ int check_matrix_entry_dense(SUNMatrix A, realtype val, realtype tol)
   return failure > 0;
 }
 
-extern "C" int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+extern "C" int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   if (using_csr_matrix_type) { return check_matrix_entry_csr(A, val, tol); }
   else if (using_dense_matrix_type)
@@ -438,7 +438,7 @@ extern "C" int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
   else { return 1; }
 }
 
-extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
+extern "C" int check_vector(N_Vector expected, N_Vector computed, sunrealtype tol)
 {
   int failure{0};
 
@@ -481,7 +481,7 @@ extern "C" int check_vector(N_Vector expected, N_Vector computed, realtype tol)
   return failure > 0;
 }
 
-extern "C" booleantype has_data(SUNMatrix A)
+extern "C" sunbooleantype has_data(SUNMatrix A)
 {
   if (using_csr_matrix_type)
   {
@@ -500,7 +500,7 @@ extern "C" booleantype has_data(SUNMatrix A)
   else { return SUNFALSE; }
 }
 
-extern "C" booleantype is_square(SUNMatrix A)
+extern "C" sunbooleantype is_square(SUNMatrix A)
 {
   if (using_csr_matrix_type)
   {
diff --git a/examples/sunmatrix/kokkos/test_sunmatrix_kokkosdense.cpp b/examples/sunmatrix/kokkos/test_sunmatrix_kokkosdense.cpp
index 4ac7c5122d..5c37de3981 100644
--- a/examples/sunmatrix/kokkos/test_sunmatrix_kokkosdense.cpp
+++ b/examples/sunmatrix/kokkos/test_sunmatrix_kokkosdense.cpp
@@ -265,9 +265,9 @@ extern "C" int check_vector(N_Vector actual, N_Vector expected, sunrealtype tol)
   else return 0;
 }
 
-extern "C" booleantype has_data(SUNMatrix A) { return SUNTRUE; }
+extern "C" sunbooleantype has_data(SUNMatrix A) { return SUNTRUE; }
 
-extern "C" booleantype is_square(SUNMatrix A)
+extern "C" sunbooleantype is_square(SUNMatrix A)
 {
   auto A_mat{sundials::kokkos::GetDenseMat<MatType>(A)};
 
diff --git a/examples/sunmatrix/magmadense/test_sunmatrix_magmadense.cpp b/examples/sunmatrix/magmadense/test_sunmatrix_magmadense.cpp
index 41d4379172..2d07eb611a 100644
--- a/examples/sunmatrix/magmadense/test_sunmatrix_magmadense.cpp
+++ b/examples/sunmatrix/magmadense/test_sunmatrix_magmadense.cpp
@@ -51,9 +51,9 @@ int main(int argc, char *argv[])
   sunindextype matrows, matcols; /* matrix dimensions          */
   sunindextype nblocks;          /* number of blocks in matrix */
   N_Vector     x, y;             /* test vectors               */
-  realtype     *xdata, *ydata;   /* pointers to vector data    */
+  sunrealtype     *xdata, *ydata;   /* pointers to vector data    */
   SUNMatrix    A, I;             /* test matrices              */
-  realtype     *Adata, *Idata;   /* pointers to matrix data    */
+  sunrealtype     *Adata, *Idata;   /* pointers to matrix data    */
   int          print_timing, square;
   sunindextype i, j, k, m, n;
   SUNContext   sunctx;
@@ -113,9 +113,9 @@ int main(int argc, char *argv[])
     I = SUNMatClone(A);
 
   /* Allocate host data */
-  Adata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_MagmaDense_LData(A));
+  Adata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_MagmaDense_LData(A));
   if (square)
-    Idata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_MagmaDense_LData(I));
+    Idata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_MagmaDense_LData(I));
 
   /* Fill matrices and vectors */
   for(k=0; k < nblocks; k++) {
@@ -194,14 +194,14 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Check matrix
  * --------------------------------------------------------------------*/
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i = 0;
   sunindextype Aldata = SUNMatrix_MagmaDense_LData(A);
   sunindextype Bldata = SUNMatrix_MagmaDense_LData(B);
-  realtype *Adata = (realtype*) malloc(sizeof(realtype)*Aldata);
-  realtype *Bdata = (realtype*) malloc(sizeof(realtype)*Bldata);
+  sunrealtype *Adata = (sunrealtype*) malloc(sizeof(sunrealtype)*Aldata);
+  sunrealtype *Bdata = (sunrealtype*) malloc(sizeof(sunrealtype)*Bldata);
 
   /* copy data to host */
   SUNMatrix_MagmaDense_CopyFromDevice(A, Adata);
@@ -227,12 +227,12 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
     return(0);
 }
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i = 0;
   sunindextype Aldata = SUNMatrix_MagmaDense_LData(A);
-  realtype *Adata = (realtype*) malloc(sizeof(realtype)*Aldata);
+  sunrealtype *Adata = (sunrealtype*) malloc(sizeof(sunrealtype)*Aldata);
 
   /* copy data to host */
   SUNMatrix_MagmaDense_CopyFromDevice(A, Adata);
@@ -254,10 +254,10 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
     return(0);
 }
 
-int check_vector(N_Vector actual, N_Vector expected, realtype tol)
+int check_vector(N_Vector actual, N_Vector expected, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
@@ -299,16 +299,16 @@ int check_vector(N_Vector actual, N_Vector expected, realtype tol)
     return(0);
 }
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
-  realtype *Adata = SUNMatrix_MagmaDense_Data(A);
+  sunrealtype *Adata = SUNMatrix_MagmaDense_Data(A);
   if (Adata == NULL)
     return SUNFALSE;
   else
     return SUNTRUE;
 }
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   if (SUNMatrix_MagmaDense_Rows(A) == SUNMatrix_MagmaDense_Columns(A))
     return SUNTRUE;
diff --git a/examples/sunmatrix/onemkldense/test_sunmatrix_onemkldense.cpp b/examples/sunmatrix/onemkldense/test_sunmatrix_onemkldense.cpp
index 615e1ee9dd..3e074aebe8 100644
--- a/examples/sunmatrix/onemkldense/test_sunmatrix_onemkldense.cpp
+++ b/examples/sunmatrix/onemkldense/test_sunmatrix_onemkldense.cpp
@@ -178,7 +178,7 @@ int main(int argc, char *argv[])
   }
 
   // Allocate host data
-  realtype* Adata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_OneMklDense_LData(A));
+  sunrealtype* Adata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_OneMklDense_LData(A));
   if (!Adata)
   {
     printf("Data allocation failed\n");
@@ -187,10 +187,10 @@ int main(int argc, char *argv[])
     SUNMatDestroy(A);
   }
 
-  realtype* Idata = NULL;
+  sunrealtype* Idata = NULL;
   if (square)
   {
-    Idata = (realtype*) malloc(sizeof(realtype)*SUNMatrix_OneMklDense_LData(I));
+    Idata = (sunrealtype*) malloc(sizeof(sunrealtype)*SUNMatrix_OneMklDense_LData(I));
     if (!Idata)
     {
       printf("Data allocation failed\n");
@@ -224,7 +224,7 @@ int main(int argc, char *argv[])
     SUNMatrix_OneMklDense_CopyToDevice(I, Idata);
   }
 
-  realtype* xdata = N_VGetArrayPointer(x);
+  sunrealtype* xdata = N_VGetArrayPointer(x);
   for(k = 0; k < nblocks; k++)
     for(i = 0; i < matcols; i++)
       xdata[matcols * k + i] = ONE / (i+1);
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
 
   N_VCopyToDevice_Sycl(x);
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   for(k = 0; k < nblocks; k++)
   {
     for(i = 0; i < matrows; i++)
@@ -290,14 +290,14 @@ int main(int argc, char *argv[])
  * ---------------------------------------------------------------------------*/
 
 
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i = 0;
   sunindextype Aldata = SUNMatrix_OneMklDense_LData(A);
   sunindextype Bldata = SUNMatrix_OneMklDense_LData(B);
-  realtype *Adata = (realtype*) malloc(sizeof(realtype) * Aldata);
-  realtype *Bdata = (realtype*) malloc(sizeof(realtype) * Bldata);
+  sunrealtype *Adata = (sunrealtype*) malloc(sizeof(sunrealtype) * Aldata);
+  sunrealtype *Bdata = (sunrealtype*) malloc(sizeof(sunrealtype) * Bldata);
 
   // Copy data to host
   SUNMatrix_OneMklDense_CopyFromDevice(A, Adata);
@@ -326,12 +326,12 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
 }
 
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
   sunindextype i = 0;
   sunindextype Aldata = SUNMatrix_OneMklDense_LData(A);
-  realtype *Adata = (realtype*) malloc(sizeof(realtype) * Aldata);
+  sunrealtype *Adata = (sunrealtype*) malloc(sizeof(sunrealtype) * Aldata);
 
   // copy data to host
   SUNMatrix_OneMklDense_CopyFromDevice(A, Adata);
@@ -356,10 +356,10 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
 }
 
 
-int check_vector(N_Vector actual, N_Vector expected, realtype tol)
+int check_vector(N_Vector actual, N_Vector expected, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
@@ -401,9 +401,9 @@ int check_vector(N_Vector actual, N_Vector expected, realtype tol)
 }
 
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
-  realtype *Adata = SUNMatrix_OneMklDense_Data(A);
+  sunrealtype *Adata = SUNMatrix_OneMklDense_Data(A);
   if (Adata == NULL)
     return SUNFALSE;
   else
@@ -411,7 +411,7 @@ booleantype has_data(SUNMatrix A)
 }
 
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   if (SUNMatrix_OneMklDense_Rows(A) == SUNMatrix_OneMklDense_Columns(A))
     return SUNTRUE;
diff --git a/examples/sunmatrix/slunrloc/test_sunmatrix_slunrloc.cpp b/examples/sunmatrix/slunrloc/test_sunmatrix_slunrloc.cpp
index cf2088e392..2de558b9b4 100644
--- a/examples/sunmatrix/slunrloc/test_sunmatrix_slunrloc.cpp
+++ b/examples/sunmatrix/slunrloc/test_sunmatrix_slunrloc.cpp
@@ -37,7 +37,7 @@ static int print_all_ranks;
 static int print_timing;
 
 /* helper functions */
-int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
+int csr_from_dense(SUNMatrix Ad, sunrealtype droptol, sunrealtype **matdata,
                    sunindextype **colind, sunindextype **rowptrs);
 
 /* ----------------------------------------------------------------------------
@@ -53,13 +53,13 @@ int main(int argc, char *argv[])
   gridinfo_t grid;                          /* SuperLU-DIST process grid        */
 
   sunindextype M, N;                        /* matrix size                      */
-  realtype *matdata;                        /* pointer to matrix data           */
+  sunrealtype *matdata;                        /* pointer to matrix data           */
   sunindextype *rowptrs, *colind;           /* indexptrs and indexvals          */
   SUNMatrix D, A, I;                        /* global and local matrices        */
   SuperMatrix *Asuper, *Isuper;             /* SLU_NR_loc SuperMatrices         */
   NRformat_loc *Istore;                     /* SuperMatrix->Store               */
   N_Vector gx, gy, x, y;                    /* test vectors                     */
-  realtype *xdata, *ydata;                  /* vector data                      */
+  sunrealtype *xdata, *ydata;                  /* vector data                      */
   sunindextype M_local;                     /* num rows in local matrix         */
   sunindextype Mnprocs;                     /* M/nprocs                         */
   sunindextype Mrem;                        /* M%nprocs                         */
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
       i = rand() % N;
       j = rand() % N;
       matdata = SUNDenseMatrix_Column(D,j);
-      matdata[i] = (realtype) rand() / (realtype) RAND_MAX / N;
+      matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX / N;
     }
 
     /* Add identity to matrix */
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 
     /* fill x with random data, then find y = Dx using Matvec */
     for (i=0; i<N; i++)
-      xdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+      xdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
     if (SUNMatMatvec(D, gx, gy)) {
       TEST_STATUS(">>> FAIL: SUNMatMatvec failed for dense matrix\n", grid.iam);
       SUNMatDestroy(D); N_VDestroy(gx); N_VDestroy(gy);
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
     /* distribute matrix and vectors */
     for (i=1; i<nprocs; i++) {
       sunindextype *coltemp, *rowtemp;
-      realtype *datatemp;
+      sunrealtype *datatemp;
       sunindextype fstrow_temp, M_localtemp;
 
       M_localtemp = (i == (nprocs-1)) ? M_local + Mrem : Mnprocs;
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
     MPI_Recv(&NNZ_local, 1, MPI_SUNINDEXTYPE, 0, grid.iam, grid.comm, &mpistatus);
 
     /* Allocate memory for matrix members */
-    matdata = (realtype*) malloc(NNZ_local*sizeof(realtype));
+    matdata = (sunrealtype*) malloc(NNZ_local*sizeof(sunrealtype));
     colind  = (sunindextype*) malloc(NNZ_local*sizeof(sunindextype));
     rowptrs = (sunindextype*) malloc((M_local+1)*sizeof(sunindextype));
 
@@ -306,7 +306,7 @@ int main(int argc, char *argv[])
 
     Isuper = SUNMatrix_SLUNRloc_SuperMatrix(I);
     Istore = (NRformat_loc*) Isuper->Store;
-    matdata = (realtype *) Istore->nzval;
+    matdata = (sunrealtype *) Istore->nzval;
     rowptrs = (sunindextype *) Istore->rowptr;
     colind  = (sunindextype *) Istore->colind;
 
@@ -364,13 +364,13 @@ int main(int argc, char *argv[])
 /* ----------------------------------------------------------------------
  * Check matrix
  * --------------------------------------------------------------------*/
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
   gridinfo_t *grid;
   SuperMatrix *Asuper, *Bsuper;
   NRformat_loc *Astore, *Bstore;
-  realtype *Adata, *Bdata;
+  sunrealtype *Adata, *Bdata;
   sunindextype *Aindexptrs, *Bindexptrs;
   sunindextype *Aindexvals, *Bindexvals;
   sunindextype i, Arows, Brows, Annz, Bnnz;
@@ -380,7 +380,7 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
   /* get matrix pointers */
   Asuper     = SUNMatrix_SLUNRloc_SuperMatrix(A);
   Astore     = (NRformat_loc*) Asuper->Store;
-  Adata      = (realtype*) Astore->nzval;
+  Adata      = (sunrealtype*) Astore->nzval;
   Aindexptrs = Astore->rowptr;
   Aindexvals = Astore->colind;
   Arows      = Astore->m_loc;
@@ -388,7 +388,7 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
 
   Bsuper     = SUNMatrix_SLUNRloc_SuperMatrix(B);
   Bstore     = (NRformat_loc*) Bsuper->Store;
-  Bdata      = (realtype*) Bstore->nzval;
+  Bdata      = (sunrealtype*) Bstore->nzval;
   Bindexptrs = Bstore->rowptr;
   Bindexvals = Bstore->colind;
   Brows      = Bstore->m_loc;
@@ -457,18 +457,18 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
   return(0);
 }
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
   SuperMatrix *Asuper;
   NRformat_loc *Astore;
-  realtype *Adata;
+  sunrealtype *Adata;
   sunindextype i, nnz_loc;
 
   /* get matrix pointers */
   Asuper = SUNMatrix_SLUNRloc_SuperMatrix(A);
   Astore = (NRformat_loc*) Asuper->Store;
-  Adata  = (realtype*) Astore->nzval;
+  Adata  = (sunrealtype*) Astore->nzval;
 
   /* compare data */
   nnz_loc = Astore->nnz_loc;
@@ -487,10 +487,10 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
     return(0);
 }
 
-int check_vector(N_Vector x, N_Vector y, realtype tol)
+int check_vector(N_Vector x, N_Vector y, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
@@ -517,16 +517,16 @@ int check_vector(N_Vector x, N_Vector y, realtype tol)
     return(0);
 }
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
   SuperMatrix *Asuper;
   NRformat_loc *Astore;
-  realtype *Adata;
+  sunrealtype *Adata;
 
   /* get matrix pointers */
   Asuper = SUNMatrix_SLUNRloc_SuperMatrix(A);
   Astore = (NRformat_loc*) Asuper->Store;
-  Adata  = (realtype*) Astore->nzval;
+  Adata  = (sunrealtype*) Astore->nzval;
 
   if (Adata == NULL)
     return SUNFALSE;
@@ -534,7 +534,7 @@ booleantype has_data(SUNMatrix A)
     return SUNTRUE;
 }
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   SuperMatrix *Asuper = SUNMatrix_SLUNRloc_SuperMatrix(A);
   if (Asuper->nrow == Asuper->ncol)
@@ -543,7 +543,7 @@ booleantype is_square(SUNMatrix A)
     return SUNFALSE;
 }
 
-int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
+int csr_from_dense(SUNMatrix Ad, sunrealtype droptol, sunrealtype **matdata,
                    sunindextype **colind, sunindextype **rowptrs)
 {
   sunindextype i, j, nnz;
@@ -565,7 +565,7 @@ int csr_from_dense(SUNMatrix Ad, realtype droptol, realtype **matdata,
       nnz += (std::abs(SM_ELEMENT_D(Ad,i,j)) > droptol);
 
   /* allocate */
-  (*matdata) = (realtype*) malloc(nnz*sizeof(realtype));
+  (*matdata) = (sunrealtype*) malloc(nnz*sizeof(sunrealtype));
   (*colind)  = (sunindextype*) malloc(nnz*sizeof(sunindextype));
   (*rowptrs) = (sunindextype*) malloc((M+1)*sizeof(sunindextype));
 
diff --git a/examples/sunmatrix/sparse/test_sunmatrix_sparse.c b/examples/sunmatrix/sparse/test_sunmatrix_sparse.c
index ecfcd4fdfd..68d329f2b7 100644
--- a/examples/sunmatrix/sparse/test_sunmatrix_sparse.c
+++ b/examples/sunmatrix/sparse/test_sunmatrix_sparse.c
@@ -44,9 +44,9 @@ int main(int argc, char *argv[])
   sunindextype matrows, matcols;           /* matrix dims                */
   int          mattype;                    /* matrix storage type        */
   N_Vector     x, y, z;                    /* test vectors               */
-  realtype*    vecdata;                    /* pointers to vector data    */
+  sunrealtype*    vecdata;                    /* pointers to vector data    */
   SUNMatrix    A, B, C, D, I;              /* test matrices              */
-  realtype*    matdata;                    /* pointer to matrix data     */
+  sunrealtype*    matdata;                    /* pointer to matrix data     */
   sunindextype i, j, k, kstart, kend, N, uband, lband;
   sunindextype *colptrs, *rowindices;
   sunindextype *rowptrs, *colindices;
@@ -104,15 +104,15 @@ int main(int argc, char *argv[])
   B = SUNDenseMatrix(5,6, sunctx);
 
   matdata = SUNDenseMatrix_Data(B);
-  matdata[2]  = RCONST(1.0);    /* [ 0 2 0 0 7 0 ] */
-  matdata[5]  = RCONST(2.0);    /* [ 0 0 4 0 8 0 ] */
-  matdata[9]  = RCONST(3.0);    /* [ 1 0 0 0 0 0 ] */
-  matdata[11] = RCONST(4.0);    /* [ 0 0 5 6 0 0 ] */
-  matdata[13] = RCONST(5.0);    /* [ 0 3 0 0 0 9 ] */
-  matdata[18] = RCONST(6.0);
-  matdata[20] = RCONST(7.0);
-  matdata[21] = RCONST(8.0);
-  matdata[29] = RCONST(9.0);
+  matdata[2]  = SUN_RCONST(1.0);    /* [ 0 2 0 0 7 0 ] */
+  matdata[5]  = SUN_RCONST(2.0);    /* [ 0 0 4 0 8 0 ] */
+  matdata[9]  = SUN_RCONST(3.0);    /* [ 1 0 0 0 0 0 ] */
+  matdata[11] = SUN_RCONST(4.0);    /* [ 0 0 5 6 0 0 ] */
+  matdata[13] = SUN_RCONST(5.0);    /* [ 0 3 0 0 0 9 ] */
+  matdata[18] = SUN_RCONST(6.0);
+  matdata[20] = SUN_RCONST(7.0);
+  matdata[21] = SUN_RCONST(8.0);
+  matdata[29] = SUN_RCONST(9.0);
 
   if (mattype == CSR_MAT) {
 
@@ -122,19 +122,19 @@ int main(int argc, char *argv[])
     colindices = SUNSparseMatrix_IndexValues(C);
     matdata = SUNSparseMatrix_Data(C);
     rowptrs[0] = 0;
-    matdata[0] = RCONST(2.0);   colindices[0] = 1;
-    matdata[1] = RCONST(7.0);   colindices[1] = 4;
+    matdata[0] = SUN_RCONST(2.0);   colindices[0] = 1;
+    matdata[1] = SUN_RCONST(7.0);   colindices[1] = 4;
     rowptrs[1] = 2;
-    matdata[2] = RCONST(4.0);   colindices[2] = 2;
-    matdata[3] = RCONST(8.0);   colindices[3] = 4;
+    matdata[2] = SUN_RCONST(4.0);   colindices[2] = 2;
+    matdata[3] = SUN_RCONST(8.0);   colindices[3] = 4;
     rowptrs[2] = 4;
-    matdata[4] = RCONST(1.0);   colindices[4] = 0;
+    matdata[4] = SUN_RCONST(1.0);   colindices[4] = 0;
     rowptrs[3] = 5;
-    matdata[5] = RCONST(5.0);   colindices[5] = 2;
-    matdata[6] = RCONST(6.0);   colindices[6] = 3;
+    matdata[5] = SUN_RCONST(5.0);   colindices[5] = 2;
+    matdata[6] = SUN_RCONST(6.0);   colindices[6] = 3;
     rowptrs[4] = 7;
-    matdata[7] = RCONST(3.0);   colindices[7] = 1;
-    matdata[8] = RCONST(9.0);   colindices[8] = 5;
+    matdata[7] = SUN_RCONST(3.0);   colindices[7] = 1;
+    matdata[8] = SUN_RCONST(9.0);   colindices[8] = 5;
     rowptrs[5] = 9;
 
     A = SUNSparseFromDenseMatrix(B, ZERO, CSR_MAT);
@@ -156,20 +156,20 @@ int main(int argc, char *argv[])
     rowindices = SUNSparseMatrix_IndexValues(D);
     matdata = SUNSparseMatrix_Data(D);
     colptrs[0] = 0;
-    matdata[0] = RCONST(1.0);   rowindices[0] = 2;
+    matdata[0] = SUN_RCONST(1.0);   rowindices[0] = 2;
     colptrs[1] = 1;
-    matdata[1] = RCONST(2.0);   rowindices[1] = 0;
-    matdata[2] = RCONST(3.0);   rowindices[2] = 4;
+    matdata[1] = SUN_RCONST(2.0);   rowindices[1] = 0;
+    matdata[2] = SUN_RCONST(3.0);   rowindices[2] = 4;
     colptrs[2] = 3;
-    matdata[3] = RCONST(4.0);   rowindices[3] = 1;
-    matdata[4] = RCONST(5.0);   rowindices[4] = 3;
+    matdata[3] = SUN_RCONST(4.0);   rowindices[3] = 1;
+    matdata[4] = SUN_RCONST(5.0);   rowindices[4] = 3;
     colptrs[3] = 5;
-    matdata[5] = RCONST(6.0);   rowindices[5] = 3;
+    matdata[5] = SUN_RCONST(6.0);   rowindices[5] = 3;
     colptrs[4] = 6;
-    matdata[6] = RCONST(7.0);   rowindices[6] = 0;
-    matdata[7] = RCONST(8.0);   rowindices[7] = 1;
+    matdata[6] = SUN_RCONST(7.0);   rowindices[6] = 0;
+    matdata[7] = SUN_RCONST(8.0);   rowindices[7] = 1;
     colptrs[5] = 8;
-    matdata[8] = RCONST(9.0);   rowindices[8] = 4;
+    matdata[8] = SUN_RCONST(9.0);   rowindices[8] = 4;
     colptrs[6] = 9;
 
     A = SUNSparseFromDenseMatrix(B, 1e-15, CSC_MAT);
@@ -208,33 +208,33 @@ int main(int argc, char *argv[])
     colindices = SUNSparseMatrix_IndexValues(C);
     matdata = SUNSparseMatrix_Data(C);
     rowptrs[ 0] = 0;
-    matdata[ 0] = RCONST(2.0);   colindices[ 0] = 1;
+    matdata[ 0] = SUN_RCONST(2.0);   colindices[ 0] = 1;
     rowptrs[ 1] = 1;
-    matdata[ 1] = RCONST(-1.0);  colindices[ 1] = 0;
-    matdata[ 2] = RCONST(1.0);   colindices[ 2] = 1;
-    matdata[ 3] = RCONST(3.0);   colindices[ 3] = 2;
+    matdata[ 1] = SUN_RCONST(-1.0);  colindices[ 1] = 0;
+    matdata[ 2] = SUN_RCONST(1.0);   colindices[ 2] = 1;
+    matdata[ 3] = SUN_RCONST(3.0);   colindices[ 3] = 2;
     rowptrs[ 2] = 4;
-    matdata[ 4] = RCONST(-2.0);  colindices[ 4] = 0;
-    matdata[ 5] = RCONST(2.0);   colindices[ 5] = 2;
-    matdata[ 6] = RCONST(4.0);   colindices[ 6] = 3;
+    matdata[ 4] = SUN_RCONST(-2.0);  colindices[ 4] = 0;
+    matdata[ 5] = SUN_RCONST(2.0);   colindices[ 5] = 2;
+    matdata[ 6] = SUN_RCONST(4.0);   colindices[ 6] = 3;
     rowptrs[ 3] = 7;
-    matdata[ 7] = RCONST(-1.0);  colindices[ 7] = 1;
-    matdata[ 8] = RCONST(1.0);   colindices[ 8] = 2;
-    matdata[ 9] = RCONST(3.0);   colindices[ 9] = 3;
-    matdata[10] = RCONST(5.0);   colindices[10] = 4;
+    matdata[ 7] = SUN_RCONST(-1.0);  colindices[ 7] = 1;
+    matdata[ 8] = SUN_RCONST(1.0);   colindices[ 8] = 2;
+    matdata[ 9] = SUN_RCONST(3.0);   colindices[ 9] = 3;
+    matdata[10] = SUN_RCONST(5.0);   colindices[10] = 4;
     rowptrs[ 4] = 11;
-    matdata[11] = RCONST(2.0);   colindices[11] = 3;
-    matdata[12] = RCONST(4.0);   colindices[12] = 4;
-    matdata[13] = RCONST(6.0);   colindices[13] = 5;
+    matdata[11] = SUN_RCONST(2.0);   colindices[11] = 3;
+    matdata[12] = SUN_RCONST(4.0);   colindices[12] = 4;
+    matdata[13] = SUN_RCONST(6.0);   colindices[13] = 5;
     rowptrs[ 5] = 14;
-    matdata[14] = RCONST(1.0);   colindices[14] = 3;
-    matdata[15] = RCONST(3.0);   colindices[15] = 4;
-    matdata[16] = RCONST(5.0);   colindices[16] = 5;
-    matdata[17] = RCONST(7.0);   colindices[17] = 6;
+    matdata[14] = SUN_RCONST(1.0);   colindices[14] = 3;
+    matdata[15] = SUN_RCONST(3.0);   colindices[15] = 4;
+    matdata[16] = SUN_RCONST(5.0);   colindices[16] = 5;
+    matdata[17] = SUN_RCONST(7.0);   colindices[17] = 6;
     rowptrs[ 6] = 18;
-    matdata[18] = RCONST(2.0);   colindices[18] = 4;
-    matdata[19] = RCONST(4.0);   colindices[19] = 5;
-    matdata[20] = RCONST(6.0);   colindices[20] = 6;
+    matdata[18] = SUN_RCONST(2.0);   colindices[18] = 4;
+    matdata[19] = SUN_RCONST(4.0);   colindices[19] = 5;
+    matdata[20] = SUN_RCONST(6.0);   colindices[20] = 6;
     rowptrs[ 7] = 21;
 
     A = SUNSparseFromBandMatrix(B, ZERO, CSR_MAT);
@@ -256,33 +256,33 @@ int main(int argc, char *argv[])
     rowindices = SUNSparseMatrix_IndexValues(D);
     matdata = SUNSparseMatrix_Data(D);
     colptrs[ 0] = 0;
-    matdata[ 0] = RCONST(-1.0);  rowindices[ 0] = 1;
-    matdata[ 1] = RCONST(-2.0);  rowindices[ 1] = 2;
+    matdata[ 0] = SUN_RCONST(-1.0);  rowindices[ 0] = 1;
+    matdata[ 1] = SUN_RCONST(-2.0);  rowindices[ 1] = 2;
     colptrs[ 1] = 2;
-    matdata[ 2] = RCONST(2.0);   rowindices[ 2] = 0;
-    matdata[ 3] = RCONST(1.0);   rowindices[ 3] = 1;
-    matdata[ 4] = RCONST(-1.0);  rowindices[ 4] = 3;
+    matdata[ 2] = SUN_RCONST(2.0);   rowindices[ 2] = 0;
+    matdata[ 3] = SUN_RCONST(1.0);   rowindices[ 3] = 1;
+    matdata[ 4] = SUN_RCONST(-1.0);  rowindices[ 4] = 3;
     colptrs[ 2] = 5;
-    matdata[ 5] = RCONST(3.0);   rowindices[ 5] = 1;
-    matdata[ 6] = RCONST(2.0);   rowindices[ 6] = 2;
-    matdata[ 7] = RCONST(1.0);   rowindices[ 7] = 3;
+    matdata[ 5] = SUN_RCONST(3.0);   rowindices[ 5] = 1;
+    matdata[ 6] = SUN_RCONST(2.0);   rowindices[ 6] = 2;
+    matdata[ 7] = SUN_RCONST(1.0);   rowindices[ 7] = 3;
     colptrs[ 3] = 8;
-    matdata[ 8] = RCONST(4.0);   rowindices[ 8] = 2;
-    matdata[ 9] = RCONST(3.0);   rowindices[ 9] = 3;
-    matdata[10] = RCONST(2.0);   rowindices[10] = 4;
-    matdata[11] = RCONST(1.0);   rowindices[11] = 5;
+    matdata[ 8] = SUN_RCONST(4.0);   rowindices[ 8] = 2;
+    matdata[ 9] = SUN_RCONST(3.0);   rowindices[ 9] = 3;
+    matdata[10] = SUN_RCONST(2.0);   rowindices[10] = 4;
+    matdata[11] = SUN_RCONST(1.0);   rowindices[11] = 5;
     colptrs[ 4] = 12;
-    matdata[12] = RCONST(5.0);   rowindices[12] = 3;
-    matdata[13] = RCONST(4.0);   rowindices[13] = 4;
-    matdata[14] = RCONST(3.0);   rowindices[14] = 5;
-    matdata[15] = RCONST(2.0);   rowindices[15] = 6;
+    matdata[12] = SUN_RCONST(5.0);   rowindices[12] = 3;
+    matdata[13] = SUN_RCONST(4.0);   rowindices[13] = 4;
+    matdata[14] = SUN_RCONST(3.0);   rowindices[14] = 5;
+    matdata[15] = SUN_RCONST(2.0);   rowindices[15] = 6;
     colptrs[ 5] = 16;
-    matdata[16] = RCONST(6.0);   rowindices[16] = 4;
-    matdata[17] = RCONST(5.0);   rowindices[17] = 5;
-    matdata[18] = RCONST(4.0);   rowindices[18] = 6;
+    matdata[16] = SUN_RCONST(6.0);   rowindices[16] = 4;
+    matdata[17] = SUN_RCONST(5.0);   rowindices[17] = 5;
+    matdata[18] = SUN_RCONST(4.0);   rowindices[18] = 6;
     colptrs[ 6] = 19;
-    matdata[19] = RCONST(7.0);   rowindices[19] = 5;
-    matdata[20] = RCONST(6.0);   rowindices[20] = 6;
+    matdata[19] = SUN_RCONST(7.0);   rowindices[19] = 5;
+    matdata[20] = SUN_RCONST(6.0);   rowindices[20] = 6;
     colptrs[ 7] = 21;
 
     A = SUNSparseFromBandMatrix(B, 1e-15, CSC_MAT);
@@ -322,13 +322,13 @@ int main(int argc, char *argv[])
     i = rand() % matrows;
     j = rand() % matcols;
     matdata = SUNDenseMatrix_Column(D,j);
-    matdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   }
   for (k=0; k<matrows; k++) {
     i = rand() % matrows;
     j = rand() % matcols;
     matdata = SUNDenseMatrix_Column(C,j);
-    matdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    matdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   }
   A = SUNSparseFromDenseMatrix(C, ZERO, mattype);
   B = SUNSparseFromDenseMatrix(D, ZERO, mattype);
@@ -339,7 +339,7 @@ int main(int argc, char *argv[])
   z = N_VNew_Serial(matrows, sunctx);
   vecdata = N_VGetArrayPointer(x);
   for(i=0; i<matcols; i++)
-    vecdata[i] = (realtype) rand() / (realtype) RAND_MAX;
+    vecdata[i] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
   if (SUNMatMatvec(C, x, y) != 0) {
     printf("FAIL: SUNMatrix module Dense matvec failure \n \n");
     SUNMatDestroy(A);  SUNMatDestroy(B);
@@ -428,7 +428,7 @@ int Test_SUNMatScaleAdd2(SUNMatrix A, SUNMatrix B, N_Vector x,
   int       failure;
   SUNMatrix C, D, E;
   N_Vector  u, v;
-  realtype  tol=100*UNIT_ROUNDOFF;
+  sunrealtype  tol=100*SUN_UNIT_ROUNDOFF;
 
   /* create clones for test */
   C = SUNMatClone(A);
@@ -601,7 +601,7 @@ int Test_SUNMatScaleAddI2(SUNMatrix A, N_Vector x, N_Vector y)
   int       failure;
   SUNMatrix B, C, D;
   N_Vector  w, z;
-  realtype  tol=200*UNIT_ROUNDOFF;
+  sunrealtype  tol=200*SUN_UNIT_ROUNDOFF;
 
   /* create clones for test */
   B = SUNMatClone(A);
@@ -743,7 +743,7 @@ int Test_SUNSparseMatrixToCSR(SUNMatrix A)
 {
   int       failure;
   SUNMatrix csc, csr;
-  realtype  tol=200*UNIT_ROUNDOFF;
+  sunrealtype  tol=200*SUN_UNIT_ROUNDOFF;
 
   failure = SUNSparseMatrix_ToCSR(A, &csr);
 
@@ -779,7 +779,7 @@ int Test_SUNSparseMatrixToCSC(SUNMatrix A)
 {
   int       failure;
   SUNMatrix csc=NULL, csr=NULL;
-  realtype  tol=200*UNIT_ROUNDOFF;
+  sunrealtype  tol=200*SUN_UNIT_ROUNDOFF;
 
   failure = SUNSparseMatrix_ToCSC(A, &csc);
 
@@ -815,10 +815,10 @@ int Test_SUNSparseMatrixToCSC(SUNMatrix A)
 /* ----------------------------------------------------------------------
  * Check matrix
  * --------------------------------------------------------------------*/
-int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
+int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol)
 {
   int failure = 0;
-  realtype *Adata, *Bdata;
+  sunrealtype *Adata, *Bdata;
   sunindextype *Aindexptrs, *Bindexptrs;
   sunindextype *Aindexvals, *Bindexvals;
   sunindextype i, ANP, BNP, Annz, Bnnz;
@@ -889,10 +889,10 @@ int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol)
   return(0);
 }
 
-int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
+int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol)
 {
   int failure = 0;
-  realtype *Adata;
+  sunrealtype *Adata;
   sunindextype *indexptrs;
   sunindextype i, NP;
 
@@ -912,10 +912,10 @@ int check_matrix_entry(SUNMatrix A, realtype val, realtype tol)
     return(0);
 }
 
-int check_vector(N_Vector x, N_Vector y, realtype tol)
+int check_vector(N_Vector x, N_Vector y, sunrealtype tol)
 {
   int failure = 0;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
   sunindextype xldata, yldata;
   sunindextype i;
 
@@ -943,16 +943,16 @@ int check_vector(N_Vector x, N_Vector y, realtype tol)
     return(0);
 }
 
-booleantype has_data(SUNMatrix A)
+sunbooleantype has_data(SUNMatrix A)
 {
-  realtype *Adata = SUNSparseMatrix_Data(A);
+  sunrealtype *Adata = SUNSparseMatrix_Data(A);
   if (Adata == NULL)
     return SUNFALSE;
   else
     return SUNTRUE;
 }
 
-booleantype is_square(SUNMatrix A)
+sunbooleantype is_square(SUNMatrix A)
 {
   if (SUNSparseMatrix_Rows(A) == SUNSparseMatrix_Columns(A))
     return SUNTRUE;
diff --git a/examples/sunmatrix/test_sunmatrix.c b/examples/sunmatrix/test_sunmatrix.c
index 1870ece1f3..7f2e1a33c9 100644
--- a/examples/sunmatrix/test_sunmatrix.c
+++ b/examples/sunmatrix/test_sunmatrix.c
@@ -79,7 +79,7 @@ int Test_SUNMatClone(SUNMatrix A, int myid)
 {
   int       failure;
   double    start_time, stop_time;
-  realtype  tol=10*UNIT_ROUNDOFF;
+  sunrealtype  tol=10*SUN_UNIT_ROUNDOFF;
   SUNMatrix B;
 
   /* clone matrix */
@@ -136,7 +136,7 @@ int Test_SUNMatZero(SUNMatrix A, int myid)
 {
   int       failure;
   double    start_time, stop_time;
-  realtype  tol=10*UNIT_ROUNDOFF;
+  sunrealtype  tol=10*SUN_UNIT_ROUNDOFF;
   SUNMatrix B;
 
   /* protect A */
@@ -183,7 +183,7 @@ int Test_SUNMatCopy(SUNMatrix A, int myid)
   int       failure;
   double    start_time, stop_time;
   SUNMatrix B;
-  realtype  tol=10*UNIT_ROUNDOFF;
+  sunrealtype  tol=10*SUN_UNIT_ROUNDOFF;
 
   B = SUNMatClone(A);
 
@@ -232,7 +232,7 @@ int Test_SUNMatScaleAdd(SUNMatrix A, SUNMatrix I, int myid)
   int       failure;
   double    start_time, stop_time;
   SUNMatrix B, C, D;
-  realtype  tol=10*UNIT_ROUNDOFF;
+  sunrealtype  tol=10*SUN_UNIT_ROUNDOFF;
 
   /*
    * Case 1: same sparsity/bandwith pattern
@@ -359,7 +359,7 @@ int Test_SUNMatScaleAddI(SUNMatrix A, SUNMatrix I, int myid)
   int       failure;
   double    start_time, stop_time;
   SUNMatrix B;
-  realtype  tol=10*UNIT_ROUNDOFF;
+  sunrealtype  tol=10*SUN_UNIT_ROUNDOFF;
 
   /* protect A */
   B = SUNMatClone(A);
@@ -444,7 +444,7 @@ int Test_SUNMatMatvec(SUNMatrix A, N_Vector x, N_Vector y, int myid)
   double   start_time, stop_time;
   SUNMatrix B;
   N_Vector  z, w;
-  realtype  tol=100*UNIT_ROUNDOFF;
+  sunrealtype  tol=100*SUN_UNIT_ROUNDOFF;
 
   if (A->ops->matvec == NULL) {
     TEST_STATUS("    PASSED test -- SUNMatMatvec not implemented\n", myid);
diff --git a/examples/sunmatrix/test_sunmatrix.f90 b/examples/sunmatrix/test_sunmatrix.f90
index 07c0f2299f..de97d621e1 100644
--- a/examples/sunmatrix/test_sunmatrix.f90
+++ b/examples/sunmatrix/test_sunmatrix.f90
@@ -137,7 +137,7 @@ integer(C_INT) function Test_FSUNMatClone(A, myid) result(failure)
 
     integer(C_INT)  :: myid
     type(SUNMatrix) :: A
-    real(C_DOUBLE)  :: tol = 10*UNIT_ROUNDOFF
+    real(C_DOUBLE)  :: tol = 10*SUN_UNIT_ROUNDOFF
     type(SUNMatrix), pointer ::  B
 
     failure = 0
@@ -180,7 +180,7 @@ integer(C_INT) function Test_FSUNMatZero(A, myid) result(failure)
     implicit none
 
     integer(C_INT)  :: myid
-    real(C_DOUBLE)  :: tol = 10*UNIT_ROUNDOFF
+    real(C_DOUBLE)  :: tol = 10*SUN_UNIT_ROUNDOFF
     type(SUNMatrix) :: A
     type(SUNMatrix), pointer :: B
 
@@ -218,7 +218,7 @@ integer(C_INT) function Test_FSUNMatCopy(A, myid) result(failure)
     implicit none
 
     integer(C_INT)  :: myid
-    real(C_DOUBLE)  :: tol = 10*UNIT_ROUNDOFF
+    real(C_DOUBLE)  :: tol = 10*SUN_UNIT_ROUNDOFF
     type(SUNMatrix) :: A
     type(SUNMatrix), pointer :: B
 
@@ -257,7 +257,7 @@ integer(C_INT) function Test_FSUNMatScaleAdd(A, I, myid) result(failure)
     implicit none
 
     integer(C_INT)  :: myid
-    real(C_DOUBLE)  :: tol = 10*UNIT_ROUNDOFF
+    real(C_DOUBLE)  :: tol = 10*SUN_UNIT_ROUNDOFF
     type(SUNMatrix) :: A, I
     type(SUNMatrix), pointer :: B
 
@@ -306,7 +306,7 @@ integer(C_INT) function Test_FSUNMatScaleAddI(A, I, myid) result(failure)
     implicit none
 
     integer(C_INT)  :: myid
-    real(C_DOUBLE)  :: tol = 10*UNIT_ROUNDOFF
+    real(C_DOUBLE)  :: tol = 10*SUN_UNIT_ROUNDOFF
     type(SUNMatrix) :: A, I
     type(SUNMatrix), pointer :: B
 
@@ -386,7 +386,7 @@ integer(C_INT) function Test_FSUNMatMatvec(A, x, y, myid) result(failure)
     type(N_Vector)               :: x, y
     type(N_Vector),  pointer     :: z, w
     integer(C_INT)               :: myid
-    real(C_DOUBLE)               :: tol = 100*UNIT_ROUNDOFF
+    real(C_DOUBLE)               :: tol = 100*SUN_UNIT_ROUNDOFF
     type(SUNMatrix_Ops), pointer :: ops
 
     failure = 0
diff --git a/examples/sunmatrix/test_sunmatrix.h b/examples/sunmatrix/test_sunmatrix.h
index 2a10c980aa..8ad9dd4686 100644
--- a/examples/sunmatrix/test_sunmatrix.h
+++ b/examples/sunmatrix/test_sunmatrix.h
@@ -21,14 +21,14 @@
 #include <math.h>
 
 /* define constatnts */
-#define NEG_TWO  RCONST(-2.0)
-#define NEG_ONE  RCONST(-1.0)
-#define NEG_HALF RCONST(-0.5)
-#define ZERO     RCONST(0.0)
-#define HALF     RCONST(0.5)
-#define ONE      RCONST(1.0)
-#define TWO      RCONST(2.0)
-#define THREE    RCONST(3.0)
+#define NEG_TWO  SUN_RCONST(-2.0)
+#define NEG_ONE  SUN_RCONST(-1.0)
+#define NEG_HALF SUN_RCONST(-0.5)
+#define ZERO     SUN_RCONST(0.0)
+#define HALF     SUN_RCONST(0.5)
+#define ONE      SUN_RCONST(1.0)
+#define TWO      SUN_RCONST(2.0)
+#define THREE    SUN_RCONST(3.0)
 
 /* Helpers for printing out test status information */
 #define TEST_STATUS(fmt, myrank)                     \
@@ -57,11 +57,11 @@
 extern "C" {
 #endif
   /* Forward declarations for implementation specific utility functions */
-  int check_matrix(SUNMatrix A, SUNMatrix B, realtype tol);
-  int check_matrix_entry(SUNMatrix A, realtype val, realtype tol);
-  int check_vector(N_Vector expected, N_Vector computed, realtype tol);
-  booleantype has_data(SUNMatrix A);
-  booleantype is_square(SUNMatrix A);
+  int check_matrix(SUNMatrix A, SUNMatrix B, sunrealtype tol);
+  int check_matrix_entry(SUNMatrix A, sunrealtype val, sunrealtype tol);
+  int check_vector(N_Vector expected, N_Vector computed, sunrealtype tol);
+  sunbooleantype has_data(SUNMatrix A);
+  sunbooleantype is_square(SUNMatrix A);
   void sync_device(SUNMatrix A);
 
   /* Test function declarations */
diff --git a/examples/sunnonlinsol/fixedpoint/test_sunnonlinsol_fixedpoint.c b/examples/sunnonlinsol/fixedpoint/test_sunnonlinsol_fixedpoint.c
index e773eeb7f6..43b986d4d6 100644
--- a/examples/sunnonlinsol/fixedpoint/test_sunnonlinsol_fixedpoint.c
+++ b/examples/sunnonlinsol/fixedpoint/test_sunnonlinsol_fixedpoint.c
@@ -62,19 +62,19 @@
 /* problem constants */
 #define NEQ   3 /* number of equations */
 
-#define ZERO         RCONST(0.0)             /* real 0.0  */
-#define PTONE        RCONST(0.1)             /* real 0.1  */
-#define HALF         RCONST(0.5)             /* real 0.5  */
-#define PTNINE       RCONST(0.9)             /* real 0.9  */
-#define ONE          RCONST(1.0)             /* real 1.0  */
-#define ONEPTZEROSIX RCONST(1.06)            /* real 1.06 */
-#define THREE        RCONST(3.0)             /* real 3.0  */
-#define SIX          RCONST(6.0)             /* real 6.0  */
-#define NINE         RCONST(9.0)             /* real 9.0  */
-#define TEN          RCONST(10.0)            /* real 10.0 */
-#define TWENTY       RCONST(20.0)            /* real 20.0 */
-#define SIXTY        RCONST(60.0)            /* real 60.0 */
-#define PI           RCONST(3.1415926535898) /* real pi   */
+#define ZERO         SUN_RCONST(0.0)             /* real 0.0  */
+#define PTONE        SUN_RCONST(0.1)             /* real 0.1  */
+#define HALF         SUN_RCONST(0.5)             /* real 0.5  */
+#define PTNINE       SUN_RCONST(0.9)             /* real 0.9  */
+#define ONE          SUN_RCONST(1.0)             /* real 1.0  */
+#define ONEPTZEROSIX SUN_RCONST(1.06)            /* real 1.06 */
+#define THREE        SUN_RCONST(3.0)             /* real 3.0  */
+#define SIX          SUN_RCONST(6.0)             /* real 6.0  */
+#define NINE         SUN_RCONST(9.0)             /* real 9.0  */
+#define TEN          SUN_RCONST(10.0)            /* real 10.0 */
+#define TWENTY       SUN_RCONST(20.0)            /* real 20.0 */
+#define SIXTY        SUN_RCONST(60.0)            /* real 60.0 */
+#define PI           SUN_RCONST(3.1415926535898) /* real pi   */
 
 /* analytic solution */
 #define XTRUE HALF
@@ -82,7 +82,7 @@
 #define ZTRUE -PI/SIX
 
 /* Check the system solution */
-static int check_ans(N_Vector ycur, realtype tol);
+static int check_ans(N_Vector ycur, sunrealtype tol);
 
 /* Check function return values */
 static int check_retval(void *flagvalue, const char *funcname, int opt);
@@ -92,7 +92,7 @@ static int FPFunction(N_Vector y, N_Vector f, void *mem);
 
 /* Convergence test function */
 static int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                    realtype tol, N_Vector ewt, void* mem);
+                    sunrealtype tol, N_Vector ewt, void* mem);
 
 /*
  * Proxy for integrator memory struct
@@ -114,17 +114,17 @@ int main(int argc, char *argv[])
   IntegratorMem      Imem    = NULL;
   int                retval  = 0;
   SUNNonlinearSolver NLS     = NULL;
-  realtype           tol     = 100 * SUNRsqrt(UNIT_ROUNDOFF);
+  sunrealtype           tol     = 100 * SUNRsqrt(SUN_UNIT_ROUNDOFF);
   int                mxiter  = 20;
   int                maa     = 0;           /* no acceleration */
-  realtype           damping = RCONST(1.0); /* no damping      */
+  sunrealtype           damping = SUN_RCONST(1.0); /* no damping      */
   long int           niters  = 0;
-  realtype*          data    = NULL;
+  sunrealtype*          data    = NULL;
   SUNContext         sunctx     = NULL;
 
   /* Check if a acceleration/dampling values were provided */
   if (argc > 1) maa     = (long int) atoi(argv[1]);
-  if (argc > 2) damping = (realtype) atof(argv[2]);
+  if (argc > 2) damping = (sunrealtype) atof(argv[2]);
 
   /* Print problem description */
   printf("Solve the nonlinear system:\n");
@@ -226,10 +226,10 @@ int main(int argc, char *argv[])
 }
 
 /* Proxy for integrator convergence test function */
-int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, realtype tol,
+int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, sunrealtype tol,
              N_Vector ewt, void* mem)
 {
-  realtype delnrm;
+  sunrealtype delnrm;
 
   /* compute the norm of the correction */
   delnrm = N_VMaxNorm(del);
@@ -262,9 +262,9 @@ int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, realtype tol,
 int FPFunction(N_Vector ycor, N_Vector gvec, void *mem)
 {
   IntegratorMem Imem;
-  realtype*     ydata = NULL;
-  realtype*     gdata = NULL;
-  realtype      x, y, z;
+  sunrealtype*     ydata = NULL;
+  sunrealtype*     gdata = NULL;
+  sunrealtype      x, y, z;
 
   if (mem == NULL) {
     printf("ERROR: Integrator memory is NULL");
@@ -300,10 +300,10 @@ int FPFunction(N_Vector ycor, N_Vector gvec, void *mem)
 /* -----------------------------------------------------------------------------
  * Check the solution of the nonlinear system and return PASS or FAIL
  * ---------------------------------------------------------------------------*/
-static int check_ans(N_Vector ycur, realtype tol)
+static int check_ans(N_Vector ycur, sunrealtype tol)
 {
-  realtype* data = NULL;
-  realtype  ex, ey, ez;
+  sunrealtype* data = NULL;
+  sunrealtype  ex, ey, ez;
 
   /* Get vector data array */
   data = N_VGetArrayPointer(ycur);
diff --git a/examples/sunnonlinsol/newton/test_sunnonlinsol_newton.c b/examples/sunnonlinsol/newton/test_sunnonlinsol_newton.c
index f0b80bfa77..0c752aec63 100644
--- a/examples/sunnonlinsol/newton/test_sunnonlinsol_newton.c
+++ b/examples/sunnonlinsol/newton/test_sunnonlinsol_newton.c
@@ -34,16 +34,16 @@
 #endif
 
 #define NEQ   3                /* number of equations        */
-#define TOL   RCONST(1.0e-2)   /* nonlinear solver tolerance */
+#define TOL   SUN_RCONST(1.0e-2)   /* nonlinear solver tolerance */
 #define MAXIT 10               /* max nonlinear iterations   */
 
-#define ZERO  RCONST(0.0)  /* real 0.0 */
-#define HALF  RCONST(0.5)  /* real 0.5 */
-#define ONE   RCONST(1.0)  /* real 1.0 */
-#define TWO   RCONST(2.0)  /* real 2.0 */
-#define THREE RCONST(3.0)  /* real 3.0 */
-#define FOUR  RCONST(4.0)  /* real 4.0 */
-#define SIX   RCONST(6.0)  /* real 6.0 */
+#define ZERO  SUN_RCONST(0.0)  /* real 0.0 */
+#define HALF  SUN_RCONST(0.5)  /* real 0.5 */
+#define ONE   SUN_RCONST(1.0)  /* real 1.0 */
+#define TWO   SUN_RCONST(2.0)  /* real 2.0 */
+#define THREE SUN_RCONST(3.0)  /* real 3.0 */
+#define FOUR  SUN_RCONST(4.0)  /* real 4.0 */
+#define SIX   SUN_RCONST(6.0)  /* real 6.0 */
 
 /* approximate solution */
 #define Y1 0.785196933062355226
@@ -57,7 +57,7 @@ static int check_retval(void *flagvalue, const char *funcname, int opt);
 static int Res(N_Vector y, N_Vector f, void *mem);
 
 /* Jacobian of the nonlinear residual */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /*
@@ -76,14 +76,14 @@ typedef struct IntegratorMemRec {
 } *IntegratorMem;
 
 /* Linear solver setup interface function */
-static int LSetup(booleantype jbad, booleantype* jcur, void* mem);
+static int LSetup(sunbooleantype jbad, sunbooleantype* jcur, void* mem);
 
 /* Linear solver solve interface function */
 static int LSolve(N_Vector b, void* mem);
 
 /* Convergence test function */
 static int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                    realtype tol, N_Vector ewt, void* mem);
+                    sunrealtype tol, N_Vector ewt, void* mem);
 
 /* -----------------------------------------------------------------------------
  * Main testing routine
@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
 
 
 /* Proxy for integrator lsetup function */
-int LSetup(booleantype jbad, booleantype* jcur, void* mem)
+int LSetup(sunbooleantype jbad, sunbooleantype* jcur, void* mem)
 {
   int retval;
   IntegratorMem Imem;
@@ -264,10 +264,10 @@ int LSolve(N_Vector b, void* mem)
 
 
 /* Proxy for integrator convergence test function */
-int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, realtype tol,
+int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, sunrealtype tol,
              N_Vector ewt, void* mem)
 {
-  realtype delnrm;
+  sunrealtype delnrm;
 
   /* compute the norm of the correction */
   delnrm = N_VWrmsNorm(del, ewt);
@@ -288,7 +288,7 @@ int ConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, realtype tol,
 int Res(N_Vector ycor, N_Vector f, void *mem)
 {
   IntegratorMem Imem;
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
 
   if (mem == NULL) {
     printf("ERROR: Integrator memory is NULL");
@@ -322,10 +322,10 @@ int Res(N_Vector ycor, N_Vector f, void *mem)
  *            ( 6x  -4  2z )
  *
  * ---------------------------------------------------------------------------*/
-int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
         void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype y1, y2, y3;
+  sunrealtype y1, y2, y3;
 
   y1 = NV_Ith_S(y,0);
   y2 = NV_Ith_S(y,1);
diff --git a/examples/sunnonlinsol/petsc/test_sunnonlinsol_petscsnes.c b/examples/sunnonlinsol/petsc/test_sunnonlinsol_petscsnes.c
index 56fb587b40..b54a4e4979 100644
--- a/examples/sunnonlinsol/petsc/test_sunnonlinsol_petscsnes.c
+++ b/examples/sunnonlinsol/petsc/test_sunnonlinsol_petscsnes.c
@@ -32,16 +32,16 @@
 #endif
 
 #define NEQ   3                /* number of equations        */
-#define TOL   RCONST(1.0e-2)   /* nonlinear solver tolerance */
+#define TOL   SUN_RCONST(1.0e-2)   /* nonlinear solver tolerance */
 #define MAXIT 10               /* max nonlinear iterations   */
 
-#define ZERO  RCONST(0.0)  /* real 0.0 */
-#define HALF  RCONST(0.5)  /* real 0.5 */
-#define ONE   RCONST(1.0)  /* real 1.0 */
-#define TWO   RCONST(2.0)  /* real 2.0 */
-#define THREE RCONST(3.0)  /* real 3.0 */
-#define FOUR  RCONST(4.0)  /* real 4.0 */
-#define SIX   RCONST(6.0)  /* real 6.0 */
+#define ZERO  SUN_RCONST(0.0)  /* real 0.0 */
+#define HALF  SUN_RCONST(0.5)  /* real 0.5 */
+#define ONE   SUN_RCONST(1.0)  /* real 1.0 */
+#define TWO   SUN_RCONST(2.0)  /* real 2.0 */
+#define THREE SUN_RCONST(3.0)  /* real 3.0 */
+#define FOUR  SUN_RCONST(4.0)  /* real 4.0 */
+#define SIX   SUN_RCONST(6.0)  /* real 6.0 */
 
 /* approximate solution */
 #define Y1 0.785196933062355226
@@ -127,7 +127,7 @@ int main(int argc, char *argv[])
   if (check_retval(&retval, "SUNNonlinSolSolve", 1)) return(1);
 
   /* get the solution */
-  realtype yvals[3];
+  sunrealtype yvals[3];
   sunindextype indc[3] = {0, 1, 2};
   VecGetValues(Y, 3, indc, yvals);
 
@@ -184,8 +184,8 @@ int main(int argc, char *argv[])
 int Res(N_Vector y, N_Vector f, void *mem)
 {
   Vec yvec, fvec;
-  realtype vals[3];
-  realtype y1, y2, y3;
+  sunrealtype vals[3];
+  sunrealtype y1, y2, y3;
 
   yvec = N_VGetVector_Petsc(y);
   fvec = N_VGetVector_Petsc(f);
@@ -221,8 +221,8 @@ int Res(N_Vector y, N_Vector f, void *mem)
  * ---------------------------------------------------------------------------*/
 int Jac(SNES snes, Vec y, Mat J, Mat Jpre, void *ctx)
 {
-  realtype y1, y2, y3;
-  realtype yvals[3];
+  sunrealtype y1, y2, y3;
+  sunrealtype yvals[3];
 
   /* set vector indices */
   sunindextype indc[3] = { 0, 1, 2 };
@@ -232,7 +232,7 @@ int Jac(SNES snes, Vec y, Mat J, Mat Jpre, void *ctx)
   y1 = yvals[0]; y2 = yvals[1]; y3 = yvals[2];
 
   /* set the Jacobian values */
-  realtype jvals[3][3] =  { { TWO*y1,  TWO*y2,  TWO*y3 },
+  sunrealtype jvals[3][3] =  { { TWO*y1,  TWO*y2,  TWO*y3 },
                             { FOUR*y1, TWO*y2, -FOUR   },
                             { SIX*y1, -FOUR,    TWO*y3 } };
   MatSetValues(J, 3, indc, 3, indc, &jvals[0][0], INSERT_VALUES);
diff --git a/examples/utilities/test_utilities.f90 b/examples/utilities/test_utilities.f90
index 77d684801e..7ff5c32fe2 100644
--- a/examples/utilities/test_utilities.f90
+++ b/examples/utilities/test_utilities.f90
@@ -20,7 +20,7 @@ module test_utilities
     use fsundials_context_mod
     implicit none
 
-    real(C_DOUBLE), parameter :: UNIT_ROUNDOFF = epsilon(1.0d0)
+    real(C_DOUBLE), parameter :: SUN_UNIT_ROUNDOFF = epsilon(1.0d0)
 
     real(C_DOUBLE) :: NEG_TWO  = -2.0d0
     real(C_DOUBLE) :: NEG_ONE  = -1.0d0
@@ -79,7 +79,7 @@ integer(C_INT) function FNEQ(a, b) result(nequal)
 
     if (a /= a) then
       nequal = 1
-    else if ((abs(a-b)/abs(b)) > (10*UNIT_ROUNDOFF)) then
+    else if ((abs(a-b)/abs(b)) > (10*SUN_UNIT_ROUNDOFF)) then
       nequal = 1
     else
       nequal = 0
diff --git a/include/arkode/arkode.h b/include/arkode/arkode.h
index a6ed8ebe83..f21ef73d64 100644
--- a/include/arkode/arkode.h
+++ b/include/arkode/arkode.h
@@ -145,11 +145,11 @@ extern "C" {
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*ARKRhsFn)(realtype t, N_Vector y,
+typedef int (*ARKRhsFn)(sunrealtype t, N_Vector y,
                         N_Vector ydot, void *user_data);
 
-typedef int (*ARKRootFn)(realtype t, N_Vector y,
-                         realtype *gout, void *user_data);
+typedef int (*ARKRootFn)(sunrealtype t, N_Vector y,
+                         sunrealtype *gout, void *user_data);
 
 typedef int (*ARKEwtFn)(N_Vector y, N_Vector ewt, void *user_data);
 
@@ -159,25 +159,25 @@ typedef void (*ARKErrHandlerFn)(int error_code, const char *module,
                                 const char *function, char *msg,
                                 void *user_data);
 
-typedef int (*ARKAdaptFn)(N_Vector y, realtype t, realtype h1,
-                          realtype h2, realtype h3,
-                          realtype e1, realtype e2,
-                          realtype e3, int q, int p,
-                          realtype *hnew, void *user_data);
+typedef int (*ARKAdaptFn)(N_Vector y, sunrealtype t, sunrealtype h1,
+                          sunrealtype h2, sunrealtype h3,
+                          sunrealtype e1, sunrealtype e2,
+                          sunrealtype e3, int q, int p,
+                          sunrealtype *hnew, void *user_data);
 
-typedef int (*ARKExpStabFn)(N_Vector y, realtype t,
-                            realtype *hstab, void *user_data);
+typedef int (*ARKExpStabFn)(N_Vector y, sunrealtype t,
+                            sunrealtype *hstab, void *user_data);
 
 typedef int (*ARKVecResizeFn)(N_Vector y, N_Vector ytemplate,
                               void *user_data);
 
-typedef int (*ARKPostProcessFn)(realtype t, N_Vector y,
+typedef int (*ARKPostProcessFn)(sunrealtype t, N_Vector y,
                                 void *user_data);
 
-typedef int (*ARKStagePredictFn)(realtype t, N_Vector zpred,
+typedef int (*ARKStagePredictFn)(sunrealtype t, N_Vector zpred,
                                  void *user_data);
 
-typedef int (*ARKRelaxFn)(N_Vector y, realtype* r, void* user_data);
+typedef int (*ARKRelaxFn)(N_Vector y, sunrealtype* r, void* user_data);
 
 typedef int (*ARKRelaxJacFn)(N_Vector y, N_Vector J, void* user_data);
 
diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
index 4e090943c2..b2c68ddcf8 100644
--- a/include/arkode/arkode_arkstep.h
+++ b/include/arkode/arkode_arkstep.h
@@ -69,32 +69,32 @@ static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SA_DIRK_8_4_5;
 
 /* Create, Resize, and Reinitialization functions */
 SUNDIALS_EXPORT void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi,
-                                    realtype t0, N_Vector y0,
+                                    sunrealtype t0, N_Vector y0,
                                     SUNContext sunctx);
 
 SUNDIALS_EXPORT int ARKStepResize(void *arkode_mem, N_Vector ynew,
-                                  realtype hscale, realtype t0,
+                                  sunrealtype hscale, sunrealtype t0,
                                   ARKVecResizeFn resize,
                                   void *resize_data);
 
 SUNDIALS_EXPORT int ARKStepReInit(void* arkode_mem, ARKRhsFn fe,
-                                  ARKRhsFn fi, realtype t0, N_Vector y0);
+                                  ARKRhsFn fi, sunrealtype t0, N_Vector y0);
 
-SUNDIALS_EXPORT int ARKStepReset(void* arkode_mem, realtype tR, N_Vector yR);
+SUNDIALS_EXPORT int ARKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR);
 
 /* Tolerance input functions */
 SUNDIALS_EXPORT int ARKStepSStolerances(void *arkode_mem,
-                                        realtype reltol,
-                                        realtype abstol);
+                                        sunrealtype reltol,
+                                        sunrealtype abstol);
 SUNDIALS_EXPORT int ARKStepSVtolerances(void *arkode_mem,
-                                        realtype reltol,
+                                        sunrealtype reltol,
                                         N_Vector abstol);
 SUNDIALS_EXPORT int ARKStepWFtolerances(void *arkode_mem,
                                         ARKEwtFn efun);
 
 /* Residual tolerance input functions */
 SUNDIALS_EXPORT int ARKStepResStolerance(void *arkode_mem,
-                                         realtype rabstol);
+                                         sunrealtype rabstol);
 SUNDIALS_EXPORT int ARKStepResVtolerance(void *arkode_mem,
                                          N_Vector rabstol);
 SUNDIALS_EXPORT int ARKStepResFtolerance(void *arkode_mem,
@@ -108,7 +108,7 @@ SUNDIALS_EXPORT int ARKStepSetLinearSolver(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepSetMassLinearSolver(void *arkode_mem,
                                                SUNLinearSolver LS,
                                                SUNMatrix M,
-                                               booleantype time_dep);
+                                               sunbooleantype time_dep);
 
 /* Rootfinding initialization */
 SUNDIALS_EXPORT int ARKStepRootInit(void *arkode_mem, int nrtfn,
@@ -140,38 +140,38 @@ SUNDIALS_EXPORT int ARKStepSetTableName(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepSetAdaptController(void *arkode_mem, SUNAdaptController C);
 SUNDIALS_EXPORT int ARKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust);
 SUNDIALS_EXPORT int ARKStepSetCFLFraction(void *arkode_mem,
-                                          realtype cfl_frac);
+                                          sunrealtype cfl_frac);
 SUNDIALS_EXPORT int ARKStepSetSafetyFactor(void *arkode_mem,
-                                           realtype safety);
+                                           sunrealtype safety);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
-int ARKStepSetErrorBias(void *arkode_mem, realtype bias);
+int ARKStepSetErrorBias(void *arkode_mem, sunrealtype bias);
 SUNDIALS_EXPORT int ARKStepSetMaxGrowth(void *arkode_mem,
-                                        realtype mx_growth);
+                                        sunrealtype mx_growth);
 SUNDIALS_EXPORT int ARKStepSetMinReduction(void *arkode_mem,
-                                           realtype eta_min);
+                                           sunrealtype eta_min);
 SUNDIALS_EXPORT int ARKStepSetFixedStepBounds(void *arkode_mem,
-                                              realtype lb, realtype ub);
+                                              sunrealtype lb, sunrealtype ub);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
 int ARKStepSetAdaptivityMethod(void *arkode_mem, int imethod,
                                int idefault, int pq,
-                               realtype adapt_params[3]);
+                               sunrealtype adapt_params[3]);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
 int ARKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun,
                            void *h_data);
 SUNDIALS_EXPORT int ARKStepSetMaxFirstGrowth(void *arkode_mem,
-                                             realtype etamx1);
+                                             sunrealtype etamx1);
 SUNDIALS_EXPORT int ARKStepSetMaxEFailGrowth(void *arkode_mem,
-                                             realtype etamxf);
+                                             sunrealtype etamxf);
 SUNDIALS_EXPORT int ARKStepSetSmallNumEFails(void *arkode_mem,
                                              int small_nef);
 SUNDIALS_EXPORT int ARKStepSetMaxCFailGrowth(void *arkode_mem,
-                                             realtype etacf);
+                                             sunrealtype etacf);
 SUNDIALS_EXPORT int ARKStepSetNonlinCRDown(void *arkode_mem,
-                                           realtype crdown);
+                                           sunrealtype crdown);
 SUNDIALS_EXPORT int ARKStepSetNonlinRDiv(void *arkode_mem,
-                                         realtype rdiv);
+                                         sunrealtype rdiv);
 SUNDIALS_EXPORT int ARKStepSetDeltaGammaMax(void *arkode_mem,
-                                            realtype dgmax);
+                                            sunrealtype dgmax);
 SUNDIALS_EXPORT int ARKStepSetLSetupFrequency(void *arkode_mem,
                                               int msbp);
 SUNDIALS_EXPORT int ARKStepSetPredictorMethod(void *arkode_mem,
@@ -186,7 +186,7 @@ SUNDIALS_EXPORT int ARKStepSetMaxNonlinIters(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepSetMaxConvFails(void *arkode_mem,
                                            int maxncf);
 SUNDIALS_EXPORT int ARKStepSetNonlinConvCoef(void *arkode_mem,
-                                             realtype nlscoef);
+                                             sunrealtype nlscoef);
 SUNDIALS_EXPORT int ARKStepSetConstraints(void *arkode_mem,
                                           N_Vector constraints);
 SUNDIALS_EXPORT int ARKStepSetMaxNumSteps(void *arkode_mem,
@@ -194,18 +194,18 @@ SUNDIALS_EXPORT int ARKStepSetMaxNumSteps(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepSetMaxHnilWarns(void *arkode_mem,
                                            int mxhnil);
 SUNDIALS_EXPORT int ARKStepSetInitStep(void *arkode_mem,
-                                       realtype hin);
+                                       sunrealtype hin);
 SUNDIALS_EXPORT int ARKStepSetMinStep(void *arkode_mem,
-                                      realtype hmin);
+                                      sunrealtype hmin);
 SUNDIALS_EXPORT int ARKStepSetMaxStep(void *arkode_mem,
-                                      realtype hmax);
+                                      sunrealtype hmax);
 SUNDIALS_EXPORT int ARKStepSetInterpolateStopTime(void *arkode_mem,
-                                                  booleantype interp);
+                                                  sunbooleantype interp);
 SUNDIALS_EXPORT int ARKStepSetStopTime(void *arkode_mem,
-                                       realtype tstop);
+                                       sunrealtype tstop);
 SUNDIALS_EXPORT int ARKStepClearStopTime(void *arkode_mem);
 SUNDIALS_EXPORT int ARKStepSetFixedStep(void *arkode_mem,
-                                        realtype hfixed);
+                                        sunrealtype hfixed);
 SUNDIALS_EXPORT int ARKStepSetMaxNumConstrFails(void *arkode_mem,
                                                 int maxfails);
 
@@ -235,13 +235,13 @@ SUNDIALS_EXPORT int ARKStepSetMassFn(void *arkode_mem, ARKLsMassFn mass);
 SUNDIALS_EXPORT int ARKStepSetJacEvalFrequency(void *arkode_mem,
                                                long int msbj);
 SUNDIALS_EXPORT int ARKStepSetLinearSolutionScaling(void *arkode_mem,
-                                                    booleantype onoff);
-SUNDIALS_EXPORT int ARKStepSetEpsLin(void *arkode_mem, realtype eplifac);
-SUNDIALS_EXPORT int ARKStepSetMassEpsLin(void *arkode_mem, realtype eplifac);
+                                                    sunbooleantype onoff);
+SUNDIALS_EXPORT int ARKStepSetEpsLin(void *arkode_mem, sunrealtype eplifac);
+SUNDIALS_EXPORT int ARKStepSetMassEpsLin(void *arkode_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int ARKStepSetLSNormFactor(void *arkode_mem,
-                                           realtype nrmfac);
+                                           sunrealtype nrmfac);
 SUNDIALS_EXPORT int ARKStepSetMassLSNormFactor(void *arkode_mem,
-                                               realtype nrmfac);
+                                               sunrealtype nrmfac);
 SUNDIALS_EXPORT int ARKStepSetPreconditioner(void *arkode_mem,
                                              ARKLsPrecSetupFn psetup,
                                              ARKLsPrecSolveFn psolve);
@@ -260,12 +260,12 @@ SUNDIALS_EXPORT int ARKStepSetMassTimes(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepSetLinSysFn(void *arkode_mem, ARKLsLinSysFn linsys);
 
 /* Integrate the ODE over an interval in t */
-SUNDIALS_EXPORT int ARKStepEvolve(void *arkode_mem, realtype tout,
-                                  N_Vector yout, realtype *tret,
+SUNDIALS_EXPORT int ARKStepEvolve(void *arkode_mem, sunrealtype tout,
+                                  N_Vector yout, sunrealtype *tret,
                                   int itask);
 
 /* Computes the kth derivative of the y function at time t */
-SUNDIALS_EXPORT int ARKStepGetDky(void *arkode_mem, realtype t,
+SUNDIALS_EXPORT int ARKStepGetDky(void *arkode_mem, sunrealtype t,
                                   int k, N_Vector dky);
 
 /* Utility function to update/compute y based on zcor */
@@ -297,21 +297,21 @@ SUNDIALS_EXPORT int ARKStepGetWorkSpace(void *arkode_mem,
 SUNDIALS_EXPORT int ARKStepGetNumSteps(void *arkode_mem,
                                        long int *nsteps);
 SUNDIALS_EXPORT int ARKStepGetActualInitStep(void *arkode_mem,
-                                             realtype *hinused);
+                                             sunrealtype *hinused);
 SUNDIALS_EXPORT int ARKStepGetLastStep(void *arkode_mem,
-                                       realtype *hlast);
+                                       sunrealtype *hlast);
 SUNDIALS_EXPORT int ARKStepGetCurrentStep(void *arkode_mem,
-                                          realtype *hcur);
+                                          sunrealtype *hcur);
 SUNDIALS_EXPORT int ARKStepGetCurrentTime(void *arkode_mem,
-                                          realtype *tcur);
+                                          sunrealtype *tcur);
 SUNDIALS_EXPORT int ARKStepGetCurrentState(void *arkode_mem,
                                            N_Vector *state);
 SUNDIALS_EXPORT int ARKStepGetCurrentGamma(void *arkode_mem,
-                                           realtype *gamma);
+                                           sunrealtype *gamma);
 SUNDIALS_EXPORT int ARKStepGetCurrentMassMatrix(void *arkode_mem,
                                                 SUNMatrix *M);
 SUNDIALS_EXPORT int ARKStepGetTolScaleFactor(void *arkode_mem,
-                                             realtype *tolsfac);
+                                             sunrealtype *tolsfac);
 SUNDIALS_EXPORT int ARKStepGetErrWeights(void *arkode_mem,
                                          N_Vector eweight);
 SUNDIALS_EXPORT int ARKStepGetResWeights(void *arkode_mem,
@@ -344,18 +344,18 @@ SUNDIALS_EXPORT int ARKStepGetTimestepperStats(void *arkode_mem,
                                                long int *netfails);
 SUNDIALS_EXPORT int ARKStepGetStepStats(void *arkode_mem,
                                         long int *nsteps,
-                                        realtype *hinused,
-                                        realtype *hlast,
-                                        realtype *hcur,
-                                        realtype *tcur);
+                                        sunrealtype *hinused,
+                                        sunrealtype *hlast,
+                                        sunrealtype *hcur,
+                                        sunrealtype *tcur);
 
 /* Nonlinear solver optional output functions */
 SUNDIALS_EXPORT int ARKStepGetNonlinearSystemData(void *arkode_mem,
-                                                  realtype *tcur,
+                                                  sunrealtype *tcur,
                                                   N_Vector *zpred,
                                                   N_Vector *z,
                                                   N_Vector *Fi,
-                                                  realtype *gamma,
+                                                  sunrealtype *gamma,
                                                   N_Vector *sdata,
                                                   void     **user_data);
 
diff --git a/include/arkode/arkode_bbdpre.h b/include/arkode/arkode_bbdpre.h
index 6fb216b40c..3796def78c 100644
--- a/include/arkode/arkode_bbdpre.h
+++ b/include/arkode/arkode_bbdpre.h
@@ -28,10 +28,10 @@ extern "C" {
 
 /* User-supplied function Types */
 
-typedef int (*ARKLocalFn)(sunindextype Nlocal, realtype t,
+typedef int (*ARKLocalFn)(sunindextype Nlocal, sunrealtype t,
                           N_Vector y, N_Vector g, void *user_data);
 
-typedef int (*ARKCommFn)(sunindextype Nlocal, realtype t,
+typedef int (*ARKCommFn)(sunindextype Nlocal, sunrealtype t,
                          N_Vector y, void *user_data);
 
 /* Exported Functions */
@@ -42,14 +42,14 @@ SUNDIALS_EXPORT int ARKBBDPrecInit(void *arkode_mem,
                                    sunindextype mldq,
                                    sunindextype mukeep,
                                    sunindextype mlkeep,
-                                   realtype dqrely,
+                                   sunrealtype dqrely,
                                    ARKLocalFn gloc,
                                    ARKCommFn cfn);
 
 SUNDIALS_EXPORT int ARKBBDPrecReInit(void *arkode_mem,
                                      sunindextype mudq,
                                      sunindextype mldq,
-                                     realtype dqrely);
+                                     sunrealtype dqrely);
 
 /* Optional output functions */
 
diff --git a/include/arkode/arkode_butcher.h b/include/arkode/arkode_butcher.h
index 6f3f5ae8ba..e5e0aa8eac 100644
--- a/include/arkode/arkode_butcher.h
+++ b/include/arkode/arkode_butcher.h
@@ -33,10 +33,10 @@ struct ARKodeButcherTableMem {
   int q;           /* method order of accuracy       */
   int p;           /* embedding order of accuracy    */
   int stages;      /* number of stages               */
-  realtype **A;    /* Butcher table coefficients     */
-  realtype *c;     /* canopy node coefficients       */
-  realtype *b;     /* root node coefficients         */
-  realtype *d;     /* embedding coefficients         */
+  sunrealtype **A;    /* Butcher table coefficients     */
+  sunrealtype *c;     /* canopy node coefficients       */
+  sunrealtype *b;     /* root node coefficients         */
+  sunrealtype *d;     /* embedding coefficients         */
 
 };
 
@@ -46,13 +46,13 @@ typedef _SUNDIALS_STRUCT_ ARKodeButcherTableMem *ARKodeButcherTable;
 
 /* Utility routines to allocate/free/output Butcher table structures */
 SUNDIALS_EXPORT ARKodeButcherTable ARKodeButcherTable_Alloc(int stages,
-                                                            booleantype embedded);
+                                                            sunbooleantype embedded);
 SUNDIALS_EXPORT ARKodeButcherTable ARKodeButcherTable_Create(int s, int q,
                                                              int p,
-                                                             realtype *c,
-                                                             realtype *A,
-                                                             realtype *b,
-                                                             realtype *d);
+                                                             sunrealtype *c,
+                                                             sunrealtype *A,
+                                                             sunrealtype *b,
+                                                             sunrealtype *d);
 SUNDIALS_EXPORT ARKodeButcherTable ARKodeButcherTable_Copy(ARKodeButcherTable B);
 SUNDIALS_EXPORT void ARKodeButcherTable_Space(ARKodeButcherTable B,
                                               sunindextype *liw,
diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h
index b0fc8636dd..3bb3c573d4 100644
--- a/include/arkode/arkode_erkstep.h
+++ b/include/arkode/arkode_erkstep.h
@@ -47,26 +47,26 @@ static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
  * ------------------- */
 
 /* Create, Resize, and Reinitialization functions */
-SUNDIALS_EXPORT void* ERKStepCreate(ARKRhsFn f, realtype t0,
+SUNDIALS_EXPORT void* ERKStepCreate(ARKRhsFn f, sunrealtype t0,
                                     N_Vector y0, SUNContext sunctx);
 
 SUNDIALS_EXPORT int ERKStepResize(void *arkode_mem, N_Vector ynew,
-                                  realtype hscale, realtype t0,
+                                  sunrealtype hscale, sunrealtype t0,
                                   ARKVecResizeFn resize,
                                   void *resize_data);
 
 SUNDIALS_EXPORT int ERKStepReInit(void* arkode_mem, ARKRhsFn f,
-                                  realtype t0, N_Vector y0);
+                                  sunrealtype t0, N_Vector y0);
 
-SUNDIALS_EXPORT int ERKStepReset(void* arkode_mem, realtype tR,
+SUNDIALS_EXPORT int ERKStepReset(void* arkode_mem, sunrealtype tR,
                                  N_Vector yR);
 
 /* Tolerance input functions */
 SUNDIALS_EXPORT int ERKStepSStolerances(void *arkode_mem,
-                                        realtype reltol,
-                                        realtype abstol);
+                                        sunrealtype reltol,
+                                        sunrealtype abstol);
 SUNDIALS_EXPORT int ERKStepSVtolerances(void *arkode_mem,
-                                        realtype reltol,
+                                        sunrealtype reltol,
                                         N_Vector abstol);
 SUNDIALS_EXPORT int ERKStepWFtolerances(void *arkode_mem,
                                         ARKEwtFn efun);
@@ -88,28 +88,28 @@ SUNDIALS_EXPORT int ERKStepSetTableName(void *arkode_mem, const char *etable);
 SUNDIALS_EXPORT int ERKStepSetAdaptController(void *arkode_mem, SUNAdaptController C);
 SUNDIALS_EXPORT int ERKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust);
 SUNDIALS_EXPORT int ERKStepSetCFLFraction(void *arkode_mem,
-                                          realtype cfl_frac);
+                                          sunrealtype cfl_frac);
 SUNDIALS_EXPORT int ERKStepSetSafetyFactor(void *arkode_mem,
-                                           realtype safety);
+                                           sunrealtype safety);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
-int ERKStepSetErrorBias(void *arkode_mem, realtype bias);
+int ERKStepSetErrorBias(void *arkode_mem, sunrealtype bias);
 SUNDIALS_EXPORT int ERKStepSetMaxGrowth(void *arkode_mem,
-                                        realtype mx_growth);
+                                        sunrealtype mx_growth);
 SUNDIALS_EXPORT int ERKStepSetMinReduction(void *arkode_mem,
-                                           realtype eta_min);
+                                           sunrealtype eta_min);
 SUNDIALS_EXPORT int ERKStepSetFixedStepBounds(void *arkode_mem,
-                                              realtype lb, realtype ub);
+                                              sunrealtype lb, sunrealtype ub);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
 int ERKStepSetAdaptivityMethod(void *arkode_mem, int imethod,
                                int idefault, int pq,
-                               realtype adapt_params[3]);
+                               sunrealtype adapt_params[3]);
 SUNDIALS_DEPRECATED_EXPORT_MSG("use SUNAdaptController instead")
 int ERKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun,
                            void *h_data);
 SUNDIALS_EXPORT int ERKStepSetMaxFirstGrowth(void *arkode_mem,
-                                             realtype etamx1);
+                                             sunrealtype etamx1);
 SUNDIALS_EXPORT int ERKStepSetMaxEFailGrowth(void *arkode_mem,
-                                             realtype etamxf);
+                                             sunrealtype etamxf);
 SUNDIALS_EXPORT int ERKStepSetSmallNumEFails(void *arkode_mem,
                                              int small_nef);
 SUNDIALS_EXPORT int ERKStepSetStabilityFn(void *arkode_mem,
@@ -124,18 +124,18 @@ SUNDIALS_EXPORT int ERKStepSetMaxNumSteps(void *arkode_mem,
 SUNDIALS_EXPORT int ERKStepSetMaxHnilWarns(void *arkode_mem,
                                            int mxhnil);
 SUNDIALS_EXPORT int ERKStepSetInitStep(void *arkode_mem,
-                                       realtype hin);
+                                       sunrealtype hin);
 SUNDIALS_EXPORT int ERKStepSetMinStep(void *arkode_mem,
-                                      realtype hmin);
+                                      sunrealtype hmin);
 SUNDIALS_EXPORT int ERKStepSetMaxStep(void *arkode_mem,
-                                      realtype hmax);
+                                      sunrealtype hmax);
 SUNDIALS_EXPORT int ERKStepSetInterpolateStopTime(void *arkode_mem,
-                                                  booleantype interp);
+                                                  sunbooleantype interp);
 SUNDIALS_EXPORT int ERKStepSetStopTime(void *arkode_mem,
-                                       realtype tstop);
+                                       sunrealtype tstop);
 SUNDIALS_EXPORT int ERKStepClearStopTime(void *arkode_mem);
 SUNDIALS_EXPORT int ERKStepSetFixedStep(void *arkode_mem,
-                                        realtype hfixed);
+                                        sunrealtype hfixed);
 SUNDIALS_EXPORT int ERKStepSetMaxNumConstrFails(void *arkode_mem,
                                                 int maxfails);
 
@@ -158,12 +158,12 @@ SUNDIALS_EXPORT int ERKStepSetPostprocessStageFn(void *arkode_mem,
 
 
 /* Integrate the ODE over an interval in t */
-SUNDIALS_EXPORT int ERKStepEvolve(void *arkode_mem, realtype tout,
-                                  N_Vector yout, realtype *tret,
+SUNDIALS_EXPORT int ERKStepEvolve(void *arkode_mem, sunrealtype tout,
+                                  N_Vector yout, sunrealtype *tret,
                                   int itask);
 
 /* Computes the kth derivative of the y function at time t */
-SUNDIALS_EXPORT int ERKStepGetDky(void *arkode_mem, realtype t,
+SUNDIALS_EXPORT int ERKStepGetDky(void *arkode_mem, sunrealtype t,
                                   int k, N_Vector dky);
 
 /* Optional output functions */
@@ -187,15 +187,15 @@ SUNDIALS_EXPORT int ERKStepGetWorkSpace(void *arkode_mem,
 SUNDIALS_EXPORT int ERKStepGetNumSteps(void *arkode_mem,
                                        long int *nsteps);
 SUNDIALS_EXPORT int ERKStepGetActualInitStep(void *arkode_mem,
-                                             realtype *hinused);
+                                             sunrealtype *hinused);
 SUNDIALS_EXPORT int ERKStepGetLastStep(void *arkode_mem,
-                                       realtype *hlast);
+                                       sunrealtype *hlast);
 SUNDIALS_EXPORT int ERKStepGetCurrentStep(void *arkode_mem,
-                                          realtype *hcur);
+                                          sunrealtype *hcur);
 SUNDIALS_EXPORT int ERKStepGetCurrentTime(void *arkode_mem,
-                                          realtype *tcur);
+                                          sunrealtype *tcur);
 SUNDIALS_EXPORT int ERKStepGetTolScaleFactor(void *arkode_mem,
-                                             realtype *tolsfac);
+                                             sunrealtype *tolsfac);
 SUNDIALS_EXPORT int ERKStepGetErrWeights(void *arkode_mem,
                                          N_Vector eweight);
 SUNDIALS_EXPORT int ERKStepGetNumGEvals(void *arkode_mem,
@@ -224,10 +224,10 @@ SUNDIALS_EXPORT int ERKStepGetTimestepperStats(void *arkode_mem,
                                                long int *netfails);
 SUNDIALS_EXPORT int ERKStepGetStepStats(void *arkode_mem,
                                         long int *nsteps,
-                                        realtype *hinused,
-                                        realtype *hlast,
-                                        realtype *hcur,
-                                        realtype *tcur);
+                                        sunrealtype *hinused,
+                                        sunrealtype *hlast,
+                                        sunrealtype *hcur,
+                                        sunrealtype *tcur);
 
 
 /* Free function */
diff --git a/include/arkode/arkode_ls.h b/include/arkode/arkode_ls.h
index a2be31d23e..aa6142a948 100644
--- a/include/arkode/arkode_ls.h
+++ b/include/arkode/arkode_ls.h
@@ -51,47 +51,47 @@ extern "C" {
   ARKLS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*ARKLsJacFn)(realtype t, N_Vector y, N_Vector fy,
+typedef int (*ARKLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy,
                           SUNMatrix Jac, void *user_data,
                           N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*ARKLsMassFn)(realtype t, SUNMatrix M, void *user_data,
+typedef int (*ARKLsMassFn)(sunrealtype t, SUNMatrix M, void *user_data,
                            N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*ARKLsPrecSetupFn)(realtype t, N_Vector y,
-                                N_Vector fy, booleantype jok,
-                                booleantype *jcurPtr,
-                                realtype gamma, void *user_data);
+typedef int (*ARKLsPrecSetupFn)(sunrealtype t, N_Vector y,
+                                N_Vector fy, sunbooleantype jok,
+                                sunbooleantype *jcurPtr,
+                                sunrealtype gamma, void *user_data);
 
-typedef int (*ARKLsPrecSolveFn)(realtype t, N_Vector y,
+typedef int (*ARKLsPrecSolveFn)(sunrealtype t, N_Vector y,
                                 N_Vector fy, N_Vector r,
-                                N_Vector z, realtype gamma,
-                                realtype delta, int lr,
+                                N_Vector z, sunrealtype gamma,
+                                sunrealtype delta, int lr,
                                 void *user_data);
 
-typedef int (*ARKLsJacTimesSetupFn)(realtype t, N_Vector y,
+typedef int (*ARKLsJacTimesSetupFn)(sunrealtype t, N_Vector y,
                                     N_Vector fy, void *user_data);
 
 typedef int (*ARKLsJacTimesVecFn)(N_Vector v, N_Vector Jv,
-                                  realtype t, N_Vector y,
+                                  sunrealtype t, N_Vector y,
                                   N_Vector fy, void *user_data,
                                   N_Vector tmp);
 
-typedef int (*ARKLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                             SUNMatrix M, booleantype jok, booleantype *jcur,
-                             realtype gamma, void *user_data, N_Vector tmp1,
+typedef int (*ARKLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                             SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur,
+                             sunrealtype gamma, void *user_data, N_Vector tmp1,
                              N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*ARKLsMassTimesSetupFn)(realtype t, void *mtimes_data);
+typedef int (*ARKLsMassTimesSetupFn)(sunrealtype t, void *mtimes_data);
 
 
 typedef int (*ARKLsMassTimesVecFn)(N_Vector v, N_Vector Mv,
-                                   realtype t, void *mtimes_data);
+                                   sunrealtype t, void *mtimes_data);
 
-typedef int (*ARKLsMassPrecSetupFn)(realtype t, void *user_data);
+typedef int (*ARKLsMassPrecSetupFn)(sunrealtype t, void *user_data);
 
-typedef int (*ARKLsMassPrecSolveFn)(realtype t, N_Vector r,
-                                    N_Vector z, realtype delta,
+typedef int (*ARKLsMassPrecSolveFn)(sunrealtype t, N_Vector r,
+                                    N_Vector z, sunrealtype delta,
                                     int lr, void *user_data);
 
 
diff --git a/include/arkode/arkode_mristep.h b/include/arkode/arkode_mristep.h
index fbfb91c349..cb644f88e3 100644
--- a/include/arkode/arkode_mristep.h
+++ b/include/arkode/arkode_mristep.h
@@ -73,14 +73,14 @@ static const int MRISTEP_DEFAULT_IMEX_SD_4 = ARKODE_IMEX_MRI_GARK4;
  * ------------------------------------ */
 
 typedef int (*MRIStepInnerEvolveFn)(MRIStepInnerStepper stepper,
-                                    realtype t0, realtype tout, N_Vector y);
+                                    sunrealtype t0, sunrealtype tout, N_Vector y);
 
 typedef int (*MRIStepInnerFullRhsFn)(MRIStepInnerStepper stepper,
-                                     realtype t, N_Vector y, N_Vector f,
+                                     sunrealtype t, N_Vector y, N_Vector f,
                                      int mode);
 
 typedef int (*MRIStepInnerResetFn)(MRIStepInnerStepper stepper,
-                                   realtype tR, N_Vector yR);
+                                   sunrealtype tR, N_Vector yR);
 
 /*---------------------------------------------------------------
   MRI coupling data structure and associated utility routines
@@ -91,9 +91,9 @@ struct MRIStepCouplingMem
   int stages;      /* size of coupling matrices (stages * stages)       */
   int q;           /* method order of accuracy                          */
   int p;           /* embedding order of accuracy                       */
-  realtype *c;     /* stage abscissae                                   */
-  realtype ***W;   /* explicit coupling matrices [nmat][stages][stages] */
-  realtype ***G;   /* implicit coupling matrices [nmat][stages][stages] */
+  sunrealtype *c;     /* stage abscissae                                   */
+  sunrealtype ***W;   /* explicit coupling matrices [nmat][stages][stages] */
+  sunrealtype ***G;   /* implicit coupling matrices [nmat][stages][stages] */
 };
 
 typedef _SUNDIALS_STRUCT_ MRIStepCouplingMem *MRIStepCoupling;
@@ -111,9 +111,9 @@ SUNDIALS_EXPORT MRIStepCoupling MRIStepCoupling_Create(int nmat,
                                                        int stages,
                                                        int q,
                                                        int p,
-                                                       realtype *W,
-                                                       realtype *G,
-                                                       realtype *c);
+                                                       sunrealtype *W,
+                                                       sunrealtype *G,
+                                                       sunrealtype *c);
 SUNDIALS_EXPORT MRIStepCoupling MRIStepCoupling_MIStoMRI(ARKodeButcherTable B,
                                                          int q, int p);
 SUNDIALS_EXPORT MRIStepCoupling MRIStepCoupling_Copy(MRIStepCoupling MRIC);
@@ -129,35 +129,35 @@ SUNDIALS_EXPORT void MRIStepCoupling_Write(MRIStepCoupling MRIC,
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*MRIStepPreInnerFn)(realtype t, N_Vector *f, int nvecs,
+typedef int (*MRIStepPreInnerFn)(sunrealtype t, N_Vector *f, int nvecs,
                                  void *user_data);
 
-typedef int (*MRIStepPostInnerFn)(realtype t, N_Vector y, void *user_data);
+typedef int (*MRIStepPostInnerFn)(sunrealtype t, N_Vector y, void *user_data);
 
 /* -------------------
  * Exported Functions
  * ------------------- */
 
 /* Create, Resize, and Reinitialization functions */
-SUNDIALS_EXPORT void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, realtype t0,
+SUNDIALS_EXPORT void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0,
                                     N_Vector y0, MRIStepInnerStepper stepper,
                                     SUNContext sunctx);
 
 SUNDIALS_EXPORT int MRIStepResize(void *arkode_mem, N_Vector ynew,
-                                  realtype t0, ARKVecResizeFn resize,
+                                  sunrealtype t0, ARKVecResizeFn resize,
                                   void *resize_data);
 
 SUNDIALS_EXPORT int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi,
-                                  realtype t0, N_Vector y0);
+                                  sunrealtype t0, N_Vector y0);
 
-SUNDIALS_EXPORT int MRIStepReset(void* arkode_mem, realtype tR, N_Vector yR);
+SUNDIALS_EXPORT int MRIStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR);
 
 /* Tolerance input functions */
 SUNDIALS_EXPORT int MRIStepSStolerances(void *arkode_mem,
-                                        realtype reltol,
-                                        realtype abstol);
+                                        sunrealtype reltol,
+                                        sunrealtype abstol);
 SUNDIALS_EXPORT int MRIStepSVtolerances(void *arkode_mem,
-                                        realtype reltol,
+                                        sunrealtype reltol,
                                         N_Vector abstol);
 SUNDIALS_EXPORT int MRIStepWFtolerances(void *arkode_mem,
                                         ARKEwtFn efun);
@@ -187,11 +187,11 @@ SUNDIALS_EXPORT int MRIStepSetCoupling(void *arkode_mem,
 SUNDIALS_EXPORT int MRIStepSetMaxNumSteps(void *arkode_mem,
                                           long int mxsteps);
 SUNDIALS_EXPORT int MRIStepSetNonlinCRDown(void *arkode_mem,
-                                           realtype crdown);
+                                           sunrealtype crdown);
 SUNDIALS_EXPORT int MRIStepSetNonlinRDiv(void *arkode_mem,
-                                         realtype rdiv);
+                                         sunrealtype rdiv);
 SUNDIALS_EXPORT int MRIStepSetDeltaGammaMax(void *arkode_mem,
-                                            realtype dgmax);
+                                            sunrealtype dgmax);
 SUNDIALS_EXPORT int MRIStepSetLSetupFrequency(void *arkode_mem,
                                               int msbp);
 SUNDIALS_EXPORT int MRIStepSetPredictorMethod(void *arkode_mem,
@@ -199,16 +199,16 @@ SUNDIALS_EXPORT int MRIStepSetPredictorMethod(void *arkode_mem,
 SUNDIALS_EXPORT int MRIStepSetMaxNonlinIters(void *arkode_mem,
                                              int maxcor);
 SUNDIALS_EXPORT int MRIStepSetNonlinConvCoef(void *arkode_mem,
-                                             realtype nlscoef);
+                                             sunrealtype nlscoef);
 SUNDIALS_EXPORT int MRIStepSetMaxHnilWarns(void *arkode_mem,
                                            int mxhnil);
 SUNDIALS_EXPORT int MRIStepSetStopTime(void *arkode_mem,
-                                       realtype tstop);
+                                       sunrealtype tstop);
 SUNDIALS_EXPORT int MRIStepSetInterpolateStopTime(void *arkode_mem,
-                                                  booleantype interp);
+                                                  sunbooleantype interp);
 SUNDIALS_EXPORT int MRIStepClearStopTime(void *arkode_mem);
 SUNDIALS_EXPORT int MRIStepSetFixedStep(void *arkode_mem,
-                                        realtype hsfixed);
+                                        sunrealtype hsfixed);
 SUNDIALS_EXPORT int MRIStepSetRootDirection(void *arkode_mem,
                                             int *rootdir);
 SUNDIALS_EXPORT int MRIStepSetNoInactiveRootWarn(void *arkode_mem);
@@ -238,10 +238,10 @@ SUNDIALS_EXPORT int MRIStepSetJacFn(void *arkode_mem, ARKLsJacFn jac);
 SUNDIALS_EXPORT int MRIStepSetJacEvalFrequency(void *arkode_mem,
                                                long int msbj);
 SUNDIALS_EXPORT int MRIStepSetLinearSolutionScaling(void *arkode_mem,
-                                                    booleantype onoff);
-SUNDIALS_EXPORT int MRIStepSetEpsLin(void *arkode_mem, realtype eplifac);
+                                                    sunbooleantype onoff);
+SUNDIALS_EXPORT int MRIStepSetEpsLin(void *arkode_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int MRIStepSetLSNormFactor(void *arkode_mem,
-                                           realtype nrmfac);
+                                           sunrealtype nrmfac);
 SUNDIALS_EXPORT int MRIStepSetPreconditioner(void *arkode_mem,
                                              ARKLsPrecSetupFn psetup,
                                              ARKLsPrecSolveFn psolve);
@@ -253,12 +253,12 @@ SUNDIALS_EXPORT int MRIStepSetJacTimesRhsFn(void *arkode_mem,
 SUNDIALS_EXPORT int MRIStepSetLinSysFn(void *arkode_mem, ARKLsLinSysFn linsys);
 
 /* Integrate the ODE over an interval in t */
-SUNDIALS_EXPORT int MRIStepEvolve(void *arkode_mem, realtype tout,
-                                  N_Vector yout, realtype *tret,
+SUNDIALS_EXPORT int MRIStepEvolve(void *arkode_mem, sunrealtype tout,
+                                  N_Vector yout, sunrealtype *tret,
                                   int itask);
 
 /* Computes the kth derivative of the y function at time t */
-SUNDIALS_EXPORT int MRIStepGetDky(void *arkode_mem, realtype t,
+SUNDIALS_EXPORT int MRIStepGetDky(void *arkode_mem, sunrealtype t,
                                   int k, N_Vector dky);
 
 /* Utility function to update/compute y based on zcor */
@@ -279,15 +279,15 @@ SUNDIALS_EXPORT int MRIStepGetWorkSpace(void *arkode_mem,
 SUNDIALS_EXPORT int MRIStepGetNumSteps(void *arkode_mem,
                                        long int *nssteps);
 SUNDIALS_EXPORT int MRIStepGetLastStep(void *arkode_mem,
-                                       realtype *hlast);
+                                       sunrealtype *hlast);
 SUNDIALS_EXPORT int MRIStepGetCurrentTime(void *arkode_mem,
-                                          realtype *tcur);
+                                          sunrealtype *tcur);
 SUNDIALS_EXPORT int MRIStepGetCurrentState(void *arkode_mem,
                                            N_Vector *state);
 SUNDIALS_EXPORT int MRIStepGetCurrentGamma(void *arkode_mem,
-                                           realtype *gamma);
+                                           sunrealtype *gamma);
 SUNDIALS_EXPORT int MRIStepGetTolScaleFactor(void *arkode_mem,
-                                             realtype *tolsfac);
+                                             sunrealtype *tolsfac);
 SUNDIALS_EXPORT int MRIStepGetErrWeights(void *arkode_mem,
                                          N_Vector eweight);
 SUNDIALS_EXPORT int MRIStepGetNumGEvals(void *arkode_mem,
@@ -308,11 +308,11 @@ SUNDIALS_EXPORT int MRIStepWriteCoupling(void *arkode_mem, FILE *fp);
 
 /* Nonlinear solver optional output functions */
 SUNDIALS_EXPORT int MRIStepGetNonlinearSystemData(void *arkode_mem,
-                                                  realtype *tcur,
+                                                  sunrealtype *tcur,
                                                   N_Vector *zpred,
                                                   N_Vector *z,
                                                   N_Vector *F,
-                                                  realtype *gamma,
+                                                  sunrealtype *gamma,
                                                   N_Vector *sdata,
                                                   void     **user_data);
 SUNDIALS_EXPORT int MRIStepGetNumNonlinSolvIters(void *arkode_mem,
@@ -382,11 +382,11 @@ SUNDIALS_EXPORT int MRIStepInnerStepper_SetResetFn(MRIStepInnerStepper stepper,
                                                    MRIStepInnerResetFn fn);
 
 SUNDIALS_EXPORT int MRIStepInnerStepper_AddForcing(MRIStepInnerStepper stepper,
-                                                   realtype t, N_Vector f);
+                                                   sunrealtype t, N_Vector f);
 
 SUNDIALS_EXPORT int MRIStepInnerStepper_GetForcingData(MRIStepInnerStepper stepper,
-                                                       realtype *tshift,
-                                                       realtype *tscale,
+                                                       sunrealtype *tshift,
+                                                       sunrealtype *tscale,
                                                        N_Vector **forcing,
                                                        int *nforcing);
 
diff --git a/include/arkode/arkode_sprkstep.h b/include/arkode/arkode_sprkstep.h
index 566f444d49..186988d953 100644
--- a/include/arkode/arkode_sprkstep.h
+++ b/include/arkode/arkode_sprkstep.h
@@ -43,13 +43,13 @@ static const int SPRKSTEP_DEFAULT_10 = ARKODE_SPRK_SOFRONIOU_10_36;
  * ------------------- */
 
 /* Create, Resize, and Reinitialization functions */
-SUNDIALS_EXPORT void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0,
+SUNDIALS_EXPORT void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, sunrealtype t0,
                                      N_Vector y0, SUNContext sunctx);
 
 SUNDIALS_EXPORT int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2,
-                                   realtype t0, N_Vector y0);
+                                   sunrealtype t0, N_Vector y0);
 
-SUNDIALS_EXPORT int SPRKStepReset(void* arkode_mem, realtype tR, N_Vector yR);
+SUNDIALS_EXPORT int SPRKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR);
 
 /* Rootfinding functions */
 
@@ -67,8 +67,8 @@ SUNDIALS_EXPORT int SPRKStepSetOrder(void* arkode_mem, int maxord);
 SUNDIALS_EXPORT int SPRKStepSetInterpolantType(void* arkode_mem, int itype);
 SUNDIALS_EXPORT int SPRKStepSetInterpolantDegree(void* arkode_mem, int degree);
 SUNDIALS_EXPORT int SPRKStepSetMaxNumSteps(void* arkode_mem, long int mxsteps);
-SUNDIALS_EXPORT int SPRKStepSetStopTime(void* arkode_mem, realtype tstop);
-SUNDIALS_EXPORT int SPRKStepSetFixedStep(void* arkode_mem, realtype hfixed);
+SUNDIALS_EXPORT int SPRKStepSetStopTime(void* arkode_mem, sunrealtype tstop);
+SUNDIALS_EXPORT int SPRKStepSetFixedStep(void* arkode_mem, sunrealtype hfixed);
 SUNDIALS_EXPORT int SPRKStepSetErrHandlerFn(void* arkode_mem,
                                             ARKErrHandlerFn ehfun, void* eh_data);
 SUNDIALS_EXPORT int SPRKStepSetErrFile(void* arkode_mem, FILE* errfp);
@@ -80,11 +80,11 @@ SUNDIALS_EXPORT int SPRKStepSetPostprocessStageFn(void* arkode_mem,
                                                   ARKPostProcessFn ProcessStage);
 
 /* Integrate the ODE over an interval in t */
-SUNDIALS_EXPORT int SPRKStepEvolve(void* arkode_mem, realtype tout,
-                                   N_Vector yout, realtype* tret, int itask);
+SUNDIALS_EXPORT int SPRKStepEvolve(void* arkode_mem, sunrealtype tout,
+                                   N_Vector yout, sunrealtype* tret, int itask);
 
 /* Computes the kth derivative of the y function at time t */
-SUNDIALS_EXPORT int SPRKStepGetDky(void* arkode_mem, realtype t, int k,
+SUNDIALS_EXPORT int SPRKStepGetDky(void* arkode_mem, sunrealtype t, int k,
                                    N_Vector dky);
 
 /* Optional output functions */
@@ -92,9 +92,9 @@ SUNDIALS_EXPORT char* SPRKStepGetReturnFlagName(long int flag);
 SUNDIALS_EXPORT int SPRKStepGetCurrentMethod(void* arkode_mem,
                                              ARKodeSPRKTable* sprk_storage);
 SUNDIALS_EXPORT int SPRKStepGetCurrentState(void* arkode_mem, N_Vector* state);
-SUNDIALS_EXPORT int SPRKStepGetCurrentStep(void* arkode_mem, realtype* hcur);
-SUNDIALS_EXPORT int SPRKStepGetCurrentTime(void* arkode_mem, realtype* tcur);
-SUNDIALS_EXPORT int SPRKStepGetLastStep(void* arkode_mem, realtype* hlast);
+SUNDIALS_EXPORT int SPRKStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur);
+SUNDIALS_EXPORT int SPRKStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur);
+SUNDIALS_EXPORT int SPRKStepGetLastStep(void* arkode_mem, sunrealtype* hlast);
 SUNDIALS_EXPORT int SPRKStepGetNumRhsEvals(void* arkode_mem, long int* nf1,
                                            long int* nf2);
 SUNDIALS_EXPORT int SPRKStepGetNumStepAttempts(void* arkode_mem,
@@ -108,8 +108,8 @@ SUNDIALS_EXPORT int SPRKStepWriteParameters(void* arkode_mem, FILE* fp);
 
 /* Grouped optional output functions */
 SUNDIALS_EXPORT int SPRKStepGetStepStats(void* arkode_mem, long int* nsteps,
-                                         realtype* hinused, realtype* hlast,
-                                         realtype* hcur, realtype* tcur);
+                                         sunrealtype* hinused, sunrealtype* hlast,
+                                         sunrealtype* hcur, sunrealtype* tcur);
 
 /* Free function */
 SUNDIALS_EXPORT void SPRKStepFree(void** arkode_mem);
diff --git a/include/arkode/arkode_xbraid.h b/include/arkode/arkode_xbraid.h
index db83a4a944..0527da32f3 100644
--- a/include/arkode/arkode_xbraid.h
+++ b/include/arkode/arkode_xbraid.h
@@ -34,7 +34,7 @@ extern "C" {
 SUNDIALS_EXPORT int ARKBraid_Create(void *arkode_mem, braid_App *app);
 
 SUNDIALS_EXPORT int ARKBraid_BraidInit(MPI_Comm comm_w, MPI_Comm comm_t,
-                                       realtype tstart, realtype tstop,
+                                       sunrealtype tstart, sunrealtype tstop,
                                        sunindextype nt, braid_App app,
                                        braid_Core *core);
 
@@ -72,7 +72,7 @@ SUNDIALS_EXPORT int ARKBraid_GetLastBraidFlag(braid_App app, int *last_flag);
 
 SUNDIALS_EXPORT int ARKBraid_GetLastARKStepFlag(braid_App app, int *last_flag);
 
-SUNDIALS_EXPORT int ARKBraid_GetSolution(braid_App app, realtype *tout,
+SUNDIALS_EXPORT int ARKBraid_GetSolution(braid_App app, sunrealtype *tout,
                                          N_Vector yout);
 
 
@@ -85,7 +85,7 @@ SUNDIALS_EXPORT int ARKBraid_Step(braid_App app, braid_Vector ustop,
                                   braid_Vector fstop, braid_Vector u,
                                   braid_StepStatus status);
 
-SUNDIALS_EXPORT int ARKBraid_Init(braid_App app, realtype t,
+SUNDIALS_EXPORT int ARKBraid_Init(braid_App app, sunrealtype t,
                                   braid_Vector *u_ptr);
 
 SUNDIALS_EXPORT int ARKBraid_Access(braid_App app, braid_Vector u,
@@ -97,8 +97,8 @@ SUNDIALS_EXPORT int ARKBraid_Access(braid_App app, braid_Vector u,
  * ----------------- */
 
 
-SUNDIALS_EXPORT int ARKBraid_TakeStep(void *arkode_mem, realtype tstart,
-                                      realtype tstop, N_Vector y,
+SUNDIALS_EXPORT int ARKBraid_TakeStep(void *arkode_mem, sunrealtype tstart,
+                                      sunrealtype tstop, N_Vector y,
                                       int *ark_flag);
 
 
diff --git a/include/cvode/cvode.h b/include/cvode/cvode.h
index 35647f983e..f68544dc48 100644
--- a/include/cvode/cvode.h
+++ b/include/cvode/cvode.h
@@ -91,10 +91,10 @@ extern "C" {
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*CVRhsFn)(realtype t, N_Vector y,
+typedef int (*CVRhsFn)(sunrealtype t, N_Vector y,
                        N_Vector ydot, void *user_data);
 
-typedef int (*CVRootFn)(realtype t, N_Vector y, realtype *gout,
+typedef int (*CVRootFn)(sunrealtype t, N_Vector y, sunrealtype *gout,
                         void *user_data);
 
 typedef int (*CVEwtFn)(N_Vector y, N_Vector ewt, void *user_data);
@@ -112,14 +112,14 @@ typedef int (*CVMonitorFn)(void *cvode_mem, void *user_data);
 /* Initialization functions */
 SUNDIALS_EXPORT void *CVodeCreate(int lmm, SUNContext sunctx);
 
-SUNDIALS_EXPORT int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0,
+SUNDIALS_EXPORT int CVodeInit(void *cvode_mem, CVRhsFn f, sunrealtype t0,
                               N_Vector y0);
-SUNDIALS_EXPORT int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0);
+SUNDIALS_EXPORT int CVodeReInit(void *cvode_mem, sunrealtype t0, N_Vector y0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int CVodeSStolerances(void *cvode_mem, realtype reltol,
-                                      realtype abstol);
-SUNDIALS_EXPORT int CVodeSVtolerances(void *cvode_mem, realtype reltol,
+SUNDIALS_EXPORT int CVodeSStolerances(void *cvode_mem, sunrealtype reltol,
+                                      sunrealtype abstol);
+SUNDIALS_EXPORT int CVodeSVtolerances(void *cvode_mem, sunrealtype reltol,
                                       N_Vector abstol);
 SUNDIALS_EXPORT int CVodeWFtolerances(void *cvode_mem, CVEwtFn efun);
 
@@ -127,10 +127,10 @@ SUNDIALS_EXPORT int CVodeWFtolerances(void *cvode_mem, CVEwtFn efun);
 
 SUNDIALS_EXPORT int CVodeSetConstraints(void *cvode_mem, N_Vector constraints);
 SUNDIALS_EXPORT int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem,
-                                                realtype dgmax_lsetup);
+                                                sunrealtype dgmax_lsetup);
 SUNDIALS_EXPORT int CVodeSetErrFile(void *cvode_mem, FILE *errfp);
 SUNDIALS_EXPORT int CVodeSetErrHandlerFn(void *cvode_mem, CVErrHandlerFn ehfun, void *eh_data);
-SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, realtype hin);
+SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, sunrealtype hin);
 SUNDIALS_EXPORT int CVodeSetLSetupFrequency(void *cvode_mem, long int msbp);
 SUNDIALS_EXPORT int CVodeSetMaxConvFails(void *cvode_mem, int maxncf);
 SUNDIALS_EXPORT int CVodeSetMaxErrTestFails(void *cvode_mem, int maxnef);
@@ -138,42 +138,42 @@ SUNDIALS_EXPORT int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil);
 SUNDIALS_EXPORT int CVodeSetMaxNonlinIters(void *cvode_mem, int maxcor);
 SUNDIALS_EXPORT int CVodeSetMaxNumSteps(void *cvode_mem, long int mxsteps);
 SUNDIALS_EXPORT int CVodeSetMaxOrd(void *cvode_mem, int maxord);
-SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, realtype hmax);
-SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, realtype hmin);
+SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax);
+SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin);
 SUNDIALS_EXPORT int CVodeSetMonitorFn(void *cvode_mem, CVMonitorFn fn);
 SUNDIALS_EXPORT int CVodeSetMonitorFrequency(void *cvode_mem, long int nst);
 SUNDIALS_EXPORT int CVodeSetNlsRhsFn(void *cvode_mem, CVRhsFn f);
-SUNDIALS_EXPORT int CVodeSetNonlinConvCoef(void *cvode_mem, realtype nlscoef);
+SUNDIALS_EXPORT int CVodeSetNonlinConvCoef(void *cvode_mem, sunrealtype nlscoef);
 SUNDIALS_EXPORT int CVodeSetNonlinearSolver(void *cvode_mem, SUNNonlinearSolver NLS);
-SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, booleantype stldet);
-SUNDIALS_EXPORT int CVodeSetStopTime(void *cvode_mem, realtype tstop);
-SUNDIALS_EXPORT int CVodeSetInterpolateStopTime(void *cvode_mem, booleantype interp);
+SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype stldet);
+SUNDIALS_EXPORT int CVodeSetStopTime(void *cvode_mem, sunrealtype tstop);
+SUNDIALS_EXPORT int CVodeSetInterpolateStopTime(void *cvode_mem, sunbooleantype interp);
 SUNDIALS_EXPORT int CVodeClearStopTime(void *cvode_mem);
-SUNDIALS_EXPORT int CVodeSetUseIntegratorFusedKernels(void *cvode_mem, booleantype onoff);
+SUNDIALS_EXPORT int CVodeSetUseIntegratorFusedKernels(void *cvode_mem, sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetUserData(void *cvode_mem, void *user_data);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
-int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
-                               realtype eta_max_fx);
+int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx,
+                               sunrealtype eta_max_fx);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs);
+int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es);
+int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es);
 SUNDIALS_EXPORT
 int CVodeSetNumStepsEtaMaxEarlyStep(void* cvode_mem, long int small_nst);
 SUNDIALS_EXPORT
-int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs);
+int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs);
 SUNDIALS_EXPORT
-int CVodeSetEtaMin(void* cvode_mem, realtype eta_min);
+int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min);
 SUNDIALS_EXPORT
-int CVodeSetEtaMinErrFail(void *cvode_mem, realtype eta_min_ef);
+int CVodeSetEtaMinErrFail(void *cvode_mem, sunrealtype eta_min_ef);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef);
+int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef);
 SUNDIALS_EXPORT
 int CVodeSetNumFailsEtaMaxErrFail(void *cvode_mem, int small_nef);
 SUNDIALS_EXPORT
-int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf);
+int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf);
 
 /* Rootfinding initialization function */
 SUNDIALS_EXPORT int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g);
@@ -183,14 +183,14 @@ SUNDIALS_EXPORT int CVodeSetRootDirection(void *cvode_mem, int *rootdir);
 SUNDIALS_EXPORT int CVodeSetNoInactiveRootWarn(void *cvode_mem);
 
 /* Solver function */
-SUNDIALS_EXPORT int CVode(void *cvode_mem, realtype tout, N_Vector yout,
-                          realtype *tret, int itask);
+SUNDIALS_EXPORT int CVode(void *cvode_mem, sunrealtype tout, N_Vector yout,
+                          sunrealtype *tret, int itask);
 
 /* Utility functions to update/compute y based on ycor */
 SUNDIALS_EXPORT int CVodeComputeState(void *cvode_mem, N_Vector ycor, N_Vector y);
 
 /* Dense output function */
-SUNDIALS_EXPORT int CVodeGetDky(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetDky(void *cvode_mem, sunrealtype t, int k,
                                 N_Vector dky);
 
 /* Optional output functions */
@@ -204,15 +204,15 @@ SUNDIALS_EXPORT int CVodeGetNumErrTestFails(void *cvode_mem,
                                             long int *netfails);
 SUNDIALS_EXPORT int CVodeGetLastOrder(void *cvode_mem, int *qlast);
 SUNDIALS_EXPORT int CVodeGetCurrentOrder(void *cvode_mem, int *qcur);
-SUNDIALS_EXPORT int CVodeGetCurrentGamma(void *cvode_mem, realtype *gamma);
+SUNDIALS_EXPORT int CVodeGetCurrentGamma(void *cvode_mem, sunrealtype *gamma);
 SUNDIALS_EXPORT int CVodeGetNumStabLimOrderReds(void *cvode_mem,
                                                 long int *nslred);
-SUNDIALS_EXPORT int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused);
-SUNDIALS_EXPORT int CVodeGetLastStep(void *cvode_mem, realtype *hlast);
-SUNDIALS_EXPORT int CVodeGetCurrentStep(void *cvode_mem, realtype *hcur);
+SUNDIALS_EXPORT int CVodeGetActualInitStep(void *cvode_mem, sunrealtype *hinused);
+SUNDIALS_EXPORT int CVodeGetLastStep(void *cvode_mem, sunrealtype *hlast);
+SUNDIALS_EXPORT int CVodeGetCurrentStep(void *cvode_mem, sunrealtype *hcur);
 SUNDIALS_EXPORT int CVodeGetCurrentState(void *cvode_mem, N_Vector *y);
-SUNDIALS_EXPORT int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur);
-SUNDIALS_EXPORT int CVodeGetTolScaleFactor(void *cvode_mem, realtype *tolsfac);
+SUNDIALS_EXPORT int CVodeGetCurrentTime(void *cvode_mem, sunrealtype *tcur);
+SUNDIALS_EXPORT int CVodeGetTolScaleFactor(void *cvode_mem, sunrealtype *tolsfac);
 SUNDIALS_EXPORT int CVodeGetErrWeights(void *cvode_mem, N_Vector eweight);
 SUNDIALS_EXPORT int CVodeGetEstLocalErrors(void *cvode_mem, N_Vector ele);
 SUNDIALS_EXPORT int CVodeGetNumGEvals(void *cvode_mem, long int *ngevals);
@@ -222,12 +222,12 @@ SUNDIALS_EXPORT int CVodeGetIntegratorStats(void *cvode_mem, long int *nsteps,
                                             long int *nlinsetups,
                                             long int *netfails,
                                             int *qlast, int *qcur,
-                                            realtype *hinused, realtype *hlast,
-                                            realtype *hcur, realtype *tcur);
-SUNDIALS_EXPORT int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur,
+                                            sunrealtype *hinused, sunrealtype *hlast,
+                                            sunrealtype *hcur, sunrealtype *tcur);
+SUNDIALS_EXPORT int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur,
                                                 N_Vector *ypred, N_Vector *yn,
-                                                N_Vector *fn, realtype *gamma,
-                                                realtype *rl1, N_Vector *zn1,
+                                                N_Vector *fn, sunrealtype *gamma,
+                                                sunrealtype *rl1, N_Vector *zn1,
                                                 void **user_data);
 SUNDIALS_EXPORT int CVodeGetNumNonlinSolvIters(void *cvode_mem,
                                                long int *nniters);
diff --git a/include/cvode/cvode_bbdpre.h b/include/cvode/cvode_bbdpre.h
index c21487e49f..5d1a088397 100644
--- a/include/cvode/cvode_bbdpre.h
+++ b/include/cvode/cvode_bbdpre.h
@@ -30,10 +30,10 @@ extern "C" {
 
 /* User-supplied function Types */
 
-typedef int (*CVLocalFn)(sunindextype Nlocal, realtype t,
+typedef int (*CVLocalFn)(sunindextype Nlocal, sunrealtype t,
                          N_Vector y, N_Vector g, void *user_data);
 
-typedef int (*CVCommFn)(sunindextype Nlocal, realtype t,
+typedef int (*CVCommFn)(sunindextype Nlocal, sunrealtype t,
                         N_Vector y, void *user_data);
 
 /* Exported Functions */
@@ -41,11 +41,11 @@ typedef int (*CVCommFn)(sunindextype Nlocal, realtype t,
 SUNDIALS_EXPORT int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
                                   sunindextype mudq, sunindextype mldq,
                                   sunindextype mukeep, sunindextype mlkeep,
-                                  realtype dqrely, CVLocalFn gloc, CVCommFn cfn);
+                                  sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn);
 
 SUNDIALS_EXPORT int CVBBDPrecReInit(void *cvode_mem,
                                     sunindextype mudq, sunindextype mldq,
-                                    realtype dqrely);
+                                    sunrealtype dqrely);
 
 
 /* Optional output functions */
diff --git a/include/cvode/cvode_ls.h b/include/cvode/cvode_ls.h
index eaae642553..bccadbd300 100644
--- a/include/cvode/cvode_ls.h
+++ b/include/cvode/cvode_ls.h
@@ -50,27 +50,27 @@ extern "C" {
   CVLS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*CVLsJacFn)(realtype t, N_Vector y, N_Vector fy,
+typedef int (*CVLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy,
                          SUNMatrix Jac, void *user_data,
                          N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*CVLsPrecSetupFn)(realtype t, N_Vector y, N_Vector fy,
-                               booleantype jok, booleantype *jcurPtr,
-                               realtype gamma, void *user_data);
+typedef int (*CVLsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy,
+                               sunbooleantype jok, sunbooleantype *jcurPtr,
+                               sunrealtype gamma, void *user_data);
 
-typedef int (*CVLsPrecSolveFn)(realtype t, N_Vector y, N_Vector fy,
-                               N_Vector r, N_Vector z, realtype gamma,
-                               realtype delta, int lr, void *user_data);
+typedef int (*CVLsPrecSolveFn)(sunrealtype t, N_Vector y, N_Vector fy,
+                               N_Vector r, N_Vector z, sunrealtype gamma,
+                               sunrealtype delta, int lr, void *user_data);
 
-typedef int (*CVLsJacTimesSetupFn)(realtype t, N_Vector y,
+typedef int (*CVLsJacTimesSetupFn)(sunrealtype t, N_Vector y,
                                    N_Vector fy, void *user_data);
 
-typedef int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, realtype t,
+typedef int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, sunrealtype t,
                                  N_Vector y, N_Vector fy,
                                  void *user_data, N_Vector tmp);
 
-typedef int (*CVLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                            booleantype jok, booleantype *jcur, realtype gamma,
+typedef int (*CVLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                            sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                             void *user_data, N_Vector tmp1, N_Vector tmp2,
                             N_Vector tmp3);
 
@@ -91,12 +91,12 @@ SUNDIALS_EXPORT int CVodeSetJacFn(void *cvode_mem, CVLsJacFn jac);
 SUNDIALS_EXPORT int CVodeSetJacEvalFrequency(void *cvode_mem,
                                              long int msbj);
 SUNDIALS_EXPORT int CVodeSetLinearSolutionScaling(void *cvode_mem,
-                                                  booleantype onoff);
+                                                  sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem,
-                                                realtype dgmax_jbad);
-SUNDIALS_EXPORT int CVodeSetEpsLin(void *cvode_mem, realtype eplifac);
+                                                sunrealtype dgmax_jbad);
+SUNDIALS_EXPORT int CVodeSetEpsLin(void *cvode_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int CVodeSetLSNormFactor(void *arkode_mem,
-                                         realtype nrmfac);
+                                         sunrealtype nrmfac);
 SUNDIALS_EXPORT int CVodeSetPreconditioner(void *cvode_mem,
                                            CVLsPrecSetupFn pset,
                                            CVLsPrecSolveFn psolve);
diff --git a/include/cvode/cvode_proj.h b/include/cvode/cvode_proj.h
index c34b527f2e..53ec224910 100644
--- a/include/cvode/cvode_proj.h
+++ b/include/cvode/cvode_proj.h
@@ -29,8 +29,8 @@ extern "C" {
  * CVProj user-supplied function prototypes
  * ---------------------------------------------------------------------------*/
 
-typedef int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr,
-                        realtype epsProj, N_Vector err, void *user_data);
+typedef int (*CVProjFn)(sunrealtype t, N_Vector ycur, N_Vector corr,
+                        sunrealtype epsProj, N_Vector err, void *user_data);
 
 
 /* -----------------------------------------------------------------------------
@@ -41,11 +41,11 @@ typedef int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr,
 SUNDIALS_EXPORT int CVodeSetProjFn(void *cvode_mem, CVProjFn pfun);
 
 /* Optional input functions */
-SUNDIALS_EXPORT int CVodeSetProjErrEst(void *cvode_mem, booleantype onoff);
+SUNDIALS_EXPORT int CVodeSetProjErrEst(void *cvode_mem, sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetProjFrequency(void *cvode_mem, long int proj_freq);
 SUNDIALS_EXPORT int CVodeSetMaxNumProjFails(void *cvode_mem, int max_fails);
-SUNDIALS_EXPORT int CVodeSetEpsProj(void *cvode_mem, realtype eps);
-SUNDIALS_EXPORT int CVodeSetProjFailEta(void *cvode_mem, realtype eta);
+SUNDIALS_EXPORT int CVodeSetEpsProj(void *cvode_mem, sunrealtype eps);
+SUNDIALS_EXPORT int CVodeSetProjFailEta(void *cvode_mem, sunrealtype eta);
 
 /* Optional output functions */
 SUNDIALS_EXPORT int CVodeGetNumProjEvals(void *cvode_mem, long int *nproj);
diff --git a/include/cvodes/cvodes.h b/include/cvodes/cvodes.h
index b1a7892377..06b0169160 100644
--- a/include/cvodes/cvodes.h
+++ b/include/cvodes/cvodes.h
@@ -131,10 +131,10 @@ extern "C" {
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*CVRhsFn)(realtype t, N_Vector y,
+typedef int (*CVRhsFn)(sunrealtype t, N_Vector y,
                        N_Vector ydot, void *user_data);
 
-typedef int (*CVRootFn)(realtype t, N_Vector y, realtype *gout,
+typedef int (*CVRootFn)(sunrealtype t, N_Vector y, sunrealtype *gout,
                         void *user_data);
 
 typedef int (*CVEwtFn)(N_Vector y, N_Vector ewt, void *user_data);
@@ -145,38 +145,38 @@ typedef void (*CVErrHandlerFn)(int error_code,
 
 typedef int (*CVMonitorFn)(void *cvode_mem, void *user_data);
 
-typedef int (*CVQuadRhsFn)(realtype t, N_Vector y,
+typedef int (*CVQuadRhsFn)(sunrealtype t, N_Vector y,
                            N_Vector yQdot, void *user_data);
 
-typedef int (*CVSensRhsFn)(int Ns, realtype t,
+typedef int (*CVSensRhsFn)(int Ns, sunrealtype t,
                            N_Vector y, N_Vector ydot,
                            N_Vector *yS, N_Vector *ySdot,
                            void *user_data,
                            N_Vector tmp1, N_Vector tmp2);
 
-typedef int (*CVSensRhs1Fn)(int Ns, realtype t,
+typedef int (*CVSensRhs1Fn)(int Ns, sunrealtype t,
                             N_Vector y, N_Vector ydot,
                             int iS, N_Vector yS, N_Vector ySdot,
                             void *user_data,
                             N_Vector tmp1, N_Vector tmp2);
 
-typedef int (*CVQuadSensRhsFn)(int Ns, realtype t,
+typedef int (*CVQuadSensRhsFn)(int Ns, sunrealtype t,
                                N_Vector y, N_Vector *yS,
                                N_Vector yQdot, N_Vector *yQSdot,
                                void *user_data,
                                N_Vector tmp, N_Vector tmpQ);
 
-typedef int (*CVRhsFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
+typedef int (*CVRhsFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector yBdot,
                         void *user_dataB);
 
-typedef int (*CVRhsFnBS)(realtype t, N_Vector y, N_Vector *yS,
+typedef int (*CVRhsFnBS)(sunrealtype t, N_Vector y, N_Vector *yS,
                          N_Vector yB, N_Vector yBdot, void *user_dataB);
 
 
-typedef int (*CVQuadRhsFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector qBdot,
+typedef int (*CVQuadRhsFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector qBdot,
                             void *user_dataB);
 
-typedef int (*CVQuadRhsFnBS)(realtype t, N_Vector y, N_Vector *yS,
+typedef int (*CVQuadRhsFnBS)(sunrealtype t, N_Vector y, N_Vector *yS,
                              N_Vector yB, N_Vector qBdot, void *user_dataB);
 
 
@@ -187,14 +187,14 @@ typedef int (*CVQuadRhsFnBS)(realtype t, N_Vector y, N_Vector *yS,
 /* Initialization functions */
 SUNDIALS_EXPORT void *CVodeCreate(int lmm, SUNContext sunctx);
 
-SUNDIALS_EXPORT int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0,
+SUNDIALS_EXPORT int CVodeInit(void *cvode_mem, CVRhsFn f, sunrealtype t0,
                               N_Vector y0);
-SUNDIALS_EXPORT int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0);
+SUNDIALS_EXPORT int CVodeReInit(void *cvode_mem, sunrealtype t0, N_Vector y0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int CVodeSStolerances(void *cvode_mem, realtype reltol,
-                                      realtype abstol);
-SUNDIALS_EXPORT int CVodeSVtolerances(void *cvode_mem, realtype reltol,
+SUNDIALS_EXPORT int CVodeSStolerances(void *cvode_mem, sunrealtype reltol,
+                                      sunrealtype abstol);
+SUNDIALS_EXPORT int CVodeSVtolerances(void *cvode_mem, sunrealtype reltol,
                                       N_Vector abstol);
 SUNDIALS_EXPORT int CVodeWFtolerances(void *cvode_mem, CVEwtFn efun);
 
@@ -202,10 +202,10 @@ SUNDIALS_EXPORT int CVodeWFtolerances(void *cvode_mem, CVEwtFn efun);
 
 SUNDIALS_EXPORT int CVodeSetConstraints(void *cvode_mem, N_Vector constraints);
 SUNDIALS_EXPORT int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem,
-                                                realtype dgmax_lsetup);
+                                                sunrealtype dgmax_lsetup);
 SUNDIALS_EXPORT int CVodeSetErrFile(void *cvode_mem, FILE *errfp);
 SUNDIALS_EXPORT int CVodeSetErrHandlerFn(void *cvode_mem, CVErrHandlerFn ehfun, void *eh_data);
-SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, realtype hin);
+SUNDIALS_EXPORT int CVodeSetInitStep(void *cvode_mem, sunrealtype hin);
 SUNDIALS_EXPORT int CVodeSetLSetupFrequency(void *cvode_mem, long int msbp);
 SUNDIALS_EXPORT int CVodeSetMaxConvFails(void *cvode_mem, int maxncf);
 SUNDIALS_EXPORT int CVodeSetMaxErrTestFails(void *cvode_mem, int maxnef);
@@ -213,41 +213,41 @@ SUNDIALS_EXPORT int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil);
 SUNDIALS_EXPORT int CVodeSetMaxNonlinIters(void *cvode_mem, int maxcor);
 SUNDIALS_EXPORT int CVodeSetMaxNumSteps(void *cvode_mem, long int mxsteps);
 SUNDIALS_EXPORT int CVodeSetMaxOrd(void *cvode_mem, int maxord);
-SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, realtype hmax);
-SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, realtype hmin);
+SUNDIALS_EXPORT int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax);
+SUNDIALS_EXPORT int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin);
 SUNDIALS_EXPORT int CVodeSetMonitorFn(void *cvode_mem, CVMonitorFn fn);
 SUNDIALS_EXPORT int CVodeSetMonitorFrequency(void *cvode_mem, long int nst);
 SUNDIALS_EXPORT int CVodeSetNlsRhsFn(void *cvode_mem, CVRhsFn f);
-SUNDIALS_EXPORT int CVodeSetNonlinConvCoef(void *cvode_mem, realtype nlscoef);
+SUNDIALS_EXPORT int CVodeSetNonlinConvCoef(void *cvode_mem, sunrealtype nlscoef);
 SUNDIALS_EXPORT int CVodeSetNonlinearSolver(void *cvode_mem, SUNNonlinearSolver NLS);
-SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, booleantype stldet);
-SUNDIALS_EXPORT int CVodeSetStopTime(void *cvode_mem, realtype tstop);
-SUNDIALS_EXPORT int CVodeSetInterpolateStopTime(void *cvode_mem, booleantype interp);
+SUNDIALS_EXPORT int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype stldet);
+SUNDIALS_EXPORT int CVodeSetStopTime(void *cvode_mem, sunrealtype tstop);
+SUNDIALS_EXPORT int CVodeSetInterpolateStopTime(void *cvode_mem, sunbooleantype interp);
 SUNDIALS_EXPORT int CVodeClearStopTime(void *cvode_mem);
 SUNDIALS_EXPORT int CVodeSetUserData(void *cvode_mem, void *user_data);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
-int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
-                               realtype eta_max_fx);
+int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx,
+                               sunrealtype eta_max_fx);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs);
+int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es);
+int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es);
 SUNDIALS_EXPORT
 int CVodeSetNumStepsEtaMaxEarlyStep(void* cvode_mem, long int small_nst);
 SUNDIALS_EXPORT
-int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs);
+int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs);
 SUNDIALS_EXPORT
-int CVodeSetEtaMin(void* cvode_mem, realtype eta_min);
+int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min);
 SUNDIALS_EXPORT
-int CVodeSetEtaMinErrFail(void *cvode_mem, realtype eta_min_ef);
+int CVodeSetEtaMinErrFail(void *cvode_mem, sunrealtype eta_min_ef);
 SUNDIALS_EXPORT
-int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef);
+int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef);
 SUNDIALS_EXPORT
 int CVodeSetNumFailsEtaMaxErrFail(void *cvode_mem, int small_nef);
 SUNDIALS_EXPORT
-int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf);
+int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf);
 
 /* Rootfinding initialization function */
 SUNDIALS_EXPORT int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g);
@@ -257,8 +257,8 @@ SUNDIALS_EXPORT int CVodeSetRootDirection(void *cvode_mem, int *rootdir);
 SUNDIALS_EXPORT int CVodeSetNoInactiveRootWarn(void *cvode_mem);
 
 /* Solver function */
-SUNDIALS_EXPORT int CVode(void *cvode_mem, realtype tout, N_Vector yout,
-                          realtype *tret, int itask);
+SUNDIALS_EXPORT int CVode(void *cvode_mem, sunrealtype tout, N_Vector yout,
+                          sunrealtype *tret, int itask);
 
 /* Utility functions to update/compute y based on ycor */
 SUNDIALS_EXPORT int CVodeComputeState(void *cvode_mem, N_Vector ycor,
@@ -269,7 +269,7 @@ SUNDIALS_EXPORT int CVodeComputeStateSens1(void *cvode_mem, int idx,
                                            N_Vector yScor1, N_Vector yS1);
 
 /* Dense output function */
-SUNDIALS_EXPORT int CVodeGetDky(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetDky(void *cvode_mem, sunrealtype t, int k,
                                 N_Vector dky);
 
 /* Optional output functions */
@@ -283,17 +283,17 @@ SUNDIALS_EXPORT int CVodeGetNumErrTestFails(void *cvode_mem,
                                             long int *netfails);
 SUNDIALS_EXPORT int CVodeGetLastOrder(void *cvode_mem, int *qlast);
 SUNDIALS_EXPORT int CVodeGetCurrentOrder(void *cvode_mem, int *qcur);
-SUNDIALS_EXPORT int CVodeGetCurrentGamma(void *cvode_mem, realtype *gamma);
+SUNDIALS_EXPORT int CVodeGetCurrentGamma(void *cvode_mem, sunrealtype *gamma);
 SUNDIALS_EXPORT int CVodeGetNumStabLimOrderReds(void *cvode_mem,
                                                 long int *nslred);
-SUNDIALS_EXPORT int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused);
-SUNDIALS_EXPORT int CVodeGetLastStep(void *cvode_mem, realtype *hlast);
-SUNDIALS_EXPORT int CVodeGetCurrentStep(void *cvode_mem, realtype *hcur);
+SUNDIALS_EXPORT int CVodeGetActualInitStep(void *cvode_mem, sunrealtype *hinused);
+SUNDIALS_EXPORT int CVodeGetLastStep(void *cvode_mem, sunrealtype *hlast);
+SUNDIALS_EXPORT int CVodeGetCurrentStep(void *cvode_mem, sunrealtype *hcur);
 SUNDIALS_EXPORT int CVodeGetCurrentState(void *cvode_mem, N_Vector *y);
 SUNDIALS_EXPORT int CVodeGetCurrentStateSens(void *cvode_mem, N_Vector **yS);
 SUNDIALS_EXPORT int CVodeGetCurrentSensSolveIndex(void *cvode_mem, int *index);
-SUNDIALS_EXPORT int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur);
-SUNDIALS_EXPORT int CVodeGetTolScaleFactor(void *cvode_mem, realtype *tolsfac);
+SUNDIALS_EXPORT int CVodeGetCurrentTime(void *cvode_mem, sunrealtype *tcur);
+SUNDIALS_EXPORT int CVodeGetTolScaleFactor(void *cvode_mem, sunrealtype *tolsfac);
 SUNDIALS_EXPORT int CVodeGetErrWeights(void *cvode_mem, N_Vector eweight);
 SUNDIALS_EXPORT int CVodeGetEstLocalErrors(void *cvode_mem, N_Vector ele);
 SUNDIALS_EXPORT int CVodeGetNumGEvals(void *cvode_mem, long int *ngevals);
@@ -303,19 +303,19 @@ SUNDIALS_EXPORT int CVodeGetIntegratorStats(void *cvode_mem, long int *nsteps,
                                             long int *nlinsetups,
                                             long int *netfails,
                                             int *qlast, int *qcur,
-                                            realtype *hinused, realtype *hlast,
-                                            realtype *hcur, realtype *tcur);
-SUNDIALS_EXPORT int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur,
+                                            sunrealtype *hinused, sunrealtype *hlast,
+                                            sunrealtype *hcur, sunrealtype *tcur);
+SUNDIALS_EXPORT int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur,
                                                 N_Vector *ypred, N_Vector *yn,
-                                                N_Vector *fn, realtype *gamma,
-                                                realtype *rl1, N_Vector *zn1,
+                                                N_Vector *fn, sunrealtype *gamma,
+                                                sunrealtype *rl1, N_Vector *zn1,
                                                 void **user_data);
 SUNDIALS_EXPORT int CVodeGetNonlinearSystemDataSens(void *cvode_mem,
-                                                    realtype *tcur,
+                                                    sunrealtype *tcur,
                                                     N_Vector **ySpred,
                                                     N_Vector **ySn,
-                                                    realtype *gamma,
-                                                    realtype *rl1,
+                                                    sunrealtype *gamma,
+                                                    sunrealtype *rl1,
                                                     N_Vector **zn1,
                                                     void **user_data);
 SUNDIALS_EXPORT int CVodeGetNumNonlinSolvIters(void *cvode_mem,
@@ -349,18 +349,18 @@ SUNDIALS_EXPORT int CVodeQuadInit(void *cvode_mem, CVQuadRhsFn fQ,
 SUNDIALS_EXPORT int CVodeQuadReInit(void *cvode_mem, N_Vector yQ0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int CVodeQuadSStolerances(void *cvode_mem, realtype reltolQ,
-                                          realtype abstolQ);
-SUNDIALS_EXPORT int CVodeQuadSVtolerances(void *cvode_mem, realtype reltolQ,
+SUNDIALS_EXPORT int CVodeQuadSStolerances(void *cvode_mem, sunrealtype reltolQ,
+                                          sunrealtype abstolQ);
+SUNDIALS_EXPORT int CVodeQuadSVtolerances(void *cvode_mem, sunrealtype reltolQ,
                                           N_Vector abstolQ);
 
 /* Optional input specification functions */
-SUNDIALS_EXPORT int CVodeSetQuadErrCon(void *cvode_mem, booleantype errconQ);
+SUNDIALS_EXPORT int CVodeSetQuadErrCon(void *cvode_mem, sunbooleantype errconQ);
 
 /* Extraction and Dense Output Functions for Forward Problems */
-SUNDIALS_EXPORT int CVodeGetQuad(void *cvode_mem, realtype *tret,
+SUNDIALS_EXPORT int CVodeGetQuad(void *cvode_mem, sunrealtype *tret,
                                  N_Vector yQout);
-SUNDIALS_EXPORT int CVodeGetQuadDky(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetQuadDky(void *cvode_mem, sunrealtype t, int k,
                                     N_Vector dky);
 
 /* Optional output specification functions */
@@ -388,19 +388,19 @@ SUNDIALS_EXPORT int CVodeSensInit1(void *cvode_mem, int Ns, int ism,
 SUNDIALS_EXPORT int CVodeSensReInit(void *cvode_mem, int ism, N_Vector *yS0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int CVodeSensSStolerances(void *cvode_mem, realtype reltolS,
-                                          realtype *abstolS);
-SUNDIALS_EXPORT int CVodeSensSVtolerances(void *cvode_mem, realtype reltolS,
+SUNDIALS_EXPORT int CVodeSensSStolerances(void *cvode_mem, sunrealtype reltolS,
+                                          sunrealtype *abstolS);
+SUNDIALS_EXPORT int CVodeSensSVtolerances(void *cvode_mem, sunrealtype reltolS,
                                           N_Vector *abstolS);
 SUNDIALS_EXPORT int CVodeSensEEtolerances(void *cvode_mem);
 
 /* Optional input specification functions */
 SUNDIALS_EXPORT int CVodeSetSensDQMethod(void *cvode_mem, int DQtype,
-                                         realtype DQrhomax);
-SUNDIALS_EXPORT int CVodeSetSensErrCon(void *cvode_mem, booleantype errconS);
+                                         sunrealtype DQrhomax);
+SUNDIALS_EXPORT int CVodeSetSensErrCon(void *cvode_mem, sunbooleantype errconS);
 SUNDIALS_EXPORT int CVodeSetSensMaxNonlinIters(void *cvode_mem, int maxcorS);
-SUNDIALS_EXPORT int CVodeSetSensParams(void *cvode_mem, realtype *p,
-                                       realtype *pbar, int *plist);
+SUNDIALS_EXPORT int CVodeSetSensParams(void *cvode_mem, sunrealtype *p,
+                                       sunrealtype *pbar, int *plist);
 
 /* Integrator nonlinear solver specification functions */
 SUNDIALS_EXPORT int CVodeSetNonlinearSolverSensSim(void *cvode_mem,
@@ -414,14 +414,14 @@ SUNDIALS_EXPORT int CVodeSetNonlinearSolverSensStg1(void *cvode_mem,
 SUNDIALS_EXPORT int CVodeSensToggleOff(void *cvode_mem);
 
 /* Extraction and dense output functions */
-SUNDIALS_EXPORT int CVodeGetSens(void *cvode_mem, realtype *tret,
+SUNDIALS_EXPORT int CVodeGetSens(void *cvode_mem, sunrealtype *tret,
                                  N_Vector *ySout);
-SUNDIALS_EXPORT int CVodeGetSens1(void *cvode_mem, realtype *tret, int is,
+SUNDIALS_EXPORT int CVodeGetSens1(void *cvode_mem, sunrealtype *tret, int is,
                                   N_Vector ySout);
 
-SUNDIALS_EXPORT int CVodeGetSensDky(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetSensDky(void *cvode_mem, sunrealtype t, int k,
                                     N_Vector *dkyA);
-SUNDIALS_EXPORT int CVodeGetSensDky1(void *cvode_mem, realtype t, int k, int is,
+SUNDIALS_EXPORT int CVodeGetSensDky1(void *cvode_mem, sunrealtype t, int k, int is,
                                      N_Vector dky);
 
 /* Optional output specification functions */
@@ -471,26 +471,26 @@ SUNDIALS_EXPORT int CVodeQuadSensReInit(void *cvode_mem, N_Vector *yQS0);
 
 /* Tolerance input functions */
 SUNDIALS_EXPORT int CVodeQuadSensSStolerances(void *cvode_mem,
-                                              realtype reltolQS,
-                                              realtype *abstolQS);
+                                              sunrealtype reltolQS,
+                                              sunrealtype *abstolQS);
 SUNDIALS_EXPORT int CVodeQuadSensSVtolerances(void *cvode_mem,
-                                              realtype reltolQS,
+                                              sunrealtype reltolQS,
                                               N_Vector *abstolQS);
 SUNDIALS_EXPORT int CVodeQuadSensEEtolerances(void *cvode_mem);
 
 /* Optional input specification functions */
 SUNDIALS_EXPORT int CVodeSetQuadSensErrCon(void *cvode_mem,
-                                           booleantype errconQS);
+                                           sunbooleantype errconQS);
 
 /* Extraction and dense output functions */
-SUNDIALS_EXPORT int CVodeGetQuadSens(void *cvode_mem, realtype *tret,
+SUNDIALS_EXPORT int CVodeGetQuadSens(void *cvode_mem, sunrealtype *tret,
                                      N_Vector *yQSout);
-SUNDIALS_EXPORT int CVodeGetQuadSens1(void *cvode_mem, realtype *tret, int is,
+SUNDIALS_EXPORT int CVodeGetQuadSens1(void *cvode_mem, sunrealtype *tret, int is,
                                       N_Vector yQSout);
 
-SUNDIALS_EXPORT int CVodeGetQuadSensDky(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetQuadSensDky(void *cvode_mem, sunrealtype t, int k,
                                         N_Vector *dkyQS_all);
-SUNDIALS_EXPORT int CVodeGetQuadSensDky1(void *cvode_mem, realtype t, int k,
+SUNDIALS_EXPORT int CVodeGetQuadSensDky1(void *cvode_mem, sunrealtype t, int k,
                                          int is, N_Vector dkyQS);
 
 /* Optional output specification functions */
@@ -526,17 +526,17 @@ SUNDIALS_EXPORT int CVodeCreateB(void *cvode_mem, int lmmB, int *which);
 
 SUNDIALS_EXPORT int CVodeInitB(void *cvode_mem, int which,
                                CVRhsFnB fB,
-                               realtype tB0, N_Vector yB0);
+                               sunrealtype tB0, N_Vector yB0);
 SUNDIALS_EXPORT int CVodeInitBS(void *cvode_mem, int which,
                                 CVRhsFnBS fBs,
-                                realtype tB0, N_Vector yB0);
+                                sunrealtype tB0, N_Vector yB0);
 SUNDIALS_EXPORT int CVodeReInitB(void *cvode_mem, int which,
-                                 realtype tB0, N_Vector yB0);
+                                 sunrealtype tB0, N_Vector yB0);
 
 SUNDIALS_EXPORT int CVodeSStolerancesB(void *cvode_mem, int which,
-                                       realtype reltolB, realtype abstolB);
+                                       sunrealtype reltolB, sunrealtype abstolB);
 SUNDIALS_EXPORT int CVodeSVtolerancesB(void *cvode_mem, int which,
-                                       realtype reltolB, N_Vector abstolB);
+                                       sunrealtype reltolB, N_Vector abstolB);
 
 SUNDIALS_EXPORT int CVodeQuadInitB(void *cvode_mem, int which,
                                      CVQuadRhsFnB fQB, N_Vector yQB0);
@@ -545,21 +545,21 @@ SUNDIALS_EXPORT int CVodeQuadInitBS(void *cvode_mem, int which,
 SUNDIALS_EXPORT int CVodeQuadReInitB(void *cvode_mem, int which, N_Vector yQB0);
 
 SUNDIALS_EXPORT int CVodeQuadSStolerancesB(void *cvode_mem, int which,
-                                           realtype reltolQB,
-                                           realtype abstolQB);
+                                           sunrealtype reltolQB,
+                                           sunrealtype abstolQB);
 SUNDIALS_EXPORT int CVodeQuadSVtolerancesB(void *cvode_mem, int which,
-                                           realtype reltolQB,
+                                           sunrealtype reltolQB,
                                            N_Vector abstolQB);
 
 /* Solver Function For Forward Problems */
 
-SUNDIALS_EXPORT int CVodeF(void *cvode_mem, realtype tout, N_Vector yout,
-                           realtype *tret, int itask, int *ncheckPtr);
+SUNDIALS_EXPORT int CVodeF(void *cvode_mem, sunrealtype tout, N_Vector yout,
+                           sunrealtype *tret, int itask, int *ncheckPtr);
 
 
 /* Solver Function For Backward Problems */
 
-SUNDIALS_EXPORT int CVodeB(void *cvode_mem, realtype tBout, int itaskB);
+SUNDIALS_EXPORT int CVodeB(void *cvode_mem, sunrealtype tBout, int itaskB);
 
 /* Optional Input Functions For Adjoint Problems */
 
@@ -571,17 +571,17 @@ SUNDIALS_EXPORT int CVodeSetMaxOrdB(void *cvode_mem, int which, int maxordB);
 SUNDIALS_EXPORT int CVodeSetMaxNumStepsB(void *cvode_mem, int which,
                                          long int mxstepsB);
 SUNDIALS_EXPORT int CVodeSetStabLimDetB(void *cvode_mem, int which,
-                                        booleantype stldetB);
+                                        sunbooleantype stldetB);
 SUNDIALS_EXPORT int CVodeSetInitStepB(void *cvode_mem, int which,
-                                      realtype hinB);
+                                      sunrealtype hinB);
 SUNDIALS_EXPORT int CVodeSetMinStepB(void *cvode_mem, int which,
-                                     realtype hminB);
+                                     sunrealtype hminB);
 SUNDIALS_EXPORT int CVodeSetMaxStepB(void *cvode_mem, int which,
-                                     realtype hmaxB);
+                                     sunrealtype hmaxB);
 SUNDIALS_EXPORT int CVodeSetConstraintsB(void *cvode_mem, int which,
                                          N_Vector constraintsB);
 SUNDIALS_EXPORT int CVodeSetQuadErrConB(void *cvode_mem, int which,
-                                        booleantype errconQB);
+                                        sunbooleantype errconQB);
 
 SUNDIALS_EXPORT int CVodeSetNonlinearSolverB(void *cvode_mem, int which,
                                              SUNNonlinearSolver NLS);
@@ -589,24 +589,24 @@ SUNDIALS_EXPORT int CVodeSetNonlinearSolverB(void *cvode_mem, int which,
 /* Extraction And Dense Output Functions For Backward Problems */
 
 SUNDIALS_EXPORT int CVodeGetB(void *cvode_mem, int which,
-                              realtype *tBret, N_Vector yB);
+                              sunrealtype *tBret, N_Vector yB);
 SUNDIALS_EXPORT int CVodeGetQuadB(void *cvode_mem, int which,
-                                  realtype *tBret, N_Vector qB);
+                                  sunrealtype *tBret, N_Vector qB);
 
 /* Optional Output Functions For Backward Problems */
 
 SUNDIALS_EXPORT void *CVodeGetAdjCVodeBmem(void *cvode_mem, int which);
 
-SUNDIALS_EXPORT int CVodeGetAdjY(void *cvode_mem, realtype t, N_Vector y);
+SUNDIALS_EXPORT int CVodeGetAdjY(void *cvode_mem, sunrealtype t, N_Vector y);
 
 typedef struct {
   void *my_addr;
   void *next_addr;
-  realtype t0;
-  realtype t1;
+  sunrealtype t0;
+  sunrealtype t1;
   long int nstep;
   int order;
-  realtype step;
+  sunrealtype step;
 } CVadjCheckPointRec;
 
 SUNDIALS_EXPORT int CVodeGetAdjCheckPointsInfo(void *cvode_mem,
@@ -637,11 +637,11 @@ int CVodeSetJacTimesRhsFnB(void *cvode_mem, int which, CVRhsFn jtimesRhsFn);
  * ----------------------------------------------------------------- */
 
 SUNDIALS_EXPORT int CVodeGetAdjDataPointHermite(void *cvode_mem, int which,
-                                                realtype *t, N_Vector y,
+                                                sunrealtype *t, N_Vector y,
                                                 N_Vector yd);
 
 SUNDIALS_EXPORT int CVodeGetAdjDataPointPolynomial(void *cvode_mem, int which,
-                                                   realtype *t, int *order,
+                                                   sunrealtype *t, int *order,
                                                    N_Vector y);
 
 /* -----------------------------------------------------------------
diff --git a/include/cvodes/cvodes_bbdpre.h b/include/cvodes/cvodes_bbdpre.h
index 754e582269..668f6831ac 100644
--- a/include/cvodes/cvodes_bbdpre.h
+++ b/include/cvodes/cvodes_bbdpre.h
@@ -33,10 +33,10 @@ extern "C" {
 
 /* User-supplied function Types */
 
-typedef int (*CVLocalFn)(sunindextype Nlocal, realtype t,
+typedef int (*CVLocalFn)(sunindextype Nlocal, sunrealtype t,
                          N_Vector y, N_Vector g, void *user_data);
 
-typedef int (*CVCommFn)(sunindextype Nlocal, realtype t,
+typedef int (*CVCommFn)(sunindextype Nlocal, sunrealtype t,
                         N_Vector y, void *user_data);
 
 /* Exported Functions */
@@ -44,11 +44,11 @@ typedef int (*CVCommFn)(sunindextype Nlocal, realtype t,
 SUNDIALS_EXPORT int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
                                   sunindextype mudq, sunindextype mldq,
                                   sunindextype mukeep, sunindextype mlkeep,
-                                  realtype dqrely, CVLocalFn gloc, CVCommFn cfn);
+                                  sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn);
 
 SUNDIALS_EXPORT int CVBBDPrecReInit(void *cvode_mem,
                                     sunindextype mudq, sunindextype mldq,
-                                    realtype dqrely);
+                                    sunrealtype dqrely);
 
 
 /* Optional output functions */
@@ -67,10 +67,10 @@ SUNDIALS_EXPORT int CVBBDPrecGetNumGfnEvals(void *cvode_mem,
 
 /* User-Supplied Function Types */
 
-typedef int (*CVLocalFnB)(sunindextype NlocalB, realtype t,
+typedef int (*CVLocalFnB)(sunindextype NlocalB, sunrealtype t,
                           N_Vector y, N_Vector yB, N_Vector gB, void *user_dataB);
 
-typedef int (*CVCommFnB)(sunindextype NlocalB, realtype t,
+typedef int (*CVCommFnB)(sunindextype NlocalB, sunrealtype t,
                          N_Vector y, N_Vector yB, void *user_dataB);
 
 
@@ -79,11 +79,11 @@ typedef int (*CVCommFnB)(sunindextype NlocalB, realtype t,
 SUNDIALS_EXPORT int CVBBDPrecInitB(void *cvode_mem, int which, sunindextype NlocalB,
                                    sunindextype mudqB, sunindextype mldqB,
                                    sunindextype mukeepB, sunindextype mlkeepB,
-                                   realtype dqrelyB, CVLocalFnB glocB, CVCommFnB cfnB);
+                                   sunrealtype dqrelyB, CVLocalFnB glocB, CVCommFnB cfnB);
 
 SUNDIALS_EXPORT int CVBBDPrecReInitB(void *cvode_mem, int which,
                                      sunindextype mudqB, sunindextype mldqB,
-                                     realtype dqrelyB);
+                                     sunrealtype dqrelyB);
 
 
 #ifdef __cplusplus
diff --git a/include/cvodes/cvodes_ls.h b/include/cvodes/cvodes_ls.h
index bcd3f02442..302fdbc77d 100644
--- a/include/cvodes/cvodes_ls.h
+++ b/include/cvodes/cvodes_ls.h
@@ -58,27 +58,27 @@ extern "C" {
   CVLS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*CVLsJacFn)(realtype t, N_Vector y, N_Vector fy,
+typedef int (*CVLsJacFn)(sunrealtype t, N_Vector y, N_Vector fy,
                          SUNMatrix Jac, void *user_data,
                          N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*CVLsPrecSetupFn)(realtype t, N_Vector y, N_Vector fy,
-                               booleantype jok, booleantype *jcurPtr,
-                               realtype gamma, void *user_data);
+typedef int (*CVLsPrecSetupFn)(sunrealtype t, N_Vector y, N_Vector fy,
+                               sunbooleantype jok, sunbooleantype *jcurPtr,
+                               sunrealtype gamma, void *user_data);
 
-typedef int (*CVLsPrecSolveFn)(realtype t, N_Vector y, N_Vector fy,
-                               N_Vector r, N_Vector z, realtype gamma,
-                               realtype delta, int lr, void *user_data);
+typedef int (*CVLsPrecSolveFn)(sunrealtype t, N_Vector y, N_Vector fy,
+                               N_Vector r, N_Vector z, sunrealtype gamma,
+                               sunrealtype delta, int lr, void *user_data);
 
-typedef int (*CVLsJacTimesSetupFn)(realtype t, N_Vector y,
+typedef int (*CVLsJacTimesSetupFn)(sunrealtype t, N_Vector y,
                                    N_Vector fy, void *user_data);
 
-typedef int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, realtype t,
+typedef int (*CVLsJacTimesVecFn)(N_Vector v, N_Vector Jv, sunrealtype t,
                                  N_Vector y, N_Vector fy,
                                  void *user_data, N_Vector tmp);
 
-typedef int (*CVLsLinSysFn)(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                            booleantype jok, booleantype *jcur, realtype gamma,
+typedef int (*CVLsLinSysFn)(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                            sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                             void *user_data, N_Vector tmp1, N_Vector tmp2,
                             N_Vector tmp3);
 
@@ -99,12 +99,12 @@ SUNDIALS_EXPORT int CVodeSetJacFn(void *cvode_mem, CVLsJacFn jac);
 SUNDIALS_EXPORT int CVodeSetJacEvalFrequency(void *cvode_mem,
                                              long int msbj);
 SUNDIALS_EXPORT int CVodeSetLinearSolutionScaling(void *cvode_mem,
-                                                  booleantype onoff);
+                                                  sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem,
-                                                realtype dgmax_jbad);
-SUNDIALS_EXPORT int CVodeSetEpsLin(void *cvode_mem, realtype eplifac);
+                                                sunrealtype dgmax_jbad);
+SUNDIALS_EXPORT int CVodeSetEpsLin(void *cvode_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int CVodeSetLSNormFactor(void *arkode_mem,
-                                         realtype nrmfac);
+                                         sunrealtype nrmfac);
 SUNDIALS_EXPORT int CVodeSetPreconditioner(void *cvode_mem,
                                            CVLsPrecSetupFn pset,
                                            CVLsPrecSolveFn psolve);
@@ -156,64 +156,64 @@ SUNDIALS_EXPORT char *CVodeGetLinReturnFlagName(long int flag);
   CVLS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*CVLsJacFnB)(realtype t, N_Vector y, N_Vector yB,
+typedef int (*CVLsJacFnB)(sunrealtype t, N_Vector y, N_Vector yB,
                           N_Vector fyB, SUNMatrix JB,
                           void *user_dataB, N_Vector tmp1B,
                           N_Vector tmp2B, N_Vector tmp3B);
 
-typedef int (*CVLsJacFnBS)(realtype t, N_Vector y, N_Vector *yS,
+typedef int (*CVLsJacFnBS)(sunrealtype t, N_Vector y, N_Vector *yS,
                            N_Vector yB, N_Vector fyB, SUNMatrix JB,
                            void *user_dataB, N_Vector tmp1B,
                            N_Vector tmp2B, N_Vector tmp3B);
 
-typedef int (*CVLsPrecSetupFnB)(realtype t, N_Vector y, N_Vector yB,
-                                N_Vector fyB, booleantype jokB,
-                                booleantype *jcurPtrB,
-                                realtype gammaB, void *user_dataB);
+typedef int (*CVLsPrecSetupFnB)(sunrealtype t, N_Vector y, N_Vector yB,
+                                N_Vector fyB, sunbooleantype jokB,
+                                sunbooleantype *jcurPtrB,
+                                sunrealtype gammaB, void *user_dataB);
 
-typedef int (*CVLsPrecSetupFnBS)(realtype t, N_Vector y,
+typedef int (*CVLsPrecSetupFnBS)(sunrealtype t, N_Vector y,
                                  N_Vector *yS, N_Vector yB,
-                                 N_Vector fyB, booleantype jokB,
-                                 booleantype *jcurPtrB,
-                                 realtype gammaB, void *user_dataB);
+                                 N_Vector fyB, sunbooleantype jokB,
+                                 sunbooleantype *jcurPtrB,
+                                 sunrealtype gammaB, void *user_dataB);
 
-typedef int (*CVLsPrecSolveFnB)(realtype t, N_Vector y, N_Vector yB,
+typedef int (*CVLsPrecSolveFnB)(sunrealtype t, N_Vector y, N_Vector yB,
                                 N_Vector fyB, N_Vector rB,
-                                N_Vector zB, realtype gammaB,
-                                realtype deltaB, int lrB,
+                                N_Vector zB, sunrealtype gammaB,
+                                sunrealtype deltaB, int lrB,
                                 void *user_dataB);
 
-typedef int (*CVLsPrecSolveFnBS)(realtype t, N_Vector y, N_Vector *yS,
+typedef int (*CVLsPrecSolveFnBS)(sunrealtype t, N_Vector y, N_Vector *yS,
                                  N_Vector yB, N_Vector fyB,
                                  N_Vector rB, N_Vector zB,
-                                 realtype gammaB, realtype deltaB,
+                                 sunrealtype gammaB, sunrealtype deltaB,
                                  int lrB, void *user_dataB);
 
-typedef int (*CVLsJacTimesSetupFnB)(realtype t, N_Vector y, N_Vector yB,
+typedef int (*CVLsJacTimesSetupFnB)(sunrealtype t, N_Vector y, N_Vector yB,
                                     N_Vector fyB, void *jac_dataB);
 
-typedef int (*CVLsJacTimesSetupFnBS)(realtype t, N_Vector y,
+typedef int (*CVLsJacTimesSetupFnBS)(sunrealtype t, N_Vector y,
                                      N_Vector *yS, N_Vector yB,
                                      N_Vector fyB, void *jac_dataB);
 
-typedef int (*CVLsJacTimesVecFnB)(N_Vector vB, N_Vector JvB, realtype t,
+typedef int (*CVLsJacTimesVecFnB)(N_Vector vB, N_Vector JvB, sunrealtype t,
                                   N_Vector y, N_Vector yB, N_Vector fyB,
                                   void *jac_dataB, N_Vector tmpB);
 
 typedef int (*CVLsJacTimesVecFnBS)(N_Vector vB, N_Vector JvB,
-                                   realtype t, N_Vector y, N_Vector *yS,
+                                   sunrealtype t, N_Vector y, N_Vector *yS,
                                    N_Vector yB, N_Vector fyB,
                                    void *jac_dataB, N_Vector tmpB);
 
-typedef int (*CVLsLinSysFnB)(realtype t, N_Vector y, N_Vector yB, N_Vector fyB,
-                             SUNMatrix AB, booleantype jokB, booleantype *jcurB,
-                             realtype gammaB, void *user_dataB, N_Vector tmp1B,
+typedef int (*CVLsLinSysFnB)(sunrealtype t, N_Vector y, N_Vector yB, N_Vector fyB,
+                             SUNMatrix AB, sunbooleantype jokB, sunbooleantype *jcurB,
+                             sunrealtype gammaB, void *user_dataB, N_Vector tmp1B,
                              N_Vector tmp2B, N_Vector tmp3B);
 
-typedef int (*CVLsLinSysFnBS)(realtype t, N_Vector y, N_Vector* yS,
+typedef int (*CVLsLinSysFnBS)(sunrealtype t, N_Vector y, N_Vector* yS,
                               N_Vector yB, N_Vector fyB, SUNMatrix AB,
-                              booleantype jokB, booleantype *jcurB,
-                              realtype gammaB, void *user_dataB, N_Vector tmp1B,
+                              sunbooleantype jokB, sunbooleantype *jcurB,
+                              sunrealtype gammaB, void *user_dataB, N_Vector tmp1B,
                               N_Vector tmp2B, N_Vector tmp3B);
 
 /*=================================================================
@@ -238,13 +238,13 @@ SUNDIALS_EXPORT int CVodeSetJacFnBS(void *cvode_mem, int which,
                                     CVLsJacFnBS jacBS);
 
 SUNDIALS_EXPORT int CVodeSetEpsLinB(void *cvode_mem, int which,
-                                    realtype eplifacB);
+                                    sunrealtype eplifacB);
 
 SUNDIALS_EXPORT int CVodeSetLSNormFactorB(void *arkode_mem, int which,
-                                          realtype nrmfacB);
+                                          sunrealtype nrmfacB);
 
 SUNDIALS_EXPORT int CVodeSetLinearSolutionScalingB(void *cvode_mem, int which,
-                                                   booleantype onoffB);
+                                                   sunbooleantype onoffB);
 
 SUNDIALS_EXPORT int CVodeSetPreconditionerB(void *cvode_mem, int which,
                                             CVLsPrecSetupFnB psetB,
diff --git a/include/cvodes/cvodes_proj.h b/include/cvodes/cvodes_proj.h
index c34b527f2e..53ec224910 100644
--- a/include/cvodes/cvodes_proj.h
+++ b/include/cvodes/cvodes_proj.h
@@ -29,8 +29,8 @@ extern "C" {
  * CVProj user-supplied function prototypes
  * ---------------------------------------------------------------------------*/
 
-typedef int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr,
-                        realtype epsProj, N_Vector err, void *user_data);
+typedef int (*CVProjFn)(sunrealtype t, N_Vector ycur, N_Vector corr,
+                        sunrealtype epsProj, N_Vector err, void *user_data);
 
 
 /* -----------------------------------------------------------------------------
@@ -41,11 +41,11 @@ typedef int (*CVProjFn)(realtype t, N_Vector ycur, N_Vector corr,
 SUNDIALS_EXPORT int CVodeSetProjFn(void *cvode_mem, CVProjFn pfun);
 
 /* Optional input functions */
-SUNDIALS_EXPORT int CVodeSetProjErrEst(void *cvode_mem, booleantype onoff);
+SUNDIALS_EXPORT int CVodeSetProjErrEst(void *cvode_mem, sunbooleantype onoff);
 SUNDIALS_EXPORT int CVodeSetProjFrequency(void *cvode_mem, long int proj_freq);
 SUNDIALS_EXPORT int CVodeSetMaxNumProjFails(void *cvode_mem, int max_fails);
-SUNDIALS_EXPORT int CVodeSetEpsProj(void *cvode_mem, realtype eps);
-SUNDIALS_EXPORT int CVodeSetProjFailEta(void *cvode_mem, realtype eta);
+SUNDIALS_EXPORT int CVodeSetEpsProj(void *cvode_mem, sunrealtype eps);
+SUNDIALS_EXPORT int CVodeSetProjFailEta(void *cvode_mem, sunrealtype eta);
 
 /* Optional output functions */
 SUNDIALS_EXPORT int CVodeGetNumProjEvals(void *cvode_mem, long int *nproj);
diff --git a/include/ida/ida.h b/include/ida/ida.h
index cd0c4e571a..2be5ccb2fd 100644
--- a/include/ida/ida.h
+++ b/include/ida/ida.h
@@ -87,11 +87,11 @@ extern "C" {
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*IDAResFn)(realtype tt, N_Vector yy, N_Vector yp,
+typedef int (*IDAResFn)(sunrealtype tt, N_Vector yy, N_Vector yp,
                         N_Vector rr, void *user_data);
 
-typedef int (*IDARootFn)(realtype t, N_Vector y, N_Vector yp,
-                         realtype *gout, void *user_data);
+typedef int (*IDARootFn)(sunrealtype t, N_Vector y, N_Vector yp,
+                         sunrealtype *gout, void *user_data);
 
 typedef int (*IDAEwtFn)(N_Vector y, N_Vector ewt, void *user_data);
 
@@ -106,68 +106,68 @@ typedef void (*IDAErrHandlerFn)(int error_code,
 /* Initialization functions */
 SUNDIALS_EXPORT void *IDACreate(SUNContext sunctx);
 
-SUNDIALS_EXPORT int IDAInit(void *ida_mem, IDAResFn res, realtype t0,
+SUNDIALS_EXPORT int IDAInit(void *ida_mem, IDAResFn res, sunrealtype t0,
                             N_Vector yy0, N_Vector yp0);
-SUNDIALS_EXPORT int IDAReInit(void *ida_mem, realtype t0, N_Vector yy0,
+SUNDIALS_EXPORT int IDAReInit(void *ida_mem, sunrealtype t0, N_Vector yy0,
                               N_Vector yp0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int IDASStolerances(void *ida_mem, realtype reltol,
-                                    realtype abstol);
-SUNDIALS_EXPORT int IDASVtolerances(void *ida_mem, realtype reltol,
+SUNDIALS_EXPORT int IDASStolerances(void *ida_mem, sunrealtype reltol,
+                                    sunrealtype abstol);
+SUNDIALS_EXPORT int IDASVtolerances(void *ida_mem, sunrealtype reltol,
                                     N_Vector abstol);
 SUNDIALS_EXPORT int IDAWFtolerances(void *ida_mem, IDAEwtFn efun);
 
 /* Initial condition calculation function */
-SUNDIALS_EXPORT int IDACalcIC(void *ida_mem, int icopt, realtype tout1);
+SUNDIALS_EXPORT int IDACalcIC(void *ida_mem, int icopt, sunrealtype tout1);
 
 /* Initial condition calculation optional input functions */
-SUNDIALS_EXPORT int IDASetNonlinConvCoefIC(void *ida_mem, realtype epiccon);
+SUNDIALS_EXPORT int IDASetNonlinConvCoefIC(void *ida_mem, sunrealtype epiccon);
 SUNDIALS_EXPORT int IDASetMaxNumStepsIC(void *ida_mem, int maxnh);
 SUNDIALS_EXPORT int IDASetMaxNumJacsIC(void *ida_mem, int maxnj);
 SUNDIALS_EXPORT int IDASetMaxNumItersIC(void *ida_mem, int maxnit);
-SUNDIALS_EXPORT int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff);
-SUNDIALS_EXPORT int IDASetStepToleranceIC(void *ida_mem, realtype steptol);
+SUNDIALS_EXPORT int IDASetLineSearchOffIC(void *ida_mem, sunbooleantype lsoff);
+SUNDIALS_EXPORT int IDASetStepToleranceIC(void *ida_mem, sunrealtype steptol);
 SUNDIALS_EXPORT int IDASetMaxBacksIC(void *ida_mem, int maxbacks);
 
 /* Optional input functions */
-SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void *ida_max, realtype dcj);
+SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void *ida_max, sunrealtype dcj);
 SUNDIALS_EXPORT int IDASetErrHandlerFn(void *ida_mem, IDAErrHandlerFn ehfun,
                                        void *eh_data);
 SUNDIALS_EXPORT int IDASetErrFile(void *ida_mem, FILE *errfp);
 SUNDIALS_EXPORT int IDASetUserData(void *ida_mem, void *user_data);
 SUNDIALS_EXPORT int IDASetMaxOrd(void *ida_mem, int maxord);
 SUNDIALS_EXPORT int IDASetMaxNumSteps(void *ida_mem, long int mxsteps);
-SUNDIALS_EXPORT int IDASetInitStep(void *ida_mem, realtype hin);
-SUNDIALS_EXPORT int IDASetMaxStep(void *ida_mem, realtype hmax);
-SUNDIALS_EXPORT int IDASetMinStep(void *ida_mem, realtype hmin);
-SUNDIALS_EXPORT int IDASetStopTime(void *ida_mem, realtype tstop);
+SUNDIALS_EXPORT int IDASetInitStep(void *ida_mem, sunrealtype hin);
+SUNDIALS_EXPORT int IDASetMaxStep(void *ida_mem, sunrealtype hmax);
+SUNDIALS_EXPORT int IDASetMinStep(void *ida_mem, sunrealtype hmin);
+SUNDIALS_EXPORT int IDASetStopTime(void *ida_mem, sunrealtype tstop);
 SUNDIALS_EXPORT int IDAClearStopTime(void *ida_mem);
 SUNDIALS_EXPORT int IDASetMaxErrTestFails(void *ida_mem, int maxnef);
-SUNDIALS_EXPORT int IDASetSuppressAlg(void *ida_mem, booleantype suppressalg);
+SUNDIALS_EXPORT int IDASetSuppressAlg(void *ida_mem, sunbooleantype suppressalg);
 SUNDIALS_EXPORT int IDASetId(void *ida_mem, N_Vector id);
 SUNDIALS_EXPORT int IDASetConstraints(void *ida_mem, N_Vector constraints);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
-int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
-                             realtype eta_max_fx);
+int IDASetEtaFixedStepBounds(void *ida_mem, sunrealtype eta_min_fx,
+                             sunrealtype eta_max_fx);
 SUNDIALS_EXPORT
-int IDASetEtaMin(void *ida_mem, realtype eta_min);
+int IDASetEtaMin(void *ida_mem, sunrealtype eta_min);
 SUNDIALS_EXPORT
-int IDASetEtaMax(void *ida_mem, realtype eta_max);
+int IDASetEtaMax(void *ida_mem, sunrealtype eta_max);
 SUNDIALS_EXPORT
-int IDASetEtaLow(void *ida_mem, realtype eta_low);
+int IDASetEtaLow(void *ida_mem, sunrealtype eta_low);
 SUNDIALS_EXPORT
-int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef);
+int IDASetEtaMinErrFail(void *ida_mem, sunrealtype eta_min_ef);
 SUNDIALS_EXPORT
-int IDASetEtaConvFail(void *ida_mem, realtype eta_cf);
+int IDASetEtaConvFail(void *ida_mem, sunrealtype eta_cf);
 
 /* Nonlinear solve input functions */
 SUNDIALS_EXPORT int IDASetMaxConvFails(void *ida_mem, int maxncf);
 SUNDIALS_EXPORT int IDASetMaxNonlinIters(void *ida_mem, int maxcor);
 SUNDIALS_EXPORT int IDASetNlsResFn(void *IDA_mem, IDAResFn res);
-SUNDIALS_EXPORT int IDASetNonlinConvCoef(void *ida_mem, realtype epcon);
+SUNDIALS_EXPORT int IDASetNonlinConvCoef(void *ida_mem, sunrealtype epcon);
 SUNDIALS_EXPORT int IDASetNonlinearSolver(void *ida_mem,
                                           SUNNonlinearSolver NLS);
 
@@ -179,7 +179,7 @@ SUNDIALS_EXPORT int IDASetRootDirection(void *ida_mem, int *rootdir);
 SUNDIALS_EXPORT int IDASetNoInactiveRootWarn(void *ida_mem);
 
 /* Solver function */
-SUNDIALS_EXPORT int IDASolve(void *ida_mem, realtype tout, realtype *tret,
+SUNDIALS_EXPORT int IDASolve(void *ida_mem, sunrealtype tout, sunrealtype *tret,
                              N_Vector yret, N_Vector ypret, int itask);
 
 /* Utility functions to update/compute y and yp based on ycor */
@@ -187,7 +187,7 @@ SUNDIALS_EXPORT int IDAComputeY(void *ida_mem, N_Vector ycor, N_Vector y);
 SUNDIALS_EXPORT int IDAComputeYp(void *ida_mem, N_Vector ycor, N_Vector yp);
 
 /* Dense output function */
-SUNDIALS_EXPORT int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky);
+SUNDIALS_EXPORT int IDAGetDky(void *ida_mem, sunrealtype t, int k, N_Vector dky);
 
 /* Optional output functions */
 SUNDIALS_EXPORT int IDAGetWorkSpace(void *ida_mem, long int *lenrw,
@@ -201,14 +201,14 @@ SUNDIALS_EXPORT int IDAGetConsistentIC(void *ida_mem, N_Vector yy0_mod,
                                        N_Vector yp0_mod);
 SUNDIALS_EXPORT int IDAGetLastOrder(void *ida_mem, int *klast);
 SUNDIALS_EXPORT int IDAGetCurrentOrder(void *ida_mem, int *kcur);
-SUNDIALS_EXPORT int IDAGetCurrentCj(void *ida_mem, realtype *cj);
+SUNDIALS_EXPORT int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj);
 SUNDIALS_EXPORT int IDAGetCurrentY(void *ida_mem, N_Vector *ycur);
 SUNDIALS_EXPORT int IDAGetCurrentYp(void *ida_mem, N_Vector *ypcur);
-SUNDIALS_EXPORT int IDAGetActualInitStep(void *ida_mem, realtype *hinused);
-SUNDIALS_EXPORT int IDAGetLastStep(void *ida_mem, realtype *hlast);
-SUNDIALS_EXPORT int IDAGetCurrentStep(void *ida_mem, realtype *hcur);
-SUNDIALS_EXPORT int IDAGetCurrentTime(void *ida_mem, realtype *tcur);
-SUNDIALS_EXPORT int IDAGetTolScaleFactor(void *ida_mem, realtype *tolsfact);
+SUNDIALS_EXPORT int IDAGetActualInitStep(void *ida_mem, sunrealtype *hinused);
+SUNDIALS_EXPORT int IDAGetLastStep(void *ida_mem, sunrealtype *hlast);
+SUNDIALS_EXPORT int IDAGetCurrentStep(void *ida_mem, sunrealtype *hcur);
+SUNDIALS_EXPORT int IDAGetCurrentTime(void *ida_mem, sunrealtype *tcur);
+SUNDIALS_EXPORT int IDAGetTolScaleFactor(void *ida_mem, sunrealtype *tolsfact);
 SUNDIALS_EXPORT int IDAGetErrWeights(void *ida_mem, N_Vector eweight);
 SUNDIALS_EXPORT int IDAGetEstLocalErrors(void *ida_mem, N_Vector ele);
 SUNDIALS_EXPORT int IDAGetNumGEvals(void *ida_mem, long int *ngevals);
@@ -218,13 +218,13 @@ SUNDIALS_EXPORT int IDAGetIntegratorStats(void *ida_mem, long int *nsteps,
                                           long int *nlinsetups,
                                           long int *netfails,
                                           int *qlast, int *qcur,
-                                          realtype *hinused, realtype *hlast,
-                                          realtype *hcur, realtype *tcur);
-SUNDIALS_EXPORT int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur,
+                                          sunrealtype *hinused, sunrealtype *hlast,
+                                          sunrealtype *hcur, sunrealtype *tcur);
+SUNDIALS_EXPORT int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur,
                                               N_Vector *yypred,
                                               N_Vector *yppred,
                                               N_Vector *yyn, N_Vector *ypn,
-                                              N_Vector *res, realtype *cj,
+                                              N_Vector *res, sunrealtype *cj,
                                               void **user_data);
 SUNDIALS_EXPORT int IDAGetNumNonlinSolvIters(void *ida_mem, long int *nniters);
 SUNDIALS_EXPORT int IDAGetNumNonlinSolvConvFails(void *ida_mem,
diff --git a/include/ida/ida_bbdpre.h b/include/ida/ida_bbdpre.h
index 8ba2af5b35..ccb3a3614c 100644
--- a/include/ida/ida_bbdpre.h
+++ b/include/ida/ida_bbdpre.h
@@ -29,11 +29,11 @@ extern "C" {
 
 /* User-supplied function Types */
 
-typedef int (*IDABBDLocalFn)(sunindextype Nlocal, realtype tt,
+typedef int (*IDABBDLocalFn)(sunindextype Nlocal, sunrealtype tt,
                              N_Vector yy, N_Vector yp, N_Vector gval,
                              void *user_data);
 
-typedef int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt,
+typedef int (*IDABBDCommFn)(sunindextype Nlocal, sunrealtype tt,
                             N_Vector yy, N_Vector yp, void *user_data);
 
 /* Exported Functions */
@@ -41,12 +41,12 @@ typedef int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt,
 SUNDIALS_EXPORT int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
                                    sunindextype mudq, sunindextype mldq,
                                    sunindextype mukeep, sunindextype mlkeep,
-                                   realtype dq_rel_yy,
+                                   sunrealtype dq_rel_yy,
                                    IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
 
 SUNDIALS_EXPORT int IDABBDPrecReInit(void *ida_mem,
                                      sunindextype mudq, sunindextype mldq,
-                                     realtype dq_rel_yy);
+                                     sunrealtype dq_rel_yy);
 
 /* Optional output functions */
 
diff --git a/include/ida/ida_ls.h b/include/ida/ida_ls.h
index 12a7fcb065..63a19bdc73 100644
--- a/include/ida/ida_ls.h
+++ b/include/ida/ida_ls.h
@@ -50,29 +50,29 @@ extern "C" {
   IDALS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*IDALsJacFn)(realtype t, realtype c_j, N_Vector y,
+typedef int (*IDALsJacFn)(sunrealtype t, sunrealtype c_j, N_Vector y,
                           N_Vector yp, N_Vector r, SUNMatrix Jac,
                           void *user_data, N_Vector tmp1,
                           N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*IDALsPrecSetupFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSetupFn)(sunrealtype tt, N_Vector yy,
                                 N_Vector yp, N_Vector rr,
-                                realtype c_j, void *user_data);
+                                sunrealtype c_j, void *user_data);
 
-typedef int (*IDALsPrecSolveFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSolveFn)(sunrealtype tt, N_Vector yy,
                                 N_Vector yp, N_Vector rr,
                                 N_Vector rvec, N_Vector zvec,
-                                realtype c_j, realtype delta,
+                                sunrealtype c_j, sunrealtype delta,
                                 void *user_data);
 
-typedef int (*IDALsJacTimesSetupFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsJacTimesSetupFn)(sunrealtype tt, N_Vector yy,
                                     N_Vector yp, N_Vector rr,
-                                    realtype c_j, void *user_data);
+                                    sunrealtype c_j, void *user_data);
 
-typedef int (*IDALsJacTimesVecFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsJacTimesVecFn)(sunrealtype tt, N_Vector yy,
                                   N_Vector yp, N_Vector rr,
                                   N_Vector v, N_Vector Jv,
-                                  realtype c_j, void *user_data,
+                                  sunrealtype c_j, void *user_data,
                                   N_Vector tmp1, N_Vector tmp2);
 
 
@@ -96,13 +96,13 @@ SUNDIALS_EXPORT int IDASetPreconditioner(void *ida_mem,
 SUNDIALS_EXPORT int IDASetJacTimes(void *ida_mem,
                                    IDALsJacTimesSetupFn jtsetup,
                                    IDALsJacTimesVecFn jtimes);
-SUNDIALS_EXPORT int IDASetEpsLin(void *ida_mem, realtype eplifac);
+SUNDIALS_EXPORT int IDASetEpsLin(void *ida_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int IDASetLSNormFactor(void *ida_mem,
-                                       realtype nrmfac);
+                                       sunrealtype nrmfac);
 SUNDIALS_EXPORT int IDASetLinearSolutionScaling(void *ida_mem,
-                                                booleantype onoff);
+                                                sunbooleantype onoff);
 SUNDIALS_EXPORT int IDASetIncrementFactor(void *ida_mem,
-                                          realtype dqincfac);
+                                          sunrealtype dqincfac);
 
 /*-----------------------------------------------------------------
   Optional outputs from the IDALS linear solver interface
diff --git a/include/idas/idas.h b/include/idas/idas.h
index f89f15bc67..213ed22e89 100644
--- a/include/idas/idas.h
+++ b/include/idas/idas.h
@@ -122,11 +122,11 @@ extern "C" {
  * User-Supplied Function Types
  * ------------------------------ */
 
-typedef int (*IDAResFn)(realtype tt, N_Vector yy, N_Vector yp,
+typedef int (*IDAResFn)(sunrealtype tt, N_Vector yy, N_Vector yp,
                         N_Vector rr, void *user_data);
 
-typedef int (*IDARootFn)(realtype t, N_Vector y, N_Vector yp,
-                         realtype *gout, void *user_data);
+typedef int (*IDARootFn)(sunrealtype t, N_Vector y, N_Vector yp,
+                         sunrealtype *gout, void *user_data);
 
 typedef int (*IDAEwtFn)(N_Vector y, N_Vector ewt, void *user_data);
 
@@ -134,39 +134,39 @@ typedef void (*IDAErrHandlerFn)(int error_code,
                                 const char *module, const char *function,
                                 char *msg, void *user_data);
 
-typedef int (*IDAQuadRhsFn)(realtype tres, N_Vector yy, N_Vector yp,
+typedef int (*IDAQuadRhsFn)(sunrealtype tres, N_Vector yy, N_Vector yp,
                             N_Vector rrQ, void *user_data);
 
-typedef int (*IDASensResFn)(int Ns, realtype t,
+typedef int (*IDASensResFn)(int Ns, sunrealtype t,
                             N_Vector yy, N_Vector yp, N_Vector resval,
                             N_Vector *yyS, N_Vector *ypS,
                             N_Vector *resvalS, void *user_data,
                             N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*IDAQuadSensRhsFn)(int Ns, realtype t,
+typedef int (*IDAQuadSensRhsFn)(int Ns, sunrealtype t,
                                N_Vector yy, N_Vector yp,
                                N_Vector *yyS, N_Vector *ypS,
                                N_Vector rrQ, N_Vector *rhsvalQS,
                                void *user_data,
                                N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS);
 
-typedef int (*IDAResFnB)(realtype tt,
+typedef int (*IDAResFnB)(sunrealtype tt,
                          N_Vector yy, N_Vector yp,
                          N_Vector yyB, N_Vector ypB,
                          N_Vector rrB, void *user_dataB);
 
-typedef int (*IDAResFnBS)(realtype t,
+typedef int (*IDAResFnBS)(sunrealtype t,
                           N_Vector yy, N_Vector yp,
                           N_Vector *yyS, N_Vector *ypS,
                           N_Vector yyB, N_Vector ypB,
                           N_Vector rrBS, void *user_dataB);
 
-typedef int (*IDAQuadRhsFnB)(realtype tt,
+typedef int (*IDAQuadRhsFnB)(sunrealtype tt,
                              N_Vector yy, N_Vector yp,
                              N_Vector yyB, N_Vector ypB,
                              N_Vector rhsvalBQ, void *user_dataB);
 
-typedef int (*IDAQuadRhsFnBS)(realtype t,
+typedef int (*IDAQuadRhsFnBS)(sunrealtype t,
                               N_Vector yy, N_Vector yp,
                               N_Vector *yyS, N_Vector *ypS,
                               N_Vector yyB, N_Vector ypB,
@@ -180,68 +180,68 @@ typedef int (*IDAQuadRhsFnBS)(realtype t,
 /* Initialization functions */
 SUNDIALS_EXPORT void *IDACreate(SUNContext sunctx);
 
-SUNDIALS_EXPORT int IDAInit(void *ida_mem, IDAResFn res, realtype t0,
+SUNDIALS_EXPORT int IDAInit(void *ida_mem, IDAResFn res, sunrealtype t0,
                             N_Vector yy0, N_Vector yp0);
-SUNDIALS_EXPORT int IDAReInit(void *ida_mem, realtype t0, N_Vector yy0,
+SUNDIALS_EXPORT int IDAReInit(void *ida_mem, sunrealtype t0, N_Vector yy0,
                               N_Vector yp0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int IDASStolerances(void *ida_mem, realtype reltol,
-                                    realtype abstol);
-SUNDIALS_EXPORT int IDASVtolerances(void *ida_mem, realtype reltol,
+SUNDIALS_EXPORT int IDASStolerances(void *ida_mem, sunrealtype reltol,
+                                    sunrealtype abstol);
+SUNDIALS_EXPORT int IDASVtolerances(void *ida_mem, sunrealtype reltol,
                                     N_Vector abstol);
 SUNDIALS_EXPORT int IDAWFtolerances(void *ida_mem, IDAEwtFn efun);
 
 /* Initial condition calculation function */
-SUNDIALS_EXPORT int IDACalcIC(void *ida_mem, int icopt, realtype tout1);
+SUNDIALS_EXPORT int IDACalcIC(void *ida_mem, int icopt, sunrealtype tout1);
 
 /* Initial condition calculation optional input functions */
-SUNDIALS_EXPORT int IDASetNonlinConvCoefIC(void *ida_mem, realtype epiccon);
+SUNDIALS_EXPORT int IDASetNonlinConvCoefIC(void *ida_mem, sunrealtype epiccon);
 SUNDIALS_EXPORT int IDASetMaxNumStepsIC(void *ida_mem, int maxnh);
 SUNDIALS_EXPORT int IDASetMaxNumJacsIC(void *ida_mem, int maxnj);
 SUNDIALS_EXPORT int IDASetMaxNumItersIC(void *ida_mem, int maxnit);
-SUNDIALS_EXPORT int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff);
-SUNDIALS_EXPORT int IDASetStepToleranceIC(void *ida_mem, realtype steptol);
+SUNDIALS_EXPORT int IDASetLineSearchOffIC(void *ida_mem, sunbooleantype lsoff);
+SUNDIALS_EXPORT int IDASetStepToleranceIC(void *ida_mem, sunrealtype steptol);
 SUNDIALS_EXPORT int IDASetMaxBacksIC(void *ida_mem, int maxbacks);
 
 /* Optional input functions */
-SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void *ida_max, realtype dcj);
+SUNDIALS_EXPORT int IDASetDeltaCjLSetup(void *ida_max, sunrealtype dcj);
 SUNDIALS_EXPORT int IDASetErrHandlerFn(void *ida_mem, IDAErrHandlerFn ehfun,
                                        void *eh_data);
 SUNDIALS_EXPORT int IDASetErrFile(void *ida_mem, FILE *errfp);
 SUNDIALS_EXPORT int IDASetUserData(void *ida_mem, void *user_data);
 SUNDIALS_EXPORT int IDASetMaxOrd(void *ida_mem, int maxord);
 SUNDIALS_EXPORT int IDASetMaxNumSteps(void *ida_mem, long int mxsteps);
-SUNDIALS_EXPORT int IDASetInitStep(void *ida_mem, realtype hin);
-SUNDIALS_EXPORT int IDASetMaxStep(void *ida_mem, realtype hmax);
-SUNDIALS_EXPORT int IDASetMinStep(void *ida_mem, realtype hmin);
-SUNDIALS_EXPORT int IDASetStopTime(void *ida_mem, realtype tstop);
+SUNDIALS_EXPORT int IDASetInitStep(void *ida_mem, sunrealtype hin);
+SUNDIALS_EXPORT int IDASetMaxStep(void *ida_mem, sunrealtype hmax);
+SUNDIALS_EXPORT int IDASetMinStep(void *ida_mem, sunrealtype hmin);
+SUNDIALS_EXPORT int IDASetStopTime(void *ida_mem, sunrealtype tstop);
 SUNDIALS_EXPORT int IDAClearStopTime(void *ida_mem);
 SUNDIALS_EXPORT int IDASetMaxErrTestFails(void *ida_mem, int maxnef);
-SUNDIALS_EXPORT int IDASetSuppressAlg(void *ida_mem, booleantype suppressalg);
+SUNDIALS_EXPORT int IDASetSuppressAlg(void *ida_mem, sunbooleantype suppressalg);
 SUNDIALS_EXPORT int IDASetId(void *ida_mem, N_Vector id);
 SUNDIALS_EXPORT int IDASetConstraints(void *ida_mem, N_Vector constraints);
 
 /* Optional step adaptivity input functions */
 SUNDIALS_EXPORT
-int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
-                             realtype eta_max_fx);
+int IDASetEtaFixedStepBounds(void *ida_mem, sunrealtype eta_min_fx,
+                             sunrealtype eta_max_fx);
 SUNDIALS_EXPORT
-int IDASetEtaMin(void *ida_mem, realtype eta_min);
+int IDASetEtaMin(void *ida_mem, sunrealtype eta_min);
 SUNDIALS_EXPORT
-int IDASetEtaMax(void *ida_mem, realtype eta_max);
+int IDASetEtaMax(void *ida_mem, sunrealtype eta_max);
 SUNDIALS_EXPORT
-int IDASetEtaLow(void *ida_mem, realtype eta_low);
+int IDASetEtaLow(void *ida_mem, sunrealtype eta_low);
 SUNDIALS_EXPORT
-int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef);
+int IDASetEtaMinErrFail(void *ida_mem, sunrealtype eta_min_ef);
 SUNDIALS_EXPORT
-int IDASetEtaConvFail(void *ida_mem, realtype eta_cf);
+int IDASetEtaConvFail(void *ida_mem, sunrealtype eta_cf);
 
 /* Nonlinear solve input functions */
 SUNDIALS_EXPORT int IDASetMaxConvFails(void *ida_mem, int maxncf);
 SUNDIALS_EXPORT int IDASetMaxNonlinIters(void *ida_mem, int maxcor);
 SUNDIALS_EXPORT int IDASetNlsResFn(void *IDA_mem, IDAResFn res);
-SUNDIALS_EXPORT int IDASetNonlinConvCoef(void *ida_mem, realtype epcon);
+SUNDIALS_EXPORT int IDASetNonlinConvCoef(void *ida_mem, sunrealtype epcon);
 SUNDIALS_EXPORT int IDASetNonlinearSolver(void *ida_mem,
                                           SUNNonlinearSolver NLS);
 
@@ -253,7 +253,7 @@ SUNDIALS_EXPORT int IDASetRootDirection(void *ida_mem, int *rootdir);
 SUNDIALS_EXPORT int IDASetNoInactiveRootWarn(void *ida_mem);
 
 /* Solver function */
-SUNDIALS_EXPORT int IDASolve(void *ida_mem, realtype tout, realtype *tret,
+SUNDIALS_EXPORT int IDASolve(void *ida_mem, sunrealtype tout, sunrealtype *tret,
                              N_Vector yret, N_Vector ypret, int itask);
 
 /* Utility functions to update/compute y and yp based on ycor */
@@ -263,7 +263,7 @@ SUNDIALS_EXPORT int IDAComputeYSens(void *ida_mem, N_Vector *ycor, N_Vector *yyS
 SUNDIALS_EXPORT int IDAComputeYpSens(void *ida_mem, N_Vector *ycor, N_Vector *ypS);
 
 /* Dense output function */
-SUNDIALS_EXPORT int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky);
+SUNDIALS_EXPORT int IDAGetDky(void *ida_mem, sunrealtype t, int k, N_Vector dky);
 
 /* Optional output functions */
 SUNDIALS_EXPORT int IDAGetWorkSpace(void *ida_mem, long int *lenrw,
@@ -277,16 +277,16 @@ SUNDIALS_EXPORT int IDAGetConsistentIC(void *ida_mem, N_Vector yy0_mod,
                                        N_Vector yp0_mod);
 SUNDIALS_EXPORT int IDAGetLastOrder(void *ida_mem, int *klast);
 SUNDIALS_EXPORT int IDAGetCurrentOrder(void *ida_mem, int *kcur);
-SUNDIALS_EXPORT int IDAGetCurrentCj(void *ida_mem, realtype *cj);
+SUNDIALS_EXPORT int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj);
 SUNDIALS_EXPORT int IDAGetCurrentY(void *ida_mem, N_Vector *ycur);
 SUNDIALS_EXPORT int IDAGetCurrentYSens(void *ida_mem, N_Vector **yS);
 SUNDIALS_EXPORT int IDAGetCurrentYp(void *ida_mem, N_Vector *ypcur);
 SUNDIALS_EXPORT int IDAGetCurrentYpSens(void *ida_mem, N_Vector **ypS);
-SUNDIALS_EXPORT int IDAGetActualInitStep(void *ida_mem, realtype *hinused);
-SUNDIALS_EXPORT int IDAGetLastStep(void *ida_mem, realtype *hlast);
-SUNDIALS_EXPORT int IDAGetCurrentStep(void *ida_mem, realtype *hcur);
-SUNDIALS_EXPORT int IDAGetCurrentTime(void *ida_mem, realtype *tcur);
-SUNDIALS_EXPORT int IDAGetTolScaleFactor(void *ida_mem, realtype *tolsfact);
+SUNDIALS_EXPORT int IDAGetActualInitStep(void *ida_mem, sunrealtype *hinused);
+SUNDIALS_EXPORT int IDAGetLastStep(void *ida_mem, sunrealtype *hlast);
+SUNDIALS_EXPORT int IDAGetCurrentStep(void *ida_mem, sunrealtype *hcur);
+SUNDIALS_EXPORT int IDAGetCurrentTime(void *ida_mem, sunrealtype *tcur);
+SUNDIALS_EXPORT int IDAGetTolScaleFactor(void *ida_mem, sunrealtype *tolsfact);
 SUNDIALS_EXPORT int IDAGetErrWeights(void *ida_mem, N_Vector eweight);
 SUNDIALS_EXPORT int IDAGetEstLocalErrors(void *ida_mem, N_Vector ele);
 SUNDIALS_EXPORT int IDAGetNumGEvals(void *ida_mem, long int *ngevals);
@@ -296,20 +296,20 @@ SUNDIALS_EXPORT int IDAGetIntegratorStats(void *ida_mem, long int *nsteps,
                                           long int *nlinsetups,
                                           long int *netfails,
                                           int *qlast, int *qcur,
-                                          realtype *hinused, realtype *hlast,
-                                          realtype *hcur, realtype *tcur);
-SUNDIALS_EXPORT int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur,
+                                          sunrealtype *hinused, sunrealtype *hlast,
+                                          sunrealtype *hcur, sunrealtype *tcur);
+SUNDIALS_EXPORT int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur,
                                               N_Vector *yypred,
                                               N_Vector *yppred,
                                               N_Vector *yyn, N_Vector *ypn,
-                                              N_Vector *res, realtype *cj,
+                                              N_Vector *res, sunrealtype *cj,
                                               void **user_data);
-SUNDIALS_EXPORT int IDAGetNonlinearSystemDataSens(void *ida_mem, realtype *tcur,
+SUNDIALS_EXPORT int IDAGetNonlinearSystemDataSens(void *ida_mem, sunrealtype *tcur,
                                                   N_Vector **yySpred,
                                                   N_Vector **ypSpred,
                                                   N_Vector **yySn,
                                                   N_Vector **ypSn,
-                                                  realtype *cj,
+                                                  sunrealtype *cj,
                                                   void **user_data);
 SUNDIALS_EXPORT int IDAGetNumNonlinSolvIters(void *ida_mem, long int *nniters);
 SUNDIALS_EXPORT int IDAGetNumNonlinSolvConvFails(void *ida_mem,
@@ -340,17 +340,17 @@ SUNDIALS_EXPORT int IDAQuadInit(void *ida_mem, IDAQuadRhsFn rhsQ, N_Vector yQ0);
 SUNDIALS_EXPORT int IDAQuadReInit(void *ida_mem, N_Vector yQ0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int IDAQuadSStolerances(void *ida_mem, realtype reltolQ,
-                                        realtype abstolQ);
-SUNDIALS_EXPORT int IDAQuadSVtolerances(void *ida_mem, realtype reltolQ,
+SUNDIALS_EXPORT int IDAQuadSStolerances(void *ida_mem, sunrealtype reltolQ,
+                                        sunrealtype abstolQ);
+SUNDIALS_EXPORT int IDAQuadSVtolerances(void *ida_mem, sunrealtype reltolQ,
                                         N_Vector abstolQ);
 
 /* Optional input specification functions */
-SUNDIALS_EXPORT int IDASetQuadErrCon(void *ida_mem, booleantype errconQ);
+SUNDIALS_EXPORT int IDASetQuadErrCon(void *ida_mem, sunbooleantype errconQ);
 
 /* Extraction and dense output functions */
-SUNDIALS_EXPORT int IDAGetQuad(void *ida_mem, realtype *t, N_Vector yQout);
-SUNDIALS_EXPORT int IDAGetQuadDky(void *ida_mem, realtype t, int k,
+SUNDIALS_EXPORT int IDAGetQuad(void *ida_mem, sunrealtype *t, N_Vector yQout);
+SUNDIALS_EXPORT int IDAGetQuadDky(void *ida_mem, sunrealtype t, int k,
                                   N_Vector dky);
 
 /* Optional output specification functions */
@@ -377,9 +377,9 @@ SUNDIALS_EXPORT int IDASensReInit(void *ida_mem, int ism, N_Vector *yS0,
                                   N_Vector *ypS0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int IDASensSStolerances(void *ida_mem, realtype reltolS,
-                                        realtype *abstolS);
-SUNDIALS_EXPORT int IDASensSVtolerances(void *ida_mem, realtype reltolS,
+SUNDIALS_EXPORT int IDASensSStolerances(void *ida_mem, sunrealtype reltolS,
+                                        sunrealtype *abstolS);
+SUNDIALS_EXPORT int IDASensSVtolerances(void *ida_mem, sunrealtype reltolS,
                                         N_Vector *abstolS);
 SUNDIALS_EXPORT int IDASensEEtolerances(void *ida_mem);
 
@@ -389,10 +389,10 @@ SUNDIALS_EXPORT int IDAGetSensConsistentIC(void *ida_mem, N_Vector *yyS0,
 
 /* Optional input specification functions */
 SUNDIALS_EXPORT int IDASetSensDQMethod(void *ida_mem, int DQtype,
-                                       realtype DQrhomax);
-SUNDIALS_EXPORT int IDASetSensErrCon(void *ida_mem, booleantype errconS);
+                                       sunrealtype DQrhomax);
+SUNDIALS_EXPORT int IDASetSensErrCon(void *ida_mem, sunbooleantype errconS);
 SUNDIALS_EXPORT int IDASetSensMaxNonlinIters(void *ida_mem, int maxcorS);
-SUNDIALS_EXPORT int IDASetSensParams(void *ida_mem, realtype *p, realtype *pbar,
+SUNDIALS_EXPORT int IDASetSensParams(void *ida_mem, sunrealtype *p, sunrealtype *pbar,
                                      int *plist);
 
 /* Integrator nonlinear solver specification functions */
@@ -405,13 +405,13 @@ SUNDIALS_EXPORT int IDASetNonlinearSolverSensStg(void *ida_mem,
 SUNDIALS_EXPORT int IDASensToggleOff(void *ida_mem);
 
 /* Extraction and dense output functions */
-SUNDIALS_EXPORT int IDAGetSens(void *ida_mem, realtype *tret, N_Vector *yySout);
-SUNDIALS_EXPORT int IDAGetSens1(void *ida_mem, realtype *tret, int is,
+SUNDIALS_EXPORT int IDAGetSens(void *ida_mem, sunrealtype *tret, N_Vector *yySout);
+SUNDIALS_EXPORT int IDAGetSens1(void *ida_mem, sunrealtype *tret, int is,
                                 N_Vector yySret);
 
-SUNDIALS_EXPORT int IDAGetSensDky(void *ida_mem, realtype t, int k,
+SUNDIALS_EXPORT int IDAGetSensDky(void *ida_mem, sunrealtype t, int k,
                                   N_Vector *dkyS);
-SUNDIALS_EXPORT int IDAGetSensDky1(void *ida_mem, realtype t, int k, int is,
+SUNDIALS_EXPORT int IDAGetSensDky1(void *ida_mem, sunrealtype t, int k, int is,
                                    N_Vector dkyS);
 
 /* Optional output specification functions */
@@ -449,23 +449,23 @@ SUNDIALS_EXPORT int IDAQuadSensInit(void *ida_mem, IDAQuadSensRhsFn resQS,
 SUNDIALS_EXPORT int IDAQuadSensReInit(void *ida_mem, N_Vector *yQS0);
 
 /* Tolerance input functions */
-SUNDIALS_EXPORT int IDAQuadSensSStolerances(void *ida_mem, realtype reltolQS,
-                                            realtype *abstolQS);
-SUNDIALS_EXPORT int IDAQuadSensSVtolerances(void *ida_mem, realtype reltolQS,
+SUNDIALS_EXPORT int IDAQuadSensSStolerances(void *ida_mem, sunrealtype reltolQS,
+                                            sunrealtype *abstolQS);
+SUNDIALS_EXPORT int IDAQuadSensSVtolerances(void *ida_mem, sunrealtype reltolQS,
                                             N_Vector *abstolQS);
 SUNDIALS_EXPORT int IDAQuadSensEEtolerances(void *ida_mem);
 
 /* Optional input specification functions */
-SUNDIALS_EXPORT int IDASetQuadSensErrCon(void *ida_mem, booleantype errconQS);
+SUNDIALS_EXPORT int IDASetQuadSensErrCon(void *ida_mem, sunbooleantype errconQS);
 
 /* Extraction and dense output functions */
-SUNDIALS_EXPORT int IDAGetQuadSens(void *ida_mem, realtype *tret,
+SUNDIALS_EXPORT int IDAGetQuadSens(void *ida_mem, sunrealtype *tret,
                                    N_Vector *yyQSout);
-SUNDIALS_EXPORT int IDAGetQuadSens1(void *ida_mem, realtype *tret, int is,
+SUNDIALS_EXPORT int IDAGetQuadSens1(void *ida_mem, sunrealtype *tret, int is,
                                     N_Vector yyQSret);
-SUNDIALS_EXPORT int IDAGetQuadSensDky(void *ida_mem, realtype t, int k,
+SUNDIALS_EXPORT int IDAGetQuadSensDky(void *ida_mem, sunrealtype t, int k,
                                       N_Vector *dkyQS);
-SUNDIALS_EXPORT int IDAGetQuadSensDky1(void *ida_mem, realtype t, int k, int is,
+SUNDIALS_EXPORT int IDAGetQuadSensDky1(void *ida_mem, sunrealtype t, int k, int is,
                                        N_Vector dkyQS);
 
 /* Optional output specification functions */
@@ -500,18 +500,18 @@ SUNDIALS_EXPORT void IDAAdjFree(void *ida_mem);
 SUNDIALS_EXPORT int IDACreateB(void *ida_mem, int *which);
 
 SUNDIALS_EXPORT int IDAInitB(void *ida_mem, int which, IDAResFnB resB,
-                             realtype tB0, N_Vector yyB0, N_Vector ypB0);
+                             sunrealtype tB0, N_Vector yyB0, N_Vector ypB0);
 
 SUNDIALS_EXPORT int IDAInitBS(void *ida_mem, int which, IDAResFnBS resS,
-                              realtype tB0, N_Vector yyB0, N_Vector ypB0);
+                              sunrealtype tB0, N_Vector yyB0, N_Vector ypB0);
 
 SUNDIALS_EXPORT int IDAReInitB(void *ida_mem, int which,
-                               realtype tB0, N_Vector yyB0, N_Vector ypB0);
+                               sunrealtype tB0, N_Vector yyB0, N_Vector ypB0);
 
 SUNDIALS_EXPORT int IDASStolerancesB(void *ida_mem, int which,
-                                     realtype relTolB, realtype absTolB);
+                                     sunrealtype relTolB, sunrealtype absTolB);
 SUNDIALS_EXPORT int IDASVtolerancesB(void *ida_mem, int which,
-                                     realtype relTolB, N_Vector absTolB);
+                                     sunrealtype relTolB, N_Vector absTolB);
 
 SUNDIALS_EXPORT int IDAQuadInitB(void *ida_mem, int which,
                                  IDAQuadRhsFnB rhsQB, N_Vector yQB0);
@@ -522,29 +522,29 @@ SUNDIALS_EXPORT int IDAQuadInitBS(void *ida_mem, int which,
 SUNDIALS_EXPORT int IDAQuadReInitB(void *ida_mem, int which, N_Vector yQB0);
 
 SUNDIALS_EXPORT int IDAQuadSStolerancesB(void *ida_mem, int which,
-                                         realtype reltolQB, realtype abstolQB);
+                                         sunrealtype reltolQB, sunrealtype abstolQB);
 SUNDIALS_EXPORT int IDAQuadSVtolerancesB(void *ida_mem, int which,
-                                         realtype reltolQB, N_Vector abstolQB);
+                                         sunrealtype reltolQB, N_Vector abstolQB);
 
 /* Consistent IC calculation functions */
 
-SUNDIALS_EXPORT int IDACalcICB (void *ida_mem, int which, realtype tout1,
+SUNDIALS_EXPORT int IDACalcICB (void *ida_mem, int which, sunrealtype tout1,
                                 N_Vector yy0, N_Vector yp0);
 
-SUNDIALS_EXPORT int IDACalcICBS(void *ida_mem, int which, realtype tout1,
+SUNDIALS_EXPORT int IDACalcICBS(void *ida_mem, int which, sunrealtype tout1,
                                 N_Vector yy0, N_Vector yp0,
                                 N_Vector *yyS0, N_Vector *ypS0);
 
 /* Solver Function For Forward Problems */
 
-SUNDIALS_EXPORT int IDASolveF(void *ida_mem, realtype tout,
-                              realtype *tret,
+SUNDIALS_EXPORT int IDASolveF(void *ida_mem, sunrealtype tout,
+                              sunrealtype *tret,
                               N_Vector yret, N_Vector ypret,
                               int itask, int *ncheckPtr);
 
 /* Solver Function For Backward Problems */
 
-SUNDIALS_EXPORT int IDASolveB(void *ida_mem, realtype tBout, int itaskB);
+SUNDIALS_EXPORT int IDASolveB(void *ida_mem, sunrealtype tBout, int itaskB);
 
 /* Optional Input Functions For Adjoint Problems */
 
@@ -554,10 +554,10 @@ SUNDIALS_EXPORT int IDASetUserDataB(void *ida_mem, int which, void *user_dataB);
 SUNDIALS_EXPORT int IDASetMaxOrdB(void *ida_mem, int which, int maxordB);
 SUNDIALS_EXPORT int IDASetMaxNumStepsB(void *ida_mem, int which,
                                        long int mxstepsB);
-SUNDIALS_EXPORT int IDASetInitStepB(void *ida_mem, int which, realtype hinB);
-SUNDIALS_EXPORT int IDASetMaxStepB(void *ida_mem, int which, realtype hmaxB);
+SUNDIALS_EXPORT int IDASetInitStepB(void *ida_mem, int which, sunrealtype hinB);
+SUNDIALS_EXPORT int IDASetMaxStepB(void *ida_mem, int which, sunrealtype hmaxB);
 SUNDIALS_EXPORT int IDASetSuppressAlgB(void *ida_mem, int which,
-                                       booleantype suppressalgB);
+                                       sunbooleantype suppressalgB);
 SUNDIALS_EXPORT int IDASetIdB(void *ida_mem, int which, N_Vector idB);
 SUNDIALS_EXPORT int IDASetConstraintsB(void *ida_mem, int which,
                                        N_Vector constraintsB);
@@ -568,10 +568,10 @@ SUNDIALS_EXPORT int IDASetNonlinearSolverB(void *ida_mem, int which,
 
 /* Extraction And Dense Output Functions For Backward Problems */
 
-SUNDIALS_EXPORT int IDAGetB(void* ida_mem, int which, realtype *tret,
+SUNDIALS_EXPORT int IDAGetB(void* ida_mem, int which, sunrealtype *tret,
                             N_Vector yy, N_Vector yp);
 SUNDIALS_EXPORT int IDAGetQuadB(void *ida_mem, int which,
-                                realtype *tret, N_Vector qB);
+                                sunrealtype *tret, N_Vector qB);
 
 /* Optional Output Functions For Backward Problems */
 
@@ -580,17 +580,17 @@ SUNDIALS_EXPORT void *IDAGetAdjIDABmem(void *ida_mem, int which);
 SUNDIALS_EXPORT int IDAGetConsistentICB(void *ida_mem, int which,
                                         N_Vector yyB0, N_Vector ypB0);
 
-SUNDIALS_EXPORT int IDAGetAdjY(void *ida_mem, realtype t,
+SUNDIALS_EXPORT int IDAGetAdjY(void *ida_mem, sunrealtype t,
                                N_Vector yy, N_Vector yp);
 
 typedef struct {
   void *my_addr;
   void *next_addr;
-  realtype t0;
-  realtype t1;
+  sunrealtype t0;
+  sunrealtype t1;
   long int nstep;
   int order;
-  realtype step;
+  sunrealtype step;
 } IDAadjCheckPointRec;
 
 SUNDIALS_EXPORT int IDAGetAdjCheckPointsInfo(void *ida_mem,
@@ -622,11 +622,11 @@ SUNDIALS_EXPORT int IDASetJacTimesResFnB(void *ida_mem, int which,
  * ----------------------------------------------------------------- */
 
 SUNDIALS_EXPORT int IDAGetAdjDataPointHermite(void *ida_mem, int which,
-                                              realtype *t, N_Vector yy,
+                                              sunrealtype *t, N_Vector yy,
                                               N_Vector yd);
 
 SUNDIALS_EXPORT int IDAGetAdjDataPointPolynomial(void *ida_mem, int which,
-                                                 realtype *t, int *order,
+                                                 sunrealtype *t, int *order,
                                                  N_Vector y);
 
 /* -----------------------------------------------------------------
diff --git a/include/idas/idas_bbdpre.h b/include/idas/idas_bbdpre.h
index 670ae5790e..e4ee717188 100644
--- a/include/idas/idas_bbdpre.h
+++ b/include/idas/idas_bbdpre.h
@@ -32,11 +32,11 @@ extern "C" {
 
 /* User-supplied function Types */
 
-typedef int (*IDABBDLocalFn)(sunindextype Nlocal, realtype tt,
+typedef int (*IDABBDLocalFn)(sunindextype Nlocal, sunrealtype tt,
                              N_Vector yy, N_Vector yp, N_Vector gval,
                              void *user_data);
 
-typedef int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt,
+typedef int (*IDABBDCommFn)(sunindextype Nlocal, sunrealtype tt,
                             N_Vector yy, N_Vector yp, void *user_data);
 
 /* Exported Functions */
@@ -44,12 +44,12 @@ typedef int (*IDABBDCommFn)(sunindextype Nlocal, realtype tt,
 SUNDIALS_EXPORT int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
                                    sunindextype mudq, sunindextype mldq,
                                    sunindextype mukeep, sunindextype mlkeep,
-                                   realtype dq_rel_yy,
+                                   sunrealtype dq_rel_yy,
                                    IDABBDLocalFn Gres, IDABBDCommFn Gcomm);
 
 SUNDIALS_EXPORT int IDABBDPrecReInit(void *ida_mem,
                                      sunindextype mudq, sunindextype mldq,
-                                     realtype dq_rel_yy);
+                                     sunrealtype dq_rel_yy);
 
 /* Optional output functions */
 
@@ -67,12 +67,12 @@ SUNDIALS_EXPORT int IDABBDPrecGetNumGfnEvals(void *ida_mem,
 
 /* User-Supplied Function Types */
 
-typedef int (*IDABBDLocalFnB)(sunindextype NlocalB, realtype tt,
+typedef int (*IDABBDLocalFnB)(sunindextype NlocalB, sunrealtype tt,
                               N_Vector yy, N_Vector yp,
                               N_Vector yyB, N_Vector ypB,
                               N_Vector gvalB, void *user_dataB);
 
-typedef int (*IDABBDCommFnB)(sunindextype NlocalB, realtype tt,
+typedef int (*IDABBDCommFnB)(sunindextype NlocalB, sunrealtype tt,
                              N_Vector yy, N_Vector yp,
                              N_Vector yyB, N_Vector ypB, void *user_dataB);
 
@@ -81,12 +81,12 @@ typedef int (*IDABBDCommFnB)(sunindextype NlocalB, realtype tt,
 SUNDIALS_EXPORT int IDABBDPrecInitB(void *ida_mem, int which, sunindextype NlocalB,
                                     sunindextype mudqB, sunindextype mldqB,
                                     sunindextype mukeepB, sunindextype mlkeepB,
-                                    realtype dq_rel_yyB,
+                                    sunrealtype dq_rel_yyB,
                                     IDABBDLocalFnB GresB, IDABBDCommFnB GcommB);
 
 SUNDIALS_EXPORT int IDABBDPrecReInitB(void *ida_mem, int which,
                                       sunindextype mudqB, sunindextype mldqB,
-                                      realtype dq_rel_yyB);
+                                      sunrealtype dq_rel_yyB);
 
 
 #ifdef __cplusplus
diff --git a/include/idas/idas_ls.h b/include/idas/idas_ls.h
index 1b6010be02..ab1b9fc323 100644
--- a/include/idas/idas_ls.h
+++ b/include/idas/idas_ls.h
@@ -57,29 +57,29 @@ extern "C" {
   IDALS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*IDALsJacFn)(realtype t, realtype c_j, N_Vector y,
+typedef int (*IDALsJacFn)(sunrealtype t, sunrealtype c_j, N_Vector y,
                           N_Vector yp, N_Vector r, SUNMatrix Jac,
                           void *user_data, N_Vector tmp1,
                           N_Vector tmp2, N_Vector tmp3);
 
-typedef int (*IDALsPrecSetupFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSetupFn)(sunrealtype tt, N_Vector yy,
                                 N_Vector yp, N_Vector rr,
-                                realtype c_j, void *user_data);
+                                sunrealtype c_j, void *user_data);
 
-typedef int (*IDALsPrecSolveFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSolveFn)(sunrealtype tt, N_Vector yy,
                                 N_Vector yp, N_Vector rr,
                                 N_Vector rvec, N_Vector zvec,
-                                realtype c_j, realtype delta,
+                                sunrealtype c_j, sunrealtype delta,
                                 void *user_data);
 
-typedef int (*IDALsJacTimesSetupFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsJacTimesSetupFn)(sunrealtype tt, N_Vector yy,
                                     N_Vector yp, N_Vector rr,
-                                    realtype c_j, void *user_data);
+                                    sunrealtype c_j, void *user_data);
 
-typedef int (*IDALsJacTimesVecFn)(realtype tt, N_Vector yy,
+typedef int (*IDALsJacTimesVecFn)(sunrealtype tt, N_Vector yy,
                                   N_Vector yp, N_Vector rr,
                                   N_Vector v, N_Vector Jv,
-                                  realtype c_j, void *user_data,
+                                  sunrealtype c_j, void *user_data,
                                   N_Vector tmp1, N_Vector tmp2);
 
 
@@ -103,13 +103,13 @@ SUNDIALS_EXPORT int IDASetPreconditioner(void *ida_mem,
 SUNDIALS_EXPORT int IDASetJacTimes(void *ida_mem,
                                    IDALsJacTimesSetupFn jtsetup,
                                    IDALsJacTimesVecFn jtimes);
-SUNDIALS_EXPORT int IDASetEpsLin(void *ida_mem, realtype eplifac);
+SUNDIALS_EXPORT int IDASetEpsLin(void *ida_mem, sunrealtype eplifac);
 SUNDIALS_EXPORT int IDASetLSNormFactor(void *ida_mem,
-                                       realtype nrmfac);
+                                       sunrealtype nrmfac);
 SUNDIALS_EXPORT int IDASetLinearSolutionScaling(void *ida_mem,
-                                                booleantype onoff);
+                                                sunbooleantype onoff);
 SUNDIALS_EXPORT int IDASetIncrementFactor(void *ida_mem,
-                                          realtype dqincfac);
+                                          sunrealtype dqincfac);
 
 /*-----------------------------------------------------------------
   Optional outputs from the IDALS linear solver interface
@@ -151,69 +151,69 @@ SUNDIALS_EXPORT char *IDAGetLinReturnFlagName(long int flag);
   IDALS user-supplied function prototypes
   =================================================================*/
 
-typedef int (*IDALsJacFnB)(realtype tt, realtype c_jB, N_Vector yy,
+typedef int (*IDALsJacFnB)(sunrealtype tt, sunrealtype c_jB, N_Vector yy,
                            N_Vector yp, N_Vector yyB, N_Vector ypB,
                            N_Vector rrB, SUNMatrix JacB,
                            void *user_dataB, N_Vector tmp1B,
                            N_Vector tmp2B, N_Vector tmp3B);
 
-typedef int (*IDALsJacFnBS)(realtype tt, realtype c_jB, N_Vector yy,
+typedef int (*IDALsJacFnBS)(sunrealtype tt, sunrealtype c_jB, N_Vector yy,
                             N_Vector yp, N_Vector *yS, N_Vector *ypS,
                             N_Vector yyB, N_Vector ypB, N_Vector rrB,
                             SUNMatrix JacB, void *user_dataB,
                             N_Vector tmp1B, N_Vector tmp2B,
                             N_Vector tmp3B);
 
-typedef int (*IDALsPrecSetupFnB)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSetupFnB)(sunrealtype tt, N_Vector yy,
                                  N_Vector yp, N_Vector yyB,
                                  N_Vector ypB, N_Vector rrB,
-                                 realtype c_jB, void *user_dataB);
+                                 sunrealtype c_jB, void *user_dataB);
 
-typedef int (*IDALsPrecSetupFnBS)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSetupFnBS)(sunrealtype tt, N_Vector yy,
                                   N_Vector yp, N_Vector *yyS,
                                   N_Vector *ypS, N_Vector yyB,
                                   N_Vector ypB, N_Vector rrB,
-                                  realtype c_jB, void *user_dataB);
+                                  sunrealtype c_jB, void *user_dataB);
 
-typedef int (*IDALsPrecSolveFnB)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSolveFnB)(sunrealtype tt, N_Vector yy,
                                  N_Vector yp, N_Vector yyB,
                                  N_Vector ypB, N_Vector rrB,
                                  N_Vector rvecB, N_Vector zvecB,
-                                 realtype c_jB, realtype deltaB,
+                                 sunrealtype c_jB, sunrealtype deltaB,
                                  void *user_dataB);
 
-typedef int (*IDALsPrecSolveFnBS)(realtype tt, N_Vector yy,
+typedef int (*IDALsPrecSolveFnBS)(sunrealtype tt, N_Vector yy,
                                   N_Vector yp, N_Vector *yyS,
                                   N_Vector *ypS, N_Vector yyB,
                                   N_Vector ypB, N_Vector rrB,
                                   N_Vector rvecB, N_Vector zvecB,
-                                  realtype c_jB, realtype deltaB,
+                                  sunrealtype c_jB, sunrealtype deltaB,
                                   void *user_dataB);
 
-typedef int (*IDALsJacTimesSetupFnB)(realtype t, N_Vector yy,
+typedef int (*IDALsJacTimesSetupFnB)(sunrealtype t, N_Vector yy,
                                      N_Vector yp, N_Vector yyB,
                                      N_Vector ypB, N_Vector rrB,
-                                     realtype c_jB, void *user_dataB);
+                                     sunrealtype c_jB, void *user_dataB);
 
-typedef int (*IDALsJacTimesSetupFnBS)(realtype t, N_Vector yy,
+typedef int (*IDALsJacTimesSetupFnBS)(sunrealtype t, N_Vector yy,
                                       N_Vector yp, N_Vector *yyS,
                                       N_Vector *ypS, N_Vector yyB,
                                       N_Vector ypB, N_Vector rrB,
-                                      realtype c_jB, void *user_dataB);
+                                      sunrealtype c_jB, void *user_dataB);
 
-typedef int (*IDALsJacTimesVecFnB)(realtype t, N_Vector yy,
+typedef int (*IDALsJacTimesVecFnB)(sunrealtype t, N_Vector yy,
                                    N_Vector yp, N_Vector yyB,
                                    N_Vector ypB, N_Vector rrB,
                                    N_Vector vB, N_Vector JvB,
-                                   realtype c_jB, void *user_dataB,
+                                   sunrealtype c_jB, void *user_dataB,
                                    N_Vector tmp1B, N_Vector tmp2B);
 
-typedef int (*IDALsJacTimesVecFnBS)(realtype t, N_Vector yy,
+typedef int (*IDALsJacTimesVecFnBS)(sunrealtype t, N_Vector yy,
                                     N_Vector yp, N_Vector *yyS,
                                     N_Vector *ypS, N_Vector yyB,
                                     N_Vector ypB, N_Vector rrB,
                                     N_Vector vB, N_Vector JvB,
-                                    realtype c_jB, void *user_dataB,
+                                    sunrealtype c_jB, void *user_dataB,
                                     N_Vector tmp1B, N_Vector tmp2B);
 
 
@@ -239,13 +239,13 @@ SUNDIALS_EXPORT int IDASetJacFnBS(void *ida_mem, int which,
                                   IDALsJacFnBS jacBS);
 
 SUNDIALS_EXPORT int IDASetEpsLinB(void *ida_mem, int which,
-                                  realtype eplifacB);
+                                  sunrealtype eplifacB);
 SUNDIALS_EXPORT int IDASetLSNormFactorB(void *ida_mem, int which,
-                                        realtype nrmfacB);
+                                        sunrealtype nrmfacB);
 SUNDIALS_EXPORT int IDASetLinearSolutionScalingB(void *ida_mem, int which,
-                                                 booleantype onoffB);
+                                                 sunbooleantype onoffB);
 SUNDIALS_EXPORT int IDASetIncrementFactorB(void *ida_mem, int which,
-                                           realtype dqincfacB);
+                                           sunrealtype dqincfacB);
 SUNDIALS_EXPORT int IDASetPreconditionerB(void *ida_mem, int which,
                                           IDALsPrecSetupFnB psetB,
                                           IDALsPrecSolveFnB psolveB);
diff --git a/include/kinsol/kinsol.h b/include/kinsol/kinsol.h
index 5a306fc967..a6518d6796 100644
--- a/include/kinsol/kinsol.h
+++ b/include/kinsol/kinsol.h
@@ -106,30 +106,30 @@ SUNDIALS_EXPORT int KINSol(void *kinmem, N_Vector uu, int strategy,
 
 /* Optional input functions */
 SUNDIALS_EXPORT int KINSetUserData(void *kinmem, void *user_data);
-SUNDIALS_EXPORT int KINSetDamping(void *kinmem, realtype beta);
+SUNDIALS_EXPORT int KINSetDamping(void *kinmem, sunrealtype beta);
 SUNDIALS_EXPORT int KINSetMAA(void *kinmem, long int maa);
 SUNDIALS_EXPORT int KINSetOrthAA(void *kinmem, int orthaa);
 SUNDIALS_EXPORT int KINSetDelayAA(void *kinmem, long int delay);
-SUNDIALS_EXPORT int KINSetDampingAA(void *kinmem, realtype beta);
-SUNDIALS_EXPORT int KINSetReturnNewest(void *kinmem, booleantype ret_newest);
+SUNDIALS_EXPORT int KINSetDampingAA(void *kinmem, sunrealtype beta);
+SUNDIALS_EXPORT int KINSetReturnNewest(void *kinmem, sunbooleantype ret_newest);
 SUNDIALS_EXPORT int KINSetNumMaxIters(void *kinmem, long int mxiter);
-SUNDIALS_EXPORT int KINSetNoInitSetup(void *kinmem, booleantype noInitSetup);
-SUNDIALS_EXPORT int KINSetNoResMon(void *kinmem, booleantype noNNIResMon);
+SUNDIALS_EXPORT int KINSetNoInitSetup(void *kinmem, sunbooleantype noInitSetup);
+SUNDIALS_EXPORT int KINSetNoResMon(void *kinmem, sunbooleantype noNNIResMon);
 SUNDIALS_EXPORT int KINSetMaxSetupCalls(void *kinmem, long int msbset);
 SUNDIALS_EXPORT int KINSetMaxSubSetupCalls(void *kinmem, long int msbsetsub);
 SUNDIALS_EXPORT int KINSetEtaForm(void *kinmem, int etachoice);
-SUNDIALS_EXPORT int KINSetEtaConstValue(void *kinmem, realtype eta);
-SUNDIALS_EXPORT int KINSetEtaParams(void *kinmem, realtype egamma,
-                                    realtype ealpha);
-SUNDIALS_EXPORT int KINSetResMonParams(void *kinmem, realtype omegamin,
-                                       realtype omegamax);
-SUNDIALS_EXPORT int KINSetResMonConstValue(void *kinmem, realtype omegaconst);
-SUNDIALS_EXPORT int KINSetNoMinEps(void *kinmem, booleantype noMinEps);
-SUNDIALS_EXPORT int KINSetMaxNewtonStep(void *kinmem, realtype mxnewtstep);
+SUNDIALS_EXPORT int KINSetEtaConstValue(void *kinmem, sunrealtype eta);
+SUNDIALS_EXPORT int KINSetEtaParams(void *kinmem, sunrealtype egamma,
+                                    sunrealtype ealpha);
+SUNDIALS_EXPORT int KINSetResMonParams(void *kinmem, sunrealtype omegamin,
+                                       sunrealtype omegamax);
+SUNDIALS_EXPORT int KINSetResMonConstValue(void *kinmem, sunrealtype omegaconst);
+SUNDIALS_EXPORT int KINSetNoMinEps(void *kinmem, sunbooleantype noMinEps);
+SUNDIALS_EXPORT int KINSetMaxNewtonStep(void *kinmem, sunrealtype mxnewtstep);
 SUNDIALS_EXPORT int KINSetMaxBetaFails(void *kinmem, long int mxnbcf);
-SUNDIALS_EXPORT int KINSetRelErrFunc(void *kinmem, realtype relfunc);
-SUNDIALS_EXPORT int KINSetFuncNormTol(void *kinmem, realtype fnormtol);
-SUNDIALS_EXPORT int KINSetScaledStepTol(void *kinmem, realtype scsteptol);
+SUNDIALS_EXPORT int KINSetRelErrFunc(void *kinmem, sunrealtype relfunc);
+SUNDIALS_EXPORT int KINSetFuncNormTol(void *kinmem, sunrealtype fnormtol);
+SUNDIALS_EXPORT int KINSetScaledStepTol(void *kinmem, sunrealtype scsteptol);
 SUNDIALS_EXPORT int KINSetConstraints(void *kinmem, N_Vector constraints);
 SUNDIALS_EXPORT int KINSetSysFunc(void *kinmem, KINSysFn func);
 
@@ -145,8 +145,8 @@ SUNDIALS_EXPORT int KINGetNumNonlinSolvIters(void *kinmem, long int *nniters);
 SUNDIALS_EXPORT int KINGetNumFuncEvals(void *kinmem, long int *nfevals);
 SUNDIALS_EXPORT int KINGetNumBetaCondFails(void *kinmem, long int *nbcfails);
 SUNDIALS_EXPORT int KINGetNumBacktrackOps(void *kinmem, long int *nbacktr);
-SUNDIALS_EXPORT int KINGetFuncNorm(void *kinmem, realtype *fnorm);
-SUNDIALS_EXPORT int KINGetStepLength(void *kinmem, realtype *steplength);
+SUNDIALS_EXPORT int KINGetFuncNorm(void *kinmem, sunrealtype *fnorm);
+SUNDIALS_EXPORT int KINGetStepLength(void *kinmem, sunrealtype *steplength);
 SUNDIALS_EXPORT int KINGetUserData(void *kinmem, void **user_data);
 SUNDIALS_EXPORT int KINPrintAllStats(void *kinmem, FILE *outfile,
                                      SUNOutputFormat fmt);
diff --git a/include/kinsol/kinsol_bbdpre.h b/include/kinsol/kinsol_bbdpre.h
index 50b7f00d13..8e0823ccd9 100644
--- a/include/kinsol/kinsol_bbdpre.h
+++ b/include/kinsol/kinsol_bbdpre.h
@@ -46,7 +46,7 @@ typedef int (*KINBBDLocalFn)(sunindextype Nlocal, N_Vector uu,
 SUNDIALS_EXPORT int KINBBDPrecInit(void *kinmem, sunindextype Nlocal,
                                    sunindextype mudq, sunindextype mldq,
                                    sunindextype mukeep, sunindextype mlkeep,
-                                   realtype dq_rel_uu,
+                                   sunrealtype dq_rel_uu,
                                    KINBBDLocalFn gloc, KINBBDCommFn gcomm);
 
 /* Optional output functions */
diff --git a/include/kinsol/kinsol_ls.h b/include/kinsol/kinsol_ls.h
index fd3fb4331a..53554d4b4c 100644
--- a/include/kinsol/kinsol_ls.h
+++ b/include/kinsol/kinsol_ls.h
@@ -62,7 +62,7 @@ typedef int (*KINLsPrecSolveFn)(N_Vector uu, N_Vector uscale,
                                 N_Vector vv, void *user_data);
 
 typedef int (*KINLsJacTimesVecFn)(N_Vector v, N_Vector Jv, N_Vector uu,
-                                  booleantype *new_uu, void *J_data);
+                                  sunbooleantype *new_uu, void *J_data);
 
 
 /*==================================================================
diff --git a/include/nvector/nvector_cuda.h b/include/nvector/nvector_cuda.h
index a8449ef322..24a298ebf9 100644
--- a/include/nvector/nvector_cuda.h
+++ b/include/nvector/nvector_cuda.h
@@ -39,7 +39,7 @@ extern "C" {
 struct _N_VectorContent_Cuda
 {
   sunindextype       length;
-  booleantype        own_helper;
+  sunbooleantype        own_helper;
   SUNMemory          host_data;
   SUNMemory          device_data;
   SUNCudaExecPolicy* stream_exec_policy;
@@ -60,19 +60,19 @@ SUNDIALS_EXPORT N_Vector N_VNewEmpty_Cuda(SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNew_Cuda(sunindextype length, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewManaged_Cuda(sunindextype length, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewWithMemHelp_Cuda(sunindextype length,
-                                                booleantype use_managed_mem,
+                                                sunbooleantype use_managed_mem,
                                                 SUNMemoryHelper helper,
                                                 SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMake_Cuda(sunindextype length,
-                                      realtype *h_vdata,
-                                      realtype *d_vdata,
+                                      sunrealtype *h_vdata,
+                                      sunrealtype *d_vdata,
                                       SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMakeManaged_Cuda(sunindextype length,
-                                             realtype *vdata,
+                                             sunrealtype *vdata,
                                              SUNContext sunctx);
-SUNDIALS_EXPORT void N_VSetHostArrayPointer_Cuda(realtype* h_vdata, N_Vector v);
-SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Cuda(realtype* d_vdata, N_Vector v);
-SUNDIALS_EXPORT booleantype N_VIsManagedMemory_Cuda(N_Vector x);
+SUNDIALS_EXPORT void N_VSetHostArrayPointer_Cuda(sunrealtype* h_vdata, N_Vector v);
+SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Cuda(sunrealtype* d_vdata, N_Vector v);
+SUNDIALS_EXPORT sunbooleantype N_VIsManagedMemory_Cuda(N_Vector x);
 SUNDIALS_EXPORT int N_VSetKernelExecPolicy_Cuda(N_Vector x,
                                                 SUNCudaExecPolicy* stream_exec_policy,
                                                 SUNCudaExecPolicy* reduce_exec_policy);
@@ -87,17 +87,17 @@ sunindextype N_VGetLength_Cuda(N_Vector x)
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetHostArrayPointer_Cuda(N_Vector x)
+sunrealtype *N_VGetHostArrayPointer_Cuda(N_Vector x)
 {
   N_VectorContent_Cuda content = (N_VectorContent_Cuda)x->content;
-  return(content->host_data == NULL ? NULL : (realtype*)content->host_data->ptr);
+  return(content->host_data == NULL ? NULL : (sunrealtype*)content->host_data->ptr);
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetDeviceArrayPointer_Cuda(N_Vector x)
+sunrealtype *N_VGetDeviceArrayPointer_Cuda(N_Vector x)
 {
   N_VectorContent_Cuda content = (N_VectorContent_Cuda)x->content;
-  return(content->device_data == NULL ? NULL : (realtype*)content->device_data->ptr);
+  return(content->device_data == NULL ? NULL : (sunrealtype*)content->device_data->ptr);
 }
 
 /*
@@ -118,58 +118,58 @@ SUNDIALS_EXPORT void N_VDestroy_Cuda(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Cuda(N_Vector v, sunindextype *lrw, sunindextype *liw);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Cuda(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Cuda(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Cuda(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Cuda(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Cuda(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Cuda(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Cuda(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Cuda(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Cuda(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Cuda(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Cuda(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Cuda(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Cuda(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Cuda(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Cuda(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Cuda(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Cuda(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Cuda(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Cuda(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Cuda(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Cuda(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Cuda(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Cuda(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Cuda(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Cuda(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Cuda(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Cuda(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Cuda(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Cuda(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Cuda(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Cuda(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Cuda(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Cuda(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VLinearCombination_Cuda(int nvec, sunrealtype* c, N_Vector* X,
                                               N_Vector Z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Cuda(int nvec, realtype* c, N_Vector X,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Cuda(int nvec, sunrealtype* c, N_Vector X,
                                           N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Cuda(int nvec, N_Vector x, N_Vector* Y,
-                                         realtype* dotprods);
+                                         sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Cuda(int nvec,
-                                                 realtype a, N_Vector* X,
-                                                 realtype b, N_Vector* Y,
+                                                 sunrealtype a, N_Vector* X,
+                                                 sunrealtype b, N_Vector* Y,
                                                  N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Cuda(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Cuda(int nvec, sunrealtype* c, N_Vector* X,
                                              N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Cuda(int nvec, realtype c, N_Vector* Z);
+SUNDIALS_EXPORT int N_VConstVectorArray_Cuda(int nvec, sunrealtype c, N_Vector* Z);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Cuda(int nvec, int nsum,
-                                                     realtype* a, N_Vector* X,
+                                                     sunrealtype* a, N_Vector* X,
                                                      N_Vector** Y, N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Cuda(int nvec, int nsum,
-                                                         realtype* c,
+                                                         sunrealtype* c,
                                                          N_Vector** X,
                                                          N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Cuda(int nvec, N_Vector* X,
-                                                N_Vector* W, realtype* nrm);
+                                                N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Cuda(int nvec, N_Vector* X,
                                                     N_Vector* W, N_Vector id,
-                                                    realtype* nrm);
+                                                    sunrealtype* nrm);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Cuda(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Cuda(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Cuda(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Cuda(N_Vector x, N_Vector w, N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Cuda(N_Vector x, sunindextype *size);
@@ -186,19 +186,19 @@ SUNDIALS_EXPORT void N_VPrintFile_Cuda(N_Vector v, FILE *outfile);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Cuda(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Cuda(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Cuda(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Cuda(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_hip.h b/include/nvector/nvector_hip.h
index dd5f3c01df..04bca2e875 100644
--- a/include/nvector/nvector_hip.h
+++ b/include/nvector/nvector_hip.h
@@ -39,7 +39,7 @@ extern "C" {
 struct _N_VectorContent_Hip
 {
   sunindextype       length;
-  booleantype        own_helper;
+  sunbooleantype        own_helper;
   SUNMemory          host_data;
   SUNMemory          device_data;
   SUNHipExecPolicy*  stream_exec_policy;
@@ -60,19 +60,19 @@ SUNDIALS_EXPORT N_Vector N_VNewEmpty_Hip(SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNew_Hip(sunindextype length, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewManaged_Hip(sunindextype length, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewWithMemHelp_Hip(sunindextype length,
-                                               booleantype use_managed_mem,
+                                               sunbooleantype use_managed_mem,
                                                SUNMemoryHelper helper,
                                                SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMake_Hip(sunindextype length,
-                                     realtype *h_vdata,
-                                     realtype *d_vdata,
+                                     sunrealtype *h_vdata,
+                                     sunrealtype *d_vdata,
                                      SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMakeManaged_Hip(sunindextype length,
-                                            realtype *vdata,
+                                            sunrealtype *vdata,
                                             SUNContext sunctx);
-SUNDIALS_EXPORT void N_VSetHostArrayPointer_Hip(realtype* h_vdata, N_Vector v);
-SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Hip(realtype* d_vdata, N_Vector v);
-SUNDIALS_EXPORT booleantype N_VIsManagedMemory_Hip(N_Vector x);
+SUNDIALS_EXPORT void N_VSetHostArrayPointer_Hip(sunrealtype* h_vdata, N_Vector v);
+SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Hip(sunrealtype* d_vdata, N_Vector v);
+SUNDIALS_EXPORT sunbooleantype N_VIsManagedMemory_Hip(N_Vector x);
 SUNDIALS_EXPORT int N_VSetKernelExecPolicy_Hip(N_Vector x,
                                                SUNHipExecPolicy* stream_exec_policy,
                                                SUNHipExecPolicy* reduce_exec_policy);
@@ -87,17 +87,17 @@ sunindextype N_VGetLength_Hip(N_Vector x)
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetHostArrayPointer_Hip(N_Vector x)
+sunrealtype *N_VGetHostArrayPointer_Hip(N_Vector x)
 {
   N_VectorContent_Hip content = (N_VectorContent_Hip)x->content;
-  return(content->host_data == NULL ? NULL : (realtype*)content->host_data->ptr);
+  return(content->host_data == NULL ? NULL : (sunrealtype*)content->host_data->ptr);
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetDeviceArrayPointer_Hip(N_Vector x)
+sunrealtype *N_VGetDeviceArrayPointer_Hip(N_Vector x)
 {
   N_VectorContent_Hip content = (N_VectorContent_Hip)x->content;
-  return(content->device_data == NULL ? NULL : (realtype*)content->device_data->ptr);
+  return(content->device_data == NULL ? NULL : (sunrealtype*)content->device_data->ptr);
 }
 
 /*
@@ -118,58 +118,58 @@ SUNDIALS_EXPORT void N_VDestroy_Hip(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Hip(N_Vector v, sunindextype *lrw, sunindextype *liw);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Hip(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Hip(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Hip(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Hip(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Hip(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Hip(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Hip(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Hip(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Hip(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Hip(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Hip(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Hip(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Hip(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Hip(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Hip(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Hip(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Hip(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Hip(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Hip(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Hip(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Hip(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Hip(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Hip(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Hip(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Hip(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Hip(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Hip(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Hip(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Hip(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Hip(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Hip(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Hip(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Hip(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VLinearCombination_Hip(int nvec, sunrealtype* c, N_Vector* X,
                                              N_Vector Z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Hip(int nvec, realtype* c, N_Vector X,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Hip(int nvec, sunrealtype* c, N_Vector X,
                                          N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Hip(int nvec, N_Vector x, N_Vector* Y,
-                                        realtype* dotprods);
+                                        sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Hip(int nvec,
-                                                realtype a, N_Vector* X,
-                                                realtype b, N_Vector* Y,
+                                                sunrealtype a, N_Vector* X,
+                                                sunrealtype b, N_Vector* Y,
                                                 N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Hip(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Hip(int nvec, sunrealtype* c, N_Vector* X,
                                             N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Hip(int nvec, realtype c, N_Vector* Z);
+SUNDIALS_EXPORT int N_VConstVectorArray_Hip(int nvec, sunrealtype c, N_Vector* Z);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Hip(int nvec, int nsum,
-                                                    realtype* a, N_Vector* X,
+                                                    sunrealtype* a, N_Vector* X,
                                                     N_Vector** Y, N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Hip(int nvec, int nsum,
-                                                        realtype* c,
+                                                        sunrealtype* c,
                                                         N_Vector** X,
                                                         N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Hip(int nvec, N_Vector* X,
-                                               N_Vector* W, realtype* nrm);
+                                               N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Hip(int nvec, N_Vector* X,
                                                    N_Vector* W, N_Vector id,
-                                                   realtype* nrm);
+                                                   sunrealtype* nrm);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Hip(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Hip(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Hip(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Hip(N_Vector x, N_Vector w, N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Hip(N_Vector x, sunindextype *size);
@@ -186,19 +186,19 @@ SUNDIALS_EXPORT void N_VPrintFile_Hip(N_Vector v, FILE *outfile);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Hip(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Hip(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Hip(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Hip(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_kokkos.hpp b/include/nvector/nvector_kokkos.hpp
index 269d15dcef..ae8976f09e 100644
--- a/include/nvector/nvector_kokkos.hpp
+++ b/include/nvector/nvector_kokkos.hpp
@@ -208,7 +208,7 @@ void N_VConst_Kokkos(sunrealtype c, N_Vector z)
 }
 
 template<class VectorType>
-booleantype N_VConstrMask_Kokkos(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Kokkos(N_Vector c, N_Vector x, N_Vector m)
 {
   auto cvec{GetVec<VectorType>(c)};
   auto cdata{cvec->View()};
@@ -289,7 +289,7 @@ void N_VInv_Kokkos(N_Vector x, N_Vector z)
 }
 
 template<class VectorType>
-booleantype N_VInvTest_Kokkos(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Kokkos(N_Vector x, N_Vector z)
 {
   auto xvec{GetVec<VectorType>(x)};
   auto xdata{xvec->View()};
diff --git a/include/nvector/nvector_manyvector.h b/include/nvector/nvector_manyvector.h
index 5f8b551f04..6a44921b57 100644
--- a/include/nvector/nvector_manyvector.h
+++ b/include/nvector/nvector_manyvector.h
@@ -19,11 +19,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definitions of the types 'realtype' and 'sunindextype' can
+ *   - The definitions of the types 'sunrealtype' and 'sunindextype' can
  *     be found in the header file sundials_types.h, and it may be
  *     changed (at the configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -52,7 +52,7 @@ struct _N_VectorContent_ManyVector {
   sunindextype  num_subvectors;  /* number of vectors attached       */
   sunindextype  global_length;   /* overall global manyvector length */
   N_Vector*     subvec_array;    /* pointer to N_Vector array        */
-  booleantype   own_data;        /* flag indicating data ownership   */
+  sunbooleantype   own_data;        /* flag indicating data ownership   */
 };
 
 typedef struct _N_VectorContent_ManyVector *N_VectorContent_ManyVector;
@@ -68,10 +68,10 @@ SUNDIALS_EXPORT N_Vector N_VNew_ManyVector(sunindextype num_subvectors,
 SUNDIALS_EXPORT N_Vector N_VGetSubvector_ManyVector(N_Vector v,
                                                     sunindextype vec_num);
 
-SUNDIALS_EXPORT realtype *N_VGetSubvectorArrayPointer_ManyVector(N_Vector v,
+SUNDIALS_EXPORT sunrealtype *N_VGetSubvectorArrayPointer_ManyVector(N_Vector v,
                                                                  sunindextype vec_num);
 
-SUNDIALS_EXPORT int N_VSetSubvectorArrayPointer_ManyVector(realtype *v_data, N_Vector v,
+SUNDIALS_EXPORT int N_VSetSubvectorArrayPointer_ManyVector(sunrealtype *v_data, N_Vector v,
                                                            sunindextype vec_num);
 
 SUNDIALS_EXPORT sunindextype N_VGetNumSubvectors_ManyVector(N_Vector v);
@@ -87,68 +87,68 @@ SUNDIALS_EXPORT void N_VSpace_ManyVector(N_Vector v, sunindextype *lrw,
                                          sunindextype *liw);
 SUNDIALS_EXPORT sunindextype N_VGetLength_ManyVector(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetSubvectorLocalLength_ManyVector(N_Vector v, sunindextype vec_num);
-SUNDIALS_EXPORT void N_VLinearSum_ManyVector(realtype a, N_Vector x,
-                                             realtype b, N_Vector y,
+SUNDIALS_EXPORT void N_VLinearSum_ManyVector(sunrealtype a, N_Vector x,
+                                             sunrealtype b, N_Vector y,
                                              N_Vector z);
-SUNDIALS_EXPORT void N_VConst_ManyVector(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_ManyVector(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_ManyVector(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_ManyVector(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_ManyVector(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_ManyVector(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_ManyVector(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_ManyVector(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_ManyVector(N_Vector x, realtype b,
+SUNDIALS_EXPORT void N_VAddConst_ManyVector(N_Vector x, sunrealtype b,
                                             N_Vector z);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_ManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_ManyVector(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_ManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_ManyVector(N_Vector x, N_Vector w,
                                                     N_Vector id);
-SUNDIALS_EXPORT realtype N_VWL2Norm_ManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT void N_VCompare_ManyVector(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_ManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT void N_VCompare_ManyVector(sunrealtype c, N_Vector x, N_Vector z);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_ManyVector(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_ManyVector(int nvec, sunrealtype* c,
                                                     N_Vector* V, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_ManyVector(int nvec, realtype* a,
+SUNDIALS_EXPORT int N_VScaleAddMulti_ManyVector(int nvec, sunrealtype* a,
                                                 N_Vector x, N_Vector* Y,
                                                 N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_ManyVector(int nvec, N_Vector x,
                                                N_Vector *Y,
-                                               realtype* dotprods);
+                                               sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_ManyVector(int nvec,
-                                                       realtype a, N_Vector* X,
-                                                       realtype b, N_Vector* Y,
+                                                       sunrealtype a, N_Vector* X,
+                                                       sunrealtype b, N_Vector* Y,
                                                        N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_ManyVector(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_ManyVector(int nvec, sunrealtype* c,
                                                    N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_ManyVector(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_ManyVector(int nvecs, sunrealtype c,
                                                    N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_ManyVector(int nvecs, N_Vector* X,
-                                                      N_Vector* W, realtype* nrm);
+                                                      N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_ManyVector(int nvec,
                                                           N_Vector* X,
                                                           N_Vector* W,
                                                           N_Vector id,
-                                                          realtype* nrm);
+                                                          sunrealtype* nrm);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_ManyVector(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_ManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_ManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_ManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_ManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_ManyVector(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_ManyVector(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_ManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_ManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_ManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_ManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_ManyVector(N_Vector x, N_Vector w,
                                                         N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_ManyVector(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_ManyVector(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_ManyVector(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_ManyVector(N_Vector c, N_Vector x,
                                                           N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_ManyVector(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_ManyVector(N_Vector num,
                                                         N_Vector denom);
 
 /* OPTIONAL single buffer reduction operations */
 SUNDIALS_EXPORT int N_VDotProdMultiLocal_ManyVector(int nvec, N_Vector x,
                                                     N_Vector *Y,
-                                                    realtype* dotprods);
+                                                    sunrealtype* dotprods);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_ManyVector(N_Vector x, sunindextype *size);
@@ -159,19 +159,19 @@ SUNDIALS_EXPORT int N_VBufUnpack_ManyVector(N_Vector x, void *buf);
    Enable / disable fused vector operations
    ----------------------------------------------------------------- */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_ManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_ManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_ManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_ManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_ManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_ManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_ManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_ManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_ManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_ManyVector(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_mpimanyvector.h b/include/nvector/nvector_mpimanyvector.h
index 313aa7dee5..bc975e03d7 100644
--- a/include/nvector/nvector_mpimanyvector.h
+++ b/include/nvector/nvector_mpimanyvector.h
@@ -19,11 +19,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definitions of the types 'realtype' and 'sunindextype' can
+ *   - The definitions of the types 'sunrealtype' and 'sunindextype' can
  *     be found in the header file sundials_types.h, and it may be
  *     changed (at the configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -55,7 +55,7 @@ struct _N_VectorContent_MPIManyVector {
   sunindextype  num_subvectors;  /* number of vectors attached       */
   sunindextype  global_length;   /* overall global manyvector length */
   N_Vector*     subvec_array;    /* pointer to N_Vector array        */
-  booleantype   own_data;        /* flag indicating data ownership   */
+  sunbooleantype   own_data;        /* flag indicating data ownership   */
 };
 
 typedef struct _N_VectorContent_MPIManyVector *N_VectorContent_MPIManyVector;
@@ -76,10 +76,10 @@ SUNDIALS_EXPORT N_Vector N_VNew_MPIManyVector(sunindextype num_subvectors,
 SUNDIALS_EXPORT N_Vector N_VGetSubvector_MPIManyVector(N_Vector v,
                                                        sunindextype vec_num);
 
-SUNDIALS_EXPORT realtype *N_VGetSubvectorArrayPointer_MPIManyVector(N_Vector v,
+SUNDIALS_EXPORT sunrealtype *N_VGetSubvectorArrayPointer_MPIManyVector(N_Vector v,
                                                                     sunindextype vec_num);
 
-SUNDIALS_EXPORT int N_VSetSubvectorArrayPointer_MPIManyVector(realtype *v_data, N_Vector v,
+SUNDIALS_EXPORT int N_VSetSubvectorArrayPointer_MPIManyVector(sunrealtype *v_data, N_Vector v,
                                                               sunindextype vec_num);
 
 SUNDIALS_EXPORT sunindextype N_VGetNumSubvectors_MPIManyVector(N_Vector v);
@@ -96,79 +96,79 @@ SUNDIALS_EXPORT void N_VSpace_MPIManyVector(N_Vector v, sunindextype *lrw,
 SUNDIALS_EXPORT void *N_VGetCommunicator_MPIManyVector(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLength_MPIManyVector(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetSubvectorLocalLength_MPIManyVector(N_Vector v, sunindextype vec_num);
-SUNDIALS_EXPORT void N_VLinearSum_MPIManyVector(realtype a, N_Vector x,
-                                                realtype b, N_Vector y,
+SUNDIALS_EXPORT void N_VLinearSum_MPIManyVector(sunrealtype a, N_Vector x,
+                                                sunrealtype b, N_Vector y,
                                                 N_Vector z);
-SUNDIALS_EXPORT void N_VConst_MPIManyVector(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_MPIManyVector(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_MPIManyVector(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_MPIManyVector(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_MPIManyVector(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_MPIManyVector(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_MPIManyVector(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_MPIManyVector(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_MPIManyVector(N_Vector x, realtype b,
+SUNDIALS_EXPORT void N_VAddConst_MPIManyVector(N_Vector x, sunrealtype b,
                                                N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_MPIManyVector(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_MPIManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_MPIManyVector(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProd_MPIManyVector(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_MPIManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_MPIManyVector(N_Vector x, N_Vector w,
                                                        N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_MPIManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_MPIManyVector(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_MPIManyVector(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_MPIManyVector(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunrealtype N_VMin_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_MPIManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_MPIManyVector(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_MPIManyVector(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_MPIManyVector(N_Vector c, N_Vector x,
                                                         N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_MPIManyVector(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_MPIManyVector(N_Vector num,
                                                       N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_MPIManyVector(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_MPIManyVector(int nvec, sunrealtype* c,
                                                        N_Vector* V, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_MPIManyVector(int nvec, realtype* a,
+SUNDIALS_EXPORT int N_VScaleAddMulti_MPIManyVector(int nvec, sunrealtype* a,
                                                    N_Vector x, N_Vector* Y,
                                                    N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_MPIManyVector(int nvec, N_Vector x,
                                                   N_Vector *Y,
-                                                  realtype* dotprods);
+                                                  sunrealtype* dotprods);
 
 /* single buffer reduction operations */
 SUNDIALS_EXPORT int N_VDotProdMultiLocal_MPIManyVector(int nvec, N_Vector x,
                                                        N_Vector *Y,
-                                                       realtype* dotprods);
+                                                       sunrealtype* dotprods);
 SUNDIALS_EXPORT int N_VDotProdMultiAllReduce_MPIManyVector(int nvec_total,
                                                            N_Vector x,
-                                                           realtype* sum);
+                                                           sunrealtype* sum);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_MPIManyVector(int nvec,
-                                                          realtype a, N_Vector* X,
-                                                          realtype b, N_Vector* Y,
+                                                          sunrealtype a, N_Vector* X,
+                                                          sunrealtype b, N_Vector* Y,
                                                           N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_MPIManyVector(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_MPIManyVector(int nvec, sunrealtype* c,
                                                       N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_MPIManyVector(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_MPIManyVector(int nvecs, sunrealtype c,
                                                       N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_MPIManyVector(int nvecs, N_Vector* X,
-                                                         N_Vector* W, realtype* nrm);
+                                                         N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_MPIManyVector(int nvec,
                                                              N_Vector* X,
                                                              N_Vector* W,
                                                              N_Vector id,
-                                                             realtype* nrm);
+                                                             sunrealtype* nrm);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_MPIManyVector(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_MPIManyVector(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_MPIManyVector(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_MPIManyVector(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_MPIManyVector(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_MPIManyVector(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_MPIManyVector(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_MPIManyVector(N_Vector x, N_Vector w,
                                                            N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_MPIManyVector(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_MPIManyVector(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_MPIManyVector(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_MPIManyVector(N_Vector c, N_Vector x,
                                                              N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_MPIManyVector(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_MPIManyVector(N_Vector num,
                                                            N_Vector denom);
 
 /* OPTIONAL XBraid interface operations */
@@ -180,19 +180,19 @@ SUNDIALS_EXPORT int N_VBufUnpack_MPIManyVector(N_Vector x, void *buf);
    Enable / disable fused vector operations
    ----------------------------------------------------------------- */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_MPIManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_MPIManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_MPIManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_MPIManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_MPIManyVector(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_MPIManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_MPIManyVector(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_MPIManyVector(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_MPIManyVector(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_mpiplusx.h b/include/nvector/nvector_mpiplusx.h
index f6e6e9e61e..a3faa7730b 100644
--- a/include/nvector/nvector_mpiplusx.h
+++ b/include/nvector/nvector_mpiplusx.h
@@ -34,9 +34,9 @@ SUNDIALS_EXPORT N_Vector N_VMake_MPIPlusX(MPI_Comm comm, N_Vector X, SUNContext
 
 SUNDIALS_EXPORT N_Vector_ID N_VGetVectorID_MPIPlusX(N_Vector v);
 
-SUNDIALS_EXPORT realtype* N_VGetArrayPointer_MPIPlusX(N_Vector v);
+SUNDIALS_EXPORT sunrealtype* N_VGetArrayPointer_MPIPlusX(N_Vector v);
 
-SUNDIALS_EXPORT void N_VSetArrayPointer_MPIPlusX(realtype *vdata, N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_MPIPlusX(sunrealtype *vdata, N_Vector v);
 
 SUNDIALS_EXPORT void N_VPrint_MPIPlusX(N_Vector x);
 
@@ -47,7 +47,7 @@ SUNDIALS_EXPORT N_Vector N_VGetLocalVector_MPIPlusX(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLocalLength_MPIPlusX(N_Vector v);
 
 SUNDIALS_STATIC_INLINE
-int N_VEnableFusedOps_MPIPlusX(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_MPIPlusX(N_Vector v, sunbooleantype tf)
 { return N_VEnableFusedOps_MPIManyVector(v, tf); }
 
 #ifdef __cplusplus
diff --git a/include/nvector/nvector_openmp.h b/include/nvector/nvector_openmp.h
index 713f1fbd64..ea69d00a71 100644
--- a/include/nvector/nvector_openmp.h
+++ b/include/nvector/nvector_openmp.h
@@ -24,11 +24,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -57,8 +57,8 @@ extern "C" {
 
 struct _N_VectorContent_OpenMP {
   sunindextype length;   /* vector length            */
-  booleantype own_data;  /* data ownership flag      */
-  realtype *data;        /* data array               */
+  sunbooleantype own_data;  /* data ownership flag      */
+  sunrealtype *data;        /* data array               */
   int num_threads;       /* number of OpenMP threads */
 };
 
@@ -93,7 +93,7 @@ SUNDIALS_EXPORT N_Vector N_VNew_OpenMP(sunindextype vec_length, int num_threads,
 
 SUNDIALS_EXPORT N_Vector N_VNewEmpty_OpenMP(sunindextype vec_length, int num_threads, SUNContext sunctx);
 
-SUNDIALS_EXPORT N_Vector N_VMake_OpenMP(sunindextype vec_length, realtype *v_data,
+SUNDIALS_EXPORT N_Vector N_VMake_OpenMP(sunindextype vec_length, sunrealtype *v_data,
                                         int num_threads, SUNContext sunctx);
 
 SUNDIALS_EXPORT sunindextype N_VGetLength_OpenMP(N_Vector v);
@@ -108,65 +108,65 @@ SUNDIALS_EXPORT N_Vector N_VCloneEmpty_OpenMP(N_Vector w);
 SUNDIALS_EXPORT N_Vector N_VClone_OpenMP(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_OpenMP(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_OpenMP(N_Vector v, sunindextype *lrw, sunindextype *liw);
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_OpenMP(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer_OpenMP(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_OpenMP(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_OpenMP(sunrealtype *v_data, N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_OpenMP(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_OpenMP(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_OpenMP(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_OpenMP(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_OpenMP(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_OpenMP(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_OpenMP(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_OpenMP(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_OpenMP(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_OpenMP(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_OpenMP(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_OpenMP(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_OpenMP(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_OpenMP(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_OpenMP(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_OpenMP(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_OpenMP(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_OpenMP(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_OpenMP(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_OpenMP(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_OpenMP(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_OpenMP(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_OpenMP(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_OpenMP(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_OpenMP(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_OpenMP(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_OpenMP(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_OpenMP(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_OpenMP(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_OpenMP(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_OpenMP(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_OpenMP(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_OpenMP(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_OpenMP(int nvec, sunrealtype* c,
                                                 N_Vector* V, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_OpenMP(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_OpenMP(int nvec, sunrealtype* a, N_Vector x,
                                             N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_OpenMP(int nvec, N_Vector x,
-                                           N_Vector* Y, realtype* dotprods);
+                                           N_Vector* Y, sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_OpenMP(int nvec,
-                                                   realtype a, N_Vector* X,
-                                                   realtype b, N_Vector* Y,
+                                                   sunrealtype a, N_Vector* X,
+                                                   sunrealtype b, N_Vector* Y,
                                                    N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_OpenMP(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_OpenMP(int nvec, sunrealtype* c,
                                                N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_OpenMP(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_OpenMP(int nvecs, sunrealtype c,
                                                N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_OpenMP(int nvecs, N_Vector* X,
-                                                  N_Vector* W, realtype* nrm);
+                                                  N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_OpenMP(int nvecs, N_Vector* X,
                                                       N_Vector* W, N_Vector id,
-                                                      realtype* nrm);
+                                                      sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_OpenMP(int nvec, int nsum,
-                                                       realtype* a,
+                                                       sunrealtype* a,
                                                        N_Vector* X,
                                                        N_Vector** Y,
                                                        N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_OpenMP(int nvec, int nsum,
-                                                           realtype* c,
+                                                           sunrealtype* c,
                                                            N_Vector** X,
                                                            N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_OpenMP(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_OpenMP(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_OpenMP(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_OpenMP(N_Vector x, N_Vector w,
                                                     N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
@@ -180,19 +180,19 @@ SUNDIALS_EXPORT int N_VBufUnpack_OpenMP(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_OpenMP(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_OpenMP(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_OpenMP(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_OpenMP(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_openmpdev.h b/include/nvector/nvector_openmpdev.h
index fcc2ced766..2352d2b590 100644
--- a/include/nvector/nvector_openmpdev.h
+++ b/include/nvector/nvector_openmpdev.h
@@ -24,11 +24,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -57,9 +57,9 @@ extern "C" {
 
 struct _N_VectorContent_OpenMPDEV {
   sunindextype length;   /* vector length       */
-  booleantype own_data;  /* data ownership flag */
-  realtype *host_data;   /* host data array     */
-  realtype *dev_data;    /* device data array   */
+  sunbooleantype own_data;  /* data ownership flag */
+  sunrealtype *host_data;   /* host data array     */
+  sunrealtype *dev_data;    /* device data array   */
 };
 
 typedef struct _N_VectorContent_OpenMPDEV *N_VectorContent_OpenMPDEV;
@@ -92,15 +92,15 @@ SUNDIALS_EXPORT N_Vector N_VNew_OpenMPDEV(sunindextype vec_length, SUNContext su
 SUNDIALS_EXPORT N_Vector N_VNewEmpty_OpenMPDEV(sunindextype vec_length, SUNContext sunctx);
 
 SUNDIALS_EXPORT N_Vector N_VMake_OpenMPDEV(sunindextype vec_length,
-                                           realtype *h_data,
-                                           realtype *v_data,
+                                           sunrealtype *h_data,
+                                           sunrealtype *v_data,
                                            SUNContext sunctx);
 
 SUNDIALS_EXPORT sunindextype N_VGetLength_OpenMPDEV(N_Vector v);
 
-SUNDIALS_EXPORT realtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v);
 
-SUNDIALS_EXPORT realtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v);
 
 SUNDIALS_EXPORT void N_VPrint_OpenMPDEV(N_Vector v);
 
@@ -117,61 +117,61 @@ SUNDIALS_EXPORT void N_VDestroy_OpenMPDEV(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_OpenMPDEV(N_Vector v, sunindextype *lrw, sunindextype *liw);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_OpenMPDEV(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_OpenMPDEV(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_OpenMPDEV(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_OpenMPDEV(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_OpenMPDEV(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_OpenMPDEV(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_OpenMPDEV(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_OpenMPDEV(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_OpenMPDEV(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_OpenMPDEV(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_OpenMPDEV(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_OpenMPDEV(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_OpenMPDEV(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_OpenMPDEV(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_OpenMPDEV(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_OpenMPDEV(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_OpenMPDEV(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_OpenMPDEV(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_OpenMPDEV(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_OpenMPDEV(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_OpenMPDEV(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_OpenMPDEV(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_OpenMPDEV(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_OpenMPDEV(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_OpenMPDEV(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_OpenMPDEV(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_OpenMPDEV(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_OpenMPDEV(int nvec, sunrealtype* c,
                                                   N_Vector* V, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_OpenMPDEV(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_OpenMPDEV(int nvec, sunrealtype* a, N_Vector x,
                                               N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_OpenMPDEV(int nvec, N_Vector x,
-                                             N_Vector *Y, realtype* dotprods);
+                                             N_Vector *Y, sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_OpenMPDEV(int nvec,
-                                                     realtype a, N_Vector* X,
-                                                     realtype b, N_Vector* Y,
+                                                     sunrealtype a, N_Vector* X,
+                                                     sunrealtype b, N_Vector* Y,
                                                      N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_OpenMPDEV(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_OpenMPDEV(int nvec, sunrealtype* c,
                                                  N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_OpenMPDEV(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_OpenMPDEV(int nvecs, sunrealtype c,
                                                  N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_OpenMPDEV(int nvecs, N_Vector* X,
-                                                    N_Vector* W, realtype* nrm);
+                                                    N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_OpenMPDEV(int nvecs, N_Vector* X,
                                                         N_Vector* W, N_Vector id,
-                                                        realtype* nrm);
+                                                        sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum,
-                                                         realtype* a,
+                                                         sunrealtype* a,
                                                          N_Vector* X,
                                                          N_Vector** Y,
                                                          N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
-                                                             realtype* c,
+                                                             sunrealtype* c,
                                                              N_Vector** X,
                                                              N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_OpenMPDEV(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_OpenMPDEV(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w,
                                                        N_Vector id);
 
 
@@ -181,19 +181,19 @@ SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w,
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_OpenMPDEV(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_OpenMPDEV(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_parallel.h b/include/nvector/nvector_parallel.h
index 127f319c0b..1a2ad48195 100644
--- a/include/nvector/nvector_parallel.h
+++ b/include/nvector/nvector_parallel.h
@@ -20,11 +20,11 @@
  *   - The definition of the generic N_Vector structure can be
  *     found in the header file sundials_nvector.h.
  *
- *   - The definition of the type realtype can be found in the
+ *   - The definition of the type sunrealtype can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type booleantype.
+ *     for the type sunbooleantype.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -56,8 +56,8 @@ extern "C" {
 struct _N_VectorContent_Parallel {
   sunindextype local_length;   /* local vector length         */
   sunindextype global_length;  /* global vector length        */
-  booleantype own_data;        /* ownership of data           */
-  realtype *data;              /* local data array            */
+  sunbooleantype own_data;        /* ownership of data           */
+  sunrealtype *data;              /* local data array            */
   MPI_Comm comm;               /* pointer to MPI communicator */
 };
 
@@ -103,7 +103,7 @@ SUNDIALS_EXPORT N_Vector N_VNewEmpty_Parallel(MPI_Comm comm,
 SUNDIALS_EXPORT N_Vector N_VMake_Parallel(MPI_Comm comm,
                                           sunindextype local_length,
                                           sunindextype global_length,
-                                          realtype *v_data,
+                                          sunrealtype *v_data,
                                           SUNContext sunctx);
 
 SUNDIALS_EXPORT sunindextype N_VGetLength_Parallel(N_Vector v);
@@ -120,83 +120,83 @@ SUNDIALS_EXPORT N_Vector N_VClone_Parallel(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_Parallel(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Parallel(N_Vector v, sunindextype *lrw,
                                        sunindextype *liw);
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_Parallel(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer_Parallel(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_Parallel(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_Parallel(sunrealtype *v_data, N_Vector v);
 SUNDIALS_EXPORT void *N_VGetCommunicator_Parallel(N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Parallel(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Parallel(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Parallel(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Parallel(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Parallel(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Parallel(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Parallel(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Parallel(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Parallel(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Parallel(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Parallel(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Parallel(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Parallel(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Parallel(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Parallel(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Parallel(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Parallel(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Parallel(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Parallel(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Parallel(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Parallel(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Parallel(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Parallel(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Parallel(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Parallel(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Parallel(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Parallel(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Parallel(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Parallel(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Parallel(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Parallel(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Parallel(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Parallel(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Parallel(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Parallel(int nvec, realtype* c, N_Vector* V,
+SUNDIALS_EXPORT int N_VLinearCombination_Parallel(int nvec, sunrealtype* c, N_Vector* V,
                                                   N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Parallel(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Parallel(int nvec, sunrealtype* a, N_Vector x,
                                               N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Parallel(int nvec, N_Vector x,
-                                             N_Vector* Y, realtype* dotprods);
+                                             N_Vector* Y, sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Parallel(int nvec,
-                                                     realtype a, N_Vector* X,
-                                                     realtype b, N_Vector* Y,
+                                                     sunrealtype a, N_Vector* X,
+                                                     sunrealtype b, N_Vector* Y,
                                                      N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Parallel(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Parallel(int nvec, sunrealtype* c,
                                                  N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Parallel(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_Parallel(int nvecs, sunrealtype c,
                                                  N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Parallel(int nvecs, N_Vector* X,
-                                                    N_Vector* W, realtype* nrm);
+                                                    N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Parallel(int nvec, N_Vector* X,
                                                         N_Vector* W, N_Vector id,
-                                                        realtype* nrm);
+                                                        sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Parallel(int nvec, int nsum,
-                                                         realtype* a,
+                                                         sunrealtype* a,
                                                          N_Vector* X,
                                                          N_Vector** Y,
                                                          N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Parallel(int nvec, int nsum,
-                                                             realtype* c,
+                                                             sunrealtype* c,
                                                              N_Vector** X,
                                                              N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_Parallel(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_Parallel(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_Parallel(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_Parallel(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Parallel(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Parallel(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_Parallel(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_Parallel(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_Parallel(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_Parallel(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Parallel(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Parallel(N_Vector x, N_Vector w,
                                                       N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_Parallel(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_Parallel(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_Parallel(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_Parallel(N_Vector c, N_Vector x,
                                                         N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_Parallel(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_Parallel(N_Vector num,
                                                       N_Vector denom);
 
 /* OPTIONAL single buffer reduction operations */
 SUNDIALS_EXPORT int N_VDotProdMultiLocal_Parallel(int nvec, N_Vector x,
                                                   N_Vector* Y,
-                                                  realtype* dotprods);
+                                                  sunrealtype* dotprods);
 SUNDIALS_EXPORT int N_VDotProdMultiAllReduce_Parallel(int nvec_total, N_Vector x,
-                                                      realtype* dotprods);
+                                                      sunrealtype* dotprods);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Parallel(N_Vector x, sunindextype *size);
@@ -209,21 +209,21 @@ SUNDIALS_EXPORT int N_VBufUnpack_Parallel(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Parallel(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Parallel(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Parallel(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Parallel(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Parallel(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Parallel(N_Vector v, sunbooleantype tf);
 
 
 #ifdef __cplusplus
diff --git a/include/nvector/nvector_parhyp.h b/include/nvector/nvector_parhyp.h
index 03e7f66df6..1287ac5128 100644
--- a/include/nvector/nvector_parhyp.h
+++ b/include/nvector/nvector_parhyp.h
@@ -23,11 +23,11 @@
  *   - The definition of the generic N_Vector structure can be
  *     found in the header file sundials_nvector.h.
  *
- *   - The definition of the type realtype can be found in the
+ *   - The definition of the type sunrealtype can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type booleantype.
+ *     for the type sunbooleantype.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -62,7 +62,7 @@ extern "C" {
 struct _N_VectorContent_ParHyp {
   sunindextype local_length;  /* local vector length         */
   sunindextype global_length; /* global vector length        */
-  booleantype own_parvector;  /* ownership of HYPRE vector   */
+  sunbooleantype own_parvector;  /* ownership of HYPRE vector   */
   MPI_Comm comm;              /* pointer to MPI communicator */
 
   HYPRE_ParVector x;          /* the actual HYPRE_ParVector object */
@@ -96,87 +96,87 @@ SUNDIALS_EXPORT N_Vector N_VClone_ParHyp(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_ParHyp(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_ParHyp(N_Vector v, sunindextype *lrw,
                                      sunindextype *liw);
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_ParHyp(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer_ParHyp(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_ParHyp(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_ParHyp(sunrealtype *v_data, N_Vector v);
 SUNDIALS_EXPORT void *N_VGetCommunicator_ParHyp(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLength_ParHyp(N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_ParHyp(realtype a, N_Vector x, realtype b,
+SUNDIALS_EXPORT void N_VLinearSum_ParHyp(sunrealtype a, N_Vector x, sunrealtype b,
                                          N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_ParHyp(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_ParHyp(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_ParHyp(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_ParHyp(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_ParHyp(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_ParHyp(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_ParHyp(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_ParHyp(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_ParHyp(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_ParHyp(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_ParHyp(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_ParHyp(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_ParHyp(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT void N_VAddConst_ParHyp(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_ParHyp(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_ParHyp(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_ParHyp(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_ParHyp(N_Vector x, N_Vector w,
                                                 N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_ParHyp(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_ParHyp(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_ParHyp(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_ParHyp(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_ParHyp(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_ParHyp(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunrealtype N_VMin_ParHyp(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_ParHyp(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_ParHyp(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_ParHyp(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_ParHyp(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_ParHyp(N_Vector c, N_Vector x,
                                                  N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_ParHyp(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_ParHyp(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_ParHyp(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_ParHyp(int nvec, sunrealtype* c,
                                                 N_Vector* X, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_ParHyp(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_ParHyp(int nvec, sunrealtype* a, N_Vector x,
                                             N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_ParHyp(int nvec, N_Vector x, N_Vector* Y,
-                                           realtype* dotprods);
+                                           sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_ParHyp(int nvec,
-                                                   realtype a, N_Vector* X,
-                                                   realtype b, N_Vector* Y,
+                                                   sunrealtype a, N_Vector* X,
+                                                   sunrealtype b, N_Vector* Y,
                                                    N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_ParHyp(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_ParHyp(int nvec, sunrealtype* c,
                                                N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_ParHyp(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_ParHyp(int nvecs, sunrealtype c,
                                                N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_ParHyp(int nvecs, N_Vector* X,
-                                                  N_Vector* W, realtype* nrm);
+                                                  N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_ParHyp(int nvec, N_Vector* X,
                                                       N_Vector* W, N_Vector id,
-                                                      realtype* nrm);
+                                                      sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_ParHyp(int nvec, int nsum,
-                                                       realtype* a,
+                                                       sunrealtype* a,
                                                        N_Vector* X,
                                                        N_Vector** Y,
                                                        N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_ParHyp(int nvec, int nsum,
-                                                           realtype* c,
+                                                           sunrealtype* c,
                                                            N_Vector** X,
                                                            N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_ParHyp(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_ParHyp(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_ParHyp(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_ParHyp(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_ParHyp(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_ParHyp(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_ParHyp(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_ParHyp(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_ParHyp(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_ParHyp(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_ParHyp(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_ParHyp(N_Vector x, N_Vector w,
                                                     N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_ParHyp(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_ParHyp(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_ParHyp(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_ParHyp(N_Vector c, N_Vector x,
                                                       N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_ParHyp(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_ParHyp(N_Vector num,
                                                     N_Vector denom);
 
 /* OPTIONAL single buffer reduction operations */
 SUNDIALS_EXPORT int N_VDotProdMultiLocal_ParHyp(int nvec, N_Vector x,
                                                 N_Vector* Y,
-                                                realtype* dotprods);
+                                                sunrealtype* dotprods);
 SUNDIALS_EXPORT int N_VDotProdMultiAllReduce_ParHyp(int nvec, N_Vector x,
-                                                    realtype* sum);
+                                                    sunrealtype* sum);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_ParHyp(N_Vector x, sunindextype *size);
@@ -189,29 +189,29 @@ SUNDIALS_EXPORT int N_VBufUnpack_ParHyp(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_ParHyp(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_ParHyp(N_Vector v, sunbooleantype tf);
 
 SUNDIALS_EXPORT int N_VEnableLinearCombination_ParHyp(N_Vector v,
-                                                      booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_ParHyp(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_ParHyp(N_Vector v, booleantype tf);
+                                                      sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_ParHyp(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_ParHyp(N_Vector v, sunbooleantype tf);
 
 SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v,
-                                                         booleantype tf);
+                                                         sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableScaleVectorArray_ParHyp(N_Vector v,
-                                                     booleantype tf);
+                                                     sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableConstVectorArray_ParHyp(N_Vector v,
-                                                     booleantype tf);
+                                                     sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v,
-                                                        booleantype tf);
+                                                        sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v,
-                                                            booleantype tf);
+                                                            sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v,
-                                                             booleantype tf);
+                                                             sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v,
-                                                                 booleantype tf);
+                                                                 sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_ParHyp(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_ParHyp(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_petsc.h b/include/nvector/nvector_petsc.h
index f7745ad98f..0edf01e560 100644
--- a/include/nvector/nvector_petsc.h
+++ b/include/nvector/nvector_petsc.h
@@ -19,11 +19,11 @@
  *   - The definition of the generic N_Vector structure can be
  *     found in the header file sundials_nvector.h.
  *
- *   - The definition of the type realtype can be found in the
+ *   - The definition of the type sunrealtype can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     build configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type booleantype.
+ *     for the type sunbooleantype.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -55,7 +55,7 @@ extern "C" {
 struct _N_VectorContent_Petsc {
   sunindextype local_length;   /* copy of local vector length  */
   sunindextype global_length;  /* copy of global vector length */
-  booleantype own_data;        /* ownership of data            */
+  sunbooleantype own_data;        /* ownership of data            */
   Vec pvec;                    /* the PETSc Vec object         */
   MPI_Comm comm;               /* copy of MPI communicator     */
 };
@@ -75,7 +75,7 @@ SUNDIALS_EXPORT N_Vector N_VNewEmpty_Petsc(MPI_Comm comm,
 
 SUNDIALS_EXPORT N_Vector N_VMake_Petsc(Vec v, SUNContext sunctx);
 
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_Petsc(N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_Petsc(N_Vector v);
 
 SUNDIALS_EXPORT Vec N_VGetVector_Petsc(N_Vector v);
 
@@ -91,82 +91,82 @@ SUNDIALS_EXPORT N_Vector N_VCloneEmpty_Petsc(N_Vector w);
 SUNDIALS_EXPORT N_Vector N_VClone_Petsc(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_Petsc(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Petsc(N_Vector v, sunindextype *lrw, sunindextype *liw);
-SUNDIALS_EXPORT void N_VSetArrayPointer_Petsc(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_Petsc(sunrealtype *v_data, N_Vector v);
 SUNDIALS_EXPORT void *N_VGetCommunicator_Petsc(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLength_Petsc(N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Petsc(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Petsc(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Petsc(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Petsc(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Petsc(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Petsc(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Petsc(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Petsc(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Petsc(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Petsc(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Petsc(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Petsc(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Petsc(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Petsc(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Petsc(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Petsc(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Petsc(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Petsc(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Petsc(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Petsc(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Petsc(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Petsc(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Petsc(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Petsc(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Petsc(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Petsc(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Petsc(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Petsc(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Petsc(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Petsc(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Petsc(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Petsc(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Petsc(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Petsc(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Petsc(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_Petsc(int nvec, sunrealtype* c,
                                                N_Vector* X, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Petsc(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Petsc(int nvec, sunrealtype* a, N_Vector x,
                                            N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Petsc(int nvec, N_Vector x, N_Vector* Y,
-                                          realtype* dotprods);
+                                          sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Petsc(int nvec,
-                                                  realtype a, N_Vector* X,
-                                                  realtype b, N_Vector* Y,
+                                                  sunrealtype a, N_Vector* X,
+                                                  sunrealtype b, N_Vector* Y,
                                                   N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Petsc(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Petsc(int nvec, sunrealtype* c,
                                               N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Petsc(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_Petsc(int nvecs, sunrealtype c,
                                               N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Petsc(int nvecs, N_Vector* X,
-                                                 N_Vector* W, realtype* nrm);
+                                                 N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Petsc(int nvec, N_Vector* X,
                                                      N_Vector* W, N_Vector id,
-                                                     realtype* nrm);
+                                                     sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Petsc(int nvec, int nsum,
-                                                      realtype* a,
+                                                      sunrealtype* a,
                                                       N_Vector* X,
                                                       N_Vector** Y,
                                                       N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Petsc(int nvec, int nsum,
-                                                          realtype* c,
+                                                          sunrealtype* c,
                                                           N_Vector** X,
                                                           N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_Petsc(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_Petsc(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_Petsc(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_Petsc(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Petsc(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Petsc(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_Petsc(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_Petsc(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_Petsc(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_Petsc(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Petsc(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Petsc(N_Vector x, N_Vector w,
                                                    N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_Petsc(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_Petsc(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_Petsc(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_Petsc(N_Vector c, N_Vector x,
                                                      N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_Petsc(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_Petsc(N_Vector num,
                                                    N_Vector denom);
 
 /* OPTIONAL single buffer reduction operations */
 SUNDIALS_EXPORT int N_VDotProdMultiLocal_Petsc(int nvec, N_Vector x,
-                                               N_Vector* Y, realtype* dotprods);
+                                               N_Vector* Y, sunrealtype* dotprods);
 SUNDIALS_EXPORT int N_VDotProdMultiAllReduce_Petsc(int nvec, N_Vector x,
-                                                   realtype* sum);
+                                                   sunrealtype* sum);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Petsc(N_Vector x, sunindextype *size);
@@ -179,21 +179,21 @@ SUNDIALS_EXPORT int N_VBufUnpack_Petsc(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Petsc(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Petsc(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Petsc(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Petsc(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Petsc(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMultiLocal_Petsc(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_pthreads.h b/include/nvector/nvector_pthreads.h
index 4e20c7ad5b..4c82a479ed 100644
--- a/include/nvector/nvector_pthreads.h
+++ b/include/nvector/nvector_pthreads.h
@@ -25,11 +25,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -59,8 +59,8 @@ extern "C" {
 
 struct _N_VectorContent_Pthreads {
   sunindextype length;   /* vector length           */
-  booleantype own_data;  /* data ownership flag     */
-  realtype *data;        /* data array              */
+  sunbooleantype own_data;  /* data ownership flag     */
+  sunrealtype *data;        /* data array              */
   int num_threads;       /* number of POSIX threads */
 };
 
@@ -69,21 +69,21 @@ typedef struct _N_VectorContent_Pthreads *N_VectorContent_Pthreads;
 /* Structure to hold parallelization information for each thread when
    calling "companion" functions to compute vector operations. The
    start and end vector (loop) indices are unique to each thread, the
-   realtype variables are the same for each thread, and the mutex
+   sunrealtype variables are the same for each thread, and the mutex
    variable is used to lock variables in reductions. */
 
 struct _Pthreads_Data{
   sunindextype start;            /* starting index for loop  */
   sunindextype end;              /* ending index for loop    */
-  realtype c1, c2;               /* scalar values            */
-  realtype *v1, *v2, *v3;        /* vector data              */
-  realtype *global_val;          /* shared global variable   */
+  sunrealtype c1, c2;               /* scalar values            */
+  sunrealtype *v1, *v2, *v3;        /* vector data              */
+  sunrealtype *global_val;          /* shared global variable   */
   pthread_mutex_t *global_mutex; /* lock for shared variable */
 
   int nvec; /* number of vectors in fused op */
   int nsum; /* number of sums in fused op    */
 
-  realtype* cvals; /* scalar values in fused op */
+  sunrealtype* cvals; /* scalar values in fused op */
 
   N_Vector x1;     /* vector array in fused op */
   N_Vector x2;     /* vector array in fused op */
@@ -131,7 +131,7 @@ SUNDIALS_EXPORT N_Vector N_VNewEmpty_Pthreads(sunindextype vec_length,
                                               int n_threads, SUNContext sunctx);
 
 SUNDIALS_EXPORT N_Vector N_VMake_Pthreads(sunindextype vec_length,
-                                          int n_threads, realtype *v_data,
+                                          int n_threads, sunrealtype *v_data,
                                           SUNContext sunctx);
 
 SUNDIALS_EXPORT sunindextype N_VGetLength_Pthreads(N_Vector v);
@@ -146,68 +146,68 @@ SUNDIALS_EXPORT N_Vector N_VClone_Pthreads(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_Pthreads(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Pthreads(N_Vector v, sunindextype *lrw,
                                        sunindextype *liw);
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_Pthreads(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer_Pthreads(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_Pthreads(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_Pthreads(sunrealtype *v_data, N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Pthreads(realtype a, N_Vector x, realtype b,
+SUNDIALS_EXPORT void N_VLinearSum_Pthreads(sunrealtype a, N_Vector x, sunrealtype b,
                                            N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Pthreads(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Pthreads(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Pthreads(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Pthreads(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Pthreads(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Pthreads(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Pthreads(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Pthreads(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Pthreads(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Pthreads(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Pthreads(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Pthreads(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Pthreads(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT void N_VAddConst_Pthreads(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Pthreads(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Pthreads(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Pthreads(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Pthreads(N_Vector x, N_Vector w,
                                                   N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Pthreads(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Pthreads(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Pthreads(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunrealtype N_VMin_Pthreads(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Pthreads(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Pthreads(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x,
                                                    N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Pthreads(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VLinearCombination_Pthreads(int nvec, sunrealtype* c,
                                                   N_Vector* X, N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Pthreads(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Pthreads(int nvec, sunrealtype* a, N_Vector x,
                                               N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Pthreads(int nvec, N_Vector x, N_Vector* Y,
-                                             realtype* dotprods);
+                                             sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Pthreads(int nvec,
-                                                     realtype a, N_Vector* X,
-                                                     realtype b, N_Vector* Y,
+                                                     sunrealtype a, N_Vector* X,
+                                                     sunrealtype b, N_Vector* Y,
                                                      N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Pthreads(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Pthreads(int nvec, sunrealtype* c,
                                                  N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Pthreads(int nvec, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_Pthreads(int nvec, sunrealtype c,
                                                  N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Pthreads(int nvec, N_Vector* X,
-                                                    N_Vector* W, realtype* nrm);
+                                                    N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Pthreads(int nvec, N_Vector* X,
                                                         N_Vector* W, N_Vector id,
-                                                        realtype* nrm);
+                                                        sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Pthreads(int nvec, int nsum,
-                                                         realtype* a,
+                                                         sunrealtype* a,
                                                          N_Vector* X,
                                                          N_Vector** Y,
                                                          N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Pthreads(int nvec, int nsum,
-                                                             realtype* c,
+                                                             sunrealtype* c,
                                                              N_Vector** X,
                                                              N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w,
                                                       N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
@@ -221,27 +221,27 @@ SUNDIALS_EXPORT int N_VBufUnpack_Pthreads(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Pthreads(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Pthreads(N_Vector v, sunbooleantype tf);
 
 SUNDIALS_EXPORT int N_VEnableLinearCombination_Pthreads(N_Vector v,
-                                                        booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Pthreads(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Pthreads(N_Vector v, booleantype tf);
+                                                        sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Pthreads(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Pthreads(N_Vector v, sunbooleantype tf);
 
 SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v,
-                                                           booleantype tf);
+                                                           sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Pthreads(N_Vector v,
-                                                       booleantype tf);
+                                                       sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableConstVectorArray_Pthreads(N_Vector v,
-                                                       booleantype tf);
+                                                       sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v,
-                                                          booleantype tf);
+                                                          sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v,
-                                                              booleantype tf);
+                                                              sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v,
-                                                               booleantype tf);
+                                                               sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v,
-                                                                   booleantype tf);
+                                                                   sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_raja.h b/include/nvector/nvector_raja.h
index b31bd3dd79..afe005d19e 100644
--- a/include/nvector/nvector_raja.h
+++ b/include/nvector/nvector_raja.h
@@ -36,12 +36,12 @@ extern "C" {
 
 /* RAJA implementation of the N_Vector 'content' structure
    contains the length of the vector, pointers to host and device
-   arrays of 'realtype' components, a flag indicating ownership of
+   arrays of 'sunrealtype' components, a flag indicating ownership of
    the data, and a private data pointer  */
 
 struct _N_VectorContent_Raja {
   sunindextype    length;
-  booleantype     own_helper;
+  sunbooleantype     own_helper;
   SUNMemory       host_data;
   SUNMemory       device_data;
   SUNMemoryHelper mem_helper;
@@ -61,18 +61,18 @@ SUNDIALS_EXPORT N_Vector N_VNew_Raja(sunindextype length, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewManaged_Raja(sunindextype length,
                                             SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewWithMemHelp_Raja(sunindextype length,
-                                                booleantype use_managed_mem,
+                                                sunbooleantype use_managed_mem,
                                                 SUNMemoryHelper helper,
                                                 SUNContext sunctx);
-SUNDIALS_EXPORT N_Vector N_VMake_Raja(sunindextype length, realtype *h_vdata,
-                                      realtype *d_vdata, SUNContext sunctx);
+SUNDIALS_EXPORT N_Vector N_VMake_Raja(sunindextype length, sunrealtype *h_vdata,
+                                      sunrealtype *d_vdata, SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMakeManaged_Raja(sunindextype length,
-                                             realtype *vdata,
+                                             sunrealtype *vdata,
                                              SUNContext sunctx);
-SUNDIALS_EXPORT void N_VSetHostArrayPointer_Raja(realtype* h_vdata, N_Vector v);
-SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Raja(realtype* d_vdata,
+SUNDIALS_EXPORT void N_VSetHostArrayPointer_Raja(sunrealtype* h_vdata, N_Vector v);
+SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Raja(sunrealtype* d_vdata,
                                                    N_Vector v);
-SUNDIALS_EXPORT booleantype N_VIsManagedMemory_Raja(N_Vector x);
+SUNDIALS_EXPORT sunbooleantype N_VIsManagedMemory_Raja(N_Vector x);
 SUNDIALS_EXPORT void N_VCopyToDevice_Raja(N_Vector v);
 SUNDIALS_EXPORT void N_VCopyFromDevice_Raja(N_Vector v);
 
@@ -84,17 +84,17 @@ sunindextype N_VGetLength_Raja(N_Vector x)
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetHostArrayPointer_Raja(N_Vector x)
+sunrealtype *N_VGetHostArrayPointer_Raja(N_Vector x)
 {
   N_VectorContent_Raja content = (N_VectorContent_Raja)x->content;
-  return(content->host_data == NULL ? NULL : (realtype*)content->host_data->ptr);
+  return(content->host_data == NULL ? NULL : (sunrealtype*)content->host_data->ptr);
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetDeviceArrayPointer_Raja(N_Vector x)
+sunrealtype *N_VGetDeviceArrayPointer_Raja(N_Vector x)
 {
   N_VectorContent_Raja content = (N_VectorContent_Raja)x->content;
-  return(content->device_data == NULL ? NULL : (realtype*)content->device_data->ptr);
+  return(content->device_data == NULL ? NULL : (sunrealtype*)content->device_data->ptr);
 }
 
 
@@ -114,55 +114,55 @@ SUNDIALS_EXPORT N_Vector N_VCloneEmpty_Raja(N_Vector w);
 SUNDIALS_EXPORT N_Vector N_VClone_Raja(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_Raja(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Raja(N_Vector v, sunindextype *lrw, sunindextype *liw);
-SUNDIALS_EXPORT void N_VSetArrayPointer_Raja(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_Raja(sunrealtype *v_data, N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Raja(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Raja(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Raja(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Raja(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Raja(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Raja(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Raja(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Raja(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Raja(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Raja(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Raja(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Raja(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Raja(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Raja(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Raja(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Raja(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Raja(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Raja(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Raja(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Raja(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Raja(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Raja(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Raja(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Raja(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Raja(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Raja(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Raja(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Raja(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Raja(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Raja(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Raja(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Raja(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Raja(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Raja(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Raja(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VLinearCombination_Raja(int nvec, sunrealtype* c, N_Vector* X,
                                               N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Raja(int nvec, realtype* c, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Raja(int nvec, sunrealtype* c, N_Vector x,
                                           N_Vector* Y, N_Vector* Z);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Raja(int nvec,
-                                                 realtype a, N_Vector* X,
-                                                 realtype b, N_Vector* Y,
+                                                 sunrealtype a, N_Vector* X,
+                                                 sunrealtype b, N_Vector* Y,
                                                  N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Raja(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Raja(int nvec, sunrealtype* c, N_Vector* X,
                                              N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Raja(int nvec, realtype c, N_Vector* Z);
+SUNDIALS_EXPORT int N_VConstVectorArray_Raja(int nvec, sunrealtype c, N_Vector* Z);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Raja(int nvec, int nsum,
-                                                     realtype* a,
+                                                     sunrealtype* a,
                                                      N_Vector* X, N_Vector** Y,
                                                      N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Raja(int nvec, int nsum,
-                                                         realtype* c,
+                                                         sunrealtype* c,
                                                          N_Vector** X,
                                                          N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Raja(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Raja(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Raja(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Raja(N_Vector x, N_Vector w, N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Raja(N_Vector x, sunindextype *size);
@@ -179,16 +179,16 @@ SUNDIALS_EXPORT void N_VPrintFile_Raja(N_Vector v, FILE *outfile);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Raja(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Raja(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Raja(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Raja(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Raja(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Raja(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Raja(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Raja(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Raja(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Raja(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Raja(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Raja(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_serial.h b/include/nvector/nvector_serial.h
index 1b08708c6c..c3cc534513 100644
--- a/include/nvector/nvector_serial.h
+++ b/include/nvector/nvector_serial.h
@@ -20,11 +20,11 @@
  *   - The definition of the generic N_Vector structure can be found
  *     in the header file sundials_nvector.h.
  *
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype'.
+ *     for the type 'sunbooleantype'.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -53,8 +53,8 @@ extern "C" {
 
 struct _N_VectorContent_Serial {
   sunindextype length;   /* vector length       */
-  booleantype own_data;  /* data ownership flag */
-  realtype *data;        /* data array          */
+  sunbooleantype own_data;  /* data ownership flag */
+  sunrealtype *data;        /* data array          */
 };
 
 typedef struct _N_VectorContent_Serial *N_VectorContent_Serial;
@@ -86,7 +86,7 @@ SUNDIALS_EXPORT N_Vector N_VNew_Serial(sunindextype vec_length, SUNContext sunct
 
 SUNDIALS_EXPORT N_Vector N_VNewEmpty_Serial(sunindextype vec_length, SUNContext sunctx);
 
-SUNDIALS_EXPORT N_Vector N_VMake_Serial(sunindextype vec_length, realtype *v_data, SUNContext sunctx);
+SUNDIALS_EXPORT N_Vector N_VMake_Serial(sunindextype vec_length, sunrealtype *v_data, SUNContext sunctx);
 
 SUNDIALS_EXPORT sunindextype N_VGetLength_Serial(N_Vector v);
 
@@ -99,65 +99,65 @@ SUNDIALS_EXPORT N_Vector N_VCloneEmpty_Serial(N_Vector w);
 SUNDIALS_EXPORT N_Vector N_VClone_Serial(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_Serial(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Serial(N_Vector v, sunindextype *lrw, sunindextype *liw);
-SUNDIALS_EXPORT realtype *N_VGetArrayPointer_Serial(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer_Serial(realtype *v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype *N_VGetArrayPointer_Serial(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer_Serial(sunrealtype *v_data, N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Serial(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Serial(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Serial(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Serial(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Serial(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Serial(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Serial(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Serial(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Serial(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Serial(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Serial(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Serial(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Serial(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Serial(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Serial(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Serial(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Serial(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Serial(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Serial(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Serial(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Serial(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Serial(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Serial(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Serial(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Serial(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Serial(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Serial(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Serial(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Serial(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Serial(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Serial(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Serial(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Serial(int nvec, realtype* c, N_Vector* V,
+SUNDIALS_EXPORT int N_VLinearCombination_Serial(int nvec, sunrealtype* c, N_Vector* V,
                                                 N_Vector z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Serial(int nvec, realtype* a, N_Vector x,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Serial(int nvec, sunrealtype* a, N_Vector x,
                                             N_Vector* Y, N_Vector* Z);
 SUNDIALS_EXPORT int N_VDotProdMulti_Serial(int nvec, N_Vector x,
-                                           N_Vector* Y, realtype* dotprods);
+                                           N_Vector* Y, sunrealtype* dotprods);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Serial(int nvec,
-                                                   realtype a, N_Vector* X,
-                                                   realtype b, N_Vector* Y,
+                                                   sunrealtype a, N_Vector* X,
+                                                   sunrealtype b, N_Vector* Y,
                                                    N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Serial(int nvec, realtype* c,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Serial(int nvec, sunrealtype* c,
                                                N_Vector* X, N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Serial(int nvecs, realtype c,
+SUNDIALS_EXPORT int N_VConstVectorArray_Serial(int nvecs, sunrealtype c,
                                                N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Serial(int nvecs, N_Vector* X,
-                                                  N_Vector* W, realtype* nrm);
+                                                  N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Serial(int nvecs, N_Vector* X,
                                                       N_Vector* W, N_Vector id,
-                                                      realtype* nrm);
+                                                      sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Serial(int nvec, int nsum,
-                                                       realtype* a,
+                                                       sunrealtype* a,
                                                        N_Vector* X,
                                                        N_Vector** Y,
                                                        N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Serial(int nvec, int nsum,
-                                                           realtype* c,
+                                                           sunrealtype* c,
                                                            N_Vector** X,
                                                            N_Vector* Z);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Serial(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Serial(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Serial(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Serial(N_Vector x, N_Vector w, N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize_Serial(N_Vector x, sunindextype *size);
@@ -170,19 +170,19 @@ SUNDIALS_EXPORT int N_VBufUnpack_Serial(N_Vector x, void *buf);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Serial(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Serial(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Serial(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Serial(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, sunbooleantype tf);
 
 
 #ifdef __cplusplus
diff --git a/include/nvector/nvector_sycl.h b/include/nvector/nvector_sycl.h
index d60187f05b..c2c40bf981 100644
--- a/include/nvector/nvector_sycl.h
+++ b/include/nvector/nvector_sycl.h
@@ -39,7 +39,7 @@ extern "C" {
 struct _N_VectorContent_Sycl
 {
   sunindextype       length;
-  booleantype        own_helper;
+  sunbooleantype        own_helper;
   SUNMemory          host_data;
   SUNMemory          device_data;
   SUNSyclExecPolicy* stream_exec_policy;
@@ -65,24 +65,24 @@ SUNDIALS_EXPORT N_Vector N_VNewManaged_Sycl(sunindextype length,
                                             ::sycl::queue *Q,
                                             SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VNewWithMemHelp_Sycl(sunindextype length,
-                                                booleantype use_managed_mem,
+                                                sunbooleantype use_managed_mem,
                                                 SUNMemoryHelper helper,
                                                 ::sycl::queue *Q,
                                                 SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMake_Sycl(sunindextype length,
-                                      realtype *h_vdata,
-                                      realtype *d_vdata,
+                                      sunrealtype *h_vdata,
+                                      sunrealtype *d_vdata,
                                       ::sycl::queue *Q,
                                       SUNContext sunctx);
 SUNDIALS_EXPORT N_Vector N_VMakeManaged_Sycl(sunindextype length,
-                                             realtype *vdata,
+                                             sunrealtype *vdata,
                                              ::sycl::queue *Q,
                                              SUNContext sunctx);
 
-SUNDIALS_EXPORT void N_VSetHostArrayPointer_Sycl(realtype* h_vdata, N_Vector v);
-SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Sycl(realtype* d_vdata,
+SUNDIALS_EXPORT void N_VSetHostArrayPointer_Sycl(sunrealtype* h_vdata, N_Vector v);
+SUNDIALS_EXPORT void N_VSetDeviceArrayPointer_Sycl(sunrealtype* d_vdata,
                                                    N_Vector v);
-SUNDIALS_EXPORT booleantype N_VIsManagedMemory_Sycl(N_Vector x);
+SUNDIALS_EXPORT sunbooleantype N_VIsManagedMemory_Sycl(N_Vector x);
 SUNDIALS_EXPORT int N_VSetKernelExecPolicy_Sycl(N_Vector x,
                                                 SUNSyclExecPolicy* stream_exec_policy,
                                                 SUNSyclExecPolicy* reduce_exec_policy);
@@ -97,17 +97,17 @@ sunindextype N_VGetLength_Sycl(N_Vector x)
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetHostArrayPointer_Sycl(N_Vector x)
+sunrealtype *N_VGetHostArrayPointer_Sycl(N_Vector x)
 {
   N_VectorContent_Sycl content = (N_VectorContent_Sycl)x->content;
-  return(content->host_data == NULL ? NULL : (realtype*)content->host_data->ptr);
+  return(content->host_data == NULL ? NULL : (sunrealtype*)content->host_data->ptr);
 }
 
 SUNDIALS_STATIC_INLINE
-realtype *N_VGetDeviceArrayPointer_Sycl(N_Vector x)
+sunrealtype *N_VGetDeviceArrayPointer_Sycl(N_Vector x)
 {
   N_VectorContent_Sycl content = (N_VectorContent_Sycl)x->content;
-  return(content->device_data == NULL ? NULL : (realtype*)content->device_data->ptr);
+  return(content->device_data == NULL ? NULL : (sunrealtype*)content->device_data->ptr);
 }
 
 
@@ -129,59 +129,59 @@ SUNDIALS_EXPORT void N_VSpace_Sycl(N_Vector v, sunindextype *lrw,
                                    sunindextype *liw);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_Sycl(realtype a, N_Vector x,
-                                       realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Sycl(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Sycl(sunrealtype a, N_Vector x,
+                                       sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Sycl(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Sycl(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Sycl(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Sycl(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Sycl(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Sycl(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Sycl(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Sycl(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Sycl(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Sycl(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Sycl(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Sycl(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT void N_VAddConst_Sycl(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Sycl(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Sycl(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Sycl(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Sycl(N_Vector x, N_Vector w,
                                               N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Sycl(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Sycl(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Sycl(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Sycl(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Sycl(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunrealtype N_VMin_Sycl(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Sycl(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Sycl(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Sycl(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Sycl(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x,
                                                N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom);
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination_Sycl(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VLinearCombination_Sycl(int nvec, sunrealtype* c, N_Vector* X,
                                               N_Vector Z);
-SUNDIALS_EXPORT int N_VScaleAddMulti_Sycl(int nvec, realtype* c, N_Vector X,
+SUNDIALS_EXPORT int N_VScaleAddMulti_Sycl(int nvec, sunrealtype* c, N_Vector X,
                                           N_Vector* Y, N_Vector* Z);
 
 /* vector array operations */
 SUNDIALS_EXPORT int N_VLinearSumVectorArray_Sycl(int nvec,
-                                                 realtype a, N_Vector* X,
-                                                 realtype b, N_Vector* Y,
+                                                 sunrealtype a, N_Vector* X,
+                                                 sunrealtype b, N_Vector* Y,
                                                  N_Vector* Z);
-SUNDIALS_EXPORT int N_VScaleVectorArray_Sycl(int nvec, realtype* c, N_Vector* X,
+SUNDIALS_EXPORT int N_VScaleVectorArray_Sycl(int nvec, sunrealtype* c, N_Vector* X,
                                              N_Vector* Z);
-SUNDIALS_EXPORT int N_VConstVectorArray_Sycl(int nvec, realtype c, N_Vector* Z);
+SUNDIALS_EXPORT int N_VConstVectorArray_Sycl(int nvec, sunrealtype c, N_Vector* Z);
 SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray_Sycl(int nvec, int nsum,
-                                                     realtype* a, N_Vector* X,
+                                                     sunrealtype* a, N_Vector* X,
                                                      N_Vector** Y, N_Vector** Z);
 SUNDIALS_EXPORT int N_VLinearCombinationVectorArray_Sycl(int nvec, int nsum,
-                                                         realtype* c,
+                                                         sunrealtype* c,
                                                          N_Vector** X,
                                                          N_Vector* Z);
 SUNDIALS_EXPORT int N_VWrmsNormVectorArray_Sycl(int nvec, N_Vector* X,
-                                                N_Vector* W, realtype* nrm);
+                                                N_Vector* W, sunrealtype* nrm);
 SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray_Sycl(int nvec, N_Vector* X,
                                                     N_Vector* W, N_Vector id,
-                                                    realtype* nrm);
+                                                    sunrealtype* nrm);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w,
                                                   N_Vector id);
 
 /* OPTIONAL XBraid interface operations */
@@ -199,24 +199,24 @@ SUNDIALS_EXPORT void N_VPrintFile_Sycl(N_Vector v, FILE *outfile);
  * ----------------------------------------------------------------- */
 
 
-SUNDIALS_EXPORT int N_VEnableFusedOps_Sycl(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableFusedOps_Sycl(N_Vector v, sunbooleantype tf);
 
-SUNDIALS_EXPORT int N_VEnableLinearCombination_Sycl(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Sycl(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableDotProdMulti_Sycl(N_Vector v, booleantype tf);
+SUNDIALS_EXPORT int N_VEnableLinearCombination_Sycl(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleAddMulti_Sycl(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableDotProdMulti_Sycl(N_Vector v, sunbooleantype tf);
 
 SUNDIALS_EXPORT int N_VEnableLinearSumVectorArray_Sycl(N_Vector v,
-                                                       booleantype tf);
-SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Sycl(N_Vector v, booleantype tf);
-SUNDIALS_EXPORT int N_VEnableConstVectorArray_Sycl(N_Vector v, booleantype tf);
+                                                       sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableScaleVectorArray_Sycl(N_Vector v, sunbooleantype tf);
+SUNDIALS_EXPORT int N_VEnableConstVectorArray_Sycl(N_Vector v, sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormVectorArray_Sycl(N_Vector v,
-                                                      booleantype tf);
+                                                      sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableWrmsNormMaskVectorArray_Sycl(N_Vector v,
-                                                          booleantype tf);
+                                                          sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v,
-                                                           booleantype tf);
+                                                           sunbooleantype tf);
 SUNDIALS_EXPORT int N_VEnableLinearCombinationVectorArray_Sycl(N_Vector v,
-                                                               booleantype tf);
+                                                               sunbooleantype tf);
 
 #ifdef __cplusplus
 }
diff --git a/include/nvector/nvector_trilinos.h b/include/nvector/nvector_trilinos.h
index 21a9f8a04d..bc98564880 100644
--- a/include/nvector/nvector_trilinos.h
+++ b/include/nvector/nvector_trilinos.h
@@ -26,11 +26,11 @@
  *   - The definition of the generic N_Vector structure can be
  *     found in the header file sundials_nvector.h.
  *
- *   - The definition of the type realtype can be found in the
+ *   - The definition of the type sunrealtype can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     build configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type booleantype.
+ *     for the type sunbooleantype.
  *
  *   - N_Vector arguments to arithmetic vector operations need not
  *     be distinct. For example, the following call:
@@ -100,38 +100,38 @@ SUNDIALS_EXPORT void N_VDestroy_Trilinos(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace_Trilinos(N_Vector v, sunindextype *lrw, sunindextype *liw);
 SUNDIALS_EXPORT void *N_VGetCommunicator_Trilinos(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLength_Trilinos(N_Vector v);
-SUNDIALS_EXPORT void N_VLinearSum_Trilinos(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst_Trilinos(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum_Trilinos(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_Trilinos(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_Trilinos(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_Trilinos(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_Trilinos(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_Trilinos(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_Trilinos(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_Trilinos(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_Trilinos(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_Trilinos(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_Trilinos(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_Trilinos(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_Trilinos(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_Trilinos(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_Trilinos(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_Trilinos(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_Trilinos(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_Trilinos(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_Trilinos(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_Trilinos(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst_Trilinos(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd_Trilinos(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_Trilinos(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_Trilinos(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_Trilinos(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin_Trilinos(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_Trilinos(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_Trilinos(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_Trilinos(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_Trilinos(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_Trilinos(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_Trilinos(N_Vector num, N_Vector denom);
 
 /* OPTIONAL local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal_Trilinos(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal_Trilinos(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal_Trilinos(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal_Trilinos(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal_Trilinos(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal_Trilinos(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal_Trilinos(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal_Trilinos(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal_Trilinos(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal_Trilinos(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal_Trilinos(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal_Trilinos(N_Vector x, N_Vector w,
                                                       N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal_Trilinos(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal_Trilinos(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal_Trilinos(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal_Trilinos(N_Vector c, N_Vector x,
                                                         N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal_Trilinos(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal_Trilinos(N_Vector num,
                                                       N_Vector denom);
 
 #ifdef __cplusplus
diff --git a/include/nvector/trilinos/SundialsTpetraVectorInterface.hpp b/include/nvector/trilinos/SundialsTpetraVectorInterface.hpp
index a399232b8b..07376bb27f 100644
--- a/include/nvector/trilinos/SundialsTpetraVectorInterface.hpp
+++ b/include/nvector/trilinos/SundialsTpetraVectorInterface.hpp
@@ -28,7 +28,7 @@ namespace nvector_tpetra
   struct TpetraVectorInterface : public _N_VectorContent_Trilinos
   {
     // Typedef of Tpetra vector class to be used with SUNDIALS
-    typedef Tpetra::Vector<realtype, int, sunindextype> vector_type;
+    typedef Tpetra::Vector<sunrealtype, int, sunindextype> vector_type;
 
     TpetraVectorInterface(Teuchos::RCP<vector_type> rcpvec)
     {
diff --git a/include/sundials/sundials_band.h b/include/sundials/sundials_band.h
index 9c306de2c1..4ddca2fe74 100644
--- a/include/sundials/sundials_band.h
+++ b/include/sundials/sundials_band.h
@@ -16,9 +16,9 @@
  *
  * There are two sets of band solver routines listed in
  * this file: one set uses type SUNDlsMat defined below and the
- * other set uses the type realtype ** for band matrix arguments.
+ * other set uses the type sunrealtype ** for band matrix arguments.
  * Routines that work with the type SUNDlsMat begin with "Band".
- * Routines that work with realtype ** begin with "band".
+ * Routines that work with sunrealtype ** begin with "band".
  * -----------------------------------------------------------------*/
 
 #ifndef _SUNDIALS_BAND_H
@@ -80,7 +80,7 @@ SUNDIALS_EXPORT
 sunindextype SUNDlsMat_BandGBTRF(SUNDlsMat A, sunindextype* p);
 
 SUNDIALS_EXPORT
-sunindextype SUNDlsMat_bandGBTRF(realtype **a, sunindextype n,
+sunindextype SUNDlsMat_bandGBTRF(sunrealtype **a, sunindextype n,
                                  sunindextype mu, sunindextype ml,
                                  sunindextype smu, sunindextype *p);
 
@@ -103,11 +103,11 @@ sunindextype SUNDlsMat_bandGBTRF(realtype **a, sunindextype n,
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_BandGBTRS(SUNDlsMat A, sunindextype *p, realtype *b);
+void SUNDlsMat_BandGBTRS(SUNDlsMat A, sunindextype *p, sunrealtype *b);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_bandGBTRS(realtype **a, sunindextype n, sunindextype smu,
-                         sunindextype ml, sunindextype *p, realtype *b);
+void SUNDlsMat_bandGBTRS(sunrealtype **a, sunindextype n, sunindextype smu,
+                         sunindextype ml, sunindextype *p, sunrealtype *b);
 
 /*
  * -----------------------------------------------------------------
@@ -129,7 +129,7 @@ SUNDIALS_EXPORT
 void SUNDlsMat_BandCopy(SUNDlsMat A, SUNDlsMat B, sunindextype copymu,
                         sunindextype copyml);
 SUNDIALS_EXPORT
-void SUNDlsMat_bandCopy(realtype **a, realtype **b, sunindextype n,
+void SUNDlsMat_bandCopy(sunrealtype **a, sunrealtype **b, sunindextype n,
                         sunindextype a_smu, sunindextype b_smu,
                         sunindextype copymu, sunindextype copyml);
 
@@ -147,10 +147,10 @@ void SUNDlsMat_bandCopy(realtype **a, realtype **b, sunindextype n,
  * -----------------------------------------------------------------
  */
 
-void SUNDlsMat_BandScale(realtype c, SUNDlsMat A);
+void SUNDlsMat_BandScale(sunrealtype c, SUNDlsMat A);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_bandScale(realtype c, realtype **a, sunindextype n,
+void SUNDlsMat_bandScale(sunrealtype c, sunrealtype **a, sunindextype n,
                          sunindextype mu, sunindextype ml, sunindextype smu);
 
 /*
@@ -158,11 +158,11 @@ void SUNDlsMat_bandScale(realtype c, realtype **a, sunindextype n,
  * Function: SUNDlsMat_bandAddIdentity
  * -----------------------------------------------------------------
  * SUNDlsMat_bandAddIdentity adds the identity matrix to the n-by-n
- * matrix stored in the realtype** arrays.
+ * matrix stored in the sunrealtype** arrays.
  * -----------------------------------------------------------------
  */
 
-void SUNDlsMat_bandAddIdentity(realtype **a, sunindextype n, sunindextype smu);
+void SUNDlsMat_bandAddIdentity(sunrealtype **a, sunindextype n, sunindextype smu);
 
 
 /*
@@ -181,10 +181,10 @@ void SUNDlsMat_bandAddIdentity(realtype **a, sunindextype n, sunindextype smu);
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_BandMatvec(SUNDlsMat A, realtype *x, realtype *y);
+void SUNDlsMat_BandMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_bandMatvec(realtype **a, realtype *x, realtype *y,
+void SUNDlsMat_bandMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y,
                           sunindextype n, sunindextype mu,
                           sunindextype ml, sunindextype smu);
 
diff --git a/include/sundials/sundials_config.in b/include/sundials/sundials_config.in
index da05f390b5..23846def6d 100644
--- a/include/sundials/sundials_config.in
+++ b/include/sundials/sundials_config.in
@@ -52,7 +52,7 @@
 #cmakedefine SUNDIALS_C_COMPILER_HAS_ISINF_ISNAN
 #cmakedefine SUNDIALS_C_COMPILER_HAS_INLINE
 
-/* Define precision of SUNDIALS data type 'realtype'
+/* Define precision of SUNDIALS data type 'sunrealtype'
  * Depending on the precision level, one of the following
  * three macros will be defined:
  *     #define SUNDIALS_SINGLE_PRECISION 1
diff --git a/include/sundials/sundials_dense.h b/include/sundials/sundials_dense.h
index 201580cad4..ae9ac57139 100644
--- a/include/sundials/sundials_dense.h
+++ b/include/sundials/sundials_dense.h
@@ -16,9 +16,9 @@
  *
  * There are two sets of dense solver routines listed in
  * this file: one set uses type DlsMat defined below and the
- * other set uses the type realtype ** for dense matrix arguments.
+ * other set uses the type sunrealtype ** for dense matrix arguments.
  * Routines that work with the type DlsMat begin with "Dense".
- * Routines that work with realtype** begin with "dense".
+ * Routines that work with sunrealtype** begin with "dense".
  * -----------------------------------------------------------------*/
 
 #ifndef _SUNDIALS_DENSE_H
@@ -73,15 +73,15 @@ SUNDIALS_EXPORT
 sunindextype SUNDlsMat_DenseGETRF(SUNDlsMat A, sunindextype *p);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_DenseGETRS(SUNDlsMat A, sunindextype *p, realtype *b);
+void SUNDlsMat_DenseGETRS(SUNDlsMat A, sunindextype *p, sunrealtype *b);
 
 SUNDIALS_EXPORT
-sunindextype SUNDlsMat_denseGETRF(realtype **a, sunindextype m,
+sunindextype SUNDlsMat_denseGETRF(sunrealtype **a, sunindextype m,
                                   sunindextype n, sunindextype *p);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_denseGETRS(realtype **a, sunindextype n, sunindextype *p,
-                          realtype *b);
+void SUNDlsMat_denseGETRS(sunrealtype **a, sunindextype n, sunindextype *p,
+                          sunrealtype *b);
 
 /*
  * ----------------------------------------------------------------------------
@@ -106,13 +106,13 @@ SUNDIALS_EXPORT
 sunindextype SUNDlsMat_DensePOTRF(SUNDlsMat A);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_DensePOTRS(SUNDlsMat A, realtype *b);
+void SUNDlsMat_DensePOTRS(SUNDlsMat A, sunrealtype *b);
 
 SUNDIALS_EXPORT
-sunindextype SUNDlsMat_densePOTRF(realtype **a, sunindextype m);
+sunindextype SUNDlsMat_densePOTRF(sunrealtype **a, sunindextype m);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_densePOTRS(realtype **a, sunindextype m, realtype *b);
+void SUNDlsMat_densePOTRS(sunrealtype **a, sunindextype m, sunrealtype *b);
 
 /*
  * -----------------------------------------------------------------------------
@@ -141,21 +141,21 @@ void SUNDlsMat_densePOTRS(realtype **a, sunindextype m, realtype *b);
  */
 
 SUNDIALS_EXPORT
-int SUNDlsMat_DenseGEQRF(SUNDlsMat A, realtype *beta, realtype *wrk);
+int SUNDlsMat_DenseGEQRF(SUNDlsMat A, sunrealtype *beta, sunrealtype *wrk);
 
 SUNDIALS_EXPORT
-int SUNDlsMat_DenseORMQR(SUNDlsMat A, realtype *beta, realtype *vn,
-                         realtype *vm, realtype *wrk);
+int SUNDlsMat_DenseORMQR(SUNDlsMat A, sunrealtype *beta, sunrealtype *vn,
+                         sunrealtype *vm, sunrealtype *wrk);
 
 
 SUNDIALS_EXPORT
-int SUNDlsMat_denseGEQRF(realtype **a, sunindextype m, sunindextype n,
-                         realtype *beta, realtype *wrk);
+int SUNDlsMat_denseGEQRF(sunrealtype **a, sunindextype m, sunindextype n,
+                         sunrealtype *beta, sunrealtype *wrk);
 
 SUNDIALS_EXPORT
-int SUNDlsMat_denseORMQR(realtype **a, sunindextype m, sunindextype n,
-                         realtype *beta, realtype *v, realtype *w,
-                         realtype *wrk);
+int SUNDlsMat_denseORMQR(sunrealtype **a, sunindextype m, sunindextype n,
+                         sunrealtype *beta, sunrealtype *v, sunrealtype *w,
+                         sunrealtype *wrk);
 
 /*
  * ----------------------------------------------------------------------------
@@ -173,7 +173,7 @@ SUNDIALS_EXPORT
 void SUNDlsMat_DenseCopy(SUNDlsMat A, SUNDlsMat B);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_denseCopy(realtype **a, realtype **b, sunindextype m,
+void SUNDlsMat_denseCopy(sunrealtype **a, sunrealtype **b, sunindextype m,
                          sunindextype n);
 
 /*
@@ -190,10 +190,10 @@ void SUNDlsMat_denseCopy(realtype **a, realtype **b, sunindextype m,
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_DenseScale(realtype c, SUNDlsMat A);
+void SUNDlsMat_DenseScale(sunrealtype c, SUNDlsMat A);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_denseScale(realtype c, realtype **a, sunindextype m,
+void SUNDlsMat_denseScale(sunrealtype c, sunrealtype **a, sunindextype m,
                           sunindextype n);
 
 /*
@@ -201,12 +201,12 @@ void SUNDlsMat_denseScale(realtype c, realtype **a, sunindextype m,
  * Function: SUNDlsMat_denseAddIdentity
  * -----------------------------------------------------------------------------
  * SUNDlsMat_denseAddIdentity adds the identity matrix to the n-by-n matrix
- * stored in a realtype** array.
+ * stored in a sunrealtype** array.
  * -----------------------------------------------------------------------------
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_denseAddIdentity(realtype **a, sunindextype n);
+void SUNDlsMat_denseAddIdentity(sunrealtype **a, sunindextype n);
 
 
 /*
@@ -224,10 +224,10 @@ void SUNDlsMat_denseAddIdentity(realtype **a, sunindextype n);
  */
 
 SUNDIALS_EXPORT
-void SUNDlsMat_DenseMatvec(SUNDlsMat A, realtype *x, realtype *y);
+void SUNDlsMat_DenseMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y);
 
 SUNDIALS_EXPORT
-void SUNDlsMat_denseMatvec(realtype **a, realtype *x, realtype *y,
+void SUNDlsMat_denseMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y,
                            sunindextype m, sunindextype n);
 
 
diff --git a/include/sundials/sundials_direct.h b/include/sundials/sundials_direct.h
index b73ffeae7e..17f0329195 100644
--- a/include/sundials/sundials_direct.h
+++ b/include/sundials/sundials_direct.h
@@ -63,7 +63,7 @@ extern "C" {
  *    M     - number of rows
  *    N     - number of columns
  *    ldim  - leading dimension (ldim >= M)
- *    data  - pointer to a contiguous block of realtype variables
+ *    data  - pointer to a contiguous block of sunrealtype variables
  *    ldata - length of the data array =ldim*N
  *    cols  - array of pointers. cols[j] points to the first element
  *            of the j-th column of the matrix in the array data.
@@ -94,7 +94,7 @@ extern "C" {
  *            partial pivoting. The s_mu field holds the upper
  *            bandwidth allocated for A.
  *    ldim  - leading dimension (ldim >= s_mu)
- *    data  - pointer to a contiguous block of realtype variables
+ *    data  - pointer to a contiguous block of sunrealtype variables
  *    ldata - length of the data array =ldim*(s_mu+ml+1)
  *    cols  - array of pointers. cols[j] points to the first element
  *            of the j-th column of the matrix in the array data.
@@ -122,9 +122,9 @@ typedef struct _DlsMat {
   sunindextype mu;
   sunindextype ml;
   sunindextype s_mu;
-  realtype *data;
+  sunrealtype *data;
   sunindextype ldata;
-  realtype **cols;
+  sunrealtype **cols;
 } *SUNDlsMat; 
 
 
@@ -141,7 +141,7 @@ typedef struct _DlsMat {
  *
  * SUNDLS_DENSE_COL(A,j) references the jth column of the M-by-N dense
  * matrix A, 0 <= j < N. The type of the expression SUNDLS_DENSE_COL(A,j)
- * is (realtype *). After the assignment col_j = SUNDLS_DENSE_COL(A,j),
+ * is (sunrealtype *). After the assignment col_j = SUNDLS_DENSE_COL(A,j),
  * col_j may be treated as an array indexed from 0 to M-1. The (i,j)-th
  * element of A is thus referenced by * col_j[i].
  *
@@ -161,7 +161,7 @@ typedef struct _DlsMat {
  *
  * SUNDLS_BAND_COL(A,j) references the diagonal element of the jth
  * column of the N by N band matrix A, 0 <= j <= N-1. The type of the
- * expression SUNDLS_BAND_COL(A,j) is realtype *. The pointer returned
+ * expression SUNDLS_BAND_COL(A,j) is sunrealtype *. The pointer returned
  * by the call SUNDLS_BAND_COL(A,j) can be treated as an array which
  * is indexed from -(A->mu) to (A->ml).
  *
@@ -267,14 +267,14 @@ sunindextype* SUNDlsMat_NewIndexArray(sunindextype N);
  * -----------------------------------------------------------------
  * Function: SUNDlsMat_NewRealArray
  * -----------------------------------------------------------------
- * SUNDlsMat_NewRealArray allocates memory an array of N realtype and
+ * SUNDlsMat_NewRealArray allocates memory an array of N sunrealtype and
  * returns the pointer to the memory it allocates. If the request for
  * memory storage cannot be satisfied, it returns NULL.
  * -----------------------------------------------------------------
  */
 
 SUNDIALS_EXPORT
-realtype* SUNDlsMat_NewRealArray(sunindextype N);
+sunrealtype* SUNDlsMat_NewRealArray(sunindextype N);
 
 /*
  * -----------------------------------------------------------------
@@ -333,20 +333,20 @@ void SUNDlsMat_PrintMat(SUNDlsMat A, FILE *outfile);
 
 /*
  * ==================================================================
- * Exported function prototypes (functions working on realtype**)
+ * Exported function prototypes (functions working on sunrealtype**)
  * ==================================================================
  */
 
 SUNDIALS_EXPORT
-realtype** SUNDlsMat_newDenseMat(sunindextype m, sunindextype n);
+sunrealtype** SUNDlsMat_newDenseMat(sunindextype m, sunindextype n);
 
 SUNDIALS_EXPORT
-realtype** SUNDlsMat_newBandMat(sunindextype n, sunindextype smu,
+sunrealtype** SUNDlsMat_newBandMat(sunindextype n, sunindextype smu,
                                 sunindextype ml);
 
 
 SUNDIALS_EXPORT
-void SUNDlsMat_destroyMat(realtype** a);
+void SUNDlsMat_destroyMat(sunrealtype** a);
 
 SUNDIALS_EXPORT
 int* SUNDlsMat_newIntArray(int n);
@@ -355,7 +355,7 @@ SUNDIALS_EXPORT
 sunindextype* SUNDlsMat_newIndexArray(sunindextype n);
 
 SUNDIALS_EXPORT
-realtype* SUNDlsMat_newRealArray(sunindextype m);
+sunrealtype* SUNDlsMat_newRealArray(sunindextype m);
 
 SUNDIALS_EXPORT
 void SUNDlsMat_destroyArray(void* v);
diff --git a/include/sundials/sundials_iterative.h b/include/sundials/sundials_iterative.h
index ba909df174..2ee1d65a06 100644
--- a/include/sundials/sundials_iterative.h
+++ b/include/sundials/sundials_iterative.h
@@ -123,7 +123,7 @@ typedef int (*SUNPSetupFn)(void *P_data);
  */
 
 typedef int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z,
-                           realtype tol, int lr);
+                           sunrealtype tol, int lr);
 
 /*
  * -----------------------------------------------------------------
@@ -132,7 +132,7 @@ typedef int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z,
  * A QRAddFn updates a given QR factorization defined by the input
  * parameters:
  *   Q : N_Vector *
- *   R : realtype *
+ *   R : sunrealtype *
  * with the input vector
  *   f : N_Vector
  *
@@ -149,7 +149,7 @@ typedef int (*SUNPSolveFn)(void *P_data, N_Vector r, N_Vector z,
  * -----------------------------------------------------------------
 */
 
-typedef int (*SUNQRAddFn)(N_Vector *Q, realtype *R, N_Vector f,
+typedef int (*SUNQRAddFn)(N_Vector *Q, sunrealtype *R, N_Vector f,
                           int m, int mMax, void *QR_data);
 
 /*
@@ -189,8 +189,8 @@ typedef int (*SUNQRAddFn)(N_Vector *Q, realtype *R, N_Vector f,
  */
 
 SUNDIALS_EXPORT
-int SUNModifiedGS(N_Vector* v, realtype **h, int k, int p,
-                  realtype *new_vk_norm);
+int SUNModifiedGS(N_Vector* v, sunrealtype **h, int k, int p,
+                  sunrealtype *new_vk_norm);
 
 /*
  * -----------------------------------------------------------------
@@ -202,7 +202,7 @@ int SUNModifiedGS(N_Vector* v, realtype **h, int k, int p,
  * k, p, and new_vk_norm are as described in the documentation
  * for SUNModifiedGS.
  *
- * stemp is a length k+1 array of realtype which can be used as
+ * stemp is a length k+1 array of sunrealtype which can be used as
  * workspace by the SUNClassicalGS routine.
  *
  * vtemp is an N_Vector array of k+1 vectors which can be used as
@@ -213,8 +213,8 @@ int SUNModifiedGS(N_Vector* v, realtype **h, int k, int p,
  */
 
 SUNDIALS_EXPORT
-int SUNClassicalGS(N_Vector* v, realtype **h, int k, int p,
-                   realtype *new_vk_norm, realtype *stemp,
+int SUNClassicalGS(N_Vector* v, sunrealtype **h, int k, int p,
+                   sunrealtype *new_vk_norm, sunrealtype *stemp,
                    N_Vector* vtemp);
 
 /*
@@ -250,7 +250,7 @@ int SUNClassicalGS(N_Vector* v, realtype **h, int k, int p,
  */
 
 SUNDIALS_EXPORT
-int SUNQRfact(int n, realtype **h, realtype *q, int job);
+int SUNQRfact(int n, sunrealtype **h, sunrealtype *q, int job);
 
 /*
  * -----------------------------------------------------------------
@@ -285,7 +285,7 @@ int SUNQRfact(int n, realtype **h, realtype *q, int job);
  */
 
 SUNDIALS_EXPORT
-int SUNQRsol(int n, realtype **h, realtype *q, realtype *b);
+int SUNQRsol(int n, sunrealtype **h, sunrealtype *q, sunrealtype *b);
 
 /*
  * -----------------------------------------------------------------
@@ -294,7 +294,7 @@ int SUNQRsol(int n, realtype **h, realtype *q, realtype *b);
  * SUNQRAdd_MGS uses Modified Gram Schmidt to update the QR factorization
  * stored in user inputs
  *   - N_Vector *Q
- *   - realtype *R
+ *   - sunrealtype *R
  * to include the orthonormalized vector input by
  *   - N_Vector df.
  *
@@ -316,7 +316,7 @@ int SUNQRsol(int n, realtype **h, realtype *q, realtype *b);
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_MGS(N_Vector *Q, sunrealtype *R, N_Vector df,
                  int m, int mMax, void *QRdata);
 
 /*
@@ -326,8 +326,8 @@ int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
  * SUNQRAdd_ICWY uses the Inverse Compact WY Modified Gram Schmidt
  * method to update the QR factorization stored in user inputs
  *   - N_Vector *Q
- *   - realtype *R
- *   - realtype *T (held within (void *) QRdata)
+ *   - sunrealtype *R
+ *   - sunrealtype *T (held within (void *) QRdata)
  * to include the orthonormalized vector input by
  *   - N_Vector df.
  * where the factorization to be updated is of the form
@@ -344,7 +344,7 @@ int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
  *          vectors or arrays required for the QRAdd routine
  *
  * QRdata should contain :
- *        N_Vector vtemp, realtype *temp_array (this will be used for T)
+ *        N_Vector vtemp, sunrealtype *temp_array (this will be used for T)
  *
  * On return, Q, R, and T contain the updated Q T R factors, if
  * SUNQRAdd_ICWY was successful.
@@ -354,7 +354,7 @@ int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_ICWY(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_ICWY(N_Vector *Q, sunrealtype *R, N_Vector df,
                   int m, int mMax, void *QRdata);
 
 /*
@@ -367,7 +367,7 @@ int SUNQRAdd_ICWY(N_Vector *Q, realtype *R, N_Vector df,
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_ICWY_SB(N_Vector *Q, sunrealtype *R, N_Vector df,
                      int m, int mMax, void *QRdata);
 
 /*
@@ -377,7 +377,7 @@ int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
  * SUNQRAdd_CGS2 uses a Classical Gram Schmidt with Reorthogonalization
  * formulation to update the QR factorization stored in user inputs
  *   - N_Vector *Q
- *   - realtype *R
+ *   - sunrealtype *R
  * to include the orthonormalized vector input by
  *   - N_Vector df.
  *
@@ -392,7 +392,7 @@ int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
  *          vectors or arrays required for the QRAdd routine
  *
  * QRdata should contain :
- *        N_Vector vtemp, N_Vector vtemp2, realtype *temp_array
+ *        N_Vector vtemp, N_Vector vtemp2, sunrealtype *temp_array
  *
  * On return, Q and R contain the updated Q R factors, if
  * SUNQRAdd_CGS2 was successful.
@@ -402,7 +402,7 @@ int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_CGS2(N_Vector *Q, sunrealtype *R, N_Vector df,
                   int m, int mMax, void *QRdata);
 
 /*
@@ -414,7 +414,7 @@ int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
  * reducing number of inner products) to update the QR factorization
  * stored in user inputs
  *   - N_Vector *Q
- *   - realtype *R
+ *   - sunrealtype *R
  * to include the orthonormalized vector input by
  *   - N_Vector df.
  *
@@ -429,7 +429,7 @@ int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
  *          vectors or arrays required for the QRAdd routine
  *
  * QRdata should contain :
- *        N_Vector vtemp, N_Vector vtemp2, realtype *temp_array
+ *        N_Vector vtemp, N_Vector vtemp2, sunrealtype *temp_array
  *
  * On return, Q and R contain the updated Q R factors, if
  * SUNQRAdd_DCGS2 was successful.
@@ -439,7 +439,7 @@ int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_DCGS2(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_DCGS2(N_Vector *Q, sunrealtype *R, N_Vector df,
                    int m, int mMax, void *QRdata);
 
 /*
@@ -452,7 +452,7 @@ int SUNQRAdd_DCGS2(N_Vector *Q, realtype *R, N_Vector df,
  */
 
 SUNDIALS_EXPORT
-int SUNQRAdd_DCGS2_SB(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_DCGS2_SB(N_Vector *Q, sunrealtype *R, N_Vector df,
                       int m, int mMax, void *QRdata);
 
 #ifdef __cplusplus
diff --git a/include/sundials/sundials_linearsolver.h b/include/sundials/sundials_linearsolver.h
index 198be4372e..24a8da49e8 100644
--- a/include/sundials/sundials_linearsolver.h
+++ b/include/sundials/sundials_linearsolver.h
@@ -114,12 +114,12 @@ struct _generic_SUNLinearSolver_Ops
   int (*setatimes)(SUNLinearSolver, void*, SUNATimesFn);
   int (*setpreconditioner)(SUNLinearSolver, void*, SUNPSetupFn, SUNPSolveFn);
   int (*setscalingvectors)(SUNLinearSolver, N_Vector, N_Vector);
-  int (*setzeroguess)(SUNLinearSolver, booleantype);
+  int (*setzeroguess)(SUNLinearSolver, sunbooleantype);
   int (*initialize)(SUNLinearSolver);
   int (*setup)(SUNLinearSolver, SUNMatrix);
-  int (*solve)(SUNLinearSolver, SUNMatrix, N_Vector, N_Vector, realtype);
+  int (*solve)(SUNLinearSolver, SUNMatrix, N_Vector, N_Vector, sunrealtype);
   int (*numiters)(SUNLinearSolver);
-  realtype (*resnorm)(SUNLinearSolver);
+  sunrealtype (*resnorm)(SUNLinearSolver);
   sunindextype (*lastflag)(SUNLinearSolver);
   int (*space)(SUNLinearSolver, long int*, long int*);
   N_Vector (*resid)(SUNLinearSolver);
@@ -160,17 +160,17 @@ SUNDIALS_EXPORT int SUNLinSolSetPreconditioner(SUNLinearSolver S, void* P_data,
 
 SUNDIALS_EXPORT int SUNLinSolSetScalingVectors(SUNLinearSolver S, N_Vector s1, N_Vector s2);
 
-SUNDIALS_EXPORT int SUNLinSolSetZeroGuess(SUNLinearSolver S, booleantype onoff);
+SUNDIALS_EXPORT int SUNLinSolSetZeroGuess(SUNLinearSolver S, sunbooleantype onoff);
 
 SUNDIALS_EXPORT int SUNLinSolInitialize(SUNLinearSolver S);
 
 SUNDIALS_EXPORT int SUNLinSolSetup(SUNLinearSolver S, SUNMatrix A);
 
-SUNDIALS_EXPORT int SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x, N_Vector b, realtype tol);
+SUNDIALS_EXPORT int SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x, N_Vector b, sunrealtype tol);
 
 SUNDIALS_EXPORT int SUNLinSolNumIters(SUNLinearSolver S);
 
-SUNDIALS_EXPORT realtype SUNLinSolResNorm(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm(SUNLinearSolver S);
 
 SUNDIALS_EXPORT N_Vector SUNLinSolResid(SUNLinearSolver S);
 
diff --git a/include/sundials/sundials_math.h b/include/sundials/sundials_math.h
index c0f32b2e98..4470e47798 100644
--- a/include/sundials/sundials_math.h
+++ b/include/sundials/sundials_math.h
@@ -77,14 +77,14 @@ extern "C" {
 #ifndef SUNRsqrt
 #if defined(__cplusplus) || defined(SUNDIALS_C_COMPILER_HAS_MATH_PRECISIONS)
 #  if defined(SUNDIALS_DOUBLE_PRECISION)
-#    define SUNRsqrt(x) ((x) <= RCONST(0.0) ? (RCONST(0.0)) : (sqrt((x))))
+#    define SUNRsqrt(x) ((x) <= SUN_RCONST(0.0) ? (SUN_RCONST(0.0)) : (sqrt((x))))
 #  elif defined(SUNDIALS_SINGLE_PRECISION)
-#    define SUNRsqrt(x) ((x) <= RCONST(0.0) ? (RCONST(0.0)) : (sqrtf((x))))
+#    define SUNRsqrt(x) ((x) <= SUN_RCONST(0.0) ? (SUN_RCONST(0.0)) : (sqrtf((x))))
 #  elif defined(SUNDIALS_EXTENDED_PRECISION)
-#    define SUNRsqrt(x) ((x) <= RCONST(0.0) ? (RCONST(0.0)) : (sqrtl((x))))
+#    define SUNRsqrt(x) ((x) <= SUN_RCONST(0.0) ? (SUN_RCONST(0.0)) : (sqrtl((x))))
 #  endif
 #else
-#  define SUNRsqrt(x) ((x) <= RCONST(0.0) ? (RCONST(0.0)) : ((sunrealtype) sqrt((double) (x))))
+#  define SUNRsqrt(x) ((x) <= SUN_RCONST(0.0) ? (SUN_RCONST(0.0)) : ((sunrealtype) sqrt((double) (x))))
 #endif
 #endif
 
@@ -209,7 +209,7 @@ SUNDIALS_EXPORT sunrealtype SUNRpowerR(sunrealtype base, sunrealtype exponent);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT booleantype SUNRCompare(sunrealtype a, sunrealtype b);
+SUNDIALS_EXPORT sunbooleantype SUNRCompare(sunrealtype a, sunrealtype b);
 
 /*
  * -----------------------------------------------------------------
@@ -227,15 +227,15 @@ SUNDIALS_EXPORT booleantype SUNRCompare(sunrealtype a, sunrealtype b);
  * -----------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT booleantype SUNRCompareTol(sunrealtype a, sunrealtype b, sunrealtype tol);
+SUNDIALS_EXPORT sunbooleantype SUNRCompareTol(sunrealtype a, sunrealtype b, sunrealtype tol);
 
 /*
  * -----------------------------------------------------------------
  * Function : SUNStrToReal
  * -----------------------------------------------------------------
- * Usage : realtype a = SUNStrToReal(const char* str)
+ * Usage : sunrealtype a = SUNStrToReal(const char* str)
  * -----------------------------------------------------------------
- * SUNStrToReal parses str into the realtype variable. Uses standard
+ * SUNStrToReal parses str into the sunrealtype variable. Uses standard
  * strtod variants when they are available.
  * -----------------------------------------------------------------
  */
diff --git a/include/sundials/sundials_matrix.h b/include/sundials/sundials_matrix.h
index a542094ad9..0a99ec7613 100644
--- a/include/sundials/sundials_matrix.h
+++ b/include/sundials/sundials_matrix.h
@@ -88,8 +88,8 @@ struct _generic_SUNMatrix_Ops
   void (*destroy)(SUNMatrix);
   int (*zero)(SUNMatrix);
   int (*copy)(SUNMatrix, SUNMatrix);
-  int (*scaleadd)(realtype, SUNMatrix, SUNMatrix);
-  int (*scaleaddi)(realtype, SUNMatrix);
+  int (*scaleadd)(sunrealtype, SUNMatrix, SUNMatrix);
+  int (*scaleaddi)(sunrealtype, SUNMatrix);
   int (*matvecsetup)(SUNMatrix);
   int (*matvec)(SUNMatrix, N_Vector, N_Vector);
   int (*space)(SUNMatrix, long int*, long int*);
@@ -123,8 +123,8 @@ SUNDIALS_EXPORT SUNMatrix SUNMatClone(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvecSetup(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace(SUNMatrix A, long int* lenrw, long int* leniw);
diff --git a/include/sundials/sundials_memory.h b/include/sundials/sundials_memory.h
index 19f17f4a9b..efa63382fc 100644
--- a/include/sundials/sundials_memory.h
+++ b/include/sundials/sundials_memory.h
@@ -47,7 +47,7 @@ struct _SUNMemory
 {
   void*         ptr;
   SUNMemoryType type;
-  booleantype   own;
+  sunbooleantype   own;
   size_t        bytes;
 };
 
@@ -152,7 +152,7 @@ SUNDIALS_EXPORT int SUNMemoryHelper_CopyOps(SUNMemoryHelper src,
 
 /* Checks that all required SUNMemoryHelper ops are provided */
 SUNDIALS_EXPORT
-booleantype SUNMemoryHelper_ImplementsRequiredOps(SUNMemoryHelper);
+sunbooleantype SUNMemoryHelper_ImplementsRequiredOps(SUNMemoryHelper);
 
 
 #ifdef __cplusplus
diff --git a/include/sundials/sundials_nonlinearsolver.h b/include/sundials/sundials_nonlinearsolver.h
index 87008b003e..67fff7a23f 100644
--- a/include/sundials/sundials_nonlinearsolver.h
+++ b/include/sundials/sundials_nonlinearsolver.h
@@ -71,11 +71,11 @@ typedef _SUNDIALS_STRUCT_ _generic_SUNNonlinearSolver* SUNNonlinearSolver;
 
 typedef int (*SUNNonlinSolSysFn)(N_Vector y, N_Vector F, void* mem);
 
-typedef int (*SUNNonlinSolLSetupFn)(booleantype jbad, booleantype* jcur, void* mem);
+typedef int (*SUNNonlinSolLSetupFn)(sunbooleantype jbad, sunbooleantype* jcur, void* mem);
 
 typedef int (*SUNNonlinSolLSolveFn)(N_Vector b, void* mem);
 
-typedef int (*SUNNonlinSolConvTestFn)(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, realtype tol, N_Vector ewt,
+typedef int (*SUNNonlinSolConvTestFn)(SUNNonlinearSolver NLS, N_Vector y, N_Vector del, sunrealtype tol, N_Vector ewt,
                                       void* mem);
 
 /* -----------------------------------------------------------------------------
@@ -98,7 +98,7 @@ struct _generic_SUNNonlinearSolver_Ops
   SUNNonlinearSolver_Type (*gettype)(SUNNonlinearSolver);
   int (*initialize)(SUNNonlinearSolver);
   int (*setup)(SUNNonlinearSolver, N_Vector, void*);
-  int (*solve)(SUNNonlinearSolver, N_Vector, N_Vector, N_Vector, realtype, booleantype, void*);
+  int (*solve)(SUNNonlinearSolver, N_Vector, N_Vector, N_Vector, sunrealtype, sunbooleantype, void*);
   int (*free)(SUNNonlinearSolver);
   int (*setsysfn)(SUNNonlinearSolver, SUNNonlinSolSysFn);
   int (*setlsetupfn)(SUNNonlinearSolver, SUNNonlinSolLSetupFn);
@@ -141,8 +141,8 @@ SUNDIALS_EXPORT int SUNNonlinSolInitialize(SUNNonlinearSolver NLS);
 
 SUNDIALS_EXPORT int SUNNonlinSolSetup(SUNNonlinearSolver NLS, N_Vector y, void* mem);
 
-SUNDIALS_EXPORT int SUNNonlinSolSolve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector y, N_Vector w, realtype tol,
-                                      booleantype callLSetup, void* mem);
+SUNDIALS_EXPORT int SUNNonlinSolSolve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector y, N_Vector w, sunrealtype tol,
+                                      sunbooleantype callLSetup, void* mem);
 
 SUNDIALS_EXPORT int SUNNonlinSolFree(SUNNonlinearSolver NLS);
 
diff --git a/include/sundials/sundials_nvector.h b/include/sundials/sundials_nvector.h
index ab42b5bcf3..8cb15d2d9d 100644
--- a/include/sundials/sundials_nvector.h
+++ b/include/sundials/sundials_nvector.h
@@ -107,33 +107,33 @@ struct _generic_N_Vector_Ops
   N_Vector (*nvcloneempty)(N_Vector);
   void (*nvdestroy)(N_Vector);
   void (*nvspace)(N_Vector, sunindextype*, sunindextype*);
-  realtype* (*nvgetarraypointer)(N_Vector);
-  realtype* (*nvgetdevicearraypointer)(N_Vector);
-  void (*nvsetarraypointer)(realtype*, N_Vector);
+  sunrealtype* (*nvgetarraypointer)(N_Vector);
+  sunrealtype* (*nvgetdevicearraypointer)(N_Vector);
+  void (*nvsetarraypointer)(sunrealtype*, N_Vector);
   void* (*nvgetcommunicator)(N_Vector);
   sunindextype (*nvgetlength)(N_Vector);
   sunindextype (*nvgetlocallength)(N_Vector);
 
   /* standard vector operations */
-  void (*nvlinearsum)(realtype, N_Vector, realtype, N_Vector, N_Vector);
-  void (*nvconst)(realtype, N_Vector);
+  void (*nvlinearsum)(sunrealtype, N_Vector, sunrealtype, N_Vector, N_Vector);
+  void (*nvconst)(sunrealtype, N_Vector);
   void (*nvprod)(N_Vector, N_Vector, N_Vector);
   void (*nvdiv)(N_Vector, N_Vector, N_Vector);
-  void (*nvscale)(realtype, N_Vector, N_Vector);
+  void (*nvscale)(sunrealtype, N_Vector, N_Vector);
   void (*nvabs)(N_Vector, N_Vector);
   void (*nvinv)(N_Vector, N_Vector);
-  void (*nvaddconst)(N_Vector, realtype, N_Vector);
-  realtype (*nvdotprod)(N_Vector, N_Vector);
-  realtype (*nvmaxnorm)(N_Vector);
-  realtype (*nvwrmsnorm)(N_Vector, N_Vector);
-  realtype (*nvwrmsnormmask)(N_Vector, N_Vector, N_Vector);
-  realtype (*nvmin)(N_Vector);
-  realtype (*nvwl2norm)(N_Vector, N_Vector);
-  realtype (*nvl1norm)(N_Vector);
-  void (*nvcompare)(realtype, N_Vector, N_Vector);
-  booleantype (*nvinvtest)(N_Vector, N_Vector);
-  booleantype (*nvconstrmask)(N_Vector, N_Vector, N_Vector);
-  realtype (*nvminquotient)(N_Vector, N_Vector);
+  void (*nvaddconst)(N_Vector, sunrealtype, N_Vector);
+  sunrealtype (*nvdotprod)(N_Vector, N_Vector);
+  sunrealtype (*nvmaxnorm)(N_Vector);
+  sunrealtype (*nvwrmsnorm)(N_Vector, N_Vector);
+  sunrealtype (*nvwrmsnormmask)(N_Vector, N_Vector, N_Vector);
+  sunrealtype (*nvmin)(N_Vector);
+  sunrealtype (*nvwl2norm)(N_Vector, N_Vector);
+  sunrealtype (*nvl1norm)(N_Vector);
+  void (*nvcompare)(sunrealtype, N_Vector, N_Vector);
+  sunbooleantype (*nvinvtest)(N_Vector, N_Vector);
+  sunbooleantype (*nvconstrmask)(N_Vector, N_Vector, N_Vector);
+  sunrealtype (*nvminquotient)(N_Vector, N_Vector);
 
   /*
    * OPTIONAL operations.
@@ -142,37 +142,37 @@ struct _generic_N_Vector_Ops
    */
 
   /* OPTIONAL fused vector operations */
-  int (*nvlinearcombination)(int, realtype*, N_Vector*, N_Vector);
-  int (*nvscaleaddmulti)(int, realtype*, N_Vector, N_Vector*, N_Vector*);
-  int (*nvdotprodmulti)(int, N_Vector, N_Vector*, realtype*);
+  int (*nvlinearcombination)(int, sunrealtype*, N_Vector*, N_Vector);
+  int (*nvscaleaddmulti)(int, sunrealtype*, N_Vector, N_Vector*, N_Vector*);
+  int (*nvdotprodmulti)(int, N_Vector, N_Vector*, sunrealtype*);
 
   /* OPTIONAL vector array operations */
-  int (*nvlinearsumvectorarray)(int, realtype, N_Vector*, realtype, N_Vector*, N_Vector*);
-  int (*nvscalevectorarray)(int, realtype*, N_Vector*, N_Vector*);
-  int (*nvconstvectorarray)(int, realtype, N_Vector*);
-  int (*nvwrmsnormvectorarray)(int, N_Vector*, N_Vector*, realtype*);
-  int (*nvwrmsnormmaskvectorarray)(int, N_Vector*, N_Vector*, N_Vector, realtype*);
-  int (*nvscaleaddmultivectorarray)(int, int, realtype*, N_Vector*, N_Vector**, N_Vector**);
-  int (*nvlinearcombinationvectorarray)(int, int, realtype*, N_Vector**, N_Vector*);
+  int (*nvlinearsumvectorarray)(int, sunrealtype, N_Vector*, sunrealtype, N_Vector*, N_Vector*);
+  int (*nvscalevectorarray)(int, sunrealtype*, N_Vector*, N_Vector*);
+  int (*nvconstvectorarray)(int, sunrealtype, N_Vector*);
+  int (*nvwrmsnormvectorarray)(int, N_Vector*, N_Vector*, sunrealtype*);
+  int (*nvwrmsnormmaskvectorarray)(int, N_Vector*, N_Vector*, N_Vector, sunrealtype*);
+  int (*nvscaleaddmultivectorarray)(int, int, sunrealtype*, N_Vector*, N_Vector**, N_Vector**);
+  int (*nvlinearcombinationvectorarray)(int, int, sunrealtype*, N_Vector**, N_Vector*);
 
   /*
    * OPTIONAL operations with no default implementation.
    */
 
   /* Local reduction kernels (no parallel communication) */
-  realtype (*nvdotprodlocal)(N_Vector, N_Vector);
-  realtype (*nvmaxnormlocal)(N_Vector);
-  realtype (*nvminlocal)(N_Vector);
-  realtype (*nvl1normlocal)(N_Vector);
-  booleantype (*nvinvtestlocal)(N_Vector, N_Vector);
-  booleantype (*nvconstrmasklocal)(N_Vector, N_Vector, N_Vector);
-  realtype (*nvminquotientlocal)(N_Vector, N_Vector);
-  realtype (*nvwsqrsumlocal)(N_Vector, N_Vector);
-  realtype (*nvwsqrsummasklocal)(N_Vector, N_Vector, N_Vector);
+  sunrealtype (*nvdotprodlocal)(N_Vector, N_Vector);
+  sunrealtype (*nvmaxnormlocal)(N_Vector);
+  sunrealtype (*nvminlocal)(N_Vector);
+  sunrealtype (*nvl1normlocal)(N_Vector);
+  sunbooleantype (*nvinvtestlocal)(N_Vector, N_Vector);
+  sunbooleantype (*nvconstrmasklocal)(N_Vector, N_Vector, N_Vector);
+  sunrealtype (*nvminquotientlocal)(N_Vector, N_Vector);
+  sunrealtype (*nvwsqrsumlocal)(N_Vector, N_Vector);
+  sunrealtype (*nvwsqrsummasklocal)(N_Vector, N_Vector, N_Vector);
 
   /* Single buffer reduction operations */
-  int (*nvdotprodmultilocal)(int, N_Vector, N_Vector*, realtype*);
-  int (*nvdotprodmultiallreduce)(int, N_Vector, realtype*);
+  int (*nvdotprodmultilocal)(int, N_Vector, N_Vector*, sunrealtype*);
+  int (*nvdotprodmultiallreduce)(int, N_Vector, sunrealtype*);
 
   /* XBraid interface operations */
   int (*nvbufsize)(N_Vector, sunindextype*);
@@ -218,79 +218,79 @@ SUNDIALS_EXPORT N_Vector N_VClone(N_Vector w);
 SUNDIALS_EXPORT N_Vector N_VCloneEmpty(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy(N_Vector v);
 SUNDIALS_EXPORT void N_VSpace(N_Vector v, sunindextype* lrw, sunindextype* liw);
-SUNDIALS_EXPORT realtype* N_VGetArrayPointer(N_Vector v);
-SUNDIALS_EXPORT realtype* N_VGetDeviceArrayPointer(N_Vector v);
-SUNDIALS_EXPORT void N_VSetArrayPointer(realtype* v_data, N_Vector v);
+SUNDIALS_EXPORT sunrealtype* N_VGetArrayPointer(N_Vector v);
+SUNDIALS_EXPORT sunrealtype* N_VGetDeviceArrayPointer(N_Vector v);
+SUNDIALS_EXPORT void N_VSetArrayPointer(sunrealtype* v_data, N_Vector v);
 SUNDIALS_EXPORT void* N_VGetCommunicator(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLength(N_Vector v);
 SUNDIALS_EXPORT sunindextype N_VGetLocalLength(N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VConst(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VLinearSum(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z);
+SUNDIALS_EXPORT void N_VConst(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst(N_Vector x, realtype b, N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT void N_VAddConst(N_Vector x, sunrealtype b, N_Vector z);
+SUNDIALS_EXPORT sunrealtype N_VDotProd(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunrealtype N_VMin(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient(N_Vector num, N_Vector denom);
 
 /*
  * OPTIONAL operations with default implementations.
  */
 
 /* fused vector operations */
-SUNDIALS_EXPORT int N_VLinearCombination(int nvec, realtype* c, N_Vector* X, N_Vector z);
+SUNDIALS_EXPORT int N_VLinearCombination(int nvec, sunrealtype* c, N_Vector* X, N_Vector z);
 
-SUNDIALS_EXPORT int N_VScaleAddMulti(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z);
+SUNDIALS_EXPORT int N_VScaleAddMulti(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z);
 
-SUNDIALS_EXPORT int N_VDotProdMulti(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods);
+SUNDIALS_EXPORT int N_VDotProdMulti(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods);
 
 /* vector array operations */
-SUNDIALS_EXPORT int N_VLinearSumVectorArray(int nvec, realtype a, N_Vector* X, realtype b, N_Vector* Y, N_Vector* Z);
+SUNDIALS_EXPORT int N_VLinearSumVectorArray(int nvec, sunrealtype a, N_Vector* X, sunrealtype b, N_Vector* Y, N_Vector* Z);
 
-SUNDIALS_EXPORT int N_VScaleVectorArray(int nvec, realtype* c, N_Vector* X, N_Vector* Z);
+SUNDIALS_EXPORT int N_VScaleVectorArray(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z);
 
-SUNDIALS_EXPORT int N_VConstVectorArray(int nvec, realtype c, N_Vector* Z);
+SUNDIALS_EXPORT int N_VConstVectorArray(int nvec, sunrealtype c, N_Vector* Z);
 
-SUNDIALS_EXPORT int N_VWrmsNormVectorArray(int nvec, N_Vector* X, N_Vector* W, realtype* nrm);
+SUNDIALS_EXPORT int N_VWrmsNormVectorArray(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm);
 
-SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray(int nvec, N_Vector* X, N_Vector* W, N_Vector id, realtype* nrm);
+SUNDIALS_EXPORT int N_VWrmsNormMaskVectorArray(int nvec, N_Vector* X, N_Vector* W, N_Vector id, sunrealtype* nrm);
 
-SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray(int nvec, int nsum, realtype* a, N_Vector* X, N_Vector** Y,
+SUNDIALS_EXPORT int N_VScaleAddMultiVectorArray(int nvec, int nsum, sunrealtype* a, N_Vector* X, N_Vector** Y,
                                                 N_Vector** Z);
 
-SUNDIALS_EXPORT int N_VLinearCombinationVectorArray(int nvec, int nsum, realtype* c, N_Vector** X, N_Vector* Z);
+SUNDIALS_EXPORT int N_VLinearCombinationVectorArray(int nvec, int nsum, sunrealtype* c, N_Vector** X, N_Vector* Z);
 
 /*
  * OPTIONAL operations with no default implementation.
  */
 
 /* local reduction kernels (no parallel communication) */
-SUNDIALS_EXPORT realtype N_VDotProdLocal(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNormLocal(N_Vector x);
-SUNDIALS_EXPORT realtype N_VMinLocal(N_Vector x);
-SUNDIALS_EXPORT realtype N_VL1NormLocal(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWSqrSumLocal(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id);
-SUNDIALS_EXPORT booleantype N_VInvTestLocal(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotientLocal(N_Vector num, N_Vector denom);
+SUNDIALS_EXPORT sunrealtype N_VDotProdLocal(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNormLocal(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VMinLocal(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VL1NormLocal(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumLocal(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id);
+SUNDIALS_EXPORT sunbooleantype N_VInvTestLocal(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m);
+SUNDIALS_EXPORT sunrealtype N_VMinQuotientLocal(N_Vector num, N_Vector denom);
 
 /* single buffer reduction operations */
-SUNDIALS_EXPORT int N_VDotProdMultiLocal(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods);
-SUNDIALS_EXPORT int N_VDotProdMultiAllReduce(int nvec_total, N_Vector x, realtype* sum);
+SUNDIALS_EXPORT int N_VDotProdMultiLocal(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods);
+SUNDIALS_EXPORT int N_VDotProdMultiAllReduce(int nvec_total, N_Vector x, sunrealtype* sum);
 
 /* XBraid interface operations */
 SUNDIALS_EXPORT int N_VBufSize(N_Vector x, sunindextype* size);
diff --git a/include/sundials/sundials_nvector_senswrapper.h b/include/sundials/sundials_nvector_senswrapper.h
index ab96a101cc..9ac486aff0 100644
--- a/include/sundials/sundials_nvector_senswrapper.h
+++ b/include/sundials/sundials_nvector_senswrapper.h
@@ -40,7 +40,7 @@ extern "C" {
 struct _N_VectorContent_SensWrapper {
   N_Vector* vecs;        /* array of wrapped vectors                */
   int nvecs;             /* number of wrapped vectors               */
-  booleantype own_vecs;  /* flag indicating if wrapper owns vectors */
+  sunbooleantype own_vecs;  /* flag indicating if wrapper owns vectors */
 };
 
 typedef struct _N_VectorContent_SensWrapper *N_VectorContent_SensWrapper;
@@ -71,30 +71,30 @@ SUNDIALS_EXPORT N_Vector N_VClone_SensWrapper(N_Vector w);
 SUNDIALS_EXPORT void N_VDestroy_SensWrapper(N_Vector v);
 
 /* standard vector operations */
-SUNDIALS_EXPORT void N_VLinearSum_SensWrapper(realtype a, N_Vector x,
-                                              realtype b, N_Vector y,
+SUNDIALS_EXPORT void N_VLinearSum_SensWrapper(sunrealtype a, N_Vector x,
+                                              sunrealtype b, N_Vector y,
                                               N_Vector z);
-SUNDIALS_EXPORT void N_VConst_SensWrapper(realtype c, N_Vector z);
+SUNDIALS_EXPORT void N_VConst_SensWrapper(sunrealtype c, N_Vector z);
 SUNDIALS_EXPORT void N_VProd_SensWrapper(N_Vector x, N_Vector y, N_Vector z);
 SUNDIALS_EXPORT void N_VDiv_SensWrapper(N_Vector x, N_Vector y, N_Vector z);
-SUNDIALS_EXPORT void N_VScale_SensWrapper(realtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT void N_VScale_SensWrapper(sunrealtype c, N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VAbs_SensWrapper(N_Vector x, N_Vector z);
 SUNDIALS_EXPORT void N_VInv_SensWrapper(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT void N_VAddConst_SensWrapper(N_Vector x, realtype b,
+SUNDIALS_EXPORT void N_VAddConst_SensWrapper(N_Vector x, sunrealtype b,
                                              N_Vector z);
-SUNDIALS_EXPORT realtype N_VDotProd_SensWrapper(N_Vector x, N_Vector y);
-SUNDIALS_EXPORT realtype N_VMaxNorm_SensWrapper(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWrmsNorm_SensWrapper(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VWrmsNormMask_SensWrapper(N_Vector x, N_Vector w,
+SUNDIALS_EXPORT sunrealtype N_VDotProd_SensWrapper(N_Vector x, N_Vector y);
+SUNDIALS_EXPORT sunrealtype N_VMaxNorm_SensWrapper(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNorm_SensWrapper(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VWrmsNormMask_SensWrapper(N_Vector x, N_Vector w,
                                                      N_Vector id);
-SUNDIALS_EXPORT realtype N_VMin_SensWrapper(N_Vector x);
-SUNDIALS_EXPORT realtype N_VWL2Norm_SensWrapper(N_Vector x, N_Vector w);
-SUNDIALS_EXPORT realtype N_VL1Norm_SensWrapper(N_Vector x);
-SUNDIALS_EXPORT void N_VCompare_SensWrapper(realtype c, N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VInvTest_SensWrapper(N_Vector x, N_Vector z);
-SUNDIALS_EXPORT booleantype N_VConstrMask_SensWrapper(N_Vector c, N_Vector x,
+SUNDIALS_EXPORT sunrealtype N_VMin_SensWrapper(N_Vector x);
+SUNDIALS_EXPORT sunrealtype N_VWL2Norm_SensWrapper(N_Vector x, N_Vector w);
+SUNDIALS_EXPORT sunrealtype N_VL1Norm_SensWrapper(N_Vector x);
+SUNDIALS_EXPORT void N_VCompare_SensWrapper(sunrealtype c, N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VInvTest_SensWrapper(N_Vector x, N_Vector z);
+SUNDIALS_EXPORT sunbooleantype N_VConstrMask_SensWrapper(N_Vector c, N_Vector x,
                                                       N_Vector m);
-SUNDIALS_EXPORT realtype N_VMinQuotient_SensWrapper(N_Vector num,
+SUNDIALS_EXPORT sunrealtype N_VMinQuotient_SensWrapper(N_Vector num,
                                                     N_Vector denom);
 
 #ifdef __cplusplus
diff --git a/include/sundials/sundials_types.h b/include/sundials/sundials_types.h
index 45e2ee839f..a1dcea797e 100644
--- a/include/sundials/sundials_types.h
+++ b/include/sundials/sundials_types.h
@@ -83,13 +83,6 @@ extern "C" {
 
 #if defined(SUNDIALS_SINGLE_PRECISION)
 
-/* deprecated */
-typedef float realtype;
-# define RCONST(x) x##F
-# define BIG_REAL FLT_MAX
-# define SMALL_REAL FLT_MIN
-# define UNIT_ROUNDOFF FLT_EPSILON
-
 typedef float sunrealtype;
 # define SUN_RCONST(x) x##F
 # define SUN_BIG_REAL FLT_MAX
@@ -98,13 +91,6 @@ typedef float sunrealtype;
 
 #elif defined(SUNDIALS_DOUBLE_PRECISION)
 
-/* deprecated */
-typedef double realtype;
-# define RCONST(x) x
-# define BIG_REAL DBL_MAX
-# define SMALL_REAL DBL_MIN
-# define UNIT_ROUNDOFF DBL_EPSILON
-
 typedef double sunrealtype;
 # define SUN_RCONST(x) x
 # define SUN_BIG_REAL DBL_MAX
@@ -113,13 +99,6 @@ typedef double sunrealtype;
 
 #elif defined(SUNDIALS_EXTENDED_PRECISION)
 
-/* deprecated */
-typedef long double realtype;
-# define RCONST(x) x##L
-# define BIG_REAL LDBL_MAX
-# define SMALL_REAL LDBL_MIN
-# define UNIT_ROUNDOFF LDBL_EPSILON
-
 typedef long double sunrealtype;
 # define SUN_RCONST(x) x##L
 # define SUN_BIG_REAL LDBL_MAX
@@ -159,11 +138,6 @@ typedef SUNDIALS_INDEX_TYPE sunindextype;
  *------------------------------------------------------------------
  */
 
-/* deprecated */
-#ifndef booleantype
-#define booleantype int
-#endif
-
 #ifndef sunbooleantype
 #define sunbooleantype int
 #endif
diff --git a/include/sundials/sundials_types_deprecated.h b/include/sundials/sundials_types_deprecated.h
new file mode 100644
index 0000000000..88901f0cff
--- /dev/null
+++ b/include/sundials/sundials_types_deprecated.h
@@ -0,0 +1,73 @@
+/* -----------------------------------------------------------------
+ * SUNDIALS Copyright Start
+ * Copyright (c) 2002-2023, Lawrence Livermore National Security
+ * and Southern Methodist University.
+ * All rights reserved.
+ *
+ * See the top-level LICENSE and NOTICE files for details.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ * SUNDIALS Copyright End
+ * -----------------------------------------------------------------
+ * This header file exports realtype and booleantype and a few macros
+ * related to realtype for backwards compatibility. It is preferable
+ * to only use the types defined in sundials_types.h .
+ * -----------------------------------------------------------------*/
+
+#ifndef _SUNDIALS_TYPES_DEPRECATED_H
+#define _SUNDIALS_TYPES_DEPRECATED_H
+
+#include <sundials/sundials_config.h>
+#include <sundials/sundials_types.h>
+
+#include <float.h>
+#include <stddef.h>
+#include <stdint.h>
+
+#ifdef __cplusplus  /* wrapper to enable C++ usage */
+extern "C" {
+#endif
+
+/*
+ *------------------------------------------------------------------
+ * Type realtype
+ * Macro RCONST
+ * Constants SMALL_REAL, BIG_REAL, and UNIT_ROUNDOFF
+ *------------------------------------------------------------------
+ */
+
+#if defined(SUNDIALS_SINGLE_PRECISION)
+
+typedef float realtype;
+# define RCONST(x) x##F
+# define BIG_REAL FLT_MAX
+# define SMALL_REAL FLT_MIN
+# define UNIT_ROUNDOFF FLT_EPSILON
+
+#elif defined(SUNDIALS_DOUBLE_PRECISION)
+
+typedef double realtype;
+# define RCONST(x) x
+# define BIG_REAL DBL_MAX
+# define SMALL_REAL DBL_MIN
+# define UNIT_ROUNDOFF DBL_EPSILON
+
+#elif defined(SUNDIALS_EXTENDED_PRECISION)
+
+typedef long double realtype;
+# define RCONST(x) x##L
+# define BIG_REAL LDBL_MAX
+# define SMALL_REAL LDBL_MIN
+# define UNIT_ROUNDOFF LDBL_EPSILON
+
+#endif
+
+#ifndef booleantype
+#define booleantype int
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* _SUNDIALS_TYPES_DEPRECATED_H */
diff --git a/include/sunlinsol/sunlinsol_band.h b/include/sunlinsol/sunlinsol_band.h
index 70f66beea0..fbb76200fb 100644
--- a/include/sunlinsol/sunlinsol_band.h
+++ b/include/sunlinsol/sunlinsol_band.h
@@ -57,7 +57,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_Band(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_Band(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_Band(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_Band(SUNLinearSolver S, SUNMatrix A,
-                                        N_Vector x, N_Vector b, realtype tol);
+                                        N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_Band(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_Band(SUNLinearSolver S,
                                         long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_cusolversp_batchqr.h b/include/sunlinsol/sunlinsol_cusolversp_batchqr.h
index c71459d71e..05ea8e8ac8 100644
--- a/include/sunlinsol/sunlinsol_cusolversp_batchqr.h
+++ b/include/sunlinsol/sunlinsol_cusolversp_batchqr.h
@@ -39,7 +39,7 @@ extern "C" {
 
 struct _SUNLinearSolverContent_cuSolverSp_batchQR {
   int                last_flag;            /* last return flag                                     */
-  booleantype        first_factorize;      /* is this the first factorization?                     */
+  sunbooleantype        first_factorize;      /* is this the first factorization?                     */
   size_t             internal_size;        /* size of cusolver internal buffer for Q and R         */
   size_t             workspace_size;       /* size of cusolver memory block for num. factorization */
   cusolverSpHandle_t cusolver_handle;      /* cuSolverSp context                                   */
@@ -81,7 +81,7 @@ SUNDIALS_EXPORT int SUNLinSolSolve_cuSolverSp_batchQR(SUNLinearSolver S,
                                                       SUNMatrix A,
                                                       N_Vector x,
                                                       N_Vector b,
-                                                      realtype tol);
+                                                      sunrealtype tol);
 
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_cuSolverSp_batchQR(SUNLinearSolver S);
 
diff --git a/include/sunlinsol/sunlinsol_dense.h b/include/sunlinsol/sunlinsol_dense.h
index b386403da5..e16c71cb70 100644
--- a/include/sunlinsol/sunlinsol_dense.h
+++ b/include/sunlinsol/sunlinsol_dense.h
@@ -18,11 +18,11 @@
  * Notes:
  *   - The definition of the generic SUNLinearSolver structure can
  *     be found in the header file sundials_linearsolver.h.
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype' and 'indextype'.
+ *     for the type 'sunbooleantype' and 'indextype'.
  * -----------------------------------------------------------------
  */
 
@@ -61,7 +61,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_Dense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_Dense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_Dense(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_Dense(SUNLinearSolver S, SUNMatrix A,
-                                         N_Vector x, N_Vector b, realtype tol);
+                                         N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_Dense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_Dense(SUNLinearSolver S,
                                          long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_klu.h b/include/sunlinsol/sunlinsol_klu.h
index efb420b7f1..e557479cf5 100644
--- a/include/sunlinsol/sunlinsol_klu.h
+++ b/include/sunlinsol/sunlinsol_klu.h
@@ -74,7 +74,7 @@ extern "C" {
 
 #if defined(SUNDIALS_DOUBLE_PRECISION)
 #else
-#error  Incompatible realtype for KLU
+#error  Incompatible sunrealtype for KLU
 #endif
 
 /* --------------------------------------
@@ -128,7 +128,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_KLU(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_KLU(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_KLU(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_KLU(SUNLinearSolver S, SUNMatrix A,
-                                       N_Vector x, N_Vector b, realtype tol);
+                                       N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_KLU(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_KLU(SUNLinearSolver S,
                                        long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_lapackband.h b/include/sunlinsol/sunlinsol_lapackband.h
index a203a578bd..e2b7bbcb2e 100644
--- a/include/sunlinsol/sunlinsol_lapackband.h
+++ b/include/sunlinsol/sunlinsol_lapackband.h
@@ -58,7 +58,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_LapackBand(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_LapackBand(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_LapackBand(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_LapackBand(SUNLinearSolver S, SUNMatrix A,
-                                              N_Vector x, N_Vector b, realtype tol);
+                                              N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_LapackBand(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_LapackBand(SUNLinearSolver S,
                                               long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_lapackdense.h b/include/sunlinsol/sunlinsol_lapackdense.h
index a7567cc6dd..00108f1f27 100644
--- a/include/sunlinsol/sunlinsol_lapackdense.h
+++ b/include/sunlinsol/sunlinsol_lapackdense.h
@@ -58,7 +58,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_LapackDense(SUNLinearSolver S)
 SUNDIALS_EXPORT int SUNLinSolInitialize_LapackDense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_LapackDense(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_LapackDense(SUNLinearSolver S, SUNMatrix A,
-                                               N_Vector x, N_Vector b, realtype tol);
+                                               N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_LapackDense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_LapackDense(SUNLinearSolver S,
                                                long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_magmadense.h b/include/sunlinsol/sunlinsol_magmadense.h
index 15885b111e..2809c5b5b3 100644
--- a/include/sunlinsol/sunlinsol_magmadense.h
+++ b/include/sunlinsol/sunlinsol_magmadense.h
@@ -42,7 +42,7 @@ extern "C" {
 
 struct _SUNLinearSolverContent_MagmaDense {
   int             last_flag;
-  booleantype     async;
+  sunbooleantype     async;
   sunindextype    N;
   SUNMemory       pivots;
   SUNMemory       pivotsarr;
@@ -58,14 +58,14 @@ typedef struct _SUNLinearSolverContent_MagmaDense *SUNLinearSolverContent_MagmaD
 
 SUNDIALS_EXPORT SUNLinearSolver SUNLinSol_MagmaDense(N_Vector y, SUNMatrix A, SUNContext sunctx);
 
-SUNDIALS_EXPORT int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver S, booleantype onoff);
+SUNDIALS_EXPORT int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver S, sunbooleantype onoff);
 
 SUNDIALS_EXPORT SUNLinearSolver_Type SUNLinSolGetType_MagmaDense(SUNLinearSolver S);
 SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_MagmaDense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_MagmaDense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_MagmaDense(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_MagmaDense(SUNLinearSolver S, SUNMatrix A,
-                                              N_Vector x, N_Vector b, realtype tol);
+                                              N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_MagmaDense(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_MagmaDense(SUNLinearSolver S,
                                               long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_onemkldense.h b/include/sunlinsol/sunlinsol_onemkldense.h
index 5f57a3ac20..f75bf87422 100644
--- a/include/sunlinsol/sunlinsol_onemkldense.h
+++ b/include/sunlinsol/sunlinsol_onemkldense.h
@@ -66,7 +66,7 @@ int SUNLinSolSetup_OneMklDense(SUNLinearSolver S, SUNMatrix A);
 
 SUNDIALS_EXPORT
 int SUNLinSolSolve_OneMklDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                               N_Vector b, realtype tol);
+                               N_Vector b, sunrealtype tol);
 
 SUNDIALS_EXPORT
 sunindextype SUNLinSolLastFlag_OneMklDense(SUNLinearSolver S);
diff --git a/include/sunlinsol/sunlinsol_pcg.h b/include/sunlinsol/sunlinsol_pcg.h
index 28e34ae6f9..daac981a0b 100644
--- a/include/sunlinsol/sunlinsol_pcg.h
+++ b/include/sunlinsol/sunlinsol_pcg.h
@@ -43,9 +43,9 @@ extern "C" {
 struct _SUNLinearSolverContent_PCG {
   int maxl;
   int pretype;
-  booleantype zeroguess;
+  sunbooleantype zeroguess;
   int numiters;
-  realtype resnorm;
+  sunrealtype resnorm;
   int last_flag;
 
   SUNATimesFn ATimes;
@@ -93,12 +93,12 @@ SUNDIALS_EXPORT int SUNLinSolSetScalingVectors_PCG(SUNLinearSolver S,
                                                    N_Vector s,
                                                    N_Vector nul);
 SUNDIALS_EXPORT int SUNLinSolSetZeroGuess_PCG(SUNLinearSolver S,
-                                              booleantype onoff);
+                                              sunbooleantype onoff);
 SUNDIALS_EXPORT int SUNLinSolSetup_PCG(SUNLinearSolver S, SUNMatrix nul);
 SUNDIALS_EXPORT int SUNLinSolSolve_PCG(SUNLinearSolver S, SUNMatrix nul,
-                                       N_Vector x, N_Vector b, realtype tol);
+                                       N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT int SUNLinSolNumIters_PCG(SUNLinearSolver S);
-SUNDIALS_EXPORT realtype SUNLinSolResNorm_PCG(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm_PCG(SUNLinearSolver S);
 SUNDIALS_EXPORT N_Vector SUNLinSolResid_PCG(SUNLinearSolver S);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_PCG(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_PCG(SUNLinearSolver S,
diff --git a/include/sunlinsol/sunlinsol_spbcgs.h b/include/sunlinsol/sunlinsol_spbcgs.h
index f2caa1ba06..3b97c8b7f5 100644
--- a/include/sunlinsol/sunlinsol_spbcgs.h
+++ b/include/sunlinsol/sunlinsol_spbcgs.h
@@ -47,9 +47,9 @@ extern "C" {
 struct _SUNLinearSolverContent_SPBCGS {
   int maxl;
   int pretype;
-  booleantype zeroguess;
+  sunbooleantype zeroguess;
   int numiters;
-  realtype resnorm;
+  sunrealtype resnorm;
   int last_flag;
 
   SUNATimesFn ATimes;
@@ -100,12 +100,12 @@ SUNDIALS_EXPORT int SUNLinSolSetScalingVectors_SPBCGS(SUNLinearSolver S,
                                                       N_Vector s1,
                                                       N_Vector s2);
 SUNDIALS_EXPORT int SUNLinSolSetZeroGuess_SPBCGS(SUNLinearSolver S,
-                                                 booleantype onoff);
+                                                 sunbooleantype onoff);
 SUNDIALS_EXPORT int SUNLinSolSetup_SPBCGS(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SPBCGS(SUNLinearSolver S, SUNMatrix A,
-                                          N_Vector x, N_Vector b, realtype tol);
+                                          N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT int SUNLinSolNumIters_SPBCGS(SUNLinearSolver S);
-SUNDIALS_EXPORT realtype SUNLinSolResNorm_SPBCGS(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm_SPBCGS(SUNLinearSolver S);
 SUNDIALS_EXPORT N_Vector SUNLinSolResid_SPBCGS(SUNLinearSolver S);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SPBCGS(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SPBCGS(SUNLinearSolver S,
diff --git a/include/sunlinsol/sunlinsol_spfgmr.h b/include/sunlinsol/sunlinsol_spfgmr.h
index 39ba18027e..8c50ddf478 100644
--- a/include/sunlinsol/sunlinsol_spfgmr.h
+++ b/include/sunlinsol/sunlinsol_spfgmr.h
@@ -50,9 +50,9 @@ struct _SUNLinearSolverContent_SPFGMR {
   int pretype;
   int gstype;
   int max_restarts;
-  booleantype zeroguess;
+  sunbooleantype zeroguess;
   int numiters;
-  realtype resnorm;
+  sunrealtype resnorm;
   int last_flag;
 
   SUNATimesFn ATimes;
@@ -65,13 +65,13 @@ struct _SUNLinearSolverContent_SPFGMR {
   N_Vector s2;
   N_Vector *V;
   N_Vector *Z;
-  realtype **Hes;
-  realtype *givens;
+  sunrealtype **Hes;
+  sunrealtype *givens;
   N_Vector xcor;
-  realtype *yg;
+  sunrealtype *yg;
   N_Vector vtemp;
 
-  realtype *cv;
+  sunrealtype *cv;
   N_Vector *Xv;
 
   int print_level;
@@ -107,12 +107,12 @@ SUNDIALS_EXPORT int SUNLinSolSetScalingVectors_SPFGMR(SUNLinearSolver S,
                                                       N_Vector s1,
                                                       N_Vector s2);
 SUNDIALS_EXPORT int SUNLinSolSetZeroGuess_SPFGMR(SUNLinearSolver S,
-                                                 booleantype onoff);
+                                                 sunbooleantype onoff);
 SUNDIALS_EXPORT int SUNLinSolSetup_SPFGMR(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SPFGMR(SUNLinearSolver S, SUNMatrix A,
-                                          N_Vector x, N_Vector b, realtype tol);
+                                          N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT int SUNLinSolNumIters_SPFGMR(SUNLinearSolver S);
-SUNDIALS_EXPORT realtype SUNLinSolResNorm_SPFGMR(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm_SPFGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT N_Vector SUNLinSolResid_SPFGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SPFGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SPFGMR(SUNLinearSolver S,
diff --git a/include/sunlinsol/sunlinsol_spgmr.h b/include/sunlinsol/sunlinsol_spgmr.h
index 807556b9a3..683c12d951 100644
--- a/include/sunlinsol/sunlinsol_spgmr.h
+++ b/include/sunlinsol/sunlinsol_spgmr.h
@@ -52,9 +52,9 @@ struct _SUNLinearSolverContent_SPGMR {
   int pretype;
   int gstype;
   int max_restarts;
-  booleantype zeroguess;
+  sunbooleantype zeroguess;
   int numiters;
-  realtype resnorm;
+  sunrealtype resnorm;
   int last_flag;
 
   SUNATimesFn ATimes;
@@ -66,13 +66,13 @@ struct _SUNLinearSolverContent_SPGMR {
   N_Vector s1;
   N_Vector s2;
   N_Vector *V;
-  realtype **Hes;
-  realtype *givens;
+  sunrealtype **Hes;
+  sunrealtype *givens;
   N_Vector xcor;
-  realtype *yg;
+  sunrealtype *yg;
   N_Vector vtemp;
 
-  realtype *cv;
+  sunrealtype *cv;
   N_Vector *Xv;
 
   int print_level;
@@ -109,12 +109,12 @@ SUNDIALS_EXPORT int SUNLinSolSetScalingVectors_SPGMR(SUNLinearSolver S,
                                                      N_Vector s1,
                                                      N_Vector s2);
 SUNDIALS_EXPORT int SUNLinSolSetZeroGuess_SPGMR(SUNLinearSolver S,
-                                                booleantype onff);
+                                                sunbooleantype onff);
 SUNDIALS_EXPORT int SUNLinSolSetup_SPGMR(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SPGMR(SUNLinearSolver S, SUNMatrix A,
-                                         N_Vector x, N_Vector b, realtype tol);
+                                         N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT int SUNLinSolNumIters_SPGMR(SUNLinearSolver S);
-SUNDIALS_EXPORT realtype SUNLinSolResNorm_SPGMR(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm_SPGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT N_Vector SUNLinSolResid_SPGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SPGMR(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SPGMR(SUNLinearSolver S,
diff --git a/include/sunlinsol/sunlinsol_sptfqmr.h b/include/sunlinsol/sunlinsol_sptfqmr.h
index 11355d15d9..1cf27484a6 100644
--- a/include/sunlinsol/sunlinsol_sptfqmr.h
+++ b/include/sunlinsol/sunlinsol_sptfqmr.h
@@ -45,9 +45,9 @@ extern "C" {
 struct _SUNLinearSolverContent_SPTFQMR {
   int maxl;
   int pretype;
-  booleantype zeroguess;
+  sunbooleantype zeroguess;
   int numiters;
-  realtype resnorm;
+  sunrealtype resnorm;
   int last_flag;
 
   SUNATimesFn ATimes;
@@ -100,12 +100,12 @@ SUNDIALS_EXPORT int SUNLinSolSetScalingVectors_SPTFQMR(SUNLinearSolver S,
                                                        N_Vector s1,
                                                        N_Vector s2);
 SUNDIALS_EXPORT int SUNLinSolSetZeroGuess_SPTFQMR(SUNLinearSolver S,
-                                                  booleantype onoff);
+                                                  sunbooleantype onoff);
 SUNDIALS_EXPORT int SUNLinSolSetup_SPTFQMR(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SPTFQMR(SUNLinearSolver S, SUNMatrix A,
-                                           N_Vector x, N_Vector b, realtype tol);
+                                           N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT int SUNLinSolNumIters_SPTFQMR(SUNLinearSolver S);
-SUNDIALS_EXPORT realtype SUNLinSolResNorm_SPTFQMR(SUNLinearSolver S);
+SUNDIALS_EXPORT sunrealtype SUNLinSolResNorm_SPTFQMR(SUNLinearSolver S);
 SUNDIALS_EXPORT N_Vector SUNLinSolResid_SPTFQMR(SUNLinearSolver S);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SPTFQMR(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SPTFQMR(SUNLinearSolver S,
diff --git a/include/sunlinsol/sunlinsol_superludist.h b/include/sunlinsol/sunlinsol_superludist.h
index 5679dd5034..ea5baca0a4 100644
--- a/include/sunlinsol/sunlinsol_superludist.h
+++ b/include/sunlinsol/sunlinsol_superludist.h
@@ -61,9 +61,9 @@ extern "C" {
  */
 
 struct _SUNLinearSolverContent_SuperLUDIST {
-  booleantype             first_factorize;
+  sunbooleantype             first_factorize;
   int                     last_flag;
-  realtype                berr;
+  sunrealtype                berr;
   gridinfo_t              *grid;
   xLUstruct_t             *lu;
   superlu_dist_options_t  *options;
@@ -97,7 +97,7 @@ SUNDIALS_EXPORT SUNLinearSolver SUNLinSol_SuperLUDIST(N_Vector y, SUNMatrix A,
  * ----------------------------------------------------------------------------
  */
 
-SUNDIALS_EXPORT realtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS);
+SUNDIALS_EXPORT sunrealtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS);
 SUNDIALS_EXPORT gridinfo_t* SUNLinSol_SuperLUDIST_GetGridinfo(SUNLinearSolver LS);
 SUNDIALS_EXPORT xLUstruct_t* SUNLinSol_SuperLUDIST_GetLUstruct(SUNLinearSolver LS);
 SUNDIALS_EXPORT superlu_dist_options_t* SUNLinSol_SuperLUDIST_GetSuperLUOptions(SUNLinearSolver LS);
@@ -116,7 +116,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_SuperLUDIST(SUNLinearSolver S)
 SUNDIALS_EXPORT int SUNLinSolInitialize_SuperLUDIST(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_SuperLUDIST(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SuperLUDIST(SUNLinearSolver S, SUNMatrix A,
-                                               N_Vector x, N_Vector b, realtype tol);
+                                               N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SuperLUDIST(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SuperLUDIST(SUNLinearSolver S,
                                               long int *lenrwLS,
diff --git a/include/sunlinsol/sunlinsol_superlumt.h b/include/sunlinsol/sunlinsol_superlumt.h
index 1885cd8f48..e14033aae2 100644
--- a/include/sunlinsol/sunlinsol_superlumt.h
+++ b/include/sunlinsol/sunlinsol_superlumt.h
@@ -43,7 +43,7 @@ extern "C" {
 /* Default SuperLU_MT solver parameters */
 #define SUNSLUMT_ORDERING_DEFAULT  3     /* COLAMD */
 
-/* Interfaces to match 'realtype' with the correct SuperLUMT functions */
+/* Interfaces to match 'sunrealtype' with the correct SuperLUMT functions */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
 #ifndef _SLUMT_H
 #define _SLUMT_H
@@ -65,7 +65,7 @@ extern "C" {
 #define xCreate_Dense_Matrix    sCreate_Dense_Matrix
 #define xCreate_CompCol_Matrix  sCreate_CompCol_Matrix
 #else  /* incompatible sunindextype for SuperLUMT */
-#error  Incompatible realtype for SuperLUMT
+#error  Incompatible sunrealtype for SuperLUMT
 #endif
 
 
@@ -81,7 +81,7 @@ struct _SUNLinearSolverContent_SuperLUMT {
   sunindextype *perm_r, *perm_c;
   sunindextype N;
   int          num_threads;
-  realtype     diag_pivot_thresh;
+  sunrealtype     diag_pivot_thresh;
   int          ordering;
   superlumt_options_t *options;
 };
@@ -104,7 +104,7 @@ SUNDIALS_EXPORT SUNLinearSolver_ID SUNLinSolGetID_SuperLUMT(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolInitialize_SuperLUMT(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSetup_SuperLUMT(SUNLinearSolver S, SUNMatrix A);
 SUNDIALS_EXPORT int SUNLinSolSolve_SuperLUMT(SUNLinearSolver S, SUNMatrix A,
-                                       N_Vector x, N_Vector b, realtype tol);
+                                       N_Vector x, N_Vector b, sunrealtype tol);
 SUNDIALS_EXPORT sunindextype SUNLinSolLastFlag_SuperLUMT(SUNLinearSolver S);
 SUNDIALS_EXPORT int SUNLinSolSpace_SuperLUMT(SUNLinearSolver S,
                                              long int *lenrwLS,
diff --git a/include/sunmatrix/sunmatrix_band.h b/include/sunmatrix/sunmatrix_band.h
index f977e0d969..1f038e9ccd 100644
--- a/include/sunmatrix/sunmatrix_band.h
+++ b/include/sunmatrix/sunmatrix_band.h
@@ -20,11 +20,11 @@
  * Notes:
  *   - The definition of the generic SUNMatrix structure can be found
  *     in the header file sundials_matrix.h.
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype' and 'indextype'.
+ *     for the type 'sunbooleantype' and 'indextype'.
  * -----------------------------------------------------------------
  */
 
@@ -49,9 +49,9 @@ struct _SUNMatrixContent_Band {
   sunindextype mu;
   sunindextype ml;
   sunindextype s_mu;
-  realtype *data;
+  sunrealtype *data;
   sunindextype ldata;
-  realtype **cols;
+  sunrealtype **cols;
 };
 
 typedef struct _SUNMatrixContent_Band *SUNMatrixContent_Band;
@@ -110,17 +110,17 @@ SUNDIALS_EXPORT sunindextype SUNBandMatrix_UpperBandwidth(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNBandMatrix_StoredUpperBandwidth(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNBandMatrix_LDim(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNBandMatrix_LData(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNBandMatrix_Data(SUNMatrix A);
-SUNDIALS_EXPORT realtype** SUNBandMatrix_Cols(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j);
+SUNDIALS_EXPORT sunrealtype* SUNBandMatrix_Data(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype** SUNBandMatrix_Cols(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j);
 
 SUNDIALS_EXPORT SUNMatrix_ID SUNMatGetID_Band(SUNMatrix A);
 SUNDIALS_EXPORT SUNMatrix SUNMatClone_Band(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_Band(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_Band(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_Band(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_Band(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_Band(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_Band(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_Band(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_Band(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace_Band(SUNMatrix A, long int *lenrw, long int *leniw);
 
diff --git a/include/sunmatrix/sunmatrix_cusparse.h b/include/sunmatrix/sunmatrix_cusparse.h
index fd7c18ee4e..4754120b71 100644
--- a/include/sunmatrix/sunmatrix_cusparse.h
+++ b/include/sunmatrix/sunmatrix_cusparse.h
@@ -50,9 +50,9 @@ struct _SUNMatrix_Content_cuSparse {
   int blockcols;
   int blocknnz;
   int sparse_type;
-  booleantype own_matd;
-  booleantype fixed_pattern;
-  booleantype matvec_issetup;
+  sunbooleantype own_matd;
+  sunbooleantype fixed_pattern;
+  sunbooleantype matvec_issetup;
   SUNMemory colind;
   SUNMemory rowptrs;
   SUNMemory data;
@@ -77,7 +77,7 @@ typedef struct _SUNMatrix_Content_cuSparse *SUNMatrix_Content_cuSparse;
 SUNDIALS_EXPORT SUNMatrix SUNMatrix_cuSparse_NewCSR(int M, int N, int NNZ, cusparseHandle_t cusp,
                                                     SUNContext sunctx);
 SUNDIALS_EXPORT SUNMatrix SUNMatrix_cuSparse_MakeCSR(cusparseMatDescr_t mat_descr, int M, int N, int NNZ,
-                                                     int *rowptrs , int *colind , realtype *data,
+                                                     int *rowptrs , int *colind , sunrealtype *data,
                                                      cusparseHandle_t cusp, SUNContext sunctx);
 
 /* Creates a CSR block-diagonal matrix where each block shares the same sparsity structure.
@@ -97,19 +97,19 @@ SUNDIALS_EXPORT int SUNMatrix_cuSparse_Columns(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_NNZ(SUNMatrix A);
 SUNDIALS_EXPORT int* SUNMatrix_cuSparse_IndexPointers(SUNMatrix A);
 SUNDIALS_EXPORT int* SUNMatrix_cuSparse_IndexValues(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNMatrix_cuSparse_Data(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype* SUNMatrix_cuSparse_Data(SUNMatrix A);
 
-SUNDIALS_EXPORT int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, booleantype yesno);
+SUNDIALS_EXPORT int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, sunbooleantype yesno);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_SetKernelExecPolicy(SUNMatrix A, SUNCudaExecPolicy* exec_policy);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_NumBlocks(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_BlockRows(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_BlockColumns(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatrix_cuSparse_BlockNNZ(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx);
+SUNDIALS_EXPORT sunrealtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx);
 SUNDIALS_EXPORT cusparseMatDescr_t SUNMatrix_cuSparse_MatDescr(SUNMatrix A);
-SUNDIALS_EXPORT int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix device, realtype* h_data,
+SUNDIALS_EXPORT int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix device, sunrealtype* h_data,
                                                     int* h_idxptrs, int* h_idxvals);
-SUNDIALS_EXPORT int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix device, realtype* h_data,
+SUNDIALS_EXPORT int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix device, sunrealtype* h_data,
                                                       int* h_idxptrs, int* h_idxvals);
 
 
@@ -122,8 +122,8 @@ SUNDIALS_EXPORT SUNMatrix SUNMatClone_cuSparse(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_cuSparse(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_cuSparse(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_cuSparse(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_cuSparse(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_cuSparse(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_cuSparse(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_cuSparse(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvecSetup_cuSparse(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_cuSparse(SUNMatrix A, N_Vector x, N_Vector y);
 
diff --git a/include/sunmatrix/sunmatrix_dense.h b/include/sunmatrix/sunmatrix_dense.h
index 7c16db8c49..995c36db56 100644
--- a/include/sunmatrix/sunmatrix_dense.h
+++ b/include/sunmatrix/sunmatrix_dense.h
@@ -20,11 +20,11 @@
  * Notes:
  *   - The definition of the generic SUNMatrix structure can be found
  *     in the header file sundials_matrix.h.
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype' and 'indextype'.
+ *     for the type 'sunbooleantype' and 'indextype'.
  * -----------------------------------------------------------------
  */
 
@@ -45,9 +45,9 @@ extern "C" {
 struct _SUNMatrixContent_Dense {
   sunindextype M;
   sunindextype N;
-  realtype *data;
+  sunrealtype *data;
   sunindextype ldata;
-  realtype **cols;
+  sunrealtype **cols;
 };
 
 typedef struct _SUNMatrixContent_Dense *SUNMatrixContent_Dense;
@@ -83,17 +83,17 @@ SUNDIALS_EXPORT void SUNDenseMatrix_Print(SUNMatrix A, FILE* outfile);
 SUNDIALS_EXPORT sunindextype SUNDenseMatrix_Rows(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNDenseMatrix_Columns(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNDenseMatrix_LData(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNDenseMatrix_Data(SUNMatrix A);
-SUNDIALS_EXPORT realtype** SUNDenseMatrix_Cols(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j);
+SUNDIALS_EXPORT sunrealtype* SUNDenseMatrix_Data(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype** SUNDenseMatrix_Cols(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j);
 
 SUNDIALS_EXPORT SUNMatrix_ID SUNMatGetID_Dense(SUNMatrix A);
 SUNDIALS_EXPORT SUNMatrix SUNMatClone_Dense(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_Dense(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_Dense(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_Dense(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_Dense(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_Dense(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_Dense(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_Dense(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_Dense(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace_Dense(SUNMatrix A, long int *lenrw, long int *leniw);
 
diff --git a/include/sunmatrix/sunmatrix_magmadense.h b/include/sunmatrix/sunmatrix_magmadense.h
index 762a0b2eb5..25cd946939 100644
--- a/include/sunmatrix/sunmatrix_magmadense.h
+++ b/include/sunmatrix/sunmatrix_magmadense.h
@@ -63,7 +63,7 @@ SUNDIALS_EXPORT SUNMatrix SUNMatrix_MagmaDenseBlock(sunindextype nblocks, sunind
                                                     SUNMemoryType memtype, SUNMemoryHelper memhelper,
                                                     void* queue, SUNContext sunctx);
 SUNDIALS_EXPORT void SUNMatrix_MagmaDense_Print(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNMatrix_MagmaDense_Data(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype* SUNMatrix_MagmaDense_Data(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_LData(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_Rows(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_Columns(SUNMatrix A);
@@ -71,29 +71,29 @@ SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_BlockRows(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_BlockColumns(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_BlockLData(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNMatrix_MagmaDense_NumBlocks(SUNMatrix A);
-SUNDIALS_EXPORT realtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix A);
-SUNDIALS_EXPORT int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix A, realtype* h_data);
-SUNDIALS_EXPORT int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix A, realtype* h_data);
+SUNDIALS_EXPORT sunrealtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix A, sunrealtype* h_data);
+SUNDIALS_EXPORT int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix A, sunrealtype* h_data);
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_MagmaDense_Block(SUNMatrix Amat, sunindextype k)
+sunrealtype* SUNMatrix_MagmaDense_Block(SUNMatrix Amat, sunindextype k)
 {
   SUNMatrixContent_MagmaDense A = (SUNMatrixContent_MagmaDense) Amat->content;
-  return( ((realtype*) A->data->ptr) + k*A->M*A->N );
+  return( ((sunrealtype*) A->data->ptr) + k*A->M*A->N );
 }
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_MagmaDense_Column(SUNMatrix Amat, sunindextype j)
+sunrealtype* SUNMatrix_MagmaDense_Column(SUNMatrix Amat, sunindextype j)
 {
   SUNMatrixContent_MagmaDense A = (SUNMatrixContent_MagmaDense) Amat->content;
-  return( ((realtype*) A->data->ptr) + j*A->M );
+  return( ((sunrealtype*) A->data->ptr) + j*A->M );
 }
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix Amat, sunindextype k, sunindextype j)
+sunrealtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix Amat, sunindextype k, sunindextype j)
 {
   SUNMatrixContent_MagmaDense A = (SUNMatrixContent_MagmaDense) Amat->content;
-  return( ((realtype*) A->data->ptr) + k*A->M*A->N + j*A->M );
+  return( ((sunrealtype*) A->data->ptr) + k*A->M*A->N + j*A->M );
 }
 
 
@@ -108,8 +108,8 @@ SUNDIALS_EXPORT SUNMatrix SUNMatClone_MagmaDense(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_MagmaDense(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_MagmaDense(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_MagmaDense(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_MagmaDense(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_MagmaDense(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_MagmaDense(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_MagmaDense(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvecSetup_MagmaDense(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_MagmaDense(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace_MagmaDense(SUNMatrix A, long int *lenrw, long int *leniw);
diff --git a/include/sunmatrix/sunmatrix_onemkldense.h b/include/sunmatrix/sunmatrix_onemkldense.h
index e0cbdbdfec..f9b7dae746 100644
--- a/include/sunmatrix/sunmatrix_onemkldense.h
+++ b/include/sunmatrix/sunmatrix_onemkldense.h
@@ -93,13 +93,13 @@ SUNDIALS_EXPORT
 sunindextype SUNMatrix_OneMklDense_LData(SUNMatrix A);
 
 SUNDIALS_EXPORT
-realtype* SUNMatrix_OneMklDense_Data(SUNMatrix A);
+sunrealtype* SUNMatrix_OneMklDense_Data(SUNMatrix A);
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_OneMklDense_Column(SUNMatrix Amat, sunindextype j)
+sunrealtype* SUNMatrix_OneMklDense_Column(SUNMatrix Amat, sunindextype j)
 {
   SUNMatrixContent_OneMklDense A = (SUNMatrixContent_OneMklDense) Amat->content;
-  return( ((realtype*) A->data->ptr) + j * A->block_rows );
+  return( ((sunrealtype*) A->data->ptr) + j * A->block_rows );
 }
 
 /* Get matrix block data */
@@ -108,31 +108,31 @@ SUNDIALS_EXPORT
 sunindextype SUNMatrix_OneMklDense_BlockLData(SUNMatrix A);
 
 SUNDIALS_EXPORT
-realtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A);
+sunrealtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A);
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_OneMklDense_Block(SUNMatrix Amat, sunindextype k)
+sunrealtype* SUNMatrix_OneMklDense_Block(SUNMatrix Amat, sunindextype k)
 {
   SUNMatrixContent_OneMklDense A = (SUNMatrixContent_OneMklDense) Amat->content;
-  return( ((realtype*) A->data->ptr) + k * A->block_rows * A->block_cols );
+  return( ((sunrealtype*) A->data->ptr) + k * A->block_rows * A->block_cols );
 }
 
 SUNDIALS_STATIC_INLINE
-realtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix Amat, sunindextype k,
+sunrealtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix Amat, sunindextype k,
                                             sunindextype j)
 {
   SUNMatrixContent_OneMklDense A = (SUNMatrixContent_OneMklDense) Amat->content;
-  return( ((realtype*) A->data->ptr) +
+  return( ((sunrealtype*) A->data->ptr) +
           k * A->block_rows * A->block_cols + j * A->block_rows );
 }
 
 /* Copy data */
 
 SUNDIALS_EXPORT
-int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, realtype* h_data);
+int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, sunrealtype* h_data);
 
 SUNDIALS_EXPORT
-int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, realtype* h_data);
+int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, sunrealtype* h_data);
 
 /* ---------------------------------------------------------------------------
  * SUNMatrix API functions
@@ -154,10 +154,10 @@ SUNDIALS_EXPORT
 int SUNMatCopy_OneMklDense(SUNMatrix A, SUNMatrix B);
 
 SUNDIALS_EXPORT
-int SUNMatScaleAdd_OneMklDense(realtype c, SUNMatrix A, SUNMatrix B);
+int SUNMatScaleAdd_OneMklDense(sunrealtype c, SUNMatrix A, SUNMatrix B);
 
 SUNDIALS_EXPORT
-int SUNMatScaleAddI_OneMklDense(realtype c, SUNMatrix A);
+int SUNMatScaleAddI_OneMklDense(sunrealtype c, SUNMatrix A);
 
 SUNDIALS_EXPORT
 int SUNMatMatvecSetup_OneMklDense(SUNMatrix A);
diff --git a/include/sunmatrix/sunmatrix_slunrloc.h b/include/sunmatrix/sunmatrix_slunrloc.h
index 077da98e4c..1b4433074c 100644
--- a/include/sunmatrix/sunmatrix_slunrloc.h
+++ b/include/sunmatrix/sunmatrix_slunrloc.h
@@ -37,7 +37,7 @@ extern "C" {
 
 
 struct _SUNMatrixContent_SLUNRloc {
-  booleantype   own_data;
+  sunbooleantype   own_data;
   gridinfo_t    *grid;
   sunindextype  *row_to_proc;
   pdgsmv_comm_t *gsmv_comm;
@@ -62,7 +62,7 @@ SUNDIALS_EXPORT void SUNMatrix_SLUNRloc_Print(SUNMatrix A, FILE *fp);
 
 SUNDIALS_EXPORT SuperMatrix*  SUNMatrix_SLUNRloc_SuperMatrix(SUNMatrix A);
 SUNDIALS_EXPORT gridinfo_t* SUNMatrix_SLUNRloc_ProcessGrid(SUNMatrix A);
-SUNDIALS_EXPORT booleantype   SUNMatrix_SLUNRloc_OwnData(SUNMatrix A);
+SUNDIALS_EXPORT sunbooleantype   SUNMatrix_SLUNRloc_OwnData(SUNMatrix A);
 
 /* -----------------------------------------------------------------------------
  * SuperLU implementations of various SUNMatrix operations:
@@ -73,8 +73,8 @@ SUNDIALS_EXPORT SUNMatrix SUNMatClone_SLUNRloc(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_SLUNRloc(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_SLUNRloc(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_SLUNRloc(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_SLUNRloc(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_SLUNRloc(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_SLUNRloc(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_SLUNRloc(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvecSetup_SLUNRloc(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_SLUNRloc(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace_SLUNRloc(SUNMatrix A, long int *lenrw, long int *leniw);
diff --git a/include/sunmatrix/sunmatrix_sparse.h b/include/sunmatrix/sunmatrix_sparse.h
index ac0eef10ce..f7792af058 100644
--- a/include/sunmatrix/sunmatrix_sparse.h
+++ b/include/sunmatrix/sunmatrix_sparse.h
@@ -21,11 +21,11 @@
  * Notes:
  *   - The definition of the generic SUNMatrix structure can be found
  *     in the header file sundials_matrix.h.
- *   - The definition of the type 'realtype' can be found in the
+ *   - The definition of the type 'sunrealtype' can be found in the
  *     header file sundials_types.h, and it may be changed (at the
  *     configuration stage) according to the user's needs.
  *     The sundials_types.h file also contains the definition
- *     for the type 'booleantype' and 'indextype'.
+ *     for the type 'sunbooleantype' and 'indextype'.
  * -----------------------------------------------------------------
  */
 
@@ -58,7 +58,7 @@ struct _SUNMatrixContent_Sparse {
   sunindextype N;
   sunindextype NNZ;
   sunindextype NP;
-  realtype *data;
+  sunrealtype *data;
   int sparsetype;
   sunindextype *indexvals;
   sunindextype *indexptrs;
@@ -104,11 +104,11 @@ SUNDIALS_EXPORT SUNMatrix SUNSparseMatrix(sunindextype M, sunindextype N,
                                           SUNContext sunctx);
 
 SUNDIALS_EXPORT SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix A,
-                                                   realtype droptol,
+                                                   sunrealtype droptol,
                                                    int sparsetype);
 
 SUNDIALS_EXPORT SUNMatrix SUNSparseFromBandMatrix(SUNMatrix A,
-                                                  realtype droptol,
+                                                  sunrealtype droptol,
                                                   int sparsetype);
 
 SUNDIALS_EXPORT int SUNSparseMatrix_ToCSR(const SUNMatrix A, SUNMatrix* Bout);
@@ -125,7 +125,7 @@ SUNDIALS_EXPORT sunindextype SUNSparseMatrix_Columns(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNSparseMatrix_NNZ(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype SUNSparseMatrix_NP(SUNMatrix A);
 SUNDIALS_EXPORT int SUNSparseMatrix_SparseType(SUNMatrix A);
-SUNDIALS_EXPORT realtype* SUNSparseMatrix_Data(SUNMatrix A);
+SUNDIALS_EXPORT sunrealtype* SUNSparseMatrix_Data(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype* SUNSparseMatrix_IndexValues(SUNMatrix A);
 SUNDIALS_EXPORT sunindextype* SUNSparseMatrix_IndexPointers(SUNMatrix A);
 
@@ -134,8 +134,8 @@ SUNDIALS_EXPORT SUNMatrix SUNMatClone_Sparse(SUNMatrix A);
 SUNDIALS_EXPORT void SUNMatDestroy_Sparse(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatZero_Sparse(SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatCopy_Sparse(SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAdd_Sparse(realtype c, SUNMatrix A, SUNMatrix B);
-SUNDIALS_EXPORT int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A);
+SUNDIALS_EXPORT int SUNMatScaleAdd_Sparse(sunrealtype c, SUNMatrix A, SUNMatrix B);
+SUNDIALS_EXPORT int SUNMatScaleAddI_Sparse(sunrealtype c, SUNMatrix A);
 SUNDIALS_EXPORT int SUNMatMatvec_Sparse(SUNMatrix A, N_Vector x, N_Vector y);
 SUNDIALS_EXPORT int SUNMatSpace_Sparse(SUNMatrix A, long int *lenrw, long int *leniw);
 
diff --git a/include/sunnonlinsol/sunnonlinsol_fixedpoint.h b/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
index caaea50c20..ac8f4620de 100644
--- a/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
+++ b/include/sunnonlinsol/sunnonlinsol_fixedpoint.h
@@ -43,11 +43,11 @@ struct _SUNNonlinearSolverContent_FixedPoint {
   /* nonlinear solver variables */
   int          m;          /* number of acceleration vectors to use          */
   int         *imap;       /* array of length m                              */
-  booleantype  damping;    /* flag to apply dampling in acceleration         */
-  realtype     beta;       /* damping paramter                               */
-  realtype    *R;          /* array of length m*m                            */
-  realtype    *gamma;      /* array of length m                              */
-  realtype    *cvals;      /* array of length m+1 for fused vector op        */
+  sunbooleantype  damping;    /* flag to apply dampling in acceleration         */
+  sunrealtype     beta;       /* damping paramter                               */
+  sunrealtype    *R;          /* array of length m*m                            */
+  sunrealtype    *gamma;      /* array of length m                              */
+  sunrealtype    *cvals;      /* array of length m+1 for fused vector op        */
   N_Vector    *df;         /* vector array of length m                       */
   N_Vector    *dg;         /* vector array of length m                       */
   N_Vector    *q;          /* vector array of length m                       */
@@ -90,8 +90,8 @@ SUNDIALS_EXPORT int SUNNonlinSolInitialize_FixedPoint(SUNNonlinearSolver NLS);
 
 SUNDIALS_EXPORT int SUNNonlinSolSolve_FixedPoint(SUNNonlinearSolver NLS,
                                                  N_Vector y0, N_Vector y,
-                                                 N_Vector w, realtype tol,
-                                                 booleantype callSetup, void *mem);
+                                                 N_Vector w, sunrealtype tol,
+                                                 sunbooleantype callSetup, void *mem);
 
 SUNDIALS_EXPORT int SUNNonlinSolFree_FixedPoint(SUNNonlinearSolver NLS);
 
@@ -107,7 +107,7 @@ SUNDIALS_EXPORT int SUNNonlinSolSetMaxIters_FixedPoint(SUNNonlinearSolver NLS,
                                                        int maxiters);
 
 SUNDIALS_EXPORT int SUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver NLS,
-                                                      realtype beta);
+                                                      sunrealtype beta);
 
 /* get functions */
 SUNDIALS_EXPORT int SUNNonlinSolGetNumIters_FixedPoint(SUNNonlinearSolver NLS,
diff --git a/include/sunnonlinsol/sunnonlinsol_newton.h b/include/sunnonlinsol/sunnonlinsol_newton.h
index d6bbe89d4f..f5d73f5cce 100644
--- a/include/sunnonlinsol/sunnonlinsol_newton.h
+++ b/include/sunnonlinsol/sunnonlinsol_newton.h
@@ -44,7 +44,7 @@ struct _SUNNonlinearSolverContent_Newton {
 
   /* nonlinear solver variables */
   N_Vector    delta;      /* Newton update vector                                   */
-  booleantype jcur;       /* Jacobian status, current = SUNTRUE / stale = SUNFALSE  */
+  sunbooleantype jcur;       /* Jacobian status, current = SUNTRUE / stale = SUNFALSE  */
   int         curiter;    /* current number of iterations in a solve attempt        */
   int         maxiters;   /* maximum number of iterations in a solve attempt        */
   long int    niters;     /* total number of nonlinear iterations across all solves */
@@ -78,8 +78,8 @@ SUNDIALS_EXPORT int SUNNonlinSolInitialize_Newton(SUNNonlinearSolver NLS);
 
 SUNDIALS_EXPORT int SUNNonlinSolSolve_Newton(SUNNonlinearSolver NLS,
                                              N_Vector y0, N_Vector y,
-                                             N_Vector w, realtype tol,
-                                             booleantype callLSetup, void *mem);
+                                             N_Vector w, sunrealtype tol,
+                                             sunbooleantype callLSetup, void *mem);
 
 SUNDIALS_EXPORT int SUNNonlinSolFree_Newton(SUNNonlinearSolver NLS);
 
diff --git a/include/sunnonlinsol/sunnonlinsol_petscsnes.h b/include/sunnonlinsol/sunnonlinsol_petscsnes.h
index 6fcea929f4..739dd21100 100644
--- a/include/sunnonlinsol/sunnonlinsol_petscsnes.h
+++ b/include/sunnonlinsol/sunnonlinsol_petscsnes.h
@@ -68,8 +68,8 @@ SUNDIALS_EXPORT int SUNNonlinSolInitialize_PetscSNES(SUNNonlinearSolver NLS);
 
 SUNDIALS_EXPORT int SUNNonlinSolSolve_PetscSNES(SUNNonlinearSolver NLS,
                                                 N_Vector y0, N_Vector y,
-                                                N_Vector w, realtype tol,
-                                                booleantype callLSetup, void* mem);
+                                                N_Vector w, sunrealtype tol,
+                                                sunbooleantype callLSetup, void* mem);
 
 SUNDIALS_EXPORT int SUNNonlinSolSetSysFn_PetscSNES(SUNNonlinearSolver NLS,
                                                    SUNNonlinSolSysFn SysFn);
diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c
index 2a910b107d..cbcdc8d326 100644
--- a/src/arkode/arkode.c
+++ b/src/arkode/arkode.c
@@ -74,7 +74,7 @@ ARKodeMem arkCreate(SUNContext sunctx)
   ark_mem->sunctx = sunctx;
 
   /* Set uround */
-  ark_mem->uround = UNIT_ROUNDOFF;
+  ark_mem->uround = SUN_UNIT_ROUNDOFF;
 
   /* Initialize time step module to NULL */
   ark_mem->step_attachlinsol   = NULL;
@@ -104,7 +104,7 @@ ARKodeMem arkCreate(SUNContext sunctx)
 
   /* Initialize lrw and liw */
   ark_mem->lrw = 18;
-  ark_mem->liw = 41;  /* fcn/data ptr, int, long int, sunindextype, booleantype */
+  ark_mem->liw = 41;  /* fcn/data ptr, int, long int, sunindextype, sunbooleantype */
 
   /* No mallocs have been done yet */
   ark_mem->VabstolMallocDone     = SUNFALSE;
@@ -215,10 +215,10 @@ ARKodeMem arkCreate(SUNContext sunctx)
   The return value is ARK_SUCCESS = 0 if no errors occurred, or
   a negative value otherwise.
   ---------------------------------------------------------------*/
-int arkResize(ARKodeMem ark_mem, N_Vector y0, realtype hscale,
-              realtype t0, ARKVecResizeFn resize, void *resize_data)
+int arkResize(ARKodeMem ark_mem, N_Vector y0, sunrealtype hscale,
+              sunrealtype t0, ARKVecResizeFn resize, void *resize_data)
 {
-  booleantype resizeOK;
+  sunbooleantype resizeOK;
   sunindextype lrw1, liw1, lrw_diff, liw_diff;
   int retval;
 
@@ -330,7 +330,7 @@ int arkResize(ARKodeMem ark_mem, N_Vector y0, realtype hscale,
   arkWFtolerances specifies a user-provides function (of type
   ARKEwtFn) which will be called to set the error weight vector.
   ---------------------------------------------------------------*/
-int arkSStolerances(ARKodeMem ark_mem, realtype reltol, realtype abstol)
+int arkSStolerances(ARKodeMem ark_mem, sunrealtype reltol, sunrealtype abstol)
 {
   /* Check inputs */
   if (ark_mem==NULL) {
@@ -371,10 +371,10 @@ int arkSStolerances(ARKodeMem ark_mem, realtype reltol, realtype abstol)
 }
 
 
-int arkSVtolerances(ARKodeMem ark_mem, realtype reltol, N_Vector abstol)
+int arkSVtolerances(ARKodeMem ark_mem, sunrealtype reltol, N_Vector abstol)
 {
   /* local variables */
-  realtype abstolmin;
+  sunrealtype abstolmin;
 
   /* Check inputs */
   if (ark_mem==NULL) {
@@ -479,7 +479,7 @@ int arkWFtolerances(ARKodeMem ark_mem, ARKEwtFn efun)
   type ARKRwtFn) which will be called to set the residual
   weight vector.
   ---------------------------------------------------------------*/
-int arkResStolerance(ARKodeMem ark_mem, realtype rabstol)
+int arkResStolerance(ARKodeMem ark_mem, sunrealtype rabstol)
 {
   /* Check inputs */
   if (ark_mem==NULL) {
@@ -528,7 +528,7 @@ int arkResStolerance(ARKodeMem ark_mem, realtype rabstol)
 int arkResVtolerance(ARKodeMem ark_mem, N_Vector rabstol)
 {
   /* local variables */
-  realtype rabstolmin;
+  sunrealtype rabstolmin;
 
   /* Check inputs */
   if (ark_mem==NULL) {
@@ -650,15 +650,15 @@ int arkResFtolerance(ARKodeMem ark_mem, ARKRwtFn rfun)
   exactly the specified stop time, and hence interpolation of
   y(tout) is not required.
   ---------------------------------------------------------------*/
-int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
-              realtype *tret, int itask)
+int arkEvolve(ARKodeMem ark_mem, sunrealtype tout, N_Vector yout,
+              sunrealtype *tret, int itask)
 {
   long int nstloc;
   int retval, kflag, istate, ir;
   int ewtsetOK;
-  realtype troundoff, nrm;
-  booleantype inactive_roots;
-  realtype dsm;
+  sunrealtype troundoff, nrm;
+  sunbooleantype inactive_roots;
+  sunrealtype dsm;
   int nflag, attempts, ncf, nef, constrfails;
   int relax_fails;
 
@@ -1063,9 +1063,9 @@ int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
   updated to correspond with the end time of the last successful
   step.
   ---------------------------------------------------------------*/
-int arkGetDky(ARKodeMem ark_mem, realtype t, int k, N_Vector dky)
+int arkGetDky(ARKodeMem ark_mem, sunrealtype t, int k, N_Vector dky)
 {
-  realtype s, tfuzz, tp, tn1;
+  sunrealtype s, tfuzz, tp, tn1;
   int retval;
 
   /* Check all inputs for legality */
@@ -1268,10 +1268,10 @@ void arkErrHandler(int error_code, const char *module,
   initialization type indicates if the values of internal counters
   should be reinitialized (FIRST_INIT) or retained (RESET_INIT).
   ---------------------------------------------------------------*/
-int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0,
+int arkInit(ARKodeMem ark_mem, sunrealtype t0, N_Vector y0,
             int init_type)
 {
-  booleantype stepperOK, nvectorOK, allocOK;
+  sunbooleantype stepperOK, nvectorOK, allocOK;
   int retval;
   sunindextype lrw1, liw1;
 
@@ -1519,7 +1519,7 @@ void arkPrintMem(ARKodeMem ark_mem, FILE *outfile)
   pointers have been supplied.  If any of them is missing it
   returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype arkCheckTimestepper(ARKodeMem ark_mem)
+sunbooleantype arkCheckTimestepper(ARKodeMem ark_mem)
 {
   if ( (ark_mem->step_init    == NULL) ||
        (ark_mem->step         == NULL) ||
@@ -1535,7 +1535,7 @@ booleantype arkCheckTimestepper(ARKodeMem ark_mem)
   This routine checks if all required vector operations are
   present.  If any of them is missing it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype arkCheckNvector(N_Vector tmpl)  /* to be updated?? */
+sunbooleantype arkCheckNvector(N_Vector tmpl)  /* to be updated?? */
 {
   if ((tmpl->ops->nvclone     == NULL) ||
       (tmpl->ops->nvdestroy   == NULL) ||
@@ -1570,7 +1570,7 @@ booleantype arkCheckNvector(N_Vector tmpl)  /* to be updated?? */
   target vector or vector array already exists) otherwise SUNFALSE
   is retured.
   ---------------------------------------------------------------*/
-booleantype arkAllocVec(ARKodeMem ark_mem, N_Vector tmpl, N_Vector *v)
+sunbooleantype arkAllocVec(ARKodeMem ark_mem, N_Vector tmpl, N_Vector *v)
 {
   /* allocate the new vector if necessary */
   if (*v == NULL) {
@@ -1587,7 +1587,7 @@ booleantype arkAllocVec(ARKodeMem ark_mem, N_Vector tmpl, N_Vector *v)
 }
 
 
-booleantype arkAllocVecArray(int count, N_Vector tmpl, N_Vector **v,
+sunbooleantype arkAllocVecArray(int count, N_Vector tmpl, N_Vector **v,
                              sunindextype lrw1, long int *lrw,
                              sunindextype liw1, long int *liw)
 {
@@ -1649,7 +1649,7 @@ void arkFreeVecArray(int count, N_Vector **v,
   SUNTRUE is returned if the resize is successful otherwise
   SUNFALSE is retured.
   ---------------------------------------------------------------*/
-booleantype arkResizeVec(ARKodeMem ark_mem, ARKVecResizeFn resize,
+sunbooleantype arkResizeVec(ARKodeMem ark_mem, ARKVecResizeFn resize,
                          void *resize_data, sunindextype lrw_diff,
                          sunindextype liw_diff, N_Vector tmpl, N_Vector *v)
 {
@@ -1677,7 +1677,7 @@ booleantype arkResizeVec(ARKodeMem ark_mem, ARKVecResizeFn resize,
 }
 
 
-booleantype arkResizeVecArray(ARKVecResizeFn resize, void *resize_data,
+sunbooleantype arkResizeVecArray(ARKVecResizeFn resize, void *resize_data,
                               int count, N_Vector tmpl, N_Vector **v,
                               sunindextype lrw_diff, long int *lrw,
                               sunindextype liw_diff, long int *liw)
@@ -1715,7 +1715,7 @@ booleantype arkResizeVecArray(ARKVecResizeFn resize, void *resize_data,
   If all memory allocations are successful, arkAllocVectors
   returns SUNTRUE, otherwise it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype arkAllocVectors(ARKodeMem ark_mem, N_Vector tmpl)
+sunbooleantype arkAllocVectors(ARKodeMem ark_mem, N_Vector tmpl)
 {
   /* Allocate ewt if needed */
   if (!arkAllocVec(ark_mem, tmpl, &ark_mem->ewt))
@@ -1762,7 +1762,7 @@ booleantype arkAllocVectors(ARKodeMem ark_mem, N_Vector tmpl)
   If all memory allocations are successful, arkResizeVectors
   returns SUNTRUE, otherwise it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype arkResizeVectors(ARKodeMem ark_mem, ARKVecResizeFn resize,
+sunbooleantype arkResizeVectors(ARKodeMem ark_mem, ARKVecResizeFn resize,
                              void *resize_data, sunindextype lrw_diff,
                              sunindextype liw_diff, N_Vector tmpl)
 {
@@ -1862,11 +1862,11 @@ void arkFreeVectors(ARKodeMem ark_mem)
   - checks for approach to tstop
   - checks for root near t0
   ---------------------------------------------------------------*/
-int arkInitialSetup(ARKodeMem ark_mem, realtype tout)
+int arkInitialSetup(ARKodeMem ark_mem, sunrealtype tout)
 {
   int retval, hflag, istate;
-  realtype tout_hin, rh, htmp;
-  booleantype conOK;
+  sunrealtype tout_hin, rh, htmp;
+  sunbooleantype conOK;
 
   /* Set up the time stepper module */
   if (ark_mem->step_init == NULL) {
@@ -2070,11 +2070,11 @@ int arkInitialSetup(ARKodeMem ark_mem, realtype tout)
   - check if we are close to tstop
   (adjust step size if needed)
   ---------------------------------------------------------------*/
-int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
-                 realtype *tret, int itask, int *ier)
+int arkStopTests(ARKodeMem ark_mem, sunrealtype tout, N_Vector yout,
+                 sunrealtype *tret, int itask, int *ier)
 {
   int irfndp, retval;
-  realtype troundoff;
+  sunrealtype troundoff;
 
   /* Estimate an infinitesimal time interval to be used as
      a roundoff for time quantities (based on current time
@@ -2257,12 +2257,12 @@ int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
   Finally, we apply a bias (0.5) and verify that h0 is within
   bounds.
   ---------------------------------------------------------------*/
-int arkHin(ARKodeMem ark_mem, realtype tout)
+int arkHin(ARKodeMem ark_mem, sunrealtype tout)
 {
   int retval, sign, count1, count2;
-  realtype tdiff, tdist, tround, hlb, hub;
-  realtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
-  booleantype hgOK;
+  sunrealtype tdiff, tdist, tround, hlb, hub;
+  sunrealtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
+  sunbooleantype hgOK;
 
   /* If tout is too close to tn, give up */
   if ((tdiff = tout-ark_mem->tcur) == ZERO) return(ARK_TOO_CLOSE);
@@ -2315,7 +2315,7 @@ int arkHin(ARKodeMem ark_mem, realtype tout)
       /* If successful, we can use ydd */
       if (retval == ARK_SUCCESS) {hgOK = SUNTRUE; break;}
       /* f() failed recoverably; cut step size and test it again */
-      hg *= RCONST(0.2);
+      hg *= SUN_RCONST(0.2);
     }
 
     /* If f() failed recoverably H0_ITERS times */
@@ -2369,9 +2369,9 @@ int arkHin(ARKodeMem ark_mem, realtype tout)
   This routine sets an upper bound on abs(h0) based on
   tdist = tn - t0 and the values of y[i]/y'[i].
   ---------------------------------------------------------------*/
-realtype arkUpperBoundH0(ARKodeMem ark_mem, realtype tdist)
+sunrealtype arkUpperBoundH0(ARKodeMem ark_mem, sunrealtype tdist)
 {
-  realtype hub_inv, hub;
+  sunrealtype hub_inv, hub;
   N_Vector temp1, temp2;
 
   /* Bound based on |y0|/|y0'| -- allow at most an increase of
@@ -2407,7 +2407,7 @@ realtype arkUpperBoundH0(ARKodeMem ark_mem, realtype tdist)
   This routine computes an estimate of the second derivative of y
   using a difference quotient, and returns its WRMS norm.
   ---------------------------------------------------------------*/
-int arkYddNorm(ARKodeMem ark_mem, realtype hg, realtype *yddnrm)
+int arkYddNorm(ARKodeMem ark_mem, sunrealtype hg, sunrealtype *yddnrm)
 {
   int retval;
 
@@ -2450,10 +2450,10 @@ int arkYddNorm(ARKodeMem ark_mem, realtype hg, realtype *yddnrm)
   and tnew, allow for user-provided postprocessing, and update
   the interpolation structure.
   ---------------------------------------------------------------*/
-int arkCompleteStep(ARKodeMem ark_mem, realtype dsm)
+int arkCompleteStep(ARKodeMem ark_mem, sunrealtype dsm)
 {
   int retval;
-  realtype troundoff;
+  sunrealtype troundoff;
 
   /* Set current time to the end of the step (in case the last
      stage time does not coincide with the step solution time).
@@ -2712,7 +2712,7 @@ int arkEwtSetSV(N_Vector ycur, N_Vector weight, void* arkode_mem)
   This routine is responsible for setting the error weight vector
   ewt as follows:
 
-  ewt[i] = SMALL_REAL
+  ewt[i] = SUN_SMALL_REAL
 
   This is routine is only used with explicit time stepping with
   a fixed step size to avoid a potential too much error return
@@ -2720,7 +2720,7 @@ int arkEwtSetSV(N_Vector ycur, N_Vector weight, void* arkode_mem)
   ---------------------------------------------------------------*/
 int arkEwtSetSmallReal(N_Vector ycur, N_Vector weight, void* arkode_mem)
 {
-  N_VConst(SMALL_REAL, weight);
+  N_VConst(SUN_SMALL_REAL, weight);
   return(ARK_SUCCESS);
 }
 
@@ -2772,11 +2772,11 @@ int arkRwtSetSV(ARKodeMem ark_mem, N_Vector My, N_Vector weight)
 /*---------------------------------------------------------------
   arkExpStab is the default explicit stability estimation function
   ---------------------------------------------------------------*/
-int arkExpStab(N_Vector y, realtype t, realtype *hstab, void *data)
+int arkExpStab(N_Vector y, sunrealtype t, sunrealtype *hstab, void *data)
 {
   /* explicit stability not used by default,
      set to zero to disable */
-  *hstab = RCONST(0.0);
+  *hstab = SUN_RCONST(0.0);
 
   return(ARK_SUCCESS);
 }
@@ -2790,7 +2790,7 @@ int arkExpStab(N_Vector y, realtype t, realtype *hstab, void *data)
   highest-degree interpolant supported by the module (stored
   in the interpolation module).
   ---------------------------------------------------------------*/
-int arkPredict_MaximumOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
+int arkPredict_MaximumOrder(ARKodeMem ark_mem, sunrealtype tau, N_Vector yguess)
 {
 
   /* verify that ark_mem and interpolation structure are provided */
@@ -2821,11 +2821,11 @@ int arkPredict_MaximumOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
   interpolant is based on the level of extrapolation outside the
   preceding time step.
   ---------------------------------------------------------------*/
-int arkPredict_VariableOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
+int arkPredict_VariableOrder(ARKodeMem ark_mem, sunrealtype tau, N_Vector yguess)
 {
   int ord;
-  realtype tau_tol  = 0.5;
-  realtype tau_tol2 = 0.75;
+  sunrealtype tau_tol  = 0.5;
+  sunrealtype tau_tol2 = 0.75;
 
   /* verify that ark_mem and interpolation structure are provided */
   if (ark_mem == NULL) {
@@ -2865,10 +2865,10 @@ int arkPredict_VariableOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
   polynomial available (stored in the interpolation module
   structure); otherwise it uses a linear polynomial.
   ---------------------------------------------------------------*/
-int arkPredict_CutoffOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
+int arkPredict_CutoffOrder(ARKodeMem ark_mem, sunrealtype tau, N_Vector yguess)
 {
   int ord;
-  realtype tau_tol = 0.5;
+  sunrealtype tau_tol = 0.5;
 
   /* verify that ark_mem and interpolation structure are provided */
   if (ark_mem == NULL) {
@@ -2909,11 +2909,11 @@ int arkPredict_CutoffOrder(ARKodeMem ark_mem, realtype tau, N_Vector yguess)
   i.e. the inputs cvals[0:nvec-1] and Xvecs[0:nvec-1] may be
   combined to form f(t_n+hj,z_j).
   ---------------------------------------------------------------*/
-int arkPredict_Bootstrap(ARKodeMem ark_mem, realtype hj,
-                         realtype tau, int nvec, realtype *cvals,
+int arkPredict_Bootstrap(ARKodeMem ark_mem, sunrealtype hj,
+                         sunrealtype tau, int nvec, sunrealtype *cvals,
                          N_Vector *Xvecs, N_Vector yguess)
 {
-  realtype a0, a1, a2;
+  sunrealtype a0, a1, a2;
   int i, retval;
 
   /* verify that ark_mem and interpolation structure are provided */
@@ -3024,7 +3024,7 @@ int arkCheckConvergence(ARKodeMem ark_mem, int *nflagPtr, int *ncfPtr)
   --------------------------------------------------------------*/
 int arkCheckConstraints(ARKodeMem ark_mem, int *constrfails, int *nflag)
 {
-  booleantype constraintsPassed;
+  sunbooleantype constraintsPassed;
   N_Vector mm  = ark_mem->tempv4;
   N_Vector tmp = ark_mem->tempv3;
 
@@ -3050,7 +3050,7 @@ int arkCheckConstraints(ARKodeMem ark_mem, int *constrfails, int *nflag)
   /* Reduce h by computing eta = h'/h */
   N_VLinearSum(ONE, ark_mem->yn, -ONE, ark_mem->ycur, tmp);
   N_VProd(mm, tmp, tmp);
-  ark_mem->eta = RCONST(0.9)*N_VMinQuotient(ark_mem->yn, tmp);
+  ark_mem->eta = SUN_RCONST(0.9)*N_VMinQuotient(ark_mem->yn, tmp);
   ark_mem->eta = SUNMAX(ark_mem->eta, TENTH);
 
   /* Signal for Jacobian/preconditioner setup */
@@ -3079,10 +3079,10 @@ int arkCheckConstraints(ARKodeMem ark_mem, int *constrfails, int *nflag)
     - otherwise: set *nflagPtr to PREV_ERR_FAIL, and
       return TRY_AGAIN.
   --------------------------------------------------------------*/
-int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr, realtype dsm)
+int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr, sunrealtype dsm)
 {
   int retval;
-  realtype ttmp;
+  sunrealtype ttmp;
   long int nsttmp;
   ARKodeHAdaptMem hadapt_mem;
 
diff --git a/src/arkode/arkode_adapt.c b/src/arkode/arkode_adapt.c
index d18cdf5d5a..12f6a4ee8b 100644
--- a/src/arkode/arkode_adapt.c
+++ b/src/arkode/arkode_adapt.c
@@ -94,11 +94,11 @@ void arkPrintAdaptMem(ARKodeHAdaptMem hadapt_mem, FILE *outfile)
   data structure.
   ---------------------------------------------------------------*/
 int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
-             N_Vector ycur, realtype tcur, realtype hcur,
-             realtype dsm, long int nst)
+             N_Vector ycur, sunrealtype tcur, sunrealtype hcur,
+             sunrealtype dsm, long int nst)
 {
   int retval;
-  realtype h_acc, h_cfl, int_dir;
+  sunrealtype h_acc, h_cfl, int_dir;
   ARKodeMem ark_mem;
   int controller_order;
   if (arkode_mem == NULL) {
@@ -134,7 +134,7 @@ int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
                     "Error in explicit stability function.");
     return (ARK_ILL_INPUT);
   }
-  if (h_cfl <= ZERO)  h_cfl = RCONST(1.0e30) * SUNRabs(hcur);
+  if (h_cfl <= ZERO)  h_cfl = SUN_RCONST(1.0e30) * SUNRabs(hcur);
 
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_INFO
   SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_INFO,
diff --git a/src/arkode/arkode_adapt_impl.h b/src/arkode/arkode_adapt_impl.h
index 53303dcb21..45bd882779 100644
--- a/src/arkode/arkode_adapt_impl.h
+++ b/src/arkode/arkode_adapt_impl.h
@@ -36,18 +36,18 @@ extern "C" {
 #define ARK_ADAPT_LIW  7    /* includes function/data pointers */
 
 /* Time step controller default values */
-#define CFLFAC    RCONST(0.5)
-#define SAFETY    RCONST(0.96)  /* CVODE uses 1.0  */
-#define GROWTH    RCONST(20.0)  /* CVODE uses 10.0 */
-#define HFIXED_LB RCONST(1.0)   /* CVODE uses 1.0  */
-#define HFIXED_UB RCONST(1.5)   /* CVODE uses 1.5  */
-
-#define ETAMX1    RCONST(10000.0)  /* maximum step size change on first step */
-#define ETAMXF    RCONST(0.3)      /* step size reduction factor on multiple error
+#define CFLFAC    SUN_RCONST(0.5)
+#define SAFETY    SUN_RCONST(0.96)  /* CVODE uses 1.0  */
+#define GROWTH    SUN_RCONST(20.0)  /* CVODE uses 10.0 */
+#define HFIXED_LB SUN_RCONST(1.0)   /* CVODE uses 1.0  */
+#define HFIXED_UB SUN_RCONST(1.5)   /* CVODE uses 1.5  */
+
+#define ETAMX1    SUN_RCONST(10000.0)  /* maximum step size change on first step */
+#define ETAMXF    SUN_RCONST(0.3)      /* step size reduction factor on multiple error
                                       test failures (multiple implies >= SMALL_NEF) */
-#define ETAMIN    RCONST(0.1)      /* smallest allowable step size reduction factor
+#define ETAMIN    SUN_RCONST(0.1)      /* smallest allowable step size reduction factor
                                       on an error test failure */
-#define ETACF     RCONST(0.25)     /* step size reduction factor on nonlinear
+#define ETACF     SUN_RCONST(0.25)     /* step size reduction factor on nonlinear
                                       convergence failure */
 #define SMALL_NEF 2                /* if an error failure occurs and SMALL_NEF <= nef,
                                       then reset  eta = MIN(eta, ETAMXF) */
@@ -71,24 +71,24 @@ extern "C" {
   ---------------------------------------------------------------*/
 typedef struct ARKodeHAdaptMemRec {
 
-  realtype     etamax;      /* eta <= etamax                              */
-  realtype     etamx1;      /* max step size change on first step         */
-  realtype     etamxf;      /* h reduction factor on multiple error fails */
-  realtype     etamin;      /* eta >= etamin on error test fail           */
+  sunrealtype     etamax;      /* eta <= etamax                              */
+  sunrealtype     etamx1;      /* max step size change on first step         */
+  sunrealtype     etamxf;      /* h reduction factor on multiple error fails */
+  sunrealtype     etamin;      /* eta >= etamin on error test fail           */
   int          small_nef;   /* bound to determine 'multiple' above        */
-  realtype     etacf;       /* h reduction factor on nonlinear conv fail  */
-  realtype     cfl;         /* cfl safety factor                          */
-  realtype     safety;      /* accuracy safety factor on h                */
-  realtype     growth;      /* maximum step growth safety factor          */
-  realtype     lbound;      /* eta lower bound to leave h unchanged       */
-  realtype     ubound;      /* eta upper bound to leave h unchanged       */
+  sunrealtype     etacf;       /* h reduction factor on nonlinear conv fail  */
+  sunrealtype     cfl;         /* cfl safety factor                          */
+  sunrealtype     safety;      /* accuracy safety factor on h                */
+  sunrealtype     growth;      /* maximum step growth safety factor          */
+  sunrealtype     lbound;      /* eta lower bound to leave h unchanged       */
+  sunrealtype     ubound;      /* eta upper bound to leave h unchanged       */
   int          p;           /* embedding order                            */
   int          q;           /* method order                               */
   int          pq;          /* decision flag for controller order         */
   int          adjust;      /* controller order adjustment factor         */
 
   SUNAdaptController hcontroller; /* temporal error controller            */
-  booleantype  owncontroller;  /* flag indicating hcontroller ownership   */
+  sunbooleantype  owncontroller;  /* flag indicating hcontroller ownership   */
 
   ARKExpStabFn expstab;     /* step stability function                    */
   void        *estab_data;  /* user pointer passed to expstab             */
@@ -106,8 +106,8 @@ typedef struct ARKodeHAdaptMemRec {
 ARKodeHAdaptMem arkAdaptInit();
 void arkPrintAdaptMem(ARKodeHAdaptMem hadapt_mem, FILE *outfile);
 int arkAdapt(void* arkode_mem, ARKodeHAdaptMem hadapt_mem,
-             N_Vector ycur, realtype tcur, realtype hcur,
-             realtype dsm, long int nst);
+             N_Vector ycur, sunrealtype tcur, sunrealtype hcur,
+             sunrealtype dsm, long int nst);
 
 
 #ifdef __cplusplus
diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c
index b1ea90d03f..1789061ac9 100644
--- a/src/arkode/arkode_arkstep.c
+++ b/src/arkode/arkode_arkstep.c
@@ -32,13 +32,13 @@
   ARKStep Exported functions -- Required
   ===============================================================*/
 
-void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, realtype t0, N_Vector y0,
+void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, sunrealtype t0, N_Vector y0,
                     SUNContext sunctx)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   SUNNonlinearSolver NLS;
-  booleantype nvectorOK;
+  sunbooleantype nvectorOK;
   int retval;
 
   /* Check that at least one of fe, fi is supplied and is to be used */
@@ -132,7 +132,7 @@ void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, realtype t0, N_Vector y0,
   step_mem->fi = fi;
 
   /* Update the ARKODE workspace requirements */
-  ark_mem->liw += 41;  /* fcn/data ptr, int, long int, sunindextype, booleantype */
+  ark_mem->liw += 41;  /* fcn/data ptr, int, long int, sunindextype, sunbooleantype */
   ark_mem->lrw += 10;
 
   /* If an implicit component is to be solved, create default Newton NLS object */
@@ -212,8 +212,8 @@ void* ARKStepCreate(ARKRhsFn fe, ARKRhsFn fi, realtype t0, N_Vector y0,
   It first resizes the main ARKODE infrastructure memory, and
   then resizes its own data.
   ---------------------------------------------------------------*/
-int ARKStepResize(void *arkode_mem, N_Vector y0, realtype hscale,
-                  realtype t0, ARKVecResizeFn resize, void *resize_data)
+int ARKStepResize(void *arkode_mem, N_Vector y0, sunrealtype hscale,
+                  sunrealtype t0, ARKVecResizeFn resize, void *resize_data)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -337,7 +337,7 @@ int ARKStepResize(void *arkode_mem, N_Vector y0, realtype hscale,
   Note all internal counters are set to 0 on re-initialization.
   ---------------------------------------------------------------*/
 int ARKStepReInit(void* arkode_mem, ARKRhsFn fe,
-                  ARKRhsFn fi, realtype t0, N_Vector y0)
+                  ARKRhsFn fi, sunrealtype t0, N_Vector y0)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -405,7 +405,7 @@ int ARKStepReInit(void* arkode_mem, ARKRhsFn fe,
   problem from the given time with the input state (all counter
   values are retained).
   ---------------------------------------------------------------*/
-int ARKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+int ARKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -436,7 +436,7 @@ int ARKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
   These routines set integration tolerances (wrappers for general
   ARKODE utility routines)
   ---------------------------------------------------------------*/
-int ARKStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
+int ARKStepSStolerances(void *arkode_mem, sunrealtype reltol, sunrealtype abstol)
 {
   /* unpack ark_mem, call arkSStolerances, and return */
   ARKodeMem ark_mem;
@@ -449,7 +449,7 @@ int ARKStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
   return(arkSStolerances(ark_mem, reltol, abstol));
 }
 
-int ARKStepSVtolerances(void *arkode_mem, realtype reltol, N_Vector abstol)
+int ARKStepSVtolerances(void *arkode_mem, sunrealtype reltol, N_Vector abstol)
 {
   /* unpack ark_mem, call arkSVtolerances, and return */
   ARKodeMem ark_mem;
@@ -475,7 +475,7 @@ int ARKStepWFtolerances(void *arkode_mem, ARKEwtFn efun)
   return(arkWFtolerances(ark_mem, efun));
 }
 
-int ARKStepResStolerance(void *arkode_mem, realtype rabstol)
+int ARKStepResStolerance(void *arkode_mem, sunrealtype rabstol)
 {
   /* unpack ark_mem, call arkResStolerance, and return */
   ARKodeMem ark_mem;
@@ -541,8 +541,8 @@ int ARKStepRootInit(void *arkode_mem, int nrtfn, ARKRootFn g)
   This is the main time-integration driver (wrappers for general
   ARKODE utility routine)
   ---------------------------------------------------------------*/
-int ARKStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
-                  realtype *tret, int itask)
+int ARKStepEvolve(void *arkode_mem, sunrealtype tout, N_Vector yout,
+                  sunrealtype *tret, int itask)
 {
   /* unpack ark_mem, call arkEvolve, and return */
   int retval;
@@ -567,7 +567,7 @@ int ARKStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
   derivatives over the most-recently-computed step (wrapper for
   generic ARKODE utility routine)
   ---------------------------------------------------------------*/
-int ARKStepGetDky(void *arkode_mem, realtype t, int k, N_Vector dky)
+int ARKStepGetDky(void *arkode_mem, sunrealtype t, int k, N_Vector dky)
 {
   /* unpack ark_mem, call arkGetDky, and return */
   int retval;
@@ -793,7 +793,7 @@ void ARKStepPrintMem(void* arkode_mem, FILE* outfile)
   fprintf(outfile,"ARKStep: user_implicit = %i\n", step_mem->implicit);
   fprintf(outfile,"ARKStep: jcur = %i\n", step_mem->jcur);
 
-  /* output realtype quantities */
+  /* output sunrealtype quantities */
   if (step_mem->Be != NULL) {
     fprintf(outfile,"ARKStep: explicit Butcher table:\n");
     ARKodeButcherTable_Write(step_mem->Be, outfile);
@@ -897,7 +897,7 @@ int arkStep_AttachMasssol(void* arkode_mem,
                           ARKMassMultFn mmult,
                           ARKMassSolveFn msolve,
                           ARKMassFreeFn mfree,
-                          booleantype time_dep,
+                          sunbooleantype time_dep,
                           SUNLinearSolver_Type msolve_type,
                           void *mass_mem)
 {
@@ -1039,9 +1039,9 @@ ARKRhsFn arkStep_GetImplicitRHS(void* arkode_mem)
   This routine fills the current value of gamma, and states
   whether the gamma ratio fails the dgmax criteria.
   ---------------------------------------------------------------*/
-int arkStep_GetGammas(void* arkode_mem, realtype *gamma,
-                      realtype *gamrat, booleantype **jcur,
-                      booleantype *dgamma_fail)
+int arkStep_GetGammas(void* arkode_mem, sunrealtype *gamma,
+                      sunrealtype *gamrat, sunbooleantype **jcur,
+                      sunbooleantype *dgamma_fail)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -1102,7 +1102,7 @@ int arkStep_Init(void* arkode_mem, int init_type)
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   int j, retval;
-  booleantype reset_efun;
+  sunbooleantype reset_efun;
 
   /* access ARKodeARKStepMem structure */
   retval = arkStep_AccessStepMem(arkode_mem, "arkStep_Init",
@@ -1212,8 +1212,8 @@ int arkStep_Init(void* arkode_mem, int init_type)
     /* Allocate reusable arrays for fused vector operations */
     step_mem->nfusedopvecs = 2 * step_mem->stages + 2 + step_mem->nforcing;
     if (step_mem->cvals == NULL) {
-      step_mem->cvals = (realtype *) calloc(step_mem->nfusedopvecs,
-                                            sizeof(realtype));
+      step_mem->cvals = (sunrealtype *) calloc(step_mem->nfusedopvecs,
+                                            sizeof(sunrealtype));
       if (step_mem->cvals == NULL)  return(ARK_MEM_FAIL);
       ark_mem->lrw += step_mem->nfusedopvecs;
     }
@@ -1232,15 +1232,15 @@ int arkStep_Init(void* arkode_mem, int init_type)
     {
       if (!(step_mem->stage_times))
       {
-        step_mem->stage_times = (realtype*) calloc(step_mem->stages,
-                                                   sizeof(realtype));
+        step_mem->stage_times = (sunrealtype*) calloc(step_mem->stages,
+                                                   sizeof(sunrealtype));
         ark_mem->lrw += step_mem->stages;
       }
 
       if (!(step_mem->stage_coefs))
       {
-        step_mem->stage_coefs = (realtype*) calloc(step_mem->stages,
-                                                   sizeof(realtype));
+        step_mem->stage_coefs = (sunrealtype*) calloc(step_mem->stages,
+                                                   sizeof(sunrealtype));
         ark_mem->lrw += step_mem->stages;
       }
     }
@@ -1372,16 +1372,16 @@ int arkStep_Init(void* arkode_mem, int init_type)
   when estimating the initial time step size, so we strive to store the
   intermediate parts so that they do not interfere with the other two modes.
   ----------------------------------------------------------------------------*/
-int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
+int arkStep_FullRHS(void* arkode_mem, sunrealtype t, N_Vector y, N_Vector f,
                     int mode)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   int nvec, retval;
-  booleantype recomputeRHS;
-  realtype* cvals;
+  sunbooleantype recomputeRHS;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
-  realtype stage_coefs = ONE;
+  sunrealtype stage_coefs = ONE;
 
   /* access ARKodeARKStepMem structure */
   retval = arkStep_AccessStepMem(arkode_mem, "arkStep_FullRHS",
@@ -1734,13 +1734,13 @@ int arkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                  reduce step and retry (if possible)
            <0 => step encountered unrecoverable failure
   ---------------------------------------------------------------*/
-int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
+int arkStep_TakeStep_Z(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr)
 {
   int retval, is, is_start, mode;
-  booleantype implicit_stage;
-  booleantype deduce_stage;
-  booleantype save_stages;
-  booleantype stiffly_accurate;
+  sunbooleantype implicit_stage;
+  sunbooleantype deduce_stage;
+  sunbooleantype save_stages;
+  sunbooleantype stiffly_accurate;
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   N_Vector zcor0;
@@ -2126,7 +2126,7 @@ int arkStep_AccessStepMem(void* arkode_mem, const char *fname,
   This routine checks if all required vector operations are
   present.  If any of them is missing it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype arkStep_CheckNVector(N_Vector tmpl)
+sunbooleantype arkStep_CheckNVector(N_Vector tmpl)
 {
   if ( (tmpl->ops->nvclone     == NULL) ||
        (tmpl->ops->nvdestroy   == NULL) ||
@@ -2306,9 +2306,9 @@ int arkStep_SetButcherTables(ARKodeMem ark_mem)
 int arkStep_CheckButcherTables(ARKodeMem ark_mem)
 {
   int i, j;
-  booleantype okay;
+  sunbooleantype okay;
   ARKodeARKStepMem step_mem;
-  const realtype tol = RCONST(100.0) * UNIT_ROUNDOFF;
+  const sunrealtype tol = SUN_RCONST(100.0) * SUN_UNIT_ROUNDOFF;
 
   /* access ARKodeARKStepMem structure */
   if (ark_mem->step_mem==NULL) {
@@ -2477,10 +2477,10 @@ int arkStep_CheckButcherTables(ARKodeMem ark_mem)
 int arkStep_Predict(ARKodeMem ark_mem, int istage, N_Vector yguess)
 {
   int i, retval, jstage, nvec;
-  realtype tau;
-  realtype h;
+  sunrealtype tau;
+  sunrealtype h;
   ARKodeARKStepMem step_mem;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
   /* access ARKodeARKStepMem structure */
@@ -2692,14 +2692,14 @@ int arkStep_Predict(ARKodeMem ark_mem, int istage, N_Vector yguess)
     sdata = yn - zp + h*sum_{j=0}^{i-1} (Ae(i,j)*Fe(j) + Ai(i,j)*Fi(j))
 
   ---------------------------------------------------------------*/
-int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
+int arkStep_StageSetup(ARKodeMem ark_mem, sunbooleantype implicit)
 {
   /* local data */
   ARKodeARKStepMem step_mem;
   int retval, i, j, jmax, nvec;
   sunrealtype*  cj;
   sunrealtype** Aij;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
   /* access ARKodeARKStepMem structure */
@@ -2808,7 +2808,7 @@ int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit)
   This version assumes either an identity or time-dependent mass
   matrix (identical steps).
   ---------------------------------------------------------------*/
-int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
+int arkStep_ComputeSolutions(ARKodeMem ark_mem, sunrealtype *dsmPtr)
 {
   /* local data */
   int retval, j, nvec;
@@ -2816,8 +2816,8 @@ int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
   sunrealtype* cj;
   sunrealtype* bj;
   sunrealtype* dj;
-  booleantype stiffly_accurate;
-  realtype* cvals;
+  sunbooleantype stiffly_accurate;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
   ARKodeARKStepMem step_mem;
 
@@ -2979,13 +2979,13 @@ int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
 
   This version assumes a fixed mass matrix.
   ---------------------------------------------------------------*/
-int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsmPtr)
+int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, sunrealtype *dsmPtr)
 {
   /* local data */
   int retval, j, nvec;
   N_Vector y, yerr;
-  booleantype stiffly_accurate;
-  realtype* cvals;
+  sunbooleantype stiffly_accurate;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
   ARKodeARKStepMem step_mem;
 
@@ -3054,7 +3054,7 @@ int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsmPtr)
     /* solve for y update (stored in y) */
     retval = step_mem->msolve((void *) ark_mem, y, step_mem->nlscoef);
     if (retval < 0) {
-      *dsmPtr = RCONST(2.0);   /* indicate too much error, step with smaller step */
+      *dsmPtr = SUN_RCONST(2.0);   /* indicate too much error, step with smaller step */
       N_VScale(ONE, ark_mem->yn, y);      /* place old solution into y */
       return(CONV_FAIL);
     }
@@ -3089,7 +3089,7 @@ int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsmPtr)
     /* solve for yerr */
     retval = step_mem->msolve((void *) ark_mem, yerr, step_mem->nlscoef);
     if (retval < 0) {
-      *dsmPtr = RCONST(2.0);  /* next attempt will reduce step by 'etacf';
+      *dsmPtr = SUN_RCONST(2.0);  /* next attempt will reduce step by 'etacf';
                                  insert dsmPtr placeholder here */
       return(CONV_FAIL);
     }
@@ -3158,12 +3158,12 @@ int ARKStepCreateMRIStepInnerStepper(void *inner_arkode_mem,
   ODE IVP.
   ----------------------------------------------------------------------------*/
 
-int arkStep_MRIStepInnerEvolve(MRIStepInnerStepper stepper, realtype t0,
-                               realtype tout, N_Vector y)
+int arkStep_MRIStepInnerEvolve(MRIStepInnerStepper stepper, sunrealtype t0,
+                               sunrealtype tout, N_Vector y)
 {
   void*    arkode_mem;     /* arkode memory             */
-  realtype tret;           /* return time               */
-  realtype tshift, tscale; /* time normalization values */
+  sunrealtype tret;           /* return time               */
+  sunrealtype tshift, tscale; /* time normalization values */
   N_Vector *forcing;       /* forcing vectors           */
   int      nforcing;       /* number of forcing vectors */
   int      retval;         /* return value              */
@@ -3206,7 +3206,7 @@ int arkStep_MRIStepInnerEvolve(MRIStepInnerStepper stepper, realtype t0,
   (fast) ODE IVP RHS.
   ----------------------------------------------------------------------------*/
 
-int arkStep_MRIStepInnerFullRhs(MRIStepInnerStepper stepper, realtype t,
+int arkStep_MRIStepInnerFullRhs(MRIStepInnerStepper stepper, sunrealtype t,
                                 N_Vector y, N_Vector f, int mode)
 {
   void* arkode_mem;
@@ -3227,7 +3227,7 @@ int arkStep_MRIStepInnerFullRhs(MRIStepInnerStepper stepper, realtype t,
   state.
   ----------------------------------------------------------------------------*/
 
-int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, realtype tR,
+int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, sunrealtype tR,
                               N_Vector yR)
 {
   void* arkode_mem;
@@ -3262,17 +3262,17 @@ int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, realtype tR,
   combination.
   ----------------------------------------------------------------------------*/
 
-void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype* stage_times,
-                          realtype* stage_coefs, int jmax, int* nvec)
+void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, sunrealtype* stage_times,
+                          sunrealtype* stage_coefs, int jmax, int* nvec)
 {
-  realtype tau, taui;
+  sunrealtype tau, taui;
   int j, k;
 
   /* Shortcuts to step_mem data */
-  realtype* vals     = step_mem->cvals;
+  sunrealtype* vals     = step_mem->cvals;
   N_Vector* vecs     = step_mem->Xvecs;
-  realtype  tshift   = step_mem->tshift;
-  realtype  tscale   = step_mem->tscale;
+  sunrealtype  tshift   = step_mem->tshift;
+  sunrealtype  tscale   = step_mem->tscale;
   int       nforcing = step_mem->nforcing;
   N_Vector* forcing  = step_mem->forcing;
 
@@ -3317,7 +3317,7 @@ void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype* stage_times,
   methods).
   ----------------------------------------------------------------------------*/
 
-int arkStep_SetInnerForcing(void* arkode_mem, realtype tshift, realtype tscale,
+int arkStep_SetInnerForcing(void* arkode_mem, sunrealtype tshift, sunrealtype tscale,
                             N_Vector* forcing, int nvecs)
 {
   ARKodeMem ark_mem;
@@ -3368,8 +3368,8 @@ int arkStep_SetInnerForcing(void* arkode_mem, realtype tshift, realtype tscale,
         step_mem->nfusedopvecs = 2 * step_mem->stages + 2 + nvecs;
 
         step_mem->cvals = NULL;
-        step_mem->cvals = (realtype *) calloc(step_mem->nfusedopvecs,
-                                              sizeof(realtype));
+        step_mem->cvals = (sunrealtype *) calloc(step_mem->nfusedopvecs,
+                                              sizeof(sunrealtype));
         if (step_mem->cvals == NULL) return(ARK_MEM_FAIL);
         ark_mem->lrw += step_mem->nfusedopvecs;
 
diff --git a/src/arkode/arkode_arkstep_impl.h b/src/arkode/arkode_arkstep_impl.h
index 9121140da1..783b2a82a9 100644
--- a/src/arkode/arkode_arkstep_impl.h
+++ b/src/arkode/arkode_arkstep_impl.h
@@ -34,16 +34,16 @@ extern "C" {
   ===============================================================*/
 
 #define MAXCOR    3              /* max number of nonlinear iterations */
-#define CRDOWN    RCONST(0.3)    /* constant to estimate the convergence
+#define CRDOWN    SUN_RCONST(0.3)    /* constant to estimate the convergence
                                     rate for the nonlinear equation */
-#define DGMAX     RCONST(0.2)    /* if |gamma/gammap-1| > DGMAX then call lsetup */
-#define RDIV      RCONST(2.3)    /* declare divergence if ratio del/delp > RDIV */
+#define DGMAX     SUN_RCONST(0.2)    /* if |gamma/gammap-1| > DGMAX then call lsetup */
+#define RDIV      SUN_RCONST(2.3)    /* declare divergence if ratio del/delp > RDIV */
 #define MSBP      20             /* max no. of steps between lsetup calls */
 
 /* Default solver tolerance factor */
-/* #define NLSCOEF   RCONST(0.003) */  /* Hairer & Wanner constant */
-/* #define NLSCOEF   RCONST(0.2)   */  /* CVODE constant */
-#define NLSCOEF   RCONST(0.1)
+/* #define NLSCOEF   SUN_RCONST(0.003) */  /* Hairer & Wanner constant */
+/* #define NLSCOEF   SUN_RCONST(0.2)   */  /* CVODE constant */
+#define NLSCOEF   SUN_RCONST(0.1)
 
 /* Mass matrix types */
 #define MASS_IDENTITY 0
@@ -67,11 +67,11 @@ typedef struct ARKodeARKStepMemRec {
   /* ARK problem specification */
   ARKRhsFn     fe;              /* My' = fe(t,y) + fi(t,y)        */
   ARKRhsFn     fi;
-  booleantype  linear;          /* SUNTRUE if fi is linear        */
-  booleantype  linear_timedep;  /* SUNTRUE if dfi/dy depends on t */
-  booleantype  explicit;        /* SUNTRUE if fe is enabled       */
-  booleantype  implicit;        /* SUNTRUE if fi is enabled       */
-  booleantype  deduce_rhs;      /* SUNTRUE if fi is deduced after
+  sunbooleantype  linear;          /* SUNTRUE if fi is linear        */
+  sunbooleantype  linear_timedep;  /* SUNTRUE if dfi/dy depends on t */
+  sunbooleantype  explicit;        /* SUNTRUE if fe is enabled       */
+  sunbooleantype  implicit;        /* SUNTRUE if fi is enabled       */
+  sunbooleantype  deduce_rhs;      /* SUNTRUE if fi is deduced after
                                    a nonlinear solve              */
 
   /* ARK method storage and parameters */
@@ -93,21 +93,21 @@ typedef struct ARKodeARKStepMemRec {
 
   /* (Non)Linear solver parameters & data */
   SUNNonlinearSolver NLS;   /* generic SUNNonlinearSolver object     */
-  booleantype     ownNLS;   /* flag indicating ownership of NLS      */
+  sunbooleantype     ownNLS;   /* flag indicating ownership of NLS      */
   ARKRhsFn nls_fi;          /* fi(t,y) used in the nonlinear solver  */
-  realtype gamma;        /* gamma = h * A(i,i)                       */
-  realtype gammap;       /* gamma at the last setup call             */
-  realtype gamrat;       /* gamma / gammap                           */
-  realtype dgmax;        /* call lsetup if |gamma/gammap-1| >= dgmax */
+  sunrealtype gamma;        /* gamma = h * A(i,i)                       */
+  sunrealtype gammap;       /* gamma at the last setup call             */
+  sunrealtype gamrat;       /* gamma / gammap                           */
+  sunrealtype dgmax;        /* call lsetup if |gamma/gammap-1| >= dgmax */
 
   int      predictor;    /* implicit prediction method to use        */
-  realtype crdown;       /* nonlinear conv rate estimation constant  */
-  realtype rdiv;         /* nonlin divergence if del/delp > rdiv     */
-  realtype crate;        /* estimated nonlin convergence rate        */
-  realtype delp;         /* norm of previous nonlinear solver update */
-  realtype eRNrm;        /* estimated residual norm, used in nonlin
+  sunrealtype crdown;       /* nonlinear conv rate estimation constant  */
+  sunrealtype rdiv;         /* nonlin divergence if del/delp > rdiv     */
+  sunrealtype crate;        /* estimated nonlin convergence rate        */
+  sunrealtype delp;         /* norm of previous nonlinear solver update */
+  sunrealtype eRNrm;        /* estimated residual norm, used in nonlin
                             and linear solver convergence tests      */
-  realtype nlscoef;      /* coefficient in nonlin. convergence test  */
+  sunrealtype nlscoef;      /* coefficient in nonlin. convergence test  */
 
   int      msbp;         /* positive => max # steps between lsetup
                             negative => call at each Newton iter     */
@@ -117,7 +117,7 @@ typedef struct ARKodeARKStepMemRec {
                             nonlinear equation                       */
 
   int      convfail;     /* NLS fail flag (for interface routines)   */
-  booleantype jcur;      /* is Jacobian info for lin solver current? */
+  sunbooleantype jcur;      /* is Jacobian info for lin solver current? */
 
   /* Linear Solver Data */
   ARKLinsolInitFn      linit;
@@ -145,19 +145,19 @@ typedef struct ARKodeARKStepMemRec {
   long int nls_fails; /* num nonlinear solver fails */
 
   /* Reusable arrays for fused vector operations */
-  realtype *cvals;         /* scalar array for fused ops       */
+  sunrealtype *cvals;         /* scalar array for fused ops       */
   N_Vector *Xvecs;         /* array of vectors for fused ops   */
   int       nfusedopvecs;  /* length of cvals and Xvecs arrays */
 
   /* Data for using ARKStep with external polynomial forcing */
-  booleantype expforcing;  /* add forcing to explicit RHS */
-  booleantype impforcing;  /* add forcing to implicit RHS */
-  realtype    tshift;      /* time normalization shift    */
-  realtype    tscale;      /* time normalization scaling  */
+  sunbooleantype expforcing;  /* add forcing to explicit RHS */
+  sunbooleantype impforcing;  /* add forcing to implicit RHS */
+  sunrealtype    tshift;      /* time normalization shift    */
+  sunrealtype    tscale;      /* time normalization scaling  */
   N_Vector*   forcing;     /* array of forcing vectors    */
   int         nforcing;    /* number of forcing vectors   */
-  realtype*   stage_times;  /* workspace for applying forcing */
-  realtype*   stage_coefs;  /* workspace for applying forcing */
+  sunrealtype*   stage_times;  /* workspace for applying forcing */
+  sunrealtype*   stage_coefs;  /* workspace for applying forcing */
 
 } *ARKodeARKStepMem;
 
@@ -179,7 +179,7 @@ int arkStep_AttachMasssol(void* arkode_mem,
                           ARKMassMultFn mmult,
                           ARKMassSolveFn msolve,
                           ARKMassFreeFn lfree,
-                          booleantype time_dep,
+                          sunbooleantype time_dep,
                           SUNLinearSolver_Type msolve_type,
                           void *mass_mem);
 void arkStep_DisableLSetup(void* arkode_mem);
@@ -188,27 +188,27 @@ int arkStep_Init(void* arkode_mem, int init_type);
 void* arkStep_GetLmem(void* arkode_mem);
 void* arkStep_GetMassMem(void* arkode_mem);
 ARKRhsFn arkStep_GetImplicitRHS(void* arkode_mem);
-int arkStep_GetGammas(void* arkode_mem, realtype *gamma,
-                      realtype *gamrat, booleantype **jcur,
-                      booleantype *dgamma_fail);
-int arkStep_FullRHS(void* arkode_mem, realtype t,
+int arkStep_GetGammas(void* arkode_mem, sunrealtype *gamma,
+                      sunrealtype *gamrat, sunbooleantype **jcur,
+                      sunbooleantype *dgamma_fail);
+int arkStep_FullRHS(void* arkode_mem, sunrealtype t,
                     N_Vector y, N_Vector f, int mode);
-int arkStep_TakeStep_Z(void* arkode_mem, realtype *dsmPtr, int *nflagPtr);
+int arkStep_TakeStep_Z(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr);
 
 /* Internal utility routines */
 int arkStep_AccessStepMem(void* arkode_mem, const char *fname,
                           ARKodeMem *ark_mem, ARKodeARKStepMem *step_mem);
-booleantype arkStep_CheckNVector(N_Vector tmpl);
+sunbooleantype arkStep_CheckNVector(N_Vector tmpl);
 int arkStep_SetButcherTables(ARKodeMem ark_mem);
 int arkStep_CheckButcherTables(ARKodeMem ark_mem);
 int arkStep_Predict(ARKodeMem ark_mem, int istage, N_Vector yguess);
-int arkStep_StageSetup(ARKodeMem ark_mem, booleantype implicit);
+int arkStep_StageSetup(ARKodeMem ark_mem, sunbooleantype implicit);
 int arkStep_NlsInit(ARKodeMem ark_mem);
 int arkStep_Nls(ARKodeMem ark_mem, int nflag);
-int arkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsm);
-int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, realtype *dsm);
-void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, realtype* stage_times,
-                          realtype* stage_coefs, int jmax, int *nvec);
+int arkStep_ComputeSolutions(ARKodeMem ark_mem, sunrealtype *dsm);
+int arkStep_ComputeSolutions_MassFixed(ARKodeMem ark_mem, sunrealtype *dsm);
+void arkStep_ApplyForcing(ARKodeARKStepMem step_mem, sunrealtype* stage_times,
+                          sunrealtype* stage_coefs, int jmax, int *nvec);
 
 /* private functions passed to nonlinear solver */
 int arkStep_NlsResidual_MassIdent(N_Vector zcor, N_Vector r, void* arkode_mem);
@@ -217,19 +217,19 @@ int arkStep_NlsResidual_MassTDep(N_Vector zcor, N_Vector r, void* arkode_mem);
 int arkStep_NlsFPFunction_MassIdent(N_Vector zcor, N_Vector g, void* arkode_mem);
 int arkStep_NlsFPFunction_MassFixed(N_Vector zcor, N_Vector g, void* arkode_mem);
 int arkStep_NlsFPFunction_MassTDep(N_Vector zcor, N_Vector g, void* arkode_mem);
-int arkStep_NlsLSetup(booleantype jbad, booleantype* jcur, void* arkode_mem);
+int arkStep_NlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* arkode_mem);
 int arkStep_NlsLSolve(N_Vector delta, void* arkode_mem);
 int arkStep_NlsConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                        realtype tol, N_Vector ewt, void* arkode_mem);
+                        sunrealtype tol, N_Vector ewt, void* arkode_mem);
 
 /* private functions for interfacing with MRIStep */
-int arkStep_SetInnerForcing(void* arkode_mem, realtype tshift, realtype tscale,
+int arkStep_SetInnerForcing(void* arkode_mem, sunrealtype tshift, sunrealtype tscale,
                             N_Vector *f, int nvecs);
 int arkStep_MRIStepInnerEvolve(MRIStepInnerStepper stepper,
-                               realtype t0, realtype tout, N_Vector y);
-int arkStep_MRIStepInnerFullRhs(MRIStepInnerStepper stepper, realtype t,
+                               sunrealtype t0, sunrealtype tout, N_Vector y);
+int arkStep_MRIStepInnerFullRhs(MRIStepInnerStepper stepper, sunrealtype t,
                                 N_Vector y, N_Vector f, int mode);
-int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, realtype tR,
+int arkStep_MRIStepInnerReset(MRIStepInnerStepper stepper, sunrealtype tR,
                               N_Vector yR);
 
 /* private functions for relaxation */
diff --git a/src/arkode/arkode_arkstep_io.c b/src/arkode/arkode_arkstep_io.c
index 1452669fbb..e7161adc08 100644
--- a/src/arkode/arkode_arkstep_io.c
+++ b/src/arkode/arkode_arkstep_io.c
@@ -48,16 +48,16 @@ int ARKStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int ARKStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
   return(arkSetMaxHnilWarns(arkode_mem, mxhnil)); }
-int ARKStepSetInitStep(void *arkode_mem, realtype hin) {
+int ARKStepSetInitStep(void *arkode_mem, sunrealtype hin) {
   return(arkSetInitStep(arkode_mem, hin)); }
-int ARKStepSetMinStep(void *arkode_mem, realtype hmin) {
+int ARKStepSetMinStep(void *arkode_mem, sunrealtype hmin) {
   return(arkSetMinStep(arkode_mem, hmin)); }
-int ARKStepSetMaxStep(void *arkode_mem, realtype hmax) {
+int ARKStepSetMaxStep(void *arkode_mem, sunrealtype hmax) {
   return(arkSetMaxStep(arkode_mem, hmax)); }
-int ARKStepSetStopTime(void *arkode_mem, realtype tstop) {
+int ARKStepSetStopTime(void *arkode_mem, sunrealtype tstop) {
   return(arkSetStopTime(arkode_mem, tstop)); }
 int ARKStepSetInterpolateStopTime(void *arkode_mem,
-                                  booleantype interp) {
+                                  sunbooleantype interp) {
   return(arkSetInterpolateStopTime(arkode_mem, interp)); }
 int ARKStepClearStopTime(void *arkode_mem) {
   return(arkClearStopTime(arkode_mem)); }
@@ -77,23 +77,23 @@ int ARKStepSetPostprocessStageFn(void *arkode_mem,
   return(arkSetPostprocessStageFn(arkode_mem, ProcessStage)); }
 int ARKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust) {
   return(arkSetAdaptivityAdjustment(arkode_mem, adjust)); }
-int ARKStepSetCFLFraction(void *arkode_mem, realtype cfl_frac) {
+int ARKStepSetCFLFraction(void *arkode_mem, sunrealtype cfl_frac) {
   return(arkSetCFLFraction(arkode_mem, cfl_frac)); }
-int ARKStepSetSafetyFactor(void *arkode_mem, realtype safety) {
+int ARKStepSetSafetyFactor(void *arkode_mem, sunrealtype safety) {
   return(arkSetSafetyFactor(arkode_mem, safety)); }
-int ARKStepSetMaxGrowth(void *arkode_mem, realtype mx_growth) {
+int ARKStepSetMaxGrowth(void *arkode_mem, sunrealtype mx_growth) {
   return(arkSetMaxGrowth(arkode_mem, mx_growth)); }
-int ARKStepSetMinReduction(void *arkode_mem, realtype eta_min) {
+int ARKStepSetMinReduction(void *arkode_mem, sunrealtype eta_min) {
   return(arkSetMinReduction(arkode_mem, eta_min)); }
-int ARKStepSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub) {
+int ARKStepSetFixedStepBounds(void *arkode_mem, sunrealtype lb, sunrealtype ub) {
   return(arkSetFixedStepBounds(arkode_mem, lb, ub)); }
-int ARKStepSetMaxFirstGrowth(void *arkode_mem, realtype etamx1) {
+int ARKStepSetMaxFirstGrowth(void *arkode_mem, sunrealtype etamx1) {
   return(arkSetMaxFirstGrowth(arkode_mem, etamx1)); }
-int ARKStepSetMaxEFailGrowth(void *arkode_mem, realtype etamxf) {
+int ARKStepSetMaxEFailGrowth(void *arkode_mem, sunrealtype etamxf) {
   return(arkSetMaxEFailGrowth(arkode_mem, etamxf)); }
 int ARKStepSetSmallNumEFails(void *arkode_mem, int small_nef) {
   return(arkSetSmallNumEFails(arkode_mem, small_nef)); }
-int ARKStepSetMaxCFailGrowth(void *arkode_mem, realtype etacf) {
+int ARKStepSetMaxCFailGrowth(void *arkode_mem, sunrealtype etacf) {
   return(arkSetMaxCFailGrowth(arkode_mem, etacf)); }
 int ARKStepSetStabilityFn(void *arkode_mem, ARKExpStabFn EStab, void *estab_data) {
   return(arkSetStabilityFn(arkode_mem, EStab, estab_data)); }
@@ -103,7 +103,7 @@ int ARKStepSetMaxConvFails(void *arkode_mem, int maxncf) {
   return(arkSetMaxConvFails(arkode_mem, maxncf)); }
 int ARKStepSetAdaptController(void *arkode_mem, SUNAdaptController C) {
   return(arkSetAdaptController(arkode_mem, C)); }
-int ARKStepSetFixedStep(void *arkode_mem, realtype hfixed) {
+int ARKStepSetFixedStep(void *arkode_mem, sunrealtype hfixed) {
   return(arkSetFixedStep(arkode_mem, hfixed)); }
 
 
@@ -115,7 +115,7 @@ int ARKStepSetLinearSolver(void *arkode_mem, SUNLinearSolver LS,
                            SUNMatrix A) {
   return(arkLSSetLinearSolver(arkode_mem, LS, A)); }
 int ARKStepSetMassLinearSolver(void *arkode_mem, SUNLinearSolver LS,
-                               SUNMatrix M, booleantype time_dep) {
+                               SUNMatrix M, sunbooleantype time_dep) {
   return(arkLSSetMassLinearSolver(arkode_mem, LS, M, time_dep)); }
 int ARKStepSetJacFn(void *arkode_mem, ARKLsJacFn jac) {
   return(arkLSSetJacFn(arkode_mem, jac)); }
@@ -123,15 +123,15 @@ int ARKStepSetMassFn(void *arkode_mem, ARKLsMassFn mass) {
   return(arkLSSetMassFn(arkode_mem, mass)); }
 int ARKStepSetJacEvalFrequency(void *arkode_mem, long int msbj) {
   return(arkLSSetJacEvalFrequency(arkode_mem, msbj)); }
-int ARKStepSetLinearSolutionScaling(void *arkode_mem, booleantype onoff) {
+int ARKStepSetLinearSolutionScaling(void *arkode_mem, sunbooleantype onoff) {
   return(arkLSSetLinearSolutionScaling(arkode_mem, onoff)); }
-int ARKStepSetEpsLin(void *arkode_mem, realtype eplifac) {
+int ARKStepSetEpsLin(void *arkode_mem, sunrealtype eplifac) {
   return(arkLSSetEpsLin(arkode_mem, eplifac)); }
-int ARKStepSetMassEpsLin(void *arkode_mem, realtype eplifac) {
+int ARKStepSetMassEpsLin(void *arkode_mem, sunrealtype eplifac) {
   return(arkLSSetMassEpsLin(arkode_mem, eplifac)); }
-int ARKStepSetLSNormFactor(void *arkode_mem, realtype nrmfac) {
+int ARKStepSetLSNormFactor(void *arkode_mem, sunrealtype nrmfac) {
   return(arkLSSetNormFactor(arkode_mem, nrmfac)); }
-int ARKStepSetMassLSNormFactor(void *arkode_mem, realtype nrmfac) {
+int ARKStepSetMassLSNormFactor(void *arkode_mem, sunrealtype nrmfac) {
   return(arkLSSetMassNormFactor(arkode_mem, nrmfac)); }
 int ARKStepSetPreconditioner(void *arkode_mem, ARKLsPrecSetupFn psetup,
                              ARKLsPrecSolveFn psolve) {
@@ -158,17 +158,17 @@ int ARKStepGetNumStepAttempts(void *arkode_mem, long int *nstep_attempts) {
   return(arkGetNumStepAttempts(arkode_mem, nstep_attempts)); }
 int ARKStepGetNumSteps(void *arkode_mem, long int *nsteps) {
   return(arkGetNumSteps(arkode_mem, nsteps)); }
-int ARKStepGetActualInitStep(void *arkode_mem, realtype *hinused) {
+int ARKStepGetActualInitStep(void *arkode_mem, sunrealtype *hinused) {
   return(arkGetActualInitStep(arkode_mem, hinused)); }
-int ARKStepGetLastStep(void *arkode_mem, realtype *hlast) {
+int ARKStepGetLastStep(void *arkode_mem, sunrealtype *hlast) {
   return(arkGetLastStep(arkode_mem, hlast)); }
-int ARKStepGetCurrentStep(void *arkode_mem, realtype *hcur) {
+int ARKStepGetCurrentStep(void *arkode_mem, sunrealtype *hcur) {
   return(arkGetCurrentStep(arkode_mem, hcur)); }
-int ARKStepGetCurrentTime(void *arkode_mem, realtype *tcur) {
+int ARKStepGetCurrentTime(void *arkode_mem, sunrealtype *tcur) {
   return(arkGetCurrentTime(arkode_mem, tcur)); }
 int ARKStepGetCurrentState(void *arkode_mem, N_Vector *state) {
   return(arkGetCurrentState(arkode_mem, state)); }
-int ARKStepGetTolScaleFactor(void *arkode_mem, realtype *tolsfact) {
+int ARKStepGetTolScaleFactor(void *arkode_mem, sunrealtype *tolsfact) {
   return(arkGetTolScaleFactor(arkode_mem, tolsfact)); }
 int ARKStepGetErrWeights(void *arkode_mem, N_Vector eweight) {
   return(arkGetErrWeights(arkode_mem, eweight)); }
@@ -181,8 +181,8 @@ int ARKStepGetNumGEvals(void *arkode_mem, long int *ngevals) {
 int ARKStepGetRootInfo(void *arkode_mem, int *rootsfound) {
   return(arkGetRootInfo(arkode_mem, rootsfound)); }
 int ARKStepGetStepStats(void *arkode_mem, long int *nsteps,
-                        realtype *hinused, realtype *hlast,
-                        realtype *hcur, realtype *tcur) {
+                        sunrealtype *hinused, sunrealtype *hlast,
+                        sunrealtype *hcur, sunrealtype *tcur) {
   return(arkGetStepStats(arkode_mem, nsteps, hinused, hlast, hcur, tcur)); }
 int ARKStepGetNumConstrFails(void *arkode_mem, long int *nconstrfails) {
   return(arkGetNumConstrFails(arkode_mem, nconstrfails)); }
@@ -349,7 +349,7 @@ int ARKStepGetNumRelaxSolveIters(void* arkode_mem, long int* iters)
   specific SUNAdaptController object.
   ---------------------------------------------------------------*/
 int ARKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                               int pq, realtype adapt_params[3]) {
+                               int pq, sunrealtype adapt_params[3]) {
   return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
 
 /*---------------------------------------------------------------
@@ -363,7 +363,7 @@ int ARKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
   ARKStepSetErrorBias: user should set this value directly in the
   SUNAdaptController object.
   ---------------------------------------------------------------*/
-int ARKStepSetErrorBias(void *arkode_mem, realtype bias) {
+int ARKStepSetErrorBias(void *arkode_mem, sunrealtype bias) {
   return(arkSetErrorBias(arkode_mem, bias)); }
 
 
@@ -524,12 +524,12 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                       "SUNAdaptController_PI allocation failure");
       return(ARK_MEM_FAIL);
     }
-    (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
-    (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
-                                           -RCONST(0.31));
-    hadapt_mem->safety = RCONST(0.99);
-    hadapt_mem->growth = RCONST(25.0);
-    hadapt_mem->etamxf = RCONST(0.3);
+    (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.2));
+    (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, SUN_RCONST(0.8),
+                                           -SUN_RCONST(0.31));
+    hadapt_mem->safety = SUN_RCONST(0.99);
+    hadapt_mem->growth = SUN_RCONST(25.0);
+    hadapt_mem->etamxf = SUN_RCONST(0.3);
     hadapt_mem->pq     = PQ;
 
   /*    implicit */
@@ -549,7 +549,7 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.001);
+      step_mem->nlscoef     = SUN_RCONST(0.001);
       step_mem->maxcor      = 5;
       step_mem->crdown      = CRDOWN;
       step_mem->rdiv        = RDIV;
@@ -564,17 +564,17 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_I allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.9));
-      hadapt_mem->safety    = RCONST(0.957);
-      hadapt_mem->growth    = RCONST(17.6);
-      hadapt_mem->etamxf    = RCONST(0.45);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.9));
+      hadapt_mem->safety    = SUN_RCONST(0.957);
+      hadapt_mem->growth    = SUN_RCONST(17.6);
+      hadapt_mem->etamxf    = SUN_RCONST(0.45);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.22);
-      step_mem->crdown      = RCONST(0.17);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.19);
+      step_mem->nlscoef     = SUN_RCONST(0.22);
+      step_mem->crdown      = SUN_RCONST(0.17);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.19);
       step_mem->msbp        = 60;
       break;
     case 4:
@@ -585,19 +585,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_PID allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.2));
-      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.535),
-                                              -RCONST(0.209), RCONST(0.148));
-      hadapt_mem->safety    = RCONST(0.988);
-      hadapt_mem->growth    = RCONST(31.5);
-      hadapt_mem->etamxf    = RCONST(0.33);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.2));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.535),
+                                              -SUN_RCONST(0.209), SUN_RCONST(0.148));
+      hadapt_mem->safety    = SUN_RCONST(0.988);
+      hadapt_mem->growth    = SUN_RCONST(31.5);
+      hadapt_mem->etamxf    = SUN_RCONST(0.33);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.24);
-      step_mem->crdown      = RCONST(0.26);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.16);
+      step_mem->nlscoef     = SUN_RCONST(0.24);
+      step_mem->crdown      = SUN_RCONST(0.26);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.16);
       step_mem->msbp        = 31;
       break;
     case 5:
@@ -608,19 +608,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_PID allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(3.3));
-      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.56),
-                                              -RCONST(0.338), RCONST(0.14));
-      hadapt_mem->safety    = RCONST(0.937);
-      hadapt_mem->growth    = RCONST(22.0);
-      hadapt_mem->etamxf    = RCONST(0.44);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(3.3));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.56),
+                                              -SUN_RCONST(0.338), SUN_RCONST(0.14));
+      hadapt_mem->safety    = SUN_RCONST(0.937);
+      hadapt_mem->growth    = SUN_RCONST(22.0);
+      hadapt_mem->etamxf    = SUN_RCONST(0.44);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.25);
-      step_mem->crdown      = RCONST(0.4);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.32);
+      step_mem->nlscoef     = SUN_RCONST(0.25);
+      step_mem->crdown      = SUN_RCONST(0.4);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.32);
       step_mem->msbp        = 31;
       break;
     }
@@ -642,7 +642,7 @@ int ARKStepSetOptimalParams(void *arkode_mem)
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.001);
+      step_mem->nlscoef     = SUN_RCONST(0.001);
       step_mem->maxcor      = 5;
       step_mem->crdown      = CRDOWN;
       step_mem->rdiv        = RDIV;
@@ -657,19 +657,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_PID allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.42));
-      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.54),
-                                              -RCONST(0.36), RCONST(0.14));
-      hadapt_mem->safety    = RCONST(0.965);
-      hadapt_mem->growth    = RCONST(28.7);
-      hadapt_mem->etamxf    = RCONST(0.46);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.42));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.54),
+                                              -SUN_RCONST(0.36), SUN_RCONST(0.14));
+      hadapt_mem->safety    = SUN_RCONST(0.965);
+      hadapt_mem->growth    = SUN_RCONST(28.7);
+      hadapt_mem->etamxf    = SUN_RCONST(0.46);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.22);
-      step_mem->crdown      = RCONST(0.17);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.19);
+      step_mem->nlscoef     = SUN_RCONST(0.22);
+      step_mem->crdown      = SUN_RCONST(0.17);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.19);
       step_mem->msbp        = 60;
       break;
     case 4:
@@ -680,19 +680,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_PID allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.35));
-      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, RCONST(0.543),
-                                              -RCONST(0.297), RCONST(0.14));
-      hadapt_mem->safety    = RCONST(0.97);
-      hadapt_mem->growth    = RCONST(25.0);
-      hadapt_mem->etamxf    = RCONST(0.47);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.35));
+      (void) SUNAdaptController_SetParams_PID(hadapt_mem->hcontroller, SUN_RCONST(0.543),
+                                              -SUN_RCONST(0.297), SUN_RCONST(0.14));
+      hadapt_mem->safety    = SUN_RCONST(0.97);
+      hadapt_mem->growth    = SUN_RCONST(25.0);
+      hadapt_mem->etamxf    = SUN_RCONST(0.47);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.24);
-      step_mem->crdown      = RCONST(0.26);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.16);
+      step_mem->nlscoef     = SUN_RCONST(0.24);
+      step_mem->crdown      = SUN_RCONST(0.26);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.16);
       step_mem->msbp        = 31;
       break;
     case 5:
@@ -703,19 +703,19 @@ int ARKStepSetOptimalParams(void *arkode_mem)
                         "SUNAdaptController_PI allocation failure");
         return(ARK_MEM_FAIL);
       }
-      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, RCONST(1.15));
-      (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, RCONST(0.8),
-                                             -RCONST(0.35));
-      hadapt_mem->safety    = RCONST(0.993);
-      hadapt_mem->growth    = RCONST(28.5);
-      hadapt_mem->etamxf    = RCONST(0.3);
+      (void) SUNAdaptController_SetErrorBias(hadapt_mem->hcontroller, SUN_RCONST(1.15));
+      (void) SUNAdaptController_SetParams_PI(hadapt_mem->hcontroller, SUN_RCONST(0.8),
+                                             -SUN_RCONST(0.35));
+      hadapt_mem->safety    = SUN_RCONST(0.993);
+      hadapt_mem->growth    = SUN_RCONST(28.5);
+      hadapt_mem->etamxf    = SUN_RCONST(0.3);
       hadapt_mem->small_nef = SMALL_NEF;
       hadapt_mem->etacf     = ETACF;
       hadapt_mem->pq        = PQ;
-      step_mem->nlscoef     = RCONST(0.25);
-      step_mem->crdown      = RCONST(0.4);
-      step_mem->rdiv        = RCONST(2.3);
-      step_mem->dgmax       = RCONST(0.32);
+      step_mem->nlscoef     = SUN_RCONST(0.25);
+      step_mem->crdown      = SUN_RCONST(0.4);
+      step_mem->rdiv        = SUN_RCONST(2.3);
+      step_mem->dgmax       = SUN_RCONST(0.32);
       step_mem->msbp        = 31;
       break;
     }
@@ -813,7 +813,7 @@ int ARKStepSetLinear(void *arkode_mem, int timedepend)
   /* set parameters */
   step_mem->linear = SUNTRUE;
   step_mem->linear_timedep = (timedepend == 1);
-  step_mem->dgmax = RCONST(100.0)*UNIT_ROUNDOFF;
+  step_mem->dgmax = SUN_RCONST(100.0)*SUN_UNIT_ROUNDOFF;
 
   return(ARK_SUCCESS);
 }
@@ -1319,7 +1319,7 @@ int ARKStepSetTableName(void *arkode_mem, const char *itable, const char *etable
   crdown.  Legal values are strictly positive; illegal values
   imply a reset to the default.
   ---------------------------------------------------------------*/
-int ARKStepSetNonlinCRDown(void *arkode_mem, realtype crdown)
+int ARKStepSetNonlinCRDown(void *arkode_mem, sunrealtype crdown)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -1348,7 +1348,7 @@ int ARKStepSetNonlinCRDown(void *arkode_mem, realtype crdown)
   rdiv.  Legal values are strictly positive; illegal values
   imply a reset to the default.
   ---------------------------------------------------------------*/
-int ARKStepSetNonlinRDiv(void *arkode_mem, realtype rdiv)
+int ARKStepSetNonlinRDiv(void *arkode_mem, sunrealtype rdiv)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -1377,7 +1377,7 @@ int ARKStepSetNonlinRDiv(void *arkode_mem, realtype rdiv)
   dgmax.  Legal values are strictly positive; illegal values imply
   a reset to the default.
   ---------------------------------------------------------------*/
-int ARKStepSetDeltaGammaMax(void *arkode_mem, realtype dgmax)
+int ARKStepSetDeltaGammaMax(void *arkode_mem, sunrealtype dgmax)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -1513,7 +1513,7 @@ int ARKStepSetMaxNonlinIters(void *arkode_mem, int maxcor)
   Specifies the coefficient in the nonlinear solver convergence
   test.  A non-positive input implies a reset to the default value.
   ---------------------------------------------------------------*/
-int ARKStepSetNonlinConvCoef(void *arkode_mem, realtype nlscoef)
+int ARKStepSetNonlinConvCoef(void *arkode_mem, sunrealtype nlscoef)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -1592,7 +1592,7 @@ int ARKStepSetDeduceImplicitRhs(void *arkode_mem, sunbooleantype deduce)
 /*---------------------------------------------------------------
   ARKStepGetCurrentGamma: Returns the current value of gamma
   ---------------------------------------------------------------*/
-int ARKStepGetCurrentGamma(void *arkode_mem, realtype *gamma)
+int ARKStepGetCurrentGamma(void *arkode_mem, sunrealtype *gamma)
 {
   int retval;
   ARKodeMem ark_mem;
@@ -1841,7 +1841,7 @@ int ARKStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (ark_mem->nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) step_mem->nls_iters / (realtype) ark_mem->nst);
+              (sunrealtype) step_mem->nls_iters / (sunrealtype) ark_mem->nst);
     }
 
     /* linear solver stats */
@@ -1860,11 +1860,11 @@ int ARKStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (step_mem->nls_iters > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) arkls_mem->nli / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nli / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) arkls_mem->nje / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nje / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) arkls_mem->npe / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->npe / (sunrealtype) step_mem->nls_iters);
       }
     }
 
@@ -1894,7 +1894,7 @@ int ARKStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (ark_mem->nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) step_mem->nls_iters / (realtype) ark_mem->nst);
+              (sunrealtype) step_mem->nls_iters / (sunrealtype) ark_mem->nst);
     }
     else
     {
@@ -1917,11 +1917,11 @@ int ARKStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (step_mem->nls_iters > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) arkls_mem->nli / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nli / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) arkls_mem->nje / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nje / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) arkls_mem->npe / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->npe / (sunrealtype) step_mem->nls_iters);
       }
       else
       {
diff --git a/src/arkode/arkode_arkstep_nls.c b/src/arkode/arkode_arkstep_nls.c
index 01565187dd..2905f26fbc 100644
--- a/src/arkode/arkode_arkstep_nls.c
+++ b/src/arkode/arkode_arkstep_nls.c
@@ -136,9 +136,9 @@ int ARKStepSetNlsRhsFn(void *arkode_mem, ARKRhsFn nls_fi)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int ARKStepGetNonlinearSystemData(void *arkode_mem, realtype *tcur,
+int ARKStepGetNonlinearSystemData(void *arkode_mem, sunrealtype *tcur,
                                   N_Vector *zpred, N_Vector *z,
-                                  N_Vector *Fi, realtype *gamma,
+                                  N_Vector *Fi, sunrealtype *gamma,
                                   N_Vector *sdata, void **user_data)
 {
   ARKodeMem ark_mem;
@@ -285,7 +285,7 @@ int arkStep_NlsInit(ARKodeMem ark_mem)
 int arkStep_Nls(ARKodeMem ark_mem, int nflag)
 {
   ARKodeARKStepMem step_mem;
-  booleantype callLSetup;
+  sunbooleantype callLSetup;
   long int nls_iters_inc = 0;
   long int nls_fails_inc = 0;
   int retval;
@@ -329,7 +329,7 @@ int arkStep_Nls(ARKodeMem ark_mem, int nflag)
   N_VConst(ZERO, step_mem->zcor);
 
   /* Reset the stored residual norm (for iterative linear solvers) */
-  step_mem->eRNrm = RCONST(0.1) * step_mem->nlscoef;
+  step_mem->eRNrm = SUN_RCONST(0.1) * step_mem->nlscoef;
 
   /* solve the nonlinear system for the actual correction */
   retval = SUNNonlinSolSolve(step_mem->NLS, step_mem->zpred, step_mem->zcor,
@@ -373,7 +373,7 @@ int arkStep_Nls(ARKodeMem ark_mem, int nflag)
   This routine wraps the ARKODE linear solver interface 'setup'
   routine for use by the nonlinear solver object.
   ---------------------------------------------------------------*/
-int arkStep_NlsLSetup(booleantype jbad, booleantype* jcur, void* arkode_mem)
+int arkStep_NlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* arkode_mem)
 {
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
@@ -478,7 +478,7 @@ int arkStep_NlsResidual_MassIdent(N_Vector zcor, N_Vector r, void* arkode_mem)
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   int retval;
-  realtype c[3];
+  sunrealtype c[3];
   N_Vector X[3];
 
   /* access ARKodeARKStepMem structure */
@@ -543,7 +543,7 @@ int arkStep_NlsResidual_MassFixed(N_Vector zcor, N_Vector r, void* arkode_mem)
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
   int retval;
-  realtype c[3];
+  sunrealtype c[3];
   N_Vector X[3];
 
   /* access ARKodeARKStepMem structure */
@@ -874,12 +874,12 @@ int arkStep_NlsFPFunction_MassTDep(N_Vector zcor, N_Vector g, void* arkode_mem)
       is provided.
   ---------------------------------------------------------------*/
 int arkStep_NlsConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                        realtype tol, N_Vector ewt, void* arkode_mem)
+                        sunrealtype tol, N_Vector ewt, void* arkode_mem)
 {
   /* temporary variables */
   ARKodeMem ark_mem;
   ARKodeARKStepMem step_mem;
-  realtype delnrm, dcon;
+  sunrealtype delnrm, dcon;
   int m, retval;
 
   /* access ARKodeARKStepMem structure */
diff --git a/src/arkode/arkode_bandpre.c b/src/arkode/arkode_bandpre.c
index 0375bdc62e..167c858997 100644
--- a/src/arkode/arkode_bandpre.c
+++ b/src/arkode/arkode_bandpre.c
@@ -26,18 +26,18 @@
 #include "arkode_ls_impl.h"
 #include <sundials/sundials_math.h>
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
 
 
 /* Prototypes of ARKBandPrecSetup and ARKBandPrecSolve */
-static int ARKBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                            booleantype jok, booleantype *jcurPtr,
-                            realtype gamma, void *bp_data);
-static int ARKBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int ARKBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                            sunbooleantype jok, sunbooleantype *jcurPtr,
+                            sunrealtype gamma, void *bp_data);
+static int ARKBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                             N_Vector r, N_Vector z,
-                            realtype gamma, realtype delta,
+                            sunrealtype gamma, sunrealtype delta,
                             int lr, void *bp_data);
 
 /* Prototype for ARKBandPrecFree */
@@ -45,7 +45,7 @@ static int ARKBandPrecFree(ARKodeMem ark_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
 static int ARKBandPDQJac(ARKBandPrecData pdata,
-                         realtype t, N_Vector y, N_Vector fy,
+                         sunrealtype t, N_Vector y, N_Vector fy,
                          N_Vector ftemp, N_Vector ytemp);
 
 
@@ -311,9 +311,9 @@ int ARKBandPrecGetNumRhsEvals(void *arkode_mem, long int *nfevalsBP)
    0  if successful, or
    1  if the band factorization failed.
 ---------------------------------------------------------------*/
-static int ARKBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bp_data)
+static int ARKBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bp_data)
 {
   ARKBandPrecData pdata;
   ARKodeMem ark_mem;
@@ -406,9 +406,9 @@ static int ARKBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
  The value returned by the ARKBandPrecSolve function is always 0,
  indicating success.
 ---------------------------------------------------------------*/
-static int ARKBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int ARKBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                             N_Vector r, N_Vector z,
-                            realtype gamma, realtype delta,
+                            sunrealtype gamma, sunrealtype delta,
                             int lr, void *bp_data)
 {
   ARKBandPrecData pdata;
@@ -466,15 +466,15 @@ static int ARKBandPrecFree(ARKodeMem ark_mem)
  each of the elements of a column in succession.
 ---------------------------------------------------------------*/
 static int ARKBandPDQJac(ARKBandPrecData pdata,
-                         realtype t, N_Vector y, N_Vector fy,
+                         sunrealtype t, N_Vector y, N_Vector fy,
                          N_Vector ftemp, N_Vector ytemp)
 {
   ARKodeMem ark_mem;
   ARKRhsFn fi;
-  realtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
+  sunrealtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *col_j, *ewt_data, *fy_data, *ftemp_data;
-  realtype *y_data, *ytemp_data, *cns_data;
+  sunrealtype *col_j, *ewt_data, *fy_data, *ftemp_data;
+  sunrealtype *y_data, *ytemp_data, *cns_data;
   int retval;
 
   ark_mem = (ARKodeMem) pdata->arkode_mem;
diff --git a/src/arkode/arkode_bbdpre.c b/src/arkode/arkode_bbdpre.c
index d1a4cc171f..d10695a1ad 100644
--- a/src/arkode/arkode_bbdpre.c
+++ b/src/arkode/arkode_bbdpre.c
@@ -28,25 +28,25 @@
 #include <nvector/nvector_serial.h>
 
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
 
 
 /* Prototypes of functions ARKBBDPrecSetup and ARKBBDPrecSolve */
-static int ARKBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bbd_data);
-static int ARKBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int ARKBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bbd_data);
+static int ARKBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                            N_Vector r, N_Vector z,
-                           realtype gamma, realtype delta,
+                           sunrealtype gamma, sunrealtype delta,
                            int lr, void *bbd_data);
 
 /* Prototype for ARKBBDPrecFree */
 static int ARKBBDPrecFree(ARKodeMem ark_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int ARKBBDDQJac(ARKBBDPrecData pdata, realtype t,
+static int ARKBBDDQJac(ARKBBDPrecData pdata, sunrealtype t,
                        N_Vector y, N_Vector gy,
                        N_Vector ytemp, N_Vector gtemp);
 
@@ -57,7 +57,7 @@ static int ARKBBDDQJac(ARKBBDPrecData pdata, realtype t,
 int ARKBBDPrecInit(void *arkode_mem, sunindextype Nlocal,
                    sunindextype mudq, sunindextype mldq,
                    sunindextype mukeep, sunindextype mlkeep,
-                   realtype dqrely,
+                   sunrealtype dqrely,
                    ARKLocalFn gloc, ARKCommFn cfn)
 {
   ARKodeMem      ark_mem;
@@ -276,7 +276,7 @@ int ARKBBDPrecInit(void *arkode_mem, sunindextype Nlocal,
 
 /*-------------------------------------------------------------*/
 int ARKBBDPrecReInit(void *arkode_mem, sunindextype mudq,
-                     sunindextype mldq, realtype dqrely)
+                     sunindextype mldq, sunrealtype dqrely)
 {
   ARKodeMem      ark_mem;
   ARKLsMem       arkls_mem;
@@ -419,9 +419,9 @@ int ARKBBDPrecGetNumGfnEvals(void *arkode_mem,
    0  if successful,
    1  for a recoverable error (step will be retried).
 ---------------------------------------------------------------*/
-static int ARKBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bbd_data)
+static int ARKBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bbd_data)
 {
   ARKBBDPrecData pdata;
   ARKodeMem ark_mem;
@@ -514,9 +514,9 @@ static int ARKBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
  The value returned by the ARKBBDPrecSolve function is the same
  as the value returned from the linear solver object.
 ---------------------------------------------------------------*/
-static int ARKBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int ARKBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                            N_Vector r, N_Vector z,
-                           realtype gamma, realtype delta,
+                           sunrealtype gamma, sunrealtype delta,
                            int lr, void *bbd_data)
 {
   int retval;
@@ -585,15 +585,15 @@ static int ARKBBDPrecFree(ARKodeMem ark_mem)
  This routine also assumes that the local elements of a vector are
  stored contiguously.
 ---------------------------------------------------------------*/
-static int ARKBBDDQJac(ARKBBDPrecData pdata, realtype t,
+static int ARKBBDDQJac(ARKBBDPrecData pdata, sunrealtype t,
                        N_Vector y, N_Vector gy,
                        N_Vector ytemp, N_Vector gtemp)
 {
   ARKodeMem ark_mem;
-  realtype gnorm, minInc, inc, inc_inv, yj, conj;
+  sunrealtype gnorm, minInc, inc, inc_inv, yj, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *y_data, *ewt_data, *gy_data, *gtemp_data;
-  realtype *ytemp_data, *col_j, *cns_data;
+  sunrealtype *y_data, *ewt_data, *gy_data, *gtemp_data;
+  sunrealtype *ytemp_data, *col_j, *cns_data;
   int retval;
 
   ark_mem = (ARKodeMem) pdata->arkode_mem;
diff --git a/src/arkode/arkode_bbdpre_impl.h b/src/arkode/arkode_bbdpre_impl.h
index ba1ace334c..97e52c9aca 100644
--- a/src/arkode/arkode_bbdpre_impl.h
+++ b/src/arkode/arkode_bbdpre_impl.h
@@ -33,7 +33,7 @@ typedef struct ARKBBDPrecDataRec {
 
   /* passed by user to ARKBBDPrecAlloc and used by PrecSetup/PrecSolve */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype dqrely;
+  sunrealtype dqrely;
   ARKLocalFn gloc;
   ARKCommFn cfn;
 
diff --git a/src/arkode/arkode_butcher.c b/src/arkode/arkode_butcher.c
index 61a7cb342f..9ea1301af6 100644
--- a/src/arkode/arkode_butcher.c
+++ b/src/arkode/arkode_butcher.c
@@ -23,57 +23,57 @@
 
 
 /* tolerance for checking order conditions */
-#define TOL  (SUNRsqrt(UNIT_ROUNDOFF))
+#define TOL  (SUNRsqrt(SUN_UNIT_ROUNDOFF))
 
 /* Private utility functions for checking method order */
-static int __mv(realtype **A, realtype *x, int s, realtype *b);
-static int __vv(realtype *x, realtype *y, int s, realtype *z);
-static int __vp(realtype *x, int l, int s, realtype *z);
-static int __dot(realtype *x, realtype *y, int s, realtype *d);
-static booleantype __rowsum(realtype **A, realtype *c, int s);
-static booleantype __order1(realtype *b, int s);
-static booleantype __order2(realtype *b, realtype *c, int s);
-static booleantype __order3a(realtype *b, realtype *c1, realtype *c2, int s);
-static booleantype __order3b(realtype *b, realtype **A, realtype *c, int s);
-static booleantype __order4a(realtype *b, realtype *c1, realtype *c2, realtype *c3, int s);
-static booleantype __order4b(realtype *b, realtype *c1, realtype **A, realtype *c2, int s);
-static booleantype __order4c(realtype *b, realtype **A, realtype *c1, realtype *c2, int s);
-static booleantype __order4d(realtype *b, realtype **A1, realtype **A2, realtype *c, int s);
-static booleantype __order5a(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype *c4, int s);
-static booleantype __order5b(realtype *b, realtype *c1, realtype *c2, realtype **A, realtype *c3, int s);
-static booleantype __order5c(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, int s);
-static booleantype __order5d(realtype *b, realtype *c1, realtype **A, realtype *c2, realtype *c3, int s);
-static booleantype __order5e(realtype *b, realtype **A, realtype *c1, realtype *c2, realtype *c3, int s);
-static booleantype __order5f(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype *c2, int s);
-static booleantype __order5g(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, int s);
-static booleantype __order5h(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype *c2, int s);
-static booleantype __order5i(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype *c, int s);
-static booleantype __order6a(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype *c4, realtype *c5, int s);
-static booleantype __order6b(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype **A, realtype *c4, int s);
-static booleantype __order6c(realtype *b, realtype *c1, realtype **A1, realtype *c2, realtype **A2, realtype *c3, int s);
-static booleantype __order6d(realtype *b, realtype *c1, realtype *c2, realtype **A, realtype *c3, realtype *c4, int s);
-static booleantype __order6e(realtype *b, realtype *c1, realtype *c2, realtype **A1, realtype **A2, realtype *c3, int s);
-static booleantype __order6f(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s);
-static booleantype __order6g(realtype *b, realtype *c1, realtype **A, realtype *c2, realtype *c3, realtype *c4, int s);
-static booleantype __order6h(realtype *b, realtype *c1, realtype **A1, realtype *c2, realtype **A2, realtype *c3, int s);
-static booleantype __order6i(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype *c2, realtype *c3, int s);
-static booleantype __order6j(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype **A3, realtype *c2, int s);
-static booleantype __order6k(realtype *b, realtype **A, realtype *c1, realtype *c2, realtype *c3, realtype *c4, int s);
-static booleantype __order6l(realtype *b, realtype **A1, realtype *c1, realtype *c2, realtype **A2, realtype *c3, int s);
-static booleantype __order6m(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s);
-static booleantype __order6n(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, realtype *c3, int s);
-static booleantype __order6o(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype **A3, realtype *c2, int s);
-static booleantype __order6p(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype *c2, realtype *c3, int s);
-static booleantype __order6q(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s);
-static booleantype __order6r(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype *c1, realtype *c2, int s);
-static booleantype __order6s(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype **A4, realtype *c, int s);
-static int __ButcherSimplifyingAssumptions(realtype **A, realtype *b, realtype *c, int s);
+static int __mv(sunrealtype **A, sunrealtype *x, int s, sunrealtype *b);
+static int __vv(sunrealtype *x, sunrealtype *y, int s, sunrealtype *z);
+static int __vp(sunrealtype *x, int l, int s, sunrealtype *z);
+static int __dot(sunrealtype *x, sunrealtype *y, int s, sunrealtype *d);
+static sunbooleantype __rowsum(sunrealtype **A, sunrealtype *c, int s);
+static sunbooleantype __order1(sunrealtype *b, int s);
+static sunbooleantype __order2(sunrealtype *b, sunrealtype *c, int s);
+static sunbooleantype __order3a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, int s);
+static sunbooleantype __order3b(sunrealtype *b, sunrealtype **A, sunrealtype *c, int s);
+static sunbooleantype __order4a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order4b(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, int s);
+static sunbooleantype __order4c(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, int s);
+static sunbooleantype __order4d(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c, int s);
+static sunbooleantype __order5a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s);
+static sunbooleantype __order5b(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A, sunrealtype *c3, int s);
+static sunbooleantype __order5c(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, int s);
+static sunbooleantype __order5d(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order5e(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order5f(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype *c2, int s);
+static sunbooleantype __order5g(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, int s);
+static sunbooleantype __order5h(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype *c2, int s);
+static sunbooleantype __order5i(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c, int s);
+static sunbooleantype __order6a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, sunrealtype *c5, int s);
+static sunbooleantype __order6b(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype **A, sunrealtype *c4, int s);
+static sunbooleantype __order6c(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s);
+static sunbooleantype __order6d(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A, sunrealtype *c3, sunrealtype *c4, int s);
+static sunbooleantype __order6e(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A1, sunrealtype **A2, sunrealtype *c3, int s);
+static sunbooleantype __order6f(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s);
+static sunbooleantype __order6g(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s);
+static sunbooleantype __order6h(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s);
+static sunbooleantype __order6i(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order6j(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c2, int s);
+static sunbooleantype __order6k(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s);
+static sunbooleantype __order6l(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s);
+static sunbooleantype __order6m(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s);
+static sunbooleantype __order6n(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order6o(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c2, int s);
+static sunbooleantype __order6p(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s);
+static sunbooleantype __order6q(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s);
+static sunbooleantype __order6r(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c1, sunrealtype *c2, int s);
+static sunbooleantype __order6s(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype **A4, sunrealtype *c, int s);
+static int __ButcherSimplifyingAssumptions(sunrealtype **A, sunrealtype *b, sunrealtype *c, int s);
 
 
 /*---------------------------------------------------------------
   Routine to allocate an empty Butcher table structure
   ---------------------------------------------------------------*/
-ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, booleantype embedded)
+ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, sunbooleantype embedded)
 {
   int i;
   ARKodeButcherTable B;
@@ -100,7 +100,7 @@ ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, booleantype embedded)
    */
 
   /* allocate rows of A */
-  B->A = (realtype **) calloc( stages, sizeof(realtype*) );
+  B->A = (sunrealtype **) calloc( stages, sizeof(sunrealtype*) );
   if (B->A == NULL) { ARKodeButcherTable_Free(B); return(NULL); }
 
   /* initialize each row of A to NULL */
@@ -109,18 +109,18 @@ ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, booleantype embedded)
 
   /* allocate columns of A */
   for (i=0; i<stages; i++) {
-    B->A[i] = (realtype *) calloc( stages, sizeof(realtype) );
+    B->A[i] = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
     if (B->A[i] == NULL) { ARKodeButcherTable_Free(B); return(NULL); }
   }
 
-  B->b = (realtype *) calloc( stages, sizeof(realtype) );
+  B->b = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
   if (B->b == NULL) { ARKodeButcherTable_Free(B); return(NULL); }
 
-  B->c = (realtype *) calloc( stages, sizeof(realtype) );
+  B->c = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
   if (B->c == NULL) { ARKodeButcherTable_Free(B); return(NULL); }
 
   if (embedded) {
-    B->d = (realtype *) calloc( stages, sizeof(realtype) );
+    B->d = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
     if (B->d == NULL) { ARKodeButcherTable_Free(B); return(NULL); }
   }
 
@@ -135,13 +135,13 @@ ARKodeButcherTable ARKodeButcherTable_Alloc(int stages, booleantype embedded)
 /*---------------------------------------------------------------
   Routine to allocate and fill a Butcher table structure
   ---------------------------------------------------------------*/
-ARKodeButcherTable ARKodeButcherTable_Create(int s, int q, int p, realtype *c,
-                                             realtype *A, realtype *b,
-                                             realtype *d)
+ARKodeButcherTable ARKodeButcherTable_Create(int s, int q, int p, sunrealtype *c,
+                                             sunrealtype *A, sunrealtype *b,
+                                             sunrealtype *d)
 {
   int i, j;
   ARKodeButcherTable B;
-  booleantype embedded;
+  sunbooleantype embedded;
 
   /* Check for legal number of stages */
   if (s < 1) return(NULL);
@@ -181,7 +181,7 @@ ARKodeButcherTable ARKodeButcherTable_Copy(ARKodeButcherTable B)
 {
   int i, j, s;
   ARKodeButcherTable Bcopy;
-  booleantype embedded;
+  sunbooleantype embedded;
 
   /* Check for legal input */
   if (B == NULL) return(NULL);
@@ -350,8 +350,8 @@ int ARKodeButcherTable_CheckOrder(ARKodeButcherTable B, int *q, int *p, FILE *ou
 {
   /* local variables */
   int q_SA, p_SA, i, s;
-  realtype **A, *b, *c, *d;
-  booleantype alltrue;
+  sunrealtype **A, *b, *c, *d;
+  sunbooleantype alltrue;
   (*q) = (*p) = 0;
 
   /* verify non-NULL Butcher table structure and contents */
@@ -803,8 +803,8 @@ int ARKodeButcherTable_CheckARKOrder(ARKodeButcherTable B1,
 {
   /* local variables */
   int i, j, k, l, m, n, s;
-  booleantype alltrue;
-  realtype **A[2], *b[2], *c[2], *d[2];
+  sunbooleantype alltrue;
+  sunrealtype **A[2], *b[2], *c[2], *d[2];
   (*q) = (*p) = 0;
 
   /* verify non-NULL Butcher table structure and contents */
@@ -1468,12 +1468,12 @@ int ARKodeButcherTable_CheckARKOrder(ARKodeButcherTable B1,
   Here A is (s x s), x and b are (s x 1).  Returns 0 on success,
   nonzero on failure.
   ---------------------------------------------------------------*/
-static int __mv(realtype **A, realtype *x, int s, realtype *b)
+static int __mv(sunrealtype **A, sunrealtype *x, int s, sunrealtype *b)
 {
   int i, j;
   if ((A == NULL) || (x == NULL) || (b == NULL) || (s < 1))
     return(1);
-  for (i=0; i<s; i++)  b[i] = RCONST(0.0);
+  for (i=0; i<s; i++)  b[i] = SUN_RCONST(0.0);
   for (i=0; i<s; i++)
     for (j=0; j<s; j++)
       b[i] += A[i][j]*x[j];
@@ -1487,7 +1487,7 @@ static int __mv(realtype **A, realtype *x, int s, realtype *b)
   Here all vectors are (s x 1).   Returns 0 on success,
   nonzero on failure.
   ---------------------------------------------------------------*/
-static int __vv(realtype *x, realtype *y, int s, realtype *z)
+static int __vv(sunrealtype *x, sunrealtype *y, int s, sunrealtype *z)
 {
   int i;
   if ((x == NULL) || (y == NULL) || (z == NULL) || (s < 1))
@@ -1504,7 +1504,7 @@ static int __vv(realtype *x, realtype *y, int s, realtype *z)
   Here all vectors are (s x 1).   Returns 0 on success,
   nonzero on failure.
   ---------------------------------------------------------------*/
-static int __vp(realtype *x, int l, int s, realtype *z)
+static int __vp(sunrealtype *x, int l, int s, sunrealtype *z)
 {
   int i;
   if ((x == NULL) || (z == NULL) || (s < 1) || (s < 0))
@@ -1521,12 +1521,12 @@ static int __vp(realtype *x, int l, int s, realtype *z)
   Here x and y are (s x 1), and d is scalar.   Returns 0 on success,
   nonzero on failure.
   ---------------------------------------------------------------*/
-static int __dot(realtype *x, realtype *y, int s, realtype *d)
+static int __dot(sunrealtype *x, sunrealtype *y, int s, sunrealtype *d)
 {
   int i;
   if ((x == NULL) || (y == NULL) || (d == NULL) || (s < 1))
     return(1);
-  (*d) = RCONST(0.0);
+  (*d) = SUN_RCONST(0.0);
   for (i=0; i<s; i++)
     (*d) += x[i]*y[i];
   return(0);
@@ -1546,12 +1546,12 @@ static int __dot(realtype *x, realtype *y, int s, realtype *d)
   ---------------------------------------------------------------*/
 
 /* c(i) = sum(A(i,:)) */
-static booleantype __rowsum(realtype **A, realtype *c, int s)
+static sunbooleantype __rowsum(sunrealtype **A, sunrealtype *c, int s)
 {
   int i, j;
-  realtype rsum;
+  sunrealtype rsum;
   for (i=0; i<s; i++) {
-    rsum = RCONST(0.0);
+    rsum = SUN_RCONST(0.0);
     for (j=0; j<s; j++)
       rsum += A[i][j];
     if (SUNRabs(rsum - c[i]) > TOL)
@@ -1561,512 +1561,512 @@ static booleantype __rowsum(realtype **A, realtype *c, int s)
 }
 
 /* b'*e = 1 */
-static booleantype __order1(realtype *b, int s)
+static sunbooleantype __order1(sunrealtype *b, int s)
 {
   int i;
-  realtype err = RCONST(1.0);
+  sunrealtype err = SUN_RCONST(1.0);
   for (i=0; i<s; i++)
     err -= b[i];
   return (SUNRabs(err) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*c = 1/2 */
-static booleantype __order2(realtype *b, realtype *c, int s)
+static sunbooleantype __order2(sunrealtype *b, sunrealtype *c, int s)
 {
-  realtype bc;
+  sunrealtype bc;
   if (__dot(b,c,s,&bc))  return(SUNFALSE);
-  return (SUNRabs(bc - RCONST(0.5)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bc - SUN_RCONST(0.5)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*c2) = 1/3 */
-static booleantype __order3a(realtype *b, realtype *c1, realtype *c2, int s)
+static sunbooleantype __order3a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, int s)
 {
-  realtype bcc;
-  realtype *tmp = calloc( s, sizeof(realtype) );
+  sunrealtype bcc;
+  sunrealtype *tmp = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp)) { free(tmp); return(SUNFALSE); }
   if (__dot(b,tmp,s,&bcc))  return(SUNFALSE);
   free(tmp);
-  return (SUNRabs(bcc - RCONST(1.0)/RCONST(3.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcc - SUN_RCONST(1.0)/SUN_RCONST(3.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(A*c) = 1/6 */
-static booleantype __order3b(realtype *b, realtype **A, realtype *c, int s)
+static sunbooleantype __order3b(sunrealtype *b, sunrealtype **A, sunrealtype *c, int s)
 {
-  realtype bAc;
-  realtype *tmp = calloc( s, sizeof(realtype) );
+  sunrealtype bAc;
+  sunrealtype *tmp = calloc( s, sizeof(sunrealtype) );
   if (__mv(A,c,s,tmp)) { free(tmp); return(SUNFALSE); }
   if (__dot(b,tmp,s,&bAc))  return(SUNFALSE);
   free(tmp);
-  return (SUNRabs(bAc - RCONST(1.0)/RCONST(6.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAc - SUN_RCONST(1.0)/SUN_RCONST(6.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*c2.*c3) = 1/4 */
-static booleantype __order4a(realtype *b, realtype *c1, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order4a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bccc))  return(SUNFALSE);
   free(tmp1);  free(tmp2);
-  return (SUNRabs(bccc - RCONST(0.25)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bccc - SUN_RCONST(0.25)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1)'*(A*c2) = 1/8 */
-static booleantype __order4b(realtype *b, realtype *c1, realtype **A, realtype *c2, int s)
+static sunbooleantype __order4b(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, int s)
 {
-  realtype bcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(b,c1,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,c2,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(tmp1,tmp2,s,&bcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAc - RCONST(0.125)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAc - SUN_RCONST(0.125)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A*(c1.*c2) = 1/12 */
-static booleantype __order4c(realtype *b, realtype **A, realtype *c1, realtype *c2, int s)
+static sunbooleantype __order4c(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, int s)
 {
-  realtype bAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAcc - RCONST(1.0)/RCONST(12.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcc - SUN_RCONST(1.0)/SUN_RCONST(12.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*c = 1/24 */
-static booleantype __order4d(realtype *b, realtype **A1, realtype **A2, realtype *c, int s)
+static sunbooleantype __order4d(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c, int s)
 {
-  realtype bAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAc - RCONST(1.0)/RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAc - SUN_RCONST(1.0)/SUN_RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*c2.*c3.*c4) = 1/5 */
-static booleantype __order5a(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype *c4, int s)
+static sunbooleantype __order5a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s)
 {
-  realtype bcccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c4,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bcccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcccc - RCONST(0.2)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcccc - SUN_RCONST(0.2)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1.*c2)'*(A*c3) = 1/10 */
-static booleantype __order5b(realtype *b, realtype *c1, realtype *c2, realtype **A, realtype *c3, int s)
+static sunbooleantype __order5b(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A, sunrealtype *c3, int s)
 {
-  realtype bccAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bccAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(b,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(tmp1,tmp2,s,&bccAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bccAc - RCONST(0.1)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bccAc - SUN_RCONST(0.1)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*((A1*c1).*(A2*c2)) = 1/20 */
-static booleantype __order5c(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, int s)
+static sunbooleantype __order5c(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, int s)
 {
-  realtype bAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A1,c1,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A2,c2,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(tmp1,tmp2,s,tmp3)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(b,tmp3,s,&bAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2); free(tmp3);
-  return (SUNRabs(bAcAc - RCONST(0.05)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcAc - SUN_RCONST(0.05)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1)'*A*(c2.*c3) = 1/15 */
-static booleantype __order5d(realtype *b, realtype *c1, realtype **A, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order5d(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bcAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(b,c1,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(tmp1,tmp2,s,&bcAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAcc - RCONST(1.0)/RCONST(15.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAcc - SUN_RCONST(1.0)/SUN_RCONST(15.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A*(c1.*c2.*c3) = 1/20 */
-static booleantype __order5e(realtype *b, realtype **A, realtype *c1, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order5e(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bAccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bAccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAccc - RCONST(0.05)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAccc - SUN_RCONST(0.05)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1)'*A1*A2*c2 = 1/30 */
-static booleantype __order5f(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype *c2, int s)
+static sunbooleantype __order5f(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype *c2, int s)
 {
-  realtype bcAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(b,c1,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(tmp1,tmp2,s,&bcAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAAc - RCONST(1.0)/RCONST(30.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAAc - SUN_RCONST(1.0)/SUN_RCONST(30.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*(c1.*(A2*c2)) = 1/40 */
-static booleantype __order5g(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, int s)
+static sunbooleantype __order5g(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, int s)
 {
-  realtype bAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAcAc - RCONST(1.0)/RCONST(40.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcAc - SUN_RCONST(1.0)/SUN_RCONST(40.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*(c1.*c2) = 1/60 */
-static booleantype __order5h(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype *c2, int s)
+static sunbooleantype __order5h(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype *c2, int s)
 {
-  realtype bAAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bAAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAcc - RCONST(1.0)/RCONST(60.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAcc - SUN_RCONST(1.0)/SUN_RCONST(60.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*A3*c = 1/120 */
-static booleantype __order5i(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype *c, int s)
+static sunbooleantype __order5i(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c, int s)
 {
-  realtype bAAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A3,c,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bAAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAAc - RCONST(1.0)/RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAAc - SUN_RCONST(1.0)/SUN_RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*c2.*c3.*c4.*c5) = 1/6 */
-static booleantype __order6a(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype *c4, realtype *c5, int s)
+static sunbooleantype __order6a(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, sunrealtype *c5, int s)
 {
-  realtype bccccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bccccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c4,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c5,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bccccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bccccc - RCONST(1.0)/RCONST(6.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bccccc - SUN_RCONST(1.0)/SUN_RCONST(6.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1.*c2.*c3)'*(A*c4) = 1/12 */
-static booleantype __order6b(realtype *b, realtype *c1, realtype *c2, realtype *c3, realtype **A, realtype *c4, int s)
+static sunbooleantype __order6b(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype **A, sunrealtype *c4, int s)
 {
-  realtype bcccAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcccAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(b,c1,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,c4,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(tmp1,tmp2,s,&bcccAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcccAc - RCONST(1.0)/RCONST(12.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcccAc - SUN_RCONST(1.0)/SUN_RCONST(12.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*(A1*c2).*(A2*c3)) = 1/24 */
-static booleantype __order6c(realtype *b, realtype *c1, realtype **A1, realtype *c2, realtype **A2, realtype *c3, int s)
+static sunbooleantype __order6c(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s)
 {
-  realtype bcAc2;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAc2;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c3,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A1,c2,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(tmp1,tmp2,s,tmp3)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(c1,tmp3,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bcAc2))  return(SUNFALSE);
   free(tmp1); free(tmp2); free(tmp3);
-  return (SUNRabs(bcAc2 - RCONST(1.0)/RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAc2 - SUN_RCONST(1.0)/SUN_RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*c1.*c2)'*A*(c3.*c4) = 1/18 */
-static booleantype __order6d(realtype *b, realtype *c1, realtype *c2, realtype **A, realtype *c3, realtype *c4, int s)
+static sunbooleantype __order6d(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A, sunrealtype *c3, sunrealtype *c4, int s)
 {
-  realtype bccAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bccAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c3,c4,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A,tmp1,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(b,tmp1,s,tmp3)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(tmp2,tmp3,s,&bccAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);  free(tmp3);
-  return (SUNRabs(bccAcc - RCONST(1.0)/RCONST(18.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bccAcc - SUN_RCONST(1.0)/SUN_RCONST(18.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* (b.*(c1.*c2))'*A1*A2*c3 = 1/36 */
-static booleantype __order6e(realtype *b, realtype *c1, realtype *c2, realtype **A1, realtype **A2, realtype *c3, int s)
+static sunbooleantype __order6e(sunrealtype *b, sunrealtype *c1, sunrealtype *c2, sunrealtype **A1, sunrealtype **A2, sunrealtype *c3, int s)
 {
-  realtype bccAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bccAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(b,tmp1,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A2,c3,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp3)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(tmp2,tmp3,s,&bccAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);  free(tmp3);
-  return (SUNRabs(bccAAc - RCONST(1.0)/RCONST(36.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bccAAc - SUN_RCONST(1.0)/SUN_RCONST(36.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*((A1*A2*c1).*(A3*c2)) = 1/72 */
-static booleantype __order6f(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s)
+static sunbooleantype __order6f(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s)
 {
-  realtype bAAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c1,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A3,c2,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(tmp1,tmp2,s,tmp3)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(b,tmp3,s,&bAAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);  free(tmp3);
-  return (SUNRabs(bAAcAc - RCONST(1.0)/RCONST(72.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAcAc - SUN_RCONST(1.0)/SUN_RCONST(72.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*(A*(c2.*c3.*c4))) = 1/24 */
-static booleantype __order6g(realtype *b, realtype *c1, realtype **A, realtype *c2, realtype *c3, realtype *c4, int s)
+static sunbooleantype __order6g(sunrealtype *b, sunrealtype *c1, sunrealtype **A, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s)
 {
-  realtype bcAccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c4,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bcAccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAccc - RCONST(1.0)/RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAccc - SUN_RCONST(1.0)/SUN_RCONST(24.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*(A1*(c2.*(A2*c3)))) = 1/48 */
-static booleantype __order6h(realtype *b, realtype *c1, realtype **A1, realtype *c2, realtype **A2, realtype *c3, int s)
+static sunbooleantype __order6h(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s)
 {
-  realtype bcAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bcAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAcAc - RCONST(1.0)/RCONST(48.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAcAc - SUN_RCONST(1.0)/SUN_RCONST(48.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*(A1*A2*(c2.*c3))) = 1/72 */
-static booleantype __order6i(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order6i(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bcAAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bcAAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAAcc - RCONST(1.0)/RCONST(72.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAAcc - SUN_RCONST(1.0)/SUN_RCONST(72.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*(c1.*(A1*A2*A3*c2)) = 1/144 */
-static booleantype __order6j(realtype *b, realtype *c1, realtype **A1, realtype **A2, realtype **A3, realtype *c2, int s)
+static sunbooleantype __order6j(sunrealtype *b, sunrealtype *c1, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c2, int s)
 {
-  realtype bcAAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bcAAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A3,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bcAAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bcAAAc - RCONST(1.0)/RCONST(144.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bcAAAc - SUN_RCONST(1.0)/SUN_RCONST(144.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A*(c1.*c2.*c3.*c4) = 1/30 */
-static booleantype __order6k(realtype *b, realtype **A, realtype *c1, realtype *c2, realtype *c3, realtype *c4, int s)
+static sunbooleantype __order6k(sunrealtype *b, sunrealtype **A, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, sunrealtype *c4, int s)
 {
-  realtype bAcccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c4,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAcccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAcccc - RCONST(1.0)/RCONST(30.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcccc - SUN_RCONST(1.0)/SUN_RCONST(30.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*(c1.*c2.*(A2*c3)) = 1/60 */
-static booleantype __order6l(realtype *b, realtype **A1, realtype *c1, realtype *c2, realtype **A2, realtype *c3, int s)
+static sunbooleantype __order6l(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype *c2, sunrealtype **A2, sunrealtype *c3, int s)
 {
-  realtype bAccAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAccAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAccAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAccAc - RCONST(1.0)/RCONST(60.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAccAc - SUN_RCONST(1.0)/SUN_RCONST(60.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*((A2*c1).*(A3*c2)) = 1/120 */
-static booleantype __order6m(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s)
+static sunbooleantype __order6m(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s)
 {
-  realtype bAAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
-  realtype *tmp3 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp3 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A3,c2,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__mv(A2,c1,s,tmp2)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__vv(tmp1,tmp2,s,tmp3)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp3,s,tmp1)) { free(tmp1); free(tmp2); free(tmp3); return(SUNFALSE); }
   if (__dot(b,tmp1,s,&bAAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2); free(tmp3);
-  return (SUNRabs(bAAcAc - RCONST(1.0)/RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAcAc - SUN_RCONST(1.0)/SUN_RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*(c1.*(A2*(c2.*c3))) = 1/90 */
-static booleantype __order6n(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order6n(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bAcAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c2,c3,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAcAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAcAcc - RCONST(1.0)/RCONST(90.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcAcc - SUN_RCONST(1.0)/SUN_RCONST(90.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*(c1.*(A2*A3*c2)) = 1/180 */
-static booleantype __order6o(realtype *b, realtype **A1, realtype *c1, realtype **A2, realtype **A3, realtype *c2, int s)
+static sunbooleantype __order6o(sunrealtype *b, sunrealtype **A1, sunrealtype *c1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c2, int s)
 {
-  realtype bAcAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAcAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A3,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAcAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAcAAc - RCONST(1.0)/RCONST(180.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAcAAc - SUN_RCONST(1.0)/SUN_RCONST(180.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*(c1.*c2.*c3) = 1/120 */
-static booleantype __order6p(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype *c2, realtype *c3, int s)
+static sunbooleantype __order6p(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype *c2, sunrealtype *c3, int s)
 {
-  realtype bAAccc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAccc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAAccc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAccc - RCONST(1.0)/RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAccc - SUN_RCONST(1.0)/SUN_RCONST(120.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*(c1.*(A3*c2)) = 1/240 */
-static booleantype __order6q(realtype *b, realtype **A1, realtype **A2, realtype *c1, realtype **A3, realtype *c2, int s)
+static sunbooleantype __order6q(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype *c1, sunrealtype **A3, sunrealtype *c2, int s)
 {
-  realtype bAAcAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAcAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A3,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__vv(c1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAAcAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAcAc - RCONST(1.0)/RCONST(240.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAcAc - SUN_RCONST(1.0)/SUN_RCONST(240.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*A3*(c1.*c2) = 1/360 */
-static booleantype __order6r(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype *c1, realtype *c2, int s)
+static sunbooleantype __order6r(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype *c1, sunrealtype *c2, int s)
 {
-  realtype bAAAcc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAAcc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__vv(c1,c2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A3,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAAAcc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAAcc - RCONST(1.0)/RCONST(360.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAAcc - SUN_RCONST(1.0)/SUN_RCONST(360.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 /* b'*A1*A2*A3*A4*c = 1/720 */
-static booleantype __order6s(realtype *b, realtype **A1, realtype **A2, realtype **A3, realtype **A4, realtype *c, int s)
+static sunbooleantype __order6s(sunrealtype *b, sunrealtype **A1, sunrealtype **A2, sunrealtype **A3, sunrealtype **A4, sunrealtype *c, int s)
 {
-  realtype bAAAAc;
-  realtype *tmp1 = calloc( s, sizeof(realtype) );
-  realtype *tmp2 = calloc( s, sizeof(realtype) );
+  sunrealtype bAAAAc;
+  sunrealtype *tmp1 = calloc( s, sizeof(sunrealtype) );
+  sunrealtype *tmp2 = calloc( s, sizeof(sunrealtype) );
   if (__mv(A4,c,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A2,tmp2,s,tmp1)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__mv(A1,tmp1,s,tmp2)) { free(tmp1); free(tmp2); return(SUNFALSE); }
   if (__dot(b,tmp2,s,&bAAAAc))  return(SUNFALSE);
   free(tmp1); free(tmp2);
-  return (SUNRabs(bAAAAc - RCONST(1.0)/RCONST(720.0)) > TOL) ? SUNFALSE : SUNTRUE;
+  return (SUNRabs(bAAAAc - SUN_RCONST(1.0)/SUN_RCONST(720.0)) > TOL) ? SUNFALSE : SUNTRUE;
 }
 
 
@@ -2074,19 +2074,19 @@ static booleantype __order6s(realtype *b, realtype **A1, realtype **A2, realtype
   Utility routine to check Butcher's simplifying assumptions.
   Returns the maximum predicted order.
   ---------------------------------------------------------------*/
-static int __ButcherSimplifyingAssumptions(realtype **A, realtype *b, realtype *c, int s)
+static int __ButcherSimplifyingAssumptions(sunrealtype **A, sunrealtype *b, sunrealtype *c, int s)
 {
   int P, Q, R, i, j, k, q;
-  realtype RHS, LHS;
-  booleantype alltrue;
-  realtype *tmp = calloc( s, sizeof(realtype) );
+  sunrealtype RHS, LHS;
+  sunbooleantype alltrue;
+  sunrealtype *tmp = calloc( s, sizeof(sunrealtype) );
 
   /* B(P) */
   P = 0;
   for (i=1; i<1000; i++) {
     if (__vp(c,i-1,s,tmp)) { free(tmp); return(0); }
     if (__dot(b,tmp,s,&LHS)) { free(tmp); return(0); }
-    RHS = RCONST(1.0)/i;
+    RHS = SUN_RCONST(1.0)/i;
     if (SUNRabs(RHS-LHS) > TOL)
       break;
     P++;
@@ -2117,10 +2117,10 @@ static int __ButcherSimplifyingAssumptions(realtype **A, realtype *b, realtype *
   for (k=1; k<1000; k++) {
     alltrue = SUNTRUE;
     for (j=0; j<s; j++) {
-      LHS = RCONST(0.0);
+      LHS = SUN_RCONST(0.0);
       for (i=0; i<s; i++)
         LHS += A[i][j]*b[i]*SUNRpowerI(c[i],k-1);
-      RHS = b[j]/k*(RCONST(1.0)-SUNRpowerI(c[j],k));
+      RHS = b[j]/k*(SUN_RCONST(1.0)-SUNRpowerI(c[j],k));
       if (SUNRabs(RHS-LHS) > TOL) {
         alltrue = SUNFALSE;
         break;
diff --git a/src/arkode/arkode_butcher_dirk.def b/src/arkode/arkode_butcher_dirk.def
index a3cca75f66..2358f3275f 100644
--- a/src/arkode/arkode_butcher_dirk.def
+++ b/src/arkode/arkode_butcher_dirk.def
@@ -70,17 +70,17 @@ ARK_BUTCHER_TABLE(ARKODE_SDIRK_2_1_2, { /* SDIRK-2-1 (A,B stable) */
     B->q = 2;
     B->p = 1;
 
-    B->A[0][0] = RCONST(1.0);
-    B->A[1][0] = RCONST(-1.0);
-    B->A[1][1] = RCONST(1.0);
+    B->A[0][0] = SUN_RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(-1.0);
+    B->A[1][1] = SUN_RCONST(1.0);
 
-    B->b[0] = RCONST(0.5);
-    B->b[1] = RCONST(0.5);
+    B->b[0] = SUN_RCONST(0.5);
+    B->b[1] = SUN_RCONST(0.5);
 
-    B->d[0] = RCONST(1.0);
+    B->d[0] = SUN_RCONST(1.0);
 
-    B->c[0] = RCONST(1.0);
-    B->c[1] = RCONST(0.0);
+    B->c[0] = SUN_RCONST(1.0);
+    B->c[1] = SUN_RCONST(0.0);
     return B;
   })
 
@@ -125,23 +125,23 @@ ARK_BUTCHER_TABLE(ARKODE_BILLINGTON_3_3_2, { /* Billington-SDIRK */
     B->q = 2;
     B->p = 3;
 
-    B->A[0][0] = RCONST(0.292893218813);
-    B->A[1][0] = RCONST(0.798989873223);
-    B->A[1][1] = RCONST(0.292893218813);
-    B->A[2][0] = RCONST(0.740789228841);
-    B->A[2][1] = RCONST(0.259210771159);
-    B->A[2][2] = RCONST(0.292893218813);
+    B->A[0][0] = SUN_RCONST(0.292893218813);
+    B->A[1][0] = SUN_RCONST(0.798989873223);
+    B->A[1][1] = SUN_RCONST(0.292893218813);
+    B->A[2][0] = SUN_RCONST(0.740789228841);
+    B->A[2][1] = SUN_RCONST(0.259210771159);
+    B->A[2][2] = SUN_RCONST(0.292893218813);
 
-    B->d[0] = RCONST(0.691665115992);
-    B->d[1] = RCONST(0.503597029883);
-    B->d[2] = RCONST(-0.195262145876);
+    B->d[0] = SUN_RCONST(0.691665115992);
+    B->d[1] = SUN_RCONST(0.503597029883);
+    B->d[2] = SUN_RCONST(-0.195262145876);
 
-    B->b[0] = RCONST(0.740789228840);
-    B->b[1] = RCONST(0.259210771159);
+    B->b[0] = SUN_RCONST(0.740789228840);
+    B->b[1] = SUN_RCONST(0.259210771159);
 
-    B->c[0] = RCONST(0.292893218813);
-    B->c[1] = RCONST(1.091883092037);
-    B->c[2] = RCONST(1.292893218813);
+    B->c[0] = SUN_RCONST(0.292893218813);
+    B->c[1] = SUN_RCONST(1.091883092037);
+    B->c[2] = SUN_RCONST(1.292893218813);
     return B;
   })
 
@@ -150,22 +150,22 @@ ARK_BUTCHER_TABLE(ARKODE_TRBDF2_3_3_2, { /* TRBDF2-ESDIRK */
     B->q = 2;
     B->p = 3;
 
-    B->A[1][0] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(2.0);
-    B->A[1][1] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(2.0);
-    B->A[2][0] = SUNRsqrt(RCONST(2.0))/RCONST(4.0);
-    B->A[2][1] = SUNRsqrt(RCONST(2.0))/RCONST(4.0);
-    B->A[2][2] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(2.0);
+    B->A[1][0] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2.0);
+    B->A[1][1] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2.0);
+    B->A[2][0] = SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0);
+    B->A[2][1] = SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0);
+    B->A[2][2] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2.0);
 
-    B->d[0] = (RCONST(1.0)-SUNRsqrt(RCONST(2.0))/RCONST(4.0))/RCONST(3.0);
-    B->d[1] = (RCONST(3.0)*SUNRsqrt(RCONST(2.0))/RCONST(4.0)+RCONST(1.0))/RCONST(3.0);
-    B->d[2] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(6.0);
+    B->d[0] = (SUN_RCONST(1.0)-SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0))/SUN_RCONST(3.0);
+    B->d[1] = (SUN_RCONST(3.0)*SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0)+SUN_RCONST(1.0))/SUN_RCONST(3.0);
+    B->d[2] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(6.0);
 
-    B->b[0] = SUNRsqrt(RCONST(2.0))/RCONST(4.0);
-    B->b[1] = SUNRsqrt(RCONST(2.0))/RCONST(4.0);
-    B->b[2] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(2.0);
+    B->b[0] = SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0);
+    B->b[1] = SUNRsqrt(SUN_RCONST(2.0))/SUN_RCONST(4.0);
+    B->b[2] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2.0);
 
-    B->c[1] = RCONST(2.0)-SUNRsqrt(RCONST(2.0));
-    B->c[2] = RCONST(1.0);
+    B->c[1] = SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0));
+    B->c[2] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -173,28 +173,28 @@ ARK_BUTCHER_TABLE(ARKODE_KVAERNO_4_2_3, { /* Kvaerno(4,2,3)-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(4, SUNTRUE);
     B->q = 3;
     B->p = 2;
-    B->A[1][0] = RCONST(0.4358665215);
-    B->A[1][1] = RCONST(0.4358665215);
-    B->A[2][0] = RCONST(0.490563388419108);
-    B->A[2][1] = RCONST(0.073570090080892);
-    B->A[2][2] = RCONST(0.4358665215);
-    B->A[3][0] = RCONST(0.308809969973036);
-    B->A[3][1] = RCONST(1.490563388254106);
-    B->A[3][2] = RCONST(-1.235239879727145);
-    B->A[3][3] = RCONST(0.4358665215);
-
-    B->b[0] = RCONST(0.308809969973036);
-    B->b[1] = RCONST(1.490563388254106);
-    B->b[2] = RCONST(-1.235239879727145);
-    B->b[3] = RCONST(0.4358665215);
-
-    B->d[0] = RCONST(0.490563388419108);
-    B->d[1] = RCONST(0.073570090080892);
-    B->d[2] = RCONST(0.4358665215);
-
-    B->c[1] = RCONST(0.871733043);
-    B->c[2] = RCONST(1.0);
-    B->c[3] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(0.4358665215);
+    B->A[1][1] = SUN_RCONST(0.4358665215);
+    B->A[2][0] = SUN_RCONST(0.490563388419108);
+    B->A[2][1] = SUN_RCONST(0.073570090080892);
+    B->A[2][2] = SUN_RCONST(0.4358665215);
+    B->A[3][0] = SUN_RCONST(0.308809969973036);
+    B->A[3][1] = SUN_RCONST(1.490563388254106);
+    B->A[3][2] = SUN_RCONST(-1.235239879727145);
+    B->A[3][3] = SUN_RCONST(0.4358665215);
+
+    B->b[0] = SUN_RCONST(0.308809969973036);
+    B->b[1] = SUN_RCONST(1.490563388254106);
+    B->b[2] = SUN_RCONST(-1.235239879727145);
+    B->b[3] = SUN_RCONST(0.4358665215);
+
+    B->d[0] = SUN_RCONST(0.490563388419108);
+    B->d[1] = SUN_RCONST(0.073570090080892);
+    B->d[2] = SUN_RCONST(0.4358665215);
+
+    B->c[1] = SUN_RCONST(0.871733043);
+    B->c[2] = SUN_RCONST(1.0);
+    B->c[3] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -202,29 +202,29 @@ ARK_BUTCHER_TABLE(ARKODE_ARK324L2SA_DIRK_4_2_3, { /* ARK3(2)4L[2]SA-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(4, SUNTRUE);
     B->q = 3;
     B->p = 2;
-    B->A[1][0] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-    B->A[1][1] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-    B->A[2][0] = RCONST(2746238789719.0)/RCONST(10658868560708.0);
-    B->A[2][1] = RCONST(-640167445237.0)/RCONST(6845629431997.0);
-    B->A[2][2] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-    B->A[3][0] = RCONST(1471266399579.0)/RCONST(7840856788654.0);
-    B->A[3][1] = RCONST(-4482444167858.0)/RCONST(7529755066697.0);
-    B->A[3][2] = RCONST(11266239266428.0)/RCONST(11593286722821.0);
-    B->A[3][3] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-
-    B->b[0] = RCONST(1471266399579.0)/RCONST(7840856788654.0);
-    B->b[1] = RCONST(-4482444167858.0)/RCONST(7529755066697.0);
-    B->b[2] = RCONST(11266239266428.0)/RCONST(11593286722821.0);
-    B->b[3] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-
-    B->d[0] = RCONST(2756255671327.0)/RCONST(12835298489170.0);
-    B->d[1] = RCONST(-10771552573575.0)/RCONST(22201958757719.0);
-    B->d[2] = RCONST(9247589265047.0)/RCONST(10645013368117.0);
-    B->d[3] = RCONST(2193209047091.0)/RCONST(5459859503100.0);
-
-    B->c[1] = RCONST(1767732205903.0)/RCONST(2027836641118.0);
-    B->c[2] = RCONST(3.0)/RCONST(5.0);
-    B->c[3] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+    B->A[1][1] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+    B->A[2][0] = SUN_RCONST(2746238789719.0)/SUN_RCONST(10658868560708.0);
+    B->A[2][1] = SUN_RCONST(-640167445237.0)/SUN_RCONST(6845629431997.0);
+    B->A[2][2] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+    B->A[3][0] = SUN_RCONST(1471266399579.0)/SUN_RCONST(7840856788654.0);
+    B->A[3][1] = SUN_RCONST(-4482444167858.0)/SUN_RCONST(7529755066697.0);
+    B->A[3][2] = SUN_RCONST(11266239266428.0)/SUN_RCONST(11593286722821.0);
+    B->A[3][3] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+
+    B->b[0] = SUN_RCONST(1471266399579.0)/SUN_RCONST(7840856788654.0);
+    B->b[1] = SUN_RCONST(-4482444167858.0)/SUN_RCONST(7529755066697.0);
+    B->b[2] = SUN_RCONST(11266239266428.0)/SUN_RCONST(11593286722821.0);
+    B->b[3] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+
+    B->d[0] = SUN_RCONST(2756255671327.0)/SUN_RCONST(12835298489170.0);
+    B->d[1] = SUN_RCONST(-10771552573575.0)/SUN_RCONST(22201958757719.0);
+    B->d[2] = SUN_RCONST(9247589265047.0)/SUN_RCONST(10645013368117.0);
+    B->d[3] = SUN_RCONST(2193209047091.0)/SUN_RCONST(5459859503100.0);
+
+    B->c[1] = SUN_RCONST(1767732205903.0)/SUN_RCONST(2027836641118.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[3] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -232,36 +232,36 @@ ARK_BUTCHER_TABLE(ARKODE_CASH_5_2_4, { /* Cash(5,2,4)-SDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 2;
-    B->A[0][0] = RCONST(0.435866521508);
-    B->A[1][0] = RCONST(-1.13586652150);
-    B->A[1][1] = RCONST(0.435866521508);
-    B->A[2][0] = RCONST(1.08543330679);
-    B->A[2][1] = RCONST(-0.721299828287);
-    B->A[2][2] = RCONST(0.435866521508);
-    B->A[3][0] = RCONST(0.416349501547);
-    B->A[3][1] = RCONST(0.190984004184);
-    B->A[3][2] = RCONST(-0.118643265417);
-    B->A[3][3] = RCONST(0.435866521508);
-    B->A[4][0] = RCONST(0.896869652944);
-    B->A[4][1] = RCONST(0.0182725272734);
-    B->A[4][2] = RCONST(-0.0845900310706);
-    B->A[4][3] = RCONST(-0.266418670647);
-    B->A[4][4] = RCONST(0.435866521508);
-
-    B->b[0] = RCONST(0.896869652944);
-    B->b[1] = RCONST(0.0182725272734);
-    B->b[2] = RCONST(-0.0845900310706);
-    B->b[3] = RCONST(-0.266418670647);
-    B->b[4] = RCONST(0.435866521508);
-
-    B->d[0] = (RCONST(-0.7)-RCONST(0.5))/(RCONST(-0.7)-RCONST(0.435866521508));
-    B->d[1] = (RCONST(0.5)-RCONST(0.435866521508))/(RCONST(-0.7)-RCONST(0.435866521508));
-
-    B->c[0] = RCONST(0.435866521508);
-    B->c[1] = RCONST(-0.7);
-    B->c[2] = RCONST(0.8);
-    B->c[3] = RCONST(0.924556761814);
-    B->c[4] = RCONST(1.0);
+    B->A[0][0] = SUN_RCONST(0.435866521508);
+    B->A[1][0] = SUN_RCONST(-1.13586652150);
+    B->A[1][1] = SUN_RCONST(0.435866521508);
+    B->A[2][0] = SUN_RCONST(1.08543330679);
+    B->A[2][1] = SUN_RCONST(-0.721299828287);
+    B->A[2][2] = SUN_RCONST(0.435866521508);
+    B->A[3][0] = SUN_RCONST(0.416349501547);
+    B->A[3][1] = SUN_RCONST(0.190984004184);
+    B->A[3][2] = SUN_RCONST(-0.118643265417);
+    B->A[3][3] = SUN_RCONST(0.435866521508);
+    B->A[4][0] = SUN_RCONST(0.896869652944);
+    B->A[4][1] = SUN_RCONST(0.0182725272734);
+    B->A[4][2] = SUN_RCONST(-0.0845900310706);
+    B->A[4][3] = SUN_RCONST(-0.266418670647);
+    B->A[4][4] = SUN_RCONST(0.435866521508);
+
+    B->b[0] = SUN_RCONST(0.896869652944);
+    B->b[1] = SUN_RCONST(0.0182725272734);
+    B->b[2] = SUN_RCONST(-0.0845900310706);
+    B->b[3] = SUN_RCONST(-0.266418670647);
+    B->b[4] = SUN_RCONST(0.435866521508);
+
+    B->d[0] = (SUN_RCONST(-0.7)-SUN_RCONST(0.5))/(SUN_RCONST(-0.7)-SUN_RCONST(0.435866521508));
+    B->d[1] = (SUN_RCONST(0.5)-SUN_RCONST(0.435866521508))/(SUN_RCONST(-0.7)-SUN_RCONST(0.435866521508));
+
+    B->c[0] = SUN_RCONST(0.435866521508);
+    B->c[1] = SUN_RCONST(-0.7);
+    B->c[2] = SUN_RCONST(0.8);
+    B->c[3] = SUN_RCONST(0.924556761814);
+    B->c[4] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -269,38 +269,38 @@ ARK_BUTCHER_TABLE(ARKODE_CASH_5_3_4, { /* Cash(5,3,4)-SDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[0][0] = RCONST(0.435866521508);
-    B->A[1][0] = RCONST(-1.13586652150);
-    B->A[1][1] = RCONST(0.435866521508);
-    B->A[2][0] = RCONST(1.08543330679);
-    B->A[2][1] = RCONST(-0.721299828287);
-    B->A[2][2] = RCONST(0.435866521508);
-    B->A[3][0] = RCONST(0.416349501547);
-    B->A[3][1] = RCONST(0.190984004184);
-    B->A[3][2] = RCONST(-0.118643265417);
-    B->A[3][3] = RCONST(0.435866521508);
-    B->A[4][0] = RCONST(0.896869652944);
-    B->A[4][1] = RCONST(0.0182725272734);
-    B->A[4][2] = RCONST(-0.0845900310706);
-    B->A[4][3] = RCONST(-0.266418670647);
-    B->A[4][4] = RCONST(0.435866521508);
-
-    B->b[0] = RCONST(0.896869652944);
-    B->b[1] = RCONST(0.0182725272734);
-    B->b[2] = RCONST(-0.0845900310706);
-    B->b[3] = RCONST(-0.266418670647);
-    B->b[4] = RCONST(0.435866521508);
-
-    B->d[0] = RCONST(0.776691932910);
-    B->d[1] = RCONST(0.0297472791484);
-    B->d[2] = RCONST(-0.0267440239074);
-    B->d[3] = RCONST(0.220304811849);
-
-    B->c[0] = RCONST(0.435866521508);
-    B->c[1] = RCONST(-0.7);
-    B->c[2] = RCONST(0.8);
-    B->c[3] = RCONST(0.924556761814);
-    B->c[4] = RCONST(1.0);
+    B->A[0][0] = SUN_RCONST(0.435866521508);
+    B->A[1][0] = SUN_RCONST(-1.13586652150);
+    B->A[1][1] = SUN_RCONST(0.435866521508);
+    B->A[2][0] = SUN_RCONST(1.08543330679);
+    B->A[2][1] = SUN_RCONST(-0.721299828287);
+    B->A[2][2] = SUN_RCONST(0.435866521508);
+    B->A[3][0] = SUN_RCONST(0.416349501547);
+    B->A[3][1] = SUN_RCONST(0.190984004184);
+    B->A[3][2] = SUN_RCONST(-0.118643265417);
+    B->A[3][3] = SUN_RCONST(0.435866521508);
+    B->A[4][0] = SUN_RCONST(0.896869652944);
+    B->A[4][1] = SUN_RCONST(0.0182725272734);
+    B->A[4][2] = SUN_RCONST(-0.0845900310706);
+    B->A[4][3] = SUN_RCONST(-0.266418670647);
+    B->A[4][4] = SUN_RCONST(0.435866521508);
+
+    B->b[0] = SUN_RCONST(0.896869652944);
+    B->b[1] = SUN_RCONST(0.0182725272734);
+    B->b[2] = SUN_RCONST(-0.0845900310706);
+    B->b[3] = SUN_RCONST(-0.266418670647);
+    B->b[4] = SUN_RCONST(0.435866521508);
+
+    B->d[0] = SUN_RCONST(0.776691932910);
+    B->d[1] = SUN_RCONST(0.0297472791484);
+    B->d[2] = SUN_RCONST(-0.0267440239074);
+    B->d[3] = SUN_RCONST(0.220304811849);
+
+    B->c[0] = SUN_RCONST(0.435866521508);
+    B->c[1] = SUN_RCONST(-0.7);
+    B->c[2] = SUN_RCONST(0.8);
+    B->c[3] = SUN_RCONST(0.924556761814);
+    B->c[4] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -308,38 +308,38 @@ ARK_BUTCHER_TABLE(ARKODE_SDIRK_5_3_4, { /* SDIRK-5-4 */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[0][0] = RCONST(0.25);
-    B->A[1][0] = RCONST(0.5);
-    B->A[1][1] = RCONST(0.25);
-    B->A[2][0] = RCONST(17.0)/RCONST(50.0);
-    B->A[2][1] = RCONST(-1.0)/RCONST(25.0);
-    B->A[2][2] = RCONST(0.25);
-    B->A[3][0] = RCONST(371.0)/RCONST(1360.0);
-    B->A[3][1] = RCONST(-137.0)/RCONST(2720.0);
-    B->A[3][2] = RCONST(15.0)/RCONST(544.0);
-    B->A[3][3] = RCONST(0.25);
-    B->A[4][0] = RCONST(25.0)/RCONST(24.0);
-    B->A[4][1] = RCONST(-49.0)/RCONST(48.0);
-    B->A[4][2] = RCONST(125.0)/RCONST(16.0);
-    B->A[4][3] = RCONST(-85.0)/RCONST(12.0);
-    B->A[4][4] = RCONST(0.25);
-
-    B->b[0] = RCONST(25.0)/RCONST(24.0);
-    B->b[1] = RCONST(-49.0)/RCONST(48.0);
-    B->b[2] = RCONST(125.0)/RCONST(16.0);
-    B->b[3] = RCONST(-85.0)/RCONST(12.0);
-    B->b[4] = RCONST(0.25);
-
-    B->d[0] = RCONST(59.0)/RCONST(48.0);
-    B->d[1] = RCONST(-17.0)/RCONST(96.0);
-    B->d[2] = RCONST(225.0)/RCONST(32.0);
-    B->d[3] = RCONST(-85.0)/RCONST(12.0);
-
-    B->c[0] = RCONST(0.25);
-    B->c[1] = RCONST(0.75);
-    B->c[2] = RCONST(11.0)/RCONST(20.0);
-    B->c[3] = RCONST(0.5);
-    B->c[4] = RCONST(1.0);
+    B->A[0][0] = SUN_RCONST(0.25);
+    B->A[1][0] = SUN_RCONST(0.5);
+    B->A[1][1] = SUN_RCONST(0.25);
+    B->A[2][0] = SUN_RCONST(17.0)/SUN_RCONST(50.0);
+    B->A[2][1] = SUN_RCONST(-1.0)/SUN_RCONST(25.0);
+    B->A[2][2] = SUN_RCONST(0.25);
+    B->A[3][0] = SUN_RCONST(371.0)/SUN_RCONST(1360.0);
+    B->A[3][1] = SUN_RCONST(-137.0)/SUN_RCONST(2720.0);
+    B->A[3][2] = SUN_RCONST(15.0)/SUN_RCONST(544.0);
+    B->A[3][3] = SUN_RCONST(0.25);
+    B->A[4][0] = SUN_RCONST(25.0)/SUN_RCONST(24.0);
+    B->A[4][1] = SUN_RCONST(-49.0)/SUN_RCONST(48.0);
+    B->A[4][2] = SUN_RCONST(125.0)/SUN_RCONST(16.0);
+    B->A[4][3] = SUN_RCONST(-85.0)/SUN_RCONST(12.0);
+    B->A[4][4] = SUN_RCONST(0.25);
+
+    B->b[0] = SUN_RCONST(25.0)/SUN_RCONST(24.0);
+    B->b[1] = SUN_RCONST(-49.0)/SUN_RCONST(48.0);
+    B->b[2] = SUN_RCONST(125.0)/SUN_RCONST(16.0);
+    B->b[3] = SUN_RCONST(-85.0)/SUN_RCONST(12.0);
+    B->b[4] = SUN_RCONST(0.25);
+
+    B->d[0] = SUN_RCONST(59.0)/SUN_RCONST(48.0);
+    B->d[1] = SUN_RCONST(-17.0)/SUN_RCONST(96.0);
+    B->d[2] = SUN_RCONST(225.0)/SUN_RCONST(32.0);
+    B->d[3] = SUN_RCONST(-85.0)/SUN_RCONST(12.0);
+
+    B->c[0] = SUN_RCONST(0.25);
+    B->c[1] = SUN_RCONST(0.75);
+    B->c[2] = SUN_RCONST(11.0)/SUN_RCONST(20.0);
+    B->c[3] = SUN_RCONST(0.5);
+    B->c[4] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -347,36 +347,36 @@ ARK_BUTCHER_TABLE(ARKODE_KVAERNO_5_3_4, { /* Kvaerno(5,3,4)-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(0.4358665215);
-    B->A[1][1] = RCONST(0.4358665215);
-    B->A[2][0] = RCONST(0.140737774731968);
-    B->A[2][1] = RCONST(-0.108365551378832);
-    B->A[2][2] = RCONST(0.4358665215);
-    B->A[3][0] = RCONST(0.102399400616089);
-    B->A[3][1] = RCONST(-0.376878452267324);
-    B->A[3][2] = RCONST(0.838612530151233);
-    B->A[3][3] = RCONST(0.4358665215);
-    B->A[4][0] = RCONST(0.157024897860995);
-    B->A[4][1] = RCONST(0.117330441357768);
-    B->A[4][2] = RCONST(0.61667803039168);
-    B->A[4][3] = RCONST(-0.326899891110444);
-    B->A[4][4] = RCONST(0.4358665215);
-
-    B->b[0] = RCONST(0.157024897860995);
-    B->b[1] = RCONST(0.117330441357768);
-    B->b[2] = RCONST(0.61667803039168);
-    B->b[3] = RCONST(-0.326899891110444);
-    B->b[4] = RCONST(0.4358665215);
-
-    B->d[0] = RCONST(0.102399400616089);
-    B->d[1] = RCONST(-0.376878452267324);
-    B->d[2] = RCONST(0.838612530151233);
-    B->d[3] = RCONST(0.4358665215);
-
-    B->c[1] = RCONST(0.871733043);
-    B->c[2] = RCONST(0.468238744853136);
-    B->c[3] = RCONST(1.0);
-    B->c[4] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(0.4358665215);
+    B->A[1][1] = SUN_RCONST(0.4358665215);
+    B->A[2][0] = SUN_RCONST(0.140737774731968);
+    B->A[2][1] = SUN_RCONST(-0.108365551378832);
+    B->A[2][2] = SUN_RCONST(0.4358665215);
+    B->A[3][0] = SUN_RCONST(0.102399400616089);
+    B->A[3][1] = SUN_RCONST(-0.376878452267324);
+    B->A[3][2] = SUN_RCONST(0.838612530151233);
+    B->A[3][3] = SUN_RCONST(0.4358665215);
+    B->A[4][0] = SUN_RCONST(0.157024897860995);
+    B->A[4][1] = SUN_RCONST(0.117330441357768);
+    B->A[4][2] = SUN_RCONST(0.61667803039168);
+    B->A[4][3] = SUN_RCONST(-0.326899891110444);
+    B->A[4][4] = SUN_RCONST(0.4358665215);
+
+    B->b[0] = SUN_RCONST(0.157024897860995);
+    B->b[1] = SUN_RCONST(0.117330441357768);
+    B->b[2] = SUN_RCONST(0.61667803039168);
+    B->b[3] = SUN_RCONST(-0.326899891110444);
+    B->b[4] = SUN_RCONST(0.4358665215);
+
+    B->d[0] = SUN_RCONST(0.102399400616089);
+    B->d[1] = SUN_RCONST(-0.376878452267324);
+    B->d[2] = SUN_RCONST(0.838612530151233);
+    B->d[3] = SUN_RCONST(0.4358665215);
+
+    B->c[1] = SUN_RCONST(0.871733043);
+    B->c[2] = SUN_RCONST(0.468238744853136);
+    B->c[3] = SUN_RCONST(1.0);
+    B->c[4] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -384,43 +384,43 @@ ARK_BUTCHER_TABLE(ARKODE_ARK436L2SA_DIRK_6_3_4, { /* ARK4(3)6L[2]SA-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(1.0)/RCONST(4.0);
-    B->A[1][1] = RCONST(1.0)/RCONST(4.0);
-    B->A[2][0] = RCONST(8611.0)/RCONST(62500.0);
-    B->A[2][1] = RCONST(-1743.0)/RCONST(31250.0);
-    B->A[2][2] = RCONST(1.0)/RCONST(4.0);
-    B->A[3][0] = RCONST(5012029.0)/RCONST(34652500.0);
-    B->A[3][1] = RCONST(-654441.0)/RCONST(2922500.0);
-    B->A[3][2] = RCONST(174375.0)/RCONST(388108.0);
-    B->A[3][3] = RCONST(1.0)/RCONST(4.0);
-    B->A[4][0] = RCONST(15267082809.0)/RCONST(155376265600.0);
-    B->A[4][1] = RCONST(-71443401.0)/RCONST(120774400.0);
-    B->A[4][2] = RCONST(730878875.0)/RCONST(902184768.0);
-    B->A[4][3] = RCONST(2285395.0)/RCONST(8070912.0);
-    B->A[4][4] = RCONST(1.0)/RCONST(4.0);
-    B->A[5][0] = RCONST(82889.0)/RCONST(524892.0);
-    B->A[5][2] = RCONST(15625.0)/RCONST(83664.0);
-    B->A[5][3] = RCONST(69875.0)/RCONST(102672.0);
-    B->A[5][4] = RCONST(-2260.0)/RCONST(8211.0);
-    B->A[5][5] = RCONST(1.0)/RCONST(4.0);
-
-    B->b[0] = RCONST(82889.0)/RCONST(524892.0);
-    B->b[2] = RCONST(15625.0)/RCONST(83664.0);
-    B->b[3] = RCONST(69875.0)/RCONST(102672.0);
-    B->b[4] = RCONST(-2260.0)/RCONST(8211.0);
-    B->b[5] = RCONST(1.0)/RCONST(4.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(2.0);
-    B->c[2] = RCONST(83.0)/RCONST(250.0);
-    B->c[3] = RCONST(31.0)/RCONST(50.0);
-    B->c[4] = RCONST(17.0)/RCONST(20.0);
-    B->c[5] = RCONST(1.0);
-
-    B->d[0] = RCONST(4586570599.0)/RCONST(29645900160.0);
-    B->d[2] = RCONST(178811875.0)/RCONST(945068544.0);
-    B->d[3] = RCONST(814220225.0)/RCONST(1159782912.0);
-    B->d[4] = RCONST(-3700637.0)/RCONST(11593932.0);
-    B->d[5] = RCONST(61727.0)/RCONST(225920.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[1][1] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[2][0] = SUN_RCONST(8611.0)/SUN_RCONST(62500.0);
+    B->A[2][1] = SUN_RCONST(-1743.0)/SUN_RCONST(31250.0);
+    B->A[2][2] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[3][0] = SUN_RCONST(5012029.0)/SUN_RCONST(34652500.0);
+    B->A[3][1] = SUN_RCONST(-654441.0)/SUN_RCONST(2922500.0);
+    B->A[3][2] = SUN_RCONST(174375.0)/SUN_RCONST(388108.0);
+    B->A[3][3] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[4][0] = SUN_RCONST(15267082809.0)/SUN_RCONST(155376265600.0);
+    B->A[4][1] = SUN_RCONST(-71443401.0)/SUN_RCONST(120774400.0);
+    B->A[4][2] = SUN_RCONST(730878875.0)/SUN_RCONST(902184768.0);
+    B->A[4][3] = SUN_RCONST(2285395.0)/SUN_RCONST(8070912.0);
+    B->A[4][4] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[5][0] = SUN_RCONST(82889.0)/SUN_RCONST(524892.0);
+    B->A[5][2] = SUN_RCONST(15625.0)/SUN_RCONST(83664.0);
+    B->A[5][3] = SUN_RCONST(69875.0)/SUN_RCONST(102672.0);
+    B->A[5][4] = SUN_RCONST(-2260.0)/SUN_RCONST(8211.0);
+    B->A[5][5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->b[0] = SUN_RCONST(82889.0)/SUN_RCONST(524892.0);
+    B->b[2] = SUN_RCONST(15625.0)/SUN_RCONST(83664.0);
+    B->b[3] = SUN_RCONST(69875.0)/SUN_RCONST(102672.0);
+    B->b[4] = SUN_RCONST(-2260.0)/SUN_RCONST(8211.0);
+    B->b[5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[2] = SUN_RCONST(83.0)/SUN_RCONST(250.0);
+    B->c[3] = SUN_RCONST(31.0)/SUN_RCONST(50.0);
+    B->c[4] = SUN_RCONST(17.0)/SUN_RCONST(20.0);
+    B->c[5] = SUN_RCONST(1.0);
+
+    B->d[0] = SUN_RCONST(4586570599.0)/SUN_RCONST(29645900160.0);
+    B->d[2] = SUN_RCONST(178811875.0)/SUN_RCONST(945068544.0);
+    B->d[3] = SUN_RCONST(814220225.0)/SUN_RCONST(1159782912.0);
+    B->d[4] = SUN_RCONST(-3700637.0)/SUN_RCONST(11593932.0);
+    B->d[5] = SUN_RCONST(61727.0)/SUN_RCONST(225920.0);
     return B;
   });
 
@@ -429,50 +429,50 @@ ARK_BUTCHER_TABLE(ARKODE_ARK437L2SA_DIRK_7_3_4, { /* ARK4(3)7L[2]SA-ESDIRK */
     B->q = 4;
     B->p = 3;
 
-    B->A[1][0] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[1][1] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[2][0] = RCONST(624185399699.0)/RCONST(4186980696204.0);
-    B->A[2][1] = RCONST(624185399699.0)/RCONST(4186980696204.0);
-    B->A[2][2] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[3][0] = RCONST(1258591069120.0)/RCONST(10082082980243.0);
-    B->A[3][1] = RCONST(1258591069120.0)/RCONST(10082082980243.0);
-    B->A[3][2] = RCONST(-322722984531.0)/RCONST(8455138723562.0);
-    B->A[3][3] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[4][0] = RCONST(-436103496990.0)/RCONST(5971407786587.0);
-    B->A[4][1] = RCONST(-436103496990.0)/RCONST(5971407786587.0);
-    B->A[4][2] = RCONST(-2689175662187.0)/RCONST(11046760208243.0);
-    B->A[4][3] = RCONST(4431412449334.0)/RCONST(12995360898505.0);
-    B->A[4][4] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[5][0] = RCONST(-2207373168298.0)/RCONST(14430576638973.0);
-    B->A[5][1] = RCONST(-2207373168298.0)/RCONST(14430576638973.0);
-    B->A[5][2] = RCONST(242511121179.0)/RCONST(3358618340039.0);
-    B->A[5][3] = RCONST(3145666661981.0)/RCONST(7780404714551.0);
-    B->A[5][4] = RCONST(5882073923981.0)/RCONST(14490790706663.0);
-    B->A[5][5] = RCONST(1235.0)/RCONST(10000.0);
-    B->A[6][2] = RCONST(9164257142617.0)/RCONST(17756377923965.0);
-    B->A[6][3] = RCONST(-10812980402763.0)/RCONST(74029279521829.0);
-    B->A[6][4] = RCONST(1335994250573.0)/RCONST(5691609445217.0);
-    B->A[6][5] = RCONST(2273837961795.0)/RCONST(8368240463276.0);
-    B->A[6][6] = RCONST(1235.0)/RCONST(10000.0);
-
-    B->b[2] = RCONST(9164257142617.0)/RCONST(17756377923965.0);
-    B->b[3] = RCONST(-10812980402763.0)/RCONST(74029279521829.0);
-    B->b[4] = RCONST(1335994250573.0)/RCONST(5691609445217.0);
-    B->b[5] = RCONST(2273837961795.0)/RCONST(8368240463276.0);
-    B->b[6] = RCONST(1235.0)/RCONST(10000.0);
-
-    B->c[1] = RCONST(247.0)/RCONST(1000.0);
-    B->c[2] = RCONST(4276536705230.0)/RCONST(10142255878289.0);
-    B->c[3] = RCONST(67.0)/RCONST(200.0);
-    B->c[4] = RCONST(3.0)/RCONST(40.0);
-    B->c[5] = RCONST(7.0)/RCONST(10.0);
-    B->c[6] = RCONST(1.0);
-
-    B->d[2] = RCONST(4469248916618.0)/RCONST(8635866897933.0);
-    B->d[3] = RCONST(-621260224600.0)/RCONST(4094290005349.0);
-    B->d[4] = RCONST(696572312987.0)/RCONST(2942599194819.0);
-    B->d[5] = RCONST(1532940081127.0)/RCONST(5565293938103.0);
-    B->d[6] = RCONST(2441.0)/RCONST(20000.0);
+    B->A[1][0] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[1][1] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[2][0] = SUN_RCONST(624185399699.0)/SUN_RCONST(4186980696204.0);
+    B->A[2][1] = SUN_RCONST(624185399699.0)/SUN_RCONST(4186980696204.0);
+    B->A[2][2] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[3][0] = SUN_RCONST(1258591069120.0)/SUN_RCONST(10082082980243.0);
+    B->A[3][1] = SUN_RCONST(1258591069120.0)/SUN_RCONST(10082082980243.0);
+    B->A[3][2] = SUN_RCONST(-322722984531.0)/SUN_RCONST(8455138723562.0);
+    B->A[3][3] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[4][0] = SUN_RCONST(-436103496990.0)/SUN_RCONST(5971407786587.0);
+    B->A[4][1] = SUN_RCONST(-436103496990.0)/SUN_RCONST(5971407786587.0);
+    B->A[4][2] = SUN_RCONST(-2689175662187.0)/SUN_RCONST(11046760208243.0);
+    B->A[4][3] = SUN_RCONST(4431412449334.0)/SUN_RCONST(12995360898505.0);
+    B->A[4][4] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[5][0] = SUN_RCONST(-2207373168298.0)/SUN_RCONST(14430576638973.0);
+    B->A[5][1] = SUN_RCONST(-2207373168298.0)/SUN_RCONST(14430576638973.0);
+    B->A[5][2] = SUN_RCONST(242511121179.0)/SUN_RCONST(3358618340039.0);
+    B->A[5][3] = SUN_RCONST(3145666661981.0)/SUN_RCONST(7780404714551.0);
+    B->A[5][4] = SUN_RCONST(5882073923981.0)/SUN_RCONST(14490790706663.0);
+    B->A[5][5] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+    B->A[6][2] = SUN_RCONST(9164257142617.0)/SUN_RCONST(17756377923965.0);
+    B->A[6][3] = SUN_RCONST(-10812980402763.0)/SUN_RCONST(74029279521829.0);
+    B->A[6][4] = SUN_RCONST(1335994250573.0)/SUN_RCONST(5691609445217.0);
+    B->A[6][5] = SUN_RCONST(2273837961795.0)/SUN_RCONST(8368240463276.0);
+    B->A[6][6] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+
+    B->b[2] = SUN_RCONST(9164257142617.0)/SUN_RCONST(17756377923965.0);
+    B->b[3] = SUN_RCONST(-10812980402763.0)/SUN_RCONST(74029279521829.0);
+    B->b[4] = SUN_RCONST(1335994250573.0)/SUN_RCONST(5691609445217.0);
+    B->b[5] = SUN_RCONST(2273837961795.0)/SUN_RCONST(8368240463276.0);
+    B->b[6] = SUN_RCONST(1235.0)/SUN_RCONST(10000.0);
+
+    B->c[1] = SUN_RCONST(247.0)/SUN_RCONST(1000.0);
+    B->c[2] = SUN_RCONST(4276536705230.0)/SUN_RCONST(10142255878289.0);
+    B->c[3] = SUN_RCONST(67.0)/SUN_RCONST(200.0);
+    B->c[4] = SUN_RCONST(3.0)/SUN_RCONST(40.0);
+    B->c[5] = SUN_RCONST(7.0)/SUN_RCONST(10.0);
+    B->c[6] = SUN_RCONST(1.0);
+
+    B->d[2] = SUN_RCONST(4469248916618.0)/SUN_RCONST(8635866897933.0);
+    B->d[3] = SUN_RCONST(-621260224600.0)/SUN_RCONST(4094290005349.0);
+    B->d[4] = SUN_RCONST(696572312987.0)/SUN_RCONST(2942599194819.0);
+    B->d[5] = SUN_RCONST(1532940081127.0)/SUN_RCONST(5565293938103.0);
+    B->d[6] = SUN_RCONST(2441.0)/SUN_RCONST(20000.0);
     return B;
   })
 
@@ -480,51 +480,51 @@ ARK_BUTCHER_TABLE(ARKODE_KVAERNO_7_4_5, { /* Kvaerno(7,4,5)-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(7, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(0.26);
-    B->A[1][1] = RCONST(0.26);
-    B->A[2][0] = RCONST(0.13);
-    B->A[2][1] = RCONST(0.84033320996790809);
-    B->A[2][2] = RCONST(0.26);
-    B->A[3][0] = RCONST(0.22371961478320505);
-    B->A[3][1] = RCONST(0.47675532319799699);
-    B->A[3][2] = RCONST(-0.06470895363112615);
-    B->A[3][3] = RCONST(0.26);
-    B->A[4][0] = RCONST(0.16648564323248321);
-    B->A[4][1] = RCONST(0.10450018841591720);
-    B->A[4][2] = RCONST(0.03631482272098715);
-    B->A[4][3] = RCONST(-0.13090704451073998);
-    B->A[4][4] = RCONST(0.26);
-    B->A[5][0] = RCONST(0.13855640231268224);
-    B->A[5][2] = RCONST(-0.04245337201752043);
-    B->A[5][3] = RCONST(0.02446657898003141);
-    B->A[5][4] = RCONST(0.61943039072480676);
-    B->A[5][5] = RCONST(0.26);
-    B->A[6][0] = RCONST(0.13659751177640291);
-    B->A[6][2] = RCONST(-0.05496908796538376);
-    B->A[6][3] = RCONST(-0.04118626728321046);
-    B->A[6][4] = RCONST(0.62993304899016403);
-    B->A[6][5] = RCONST(0.06962479448202728);
-    B->A[6][6] = RCONST(0.26);
-
-    B->b[0] = RCONST(0.13659751177640291);
-    B->b[2] = RCONST(-0.05496908796538376);
-    B->b[3] = RCONST(-0.04118626728321046);
-    B->b[4] = RCONST(0.62993304899016403);
-    B->b[5] = RCONST(0.06962479448202728);
-    B->b[6] = RCONST(0.26);
-
-    B->d[0] = RCONST(0.13855640231268224);
-    B->d[2] = RCONST(-0.04245337201752043);
-    B->d[3] = RCONST(0.02446657898003141);
-    B->d[4] = RCONST(0.61943039072480676);
-    B->d[5] = RCONST(0.26);
-
-    B->c[1] = RCONST(0.52);
-    B->c[2] = RCONST(1.230333209967908);
-    B->c[3] = RCONST(0.895765984350076);
-    B->c[4] = RCONST(0.436393609858648);
-    B->c[5] = RCONST(1.0);
-    B->c[6] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(0.26);
+    B->A[1][1] = SUN_RCONST(0.26);
+    B->A[2][0] = SUN_RCONST(0.13);
+    B->A[2][1] = SUN_RCONST(0.84033320996790809);
+    B->A[2][2] = SUN_RCONST(0.26);
+    B->A[3][0] = SUN_RCONST(0.22371961478320505);
+    B->A[3][1] = SUN_RCONST(0.47675532319799699);
+    B->A[3][2] = SUN_RCONST(-0.06470895363112615);
+    B->A[3][3] = SUN_RCONST(0.26);
+    B->A[4][0] = SUN_RCONST(0.16648564323248321);
+    B->A[4][1] = SUN_RCONST(0.10450018841591720);
+    B->A[4][2] = SUN_RCONST(0.03631482272098715);
+    B->A[4][3] = SUN_RCONST(-0.13090704451073998);
+    B->A[4][4] = SUN_RCONST(0.26);
+    B->A[5][0] = SUN_RCONST(0.13855640231268224);
+    B->A[5][2] = SUN_RCONST(-0.04245337201752043);
+    B->A[5][3] = SUN_RCONST(0.02446657898003141);
+    B->A[5][4] = SUN_RCONST(0.61943039072480676);
+    B->A[5][5] = SUN_RCONST(0.26);
+    B->A[6][0] = SUN_RCONST(0.13659751177640291);
+    B->A[6][2] = SUN_RCONST(-0.05496908796538376);
+    B->A[6][3] = SUN_RCONST(-0.04118626728321046);
+    B->A[6][4] = SUN_RCONST(0.62993304899016403);
+    B->A[6][5] = SUN_RCONST(0.06962479448202728);
+    B->A[6][6] = SUN_RCONST(0.26);
+
+    B->b[0] = SUN_RCONST(0.13659751177640291);
+    B->b[2] = SUN_RCONST(-0.05496908796538376);
+    B->b[3] = SUN_RCONST(-0.04118626728321046);
+    B->b[4] = SUN_RCONST(0.62993304899016403);
+    B->b[5] = SUN_RCONST(0.06962479448202728);
+    B->b[6] = SUN_RCONST(0.26);
+
+    B->d[0] = SUN_RCONST(0.13855640231268224);
+    B->d[2] = SUN_RCONST(-0.04245337201752043);
+    B->d[3] = SUN_RCONST(0.02446657898003141);
+    B->d[4] = SUN_RCONST(0.61943039072480676);
+    B->d[5] = SUN_RCONST(0.26);
+
+    B->c[1] = SUN_RCONST(0.52);
+    B->c[2] = SUN_RCONST(1.230333209967908);
+    B->c[3] = SUN_RCONST(0.895765984350076);
+    B->c[4] = SUN_RCONST(0.436393609858648);
+    B->c[5] = SUN_RCONST(1.0);
+    B->c[6] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -532,57 +532,57 @@ ARK_BUTCHER_TABLE(ARKODE_ARK548L2SA_DIRK_8_4_5, { /* ARK5(4)8L[2]SA-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(8, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(41.0)/RCONST(200.0);
-    B->A[1][1] = RCONST(41.0)/RCONST(200.0);
-    B->A[2][0] = RCONST(41.0)/RCONST(400.0);
-    B->A[2][1] = RCONST(-567603406766.0)/RCONST(11931857230679.0);
-    B->A[2][2] = RCONST(41.0)/RCONST(200.0);
-    B->A[3][0] = RCONST(683785636431.0)/RCONST(9252920307686.0);
-    B->A[3][2] = RCONST(-110385047103.0)/RCONST(1367015193373.0);
-    B->A[3][3] = RCONST(41.0)/RCONST(200.0);
-    B->A[4][0] = RCONST(3016520224154.0)/RCONST(10081342136671.0);
-    B->A[4][2] = RCONST(30586259806659.0)/RCONST(12414158314087.0);
-    B->A[4][3] = RCONST(-22760509404356.0)/RCONST(11113319521817.0);
-    B->A[4][4] = RCONST(41.0)/RCONST(200.0);
-    B->A[5][0] = RCONST(218866479029.0)/RCONST(1489978393911.0);
-    B->A[5][2] = RCONST(638256894668.0)/RCONST(5436446318841.0);
-    B->A[5][3] = RCONST(-1179710474555.0)/RCONST(5321154724896.0);
-    B->A[5][4] = RCONST(-60928119172.0)/RCONST(8023461067671.0);
-    B->A[5][5] = RCONST(41.0)/RCONST(200.0);
-    B->A[6][0] = RCONST(1020004230633.0)/RCONST(5715676835656.0);
-    B->A[6][2] = RCONST(25762820946817.0)/RCONST(25263940353407.0);
-    B->A[6][3] = RCONST(-2161375909145.0)/RCONST(9755907335909.0);
-    B->A[6][4] = RCONST(-211217309593.0)/RCONST(5846859502534.0);
-    B->A[6][5] = RCONST(-4269925059573.0)/RCONST(7827059040749.0);
-    B->A[6][6] = RCONST(41.0)/RCONST(200.0);
-    B->A[7][0] = RCONST(-872700587467.0)/RCONST(9133579230613.0);
-    B->A[7][3] = RCONST(22348218063261.0)/RCONST(9555858737531.0);
-    B->A[7][4] = RCONST(-1143369518992.0)/RCONST(8141816002931.0);
-    B->A[7][5] = RCONST(-39379526789629.0)/RCONST(19018526304540.0);
-    B->A[7][6] = RCONST(32727382324388.0)/RCONST(42900044865799.0);
-    B->A[7][7] = RCONST(41.0)/RCONST(200.0);
-
-    B->b[0] = RCONST(-872700587467.0)/RCONST(9133579230613.0);
-    B->b[3] = RCONST(22348218063261.0)/RCONST(9555858737531.0);
-    B->b[4] = RCONST(-1143369518992.0)/RCONST(8141816002931.0);
-    B->b[5] = RCONST(-39379526789629.0)/RCONST(19018526304540.0);
-    B->b[6] = RCONST(32727382324388.0)/RCONST(42900044865799.0);
-    B->b[7] = RCONST(41.0)/RCONST(200.0);
-
-    B->d[0] = RCONST(-975461918565.0)/RCONST(9796059967033.0);
-    B->d[3] = RCONST(78070527104295.0)/RCONST(32432590147079.0);
-    B->d[4] = RCONST(-548382580838.0)/RCONST(3424219808633.0);
-    B->d[5] = RCONST(-33438840321285.0)/RCONST(15594753105479.0);
-    B->d[6] = RCONST(3629800801594.0)/RCONST(4656183773603.0);
-    B->d[7] = RCONST(4035322873751.0)/RCONST(18575991585200.0);
-
-    B->c[1] = RCONST(41.0)/RCONST(100.0);
-    B->c[2] = RCONST(2935347310677.0)/RCONST(11292855782101.0);
-    B->c[3] = RCONST(1426016391358.0)/RCONST(7196633302097.0);
-    B->c[4] = RCONST(92.0)/RCONST(100.0);
-    B->c[5] = RCONST(24.0)/RCONST(100.0);
-    B->c[6] = RCONST(3.0)/RCONST(5.0);
-    B->c[7] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[1][1] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[2][0] = SUN_RCONST(41.0)/SUN_RCONST(400.0);
+    B->A[2][1] = SUN_RCONST(-567603406766.0)/SUN_RCONST(11931857230679.0);
+    B->A[2][2] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[3][0] = SUN_RCONST(683785636431.0)/SUN_RCONST(9252920307686.0);
+    B->A[3][2] = SUN_RCONST(-110385047103.0)/SUN_RCONST(1367015193373.0);
+    B->A[3][3] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[4][0] = SUN_RCONST(3016520224154.0)/SUN_RCONST(10081342136671.0);
+    B->A[4][2] = SUN_RCONST(30586259806659.0)/SUN_RCONST(12414158314087.0);
+    B->A[4][3] = SUN_RCONST(-22760509404356.0)/SUN_RCONST(11113319521817.0);
+    B->A[4][4] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[5][0] = SUN_RCONST(218866479029.0)/SUN_RCONST(1489978393911.0);
+    B->A[5][2] = SUN_RCONST(638256894668.0)/SUN_RCONST(5436446318841.0);
+    B->A[5][3] = SUN_RCONST(-1179710474555.0)/SUN_RCONST(5321154724896.0);
+    B->A[5][4] = SUN_RCONST(-60928119172.0)/SUN_RCONST(8023461067671.0);
+    B->A[5][5] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[6][0] = SUN_RCONST(1020004230633.0)/SUN_RCONST(5715676835656.0);
+    B->A[6][2] = SUN_RCONST(25762820946817.0)/SUN_RCONST(25263940353407.0);
+    B->A[6][3] = SUN_RCONST(-2161375909145.0)/SUN_RCONST(9755907335909.0);
+    B->A[6][4] = SUN_RCONST(-211217309593.0)/SUN_RCONST(5846859502534.0);
+    B->A[6][5] = SUN_RCONST(-4269925059573.0)/SUN_RCONST(7827059040749.0);
+    B->A[6][6] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+    B->A[7][0] = SUN_RCONST(-872700587467.0)/SUN_RCONST(9133579230613.0);
+    B->A[7][3] = SUN_RCONST(22348218063261.0)/SUN_RCONST(9555858737531.0);
+    B->A[7][4] = SUN_RCONST(-1143369518992.0)/SUN_RCONST(8141816002931.0);
+    B->A[7][5] = SUN_RCONST(-39379526789629.0)/SUN_RCONST(19018526304540.0);
+    B->A[7][6] = SUN_RCONST(32727382324388.0)/SUN_RCONST(42900044865799.0);
+    B->A[7][7] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+
+    B->b[0] = SUN_RCONST(-872700587467.0)/SUN_RCONST(9133579230613.0);
+    B->b[3] = SUN_RCONST(22348218063261.0)/SUN_RCONST(9555858737531.0);
+    B->b[4] = SUN_RCONST(-1143369518992.0)/SUN_RCONST(8141816002931.0);
+    B->b[5] = SUN_RCONST(-39379526789629.0)/SUN_RCONST(19018526304540.0);
+    B->b[6] = SUN_RCONST(32727382324388.0)/SUN_RCONST(42900044865799.0);
+    B->b[7] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+
+    B->d[0] = SUN_RCONST(-975461918565.0)/SUN_RCONST(9796059967033.0);
+    B->d[3] = SUN_RCONST(78070527104295.0)/SUN_RCONST(32432590147079.0);
+    B->d[4] = SUN_RCONST(-548382580838.0)/SUN_RCONST(3424219808633.0);
+    B->d[5] = SUN_RCONST(-33438840321285.0)/SUN_RCONST(15594753105479.0);
+    B->d[6] = SUN_RCONST(3629800801594.0)/SUN_RCONST(4656183773603.0);
+    B->d[7] = SUN_RCONST(4035322873751.0)/SUN_RCONST(18575991585200.0);
+
+    B->c[1] = SUN_RCONST(41.0)/SUN_RCONST(100.0);
+    B->c[2] = SUN_RCONST(2935347310677.0)/SUN_RCONST(11292855782101.0);
+    B->c[3] = SUN_RCONST(1426016391358.0)/SUN_RCONST(7196633302097.0);
+    B->c[4] = SUN_RCONST(92.0)/SUN_RCONST(100.0);
+    B->c[5] = SUN_RCONST(24.0)/SUN_RCONST(100.0);
+    B->c[6] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[7] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -590,90 +590,90 @@ ARK_BUTCHER_TABLE(ARKODE_ARK548L2SAb_DIRK_8_4_5, { /* ARK5(4)8L[2]SAb-ESDIRK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(8, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(2.0)/RCONST(9.0);
-    B->A[1][1] = RCONST(2.0)/RCONST(9.0);
-    B->A[2][0] = RCONST(2366667076620.0)/RCONST(8822750406821.0);
-    B->A[2][1] = RCONST(2366667076620.0)/RCONST(8822750406821.0);
-    B->A[2][2] = RCONST(2.0)/RCONST(9.0);
-    B->A[3][0] = RCONST(-257962897183.0)/RCONST(4451812247028.0);
-    B->A[3][1] = RCONST(-257962897183.0)/RCONST(4451812247028.0);
-    B->A[3][2] = RCONST(128530224461.0)/RCONST(14379561246022.0);
-    B->A[3][3] = RCONST(2.0)/RCONST(9.0);
-    B->A[4][0] = RCONST(-486229321650.0)/RCONST(11227943450093.0);
-    B->A[4][1] = RCONST(-486229321650.0)/RCONST(11227943450093.0);
-    B->A[4][2] = RCONST(-225633144460.0)/RCONST(6633558740617.0);
-    B->A[4][3] = RCONST(1741320951451.0)/RCONST(6824444397158.0);
-    B->A[4][4] = RCONST(2.0)/RCONST(9.0);
-    B->A[5][0] = RCONST(621307788657.0)/RCONST(4714163060173.0);
-    B->A[5][1] = RCONST(621307788657.0)/RCONST(4714163060173.0);
-    B->A[5][2] = RCONST(-125196015625.0)/RCONST(3866852212004.0);
-    B->A[5][3] = RCONST(940440206406.0)/RCONST(7593089888465.0);
-    B->A[5][4] = RCONST(961109811699.0)/RCONST(6734810228204.0);
-    B->A[5][5] = RCONST(2.0)/RCONST(9.0);
-    B->A[6][0] = RCONST(2036305566805.0)/RCONST(6583108094622.0);
-    B->A[6][1] = RCONST(2036305566805.0)/RCONST(6583108094622.0);
-    B->A[6][2] = RCONST(-3039402635899.0)/RCONST(4450598839912.0);
-    B->A[6][3] = RCONST(-1829510709469.0)/RCONST(31102090912115.0);
-    B->A[6][4] = RCONST(-286320471013.0)/RCONST(6931253422520.0);
-    B->A[6][5] = RCONST(8651533662697.0)/RCONST(9642993110008.0);
-    B->A[6][6] = RCONST(2.0)/RCONST(9.0);
-    B->A[7][2] = RCONST(3517720773327.0)/RCONST(20256071687669.0);
-    B->A[7][3] = RCONST(4569610470461.0)/RCONST(17934693873752.0);
-    B->A[7][4] = RCONST(2819471173109.0)/RCONST(11655438449929.0);
-    B->A[7][5] = RCONST(3296210113763.0)/RCONST(10722700128969.0);
-    B->A[7][6] = RCONST(-1142099968913.0)/RCONST(5710983926999.0);
-    B->A[7][7] = RCONST(2.0)/RCONST(9.0);
-
-    B->b[2] = RCONST(3517720773327.0)/RCONST(20256071687669.0);
-    B->b[3] = RCONST(4569610470461.0)/RCONST(17934693873752.0);
-    B->b[4] = RCONST(2819471173109.0)/RCONST(11655438449929.0);
-    B->b[5] = RCONST(3296210113763.0)/RCONST(10722700128969.0);
-    B->b[6] = RCONST(-1142099968913.0)/RCONST(5710983926999.0);
-    B->b[7] = RCONST(2.0)/RCONST(9.0);
-
-    B->d[2] = RCONST(520639020421.0)/RCONST(8300446712847.0);
-    B->d[3] = RCONST(4550235134915.0)/RCONST(17827758688493.0);
-    B->d[4] = RCONST(1482366381361.0)/RCONST(6201654941325.0);
-    B->d[5] = RCONST(5551607622171.0)/RCONST(13911031047899.0);
-    B->d[6] = RCONST(-5266607656330.0)/RCONST(36788968843917.0);
-    B->d[7] = RCONST(1074053359553.0)/RCONST(5740751784926.0);
-
-    B->c[1] = RCONST(4.0)/RCONST(9.0);
-    B->c[2] = RCONST(6456083330201.0)/RCONST(8509243623797.0);
-    B->c[3] = RCONST(1632083962415.0)/RCONST(14158861528103.0);
-    B->c[4] = RCONST(6365430648612.0)/RCONST(17842476412687.0);
-    B->c[5] = RCONST(18.0)/RCONST(25.0);
-    B->c[6] = RCONST(191.0)/RCONST(200.0);
-    B->c[7] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[1][1] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[2][0] = SUN_RCONST(2366667076620.0)/SUN_RCONST(8822750406821.0);
+    B->A[2][1] = SUN_RCONST(2366667076620.0)/SUN_RCONST(8822750406821.0);
+    B->A[2][2] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[3][0] = SUN_RCONST(-257962897183.0)/SUN_RCONST(4451812247028.0);
+    B->A[3][1] = SUN_RCONST(-257962897183.0)/SUN_RCONST(4451812247028.0);
+    B->A[3][2] = SUN_RCONST(128530224461.0)/SUN_RCONST(14379561246022.0);
+    B->A[3][3] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[4][0] = SUN_RCONST(-486229321650.0)/SUN_RCONST(11227943450093.0);
+    B->A[4][1] = SUN_RCONST(-486229321650.0)/SUN_RCONST(11227943450093.0);
+    B->A[4][2] = SUN_RCONST(-225633144460.0)/SUN_RCONST(6633558740617.0);
+    B->A[4][3] = SUN_RCONST(1741320951451.0)/SUN_RCONST(6824444397158.0);
+    B->A[4][4] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[5][0] = SUN_RCONST(621307788657.0)/SUN_RCONST(4714163060173.0);
+    B->A[5][1] = SUN_RCONST(621307788657.0)/SUN_RCONST(4714163060173.0);
+    B->A[5][2] = SUN_RCONST(-125196015625.0)/SUN_RCONST(3866852212004.0);
+    B->A[5][3] = SUN_RCONST(940440206406.0)/SUN_RCONST(7593089888465.0);
+    B->A[5][4] = SUN_RCONST(961109811699.0)/SUN_RCONST(6734810228204.0);
+    B->A[5][5] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[6][0] = SUN_RCONST(2036305566805.0)/SUN_RCONST(6583108094622.0);
+    B->A[6][1] = SUN_RCONST(2036305566805.0)/SUN_RCONST(6583108094622.0);
+    B->A[6][2] = SUN_RCONST(-3039402635899.0)/SUN_RCONST(4450598839912.0);
+    B->A[6][3] = SUN_RCONST(-1829510709469.0)/SUN_RCONST(31102090912115.0);
+    B->A[6][4] = SUN_RCONST(-286320471013.0)/SUN_RCONST(6931253422520.0);
+    B->A[6][5] = SUN_RCONST(8651533662697.0)/SUN_RCONST(9642993110008.0);
+    B->A[6][6] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[7][2] = SUN_RCONST(3517720773327.0)/SUN_RCONST(20256071687669.0);
+    B->A[7][3] = SUN_RCONST(4569610470461.0)/SUN_RCONST(17934693873752.0);
+    B->A[7][4] = SUN_RCONST(2819471173109.0)/SUN_RCONST(11655438449929.0);
+    B->A[7][5] = SUN_RCONST(3296210113763.0)/SUN_RCONST(10722700128969.0);
+    B->A[7][6] = SUN_RCONST(-1142099968913.0)/SUN_RCONST(5710983926999.0);
+    B->A[7][7] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+
+    B->b[2] = SUN_RCONST(3517720773327.0)/SUN_RCONST(20256071687669.0);
+    B->b[3] = SUN_RCONST(4569610470461.0)/SUN_RCONST(17934693873752.0);
+    B->b[4] = SUN_RCONST(2819471173109.0)/SUN_RCONST(11655438449929.0);
+    B->b[5] = SUN_RCONST(3296210113763.0)/SUN_RCONST(10722700128969.0);
+    B->b[6] = SUN_RCONST(-1142099968913.0)/SUN_RCONST(5710983926999.0);
+    B->b[7] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+
+    B->d[2] = SUN_RCONST(520639020421.0)/SUN_RCONST(8300446712847.0);
+    B->d[3] = SUN_RCONST(4550235134915.0)/SUN_RCONST(17827758688493.0);
+    B->d[4] = SUN_RCONST(1482366381361.0)/SUN_RCONST(6201654941325.0);
+    B->d[5] = SUN_RCONST(5551607622171.0)/SUN_RCONST(13911031047899.0);
+    B->d[6] = SUN_RCONST(-5266607656330.0)/SUN_RCONST(36788968843917.0);
+    B->d[7] = SUN_RCONST(1074053359553.0)/SUN_RCONST(5740751784926.0);
+
+    B->c[1] = SUN_RCONST(4.0)/SUN_RCONST(9.0);
+    B->c[2] = SUN_RCONST(6456083330201.0)/SUN_RCONST(8509243623797.0);
+    B->c[3] = SUN_RCONST(1632083962415.0)/SUN_RCONST(14158861528103.0);
+    B->c[4] = SUN_RCONST(6365430648612.0)/SUN_RCONST(17842476412687.0);
+    B->c[5] = SUN_RCONST(18.0)/SUN_RCONST(25.0);
+    B->c[6] = SUN_RCONST(191.0)/SUN_RCONST(200.0);
+    B->c[7] = SUN_RCONST(1.0);
     return B;
   })
 
 ARK_BUTCHER_TABLE(ARKODE_ESDIRK324L2SA_4_2_3, { /* ESDIRK3(2)4L[2]SA (A,L stable) */
-    const sunrealtype g = RCONST(0.435866521508458999416019451193556843);
+    const sunrealtype g = SUN_RCONST(0.435866521508458999416019451193556843);
     const sunrealtype g2 = g * g;
     const sunrealtype g3 = g2 * g;
     const sunrealtype g4 = g3 * g;
     const sunrealtype g5 = g4 * g;
-    const sunrealtype c3 = RCONST(0.6);
+    const sunrealtype c3 = SUN_RCONST(0.6);
 
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(4, SUNTRUE);
     B->q = 3;
     B->p = 2;
 
-    B->b[1] = (-RCONST(2.0)+RCONST(3.0)*c3+RCONST(6.0)*g*(RCONST(1.0)-c3))/(RCONST(12.0)*g*(c3-RCONST(2.0)*g));
-    B->b[2] = (RCONST(1.0)-RCONST(6.0)*g+RCONST(6.0)*g2)/(RCONST(3.0)*c3*(c3-RCONST(2.0)*g));
+    B->b[1] = (-SUN_RCONST(2.0)+SUN_RCONST(3.0)*c3+SUN_RCONST(6.0)*g*(SUN_RCONST(1.0)-c3))/(SUN_RCONST(12.0)*g*(c3-SUN_RCONST(2.0)*g));
+    B->b[2] = (SUN_RCONST(1.0)-SUN_RCONST(6.0)*g+SUN_RCONST(6.0)*g2)/(SUN_RCONST(3.0)*c3*(c3-SUN_RCONST(2.0)*g));
     B->b[3] = g;
-    B->b[0] = RCONST(1.0) - g - B->b[1] - B->b[2];
+    B->b[0] = SUN_RCONST(1.0) - g - B->b[1] - B->b[2];
 
-    B->d[1] = c3*(-RCONST(1.0)+RCONST(6.0)*g-RCONST(24.0)*g3+RCONST(12.0)*g4-RCONST(6.0)*g5)/(RCONST(4.0)*g*(RCONST(2.0)*g-c3)*(RCONST(1.0)-RCONST(6.0)*g+RCONST(6.0)*g2))
-      + (RCONST(3.0)-RCONST(27.0)*g+RCONST(68.0)*g2-RCONST(55.0)*g3+RCONST(21.0)*g4-RCONST(6.0)*g5)/(RCONST(2.0)*(RCONST(2.0)*g-c3)*(RCONST(1.0)-RCONST(6.0)*g+RCONST(6.0)*g2));
-    B->d[2] = -g*(-RCONST(2.0)+RCONST(21.0)*g-RCONST(68.0)*g2+RCONST(79.0)*g3-RCONST(33.0)*g4+RCONST(12.0)*g5)/(c3*(c3-RCONST(2.0)*g)*(RCONST(1.0)-RCONST(6.0)*g+RCONST(6.0)*g2));
-    B->d[3] = -RCONST(3.0)*g2*(-RCONST(1.0)+RCONST(4.0)*g-RCONST(2.0)*g2+g3)/(RCONST(1.0)-RCONST(6.0)*g+RCONST(6.0)*g2);
-    B->d[0] = RCONST(1.0) - B->d[1] - B->d[2] - B->d[3];
+    B->d[1] = c3*(-SUN_RCONST(1.0)+SUN_RCONST(6.0)*g-SUN_RCONST(24.0)*g3+SUN_RCONST(12.0)*g4-SUN_RCONST(6.0)*g5)/(SUN_RCONST(4.0)*g*(SUN_RCONST(2.0)*g-c3)*(SUN_RCONST(1.0)-SUN_RCONST(6.0)*g+SUN_RCONST(6.0)*g2))
+      + (SUN_RCONST(3.0)-SUN_RCONST(27.0)*g+SUN_RCONST(68.0)*g2-SUN_RCONST(55.0)*g3+SUN_RCONST(21.0)*g4-SUN_RCONST(6.0)*g5)/(SUN_RCONST(2.0)*(SUN_RCONST(2.0)*g-c3)*(SUN_RCONST(1.0)-SUN_RCONST(6.0)*g+SUN_RCONST(6.0)*g2));
+    B->d[2] = -g*(-SUN_RCONST(2.0)+SUN_RCONST(21.0)*g-SUN_RCONST(68.0)*g2+SUN_RCONST(79.0)*g3-SUN_RCONST(33.0)*g4+SUN_RCONST(12.0)*g5)/(c3*(c3-SUN_RCONST(2.0)*g)*(SUN_RCONST(1.0)-SUN_RCONST(6.0)*g+SUN_RCONST(6.0)*g2));
+    B->d[3] = -SUN_RCONST(3.0)*g2*(-SUN_RCONST(1.0)+SUN_RCONST(4.0)*g-SUN_RCONST(2.0)*g2+g3)/(SUN_RCONST(1.0)-SUN_RCONST(6.0)*g+SUN_RCONST(6.0)*g2);
+    B->d[0] = SUN_RCONST(1.0) - B->d[1] - B->d[2] - B->d[3];
 
     B->A[1][0] = g;
     B->A[1][1] = g;
-    B->A[2][1] = c3*(c3-RCONST(2.0)*g)/(RCONST(4.0)*g);
+    B->A[2][1] = c3*(c3-SUN_RCONST(2.0)*g)/(SUN_RCONST(4.0)*g);
     B->A[2][0] = c3 - g - B->A[2][1];
     B->A[2][2] = g;
     B->A[3][0] = B->b[0];
@@ -681,9 +681,9 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK324L2SA_4_2_3, { /* ESDIRK3(2)4L[2]SA (A,L stable
     B->A[3][2] = B->b[2];
     B->A[3][3] = B->b[3];
 
-    B->c[1] = RCONST(2.0)*g;
-    B->c[2] = RCONST(3.0)/RCONST(5.0);
-    B->c[3] = RCONST(1.0);
+    B->c[1] = SUN_RCONST(2.0)*g;
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[3] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -692,32 +692,32 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK325L2SA_5_2_3, { /* ESDIRK3(2)5L[2]SA (A,L stable
     B->q = 3;
     B->p = 2;
 
-    B->c[1] = RCONST(9.0)/RCONST(20.0);
-    B->c[2] = RCONST(9.0)*(RCONST(2.0)+SUNRsqrt(RCONST(2.0)))/RCONST(40.0);
-    B->c[3] = RCONST(3.0)/RCONST(5.0);
-    B->c[4] = RCONST(1.0);
-
-    B->b[0] = (RCONST(2398.0)+RCONST(1205.0)*SUNRsqrt(RCONST(2.0)))/RCONST(2835.0)/(RCONST(4.0)+RCONST(3.0)*SUNRsqrt(RCONST(2.0)));
-    B->b[1] = (RCONST(2398.0)+RCONST(1205.0)*SUNRsqrt(RCONST(2.0)))/RCONST(2835.0)/(RCONST(4.0)+RCONST(3.0)*SUNRsqrt(RCONST(2.0)));
-    B->b[2] = -RCONST(2374.0)*(RCONST(1.0)+RCONST(2.0)*SUNRsqrt(RCONST(2.0)))/RCONST(2835.0)/(RCONST(5.0)+RCONST(3.0)*SUNRsqrt(RCONST(2.0)));
-    B->b[3] = RCONST(5827.0)/RCONST(7560.0);
-    B->b[4] = RCONST(9.0)/RCONST(40.0);
-
-    B->d[0] = (SUNRsqrt(RCONST(2.0))*RCONST(5547709.0)-RCONST(4800247.0))/RCONST(16519545.0);
-    B->d[1] = (SUNRsqrt(RCONST(2.0))*RCONST(5547709.0)-RCONST(4800247.0))/RCONST(16519545.0);
-    B->d[2] = RCONST(11095418.0)*(RCONST(1.0)-SUNRsqrt(RCONST(2.0)))/RCONST(16519545.0);
-    B->d[3] = RCONST(30698249.0)/RCONST(44052120.0);
-    B->d[4] = RCONST(49563.0)/RCONST(233080.0);
-
-    B->A[1][0] = RCONST(9.0)/RCONST(40.0);
-    B->A[1][1] = RCONST(9.0)/RCONST(40.0);
-    B->A[2][0] = RCONST(9.0)*(RCONST(1.0)+SUNRsqrt(RCONST(2.0)))/RCONST(80.0);
-    B->A[2][1] = RCONST(9.0)*(RCONST(1.0)+SUNRsqrt(RCONST(2.0)))/RCONST(80.0);
-    B->A[2][2] = RCONST(9.0)/RCONST(40.0);
-    B->A[3][0] = (RCONST(22.0)+RCONST(15.0)*SUNRsqrt(RCONST(2.0)))/RCONST(80.0)/(RCONST(1.0)+SUNRsqrt(RCONST(2.0)));
-    B->A[3][1] = (RCONST(22.0)+RCONST(15.0)*SUNRsqrt(RCONST(2.0)))/RCONST(80.0)/(RCONST(1.0)+SUNRsqrt(RCONST(2.0)));
-    B->A[3][2] = -RCONST(7.0)/RCONST(40.0)/(RCONST(1.0)+SUNRsqrt(RCONST(2.0)));
-    B->A[3][3] = RCONST(9.0)/RCONST(40.0);
+    B->c[1] = SUN_RCONST(9.0)/SUN_RCONST(20.0);
+    B->c[2] = SUN_RCONST(9.0)*(SUN_RCONST(2.0)+SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(40.0);
+    B->c[3] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[4] = SUN_RCONST(1.0);
+
+    B->b[0] = (SUN_RCONST(2398.0)+SUN_RCONST(1205.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2835.0)/(SUN_RCONST(4.0)+SUN_RCONST(3.0)*SUNRsqrt(SUN_RCONST(2.0)));
+    B->b[1] = (SUN_RCONST(2398.0)+SUN_RCONST(1205.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2835.0)/(SUN_RCONST(4.0)+SUN_RCONST(3.0)*SUNRsqrt(SUN_RCONST(2.0)));
+    B->b[2] = -SUN_RCONST(2374.0)*(SUN_RCONST(1.0)+SUN_RCONST(2.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(2835.0)/(SUN_RCONST(5.0)+SUN_RCONST(3.0)*SUNRsqrt(SUN_RCONST(2.0)));
+    B->b[3] = SUN_RCONST(5827.0)/SUN_RCONST(7560.0);
+    B->b[4] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+
+    B->d[0] = (SUNRsqrt(SUN_RCONST(2.0))*SUN_RCONST(5547709.0)-SUN_RCONST(4800247.0))/SUN_RCONST(16519545.0);
+    B->d[1] = (SUNRsqrt(SUN_RCONST(2.0))*SUN_RCONST(5547709.0)-SUN_RCONST(4800247.0))/SUN_RCONST(16519545.0);
+    B->d[2] = SUN_RCONST(11095418.0)*(SUN_RCONST(1.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(16519545.0);
+    B->d[3] = SUN_RCONST(30698249.0)/SUN_RCONST(44052120.0);
+    B->d[4] = SUN_RCONST(49563.0)/SUN_RCONST(233080.0);
+
+    B->A[1][0] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[1][1] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[2][0] = SUN_RCONST(9.0)*(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(80.0);
+    B->A[2][1] = SUN_RCONST(9.0)*(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(80.0);
+    B->A[2][2] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[3][0] = (SUN_RCONST(22.0)+SUN_RCONST(15.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(80.0)/(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)));
+    B->A[3][1] = (SUN_RCONST(22.0)+SUN_RCONST(15.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(80.0)/(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)));
+    B->A[3][2] = -SUN_RCONST(7.0)/SUN_RCONST(40.0)/(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)));
+    B->A[3][3] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
     B->A[4][0] = B->b[0];
     B->A[4][1] = B->b[1];
     B->A[4][2] = B->b[2];
@@ -731,32 +731,32 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK32I5L2SA_5_2_3, { /* ESDIRK3(2I)5L[2]SA (A,L stab
     B->q = 3;
     B->p = 2;
 
-    B->c[1] = RCONST(9.0)/RCONST(20.0);
-    B->c[2] = RCONST(4.0)/RCONST(5.0);
-    B->c[3] = RCONST(1.0);
-    B->c[4] = RCONST(1.0);
-
-    B->b[0] = RCONST(7415.0)/RCONST(34776.0);
-    B->b[1] = RCONST(9920.0)/RCONST(30429.0);
-    B->b[2] = RCONST(4845.0)/RCONST(9016.0);
-    B->b[3] = -RCONST(5827.0)/RCONST(19320.0);
-    B->b[4] = RCONST(9.0)/RCONST(40.0);
-
-    B->d[0] = RCONST(23705.0)/RCONST(104328.0);
-    B->d[1] = RCONST(29720.0)/RCONST(91287.0);
-    B->d[2] = RCONST(4225.0)/RCONST(9016.0);
-    B->d[3] = -RCONST(69304987.0)/RCONST(337732920.0);
-    B->d[4] = RCONST(42843.0)/RCONST(233080.0);
-
-    B->A[1][0] = RCONST(9.0)/RCONST(40.0);
-    B->A[1][1] = RCONST(9.0)/RCONST(40.0);
-    B->A[2][0] = RCONST(19.0)/RCONST(72.0);
-    B->A[2][1] = RCONST(14.0)/RCONST(45.0);
-    B->A[2][2] = RCONST(9.0)/RCONST(40.0);
-    B->A[3][0] = RCONST(3337.0)/RCONST(11520.0);
-    B->A[3][1] = RCONST(233.0)/RCONST(720.0);
-    B->A[3][2] = RCONST(207.0)/RCONST(1280.0);
-    B->A[3][3] = RCONST(9.0)/RCONST(40.0);
+    B->c[1] = SUN_RCONST(9.0)/SUN_RCONST(20.0);
+    B->c[2] = SUN_RCONST(4.0)/SUN_RCONST(5.0);
+    B->c[3] = SUN_RCONST(1.0);
+    B->c[4] = SUN_RCONST(1.0);
+
+    B->b[0] = SUN_RCONST(7415.0)/SUN_RCONST(34776.0);
+    B->b[1] = SUN_RCONST(9920.0)/SUN_RCONST(30429.0);
+    B->b[2] = SUN_RCONST(4845.0)/SUN_RCONST(9016.0);
+    B->b[3] = -SUN_RCONST(5827.0)/SUN_RCONST(19320.0);
+    B->b[4] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+
+    B->d[0] = SUN_RCONST(23705.0)/SUN_RCONST(104328.0);
+    B->d[1] = SUN_RCONST(29720.0)/SUN_RCONST(91287.0);
+    B->d[2] = SUN_RCONST(4225.0)/SUN_RCONST(9016.0);
+    B->d[3] = -SUN_RCONST(69304987.0)/SUN_RCONST(337732920.0);
+    B->d[4] = SUN_RCONST(42843.0)/SUN_RCONST(233080.0);
+
+    B->A[1][0] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[1][1] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[2][0] = SUN_RCONST(19.0)/SUN_RCONST(72.0);
+    B->A[2][1] = SUN_RCONST(14.0)/SUN_RCONST(45.0);
+    B->A[2][2] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[3][0] = SUN_RCONST(3337.0)/SUN_RCONST(11520.0);
+    B->A[3][1] = SUN_RCONST(233.0)/SUN_RCONST(720.0);
+    B->A[3][2] = SUN_RCONST(207.0)/SUN_RCONST(1280.0);
+    B->A[3][3] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
     B->A[4][0] = B->b[0];
     B->A[4][1] = B->b[1];
     B->A[4][2] = B->b[2];
@@ -770,36 +770,36 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK436L2SA_6_3_4, { /* ESDIRK4(3)6L[2]SA (A,L stable
     B->q = 4;
     B->p = 3;
 
-    B->c[1] = RCONST(0.5);
-    B->c[2] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(4.0);
-    B->c[3] = RCONST(5.0)/RCONST(8.0);
-    B->c[4] = RCONST(26.0)/RCONST(25.0);
-    B->c[5] = RCONST(1.0);
-
-    B->b[0] = (RCONST(1181.0)-RCONST(987.0)*SUNRsqrt(RCONST(2.0)))/RCONST(13782.0);
-    B->b[1] = (RCONST(1181.0)-RCONST(987.0)*SUNRsqrt(RCONST(2.0)))/RCONST(13782.0);
-    B->b[2] = RCONST(47.0)*(-RCONST(267.0)+RCONST(1783.0)*SUNRsqrt(RCONST(2.0)))/RCONST(273343.0);
-    B->b[3] = -RCONST(16.0)*(-RCONST(22922.0)+RCONST(3525.0)*SUNRsqrt(RCONST(2.0)))/RCONST(571953.0);
-    B->b[4] = -RCONST(15625.0)*(RCONST(97.0)+RCONST(376.0)*SUNRsqrt(RCONST(2.0)))/RCONST(90749876.0);
-    B->b[5] = RCONST(1.0)/RCONST(4.0);
-
-    B->d[0] = -RCONST(480923228411.0)/RCONST(4982971448372.0);
-    B->d[1] = -RCONST(480923228411.0)/RCONST(4982971448372.0);
-    B->d[2] = RCONST(6709447293961.0)/RCONST(12833189095359.0);
-    B->d[3] = RCONST(3513175791894.0)/RCONST(6748737351361.0);
-    B->d[4] = -RCONST(498863281070.0)/RCONST(6042575550617.0);
-    B->d[5] = RCONST(2077005547802.0)/RCONST(8945017530137.0);
-
-    B->A[1][1] = RCONST(0.25);
-    B->A[2][1] = (RCONST(1.0)-SUNRsqrt(RCONST(2.0)))/RCONST(8.0);
-    B->A[2][2] = RCONST(0.25);
-    B->A[3][1] = (RCONST(5.0)-RCONST(7.0)*SUNRsqrt(RCONST(2.0)))/RCONST(64.0);
-    B->A[3][2] = RCONST(7.0)*(RCONST(1.0)+SUNRsqrt(RCONST(2.0)))/RCONST(32.0);
-    B->A[3][3] = RCONST(0.25);
-    B->A[4][1] = -(RCONST(13796.0)+RCONST(54539.0)*SUNRsqrt(RCONST(2.0)))/RCONST(125000.0);
-    B->A[4][2] = (RCONST(506605.0)+RCONST(132109.0)*SUNRsqrt(RCONST(2.0)))/RCONST(437500.0);
-    B->A[4][3] = RCONST(166.0)*(-RCONST(97.0)+RCONST(376.0)*SUNRsqrt(RCONST(2.0)))/RCONST(109375.0);
-    B->A[4][4] = RCONST(0.25);
+    B->c[1] = SUN_RCONST(0.5);
+    B->c[2] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(4.0);
+    B->c[3] = SUN_RCONST(5.0)/SUN_RCONST(8.0);
+    B->c[4] = SUN_RCONST(26.0)/SUN_RCONST(25.0);
+    B->c[5] = SUN_RCONST(1.0);
+
+    B->b[0] = (SUN_RCONST(1181.0)-SUN_RCONST(987.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(13782.0);
+    B->b[1] = (SUN_RCONST(1181.0)-SUN_RCONST(987.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(13782.0);
+    B->b[2] = SUN_RCONST(47.0)*(-SUN_RCONST(267.0)+SUN_RCONST(1783.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(273343.0);
+    B->b[3] = -SUN_RCONST(16.0)*(-SUN_RCONST(22922.0)+SUN_RCONST(3525.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(571953.0);
+    B->b[4] = -SUN_RCONST(15625.0)*(SUN_RCONST(97.0)+SUN_RCONST(376.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(90749876.0);
+    B->b[5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->d[0] = -SUN_RCONST(480923228411.0)/SUN_RCONST(4982971448372.0);
+    B->d[1] = -SUN_RCONST(480923228411.0)/SUN_RCONST(4982971448372.0);
+    B->d[2] = SUN_RCONST(6709447293961.0)/SUN_RCONST(12833189095359.0);
+    B->d[3] = SUN_RCONST(3513175791894.0)/SUN_RCONST(6748737351361.0);
+    B->d[4] = -SUN_RCONST(498863281070.0)/SUN_RCONST(6042575550617.0);
+    B->d[5] = SUN_RCONST(2077005547802.0)/SUN_RCONST(8945017530137.0);
+
+    B->A[1][1] = SUN_RCONST(0.25);
+    B->A[2][1] = (SUN_RCONST(1.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(8.0);
+    B->A[2][2] = SUN_RCONST(0.25);
+    B->A[3][1] = (SUN_RCONST(5.0)-SUN_RCONST(7.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(64.0);
+    B->A[3][2] = SUN_RCONST(7.0)*(SUN_RCONST(1.0)+SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(32.0);
+    B->A[3][3] = SUN_RCONST(0.25);
+    B->A[4][1] = -(SUN_RCONST(13796.0)+SUN_RCONST(54539.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(125000.0);
+    B->A[4][2] = (SUN_RCONST(506605.0)+SUN_RCONST(132109.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(437500.0);
+    B->A[4][3] = SUN_RCONST(166.0)*(-SUN_RCONST(97.0)+SUN_RCONST(376.0)*SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(109375.0);
+    B->A[4][4] = SUN_RCONST(0.25);
     B->A[5][0] = B->b[0];
     B->A[5][1] = B->b[1];
     B->A[5][2] = B->b[2];
@@ -818,36 +818,36 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK43I6L2SA_6_3_4, { /* ESDIRK4(3I)6L[2]SA (A,L stab
     B->q = 4;
     B->p = 3;
 
-    B->c[1] = RCONST(0.5);
-    B->c[2] = (RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(4.0);
-    B->c[3] = RCONST(2012122486997.0)/RCONST(3467029789466.0);
-    B->c[4] = RCONST(1.0);
-    B->c[5] = RCONST(1.0);
-
-    B->b[0] = RCONST(657241292721.0)/RCONST(9909463049845.0);
-    B->b[1] = RCONST(657241292721.0)/RCONST(9909463049845.0);
-    B->b[2] = RCONST(1290772910128.0)/RCONST(5804808736437.0);
-    B->b[3] = RCONST(1103522341516.0)/RCONST(2197678446715.0);
-    B->b[4] = -RCONST(3.0)/RCONST(28.0);
-    B->b[5] = RCONST(1.0)/RCONST(4.0);
-
-    B->d[0] = -RCONST(71925161075.0)/RCONST(3900939759889.0);
-    B->d[1] = -RCONST(71925161075.0)/RCONST(3900939759889.0);
-    B->d[2] = RCONST(2973346383745.0)/RCONST(8160025745289.0);
-    B->d[3] = RCONST(3972464885073.0)/RCONST(7694851252693.0);
-    B->d[4] = -RCONST(263368882881.0)/RCONST(4213126269514.0);
-    B->d[5] = RCONST(3295468053953.0)/RCONST(15064441987965.0);
-
-    B->A[1][1] = RCONST(0.25);
-    B->A[2][1] = -RCONST(1356991263433.0)/RCONST(26208533697614.0);
-    B->A[2][2] = RCONST(0.25);
-    B->A[3][1] = -RCONST(1778551891173.0)/RCONST(14697912885533.0);
-    B->A[3][2] = RCONST(7325038566068.0)/RCONST(12797657924939.0);
-    B->A[3][3] = RCONST(0.25);
-    B->A[4][1] = -RCONST(24076725932807.0)/RCONST(39344244018142.0);
-    B->A[4][2] = RCONST(9344023789330.0)/RCONST(6876721947151.0);
-    B->A[4][3] = RCONST(11302510524611.0)/RCONST(18374767399840.0);
-    B->A[4][4] = RCONST(0.25);
+    B->c[1] = SUN_RCONST(0.5);
+    B->c[2] = (SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(4.0);
+    B->c[3] = SUN_RCONST(2012122486997.0)/SUN_RCONST(3467029789466.0);
+    B->c[4] = SUN_RCONST(1.0);
+    B->c[5] = SUN_RCONST(1.0);
+
+    B->b[0] = SUN_RCONST(657241292721.0)/SUN_RCONST(9909463049845.0);
+    B->b[1] = SUN_RCONST(657241292721.0)/SUN_RCONST(9909463049845.0);
+    B->b[2] = SUN_RCONST(1290772910128.0)/SUN_RCONST(5804808736437.0);
+    B->b[3] = SUN_RCONST(1103522341516.0)/SUN_RCONST(2197678446715.0);
+    B->b[4] = -SUN_RCONST(3.0)/SUN_RCONST(28.0);
+    B->b[5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->d[0] = -SUN_RCONST(71925161075.0)/SUN_RCONST(3900939759889.0);
+    B->d[1] = -SUN_RCONST(71925161075.0)/SUN_RCONST(3900939759889.0);
+    B->d[2] = SUN_RCONST(2973346383745.0)/SUN_RCONST(8160025745289.0);
+    B->d[3] = SUN_RCONST(3972464885073.0)/SUN_RCONST(7694851252693.0);
+    B->d[4] = -SUN_RCONST(263368882881.0)/SUN_RCONST(4213126269514.0);
+    B->d[5] = SUN_RCONST(3295468053953.0)/SUN_RCONST(15064441987965.0);
+
+    B->A[1][1] = SUN_RCONST(0.25);
+    B->A[2][1] = -SUN_RCONST(1356991263433.0)/SUN_RCONST(26208533697614.0);
+    B->A[2][2] = SUN_RCONST(0.25);
+    B->A[3][1] = -SUN_RCONST(1778551891173.0)/SUN_RCONST(14697912885533.0);
+    B->A[3][2] = SUN_RCONST(7325038566068.0)/SUN_RCONST(12797657924939.0);
+    B->A[3][3] = SUN_RCONST(0.25);
+    B->A[4][1] = -SUN_RCONST(24076725932807.0)/SUN_RCONST(39344244018142.0);
+    B->A[4][2] = SUN_RCONST(9344023789330.0)/SUN_RCONST(6876721947151.0);
+    B->A[4][3] = SUN_RCONST(11302510524611.0)/SUN_RCONST(18374767399840.0);
+    B->A[4][4] = SUN_RCONST(0.25);
     B->A[5][0] = B->b[0];
     B->A[5][1] = B->b[1];
     B->A[5][2] = B->b[2];
@@ -866,39 +866,39 @@ ARK_BUTCHER_TABLE(ARKODE_QESDIRK436L2SA_6_3_4, { /* QESDIRK4(3)6L[2]SA (A,L stab
     B->q = 4;
     B->p = 3;
 
-    B->c[1] = RCONST(16.0)/RCONST(75.0);
-    B->c[2] = RCONST(8.0)*(RCONST(2.0)-SUNRsqrt(RCONST(2.0)))/RCONST(25.0);
-    B->c[3] = RCONST(1298154247449.0)/RCONST(2478647287318.0);
-    B->c[4] = RCONST(11563539331134.0)/RCONST(11078645848867.0);
-    B->c[5] = RCONST(1.0);
-
-    B->b[0] = RCONST(540088238697.0)/RCONST(4693226184761.0);
-    B->b[2] = RCONST(1094762490994.0)/RCONST(7880993776667.0);
-    B->b[3] = RCONST(4016564763003.0)/RCONST(7185357966874.0);
-    B->b[4] = -RCONST(411820258827.0)/RCONST(3096789411938.0);
-    B->b[5] = RCONST(8.0)/RCONST(25.0);
-
-    B->d[0] = -RCONST(374484326677.0)/RCONST(8442488809460.0);
-    B->d[1] = -RCONST(41125091159938.0)/RCONST(25963879779069.0);
-    B->d[2] = RCONST(24025088270494.0)/RCONST(12927594097169.0);
-    B->d[3] = RCONST(5193917461301.0)/RCONST(8985383982321.0);
-    B->d[4] = -RCONST(1843122001830.0)/RCONST(16078617943063.0);
-    B->d[5] = RCONST(2439572212972.0)/RCONST(7960792257433.0);
-
-    B->A[1][0] = RCONST(8.0)/RCONST(75.0);
-    B->A[1][1] = RCONST(8.0)/RCONST(75.0);
-    B->A[2][0] = RCONST(605497861978.0)/RCONST(9136257189845.0);
-    B->A[2][1] = -RCONST(2127848798551.0)/RCONST(10702252975294.0);
-    B->A[2][2] = RCONST(8.0)/RCONST(25.0);
-    B->A[3][0] = -RCONST(3005106686955.0)/RCONST(6150333508049.0);
-    B->A[3][1] = -RCONST(68662668193799.0)/RCONST(11091168490809.0);
-    B->A[3][2] = RCONST(80786898110822.0)/RCONST(11737001380747.0);
-    B->A[3][3] = RCONST(8.0)/RCONST(25.0);
-    B->A[4][0] = -RCONST(26162805558846.0)/RCONST(8363194173203.0);
-    B->A[4][1] = -RCONST(291987295964487.0)/RCONST(9066074244437.0);
-    B->A[4][2] = RCONST(384682892278670.0)/RCONST(10959450712301.0);
-    B->A[4][3] = RCONST(13555548451102.0)/RCONST(14148104892819.0);
-    B->A[4][4] = RCONST(8.0)/RCONST(25.0);
+    B->c[1] = SUN_RCONST(16.0)/SUN_RCONST(75.0);
+    B->c[2] = SUN_RCONST(8.0)*(SUN_RCONST(2.0)-SUNRsqrt(SUN_RCONST(2.0)))/SUN_RCONST(25.0);
+    B->c[3] = SUN_RCONST(1298154247449.0)/SUN_RCONST(2478647287318.0);
+    B->c[4] = SUN_RCONST(11563539331134.0)/SUN_RCONST(11078645848867.0);
+    B->c[5] = SUN_RCONST(1.0);
+
+    B->b[0] = SUN_RCONST(540088238697.0)/SUN_RCONST(4693226184761.0);
+    B->b[2] = SUN_RCONST(1094762490994.0)/SUN_RCONST(7880993776667.0);
+    B->b[3] = SUN_RCONST(4016564763003.0)/SUN_RCONST(7185357966874.0);
+    B->b[4] = -SUN_RCONST(411820258827.0)/SUN_RCONST(3096789411938.0);
+    B->b[5] = SUN_RCONST(8.0)/SUN_RCONST(25.0);
+
+    B->d[0] = -SUN_RCONST(374484326677.0)/SUN_RCONST(8442488809460.0);
+    B->d[1] = -SUN_RCONST(41125091159938.0)/SUN_RCONST(25963879779069.0);
+    B->d[2] = SUN_RCONST(24025088270494.0)/SUN_RCONST(12927594097169.0);
+    B->d[3] = SUN_RCONST(5193917461301.0)/SUN_RCONST(8985383982321.0);
+    B->d[4] = -SUN_RCONST(1843122001830.0)/SUN_RCONST(16078617943063.0);
+    B->d[5] = SUN_RCONST(2439572212972.0)/SUN_RCONST(7960792257433.0);
+
+    B->A[1][0] = SUN_RCONST(8.0)/SUN_RCONST(75.0);
+    B->A[1][1] = SUN_RCONST(8.0)/SUN_RCONST(75.0);
+    B->A[2][0] = SUN_RCONST(605497861978.0)/SUN_RCONST(9136257189845.0);
+    B->A[2][1] = -SUN_RCONST(2127848798551.0)/SUN_RCONST(10702252975294.0);
+    B->A[2][2] = SUN_RCONST(8.0)/SUN_RCONST(25.0);
+    B->A[3][0] = -SUN_RCONST(3005106686955.0)/SUN_RCONST(6150333508049.0);
+    B->A[3][1] = -SUN_RCONST(68662668193799.0)/SUN_RCONST(11091168490809.0);
+    B->A[3][2] = SUN_RCONST(80786898110822.0)/SUN_RCONST(11737001380747.0);
+    B->A[3][3] = SUN_RCONST(8.0)/SUN_RCONST(25.0);
+    B->A[4][0] = -SUN_RCONST(26162805558846.0)/SUN_RCONST(8363194173203.0);
+    B->A[4][1] = -SUN_RCONST(291987295964487.0)/SUN_RCONST(9066074244437.0);
+    B->A[4][2] = SUN_RCONST(384682892278670.0)/SUN_RCONST(10959450712301.0);
+    B->A[4][3] = SUN_RCONST(13555548451102.0)/SUN_RCONST(14148104892819.0);
+    B->A[4][4] = SUN_RCONST(8.0)/SUN_RCONST(25.0);
     B->A[5][0] = B->b[0];
     B->A[5][1] = B->b[1];
     B->A[5][2] = B->b[2];
@@ -913,44 +913,44 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK437L2SA_7_3_4, { /* ESDIRK4(3)7L[2]SA (A,L stable
     B->q = 4;
     B->p = 3;
 
-    B->c[1] = RCONST(1.0)/RCONST(4.0);
-    B->c[2] = RCONST(1200237871921.0)/RCONST(16391473681546.0);
-    B->c[3] = RCONST(1.0)/RCONST(2.0);
-    B->c[4] = RCONST(395.0)/RCONST(567.0);
-    B->c[5] = RCONST(89.0)/RCONST(126.0);
-    B->c[6] = RCONST(1.0);
-
-    B->b[1] = -RCONST(5649241495537.0)/RCONST(14093099002237.0);
-    B->b[2] = RCONST(5718691255176.0)/RCONST(6089204655961.0);
-    B->b[3] = RCONST(2199600963556.0)/RCONST(4241893152925.0);
-    B->b[4] = RCONST(8860614275765.0)/RCONST(11425531467341.0);
-    B->b[5] = -RCONST(3696041814078.0)/RCONST(6641566663007.0);
-    B->b[6] = RCONST(1.0)/RCONST(8.0);
-    B->b[0] = RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
-
-    B->d[1] = -RCONST(1517409284625.0)/RCONST(6267517876163.0);
-    B->d[2] = RCONST(8291371032348.0)/RCONST(12587291883523.0);
-    B->d[3] = RCONST(5328310281212.0)/RCONST(10646448185159.0);
-    B->d[4] = RCONST(5405006853541.0)/RCONST(7104492075037.0);
-    B->d[5] = -RCONST(4254786582061.0)/RCONST(7445269677723.0);
-    B->d[6] = RCONST(19.0)/RCONST(140.0);
-    B->d[0] = RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
-
-    B->A[1][1] = RCONST(1.0)/RCONST(8.0);
-    B->A[2][1] = -RCONST(39188347878.0)/RCONST(1513744654945.0);
-    B->A[2][2] = RCONST(1.0)/RCONST(8.0);
-    B->A[3][1] = RCONST(1748874742213.0)/RCONST(5168247530883.0);
-    B->A[3][2] = -RCONST(1748874742213.0)/RCONST(5795261096931.0);
-    B->A[3][3] = RCONST(1.0)/RCONST(8.0);
-    B->A[4][1] = -RCONST(6429340993097.0)/RCONST(17896796106705.0);
-    B->A[4][2] = RCONST(9711656375562.0)/RCONST(10370074603625.0);
-    B->A[4][3] = RCONST(1137589605079.0)/RCONST(3216875020685.0);
-    B->A[4][4] = RCONST(1.0)/RCONST(8.0);
-    B->A[5][1] = RCONST(405169606099.0)/RCONST(1734380148729.0);
-    B->A[5][2] = -RCONST(264468840649.0)/RCONST(6105657584947.0);
-    B->A[5][3] = RCONST(118647369377.0)/RCONST(6233854714037.0);
-    B->A[5][4] = RCONST(683008737625.0)/RCONST(4934655825458.0);
-    B->A[5][5] = RCONST(1.0)/RCONST(8.0);
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->c[2] = SUN_RCONST(1200237871921.0)/SUN_RCONST(16391473681546.0);
+    B->c[3] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[4] = SUN_RCONST(395.0)/SUN_RCONST(567.0);
+    B->c[5] = SUN_RCONST(89.0)/SUN_RCONST(126.0);
+    B->c[6] = SUN_RCONST(1.0);
+
+    B->b[1] = -SUN_RCONST(5649241495537.0)/SUN_RCONST(14093099002237.0);
+    B->b[2] = SUN_RCONST(5718691255176.0)/SUN_RCONST(6089204655961.0);
+    B->b[3] = SUN_RCONST(2199600963556.0)/SUN_RCONST(4241893152925.0);
+    B->b[4] = SUN_RCONST(8860614275765.0)/SUN_RCONST(11425531467341.0);
+    B->b[5] = -SUN_RCONST(3696041814078.0)/SUN_RCONST(6641566663007.0);
+    B->b[6] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->b[0] = SUN_RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
+
+    B->d[1] = -SUN_RCONST(1517409284625.0)/SUN_RCONST(6267517876163.0);
+    B->d[2] = SUN_RCONST(8291371032348.0)/SUN_RCONST(12587291883523.0);
+    B->d[3] = SUN_RCONST(5328310281212.0)/SUN_RCONST(10646448185159.0);
+    B->d[4] = SUN_RCONST(5405006853541.0)/SUN_RCONST(7104492075037.0);
+    B->d[5] = -SUN_RCONST(4254786582061.0)/SUN_RCONST(7445269677723.0);
+    B->d[6] = SUN_RCONST(19.0)/SUN_RCONST(140.0);
+    B->d[0] = SUN_RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
+
+    B->A[1][1] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->A[2][1] = -SUN_RCONST(39188347878.0)/SUN_RCONST(1513744654945.0);
+    B->A[2][2] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->A[3][1] = SUN_RCONST(1748874742213.0)/SUN_RCONST(5168247530883.0);
+    B->A[3][2] = -SUN_RCONST(1748874742213.0)/SUN_RCONST(5795261096931.0);
+    B->A[3][3] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->A[4][1] = -SUN_RCONST(6429340993097.0)/SUN_RCONST(17896796106705.0);
+    B->A[4][2] = SUN_RCONST(9711656375562.0)/SUN_RCONST(10370074603625.0);
+    B->A[4][3] = SUN_RCONST(1137589605079.0)/SUN_RCONST(3216875020685.0);
+    B->A[4][4] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->A[5][1] = SUN_RCONST(405169606099.0)/SUN_RCONST(1734380148729.0);
+    B->A[5][2] = -SUN_RCONST(264468840649.0)/SUN_RCONST(6105657584947.0);
+    B->A[5][3] = SUN_RCONST(118647369377.0)/SUN_RCONST(6233854714037.0);
+    B->A[5][4] = SUN_RCONST(683008737625.0)/SUN_RCONST(4934655825458.0);
+    B->A[5][5] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
     B->A[6][0] = B->b[0];
     B->A[6][1] = B->b[1];
     B->A[6][2] = B->b[2];
@@ -971,44 +971,44 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK547L2SA_7_4_5, { /* ESDIRK5(4)7L[2]SA (A,L stable
     B->q = 5;
     B->p = 4;
 
-    B->c[1] = RCONST(46.0)/RCONST(125.0);
-    B->c[2] = RCONST(1518047795759.0)/RCONST(14084074382095.0);
-    B->c[3] = RCONST(13.0)/RCONST(25.0);
-    B->c[4] = RCONST(5906118540659.0)/RCONST(9042400211275.0);
-    B->c[5] = RCONST(26.0)/RCONST(25.0);
-    B->c[6] = RCONST(1.0);
-
-    B->b[1] = -RCONST(1319096626979.0)/RCONST(17356965168099.0);
-    B->b[2] = RCONST(4356877330928.0)/RCONST(10268933656267.0);
-    B->b[3] = RCONST(922991294344.0)/RCONST(3350617878647.0);
-    B->b[4] = RCONST(4729382008034.0)/RCONST(14755765856909.0);
-    B->b[5] = -RCONST(308199069217.0)/RCONST(5897303561678.0);
-    B->b[6] = RCONST(23.0)/RCONST(125.0);
-    B->b[0] = RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
-
-    B->d[1] = -RCONST(12068858301481.0)/RCONST(111697653055985.0);
-    B->d[2] = RCONST(30204157393951.0)/RCONST(62440428688139.0);
-    B->d[3] = RCONST(26156819792768.0)/RCONST(110856972047457.0);
-    B->d[4] = RCONST(33531609809941.0)/RCONST(89326307438822.0);
-    B->d[5] = -RCONST(18686091006953.0)/RCONST(578397443530870.0);
-    B->d[6] = RCONST(10582397456777.0)/RCONST(69011126173064.0);
-    B->d[0] = RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
-
-    B->A[1][1] = RCONST(23.0)/RCONST(125.0);
-    B->A[2][1] = -RCONST(121529886477.0)/RCONST(3189120653983.0);
-    B->A[2][2] = RCONST(23.0)/RCONST(125.0);
-    B->A[3][1] = RCONST(186345625210.0)/RCONST(8596203768457.0);
-    B->A[3][2] = RCONST(3681435451073.0)/RCONST(12579882114497.0);
-    B->A[3][3] = RCONST(23.0)/RCONST(125.0);
-    B->A[4][1] = -RCONST(9898129553915.0)/RCONST(11630542248213.0);
-    B->A[4][2] = RCONST(19565727496993.0)/RCONST(11159348038501.0);
-    B->A[4][3] = RCONST(2073446517052.0)/RCONST(4961027473423.0);
-    B->A[4][4] = RCONST(23.0)/RCONST(125.0);
-    B->A[5][1] = -RCONST(39752543191591.0)/RCONST(7894275939720.0);
-    B->A[5][2] = RCONST(52228808998390.0)/RCONST(5821762529307.0);
-    B->A[5][3] = RCONST(2756378382725.0)/RCONST(8748785577174.0);
-    B->A[5][4] = RCONST(17322065038796.0)/RCONST(10556643942083.0);
-    B->A[5][5] = RCONST(23.0)/RCONST(125.0);
+    B->c[1] = SUN_RCONST(46.0)/SUN_RCONST(125.0);
+    B->c[2] = SUN_RCONST(1518047795759.0)/SUN_RCONST(14084074382095.0);
+    B->c[3] = SUN_RCONST(13.0)/SUN_RCONST(25.0);
+    B->c[4] = SUN_RCONST(5906118540659.0)/SUN_RCONST(9042400211275.0);
+    B->c[5] = SUN_RCONST(26.0)/SUN_RCONST(25.0);
+    B->c[6] = SUN_RCONST(1.0);
+
+    B->b[1] = -SUN_RCONST(1319096626979.0)/SUN_RCONST(17356965168099.0);
+    B->b[2] = SUN_RCONST(4356877330928.0)/SUN_RCONST(10268933656267.0);
+    B->b[3] = SUN_RCONST(922991294344.0)/SUN_RCONST(3350617878647.0);
+    B->b[4] = SUN_RCONST(4729382008034.0)/SUN_RCONST(14755765856909.0);
+    B->b[5] = -SUN_RCONST(308199069217.0)/SUN_RCONST(5897303561678.0);
+    B->b[6] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->b[0] = SUN_RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
+
+    B->d[1] = -SUN_RCONST(12068858301481.0)/SUN_RCONST(111697653055985.0);
+    B->d[2] = SUN_RCONST(30204157393951.0)/SUN_RCONST(62440428688139.0);
+    B->d[3] = SUN_RCONST(26156819792768.0)/SUN_RCONST(110856972047457.0);
+    B->d[4] = SUN_RCONST(33531609809941.0)/SUN_RCONST(89326307438822.0);
+    B->d[5] = -SUN_RCONST(18686091006953.0)/SUN_RCONST(578397443530870.0);
+    B->d[6] = SUN_RCONST(10582397456777.0)/SUN_RCONST(69011126173064.0);
+    B->d[0] = SUN_RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
+
+    B->A[1][1] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[2][1] = -SUN_RCONST(121529886477.0)/SUN_RCONST(3189120653983.0);
+    B->A[2][2] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[3][1] = SUN_RCONST(186345625210.0)/SUN_RCONST(8596203768457.0);
+    B->A[3][2] = SUN_RCONST(3681435451073.0)/SUN_RCONST(12579882114497.0);
+    B->A[3][3] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[4][1] = -SUN_RCONST(9898129553915.0)/SUN_RCONST(11630542248213.0);
+    B->A[4][2] = SUN_RCONST(19565727496993.0)/SUN_RCONST(11159348038501.0);
+    B->A[4][3] = SUN_RCONST(2073446517052.0)/SUN_RCONST(4961027473423.0);
+    B->A[4][4] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[5][1] = -SUN_RCONST(39752543191591.0)/SUN_RCONST(7894275939720.0);
+    B->A[5][2] = SUN_RCONST(52228808998390.0)/SUN_RCONST(5821762529307.0);
+    B->A[5][3] = SUN_RCONST(2756378382725.0)/SUN_RCONST(8748785577174.0);
+    B->A[5][4] = SUN_RCONST(17322065038796.0)/SUN_RCONST(10556643942083.0);
+    B->A[5][5] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
     B->A[6][0] = B->b[0];
     B->A[6][1] = B->b[1];
     B->A[6][2] = B->b[2];
@@ -1029,44 +1029,44 @@ ARK_BUTCHER_TABLE(ARKODE_ESDIRK547L2SA2_7_4_5, { /* ESDIRK5(4)7L[2]SA2 (A,L stab
     B->q = 5;
     B->p = 4;
 
-    B->c[1] = RCONST(46.0)/RCONST(125.0);
-    B->c[2] = RCONST(7121331996143.0)/RCONST(11335814405378.0);
-    B->c[3] = RCONST(49.0)/RCONST(353.0);
-    B->c[4] = RCONST(3706679970760.0)/RCONST(5295570149437.0);
-    B->c[5] = RCONST(347.0)/RCONST(382.0);
-    B->c[6] = RCONST(1.0);
-
-    B->b[1] = -RCONST(188593204321.0)/RCONST(4778616380481.0);
-    B->b[2] = RCONST(2809310203510.0)/RCONST(10304234040467.0);
-    B->b[3] = RCONST(1021729336898.0)/RCONST(2364210264653.0);
-    B->b[4] = RCONST(870612361811.0)/RCONST(2470410392208.0);
-    B->b[5] = -RCONST(1307970675534.0)/RCONST(8059683598661.0);
-    B->b[6] = RCONST(23.0)/RCONST(125.0);
-    B->b[0] = RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
-
-    B->d[1] = -RCONST(582099335757.0)/RCONST(7214068459310.0);
-    B->d[2] = RCONST(615023338567.0)/RCONST(3362626566945.0);
-    B->d[3] = RCONST(3192122436311.0)/RCONST(6174152374399.0);
-    B->d[4] = RCONST(6156034052041.0)/RCONST(14430468657929.0);
-    B->d[5] = -RCONST(1011318518279.0)/RCONST(9693750372484.0);
-    B->d[6] = RCONST(1914490192573.0)/RCONST(13754262428401.0);
-    B->d[0] = RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
-
-    B->A[1][1] = RCONST(23.0)/RCONST(125.0);
-    B->A[2][1] = RCONST(791020047304.0)/RCONST(3561426431547.0);
-    B->A[2][2] = RCONST(23.0)/RCONST(125.0);
-    B->A[3][1] = -RCONST(158159076358.0)/RCONST(11257294102345.0);
-    B->A[3][2] = -RCONST(85517644447.0)/RCONST(5003708988389.0);
-    B->A[3][3] = RCONST(23.0)/RCONST(125.0);
-    B->A[4][1] = -RCONST(1653327111580.0)/RCONST(4048416487981.0);
-    B->A[4][2] = RCONST(1514767744496.0)/RCONST(9099671765375.0);
-    B->A[4][3] = RCONST(14283835447591.0)/RCONST(12247432691556.0);
-    B->A[4][4] = RCONST(23.0)/RCONST(125.0);
-    B->A[5][1] = -RCONST(4540011970825.0)/RCONST(8418487046959.0);
-    B->A[5][2] = -RCONST(1790937573418.0)/RCONST(7393406387169.0);
-    B->A[5][3] = RCONST(10819093665085.0)/RCONST(7266595846747.0);
-    B->A[5][4] = RCONST(4109463131231.0)/RCONST(7386972500302.0);
-    B->A[5][5] = RCONST(23.0)/RCONST(125.0);
+    B->c[1] = SUN_RCONST(46.0)/SUN_RCONST(125.0);
+    B->c[2] = SUN_RCONST(7121331996143.0)/SUN_RCONST(11335814405378.0);
+    B->c[3] = SUN_RCONST(49.0)/SUN_RCONST(353.0);
+    B->c[4] = SUN_RCONST(3706679970760.0)/SUN_RCONST(5295570149437.0);
+    B->c[5] = SUN_RCONST(347.0)/SUN_RCONST(382.0);
+    B->c[6] = SUN_RCONST(1.0);
+
+    B->b[1] = -SUN_RCONST(188593204321.0)/SUN_RCONST(4778616380481.0);
+    B->b[2] = SUN_RCONST(2809310203510.0)/SUN_RCONST(10304234040467.0);
+    B->b[3] = SUN_RCONST(1021729336898.0)/SUN_RCONST(2364210264653.0);
+    B->b[4] = SUN_RCONST(870612361811.0)/SUN_RCONST(2470410392208.0);
+    B->b[5] = -SUN_RCONST(1307970675534.0)/SUN_RCONST(8059683598661.0);
+    B->b[6] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->b[0] = SUN_RCONST(1.0) - B->b[1] - B->b[2] - B->b[3] - B->b[4] - B->b[5] - B->b[6];
+
+    B->d[1] = -SUN_RCONST(582099335757.0)/SUN_RCONST(7214068459310.0);
+    B->d[2] = SUN_RCONST(615023338567.0)/SUN_RCONST(3362626566945.0);
+    B->d[3] = SUN_RCONST(3192122436311.0)/SUN_RCONST(6174152374399.0);
+    B->d[4] = SUN_RCONST(6156034052041.0)/SUN_RCONST(14430468657929.0);
+    B->d[5] = -SUN_RCONST(1011318518279.0)/SUN_RCONST(9693750372484.0);
+    B->d[6] = SUN_RCONST(1914490192573.0)/SUN_RCONST(13754262428401.0);
+    B->d[0] = SUN_RCONST(1.0) - B->d[1] - B->d[2] - B->d[3] - B->d[4] - B->d[5] - B->d[6];
+
+    B->A[1][1] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[2][1] = SUN_RCONST(791020047304.0)/SUN_RCONST(3561426431547.0);
+    B->A[2][2] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[3][1] = -SUN_RCONST(158159076358.0)/SUN_RCONST(11257294102345.0);
+    B->A[3][2] = -SUN_RCONST(85517644447.0)/SUN_RCONST(5003708988389.0);
+    B->A[3][3] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[4][1] = -SUN_RCONST(1653327111580.0)/SUN_RCONST(4048416487981.0);
+    B->A[4][2] = SUN_RCONST(1514767744496.0)/SUN_RCONST(9099671765375.0);
+    B->A[4][3] = SUN_RCONST(14283835447591.0)/SUN_RCONST(12247432691556.0);
+    B->A[4][4] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
+    B->A[5][1] = -SUN_RCONST(4540011970825.0)/SUN_RCONST(8418487046959.0);
+    B->A[5][2] = -SUN_RCONST(1790937573418.0)/SUN_RCONST(7393406387169.0);
+    B->A[5][3] = SUN_RCONST(10819093665085.0)/SUN_RCONST(7266595846747.0);
+    B->A[5][4] = SUN_RCONST(4109463131231.0)/SUN_RCONST(7386972500302.0);
+    B->A[5][5] = SUN_RCONST(23.0)/SUN_RCONST(125.0);
     B->A[6][0] = B->b[0];
     B->A[6][1] = B->b[1];
     B->A[6][2] = B->b[2];
diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def
index ba719b24bc..edb11c3aac 100644
--- a/src/arkode/arkode_butcher_erk.def
+++ b/src/arkode/arkode_butcher_erk.def
@@ -73,14 +73,14 @@ ARK_BUTCHER_TABLE(ARKODE_HEUN_EULER_2_1_2, { /* Heun-Euler-ERK */
     B->q = 2;
     B->p = 1;
 
-    B->A[1][0] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1.0);
 
-    B->b[0] = RCONST(1.0)/RCONST(2.0);
-    B->b[1] = RCONST(1.0)/RCONST(2.0);
+    B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->b[1] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
 
-    B->d[0] = RCONST(1.0);
+    B->d[0] = SUN_RCONST(1.0);
 
-    B->c[1] = RCONST(1.0);
+    B->c[1] = SUN_RCONST(1.0);
     return B;
  })
 
@@ -123,24 +123,24 @@ ARK_BUTCHER_TABLE(ARKODE_BOGACKI_SHAMPINE_4_2_3, { /* Bogacki-Shampine-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(4, SUNTRUE);
     B->q = 3;
     B->p = 2;
-    B->A[1][0] = RCONST(1.0)/RCONST(2.0);
-    B->A[2][1] = RCONST(3.0)/RCONST(4.0);
-    B->A[3][0] = RCONST(2.0)/RCONST(9.0);
-    B->A[3][1] = RCONST(1.0)/RCONST(3.0);
-    B->A[3][2] = RCONST(4.0)/RCONST(9.0);
-
-    B->b[0] = RCONST(2.0)/RCONST(9.0);
-    B->b[1] = RCONST(1.0)/RCONST(3.0);
-    B->b[2] = RCONST(4.0)/RCONST(9.0);
-
-    B->d[0] = RCONST(7.0)/RCONST(24.0);
-    B->d[1] = RCONST(1.0)/RCONST(4.0);
-    B->d[2] = RCONST(1.0)/RCONST(3.0);
-    B->d[3] = RCONST(1.0)/RCONST(8.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(2.0);
-    B->c[2] = RCONST(3.0)/RCONST(4.0);
-    B->c[3] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->A[2][1] = SUN_RCONST(3.0)/SUN_RCONST(4.0);
+    B->A[3][0] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->A[3][1] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->A[3][2] = SUN_RCONST(4.0)/SUN_RCONST(9.0);
+
+    B->b[0] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+    B->b[1] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->b[2] = SUN_RCONST(4.0)/SUN_RCONST(9.0);
+
+    B->d[0] = SUN_RCONST(7.0)/SUN_RCONST(24.0);
+    B->d[1] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->d[2] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->d[3] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(4.0);
+    B->c[3] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -148,26 +148,26 @@ ARK_BUTCHER_TABLE(ARKODE_ARK324L2SA_ERK_4_2_3, { /* ARK3(2)4L[2]SA-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(4, SUNTRUE);
     B->q = 3;
     B->p = 2;
-    B->A[1][0] = RCONST(1767732205903.0)/RCONST(2027836641118.0);
-    B->A[2][0] = RCONST(5535828885825.0)/RCONST(10492691773637.0);
-    B->A[2][1] = RCONST(788022342437.0)/RCONST(10882634858940.0);
-    B->A[3][0] = RCONST(6485989280629.0)/RCONST(16251701735622.0);
-    B->A[3][1] = RCONST(-4246266847089.0)/RCONST(9704473918619.0);
-    B->A[3][2] = RCONST(10755448449292.0)/RCONST(10357097424841.0);
-
-    B->b[0] = RCONST(1471266399579.0)/RCONST(7840856788654.0);
-    B->b[1] = RCONST(-4482444167858.0)/RCONST(7529755066697.0);
-    B->b[2] = RCONST(11266239266428.0)/RCONST(11593286722821.0);
-    B->b[3] = RCONST(1767732205903.0)/RCONST(4055673282236.0);
-
-    B->d[0] = RCONST(2756255671327.0)/RCONST(12835298489170.0);
-    B->d[1] = RCONST(-10771552573575.0)/RCONST(22201958757719.0);
-    B->d[2] = RCONST(9247589265047.0)/RCONST(10645013368117.0);
-    B->d[3] = RCONST(2193209047091.0)/RCONST(5459859503100.0);
-
-    B->c[1] = RCONST(1767732205903.0)/RCONST(2027836641118.0);
-    B->c[2] = RCONST(3.0)/RCONST(5.0);
-    B->c[3] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1767732205903.0)/SUN_RCONST(2027836641118.0);
+    B->A[2][0] = SUN_RCONST(5535828885825.0)/SUN_RCONST(10492691773637.0);
+    B->A[2][1] = SUN_RCONST(788022342437.0)/SUN_RCONST(10882634858940.0);
+    B->A[3][0] = SUN_RCONST(6485989280629.0)/SUN_RCONST(16251701735622.0);
+    B->A[3][1] = SUN_RCONST(-4246266847089.0)/SUN_RCONST(9704473918619.0);
+    B->A[3][2] = SUN_RCONST(10755448449292.0)/SUN_RCONST(10357097424841.0);
+
+    B->b[0] = SUN_RCONST(1471266399579.0)/SUN_RCONST(7840856788654.0);
+    B->b[1] = SUN_RCONST(-4482444167858.0)/SUN_RCONST(7529755066697.0);
+    B->b[2] = SUN_RCONST(11266239266428.0)/SUN_RCONST(11593286722821.0);
+    B->b[3] = SUN_RCONST(1767732205903.0)/SUN_RCONST(4055673282236.0);
+
+    B->d[0] = SUN_RCONST(2756255671327.0)/SUN_RCONST(12835298489170.0);
+    B->d[1] = SUN_RCONST(-10771552573575.0)/SUN_RCONST(22201958757719.0);
+    B->d[2] = SUN_RCONST(9247589265047.0)/SUN_RCONST(10645013368117.0);
+    B->d[3] = SUN_RCONST(2193209047091.0)/SUN_RCONST(5459859503100.0);
+
+    B->c[1] = SUN_RCONST(1767732205903.0)/SUN_RCONST(2027836641118.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[3] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -176,20 +176,20 @@ ARK_BUTCHER_TABLE(ARKODE_SHU_OSHER_3_2_3, { /* Shu-Osher-ERK */
     B->q = 3;
     B->p = 2;
 
-    B->A[1][0] = RCONST(1.0);
-    B->A[2][0] = RCONST(1.0)/RCONST(4.0);
-    B->A[2][1] = RCONST(1.0)/RCONST(4.0);
+    B->A[1][0] = SUN_RCONST(1.0);
+    B->A[2][0] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[2][1] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
 
-    B->b[0] = RCONST(1.0)/RCONST(6.0);
-    B->b[1] = RCONST(1.0)/RCONST(6.0);
-    B->b[2] = RCONST(2.0)/RCONST(3.0);
+    B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->b[1] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->b[2] = SUN_RCONST(2.0)/SUN_RCONST(3.0);
 
-    B->d[0] = RCONST(291485418878409.0)/RCONST(1.0e15);
-    B->d[1] = RCONST(291485418878409.0)/RCONST(1.0e15);
-    B->d[2] = RCONST(208514581121591.0)/RCONST(5.0e14);
+    B->d[0] = SUN_RCONST(291485418878409.0)/SUN_RCONST(1.0e15);
+    B->d[1] = SUN_RCONST(291485418878409.0)/SUN_RCONST(1.0e15);
+    B->d[2] = SUN_RCONST(208514581121591.0)/SUN_RCONST(5.0e14);
 
-    B->c[1] = RCONST(1.0);
-    B->c[2] = RCONST(1.0)/RCONST(2.0);
+    B->c[1] = SUN_RCONST(1.0);
+    B->c[2] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
 
     return B;
   })
@@ -198,32 +198,32 @@ ARK_BUTCHER_TABLE(ARKODE_SOFRONIOU_SPALETTA_5_3_4, { /* Sofroniou-Spaletta-ERK *
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(2.0) / RCONST(5.0);
-    B->A[2][0] = RCONST(-3.0) / RCONST(20.0);
-    B->A[2][1] = RCONST(3.0) / RCONST(4.0);
-    B->A[3][0] = RCONST(19.0)/RCONST(44.0);
-    B->A[3][1] = RCONST(-15.0)/RCONST(44.0);
-    B->A[3][2] = RCONST(10.0)/RCONST(11.0);
-    B->A[4][0] = RCONST(11.0)/RCONST(72.0);
-    B->A[4][1] = RCONST(25.0)/RCONST(72.0);
-    B->A[4][2] = RCONST(25.0)/RCONST(72.0);
-    B->A[4][3] = RCONST(11.0)/RCONST(72.0);
-
-    B->b[0] = RCONST(11.0)/RCONST(72.0);
-    B->b[1] = RCONST(25.0)/RCONST(72.0);
-    B->b[2] = RCONST(25.0)/RCONST(72.0);
-    B->b[3] = RCONST(11.0)/RCONST(72.0);
-
-    B->d[0] = RCONST(1251515.0)/RCONST(8970912.0);
-    B->d[1] = RCONST(3710105.0)/RCONST(8970912.0);
-    B->d[2] = RCONST(2519695.0)/RCONST(8970912.0);
-    B->d[3] = RCONST(61105.0)/RCONST(8970912.0);
-    B->d[4] = RCONST(119041.0)/RCONST(747576.0);
-
-    B->c[1] = RCONST(2.0) / RCONST(5.0);
-    B->c[2] = RCONST(3.0) / RCONST(5.0);
-    B->c[3] = RCONST(1.0);
-    B->c[4] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(2.0) / SUN_RCONST(5.0);
+    B->A[2][0] = SUN_RCONST(-3.0) / SUN_RCONST(20.0);
+    B->A[2][1] = SUN_RCONST(3.0) / SUN_RCONST(4.0);
+    B->A[3][0] = SUN_RCONST(19.0)/SUN_RCONST(44.0);
+    B->A[3][1] = SUN_RCONST(-15.0)/SUN_RCONST(44.0);
+    B->A[3][2] = SUN_RCONST(10.0)/SUN_RCONST(11.0);
+    B->A[4][0] = SUN_RCONST(11.0)/SUN_RCONST(72.0);
+    B->A[4][1] = SUN_RCONST(25.0)/SUN_RCONST(72.0);
+    B->A[4][2] = SUN_RCONST(25.0)/SUN_RCONST(72.0);
+    B->A[4][3] = SUN_RCONST(11.0)/SUN_RCONST(72.0);
+
+    B->b[0] = SUN_RCONST(11.0)/SUN_RCONST(72.0);
+    B->b[1] = SUN_RCONST(25.0)/SUN_RCONST(72.0);
+    B->b[2] = SUN_RCONST(25.0)/SUN_RCONST(72.0);
+    B->b[3] = SUN_RCONST(11.0)/SUN_RCONST(72.0);
+
+    B->d[0] = SUN_RCONST(1251515.0)/SUN_RCONST(8970912.0);
+    B->d[1] = SUN_RCONST(3710105.0)/SUN_RCONST(8970912.0);
+    B->d[2] = SUN_RCONST(2519695.0)/SUN_RCONST(8970912.0);
+    B->d[3] = SUN_RCONST(61105.0)/SUN_RCONST(8970912.0);
+    B->d[4] = SUN_RCONST(119041.0)/SUN_RCONST(747576.0);
+
+    B->c[1] = SUN_RCONST(2.0) / SUN_RCONST(5.0);
+    B->c[2] = SUN_RCONST(3.0) / SUN_RCONST(5.0);
+    B->c[3] = SUN_RCONST(1.0);
+    B->c[4] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -231,29 +231,29 @@ ARK_BUTCHER_TABLE(ARKODE_ZONNEVELD_5_3_4, { /* Zonneveld */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(5, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(0.5);
-    B->A[2][1] = RCONST(0.5);
-    B->A[3][2] = RCONST(1.0);
-    B->A[4][0] = RCONST(5.0)/RCONST(32.0);
-    B->A[4][1] = RCONST(7.0)/RCONST(32.0);
-    B->A[4][2] = RCONST(13.0)/RCONST(32.0);
-    B->A[4][3] = RCONST(-1.0)/RCONST(32.0);
-
-    B->b[0] = RCONST(1.0)/RCONST(6.0);
-    B->b[1] = RCONST(1.0)/RCONST(3.0);
-    B->b[2] = RCONST(1.0)/RCONST(3.0);
-    B->b[3] = RCONST(1.0)/RCONST(6.0);
-
-    B->d[0] = RCONST(-1.0)/RCONST(2.0);
-    B->d[1] = RCONST(7.0)/RCONST(3.0);
-    B->d[2] = RCONST(7.0)/RCONST(3.0);
-    B->d[3] = RCONST(13.0)/RCONST(6.0);
-    B->d[4] = RCONST(-16.0)/RCONST(3.0);
-
-    B->c[1] = RCONST(0.5);
-    B->c[2] = RCONST(0.5);
-    B->c[3] = RCONST(1.0);
-    B->c[4] = RCONST(0.75);
+    B->A[1][0] = SUN_RCONST(0.5);
+    B->A[2][1] = SUN_RCONST(0.5);
+    B->A[3][2] = SUN_RCONST(1.0);
+    B->A[4][0] = SUN_RCONST(5.0)/SUN_RCONST(32.0);
+    B->A[4][1] = SUN_RCONST(7.0)/SUN_RCONST(32.0);
+    B->A[4][2] = SUN_RCONST(13.0)/SUN_RCONST(32.0);
+    B->A[4][3] = SUN_RCONST(-1.0)/SUN_RCONST(32.0);
+
+    B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->b[1] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->b[2] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->b[3] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+
+    B->d[0] = SUN_RCONST(-1.0)/SUN_RCONST(2.0);
+    B->d[1] = SUN_RCONST(7.0)/SUN_RCONST(3.0);
+    B->d[2] = SUN_RCONST(7.0)/SUN_RCONST(3.0);
+    B->d[3] = SUN_RCONST(13.0)/SUN_RCONST(6.0);
+    B->d[4] = SUN_RCONST(-16.0)/SUN_RCONST(3.0);
+
+    B->c[1] = SUN_RCONST(0.5);
+    B->c[2] = SUN_RCONST(0.5);
+    B->c[3] = SUN_RCONST(1.0);
+    B->c[4] = SUN_RCONST(0.75);
     return B;
   })
 
@@ -261,39 +261,39 @@ ARK_BUTCHER_TABLE(ARKODE_ARK436L2SA_ERK_6_3_4, { /* ARK4(3)6L[2]SA-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(0.5);
-    B->A[2][0] = RCONST(13861.0)/RCONST(62500.0);
-    B->A[2][1] = RCONST(6889.0)/RCONST(62500.0);
-    B->A[3][0] = RCONST(-116923316275.0)/RCONST(2393684061468.0);
-    B->A[3][1] = RCONST(-2731218467317.0)/RCONST(15368042101831.0);
-    B->A[3][2] = RCONST(9408046702089.0)/RCONST(11113171139209.0);
-    B->A[4][0] = RCONST(-451086348788.0)/RCONST(2902428689909.0);
-    B->A[4][1] = RCONST(-2682348792572.0)/RCONST(7519795681897.0);
-    B->A[4][2] = RCONST(12662868775082.0)/RCONST(11960479115383.0);
-    B->A[4][3] = RCONST(3355817975965.0)/RCONST(11060851509271.0);
-    B->A[5][0] = RCONST(647845179188.0)/RCONST(3216320057751.0);
-    B->A[5][1] = RCONST(73281519250.0)/RCONST(8382639484533.0);
-    B->A[5][2] = RCONST(552539513391.0)/RCONST(3454668386233.0);
-    B->A[5][3] = RCONST(3354512671639.0)/RCONST(8306763924573.0);
-    B->A[5][4] = RCONST(4040.0)/RCONST(17871.0);
-
-    B->b[0] = RCONST(82889.0)/RCONST(524892.0);
-    B->b[2] = RCONST(15625.0)/RCONST(83664.0);
-    B->b[3] = RCONST(69875.0)/RCONST(102672.0);
-    B->b[4] = RCONST(-2260.0)/RCONST(8211.0);
-    B->b[5] = RCONST(1.0)/RCONST(4.0);
-
-    B->d[0] = RCONST(4586570599.0)/RCONST(29645900160.0);
-    B->d[2] = RCONST(178811875.0)/RCONST(945068544.0);
-    B->d[3] = RCONST(814220225.0)/RCONST(1159782912.0);
-    B->d[4] = RCONST(-3700637.0)/RCONST(11593932.0);
-    B->d[5] = RCONST(61727.0)/RCONST(225920.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(2.0);
-    B->c[2] = RCONST(83.0)/RCONST(250.0);
-    B->c[3] = RCONST(31.0)/RCONST(50.0);
-    B->c[4] = RCONST(17.0)/RCONST(20.0);
-    B->c[5] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(0.5);
+    B->A[2][0] = SUN_RCONST(13861.0)/SUN_RCONST(62500.0);
+    B->A[2][1] = SUN_RCONST(6889.0)/SUN_RCONST(62500.0);
+    B->A[3][0] = SUN_RCONST(-116923316275.0)/SUN_RCONST(2393684061468.0);
+    B->A[3][1] = SUN_RCONST(-2731218467317.0)/SUN_RCONST(15368042101831.0);
+    B->A[3][2] = SUN_RCONST(9408046702089.0)/SUN_RCONST(11113171139209.0);
+    B->A[4][0] = SUN_RCONST(-451086348788.0)/SUN_RCONST(2902428689909.0);
+    B->A[4][1] = SUN_RCONST(-2682348792572.0)/SUN_RCONST(7519795681897.0);
+    B->A[4][2] = SUN_RCONST(12662868775082.0)/SUN_RCONST(11960479115383.0);
+    B->A[4][3] = SUN_RCONST(3355817975965.0)/SUN_RCONST(11060851509271.0);
+    B->A[5][0] = SUN_RCONST(647845179188.0)/SUN_RCONST(3216320057751.0);
+    B->A[5][1] = SUN_RCONST(73281519250.0)/SUN_RCONST(8382639484533.0);
+    B->A[5][2] = SUN_RCONST(552539513391.0)/SUN_RCONST(3454668386233.0);
+    B->A[5][3] = SUN_RCONST(3354512671639.0)/SUN_RCONST(8306763924573.0);
+    B->A[5][4] = SUN_RCONST(4040.0)/SUN_RCONST(17871.0);
+
+    B->b[0] = SUN_RCONST(82889.0)/SUN_RCONST(524892.0);
+    B->b[2] = SUN_RCONST(15625.0)/SUN_RCONST(83664.0);
+    B->b[3] = SUN_RCONST(69875.0)/SUN_RCONST(102672.0);
+    B->b[4] = SUN_RCONST(-2260.0)/SUN_RCONST(8211.0);
+    B->b[5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->d[0] = SUN_RCONST(4586570599.0)/SUN_RCONST(29645900160.0);
+    B->d[2] = SUN_RCONST(178811875.0)/SUN_RCONST(945068544.0);
+    B->d[3] = SUN_RCONST(814220225.0)/SUN_RCONST(1159782912.0);
+    B->d[4] = SUN_RCONST(-3700637.0)/SUN_RCONST(11593932.0);
+    B->d[5] = SUN_RCONST(61727.0)/SUN_RCONST(225920.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[2] = SUN_RCONST(83.0)/SUN_RCONST(250.0);
+    B->c[3] = SUN_RCONST(31.0)/SUN_RCONST(50.0);
+    B->c[4] = SUN_RCONST(17.0)/SUN_RCONST(20.0);
+    B->c[5] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -301,46 +301,46 @@ ARK_BUTCHER_TABLE(ARKODE_ARK437L2SA_ERK_7_3_4, { /* ARK4(3)7L[2]SA-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(7, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(247.0)/RCONST(1000.0);
-    B->A[2][0] = RCONST(247.0)/RCONST(4000.0);
-    B->A[2][1] = RCONST(2694949928731.0)/RCONST(7487940209513.0);
-    B->A[3][0] = RCONST(464650059369.0)/RCONST(8764239774964.0);
-    B->A[3][1] = RCONST(878889893998.0)/RCONST(2444806327765.0);
-    B->A[3][2] = RCONST(-952945855348.0)/RCONST(12294611323341.0);
-    B->A[4][0] = RCONST(476636172619.0)/RCONST(8159180917465.0);
-    B->A[4][1] = RCONST(-1271469283451.0)/RCONST(7793814740893.0);
-    B->A[4][2] = RCONST(-859560642026.0)/RCONST(4356155882851.0);
-    B->A[4][3] = RCONST(1723805262919.0)/RCONST(4571918432560.0);
-    B->A[5][0] = RCONST(6338158500785.0)/RCONST(11769362343261.0);
-    B->A[5][1] = RCONST(-4970555480458.0)/RCONST(10924838743837.0);
-    B->A[5][2] = RCONST(3326578051521.0)/RCONST(2647936831840.0);
-    B->A[5][3] = RCONST(-880713585975.0)/RCONST(1841400956686.0);
-    B->A[5][4] = RCONST(-1428733748635.0)/RCONST(8843423958496.0);
-    B->A[6][0] = RCONST(760814592956.0)/RCONST(3276306540349.0);
-    B->A[6][1] = RCONST(760814592956.0)/RCONST(3276306540349.0);
-    B->A[6][2] = RCONST(-47223648122716.0)/RCONST(6934462133451.0);
-    B->A[6][3] = RCONST(71187472546993.0)/RCONST(9669769126921.0);
-    B->A[6][4] = RCONST(-13330509492149.0)/RCONST(9695768672337.0);
-    B->A[6][5] = RCONST(11565764226357.0)/RCONST(8513123442827.0);
-
-    B->b[2] = RCONST(9164257142617.0)/RCONST(17756377923965.0);
-    B->b[3] = RCONST(-10812980402763.0)/RCONST(74029279521829.0);
-    B->b[4] = RCONST(1335994250573.0)/RCONST(5691609445217.0);
-    B->b[5] = RCONST(2273837961795.0)/RCONST(8368240463276.0);
-    B->b[6] = RCONST(247.0)/RCONST(2000.0);
-
-    B->d[2] = RCONST(4469248916618.0)/RCONST(8635866897933.0);
-    B->d[3] = RCONST(-621260224600.0)/RCONST(4094290005349.0);
-    B->d[4] = RCONST(696572312987.0)/RCONST(2942599194819.0);
-    B->d[5] = RCONST(1532940081127.0)/RCONST(5565293938103.0);
-    B->d[6] = RCONST(2441.0)/RCONST(20000.0);
-
-    B->c[1] = RCONST(247.0)/RCONST(1000.0);
-    B->c[2] = RCONST(4276536705230.0)/RCONST(10142255878289.0);
-    B->c[3] = RCONST(67.0)/RCONST(200.0);
-    B->c[4] = RCONST(3.0)/RCONST(40.0);
-    B->c[5] = RCONST(7.0)/RCONST(10.0);
-    B->c[6] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(247.0)/SUN_RCONST(1000.0);
+    B->A[2][0] = SUN_RCONST(247.0)/SUN_RCONST(4000.0);
+    B->A[2][1] = SUN_RCONST(2694949928731.0)/SUN_RCONST(7487940209513.0);
+    B->A[3][0] = SUN_RCONST(464650059369.0)/SUN_RCONST(8764239774964.0);
+    B->A[3][1] = SUN_RCONST(878889893998.0)/SUN_RCONST(2444806327765.0);
+    B->A[3][2] = SUN_RCONST(-952945855348.0)/SUN_RCONST(12294611323341.0);
+    B->A[4][0] = SUN_RCONST(476636172619.0)/SUN_RCONST(8159180917465.0);
+    B->A[4][1] = SUN_RCONST(-1271469283451.0)/SUN_RCONST(7793814740893.0);
+    B->A[4][2] = SUN_RCONST(-859560642026.0)/SUN_RCONST(4356155882851.0);
+    B->A[4][3] = SUN_RCONST(1723805262919.0)/SUN_RCONST(4571918432560.0);
+    B->A[5][0] = SUN_RCONST(6338158500785.0)/SUN_RCONST(11769362343261.0);
+    B->A[5][1] = SUN_RCONST(-4970555480458.0)/SUN_RCONST(10924838743837.0);
+    B->A[5][2] = SUN_RCONST(3326578051521.0)/SUN_RCONST(2647936831840.0);
+    B->A[5][3] = SUN_RCONST(-880713585975.0)/SUN_RCONST(1841400956686.0);
+    B->A[5][4] = SUN_RCONST(-1428733748635.0)/SUN_RCONST(8843423958496.0);
+    B->A[6][0] = SUN_RCONST(760814592956.0)/SUN_RCONST(3276306540349.0);
+    B->A[6][1] = SUN_RCONST(760814592956.0)/SUN_RCONST(3276306540349.0);
+    B->A[6][2] = SUN_RCONST(-47223648122716.0)/SUN_RCONST(6934462133451.0);
+    B->A[6][3] = SUN_RCONST(71187472546993.0)/SUN_RCONST(9669769126921.0);
+    B->A[6][4] = SUN_RCONST(-13330509492149.0)/SUN_RCONST(9695768672337.0);
+    B->A[6][5] = SUN_RCONST(11565764226357.0)/SUN_RCONST(8513123442827.0);
+
+    B->b[2] = SUN_RCONST(9164257142617.0)/SUN_RCONST(17756377923965.0);
+    B->b[3] = SUN_RCONST(-10812980402763.0)/SUN_RCONST(74029279521829.0);
+    B->b[4] = SUN_RCONST(1335994250573.0)/SUN_RCONST(5691609445217.0);
+    B->b[5] = SUN_RCONST(2273837961795.0)/SUN_RCONST(8368240463276.0);
+    B->b[6] = SUN_RCONST(247.0)/SUN_RCONST(2000.0);
+
+    B->d[2] = SUN_RCONST(4469248916618.0)/SUN_RCONST(8635866897933.0);
+    B->d[3] = SUN_RCONST(-621260224600.0)/SUN_RCONST(4094290005349.0);
+    B->d[4] = SUN_RCONST(696572312987.0)/SUN_RCONST(2942599194819.0);
+    B->d[5] = SUN_RCONST(1532940081127.0)/SUN_RCONST(5565293938103.0);
+    B->d[6] = SUN_RCONST(2441.0)/SUN_RCONST(20000.0);
+
+    B->c[1] = SUN_RCONST(247.0)/SUN_RCONST(1000.0);
+    B->c[2] = SUN_RCONST(4276536705230.0)/SUN_RCONST(10142255878289.0);
+    B->c[3] = SUN_RCONST(67.0)/SUN_RCONST(200.0);
+    B->c[4] = SUN_RCONST(3.0)/SUN_RCONST(40.0);
+    B->c[5] = SUN_RCONST(7.0)/SUN_RCONST(10.0);
+    B->c[6] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -348,36 +348,36 @@ ARK_BUTCHER_TABLE(ARKODE_SAYFY_ABURUB_6_3_4, { /* Sayfy-Aburub-4-3-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE);
     B->q = 4;
     B->p = 3;
-    B->A[1][0] = RCONST(1.0)/RCONST(2.0);
-    B->A[2][0] = RCONST(-1.0);
-    B->A[2][1] = RCONST(2.0);
-    B->A[3][0] = RCONST(1.0)/RCONST(6.0);
-    B->A[3][1] = RCONST(2.0)/RCONST(3.0);
-    B->A[3][2] = RCONST(1.0)/RCONST(6.0);
-    B->A[4][0] = RCONST(0.137);
-    B->A[4][1] = RCONST(0.226);
-    B->A[4][2] = RCONST(0.137);
-    B->A[5][0] = RCONST(0.452);
-    B->A[5][1] = RCONST(-0.904);
-    B->A[5][2] = RCONST(-0.548);
-    B->A[5][4] = RCONST(2.0);
-
-    B->b[0] = RCONST(1.0)/RCONST(6.0);
-    B->b[1] = RCONST(1.0)/RCONST(3.0);
-    B->b[2] = RCONST(1.0)/RCONST(12.0);
-    B->b[3] = RCONST(0.0);
-    B->b[4] = RCONST(1.0)/RCONST(3.0);
-    B->b[5] = RCONST(1.0)/RCONST(12.0);
-
-    B->d[0] = RCONST(1.0)/RCONST(6.0);
-    B->d[1] = RCONST(2.0)/RCONST(3.0);
-    B->d[2] = RCONST(1.0)/RCONST(6.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(2.0);
-    B->c[2] = RCONST(1.0);
-    B->c[3] = RCONST(1.0);
-    B->c[4] = RCONST(1.0)/RCONST(2.0);
-    B->c[5] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->A[2][0] = SUN_RCONST(-1.0);
+    B->A[2][1] = SUN_RCONST(2.0);
+    B->A[3][0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->A[3][1] = SUN_RCONST(2.0)/SUN_RCONST(3.0);
+    B->A[3][2] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->A[4][0] = SUN_RCONST(0.137);
+    B->A[4][1] = SUN_RCONST(0.226);
+    B->A[4][2] = SUN_RCONST(0.137);
+    B->A[5][0] = SUN_RCONST(0.452);
+    B->A[5][1] = SUN_RCONST(-0.904);
+    B->A[5][2] = SUN_RCONST(-0.548);
+    B->A[5][4] = SUN_RCONST(2.0);
+
+    B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->b[1] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->b[2] = SUN_RCONST(1.0)/SUN_RCONST(12.0);
+    B->b[3] = SUN_RCONST(0.0);
+    B->b[4] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->b[5] = SUN_RCONST(1.0)/SUN_RCONST(12.0);
+
+    B->d[0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->d[1] = SUN_RCONST(2.0)/SUN_RCONST(3.0);
+    B->d[2] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[2] = SUN_RCONST(1.0);
+    B->c[3] = SUN_RCONST(1.0);
+    B->c[4] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[5] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -385,38 +385,38 @@ ARK_BUTCHER_TABLE(ARKODE_CASH_KARP_6_4_5, { /* Cash-Karp-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(1.0)/RCONST(5.0);
-    B->A[2][0] = RCONST(3.0)/RCONST(40.0);
-    B->A[2][1] = RCONST(9.0)/RCONST(40.0);
-    B->A[3][0] = RCONST(3.0)/RCONST(10.0);
-    B->A[3][1] = RCONST(-9.0)/RCONST(10.0);
-    B->A[3][2] = RCONST(6.0)/RCONST(5.0);
-    B->A[4][0] = RCONST(-11.0)/RCONST(54.0);
-    B->A[4][1] = RCONST(5.0)/RCONST(2.0);
-    B->A[4][2] = RCONST(-70.0)/RCONST(27.0);
-    B->A[4][3] = RCONST(35.0)/RCONST(27.0);
-    B->A[5][0] = RCONST(1631.0)/RCONST(55296.0);
-    B->A[5][1] = RCONST(175.0)/RCONST(512.0);
-    B->A[5][2] = RCONST(575.0)/RCONST(13824.0);
-    B->A[5][3] = RCONST(44275.0)/RCONST(110592.0);
-    B->A[5][4] = RCONST(253.0)/RCONST(4096.0);
-
-    B->b[0] = RCONST(37.0)/RCONST(378.0);
-    B->b[2] = RCONST(250.0)/RCONST(621.0);
-    B->b[3] = RCONST(125.0)/RCONST(594.0);
-    B->b[5] = RCONST(512.0)/RCONST(1771.0);
-
-    B->d[0] = RCONST(2825.0)/RCONST(27648.0);
-    B->d[2] = RCONST(18575.0)/RCONST(48384.0);
-    B->d[3] = RCONST(13525.0)/RCONST(55296.0);
-    B->d[4] = RCONST(277.0)/RCONST(14336.0);
-    B->d[5] = RCONST(1.0)/RCONST(4.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(5.0);
-    B->c[2] = RCONST(3.0)/RCONST(10.0);
-    B->c[3] = RCONST(3.0)/RCONST(5.0);
-    B->c[4] = RCONST(1.0);
-    B->c[5] = RCONST(7.0)/RCONST(8.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(5.0);
+    B->A[2][0] = SUN_RCONST(3.0)/SUN_RCONST(40.0);
+    B->A[2][1] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[3][0] = SUN_RCONST(3.0)/SUN_RCONST(10.0);
+    B->A[3][1] = SUN_RCONST(-9.0)/SUN_RCONST(10.0);
+    B->A[3][2] = SUN_RCONST(6.0)/SUN_RCONST(5.0);
+    B->A[4][0] = SUN_RCONST(-11.0)/SUN_RCONST(54.0);
+    B->A[4][1] = SUN_RCONST(5.0)/SUN_RCONST(2.0);
+    B->A[4][2] = SUN_RCONST(-70.0)/SUN_RCONST(27.0);
+    B->A[4][3] = SUN_RCONST(35.0)/SUN_RCONST(27.0);
+    B->A[5][0] = SUN_RCONST(1631.0)/SUN_RCONST(55296.0);
+    B->A[5][1] = SUN_RCONST(175.0)/SUN_RCONST(512.0);
+    B->A[5][2] = SUN_RCONST(575.0)/SUN_RCONST(13824.0);
+    B->A[5][3] = SUN_RCONST(44275.0)/SUN_RCONST(110592.0);
+    B->A[5][4] = SUN_RCONST(253.0)/SUN_RCONST(4096.0);
+
+    B->b[0] = SUN_RCONST(37.0)/SUN_RCONST(378.0);
+    B->b[2] = SUN_RCONST(250.0)/SUN_RCONST(621.0);
+    B->b[3] = SUN_RCONST(125.0)/SUN_RCONST(594.0);
+    B->b[5] = SUN_RCONST(512.0)/SUN_RCONST(1771.0);
+
+    B->d[0] = SUN_RCONST(2825.0)/SUN_RCONST(27648.0);
+    B->d[2] = SUN_RCONST(18575.0)/SUN_RCONST(48384.0);
+    B->d[3] = SUN_RCONST(13525.0)/SUN_RCONST(55296.0);
+    B->d[4] = SUN_RCONST(277.0)/SUN_RCONST(14336.0);
+    B->d[5] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(5.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(10.0);
+    B->c[3] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[4] = SUN_RCONST(1.0);
+    B->c[5] = SUN_RCONST(7.0)/SUN_RCONST(8.0);
     return B;
   })
 
@@ -424,38 +424,38 @@ ARK_BUTCHER_TABLE(ARKODE_FEHLBERG_6_4_5, { /* Fehlberg-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(1.0)/RCONST(4.0);
-    B->A[2][0] = RCONST(3.0)/RCONST(32.0);
-    B->A[2][1] = RCONST(9.0)/RCONST(32.0);
-    B->A[3][0] = RCONST(1932.0)/RCONST(2197.0);
-    B->A[3][1] = RCONST(-7200.0)/RCONST(2197.0);
-    B->A[3][2] = RCONST(7296.0)/RCONST(2197.0);
-    B->A[4][0] = RCONST(439.0)/RCONST(216.0);
-    B->A[4][1] = RCONST(-8.0);
-    B->A[4][2] = RCONST(3680.0)/RCONST(513.0);
-    B->A[4][3] = RCONST(-845.0)/RCONST(4104.0);
-    B->A[5][0] = RCONST(-8.0)/RCONST(27.0);
-    B->A[5][1] = RCONST(2.0);
-    B->A[5][2] = RCONST(-3544.0)/RCONST(2565.0);
-    B->A[5][3] = RCONST(1859.0)/RCONST(4104.0);
-    B->A[5][4] = RCONST(-11.0)/RCONST(40.0);
-
-    B->b[0] = RCONST(16.0)/RCONST(135.0);
-    B->b[2] = RCONST(6656.0)/RCONST(12825.0);
-    B->b[3] = RCONST(28561.0)/RCONST(56430.0);
-    B->b[4] = RCONST(-9.0)/RCONST(50.0);
-    B->b[5] = RCONST(2.0)/RCONST(55.0);
-
-    B->d[0] = RCONST(25.0)/RCONST(216.0);
-    B->d[2] = RCONST(1408.0)/RCONST(2565.0);
-    B->d[3] = RCONST(2197.0)/RCONST(4104.0);
-    B->d[4] = RCONST(-1.0)/RCONST(5.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(4.0);
-    B->c[2] = RCONST(3.0)/RCONST(8.0);
-    B->c[3] = RCONST(12.0)/RCONST(13.0);
-    B->c[4] = RCONST(1.0);
-    B->c[5] = RCONST(1.0)/RCONST(2.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[2][0] = SUN_RCONST(3.0)/SUN_RCONST(32.0);
+    B->A[2][1] = SUN_RCONST(9.0)/SUN_RCONST(32.0);
+    B->A[3][0] = SUN_RCONST(1932.0)/SUN_RCONST(2197.0);
+    B->A[3][1] = SUN_RCONST(-7200.0)/SUN_RCONST(2197.0);
+    B->A[3][2] = SUN_RCONST(7296.0)/SUN_RCONST(2197.0);
+    B->A[4][0] = SUN_RCONST(439.0)/SUN_RCONST(216.0);
+    B->A[4][1] = SUN_RCONST(-8.0);
+    B->A[4][2] = SUN_RCONST(3680.0)/SUN_RCONST(513.0);
+    B->A[4][3] = SUN_RCONST(-845.0)/SUN_RCONST(4104.0);
+    B->A[5][0] = SUN_RCONST(-8.0)/SUN_RCONST(27.0);
+    B->A[5][1] = SUN_RCONST(2.0);
+    B->A[5][2] = SUN_RCONST(-3544.0)/SUN_RCONST(2565.0);
+    B->A[5][3] = SUN_RCONST(1859.0)/SUN_RCONST(4104.0);
+    B->A[5][4] = SUN_RCONST(-11.0)/SUN_RCONST(40.0);
+
+    B->b[0] = SUN_RCONST(16.0)/SUN_RCONST(135.0);
+    B->b[2] = SUN_RCONST(6656.0)/SUN_RCONST(12825.0);
+    B->b[3] = SUN_RCONST(28561.0)/SUN_RCONST(56430.0);
+    B->b[4] = SUN_RCONST(-9.0)/SUN_RCONST(50.0);
+    B->b[5] = SUN_RCONST(2.0)/SUN_RCONST(55.0);
+
+    B->d[0] = SUN_RCONST(25.0)/SUN_RCONST(216.0);
+    B->d[2] = SUN_RCONST(1408.0)/SUN_RCONST(2565.0);
+    B->d[3] = SUN_RCONST(2197.0)/SUN_RCONST(4104.0);
+    B->d[4] = SUN_RCONST(-1.0)/SUN_RCONST(5.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(8.0);
+    B->c[3] = SUN_RCONST(12.0)/SUN_RCONST(13.0);
+    B->c[4] = SUN_RCONST(1.0);
+    B->c[5] = SUN_RCONST(1.0)/SUN_RCONST(2.0);
     return B;
   })
 
@@ -463,46 +463,46 @@ ARK_BUTCHER_TABLE(ARKODE_DORMAND_PRINCE_7_4_5, { /* Dormand-Prince-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(7, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(1.0)/RCONST(5.0);
-    B->A[2][0] = RCONST(3.0)/RCONST(40.0);
-    B->A[2][1] = RCONST(9.0)/RCONST(40.0);
-    B->A[3][0] = RCONST(44.0)/RCONST(45.0);
-    B->A[3][1] = RCONST(-56.0)/RCONST(15.0);
-    B->A[3][2] = RCONST(32.0)/RCONST(9.0);
-    B->A[4][0] = RCONST(19372.0)/RCONST(6561.0);
-    B->A[4][1] = RCONST(-25360.0)/RCONST(2187.0);
-    B->A[4][2] = RCONST(64448.0)/RCONST(6561.0);
-    B->A[4][3] = RCONST(-212.0)/RCONST(729.0);
-    B->A[5][0] = RCONST(9017.0)/RCONST(3168.0);
-    B->A[5][1] = RCONST(-355.0)/RCONST(33.0);
-    B->A[5][2] = RCONST(46732.0)/RCONST(5247.0);
-    B->A[5][3] = RCONST(49.0)/RCONST(176.0);
-    B->A[5][4] = RCONST(-5103.0)/RCONST(18656.0);
-    B->A[6][0] = RCONST(35.0)/RCONST(384.0);
-    B->A[6][2] = RCONST(500.0)/RCONST(1113.0);
-    B->A[6][3] = RCONST(125.0)/RCONST(192.0);
-    B->A[6][4] = RCONST(-2187.0)/RCONST(6784.0);
-    B->A[6][5] = RCONST(11.0)/RCONST(84.0);
-
-    B->b[0] = RCONST(35.0)/RCONST(384.0);
-    B->b[2] = RCONST(500.0)/RCONST(1113.0);
-    B->b[3] = RCONST(125.0)/RCONST(192.0);
-    B->b[4] = RCONST(-2187.0)/RCONST(6784.0);
-    B->b[5] = RCONST(11.0)/RCONST(84.0);
-
-    B->d[0] = RCONST(5179.0)/RCONST(57600.0);
-    B->d[2] = RCONST(7571.0)/RCONST(16695.0);
-    B->d[3] = RCONST(393.0)/RCONST(640.0);
-    B->d[4] = RCONST(-92097.0)/RCONST(339200.0);
-    B->d[5] = RCONST(187.0)/RCONST(2100.0);
-    B->d[6] = RCONST(1.0)/RCONST(40.0);
-
-    B->c[1] = RCONST(1.0)/RCONST(5.0);
-    B->c[2] = RCONST(3.0)/RCONST(10.0);
-    B->c[3] = RCONST(4.0)/RCONST(5.0);
-    B->c[4] = RCONST(8.0)/RCONST(9.0);
-    B->c[5] = RCONST(1.0);
-    B->c[6] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(5.0);
+    B->A[2][0] = SUN_RCONST(3.0)/SUN_RCONST(40.0);
+    B->A[2][1] = SUN_RCONST(9.0)/SUN_RCONST(40.0);
+    B->A[3][0] = SUN_RCONST(44.0)/SUN_RCONST(45.0);
+    B->A[3][1] = SUN_RCONST(-56.0)/SUN_RCONST(15.0);
+    B->A[3][2] = SUN_RCONST(32.0)/SUN_RCONST(9.0);
+    B->A[4][0] = SUN_RCONST(19372.0)/SUN_RCONST(6561.0);
+    B->A[4][1] = SUN_RCONST(-25360.0)/SUN_RCONST(2187.0);
+    B->A[4][2] = SUN_RCONST(64448.0)/SUN_RCONST(6561.0);
+    B->A[4][3] = SUN_RCONST(-212.0)/SUN_RCONST(729.0);
+    B->A[5][0] = SUN_RCONST(9017.0)/SUN_RCONST(3168.0);
+    B->A[5][1] = SUN_RCONST(-355.0)/SUN_RCONST(33.0);
+    B->A[5][2] = SUN_RCONST(46732.0)/SUN_RCONST(5247.0);
+    B->A[5][3] = SUN_RCONST(49.0)/SUN_RCONST(176.0);
+    B->A[5][4] = SUN_RCONST(-5103.0)/SUN_RCONST(18656.0);
+    B->A[6][0] = SUN_RCONST(35.0)/SUN_RCONST(384.0);
+    B->A[6][2] = SUN_RCONST(500.0)/SUN_RCONST(1113.0);
+    B->A[6][3] = SUN_RCONST(125.0)/SUN_RCONST(192.0);
+    B->A[6][4] = SUN_RCONST(-2187.0)/SUN_RCONST(6784.0);
+    B->A[6][5] = SUN_RCONST(11.0)/SUN_RCONST(84.0);
+
+    B->b[0] = SUN_RCONST(35.0)/SUN_RCONST(384.0);
+    B->b[2] = SUN_RCONST(500.0)/SUN_RCONST(1113.0);
+    B->b[3] = SUN_RCONST(125.0)/SUN_RCONST(192.0);
+    B->b[4] = SUN_RCONST(-2187.0)/SUN_RCONST(6784.0);
+    B->b[5] = SUN_RCONST(11.0)/SUN_RCONST(84.0);
+
+    B->d[0] = SUN_RCONST(5179.0)/SUN_RCONST(57600.0);
+    B->d[2] = SUN_RCONST(7571.0)/SUN_RCONST(16695.0);
+    B->d[3] = SUN_RCONST(393.0)/SUN_RCONST(640.0);
+    B->d[4] = SUN_RCONST(-92097.0)/SUN_RCONST(339200.0);
+    B->d[5] = SUN_RCONST(187.0)/SUN_RCONST(2100.0);
+    B->d[6] = SUN_RCONST(1.0)/SUN_RCONST(40.0);
+
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(5.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(10.0);
+    B->c[3] = SUN_RCONST(4.0)/SUN_RCONST(5.0);
+    B->c[4] = SUN_RCONST(8.0)/SUN_RCONST(9.0);
+    B->c[5] = SUN_RCONST(1.0);
+    B->c[6] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -510,51 +510,51 @@ ARK_BUTCHER_TABLE(ARKODE_ARK548L2SA_ERK_8_4_5, { /* ARK5(4)8L[2]SA-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(8, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(41.0)/RCONST(100.0);
-    B->A[2][0] = RCONST(367902744464.0)/RCONST(2072280473677.0);
-    B->A[2][1] = RCONST(677623207551.0)/RCONST(8224143866563.0);
-    B->A[3][0] = RCONST(1268023523408.0)/RCONST(10340822734521.0);
-    B->A[3][2] = RCONST(1029933939417.0)/RCONST(13636558850479.0);
-    B->A[4][0] = RCONST(14463281900351.0)/RCONST(6315353703477.0);
-    B->A[4][2] = RCONST(66114435211212.0)/RCONST(5879490589093.0);
-    B->A[4][3] = RCONST(-54053170152839.0)/RCONST(4284798021562.0);
-    B->A[5][0] = RCONST(14090043504691.0)/RCONST(34967701212078.0);
-    B->A[5][2] = RCONST(15191511035443.0)/RCONST(11219624916014.0);
-    B->A[5][3] = RCONST(-18461159152457.0)/RCONST(12425892160975.0);
-    B->A[5][4] = RCONST(-281667163811.0)/RCONST(9011619295870.0);
-    B->A[6][0] = RCONST(19230459214898.0)/RCONST(13134317526959.0);
-    B->A[6][2] = RCONST(21275331358303.0)/RCONST(2942455364971.0);
-    B->A[6][3] = RCONST(-38145345988419.0)/RCONST(4862620318723.0);
-    B->A[6][4] = RCONST(-1.0)/RCONST(8.0);
-    B->A[6][5] = RCONST(-1.0)/RCONST(8.0);
-    B->A[7][0] = RCONST(-19977161125411.0)/RCONST(11928030595625.0);
-    B->A[7][2] = RCONST(-40795976796054.0)/RCONST(6384907823539.0);
-    B->A[7][3] = RCONST(177454434618887.0)/RCONST(12078138498510.0);
-    B->A[7][4] = RCONST(782672205425.0)/RCONST(8267701900261.0);
-    B->A[7][5] = RCONST(-69563011059811.0)/RCONST(9646580694205.0);
-    B->A[7][6] = RCONST(7356628210526.0)/RCONST(4942186776405.0);
-
-    B->b[0] = RCONST(-872700587467.0)/RCONST(9133579230613.0);
-    B->b[3] = RCONST(22348218063261.0)/RCONST(9555858737531.0);
-    B->b[4] = RCONST(-1143369518992.0)/RCONST(8141816002931.0);
-    B->b[5] = RCONST(-39379526789629.0)/RCONST(19018526304540.0);
-    B->b[6] = RCONST(32727382324388.0)/RCONST(42900044865799.0);
-    B->b[7] = RCONST(41.0)/RCONST(200.0);
-
-    B->d[0] = RCONST(-975461918565.0)/RCONST(9796059967033.0);
-    B->d[3] = RCONST(78070527104295.0)/RCONST(32432590147079.0);
-    B->d[4] = RCONST(-548382580838.0)/RCONST(3424219808633.0);
-    B->d[5] = RCONST(-33438840321285.0)/RCONST(15594753105479.0);
-    B->d[6] = RCONST(3629800801594.0)/RCONST(4656183773603.0);
-    B->d[7] = RCONST(4035322873751.0)/RCONST(18575991585200.0);
-
-    B->c[1] = RCONST(41.0)/RCONST(100.0);
-    B->c[2] = RCONST(2935347310677.0)/RCONST(11292855782101.0);
-    B->c[3] = RCONST(1426016391358.0)/RCONST(7196633302097.0);
-    B->c[4] = RCONST(92.0)/RCONST(100.0);
-    B->c[5] = RCONST(24.0)/RCONST(100.0);
-    B->c[6] = RCONST(3.0)/RCONST(5.0);
-    B->c[7] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(41.0)/SUN_RCONST(100.0);
+    B->A[2][0] = SUN_RCONST(367902744464.0)/SUN_RCONST(2072280473677.0);
+    B->A[2][1] = SUN_RCONST(677623207551.0)/SUN_RCONST(8224143866563.0);
+    B->A[3][0] = SUN_RCONST(1268023523408.0)/SUN_RCONST(10340822734521.0);
+    B->A[3][2] = SUN_RCONST(1029933939417.0)/SUN_RCONST(13636558850479.0);
+    B->A[4][0] = SUN_RCONST(14463281900351.0)/SUN_RCONST(6315353703477.0);
+    B->A[4][2] = SUN_RCONST(66114435211212.0)/SUN_RCONST(5879490589093.0);
+    B->A[4][3] = SUN_RCONST(-54053170152839.0)/SUN_RCONST(4284798021562.0);
+    B->A[5][0] = SUN_RCONST(14090043504691.0)/SUN_RCONST(34967701212078.0);
+    B->A[5][2] = SUN_RCONST(15191511035443.0)/SUN_RCONST(11219624916014.0);
+    B->A[5][3] = SUN_RCONST(-18461159152457.0)/SUN_RCONST(12425892160975.0);
+    B->A[5][4] = SUN_RCONST(-281667163811.0)/SUN_RCONST(9011619295870.0);
+    B->A[6][0] = SUN_RCONST(19230459214898.0)/SUN_RCONST(13134317526959.0);
+    B->A[6][2] = SUN_RCONST(21275331358303.0)/SUN_RCONST(2942455364971.0);
+    B->A[6][3] = SUN_RCONST(-38145345988419.0)/SUN_RCONST(4862620318723.0);
+    B->A[6][4] = SUN_RCONST(-1.0)/SUN_RCONST(8.0);
+    B->A[6][5] = SUN_RCONST(-1.0)/SUN_RCONST(8.0);
+    B->A[7][0] = SUN_RCONST(-19977161125411.0)/SUN_RCONST(11928030595625.0);
+    B->A[7][2] = SUN_RCONST(-40795976796054.0)/SUN_RCONST(6384907823539.0);
+    B->A[7][3] = SUN_RCONST(177454434618887.0)/SUN_RCONST(12078138498510.0);
+    B->A[7][4] = SUN_RCONST(782672205425.0)/SUN_RCONST(8267701900261.0);
+    B->A[7][5] = SUN_RCONST(-69563011059811.0)/SUN_RCONST(9646580694205.0);
+    B->A[7][6] = SUN_RCONST(7356628210526.0)/SUN_RCONST(4942186776405.0);
+
+    B->b[0] = SUN_RCONST(-872700587467.0)/SUN_RCONST(9133579230613.0);
+    B->b[3] = SUN_RCONST(22348218063261.0)/SUN_RCONST(9555858737531.0);
+    B->b[4] = SUN_RCONST(-1143369518992.0)/SUN_RCONST(8141816002931.0);
+    B->b[5] = SUN_RCONST(-39379526789629.0)/SUN_RCONST(19018526304540.0);
+    B->b[6] = SUN_RCONST(32727382324388.0)/SUN_RCONST(42900044865799.0);
+    B->b[7] = SUN_RCONST(41.0)/SUN_RCONST(200.0);
+
+    B->d[0] = SUN_RCONST(-975461918565.0)/SUN_RCONST(9796059967033.0);
+    B->d[3] = SUN_RCONST(78070527104295.0)/SUN_RCONST(32432590147079.0);
+    B->d[4] = SUN_RCONST(-548382580838.0)/SUN_RCONST(3424219808633.0);
+    B->d[5] = SUN_RCONST(-33438840321285.0)/SUN_RCONST(15594753105479.0);
+    B->d[6] = SUN_RCONST(3629800801594.0)/SUN_RCONST(4656183773603.0);
+    B->d[7] = SUN_RCONST(4035322873751.0)/SUN_RCONST(18575991585200.0);
+
+    B->c[1] = SUN_RCONST(41.0)/SUN_RCONST(100.0);
+    B->c[2] = SUN_RCONST(2935347310677.0)/SUN_RCONST(11292855782101.0);
+    B->c[3] = SUN_RCONST(1426016391358.0)/SUN_RCONST(7196633302097.0);
+    B->c[4] = SUN_RCONST(92.0)/SUN_RCONST(100.0);
+    B->c[5] = SUN_RCONST(24.0)/SUN_RCONST(100.0);
+    B->c[6] = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    B->c[7] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -562,56 +562,56 @@ ARK_BUTCHER_TABLE(ARKODE_ARK548L2SAb_ERK_8_4_5, { /* ARK5(4)8L[2]SAb-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(8, SUNTRUE);
     B->q = 5;
     B->p = 4;
-    B->A[1][0] = RCONST(4.0)/RCONST(9.0);
-    B->A[2][0] = RCONST(1.0)/RCONST(9.0);
-    B->A[2][1] = RCONST(1183333538310.0)/RCONST(1827251437969.0);
-    B->A[3][0] = RCONST(895379019517.0)/RCONST(9750411845327.0);
-    B->A[3][1] = RCONST(477606656805.0)/RCONST(13473228687314.0);
-    B->A[3][2] = RCONST(-112564739183.0)/RCONST(9373365219272.0);
-    B->A[4][0] = RCONST(-4458043123994.0)/RCONST(13015289567637.0);
-    B->A[4][1] = RCONST(-2500665203865.0)/RCONST(9342069639922.0);
-    B->A[4][2] = RCONST(983347055801.0)/RCONST(8893519644487.0);
-    B->A[4][3] = RCONST(2185051477207.0)/RCONST(2551468980502.0);
-    B->A[5][0] = RCONST(-167316361917.0)/RCONST(17121522574472.0);
-    B->A[5][1] = RCONST(1605541814917.0)/RCONST(7619724128744.0);
-    B->A[5][2] = RCONST(991021770328.0)/RCONST(13052792161721.0);
-    B->A[5][3] = RCONST(2342280609577.0)/RCONST(11279663441611.0);
-    B->A[5][4] = RCONST(3012424348531.0)/RCONST(12792462456678.0);
-    B->A[6][0] = RCONST(6680998715867.0)/RCONST(14310383562358.0);
-    B->A[6][1] = RCONST(5029118570809.0)/RCONST(3897454228471.0);
-    B->A[6][2] = RCONST(2415062538259.0)/RCONST(6382199904604.0);
-    B->A[6][3] = RCONST(-3924368632305.0)/RCONST(6964820224454.0);
-    B->A[6][4] = RCONST(-4331110370267.0)/RCONST(15021686902756.0);
-    B->A[6][5] = RCONST(-3944303808049.0)/RCONST(11994238218192.0);
-    B->A[7][0] = RCONST(2193717860234.0)/RCONST(3570523412979.0);
-    B->A[7][1] = RCONST(2193717860234.0)/RCONST(3570523412979.0);
-    B->A[7][2] = RCONST(5952760925747.0)/RCONST(18750164281544.0);
-    B->A[7][3] = RCONST(-4412967128996.0)/RCONST(6196664114337.0);
-    B->A[7][4] = RCONST(4151782504231.0)/RCONST(36106512998704.0);
-    B->A[7][5] = RCONST(572599549169.0)/RCONST(6265429158920.0);
-    B->A[7][6] = RCONST(-457874356192.0)/RCONST(11306498036315.0);
-
-    B->b[2] = RCONST(3517720773327.0)/RCONST(20256071687669.0);
-    B->b[3] = RCONST(4569610470461.0)/RCONST(17934693873752.0);
-    B->b[4] = RCONST(2819471173109.0)/RCONST(11655438449929.0);
-    B->b[5] = RCONST(3296210113763.0)/RCONST(10722700128969.0);
-    B->b[6] = RCONST(-1142099968913.0)/RCONST(5710983926999.0);
-    B->b[7] = RCONST(2.0)/RCONST(9.0);
-
-    B->d[2] = RCONST(520639020421.0)/RCONST(8300446712847.0);
-    B->d[3] = RCONST(4550235134915.0)/RCONST(17827758688493.0);
-    B->d[4] = RCONST(1482366381361.0)/RCONST(6201654941325.0);
-    B->d[5] = RCONST(5551607622171.0)/RCONST(13911031047899.0);
-    B->d[6] = RCONST(-5266607656330.0)/RCONST(36788968843917.0);
-    B->d[7] = RCONST(1074053359553.0)/RCONST(5740751784926.0);
-
-    B->c[1] = RCONST(4.0)/RCONST(9.0);
-    B->c[2] = RCONST(6456083330201.0)/RCONST(8509243623797.0);
-    B->c[3] = RCONST(1632083962415.0)/RCONST(14158861528103.0);
-    B->c[4] = RCONST(6365430648612.0)/RCONST(17842476412687.0);
-    B->c[5] = RCONST(18.0)/RCONST(25.0);
-    B->c[6] = RCONST(191.0)/RCONST(200.0);
-    B->c[7] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(4.0)/SUN_RCONST(9.0);
+    B->A[2][0] = SUN_RCONST(1.0)/SUN_RCONST(9.0);
+    B->A[2][1] = SUN_RCONST(1183333538310.0)/SUN_RCONST(1827251437969.0);
+    B->A[3][0] = SUN_RCONST(895379019517.0)/SUN_RCONST(9750411845327.0);
+    B->A[3][1] = SUN_RCONST(477606656805.0)/SUN_RCONST(13473228687314.0);
+    B->A[3][2] = SUN_RCONST(-112564739183.0)/SUN_RCONST(9373365219272.0);
+    B->A[4][0] = SUN_RCONST(-4458043123994.0)/SUN_RCONST(13015289567637.0);
+    B->A[4][1] = SUN_RCONST(-2500665203865.0)/SUN_RCONST(9342069639922.0);
+    B->A[4][2] = SUN_RCONST(983347055801.0)/SUN_RCONST(8893519644487.0);
+    B->A[4][3] = SUN_RCONST(2185051477207.0)/SUN_RCONST(2551468980502.0);
+    B->A[5][0] = SUN_RCONST(-167316361917.0)/SUN_RCONST(17121522574472.0);
+    B->A[5][1] = SUN_RCONST(1605541814917.0)/SUN_RCONST(7619724128744.0);
+    B->A[5][2] = SUN_RCONST(991021770328.0)/SUN_RCONST(13052792161721.0);
+    B->A[5][3] = SUN_RCONST(2342280609577.0)/SUN_RCONST(11279663441611.0);
+    B->A[5][4] = SUN_RCONST(3012424348531.0)/SUN_RCONST(12792462456678.0);
+    B->A[6][0] = SUN_RCONST(6680998715867.0)/SUN_RCONST(14310383562358.0);
+    B->A[6][1] = SUN_RCONST(5029118570809.0)/SUN_RCONST(3897454228471.0);
+    B->A[6][2] = SUN_RCONST(2415062538259.0)/SUN_RCONST(6382199904604.0);
+    B->A[6][3] = SUN_RCONST(-3924368632305.0)/SUN_RCONST(6964820224454.0);
+    B->A[6][4] = SUN_RCONST(-4331110370267.0)/SUN_RCONST(15021686902756.0);
+    B->A[6][5] = SUN_RCONST(-3944303808049.0)/SUN_RCONST(11994238218192.0);
+    B->A[7][0] = SUN_RCONST(2193717860234.0)/SUN_RCONST(3570523412979.0);
+    B->A[7][1] = SUN_RCONST(2193717860234.0)/SUN_RCONST(3570523412979.0);
+    B->A[7][2] = SUN_RCONST(5952760925747.0)/SUN_RCONST(18750164281544.0);
+    B->A[7][3] = SUN_RCONST(-4412967128996.0)/SUN_RCONST(6196664114337.0);
+    B->A[7][4] = SUN_RCONST(4151782504231.0)/SUN_RCONST(36106512998704.0);
+    B->A[7][5] = SUN_RCONST(572599549169.0)/SUN_RCONST(6265429158920.0);
+    B->A[7][6] = SUN_RCONST(-457874356192.0)/SUN_RCONST(11306498036315.0);
+
+    B->b[2] = SUN_RCONST(3517720773327.0)/SUN_RCONST(20256071687669.0);
+    B->b[3] = SUN_RCONST(4569610470461.0)/SUN_RCONST(17934693873752.0);
+    B->b[4] = SUN_RCONST(2819471173109.0)/SUN_RCONST(11655438449929.0);
+    B->b[5] = SUN_RCONST(3296210113763.0)/SUN_RCONST(10722700128969.0);
+    B->b[6] = SUN_RCONST(-1142099968913.0)/SUN_RCONST(5710983926999.0);
+    B->b[7] = SUN_RCONST(2.0)/SUN_RCONST(9.0);
+
+    B->d[2] = SUN_RCONST(520639020421.0)/SUN_RCONST(8300446712847.0);
+    B->d[3] = SUN_RCONST(4550235134915.0)/SUN_RCONST(17827758688493.0);
+    B->d[4] = SUN_RCONST(1482366381361.0)/SUN_RCONST(6201654941325.0);
+    B->d[5] = SUN_RCONST(5551607622171.0)/SUN_RCONST(13911031047899.0);
+    B->d[6] = SUN_RCONST(-5266607656330.0)/SUN_RCONST(36788968843917.0);
+    B->d[7] = SUN_RCONST(1074053359553.0)/SUN_RCONST(5740751784926.0);
+
+    B->c[1] = SUN_RCONST(4.0)/SUN_RCONST(9.0);
+    B->c[2] = SUN_RCONST(6456083330201.0)/SUN_RCONST(8509243623797.0);
+    B->c[3] = SUN_RCONST(1632083962415.0)/SUN_RCONST(14158861528103.0);
+    B->c[4] = SUN_RCONST(6365430648612.0)/SUN_RCONST(17842476412687.0);
+    B->c[5] = SUN_RCONST(18.0)/SUN_RCONST(25.0);
+    B->c[6] = SUN_RCONST(191.0)/SUN_RCONST(200.0);
+    B->c[7] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -619,54 +619,54 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_8_5_6, { /* Verner-6-5 */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(8, SUNTRUE);
     B->q = 6;
     B->p = 5;
-    B->A[1][0] = RCONST(1.0)/RCONST(6.0);
-    B->A[2][0] = RCONST(4.0)/RCONST(75.0);
-    B->A[2][1] = RCONST(16.0)/RCONST(75.0);
-    B->A[3][0] = RCONST(5.0)/RCONST(6.0);
-    B->A[3][1] = RCONST(-8.0)/RCONST(3.0);
-    B->A[3][2] = RCONST(5.0)/RCONST(2.0);
-    B->A[4][0] = RCONST(-165.0)/RCONST(64.0);
-    B->A[4][1] = RCONST(55.0)/RCONST(6.0);
-    B->A[4][2] = RCONST(-425.0)/RCONST(64.0);
-    B->A[4][3] = RCONST(85.0)/RCONST(96.0);
-    B->A[5][0] = RCONST(12.0)/RCONST(5.0);
-    B->A[5][1] = RCONST(-8.0);
-    B->A[5][2] = RCONST(4015.0)/RCONST(612.0);
-    B->A[5][3] = RCONST(-11.0)/RCONST(36.0);
-    B->A[5][4] = RCONST(88.0)/RCONST(255.0);
-    B->A[6][0] = RCONST(-8263.0)/RCONST(15000.0);
-    B->A[6][1] = RCONST(124.0)/RCONST(75.0);
-    B->A[6][2] = RCONST(-643.0)/RCONST(680.0);
-    B->A[6][3] = RCONST(-81.0)/RCONST(250.0);
-    B->A[6][4] = RCONST(2484.0)/RCONST(10625.0);
-    B->A[7][0] = RCONST(3501.0)/RCONST(1720.0);
-    B->A[7][1] = RCONST(-300.0)/RCONST(43.0);
-    B->A[7][2] = RCONST(297275.0)/RCONST(52632.0);
-    B->A[7][3] = RCONST(-319.0)/RCONST(2322.0);
-    B->A[7][4] = RCONST(24068.0)/RCONST(84065.0);
-    B->A[7][6] = RCONST(3850.0)/RCONST(26703.0);
-
-    B->b[0] = RCONST(3.0)/RCONST(40.0);
-    B->b[2] = RCONST(875.0)/RCONST(2244.0);
-    B->b[3] = RCONST(23.0)/RCONST(72.0);
-    B->b[4] = RCONST(264.0)/RCONST(1955.0);
-    B->b[6] = RCONST(125.0)/RCONST(11592.0);
-    B->b[7] = RCONST(43.0)/RCONST(616.0);
-
-    B->d[0] = RCONST(13.0)/RCONST(160.0);
-    B->d[2] = RCONST(2375.0)/RCONST(5984.0);
-    B->d[3] = RCONST(5.0)/RCONST(16.0);
-    B->d[4] = RCONST(12.0)/RCONST(85.0);
-    B->d[5] = RCONST(3.0)/RCONST(44.0);
-
-    B->c[0] = RCONST(0.0);
-    B->c[1] = RCONST(1.0)/RCONST(6.0);
-    B->c[2] = RCONST(4.0)/RCONST(15.0);
-    B->c[3] = RCONST(2.0)/RCONST(3.0);
-    B->c[4] = RCONST(5.0)/RCONST(6.0);
-    B->c[5] = RCONST(1.0);
-    B->c[6] = RCONST(1.0)/RCONST(15.0);
-    B->c[7] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->A[2][0] = SUN_RCONST(4.0)/SUN_RCONST(75.0);
+    B->A[2][1] = SUN_RCONST(16.0)/SUN_RCONST(75.0);
+    B->A[3][0] = SUN_RCONST(5.0)/SUN_RCONST(6.0);
+    B->A[3][1] = SUN_RCONST(-8.0)/SUN_RCONST(3.0);
+    B->A[3][2] = SUN_RCONST(5.0)/SUN_RCONST(2.0);
+    B->A[4][0] = SUN_RCONST(-165.0)/SUN_RCONST(64.0);
+    B->A[4][1] = SUN_RCONST(55.0)/SUN_RCONST(6.0);
+    B->A[4][2] = SUN_RCONST(-425.0)/SUN_RCONST(64.0);
+    B->A[4][3] = SUN_RCONST(85.0)/SUN_RCONST(96.0);
+    B->A[5][0] = SUN_RCONST(12.0)/SUN_RCONST(5.0);
+    B->A[5][1] = SUN_RCONST(-8.0);
+    B->A[5][2] = SUN_RCONST(4015.0)/SUN_RCONST(612.0);
+    B->A[5][3] = SUN_RCONST(-11.0)/SUN_RCONST(36.0);
+    B->A[5][4] = SUN_RCONST(88.0)/SUN_RCONST(255.0);
+    B->A[6][0] = SUN_RCONST(-8263.0)/SUN_RCONST(15000.0);
+    B->A[6][1] = SUN_RCONST(124.0)/SUN_RCONST(75.0);
+    B->A[6][2] = SUN_RCONST(-643.0)/SUN_RCONST(680.0);
+    B->A[6][3] = SUN_RCONST(-81.0)/SUN_RCONST(250.0);
+    B->A[6][4] = SUN_RCONST(2484.0)/SUN_RCONST(10625.0);
+    B->A[7][0] = SUN_RCONST(3501.0)/SUN_RCONST(1720.0);
+    B->A[7][1] = SUN_RCONST(-300.0)/SUN_RCONST(43.0);
+    B->A[7][2] = SUN_RCONST(297275.0)/SUN_RCONST(52632.0);
+    B->A[7][3] = SUN_RCONST(-319.0)/SUN_RCONST(2322.0);
+    B->A[7][4] = SUN_RCONST(24068.0)/SUN_RCONST(84065.0);
+    B->A[7][6] = SUN_RCONST(3850.0)/SUN_RCONST(26703.0);
+
+    B->b[0] = SUN_RCONST(3.0)/SUN_RCONST(40.0);
+    B->b[2] = SUN_RCONST(875.0)/SUN_RCONST(2244.0);
+    B->b[3] = SUN_RCONST(23.0)/SUN_RCONST(72.0);
+    B->b[4] = SUN_RCONST(264.0)/SUN_RCONST(1955.0);
+    B->b[6] = SUN_RCONST(125.0)/SUN_RCONST(11592.0);
+    B->b[7] = SUN_RCONST(43.0)/SUN_RCONST(616.0);
+
+    B->d[0] = SUN_RCONST(13.0)/SUN_RCONST(160.0);
+    B->d[2] = SUN_RCONST(2375.0)/SUN_RCONST(5984.0);
+    B->d[3] = SUN_RCONST(5.0)/SUN_RCONST(16.0);
+    B->d[4] = SUN_RCONST(12.0)/SUN_RCONST(85.0);
+    B->d[5] = SUN_RCONST(3.0)/SUN_RCONST(44.0);
+
+    B->c[0] = SUN_RCONST(0.0);
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->c[2] = SUN_RCONST(4.0)/SUN_RCONST(15.0);
+    B->c[3] = SUN_RCONST(2.0)/SUN_RCONST(3.0);
+    B->c[4] = SUN_RCONST(5.0)/SUN_RCONST(6.0);
+    B->c[5] = SUN_RCONST(1.0);
+    B->c[6] = SUN_RCONST(1.0)/SUN_RCONST(15.0);
+    B->c[7] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -675,58 +675,58 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_9_5_6, { /* Verner-6-5b (DOI: 10.1007/s11075-009
     B->q = 6;
     B->p = 5;
 
-    B->A[1][0] =  RCONST(0.06);
-    B->A[2][0] =  RCONST(0.01923996296296296218408805600574851268902);
-    B->A[2][1] =  RCONST(0.07669337037037037008158080197972594760358);
-    B->A[3][0] =  RCONST(0.035975);
-    B->A[3][2] =  RCONST(0.107925);
-    B->A[4][0] =  RCONST(1.318683415233148359391179837984964251518);
-    B->A[4][2] =  RCONST(-5.042058063628561903612990136025473475456);
-    B->A[4][3] =  RCONST(4.220674648395413619539340288611128926277);
-    B->A[5][0] =  RCONST(-41.87259166432750845388000016100704669952);
-    B->A[5][2] =  RCONST(159.432562163137475863550207577645778656);
-    B->A[5][3] =  RCONST(-122.1192135650100425436903606168925762177);
-    B->A[5][4] =  RCONST(5.531743066200053071668207849143072962761);
-    B->A[6][0] =  RCONST(-54.43015693531650356362661113962531089783);
-    B->A[6][2] =  RCONST(207.0672513650184782818541862070560455322);
-    B->A[6][3] =  RCONST(-158.6108137845899932472093496471643447876);
-    B->A[6][4] =  RCONST(6.99181658595024213553870140458457171917);
-    B->A[6][5] =  RCONST(-0.01859723106220323093906721112489321967587);
-    B->A[7][0] =  RCONST(-54.66374178728197819054912542924284934998);
-    B->A[7][2] =  RCONST(207.9528062553893619224254507571458816528);
-    B->A[7][3] =  RCONST(-159.2889574744995115906931459903717041016);
-    B->A[7][4] =  RCONST(7.018743740796944408089075295720249414444);
-    B->A[7][5] =  RCONST(-0.01833878590504572220210022237552038859576);
-    B->A[7][6] =  RCONST(-0.000511948499788209866745436471546781831421);
-    B->A[8][0] =  RCONST(0.0343895786835703570760713887466408777982);
-    B->A[8][3] =  RCONST(0.2582624555633503682372520415810868144035);
-    B->A[8][4] =  RCONST(0.4209371189673536961528554911637911573052);
-    B->A[8][5] =  RCONST(4.405396469669310199890333024086430668831);
-    B->A[8][6] =  RCONST(-176.4831190242986451721662888303399085999);
-    B->A[8][7] =  RCONST(172.3641334014150743314530700445175170898);
-
-    B->b[0] =  RCONST(0.0343895786835703570760713887466408777982);
-    B->b[3] =  RCONST(0.2582624555633503682372520415810868144035);
-    B->b[4] =  RCONST(0.4209371189673536961528554911637911573052);
-    B->b[5] =  RCONST(4.405396469669310199890333024086430668831);
-    B->b[6] =  RCONST(-176.4831190242986451721662888303399085999);
-    B->b[7] =  RCONST(172.3641334014150743314530700445175170898);
-
-    B->d[0] =  RCONST(0.04909967648382489863179145572757988702506);
-    B->d[3] =  RCONST(0.2251112229516524232408869465871248394251);
-    B->d[4] =  RCONST(0.4694682253029561769253064085205551236868);
-    B->d[5] =  RCONST(0.806579224998886790132246460416354238987);
-    B->d[7] =  RCONST(-0.607119489177795901291290192602900788188);
-    B->d[8] =  RCONST(0.05686113944047568868889186433079885318875);
-
-    B->c[1] =  RCONST(0.06);
-    B->c[2] =  RCONST(0.09593333333333333333333333333333333333333);
-    B->c[3] =  RCONST(0.1439);
-    B->c[4] =  RCONST(0.4973);
-    B->c[5] =  RCONST(0.9725);
-    B->c[6] =  RCONST(0.9995);
-    B->c[7] =  RCONST(1.0);
-    B->c[8] =  RCONST(1.0);
+    B->A[1][0] =  SUN_RCONST(0.06);
+    B->A[2][0] =  SUN_RCONST(0.01923996296296296218408805600574851268902);
+    B->A[2][1] =  SUN_RCONST(0.07669337037037037008158080197972594760358);
+    B->A[3][0] =  SUN_RCONST(0.035975);
+    B->A[3][2] =  SUN_RCONST(0.107925);
+    B->A[4][0] =  SUN_RCONST(1.318683415233148359391179837984964251518);
+    B->A[4][2] =  SUN_RCONST(-5.042058063628561903612990136025473475456);
+    B->A[4][3] =  SUN_RCONST(4.220674648395413619539340288611128926277);
+    B->A[5][0] =  SUN_RCONST(-41.87259166432750845388000016100704669952);
+    B->A[5][2] =  SUN_RCONST(159.432562163137475863550207577645778656);
+    B->A[5][3] =  SUN_RCONST(-122.1192135650100425436903606168925762177);
+    B->A[5][4] =  SUN_RCONST(5.531743066200053071668207849143072962761);
+    B->A[6][0] =  SUN_RCONST(-54.43015693531650356362661113962531089783);
+    B->A[6][2] =  SUN_RCONST(207.0672513650184782818541862070560455322);
+    B->A[6][3] =  SUN_RCONST(-158.6108137845899932472093496471643447876);
+    B->A[6][4] =  SUN_RCONST(6.99181658595024213553870140458457171917);
+    B->A[6][5] =  SUN_RCONST(-0.01859723106220323093906721112489321967587);
+    B->A[7][0] =  SUN_RCONST(-54.66374178728197819054912542924284934998);
+    B->A[7][2] =  SUN_RCONST(207.9528062553893619224254507571458816528);
+    B->A[7][3] =  SUN_RCONST(-159.2889574744995115906931459903717041016);
+    B->A[7][4] =  SUN_RCONST(7.018743740796944408089075295720249414444);
+    B->A[7][5] =  SUN_RCONST(-0.01833878590504572220210022237552038859576);
+    B->A[7][6] =  SUN_RCONST(-0.000511948499788209866745436471546781831421);
+    B->A[8][0] =  SUN_RCONST(0.0343895786835703570760713887466408777982);
+    B->A[8][3] =  SUN_RCONST(0.2582624555633503682372520415810868144035);
+    B->A[8][4] =  SUN_RCONST(0.4209371189673536961528554911637911573052);
+    B->A[8][5] =  SUN_RCONST(4.405396469669310199890333024086430668831);
+    B->A[8][6] =  SUN_RCONST(-176.4831190242986451721662888303399085999);
+    B->A[8][7] =  SUN_RCONST(172.3641334014150743314530700445175170898);
+
+    B->b[0] =  SUN_RCONST(0.0343895786835703570760713887466408777982);
+    B->b[3] =  SUN_RCONST(0.2582624555633503682372520415810868144035);
+    B->b[4] =  SUN_RCONST(0.4209371189673536961528554911637911573052);
+    B->b[5] =  SUN_RCONST(4.405396469669310199890333024086430668831);
+    B->b[6] =  SUN_RCONST(-176.4831190242986451721662888303399085999);
+    B->b[7] =  SUN_RCONST(172.3641334014150743314530700445175170898);
+
+    B->d[0] =  SUN_RCONST(0.04909967648382489863179145572757988702506);
+    B->d[3] =  SUN_RCONST(0.2251112229516524232408869465871248394251);
+    B->d[4] =  SUN_RCONST(0.4694682253029561769253064085205551236868);
+    B->d[5] =  SUN_RCONST(0.806579224998886790132246460416354238987);
+    B->d[7] =  SUN_RCONST(-0.607119489177795901291290192602900788188);
+    B->d[8] =  SUN_RCONST(0.05686113944047568868889186433079885318875);
+
+    B->c[1] =  SUN_RCONST(0.06);
+    B->c[2] =  SUN_RCONST(0.09593333333333333333333333333333333333333);
+    B->c[3] =  SUN_RCONST(0.1439);
+    B->c[4] =  SUN_RCONST(0.4973);
+    B->c[5] =  SUN_RCONST(0.9725);
+    B->c[6] =  SUN_RCONST(0.9995);
+    B->c[7] =  SUN_RCONST(1.0);
+    B->c[8] =  SUN_RCONST(1.0);
     return B;
   })
 
@@ -735,67 +735,67 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_10_6_7, { /* Verner-7-6 (DOI: 10.1007/s11075-009
     B->q = 7;
     B->p = 6;
 
-    B->A[1][0] =  RCONST(0.005);
-    B->A[2][0] =  RCONST(-1.076790123456790123456790123456790123457);
-    B->A[2][1] =  RCONST(1.185679012345679012345679012345679012346);
-    B->A[3][0] =  RCONST(0.04083333333333333333333333333333333333333);
-    B->A[3][2] =  RCONST(0.1225);
-    B->A[4][0] =  RCONST(0.6389139236255726439495106205868069082499);
-    B->A[4][2] =  RCONST(-2.45567263822365688952231721486896276474);
-    B->A[4][3] =  RCONST(2.272258714598084150537715686368755996227);
-    B->A[5][0] =  RCONST(-2.661577375018756796976049372460693120956);
-    B->A[5][2] =  RCONST(10.80451388645613874928130826447159051895);
-    B->A[5][3] =  RCONST(-8.353914657396199316963247838430106639862);
-    B->A[5][4] =  RCONST(0.8204875949566569071080834874010179191828);
-    B->A[6][0] =  RCONST(6.067741434696771740675558248767629265785);
-    B->A[6][2] =  RCONST(-24.71127363591108760942915978375822305679);
-    B->A[6][3] =  RCONST(20.42751793078889477328630164265632629395);
-    B->A[6][4] =  RCONST(-1.906157978816647169395537275704555213451);
-    B->A[6][5] =  RCONST(1.006172249242067939789535557792987674475);
-    B->A[7][0] =  RCONST(12.05467007625320441377425595419481396675);
-    B->A[7][2] =  RCONST(-49.75478495046898785858502378687262535095);
-    B->A[7][3] =  RCONST(41.14288863860467415634047938510775566101);
-    B->A[7][4] =  RCONST(-4.461760149974003830664059933042153716087);
-    B->A[7][5] =  RCONST(2.042334822239175284863677006796933710575);
-    B->A[7][6] =  RCONST(-0.0983484366540610666085342472797492519021);
-    B->A[8][0] =  RCONST(10.13814652288180795380867493804544210434);
-    B->A[8][2] =  RCONST(-42.64113603171750099818382295779883861542);
-    B->A[8][3] =  RCONST(35.76384003992257021309342235326766967773);
-    B->A[8][4] =  RCONST(-4.348022840392907539808220462873578071594);
-    B->A[8][5] =  RCONST(2.009862268377035743327496675192378461361);
-    B->A[8][6] =  RCONST(0.3487490460338271702767087845131754875183);
-    B->A[8][7] =  RCONST(-0.2714390051048312657577810114162275567651);
-    B->A[9][0] =  RCONST(-45.03007203429867644217665656469762325287);
-    B->A[9][2] =  RCONST(187.3272437654588884470285847783088684082);
-    B->A[9][3] =  RCONST(-154.0288236935018630902050063014030456543);
-    B->A[9][4] =  RCONST(18.56465306347536170505918562412261962891);
-    B->A[9][5] =  RCONST(-7.141809679295079149596858769655227661133);
-    B->A[9][6] =  RCONST(1.3088085781613787439425777847645804286);
-
-    B->b[0] =  RCONST(0.04715561848627222024665783806085528340191);
-    B->b[3] =  RCONST(0.2575056429843415317648691598151344805956);
-    B->b[4] =  RCONST(0.2621665397741262393260797125549288466573);
-    B->b[5] =  RCONST(0.1521609265673855848621798259046045131981);
-    B->b[6] =  RCONST(0.4939969170032484924171001239301403984427);
-    B->b[7] =  RCONST(-0.2943031171403250323415079492406221106648);
-    B->b[8] =  RCONST(0.08131747232495110944139327102675451897085);
-
-    B->d[0] =  RCONST(0.04460860660634117375034080055229424033314);
-    B->d[3] =  RCONST(0.2671640378571372709259890143584925681353);
-    B->d[4] =  RCONST(0.2201018300177293163244485185714438557625);
-    B->d[5] =  RCONST(0.2188431703143156881186115469972719438374);
-    B->d[6] =  RCONST(0.2289871705411202773561285539472009986639);
-    B->d[9] =  RCONST(0.02029518466335628046337546948052477091551);
-
-    B->c[1] =  RCONST(0.005);
-    B->c[2] =  RCONST(0.1088888888888888888888888888888888888889);
-    B->c[3] =  RCONST(0.1633333333333333333333333333333333333333);
-    B->c[4] =  RCONST(0.4555);
-    B->c[5] =  RCONST(0.6095094489978380991601625282783061265945);
-    B->c[6] =  RCONST(0.884);
-    B->c[7] =  RCONST(0.925);
-    B->c[8] =  RCONST(1.0);
-    B->c[9] =  RCONST(1.0);
+    B->A[1][0] =  SUN_RCONST(0.005);
+    B->A[2][0] =  SUN_RCONST(-1.076790123456790123456790123456790123457);
+    B->A[2][1] =  SUN_RCONST(1.185679012345679012345679012345679012346);
+    B->A[3][0] =  SUN_RCONST(0.04083333333333333333333333333333333333333);
+    B->A[3][2] =  SUN_RCONST(0.1225);
+    B->A[4][0] =  SUN_RCONST(0.6389139236255726439495106205868069082499);
+    B->A[4][2] =  SUN_RCONST(-2.45567263822365688952231721486896276474);
+    B->A[4][3] =  SUN_RCONST(2.272258714598084150537715686368755996227);
+    B->A[5][0] =  SUN_RCONST(-2.661577375018756796976049372460693120956);
+    B->A[5][2] =  SUN_RCONST(10.80451388645613874928130826447159051895);
+    B->A[5][3] =  SUN_RCONST(-8.353914657396199316963247838430106639862);
+    B->A[5][4] =  SUN_RCONST(0.8204875949566569071080834874010179191828);
+    B->A[6][0] =  SUN_RCONST(6.067741434696771740675558248767629265785);
+    B->A[6][2] =  SUN_RCONST(-24.71127363591108760942915978375822305679);
+    B->A[6][3] =  SUN_RCONST(20.42751793078889477328630164265632629395);
+    B->A[6][4] =  SUN_RCONST(-1.906157978816647169395537275704555213451);
+    B->A[6][5] =  SUN_RCONST(1.006172249242067939789535557792987674475);
+    B->A[7][0] =  SUN_RCONST(12.05467007625320441377425595419481396675);
+    B->A[7][2] =  SUN_RCONST(-49.75478495046898785858502378687262535095);
+    B->A[7][3] =  SUN_RCONST(41.14288863860467415634047938510775566101);
+    B->A[7][4] =  SUN_RCONST(-4.461760149974003830664059933042153716087);
+    B->A[7][5] =  SUN_RCONST(2.042334822239175284863677006796933710575);
+    B->A[7][6] =  SUN_RCONST(-0.0983484366540610666085342472797492519021);
+    B->A[8][0] =  SUN_RCONST(10.13814652288180795380867493804544210434);
+    B->A[8][2] =  SUN_RCONST(-42.64113603171750099818382295779883861542);
+    B->A[8][3] =  SUN_RCONST(35.76384003992257021309342235326766967773);
+    B->A[8][4] =  SUN_RCONST(-4.348022840392907539808220462873578071594);
+    B->A[8][5] =  SUN_RCONST(2.009862268377035743327496675192378461361);
+    B->A[8][6] =  SUN_RCONST(0.3487490460338271702767087845131754875183);
+    B->A[8][7] =  SUN_RCONST(-0.2714390051048312657577810114162275567651);
+    B->A[9][0] =  SUN_RCONST(-45.03007203429867644217665656469762325287);
+    B->A[9][2] =  SUN_RCONST(187.3272437654588884470285847783088684082);
+    B->A[9][3] =  SUN_RCONST(-154.0288236935018630902050063014030456543);
+    B->A[9][4] =  SUN_RCONST(18.56465306347536170505918562412261962891);
+    B->A[9][5] =  SUN_RCONST(-7.141809679295079149596858769655227661133);
+    B->A[9][6] =  SUN_RCONST(1.3088085781613787439425777847645804286);
+
+    B->b[0] =  SUN_RCONST(0.04715561848627222024665783806085528340191);
+    B->b[3] =  SUN_RCONST(0.2575056429843415317648691598151344805956);
+    B->b[4] =  SUN_RCONST(0.2621665397741262393260797125549288466573);
+    B->b[5] =  SUN_RCONST(0.1521609265673855848621798259046045131981);
+    B->b[6] =  SUN_RCONST(0.4939969170032484924171001239301403984427);
+    B->b[7] =  SUN_RCONST(-0.2943031171403250323415079492406221106648);
+    B->b[8] =  SUN_RCONST(0.08131747232495110944139327102675451897085);
+
+    B->d[0] =  SUN_RCONST(0.04460860660634117375034080055229424033314);
+    B->d[3] =  SUN_RCONST(0.2671640378571372709259890143584925681353);
+    B->d[4] =  SUN_RCONST(0.2201018300177293163244485185714438557625);
+    B->d[5] =  SUN_RCONST(0.2188431703143156881186115469972719438374);
+    B->d[6] =  SUN_RCONST(0.2289871705411202773561285539472009986639);
+    B->d[9] =  SUN_RCONST(0.02029518466335628046337546948052477091551);
+
+    B->c[1] =  SUN_RCONST(0.005);
+    B->c[2] =  SUN_RCONST(0.1088888888888888888888888888888888888889);
+    B->c[3] =  SUN_RCONST(0.1633333333333333333333333333333333333333);
+    B->c[4] =  SUN_RCONST(0.4555);
+    B->c[5] =  SUN_RCONST(0.6095094489978380991601625282783061265945);
+    B->c[6] =  SUN_RCONST(0.884);
+    B->c[7] =  SUN_RCONST(0.925);
+    B->c[8] =  SUN_RCONST(1.0);
+    B->c[9] =  SUN_RCONST(1.0);
     return B;
   })
 
@@ -804,94 +804,94 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_13_7_8, { /* Verner-8-7 (DOI: 10.1007/s11075-009
     B->q = 8;
     B->p = 7;
 
-    B->A[1][0] =  RCONST(0.05);
-    B->A[2][0] =  RCONST(-0.006993164062499999597544153573380754096434);
-    B->A[2][1] =  RCONST(0.1135556640625000057731597280508140102029);
-    B->A[3][0] =  RCONST(0.0399609375);
-    B->A[3][2] =  RCONST(0.1198828125);
-    B->A[4][0] =  RCONST(0.3613975628004575391116759419674053788185);
-    B->A[4][2] =  RCONST(-1.341524066700492845427561405813321471214);
-    B->A[4][3] =  RCONST(1.370126503900035208616259296832140535116);
-    B->A[5][0] =  RCONST(0.04904720279720279491053602782812959048897);
-    B->A[5][3] =  RCONST(0.2350972042214404811311112553084967657924);
-    B->A[5][4] =  RCONST(0.1808555929813567275665775468951324000955);
-    B->A[6][0] =  RCONST(0.06169289044289043982827180911954201292247);
-    B->A[6][3] =  RCONST(0.112365683146402772774052891691098921001);
-    B->A[6][4] =  RCONST(-0.03885046071451366683779937716280983295292);
-    B->A[6][5] =  RCONST(0.01979188712522046006414555563424073625356);
-    B->A[7][0] =  RCONST(-1.767630240222326953869469434721395373344);
-    B->A[7][3] =  RCONST(-62.5);
-    B->A[7][4] =  RCONST(-6.061889377376669330033109872601926326752);
-    B->A[7][5] =  RCONST(5.6508231982227634659921022830531001091);
-    B->A[7][6] =  RCONST(65.6216964193762350987526588141918182373);
-    B->A[8][0] =  RCONST(-1.180945066554970779293398663867264986038);
-    B->A[8][3] =  RCONST(-41.50473441114321104805640061385929584503);
-    B->A[8][4] =  RCONST(-4.434438319103724879255423729773610830307);
-    B->A[8][5] =  RCONST(4.26040818858613334896290325559675693512);
-    B->A[8][6] =  RCONST(43.75364022446171219371535698883235454559);
-    B->A[8][7] =  RCONST(0.007871425489912309975126802896738809067756);
-    B->A[9][0] =  RCONST(-1.281405999441488363643770753697026520967);
-    B->A[9][3] =  RCONST(-45.04713996013986587740873801521956920624);
-    B->A[9][4] =  RCONST(-4.731362069449575713520061981398612260818);
-    B->A[9][5] =  RCONST(4.514967016593807613844546722248196601868);
-    B->A[9][6] =  RCONST(47.4490955717298490412758837919682264328);
-    B->A[9][7] =  RCONST(0.01059228297111661047658071055366235668771);
-    B->A[9][8] =  RCONST(-0.005746842263844615696088968803678653785028);
-    B->A[10][0] =  RCONST(-1.724470134262485077059068316884804517031);
-    B->A[10][3] =  RCONST(-60.92349008483054007001555874012410640717);
-    B->A[10][4] =  RCONST(-5.951518376222391992769189528189599514008);
-    B->A[10][5] =  RCONST(5.55652373069845673114741657627746462822);
-    B->A[10][6] =  RCONST(63.98301198033306036450085230171680450439);
-    B->A[10][7] =  RCONST(0.01464202825041496271174512600055095390417);
-    B->A[10][8] =  RCONST(0.06460408772358203211005900357122300192714);
-    B->A[10][9] =  RCONST(-0.07930323169008879347074980614706873893738);
-    B->A[11][0] =  RCONST(-3.30162266774707902072805154602974653244);
-    B->A[11][3] =  RCONST(-118.0112723597525103969019255600869655609);
-    B->A[11][4] =  RCONST(-10.14142238845611210251718148356303572655);
-    B->A[11][5] =  RCONST(9.139311332232058049385159392841160297394);
-    B->A[11][6] =  RCONST(123.3759428284042769519146531820297241211);
-    B->A[11][7] =  RCONST(4.623244378874581173022306757047772407532);
-    B->A[11][8] =  RCONST(-3.383277738068201756505004595965147018433);
-    B->A[11][9] =  RCONST(4.527592100324618229478801367804408073425);
-    B->A[11][10] =  RCONST(-5.828495485811623133542980212951079010963);
-    B->A[12][0] =  RCONST(-3.039515033766308604867845133412629365921);
-    B->A[12][3] =  RCONST(-109.260868089417627402326615992933511734);
-    B->A[12][4] =  RCONST(-9.290642497400291688336437800899147987366);
-    B->A[12][5] =  RCONST(8.43050498176491203139448771253228187561);
-    B->A[12][6] =  RCONST(114.2010010378331372749016736634075641632);
-    B->A[12][7] =  RCONST(-0.9637271342145479202656588313402608036995);
-    B->A[12][8] =  RCONST(-5.034884088802189516798080148873850703239);
-    B->A[12][9] =  RCONST(5.958130824002923375815043982584029436111);
-
-    B->b[0] =  RCONST(0.04427989419007950788742533632103004492819);
-    B->b[5] =  RCONST(0.3541049391724448991425333588267676532269);
-    B->b[6] =  RCONST(0.2479692154956437688539949704136233776808);
-    B->b[7] =  RCONST(-15.69420203883808540012978482991456985474);
-    B->b[8] =  RCONST(25.08406496555856435293208051007241010666);
-    B->b[9] =  RCONST(-31.73836778626027665950459777377545833588);
-    B->b[10] =  RCONST(22.93828327398878386134128959383815526962);
-    B->b[11] =  RCONST(-0.2361324633071542056228508954518474638462);
-
-    B->d[0] =  RCONST(0.04431261522908979538781792939516890328377);
-    B->d[5] =  RCONST(0.3546095642343226606030270886549260467291);
-    B->d[6] =  RCONST(0.2478480431366653080615947146725375205278);
-    B->d[7] =  RCONST(4.448134732475784502980786783155053853989);
-    B->d[8] =  RCONST(19.8468863661187349123338208300992846489);
-    B->d[9] =  RCONST(-23.58162337746561831863800762221217155457);
-    B->d[12] =  RCONST(-0.3601679437289775354003040774841792881489);
-
-    B->c[1] =  RCONST(0.05);
-    B->c[2] =  RCONST(0.1065625);
-    B->c[3] =  RCONST(0.15984375);
-    B->c[4] =  RCONST(0.39);
-    B->c[5] =  RCONST(0.465);
-    B->c[6] =  RCONST(0.155);
-    B->c[7] =  RCONST(0.943);
-    B->c[8] =  RCONST(0.9018020417358569851273841777583584189415);
-    B->c[9] =  RCONST(0.909);
-    B->c[10] =  RCONST(0.94);
-    B->c[11] =  RCONST(1.0);
-    B->c[12] =  RCONST(1.0);
+    B->A[1][0] =  SUN_RCONST(0.05);
+    B->A[2][0] =  SUN_RCONST(-0.006993164062499999597544153573380754096434);
+    B->A[2][1] =  SUN_RCONST(0.1135556640625000057731597280508140102029);
+    B->A[3][0] =  SUN_RCONST(0.0399609375);
+    B->A[3][2] =  SUN_RCONST(0.1198828125);
+    B->A[4][0] =  SUN_RCONST(0.3613975628004575391116759419674053788185);
+    B->A[4][2] =  SUN_RCONST(-1.341524066700492845427561405813321471214);
+    B->A[4][3] =  SUN_RCONST(1.370126503900035208616259296832140535116);
+    B->A[5][0] =  SUN_RCONST(0.04904720279720279491053602782812959048897);
+    B->A[5][3] =  SUN_RCONST(0.2350972042214404811311112553084967657924);
+    B->A[5][4] =  SUN_RCONST(0.1808555929813567275665775468951324000955);
+    B->A[6][0] =  SUN_RCONST(0.06169289044289043982827180911954201292247);
+    B->A[6][3] =  SUN_RCONST(0.112365683146402772774052891691098921001);
+    B->A[6][4] =  SUN_RCONST(-0.03885046071451366683779937716280983295292);
+    B->A[6][5] =  SUN_RCONST(0.01979188712522046006414555563424073625356);
+    B->A[7][0] =  SUN_RCONST(-1.767630240222326953869469434721395373344);
+    B->A[7][3] =  SUN_RCONST(-62.5);
+    B->A[7][4] =  SUN_RCONST(-6.061889377376669330033109872601926326752);
+    B->A[7][5] =  SUN_RCONST(5.6508231982227634659921022830531001091);
+    B->A[7][6] =  SUN_RCONST(65.6216964193762350987526588141918182373);
+    B->A[8][0] =  SUN_RCONST(-1.180945066554970779293398663867264986038);
+    B->A[8][3] =  SUN_RCONST(-41.50473441114321104805640061385929584503);
+    B->A[8][4] =  SUN_RCONST(-4.434438319103724879255423729773610830307);
+    B->A[8][5] =  SUN_RCONST(4.26040818858613334896290325559675693512);
+    B->A[8][6] =  SUN_RCONST(43.75364022446171219371535698883235454559);
+    B->A[8][7] =  SUN_RCONST(0.007871425489912309975126802896738809067756);
+    B->A[9][0] =  SUN_RCONST(-1.281405999441488363643770753697026520967);
+    B->A[9][3] =  SUN_RCONST(-45.04713996013986587740873801521956920624);
+    B->A[9][4] =  SUN_RCONST(-4.731362069449575713520061981398612260818);
+    B->A[9][5] =  SUN_RCONST(4.514967016593807613844546722248196601868);
+    B->A[9][6] =  SUN_RCONST(47.4490955717298490412758837919682264328);
+    B->A[9][7] =  SUN_RCONST(0.01059228297111661047658071055366235668771);
+    B->A[9][8] =  SUN_RCONST(-0.005746842263844615696088968803678653785028);
+    B->A[10][0] =  SUN_RCONST(-1.724470134262485077059068316884804517031);
+    B->A[10][3] =  SUN_RCONST(-60.92349008483054007001555874012410640717);
+    B->A[10][4] =  SUN_RCONST(-5.951518376222391992769189528189599514008);
+    B->A[10][5] =  SUN_RCONST(5.55652373069845673114741657627746462822);
+    B->A[10][6] =  SUN_RCONST(63.98301198033306036450085230171680450439);
+    B->A[10][7] =  SUN_RCONST(0.01464202825041496271174512600055095390417);
+    B->A[10][8] =  SUN_RCONST(0.06460408772358203211005900357122300192714);
+    B->A[10][9] =  SUN_RCONST(-0.07930323169008879347074980614706873893738);
+    B->A[11][0] =  SUN_RCONST(-3.30162266774707902072805154602974653244);
+    B->A[11][3] =  SUN_RCONST(-118.0112723597525103969019255600869655609);
+    B->A[11][4] =  SUN_RCONST(-10.14142238845611210251718148356303572655);
+    B->A[11][5] =  SUN_RCONST(9.139311332232058049385159392841160297394);
+    B->A[11][6] =  SUN_RCONST(123.3759428284042769519146531820297241211);
+    B->A[11][7] =  SUN_RCONST(4.623244378874581173022306757047772407532);
+    B->A[11][8] =  SUN_RCONST(-3.383277738068201756505004595965147018433);
+    B->A[11][9] =  SUN_RCONST(4.527592100324618229478801367804408073425);
+    B->A[11][10] =  SUN_RCONST(-5.828495485811623133542980212951079010963);
+    B->A[12][0] =  SUN_RCONST(-3.039515033766308604867845133412629365921);
+    B->A[12][3] =  SUN_RCONST(-109.260868089417627402326615992933511734);
+    B->A[12][4] =  SUN_RCONST(-9.290642497400291688336437800899147987366);
+    B->A[12][5] =  SUN_RCONST(8.43050498176491203139448771253228187561);
+    B->A[12][6] =  SUN_RCONST(114.2010010378331372749016736634075641632);
+    B->A[12][7] =  SUN_RCONST(-0.9637271342145479202656588313402608036995);
+    B->A[12][8] =  SUN_RCONST(-5.034884088802189516798080148873850703239);
+    B->A[12][9] =  SUN_RCONST(5.958130824002923375815043982584029436111);
+
+    B->b[0] =  SUN_RCONST(0.04427989419007950788742533632103004492819);
+    B->b[5] =  SUN_RCONST(0.3541049391724448991425333588267676532269);
+    B->b[6] =  SUN_RCONST(0.2479692154956437688539949704136233776808);
+    B->b[7] =  SUN_RCONST(-15.69420203883808540012978482991456985474);
+    B->b[8] =  SUN_RCONST(25.08406496555856435293208051007241010666);
+    B->b[9] =  SUN_RCONST(-31.73836778626027665950459777377545833588);
+    B->b[10] =  SUN_RCONST(22.93828327398878386134128959383815526962);
+    B->b[11] =  SUN_RCONST(-0.2361324633071542056228508954518474638462);
+
+    B->d[0] =  SUN_RCONST(0.04431261522908979538781792939516890328377);
+    B->d[5] =  SUN_RCONST(0.3546095642343226606030270886549260467291);
+    B->d[6] =  SUN_RCONST(0.2478480431366653080615947146725375205278);
+    B->d[7] =  SUN_RCONST(4.448134732475784502980786783155053853989);
+    B->d[8] =  SUN_RCONST(19.8468863661187349123338208300992846489);
+    B->d[9] =  SUN_RCONST(-23.58162337746561831863800762221217155457);
+    B->d[12] =  SUN_RCONST(-0.3601679437289775354003040774841792881489);
+
+    B->c[1] =  SUN_RCONST(0.05);
+    B->c[2] =  SUN_RCONST(0.1065625);
+    B->c[3] =  SUN_RCONST(0.15984375);
+    B->c[4] =  SUN_RCONST(0.39);
+    B->c[5] =  SUN_RCONST(0.465);
+    B->c[6] =  SUN_RCONST(0.155);
+    B->c[7] =  SUN_RCONST(0.943);
+    B->c[8] =  SUN_RCONST(0.9018020417358569851273841777583584189415);
+    B->c[9] =  SUN_RCONST(0.909);
+    B->c[10] =  SUN_RCONST(0.94);
+    B->c[11] =  SUN_RCONST(1.0);
+    B->c[12] =  SUN_RCONST(1.0);
     return B;
   })
 
@@ -900,117 +900,117 @@ ARK_BUTCHER_TABLE(ARKODE_VERNER_16_8_9, { /* Verner-9-8 (DOI: 10.1007/s11075-009
     B->q = 9;
     B->p = 8;
 
-    B->A[1][0] = RCONST(0.3462e-1);
-    B->A[2][0] = RCONST(-0.389335438857287327017042687229284478532e-1);
-    B->A[2][1] = RCONST(0.1359578945245091786499878854939346230295);
-    B->A[3][0] = RCONST(0.3638413148954266723060635628912731569111e-1);
-    B->A[3][2] = RCONST(0.1091523944686280016918190688673819470733);
-    B->A[4][0] = RCONST(2.025763914393969636805657604282571047511);
-    B->A[4][2] = RCONST(-7.638023836496292020387602153091964592952);
-    B->A[4][3] = RCONST(6.173259922102322383581944548809393545442);
-    B->A[5][0] = RCONST(0.5112275589406060872792270881648288397197e-1);
-    B->A[5][3] = RCONST(0.1770823794555021537929910813839068684087);
-    B->A[5][4] = RCONST(0.80277624092225014536138698108025283759e-3);
-    B->A[6][0] = RCONST(0.1316006357975216279279871693164256985334);
-    B->A[6][3] = RCONST(-0.2957276252669636417685183174672273730699);
-    B->A[6][4] = RCONST(0.878137803564295237421124704053886667082e-1);
-    B->A[6][5] = RCONST(0.6213052975225274774321435005639430026100);
-    B->A[7][0] = RCONST(0.7166666666666666666666666666666666666667e-1);
-    B->A[7][5] = RCONST(0.3305533578915319409260346730051472207728);
-    B->A[7][6] = RCONST(0.2427799754418013924072986603281861125606);
-    B->A[8][0] = RCONST(0.7180664062500000000000000000000000000000e-1);
-    B->A[8][5] = RCONST(0.3294380283228177160744825466257672816401);
-    B->A[8][6] = RCONST(0.1165190029271822839255174533742327183599);
-    B->A[8][7] = RCONST(-0.3401367187500000000000000000000000000000e-1);
-    B->A[9][0] = RCONST(0.4836757646340646986611287718844085773549e-1);
-    B->A[9][5] = RCONST(0.3928989925676163974333190042057047002852e-1);
-    B->A[9][6] = RCONST(0.1054740945890344608263649267140088017604);
-    B->A[9][7] = RCONST(-0.2143865284648312665982642293830533996214e-1);
-    B->A[9][8] = RCONST(-0.1041229174627194437759832813847147895623);
-    B->A[10][0] = RCONST(-0.2664561487201478635337289243849737340534e-1);
-    B->A[10][5] = RCONST(0.3333333333333333333333333333333333333333e-1);
-    B->A[10][6] = RCONST(-0.1631072244872467239162704487554706387141);
-    B->A[10][7] = RCONST(0.3396081684127761199487954930015522928244e-1);
-    B->A[10][8] = RCONST(0.1572319413814626097110769806810024118077);
-    B->A[10][9] = RCONST(0.2152267478031879552303534778794770376960);
-    B->A[11][0] = RCONST(0.3689009248708622334786359863227633989718e-1);
-    B->A[11][5] = RCONST(-0.1465181576725542928653609891758501156785);
-    B->A[11][6] = RCONST(0.2242577768172024345345469822625833796001);
-    B->A[11][7] = RCONST(0.2294405717066072637090897902753790803034e-1);
-    B->A[11][8] = RCONST(-0.35850052905728761357394424889330334334e-2);
-    B->A[11][9] = RCONST(0.8669223316444385506869203619044453906053e-1);
-    B->A[11][10] = RCONST(0.4383840651968337846196219974168630120572);
-    B->A[12][0] = RCONST(-0.4866012215113340846662212357570395295088);
-    B->A[12][5] = RCONST(-6.304602650282852990657772792012007122988);
-    B->A[12][6] = RCONST(-0.281245618289472564778284183790118418111);
-    B->A[12][7] = RCONST(-2.679019236219849057687906597489223155566);
-    B->A[12][8] = RCONST(0.518815663924157511565311164615012522024);
-    B->A[12][9] = RCONST(1.365353187603341710683633635235238678626);
-    B->A[12][10] = RCONST(5.885091088503946585721274891680604830712);
-    B->A[12][11] = RCONST(2.802808786272062889819965117517532194812);
-    B->A[13][0] = RCONST(0.4185367457753471441471025246471931649633);
-    B->A[13][5] = RCONST(6.724547581906459363100870806514855026676);
-    B->A[13][6] = RCONST(-0.425444280164611790606983409697113064616);
-    B->A[13][7] = RCONST(3.343279153001265577811816947557982637749);
-    B->A[13][8] = RCONST(0.617081663117537759528421117507709784737);
-    B->A[13][9] = RCONST(-0.929966123939932833937749523988800852013);
-    B->A[13][10] = RCONST(-6.099948804751010722472962837945508844846);
-    B->A[13][11] = RCONST(-3.002206187889399044804158084895173690015);
-    B->A[13][12] = RCONST(0.2553202529443445472336424602988558373637);
-    B->A[14][0] = RCONST(-0.779374086122884664644623040843840506343);
-    B->A[14][5] = RCONST(-13.93734253810777678786523664804936051203);
-    B->A[14][6] = RCONST(1.252048853379357320949735183924200895136);
-    B->A[14][7] = RCONST(-14.69150040801686878191527989293072091588);
-    B->A[14][8] = RCONST(-0.494705058533141685655191992136962873577);
-    B->A[14][9] = RCONST(2.242974909146236657906984549543692874755);
-    B->A[14][10] = RCONST(13.36789380382864375813864978592679139881);
-    B->A[14][11] = RCONST(14.39665048665068644512236935340272139005);
-    B->A[14][12] = RCONST(-0.7975813331776800379127866056663258667437);
-    B->A[14][13] = RCONST(0.4409353709534277758753793068298041158235);
-    B->A[15][0] = RCONST(2.058051337466886442151242368989994043993);
-    B->A[15][5] = RCONST(22.35793772796803295519317565842520212899);
-    B->A[15][6] = RCONST(0.90949810997556332745009198137971890783);
-    B->A[15][7] = RCONST(35.89110098240264104710550686568482456493);
-    B->A[15][8] = RCONST(-3.442515027624453437985000403608480262211);
-    B->A[15][9] = RCONST(-4.865481358036368826566013387928704014496);
-    B->A[15][10] = RCONST(-18.90980381354342625688427480879773032857);
-    B->A[15][11] = RCONST(-34.26354448030451782929251177395134170515);
-    B->A[15][12] = RCONST(1.264756521695642578827783499806516664686);
-
-    B->b[0] = RCONST(0.1461197685842315252051541915018784713459e-1);
-    B->b[7] = RCONST(-0.3915211862331339089410228267288242030810);
-    B->b[8] = RCONST(0.2310932500289506415909675644868993669908);
-    B->b[9] = RCONST(0.1274766769992852382560589467488989175618);
-    B->b[10] = RCONST(0.2246434176204157731566981937082069688984);
-    B->b[11] = RCONST(0.5684352689748512932705226972873692126743);
-    B->b[12] = RCONST(0.5825871557215827200814768021863420902155e-1);
-    B->b[13] = RCONST(0.1364317403482215641609022744494239843327);
-    B->b[14] = RCONST(0.3057013983082797397721005067920369646664e-1);
-
-    B->d[0] = RCONST(0.1996996514886773085518508418098868756464e-1);
-    B->d[7] = RCONST(2.191499304949330054530747099310837524864);
-    B->d[8] = RCONST(0.8857071848208438030833722031786358862953e-1);
-    B->d[9] = RCONST(0.1140560234865965622484956605091432032674);
-    B->d[10] = RCONST(0.2533163805345107065564577734569651977347);
-    B->d[11] = RCONST(-2.056564386240941011158999594595981300493);
-    B->d[12] = RCONST(0.3408096799013119935160094894224543812830);
-    B->d[15] = RCONST(0.4834231373823958314376726739772871714902e-1);
-
-    B->c[1] = RCONST(0.3462e-1);
-    B->c[2] = RCONST(0.9702435063878044594828361677100617517633e-1);
-    B->c[3] = RCONST(0.1455365259581706689224254251565092627645);
-    B->c[4] = RCONST(0.561);
-    B->c[5] = RCONST(0.2290079115904850126662751771814700052182);
-    B->c[6] = RCONST(0.5449920884095149873337248228185299947818);
-    B->c[7] = RCONST(0.645);
-    B->c[8] = RCONST(0.48375);
-    B->c[9] = RCONST(0.6757e-1);
-    B->c[10] = RCONST(0.25);
-    B->c[11] = RCONST(0.6590650618730998549405331618649220295334);
-    B->c[12] = RCONST(0.8206);
-    B->c[13] = RCONST(0.9012);
-    B->c[14] = RCONST(1.0);
-    B->c[15] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(0.3462e-1);
+    B->A[2][0] = SUN_RCONST(-0.389335438857287327017042687229284478532e-1);
+    B->A[2][1] = SUN_RCONST(0.1359578945245091786499878854939346230295);
+    B->A[3][0] = SUN_RCONST(0.3638413148954266723060635628912731569111e-1);
+    B->A[3][2] = SUN_RCONST(0.1091523944686280016918190688673819470733);
+    B->A[4][0] = SUN_RCONST(2.025763914393969636805657604282571047511);
+    B->A[4][2] = SUN_RCONST(-7.638023836496292020387602153091964592952);
+    B->A[4][3] = SUN_RCONST(6.173259922102322383581944548809393545442);
+    B->A[5][0] = SUN_RCONST(0.5112275589406060872792270881648288397197e-1);
+    B->A[5][3] = SUN_RCONST(0.1770823794555021537929910813839068684087);
+    B->A[5][4] = SUN_RCONST(0.80277624092225014536138698108025283759e-3);
+    B->A[6][0] = SUN_RCONST(0.1316006357975216279279871693164256985334);
+    B->A[6][3] = SUN_RCONST(-0.2957276252669636417685183174672273730699);
+    B->A[6][4] = SUN_RCONST(0.878137803564295237421124704053886667082e-1);
+    B->A[6][5] = SUN_RCONST(0.6213052975225274774321435005639430026100);
+    B->A[7][0] = SUN_RCONST(0.7166666666666666666666666666666666666667e-1);
+    B->A[7][5] = SUN_RCONST(0.3305533578915319409260346730051472207728);
+    B->A[7][6] = SUN_RCONST(0.2427799754418013924072986603281861125606);
+    B->A[8][0] = SUN_RCONST(0.7180664062500000000000000000000000000000e-1);
+    B->A[8][5] = SUN_RCONST(0.3294380283228177160744825466257672816401);
+    B->A[8][6] = SUN_RCONST(0.1165190029271822839255174533742327183599);
+    B->A[8][7] = SUN_RCONST(-0.3401367187500000000000000000000000000000e-1);
+    B->A[9][0] = SUN_RCONST(0.4836757646340646986611287718844085773549e-1);
+    B->A[9][5] = SUN_RCONST(0.3928989925676163974333190042057047002852e-1);
+    B->A[9][6] = SUN_RCONST(0.1054740945890344608263649267140088017604);
+    B->A[9][7] = SUN_RCONST(-0.2143865284648312665982642293830533996214e-1);
+    B->A[9][8] = SUN_RCONST(-0.1041229174627194437759832813847147895623);
+    B->A[10][0] = SUN_RCONST(-0.2664561487201478635337289243849737340534e-1);
+    B->A[10][5] = SUN_RCONST(0.3333333333333333333333333333333333333333e-1);
+    B->A[10][6] = SUN_RCONST(-0.1631072244872467239162704487554706387141);
+    B->A[10][7] = SUN_RCONST(0.3396081684127761199487954930015522928244e-1);
+    B->A[10][8] = SUN_RCONST(0.1572319413814626097110769806810024118077);
+    B->A[10][9] = SUN_RCONST(0.2152267478031879552303534778794770376960);
+    B->A[11][0] = SUN_RCONST(0.3689009248708622334786359863227633989718e-1);
+    B->A[11][5] = SUN_RCONST(-0.1465181576725542928653609891758501156785);
+    B->A[11][6] = SUN_RCONST(0.2242577768172024345345469822625833796001);
+    B->A[11][7] = SUN_RCONST(0.2294405717066072637090897902753790803034e-1);
+    B->A[11][8] = SUN_RCONST(-0.35850052905728761357394424889330334334e-2);
+    B->A[11][9] = SUN_RCONST(0.8669223316444385506869203619044453906053e-1);
+    B->A[11][10] = SUN_RCONST(0.4383840651968337846196219974168630120572);
+    B->A[12][0] = SUN_RCONST(-0.4866012215113340846662212357570395295088);
+    B->A[12][5] = SUN_RCONST(-6.304602650282852990657772792012007122988);
+    B->A[12][6] = SUN_RCONST(-0.281245618289472564778284183790118418111);
+    B->A[12][7] = SUN_RCONST(-2.679019236219849057687906597489223155566);
+    B->A[12][8] = SUN_RCONST(0.518815663924157511565311164615012522024);
+    B->A[12][9] = SUN_RCONST(1.365353187603341710683633635235238678626);
+    B->A[12][10] = SUN_RCONST(5.885091088503946585721274891680604830712);
+    B->A[12][11] = SUN_RCONST(2.802808786272062889819965117517532194812);
+    B->A[13][0] = SUN_RCONST(0.4185367457753471441471025246471931649633);
+    B->A[13][5] = SUN_RCONST(6.724547581906459363100870806514855026676);
+    B->A[13][6] = SUN_RCONST(-0.425444280164611790606983409697113064616);
+    B->A[13][7] = SUN_RCONST(3.343279153001265577811816947557982637749);
+    B->A[13][8] = SUN_RCONST(0.617081663117537759528421117507709784737);
+    B->A[13][9] = SUN_RCONST(-0.929966123939932833937749523988800852013);
+    B->A[13][10] = SUN_RCONST(-6.099948804751010722472962837945508844846);
+    B->A[13][11] = SUN_RCONST(-3.002206187889399044804158084895173690015);
+    B->A[13][12] = SUN_RCONST(0.2553202529443445472336424602988558373637);
+    B->A[14][0] = SUN_RCONST(-0.779374086122884664644623040843840506343);
+    B->A[14][5] = SUN_RCONST(-13.93734253810777678786523664804936051203);
+    B->A[14][6] = SUN_RCONST(1.252048853379357320949735183924200895136);
+    B->A[14][7] = SUN_RCONST(-14.69150040801686878191527989293072091588);
+    B->A[14][8] = SUN_RCONST(-0.494705058533141685655191992136962873577);
+    B->A[14][9] = SUN_RCONST(2.242974909146236657906984549543692874755);
+    B->A[14][10] = SUN_RCONST(13.36789380382864375813864978592679139881);
+    B->A[14][11] = SUN_RCONST(14.39665048665068644512236935340272139005);
+    B->A[14][12] = SUN_RCONST(-0.7975813331776800379127866056663258667437);
+    B->A[14][13] = SUN_RCONST(0.4409353709534277758753793068298041158235);
+    B->A[15][0] = SUN_RCONST(2.058051337466886442151242368989994043993);
+    B->A[15][5] = SUN_RCONST(22.35793772796803295519317565842520212899);
+    B->A[15][6] = SUN_RCONST(0.90949810997556332745009198137971890783);
+    B->A[15][7] = SUN_RCONST(35.89110098240264104710550686568482456493);
+    B->A[15][8] = SUN_RCONST(-3.442515027624453437985000403608480262211);
+    B->A[15][9] = SUN_RCONST(-4.865481358036368826566013387928704014496);
+    B->A[15][10] = SUN_RCONST(-18.90980381354342625688427480879773032857);
+    B->A[15][11] = SUN_RCONST(-34.26354448030451782929251177395134170515);
+    B->A[15][12] = SUN_RCONST(1.264756521695642578827783499806516664686);
+
+    B->b[0] = SUN_RCONST(0.1461197685842315252051541915018784713459e-1);
+    B->b[7] = SUN_RCONST(-0.3915211862331339089410228267288242030810);
+    B->b[8] = SUN_RCONST(0.2310932500289506415909675644868993669908);
+    B->b[9] = SUN_RCONST(0.1274766769992852382560589467488989175618);
+    B->b[10] = SUN_RCONST(0.2246434176204157731566981937082069688984);
+    B->b[11] = SUN_RCONST(0.5684352689748512932705226972873692126743);
+    B->b[12] = SUN_RCONST(0.5825871557215827200814768021863420902155e-1);
+    B->b[13] = SUN_RCONST(0.1364317403482215641609022744494239843327);
+    B->b[14] = SUN_RCONST(0.3057013983082797397721005067920369646664e-1);
+
+    B->d[0] = SUN_RCONST(0.1996996514886773085518508418098868756464e-1);
+    B->d[7] = SUN_RCONST(2.191499304949330054530747099310837524864);
+    B->d[8] = SUN_RCONST(0.8857071848208438030833722031786358862953e-1);
+    B->d[9] = SUN_RCONST(0.1140560234865965622484956605091432032674);
+    B->d[10] = SUN_RCONST(0.2533163805345107065564577734569651977347);
+    B->d[11] = SUN_RCONST(-2.056564386240941011158999594595981300493);
+    B->d[12] = SUN_RCONST(0.3408096799013119935160094894224543812830);
+    B->d[15] = SUN_RCONST(0.4834231373823958314376726739772871714902e-1);
+
+    B->c[1] = SUN_RCONST(0.3462e-1);
+    B->c[2] = SUN_RCONST(0.9702435063878044594828361677100617517633e-1);
+    B->c[3] = SUN_RCONST(0.1455365259581706689224254251565092627645);
+    B->c[4] = SUN_RCONST(0.561);
+    B->c[5] = SUN_RCONST(0.2290079115904850126662751771814700052182);
+    B->c[6] = SUN_RCONST(0.5449920884095149873337248228185299947818);
+    B->c[7] = SUN_RCONST(0.645);
+    B->c[8] = SUN_RCONST(0.48375);
+    B->c[9] = SUN_RCONST(0.6757e-1);
+    B->c[10] = SUN_RCONST(0.25);
+    B->c[11] = SUN_RCONST(0.6590650618730998549405331618649220295334);
+    B->c[12] = SUN_RCONST(0.8206);
+    B->c[13] = SUN_RCONST(0.9012);
+    B->c[14] = SUN_RCONST(1.0);
+    B->c[15] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -1018,89 +1018,89 @@ ARK_BUTCHER_TABLE(ARKODE_FEHLBERG_13_7_8, { /* Fehlberg-8-7 */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(13, SUNTRUE);
     B->q = 8;
     B->p = 7;
-    B->A[1][0] = RCONST(2.0)/RCONST(27.0);
-    B->A[2][0] = RCONST(1.0)/RCONST(36.0);
-    B->A[2][1] = RCONST(1.0)/RCONST(12.0);
-    B->A[3][0] = RCONST(1.0)/RCONST(24.0);
-    B->A[3][2] = RCONST(1.0)/RCONST(8.0);
-    B->A[4][0] = RCONST(5.0)/RCONST(12.0);
-    B->A[4][2] = RCONST(-25.0)/RCONST(16.0);
-    B->A[4][3] = RCONST(25.0)/RCONST(16.0);
-    B->A[5][0] = RCONST(1.0)/RCONST(20.0);
-    B->A[5][3] = RCONST(1.0)/RCONST(4.0);
-    B->A[5][4] = RCONST(1.0)/RCONST(5.0);
-    B->A[6][0] = RCONST(-25.0)/RCONST(108.0);
-    B->A[6][3] = RCONST(125.0)/RCONST(108.0);
-    B->A[6][4] = RCONST(-65.0)/RCONST(27.0);
-    B->A[6][5] = RCONST(125.0)/RCONST(54.0);
-    B->A[7][0] = RCONST(31.0)/RCONST(300.0);
-    B->A[7][4] = RCONST(61.0)/RCONST(225.0);
-    B->A[7][5] = RCONST(-2.0)/RCONST(9.0);
-    B->A[7][6] = RCONST(13.0)/RCONST(900.0);
-    B->A[8][0] = RCONST(2.0);
-    B->A[8][3] = RCONST(-53.0)/RCONST(6.0);
-    B->A[8][4] = RCONST(704.0)/RCONST(45.0);
-    B->A[8][5] = RCONST(-107.0)/RCONST(9.0);
-    B->A[8][6] = RCONST(67.0)/RCONST(90.0);
-    B->A[8][7] = RCONST(3.0);
-    B->A[9][0] = RCONST(-91.0)/RCONST(108.0);
-    B->A[9][3] = RCONST(23.0)/RCONST(108.0);
-    B->A[9][4] = RCONST(-976.0)/RCONST(135.0);
-    B->A[9][5] = RCONST(311.0)/RCONST(54.0);
-    B->A[9][6] = RCONST(-19.0)/RCONST(60.0);
-    B->A[9][7] = RCONST(17.0)/RCONST(6.0);
-    B->A[9][8] = RCONST(-1.0)/RCONST(12.0);
-    B->A[10][0] = RCONST(2383.0)/RCONST(4100.0);
-    B->A[10][3] = RCONST(-341.0)/RCONST(164.0);
-    B->A[10][4] = RCONST(4496.0)/RCONST(1025.0);
-    B->A[10][5] = RCONST(-301.0)/RCONST(82.0);
-    B->A[10][6] = RCONST(2133.0)/RCONST(4100.0);
-    B->A[10][7] = RCONST(45.0)/RCONST(82.0);
-    B->A[10][8] = RCONST(45.0)/RCONST(164.0);
-    B->A[10][9] = RCONST(18.0)/RCONST(41.0);
-    B->A[11][0] = RCONST(3.0)/RCONST(205.0);
-    B->A[11][5] = RCONST(-6.0)/RCONST(41.0);
-    B->A[11][6] = RCONST(-3.0)/RCONST(205.0);
-    B->A[11][7] = RCONST(-3.0)/RCONST(41.0);
-    B->A[11][8] = RCONST(3.0)/RCONST(41.0);
-    B->A[11][9] = RCONST(6.0)/RCONST(41.0);
-    B->A[12][0] = RCONST(-1777.0)/RCONST(4100.0);
-    B->A[12][3] = RCONST(-341.0)/RCONST(164.0);
-    B->A[12][4] = RCONST(4496.0)/RCONST(1025.0);
-    B->A[12][5] = RCONST(-289.0)/RCONST(82.0);
-    B->A[12][6] = RCONST(2193.0)/RCONST(4100.0);
-    B->A[12][7] = RCONST(51.0)/RCONST(82.0);
-    B->A[12][8] = RCONST(33.0)/RCONST(164.0);
-    B->A[12][9] = RCONST(12.0)/RCONST(41.0);
-    B->A[12][11] = RCONST(1.0);
-
-    B->b[5]  = RCONST(34.0)/RCONST(105.0);
-    B->b[6]  = RCONST(9.0)/RCONST(35.0);
-    B->b[7]  = RCONST(9.0)/RCONST(35.0);
-    B->b[8]  = RCONST(9.0)/RCONST(280.0);
-    B->b[9]  = RCONST(9.0)/RCONST(280.0);
-    B->b[11] = RCONST(41.0)/RCONST(840.0);
-    B->b[12] = RCONST(41.0)/RCONST(840.0);
-
-    B->d[0]  = RCONST(41.0)/RCONST(840.0);
-    B->d[5]  = RCONST(34.0)/RCONST(105.0);
-    B->d[6]  = RCONST(9.0)/RCONST(35.0);
-    B->d[7]  = RCONST(9.0)/RCONST(35.0);
-    B->d[8]  = RCONST(9.0)/RCONST(280.0);
-    B->d[9]  = RCONST(9.0)/RCONST(280.0);
-    B->d[10] = RCONST(41.0)/RCONST(840.0);
-
-    B->c[1]  = RCONST(2.0)/RCONST(27.0);
-    B->c[2]  = RCONST(1.0)/RCONST(9.0);
-    B->c[3]  = RCONST(1.0)/RCONST(6.0);
-    B->c[4]  = RCONST(5.0)/RCONST(12.0);
-    B->c[5]  = RCONST(1.0)/RCONST(2.0);
-    B->c[6]  = RCONST(5.0)/RCONST(6.0);
-    B->c[7]  = RCONST(1.0)/RCONST(6.0);
-    B->c[8]  = RCONST(2.0)/RCONST(3.0);
-    B->c[9]  = RCONST(1.0)/RCONST(3.0);
-    B->c[10] = RCONST(1.0);
-    B->c[12] = RCONST(1.0);
+    B->A[1][0] = SUN_RCONST(2.0)/SUN_RCONST(27.0);
+    B->A[2][0] = SUN_RCONST(1.0)/SUN_RCONST(36.0);
+    B->A[2][1] = SUN_RCONST(1.0)/SUN_RCONST(12.0);
+    B->A[3][0] = SUN_RCONST(1.0)/SUN_RCONST(24.0);
+    B->A[3][2] = SUN_RCONST(1.0)/SUN_RCONST(8.0);
+    B->A[4][0] = SUN_RCONST(5.0)/SUN_RCONST(12.0);
+    B->A[4][2] = SUN_RCONST(-25.0)/SUN_RCONST(16.0);
+    B->A[4][3] = SUN_RCONST(25.0)/SUN_RCONST(16.0);
+    B->A[5][0] = SUN_RCONST(1.0)/SUN_RCONST(20.0);
+    B->A[5][3] = SUN_RCONST(1.0)/SUN_RCONST(4.0);
+    B->A[5][4] = SUN_RCONST(1.0)/SUN_RCONST(5.0);
+    B->A[6][0] = SUN_RCONST(-25.0)/SUN_RCONST(108.0);
+    B->A[6][3] = SUN_RCONST(125.0)/SUN_RCONST(108.0);
+    B->A[6][4] = SUN_RCONST(-65.0)/SUN_RCONST(27.0);
+    B->A[6][5] = SUN_RCONST(125.0)/SUN_RCONST(54.0);
+    B->A[7][0] = SUN_RCONST(31.0)/SUN_RCONST(300.0);
+    B->A[7][4] = SUN_RCONST(61.0)/SUN_RCONST(225.0);
+    B->A[7][5] = SUN_RCONST(-2.0)/SUN_RCONST(9.0);
+    B->A[7][6] = SUN_RCONST(13.0)/SUN_RCONST(900.0);
+    B->A[8][0] = SUN_RCONST(2.0);
+    B->A[8][3] = SUN_RCONST(-53.0)/SUN_RCONST(6.0);
+    B->A[8][4] = SUN_RCONST(704.0)/SUN_RCONST(45.0);
+    B->A[8][5] = SUN_RCONST(-107.0)/SUN_RCONST(9.0);
+    B->A[8][6] = SUN_RCONST(67.0)/SUN_RCONST(90.0);
+    B->A[8][7] = SUN_RCONST(3.0);
+    B->A[9][0] = SUN_RCONST(-91.0)/SUN_RCONST(108.0);
+    B->A[9][3] = SUN_RCONST(23.0)/SUN_RCONST(108.0);
+    B->A[9][4] = SUN_RCONST(-976.0)/SUN_RCONST(135.0);
+    B->A[9][5] = SUN_RCONST(311.0)/SUN_RCONST(54.0);
+    B->A[9][6] = SUN_RCONST(-19.0)/SUN_RCONST(60.0);
+    B->A[9][7] = SUN_RCONST(17.0)/SUN_RCONST(6.0);
+    B->A[9][8] = SUN_RCONST(-1.0)/SUN_RCONST(12.0);
+    B->A[10][0] = SUN_RCONST(2383.0)/SUN_RCONST(4100.0);
+    B->A[10][3] = SUN_RCONST(-341.0)/SUN_RCONST(164.0);
+    B->A[10][4] = SUN_RCONST(4496.0)/SUN_RCONST(1025.0);
+    B->A[10][5] = SUN_RCONST(-301.0)/SUN_RCONST(82.0);
+    B->A[10][6] = SUN_RCONST(2133.0)/SUN_RCONST(4100.0);
+    B->A[10][7] = SUN_RCONST(45.0)/SUN_RCONST(82.0);
+    B->A[10][8] = SUN_RCONST(45.0)/SUN_RCONST(164.0);
+    B->A[10][9] = SUN_RCONST(18.0)/SUN_RCONST(41.0);
+    B->A[11][0] = SUN_RCONST(3.0)/SUN_RCONST(205.0);
+    B->A[11][5] = SUN_RCONST(-6.0)/SUN_RCONST(41.0);
+    B->A[11][6] = SUN_RCONST(-3.0)/SUN_RCONST(205.0);
+    B->A[11][7] = SUN_RCONST(-3.0)/SUN_RCONST(41.0);
+    B->A[11][8] = SUN_RCONST(3.0)/SUN_RCONST(41.0);
+    B->A[11][9] = SUN_RCONST(6.0)/SUN_RCONST(41.0);
+    B->A[12][0] = SUN_RCONST(-1777.0)/SUN_RCONST(4100.0);
+    B->A[12][3] = SUN_RCONST(-341.0)/SUN_RCONST(164.0);
+    B->A[12][4] = SUN_RCONST(4496.0)/SUN_RCONST(1025.0);
+    B->A[12][5] = SUN_RCONST(-289.0)/SUN_RCONST(82.0);
+    B->A[12][6] = SUN_RCONST(2193.0)/SUN_RCONST(4100.0);
+    B->A[12][7] = SUN_RCONST(51.0)/SUN_RCONST(82.0);
+    B->A[12][8] = SUN_RCONST(33.0)/SUN_RCONST(164.0);
+    B->A[12][9] = SUN_RCONST(12.0)/SUN_RCONST(41.0);
+    B->A[12][11] = SUN_RCONST(1.0);
+
+    B->b[5]  = SUN_RCONST(34.0)/SUN_RCONST(105.0);
+    B->b[6]  = SUN_RCONST(9.0)/SUN_RCONST(35.0);
+    B->b[7]  = SUN_RCONST(9.0)/SUN_RCONST(35.0);
+    B->b[8]  = SUN_RCONST(9.0)/SUN_RCONST(280.0);
+    B->b[9]  = SUN_RCONST(9.0)/SUN_RCONST(280.0);
+    B->b[11] = SUN_RCONST(41.0)/SUN_RCONST(840.0);
+    B->b[12] = SUN_RCONST(41.0)/SUN_RCONST(840.0);
+
+    B->d[0]  = SUN_RCONST(41.0)/SUN_RCONST(840.0);
+    B->d[5]  = SUN_RCONST(34.0)/SUN_RCONST(105.0);
+    B->d[6]  = SUN_RCONST(9.0)/SUN_RCONST(35.0);
+    B->d[7]  = SUN_RCONST(9.0)/SUN_RCONST(35.0);
+    B->d[8]  = SUN_RCONST(9.0)/SUN_RCONST(280.0);
+    B->d[9]  = SUN_RCONST(9.0)/SUN_RCONST(280.0);
+    B->d[10] = SUN_RCONST(41.0)/SUN_RCONST(840.0);
+
+    B->c[1]  = SUN_RCONST(2.0)/SUN_RCONST(27.0);
+    B->c[2]  = SUN_RCONST(1.0)/SUN_RCONST(9.0);
+    B->c[3]  = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->c[4]  = SUN_RCONST(5.0)/SUN_RCONST(12.0);
+    B->c[5]  = SUN_RCONST(1.0)/SUN_RCONST(2.0);
+    B->c[6]  = SUN_RCONST(5.0)/SUN_RCONST(6.0);
+    B->c[7]  = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->c[8]  = SUN_RCONST(2.0)/SUN_RCONST(3.0);
+    B->c[9]  = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->c[10] = SUN_RCONST(1.0);
+    B->c[12] = SUN_RCONST(1.0);
     return B;
   })
 
@@ -1112,17 +1112,17 @@ ARK_BUTCHER_TABLE(ARKODE_KNOTH_WOLKE_3_3, { /* Knoth-Wolke-ERK */
     ARKodeButcherTable B = ARKodeButcherTable_Alloc(3, SUNFALSE);
     B->q = 3;
     B->p = 0;
-    B->A[1][0] = RCONST(1.0)/RCONST(3.0);
-    B->A[2][0] = RCONST(-3.0)/RCONST(16.0);
-    B->A[2][1] = RCONST(15.0)/RCONST(16.0);
+    B->A[1][0] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->A[2][0] = SUN_RCONST(-3.0)/SUN_RCONST(16.0);
+    B->A[2][1] = SUN_RCONST(15.0)/SUN_RCONST(16.0);
 
-    B->b[0] = RCONST(1.0)/RCONST(6.0);
-    B->b[1] = RCONST(3.0)/RCONST(10.0);
-    B->b[2] = RCONST(8.0)/RCONST(15.0);
+    B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(6.0);
+    B->b[1] = SUN_RCONST(3.0)/SUN_RCONST(10.0);
+    B->b[2] = SUN_RCONST(8.0)/SUN_RCONST(15.0);
 
     B->d = NULL;
 
-    B->c[1] = RCONST(1.0)/RCONST(3.0);
-    B->c[2] = RCONST(3.0)/RCONST(4.0);
+    B->c[1] = SUN_RCONST(1.0)/SUN_RCONST(3.0);
+    B->c[2] = SUN_RCONST(3.0)/SUN_RCONST(4.0);
     return B;
   })
diff --git a/src/arkode/arkode_erkstep.c b/src/arkode/arkode_erkstep.c
index 78aec3331a..794507058e 100644
--- a/src/arkode/arkode_erkstep.c
+++ b/src/arkode/arkode_erkstep.c
@@ -31,11 +31,11 @@
   ERKStep Exported functions -- Required
   ===============================================================*/
 
-void* ERKStepCreate(ARKRhsFn f, realtype t0, N_Vector y0, SUNContext sunctx)
+void* ERKStepCreate(ARKRhsFn f, sunrealtype t0, N_Vector y0, SUNContext sunctx)
 {
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
-  booleantype nvectorOK;
+  sunbooleantype nvectorOK;
   int retval;
 
   /* Check that f is supplied */
@@ -106,7 +106,7 @@ void* ERKStepCreate(ARKRhsFn f, realtype t0, N_Vector y0, SUNContext sunctx)
   step_mem->f = f;
 
   /* Update the ARKODE workspace requirements -- UPDATE */
-  ark_mem->liw += 41;  /* fcn/data ptr, int, long int, sunindextype, booleantype */
+  ark_mem->liw += 41;  /* fcn/data ptr, int, long int, sunindextype, sunbooleantype */
   ark_mem->lrw += 10;
 
   /* Initialize all the counters */
@@ -131,8 +131,8 @@ void* ERKStepCreate(ARKRhsFn f, realtype t0, N_Vector y0, SUNContext sunctx)
   It first resizes the main ARKODE infrastructure memory, and
   then resizes its own data.
   ---------------------------------------------------------------*/
-int ERKStepResize(void *arkode_mem, N_Vector y0, realtype hscale,
-                  realtype t0, ARKVecResizeFn resize, void *resize_data)
+int ERKStepResize(void *arkode_mem, N_Vector y0, sunrealtype hscale,
+                  sunrealtype t0, ARKVecResizeFn resize, void *resize_data)
 {
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
@@ -186,7 +186,7 @@ int ERKStepResize(void *arkode_mem, N_Vector y0, realtype hscale,
 
   Note all internal counters are set to 0 on re-initialization.
   ---------------------------------------------------------------*/
-int ERKStepReInit(void* arkode_mem, ARKRhsFn f, realtype t0, N_Vector y0)
+int ERKStepReInit(void* arkode_mem, ARKRhsFn f, sunrealtype t0, N_Vector y0)
 {
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
@@ -243,7 +243,7 @@ int ERKStepReInit(void* arkode_mem, ARKRhsFn f, realtype t0, N_Vector y0)
   problem from the given time with the input state (all counter
   values are retained).
   ---------------------------------------------------------------*/
-int ERKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+int ERKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 {
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
@@ -273,7 +273,7 @@ int ERKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
   These routines set integration tolerances (wrappers for general
   ARKODE utility routines)
   ---------------------------------------------------------------*/
-int ERKStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
+int ERKStepSStolerances(void *arkode_mem, sunrealtype reltol, sunrealtype abstol)
 {
   /* unpack ark_mem, call arkSStolerances, and return */
   ARKodeMem ark_mem;
@@ -287,7 +287,7 @@ int ERKStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
 }
 
 
-int ERKStepSVtolerances(void *arkode_mem, realtype reltol, N_Vector abstol)
+int ERKStepSVtolerances(void *arkode_mem, sunrealtype reltol, N_Vector abstol)
 {
   /* unpack ark_mem, call arkSVtolerances, and return */
   ARKodeMem ark_mem;
@@ -329,8 +329,8 @@ int ERKStepRootInit(void *arkode_mem, int nrtfn, ARKRootFn g)
 }
 
 
-int ERKStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
-                  realtype *tret, int itask)
+int ERKStepEvolve(void *arkode_mem, sunrealtype tout, N_Vector yout,
+                  sunrealtype *tret, int itask)
 {
   /* unpack ark_mem, call arkEvolve, and return */
   int retval;
@@ -348,7 +348,7 @@ int ERKStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
 }
 
 
-int ERKStepGetDky(void *arkode_mem, realtype t, int k, N_Vector dky)
+int ERKStepGetDky(void *arkode_mem, sunrealtype t, int k, N_Vector dky)
 {
   /* unpack ark_mem, call arkGetDky, and return */
   int retval;
@@ -460,7 +460,7 @@ void ERKStepPrintMem(void* arkode_mem, FILE* outfile)
   /* output long integer quantities */
   fprintf(outfile,"ERKStep: nfe = %li\n", step_mem->nfe);
 
-  /* output realtype quantities */
+  /* output sunrealtype quantities */
   fprintf(outfile,"ERKStep: Butcher table:\n");
   ARKodeButcherTable_Write(step_mem->B, outfile);
 
@@ -560,7 +560,7 @@ int erkStep_Init(void* arkode_mem, int init_type)
 
   /* Allocate reusable arrays for fused vector interface */
   if (step_mem->cvals == NULL) {
-    step_mem->cvals = (realtype *) calloc(step_mem->stages+1, sizeof(realtype));
+    step_mem->cvals = (sunrealtype *) calloc(step_mem->stages+1, sizeof(sunrealtype));
     if (step_mem->cvals == NULL)  return(ARK_MEM_FAIL);
     ark_mem->lrw += (step_mem->stages + 1);
   }
@@ -630,13 +630,13 @@ int erkStep_Init(void* arkode_mem, int init_type)
   when estimating the initial time step size, so we strive to store the
   intermediate parts so that they do not interfere with the other two modes.
   ----------------------------------------------------------------------------*/
-int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
+int erkStep_FullRHS(void* arkode_mem, sunrealtype t, N_Vector y, N_Vector f,
                     int mode)
 {
   int retval;
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
-  booleantype recomputeRHS;
+  sunbooleantype recomputeRHS;
 
   /* access ARKodeERKStepMem structure */
   retval = erkStep_AccessStepMem(arkode_mem, "erkStep_FullRHS",
@@ -744,10 +744,10 @@ int erkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                  reduce step and retry (if possible)
            <0 => step encountered unrecoverable failure
   ---------------------------------------------------------------*/
-int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
+int erkStep_TakeStep(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr)
 {
   int retval, is, js, nvec, mode;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
   ARKodeMem ark_mem;
   ARKodeERKStepMem step_mem;
@@ -909,7 +909,7 @@ int erkStep_AccessStepMem(void* arkode_mem, const char *fname,
   This routine checks if all required vector operations are
   present.  If any of them is missing it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype erkStep_CheckNVector(N_Vector tmpl)
+sunbooleantype erkStep_CheckNVector(N_Vector tmpl)
 {
   if ( (tmpl->ops->nvclone     == NULL) ||
        (tmpl->ops->nvdestroy   == NULL) ||
@@ -1017,9 +1017,9 @@ int erkStep_SetButcherTable(ARKodeMem ark_mem)
 int erkStep_CheckButcherTable(ARKodeMem ark_mem)
 {
   int i, j;
-  booleantype okay;
+  sunbooleantype okay;
   ARKodeERKStepMem step_mem;
-  realtype tol = RCONST(1.0e-12);
+  sunrealtype tol = SUN_RCONST(1.0e-12);
 
   /* access ARKodeERKStepMem structure */
   if (ark_mem->step_mem==NULL) {
@@ -1117,12 +1117,12 @@ int erkStep_CheckButcherTable(ARKodeMem ark_mem)
   Note: at this point in the step, the vector ark_tempv1 may be
   used as a temporary vector.
   ---------------------------------------------------------------*/
-int erkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsmPtr)
+int erkStep_ComputeSolutions(ARKodeMem ark_mem, sunrealtype *dsmPtr)
 {
   /* local data */
   int retval, j, nvec;
   N_Vector y, yerr;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
   ARKodeERKStepMem step_mem;
 
@@ -1196,7 +1196,7 @@ int erkStep_RelaxDeltaE(ARKodeMem ark_mem, ARKRelaxJacFn relax_jac_fn,
                         long int* num_relax_jac_evals, sunrealtype* delta_e_out)
 {
   int i, j, nvec, retval;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
   ARKodeERKStepMem step_mem;
   N_Vector z_stage = ark_mem->tempv2;
diff --git a/src/arkode/arkode_erkstep_impl.h b/src/arkode/arkode_erkstep_impl.h
index 236e1779ac..ed78e08e35 100644
--- a/src/arkode/arkode_erkstep_impl.h
+++ b/src/arkode/arkode_erkstep_impl.h
@@ -59,7 +59,7 @@ typedef struct ARKodeERKStepMemRec {
   long int nfe;           /* num fe calls               */
 
   /* Reusable arrays for fused vector operations */
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
 } *ARKodeERKStepMem;
@@ -71,17 +71,17 @@ typedef struct ARKodeERKStepMemRec {
 
 /* Interface routines supplied to ARKODE */
 int erkStep_Init(void* arkode_mem, int init_type);
-int erkStep_FullRHS(void* arkode_mem, realtype t,
+int erkStep_FullRHS(void* arkode_mem, sunrealtype t,
                     N_Vector y, N_Vector f, int mode);
-int erkStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr);
+int erkStep_TakeStep(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr);
 
 /* Internal utility routines */
 int erkStep_AccessStepMem(void* arkode_mem, const char *fname,
                           ARKodeMem *ark_mem, ARKodeERKStepMem *step_mem);
-booleantype erkStep_CheckNVector(N_Vector tmpl);
+sunbooleantype erkStep_CheckNVector(N_Vector tmpl);
 int erkStep_SetButcherTable(ARKodeMem ark_mem);
 int erkStep_CheckButcherTable(ARKodeMem ark_mem);
-int erkStep_ComputeSolutions(ARKodeMem ark_mem, realtype *dsm);
+int erkStep_ComputeSolutions(ARKodeMem ark_mem, sunrealtype *dsm);
 
 /* private functions for relaxation */
 int erkStep_RelaxDeltaE(ARKodeMem ark_mem, ARKRelaxJacFn relax_jac_fn,
diff --git a/src/arkode/arkode_erkstep_io.c b/src/arkode/arkode_erkstep_io.c
index 7a3f9dbc54..2d1b92d3a8 100644
--- a/src/arkode/arkode_erkstep_io.c
+++ b/src/arkode/arkode_erkstep_io.c
@@ -49,16 +49,16 @@ int ERKStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int ERKStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
   return(arkSetMaxHnilWarns(arkode_mem, mxhnil)); }
-int ERKStepSetInitStep(void *arkode_mem, realtype hin) {
+int ERKStepSetInitStep(void *arkode_mem, sunrealtype hin) {
   return(arkSetInitStep(arkode_mem, hin)); }
-int ERKStepSetMinStep(void *arkode_mem, realtype hmin) {
+int ERKStepSetMinStep(void *arkode_mem, sunrealtype hmin) {
   return(arkSetMinStep(arkode_mem, hmin)); }
-int ERKStepSetMaxStep(void *arkode_mem, realtype hmax) {
+int ERKStepSetMaxStep(void *arkode_mem, sunrealtype hmax) {
   return(arkSetMaxStep(arkode_mem, hmax)); }
-int ERKStepSetStopTime(void *arkode_mem, realtype tstop) {
+int ERKStepSetStopTime(void *arkode_mem, sunrealtype tstop) {
   return(arkSetStopTime(arkode_mem, tstop)); }
 int ERKStepSetInterpolateStopTime(void *arkode_mem,
-                                  booleantype interp) {
+                                  sunbooleantype interp) {
   return(arkSetInterpolateStopTime(arkode_mem, interp)); }
 int ERKStepClearStopTime(void *arkode_mem) {
   return(arkClearStopTime(arkode_mem)); }
@@ -78,19 +78,19 @@ int ERKStepSetPostprocessStageFn(void *arkode_mem,
   return(arkSetPostprocessStageFn(arkode_mem, ProcessStage)); }
 int ERKStepSetAdaptivityAdjustment(void *arkode_mem, int adjust) {
   return(arkSetAdaptivityAdjustment(arkode_mem, adjust)); }
-int ERKStepSetCFLFraction(void *arkode_mem, realtype cfl_frac) {
+int ERKStepSetCFLFraction(void *arkode_mem, sunrealtype cfl_frac) {
   return(arkSetCFLFraction(arkode_mem, cfl_frac)); }
-int ERKStepSetSafetyFactor(void *arkode_mem, realtype safety) {
+int ERKStepSetSafetyFactor(void *arkode_mem, sunrealtype safety) {
   return(arkSetSafetyFactor(arkode_mem, safety)); }
-int ERKStepSetMaxGrowth(void *arkode_mem, realtype mx_growth) {
+int ERKStepSetMaxGrowth(void *arkode_mem, sunrealtype mx_growth) {
   return(arkSetMaxGrowth(arkode_mem, mx_growth)); }
-int ERKStepSetMinReduction(void *arkode_mem, realtype eta_min) {
+int ERKStepSetMinReduction(void *arkode_mem, sunrealtype eta_min) {
   return(arkSetMinReduction(arkode_mem, eta_min)); }
-int ERKStepSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub) {
+int ERKStepSetFixedStepBounds(void *arkode_mem, sunrealtype lb, sunrealtype ub) {
   return(arkSetFixedStepBounds(arkode_mem, lb, ub)); }
-int ERKStepSetMaxFirstGrowth(void *arkode_mem, realtype etamx1) {
+int ERKStepSetMaxFirstGrowth(void *arkode_mem, sunrealtype etamx1) {
   return(arkSetMaxFirstGrowth(arkode_mem, etamx1)); }
-int ERKStepSetMaxEFailGrowth(void *arkode_mem, realtype etamxf) {
+int ERKStepSetMaxEFailGrowth(void *arkode_mem, sunrealtype etamxf) {
   return(arkSetMaxEFailGrowth(arkode_mem, etamxf)); }
 int ERKStepSetSmallNumEFails(void *arkode_mem, int small_nef) {
   return(arkSetSmallNumEFails(arkode_mem, small_nef)); }
@@ -98,7 +98,7 @@ int ERKStepSetStabilityFn(void *arkode_mem, ARKExpStabFn EStab, void *estab_data
   return(arkSetStabilityFn(arkode_mem, EStab, estab_data)); }
 int ERKStepSetMaxErrTestFails(void *arkode_mem, int maxnef) {
   return(arkSetMaxErrTestFails(arkode_mem, maxnef)); }
-int ERKStepSetFixedStep(void *arkode_mem, realtype hfixed) {
+int ERKStepSetFixedStep(void *arkode_mem, sunrealtype hfixed) {
   return(arkSetFixedStep(arkode_mem, hfixed)); }
 int ERKStepSetAdaptController(void *arkode_mem, SUNAdaptController C) {
   return(arkSetAdaptController(arkode_mem, C)); }
@@ -113,15 +113,15 @@ int ERKStepGetNumStepAttempts(void *arkode_mem, long int *nstep_attempts) {
   return(arkGetNumStepAttempts(arkode_mem, nstep_attempts)); }
 int ERKStepGetNumSteps(void *arkode_mem, long int *nsteps) {
   return(arkGetNumSteps(arkode_mem, nsteps)); }
-int ERKStepGetActualInitStep(void *arkode_mem, realtype *hinused) {
+int ERKStepGetActualInitStep(void *arkode_mem, sunrealtype *hinused) {
   return(arkGetActualInitStep(arkode_mem, hinused)); }
-int ERKStepGetLastStep(void *arkode_mem, realtype *hlast) {
+int ERKStepGetLastStep(void *arkode_mem, sunrealtype *hlast) {
   return(arkGetLastStep(arkode_mem, hlast)); }
-int ERKStepGetCurrentStep(void *arkode_mem, realtype *hcur) {
+int ERKStepGetCurrentStep(void *arkode_mem, sunrealtype *hcur) {
   return(arkGetCurrentStep(arkode_mem, hcur)); }
-int ERKStepGetCurrentTime(void *arkode_mem, realtype *tcur) {
+int ERKStepGetCurrentTime(void *arkode_mem, sunrealtype *tcur) {
   return(arkGetCurrentTime(arkode_mem, tcur)); }
-int ERKStepGetTolScaleFactor(void *arkode_mem, realtype *tolsfact) {
+int ERKStepGetTolScaleFactor(void *arkode_mem, sunrealtype *tolsfact) {
   return(arkGetTolScaleFactor(arkode_mem, tolsfact)); }
 int ERKStepGetErrWeights(void *arkode_mem, N_Vector eweight) {
   return(arkGetErrWeights(arkode_mem, eweight)); }
@@ -132,8 +132,8 @@ int ERKStepGetNumGEvals(void *arkode_mem, long int *ngevals) {
 int ERKStepGetRootInfo(void *arkode_mem, int *rootsfound) {
   return(arkGetRootInfo(arkode_mem, rootsfound)); }
 int ERKStepGetStepStats(void *arkode_mem, long int *nsteps,
-                        realtype *hinused, realtype *hlast,
-                        realtype *hcur, realtype *tcur) {
+                        sunrealtype *hinused, sunrealtype *hlast,
+                        sunrealtype *hcur, sunrealtype *tcur) {
   return(arkGetStepStats(arkode_mem, nsteps, hinused, hlast, hcur, tcur)); }
 int ERKStepGetNumConstrFails(void *arkode_mem, long int *nconstrfails) {
   return(arkGetNumConstrFails(arkode_mem, nconstrfails)); }
@@ -239,7 +239,7 @@ int ERKStepGetNumRelaxSolveIters(void* arkode_mem, long int* iters)
   specific SUNAdaptController object.
   ---------------------------------------------------------------*/
 int ERKStepSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                               int pq, realtype adapt_params[3]) {
+                               int pq, sunrealtype adapt_params[3]) {
   return(arkSetAdaptivityMethod(arkode_mem, imethod, idefault, pq, adapt_params)); }
 
 /*---------------------------------------------------------------
@@ -253,7 +253,7 @@ int ERKStepSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data) {
   ERKStepSetErrorBias: user should set this value directly in the
   SUNAdaptController object.
   ---------------------------------------------------------------*/
-int ERKStepSetErrorBias(void *arkode_mem, realtype bias) {
+int ERKStepSetErrorBias(void *arkode_mem, sunrealtype bias) {
   return(arkSetErrorBias(arkode_mem, bias)); }
 
 
@@ -325,12 +325,12 @@ int ERKStepSetDefaults(void* arkode_mem)
   step_mem->p = 0;                             /* embedding order */
   step_mem->stages = 0;                        /* no stages */
   step_mem->B = NULL;                          /* no Butcher table */
-  ark_mem->hadapt_mem->etamxf  = RCONST(0.3);  /* max change on error-failed step */
-  ark_mem->hadapt_mem->safety  = RCONST(0.99); /* step adaptivity safety factor  */
-  ark_mem->hadapt_mem->growth  = RCONST(25.0); /* step adaptivity growth factor */
-  (void) SUNAdaptController_SetErrorBias(ark_mem->hadapt_mem->hcontroller, RCONST(1.2));
+  ark_mem->hadapt_mem->etamxf  = SUN_RCONST(0.3);  /* max change on error-failed step */
+  ark_mem->hadapt_mem->safety  = SUN_RCONST(0.99); /* step adaptivity safety factor  */
+  ark_mem->hadapt_mem->growth  = SUN_RCONST(25.0); /* step adaptivity growth factor */
+  (void) SUNAdaptController_SetErrorBias(ark_mem->hadapt_mem->hcontroller, SUN_RCONST(1.2));
   (void) SUNAdaptController_SetParams_PI(ark_mem->hadapt_mem->hcontroller,
-                                         RCONST(0.8), -RCONST(0.31));
+                                         SUN_RCONST(0.8), -SUN_RCONST(0.31));
   return(ARK_SUCCESS);
 }
 
diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h
index 596d3202a5..f5e5356629 100644
--- a/src/arkode/arkode_impl.h
+++ b/src/arkode/arkode_impl.h
@@ -74,15 +74,15 @@ extern "C" {
 #define MXHNIL           10     /* max number of t+h==h warnings      */
 
 /* Numeric constants */
-#define ZERO   RCONST(0.0)      /* real 0.0     */
-#define TINY   RCONST(1.0e-10)  /* small number */
-#define TENTH  RCONST(0.1)      /* real 0.1     */
-#define HALF   RCONST(0.5)      /* real 0.5     */
-#define ONE    RCONST(1.0)      /* real 1.0     */
-#define TWO    RCONST(2.0)      /* real 2.0     */
-#define THREE  RCONST(3.0)      /* real 3.0     */
-#define FOUR   RCONST(4.0)      /* real 4.0     */
-#define FIVE   RCONST(5.0)      /* real 5.0     */
+#define ZERO   SUN_RCONST(0.0)      /* real 0.0     */
+#define TINY   SUN_RCONST(1.0e-10)  /* small number */
+#define TENTH  SUN_RCONST(0.1)      /* real 0.1     */
+#define HALF   SUN_RCONST(0.5)      /* real 0.5     */
+#define ONE    SUN_RCONST(1.0)      /* real 1.0     */
+#define TWO    SUN_RCONST(2.0)      /* real 2.0     */
+#define THREE  SUN_RCONST(3.0)      /* real 3.0     */
+#define FOUR   SUN_RCONST(4.0)      /* real 4.0     */
+#define FIVE   SUN_RCONST(5.0)      /* real 5.0     */
 
 /* Control constants for tolerances */
 #define ARK_SS  0
@@ -131,15 +131,15 @@ extern "C" {
      ONEPSM      safety factor for floating point comparisons
      ONEMSM      safety factor for floating point comparisons
   ---------------------------------------------------------------*/
-#define FUZZ_FACTOR RCONST(100.0)
+#define FUZZ_FACTOR SUN_RCONST(100.0)
 
-#define H0_LBFACTOR RCONST(100.0)
-#define H0_UBFACTOR RCONST(0.1)
+#define H0_LBFACTOR SUN_RCONST(100.0)
+#define H0_UBFACTOR SUN_RCONST(0.1)
 #define H0_BIAS     HALF
 #define H0_ITERS    4
 
-#define ONEPSM      RCONST(1.000001)
-#define ONEMSM      RCONST(0.999999)
+#define ONEPSM      SUN_RCONST(1.000001)
+#define ONEMSM      SUN_RCONST(0.999999)
 
 
 /*===============================================================
@@ -152,26 +152,26 @@ extern "C" {
 /* linear solver interface functions */
 typedef int (*ARKLinsolInitFn)(void* arkode_mem);
 typedef int (*ARKLinsolSetupFn)(void* arkode_mem, int convfail,
-                                realtype tpred, N_Vector ypred,
+                                sunrealtype tpred, N_Vector ypred,
                                 N_Vector fpred,
-                                booleantype *jcurPtr,
+                                sunbooleantype *jcurPtr,
                                 N_Vector vtemp1,
                                 N_Vector vtemp2, N_Vector vtemp3);
 typedef int (*ARKLinsolSolveFn)(void* arkode_mem, N_Vector b,
-                                realtype tcur, N_Vector ycur,
-                                N_Vector fcur, realtype client_tol,
+                                sunrealtype tcur, N_Vector ycur,
+                                N_Vector fcur, sunrealtype client_tol,
                                 int mnewt);
 typedef int (*ARKLinsolFreeFn)(void* arkode_mem);
 
 /* mass-matrix solver interface functions */
 typedef int (*ARKMassInitFn)(void *arkode_mem);
-typedef int (*ARKMassSetupFn)(void *arkode_mem, realtype t,
+typedef int (*ARKMassSetupFn)(void *arkode_mem, sunrealtype t,
                               N_Vector vtemp1, N_Vector vtemp2,
                               N_Vector vtemp3);
 typedef int (*ARKMassMultFn)(void *arkode_mem, N_Vector v,
                              N_Vector Mv);
 typedef int (*ARKMassSolveFn)(void *arkode_mem, N_Vector b,
-                              realtype client_tol);
+                              sunrealtype client_tol);
 typedef int (*ARKMassFreeFn)(void *arkode_mem);
 
 /* time stepper interface functions */
@@ -189,7 +189,7 @@ typedef int (*ARKTimestepAttachMasssolFn)(void* arkode_mem,
                                           ARKMassMultFn mmult,
                                           ARKMassSolveFn msolve,
                                           ARKMassFreeFn mfree,
-                                          booleantype time_dep,
+                                          sunbooleantype time_dep,
                                           SUNLinearSolver_Type msolve_type,
                                           void *mass_mem);
 typedef void (*ARKTimestepDisableLSetup)(void* arkode_mem);
@@ -198,13 +198,13 @@ typedef void* (*ARKTimestepGetLinMemFn)(void* arkode_mem);
 typedef void* (*ARKTimestepGetMassMemFn)(void* arkode_mem);
 typedef ARKRhsFn (*ARKTimestepGetImplicitRHSFn)(void* arkode_mem);
 typedef int (*ARKTimestepGetGammasFn)(void* arkode_mem,
-                                      realtype *gamma,
-                                      realtype *gamrat,
-                                      booleantype **jcur,
-                                      booleantype *dgamma_fail);
-typedef int (*ARKTimestepFullRHSFn)(void* arkode_mem, realtype t,
+                                      sunrealtype *gamma,
+                                      sunrealtype *gamrat,
+                                      sunbooleantype **jcur,
+                                      sunbooleantype *dgamma_fail);
+typedef int (*ARKTimestepFullRHSFn)(void* arkode_mem, sunrealtype t,
                                     N_Vector y, N_Vector f, int mode);
-typedef int (*ARKTimestepStepFn)(void* arkode_mem, realtype *dsm,
+typedef int (*ARKTimestepStepFn)(void* arkode_mem, sunrealtype *dsm,
                                  int *nflag);
 
 
@@ -227,10 +227,10 @@ struct _generic_ARKInterpOps {
   void (*free)(void* arkode_mem, ARKInterp interp);
   void (*print)(ARKInterp interp, FILE *outfile);
   int (*setdegree)(void *arkode_mem, ARKInterp interp, int degree);
-  int (*init)(void* arkode_mem, ARKInterp interp, realtype tnew);
-  int (*update)(void* arkode_mem, ARKInterp interp, realtype tnew);
+  int (*init)(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
+  int (*update)(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
   int (*evaluate)(void* arkode_mem, ARKInterp interp,
-                  realtype tau, int d, int order, N_Vector yout);
+                  sunrealtype tau, int d, int order, N_Vector yout);
 };
 
 /* An interpolation module consists of an implementation-dependent 'content'
@@ -248,10 +248,10 @@ int arkInterpResize(void* arkode_mem, ARKInterp interp,
 void arkInterpFree(void* arkode_mem, ARKInterp interp);
 void arkInterpPrintMem(ARKInterp interp, FILE *outfile);
 int arkInterpSetDegree(void *arkode_mem, ARKInterp interp, int degree);
-int arkInterpInit(void* arkode_mem, ARKInterp interp, realtype tnew);
-int arkInterpUpdate(void* arkode_mem, ARKInterp interp, realtype tnew);
+int arkInterpInit(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
+int arkInterpUpdate(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
 int arkInterpEvaluate(void* arkode_mem, ARKInterp interp,
-                      realtype tau, int d, int order, N_Vector yout);
+                      sunrealtype tau, int d, int order, N_Vector yout);
 
 
 /*===============================================================
@@ -290,7 +290,7 @@ struct ARKodeMemRec
 {
   SUNContext sunctx;
 
-  realtype uround;             /* machine unit roundoff */
+  sunrealtype uround;             /* machine unit roundoff */
 
   /* Problem specification data */
   void        *user_data;      /* user ptr passed to supplied functions */
@@ -300,20 +300,20 @@ struct ARKodeMemRec
   int          ritol;          /* itol = ARK_SS (scalar, default),
                                          ARK_SV (vector),
                                          ARK_WF (user weight function)  */
-  realtype     reltol;         /* relative tolerance                    */
-  realtype     Sabstol;        /* scalar absolute solution tolerance    */
+  sunrealtype     reltol;         /* relative tolerance                    */
+  sunrealtype     Sabstol;        /* scalar absolute solution tolerance    */
   N_Vector     Vabstol;        /* vector absolute solution tolerance    */
-  booleantype  atolmin0;       /* flag indicating that min(abstol) = 0  */
-  realtype     SRabstol;       /* scalar absolute residual tolerance    */
+  sunbooleantype  atolmin0;       /* flag indicating that min(abstol) = 0  */
+  sunrealtype     SRabstol;       /* scalar absolute residual tolerance    */
   N_Vector     VRabstol;       /* vector absolute residual tolerance    */
-  booleantype  Ratolmin0;      /* flag indicating that min(Rabstol) = 0 */
-  booleantype  user_efun;      /* SUNTRUE if user sets efun             */
+  sunbooleantype  Ratolmin0;      /* flag indicating that min(Rabstol) = 0 */
+  sunbooleantype  user_efun;      /* SUNTRUE if user sets efun             */
   ARKEwtFn     efun;           /* function to set ewt                   */
   void        *e_data;         /* user pointer passed to efun           */
-  booleantype  user_rfun;      /* SUNTRUE if user sets rfun             */
+  sunbooleantype  user_rfun;      /* SUNTRUE if user sets rfun             */
   ARKRwtFn     rfun;           /* function to set rwt                   */
   void        *r_data;         /* user pointer passed to rfun           */
-  booleantype  constraintsSet; /* check inequality constraints          */
+  sunbooleantype  constraintsSet; /* check inequality constraints          */
 
   /* Time stepper module */
   ARKTimestepAttachLinsolFn   step_attachlinsol;
@@ -333,7 +333,7 @@ struct ARKodeMemRec
   /* N_Vector storage */
   N_Vector ewt;                 /* error weight vector                        */
   N_Vector rwt;                 /* residual weight vector                     */
-  booleantype rwt_is_ewt;       /* SUNTRUE if rwt is a pointer to ewt         */
+  sunbooleantype rwt_is_ewt;       /* SUNTRUE if rwt is a pointer to ewt         */
   N_Vector ycur;                /* pointer to user-provided solution memory;
                                    used as evolving solution by the time stepper
                                    modules */
@@ -352,24 +352,24 @@ struct ARKodeMemRec
   int interp_type;
 
   /* Tstop information */
-  booleantype tstopset;
-  booleantype tstopinterp;
-  realtype    tstop;
+  sunbooleantype tstopset;
+  sunbooleantype tstopinterp;
+  sunrealtype    tstop;
 
   /* Time step data */
-  realtype hin;                /* initial step size                        */
-  realtype h;                  /* current step size                        */
-  realtype hmin;               /* |h| >= hmin                              */
-  realtype hmax_inv;           /* |h| <= 1/hmax_inv                        */
-  realtype hprime;             /* next actual step size to be used         */
-  realtype next_h;             /* next dynamical step size (only used in
+  sunrealtype hin;                /* initial step size                        */
+  sunrealtype h;                  /* current step size                        */
+  sunrealtype hmin;               /* |h| >= hmin                              */
+  sunrealtype hmax_inv;           /* |h| <= 1/hmax_inv                        */
+  sunrealtype hprime;             /* next actual step size to be used         */
+  sunrealtype next_h;             /* next dynamical step size (only used in
                                   getCurrentStep); note that this could
                                   overtake tstop */
-  realtype eta;                /* eta = hprime / h                         */
-  realtype tcur;               /* current internal value of t
+  sunrealtype eta;                /* eta = hprime / h                         */
+  sunrealtype tcur;               /* current internal value of t
                                   (changes with each stage)                */
-  realtype tretlast;           /* value of tret last returned by ARKODE    */
-  booleantype fixedstep;       /* flag to disable temporal adaptivity      */
+  sunrealtype tretlast;           /* value of tret last returned by ARKODE    */
+  sunbooleantype fixedstep;       /* flag to disable temporal adaptivity      */
   ARKodeHAdaptMem hadapt_mem;  /* time step adaptivity structure           */
 
 
@@ -391,25 +391,25 @@ struct ARKodeMemRec
   long int nconstrfails;  /* number of constraint failures              */
 
   /* Space requirements for ARKODE */
-  sunindextype lrw1;        /* no. of realtype words in 1 N_Vector          */
+  sunindextype lrw1;        /* no. of sunrealtype words in 1 N_Vector          */
   sunindextype liw1;        /* no. of integer words in 1 N_Vector           */
-  long int lrw;             /* no. of realtype words in ARKODE work vectors */
+  long int lrw;             /* no. of sunrealtype words in ARKODE work vectors */
   long int liw;             /* no. of integer words in ARKODE work vectors  */
 
   /* Saved Values */
-  realtype    h0u;          /* actual initial stepsize                     */
-  realtype    tn;           /* time of last successful step                */
-  realtype    terr;         /* error in tn for compensated sums            */
-  realtype    hold;         /* last successful h value used                */
-  realtype    tolsf;        /* tolerance scale factor (suggestion to user) */
-  booleantype VabstolMallocDone;
-  booleantype VRabstolMallocDone;
-  booleantype MallocDone;
-  booleantype initsetup;    /* denotes a call to InitialSetup is needed   */
+  sunrealtype    h0u;          /* actual initial stepsize                     */
+  sunrealtype    tn;           /* time of last successful step                */
+  sunrealtype    terr;         /* error in tn for compensated sums            */
+  sunrealtype    hold;         /* last successful h value used                */
+  sunrealtype    tolsf;        /* tolerance scale factor (suggestion to user) */
+  sunbooleantype VabstolMallocDone;
+  sunbooleantype VRabstolMallocDone;
+  sunbooleantype MallocDone;
+  sunbooleantype initsetup;    /* denotes a call to InitialSetup is needed   */
   int         init_type;    /* initialization type (see constants above)  */
-  booleantype firststage;   /* denotes first stage in simulation          */
-  booleantype initialized;  /* denotes arkInitialSetup has been done      */
-  booleantype call_fullrhs; /* denotes the full RHS fn will be called     */
+  sunbooleantype firststage;   /* denotes first stage in simulation          */
+  sunbooleantype initialized;  /* denotes arkInitialSetup has been done      */
+  sunbooleantype call_fullrhs; /* denotes the full RHS fn will be called     */
 
   /* Error handler function and error ouput file */
   ARKErrHandlerFn ehfun;    /* error messages are handled by ehfun        */
@@ -433,7 +433,7 @@ struct ARKodeMemRec
   sunbooleantype use_compensated_sums;
 
   /* XBraid interface variables */
-  booleantype force_pass;  /* when true the step attempt loop will ignore the
+  sunbooleantype force_pass;  /* when true the step attempt loop will ignore the
                               return value (kflag) from arkCheckTemporalError
                               and set kflag = ARK_SUCCESS to force the step
                               attempt to always pass (if a solver failure did
@@ -625,7 +625,7 @@ struct ARKodeMemRec
   ---------------------------------------------------------------
   This must solve the linear equation M x = b, where M is the
   system mass matrix, and the RHS vector b is input. The
-  realtype client_tol contains the desired accuracy (in the wrms
+  sunrealtype client_tol contains the desired accuracy (in the wrms
   norm) of the routine calling the solver; the ARKDLS solver
   ignore this value and the ARKSPILS solver tightens it by the
   factor eplifac.  The solution is to be returned in the vector b.
@@ -751,7 +751,7 @@ struct ARKodeMemRec
   This routine should fill the current value of gamma, the ratio
   of the current gamma value to the gamma value when the
   Jacobian/preconditioner was last updated, a pointer to the
-  time step module internal booleantype variable indicating
+  time step module internal sunbooleantype variable indicating
   whether the preconditioner is current, and a logic value
   indicating whether the gamma value is sufficiently stale
   to cause recomputation of Jacobian/preconditioner data.  Here,
@@ -759,7 +759,7 @@ struct ARKodeMemRec
   matrix, J, in the full nonlinear system Jacobian,
   A = M - gamma*J.
 
-  The time step module must contain a booleantype variable to
+  The time step module must contain a sunbooleantype variable to
   provide for the boolentype pointer (jcur).  This is only used
   by iterative linear solvers, so could be NULL for time step
   modules that only work with direct linear solvers.  Optionally,
@@ -892,7 +892,7 @@ void arkErrHandler(int error_code, const char *module,
                    const char *function, char *msg, void *data);
 
 /* Prototype of internal explicit stability estimation function */
-int arkExpStab(N_Vector y, realtype t, realtype *hstab, void *user_data);
+int arkExpStab(N_Vector y, sunrealtype t, sunrealtype *hstab, void *user_data);
 
 /*===============================================================
   HIGH LEVEL ERROR HANDLER, USED THROUGHOUT ARKODE
@@ -911,32 +911,32 @@ void arkProcessError(ARKodeMem ark_mem, int error_code,
 #define SUNDIALS_UNUSED
 #endif
 
-int arkInit(ARKodeMem ark_mem, realtype t0, N_Vector y0, int init_type);
-booleantype arkAllocVec(ARKodeMem ark_mem, N_Vector tmpl, N_Vector *v);
-booleantype arkAllocVecArray(int count, N_Vector tmpl, N_Vector **v,
+int arkInit(ARKodeMem ark_mem, sunrealtype t0, N_Vector y0, int init_type);
+sunbooleantype arkAllocVec(ARKodeMem ark_mem, N_Vector tmpl, N_Vector *v);
+sunbooleantype arkAllocVecArray(int count, N_Vector tmpl, N_Vector **v,
                              sunindextype lrw1, long int *lrw,
                              sunindextype liw1, long int *liw);
 void arkFreeVec(ARKodeMem ark_mem, N_Vector *v);
 void arkFreeVecArray(int count, N_Vector **v,
                      sunindextype lrw1, long int *lrw,
                      sunindextype liw1, long int *liw);
-booleantype arkResizeVec(ARKodeMem ark_mem,
+sunbooleantype arkResizeVec(ARKodeMem ark_mem,
                          ARKVecResizeFn resize,
                          void *resize_data,
                          sunindextype lrw_diff,
                          sunindextype liw_diff,
                          N_Vector tmpl,
                          N_Vector *v);
-booleantype arkResizeVecArray(ARKVecResizeFn resize, void *resize_data,
+sunbooleantype arkResizeVecArray(ARKVecResizeFn resize, void *resize_data,
                               int count, N_Vector tmpl, N_Vector **v,
                               sunindextype lrw_diff, long int *lrw,
                               sunindextype liw_diff, long int *liw);
 void arkPrintMem(ARKodeMem ark_mem, FILE *outfile);
-booleantype arkCheckTimestepper(ARKodeMem ark_mem);
-booleantype arkCheckNvector(N_Vector tmpl);
-booleantype arkAllocVectors(ARKodeMem ark_mem,
+sunbooleantype arkCheckTimestepper(ARKodeMem ark_mem);
+sunbooleantype arkCheckNvector(N_Vector tmpl);
+sunbooleantype arkAllocVectors(ARKodeMem ark_mem,
                             N_Vector tmpl);
-booleantype arkResizeVectors(ARKodeMem ark_mem,
+sunbooleantype arkResizeVectors(ARKodeMem ark_mem,
                              ARKVecResizeFn resize,
                              void *resize_data,
                              sunindextype lrw_diff,
@@ -944,16 +944,16 @@ booleantype arkResizeVectors(ARKodeMem ark_mem,
                              N_Vector tmpl);
 void arkFreeVectors(ARKodeMem ark_mem);
 
-int arkInitialSetup(ARKodeMem ark_mem, realtype tout);
-int arkStopTests(ARKodeMem ark_mem, realtype tout, N_Vector yout,
-                 realtype *tret, int itask, int *ier);
-int arkHin(ARKodeMem ark_mem, realtype tout);
-realtype arkUpperBoundH0(ARKodeMem ark_mem,
-                         realtype tdist);
-int arkYddNorm(ARKodeMem ark_mem, realtype hg,
-               realtype *yddnrm);
+int arkInitialSetup(ARKodeMem ark_mem, sunrealtype tout);
+int arkStopTests(ARKodeMem ark_mem, sunrealtype tout, N_Vector yout,
+                 sunrealtype *tret, int itask, int *ier);
+int arkHin(ARKodeMem ark_mem, sunrealtype tout);
+sunrealtype arkUpperBoundH0(ARKodeMem ark_mem,
+                         sunrealtype tdist);
+int arkYddNorm(ARKodeMem ark_mem, sunrealtype hg,
+               sunrealtype *yddnrm);
 
-int arkCompleteStep(ARKodeMem ark_mem, realtype dsm);
+int arkCompleteStep(ARKodeMem ark_mem, sunrealtype dsm);
 int arkHandleFailure(ARKodeMem ark_mem,int flag);
 
 int arkEwtSetSS(N_Vector ycur, N_Vector weight, void* arkode_mem);
@@ -965,34 +965,34 @@ int arkRwtSetSV(ARKodeMem ark_mem, N_Vector My,
                 N_Vector weight);
 
 ARKodeMem arkCreate(SUNContext sunctx);
-int arkResize(ARKodeMem ark_mem, N_Vector ynew, realtype hscale,
-              realtype t0, ARKVecResizeFn resize, void *resize_data);
-int arkSStolerances(ARKodeMem ark_mem, realtype reltol, realtype abstol);
-int arkSVtolerances(ARKodeMem ark_mem, realtype reltol, N_Vector abstol);
+int arkResize(ARKodeMem ark_mem, N_Vector ynew, sunrealtype hscale,
+              sunrealtype t0, ARKVecResizeFn resize, void *resize_data);
+int arkSStolerances(ARKodeMem ark_mem, sunrealtype reltol, sunrealtype abstol);
+int arkSVtolerances(ARKodeMem ark_mem, sunrealtype reltol, N_Vector abstol);
 int arkWFtolerances(ARKodeMem ark_mem, ARKEwtFn efun);
-int arkResStolerance(ARKodeMem ark_mem, realtype rabstol);
+int arkResStolerance(ARKodeMem ark_mem, sunrealtype rabstol);
 int arkResVtolerance(ARKodeMem ark_mem, N_Vector rabstol);
 int arkResFtolerance(ARKodeMem ark_mem, ARKRwtFn rfun);
 int arkRootInit(ARKodeMem ark_mem, int nrtfn, ARKRootFn g);
-int arkEvolve(ARKodeMem ark_mem, realtype tout, N_Vector yout,
-              realtype *tret, int itask);
-int arkGetDky(ARKodeMem ark_mem, realtype t, int k, N_Vector dky);
+int arkEvolve(ARKodeMem ark_mem, sunrealtype tout, N_Vector yout,
+              sunrealtype *tret, int itask);
+int arkGetDky(ARKodeMem ark_mem, sunrealtype t, int k, N_Vector dky);
 void arkFree(void **arkode_mem);
 
 int arkWriteParameters(ARKodeMem ark_mem, FILE *fp);
-int arkPredict_MaximumOrder(ARKodeMem ark_mem, realtype tau,
+int arkPredict_MaximumOrder(ARKodeMem ark_mem, sunrealtype tau,
                             N_Vector yguess);
-int arkPredict_VariableOrder(ARKodeMem ark_mem, realtype tau,
+int arkPredict_VariableOrder(ARKodeMem ark_mem, sunrealtype tau,
                              N_Vector yguess);
-int arkPredict_CutoffOrder(ARKodeMem ark_mem, realtype tau,
+int arkPredict_CutoffOrder(ARKodeMem ark_mem, sunrealtype tau,
                            N_Vector yguess);
-int arkPredict_Bootstrap(ARKodeMem ark_mem, realtype hj,
-                         realtype tau, int nvec, realtype *cvals,
+int arkPredict_Bootstrap(ARKodeMem ark_mem, sunrealtype hj,
+                         sunrealtype tau, int nvec, sunrealtype *cvals,
                          N_Vector *Xvecs, N_Vector yguess);
 int arkCheckConvergence(ARKodeMem ark_mem, int *nflagPtr, int *ncfPtr);
 int arkCheckConstraints(ARKodeMem ark_mem, int *nflag, int *constrfails);
 int arkCheckTemporalError(ARKodeMem ark_mem, int *nflagPtr, int *nefPtr,
-                          realtype dsm);
+                          sunrealtype dsm);
 int arkAccessHAdaptMem(void* arkode_mem, const char *fname,
                        ARKodeMem *ark_mem, ARKodeHAdaptMem *hadapt_mem);
 
@@ -1008,13 +1008,13 @@ int arkSetErrFile(void *arkode_mem, FILE *errfp);
 int arkSetUserData(void *arkode_mem, void *user_data);
 int arkSetMaxNumSteps(void *arkode_mem, long int mxsteps);
 int arkSetMaxHnilWarns(void *arkode_mem, int mxhnil);
-int arkSetInitStep(void *arkode_mem, realtype hin);
-int arkSetMinStep(void *arkode_mem, realtype hmin);
-int arkSetMaxStep(void *arkode_mem, realtype hmax);
-int arkSetStopTime(void *arkode_mem, realtype tstop);
-int arkSetInterpolateStopTime(void *arkode_mem, booleantype interp);
+int arkSetInitStep(void *arkode_mem, sunrealtype hin);
+int arkSetMinStep(void *arkode_mem, sunrealtype hmin);
+int arkSetMaxStep(void *arkode_mem, sunrealtype hmax);
+int arkSetStopTime(void *arkode_mem, sunrealtype tstop);
+int arkSetInterpolateStopTime(void *arkode_mem, sunbooleantype interp);
 int arkClearStopTime(void *arkode_mem);
-int arkSetFixedStep(void *arkode_mem, realtype hfixed);
+int arkSetFixedStep(void *arkode_mem, sunrealtype hfixed);
 int arkSetRootDirection(void *arkode_mem, int *rootdir);
 int arkSetNoInactiveRootWarn(void *arkode_mem);
 int arkSetPostprocessStepFn(void *arkode_mem,
@@ -1024,19 +1024,19 @@ int arkSetPostprocessStageFn(void *arkode_mem,
 int arkSetConstraints(void *arkode_mem, N_Vector constraints);
 int arkSetMaxNumConstrFails(void *arkode_mem, int maxfails);
 int arkSetAdaptivityAdjustment(void *arkode_mem, int adjust);
-int arkSetCFLFraction(void *arkode_mem, realtype cfl_frac);
-int arkSetSafetyFactor(void *arkode_mem, realtype safety);
-int arkSetErrorBias(void *arkode_mem, realtype bias);
-int arkSetMaxGrowth(void *arkode_mem, realtype mx_growth);
-int arkSetMinReduction(void *arkode_mem, realtype eta_min);
-int arkSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub);
+int arkSetCFLFraction(void *arkode_mem, sunrealtype cfl_frac);
+int arkSetSafetyFactor(void *arkode_mem, sunrealtype safety);
+int arkSetErrorBias(void *arkode_mem, sunrealtype bias);
+int arkSetMaxGrowth(void *arkode_mem, sunrealtype mx_growth);
+int arkSetMinReduction(void *arkode_mem, sunrealtype eta_min);
+int arkSetFixedStepBounds(void *arkode_mem, sunrealtype lb, sunrealtype ub);
 int arkSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                           int pq, realtype adapt_params[3]);
+                           int pq, sunrealtype adapt_params[3]);
 int arkSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data);
-int arkSetMaxFirstGrowth(void *arkode_mem, realtype etamx1);
-int arkSetMaxEFailGrowth(void *arkode_mem, realtype etamxf);
+int arkSetMaxFirstGrowth(void *arkode_mem, sunrealtype etamx1);
+int arkSetMaxEFailGrowth(void *arkode_mem, sunrealtype etamxf);
 int arkSetSmallNumEFails(void *arkode_mem, int small_nef);
-int arkSetMaxCFailGrowth(void *arkode_mem, realtype etacf);
+int arkSetMaxCFailGrowth(void *arkode_mem, sunrealtype etacf);
 int arkSetStabilityFn(void *arkode_mem, ARKExpStabFn EStab, void *estab_data);
 int arkSetMaxErrTestFails(void *arkode_mem, int maxnef);
 int arkSetMaxConvFails(void *arkode_mem, int maxncf);
@@ -1044,12 +1044,12 @@ int arkSetUseCompensatedSums(void *arkode_mem, sunbooleantype onoff);
 int arkGetWorkSpace(void *arkode_mem, long int *lenrw, long int *leniw);
 int arkGetNumStepAttempts(void *arkode_mem, long int *nstep_attempts);
 int arkGetNumSteps(void *arkode_mem, long int *nsteps);
-int arkGetActualInitStep(void *arkode_mem, realtype *hinused);
-int arkGetLastStep(void *arkode_mem, realtype *hlast);
-int arkGetCurrentStep(void *arkode_mem, realtype *hcur);
+int arkGetActualInitStep(void *arkode_mem, sunrealtype *hinused);
+int arkGetLastStep(void *arkode_mem, sunrealtype *hlast);
+int arkGetCurrentStep(void *arkode_mem, sunrealtype *hcur);
 int arkGetCurrentState(void *arkode_mem, N_Vector *ycur);
-int arkGetCurrentTime(void *arkode_mem, realtype *tcur);
-int arkGetTolScaleFactor(void *arkode_mem, realtype *tolsfac);
+int arkGetCurrentTime(void *arkode_mem, sunrealtype *tcur);
+int arkGetTolScaleFactor(void *arkode_mem, sunrealtype *tolsfac);
 int arkGetErrWeights(void *arkode_mem, N_Vector eweight);
 int arkGetResWeights(void *arkode_mem, N_Vector rweight);
 int arkGetNumGEvals(void *arkode_mem, long int *ngevals);
@@ -1060,8 +1060,8 @@ int arkGetNumAccSteps(void *arkode_mem, long int *nsteps);
 int arkGetNumErrTestFails(void *arkode_mem, long int *netfails);
 int arkGetNumStepSolveFails(void *arkode_mem, long int *nncfails);
 int arkGetStepStats(void *arkode_mem, long int *nsteps,
-                    realtype *hinused, realtype *hlast,
-                    realtype *hcur, realtype *tcur);
+                    sunrealtype *hinused, sunrealtype *hlast,
+                    sunrealtype *hcur, sunrealtype *tcur);
 int arkGetUserData(void *arkode_mem, void** user_data);
 int arkPrintAllStats(void *arkode_mem, FILE *outfile,
                      SUNOutputFormat fmt);
@@ -1071,7 +1071,7 @@ ARKODE_DIRKTableID arkButcherTableDIRKNameToID(const char *imethod);
 ARKODE_ERKTableID arkButcherTableERKNameToID(const char *emethod);
 
 /* XBraid interface functions */
-int arkSetForcePass(void *arkode_mem, booleantype force_pass);
+int arkSetForcePass(void *arkode_mem, sunbooleantype force_pass);
 int arkGetLastKFlag(void *arkode_mem, int *last_kflag);
 
 
diff --git a/src/arkode/arkode_interp.c b/src/arkode/arkode_interp.c
index 542126463a..165ac248d4 100644
--- a/src/arkode/arkode_interp.c
+++ b/src/arkode/arkode_interp.c
@@ -65,20 +65,20 @@ int arkInterpSetDegree(void* arkode_mem, ARKInterp interp,
 }
 
 int arkInterpInit(void* arkode_mem, ARKInterp interp,
-                  realtype tnew)
+                  sunrealtype tnew)
 {
   if (interp == NULL)  return(ARK_SUCCESS);
   return((int) interp->ops->init(arkode_mem, interp, tnew));
 }
 
-int arkInterpUpdate(void* arkode_mem, ARKInterp interp, realtype tnew)
+int arkInterpUpdate(void* arkode_mem, ARKInterp interp, sunrealtype tnew)
 {
   if (interp == NULL)  return(ARK_SUCCESS);
   return((int) interp->ops->update(arkode_mem, interp, tnew));
 }
 
 int arkInterpEvaluate(void* arkode_mem, ARKInterp interp,
-                      realtype tau, int d, int order, N_Vector yout)
+                      sunrealtype tau, int d, int order, N_Vector yout)
 {
   if (interp == NULL)  return(ARK_SUCCESS);
   return((int) interp->ops->evaluate(arkode_mem, interp,
@@ -157,7 +157,7 @@ ARKInterp arkInterpCreate_Hermite(void* arkode_mem, int degree)
   /* initialize time values */
   content->told = ark_mem->tcur;
   content->tnew = ark_mem->tcur;
-  content->h    = RCONST(0.0);
+  content->h    = SUN_RCONST(0.0);
 
   return(interp);
 }
@@ -201,7 +201,7 @@ int arkInterpResize_Hermite(void* arkode_mem, ARKInterp interp,
   /* reinitialize time values */
   HINT_TOLD(interp) = ark_mem->tcur;
   HINT_TNEW(interp) = ark_mem->tcur;
-  HINT_H(interp)    = RCONST(0.0);
+  HINT_H(interp)    = SUN_RCONST(0.0);
 
   return(ARK_SUCCESS);
 }
@@ -357,7 +357,7 @@ int arkInterpSetDegree_Hermite(void* arkode_mem, ARKInterp interp,
   5. Copies fnew into fold
   ---------------------------------------------------------------*/
 int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
-                          realtype tnew)
+                          sunrealtype tnew)
 {
   ARKodeMem ark_mem;
 
@@ -368,7 +368,7 @@ int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
   /* initialize time values */
   HINT_TOLD(interp) = tnew;
   HINT_TNEW(interp) = tnew;
-  HINT_H(interp)    = RCONST(0.0);
+  HINT_H(interp)    = SUN_RCONST(0.0);
 
   /* allocate vectors based on interpolant degree */
   if (HINT_FOLD(interp) == NULL)
@@ -404,7 +404,7 @@ int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
   This routine copies ynew into yold, and fnew into fold, so that
   yold and fold contain the previous values.
   ---------------------------------------------------------------*/
-int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, realtype tnew)
+int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, sunrealtype tnew)
 {
   int retval;
   ARKodeMem ark_mem;
@@ -467,13 +467,13 @@ int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, realtype tnew)
   other values result in extrapolation.
   ---------------------------------------------------------------*/
 int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
-                              realtype tau, int d, int order, N_Vector yout)
+                              sunrealtype tau, int d, int order, N_Vector yout)
 {
   /* local variables */
   int q, retval;
-  realtype tval, a0, a1, tau2, tau3, tau4, tau5;
-  realtype h, h2, h3, h4, h5;
-  realtype a[6];
+  sunrealtype tval, a0, a1, tau2, tau3, tau4, tau5;
+  sunrealtype h, h2, h3, h4, h5;
+  sunrealtype a[6];
   N_Vector X[6];
   ARKodeMem ark_mem;
 
@@ -611,35 +611,35 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
 
     /* evaluate desired function */
     if (d == 0) {
-      a[0] = -SIX*tau2 - RCONST(16.0)*tau3 - RCONST(9.0)*tau4;
-      a[1] = ONE + SIX*tau2 + RCONST(16.0)*tau3 + RCONST(9.0)*tau4;
-      a[2] = h*FOURTH*(-FIVE*tau2 - RCONST(14.0)*tau3 - RCONST(9.0)*tau4);
+      a[0] = -SIX*tau2 - SUN_RCONST(16.0)*tau3 - SUN_RCONST(9.0)*tau4;
+      a[1] = ONE + SIX*tau2 + SUN_RCONST(16.0)*tau3 + SUN_RCONST(9.0)*tau4;
+      a[2] = h*FOURTH*(-FIVE*tau2 - SUN_RCONST(14.0)*tau3 - SUN_RCONST(9.0)*tau4);
       a[3] = h*(tau + TWO*tau2 + tau3);
-      a[4] = h*RCONST(27.0)*FOURTH*(-tau4 - TWO*tau3 - tau2);
+      a[4] = h*SUN_RCONST(27.0)*FOURTH*(-tau4 - TWO*tau3 - tau2);
     } else if (d == 1) {
-      a[0] = (-TWELVE*tau - RCONST(48.0)*tau2 - RCONST(36.0)*tau3)/h;
-      a[1] = (TWELVE*tau + RCONST(48.0)*tau2 + RCONST(36.0)*tau3)/h;
-      a[2] = HALF*(-FIVE*tau - RCONST(21.0)*tau2 - RCONST(18.0)*tau3);
+      a[0] = (-TWELVE*tau - SUN_RCONST(48.0)*tau2 - SUN_RCONST(36.0)*tau3)/h;
+      a[1] = (TWELVE*tau + SUN_RCONST(48.0)*tau2 + SUN_RCONST(36.0)*tau3)/h;
+      a[2] = HALF*(-FIVE*tau - SUN_RCONST(21.0)*tau2 - SUN_RCONST(18.0)*tau3);
       a[3] = (ONE + FOUR*tau + THREE*tau2);
-      a[4] = -RCONST(27.0)*HALF*(TWO*tau3 + THREE*tau2 + tau);
+      a[4] = -SUN_RCONST(27.0)*HALF*(TWO*tau3 + THREE*tau2 + tau);
     } else if (d == 2) {
-      a[0] = (-TWELVE - RCONST(96.0)*tau - RCONST(108.0)*tau2)/h2;
-      a[1] = (TWELVE + RCONST(96.0)*tau + RCONST(108.0)*tau2)/h2;
-      a[2] = (-FIVE*HALF - RCONST(21.0)*tau - RCONST(27.0)*tau2)/h;
+      a[0] = (-TWELVE - SUN_RCONST(96.0)*tau - SUN_RCONST(108.0)*tau2)/h2;
+      a[1] = (TWELVE + SUN_RCONST(96.0)*tau + SUN_RCONST(108.0)*tau2)/h2;
+      a[2] = (-FIVE*HALF - SUN_RCONST(21.0)*tau - SUN_RCONST(27.0)*tau2)/h;
       a[3] = (FOUR + SIX*tau)/h;
-      a[4] = (-RCONST(27.0)*HALF - RCONST(81.0)*tau - RCONST(81.0)*tau2)/h;
+      a[4] = (-SUN_RCONST(27.0)*HALF - SUN_RCONST(81.0)*tau - SUN_RCONST(81.0)*tau2)/h;
     } else if (d == 3) {
-      a[0] = (-RCONST(96.0) - RCONST(216.0)*tau)/h3;
-      a[1] = (RCONST(96.0) + RCONST(216.0)*tau)/h3;
-      a[2] = (-RCONST(21.0) - RCONST(54.0)*tau)/h2;
+      a[0] = (-SUN_RCONST(96.0) - SUN_RCONST(216.0)*tau)/h3;
+      a[1] = (SUN_RCONST(96.0) + SUN_RCONST(216.0)*tau)/h3;
+      a[2] = (-SUN_RCONST(21.0) - SUN_RCONST(54.0)*tau)/h2;
       a[3] = SIX/h2;
-      a[4] = (-RCONST(81.0) - RCONST(162.0)*tau)/h2;
+      a[4] = (-SUN_RCONST(81.0) - SUN_RCONST(162.0)*tau)/h2;
     } else {  /* d == 4 */
-      a[0] = -RCONST(216.0)/h4;
-      a[1] = RCONST(216.0)/h4;
-      a[2] = -RCONST(54.0)/h3;
+      a[0] = -SUN_RCONST(216.0)/h4;
+      a[1] = SUN_RCONST(216.0)/h4;
+      a[2] = -SUN_RCONST(54.0)/h3;
       a[3] = ZERO;
-      a[4] = -RCONST(162.0)/h3;
+      a[4] = -SUN_RCONST(162.0)/h3;
     }
     X[0] = HINT_YOLD(interp);
     X[1] = ark_mem->yn;
@@ -676,46 +676,46 @@ int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
 
     /* evaluate desired function */
     if (d == 0) {
-      a[0] = RCONST(54.0)*tau5 + RCONST(135.0)*tau4 + RCONST(110.0)*tau3 + RCONST(30.0)*tau2;
+      a[0] = SUN_RCONST(54.0)*tau5 + SUN_RCONST(135.0)*tau4 + SUN_RCONST(110.0)*tau3 + SUN_RCONST(30.0)*tau2;
       a[1] = ONE - a[0];
-      a[2] = h/FOUR*(RCONST(27.0)*tau5 + RCONST(63.0)*tau4 + RCONST(49.0)*tau3 + RCONST(13.0)*tau2);
-      a[3] = h/FOUR*(RCONST(27.0)*tau5 + RCONST(72.0)*tau4 + RCONST(67.0)*tau3 + RCONST(26.0)*tau2 + FOUR*tau);
-      a[4] = h/FOUR*(RCONST(81.0)*tau5 + RCONST(189.0)*tau4 + RCONST(135.0)*tau3 + RCONST(27.0)*tau2);
-      a[5] = h/FOUR*(RCONST(81.0)*tau5 + RCONST(216.0)*tau4 + RCONST(189.0)*tau3 + RCONST(54.0)*tau2);
+      a[2] = h/FOUR*(SUN_RCONST(27.0)*tau5 + SUN_RCONST(63.0)*tau4 + SUN_RCONST(49.0)*tau3 + SUN_RCONST(13.0)*tau2);
+      a[3] = h/FOUR*(SUN_RCONST(27.0)*tau5 + SUN_RCONST(72.0)*tau4 + SUN_RCONST(67.0)*tau3 + SUN_RCONST(26.0)*tau2 + FOUR*tau);
+      a[4] = h/FOUR*(SUN_RCONST(81.0)*tau5 + SUN_RCONST(189.0)*tau4 + SUN_RCONST(135.0)*tau3 + SUN_RCONST(27.0)*tau2);
+      a[5] = h/FOUR*(SUN_RCONST(81.0)*tau5 + SUN_RCONST(216.0)*tau4 + SUN_RCONST(189.0)*tau3 + SUN_RCONST(54.0)*tau2);
     } else if (d == 1) {
-      a[0] = (RCONST(270.0)*tau4 + RCONST(540.0)*tau3 + RCONST(330.0)*tau2 + RCONST(60.0)*tau)/h;
+      a[0] = (SUN_RCONST(270.0)*tau4 + SUN_RCONST(540.0)*tau3 + SUN_RCONST(330.0)*tau2 + SUN_RCONST(60.0)*tau)/h;
       a[1] = -a[0];
-      a[2] = (RCONST(135.0)*tau4 + RCONST(252.0)*tau3 + RCONST(147.0)*tau2 + RCONST(26.0)*tau)/FOUR;
-      a[3] = (RCONST(135.0)*tau4 + RCONST(288.0)*tau3 + RCONST(201.0)*tau2 + RCONST(52.0)*tau + FOUR)/FOUR;
-      a[4] = (RCONST(405.0)*tau4 + RCONST(4.0)*189*tau3 + RCONST(405.0)*tau2 + RCONST(54.0)*tau)/FOUR;
-      a[5] = (RCONST(405.0)*tau4 + RCONST(864.0)*tau3 + RCONST(567.0)*tau2 + RCONST(108.0)*tau)/FOUR;
+      a[2] = (SUN_RCONST(135.0)*tau4 + SUN_RCONST(252.0)*tau3 + SUN_RCONST(147.0)*tau2 + SUN_RCONST(26.0)*tau)/FOUR;
+      a[3] = (SUN_RCONST(135.0)*tau4 + SUN_RCONST(288.0)*tau3 + SUN_RCONST(201.0)*tau2 + SUN_RCONST(52.0)*tau + FOUR)/FOUR;
+      a[4] = (SUN_RCONST(405.0)*tau4 + SUN_RCONST(4.0)*189*tau3 + SUN_RCONST(405.0)*tau2 + SUN_RCONST(54.0)*tau)/FOUR;
+      a[5] = (SUN_RCONST(405.0)*tau4 + SUN_RCONST(864.0)*tau3 + SUN_RCONST(567.0)*tau2 + SUN_RCONST(108.0)*tau)/FOUR;
     } else if (d == 2) {
-      a[0] = (RCONST(1080.0)*tau3 + RCONST(1620.0)*tau2 + RCONST(660.0)*tau + RCONST(60.0))/h2;
+      a[0] = (SUN_RCONST(1080.0)*tau3 + SUN_RCONST(1620.0)*tau2 + SUN_RCONST(660.0)*tau + SUN_RCONST(60.0))/h2;
       a[1] = -a[0];
-      a[2] = (RCONST(270.0)*tau3 + RCONST(378.0)*tau2 + RCONST(147.0)*tau + RCONST(13.0))/(TWO*h);
-      a[3] = (RCONST(270.0)*tau3 + RCONST(432.0)*tau2 + RCONST(201.0)*tau + RCONST(26.0))/(TWO*h);
-      a[4] = (RCONST(810.0)*tau3 + RCONST(1134.0)*tau2 + RCONST(405.0)*tau + RCONST(27.0))/(TWO*h);
-      a[5] = (RCONST(810.0)*tau3 + RCONST(1296.0)*tau2 + RCONST(567.0)*tau + RCONST(54.0))/(TWO*h);
+      a[2] = (SUN_RCONST(270.0)*tau3 + SUN_RCONST(378.0)*tau2 + SUN_RCONST(147.0)*tau + SUN_RCONST(13.0))/(TWO*h);
+      a[3] = (SUN_RCONST(270.0)*tau3 + SUN_RCONST(432.0)*tau2 + SUN_RCONST(201.0)*tau + SUN_RCONST(26.0))/(TWO*h);
+      a[4] = (SUN_RCONST(810.0)*tau3 + SUN_RCONST(1134.0)*tau2 + SUN_RCONST(405.0)*tau + SUN_RCONST(27.0))/(TWO*h);
+      a[5] = (SUN_RCONST(810.0)*tau3 + SUN_RCONST(1296.0)*tau2 + SUN_RCONST(567.0)*tau + SUN_RCONST(54.0))/(TWO*h);
     } else if (d == 3) {
-      a[0] = (RCONST(3240.0)*tau2 + RCONST(3240.0)*tau + RCONST(660.0))/h3;
+      a[0] = (SUN_RCONST(3240.0)*tau2 + SUN_RCONST(3240.0)*tau + SUN_RCONST(660.0))/h3;
       a[1] = -a[0];
-      a[2] = (RCONST(810.0)*tau2 + RCONST(756.0)*tau + RCONST(147.0))/(TWO*h2);
-      a[3] = (RCONST(810.0)*tau2 + RCONST(864.0)*tau + RCONST(201.0))/(TWO*h2);
-      a[4] = (RCONST(2430.0)*tau2 + RCONST(2268.0)*tau + RCONST(405.0))/(TWO*h2);
-      a[5] = (RCONST(2430.0)*tau2 + RCONST(2592.0)*tau + RCONST(567.0))/(TWO*h2);
+      a[2] = (SUN_RCONST(810.0)*tau2 + SUN_RCONST(756.0)*tau + SUN_RCONST(147.0))/(TWO*h2);
+      a[3] = (SUN_RCONST(810.0)*tau2 + SUN_RCONST(864.0)*tau + SUN_RCONST(201.0))/(TWO*h2);
+      a[4] = (SUN_RCONST(2430.0)*tau2 + SUN_RCONST(2268.0)*tau + SUN_RCONST(405.0))/(TWO*h2);
+      a[5] = (SUN_RCONST(2430.0)*tau2 + SUN_RCONST(2592.0)*tau + SUN_RCONST(567.0))/(TWO*h2);
     } else if (d == 4) {
-      a[0] = (RCONST(6480.0)*tau + RCONST(3240.0))/h4;
+      a[0] = (SUN_RCONST(6480.0)*tau + SUN_RCONST(3240.0))/h4;
       a[1] = -a[0];
-      a[2] = (RCONST(810.0)*tau + RCONST(378.0))/h3;
-      a[3] = (RCONST(810.0)*tau + RCONST(432.0))/h3;
-      a[4] = (RCONST(2430.0)*tau + RCONST(1134.0))/h3;
-      a[5] = (RCONST(2430.0)*tau + RCONST(1296.0))/h3;
+      a[2] = (SUN_RCONST(810.0)*tau + SUN_RCONST(378.0))/h3;
+      a[3] = (SUN_RCONST(810.0)*tau + SUN_RCONST(432.0))/h3;
+      a[4] = (SUN_RCONST(2430.0)*tau + SUN_RCONST(1134.0))/h3;
+      a[5] = (SUN_RCONST(2430.0)*tau + SUN_RCONST(1296.0))/h3;
     } else {  /* d == 5 */
-      a[0] = RCONST(6480.0)/h5;
+      a[0] = SUN_RCONST(6480.0)/h5;
       a[1] = -a[0];
-      a[2] = RCONST(810.0)/h4;
+      a[2] = SUN_RCONST(810.0)/h4;
       a[3] = a[2];
-      a[4] = RCONST(2430.0)/h4;
+      a[4] = SUN_RCONST(2430.0)/h4;
       a[5] = a[4];
     }
     X[0] = HINT_YOLD(interp);
@@ -1006,7 +1006,7 @@ int arkInterpSetDegree_Lagrange(void* arkode_mem, ARKInterp I,
   4. updates the 'active' history counter to 1
   ---------------------------------------------------------------*/
 int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp I,
-                           realtype tnew)
+                           sunrealtype tnew)
 {
   int i;
   ARKodeMem ark_mem;
@@ -1035,7 +1035,7 @@ int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp I,
 
   /* allocate storage for time and solution histories */
   if (LINT_THIST(I) == NULL) {
-    LINT_THIST(I) = (realtype*) malloc(LINT_NMAX(I) * sizeof(realtype));
+    LINT_THIST(I) = (sunrealtype*) malloc(LINT_NMAX(I) * sizeof(sunrealtype));
     if (LINT_THIST(I) == NULL) {
       arkInterpFree(ark_mem, I); return(ARK_MEM_FAIL);
     }
@@ -1061,8 +1061,8 @@ int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp I,
 
   /* zero out history (to be safe) */
   for (i=0; i<LINT_NMAXALLOC(I); i++)
-    LINT_TJ(I,i) = RCONST(0.0);
-  if (N_VConstVectorArray(LINT_NMAXALLOC(I), RCONST(0.0), LINT_YHIST(I)))
+    LINT_TJ(I,i) = SUN_RCONST(0.0);
+  if (N_VConstVectorArray(LINT_NMAXALLOC(I), SUN_RCONST(0.0), LINT_YHIST(I)))
     return(ARK_VECTOROP_ERR);
 
   /* set current time and state as first entries of (t,y) history, update counter */
@@ -1086,14 +1086,14 @@ int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp I,
      into the first history vector
   Otherwise it just returns with success.
   ---------------------------------------------------------------*/
-int arkInterpUpdate_Lagrange(void* arkode_mem, ARKInterp I, realtype tnew)
+int arkInterpUpdate_Lagrange(void* arkode_mem, ARKInterp I, sunrealtype tnew)
 {
   int i;
   ARKodeMem ark_mem;
-  realtype tdiff;
+  sunrealtype tdiff;
   N_Vector ytmp;
   int nhist, nmax;
-  realtype *thist;
+  sunrealtype *thist;
   N_Vector *yhist;
 
   /* access ARKodeMem structure */
@@ -1159,17 +1159,17 @@ int arkInterpUpdate_Lagrange(void* arkode_mem, ARKInterp I, realtype tnew)
   approximate).
   ---------------------------------------------------------------*/
 int arkInterpEvaluate_Lagrange(void* arkode_mem, ARKInterp I,
-                               realtype tau, int deriv, int degree,
+                               sunrealtype tau, int deriv, int degree,
                                N_Vector yout)
 {
   /* local variables */
   int q, retval, i, j;
-  realtype tval;
-  realtype a[6];
+  sunrealtype tval;
+  sunrealtype a[6];
   N_Vector X[6];
   ARKodeMem ark_mem;
   int nhist;
-  realtype *thist;
+  sunrealtype *thist;
   N_Vector *yhist;
 
   /* access ARKodeMem structure */
@@ -1263,10 +1263,10 @@ int arkInterpEvaluate_Lagrange(void* arkode_mem, ARKInterp I,
 
 
 /* Lagrange utility routines (basis functions and their derivatives) */
-realtype LBasis(ARKInterp I, int j, realtype t)
+sunrealtype LBasis(ARKInterp I, int j, sunrealtype t)
 {
   int k;
-  realtype p = ONE;
+  sunrealtype p = ONE;
   for (k=0; k<LINT_NHIST(I); k++) {
     if (k == j) continue;
     p *= (t-LINT_TJ(I,k))/(LINT_TJ(I,j)-LINT_TJ(I,k));
@@ -1275,10 +1275,10 @@ realtype LBasis(ARKInterp I, int j, realtype t)
 }
 
 
-realtype LBasisD(ARKInterp I, int j, realtype t)
+sunrealtype LBasisD(ARKInterp I, int j, sunrealtype t)
 {
   int i, k;
-  realtype p, q;
+  sunrealtype p, q;
   p = ZERO;
   for (i=0; i<LINT_NHIST(I); i++) {
     if (i == j) continue;
@@ -1295,10 +1295,10 @@ realtype LBasisD(ARKInterp I, int j, realtype t)
 }
 
 
-realtype LBasisD2(ARKInterp I, int j, realtype t)
+sunrealtype LBasisD2(ARKInterp I, int j, sunrealtype t)
 {
   int i, k, l;
-  realtype p, q, r;
+  sunrealtype p, q, r;
   p = ZERO;
   for (l=0; l<LINT_NHIST(I); l++) {
     if (l == j) continue;
@@ -1322,10 +1322,10 @@ realtype LBasisD2(ARKInterp I, int j, realtype t)
 }
 
 
-realtype LBasisD3(ARKInterp I, int j, realtype t)
+sunrealtype LBasisD3(ARKInterp I, int j, sunrealtype t)
 {
   int i, k, l, m;
-  realtype p, q, r, s;
+  sunrealtype p, q, r, s;
   p = ZERO;
   for (m=0; m<LINT_NHIST(I); m++) {
     if (m == j) continue;
diff --git a/src/arkode/arkode_interp_impl.h b/src/arkode/arkode_interp_impl.h
index 7c8794ff82..7ad4991ef0 100644
--- a/src/arkode/arkode_interp_impl.h
+++ b/src/arkode/arkode_interp_impl.h
@@ -31,10 +31,10 @@ extern "C" {
   ===============================================================*/
 
 /* Numeric constants */
-#define FOURTH RCONST(0.25)
-#define THREE  RCONST(3.0)
-#define SIX    RCONST(6.0)
-#define TWELVE RCONST(12.0)
+#define FOURTH SUN_RCONST(0.25)
+#define THREE  SUN_RCONST(3.0)
+#define SIX    SUN_RCONST(6.0)
+#define TWELVE SUN_RCONST(12.0)
 
 
 
@@ -50,9 +50,9 @@ struct _ARKInterpContent_Hermite {
   N_Vector yold;    /* y at beginning of last successful step      */
   N_Vector fa;      /* f(t,y) used in higher-order interpolation   */
   N_Vector fb;      /* f(t,y) used in higher-order interpolation   */
-  realtype told;    /* t at beginning of last successful step      */
-  realtype tnew;    /* t at end of last successful step            */
-  realtype h;       /* last successful step size                   */
+  sunrealtype told;    /* t at beginning of last successful step      */
+  sunrealtype tnew;    /* t at end of last successful step            */
+  sunrealtype h;       /* last successful step size                   */
 };
 
 typedef struct _ARKInterpContent_Hermite *ARKInterpContent_Hermite;
@@ -83,10 +83,10 @@ void arkInterpFree_Hermite(void* arkode_mem, ARKInterp interp);
 void arkInterpPrintMem_Hermite(ARKInterp interp, FILE *outfile);
 int arkInterpSetDegree_Hermite(void *arkode_mem, ARKInterp interp, int degree);
 int arkInterpInit_Hermite(void* arkode_mem, ARKInterp interp,
-                          realtype tnew);
-int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, realtype tnew);
+                          sunrealtype tnew);
+int arkInterpUpdate_Hermite(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
 int arkInterpEvaluate_Hermite(void* arkode_mem, ARKInterp interp,
-                              realtype tau, int d, int order, N_Vector yout);
+                              sunrealtype tau, int d, int order, N_Vector yout);
 
 
 
@@ -102,9 +102,9 @@ struct _ARKInterpContent_Lagrange {
   int       nmax;      /* number of previous solutions to use      */
   int       nmaxalloc; /* vectors allocated for previous solutions */
   N_Vector *yhist;     /* previous solution vectors                */
-  realtype *thist;     /* 't' values associated with yhist         */
+  sunrealtype *thist;     /* 't' values associated with yhist         */
   int       nhist;     /* number of 'active' vectors in yhist      */
-  realtype  tround;    /* unit roundoff for 't' values             */
+  sunrealtype  tround;    /* unit roundoff for 't' values             */
 };
 
 typedef struct _ARKInterpContent_Lagrange *ARKInterpContent_Lagrange;
@@ -135,17 +135,17 @@ void arkInterpFree_Lagrange(void* arkode_mem, ARKInterp interp);
 void arkInterpPrintMem_Lagrange(ARKInterp interp, FILE *outfile);
 int arkInterpSetDegree_Lagrange(void *arkode_mem, ARKInterp interp, int degree);
 int arkInterpInit_Lagrange(void* arkode_mem, ARKInterp interp,
-                           realtype tnew);
-int arkInterpUpdate_Lagrange(void* arkode_mem, ARKInterp interp, realtype tnew);
+                           sunrealtype tnew);
+int arkInterpUpdate_Lagrange(void* arkode_mem, ARKInterp interp, sunrealtype tnew);
 int arkInterpEvaluate_Lagrange(void* arkode_mem, ARKInterp interp,
-                               realtype tau, int d, int order, N_Vector yout);
+                               sunrealtype tau, int d, int order, N_Vector yout);
 
 
 /* Lagrange structure utility routines */
-realtype LBasis(ARKInterp interp, int idx, realtype t);
-realtype LBasisD(ARKInterp interp, int idx, realtype t);
-realtype LBasisD2(ARKInterp interp, int idx, realtype t);
-realtype LBasisD3(ARKInterp interp, int idx, realtype t);
+sunrealtype LBasis(ARKInterp interp, int idx, sunrealtype t);
+sunrealtype LBasisD(ARKInterp interp, int idx, sunrealtype t);
+sunrealtype LBasisD2(ARKInterp interp, int idx, sunrealtype t);
+sunrealtype LBasisD3(ARKInterp interp, int idx, sunrealtype t);
 
 #ifdef __cplusplus
 }
diff --git a/src/arkode/arkode_io.c b/src/arkode/arkode_io.c
index fe6bd4c5b1..36ee1b2891 100644
--- a/src/arkode/arkode_io.c
+++ b/src/arkode/arkode_io.c
@@ -56,12 +56,12 @@ int arkSetDefaults(void *arkode_mem)
   /* Set default values for integrator optional inputs */
   ark_mem->use_compensated_sums    = SUNFALSE;
   ark_mem->fixedstep               = SUNFALSE;       /* default to use adaptive steps */
-  ark_mem->reltol                  = RCONST(1.e-4);  /* relative tolerance */
+  ark_mem->reltol                  = SUN_RCONST(1.e-4);  /* relative tolerance */
   ark_mem->itol                    = ARK_SS;         /* scalar-scalar solution tolerances */
   ark_mem->ritol                   = ARK_SS;         /* scalar-scalar residual tolerances */
-  ark_mem->Sabstol                 = RCONST(1.e-9);  /* solution absolute tolerance */
+  ark_mem->Sabstol                 = SUN_RCONST(1.e-9);  /* solution absolute tolerance */
   ark_mem->atolmin0                = SUNFALSE;       /* min(abstol) > 0 */
-  ark_mem->SRabstol                = RCONST(1.e-9);  /* residual absolute tolerance */
+  ark_mem->SRabstol                = SUN_RCONST(1.e-9);  /* residual absolute tolerance */
   ark_mem->Ratolmin0               = SUNFALSE;       /* min(Rabstol) > 0 */
   ark_mem->user_efun               = SUNFALSE;       /* no user-supplied ewt function */
   ark_mem->efun                    = arkEwtSetSS;    /* built-in scalar-scalar ewt function */
@@ -424,7 +424,7 @@ int arkSetMaxHnilWarns(void *arkode_mem, int mxhnil)
 
   Specifies the initial step size
   ---------------------------------------------------------------*/
-int arkSetInitStep(void *arkode_mem, realtype hin)
+int arkSetInitStep(void *arkode_mem, sunrealtype hin)
 {
   ARKodeMem ark_mem;
   int retval;
@@ -458,7 +458,7 @@ int arkSetInitStep(void *arkode_mem, realtype hin)
 
   Specifies the minimum step size
   ---------------------------------------------------------------*/
-int arkSetMinStep(void *arkode_mem, realtype hmin)
+int arkSetMinStep(void *arkode_mem, sunrealtype hmin)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -493,9 +493,9 @@ int arkSetMinStep(void *arkode_mem, realtype hmin)
 
   Specifies the maximum step size
   ---------------------------------------------------------------*/
-int arkSetMaxStep(void *arkode_mem, realtype hmax)
+int arkSetMaxStep(void *arkode_mem, sunrealtype hmax)
 {
-  realtype hmax_inv;
+  sunrealtype hmax_inv;
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
     arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
@@ -530,7 +530,7 @@ int arkSetMaxStep(void *arkode_mem, realtype hmax)
 
   Specifies the time beyond which the integration is not to proceed.
   ---------------------------------------------------------------*/
-int arkSetStopTime(void *arkode_mem, realtype tstop)
+int arkSetStopTime(void *arkode_mem, sunrealtype tstop)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -566,7 +566,7 @@ int arkSetStopTime(void *arkode_mem, realtype tstop)
   Specifies to use interpolation to fill the solution output at
   the stop time (instead of a copy).
   ---------------------------------------------------------------*/
-int arkSetInterpolateStopTime(void *arkode_mem, booleantype interp)
+int arkSetInterpolateStopTime(void *arkode_mem, sunbooleantype interp)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -615,7 +615,7 @@ int arkClearStopTime(void *arkode_mem)
   Any nonzero argument will result in the use of that fixed step
   size; an argument of 0 will re-enable temporal adaptivity.
   ---------------------------------------------------------------*/
-int arkSetFixedStep(void *arkode_mem, realtype hfixed)
+int arkSetFixedStep(void *arkode_mem, sunrealtype hfixed)
 {
   int retval;
   ARKodeMem ark_mem;
@@ -786,7 +786,7 @@ int arkSetPostprocessStageFn(void *arkode_mem,
   ---------------------------------------------------------------*/
 int arkSetConstraints(void *arkode_mem, N_Vector constraints)
 {
-  realtype temptest;
+  sunrealtype temptest;
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
     arkProcessError(NULL, ARK_MEM_NULL, "ARKODE",
@@ -815,7 +815,7 @@ int arkSetConstraints(void *arkode_mem, N_Vector constraints)
 
   /* Check the constraints vector */
   temptest = N_VMaxNorm(constraints);
-  if ((temptest > RCONST(2.5)) || (temptest < HALF)) {
+  if ((temptest > SUN_RCONST(2.5)) || (temptest < HALF)) {
     arkProcessError(ark_mem, ARK_ILL_INPUT, "ARKODE",
                     "arkSetConstraints", MSG_ARK_BAD_CONSTR);
     return(ARK_ILL_INPUT);
@@ -871,11 +871,11 @@ int arkSetMaxNumConstrFails(void *arkode_mem, int maxfails)
   via the time-stepping module *SetController routines.
   ---------------------------------------------------------------*/
 int arkSetAdaptivityMethod(void *arkode_mem, int imethod, int idefault,
-                           int pq, realtype adapt_params[3])
+                           int pq, sunrealtype adapt_params[3])
 {
   int retval;
   long int lenrw, leniw;
-  realtype k1, k2, k3;
+  sunrealtype k1, k2, k3;
   ARKodeMem ark_mem;
   SUNAdaptController C;
   if (arkode_mem==NULL) {
@@ -1125,7 +1125,7 @@ int arkSetAdaptivityFn(void *arkode_mem, ARKAdaptFn hfun, void *h_data)
   interval (0,1).  A non-positive input implies a reset to
   the default value.
   ---------------------------------------------------------------*/
-int arkSetCFLFraction(void *arkode_mem, realtype cfl_frac)
+int arkSetCFLFraction(void *arkode_mem, sunrealtype cfl_frac)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1184,7 +1184,7 @@ int arkSetAdaptivityAdjustment(void *arkode_mem, int adjust)
   interval (0,1).  A non-positive input implies a reset to the
   default value.
   ---------------------------------------------------------------*/
-int arkSetSafetyFactor(void *arkode_mem, realtype safety)
+int arkSetSafetyFactor(void *arkode_mem, sunrealtype safety)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1218,7 +1218,7 @@ int arkSetSafetyFactor(void *arkode_mem, realtype safety)
   error control.  Allowable values must be >= 1.0.  Any illegal
   value implies a reset to the default value.
   ---------------------------------------------------------------*/
-int arkSetErrorBias(void *arkode_mem, realtype bias)
+int arkSetErrorBias(void *arkode_mem, sunrealtype bias)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1250,7 +1250,7 @@ int arkSetErrorBias(void *arkode_mem, realtype bias)
   a separate maximum growth factor.  Allowable values must be
   > 1.0.  Any illegal value implies a reset to the default.
   ---------------------------------------------------------------*/
-int arkSetMaxGrowth(void *arkode_mem, realtype mx_growth)
+int arkSetMaxGrowth(void *arkode_mem, sunrealtype mx_growth)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1278,7 +1278,7 @@ int arkSetMaxGrowth(void *arkode_mem, realtype mx_growth)
   must be > 0.0 and < 1.0. Any illegal value implies a reset to
   the default.
   ---------------------------------------------------------------*/
-int arkSetMinReduction(void *arkode_mem, realtype eta_min)
+int arkSetMinReduction(void *arkode_mem, sunrealtype eta_min)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1305,7 +1305,7 @@ int arkSetMinReduction(void *arkode_mem, realtype eta_min)
   size will remain unchanged.  Allowable values must enclose the
   value 1.0.  Any illegal interval implies a reset to the default.
   ---------------------------------------------------------------*/
-int arkSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub)
+int arkSetFixedStepBounds(void *arkode_mem, sunrealtype lb, sunrealtype ub)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1334,7 +1334,7 @@ int arkSetFixedStepBounds(void *arkode_mem, realtype lb, realtype ub)
   etamx1.  Legal values are greater than 1.0.  Illegal values
   imply a reset to the default value.
   ---------------------------------------------------------------*/
-int arkSetMaxFirstGrowth(void *arkode_mem, realtype etamx1)
+int arkSetMaxFirstGrowth(void *arkode_mem, sunrealtype etamx1)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1361,7 +1361,7 @@ int arkSetMaxFirstGrowth(void *arkode_mem, realtype etamx1)
   etamxf. Legal values are in the interval (0,1].  Illegal values
   imply a reset to the default value.
   ---------------------------------------------------------------*/
-int arkSetMaxEFailGrowth(void *arkode_mem, realtype etamxf)
+int arkSetMaxEFailGrowth(void *arkode_mem, sunrealtype etamxf)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1415,7 +1415,7 @@ int arkSetSmallNumEFails(void *arkode_mem, int small_nef)
   etacf. Legal values are in the interval (0,1].  Illegal values
   imply a reset to the default value.
   ---------------------------------------------------------------*/
-int arkSetMaxCFailGrowth(void *arkode_mem, realtype etacf)
+int arkSetMaxCFailGrowth(void *arkode_mem, sunrealtype etacf)
 {
   int retval;
   ARKodeHAdaptMem hadapt_mem;
@@ -1592,7 +1592,7 @@ int arkGetNumSteps(void *arkode_mem, long int *nsteps)
 
   Returns the step size used on the first step
   ---------------------------------------------------------------*/
-int arkGetActualInitStep(void *arkode_mem, realtype *hinused)
+int arkGetActualInitStep(void *arkode_mem, sunrealtype *hinused)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -1612,7 +1612,7 @@ int arkGetActualInitStep(void *arkode_mem, realtype *hinused)
 
   Returns the step size used on the last successful step
   ---------------------------------------------------------------*/
-int arkGetLastStep(void *arkode_mem, realtype *hlast)
+int arkGetLastStep(void *arkode_mem, sunrealtype *hlast)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -1632,7 +1632,7 @@ int arkGetLastStep(void *arkode_mem, realtype *hlast)
 
   Returns the step size to be attempted on the next step
   ---------------------------------------------------------------*/
-int arkGetCurrentStep(void *arkode_mem, realtype *hcur)
+int arkGetCurrentStep(void *arkode_mem, sunrealtype *hcur)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -1673,7 +1673,7 @@ int arkGetCurrentState(void *arkode_mem, N_Vector *state)
 
   Returns the current value of the independent variable
   ---------------------------------------------------------------*/
-int arkGetCurrentTime(void *arkode_mem, realtype *tcur)
+int arkGetCurrentTime(void *arkode_mem, sunrealtype *tcur)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -1693,7 +1693,7 @@ int arkGetCurrentTime(void *arkode_mem, realtype *tcur)
 
   Returns a suggested factor for scaling tolerances
   ---------------------------------------------------------------*/
-int arkGetTolScaleFactor(void *arkode_mem, realtype *tolsfact)
+int arkGetTolScaleFactor(void *arkode_mem, sunrealtype *tolsfact)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -1829,8 +1829,8 @@ int arkGetRootInfo(void *arkode_mem, int *rootsfound)
   Returns step statistics
   ---------------------------------------------------------------*/
 int arkGetStepStats(void *arkode_mem, long int *nsteps,
-                    realtype *hinused, realtype *hlast,
-                    realtype *hcur, realtype *tcur)
+                    sunrealtype *hinused, sunrealtype *hlast,
+                    sunrealtype *hcur, sunrealtype *tcur)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -2294,7 +2294,7 @@ int arkWriteParameters(ARKodeMem ark_mem, FILE *fp)
   Ignore the value of kflag after the temporal error test and
   force the step to pass.
   ---------------------------------------------------------------*/
-int arkSetForcePass(void *arkode_mem, booleantype force_pass)
+int arkSetForcePass(void *arkode_mem, sunbooleantype force_pass)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
diff --git a/src/arkode/arkode_ls.c b/src/arkode/arkode_ls.c
index bd6749d401..59b7ac57ff 100644
--- a/src/arkode/arkode_ls.c
+++ b/src/arkode/arkode_ls.c
@@ -25,16 +25,16 @@
 #include <sunmatrix/sunmatrix_sparse.h>
 
 /* constants */
-#define MIN_INC_MULT RCONST(1000.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
 #define MAX_DQITERS  3  /* max. # of attempts to recover in DQ J*v */
-#define ZERO         RCONST(0.0)
-#define PT25         RCONST(0.25)
-#define ONE          RCONST(1.0)
+#define ZERO         SUN_RCONST(0.0)
+#define PT25         SUN_RCONST(0.25)
+#define ONE          SUN_RCONST(1.0)
 
 /* Prototypes for internal functions */
-static int arkLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                       SUNMatrix M, booleantype jok, booleantype *jcur,
-                       realtype gamma, void *user_data, N_Vector tmp1,
+static int arkLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                       SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur,
+                       sunrealtype gamma, void *user_data, N_Vector tmp1,
                        N_Vector tmp2, N_Vector tmp3);
 
 /*===============================================================
@@ -51,8 +51,8 @@ int arkLSSetLinearSolver(void *arkode_mem, SUNLinearSolver LS,
   ARKLsMem             arkls_mem;
   int                  retval;
   SUNLinearSolver_Type LSType;
-  booleantype          iterative;    /* is the solver iterative?    */
-  booleantype          matrixbased;  /* is a matrix structure used? */
+  sunbooleantype          iterative;    /* is the solver iterative?    */
+  sunbooleantype          matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if either arkode_mem or LS inputs are NULL */
   if (arkode_mem == NULL) {
@@ -281,14 +281,14 @@ int arkLSSetLinearSolver(void *arkode_mem, SUNLinearSolver LS,
   mass-matrix-vector product.
   ---------------------------------------------------------------*/
 int arkLSSetMassLinearSolver(void *arkode_mem, SUNLinearSolver LS,
-                             SUNMatrix M, booleantype time_dep)
+                             SUNMatrix M, sunbooleantype time_dep)
 {
   ARKodeMem            ark_mem;
   ARKLsMassMem         arkls_mem;
   int                  retval;
   SUNLinearSolver_Type LSType;
-  booleantype          iterative;    /* is the solver iterative?    */
-  booleantype          matrixbased;  /* is a matrix structure used? */
+  sunbooleantype          iterative;    /* is the solver iterative?    */
+  sunbooleantype          matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if either arkode_mem or LS inputs are NULL */
   if (arkode_mem == NULL) {
@@ -571,7 +571,7 @@ int arkLSSetMassFn(void *arkode_mem, ARKLsMassFn mass)
   arkLSSetEpsLin specifies the nonlinear -> linear tolerance
   scale factor.
   ---------------------------------------------------------------*/
-int arkLSSetEpsLin(void *arkode_mem, realtype eplifac)
+int arkLSSetEpsLin(void *arkode_mem, sunrealtype eplifac)
 {
   ARKodeMem ark_mem;
   ARKLsMem  arkls_mem;
@@ -592,7 +592,7 @@ int arkLSSetEpsLin(void *arkode_mem, realtype eplifac)
   converting from the integrator tolerance (WRMS norm) to the
   linear solver tolerance (L2 norm).
   ---------------------------------------------------------------*/
-int arkLSSetNormFactor(void *arkode_mem, realtype nrmfac)
+int arkLSSetNormFactor(void *arkode_mem, sunrealtype nrmfac)
 {
   ARKodeMem ark_mem;
   ARKLsMem  arkls_mem;
@@ -643,7 +643,7 @@ int arkLSSetJacEvalFrequency(void *arkode_mem, long int msbj)
   arkLSSetLinearSolutionScaling enables or disables scaling the
   linear solver solution to account for changes in gamma.
   ---------------------------------------------------------------*/
-int arkLSSetLinearSolutionScaling(void *arkode_mem, booleantype onoff)
+int arkLSSetLinearSolutionScaling(void *arkode_mem, sunbooleantype onoff)
 {
   ARKodeMem ark_mem;
   ARKLsMem  arkls_mem;
@@ -1209,7 +1209,7 @@ char *arkLSGetReturnFlagName(long int flag)
   arkLSSetMassEpsLin specifies the nonlinear -> linear tolerance
   scale factor for mass matrix linear systems.
   ---------------------------------------------------------------*/
-int arkLSSetMassEpsLin(void *arkode_mem, realtype eplifac)
+int arkLSSetMassEpsLin(void *arkode_mem, sunrealtype eplifac)
 {
   ARKodeMem    ark_mem;
   ARKLsMassMem arkls_mem;
@@ -1230,7 +1230,7 @@ int arkLSSetMassEpsLin(void *arkode_mem, realtype eplifac)
   converting from the integrator tolerance (WRMS norm) to the
   linear solver tolerance (L2 norm).
   ---------------------------------------------------------------*/
-int arkLSSetMassNormFactor(void *arkode_mem, realtype nrmfac)
+int arkLSSetMassNormFactor(void *arkode_mem, sunrealtype nrmfac)
 {
   ARKodeMem     ark_mem;
   ARKLsMassMem  arkls_mem;
@@ -1643,8 +1643,8 @@ int arkLsATimes(void *arkode_mem, N_Vector v, N_Vector z)
   ARKLsMem    arkls_mem;
   void*       ark_step_massmem;
   int         retval;
-  realtype    gamma, gamrat;
-  booleantype dgamma_fail, *jcur;
+  sunrealtype    gamma, gamrat;
+  sunbooleantype dgamma_fail, *jcur;
 
   /* access ARKLsMem structure */
   retval = arkLs_AccessLMem(arkode_mem, "arkLsATimes",
@@ -1702,8 +1702,8 @@ int arkLsPSetup(void *arkode_mem)
 {
   ARKodeMem   ark_mem;
   ARKLsMem    arkls_mem;
-  realtype    gamma, gamrat;
-  booleantype dgamma_fail, *jcur;
+  sunrealtype    gamma, gamrat;
+  sunbooleantype dgamma_fail, *jcur;
   int         retval;
 
   /* access ARKLsMem structure */
@@ -1744,12 +1744,12 @@ int arkLsPSetup(void *arkode_mem)
   to be NULL.
   ---------------------------------------------------------------*/
 int arkLsPSolve(void *arkode_mem, N_Vector r, N_Vector z,
-                realtype tol, int lr)
+                sunrealtype tol, int lr)
 {
   ARKodeMem   ark_mem;
   ARKLsMem    arkls_mem;
-  realtype    gamma, gamrat;
-  booleantype dgamma_fail, *jcur;
+  sunrealtype    gamma, gamrat;
+  sunbooleantype dgamma_fail, *jcur;
   int         retval;
 
   /* access ARKLsMem structure */
@@ -1878,7 +1878,7 @@ int arkLsMPSetup(void *arkode_mem)
   in which the user's psolve routine is allowed to be NULL.
   ---------------------------------------------------------------*/
 int arkLsMPSolve(void *arkode_mem, N_Vector r, N_Vector z,
-                 realtype tol, int lr)
+                 sunrealtype tol, int lr)
 {
   ARKodeMem    ark_mem;
   ARKLsMassMem arkls_mem;
@@ -1904,7 +1904,7 @@ int arkLsMPSolve(void *arkode_mem, N_Vector r, N_Vector z,
   implementations of the difference quotient Jacobian
   approximation routines.
   ---------------------------------------------------------------*/
-int arkLsDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix Jac, void *arkode_mem, N_Vector tmp1,
                N_Vector tmp2, N_Vector tmp3)
 {
@@ -1975,13 +1975,13 @@ int arkLsDQJac(realtype t, N_Vector y, N_Vector fy,
   actual computation of the jth column of the Jacobian is done
   with a call to N_VLinearSum.
   ---------------------------------------------------------------*/
-int arkLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                     SUNMatrix Jac, ARKodeMem ark_mem,
                     ARKLsMem arkls_mem, ARKRhsFn fi,
                     N_Vector tmp1)
 {
-  realtype     fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
-  realtype    *y_data, *ewt_data, *cns_data;
+  sunrealtype     fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
+  sunrealtype    *y_data, *ewt_data, *cns_data;
   N_Vector     ftemp, jthCol;
   sunindextype j, N;
   int          retval = 0;
@@ -2054,15 +2054,15 @@ int arkLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
   write a simple for loop to set each of the elements of a column
   in succession.
   ---------------------------------------------------------------*/
-int arkLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, ARKodeMem ark_mem,
                    ARKLsMem arkls_mem, ARKRhsFn fi,
                    N_Vector tmp1, N_Vector tmp2)
 {
   N_Vector     ftemp, ytemp;
-  realtype     fnorm, minInc, inc, inc_inv, srur, conj;
-  realtype    *col_j, *ewt_data, *fy_data, *ftemp_data, *y_data, *ytemp_data;
-  realtype    *cns_data;
+  sunrealtype     fnorm, minInc, inc, inc_inv, srur, conj;
+  sunrealtype    *col_j, *ewt_data, *fy_data, *ftemp_data, *y_data, *ytemp_data;
+  sunrealtype    *cns_data;
   sunindextype group, i, j, width, ngroups, i1, i2;
   sunindextype N, mupper, mlower;
   int          retval = 0;
@@ -2153,13 +2153,13 @@ int arkLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
   Jv = [fi(y + v*sig) - fi(y)]/sig, where sig = 1 / ||v||_WRMS,
   i.e. the WRMS norm of v*sig is 1.
   ---------------------------------------------------------------*/
-int arkLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int arkLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                   N_Vector y, N_Vector fy, void *arkode_mem,
                   N_Vector work)
 {
   ARKodeMem ark_mem;
   ARKLsMem  arkls_mem;
-  realtype  sig, siginv;
+  sunrealtype  sig, siginv;
   int       iter, retval;
 
   /* access ARKLsMem structure */
@@ -2202,9 +2202,9 @@ int arkLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
 
   Setup the linear system A = I - gamma J or A = M - gamma J
   -----------------------------------------------------------------*/
-static int arkLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                       SUNMatrix M, booleantype jok, booleantype *jcur,
-                       realtype gamma, void *arkode_mem, N_Vector vtemp1,
+static int arkLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                       SUNMatrix M, sunbooleantype jok, sunbooleantype *jcur,
+                       sunrealtype gamma, void *arkode_mem, N_Vector vtemp1,
                        N_Vector vtemp2, N_Vector vtemp3)
 {
   ARKodeMem ark_mem;
@@ -2466,16 +2466,16 @@ int arkLsInitialize(void* arkode_mem)
 
   This routine then calls the LS 'setup' routine with A.
   ---------------------------------------------------------------*/
-int arkLsSetup(void* arkode_mem, int convfail, realtype tpred,
-               N_Vector ypred, N_Vector fpred, booleantype *jcurPtr,
+int arkLsSetup(void* arkode_mem, int convfail, sunrealtype tpred,
+               N_Vector ypred, N_Vector fpred, sunbooleantype *jcurPtr,
                N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3)
 {
   ARKodeMem    ark_mem = NULL;
   ARKLsMem     arkls_mem = NULL;
   void*        ark_step_massmem = NULL;
   SUNMatrix    M = NULL;
-  realtype     gamma, gamrat;
-  booleantype  dgamma_fail, *jcur;
+  sunrealtype     gamma, gamrat;
+  sunbooleantype  dgamma_fail, *jcur;
   int          retval;
 
   /* access ARKLsMem structure */
@@ -2602,14 +2602,14 @@ int arkLsSetup(void* arkode_mem, int convfail, realtype tpred,
   When using a non-NULL SUNMatrix, this will additionally scale
   the solution appropriately when gamrat != 1.
   ---------------------------------------------------------------*/
-int arkLsSolve(void* arkode_mem, N_Vector b, realtype tnow,
-               N_Vector ynow, N_Vector fnow, realtype eRNrm, int mnewt)
+int arkLsSolve(void* arkode_mem, N_Vector b, sunrealtype tnow,
+               N_Vector ynow, N_Vector fnow, sunrealtype eRNrm, int mnewt)
 {
-  realtype    bnorm, resnorm;
+  sunrealtype    bnorm, resnorm;
   ARKodeMem   ark_mem;
   ARKLsMem    arkls_mem;
-  realtype    gamma, gamrat, delta, deltar, rwt_mean;
-  booleantype dgamma_fail, *jcur;
+  sunrealtype    gamma, gamrat, delta, deltar, rwt_mean;
+  sunbooleantype dgamma_fail, *jcur;
   long int    nps_inc;
   int         nli_inc, retval;
 
@@ -2921,12 +2921,12 @@ int arkLsMassInitialize(void *arkode_mem)
 /*---------------------------------------------------------------
   arkLsMassSetup calls the LS 'setup' routine.
   ---------------------------------------------------------------*/
-int arkLsMassSetup(void *arkode_mem, realtype t, N_Vector vtemp1,
+int arkLsMassSetup(void *arkode_mem, sunrealtype t, N_Vector vtemp1,
                    N_Vector vtemp2, N_Vector vtemp3)
 {
   ARKodeMem    ark_mem;
   ARKLsMassMem arkls_mem;
-  booleantype  call_mtsetup, call_mvsetup, call_lssetup;
+  sunbooleantype  call_mtsetup, call_mvsetup, call_lssetup;
   int          retval;
 
   /* access ARKLsMassMem structure */
@@ -3062,9 +3062,9 @@ int arkLsMassSetup(void *arkode_mem, realtype t, N_Vector vtemp1,
   and scaling vectors, calling the solver, and accumulating
   statistics from the solve for use/reporting by ARKODE.
   ---------------------------------------------------------------*/
-int arkLsMassSolve(void *arkode_mem, N_Vector b, realtype nlscoef)
+int arkLsMassSolve(void *arkode_mem, N_Vector b, sunrealtype nlscoef)
 {
-  realtype     resnorm, delta, rwt_mean;
+  sunrealtype     resnorm, delta, rwt_mean;
   ARKodeMem    ark_mem;
   ARKLsMassMem arkls_mem;
   long int     nps_inc;
@@ -3295,7 +3295,7 @@ int arkLsInitializeMassCounters(ARKLsMassMem arkls_mem)
   arkls_mem->nli        = 0;
   arkls_mem->nps        = 0;
   arkls_mem->ncfl       = 0;
-  arkls_mem->msetuptime = -BIG_REAL;
+  arkls_mem->msetuptime = -SUN_BIG_REAL;
   return(0);
 }
 
diff --git a/src/arkode/arkode_ls_impl.h b/src/arkode/arkode_ls_impl.h
index e837d2bca2..75948192d7 100644
--- a/src/arkode/arkode_ls_impl.h
+++ b/src/arkode/arkode_ls_impl.h
@@ -35,7 +35,7 @@ extern "C" {
                a tolerance on the linear iteration
   ---------------------------------------------------------------*/
 #define ARKLS_MSBJ   51
-#define ARKLS_EPLIN  RCONST(0.05)
+#define ARKLS_EPLIN  SUN_RCONST(0.05)
 
 
 /*---------------------------------------------------------------
@@ -46,21 +46,21 @@ extern "C" {
 typedef struct ARKLsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;  /* SUNTRUE if using internal DQ Jacobian approx. */
+  sunbooleantype jacDQ;  /* SUNTRUE if using internal DQ Jacobian approx. */
   ARKLsJacFn jac;     /* Jacobian routine to be called                 */
   void *J_data;       /* user data is passed to jac                    */
-  booleantype jbad;   /* heuristic suggestion for pset                 */
+  sunbooleantype jbad;   /* heuristic suggestion for pset                 */
 
   /* Matrix-based solver, scale solution to account for change in gamma */
-  booleantype scalesol;
+  sunbooleantype scalesol;
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor        */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor       */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor        */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor       */
 
   /* Linear solver, matrix and vector objects/pointers */
   SUNLinearSolver LS; /* generic linear solver object                  */
@@ -73,7 +73,7 @@ typedef struct ARKLsMemRec {
 
   /* Statistics and associated parameters */
   long int msbj;      /* max num steps between jac/pset calls         */
-  realtype tcur;      /* 'time' for current ARKLs solve               */
+  sunrealtype tcur;      /* 'time' for current ARKLs solve               */
   long int nje;       /* no. of calls to jac                          */
   long int nfeDQ;     /* no. of calls to f due to DQ Jacobian or J*v
                          approximations                               */
@@ -105,7 +105,7 @@ typedef struct ARKLsMemRec {
     (b) internal jtimes
         - Jt_data == arkode_mem
         - jtimesDQ == SUNTRUE   */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   ARKLsJacTimesSetupFn jtsetup;
   ARKLsJacTimesVecFn jtimes;
   ARKRhsFn Jt_f;
@@ -119,7 +119,7 @@ typedef struct ARKLsMemRec {
    * (b) internal linsys function:
    *     - user_linsys = SUNFALSE
    *     - A_data      = cvode_mem */
-  booleantype user_linsys;
+  sunbooleantype user_linsys;
   ARKLsLinSysFn linsys;
   void* A_data;
 
@@ -136,8 +136,8 @@ typedef struct ARKLsMemRec {
 typedef struct ARKLsMassMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Mass matrix construction & storage */
   ARKLsMassFn mass;   /* user-provided mass matrix routine to call   */
@@ -146,12 +146,12 @@ typedef struct ARKLsMassMemRec {
   void* M_data;       /* user data pointer */
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor      */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor     */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor      */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor     */
 
   /* Statistics and associated parameters */
-  booleantype time_dependent;  /* flag whether M depends on t        */
-  realtype    msetuptime;      /* "t" value at last msetup call      */
+  sunbooleantype time_dependent;  /* flag whether M depends on t        */
+  sunrealtype    msetuptime;      /* "t" value at last msetup call      */
   long int    nmsetups;        /* total # mass matrix-solver setups  */
   long int    nmsolves;        /* total # mass matrix-solver solves  */
   long int    nmtsetup;        /* total # calls to mtsetup           */
@@ -197,27 +197,27 @@ typedef struct ARKLsMassMemRec {
 int arkLsATimes(void* arkode_mem, N_Vector v, N_Vector z);
 int arkLsPSetup(void* arkode_mem);
 int arkLsPSolve(void* arkode_mem, N_Vector r, N_Vector z,
-                realtype tol, int lr);
+                sunrealtype tol, int lr);
 
 /* Interface routines called by mass SUNLinearSolver */
 int arkLsMTimes(void* arkode_mem, N_Vector v, N_Vector z);
 int arkLsMPSetup(void* arkode_mem);
 int arkLsMPSolve(void* arkode_mem, N_Vector r, N_Vector z,
-                 realtype tol, int lr);
+                 sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jac times vector */
-int arkLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int arkLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                   N_Vector y, N_Vector fy, void* data,
                   N_Vector work);
 
 /* Difference-quotient Jacobian approximation routines */
-int arkLsDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix Jac, void* data, N_Vector tmp1,
                N_Vector tmp2, N_Vector tmp3);
-int arkLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                     SUNMatrix Jac, ARKodeMem ark_mem,
                     ARKLsMem arkls_mem, ARKRhsFn fi, N_Vector tmp1);
-int arkLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
+int arkLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, ARKodeMem ark_mem,
                    ARKLsMem arkls_mem, ARKRhsFn fi,
                    N_Vector tmp1, N_Vector tmp2);
@@ -225,24 +225,24 @@ int arkLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
 /* Generic linit/lsetup/lsolve/lfree interface routines for ARKODE to call */
 int arkLsInitialize(void* arkode_mem);
 
-int arkLsSetup(void* arkode_mem, int convfail, realtype tpred,
-               N_Vector ypred, N_Vector fpred, booleantype* jcurPtr,
+int arkLsSetup(void* arkode_mem, int convfail, sunrealtype tpred,
+               N_Vector ypred, N_Vector fpred, sunbooleantype* jcurPtr,
                N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3);
 
-int arkLsSolve(void* arkode_mem, N_Vector b, realtype tcur,
-               N_Vector ycur, N_Vector fcur, realtype eRnrm, int mnewt);
+int arkLsSolve(void* arkode_mem, N_Vector b, sunrealtype tcur,
+               N_Vector ycur, N_Vector fcur, sunrealtype eRnrm, int mnewt);
 
 int arkLsFree(void* arkode_mem);
 
 /* Generic minit/msetup/mmult/msolve/mfree routines for ARKODE to call */
 int arkLsMassInitialize(void* arkode_mem);
 
-int arkLsMassSetup(void* arkode_mem, realtype t, N_Vector vtemp1,
+int arkLsMassSetup(void* arkode_mem, sunrealtype t, N_Vector vtemp1,
                    N_Vector vtemp2, N_Vector vtemp3);
 
 int arkLsMassMult(void* arkode_mem, N_Vector v, N_Vector Mv);
 
-int arkLsMassSolve(void* arkode_mem, N_Vector b, realtype nlscoef);
+int arkLsMassSolve(void* arkode_mem, N_Vector b, sunrealtype nlscoef);
 
 int arkLsMassFree(void* arkode_mem);
 
@@ -261,16 +261,16 @@ int arkLs_AccessMassMem(void* arkode_mem, const char* fname,
 int arkLSSetLinearSolver(void* arkode_mem, SUNLinearSolver LS, SUNMatrix A);
 
 int arkLSSetMassLinearSolver(void* arkode_mem, SUNLinearSolver LS,
-                             SUNMatrix M, booleantype time_dep);
+                             SUNMatrix M, sunbooleantype time_dep);
 
 int arkLSSetJacFn(void* arkode_mem, ARKLsJacFn jac);
 int arkLSSetMassFn(void* arkode_mem, ARKLsMassFn mass);
-int arkLSSetEpsLin(void* arkode_mem, realtype eplifac);
-int arkLSSetMassEpsLin(void* arkode_mem, realtype eplifac);
-int arkLSSetNormFactor(void* arkode_mem, realtype nrmfac);
-int arkLSSetMassNormFactor(void* arkode_mem, realtype nrmfac);
+int arkLSSetEpsLin(void* arkode_mem, sunrealtype eplifac);
+int arkLSSetMassEpsLin(void* arkode_mem, sunrealtype eplifac);
+int arkLSSetNormFactor(void* arkode_mem, sunrealtype nrmfac);
+int arkLSSetMassNormFactor(void* arkode_mem, sunrealtype nrmfac);
 int arkLSSetJacEvalFrequency(void* arkode_mem, long int msbj);
-int arkLSSetLinearSolutionScaling(void* arkode_mem, booleantype onoff);
+int arkLSSetLinearSolutionScaling(void* arkode_mem, sunbooleantype onoff);
 int arkLSSetPreconditioner(void* arkode_mem, ARKLsPrecSetupFn psetup,
                            ARKLsPrecSolveFn psolve);
 int arkLSSetMassPreconditioner(void* arkode_mem, ARKLsMassPrecSetupFn psetup,
diff --git a/src/arkode/arkode_mri_tables.c b/src/arkode/arkode_mri_tables.c
index 5552ec6cbf..a84d5a3672 100644
--- a/src/arkode/arkode_mri_tables.c
+++ b/src/arkode/arkode_mri_tables.c
@@ -100,19 +100,19 @@ MRIStepCoupling MRIStepCoupling_Alloc(int nmat, int stages,
    * Allocate abscissae and coupling coefficients
    * -------------------------------------------- */
 
-  MRIC->c = (realtype *) calloc( stages, sizeof(realtype) );
+  MRIC->c = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
   if (!(MRIC->c)) { MRIStepCoupling_Free(MRIC); return(NULL); }
 
   if (type == MRISTEP_EXPLICIT || type == MRISTEP_IMEX) {
 
     /* allocate W matrices */
-    MRIC->W = (realtype ***) calloc( nmat, sizeof(realtype**) );
+    MRIC->W = (sunrealtype ***) calloc( nmat, sizeof(sunrealtype**) );
     if (!(MRIC->W)) { MRIStepCoupling_Free(MRIC); return(NULL); }
 
     /* allocate rows of each matrix in W */
     for (i=0; i<nmat; i++) {
       MRIC->W[i] = NULL;
-      MRIC->W[i] = (realtype **) calloc( stages, sizeof(realtype*) );
+      MRIC->W[i] = (sunrealtype **) calloc( stages, sizeof(sunrealtype*) );
       if (!(MRIC->W[i])) { MRIStepCoupling_Free(MRIC); return(NULL); }
     }
 
@@ -120,7 +120,7 @@ MRIStepCoupling MRIStepCoupling_Alloc(int nmat, int stages,
     for (i=0; i<nmat; i++)
       for (j=0; j<stages; j++) {
         MRIC->W[i][j] = NULL;
-        MRIC->W[i][j] = (realtype *) calloc( stages, sizeof(realtype) );
+        MRIC->W[i][j] = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
         if (!(MRIC->W[i][j])) { MRIStepCoupling_Free(MRIC); return(NULL); }
       }
   }
@@ -128,13 +128,13 @@ MRIStepCoupling MRIStepCoupling_Alloc(int nmat, int stages,
   if (type == MRISTEP_IMPLICIT || type == MRISTEP_IMEX) {
 
     /* allocate G matrices */
-    MRIC->G = (realtype ***) calloc( nmat, sizeof(realtype**) );
+    MRIC->G = (sunrealtype ***) calloc( nmat, sizeof(sunrealtype**) );
     if (!(MRIC->G)) { MRIStepCoupling_Free(MRIC); return(NULL); }
 
     /* allocate rows of each matrix in G */
     for (i=0; i<nmat; i++) {
       MRIC->G[i] = NULL;
-      MRIC->G[i] = (realtype **) calloc( stages, sizeof(realtype*) );
+      MRIC->G[i] = (sunrealtype **) calloc( stages, sizeof(sunrealtype*) );
       if (!(MRIC->G[i])) { MRIStepCoupling_Free(MRIC); return(NULL); }
     }
 
@@ -142,7 +142,7 @@ MRIStepCoupling MRIStepCoupling_Alloc(int nmat, int stages,
     for (i=0; i<nmat; i++)
       for (j=0; j<stages; j++) {
         MRIC->G[i][j] = NULL;
-        MRIC->G[i][j] = (realtype *) calloc( stages, sizeof(realtype) );
+        MRIC->G[i][j] = (sunrealtype *) calloc( stages, sizeof(sunrealtype) );
         if (!(MRIC->G[i][j])) { MRIStepCoupling_Free(MRIC); return(NULL); }
       }
   }
@@ -155,7 +155,7 @@ MRIStepCoupling MRIStepCoupling_Alloc(int nmat, int stages,
   Routine to allocate and fill a MRIStepCoupling structure
   ---------------------------------------------------------------*/
 MRIStepCoupling MRIStepCoupling_Create(int nmat, int stages, int q, int p,
-                                       realtype *W, realtype *G, realtype *c)
+                                       sunrealtype *W, sunrealtype *G, sunrealtype *c)
 {
   int i, j, k;
   MRISTEP_METHOD_TYPE type;
@@ -217,13 +217,13 @@ MRIStepCoupling MRIStepCoupling_MIStoMRI(ARKodeButcherTable B,
                                          int q, int p)
 {
   int i, j, stages;
-  booleantype padding;
-  realtype Asum;
-  realtype ***C;
+  sunbooleantype padding;
+  sunrealtype Asum;
+  sunrealtype ***C;
   MRISTEP_METHOD_TYPE type;
   MRIStepCoupling MRIC;
 
-  const realtype tol = RCONST(100.0) * UNIT_ROUNDOFF;
+  const sunrealtype tol = SUN_RCONST(100.0) * SUN_UNIT_ROUNDOFF;
 
   /* Check that input table is non-NULL */
   if (!B) return(NULL);
@@ -541,8 +541,8 @@ void MRIStepCoupling_Write(MRIStepCoupling MRIC, FILE *outfile)
 int mriStepCoupling_GetStageType(MRIStepCoupling MRIC, int is)
 {
   int i;
-  realtype Gabs, cdiff;
-  const realtype tol = RCONST(100.0) * UNIT_ROUNDOFF;
+  sunrealtype Gabs, cdiff;
+  const sunrealtype tol = SUN_RCONST(100.0) * SUN_UNIT_ROUNDOFF;
 
   if ((is < 1) || (is >= MRIC->stages)) return ARK_INVALID_TABLE;
 
@@ -583,8 +583,8 @@ int mriStepCoupling_GetStageMap(MRIStepCoupling MRIC,
                                 int* nstages_active)
 {
   int i, j, k, idx;
-  realtype Wsum, Gsum;
-  const realtype tol = RCONST(100.0) * UNIT_ROUNDOFF;
+  sunrealtype Wsum, Gsum;
+  const sunrealtype tol = SUN_RCONST(100.0) * SUN_UNIT_ROUNDOFF;
 
   /* ----------------------
    * Check for valid inputs
diff --git a/src/arkode/arkode_mri_tables.def b/src/arkode/arkode_mri_tables.def
index 4cd224a67d..6cdf5400e6 100644
--- a/src/arkode/arkode_mri_tables.def
+++ b/src/arkode/arkode_mri_tables.def
@@ -62,14 +62,14 @@ ARK_MRI_TABLE(ARKODE_MRI_GARK_ERK33a, { /* A. Sandu, SINUM 57:2300-2327, 2019 */
     C->q = 3;
     C->p = 0;
 
-    C->c[1] = ONE/RCONST(3.0);
-    C->c[2] = TWO/RCONST(3.0);
+    C->c[1] = ONE/SUN_RCONST(3.0);
+    C->c[2] = TWO/SUN_RCONST(3.0);
     C->c[3] = ONE;
 
-    C->W[0][1][0] =  ONE/RCONST(3.0);
-    C->W[0][2][0] = -ONE/RCONST(3.0);
-    C->W[0][2][1] =  TWO/RCONST(3.0);
-    C->W[0][3][1] = -TWO/RCONST(3.0);
+    C->W[0][1][0] =  ONE/SUN_RCONST(3.0);
+    C->W[0][2][0] = -ONE/SUN_RCONST(3.0);
+    C->W[0][2][1] =  TWO/SUN_RCONST(3.0);
+    C->W[0][3][1] = -TWO/SUN_RCONST(3.0);
     C->W[0][3][2] =  ONE;
 
     C->W[1][3][0] =  ONE/TWO;
@@ -83,42 +83,42 @@ ARK_MRI_TABLE(ARKODE_MRI_GARK_ERK45a, { /* A. Sandu, SINUM 57:2300-2327, 2019 */
     C->q = 4;
     C->p = 0;
 
-    C->c[1] = RCONST(0.2);
-    C->c[2] = RCONST(0.4);
-    C->c[3] = RCONST(0.6);
-    C->c[4] = RCONST(0.8);
+    C->c[1] = SUN_RCONST(0.2);
+    C->c[2] = SUN_RCONST(0.4);
+    C->c[3] = SUN_RCONST(0.6);
+    C->c[4] = SUN_RCONST(0.8);
     C->c[5] = ONE;
 
-    C->W[0][1][0] =  RCONST(0.2);
-    C->W[0][2][0] = -RCONST(53.0)/RCONST(16.0);
-    C->W[0][2][1] =  RCONST(281.0)/RCONST(80.0);
-    C->W[0][3][0] = -RCONST(36562993.0)/RCONST(71394880.0);
-    C->W[0][3][1] =  RCONST(34903117.0)/RCONST(17848720.0);
-    C->W[0][3][2] = -RCONST(88770499.0)/RCONST(71394880.0);
-    C->W[0][4][0] = -RCONST(7631593.0)/RCONST(71394880.0);
-    C->W[0][4][1] = -RCONST(166232021.0)/RCONST(35697440.0);
-    C->W[0][4][2] =  RCONST(6068517.0)/RCONST(1519040.0);
-    C->W[0][4][3] =  RCONST(8644289.0)/RCONST(8924360.0);
-    C->W[0][5][0] =  RCONST(277061.0)/RCONST(303808.0);
-    C->W[0][5][1] = -RCONST(209323.0)/RCONST(1139280.0);
-    C->W[0][5][2] = -RCONST(1360217.0)/RCONST(1139280.0);
-    C->W[0][5][3] = -RCONST(148789.0)/RCONST(56964.0);
-    C->W[0][5][4] =  RCONST(147889.0)/RCONST(45120.0);
-
-    C->W[1][2][0] =  RCONST(503.0)/RCONST(80.0);
-    C->W[1][2][1] = -RCONST(503.0)/RCONST(80.0);
-    C->W[1][3][0] = -RCONST(1365537.0)/RCONST(35697440.0);
-    C->W[1][3][1] =  RCONST(4963773.0)/RCONST(7139488.0);
-    C->W[1][3][2] = -RCONST(1465833.0)/RCONST(2231090.0);
-    C->W[1][4][0] =  RCONST(66974357.0)/RCONST(35697440.0);
-    C->W[1][4][1] =  RCONST(21445367.0)/RCONST(7139488.0);
-    C->W[1][4][2] = -RCONST(3.0);
-    C->W[1][4][3] = -RCONST(8388609.0)/RCONST(4462180.0);
-    C->W[1][5][0] = -RCONST(18227.0)/RCONST(7520.0);
+    C->W[0][1][0] =  SUN_RCONST(0.2);
+    C->W[0][2][0] = -SUN_RCONST(53.0)/SUN_RCONST(16.0);
+    C->W[0][2][1] =  SUN_RCONST(281.0)/SUN_RCONST(80.0);
+    C->W[0][3][0] = -SUN_RCONST(36562993.0)/SUN_RCONST(71394880.0);
+    C->W[0][3][1] =  SUN_RCONST(34903117.0)/SUN_RCONST(17848720.0);
+    C->W[0][3][2] = -SUN_RCONST(88770499.0)/SUN_RCONST(71394880.0);
+    C->W[0][4][0] = -SUN_RCONST(7631593.0)/SUN_RCONST(71394880.0);
+    C->W[0][4][1] = -SUN_RCONST(166232021.0)/SUN_RCONST(35697440.0);
+    C->W[0][4][2] =  SUN_RCONST(6068517.0)/SUN_RCONST(1519040.0);
+    C->W[0][4][3] =  SUN_RCONST(8644289.0)/SUN_RCONST(8924360.0);
+    C->W[0][5][0] =  SUN_RCONST(277061.0)/SUN_RCONST(303808.0);
+    C->W[0][5][1] = -SUN_RCONST(209323.0)/SUN_RCONST(1139280.0);
+    C->W[0][5][2] = -SUN_RCONST(1360217.0)/SUN_RCONST(1139280.0);
+    C->W[0][5][3] = -SUN_RCONST(148789.0)/SUN_RCONST(56964.0);
+    C->W[0][5][4] =  SUN_RCONST(147889.0)/SUN_RCONST(45120.0);
+
+    C->W[1][2][0] =  SUN_RCONST(503.0)/SUN_RCONST(80.0);
+    C->W[1][2][1] = -SUN_RCONST(503.0)/SUN_RCONST(80.0);
+    C->W[1][3][0] = -SUN_RCONST(1365537.0)/SUN_RCONST(35697440.0);
+    C->W[1][3][1] =  SUN_RCONST(4963773.0)/SUN_RCONST(7139488.0);
+    C->W[1][3][2] = -SUN_RCONST(1465833.0)/SUN_RCONST(2231090.0);
+    C->W[1][4][0] =  SUN_RCONST(66974357.0)/SUN_RCONST(35697440.0);
+    C->W[1][4][1] =  SUN_RCONST(21445367.0)/SUN_RCONST(7139488.0);
+    C->W[1][4][2] = -SUN_RCONST(3.0);
+    C->W[1][4][3] = -SUN_RCONST(8388609.0)/SUN_RCONST(4462180.0);
+    C->W[1][5][0] = -SUN_RCONST(18227.0)/SUN_RCONST(7520.0);
     C->W[1][5][1] =  TWO;
     C->W[1][5][2] =  ONE;
-    C->W[1][5][3] =  RCONST(5.0);
-    C->W[1][5][4] = -RCONST(41933.0)/RCONST(7520.0);
+    C->W[1][5][3] =  SUN_RCONST(5.0);
+    C->W[1][5][4] = -SUN_RCONST(41933.0)/SUN_RCONST(7520.0);
     return C;
   })
 
@@ -132,11 +132,11 @@ ARK_MRI_TABLE(ARKODE_MRI_GARK_IRK21a, { /* A. Sandu, SINUM 57:2300-2327, 2019 */
     B->c[2] = ONE;
 
     B->A[1][0] = ONE;
-    B->A[2][0] = RCONST(0.5);
-    B->A[2][2] = RCONST(0.5);
+    B->A[2][0] = SUN_RCONST(0.5);
+    B->A[2][2] = SUN_RCONST(0.5);
 
-    B->b[0] = RCONST(0.5);
-    B->b[2] = RCONST(0.5);
+    B->b[0] = SUN_RCONST(0.5);
+    B->b[2] = SUN_RCONST(0.5);
 
     C = MRIStepCoupling_MIStoMRI(B, 2, 0);
     ARKodeButcherTable_Free(B);
@@ -145,29 +145,29 @@ ARK_MRI_TABLE(ARKODE_MRI_GARK_IRK21a, { /* A. Sandu, SINUM 57:2300-2327, 2019 */
 
 ARK_MRI_TABLE(ARKODE_MRI_GARK_ESDIRK34a, { /* A. Sandu, SINUM 57:2300-2327, 2019 */
     MRIStepCoupling C = MRIStepCoupling_Alloc(1, 7, MRISTEP_IMPLICIT);
-    realtype beta = RCONST(0.4358665215084589994160194511935568425);
+    sunrealtype beta = SUN_RCONST(0.4358665215084589994160194511935568425);
 
     C->q = 3;
     C->p = 0;
 
-    C->c[1] = ONE/RCONST(3.0);
-    C->c[2] = ONE/RCONST(3.0);
-    C->c[3] = TWO/RCONST(3.0);
-    C->c[4] = TWO/RCONST(3.0);
+    C->c[1] = ONE/SUN_RCONST(3.0);
+    C->c[2] = ONE/SUN_RCONST(3.0);
+    C->c[3] = TWO/SUN_RCONST(3.0);
+    C->c[4] = TWO/SUN_RCONST(3.0);
     C->c[5] = ONE;
     C->c[6] = ONE;
 
-    C->G[0][1][0] =  ONE/RCONST(3.0);
+    C->G[0][1][0] =  ONE/SUN_RCONST(3.0);
     C->G[0][2][0] = -beta;
     C->G[0][2][2] =  beta;
-    C->G[0][3][0] =  RCONST(-0.3045790611944504970424837655380884888);
-    C->G[0][3][2] =  RCONST(0.6379123945277838303758170988714218222);
-    C->G[0][4][0] =  RCONST(0.2116913105640266601676536489364004869);
-    C->G[0][4][2] =  RCONST(-0.6475578320724856595836731001299573294);
+    C->G[0][3][0] =  SUN_RCONST(-0.3045790611944504970424837655380884888);
+    C->G[0][3][2] =  SUN_RCONST(0.6379123945277838303758170988714218222);
+    C->G[0][4][0] =  SUN_RCONST(0.2116913105640266601676536489364004869);
+    C->G[0][4][2] =  SUN_RCONST(-0.6475578320724856595836731001299573294);
     C->G[0][4][4] =  beta;
-    C->G[0][5][0] =  RCONST(0.4454209388055495029575162344619115112);
-    C->G[0][5][2] =  RCONST(0.8813784805616198280398949036456491923);
-    C->G[0][5][4] =  RCONST(-0.9934660860338359976640778047742273701);
+    C->G[0][5][0] =  SUN_RCONST(0.4454209388055495029575162344619115112);
+    C->G[0][5][2] =  SUN_RCONST(0.8813784805616198280398949036456491923);
+    C->G[0][5][4] =  SUN_RCONST(-0.9934660860338359976640778047742273701);
     C->G[0][6][0] = -beta;
     C->G[0][6][6] =  beta;
     return C;
@@ -179,123 +179,123 @@ ARK_MRI_TABLE(ARKODE_MRI_GARK_ESDIRK46a, { /* A. Sandu, SINUM 57:2300-2327, 2019
     C->q = 4;
     C->p = 0;
 
-    C->c[1]  = ONE/RCONST(5.0);
-    C->c[2]  = ONE/RCONST(5.0);
-    C->c[3]  = TWO/RCONST(5.0);
-    C->c[4]  = TWO/RCONST(5.0);
-    C->c[5]  = RCONST(3.0)/RCONST(5.0);
-    C->c[6]  = RCONST(3.0)/RCONST(5.0);
-    C->c[7]  = RCONST(4.0)/RCONST(5.0);
-    C->c[8]  = RCONST(4.0)/RCONST(5.0);
+    C->c[1]  = ONE/SUN_RCONST(5.0);
+    C->c[2]  = ONE/SUN_RCONST(5.0);
+    C->c[3]  = TWO/SUN_RCONST(5.0);
+    C->c[4]  = TWO/SUN_RCONST(5.0);
+    C->c[5]  = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    C->c[6]  = SUN_RCONST(3.0)/SUN_RCONST(5.0);
+    C->c[7]  = SUN_RCONST(4.0)/SUN_RCONST(5.0);
+    C->c[8]  = SUN_RCONST(4.0)/SUN_RCONST(5.0);
     C->c[9]  = ONE;
     C->c[10] = ONE;
 
-    C->G[0][1][0]   =  ONE/RCONST(5.0);
-    C->G[0][2][0]   = -ONE/RCONST(4.0);
-    C->G[0][2][2]   =  ONE/RCONST(4.0);
-    C->G[0][3][0]   =  RCONST(1771023115159.0)/RCONST(1929363690800.0);
-    C->G[0][3][2]   = -RCONST(1385150376999.0)/RCONST(1929363690800.0);
-    C->G[0][4][0]   =  RCONST(914009.0)/RCONST(345800.0);
-    C->G[0][4][2]   = -RCONST(1000459.0)/RCONST(345800.0);
-    C->G[0][4][4]   =  ONE/RCONST(4.0);
-    C->G[0][5][0]   =  RCONST(18386293581909.0)/RCONST(36657910125200.0);
-    C->G[0][5][2]   =  RCONST(5506531089.0)/RCONST(80566835440.0);
-    C->G[0][5][4]   = -RCONST(178423463189.0)/RCONST(482340922700.0);
-    C->G[0][6][0]   =  RCONST(36036097.0)/RCONST(8299200.0);
-    C->G[0][6][2]   =  RCONST(4621.0)/RCONST(118560.0);
-    C->G[0][6][4]   = -RCONST(38434367.0)/RCONST(8299200.0);
-    C->G[0][6][6]   =  ONE/RCONST(4.0);
-    C->G[0][7][0]   = -RCONST(247809665162987.0)/RCONST(146631640500800.0);
-    C->G[0][7][2]   =  RCONST(10604946373579.0)/RCONST(14663164050080.0);
-    C->G[0][7][4]   =  RCONST(10838126175385.0)/RCONST(5865265620032.0);
-    C->G[0][7][6]   = -RCONST(24966656214317.0)/RCONST(36657910125200.0);
-    C->G[0][8][0]   =  RCONST(38519701.0)/RCONST(11618880.0);
-    C->G[0][8][2]   =  RCONST(10517363.0)/RCONST(9682400.0);
-    C->G[0][8][4]   = -RCONST(23284701.0)/RCONST(19364800.0);
-    C->G[0][8][6]   = -RCONST(10018609.0)/RCONST(2904720.0);
-    C->G[0][8][8]   =  ONE/RCONST(4.0);
-    C->G[0][9][0]   = -RCONST(52907807977903.0)/RCONST(33838070884800.0);
-    C->G[0][9][2]   =  RCONST(74846944529257.0)/RCONST(73315820250400.0);
-    C->G[0][9][4]   =  RCONST(365022522318171.0)/RCONST(146631640500800.0);
-    C->G[0][9][6]   = -RCONST(20513210406809.0)/RCONST(109973730375600.0);
-    C->G[0][9][8]   = -RCONST(2918009798.0)/RCONST(1870301537.0);
-    C->G[0][10][0]  =  RCONST(19.0)/RCONST(100.0);
-    C->G[0][10][2]  = -RCONST(73.0)/RCONST(300.0);
-    C->G[0][10][4]  =  RCONST(127.0)/RCONST(300.0);
-    C->G[0][10][6]  =  RCONST(127.0)/RCONST(300.0);
-    C->G[0][10][8]  = -RCONST(313.0)/RCONST(300.0);
-    C->G[0][10][10] =  ONE/RCONST(4.0);
-
-    C->G[1][3][0]  = -RCONST(1674554930619.0)/RCONST(964681845400.0);
-    C->G[1][3][2]  =  RCONST(1674554930619.0)/RCONST(964681845400.0);
-    C->G[1][4][0]  = -RCONST(1007739.0)/RCONST(172900.0);
-    C->G[1][4][2]  =  RCONST(1007739.0)/RCONST(172900.0);
-    C->G[1][5][0]  = -RCONST(8450070574289.0)/RCONST(18328955062600.0);
-    C->G[1][5][2]  = -RCONST(39429409169.0)/RCONST(40283417720.0);
-    C->G[1][5][4]  =  RCONST(173621393067.0)/RCONST(120585230675.0);
-    C->G[1][6][0]  = -RCONST(122894383.0)/RCONST(16598400.0);
-    C->G[1][6][2]  =  RCONST(14501.0)/RCONST(237120.0);
-    C->G[1][6][4]  =  RCONST(121879313.0)/RCONST(16598400.0);
-    C->G[1][7][0]  =  RCONST(32410002731287.0)/RCONST(15434909526400.0);
-    C->G[1][7][2]  = -RCONST(46499276605921.0)/RCONST(29326328100160.0);
-    C->G[1][7][4]  = -RCONST(34914135774643.0)/RCONST(11730531240064.0);
-    C->G[1][7][6]  =  RCONST(45128506783177.0)/RCONST(18328955062600.0);
-    C->G[1][8][0]  = -RCONST(128357303.0)/RCONST(23237760.0);
-    C->G[1][8][2]  = -RCONST(35433927.0)/RCONST(19364800.0);
-    C->G[1][8][4]  =  RCONST(71038479.0)/RCONST(38729600.0);
-    C->G[1][8][6]  =  RCONST(8015933.0)/RCONST(1452360.0);
-    C->G[1][9][0]  =  RCONST(136721604296777.0)/RCONST(67676141769600.0);
-    C->G[1][9][2]  = -RCONST(349632444539303.0)/RCONST(146631640500800.0);
-    C->G[1][9][4]  = -RCONST(1292744859249609.0)/RCONST(293263281001600.0);
-    C->G[1][9][6]  =  RCONST(8356250416309.0)/RCONST(54986865187800.0);
-    C->G[1][9][8]  =  RCONST(17282943803.0)/RCONST(3740603074.0);
-    C->G[1][10][0] =  RCONST(3.0)/RCONST(25.0);
-    C->G[1][10][2] = -RCONST(29.0)/RCONST(300.0);
-    C->G[1][10][4] =  RCONST(71.0)/RCONST(300.0);
-    C->G[1][10][6] =  RCONST(71.0)/RCONST(300.0);
-    C->G[1][10][8] = -RCONST(149.0)/RCONST(300.0);
+    C->G[0][1][0]   =  ONE/SUN_RCONST(5.0);
+    C->G[0][2][0]   = -ONE/SUN_RCONST(4.0);
+    C->G[0][2][2]   =  ONE/SUN_RCONST(4.0);
+    C->G[0][3][0]   =  SUN_RCONST(1771023115159.0)/SUN_RCONST(1929363690800.0);
+    C->G[0][3][2]   = -SUN_RCONST(1385150376999.0)/SUN_RCONST(1929363690800.0);
+    C->G[0][4][0]   =  SUN_RCONST(914009.0)/SUN_RCONST(345800.0);
+    C->G[0][4][2]   = -SUN_RCONST(1000459.0)/SUN_RCONST(345800.0);
+    C->G[0][4][4]   =  ONE/SUN_RCONST(4.0);
+    C->G[0][5][0]   =  SUN_RCONST(18386293581909.0)/SUN_RCONST(36657910125200.0);
+    C->G[0][5][2]   =  SUN_RCONST(5506531089.0)/SUN_RCONST(80566835440.0);
+    C->G[0][5][4]   = -SUN_RCONST(178423463189.0)/SUN_RCONST(482340922700.0);
+    C->G[0][6][0]   =  SUN_RCONST(36036097.0)/SUN_RCONST(8299200.0);
+    C->G[0][6][2]   =  SUN_RCONST(4621.0)/SUN_RCONST(118560.0);
+    C->G[0][6][4]   = -SUN_RCONST(38434367.0)/SUN_RCONST(8299200.0);
+    C->G[0][6][6]   =  ONE/SUN_RCONST(4.0);
+    C->G[0][7][0]   = -SUN_RCONST(247809665162987.0)/SUN_RCONST(146631640500800.0);
+    C->G[0][7][2]   =  SUN_RCONST(10604946373579.0)/SUN_RCONST(14663164050080.0);
+    C->G[0][7][4]   =  SUN_RCONST(10838126175385.0)/SUN_RCONST(5865265620032.0);
+    C->G[0][7][6]   = -SUN_RCONST(24966656214317.0)/SUN_RCONST(36657910125200.0);
+    C->G[0][8][0]   =  SUN_RCONST(38519701.0)/SUN_RCONST(11618880.0);
+    C->G[0][8][2]   =  SUN_RCONST(10517363.0)/SUN_RCONST(9682400.0);
+    C->G[0][8][4]   = -SUN_RCONST(23284701.0)/SUN_RCONST(19364800.0);
+    C->G[0][8][6]   = -SUN_RCONST(10018609.0)/SUN_RCONST(2904720.0);
+    C->G[0][8][8]   =  ONE/SUN_RCONST(4.0);
+    C->G[0][9][0]   = -SUN_RCONST(52907807977903.0)/SUN_RCONST(33838070884800.0);
+    C->G[0][9][2]   =  SUN_RCONST(74846944529257.0)/SUN_RCONST(73315820250400.0);
+    C->G[0][9][4]   =  SUN_RCONST(365022522318171.0)/SUN_RCONST(146631640500800.0);
+    C->G[0][9][6]   = -SUN_RCONST(20513210406809.0)/SUN_RCONST(109973730375600.0);
+    C->G[0][9][8]   = -SUN_RCONST(2918009798.0)/SUN_RCONST(1870301537.0);
+    C->G[0][10][0]  =  SUN_RCONST(19.0)/SUN_RCONST(100.0);
+    C->G[0][10][2]  = -SUN_RCONST(73.0)/SUN_RCONST(300.0);
+    C->G[0][10][4]  =  SUN_RCONST(127.0)/SUN_RCONST(300.0);
+    C->G[0][10][6]  =  SUN_RCONST(127.0)/SUN_RCONST(300.0);
+    C->G[0][10][8]  = -SUN_RCONST(313.0)/SUN_RCONST(300.0);
+    C->G[0][10][10] =  ONE/SUN_RCONST(4.0);
+
+    C->G[1][3][0]  = -SUN_RCONST(1674554930619.0)/SUN_RCONST(964681845400.0);
+    C->G[1][3][2]  =  SUN_RCONST(1674554930619.0)/SUN_RCONST(964681845400.0);
+    C->G[1][4][0]  = -SUN_RCONST(1007739.0)/SUN_RCONST(172900.0);
+    C->G[1][4][2]  =  SUN_RCONST(1007739.0)/SUN_RCONST(172900.0);
+    C->G[1][5][0]  = -SUN_RCONST(8450070574289.0)/SUN_RCONST(18328955062600.0);
+    C->G[1][5][2]  = -SUN_RCONST(39429409169.0)/SUN_RCONST(40283417720.0);
+    C->G[1][5][4]  =  SUN_RCONST(173621393067.0)/SUN_RCONST(120585230675.0);
+    C->G[1][6][0]  = -SUN_RCONST(122894383.0)/SUN_RCONST(16598400.0);
+    C->G[1][6][2]  =  SUN_RCONST(14501.0)/SUN_RCONST(237120.0);
+    C->G[1][6][4]  =  SUN_RCONST(121879313.0)/SUN_RCONST(16598400.0);
+    C->G[1][7][0]  =  SUN_RCONST(32410002731287.0)/SUN_RCONST(15434909526400.0);
+    C->G[1][7][2]  = -SUN_RCONST(46499276605921.0)/SUN_RCONST(29326328100160.0);
+    C->G[1][7][4]  = -SUN_RCONST(34914135774643.0)/SUN_RCONST(11730531240064.0);
+    C->G[1][7][6]  =  SUN_RCONST(45128506783177.0)/SUN_RCONST(18328955062600.0);
+    C->G[1][8][0]  = -SUN_RCONST(128357303.0)/SUN_RCONST(23237760.0);
+    C->G[1][8][2]  = -SUN_RCONST(35433927.0)/SUN_RCONST(19364800.0);
+    C->G[1][8][4]  =  SUN_RCONST(71038479.0)/SUN_RCONST(38729600.0);
+    C->G[1][8][6]  =  SUN_RCONST(8015933.0)/SUN_RCONST(1452360.0);
+    C->G[1][9][0]  =  SUN_RCONST(136721604296777.0)/SUN_RCONST(67676141769600.0);
+    C->G[1][9][2]  = -SUN_RCONST(349632444539303.0)/SUN_RCONST(146631640500800.0);
+    C->G[1][9][4]  = -SUN_RCONST(1292744859249609.0)/SUN_RCONST(293263281001600.0);
+    C->G[1][9][6]  =  SUN_RCONST(8356250416309.0)/SUN_RCONST(54986865187800.0);
+    C->G[1][9][8]  =  SUN_RCONST(17282943803.0)/SUN_RCONST(3740603074.0);
+    C->G[1][10][0] =  SUN_RCONST(3.0)/SUN_RCONST(25.0);
+    C->G[1][10][2] = -SUN_RCONST(29.0)/SUN_RCONST(300.0);
+    C->G[1][10][4] =  SUN_RCONST(71.0)/SUN_RCONST(300.0);
+    C->G[1][10][6] =  SUN_RCONST(71.0)/SUN_RCONST(300.0);
+    C->G[1][10][8] = -SUN_RCONST(149.0)/SUN_RCONST(300.0);
     return C;
   })
 
 ARK_MRI_TABLE(ARKODE_IMEX_MRI_GARK3a, { /* R. Chinomona & D. Reynolds SINUM 43(5):A3082-A3113, 2021 */
     MRIStepCoupling C = MRIStepCoupling_Alloc(1, 8, MRISTEP_IMEX);
-    realtype beta = RCONST(0.4358665215084589994160194511935568425);
+    sunrealtype beta = SUN_RCONST(0.4358665215084589994160194511935568425);
 
     C->q = 3;
     C->p = 0;
 
     C->c[1] = beta;
     C->c[2] = beta;
-    C->c[3] = RCONST(0.7179332607542294997080097255967784213);
-    C->c[4] = RCONST(0.7179332607542294997080097255967784213);
+    C->c[3] = SUN_RCONST(0.7179332607542294997080097255967784213);
+    C->c[4] = SUN_RCONST(0.7179332607542294997080097255967784213);
     C->c[5] = ONE;
     C->c[6] = ONE;
     C->c[7] = ONE;
 
     C->W[0][1][0] =  beta;
-    C->W[0][3][0] = -RCONST(0.5688715801234400928465032925317932021);
-    C->W[0][3][2] =  RCONST(0.8509383193692105931384935669350147809);
-    C->W[0][4][0] =  RCONST(0.454283944643608855878770886900124654);
-    C->W[0][4][2] = -RCONST(0.454283944643608855878770886900124654);
-    C->W[0][5][0] = -RCONST(0.4271371821005074011706645050390732474);
-    C->W[0][5][2] =  RCONST(0.1562747733103380821014660497037023496);
-    C->W[0][5][4] =  RCONST(0.5529291480359398193611887297385924765);
-    C->W[0][7][0] =  RCONST(0.105858296071879638722377459477184953);
-    C->W[0][7][2] =  RCONST(0.655567501140070250975288954324730635);
-    C->W[0][7][4] = -RCONST(1.197292318720408889113685864995472431);
+    C->W[0][3][0] = -SUN_RCONST(0.5688715801234400928465032925317932021);
+    C->W[0][3][2] =  SUN_RCONST(0.8509383193692105931384935669350147809);
+    C->W[0][4][0] =  SUN_RCONST(0.454283944643608855878770886900124654);
+    C->W[0][4][2] = -SUN_RCONST(0.454283944643608855878770886900124654);
+    C->W[0][5][0] = -SUN_RCONST(0.4271371821005074011706645050390732474);
+    C->W[0][5][2] =  SUN_RCONST(0.1562747733103380821014660497037023496);
+    C->W[0][5][4] =  SUN_RCONST(0.5529291480359398193611887297385924765);
+    C->W[0][7][0] =  SUN_RCONST(0.105858296071879638722377459477184953);
+    C->W[0][7][2] =  SUN_RCONST(0.655567501140070250975288954324730635);
+    C->W[0][7][4] = -SUN_RCONST(1.197292318720408889113685864995472431);
     C->W[0][7][6] =  beta;
 
     C->G[0][1][0] =  beta;
     C->G[0][2][0] = -beta;
     C->G[0][2][2] =  beta;
-    C->G[0][3][0] = -RCONST(0.4103336962288525014599513720161078937);
-    C->G[0][3][2] =  RCONST(0.6924004354746230017519416464193294724);
-    C->G[0][4][0] =  RCONST(0.4103336962288525014599513720161078937);
-    C->G[0][4][2] = -RCONST(0.8462002177373115008759708232096647362);
+    C->G[0][3][0] = -SUN_RCONST(0.4103336962288525014599513720161078937);
+    C->G[0][3][2] =  SUN_RCONST(0.6924004354746230017519416464193294724);
+    C->G[0][4][0] =  SUN_RCONST(0.4103336962288525014599513720161078937);
+    C->G[0][4][2] = -SUN_RCONST(0.8462002177373115008759708232096647362);
     C->G[0][4][4] =  beta;
     C->G[0][5][0] =  beta;
-    C->G[0][5][2] =  RCONST(0.9264299099302395700444874096601015328);
-    C->G[0][5][4] = -RCONST(1.080229692192928069168516586450436797);
+    C->G[0][5][2] =  SUN_RCONST(0.9264299099302395700444874096601015328);
+    C->G[0][5][4] = -SUN_RCONST(1.080229692192928069168516586450436797);
     C->G[0][6][0] = -beta;
     C->G[0][6][6] =  beta;
     return C;
@@ -303,49 +303,49 @@ ARK_MRI_TABLE(ARKODE_IMEX_MRI_GARK3a, { /* R. Chinomona & D. Reynolds SINUM 43(5
 
 ARK_MRI_TABLE(ARKODE_IMEX_MRI_GARK3b, { /* R. Chinomona & D. Reynolds SINUM 43(5):A3082-A3113, 2021 */
     MRIStepCoupling C = MRIStepCoupling_Alloc(1, 8, MRISTEP_IMEX);
-    realtype beta = RCONST(0.4358665215084589994160194511935568425);
+    sunrealtype beta = SUN_RCONST(0.4358665215084589994160194511935568425);
 
     C->q = 3;
     C->p = 0;
 
     C->c[1] = beta;
     C->c[2] = beta;
-    C->c[3] = RCONST(0.7179332607542294997080097255967784213);
-    C->c[4] = RCONST(0.7179332607542294997080097255967784213);
+    C->c[3] = SUN_RCONST(0.7179332607542294997080097255967784213);
+    C->c[4] = SUN_RCONST(0.7179332607542294997080097255967784213);
     C->c[5] = ONE;
     C->c[6] = ONE;
     C->c[7] = ONE;
 
     C->W[0][1][0] =  beta;
-    C->W[0][3][0] = -RCONST(0.1750145285570467590610670000018749059);
-    C->W[0][3][2] =  RCONST(0.4570812678028172593530572744050964846);
-    C->W[0][4][0] =  RCONST(0.06042689307721552209333459437020635774);
-    C->W[0][4][2] = -RCONST(0.06042689307721552209333459437020635774);
-    C->W[0][5][0] =  RCONST(0.1195213959425454440038786034027936869);
-    C->W[0][5][2] = -RCONST(1.84372522668966191789853395029629765);
-    C->W[0][5][4] =  RCONST(2.006270569992886974186645621296725542);
-    C->W[0][6][0] = -RCONST(0.5466585780430528451745431084418669343);
-    C->W[0][6][2] =  RCONST(2.0);
-    C->W[0][6][4] = -RCONST(1.453341421956947154825456891558133066);
-    C->W[0][7][0] =  RCONST(0.105858296071879638722377459477184953);
-    C->W[0][7][2] =  RCONST(0.655567501140070250975288954324730635);
-    C->W[0][7][4] = -RCONST(1.197292318720408889113685864995472431);
+    C->W[0][3][0] = -SUN_RCONST(0.1750145285570467590610670000018749059);
+    C->W[0][3][2] =  SUN_RCONST(0.4570812678028172593530572744050964846);
+    C->W[0][4][0] =  SUN_RCONST(0.06042689307721552209333459437020635774);
+    C->W[0][4][2] = -SUN_RCONST(0.06042689307721552209333459437020635774);
+    C->W[0][5][0] =  SUN_RCONST(0.1195213959425454440038786034027936869);
+    C->W[0][5][2] = -SUN_RCONST(1.84372522668966191789853395029629765);
+    C->W[0][5][4] =  SUN_RCONST(2.006270569992886974186645621296725542);
+    C->W[0][6][0] = -SUN_RCONST(0.5466585780430528451745431084418669343);
+    C->W[0][6][2] =  SUN_RCONST(2.0);
+    C->W[0][6][4] = -SUN_RCONST(1.453341421956947154825456891558133066);
+    C->W[0][7][0] =  SUN_RCONST(0.105858296071879638722377459477184953);
+    C->W[0][7][2] =  SUN_RCONST(0.655567501140070250975288954324730635);
+    C->W[0][7][4] = -SUN_RCONST(1.197292318720408889113685864995472431);
     C->W[0][7][6] =  beta;
 
     C->G[0][1][0] =  beta;
     C->G[0][2][0] = -beta;
     C->G[0][2][2] =  beta;
-    C->G[0][3][0] =  RCONST(0.0414273753564414837153799230278275639);
-    C->G[0][3][2] =  RCONST(0.2406393638893290165766103513753940148);
-    C->G[0][4][0] = -RCONST(0.0414273753564414837153799230278275639);
-    C->G[0][4][2] = -RCONST(0.3944391461520175157006395281657292786);
+    C->G[0][3][0] =  SUN_RCONST(0.0414273753564414837153799230278275639);
+    C->G[0][3][2] =  SUN_RCONST(0.2406393638893290165766103513753940148);
+    C->G[0][4][0] = -SUN_RCONST(0.0414273753564414837153799230278275639);
+    C->G[0][4][2] = -SUN_RCONST(0.3944391461520175157006395281657292786);
     C->G[0][4][4] =  beta;
-    C->G[0][5][0] =  RCONST(0.1123373143006047802633543416889605123);
-    C->G[0][5][2] =  RCONST(1.051807513648115027700693049638099167);
-    C->G[0][5][4] = -RCONST(0.8820780887029493076720571169238381009);
-    C->G[0][6][0] = -RCONST(0.1123373143006047802633543416889605123);
-    C->G[0][6][2] = -RCONST(0.1253776037178754576562056399779976346);
-    C->G[0][6][4] = -RCONST(0.1981516034899787614964594695265986957);
+    C->G[0][5][0] =  SUN_RCONST(0.1123373143006047802633543416889605123);
+    C->G[0][5][2] =  SUN_RCONST(1.051807513648115027700693049638099167);
+    C->G[0][5][4] = -SUN_RCONST(0.8820780887029493076720571169238381009);
+    C->G[0][6][0] = -SUN_RCONST(0.1123373143006047802633543416889605123);
+    C->G[0][6][2] = -SUN_RCONST(0.1253776037178754576562056399779976346);
+    C->G[0][6][4] = -SUN_RCONST(0.1981516034899787614964594695265986957);
     C->G[0][6][6] =  beta;
     return C;
   })
@@ -356,111 +356,111 @@ ARK_MRI_TABLE(ARKODE_IMEX_MRI_GARK4, { /* R. Chinomona & D. Reynolds SINUM 43(5)
     C->q = 4;
     C->p = 0;
 
-    C->c[1]  = RCONST(0.5);
-    C->c[2]  = RCONST(0.5);
-    C->c[3]  = RCONST(0.625);
-    C->c[4]  = RCONST(0.625);
-    C->c[5]  = RCONST(0.75);
-    C->c[6]  = RCONST(0.75);
-    C->c[7]  = RCONST(0.875);
-    C->c[8]  = RCONST(0.875);
+    C->c[1]  = SUN_RCONST(0.5);
+    C->c[2]  = SUN_RCONST(0.5);
+    C->c[3]  = SUN_RCONST(0.625);
+    C->c[4]  = SUN_RCONST(0.625);
+    C->c[5]  = SUN_RCONST(0.75);
+    C->c[6]  = SUN_RCONST(0.75);
+    C->c[7]  = SUN_RCONST(0.875);
+    C->c[8]  = SUN_RCONST(0.875);
     C->c[9]  = ONE;
     C->c[10] = ONE;
     C->c[11] = ONE;
 
-    C->W[0][1][0]   =  RCONST(0.5);
-    C->W[0][3][0]   = -RCONST(1.91716534363662868878172216064946905);
-    C->W[0][3][2]   =  RCONST(2.04216534363662868878172216064946905);
-    C->W[0][4][0]   = -RCONST(0.4047510318011059426979159070469904691);
-    C->W[0][4][2]   =  RCONST(0.4047510318011059426979159070469904691);
-    C->W[0][5][0]   =  RCONST(11.45146602249221636665698028602631728);
-    C->W[0][5][2]   = -RCONST(30.21075747526504271440647815573950607);
-    C->W[0][5][4]   =  RCONST(18.88429145277282634774949786971318879);
-    C->W[0][6][0]   = -RCONST(0.7090335647602614506847116729463301439);
-    C->W[0][6][2]   =  RCONST(1.03030720858751876652616190884004718);
-    C->W[0][6][4]   = -RCONST(0.3212736438272573158414502358937170357);
-    C->W[0][7][0]   = -RCONST(29.99548716455828439840910684944199275);
-    C->W[0][7][2]   =  RCONST(37.60598277499180180536489685624385701);
-    C->W[0][7][4]   =  RCONST(0.3212736438272573158414502358937170357);
-    C->W[0][7][6]   = -RCONST(7.806769254260774722797240242695581295);
-    C->W[0][8][0]   =  RCONST(3.104665054272962116338769391849124223);
-    C->W[0][8][2]   = -RCONST(2.430325019757162297132065927415566359);
-    C->W[0][8][4]   = -RCONST(1.905479301151524635219201659483842131);
-    C->W[0][8][6]   =  RCONST(1.231139266635724816012498195050284266);
-    C->W[0][9][0]   = -RCONST(2.424429547752047869875875914355514008);
-    C->W[0][9][2]   =  RCONST(2.430325019757162297132065927415566359);
-    C->W[0][9][4]   =  RCONST(1.905479301151524635219201659483842131);
-    C->W[0][9][6]   = -RCONST(1.231139266635724816012498195050284266);
-    C->W[0][9][8]   = -RCONST(0.555235506520914246462893477493610215);
-    C->W[0][10][0]  = -RCONST(0.01044135044479748590294518945165354204);
-    C->W[0][10][2]  =  RCONST(0.07260303614655074505152104505488141613);
-    C->W[0][10][4]  = -RCONST(0.1288275951677260952239454098576424313);
-    C->W[0][10][6]  =  RCONST(0.1129355350093823566139440107122154084);
-    C->W[0][10][8]  = -RCONST(0.04626962554340952053857445645780085125);
-    C->W[0][11][0]  = -RCONST(0.8108522787762101328175789228607932098);
-    C->W[0][11][2]  =  RCONST(0.2560073199220492435001562192140882299);
-    C->W[0][11][4]  =  RCONST(0.8068294072697527893665866422787819475);
-    C->W[0][11][6]  = -RCONST(0.4557148228721823795105894821742761164);
-    C->W[0][11][8]  = -RCONST(0.04626962554340952053857445645780085125);
-    C->W[0][11][10] =  RCONST(0.25);
-
-    C->W[1][3][0]   =  RCONST(4.084330687273257377563444321298938099);
-    C->W[1][3][2]   = -RCONST(4.084330687273257377563444321298938099);
-    C->W[1][5][0]   = -RCONST(21.84342998138222084791812875795865363);
-    C->W[1][5][2]   =  RCONST(59.61201288692787354341712449738503121);
-    C->W[1][5][4]   = -RCONST(37.76858290554565269549899573942637758);
-    C->W[1][7][0]   =  RCONST(61.65904145863709169818763704477664579);
-    C->W[1][7][2]   = -RCONST(77.27257996715864114378211753016780838);
-    C->W[1][7][6]   =  RCONST(15.61353850852154944559448048539116259);
-    C->W[1][9][0]   = -RCONST(1.11047101304182849292578695498722043);
-    C->W[1][9][8]   =  RCONST(1.11047101304182849292578695498722043);
-
-    C->G[0][1][0]   =  RCONST(0.5);
-    C->G[0][2][0]   = -RCONST(0.25);
-    C->G[0][2][2]   =  RCONST(0.25);
-    C->G[0][3][0]   = -RCONST(3.977281248108488183067033851462278892);
-    C->G[0][3][2]   =  RCONST(4.102281248108488183067033851462278892);
-    C->G[0][4][0]   = -RCONST(0.06905388741401691232724147084809374064);
-    C->G[0][4][2]   = -RCONST(0.1809461125859830876727585291519062594);
-    C->G[0][4][4]   =  RCONST(0.25);
-    C->G[0][5][0]   = -RCONST(1.761767663757920528863378964822412405);
-    C->G[0][5][2]   =  RCONST(2.694524698377298610155338150791461384);
-    C->G[0][5][4]   = -RCONST(0.8077570346193780812919591859690489783);
-    C->G[0][6][0]   =  RCONST(0.5558721791553969487305081009588084962);
-    C->G[0][6][2]   = -RCONST(0.6799140501579995013958501527883486949);
-    C->G[0][6][4]   = -RCONST(0.1259581289973974473346579481704598013);
-    C->G[0][6][6]   =  RCONST(0.25);
-    C->G[0][7][0]   = -RCONST(5.840176028724955954446426657541065113);
-    C->G[0][7][2]   =  RCONST(8.174456684291915089191270805710716374);
-    C->G[0][7][4]   =  RCONST(0.1259581289973974473346579481704598013);
-    C->G[0][7][6]   = -RCONST(2.335238784564356582079502096340111063);
-    C->G[0][8][0]   = -RCONST(1.906792645167811808094759305036052304);
-    C->G[0][8][2]   = -RCONST(1.547057811385123933632984579249388443);
-    C->G[0][8][4]   =  RCONST(4.129888013149350305954491738020313225);
-    C->G[0][8][6]   = -RCONST(0.9260375565964145642267478537348724775);
-    C->G[0][8][8]   =  RCONST(0.25);
-    C->G[0][9][0]   =  RCONST(3.337028151688726054557652782529662519);
-    C->G[0][9][2]   =  RCONST(1.547057811385123933632984579249388443);
-    C->G[0][9][4]   = -RCONST(4.129888013149350305954491738020313225);
-    C->G[0][9][6]   =  RCONST(0.9260375565964145642267478537348724775);
-    C->G[0][9][8]   = -RCONST(1.555235506520914246462893477493610215);
-    C->G[0][10][0]  = -RCONST(0.8212936292210076187205241123124467518);
-    C->G[0][10][2]  =  RCONST(0.328610356068599988551677264268969646);
-    C->G[0][10][4]  =  RCONST(0.6780018121020266941426412324211395162);
-    C->G[0][10][6]  = -RCONST(0.3427792878628000228966454714620607079);
-    C->G[0][10][8]  = -RCONST(0.0925392510868190410771489129156017025);
-    C->G[0][10][10] =  RCONST(0.25);
-
-    C->G[1][3][0]   =  RCONST(8.704562496216976366134067702924557783);
-    C->G[1][3][2]   = -RCONST(8.704562496216976366134067702924557783);
-    C->G[1][5][0]   =  RCONST(3.911643102343874882381240871341012292);
-    C->G[1][5][2]   = -RCONST(5.027157171582631044965159243279110249);
-    C->G[1][5][4]   =  RCONST(1.115514069238756162583918371938097957);
-    C->G[1][7][0]   =  RCONST(10.81860769913911801143183711316451323);
-    C->G[1][7][2]   = -RCONST(14.98908526826783117559084130584473536);
-    C->G[1][7][6]   =  RCONST(4.170477569128713164159004192680222125);
-    C->G[1][9][0]   = -RCONST(2.61047101304182849292578695498722043);
-    C->G[1][9][8]   =  RCONST(2.61047101304182849292578695498722043);
+    C->W[0][1][0]   =  SUN_RCONST(0.5);
+    C->W[0][3][0]   = -SUN_RCONST(1.91716534363662868878172216064946905);
+    C->W[0][3][2]   =  SUN_RCONST(2.04216534363662868878172216064946905);
+    C->W[0][4][0]   = -SUN_RCONST(0.4047510318011059426979159070469904691);
+    C->W[0][4][2]   =  SUN_RCONST(0.4047510318011059426979159070469904691);
+    C->W[0][5][0]   =  SUN_RCONST(11.45146602249221636665698028602631728);
+    C->W[0][5][2]   = -SUN_RCONST(30.21075747526504271440647815573950607);
+    C->W[0][5][4]   =  SUN_RCONST(18.88429145277282634774949786971318879);
+    C->W[0][6][0]   = -SUN_RCONST(0.7090335647602614506847116729463301439);
+    C->W[0][6][2]   =  SUN_RCONST(1.03030720858751876652616190884004718);
+    C->W[0][6][4]   = -SUN_RCONST(0.3212736438272573158414502358937170357);
+    C->W[0][7][0]   = -SUN_RCONST(29.99548716455828439840910684944199275);
+    C->W[0][7][2]   =  SUN_RCONST(37.60598277499180180536489685624385701);
+    C->W[0][7][4]   =  SUN_RCONST(0.3212736438272573158414502358937170357);
+    C->W[0][7][6]   = -SUN_RCONST(7.806769254260774722797240242695581295);
+    C->W[0][8][0]   =  SUN_RCONST(3.104665054272962116338769391849124223);
+    C->W[0][8][2]   = -SUN_RCONST(2.430325019757162297132065927415566359);
+    C->W[0][8][4]   = -SUN_RCONST(1.905479301151524635219201659483842131);
+    C->W[0][8][6]   =  SUN_RCONST(1.231139266635724816012498195050284266);
+    C->W[0][9][0]   = -SUN_RCONST(2.424429547752047869875875914355514008);
+    C->W[0][9][2]   =  SUN_RCONST(2.430325019757162297132065927415566359);
+    C->W[0][9][4]   =  SUN_RCONST(1.905479301151524635219201659483842131);
+    C->W[0][9][6]   = -SUN_RCONST(1.231139266635724816012498195050284266);
+    C->W[0][9][8]   = -SUN_RCONST(0.555235506520914246462893477493610215);
+    C->W[0][10][0]  = -SUN_RCONST(0.01044135044479748590294518945165354204);
+    C->W[0][10][2]  =  SUN_RCONST(0.07260303614655074505152104505488141613);
+    C->W[0][10][4]  = -SUN_RCONST(0.1288275951677260952239454098576424313);
+    C->W[0][10][6]  =  SUN_RCONST(0.1129355350093823566139440107122154084);
+    C->W[0][10][8]  = -SUN_RCONST(0.04626962554340952053857445645780085125);
+    C->W[0][11][0]  = -SUN_RCONST(0.8108522787762101328175789228607932098);
+    C->W[0][11][2]  =  SUN_RCONST(0.2560073199220492435001562192140882299);
+    C->W[0][11][4]  =  SUN_RCONST(0.8068294072697527893665866422787819475);
+    C->W[0][11][6]  = -SUN_RCONST(0.4557148228721823795105894821742761164);
+    C->W[0][11][8]  = -SUN_RCONST(0.04626962554340952053857445645780085125);
+    C->W[0][11][10] =  SUN_RCONST(0.25);
+
+    C->W[1][3][0]   =  SUN_RCONST(4.084330687273257377563444321298938099);
+    C->W[1][3][2]   = -SUN_RCONST(4.084330687273257377563444321298938099);
+    C->W[1][5][0]   = -SUN_RCONST(21.84342998138222084791812875795865363);
+    C->W[1][5][2]   =  SUN_RCONST(59.61201288692787354341712449738503121);
+    C->W[1][5][4]   = -SUN_RCONST(37.76858290554565269549899573942637758);
+    C->W[1][7][0]   =  SUN_RCONST(61.65904145863709169818763704477664579);
+    C->W[1][7][2]   = -SUN_RCONST(77.27257996715864114378211753016780838);
+    C->W[1][7][6]   =  SUN_RCONST(15.61353850852154944559448048539116259);
+    C->W[1][9][0]   = -SUN_RCONST(1.11047101304182849292578695498722043);
+    C->W[1][9][8]   =  SUN_RCONST(1.11047101304182849292578695498722043);
+
+    C->G[0][1][0]   =  SUN_RCONST(0.5);
+    C->G[0][2][0]   = -SUN_RCONST(0.25);
+    C->G[0][2][2]   =  SUN_RCONST(0.25);
+    C->G[0][3][0]   = -SUN_RCONST(3.977281248108488183067033851462278892);
+    C->G[0][3][2]   =  SUN_RCONST(4.102281248108488183067033851462278892);
+    C->G[0][4][0]   = -SUN_RCONST(0.06905388741401691232724147084809374064);
+    C->G[0][4][2]   = -SUN_RCONST(0.1809461125859830876727585291519062594);
+    C->G[0][4][4]   =  SUN_RCONST(0.25);
+    C->G[0][5][0]   = -SUN_RCONST(1.761767663757920528863378964822412405);
+    C->G[0][5][2]   =  SUN_RCONST(2.694524698377298610155338150791461384);
+    C->G[0][5][4]   = -SUN_RCONST(0.8077570346193780812919591859690489783);
+    C->G[0][6][0]   =  SUN_RCONST(0.5558721791553969487305081009588084962);
+    C->G[0][6][2]   = -SUN_RCONST(0.6799140501579995013958501527883486949);
+    C->G[0][6][4]   = -SUN_RCONST(0.1259581289973974473346579481704598013);
+    C->G[0][6][6]   =  SUN_RCONST(0.25);
+    C->G[0][7][0]   = -SUN_RCONST(5.840176028724955954446426657541065113);
+    C->G[0][7][2]   =  SUN_RCONST(8.174456684291915089191270805710716374);
+    C->G[0][7][4]   =  SUN_RCONST(0.1259581289973974473346579481704598013);
+    C->G[0][7][6]   = -SUN_RCONST(2.335238784564356582079502096340111063);
+    C->G[0][8][0]   = -SUN_RCONST(1.906792645167811808094759305036052304);
+    C->G[0][8][2]   = -SUN_RCONST(1.547057811385123933632984579249388443);
+    C->G[0][8][4]   =  SUN_RCONST(4.129888013149350305954491738020313225);
+    C->G[0][8][6]   = -SUN_RCONST(0.9260375565964145642267478537348724775);
+    C->G[0][8][8]   =  SUN_RCONST(0.25);
+    C->G[0][9][0]   =  SUN_RCONST(3.337028151688726054557652782529662519);
+    C->G[0][9][2]   =  SUN_RCONST(1.547057811385123933632984579249388443);
+    C->G[0][9][4]   = -SUN_RCONST(4.129888013149350305954491738020313225);
+    C->G[0][9][6]   =  SUN_RCONST(0.9260375565964145642267478537348724775);
+    C->G[0][9][8]   = -SUN_RCONST(1.555235506520914246462893477493610215);
+    C->G[0][10][0]  = -SUN_RCONST(0.8212936292210076187205241123124467518);
+    C->G[0][10][2]  =  SUN_RCONST(0.328610356068599988551677264268969646);
+    C->G[0][10][4]  =  SUN_RCONST(0.6780018121020266941426412324211395162);
+    C->G[0][10][6]  = -SUN_RCONST(0.3427792878628000228966454714620607079);
+    C->G[0][10][8]  = -SUN_RCONST(0.0925392510868190410771489129156017025);
+    C->G[0][10][10] =  SUN_RCONST(0.25);
+
+    C->G[1][3][0]   =  SUN_RCONST(8.704562496216976366134067702924557783);
+    C->G[1][3][2]   = -SUN_RCONST(8.704562496216976366134067702924557783);
+    C->G[1][5][0]   =  SUN_RCONST(3.911643102343874882381240871341012292);
+    C->G[1][5][2]   = -SUN_RCONST(5.027157171582631044965159243279110249);
+    C->G[1][5][4]   =  SUN_RCONST(1.115514069238756162583918371938097957);
+    C->G[1][7][0]   =  SUN_RCONST(10.81860769913911801143183711316451323);
+    C->G[1][7][2]   = -SUN_RCONST(14.98908526826783117559084130584473536);
+    C->G[1][7][6]   =  SUN_RCONST(4.170477569128713164159004192680222125);
+    C->G[1][9][0]   = -SUN_RCONST(2.61047101304182849292578695498722043);
+    C->G[1][9][8]   =  SUN_RCONST(2.61047101304182849292578695498722043);
     return C;
   })
 
diff --git a/src/arkode/arkode_mristep.c b/src/arkode/arkode_mristep.c
index e6d32c65b3..270b75cc6f 100644
--- a/src/arkode/arkode_mristep.c
+++ b/src/arkode/arkode_mristep.c
@@ -34,13 +34,13 @@
 /*---------------------------------------------------------------
   Create MRIStep integrator memory struct
   ---------------------------------------------------------------*/
-void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, realtype t0, N_Vector y0,
+void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0, N_Vector y0,
                     MRIStepInnerStepper stepper, SUNContext sunctx)
 {
   ARKodeMem          ark_mem;         /* outer ARKODE memory   */
   ARKodeMRIStepMem   step_mem;        /* outer stepper memory  */
   SUNNonlinearSolver NLS;             /* default nonlin solver */
-  booleantype        nvectorOK;
+  sunbooleantype        nvectorOK;
   int                retval;
 
   /* Check that at least one of fse, fsi is supplied and is to be used*/
@@ -131,7 +131,7 @@ void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, realtype t0, N_Vector y0,
   step_mem->implicit_rhs = (fsi == NULL) ? SUNFALSE : SUNTRUE;
 
   /* Update the ARKODE workspace requirements */
-  ark_mem->liw += 42;  /* fcn/data ptr, int, long int, sunindextype, booleantype */
+  ark_mem->liw += 42;  /* fcn/data ptr, int, long int, sunindextype, sunbooleantype */
   ark_mem->lrw += 10;
 
   /* Create a default Newton NLS object (just in case; will be deleted if
@@ -211,7 +211,7 @@ void* MRIStepCreate(ARKRhsFn fse, ARKRhsFn fsi, realtype t0, N_Vector y0,
   It first resizes the main ARKODE infrastructure memory, and
   then resizes its own data.
   ---------------------------------------------------------------*/
-int MRIStepResize(void *arkode_mem, N_Vector y0, realtype t0,
+int MRIStepResize(void *arkode_mem, N_Vector y0, sunrealtype t0,
                   ARKVecResizeFn resize, void *resize_data)
 {
   ARKodeMem ark_mem;
@@ -235,7 +235,7 @@ int MRIStepResize(void *arkode_mem, N_Vector y0, realtype t0,
   ark_mem->liw1 = liw1;
 
   /* resize ARKODE infrastructure memory (use hscale = 1.0) */
-  retval = arkResize(ark_mem, y0, RCONST(1.0), t0, resize, resize_data);
+  retval = arkResize(ark_mem, y0, SUN_RCONST(1.0), t0, resize, resize_data);
   if (retval != ARK_SUCCESS) {
     arkProcessError(ark_mem, retval, "ARKODE::MRIStep", "MRIStepResize",
                     "Unable to resize main ARKODE infrastructure");
@@ -344,7 +344,7 @@ int MRIStepResize(void *arkode_mem, N_Vector y0, realtype t0,
   NOTE: the inner stepper needs to be reinitialized before
   calling this function.
   ---------------------------------------------------------------*/
-int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, realtype t0,
+int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, sunrealtype t0,
                   N_Vector y0)
 {
   ARKodeMem ark_mem;
@@ -430,7 +430,7 @@ int MRIStepReInit(void* arkode_mem, ARKRhsFn fse, ARKRhsFn fsi, realtype t0,
   problem from the given time with the input state (all counter
   values are retained).
   ---------------------------------------------------------------*/
-int MRIStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+int MRIStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -464,7 +464,7 @@ int MRIStepReset(void* arkode_mem, realtype tR, N_Vector yR)
   These routines set integration tolerances (wrappers for general
   ARKODE utility routines)
   ---------------------------------------------------------------*/
-int MRIStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
+int MRIStepSStolerances(void *arkode_mem, sunrealtype reltol, sunrealtype abstol)
 {
   /* unpack ark_mem, call arkSStolerances, and return */
   ARKodeMem ark_mem;
@@ -477,7 +477,7 @@ int MRIStepSStolerances(void *arkode_mem, realtype reltol, realtype abstol)
   return(arkSStolerances(ark_mem, reltol, abstol));
 }
 
-int MRIStepSVtolerances(void *arkode_mem, realtype reltol, N_Vector abstol)
+int MRIStepSVtolerances(void *arkode_mem, sunrealtype reltol, N_Vector abstol)
 {
   /* unpack ark_mem, call arkSVtolerances, and return */
   ARKodeMem ark_mem;
@@ -530,8 +530,8 @@ int MRIStepRootInit(void *arkode_mem, int nrtfn, ARKRootFn g)
   This is the main time-integration driver (wrappers for general
   ARKODE utility routine)
   ---------------------------------------------------------------*/
-int MRIStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
-                  realtype *tret, int itask)
+int MRIStepEvolve(void *arkode_mem, sunrealtype tout, N_Vector yout,
+                  sunrealtype *tret, int itask)
 {
   /* unpack ark_mem, call arkEvolve, and return */
   int retval;
@@ -556,7 +556,7 @@ int MRIStepEvolve(void *arkode_mem, realtype tout, N_Vector yout,
   derivatives over the most-recently-computed step (wrapper for
   generic ARKODE utility routine)
   ---------------------------------------------------------------*/
-int MRIStepGetDky(void *arkode_mem, realtype t, int k, N_Vector dky)
+int MRIStepGetDky(void *arkode_mem, sunrealtype t, int k, N_Vector dky)
 {
   /* unpack ark_mem, call arkGetDky, and return */
   int retval;
@@ -760,7 +760,7 @@ void MRIStepPrintMem(void* arkode_mem, FILE* outfile)
   fprintf(outfile,"MRIStep: jcur = %i\n", step_mem->jcur);
   fprintf(outfile,"MRIStep: ownNLS = %i\n", step_mem->ownNLS);
 
-  /* output realtype quantities */
+  /* output sunrealtype quantities */
   fprintf(outfile,"MRIStep: Coupling structure:\n");
   MRIStepCoupling_Write(step_mem->MRIC, outfile);
 
@@ -931,9 +931,9 @@ ARKRhsFn mriStep_GetImplicitRHS(void* arkode_mem)
   This routine fills the current value of gamma, and states
   whether the gamma ratio fails the dgmax criteria.
   ---------------------------------------------------------------*/
-int mriStep_GetGammas(void* arkode_mem, realtype *gamma,
-                      realtype *gamrat, booleantype **jcur,
-                      booleantype *dgamma_fail)
+int mriStep_GetGammas(void* arkode_mem, sunrealtype *gamma,
+                      sunrealtype *gamrat, sunbooleantype **jcur,
+                      sunbooleantype *dgamma_fail)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -973,7 +973,7 @@ int mriStep_Init(void* arkode_mem, int init_type)
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
   int retval, j;
-  booleantype reset_efun;
+  sunbooleantype reset_efun;
 
   /* access ARKodeMRIStepMem structure */
   retval = mriStep_AccessStepMem(arkode_mem, "mriStep_Init",
@@ -1062,8 +1062,8 @@ int mriStep_Init(void* arkode_mem, int init_type)
       step_mem->Ae_row = NULL;
       ark_mem->lrw -= step_mem->stages;
     }
-    step_mem->Ae_row = (realtype *) calloc(step_mem->stages,
-                                           sizeof(realtype));
+    step_mem->Ae_row = (sunrealtype *) calloc(step_mem->stages,
+                                           sizeof(sunrealtype));
     ark_mem->lrw += step_mem->stages;
 
     /* implicit RK coefficient row */
@@ -1072,8 +1072,8 @@ int mriStep_Init(void* arkode_mem, int init_type)
       step_mem->Ai_row = NULL;
       ark_mem->lrw -= step_mem->stages;
     }
-    step_mem->Ai_row = (realtype *) calloc(step_mem->stages,
-                                           sizeof(realtype));
+    step_mem->Ai_row = (sunrealtype *) calloc(step_mem->stages,
+                                           sizeof(sunrealtype));
     ark_mem->lrw += step_mem->stages;
 
     /* Allocate MRI RHS vector memory, update storage requirements */
@@ -1142,7 +1142,7 @@ int mriStep_Init(void* arkode_mem, int init_type)
     /* Allocate reusable arrays for fused vector interface */
     step_mem->nfusedopvecs = 2*step_mem->stages + 2;
     if (step_mem->cvals == NULL) {
-      step_mem->cvals = (realtype *) calloc(step_mem->nfusedopvecs, sizeof(realtype));
+      step_mem->cvals = (sunrealtype *) calloc(step_mem->nfusedopvecs, sizeof(sunrealtype));
       if (step_mem->cvals == NULL)  return(ARK_MEM_FAIL);
       ark_mem->lrw += (step_mem->nfusedopvecs);
     }
@@ -1239,7 +1239,7 @@ int mriStep_Init(void* arkode_mem, int init_type)
 
   Presently ff(t,y) is always called with ARK_FULLRHS_OTHER mode.
   ----------------------------------------------------------------------------*/
-int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
+int mriStep_FullRHS(void* arkode_mem, sunrealtype t, N_Vector y, N_Vector f,
                     int mode)
 {
   ARKodeMem ark_mem;
@@ -1476,7 +1476,7 @@ int mriStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
                  reduce step and retry (if possible)
            <0 => step encountered unrecoverable failure
   ---------------------------------------------------------------*/
-int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr)
+int mriStep_TakeStep(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr)
 {
   ARKodeMem ark_mem;           /* outer ARKODE memory        */
   ARKodeMRIStepMem step_mem;   /* outer stepper memory       */
@@ -1724,7 +1724,7 @@ int mriStep_AccessStepMem(void* arkode_mem, const char *fname,
   This routine checks if all required vector operations are
   present.  If any of them is missing it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype mriStep_CheckNVector(N_Vector tmpl)
+sunbooleantype mriStep_CheckNVector(N_Vector tmpl)
 {
   if ( (tmpl->ops->nvclone     == NULL) ||
        (tmpl->ops->nvdestroy   == NULL) ||
@@ -1858,10 +1858,10 @@ int mriStep_SetCoupling(ARKodeMem ark_mem)
 int mriStep_CheckCoupling(ARKodeMem ark_mem)
 {
   int i, j, k;
-  booleantype okay;
+  sunbooleantype okay;
   ARKodeMRIStepMem step_mem;
-  realtype Gabs, Wabs;
-  const realtype tol = RCONST(100.0)*UNIT_ROUNDOFF;
+  sunrealtype Gabs, Wabs;
+  const sunrealtype tol = SUN_RCONST(100.0)*SUN_UNIT_ROUNDOFF;
 
   /* access ARKodeMRIStepMem structure */
   if (ark_mem->step_mem==NULL) {
@@ -1921,7 +1921,7 @@ int mriStep_CheckCoupling(ARKodeMem ark_mem)
 
   /* Check that W tables are strictly lower triangular */
   if (step_mem->MRIC->W) {
-    Wabs = RCONST(0.0);
+    Wabs = SUN_RCONST(0.0);
     for (k=0; k<step_mem->MRIC->nmat; k++)
       for (i=0; i<step_mem->MRIC->stages; i++)
         for (j=i; j<step_mem->MRIC->stages; j++)
@@ -1936,7 +1936,7 @@ int mriStep_CheckCoupling(ARKodeMem ark_mem)
 
   /* Check that G tables are lower triangular */
   if (step_mem->MRIC->G) {
-    Gabs = RCONST(0.0);
+    Gabs = SUN_RCONST(0.0);
     for (k=0; k<step_mem->MRIC->nmat; k++)
       for (i=0; i<step_mem->MRIC->stages; i++)
         for (j=i+1; j<step_mem->MRIC->stages; j++)
@@ -2011,8 +2011,8 @@ int mriStep_CheckCoupling(ARKodeMem ark_mem)
 int mriStep_StageERKFast(ARKodeMem ark_mem,
                          ARKodeMRIStepMem step_mem, int is)
 {
-  realtype cdiff;    /* stage time increment */
-  realtype t0;       /* start time for stage */
+  sunrealtype cdiff;    /* stage time increment */
+  sunrealtype t0;       /* start time for stage */
   int retval;        /* reusable return flag */
 
 #ifdef SUNDIALS_DEBUG
@@ -2246,11 +2246,11 @@ int mriStep_StageDIRKNoFast(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem,
   ---------------------------------------------------------------*/
 
 int mriStep_ComputeInnerForcing(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem,
-                                int stage, realtype cdiff)
+                                int stage, sunrealtype cdiff)
 {
-  realtype  rcdiff;
+  sunrealtype  rcdiff;
   int       j, k, nmat, nstore, retval;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
   /* local shortcuts for fused vector operations */
@@ -2321,10 +2321,10 @@ int mriStep_ComputeInnerForcing(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem,
   ---------------------------------------------------------------*/
 
 int mriStep_RKCoeffs(MRIStepCoupling MRIC, int is, int *stage_map,
-                     realtype *Ae_row, realtype *Ai_row)
+                     sunrealtype *Ae_row, sunrealtype *Ai_row)
 {
   int j, k;
-  realtype kconst;
+  sunrealtype kconst;
 
   if (is < 1 || is >= MRIC->stages || !stage_map || !Ae_row || !Ai_row)
     return ARK_INVALID_TABLE;
@@ -2367,10 +2367,10 @@ int mriStep_RKCoeffs(MRIStepCoupling MRIC, int is, int *stage_map,
 int mriStep_Predict(ARKodeMem ark_mem, int istage, N_Vector yguess)
 {
   int i, retval, jstage, nvec;
-  realtype tau;
-  realtype h;
+  sunrealtype tau;
+  sunrealtype h;
   ARKodeMRIStepMem step_mem;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
   /* access ARKodeMRIStepMem structure */
@@ -2500,7 +2500,7 @@ int mriStep_StageSetup(ARKodeMem ark_mem)
   /* local data */
   ARKodeMRIStepMem step_mem;
   int retval, i, j, nvec;
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
   /* access ARKodeMRIStepMem structure */
@@ -2719,9 +2719,9 @@ int MRIStepInnerStepper_SetResetFn(MRIStepInnerStepper stepper,
 
 
 int MRIStepInnerStepper_AddForcing(MRIStepInnerStepper stepper,
-                                   realtype t, N_Vector f)
+                                   sunrealtype t, N_Vector f)
 {
-  realtype tau, taui;
+  sunrealtype tau, taui;
   int i;
 
   if (stepper == NULL)
@@ -2756,7 +2756,7 @@ int MRIStepInnerStepper_AddForcing(MRIStepInnerStepper stepper,
 
 
 int MRIStepInnerStepper_GetForcingData(MRIStepInnerStepper stepper,
-                                       realtype *tshift, realtype *tscale,
+                                       sunrealtype *tshift, sunrealtype *tscale,
                                        N_Vector **forcing, int *nforcing)
 {
   if (stepper == NULL)
@@ -2796,7 +2796,7 @@ int mriStepInnerStepper_HasRequiredOps(MRIStepInnerStepper stepper)
 
 /* Evolve the inner (fast) ODE */
 int mriStepInnerStepper_Evolve(MRIStepInnerStepper stepper,
-                               realtype t0, realtype tout, N_Vector y)
+                               sunrealtype t0, sunrealtype tout, N_Vector y)
 {
   if (stepper == NULL) return ARK_ILL_INPUT;
   if (stepper->ops == NULL) return ARK_ILL_INPUT;
@@ -2824,7 +2824,7 @@ int mriStepInnerStepper_Evolve(MRIStepInnerStepper stepper,
    be made optional when fullrhs is not called unconditionally by the ARKODE
    infrastructure e.g., in arkInitialSetup, arkYddNorm, and arkCompleteStep. */
 int mriStepInnerStepper_FullRhs(MRIStepInnerStepper stepper,
-                                realtype t, N_Vector y, N_Vector f,
+                                sunrealtype t, N_Vector y, N_Vector f,
                                 int mode)
 {
   if (stepper == NULL) return ARK_ILL_INPUT;
@@ -2838,7 +2838,7 @@ int mriStepInnerStepper_FullRhs(MRIStepInnerStepper stepper,
 
 /* Reset the inner (fast) stepper state */
 int mriStepInnerStepper_Reset(MRIStepInnerStepper stepper,
-                              realtype tR, N_Vector yR)
+                              sunrealtype tR, N_Vector yR)
 {
   if (stepper == NULL) return ARK_ILL_INPUT;
   if (stepper->ops == NULL) return ARK_ILL_INPUT;
@@ -2909,7 +2909,7 @@ int mriStepInnerStepper_AllocVecs(MRIStepInnerStepper stepper, int count,
   }
 
   if (stepper->vals == NULL) {
-    stepper->vals = (realtype *) calloc(count + 1, sizeof(realtype));
+    stepper->vals = (sunrealtype *) calloc(count + 1, sizeof(sunrealtype));
     if (stepper->vals == NULL) {
       mriStepInnerStepper_FreeVecs(stepper);
       return(ARK_MEM_FAIL);
diff --git a/src/arkode/arkode_mristep_impl.h b/src/arkode/arkode_mristep_impl.h
index 34e29b8485..38db6d481e 100644
--- a/src/arkode/arkode_mristep_impl.h
+++ b/src/arkode/arkode_mristep_impl.h
@@ -39,12 +39,12 @@ extern "C" {
 
 /* Implicit solver constants (duplicate from arkode_arkstep_impl.h) */
 #define MAXCOR    3              /* max number of nonlinear iterations */
-#define CRDOWN    RCONST(0.3)    /* constant to estimate the convergence
+#define CRDOWN    SUN_RCONST(0.3)    /* constant to estimate the convergence
                                     rate for the nonlinear equation */
-#define DGMAX     RCONST(0.2)    /* if |gamma/gammap-1| > DGMAX then call lsetup */
-#define RDIV      RCONST(2.3)    /* declare divergence if ratio del/delp > RDIV */
+#define DGMAX     SUN_RCONST(0.2)    /* if |gamma/gammap-1| > DGMAX then call lsetup */
+#define RDIV      SUN_RCONST(2.3)    /* declare divergence if ratio del/delp > RDIV */
 #define MSBP      20             /* max no. of steps between lsetup calls */
-#define NLSCOEF   RCONST(0.1)
+#define NLSCOEF   SUN_RCONST(0.1)
 
 /*===============================================================
   MRI time step module data structure
@@ -60,11 +60,11 @@ typedef struct ARKodeMRIStepMemRec {
   /* MRI problem specification */
   ARKRhsFn     fse;              /* y' = fse(t,y) + fsi(t,y) + ff(t,y) */
   ARKRhsFn     fsi;
-  booleantype  linear;           /* SUNTRUE if fi is linear        */
-  booleantype  linear_timedep;   /* SUNTRUE if dfi/dy depends on t */
-  booleantype  explicit_rhs;     /* SUNTRUE if fse is provided     */
-  booleantype  implicit_rhs;     /* SUNTRUE if fsi is provided     */
-  booleantype  deduce_rhs;       /* SUNTRUE if fi is deduced after
+  sunbooleantype  linear;           /* SUNTRUE if fi is linear        */
+  sunbooleantype  linear_timedep;   /* SUNTRUE if dfi/dy depends on t */
+  sunbooleantype  explicit_rhs;     /* SUNTRUE if fse is provided     */
+  sunbooleantype  implicit_rhs;     /* SUNTRUE if fsi is provided     */
+  sunbooleantype  deduce_rhs;       /* SUNTRUE if fi is deduced after
                                     a nonlinear solve              */
 
   /* Outer RK method storage and parameters */
@@ -78,8 +78,8 @@ typedef struct ARKodeMRIStepMemRec {
   int nstages_allocated;         /* number of stage RHS vectors allocated    */
   int *stage_map;                /* index map for storing stage RHS vectors  */
   int *stagetypes;               /* type flags for stages                    */
-  realtype *Ae_row;              /* equivalent explicit RK coeffs            */
-  realtype *Ai_row;              /* equivalent implicit RK coeffs            */
+  sunrealtype *Ae_row;              /* equivalent explicit RK coeffs            */
+  sunrealtype *Ai_row;              /* equivalent implicit RK coeffs            */
 
   /* Algebraic solver data and parameters */
   N_Vector           sdata;      /* old stage data in residual               */
@@ -87,20 +87,20 @@ typedef struct ARKodeMRIStepMemRec {
   N_Vector           zcor;       /* stage correction                         */
   int                istage;     /* current stage index                      */
   SUNNonlinearSolver NLS;        /* generic SUNNonlinearSolver object        */
-  booleantype        ownNLS;     /* flag indicating ownership of NLS         */
+  sunbooleantype        ownNLS;     /* flag indicating ownership of NLS         */
   ARKRhsFn           nls_fsi;    /* fsi(t,y) used in the nonlinear solver    */
-  realtype           gamma;      /* gamma = h * A(i,i)                       */
-  realtype           gammap;     /* gamma at the last setup call             */
-  realtype           gamrat;     /* gamma / gammap                           */
-  realtype           dgmax;      /* call lsetup if |gamma/gammap-1| >= dgmax */
+  sunrealtype           gamma;      /* gamma = h * A(i,i)                       */
+  sunrealtype           gammap;     /* gamma at the last setup call             */
+  sunrealtype           gamrat;     /* gamma / gammap                           */
+  sunrealtype           dgmax;      /* call lsetup if |gamma/gammap-1| >= dgmax */
   int                predictor;  /* implicit prediction method to use        */
-  realtype           crdown;     /* nonlinear conv rate estimation constant  */
-  realtype           rdiv;       /* nonlin divergence if del/delp > rdiv     */
-  realtype           crate;      /* estimated nonlin convergence rate        */
-  realtype           delp;       /* norm of previous nonlinear solver update */
-  realtype           eRNrm;      /* estimated residual norm, used in nonlin
+  sunrealtype           crdown;     /* nonlinear conv rate estimation constant  */
+  sunrealtype           rdiv;       /* nonlin divergence if del/delp > rdiv     */
+  sunrealtype           crate;      /* estimated nonlin convergence rate        */
+  sunrealtype           delp;       /* norm of previous nonlinear solver update */
+  sunrealtype           eRNrm;      /* estimated residual norm, used in nonlin
                                     and linear solver convergence tests      */
-  realtype           nlscoef;    /* coefficient in nonlin. convergence test  */
+  sunrealtype           nlscoef;    /* coefficient in nonlin. convergence test  */
 
   int                msbp;       /* positive => max # steps between lsetup
                                     negative => call at each Newton iter     */
@@ -109,7 +109,7 @@ typedef struct ARKodeMRIStepMemRec {
   int                maxcor;     /* max num iterations for solving the
                                     nonlinear equation                       */
   int                convfail;   /* NLS fail flag (for interface routines)   */
-  booleantype        jcur;       /* is Jacobian info for lin solver current? */
+  sunbooleantype        jcur;       /* is Jacobian info for lin solver current? */
   ARKStagePredictFn  stage_predict;  /* User-supplied stage predictor        */
 
   /* Linear Solver Data */
@@ -135,7 +135,7 @@ typedef struct ARKodeMRIStepMemRec {
   int      nfusedopvecs;  /* length of cvals and Xvecs arrays */
 
   /* Reusable arrays for fused vector operations */
-  realtype* cvals;
+  sunrealtype* cvals;
   N_Vector* Xvecs;
 
 } *ARKodeMRIStepMem;
@@ -168,17 +168,17 @@ struct _MRIStepInnerStepper
   int        nforcing;            /* number of forcing vectors active    */
   int        nforcing_allocated;  /* number of forcing vectors allocated */
   int        last_flag;           /* last stepper return flag            */
-  realtype   tshift;              /* time normalization shift            */
-  realtype   tscale;              /* time normalization scaling          */
+  sunrealtype   tshift;              /* time normalization shift            */
+  sunrealtype   tscale;              /* time normalization scaling          */
 
   /* fused op workspace */
-  realtype* vals;
+  sunrealtype* vals;
   N_Vector* vecs;
 
   /* Space requirements */
-  sunindextype lrw1;        /* no. of realtype words in 1 N_Vector          */
+  sunindextype lrw1;        /* no. of sunrealtype words in 1 N_Vector          */
   sunindextype liw1;        /* no. of integer words in 1 N_Vector           */
-  long int lrw;             /* no. of realtype words in ARKODE work vectors */
+  long int lrw;             /* no. of sunrealtype words in ARKODE work vectors */
   long int liw;             /* no. of integer words in ARKODE work vectors  */
 };
 
@@ -198,17 +198,17 @@ void mriStep_DisableLSetup(void* arkode_mem);
 int mriStep_Init(void* arkode_mem, int init_type);
 void* mriStep_GetLmem(void* arkode_mem);
 ARKRhsFn mriStep_GetImplicitRHS(void* arkode_mem);
-int mriStep_GetGammas(void* arkode_mem, realtype *gamma,
-                      realtype *gamrat, booleantype **jcur,
-                      booleantype *dgamma_fail);
-int mriStep_FullRHS(void* arkode_mem, realtype t,
+int mriStep_GetGammas(void* arkode_mem, sunrealtype *gamma,
+                      sunrealtype *gamrat, sunbooleantype **jcur,
+                      sunbooleantype *dgamma_fail);
+int mriStep_FullRHS(void* arkode_mem, sunrealtype t,
                     N_Vector y, N_Vector f, int mode);
-int mriStep_TakeStep(void* arkode_mem, realtype *dsmPtr, int *nflagPtr);
+int mriStep_TakeStep(void* arkode_mem, sunrealtype *dsmPtr, int *nflagPtr);
 
 /* Internal utility routines */
 int mriStep_AccessStepMem(void* arkode_mem, const char *fname,
                           ARKodeMem *ark_mem, ARKodeMRIStepMem *step_mem);
-booleantype mriStep_CheckNVector(N_Vector tmpl);
+sunbooleantype mriStep_CheckNVector(N_Vector tmpl);
 int mriStep_SetCoupling(ARKodeMem ark_mem);
 int mriStep_CheckCoupling(ARKodeMem ark_mem);
 int mriStep_StageERKFast(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem,
@@ -227,21 +227,21 @@ int mriStep_Nls(ARKodeMem ark_mem, int nflag);
 /* private functions passed to nonlinear solver */
 int mriStep_NlsResidual(N_Vector yy, N_Vector res, void* arkode_mem);
 int mriStep_NlsFPFunction(N_Vector yy, N_Vector res, void* arkode_mem);
-int mriStep_NlsLSetup(booleantype jbad, booleantype* jcur, void* arkode_mem);
+int mriStep_NlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* arkode_mem);
 int mriStep_NlsLSolve(N_Vector delta, void* arkode_mem);
 int mriStep_NlsConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                        realtype tol, N_Vector ewt, void* arkode_mem);
+                        sunrealtype tol, N_Vector ewt, void* arkode_mem);
 
 
 /* Inner stepper functions */
 int mriStepInnerStepper_HasRequiredOps(MRIStepInnerStepper stepper);
 int mriStepInnerStepper_Evolve(MRIStepInnerStepper stepper,
-                               realtype t0, realtype tout, N_Vector y);
+                               sunrealtype t0, sunrealtype tout, N_Vector y);
 int mriStepInnerStepper_FullRhs(MRIStepInnerStepper stepper,
-                                realtype t, N_Vector y, N_Vector f,
+                                sunrealtype t, N_Vector y, N_Vector f,
                                 int mode);
 int mriStepInnerStepper_Reset(MRIStepInnerStepper stepper,
-                              realtype tR, N_Vector yR);
+                              sunrealtype tR, N_Vector yR);
 int mriStepInnerStepper_AllocVecs(MRIStepInnerStepper stepper, int count,
                                   N_Vector tmpl);
 int mriStepInnerStepper_Resize(MRIStepInnerStepper stepper,
@@ -254,11 +254,11 @@ void mriStepInnerStepper_PrintMem(MRIStepInnerStepper stepper,
 
 /* Compute forcing for inner stepper */
 int mriStep_ComputeInnerForcing(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem,
-                                int stage, realtype cdiff);
+                                int stage, sunrealtype cdiff);
 
 /* Return effective RK coefficients (nofast stage) */
 int mriStep_RKCoeffs(MRIStepCoupling MRIC, int is, int *stage_map,
-                     realtype *Ae_row, realtype *Ai_row);
+                     sunrealtype *Ae_row, sunrealtype *Ai_row);
 
 /*===============================================================
   Reusable MRIStep Error Messages
diff --git a/src/arkode/arkode_mristep_io.c b/src/arkode/arkode_mristep_io.c
index da5a76442b..5d740976f0 100644
--- a/src/arkode/arkode_mristep_io.c
+++ b/src/arkode/arkode_mristep_io.c
@@ -44,10 +44,10 @@ int MRIStepSetMaxNumSteps(void *arkode_mem, long int mxsteps) {
   return(arkSetMaxNumSteps(arkode_mem, mxsteps)); }
 int MRIStepSetMaxHnilWarns(void *arkode_mem, int mxhnil) {
   return(arkSetMaxHnilWarns(arkode_mem, mxhnil)); }
-int MRIStepSetStopTime(void *arkode_mem, realtype tstop) {
+int MRIStepSetStopTime(void *arkode_mem, sunrealtype tstop) {
   return(arkSetStopTime(arkode_mem, tstop)); }
 int MRIStepSetInterpolateStopTime(void *arkode_mem,
-                                  booleantype interp) {
+                                  sunbooleantype interp) {
   return(arkSetInterpolateStopTime(arkode_mem, interp)); }
 int MRIStepClearStopTime(void *arkode_mem) {
   return(arkClearStopTime(arkode_mem)); }
@@ -74,11 +74,11 @@ int MRIStepSetJacFn(void *arkode_mem, ARKLsJacFn jac) {
   return(arkLSSetJacFn(arkode_mem, jac)); }
 int MRIStepSetJacEvalFrequency(void *arkode_mem, long int msbj) {
   return(arkLSSetJacEvalFrequency(arkode_mem, msbj)); }
-int MRIStepSetLinearSolutionScaling(void *arkode_mem, booleantype onoff) {
+int MRIStepSetLinearSolutionScaling(void *arkode_mem, sunbooleantype onoff) {
   return(arkLSSetLinearSolutionScaling(arkode_mem, onoff)); }
-int MRIStepSetEpsLin(void *arkode_mem, realtype eplifac) {
+int MRIStepSetEpsLin(void *arkode_mem, sunrealtype eplifac) {
   return(arkLSSetEpsLin(arkode_mem, eplifac)); }
-int MRIStepSetLSNormFactor(void *arkode_mem, realtype nrmfac) {
+int MRIStepSetLSNormFactor(void *arkode_mem, sunrealtype nrmfac) {
   return(arkLSSetNormFactor(arkode_mem, nrmfac)); }
 int MRIStepSetPreconditioner(void *arkode_mem, ARKLsPrecSetupFn psetup,
                              ARKLsPrecSolveFn psolve) {
@@ -98,13 +98,13 @@ int MRIStepSetLinSysFn(void *arkode_mem, ARKLsLinSysFn linsys) {
   ===============================================================*/
 int MRIStepGetNumSteps(void *arkode_mem, long int *nssteps) {
   return(arkGetNumSteps(arkode_mem, nssteps)); }
-int MRIStepGetLastStep(void *arkode_mem, realtype *hlast) {
+int MRIStepGetLastStep(void *arkode_mem, sunrealtype *hlast) {
   return(arkGetLastStep(arkode_mem, hlast)); }
-int MRIStepGetCurrentTime(void *arkode_mem, realtype *tcur) {
+int MRIStepGetCurrentTime(void *arkode_mem, sunrealtype *tcur) {
   return(arkGetCurrentTime(arkode_mem, tcur)); }
 int MRIStepGetCurrentState(void *arkode_mem, N_Vector *state) {
   return(arkGetCurrentState(arkode_mem, state)); }
-int MRIStepGetTolScaleFactor(void *arkode_mem, realtype *tolsfact) {
+int MRIStepGetTolScaleFactor(void *arkode_mem, sunrealtype *tolsfact) {
   return(arkGetTolScaleFactor(arkode_mem, tolsfact)); }
 int MRIStepGetErrWeights(void *arkode_mem, N_Vector eweight) {
   return(arkGetErrWeights(arkode_mem, eweight)); }
@@ -261,7 +261,7 @@ int MRIStepSetLinear(void *arkode_mem, int timedepend)
   /* set parameters */
   step_mem->linear = SUNTRUE;
   step_mem->linear_timedep = (timedepend == 1);
-  step_mem->dgmax = RCONST(100.0)*UNIT_ROUNDOFF;
+  step_mem->dgmax = SUN_RCONST(100.0)*SUN_UNIT_ROUNDOFF;
 
   return(ARK_SUCCESS);
 }
@@ -441,7 +441,7 @@ int MRIStepSetPostInnerFn(void *arkode_mem, MRIStepPostInnerFn postfn)
   Wrapper for generic arkSetFixedStep routine.  Additionally
   enforces current MRIStep constraint for fixed time-stepping.
   ---------------------------------------------------------------*/
-int MRIStepSetFixedStep(void *arkode_mem, realtype hsfixed)
+int MRIStepSetFixedStep(void *arkode_mem, sunrealtype hsfixed)
 {
   ARKodeMem ark_mem;
   if (arkode_mem==NULL) {
@@ -470,7 +470,7 @@ int MRIStepSetFixedStep(void *arkode_mem, realtype hsfixed)
   crdown.  Legal values are strictly positive; illegal values
   imply a reset to the default.
   ---------------------------------------------------------------*/
-int MRIStepSetNonlinCRDown(void *arkode_mem, realtype crdown)
+int MRIStepSetNonlinCRDown(void *arkode_mem, sunrealtype crdown)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -499,7 +499,7 @@ int MRIStepSetNonlinCRDown(void *arkode_mem, realtype crdown)
   rdiv.  Legal values are strictly positive; illegal values
   imply a reset to the default.
   ---------------------------------------------------------------*/
-int MRIStepSetNonlinRDiv(void *arkode_mem, realtype rdiv)
+int MRIStepSetNonlinRDiv(void *arkode_mem, sunrealtype rdiv)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -528,7 +528,7 @@ int MRIStepSetNonlinRDiv(void *arkode_mem, realtype rdiv)
   dgmax.  Legal values are strictly positive; illegal values imply
   a reset to the default.
   ---------------------------------------------------------------*/
-int MRIStepSetDeltaGammaMax(void *arkode_mem, realtype dgmax)
+int MRIStepSetDeltaGammaMax(void *arkode_mem, sunrealtype dgmax)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -657,7 +657,7 @@ int MRIStepSetMaxNonlinIters(void *arkode_mem, int maxcor)
   Specifies the coefficient in the nonlinear solver convergence
   test.  A non-positive input implies a reset to the default value.
   ---------------------------------------------------------------*/
-int MRIStepSetNonlinConvCoef(void *arkode_mem, realtype nlscoef)
+int MRIStepSetNonlinConvCoef(void *arkode_mem, sunrealtype nlscoef)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -783,7 +783,7 @@ int MRIStepGetLastInnerStepFlag(void *arkode_mem, int *flag)
 /*---------------------------------------------------------------
   MRIStepGetCurrentGamma: Returns the current value of gamma
   ---------------------------------------------------------------*/
-int MRIStepGetCurrentGamma(void *arkode_mem, realtype *gamma)
+int MRIStepGetCurrentGamma(void *arkode_mem, sunrealtype *gamma)
 {
   int retval;
   ARKodeMem ark_mem;
@@ -969,7 +969,7 @@ int MRIStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (ark_mem->nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) step_mem->nls_iters / (realtype) ark_mem->nst);
+              (sunrealtype) step_mem->nls_iters / (sunrealtype) ark_mem->nst);
     }
 
     /* linear solver stats */
@@ -988,11 +988,11 @@ int MRIStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (step_mem->nls_iters > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) arkls_mem->nli / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nli / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) arkls_mem->nje / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nje / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) arkls_mem->npe / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->npe / (sunrealtype) step_mem->nls_iters);
       }
     }
     break;
@@ -1008,7 +1008,7 @@ int MRIStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (ark_mem->nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) step_mem->nls_iters / (realtype) ark_mem->nst);
+              (sunrealtype) step_mem->nls_iters / (sunrealtype) ark_mem->nst);
     }
     else
     {
@@ -1031,11 +1031,11 @@ int MRIStepPrintAllStats(void *arkode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (step_mem->nls_iters > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) arkls_mem->nli / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nli / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) arkls_mem->nje / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->nje / (sunrealtype) step_mem->nls_iters);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) arkls_mem->npe / (realtype) step_mem->nls_iters);
+                (sunrealtype) arkls_mem->npe / (sunrealtype) step_mem->nls_iters);
       }
       else
       {
diff --git a/src/arkode/arkode_mristep_nls.c b/src/arkode/arkode_mristep_nls.c
index 1ef2d22887..e6f58320e5 100644
--- a/src/arkode/arkode_mristep_nls.c
+++ b/src/arkode/arkode_mristep_nls.c
@@ -158,9 +158,9 @@ int MRIStepSetNlsRhsFn(void *arkode_mem, ARKRhsFn nls_fsi)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int MRIStepGetNonlinearSystemData(void *arkode_mem, realtype *tcur,
+int MRIStepGetNonlinearSystemData(void *arkode_mem, sunrealtype *tcur,
                                   N_Vector *zpred, N_Vector *z,
-                                  N_Vector *F, realtype *gamma,
+                                  N_Vector *F, sunrealtype *gamma,
                                   N_Vector *sdata, void **user_data)
 {
   ARKodeMem ark_mem;
@@ -267,7 +267,7 @@ int mriStep_NlsInit(ARKodeMem ark_mem)
 int mriStep_Nls(ARKodeMem ark_mem, int nflag)
 {
   ARKodeMRIStepMem step_mem;
-  booleantype callLSetup;
+  sunbooleantype callLSetup;
   long int nls_iters_inc = 0;
   long int nls_fails_inc = 0;
   int retval;
@@ -311,7 +311,7 @@ int mriStep_Nls(ARKodeMem ark_mem, int nflag)
   N_VConst(ZERO, step_mem->zcor);
 
   /* Reset the stored residual norm (for iterative linear solvers) */
-  step_mem->eRNrm = RCONST(0.1) * step_mem->nlscoef;
+  step_mem->eRNrm = SUN_RCONST(0.1) * step_mem->nlscoef;
 
   /* solve the nonlinear system for the actual correction */
   retval = SUNNonlinSolSolve(step_mem->NLS, step_mem->zpred, step_mem->zcor,
@@ -355,7 +355,7 @@ int mriStep_Nls(ARKodeMem ark_mem, int nflag)
   This routine wraps the ARKODE linear solver interface 'setup'
   routine for use by the nonlinear solver object.
   ---------------------------------------------------------------*/
-int mriStep_NlsLSetup(booleantype jbad, booleantype* jcur, void* arkode_mem)
+int mriStep_NlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* arkode_mem)
 {
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
@@ -454,7 +454,7 @@ int mriStep_NlsResidual(N_Vector zcor, N_Vector r, void* arkode_mem)
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
   int retval;
-  realtype c[3];
+  sunrealtype c[3];
   N_Vector X[3];
 
   /* access ARKodeMRIStepMem structure */
@@ -559,12 +559,12 @@ int mriStep_NlsFPFunction(N_Vector zcor, N_Vector g, void* arkode_mem)
       is provided.
   ---------------------------------------------------------------*/
 int mriStep_NlsConvTest(SUNNonlinearSolver NLS, N_Vector y, N_Vector del,
-                        realtype tol, N_Vector ewt, void* arkode_mem)
+                        sunrealtype tol, N_Vector ewt, void* arkode_mem)
 {
   /* temporary variables */
   ARKodeMem ark_mem;
   ARKodeMRIStepMem step_mem;
-  realtype delnrm, dcon;
+  sunrealtype delnrm, dcon;
   int m, retval;
 
   /* access ARKodeMRIStepMem structure */
diff --git a/src/arkode/arkode_relaxation.c b/src/arkode/arkode_relaxation.c
index 5161b46dc0..e7a3953077 100644
--- a/src/arkode/arkode_relaxation.c
+++ b/src/arkode/arkode_relaxation.c
@@ -802,7 +802,7 @@ int arkRelaxDestroy(ARKodeRelaxMem relax_mem)
 }
 
 /* Compute and apply relaxation, called by driver */
-int arkRelax(ARKodeMem ark_mem, int* relax_fails, realtype* dsm_inout,
+int arkRelax(ARKodeMem ark_mem, int* relax_fails, sunrealtype* dsm_inout,
              int* nflag_out)
 {
   int retval;
diff --git a/src/arkode/arkode_root.c b/src/arkode/arkode_root.c
index ff0682ac34..2d0250be99 100644
--- a/src/arkode/arkode_root.c
+++ b/src/arkode/arkode_root.c
@@ -153,14 +153,14 @@ int arkRootInit(ARKodeMem ark_mem, int nrtfn, ARKRootFn g)
 
   /* Allocate necessary memory and return */
   ark_mem->root_mem->glo = NULL;
-  ark_mem->root_mem->glo = (realtype *) malloc(nrt*sizeof(realtype));
+  ark_mem->root_mem->glo = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (ark_mem->root_mem->glo == NULL) {
     arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE",
                     "arkRootInit", MSG_ARK_MEM_FAIL);
     return(ARK_MEM_FAIL);
   }
   ark_mem->root_mem->ghi = NULL;
-  ark_mem->root_mem->ghi = (realtype *) malloc(nrt*sizeof(realtype));
+  ark_mem->root_mem->ghi = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (ark_mem->root_mem->ghi == NULL) {
     free(ark_mem->root_mem->glo); ark_mem->root_mem->glo = NULL;
     arkProcessError(ark_mem, ARK_MEM_FAIL, "ARKODE",
@@ -168,7 +168,7 @@ int arkRootInit(ARKodeMem ark_mem, int nrtfn, ARKRootFn g)
     return(ARK_MEM_FAIL);
   }
   ark_mem->root_mem->grout = NULL;
-  ark_mem->root_mem->grout = (realtype *) malloc(nrt*sizeof(realtype));
+  ark_mem->root_mem->grout = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (ark_mem->root_mem->grout == NULL) {
     free(ark_mem->root_mem->glo); ark_mem->root_mem->glo = NULL;
     free(ark_mem->root_mem->ghi); ark_mem->root_mem->ghi = NULL;
@@ -198,7 +198,7 @@ int arkRootInit(ARKodeMem ark_mem, int nrtfn, ARKRootFn g)
     return(ARK_MEM_FAIL);
   }
   ark_mem->root_mem->gactive = NULL;
-  ark_mem->root_mem->gactive = (booleantype *) malloc(nrt*sizeof(booleantype));
+  ark_mem->root_mem->gactive = (sunbooleantype *) malloc(nrt*sizeof(sunbooleantype));
   if (ark_mem->root_mem->gactive == NULL) {
     free(ark_mem->root_mem->glo); ark_mem->root_mem->glo = NULL;
     free(ark_mem->root_mem->ghi); ark_mem->root_mem->ghi = NULL;
@@ -322,8 +322,8 @@ int arkPrintRootMem(void* arkode_mem, FILE *outfile)
 int arkRootCheck1(void* arkode_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
   ARKodeMem ark_mem;
   ARKodeRootMem rootmem;
   if (arkode_mem == NULL) {
@@ -400,8 +400,8 @@ int arkRootCheck1(void* arkode_mem)
 int arkRootCheck2(void* arkode_mem)
 {
   int i, retval;
-  realtype smallh, tplus;
-  booleantype zroot;
+  sunrealtype smallh, tplus;
+  sunbooleantype zroot;
   ARKodeMem ark_mem;
   ARKodeRootMem rootmem;
   if (arkode_mem == NULL) {
@@ -623,9 +623,9 @@ int arkRootCheck3(void* arkode_mem)
   ---------------------------------------------------------------*/
 int arkRootfind(void* arkode_mem)
 {
-  realtype alpha, tmid, gfrac, maxfrac, fracint, fracsub;
+  sunrealtype alpha, tmid, gfrac, maxfrac, fracint, fracsub;
   int i, retval, imax, side, sideprev;
-  booleantype zroot, sgnchg;
+  sunbooleantype zroot, sgnchg;
   ARKodeMem ark_mem;
   ARKodeRootMem rootmem;
   if (arkode_mem == NULL) {
diff --git a/src/arkode/arkode_root_impl.h b/src/arkode/arkode_root_impl.h
index 224a7413ca..14621b7965 100644
--- a/src/arkode/arkode_root_impl.h
+++ b/src/arkode/arkode_root_impl.h
@@ -34,7 +34,7 @@ extern "C" {
 #define ARK_ROOT_LIW  12   /* int, ptr, etc */
 
 /* Numeric constants */
-#define HUND   RCONST(100.0)    /* real 100.0   */
+#define HUND   SUN_RCONST(100.0)    /* real 100.0   */
 
 
 /*===============================================================
@@ -54,18 +54,18 @@ typedef struct ARKodeRootMemRec {
   int          nrtfn;       /* number of components of g                    */
   int         *iroots;      /* array for root information                   */
   int         *rootdir;     /* array specifying direction of zero-crossing  */
-  realtype     tlo;         /* nearest endpoint of interval in root search  */
-  realtype     thi;         /* farthest endpoint of interval in root search */
-  realtype     trout;       /* t value returned by rootfinding routine      */
-  realtype    *glo;         /* saved array of g values at t = tlo           */
-  realtype    *ghi;         /* saved array of g values at t = thi           */
-  realtype    *grout;       /* array of g values at t = trout               */
-  realtype     toutc;       /* copy of tout (if NORMAL mode)                */
-  realtype     ttol;        /* tolerance on root location                   */
+  sunrealtype     tlo;         /* nearest endpoint of interval in root search  */
+  sunrealtype     thi;         /* farthest endpoint of interval in root search */
+  sunrealtype     trout;       /* t value returned by rootfinding routine      */
+  sunrealtype    *glo;         /* saved array of g values at t = tlo           */
+  sunrealtype    *ghi;         /* saved array of g values at t = thi           */
+  sunrealtype    *grout;       /* array of g values at t = trout               */
+  sunrealtype     toutc;       /* copy of tout (if NORMAL mode)                */
+  sunrealtype     ttol;        /* tolerance on root location                   */
   int          taskc;       /* copy of parameter itask                      */
   int          irfnd;       /* flag showing whether last step had a root    */
   long int     nge;         /* counter for g evaluations                    */
-  booleantype *gactive;     /* array with active/inactive event functions   */
+  sunbooleantype *gactive;     /* array with active/inactive event functions   */
   int          mxgnull;     /* num. warning messages about possible g==0    */
   void        *root_data;   /* pointer to user_data                         */
 
diff --git a/src/arkode/arkode_sprkstep.c b/src/arkode/arkode_sprkstep.c
index f2968ffef3..cf00192884 100644
--- a/src/arkode/arkode_sprkstep.c
+++ b/src/arkode/arkode_sprkstep.c
@@ -33,12 +33,12 @@
   SPRKStep Exported functions -- Required
   ===============================================================*/
 
-void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0, N_Vector y0,
+void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, sunrealtype t0, N_Vector y0,
                      SUNContext sunctx)
 {
   ARKodeMem ark_mem          = NULL;
   ARKodeSPRKStepMem step_mem = NULL;
-  booleantype nvectorOK      = 0;
+  sunbooleantype nvectorOK      = 0;
   int retval                 = 0;
 
   /* Check that f1 and f2 are supplied */
@@ -171,7 +171,7 @@ void* SPRKStepCreate(ARKRhsFn f1, ARKRhsFn f2, realtype t0, N_Vector y0,
 
   Note all internal counters are set to 0 on re-initialization.
   ---------------------------------------------------------------*/
-int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2, realtype t0,
+int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2, sunrealtype t0,
                    N_Vector y0)
 {
   ARKodeMem ark_mem          = NULL;
@@ -238,7 +238,7 @@ int SPRKStepReInit(void* arkode_mem, ARKRhsFn f1, ARKRhsFn f2, realtype t0,
   problem from the given time with the input state (all counter
   values are retained).
   ---------------------------------------------------------------*/
-int SPRKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
+int SPRKStepReset(void* arkode_mem, sunrealtype tR, N_Vector yR)
 {
   ARKodeMem ark_mem          = NULL;
   ARKodeSPRKStepMem step_mem = NULL;
@@ -270,8 +270,8 @@ int SPRKStepReset(void* arkode_mem, realtype tR, N_Vector yR)
   This is the main time-integration driver (wrappers for general
   ARKODE utility routine)
   ---------------------------------------------------------------*/
-int SPRKStepEvolve(void* arkode_mem, realtype tout, N_Vector yout,
-                   realtype* tret, int itask)
+int SPRKStepEvolve(void* arkode_mem, sunrealtype tout, N_Vector yout,
+                   sunrealtype* tret, int itask)
 {
   /* unpack ark_mem, call arkEvolve, and return */
   ARKodeMem ark_mem = NULL;
@@ -296,7 +296,7 @@ int SPRKStepEvolve(void* arkode_mem, realtype tout, N_Vector yout,
   derivatives over the most-recently-computed step (wrapper for
   generic ARKODE utility routine)
   ---------------------------------------------------------------*/
-int SPRKStepGetDky(void* arkode_mem, realtype t, int k, N_Vector dky)
+int SPRKStepGetDky(void* arkode_mem, sunrealtype t, int k, N_Vector dky)
 {
   /* unpack ark_mem, call arkGetDky, and return */
   ARKodeMem ark_mem = NULL;
@@ -517,7 +517,7 @@ int sprkStep_f2(ARKodeSPRKStepMem step_mem, sunrealtype tcur, N_Vector ycur,
   Since RHS values are not stored in SPRKStep we evaluate the RHS functions for
   all modes.
   ----------------------------------------------------------------------------*/
-int sprkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
+int sprkStep_FullRHS(void* arkode_mem, sunrealtype t, N_Vector y, N_Vector f,
                      int mode)
 {
   int retval                 = 0;
@@ -571,7 +571,7 @@ int sprkStep_FullRHS(void* arkode_mem, realtype t, N_Vector y, N_Vector f,
    This requires only 2 vectors in principle, but we use three
    since we persist the stage data. Only the stage data vector
    belongs to SPRKStep, the other two are reused from the ARKODE core. */
-int sprkStep_TakeStep(void* arkode_mem, realtype* dsmPtr, int* nflagPtr)
+int sprkStep_TakeStep(void* arkode_mem, sunrealtype* dsmPtr, int* nflagPtr)
 {
   ARKodeMem ark_mem          = NULL;
   ARKodeSPRKStepMem step_mem = NULL;
@@ -648,7 +648,7 @@ int sprkStep_TakeStep(void* arkode_mem, realtype* dsmPtr, int* nflagPtr)
 /* Increment SPRK algorithm with compensated summation.
    This algorithm requires 6 vectors, but 5 of them are reused
    from the ARKODE core. */
-int sprkStep_TakeStep_Compensated(void* arkode_mem, realtype* dsmPtr,
+int sprkStep_TakeStep_Compensated(void* arkode_mem, sunrealtype* dsmPtr,
                                   int* nflagPtr)
 {
   ARKodeMem ark_mem          = NULL;
@@ -787,7 +787,7 @@ int sprkStep_AccessStepMem(void* arkode_mem, const char* fname,
   This routine checks if all required vector operations are
   present.  If any of them is missing it returns SUNFALSE.
   ---------------------------------------------------------------*/
-booleantype sprkStep_CheckNVector(N_Vector tmpl)
+sunbooleantype sprkStep_CheckNVector(N_Vector tmpl)
 {
   if ((tmpl->ops->nvclone == NULL) || (tmpl->ops->nvdestroy == NULL) ||
       (tmpl->ops->nvlinearsum == NULL) || (tmpl->ops->nvconst == NULL) ||
diff --git a/src/arkode/arkode_sprkstep_impl.h b/src/arkode/arkode_sprkstep_impl.h
index b24f3b62f8..95731cfb8a 100644
--- a/src/arkode/arkode_sprkstep_impl.h
+++ b/src/arkode/arkode_sprkstep_impl.h
@@ -76,7 +76,7 @@ int sprkStep_TakeStep_Compensated(void* arkode_mem, sunrealtype* dsmPtr,
 /* Internal utility routines */
 int sprkStep_AccessStepMem(void* arkode_mem, const char* fname,
                            ARKodeMem* ark_mem, ARKodeSPRKStepMem* step_mem);
-booleantype sprkStep_CheckNVector(N_Vector tmpl);
+sunbooleantype sprkStep_CheckNVector(N_Vector tmpl);
 /* f1 = p' (Force evaluation) */
 int sprkStep_f1(ARKodeSPRKStepMem step_mem, sunrealtype tcur, N_Vector ycur,
                 N_Vector f1, void* user_data);
diff --git a/src/arkode/arkode_sprkstep_io.c b/src/arkode/arkode_sprkstep_io.c
index 0474fd646b..dcd4e7eb93 100644
--- a/src/arkode/arkode_sprkstep_io.c
+++ b/src/arkode/arkode_sprkstep_io.c
@@ -58,7 +58,7 @@ int SPRKStepSetMaxNumSteps(void* arkode_mem, long int mxsteps)
   return (arkSetMaxNumSteps(arkode_mem, mxsteps));
 }
 
-int SPRKStepSetStopTime(void* arkode_mem, realtype tstop)
+int SPRKStepSetStopTime(void* arkode_mem, sunrealtype tstop)
 {
   return (arkSetStopTime(arkode_mem, tstop));
 }
@@ -88,7 +88,7 @@ int SPRKStepSetPostprocessStageFn(void* arkode_mem, ARKPostProcessFn ProcessStag
   return (arkSetPostprocessStageFn(arkode_mem, ProcessStage));
 }
 
-int SPRKStepSetFixedStep(void* arkode_mem, realtype hfixed)
+int SPRKStepSetFixedStep(void* arkode_mem, sunrealtype hfixed)
 {
   return (arkSetFixedStep(arkode_mem, hfixed));
 }
@@ -107,17 +107,17 @@ int SPRKStepGetNumSteps(void* arkode_mem, long int* nsteps)
   return (arkGetNumSteps(arkode_mem, nsteps));
 }
 
-int SPRKStepGetLastStep(void* arkode_mem, realtype* hlast)
+int SPRKStepGetLastStep(void* arkode_mem, sunrealtype* hlast)
 {
   return (arkGetLastStep(arkode_mem, hlast));
 }
 
-int SPRKStepGetCurrentStep(void* arkode_mem, realtype* hcur)
+int SPRKStepGetCurrentStep(void* arkode_mem, sunrealtype* hcur)
 {
   return (arkGetCurrentStep(arkode_mem, hcur));
 }
 
-int SPRKStepGetCurrentTime(void* arkode_mem, realtype* tcur)
+int SPRKStepGetCurrentTime(void* arkode_mem, sunrealtype* tcur)
 {
   return (arkGetCurrentTime(arkode_mem, tcur));
 }
@@ -132,8 +132,8 @@ int SPRKStepGetRootInfo(void* arkode_mem, int* rootsfound)
   return (arkGetRootInfo(arkode_mem, rootsfound));
 }
 
-int SPRKStepGetStepStats(void* arkode_mem, long int* nsteps, realtype* hinused,
-                         realtype* hlast, realtype* hcur, realtype* tcur)
+int SPRKStepGetStepStats(void* arkode_mem, long int* nsteps, sunrealtype* hinused,
+                         sunrealtype* hlast, sunrealtype* hcur, sunrealtype* tcur)
 {
   return (arkGetStepStats(arkode_mem, nsteps, hinused, hlast, hcur, tcur));
 }
diff --git a/src/arkode/arkode_user_controller.c b/src/arkode/arkode_user_controller.c
index ddf3cbd262..4e07574b00 100644
--- a/src/arkode/arkode_user_controller.c
+++ b/src/arkode/arkode_user_controller.c
@@ -97,8 +97,8 @@ SUNAdaptController ARKUserControl(SUNContext sunctx, void* arkode_mem,
 SUNAdaptController_Type SUNAdaptController_GetType_ARKUserControl(SUNAdaptController C)
 { return SUN_ADAPTCONTROLLER_H; }
 
-int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, realtype h,
-                                                   int p, realtype dsm, realtype* hnew)
+int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, sunrealtype h,
+                                                   int p, sunrealtype dsm, sunrealtype* hnew)
 {
   /* call user-provided function to compute new step */
   sunrealtype ttmp = (dsm <= ONE) ? SC_ARKMEM(C)->tn + SC_ARKMEM(C)->h : SC_ARKMEM(C)->tn;
@@ -112,10 +112,10 @@ int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, realtyp
 
 int SUNAdaptController_Reset_ARKUserControl(SUNAdaptController C)
 {
-  SC_EP(C)  = RCONST(1.0);
-  SC_EPP(C) = RCONST(1.0);
-  SC_HP(C)  = RCONST(0.0);
-  SC_HPP(C) = RCONST(0.0);
+  SC_EP(C)  = SUN_RCONST(1.0);
+  SC_EPP(C) = SUN_RCONST(1.0);
+  SC_HP(C)  = SUN_RCONST(0.0);
+  SC_HPP(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -137,7 +137,7 @@ int SUNAdaptController_Write_ARKUserControl(SUNAdaptController C, FILE *fptr)
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
-int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, realtype h, realtype dsm)
+int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, sunrealtype h, sunrealtype dsm)
 {
   SC_HPP(C) = SC_HP(C);
   SC_HP(C) = h;
diff --git a/src/arkode/arkode_user_controller.h b/src/arkode/arkode_user_controller.h
index 201e622b70..c89e91976f 100644
--- a/src/arkode/arkode_user_controller.h
+++ b/src/arkode/arkode_user_controller.h
@@ -32,10 +32,10 @@ extern "C" {
  * --------------------------------------------------- */
 
 struct _ARKUserControlContent {
-  realtype hp;        /* h from previous step */
-  realtype hpp;       /* h from 2 steps ago */
-  realtype ep;        /* error from previous step */
-  realtype epp;       /* error from 2 steps ago */
+  sunrealtype hp;        /* h from previous step */
+  sunrealtype hpp;       /* h from 2 steps ago */
+  sunrealtype ep;        /* error from previous step */
+  sunrealtype epp;       /* error from 2 steps ago */
   ARKodeMem ark_mem;  /* main ARKODE memory structure */
   ARKAdaptFn hadapt;  /* user-provided adaptivity fn */
   void* hadapt_data;  /* user-provided data pointer */
@@ -53,14 +53,14 @@ SUNAdaptController ARKUserControl(SUNContext sunctx, void* arkode_mem,
 SUNDIALS_EXPORT
 SUNAdaptController_Type SUNAdaptController_GetType_ARKUserControl(SUNAdaptController C);
 SUNDIALS_EXPORT
-int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, realtype h,
-                                                   int p, realtype dsm, realtype* hnew);
+int SUNAdaptController_EstimateStep_ARKUserControl(SUNAdaptController C, sunrealtype h,
+                                                   int p, sunrealtype dsm, sunrealtype* hnew);
 SUNDIALS_EXPORT
 int SUNAdaptController_Reset_ARKUserControl(SUNAdaptController C);
 SUNDIALS_EXPORT
 int SUNAdaptController_Write_ARKUserControl(SUNAdaptController C, FILE* fptr);
 SUNDIALS_EXPORT
-int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, realtype h, realtype dsm);
+int SUNAdaptController_UpdateH_ARKUserControl(SUNAdaptController C, sunrealtype h, sunrealtype dsm);
 SUNDIALS_EXPORT
 int SUNAdaptController_Space_ARKUserControl(SUNAdaptController C, long int *lenrw,
                                             long int *leniw);
diff --git a/src/arkode/fmod/farkode_arkstep_mod.c b/src/arkode/fmod/farkode_arkstep_mod.c
index cd0dfe64b1..29b6b1eb92 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.c
+++ b/src/arkode/fmod/farkode_arkstep_mod.c
@@ -237,14 +237,14 @@ SWIGEXPORT void * _wrap_FARKStepCreate(ARKRhsFn farg1, ARKRhsFn farg2, double co
   void * fresult ;
   ARKRhsFn arg1 = (ARKRhsFn) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   SUNContext arg5 = (SUNContext) 0 ;
   void *result = 0 ;
   
   arg1 = (ARKRhsFn)(farg1);
   arg2 = (ARKRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (SUNContext)(farg5);
   result = (void *)ARKStepCreate(arg1,arg2,arg3,arg4,arg5);
@@ -257,16 +257,16 @@ SWIGEXPORT int _wrap_FARKStepResize(void *farg1, N_Vector farg2, double const *f
   int fresult ;
   void *arg1 = (void *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   ARKVecResizeFn arg5 = (ARKVecResizeFn) 0 ;
   void *arg6 = (void *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (ARKVecResizeFn)(farg5);
   arg6 = (void *)(farg6);
   result = (int)ARKStepResize(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -280,14 +280,14 @@ SWIGEXPORT int _wrap_FARKStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3,
   void *arg1 = (void *) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
   ARKRhsFn arg3 = (ARKRhsFn) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (ARKRhsFn)(farg2);
   arg3 = (ARKRhsFn)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)ARKStepReInit(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -298,12 +298,12 @@ SWIGEXPORT int _wrap_FARKStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3,
 SWIGEXPORT int _wrap_FARKStepReset(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)ARKStepReset(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -314,13 +314,13 @@ SWIGEXPORT int _wrap_FARKStepReset(void *farg1, double const *farg2, N_Vector fa
 SWIGEXPORT int _wrap_FARKStepSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)ARKStepSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -330,12 +330,12 @@ SWIGEXPORT int _wrap_FARKStepSStolerances(void *farg1, double const *farg2, doub
 SWIGEXPORT int _wrap_FARKStepSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)ARKStepSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -360,11 +360,11 @@ SWIGEXPORT int _wrap_FARKStepWFtolerances(void *farg1, ARKEwtFn farg2) {
 SWIGEXPORT int _wrap_FARKStepResStolerance(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepResStolerance(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -716,11 +716,11 @@ SWIGEXPORT int _wrap_FARKStepSetAdaptivityAdjustment(void *farg1, int const *far
 SWIGEXPORT int _wrap_FARKStepSetCFLFraction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetCFLFraction(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -730,11 +730,11 @@ SWIGEXPORT int _wrap_FARKStepSetCFLFraction(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetSafetyFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetSafetyFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -744,11 +744,11 @@ SWIGEXPORT int _wrap_FARKStepSetSafetyFactor(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetErrorBias(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetErrorBias(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -758,11 +758,11 @@ SWIGEXPORT int _wrap_FARKStepSetErrorBias(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMaxGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMaxGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -772,11 +772,11 @@ SWIGEXPORT int _wrap_FARKStepSetMaxGrowth(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMinReduction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMinReduction(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -786,13 +786,13 @@ SWIGEXPORT int _wrap_FARKStepSetMinReduction(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)ARKStepSetFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -805,7 +805,7 @@ SWIGEXPORT int _wrap_FARKStepSetAdaptivityMethod(void *farg1, int const *farg2,
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  realtype *arg5 ;
+  sunrealtype *arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -838,11 +838,11 @@ SWIGEXPORT int _wrap_FARKStepSetAdaptivityFn(void *farg1, ARKAdaptFn farg2, void
 SWIGEXPORT int _wrap_FARKStepSetMaxFirstGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMaxFirstGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -852,11 +852,11 @@ SWIGEXPORT int _wrap_FARKStepSetMaxFirstGrowth(void *farg1, double const *farg2)
 SWIGEXPORT int _wrap_FARKStepSetMaxEFailGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMaxEFailGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -880,11 +880,11 @@ SWIGEXPORT int _wrap_FARKStepSetSmallNumEFails(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMaxCFailGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMaxCFailGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -894,11 +894,11 @@ SWIGEXPORT int _wrap_FARKStepSetMaxCFailGrowth(void *farg1, double const *farg2)
 SWIGEXPORT int _wrap_FARKStepSetNonlinCRDown(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetNonlinCRDown(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -908,11 +908,11 @@ SWIGEXPORT int _wrap_FARKStepSetNonlinCRDown(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetNonlinRDiv(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetNonlinRDiv(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -922,11 +922,11 @@ SWIGEXPORT int _wrap_FARKStepSetNonlinRDiv(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetDeltaGammaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetDeltaGammaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1022,11 +1022,11 @@ SWIGEXPORT int _wrap_FARKStepSetMaxConvFails(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1078,11 +1078,11 @@ SWIGEXPORT int _wrap_FARKStepSetMaxHnilWarns(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1092,11 +1092,11 @@ SWIGEXPORT int _wrap_FARKStepSetInitStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1106,11 +1106,11 @@ SWIGEXPORT int _wrap_FARKStepSetMinStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1134,11 +1134,11 @@ SWIGEXPORT int _wrap_FARKStepSetInterpolateStopTime(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FARKStepSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1160,11 +1160,11 @@ SWIGEXPORT int _wrap_FARKStepClearStopTime(void *farg1) {
 SWIGEXPORT int _wrap_FARKStepSetFixedStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetFixedStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1356,11 +1356,11 @@ SWIGEXPORT int _wrap_FARKStepSetLinearSolutionScaling(void *farg1, int const *fa
 SWIGEXPORT int _wrap_FARKStepSetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1370,11 +1370,11 @@ SWIGEXPORT int _wrap_FARKStepSetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMassEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMassEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1384,11 +1384,11 @@ SWIGEXPORT int _wrap_FARKStepSetMassEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1398,11 +1398,11 @@ SWIGEXPORT int _wrap_FARKStepSetLSNormFactor(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FARKStepSetMassLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ARKStepSetMassLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1506,16 +1506,16 @@ SWIGEXPORT int _wrap_FARKStepSetLinSysFn(void *farg1, ARKLsLinSysFn farg2) {
 SWIGEXPORT int _wrap_FARKStepEvolve(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)ARKStepEvolve(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -1526,13 +1526,13 @@ SWIGEXPORT int _wrap_FARKStepEvolve(void *farg1, double const *farg2, N_Vector f
 SWIGEXPORT int _wrap_FARKStepGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)ARKStepGetDky(arg1,arg2,arg3,arg4);
@@ -1706,11 +1706,11 @@ SWIGEXPORT int _wrap_FARKStepGetNumSteps(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1720,11 +1720,11 @@ SWIGEXPORT int _wrap_FARKStepGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1734,11 +1734,11 @@ SWIGEXPORT int _wrap_FARKStepGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1748,11 +1748,11 @@ SWIGEXPORT int _wrap_FARKStepGetCurrentStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1776,11 +1776,11 @@ SWIGEXPORT int _wrap_FARKStepGetCurrentState(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetCurrentGamma(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetCurrentGamma(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1804,11 +1804,11 @@ SWIGEXPORT int _wrap_FARKStepGetCurrentMassMatrix(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FARKStepGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ARKStepGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1986,18 +1986,18 @@ SWIGEXPORT int _wrap_FARKStepGetStepStats(void *farg1, long *farg2, double *farg
   int fresult ;
   void *arg1 = (void *) 0 ;
   long *arg2 = (long *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (long *)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (realtype *)(farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg3 = (sunrealtype *)(farg3);
+  arg4 = (sunrealtype *)(farg4);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
   result = (int)ARKStepGetStepStats(arg1,arg2,arg3,arg4,arg5,arg6);
   fresult = (int)(result);
   return fresult;
@@ -2007,21 +2007,21 @@ SWIGEXPORT int _wrap_FARKStepGetStepStats(void *farg1, long *farg2, double *farg
 SWIGEXPORT int _wrap_FARKStepGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, double *farg6, void *farg7, void *farg8) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   N_Vector *arg7 = (N_Vector *) 0 ;
   void **arg8 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg6 = (sunrealtype *)(farg6);
   arg7 = (N_Vector *)(farg7);
   arg8 = (void **)(farg8);
   result = (int)ARKStepGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
diff --git a/src/arkode/fmod/farkode_arkstep_mod.f90 b/src/arkode/fmod/farkode_arkstep_mod.f90
index 189ac8b844..6bbe5a1d51 100644
--- a/src/arkode/fmod/farkode_arkstep_mod.f90
+++ b/src/arkode/fmod/farkode_arkstep_mod.f90
@@ -4023,13 +4023,13 @@ function FARKStepGetJacTime(arkode_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: arkode_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = arkode_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FARKStepGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/arkode/fmod/farkode_erkstep_mod.c b/src/arkode/fmod/farkode_erkstep_mod.c
index 1e04abc320..128d8bed34 100644
--- a/src/arkode/fmod/farkode_erkstep_mod.c
+++ b/src/arkode/fmod/farkode_erkstep_mod.c
@@ -236,13 +236,13 @@ SWIGINTERN SwigArrayWrapper SwigArrayWrapper_uninitialized() {
 SWIGEXPORT void * _wrap_FERKStepCreate(ARKRhsFn farg1, double const *farg2, N_Vector farg3, void *farg4) {
   void * fresult ;
   ARKRhsFn arg1 = (ARKRhsFn) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   SUNContext arg4 = (SUNContext) 0 ;
   void *result = 0 ;
   
   arg1 = (ARKRhsFn)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (SUNContext)(farg4);
   result = (void *)ERKStepCreate(arg1,arg2,arg3,arg4);
@@ -255,16 +255,16 @@ SWIGEXPORT int _wrap_FERKStepResize(void *farg1, N_Vector farg2, double const *f
   int fresult ;
   void *arg1 = (void *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   ARKVecResizeFn arg5 = (ARKVecResizeFn) 0 ;
   void *arg6 = (void *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (ARKVecResizeFn)(farg5);
   arg6 = (void *)(farg6);
   result = (int)ERKStepResize(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -277,13 +277,13 @@ SWIGEXPORT int _wrap_FERKStepReInit(void *farg1, ARKRhsFn farg2, double const *f
   int fresult ;
   void *arg1 = (void *) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (ARKRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)ERKStepReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -294,12 +294,12 @@ SWIGEXPORT int _wrap_FERKStepReInit(void *farg1, ARKRhsFn farg2, double const *f
 SWIGEXPORT int _wrap_FERKStepReset(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)ERKStepReset(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -310,13 +310,13 @@ SWIGEXPORT int _wrap_FERKStepReset(void *farg1, double const *farg2, N_Vector fa
 SWIGEXPORT int _wrap_FERKStepSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)ERKStepSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -326,12 +326,12 @@ SWIGEXPORT int _wrap_FERKStepSStolerances(void *farg1, double const *farg2, doub
 SWIGEXPORT int _wrap_FERKStepSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)ERKStepSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -510,11 +510,11 @@ SWIGEXPORT int _wrap_FERKStepSetAdaptivityAdjustment(void *farg1, int const *far
 SWIGEXPORT int _wrap_FERKStepSetCFLFraction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetCFLFraction(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -524,11 +524,11 @@ SWIGEXPORT int _wrap_FERKStepSetCFLFraction(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetSafetyFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetSafetyFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -538,11 +538,11 @@ SWIGEXPORT int _wrap_FERKStepSetSafetyFactor(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetErrorBias(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetErrorBias(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -552,11 +552,11 @@ SWIGEXPORT int _wrap_FERKStepSetErrorBias(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetMaxGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMaxGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -566,11 +566,11 @@ SWIGEXPORT int _wrap_FERKStepSetMaxGrowth(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetMinReduction(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMinReduction(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -580,13 +580,13 @@ SWIGEXPORT int _wrap_FERKStepSetMinReduction(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)ERKStepSetFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -599,7 +599,7 @@ SWIGEXPORT int _wrap_FERKStepSetAdaptivityMethod(void *farg1, int const *farg2,
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  realtype *arg5 ;
+  sunrealtype *arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -632,11 +632,11 @@ SWIGEXPORT int _wrap_FERKStepSetAdaptivityFn(void *farg1, ARKAdaptFn farg2, void
 SWIGEXPORT int _wrap_FERKStepSetMaxFirstGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMaxFirstGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -646,11 +646,11 @@ SWIGEXPORT int _wrap_FERKStepSetMaxFirstGrowth(void *farg1, double const *farg2)
 SWIGEXPORT int _wrap_FERKStepSetMaxEFailGrowth(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMaxEFailGrowth(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -746,11 +746,11 @@ SWIGEXPORT int _wrap_FERKStepSetMaxHnilWarns(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -760,11 +760,11 @@ SWIGEXPORT int _wrap_FERKStepSetInitStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -774,11 +774,11 @@ SWIGEXPORT int _wrap_FERKStepSetMinStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FERKStepSetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -802,11 +802,11 @@ SWIGEXPORT int _wrap_FERKStepSetInterpolateStopTime(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FERKStepSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -828,11 +828,11 @@ SWIGEXPORT int _wrap_FERKStepClearStopTime(void *farg1) {
 SWIGEXPORT int _wrap_FERKStepSetFixedStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)ERKStepSetFixedStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -954,16 +954,16 @@ SWIGEXPORT int _wrap_FERKStepSetPostprocessStageFn(void *farg1, ARKPostProcessFn
 SWIGEXPORT int _wrap_FERKStepEvolve(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)ERKStepEvolve(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -974,13 +974,13 @@ SWIGEXPORT int _wrap_FERKStepEvolve(void *farg1, double const *farg2, N_Vector f
 SWIGEXPORT int _wrap_FERKStepGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)ERKStepGetDky(arg1,arg2,arg3,arg4);
@@ -1120,11 +1120,11 @@ SWIGEXPORT int _wrap_FERKStepGetNumSteps(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FERKStepGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ERKStepGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1134,11 +1134,11 @@ SWIGEXPORT int _wrap_FERKStepGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FERKStepGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ERKStepGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1148,11 +1148,11 @@ SWIGEXPORT int _wrap_FERKStepGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FERKStepGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ERKStepGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1162,11 +1162,11 @@ SWIGEXPORT int _wrap_FERKStepGetCurrentStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FERKStepGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ERKStepGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1176,11 +1176,11 @@ SWIGEXPORT int _wrap_FERKStepGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FERKStepGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)ERKStepGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1340,18 +1340,18 @@ SWIGEXPORT int _wrap_FERKStepGetStepStats(void *farg1, long *farg2, double *farg
   int fresult ;
   void *arg1 = (void *) 0 ;
   long *arg2 = (long *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (long *)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (realtype *)(farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg3 = (sunrealtype *)(farg3);
+  arg4 = (sunrealtype *)(farg4);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
   result = (int)ERKStepGetStepStats(arg1,arg2,arg3,arg4,arg5,arg6);
   fresult = (int)(result);
   return fresult;
diff --git a/src/arkode/fmod/farkode_mod.c b/src/arkode/fmod/farkode_mod.c
index 704328f607..3888d4dec2 100644
--- a/src/arkode/fmod/farkode_mod.c
+++ b/src/arkode/fmod/farkode_mod.c
@@ -371,7 +371,7 @@ SWIGEXPORT int _wrap_FARKBBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   ARKLocalFn arg8 = (ARKLocalFn) 0 ;
   ARKCommFn arg9 = (ARKCommFn) 0 ;
   int result;
@@ -382,7 +382,7 @@ SWIGEXPORT int _wrap_FARKBBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (ARKLocalFn)(farg8);
   arg9 = (ARKCommFn)(farg9);
   result = (int)ARKBBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -396,13 +396,13 @@ SWIGEXPORT int _wrap_FARKBBDPrecReInit(void *farg1, int64_t const *farg2, int64_
   void *arg1 = (void *) 0 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)ARKBBDPrecReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -513,11 +513,11 @@ SWIGEXPORT int _wrap_ARKodeButcherTableMem_stages_get(SwigClassWrapper const *fa
 
 SWIGEXPORT void _wrap_ARKodeButcherTableMem_A_set(SwigClassWrapper const *farg1, void *farg2) {
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype **arg2 = (realtype **) 0 ;
+  sunrealtype **arg2 = (sunrealtype **) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::A", return );
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  arg2 = (realtype **)(farg2);
+  arg2 = (sunrealtype **)(farg2);
   if (arg1) (arg1)->A = arg2;
 }
 
@@ -525,11 +525,11 @@ SWIGEXPORT void _wrap_ARKodeButcherTableMem_A_set(SwigClassWrapper const *farg1,
 SWIGEXPORT void * _wrap_ARKodeButcherTableMem_A_get(SwigClassWrapper const *farg1) {
   void * fresult ;
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype **result = 0 ;
+  sunrealtype **result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::A", return 0);
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  result = (realtype **) ((arg1)->A);
+  result = (sunrealtype **) ((arg1)->A);
   fresult = result;
   return fresult;
 }
@@ -537,11 +537,11 @@ SWIGEXPORT void * _wrap_ARKodeButcherTableMem_A_get(SwigClassWrapper const *farg
 
 SWIGEXPORT void _wrap_ARKodeButcherTableMem_c_set(SwigClassWrapper const *farg1, double *farg2) {
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::c", return );
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   if (arg1) (arg1)->c = arg2;
 }
 
@@ -549,11 +549,11 @@ SWIGEXPORT void _wrap_ARKodeButcherTableMem_c_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double * _wrap_ARKodeButcherTableMem_c_get(SwigClassWrapper const *farg1) {
   double * fresult ;
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::c", return 0);
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  result = (realtype *) ((arg1)->c);
+  result = (sunrealtype *) ((arg1)->c);
   fresult = result;
   return fresult;
 }
@@ -561,11 +561,11 @@ SWIGEXPORT double * _wrap_ARKodeButcherTableMem_c_get(SwigClassWrapper const *fa
 
 SWIGEXPORT void _wrap_ARKodeButcherTableMem_b_set(SwigClassWrapper const *farg1, double *farg2) {
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::b", return );
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   if (arg1) (arg1)->b = arg2;
 }
 
@@ -573,11 +573,11 @@ SWIGEXPORT void _wrap_ARKodeButcherTableMem_b_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double * _wrap_ARKodeButcherTableMem_b_get(SwigClassWrapper const *farg1) {
   double * fresult ;
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::b", return 0);
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  result = (realtype *) ((arg1)->b);
+  result = (sunrealtype *) ((arg1)->b);
   fresult = result;
   return fresult;
 }
@@ -585,11 +585,11 @@ SWIGEXPORT double * _wrap_ARKodeButcherTableMem_b_get(SwigClassWrapper const *fa
 
 SWIGEXPORT void _wrap_ARKodeButcherTableMem_d_set(SwigClassWrapper const *farg1, double *farg2) {
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::d", return );
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   if (arg1) (arg1)->d = arg2;
 }
 
@@ -597,11 +597,11 @@ SWIGEXPORT void _wrap_ARKodeButcherTableMem_d_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double * _wrap_ARKodeButcherTableMem_d_get(SwigClassWrapper const *farg1) {
   double * fresult ;
   struct ARKodeButcherTableMem *arg1 = (struct ARKodeButcherTableMem *) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct ARKodeButcherTableMem *", "ARKodeButcherTableMem", "ARKodeButcherTableMem::d", return 0);
   arg1 = (struct ARKodeButcherTableMem *)(farg1->cptr);
-  result = (realtype *) ((arg1)->d);
+  result = (sunrealtype *) ((arg1)->d);
   fresult = result;
   return fresult;
 }
@@ -657,19 +657,19 @@ SWIGEXPORT void * _wrap_FARKodeButcherTable_Create(int const *farg1, int const *
   int arg1 ;
   int arg2 ;
   int arg3 ;
-  realtype *arg4 = (realtype *) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
-  realtype *arg7 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
+  sunrealtype *arg7 = (sunrealtype *) 0 ;
   ARKodeButcherTable result;
   
   arg1 = (int)(*farg1);
   arg2 = (int)(*farg2);
   arg3 = (int)(*farg3);
-  arg4 = (realtype *)(farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
-  arg7 = (realtype *)(farg7);
+  arg4 = (sunrealtype *)(farg4);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
+  arg7 = (sunrealtype *)(farg7);
   result = (ARKodeButcherTable)ARKodeButcherTable_Create(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
   fresult = result;
   return fresult;
@@ -718,6 +718,18 @@ SWIGEXPORT void _wrap_FARKodeButcherTable_Write(void *farg1, void *farg2) {
 }
 
 
+SWIGEXPORT int _wrap_FARKodeButcherTable_IsStifflyAccurate(void *farg1) {
+  int fresult ;
+  ARKodeButcherTable arg1 = (ARKodeButcherTable) 0 ;
+  int result;
+  
+  arg1 = (ARKodeButcherTable)(farg1);
+  result = (int)ARKodeButcherTable_IsStifflyAccurate(arg1);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FARKodeButcherTable_CheckOrder(void *farg1, int *farg2, int *farg3, void *farg4) {
   int fresult ;
   ARKodeButcherTable arg1 = (ARKodeButcherTable) 0 ;
@@ -931,7 +943,7 @@ SWIGEXPORT void _wrap_ARKodeSPRKTableMem_op_assign__(SwigClassWrapper *farg1, Sw
 }
 
 
-SWIGEXPORT void * _wrap_FARKodeSPRKTable_Create(int const *farg1, int const *farg2, double const *farg3, double const *farg4) {
+SWIGEXPORT void * _wrap_FARKodeSPRKTable_Create(int const *farg1, int const *farg2, double *farg3, double *farg4) {
   void * fresult ;
   int arg1 ;
   int arg2 ;
diff --git a/src/arkode/fmod/farkode_mod.f90 b/src/arkode/fmod/farkode_mod.f90
index 6b3e629e0d..c0f017e672 100644
--- a/src/arkode/fmod/farkode_mod.f90
+++ b/src/arkode/fmod/farkode_mod.f90
@@ -160,6 +160,7 @@ module farkode_mod
  public :: FARKodeButcherTable_Space
  public :: FARKodeButcherTable_Free
  public :: FARKodeButcherTable_Write
+ public :: FARKodeButcherTable_IsStifflyAccurate
  public :: FARKodeButcherTable_CheckOrder
  public :: FARKodeButcherTable_CheckARKOrder
  ! typedef enum ARKODE_DIRKTableID
@@ -580,6 +581,14 @@ subroutine swigc_FARKodeButcherTable_Write(farg1, farg2) &
 type(C_PTR), value :: farg2
 end subroutine
 
+function swigc_FARKodeButcherTable_IsStifflyAccurate(farg1) &
+bind(C, name="_wrap_FARKodeButcherTable_IsStifflyAccurate") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+integer(C_INT) :: fresult
+end function
+
 function swigc_FARKodeButcherTable_CheckOrder(farg1, farg2, farg3, farg4) &
 bind(C, name="_wrap_FARKodeButcherTable_CheckOrder") &
 result(fresult)
@@ -1267,6 +1276,19 @@ subroutine FARKodeButcherTable_Write(b, outfile)
 call swigc_FARKodeButcherTable_Write(farg1, farg2)
 end subroutine
 
+function FARKodeButcherTable_IsStifflyAccurate(b) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: b
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+
+farg1 = b
+fresult = swigc_FARKodeButcherTable_IsStifflyAccurate(farg1)
+swig_result = fresult
+end function
+
 function FARKodeButcherTable_CheckOrder(b, q, p, outfile) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
@@ -1439,51 +1461,51 @@ function swigf_ARKodeSPRKTableMem_stages_get(self) &
 subroutine swigf_ARKodeSPRKTableMem_a_set(self, a)
 use, intrinsic :: ISO_C_BINDING
 class(ARKodeSPRKTableMem), intent(in) :: self
-real(C_DOUBLE), target, intent(inout) :: a
+real(C_DOUBLE), dimension(*), target, intent(inout) :: a
 type(SwigClassWrapper) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = self%swigdata
-farg2 = c_loc(a)
+farg2 = c_loc(a(1))
 call swigc_ARKodeSPRKTableMem_a_set(farg1, farg2)
 end subroutine
 
 function swigf_ARKodeSPRKTableMem_a_get(self) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
-real(C_DOUBLE), pointer :: swig_result
+real(C_DOUBLE), dimension(:), pointer :: swig_result
 class(ARKodeSPRKTableMem), intent(in) :: self
 type(C_PTR) :: fresult 
 type(SwigClassWrapper) :: farg1 
 
 farg1 = self%swigdata
 fresult = swigc_ARKodeSPRKTableMem_a_get(farg1)
-call c_f_pointer(fresult, swig_result)
+call c_f_pointer(fresult, swig_result, [1])
 end function
 
 subroutine swigf_ARKodeSPRKTableMem_ahat_set(self, ahat)
 use, intrinsic :: ISO_C_BINDING
 class(ARKodeSPRKTableMem), intent(in) :: self
-real(C_DOUBLE), target, intent(inout) :: ahat
+real(C_DOUBLE), dimension(*), target, intent(inout) :: ahat
 type(SwigClassWrapper) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = self%swigdata
-farg2 = c_loc(ahat)
+farg2 = c_loc(ahat(1))
 call swigc_ARKodeSPRKTableMem_ahat_set(farg1, farg2)
 end subroutine
 
 function swigf_ARKodeSPRKTableMem_ahat_get(self) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING
-real(C_DOUBLE), pointer :: swig_result
+real(C_DOUBLE), dimension(:), pointer :: swig_result
 class(ARKodeSPRKTableMem), intent(in) :: self
 type(C_PTR) :: fresult 
 type(SwigClassWrapper) :: farg1 
 
 farg1 = self%swigdata
 fresult = swigc_ARKodeSPRKTableMem_ahat_get(farg1)
-call c_f_pointer(fresult, swig_result)
+call c_f_pointer(fresult, swig_result, [1])
 end function
 
 function swigf_create_ARKodeSPRKTableMem() &
@@ -1529,8 +1551,8 @@ function FARKodeSPRKTable_Create(s, q, a, ahat) &
 type(C_PTR) :: swig_result
 integer(C_INT), intent(in) :: s
 integer(C_INT), intent(in) :: q
-real(C_DOUBLE), target, intent(inout) :: a
-real(C_DOUBLE), target, intent(inout) :: ahat
+real(C_DOUBLE), dimension(*), target, intent(inout) :: a
+real(C_DOUBLE), dimension(*), target, intent(inout) :: ahat
 type(C_PTR) :: fresult 
 integer(C_INT) :: farg1 
 integer(C_INT) :: farg2 
@@ -1539,8 +1561,8 @@ function FARKodeSPRKTable_Create(s, q, a, ahat) &
 
 farg1 = s
 farg2 = q
-farg3 = c_loc(a)
-farg4 = c_loc(ahat)
+farg3 = c_loc(a(1))
+farg4 = c_loc(ahat(1))
 fresult = swigc_FARKodeSPRKTable_Create(farg1, farg2, farg3, farg4)
 swig_result = fresult
 end function
diff --git a/src/arkode/fmod/farkode_mristep_mod.c b/src/arkode/fmod/farkode_mristep_mod.c
index 0065b6553f..63c3adb087 100644
--- a/src/arkode/fmod/farkode_mristep_mod.c
+++ b/src/arkode/fmod/farkode_mristep_mod.c
@@ -406,11 +406,11 @@ SWIGEXPORT int _wrap_MRIStepCouplingMem_p_get(SwigClassWrapper const *farg1) {
 
 SWIGEXPORT void _wrap_MRIStepCouplingMem_c_set(SwigClassWrapper const *farg1, double *farg2) {
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::c", return );
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   if (arg1) (arg1)->c = arg2;
 }
 
@@ -418,11 +418,11 @@ SWIGEXPORT void _wrap_MRIStepCouplingMem_c_set(SwigClassWrapper const *farg1, do
 SWIGEXPORT double * _wrap_MRIStepCouplingMem_c_get(SwigClassWrapper const *farg1) {
   double * fresult ;
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::c", return 0);
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  result = (realtype *) ((arg1)->c);
+  result = (sunrealtype *) ((arg1)->c);
   fresult = result;
   return fresult;
 }
@@ -430,11 +430,11 @@ SWIGEXPORT double * _wrap_MRIStepCouplingMem_c_get(SwigClassWrapper const *farg1
 
 SWIGEXPORT void _wrap_MRIStepCouplingMem_W_set(SwigClassWrapper const *farg1, void *farg2) {
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype ***arg2 = (realtype ***) 0 ;
+  sunrealtype ***arg2 = (sunrealtype ***) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::W", return );
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  arg2 = (realtype ***)(farg2);
+  arg2 = (sunrealtype ***)(farg2);
   if (arg1) (arg1)->W = arg2;
 }
 
@@ -442,11 +442,11 @@ SWIGEXPORT void _wrap_MRIStepCouplingMem_W_set(SwigClassWrapper const *farg1, vo
 SWIGEXPORT void * _wrap_MRIStepCouplingMem_W_get(SwigClassWrapper const *farg1) {
   void * fresult ;
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype ***result = 0 ;
+  sunrealtype ***result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::W", return 0);
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  result = (realtype ***) ((arg1)->W);
+  result = (sunrealtype ***) ((arg1)->W);
   fresult = result;
   return fresult;
 }
@@ -454,11 +454,11 @@ SWIGEXPORT void * _wrap_MRIStepCouplingMem_W_get(SwigClassWrapper const *farg1)
 
 SWIGEXPORT void _wrap_MRIStepCouplingMem_G_set(SwigClassWrapper const *farg1, void *farg2) {
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype ***arg2 = (realtype ***) 0 ;
+  sunrealtype ***arg2 = (sunrealtype ***) 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::G", return );
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  arg2 = (realtype ***)(farg2);
+  arg2 = (sunrealtype ***)(farg2);
   if (arg1) (arg1)->G = arg2;
 }
 
@@ -466,11 +466,11 @@ SWIGEXPORT void _wrap_MRIStepCouplingMem_G_set(SwigClassWrapper const *farg1, vo
 SWIGEXPORT void * _wrap_MRIStepCouplingMem_G_get(SwigClassWrapper const *farg1) {
   void * fresult ;
   struct MRIStepCouplingMem *arg1 = (struct MRIStepCouplingMem *) 0 ;
-  realtype ***result = 0 ;
+  sunrealtype ***result = 0 ;
   
   SWIG_check_mutable_nonnull(*farg1, "struct MRIStepCouplingMem *", "MRIStepCouplingMem", "MRIStepCouplingMem::G", return 0);
   arg1 = (struct MRIStepCouplingMem *)(farg1->cptr);
-  result = (realtype ***) ((arg1)->G);
+  result = (sunrealtype ***) ((arg1)->G);
   fresult = result;
   return fresult;
 }
@@ -553,18 +553,18 @@ SWIGEXPORT void * _wrap_FMRIStepCoupling_Create(int const *farg1, int const *far
   int arg2 ;
   int arg3 ;
   int arg4 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
-  realtype *arg7 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
+  sunrealtype *arg7 = (sunrealtype *) 0 ;
   MRIStepCoupling result;
   
   arg1 = (int)(*farg1);
   arg2 = (int)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
-  arg7 = (realtype *)(farg7);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
+  arg7 = (sunrealtype *)(farg7);
   result = (MRIStepCoupling)MRIStepCoupling_Create(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
   fresult = result;
   return fresult;
@@ -633,7 +633,7 @@ SWIGEXPORT void * _wrap_FMRIStepCreate(ARKRhsFn farg1, ARKRhsFn farg2, double co
   void * fresult ;
   ARKRhsFn arg1 = (ARKRhsFn) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   MRIStepInnerStepper arg5 = (MRIStepInnerStepper) 0 ;
   SUNContext arg6 = (SUNContext) 0 ;
@@ -641,7 +641,7 @@ SWIGEXPORT void * _wrap_FMRIStepCreate(ARKRhsFn farg1, ARKRhsFn farg2, double co
   
   arg1 = (ARKRhsFn)(farg1);
   arg2 = (ARKRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (MRIStepInnerStepper)(farg5);
   arg6 = (SUNContext)(farg6);
@@ -655,14 +655,14 @@ SWIGEXPORT int _wrap_FMRIStepResize(void *farg1, N_Vector farg2, double const *f
   int fresult ;
   void *arg1 = (void *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   ARKVecResizeFn arg4 = (ARKVecResizeFn) 0 ;
   void *arg5 = (void *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (ARKVecResizeFn)(farg4);
   arg5 = (void *)(farg5);
   result = (int)MRIStepResize(arg1,arg2,arg3,arg4,arg5);
@@ -676,14 +676,14 @@ SWIGEXPORT int _wrap_FMRIStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3,
   void *arg1 = (void *) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
   ARKRhsFn arg3 = (ARKRhsFn) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (ARKRhsFn)(farg2);
   arg3 = (ARKRhsFn)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)MRIStepReInit(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -694,12 +694,12 @@ SWIGEXPORT int _wrap_FMRIStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3,
 SWIGEXPORT int _wrap_FMRIStepReset(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)MRIStepReset(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -710,13 +710,13 @@ SWIGEXPORT int _wrap_FMRIStepReset(void *farg1, double const *farg2, N_Vector fa
 SWIGEXPORT int _wrap_FMRIStepSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)MRIStepSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -726,12 +726,12 @@ SWIGEXPORT int _wrap_FMRIStepSStolerances(void *farg1, double const *farg2, doub
 SWIGEXPORT int _wrap_FMRIStepSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)MRIStepSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -938,11 +938,11 @@ SWIGEXPORT int _wrap_FMRIStepSetMaxNumSteps(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetNonlinCRDown(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetNonlinCRDown(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -952,11 +952,11 @@ SWIGEXPORT int _wrap_FMRIStepSetNonlinCRDown(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetNonlinRDiv(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetNonlinRDiv(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -966,11 +966,11 @@ SWIGEXPORT int _wrap_FMRIStepSetNonlinRDiv(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetDeltaGammaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetDeltaGammaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1022,11 +1022,11 @@ SWIGEXPORT int _wrap_FMRIStepSetMaxNonlinIters(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1050,11 +1050,11 @@ SWIGEXPORT int _wrap_FMRIStepSetMaxHnilWarns(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1090,11 +1090,11 @@ SWIGEXPORT int _wrap_FMRIStepClearStopTime(void *farg1) {
 SWIGEXPORT int _wrap_FMRIStepSetFixedStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetFixedStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1300,11 +1300,11 @@ SWIGEXPORT int _wrap_FMRIStepSetLinearSolutionScaling(void *farg1, int const *fa
 SWIGEXPORT int _wrap_FMRIStepSetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1314,11 +1314,11 @@ SWIGEXPORT int _wrap_FMRIStepSetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FMRIStepSetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)MRIStepSetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1388,16 +1388,16 @@ SWIGEXPORT int _wrap_FMRIStepSetLinSysFn(void *farg1, ARKLsLinSysFn farg2) {
 SWIGEXPORT int _wrap_FMRIStepEvolve(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)MRIStepEvolve(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -1408,13 +1408,13 @@ SWIGEXPORT int _wrap_FMRIStepEvolve(void *farg1, double const *farg2, N_Vector f
 SWIGEXPORT int _wrap_FMRIStepGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)MRIStepGetDky(arg1,arg2,arg3,arg4);
@@ -1516,11 +1516,11 @@ SWIGEXPORT int _wrap_FMRIStepGetNumSteps(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FMRIStepGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)MRIStepGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1530,11 +1530,11 @@ SWIGEXPORT int _wrap_FMRIStepGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FMRIStepGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)MRIStepGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1558,11 +1558,11 @@ SWIGEXPORT int _wrap_FMRIStepGetCurrentState(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FMRIStepGetCurrentGamma(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)MRIStepGetCurrentGamma(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1572,11 +1572,11 @@ SWIGEXPORT int _wrap_FMRIStepGetCurrentGamma(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FMRIStepGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)MRIStepGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1713,21 +1713,21 @@ SWIGEXPORT int _wrap_FMRIStepWriteCoupling(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FMRIStepGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, double *farg6, void *farg7, void *farg8) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   N_Vector *arg7 = (N_Vector *) 0 ;
   void **arg8 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg6 = (sunrealtype *)(farg6);
   arg7 = (N_Vector *)(farg7);
   arg8 = (void **)(farg8);
   result = (int)MRIStepGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
@@ -2108,12 +2108,12 @@ SWIGEXPORT int _wrap_FMRIStepInnerStepper_SetResetFn(void *farg1, MRIStepInnerRe
 SWIGEXPORT int _wrap_FMRIStepInnerStepper_AddForcing(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   MRIStepInnerStepper arg1 = (MRIStepInnerStepper) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (MRIStepInnerStepper)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)MRIStepInnerStepper_AddForcing(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2124,15 +2124,15 @@ SWIGEXPORT int _wrap_FMRIStepInnerStepper_AddForcing(void *farg1, double const *
 SWIGEXPORT int _wrap_FMRIStepInnerStepper_GetForcingData(void *farg1, double *farg2, double *farg3, void *farg4, int *farg5) {
   int fresult ;
   MRIStepInnerStepper arg1 = (MRIStepInnerStepper) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector **arg4 = (N_Vector **) 0 ;
   int *arg5 = (int *) 0 ;
   int result;
   
   arg1 = (MRIStepInnerStepper)(farg1);
-  arg2 = (realtype *)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype *)(farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector **)(farg4);
   arg5 = (int *)(farg5);
   result = (int)MRIStepInnerStepper_GetForcingData(arg1,arg2,arg3,arg4,arg5);
diff --git a/src/arkode/fmod/farkode_mristep_mod.f90 b/src/arkode/fmod/farkode_mristep_mod.f90
index d5de6b89fc..2ab7982f6a 100644
--- a/src/arkode/fmod/farkode_mristep_mod.f90
+++ b/src/arkode/fmod/farkode_mristep_mod.f90
@@ -3187,13 +3187,13 @@ function FMRIStepGetJacTime(arkode_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: arkode_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = arkode_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FMRIStepGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/arkode/fmod/farkode_sprkstep_mod.c b/src/arkode/fmod/farkode_sprkstep_mod.c
index f7ab4ba794..4cf502f9fd 100644
--- a/src/arkode/fmod/farkode_sprkstep_mod.c
+++ b/src/arkode/fmod/farkode_sprkstep_mod.c
@@ -237,14 +237,14 @@ SWIGEXPORT void * _wrap_FSPRKStepCreate(ARKRhsFn farg1, ARKRhsFn farg2, double c
   void * fresult ;
   ARKRhsFn arg1 = (ARKRhsFn) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   SUNContext arg5 = (SUNContext) 0 ;
   void *result = 0 ;
   
   arg1 = (ARKRhsFn)(farg1);
   arg2 = (ARKRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (SUNContext)(farg5);
   result = (void *)SPRKStepCreate(arg1,arg2,arg3,arg4,arg5);
@@ -258,14 +258,14 @@ SWIGEXPORT int _wrap_FSPRKStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3
   void *arg1 = (void *) 0 ;
   ARKRhsFn arg2 = (ARKRhsFn) 0 ;
   ARKRhsFn arg3 = (ARKRhsFn) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (ARKRhsFn)(farg2);
   arg3 = (ARKRhsFn)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)SPRKStepReInit(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -276,12 +276,12 @@ SWIGEXPORT int _wrap_FSPRKStepReInit(void *farg1, ARKRhsFn farg2, ARKRhsFn farg3
 SWIGEXPORT int _wrap_FSPRKStepReset(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)SPRKStepReset(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -418,11 +418,11 @@ SWIGEXPORT int _wrap_FSPRKStepSetMaxNumSteps(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FSPRKStepSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)SPRKStepSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -432,11 +432,11 @@ SWIGEXPORT int _wrap_FSPRKStepSetStopTime(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FSPRKStepSetFixedStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)SPRKStepSetFixedStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -518,16 +518,16 @@ SWIGEXPORT int _wrap_FSPRKStepSetPostprocessStageFn(void *farg1, ARKPostProcessF
 SWIGEXPORT int _wrap_FSPRKStepEvolve(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)SPRKStepEvolve(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -538,13 +538,13 @@ SWIGEXPORT int _wrap_FSPRKStepEvolve(void *farg1, double const *farg2, N_Vector
 SWIGEXPORT int _wrap_FSPRKStepGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)SPRKStepGetDky(arg1,arg2,arg3,arg4);
@@ -597,11 +597,11 @@ SWIGEXPORT int _wrap_FSPRKStepGetCurrentState(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FSPRKStepGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)SPRKStepGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -611,11 +611,11 @@ SWIGEXPORT int _wrap_FSPRKStepGetCurrentStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FSPRKStepGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)SPRKStepGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -625,11 +625,11 @@ SWIGEXPORT int _wrap_FSPRKStepGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FSPRKStepGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)SPRKStepGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -742,18 +742,18 @@ SWIGEXPORT int _wrap_FSPRKStepGetStepStats(void *farg1, long *farg2, double *far
   int fresult ;
   void *arg1 = (void *) 0 ;
   long *arg2 = (long *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (long *)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (realtype *)(farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg3 = (sunrealtype *)(farg3);
+  arg4 = (sunrealtype *)(farg4);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
   result = (int)SPRKStepGetStepStats(arg1,arg2,arg3,arg4,arg5,arg6);
   fresult = (int)(result);
   return fresult;
diff --git a/src/arkode/xbraid/arkode_xbraid.c b/src/arkode/xbraid/arkode_xbraid.c
index da08a0d3ef..24942b02b2 100644
--- a/src/arkode/xbraid/arkode_xbraid.c
+++ b/src/arkode/xbraid/arkode_xbraid.c
@@ -21,7 +21,7 @@
 #include "arkode_xbraid_impl.h"
 #include "arkode_arkstep_impl.h"
 
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 
 /* -------------------------------
@@ -81,8 +81,8 @@ int ARKBraid_Create(void *arkode_mem, braid_App *app)
 
 
 /* Initialize XBraid, attach interface functions */
-int ARKBraid_BraidInit(MPI_Comm comm_w, MPI_Comm comm_t, realtype tstart,
-                       realtype tstop, sunindextype ntime, braid_App app,
+int ARKBraid_BraidInit(MPI_Comm comm_w, MPI_Comm comm_t, sunrealtype tstart,
+                       sunrealtype tstop, sunindextype ntime, braid_App app,
                        braid_Core *core)
 {
   braid_Int       braid_flag;
@@ -284,7 +284,7 @@ int ARKBraid_GetLastARKStepFlag(braid_App app, int *last_flag)
 }
 
 
-int ARKBraid_GetSolution(braid_App app, realtype *tout, N_Vector yout)
+int ARKBraid_GetSolution(braid_App app, sunrealtype *tout, N_Vector yout)
 {
   ARKBraidContent content;
   if (app == NULL) return SUNBRAID_ILLINPUT;
@@ -311,9 +311,9 @@ int ARKBraid_Step(braid_App app, braid_Vector ustop, braid_Vector fstop,
   int             flag;       /* arkode function return flag */
   int             level;      /* current level               */
   int             rfac;       /* refinement factor           */
-  realtype        tstart;     /* current time                */
-  realtype        tstop;      /* evolve to this time         */
-  realtype        hacc;       /* accuracy based step size    */
+  sunrealtype        tstart;     /* current time                */
+  sunrealtype        tstop;      /* evolve to this time         */
+  sunrealtype        hacc;       /* accuracy based step size    */
   ARKBraidContent content;    /* ARKBraid app content        */
 
   /* Check input */
@@ -371,7 +371,7 @@ int ARKBraid_Step(braid_App app, braid_Vector ustop, braid_Vector fstop,
 
 
 /* Create and initialize vectors */
-int ARKBraid_Init(braid_App app, realtype t, braid_Vector *u_ptr)
+int ARKBraid_Init(braid_App app, sunrealtype t, braid_Vector *u_ptr)
 {
   int             flag;     /* return flag          */
   N_Vector        y;        /* output N_Vector      */
@@ -467,12 +467,12 @@ int ARKBraid_Access(braid_App app, braid_Vector u,
 
 
 /* Force a single step with ARKEvolve */
-int ARKBraid_TakeStep(void *arkode_mem, realtype tstart, realtype tstop,
+int ARKBraid_TakeStep(void *arkode_mem, sunrealtype tstart, sunrealtype tstop,
                       N_Vector y, int *ark_flag)
 {
   int      flag;      /* generic return flag      */
   int      tmp_flag;  /* evolve return flag       */
-  realtype tret;      /* return time              */
+  sunrealtype tret;      /* return time              */
 
   /* Check inputs */
   if (arkode_mem == NULL) return ARK_MEM_NULL;
diff --git a/src/arkode/xbraid/arkode_xbraid_impl.h b/src/arkode/xbraid/arkode_xbraid_impl.h
index b34a58e8e8..544e21becf 100644
--- a/src/arkode/xbraid/arkode_xbraid_impl.h
+++ b/src/arkode/xbraid/arkode_xbraid_impl.h
@@ -75,7 +75,7 @@ struct _ARKBraidContent
   int       last_flag_arkode;
 
   /* Output time and state */
-  realtype tout;
+  sunrealtype tout;
   N_Vector yout;
 };
 
diff --git a/src/cvode/cvode.c b/src/cvode/cvode.c
index dddf19e171..c96d702a8f 100644
--- a/src/cvode/cvode.c
+++ b/src/cvode/cvode.c
@@ -32,21 +32,21 @@
 /* CVODE Private Constants                                         */
 /*=================================================================*/
 
-#define ZERO    RCONST(0.0)     /* real 0.0     */
-#define TINY    RCONST(1.0e-10) /* small number */
-#define PT1     RCONST(0.1)     /* real 0.1     */
-#define POINT2  RCONST(0.2)     /* real 0.2     */
-#define FOURTH  RCONST(0.25)    /* real 0.25    */
-#define HALF    RCONST(0.5)     /* real 0.5     */
-#define PT9     RCONST(0.9)     /* real 0.9     */
-#define ONE     RCONST(1.0)     /* real 1.0     */
-#define ONEPT5  RCONST(1.50)    /* real 1.5     */
-#define TWO     RCONST(2.0)     /* real 2.0     */
-#define THREE   RCONST(3.0)     /* real 3.0     */
-#define FOUR    RCONST(4.0)     /* real 4.0     */
-#define FIVE    RCONST(5.0)     /* real 5.0     */
-#define TWELVE  RCONST(12.0)    /* real 12.0    */
-#define HUNDRED RCONST(100.0)   /* real 100.0   */
+#define ZERO    SUN_RCONST(0.0)     /* real 0.0     */
+#define TINY    SUN_RCONST(1.0e-10) /* small number */
+#define PT1     SUN_RCONST(0.1)     /* real 0.1     */
+#define POINT2  SUN_RCONST(0.2)     /* real 0.2     */
+#define FOURTH  SUN_RCONST(0.25)    /* real 0.25    */
+#define HALF    SUN_RCONST(0.5)     /* real 0.5     */
+#define PT9     SUN_RCONST(0.9)     /* real 0.9     */
+#define ONE     SUN_RCONST(1.0)     /* real 1.0     */
+#define ONEPT5  SUN_RCONST(1.50)    /* real 1.5     */
+#define TWO     SUN_RCONST(2.0)     /* real 2.0     */
+#define THREE   SUN_RCONST(3.0)     /* real 3.0     */
+#define FOUR    SUN_RCONST(4.0)     /* real 4.0     */
+#define FIVE    SUN_RCONST(5.0)     /* real 5.0     */
+#define TWELVE  SUN_RCONST(12.0)    /* real 12.0    */
+#define HUNDRED SUN_RCONST(100.0)   /* real 100.0   */
 
 /*=================================================================*/
 /* CVODE Routine-Specific Constants                                */
@@ -108,20 +108,20 @@
  *
  */
 
-#define FUZZ_FACTOR RCONST(100.0)
+#define FUZZ_FACTOR SUN_RCONST(100.0)
 
-#define HLB_FACTOR RCONST(100.0)
-#define HUB_FACTOR RCONST(0.1)
+#define HLB_FACTOR SUN_RCONST(100.0)
+#define HUB_FACTOR SUN_RCONST(0.1)
 #define H_BIAS     HALF
 #define MAX_ITERS  4
 
-#define CORTES RCONST(0.1)
+#define CORTES SUN_RCONST(0.1)
 
 /*=================================================================*/
 /* Private Helper Functions Prototypes                             */
 /*=================================================================*/
 
-static booleantype cvCheckNvector(N_Vector tmpl);
+static sunbooleantype cvCheckNvector(N_Vector tmpl);
 
 /* Initial setup */
 
@@ -129,7 +129,7 @@ static int cvInitialSetup(CVodeMem cv_mem);
 
 /* Memory allocation/deallocation */
 
-static booleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
+static sunbooleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
 static void cvFreeVectors(CVodeMem cv_mem);
 
 static int cvEwtSetSS(CVodeMem cv_mem, N_Vector ycur, N_Vector weight);
@@ -137,16 +137,16 @@ static int cvEwtSetSV(CVodeMem cv_mem, N_Vector ycur, N_Vector weight);
 
 #ifdef SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS
 extern
-int cvEwtSetSS_fused(const booleantype atolmin0,
-                     const realtype reltol,
-                     const realtype Sabstol,
+int cvEwtSetSS_fused(const sunbooleantype atolmin0,
+                     const sunrealtype reltol,
+                     const sunrealtype Sabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
                      N_Vector weight);
 
 extern
-int cvEwtSetSV_fused(const booleantype atolmin0,
-                     const realtype reltol,
+int cvEwtSetSV_fused(const sunbooleantype atolmin0,
+                     const sunrealtype reltol,
                      const N_Vector Vabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
@@ -155,9 +155,9 @@ int cvEwtSetSV_fused(const booleantype atolmin0,
 
 /* Initial stepsize calculation */
 
-static int cvHin(CVodeMem cv_mem, realtype tout);
-static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist);
-static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm);
+static int cvHin(CVodeMem cv_mem, sunrealtype tout);
+static sunrealtype cvUpperBoundH0(CVodeMem cv_mem, sunrealtype tdist);
+static int cvYddNorm(CVodeMem cv_mem, sunrealtype hg, sunrealtype *yddnrm);
 
 /* Main cvStep function */
 
@@ -174,12 +174,12 @@ static void cvDecreaseBDF(CVodeMem cv_mem);
 static void cvPredict(CVodeMem cv_mem);
 static void cvSet(CVodeMem cv_mem);
 static void cvSetAdams(CVodeMem cv_mem);
-static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[]);
-static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype hsum);
-static realtype cvAltSum(int iend, realtype a[], int k);
+static sunrealtype cvAdamsStart(CVodeMem cv_mem, sunrealtype m[]);
+static void cvAdamsFinish(CVodeMem cv_mem, sunrealtype m[], sunrealtype M[], sunrealtype hsum);
+static sunrealtype cvAltSum(int iend, sunrealtype a[], int k);
 static void cvSetBDF(CVodeMem cv_mem);
-static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
-                       realtype alpha0_hat, realtype xi_inv, realtype xistar_inv);
+static void cvSetTqBDF(CVodeMem cv_mem, sunrealtype hsum, sunrealtype alpha0,
+                       sunrealtype alpha0_hat, sunrealtype xi_inv, sunrealtype xistar_inv);
 
 /* Nonlinear solver functions */
 
@@ -195,21 +195,21 @@ int cvCheckConstraints_fused(const N_Vector c,
                              N_Vector tempv);
 #endif
 
-static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                          int *ncfPtr);
 
 /* Error Test */
 
 static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr,
-                         realtype saved_t, int *nefPtr, realtype *dsmPtr);
+                         sunrealtype saved_t, int *nefPtr, sunrealtype *dsmPtr);
 
 /* Function called after a successful step */
 
 static void cvCompleteStep(CVodeMem cv_mem);
-static void cvPrepareNextStep(CVodeMem cv_mem, realtype dsm);
+static void cvPrepareNextStep(CVodeMem cv_mem, sunrealtype dsm);
 static void cvSetEta(CVodeMem cv_mem);
-static realtype cvComputeEtaqm1(CVodeMem cv_mem);
-static realtype cvComputeEtaqp1(CVodeMem cv_mem);
+static sunrealtype cvComputeEtaqm1(CVodeMem cv_mem);
+static sunrealtype cvComputeEtaqp1(CVodeMem cv_mem);
 static void cvChooseEta(CVodeMem cv_mem);
 
 /* Function to handle failures */
@@ -286,7 +286,7 @@ void *CVodeCreate(int lmm, SUNContext sunctx)
   cv_mem->cv_lmm  = lmm;
 
   /* Set uround */
-  cv_mem->cv_uround = UNIT_ROUNDOFF;
+  cv_mem->cv_uround = SUN_UNIT_ROUNDOFF;
 
   /* Set default values for integrator optional inputs */
   cv_mem->cv_f                = NULL;
@@ -388,10 +388,10 @@ void *CVodeCreate(int lmm, SUNContext sunctx)
  * errfp and an error flag is returned. Otherwise, it returns CV_SUCCESS
  */
 
-int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
+int CVodeInit(void *cvode_mem, CVRhsFn f, sunrealtype t0, N_Vector y0)
 {
   CVodeMem cv_mem;
-  booleantype nvectorOK, allocOK;
+  sunbooleantype nvectorOK, allocOK;
   sunindextype lrw1, liw1;
   int i,k, retval;
   SUNNonlinearSolver NLS;
@@ -562,7 +562,7 @@ int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
  * a negative value otherwise.
  */
 
-int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0)
+int CVodeReInit(void *cvode_mem, sunrealtype t0, N_Vector y0)
 {
   CVodeMem cv_mem;
   int i,k;
@@ -667,7 +667,7 @@ int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0)
  *   which will be called to set the error weight vector.
  */
 
-int CVodeSStolerances(void *cvode_mem, realtype reltol, realtype abstol)
+int CVodeSStolerances(void *cvode_mem, sunrealtype reltol, sunrealtype abstol)
 {
   CVodeMem cv_mem;
 
@@ -714,10 +714,10 @@ int CVodeSStolerances(void *cvode_mem, realtype reltol, realtype abstol)
 }
 
 
-int CVodeSVtolerances(void *cvode_mem, realtype reltol, N_Vector abstol)
+int CVodeSVtolerances(void *cvode_mem, sunrealtype reltol, N_Vector abstol)
 {
   CVodeMem cv_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODE", "CVodeSVtolerances",
@@ -891,7 +891,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
 
   /* Allocate necessary memory and return */
   cv_mem->cv_glo = NULL;
-  cv_mem->cv_glo = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_glo = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_glo == NULL) {
     cvProcessError(cv_mem, CV_MEM_FAIL, "CVODE", "CVodeRootInit",
                    MSGCV_MEM_FAIL);
@@ -899,7 +899,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_ghi = NULL;
-  cv_mem->cv_ghi = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_ghi = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_ghi == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     cvProcessError(cv_mem, CV_MEM_FAIL, "CVODE", "CVodeRootInit",
@@ -908,7 +908,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_grout = NULL;
-  cv_mem->cv_grout = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_grout = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_grout == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     free(cv_mem->cv_ghi); cv_mem->cv_ghi = NULL;
@@ -941,7 +941,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_gactive = NULL;
-  cv_mem->cv_gactive = (booleantype *) malloc(nrt*sizeof(booleantype));
+  cv_mem->cv_gactive = (sunbooleantype *) malloc(nrt*sizeof(sunbooleantype));
   if (cv_mem->cv_gactive == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     free(cv_mem->cv_ghi); cv_mem->cv_ghi = NULL;
@@ -988,15 +988,15 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
  * In the CV_ONE_STEP mode, it takes one internal step and returns.
  */
 
-int CVode(void *cvode_mem, realtype tout, N_Vector yout,
-          realtype *tret, int itask)
+int CVode(void *cvode_mem, sunrealtype tout, N_Vector yout,
+          sunrealtype *tret, int itask)
 {
   CVodeMem cv_mem;
   long int nstloc;
   int retval, hflag, kflag, istate, ir, ier, irfndp;
   int ewtsetOK;
-  realtype troundoff, tout_hin, rh, nrm;
-  booleantype inactive_roots;
+  sunrealtype troundoff, tout_hin, rh, nrm;
+  sunbooleantype inactive_roots;
 
   /*
    * -------------------------------------
@@ -1510,10 +1510,10 @@ int CVode(void *cvode_mem, realtype tout, N_Vector yout,
  * may also be called directly by the user.
  */
 
-int CVodeGetDky(void *cvode_mem, realtype t, int k, N_Vector dky)
+int CVodeGetDky(void *cvode_mem, sunrealtype t, int k, N_Vector dky)
 {
-  realtype s, r;
-  realtype tfuzz, tp, tn1;
+  sunrealtype s, r;
+  sunrealtype tfuzz, tp, tn1;
   int i, j, nvec, ier;
   CVodeMem cv_mem;
 
@@ -1665,7 +1665,7 @@ void CVodeFree(void **cvode_mem)
  * If any of them is missing it returns SUNFALSE.
  */
 
-static booleantype cvCheckNvector(N_Vector tmpl)
+static sunbooleantype cvCheckNvector(N_Vector tmpl)
 {
   if((tmpl->ops->nvclone     == NULL) ||
      (tmpl->ops->nvdestroy   == NULL) ||
@@ -1702,7 +1702,7 @@ static booleantype cvCheckNvector(N_Vector tmpl)
  * allocated here.
  */
 
-static booleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
+static sunbooleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -1845,7 +1845,7 @@ static void cvFreeVectors(CVodeMem cv_mem)
 static int cvInitialSetup(CVodeMem cv_mem)
 {
   int ier;
-  booleantype conOK;
+  sunbooleantype conOK;
 
   /* Did the user specify tolerances? */
   if (cv_mem->cv_itol == CV_NN) {
@@ -1969,12 +1969,12 @@ static int cvInitialSetup(CVodeMem cv_mem)
  * Finally, we apply a bias (0.5) and verify that h0 is within bounds.
  */
 
-static int cvHin(CVodeMem cv_mem, realtype tout)
+static int cvHin(CVodeMem cv_mem, sunrealtype tout)
 {
   int retval, sign, count1, count2;
-  realtype tdiff, tdist, tround, hlb, hub;
-  realtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
-  booleantype hgOK;
+  sunrealtype tdiff, tdist, tround, hlb, hub;
+  sunrealtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
+  sunbooleantype hgOK;
 
   /* If tout is too close to tn, give up */
 
@@ -2078,9 +2078,9 @@ static int cvHin(CVodeMem cv_mem, realtype tout)
  * tdist = tn - t0 and the values of y[i]/y'[i].
  */
 
-static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist)
+static sunrealtype cvUpperBoundH0(CVodeMem cv_mem, sunrealtype tdist)
 {
-  realtype hub_inv, hub;
+  sunrealtype hub_inv, hub;
   N_Vector temp1, temp2;
 
   /*
@@ -2123,7 +2123,7 @@ static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist)
  * using a difference quotient, and returns its WRMS norm.
  */
 
-static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm)
+static int cvYddNorm(CVodeMem cv_mem, sunrealtype hg, sunrealtype *yddnrm)
 {
   int retval;
 
@@ -2169,15 +2169,15 @@ static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm)
 
 static int cvStep(CVodeMem cv_mem)
 {
-  realtype saved_t;          /* time to restore to if a failure occurs   */
-  realtype dsm;              /* local truncation error estimate          */
+  sunrealtype saved_t;          /* time to restore to if a failure occurs   */
+  sunrealtype dsm;              /* local truncation error estimate          */
   int ncf;                   /* corrector failures in this step attempt  */
   int npf;                   /* projection failures in this step attempt */
   int nef;                   /* error test failures in this step attempt */
   int nflag, kflag;          /* nonlinear solver flags                   */
   int pflag;                 /* projection return flag                   */
   int eflag;                 /* error test return flag                   */
-  booleantype doProjection;  /* flag to apply projection in this step    */
+  sunbooleantype doProjection;  /* flag to apply projection in this step    */
 
   /* Initialize local counters for convergence and error test failures */
 
@@ -2334,7 +2334,7 @@ static void cvAdjustOrder(CVodeMem cv_mem, int deltaq)
 static void cvAdjustAdams(CVodeMem cv_mem, int deltaq)
 {
   int i, j;
-  realtype xi, hsum;
+  sunrealtype xi, hsum;
 
   /* On an order increase, set new column of zn to zero and return */
 
@@ -2409,7 +2409,7 @@ static void cvAdjustBDF(CVodeMem cv_mem, int deltaq)
 
 static void cvIncreaseBDF(CVodeMem cv_mem)
 {
-  realtype alpha0, alpha1, prod, xi, xiold, hsum, A1;
+  sunrealtype alpha0, alpha1, prod, xi, xiold, hsum, A1;
   int i, j;
 
   for (i=0; i <= cv_mem->cv_qmax; i++) cv_mem->cv_l[i] = ZERO;
@@ -2451,7 +2451,7 @@ static void cvIncreaseBDF(CVodeMem cv_mem)
 
 static void cvDecreaseBDF(CVodeMem cv_mem)
 {
-  realtype hsum, xi;
+  sunrealtype hsum, xi;
   int i, j;
 
   for (i=0; i <= cv_mem->cv_qmax; i++) cv_mem->cv_l[i] = ZERO;
@@ -2586,7 +2586,7 @@ static void cvSet(CVodeMem cv_mem)
 
 static void cvSetAdams(CVodeMem cv_mem)
 {
-  realtype m[L_MAX], M[3], hsum;
+  sunrealtype m[L_MAX], M[3], hsum;
 
   if (cv_mem->cv_q == 1) {
     cv_mem->cv_l[0] = cv_mem->cv_l[1] = cv_mem->cv_tq[1] = cv_mem->cv_tq[5] = ONE;
@@ -2611,9 +2611,9 @@ static void cvSetAdams(CVodeMem cv_mem)
  * polynomial needed for the Adams l and tq coefficients for q > 1.
  */
 
-static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[])
+static sunrealtype cvAdamsStart(CVodeMem cv_mem, sunrealtype m[])
 {
-  realtype hsum, xi_inv, sum;
+  sunrealtype hsum, xi_inv, sum;
   int i, j;
 
   hsum = cv_mem->cv_h;
@@ -2638,10 +2638,10 @@ static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[])
  * This routine completes the calculation of the Adams l and tq.
  */
 
-static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype hsum)
+static void cvAdamsFinish(CVodeMem cv_mem, sunrealtype m[], sunrealtype M[], sunrealtype hsum)
 {
   int i;
-  realtype M0_inv, xi, xi_inv;
+  sunrealtype M0_inv, xi, xi_inv;
 
   M0_inv = ONE / M[0];
 
@@ -2673,10 +2673,10 @@ static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype
  * of a polynomial x^(k-1) M(x) given the coefficients of M(x).
  */
 
-static realtype cvAltSum(int iend, realtype a[], int k)
+static sunrealtype cvAltSum(int iend, sunrealtype a[], int k)
 {
   int i, sign;
-  realtype sum;
+  sunrealtype sum;
 
   if (iend < 0) return(ZERO);
 
@@ -2717,7 +2717,7 @@ static realtype cvAltSum(int iend, realtype a[], int k)
 
 static void cvSetBDF(CVodeMem cv_mem)
 {
-  realtype alpha0, alpha0_hat, xi_inv, xistar_inv, hsum;
+  sunrealtype alpha0, alpha0_hat, xi_inv, xistar_inv, hsum;
   int i,j;
 
   cv_mem->cv_l[0] = cv_mem->cv_l[1] = xi_inv = xistar_inv = ONE;
@@ -2763,11 +2763,11 @@ static void cvSetBDF(CVodeMem cv_mem)
  * lmm == CV_BDF.
  */
 
-static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
-                       realtype alpha0_hat, realtype xi_inv, realtype xistar_inv)
+static void cvSetTqBDF(CVodeMem cv_mem, sunrealtype hsum, sunrealtype alpha0,
+                       sunrealtype alpha0_hat, sunrealtype xi_inv, sunrealtype xistar_inv)
 {
-  realtype A1, A2, A3, A4, A5, A6;
-  realtype C, Cpinv, Cppinv;
+  sunrealtype A1, A2, A3, A4, A5, A6;
+  sunrealtype C, Cpinv, Cppinv;
 
   A1 = ONE - alpha0_hat + alpha0;
   A2 = ONE + cv_mem->cv_q * A1;
@@ -2808,7 +2808,7 @@ static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
 static int cvNls(CVodeMem cv_mem, int nflag)
 {
   int flag = CV_SUCCESS;
-  booleantype callSetup;
+  sunbooleantype callSetup;
   long int nni_inc = 0;
   long int nnf_inc = 0;
 
@@ -2887,8 +2887,8 @@ static int cvNls(CVodeMem cv_mem, int nflag)
 
 static int cvCheckConstraints(CVodeMem cv_mem)
 {
-  booleantype constraintsPassed;
-  realtype vnorm;
+  sunbooleantype constraintsPassed;
+  sunrealtype vnorm;
   N_Vector mm  = cv_mem->cv_ftemp;
   N_Vector tmp = cv_mem->cv_tempv;
 
@@ -2978,7 +2978,7 @@ static int cvCheckConstraints(CVodeMem cv_mem)
  *
  */
 
-static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                          int *ncfPtr)
 {
   int nflag;
@@ -3032,7 +3032,7 @@ static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
  * the same values as before the call to cvPredict.
  */
 
-void cvRestore(CVodeMem cv_mem, realtype saved_t)
+void cvRestore(CVodeMem cv_mem, sunrealtype saved_t)
 {
   int j, k;
 
@@ -3072,10 +3072,10 @@ void cvRestore(CVodeMem cv_mem, realtype saved_t)
  *
  */
 
-static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
-                         int *nefPtr, realtype *dsmPtr)
+static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
+                         int *nefPtr, sunrealtype *dsmPtr)
 {
-  realtype dsm;
+  sunrealtype dsm;
   int retval;
 
   dsm = cv_mem->cv_acnrm * cv_mem->cv_tq[2];
@@ -3242,7 +3242,7 @@ static void cvCompleteStep(CVodeMem cv_mem)
  * related to a change of step size or order.
  */
 
-static void cvPrepareNextStep(CVodeMem cv_mem, realtype dsm)
+static void cvPrepareNextStep(CVodeMem cv_mem, sunrealtype dsm)
 {
   /* If etamax = 1, defer step size or order changes */
   if (cv_mem->cv_etamax == ONE) {
@@ -3323,9 +3323,9 @@ static void cvSetEta(CVodeMem cv_mem)
  * possible decrease in order by 1.
  */
 
-static realtype cvComputeEtaqm1(CVodeMem cv_mem)
+static sunrealtype cvComputeEtaqm1(CVodeMem cv_mem)
 {
-  realtype ddn;
+  sunrealtype ddn;
 
   cv_mem->cv_etaqm1 = ZERO;
   if (cv_mem->cv_q > 1) {
@@ -3342,9 +3342,9 @@ static realtype cvComputeEtaqm1(CVodeMem cv_mem)
  * possible increase in order by 1.
  */
 
-static realtype cvComputeEtaqp1(CVodeMem cv_mem)
+static sunrealtype cvComputeEtaqp1(CVodeMem cv_mem)
 {
-  realtype dup, cquot;
+  sunrealtype dup, cquot;
 
   cv_mem->cv_etaqp1 = ZERO;
   if (cv_mem->cv_q != cv_mem->cv_qmax) {
@@ -3373,7 +3373,7 @@ static realtype cvComputeEtaqp1(CVodeMem cv_mem)
 
 static void cvChooseEta(CVodeMem cv_mem)
 {
-  realtype etam;
+  sunrealtype etam;
 
   etam = SUNMAX(cv_mem->cv_etaqm1, SUNMAX(cv_mem->cv_etaq, cv_mem->cv_etaqp1));
 
@@ -3538,7 +3538,7 @@ static int cvHandleFailure(CVodeMem cv_mem, int flag)
 static void cvBDFStab(CVodeMem cv_mem)
 {
   int i,k, ldflag, factorial;
-  realtype sq, sqm1, sqm2;
+  sunrealtype sq, sqm1, sqm2;
 
   /* If order is 3 or greater, then save scaled derivative data,
      push old data down in i, then add current values to top.    */
@@ -3627,22 +3627,22 @@ static void cvBDFStab(CVodeMem cv_mem)
 static int cvSLdet(CVodeMem cv_mem)
 {
   int i, k, j, it, kmin = 0, kflag = 0;
-  realtype rat[5][4], rav[4], qkr[4], sigsq[4], smax[4], ssmax[4];
-  realtype drr[4], rrc[4],sqmx[4], qjk[4][4], vrat[5], qc[6][4], qco[6][4];
-  realtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol;
-  realtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr;
-  realtype tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin;
-  realtype rsa, rsb, rsc, rsd, rd1a, rd1b, rd1c;
-  realtype rd2a, rd2b, rd3a, cest1, corr1;
-  realtype ratp, ratm, qfac1, qfac2, bb, rrb;
+  sunrealtype rat[5][4], rav[4], qkr[4], sigsq[4], smax[4], ssmax[4];
+  sunrealtype drr[4], rrc[4],sqmx[4], qjk[4][4], vrat[5], qc[6][4], qco[6][4];
+  sunrealtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol;
+  sunrealtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr;
+  sunrealtype tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin;
+  sunrealtype rsa, rsb, rsc, rsd, rd1a, rd1b, rd1c;
+  sunrealtype rd2a, rd2b, rd3a, cest1, corr1;
+  sunrealtype ratp, ratm, qfac1, qfac2, bb, rrb;
 
   /* The following are cutoffs and tolerances used by this routine */
 
-  rrcut  = RCONST(0.98);
-  vrrtol = RCONST(1.0e-4);
-  vrrt2  = RCONST(5.0e-4);
-  sqtol  = RCONST(1.0e-3);
-  rrtol  = RCONST(1.0e-2);
+  rrcut  = SUN_RCONST(0.98);
+  vrrtol = SUN_RCONST(1.0e-4);
+  vrrt2  = SUN_RCONST(5.0e-4);
+  sqtol  = SUN_RCONST(1.0e-3);
+  rrtol  = SUN_RCONST(1.0e-2);
 
   rr = ZERO;
 
@@ -3919,8 +3919,8 @@ static int cvSLdet(CVodeMem cv_mem)
 static int cvRcheck1(CVodeMem cv_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   for (i = 0; i < cv_mem->cv_nrtfn; i++) cv_mem->cv_iroots[i] = 0;
   cv_mem->cv_tlo = cv_mem->cv_tn;
@@ -3987,8 +3987,8 @@ static int cvRcheck1(CVodeMem cv_mem)
 static int cvRcheck2(CVodeMem cv_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   if (cv_mem->cv_irfnd == 0) return(CV_SUCCESS);
 
@@ -4182,9 +4182,9 @@ static int cvRcheck3(CVodeMem cv_mem)
 
 static int cvRootfind(CVodeMem cv_mem)
 {
-  realtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
+  sunrealtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
   int i, retval, imax, side, sideprev;
-  booleantype zroot, sgnchg;
+  sunbooleantype zroot, sgnchg;
 
   imax = 0;
 
diff --git a/src/cvode/cvode_bandpre.c b/src/cvode/cvode_bandpre.c
index 604181346f..d56018af08 100644
--- a/src/cvode/cvode_bandpre.c
+++ b/src/cvode/cvode_bandpre.c
@@ -28,25 +28,25 @@
 #include "cvode_ls_impl.h"
 #include <sundials/sundials_math.h>
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /* Prototypes of CVBandPrecSetup and CVBandPrecSolve */
-static int CVBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bp_data);
-static int CVBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int CVBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bp_data);
+static int CVBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                            N_Vector r, N_Vector z,
-                           realtype gamma, realtype delta,
+                           sunrealtype gamma, sunrealtype delta,
                            int lr, void *bp_data);
 
 /* Prototype for CVBandPrecFree */
 static int CVBandPrecFree(CVodeMem cv_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int CVBandPDQJac(CVBandPrecData pdata, realtype t, N_Vector y,
+static int CVBandPDQJac(CVBandPrecData pdata, sunrealtype t, N_Vector y,
                         N_Vector fy, N_Vector ftemp, N_Vector ytemp);
 
 
@@ -334,9 +334,9 @@ int CVBandPrecGetNumRhsEvals(void *cvode_mem, long int *nfevalsBP)
     0  if successful, or
     1  if the band factorization failed.
   -----------------------------------------------------------------*/
-static int CVBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bp_data)
+static int CVBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bp_data)
 {
   CVBandPrecData pdata;
   CVodeMem cv_mem;
@@ -428,9 +428,9 @@ static int CVBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
   The value returned by the CVBandPrecSolve function is always 0,
   indicating success.
   -----------------------------------------------------------------*/
-static int CVBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
-                           N_Vector r, N_Vector z, realtype gamma,
-                           realtype delta, int lr, void *bp_data)
+static int CVBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
+                           N_Vector r, N_Vector z, sunrealtype gamma,
+                           sunrealtype delta, int lr, void *bp_data)
 {
   CVBandPrecData pdata;
   int retval;
@@ -479,14 +479,14 @@ static int CVBandPrecFree(CVodeMem cv_mem)
   write a simple for loop to set each of the elements of a column
   in succession.
   -----------------------------------------------------------------*/
-static int CVBandPDQJac(CVBandPrecData pdata, realtype t, N_Vector y,
+static int CVBandPDQJac(CVBandPrecData pdata, sunrealtype t, N_Vector y,
                         N_Vector fy, N_Vector ftemp, N_Vector ytemp)
 {
   CVodeMem cv_mem;
-  realtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
+  sunrealtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *col_j, *ewt_data, *fy_data, *ftemp_data;
-  realtype *y_data, *ytemp_data, *cns_data;
+  sunrealtype *col_j, *ewt_data, *fy_data, *ftemp_data;
+  sunrealtype *y_data, *ytemp_data, *cns_data;
   int retval;
 
   /* initialize cns_data to avoid compiler warning */
diff --git a/src/cvode/cvode_bbdpre.c b/src/cvode/cvode_bbdpre.c
index 0b160d396f..c7d6d7ff62 100644
--- a/src/cvode/cvode_bbdpre.c
+++ b/src/cvode/cvode_bbdpre.c
@@ -30,25 +30,25 @@
 #include <sundials/sundials_math.h>
 #include <nvector/nvector_serial.h>
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /* Prototypes of functions CVBBDPrecSetup and CVBBDPrecSolve */
-static int CVBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                          booleantype jok, booleantype *jcurPtr,
-                          realtype gamma, void *bbd_data);
-static int CVBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int CVBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                          sunbooleantype jok, sunbooleantype *jcurPtr,
+                          sunrealtype gamma, void *bbd_data);
+static int CVBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                           N_Vector r, N_Vector z,
-                          realtype gamma, realtype delta,
+                          sunrealtype gamma, sunrealtype delta,
                           int lr, void *bbd_data);
 
 /* Prototype for CVBBDPrecFree */
 static int CVBBDPrecFree(CVodeMem cv_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int CVBBDDQJac(CVBBDPrecData pdata, realtype t,
+static int CVBBDDQJac(CVBBDPrecData pdata, sunrealtype t,
                       N_Vector y, N_Vector gy,
                       N_Vector ytemp, N_Vector gtemp);
 
@@ -58,7 +58,7 @@ static int CVBBDDQJac(CVBBDPrecData pdata, realtype t,
 int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
                   sunindextype mudq, sunindextype mldq,
                   sunindextype mukeep, sunindextype mlkeep,
-                  realtype dqrely, CVLocalFn gloc, CVCommFn cfn)
+                  sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn)
 {
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
@@ -282,7 +282,7 @@ int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
 
 
 int CVBBDPrecReInit(void *cvode_mem, sunindextype mudq,
-                    sunindextype mldq, realtype dqrely)
+                    sunindextype mldq, sunrealtype dqrely)
 {
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
@@ -444,9 +444,9 @@ int CVBBDPrecGetNumGfnEvals(void *cvode_mem,
     0  if successful,
     1  for a recoverable error (step will be retried).
   -----------------------------------------------------------------*/
-static int CVBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                          booleantype jok, booleantype *jcurPtr,
-                          realtype gamma, void *bbd_data)
+static int CVBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                          sunbooleantype jok, sunbooleantype *jcurPtr,
+                          sunrealtype gamma, void *bbd_data)
 {
   CVBBDPrecData pdata;
   CVodeMem cv_mem;
@@ -538,9 +538,9 @@ static int CVBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
   The value returned by the CVBBDPrecSolve function is always 0,
   indicating success.
   -----------------------------------------------------------------*/
-static int CVBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int CVBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                           N_Vector r, N_Vector z,
-                          realtype gamma, realtype delta,
+                          sunrealtype gamma, sunrealtype delta,
                           int lr, void *bbd_data)
 {
   int retval;
@@ -605,14 +605,14 @@ static int CVBBDPrecFree(CVodeMem cv_mem)
   This routine also assumes that the local elements of a vector are
   stored contiguously.
   -----------------------------------------------------------------*/
-static int CVBBDDQJac(CVBBDPrecData pdata, realtype t, N_Vector y,
+static int CVBBDDQJac(CVBBDPrecData pdata, sunrealtype t, N_Vector y,
                       N_Vector gy, N_Vector ytemp, N_Vector gtemp)
 {
   CVodeMem cv_mem;
-  realtype gnorm, minInc, inc, inc_inv, yj, conj;
+  sunrealtype gnorm, minInc, inc, inc_inv, yj, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *y_data, *ewt_data, *gy_data, *gtemp_data;
-  realtype *ytemp_data, *col_j, *cns_data;
+  sunrealtype *y_data, *ewt_data, *gy_data, *gtemp_data;
+  sunrealtype *ytemp_data, *col_j, *cns_data;
   int retval;
 
   /* initialize cns_data to avoid compiler warning */
diff --git a/src/cvode/cvode_bbdpre_impl.h b/src/cvode/cvode_bbdpre_impl.h
index e56354b058..3f9371214c 100644
--- a/src/cvode/cvode_bbdpre_impl.h
+++ b/src/cvode/cvode_bbdpre_impl.h
@@ -36,7 +36,7 @@ typedef struct CVBBDPrecDataRec {
 
   /* passed by user to CVBBDPrecInit and used by PrecSetup/PrecSolve */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype dqrely;
+  sunrealtype dqrely;
   CVLocalFn gloc;
   CVCommFn cfn;
 
diff --git a/src/cvode/cvode_diag.c b/src/cvode/cvode_diag.c
index ce87591cbe..f86db8afe0 100644
--- a/src/cvode/cvode_diag.c
+++ b/src/cvode/cvode_diag.c
@@ -25,8 +25,8 @@
 
 #ifdef SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS
 extern
-int cvDiagSetup_formY(const realtype h,
-                      const realtype r,
+int cvDiagSetup_formY(const sunrealtype h,
+                      const sunrealtype r,
                       const N_Vector fpred,
                       const N_Vector zn1,
                       const N_Vector ypred,
@@ -34,9 +34,9 @@ int cvDiagSetup_formY(const realtype h,
                       N_Vector y);
 
 extern
-int cvDiagSetup_buildM(const realtype fract,
-                       const realtype uround,
-                       const realtype h,
+int cvDiagSetup_buildM(const sunrealtype fract,
+                       const sunrealtype uround,
+                       const sunrealtype h,
                        const N_Vector ftemp,
                        const N_Vector fpred,
                        const N_Vector ewt,
@@ -45,20 +45,20 @@ int cvDiagSetup_buildM(const realtype fract,
                        N_Vector y,
                        N_Vector M);
 
-int cvDiagSolve_updateM(const realtype r, N_Vector M);
+int cvDiagSolve_updateM(const sunrealtype r, N_Vector M);
 #endif
 
 /* Other Constants */
 
-#define FRACT RCONST(0.1)
-#define ONE   RCONST(1.0)
+#define FRACT SUN_RCONST(0.1)
+#define ONE   SUN_RCONST(1.0)
 
 /* CVDIAG linit, lsetup, lsolve, and lfree routines */
 
 static int CVDiagInit(CVodeMem cv_mem);
 
 static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-                       N_Vector fpred, booleantype *jcurPtr, N_Vector vtemp1,
+                       N_Vector fpred, sunbooleantype *jcurPtr, N_Vector vtemp1,
                        N_Vector vtemp2, N_Vector vtemp3);
 
 static int CVDiagSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
@@ -339,12 +339,12 @@ static int CVDiagInit(CVodeMem cv_mem)
  */
 
 static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-                       N_Vector fpred, booleantype *jcurPtr, N_Vector vtemp1,
+                       N_Vector fpred, sunbooleantype *jcurPtr, N_Vector vtemp1,
                        N_Vector vtemp2, N_Vector vtemp3)
 {
-  realtype r;
+  sunrealtype r;
   N_Vector ftemp, y;
-  booleantype invOK;
+  sunbooleantype invOK;
   CVDiagMem cvdiag_mem;
   int retval;
 
@@ -429,8 +429,8 @@ static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
 static int CVDiagSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
                        N_Vector ycur, N_Vector fcur)
 {
-  booleantype invOK;
-  realtype r;
+  sunbooleantype invOK;
+  sunrealtype r;
   CVDiagMem cvdiag_mem;
 
   cvdiag_mem = (CVDiagMem) lmem;
diff --git a/src/cvode/cvode_diag_impl.h b/src/cvode/cvode_diag_impl.h
index a3a1fcf0f4..ac2904227b 100644
--- a/src/cvode/cvode_diag_impl.h
+++ b/src/cvode/cvode_diag_impl.h
@@ -37,7 +37,7 @@ extern "C" {
 
 typedef struct {
 
-  realtype di_gammasv; /* gammasv = gamma at the last call to setup */
+  sunrealtype di_gammasv; /* gammasv = gamma at the last call to setup */
                        /* or solve                                  */
 
   N_Vector di_M;       /* M = (I - gamma J)^{-1} , gamma = h / l1   */
diff --git a/src/cvode/cvode_fused_gpu.cpp b/src/cvode/cvode_fused_gpu.cpp
index d8ff76297d..d88b02efee 100644
--- a/src/cvode/cvode_fused_gpu.cpp
+++ b/src/cvode/cvode_fused_gpu.cpp
@@ -53,29 +53,29 @@ constexpr auto gpuAssert = SUNDIALS_HIP_Assert;
 
 __global__
 void cvEwtSetSS_kernel(const sunindextype length,
-                       const realtype reltol,
-                       const realtype Sabstol,
-                       const realtype* ycur,
-                       realtype* tempv,
-                       realtype* weight)
+                       const sunrealtype reltol,
+                       const sunrealtype Sabstol,
+                       const sunrealtype* ycur,
+                       sunrealtype* tempv,
+                       sunrealtype* weight)
 {
-  const realtype one = 1.0;
+  const sunrealtype one = 1.0;
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VAbs(ycur, cv_mem->cv_tempv);
     // N_VScale(cv_mem->cv_reltol, cv_mem->cv_tempv, cv_mem->cv_tempv);
     // N_VAddConst(cv_mem->cv_tempv, cv_mem->cv_Sabstol, cv_mem->cv_tempv);
     // N_VInv(cv_mem->cv_tempv, weight);
-    realtype tmp = abs(ycur[i]);
+    sunrealtype tmp = abs(ycur[i]);
     tempv[i] = reltol*tmp + Sabstol;
     weight[i] = one/tempv[i];
   }
 }
 
 extern "C"
-int cvEwtSetSS_fused(const booleantype atolMin0,
-                     const realtype reltol,
-                     const realtype Sabstol,
+int cvEwtSetSS_fused(const sunbooleantype atolMin0,
+                     const sunrealtype reltol,
+                     const sunrealtype Sabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
                      N_Vector weight)
@@ -113,28 +113,28 @@ int cvEwtSetSS_fused(const booleantype atolMin0,
 
 __global__
 void cvEwtSetSV_kernel(const sunindextype length,
-                       const realtype reltol,
-                       const realtype* Vabstol,
-                       const realtype* ycur,
-                       realtype* tempv,
-                       realtype* weight)
+                       const sunrealtype reltol,
+                       const sunrealtype* Vabstol,
+                       const sunrealtype* ycur,
+                       sunrealtype* tempv,
+                       sunrealtype* weight)
 {
-  const realtype one = 1.0;
+  const sunrealtype one = 1.0;
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VAbs(ycur, cv_mem->cv_tempv);
     // N_VLinearSum(cv_mem->cv_reltol, cv_mem->cv_tempv, ONE,
     //             cv_mem->cv_Vabstol, cv_mem->cv_tempv);
     // N_VInv(cv_mem->cv_tempv, weight);
-    realtype tmp = abs(ycur[i]);
+    sunrealtype tmp = abs(ycur[i]);
     tempv[i] = reltol*tmp + Vabstol[i];
     weight[i] = one/tempv[i];
   }
 }
 
 extern "C"
-int cvEwtSetSV_fused(const booleantype atolMin0,
-                     const realtype reltol,
+int cvEwtSetSV_fused(const sunbooleantype atolMin0,
+                     const sunrealtype reltol,
                      const N_Vector Vabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
@@ -174,16 +174,16 @@ int cvEwtSetSV_fused(const booleantype atolMin0,
 
 __global__
 void cvCheckConstraints_kernel(const sunindextype length,
-                               const realtype* c,
-                               const realtype* ewt,
-                               const realtype* y,
-                               const realtype* mm,
-                               realtype* tempv)
+                               const sunrealtype* c,
+                               const sunrealtype* ewt,
+                               const sunrealtype* y,
+                               const sunrealtype* mm,
+                               sunrealtype* tempv)
 {
-  static const realtype zero = 0.0;
-  static const realtype pt1 = 0.1;
-  static const realtype one = 1.0;
-  static const realtype onept5 = 1.5;
+  static const sunrealtype zero = 0.0;
+  static const sunrealtype pt1 = 0.1;
+  static const sunrealtype one = 1.0;
+  static const sunrealtype onept5 = 1.5;
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VCompare(ONEPT5, cv_mem->cv_constraints, tmp); /* a[i]=1 when |c[i]|=2  */
@@ -191,7 +191,7 @@ void cvCheckConstraints_kernel(const sunindextype length,
     // N_VDiv(tmp, cv_mem->cv_ewt, tmp);                /* a * c * wt            */
     // N_VLinearSum(ONE, cv_mem->cv_y, -PT1, tmp, tmp); /* y - 0.1 * a * c * wt  */
     // N_VProd(tmp, mm, tmp);                           /* v = mm*(y-0.1*a*c*wt) */
-    realtype tmp = (abs(c[i]) >= onept5) ? one : zero;
+    sunrealtype tmp = (abs(c[i]) >= onept5) ? one : zero;
     tmp = tmp*c[i];
     tmp = tmp/ewt[i];
     tmp = y[i] - pt1*tmp;
@@ -239,25 +239,25 @@ int cvCheckConstraints_fused(const N_Vector c,
 
 __global__
 void cvNlsResid_kernel(const sunindextype length,
-                       const realtype rl1,
-                       const realtype ngamma,
-                       const realtype* zn1,
-                       const realtype* ycor,
-                       const realtype* ftemp,
-                       realtype* res)
+                       const sunrealtype rl1,
+                       const sunrealtype ngamma,
+                       const sunrealtype* zn1,
+                       const sunrealtype* ycor,
+                       const sunrealtype* ftemp,
+                       sunrealtype* res)
 {
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VLinearSum(cv_mem->cv_rl1, cv_mem->cv_zn[1], ONE, ycor, res);
     // N_VLinearSum(-cv_mem->cv_gamma, cv_mem->cv_ftemp, ONE, res, res);
-    realtype tmp = rl1*zn1[i] + ycor[i];
+    sunrealtype tmp = rl1*zn1[i] + ycor[i];
     res[i] = ngamma*ftemp[i] + tmp;
   }
 }
 
 extern "C"
-int cvNlsResid_fused(const realtype rl1,
-                     const realtype ngamma,
+int cvNlsResid_fused(const sunrealtype rl1,
+                     const sunrealtype ngamma,
                      const N_Vector zn1,
                      const N_Vector ycor,
                      const N_Vector ftemp,
@@ -295,13 +295,13 @@ int cvNlsResid_fused(const realtype rl1,
 
 __global__
 void cvDiagSetup_formY_kernel(const sunindextype length,
-                              const realtype h,
-                              const realtype r,
-                              const realtype* fpred,
-                              const realtype* zn1,
-                              const realtype* ypred,
-                              realtype* ftemp,
-                              realtype* y)
+                              const sunrealtype h,
+                              const sunrealtype r,
+                              const sunrealtype* fpred,
+                              const sunrealtype* zn1,
+                              const sunrealtype* ypred,
+                              sunrealtype* ftemp,
+                              sunrealtype* y)
 {
   // N_VLinearSum(h, fpred, -ONE, zn[1], ftemp);
   // N_VLinearSum(r, ftemp, ONE, ypred, y);
@@ -313,8 +313,8 @@ void cvDiagSetup_formY_kernel(const sunindextype length,
 }
 
 extern "C"
-int cvDiagSetup_formY(const realtype h,
-                      const realtype r,
+int cvDiagSetup_formY(const sunrealtype h,
+                      const sunrealtype r,
                       const N_Vector fpred,
                       const N_Vector zn1,
                       const N_Vector ypred,
@@ -355,19 +355,19 @@ int cvDiagSetup_formY(const realtype h,
 
 __global__
 void cvDiagSetup_buildM_kernel(const sunindextype length,
-                               const realtype fract,
-                               const realtype uround,
-                               const realtype h,
-                               const realtype* ftemp,
-                               const realtype* fpred,
-                               const realtype* ewt,
-                               realtype* bit,
-                               realtype* bitcomp,
-                               realtype* y,
-                               realtype* M)
+                               const sunrealtype fract,
+                               const sunrealtype uround,
+                               const sunrealtype h,
+                               const sunrealtype* ftemp,
+                               const sunrealtype* fpred,
+                               const sunrealtype* ewt,
+                               sunrealtype* bit,
+                               sunrealtype* bitcomp,
+                               sunrealtype* y,
+                               sunrealtype* M)
 {
-  static const realtype zero = 0.0;
-  static const realtype one = 1.0;
+  static const sunrealtype zero = 0.0;
+  static const sunrealtype one = 1.0;
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VLinearSum(ONE, M, -ONE, fpred, M);
@@ -393,9 +393,9 @@ void cvDiagSetup_buildM_kernel(const sunindextype length,
 }
 
 extern "C"
-int cvDiagSetup_buildM(const realtype fract,
-                       const realtype uround,
-                       const realtype h,
+int cvDiagSetup_buildM(const sunrealtype fract,
+                       const sunrealtype uround,
+                       const sunrealtype h,
                        const N_Vector ftemp,
                        const N_Vector fpred,
                        const N_Vector ewt,
@@ -441,23 +441,23 @@ int cvDiagSetup_buildM(const realtype fract,
 
 
  __global__
-void cvDiagSolve_updateM_kernel(const sunindextype length, const realtype r, realtype* M)
+void cvDiagSolve_updateM_kernel(const sunindextype length, const sunrealtype r, sunrealtype* M)
 {
-  static const realtype one = 1.0;
+  static const sunrealtype one = 1.0;
   GRID_STRIDE_XLOOP(sunindextype, i, length)
   {
     // N_VInv(M, M);
     // N_VAddConst(M, -ONE, M);
     // N_VScale(r, M, M);
     // N_VAddConst(M, ONE, M);
-    realtype a = one/M[i] - one;
+    sunrealtype a = one/M[i] - one;
     M[i] = r*a + one;
   }
 }
 
 
 extern "C"
-int cvDiagSolve_updateM(const realtype r, N_Vector M)
+int cvDiagSolve_updateM(const sunrealtype r, N_Vector M)
 {
   const SUNExecPolicy* exec_policy = ((NVectorContent)M->content)->stream_exec_policy;
   const sunindextype N = N_VGetLength(M);
diff --git a/src/cvode/cvode_fused_stubs.c b/src/cvode/cvode_fused_stubs.c
index f972a7bb7f..4c1ebebd92 100644
--- a/src/cvode/cvode_fused_stubs.c
+++ b/src/cvode/cvode_fused_stubs.c
@@ -20,11 +20,11 @@
 #include "cvode_diag_impl.h"
 #include "cvode_impl.h"
 
-#define ZERO   RCONST(0.0)
-#define PT1    RCONST(0.1)
-#define FRACT  RCONST(0.1)
-#define ONEPT5 RCONST(1.50)
-#define ONE    RCONST(1.0)
+#define ZERO   SUN_RCONST(0.0)
+#define PT1    SUN_RCONST(0.1)
+#define FRACT  SUN_RCONST(0.1)
+#define ONEPT5 SUN_RCONST(1.50)
+#define ONE    SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -32,9 +32,9 @@
  * -----------------------------------------------------------------
  */
 
-int cvEwtSetSS_fused(const booleantype atolmin0,
-                     const realtype reltol,
-                     const realtype Sabstol,
+int cvEwtSetSS_fused(const sunbooleantype atolmin0,
+                     const sunrealtype reltol,
+                     const sunrealtype Sabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
                      N_Vector weight)
@@ -56,8 +56,8 @@ int cvEwtSetSS_fused(const booleantype atolmin0,
  */
 
 
-int cvEwtSetSV_fused(const booleantype atolmin0,
-                     const realtype reltol,
+int cvEwtSetSV_fused(const sunbooleantype atolmin0,
+                     const sunrealtype reltol,
                      const N_Vector Vabstol,
                      const N_Vector ycur,
                      N_Vector tempv,
@@ -104,8 +104,8 @@ int cvCheckConstraints_fused(const N_Vector c,
  */
 
 
-int cvNlsResid_fused(const realtype rl1,
-                     const realtype ngamma,
+int cvNlsResid_fused(const sunrealtype rl1,
+                     const sunrealtype ngamma,
                      const N_Vector zn1,
                      const N_Vector ycor,
                      const N_Vector ftemp,
@@ -122,8 +122,8 @@ int cvNlsResid_fused(const realtype rl1,
  * -----------------------------------------------------------------
  */
 
-int cvDiagSetup_formY(const realtype h,
-                      const realtype r,
+int cvDiagSetup_formY(const sunrealtype h,
+                      const sunrealtype r,
                       const N_Vector fpred,
                       const N_Vector zn1,
                       const N_Vector ypred,
@@ -142,9 +142,9 @@ int cvDiagSetup_formY(const realtype h,
  * -----------------------------------------------------------------
  */
 
-int cvDiagSetup_buildM(const realtype fract,
-                       const realtype uround,
-                       const realtype h,
+int cvDiagSetup_buildM(const sunrealtype fract,
+                       const sunrealtype uround,
+                       const sunrealtype h,
                        const N_Vector ftemp,
                        const N_Vector fpred,
                        const N_Vector ewt,
@@ -174,7 +174,7 @@ int cvDiagSetup_buildM(const realtype fract,
  * -----------------------------------------------------------------
  */
 
-int cvDiagSolve_updateM(const realtype r, N_Vector M)
+int cvDiagSolve_updateM(const sunrealtype r, N_Vector M)
 {
   N_VInv(M, M);
   N_VAddConst(M, -ONE, M);
diff --git a/src/cvode/cvode_impl.h b/src/cvode/cvode_impl.h
index 966626b715..3eeea40102 100644
--- a/src/cvode/cvode_impl.h
+++ b/src/cvode/cvode_impl.h
@@ -60,13 +60,13 @@ extern "C" {
 #define L_MAX  (Q_MAX+1)   /* max value of L for either lmm       */
 #define NUM_TESTS    5     /* number of error test quantities     */
 
-#define HMIN_DEFAULT     RCONST(0.0)    /* hmin default value     */
-#define HMAX_INV_DEFAULT RCONST(0.0)    /* hmax_inv default value */
+#define HMIN_DEFAULT     SUN_RCONST(0.0)    /* hmin default value     */
+#define HMAX_INV_DEFAULT SUN_RCONST(0.0)    /* hmax_inv default value */
 #define MXHNIL_DEFAULT   10             /* mxhnil default value   */
 #define MXSTEP_DEFAULT   500            /* mxstep default value   */
 
 #define MSBP_DEFAULT         20          /* max steps between lsetup calls */
-#define DGMAX_LSETUP_DEFAULT RCONST(0.3) /* gamma threshold to call lsetup */
+#define DGMAX_LSETUP_DEFAULT SUN_RCONST(0.3) /* gamma threshold to call lsetup */
 
 /* Step size change constants
  * --------------------------
@@ -84,18 +84,18 @@ extern "C" {
  * ONEPSM (1+epsilon)  used in testing if the step size is below its bound
  */
 
-#define ETA_MIN_FX_DEFAULT RCONST(0.0)
-#define ETA_MAX_FX_DEFAULT RCONST(1.5)
-#define ETA_MAX_FS_DEFAULT RCONST(10000.0)
-#define ETA_MAX_ES_DEFAULT RCONST(10.0)
-#define ETA_MAX_GS_DEFAULT RCONST(10.0)
-#define ETA_MIN_DEFAULT    RCONST(0.1)
-#define ETA_MAX_EF_DEFAULT RCONST(0.2)
-#define ETA_MIN_EF_DEFAULT RCONST(0.1)
-#define ETA_CF_DEFAULT     RCONST(0.25)
+#define ETA_MIN_FX_DEFAULT SUN_RCONST(0.0)
+#define ETA_MAX_FX_DEFAULT SUN_RCONST(1.5)
+#define ETA_MAX_FS_DEFAULT SUN_RCONST(10000.0)
+#define ETA_MAX_ES_DEFAULT SUN_RCONST(10.0)
+#define ETA_MAX_GS_DEFAULT SUN_RCONST(10.0)
+#define ETA_MIN_DEFAULT    SUN_RCONST(0.1)
+#define ETA_MAX_EF_DEFAULT SUN_RCONST(0.2)
+#define ETA_MIN_EF_DEFAULT SUN_RCONST(0.1)
+#define ETA_CF_DEFAULT     SUN_RCONST(0.25)
 #define SMALL_NST_DEFAULT  10
 #define SMALL_NEF_DEFAULT  2
-#define ONEPSM             RCONST(1.000001)
+#define ONEPSM             SUN_RCONST(1.000001)
 
 /* Step size controller constants
  * ------------------------------
@@ -105,10 +105,10 @@ extern "C" {
  * BIAS3  -+
  */
 
-#define ADDON     RCONST(0.000001)
-#define BIAS1     RCONST(6.0)
-#define BIAS2     RCONST(6.0)
-#define BIAS3     RCONST(10.0)
+#define ADDON     SUN_RCONST(0.000001)
+#define BIAS1     SUN_RCONST(6.0)
+#define BIAS2     SUN_RCONST(6.0)
+#define BIAS3     SUN_RCONST(10.0)
 
 /* Order selection constants
  * -------------------------
@@ -201,7 +201,7 @@ typedef struct CVodeMemRec {
 
   SUNContext cv_sunctx;
 
-  realtype cv_uround;    /* machine unit roundoff */
+  sunrealtype cv_uround;    /* machine unit roundoff */
 
   /*--------------------------
     Problem Specification Data
@@ -212,15 +212,15 @@ typedef struct CVodeMemRec {
   int cv_lmm;                /* lmm = CV_ADAMS or CV_BDF                      */
   int cv_itol;               /* itol = CV_SS, CV_SV, CV_WF, CV_NN             */
 
-  realtype cv_reltol;        /* relative tolerance                            */
-  realtype cv_Sabstol;       /* scalar absolute tolerance                     */
+  sunrealtype cv_reltol;        /* relative tolerance                            */
+  sunrealtype cv_Sabstol;       /* scalar absolute tolerance                     */
   N_Vector cv_Vabstol;       /* vector absolute tolerance                     */
-  booleantype cv_atolmin0;   /* flag indicating that min(abstol) = 0          */
-  booleantype cv_user_efun;  /* SUNTRUE if user sets efun                     */
+  sunbooleantype cv_atolmin0;   /* flag indicating that min(abstol) = 0          */
+  sunbooleantype cv_user_efun;  /* SUNTRUE if user sets efun                     */
   CVEwtFn cv_efun;           /* function to set ewt                           */
   void *cv_e_data;           /* user pointer passed to efun                   */
 
-  booleantype cv_constraintsSet; /* constraints vector present:
+  sunbooleantype cv_constraintsSet; /* constraints vector present:
                                     do constraints calc                       */
 
   /*-----------------------
@@ -255,9 +255,9 @@ typedef struct CVodeMemRec {
     Tstop information
     -----------------*/
 
-  booleantype cv_tstopset;
-  booleantype cv_tstopinterp;
-  realtype cv_tstop;
+  sunbooleantype cv_tstopset;
+  sunbooleantype cv_tstopinterp;
+  sunrealtype cv_tstop;
 
   /*---------
     Step Data
@@ -271,31 +271,31 @@ typedef struct CVodeMemRec {
                                   considering a change in q                   */
   int cv_L;                    /* L = q + 1                                   */
 
-  realtype cv_hin;             /* initial step size                           */
-  realtype cv_h;               /* current step size                           */
-  realtype cv_hprime;          /* step size to be used on the next step       */
-  realtype cv_next_h;          /* step size to be used on the next step       */
-  realtype cv_eta;             /* eta = hprime / h                            */
-  realtype cv_hscale;          /* value of h used in zn                       */
-  realtype cv_tn;              /* current internal value of t                 */
-  realtype cv_tretlast;        /* last value of t returned by CVode           */
+  sunrealtype cv_hin;             /* initial step size                           */
+  sunrealtype cv_h;               /* current step size                           */
+  sunrealtype cv_hprime;          /* step size to be used on the next step       */
+  sunrealtype cv_next_h;          /* step size to be used on the next step       */
+  sunrealtype cv_eta;             /* eta = hprime / h                            */
+  sunrealtype cv_hscale;          /* value of h used in zn                       */
+  sunrealtype cv_tn;              /* current internal value of t                 */
+  sunrealtype cv_tretlast;        /* last value of t returned by CVode           */
 
-  realtype cv_tau[L_MAX+1];    /* array of previous q+1 successful step
+  sunrealtype cv_tau[L_MAX+1];    /* array of previous q+1 successful step
                                   sizes indexed from 1 to q+1                 */
-  realtype cv_tq[NUM_TESTS+1]; /* array of test quantities indexed from
+  sunrealtype cv_tq[NUM_TESTS+1]; /* array of test quantities indexed from
                                   1 to NUM_TESTS(=5)                          */
-  realtype cv_l[L_MAX];        /* coefficients of l(x) (degree q poly)        */
+  sunrealtype cv_l[L_MAX];        /* coefficients of l(x) (degree q poly)        */
 
-  realtype cv_rl1;             /* the scalar 1/l[1]                           */
-  realtype cv_gamma;           /* gamma = h * rl1                             */
-  realtype cv_gammap;          /* gamma at the last setup call                */
-  realtype cv_gamrat;          /* gamma / gammap                              */
+  sunrealtype cv_rl1;             /* the scalar 1/l[1]                           */
+  sunrealtype cv_gamma;           /* gamma = h * rl1                             */
+  sunrealtype cv_gammap;          /* gamma at the last setup call                */
+  sunrealtype cv_gamrat;          /* gamma / gammap                              */
 
-  realtype cv_crate;           /* estimated corrector convergence rate        */
-  realtype cv_delp;            /* norm of previous nonlinear solver update    */
-  realtype cv_acnrm;           /* | acor |                                    */
-  booleantype cv_acnrmcur;     /* is | acor | current?                        */
-  realtype cv_nlscoef;         /* coeficient in nonlinear convergence test    */
+  sunrealtype cv_crate;           /* estimated corrector convergence rate        */
+  sunrealtype cv_delp;            /* norm of previous nonlinear solver update    */
+  sunrealtype cv_acnrm;           /* | acor |                                    */
+  sunbooleantype cv_acnrmcur;     /* is | acor | current?                        */
+  sunrealtype cv_nlscoef;         /* coeficient in nonlinear convergence test    */
 
   /*------
     Limits
@@ -308,18 +308,18 @@ typedef struct CVodeMemRec {
   int cv_maxnef;          /* maximum number of error test failures              */
   int cv_maxncf;          /* maximum number of nonlinear convergence failures   */
 
-  realtype cv_hmin;       /* |h| >= hmin                                        */
-  realtype cv_hmax_inv;   /* |h| <= 1/hmax_inv                                  */
-  realtype cv_etamax;     /* eta <= etamax                                      */
-  realtype cv_eta_min_fx; /* eta_min_fx < eta < eta_max_fx keep the current h   */
-  realtype cv_eta_max_fx;
-  realtype cv_eta_max_fs; /* eta <= eta_max_fs on the first step                */
-  realtype cv_eta_max_es; /* eta <= eta_max_es on early steps                   */
-  realtype cv_eta_max_gs; /* eta <= eta_max_gs on a general step                */
-  realtype cv_eta_min;    /* eta >= eta_min on a general step                   */
-  realtype cv_eta_min_ef; /* eta >= eta_min_ef after an error test failure      */
-  realtype cv_eta_max_ef; /* eta on multiple (>= small_nef) error test failures */
-  realtype cv_eta_cf;     /* eta on a nonlinear solver convergence failure      */
+  sunrealtype cv_hmin;       /* |h| >= hmin                                        */
+  sunrealtype cv_hmax_inv;   /* |h| <= 1/hmax_inv                                  */
+  sunrealtype cv_etamax;     /* eta <= etamax                                      */
+  sunrealtype cv_eta_min_fx; /* eta_min_fx < eta < eta_max_fx keep the current h   */
+  sunrealtype cv_eta_max_fx;
+  sunrealtype cv_eta_max_fs; /* eta <= eta_max_fs on the first step                */
+  sunrealtype cv_eta_max_es; /* eta <= eta_max_es on early steps                   */
+  sunrealtype cv_eta_max_gs; /* eta <= eta_max_gs on a general step                */
+  sunrealtype cv_eta_min;    /* eta >= eta_min on a general step                   */
+  sunrealtype cv_eta_min_ef; /* eta >= eta_min_ef after an error test failure      */
+  sunrealtype cv_eta_max_ef; /* eta on multiple (>= small_nef) error test failures */
+  sunrealtype cv_eta_cf;     /* eta on a nonlinear solver convergence failure      */
 
   long int cv_small_nst; /* nst <= small_nst use eta_max_es */
   int cv_small_nef;      /* nef >= small_nef use eta_max_ef */
@@ -342,17 +342,17 @@ typedef struct CVodeMemRec {
     Step size ratios
     ----------------*/
 
-  realtype cv_etaqm1;      /* ratio of new to old h for order q-1             */
-  realtype cv_etaq;        /* ratio of new to old h for order q               */
-  realtype cv_etaqp1;      /* ratio of new to old h for order q+1             */
+  sunrealtype cv_etaqm1;      /* ratio of new to old h for order q-1             */
+  sunrealtype cv_etaq;        /* ratio of new to old h for order q               */
+  sunrealtype cv_etaqp1;      /* ratio of new to old h for order q+1             */
 
   /*------------------
     Space requirements
     ------------------*/
 
-  sunindextype cv_lrw1;        /* no. of realtype words in 1 N_Vector y           */
+  sunindextype cv_lrw1;        /* no. of sunrealtype words in 1 N_Vector y           */
   sunindextype cv_liw1;        /* no. of integer words in 1 N_Vector y            */
-  long int cv_lrw;             /* no. of realtype words in CVODE work vectors     */
+  long int cv_lrw;             /* no. of sunrealtype words in CVODE work vectors     */
   long int cv_liw;             /* no. of integer words in CVODE work vectors      */
 
   /*---------------------
@@ -360,7 +360,7 @@ typedef struct CVodeMemRec {
     ---------------------*/
 
   SUNNonlinearSolver NLS;      /* nonlinear solver object                   */
-  booleantype ownNLS;          /* flag indicating NLS ownership             */
+  sunbooleantype ownNLS;          /* flag indicating NLS ownership             */
   CVRhsFn nls_f;               /* f(t,y(t)) used in the nonlinear solver    */
   int convfail;                /* flag to indicate when a Jacobian update may
                                   be needed */
@@ -374,7 +374,7 @@ typedef struct CVodeMemRec {
   int (*cv_linit)(struct CVodeMemRec *cv_mem);
 
   int (*cv_lsetup)(struct CVodeMemRec *cv_mem, int convfail,
-                   N_Vector ypred, N_Vector fpred, booleantype *jcurPtr,
+                   N_Vector ypred, N_Vector fpred, sunbooleantype *jcurPtr,
                    N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3);
 
   int (*cv_lsolve)(struct CVodeMemRec *cv_mem, N_Vector b, N_Vector weight,
@@ -386,7 +386,7 @@ typedef struct CVodeMemRec {
 
   void     *cv_lmem;         /* linear solver interface memory structure */
   long int  cv_msbp;         /* max number of steps between lsetip calls */
-  realtype  cv_dgmax_lsetup; /* gamma ratio threshold to signal for a linear
+  sunrealtype  cv_dgmax_lsetup; /* gamma ratio threshold to signal for a linear
                               * solver setup */
 
   /*------------
@@ -395,11 +395,11 @@ typedef struct CVodeMemRec {
 
   int cv_qu;                   /* last successful q value used                */
   long int cv_nstlp;           /* step number of last setup call              */
-  realtype cv_h0u;             /* actual initial stepsize                     */
-  realtype cv_hu;              /* last successful h value used                */
-  realtype cv_saved_tq5;       /* saved value of tq[5]                        */
-  booleantype cv_jcur;         /* is Jacobian info for linear solver current? */
-  realtype cv_tolsf;           /* tolerance scale factor                      */
+  sunrealtype cv_h0u;             /* actual initial stepsize                     */
+  sunrealtype cv_hu;              /* last successful h value used                */
+  sunrealtype cv_saved_tq5;       /* saved value of tq[5]                        */
+  sunbooleantype cv_jcur;         /* is Jacobian info for linear solver current? */
+  sunrealtype cv_tolsf;           /* tolerance scale factor                      */
   int cv_qmax_alloc;           /* value of qmax used when allocating mem      */
   int cv_indx_acor;            /* index of the zn vector with saved acor      */
 
@@ -407,9 +407,9 @@ typedef struct CVodeMemRec {
     Flags turned ON by CVodeInit and read by CVodeReInit
     --------------------------------------------------------------------*/
 
-  booleantype cv_VabstolMallocDone;
-  booleantype cv_MallocDone;
-  booleantype cv_constraintsMallocDone;
+  sunbooleantype cv_VabstolMallocDone;
+  sunbooleantype cv_MallocDone;
+  sunbooleantype cv_constraintsMallocDone;
 
   /*-------------------------------------------
     Error handler function and error ouput file
@@ -429,8 +429,8 @@ typedef struct CVodeMemRec {
     Stability Limit Detection
     -------------------------*/
 
-  booleantype cv_sldeton;     /* is Stability Limit Detection on?             */
-  realtype cv_ssdat[6][4];    /* scaled data array for STALD                  */
+  sunbooleantype cv_sldeton;     /* is Stability Limit Detection on?             */
+  sunrealtype cv_ssdat[6][4];    /* scaled data array for STALD                  */
   int cv_nscon;               /* counter for STALD method                     */
   long int cv_nor;            /* counter for number of order reductions       */
 
@@ -442,18 +442,18 @@ typedef struct CVodeMemRec {
   int cv_nrtfn;            /* number of components of g                       */
   int *cv_iroots;          /* array for root information                      */
   int *cv_rootdir;         /* array specifying direction of zero-crossing     */
-  realtype cv_tlo;         /* nearest endpoint of interval in root search     */
-  realtype cv_thi;         /* farthest endpoint of interval in root search    */
-  realtype cv_trout;       /* t value returned by rootfinding routine         */
-  realtype *cv_glo;        /* saved array of g values at t = tlo              */
-  realtype *cv_ghi;        /* saved array of g values at t = thi              */
-  realtype *cv_grout;      /* array of g values at t = trout                  */
-  realtype cv_toutc;       /* copy of tout (if NORMAL mode)                   */
-  realtype cv_ttol;        /* tolerance on root location trout                */
+  sunrealtype cv_tlo;         /* nearest endpoint of interval in root search     */
+  sunrealtype cv_thi;         /* farthest endpoint of interval in root search    */
+  sunrealtype cv_trout;       /* t value returned by rootfinding routine         */
+  sunrealtype *cv_glo;        /* saved array of g values at t = tlo              */
+  sunrealtype *cv_ghi;        /* saved array of g values at t = thi              */
+  sunrealtype *cv_grout;      /* array of g values at t = trout                  */
+  sunrealtype cv_toutc;       /* copy of tout (if NORMAL mode)                   */
+  sunrealtype cv_ttol;        /* tolerance on root location trout                */
   int cv_taskc;            /* copy of parameter itask                         */
   int cv_irfnd;            /* flag showing whether last step had a root       */
   long int cv_nge;         /* counter for g evaluations                       */
-  booleantype *cv_gactive; /* array with active/inactive event functions      */
+  sunbooleantype *cv_gactive; /* array with active/inactive event functions      */
   int cv_mxgnull;          /* number of warning messages about possible g==0  */
 
   /*---------------
@@ -461,18 +461,18 @@ typedef struct CVodeMemRec {
     ---------------*/
 
   CVodeProjMem proj_mem;      /* projection memory structure               */
-  booleantype  proj_enabled;  /* flag indicating if projection is enabled  */
-  booleantype  proj_applied;  /* flag indicating if projection was applied */
-  realtype     proj_p[L_MAX]; /* coefficients of p(x) (degree q poly)      */
+  sunbooleantype  proj_enabled;  /* flag indicating if projection is enabled  */
+  sunbooleantype  proj_applied;  /* flag indicating if projection was applied */
+  sunrealtype     proj_p[L_MAX]; /* coefficients of p(x) (degree q poly)      */
 
   /*-----------------------
     Fused Vector Operations
     -----------------------*/
 
-  realtype cv_cvals[L_MAX]; /* array of scalars */
+  sunrealtype cv_cvals[L_MAX]; /* array of scalars */
   N_Vector cv_Xvecs[L_MAX]; /* array of vectors */
 
-  booleantype cv_usefused;  /* flag indicating if CVODE specific fused kernels should be used */
+  sunbooleantype cv_usefused;  /* flag indicating if CVODE specific fused kernels should be used */
 
 } *CVodeMem;
 
@@ -535,7 +535,7 @@ typedef struct CVodeMemRec {
 /*
  * -----------------------------------------------------------------
  * int (*cv_lsetup)(CVodeMem cv_mem, int convfail, N_Vector ypred,
- *                 N_Vector fpred, booleantype *jcurPtr,
+ *                 N_Vector fpred, sunbooleantype *jcurPtr,
  *                 N_Vector vtemp1, N_Vector vtemp2,
  *                 N_Vector vtemp3);
  * -----------------------------------------------------------------
@@ -634,14 +634,14 @@ int cvNlsInit(CVodeMem cv_mem);
 
 /* Projection functions */
 
-int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                    int *npfPtr);
 int cvProjInit(CVodeProjMem proj_mem);
 int cvProjFree(CVodeProjMem *proj_mem);
 
 /* Restore tn and undo prediction to reattempt a step */
 
-void cvRestore(CVodeMem cv_mem, realtype saved_t);
+void cvRestore(CVodeMem cv_mem, sunrealtype saved_t);
 
 /* Reset h and rescale history array to prepare for a step */
 
diff --git a/src/cvode/cvode_io.c b/src/cvode/cvode_io.c
index 174462b552..7f4cbe7f08 100644
--- a/src/cvode/cvode_io.c
+++ b/src/cvode/cvode_io.c
@@ -22,10 +22,10 @@
 #include "cvode_ls_impl.h"
 #include "sundials/sundials_types.h"
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define TWOPT5 RCONST(2.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define TWOPT5 SUN_RCONST(2.5)
 
 /*
  * =================================================================
@@ -40,7 +40,7 @@
  * Specifies the gamma ratio threshold to signal for a linear solver setup
  */
 
-int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem, realtype dgmax_lsetup)
+int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem, sunrealtype dgmax_lsetup)
 {
   CVodeMem cv_mem;
 
@@ -277,7 +277,7 @@ int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil)
  * Turns on/off the stability limit detection algorithm
  */
 
-int CVodeSetStabLimDet(void *cvode_mem, booleantype sldet)
+int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype sldet)
 {
   CVodeMem cv_mem;
 
@@ -304,7 +304,7 @@ int CVodeSetStabLimDet(void *cvode_mem, booleantype sldet)
  * Specifies the initial step size
  */
 
-int CVodeSetInitStep(void *cvode_mem, realtype hin)
+int CVodeSetInitStep(void *cvode_mem, sunrealtype hin)
 {
   CVodeMem cv_mem;
 
@@ -326,7 +326,7 @@ int CVodeSetInitStep(void *cvode_mem, realtype hin)
  * Specifies the minimum step size
  */
 
-int CVodeSetMinStep(void *cvode_mem, realtype hmin)
+int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin)
 {
   CVodeMem cv_mem;
 
@@ -364,9 +364,9 @@ int CVodeSetMinStep(void *cvode_mem, realtype hmin)
  * Specifies the maximum step size
  */
 
-int CVodeSetMaxStep(void *cvode_mem, realtype hmax)
+int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax)
 {
-  realtype hmax_inv;
+  sunrealtype hmax_inv;
   CVodeMem cv_mem;
 
   if (cvode_mem==NULL) {
@@ -405,8 +405,8 @@ int CVodeSetMaxStep(void *cvode_mem, realtype hmax)
  */
 
 
-int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
-                               realtype eta_max_fx)
+int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx,
+                               sunrealtype eta_max_fx)
 {
   CVodeMem cv_mem;
 
@@ -438,7 +438,7 @@ int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
  * Specifies the maximum step size change on the first step
  */
 
-int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
+int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs)
 {
   CVodeMem cv_mem;
 
@@ -466,7 +466,7 @@ int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
  * when nst <= small_nst
  */
 
-int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es)
+int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es)
 {
   CVodeMem cv_mem;
 
@@ -521,7 +521,7 @@ int CVodeSetNumStepsEtaMaxEarlyStep(void* cvode_mem, long int small_nst)
  * Specifies the maximum step size change on a general steps (nst > small_nst)
  */
 
-int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
+int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs)
 {
   CVodeMem cv_mem;
 
@@ -548,7 +548,7 @@ int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
  * Specifies the minimum change on a general steps
  */
 
-int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
+int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min)
 {
   CVodeMem cv_mem;
 
@@ -575,7 +575,7 @@ int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
  * Specifies the minimum step size change after an error test failure
  */
 
-int CVodeSetEtaMinErrFail(void* cvode_mem, realtype eta_min_ef)
+int CVodeSetEtaMinErrFail(void* cvode_mem, sunrealtype eta_min_ef)
 {
   CVodeMem cv_mem;
 
@@ -603,7 +603,7 @@ int CVodeSetEtaMinErrFail(void* cvode_mem, realtype eta_min_ef)
  * test failures
  */
 
-int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef)
+int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef)
 {
   CVodeMem cv_mem;
 
@@ -658,7 +658,7 @@ int CVodeSetNumFailsEtaMaxErrFail(void* cvode_mem, int small_nef)
  * Specifies the step size change after a nonlinear solver failure
  */
 
-int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
+int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf)
 {
   CVodeMem cv_mem;
 
@@ -685,7 +685,7 @@ int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
  * Specifies the time beyond which the integration is not to proceed.
  */
 
-int CVodeSetStopTime(void *cvode_mem, realtype tstop)
+int CVodeSetStopTime(void *cvode_mem, sunrealtype tstop)
 {
   CVodeMem cv_mem;
 
@@ -721,7 +721,7 @@ int CVodeSetStopTime(void *cvode_mem, realtype tstop)
  * the stop time (instead of a copy).
  */
 
-int CVodeSetInterpolateStopTime(void *cvode_mem, booleantype interp)
+int CVodeSetInterpolateStopTime(void *cvode_mem, sunbooleantype interp)
 {
   CVodeMem cv_mem;
 
@@ -835,7 +835,7 @@ int CVodeSetMaxNonlinIters(void *cvode_mem, int maxcor)
  * test
  */
 
-int CVodeSetNonlinConvCoef(void *cvode_mem, realtype nlscoef)
+int CVodeSetNonlinConvCoef(void *cvode_mem, sunrealtype nlscoef)
 {
   CVodeMem cv_mem;
 
@@ -945,7 +945,7 @@ int CVodeSetNoInactiveRootWarn(void *cvode_mem)
 int CVodeSetConstraints(void *cvode_mem, N_Vector constraints)
 {
   CVodeMem cv_mem;
-  realtype temptest;
+  sunrealtype temptest;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODE", "CVodeSetConstraints", MSGCV_NO_MEM);
@@ -1005,7 +1005,7 @@ int CVodeSetConstraints(void *cvode_mem, N_Vector constraints)
  * Enable or disable integrator specific fused kernels
  */
 
-int CVodeSetUseIntegratorFusedKernels(void *cvode_mem, booleantype onoff)
+int CVodeSetUseIntegratorFusedKernels(void *cvode_mem, sunbooleantype onoff)
 {
   CVodeMem cv_mem;
 #ifdef SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS
@@ -1183,7 +1183,7 @@ int CVodeGetCurrentOrder(void *cvode_mem, int *qcur)
  * Returns the value of gamma for the current step.
  */
 
-int CVodeGetCurrentGamma(void *cvode_mem, realtype *gamma)
+int CVodeGetCurrentGamma(void *cvode_mem, sunrealtype *gamma)
 {
   CVodeMem cv_mem;
 
@@ -1231,7 +1231,7 @@ int CVodeGetNumStabLimOrderReds(void *cvode_mem, long int *nslred)
  * Returns the step size used on the first step
  */
 
-int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused)
+int CVodeGetActualInitStep(void *cvode_mem, sunrealtype *hinused)
 {
   CVodeMem cv_mem;
 
@@ -1253,7 +1253,7 @@ int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused)
  * Returns the step size used on the last successful step
  */
 
-int CVodeGetLastStep(void *cvode_mem, realtype *hlast)
+int CVodeGetLastStep(void *cvode_mem, sunrealtype *hlast)
 {
   CVodeMem cv_mem;
 
@@ -1275,7 +1275,7 @@ int CVodeGetLastStep(void *cvode_mem, realtype *hlast)
  * Returns the step size to be attempted on the next step
  */
 
-int CVodeGetCurrentStep(void *cvode_mem, realtype *hcur)
+int CVodeGetCurrentStep(void *cvode_mem, sunrealtype *hcur)
 {
   CVodeMem cv_mem;
 
@@ -1319,7 +1319,7 @@ int CVodeGetCurrentState(void *cvode_mem, N_Vector *y)
  * Returns the current value of the independent variable
  */
 
-int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur)
+int CVodeGetCurrentTime(void *cvode_mem, sunrealtype *tcur)
 {
   CVodeMem cv_mem;
 
@@ -1341,7 +1341,7 @@ int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur)
  * Returns a suggested factor for scaling tolerances
  */
 
-int CVodeGetTolScaleFactor(void *cvode_mem, realtype *tolsfact)
+int CVodeGetTolScaleFactor(void *cvode_mem, sunrealtype *tolsfact)
 {
   CVodeMem cv_mem;
 
@@ -1432,8 +1432,8 @@ int CVodeGetWorkSpace(void *cvode_mem, long int *lenrw, long int *leniw)
 
 int CVodeGetIntegratorStats(void *cvode_mem, long int *nsteps, long int *nfevals,
                             long int *nlinsetups, long int *netfails, int *qlast,
-                            int *qcur, realtype *hinused, realtype *hlast,
-                            realtype *hcur, realtype *tcur)
+                            int *qcur, sunrealtype *hinused, sunrealtype *hlast,
+                            sunrealtype *hcur, sunrealtype *tcur)
 {
   CVodeMem cv_mem;
 
@@ -1645,7 +1645,7 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (cv_mem->cv_nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) cv_mem->cv_nni / (realtype) cv_mem->cv_nst);
+              (sunrealtype) cv_mem->cv_nni / (sunrealtype) cv_mem->cv_nst);
     }
 
     /* linear solver stats */
@@ -1664,11 +1664,11 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (cv_mem->cv_nni > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) cvls_mem->nli / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nli / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) cvls_mem->nje / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nje / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) cvls_mem->npe / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->npe / (sunrealtype) cv_mem->cv_nni);
       }
     }
 
@@ -1706,7 +1706,7 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (cv_mem->cv_nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) cv_mem->cv_nni / (realtype) cv_mem->cv_nst);
+              (sunrealtype) cv_mem->cv_nni / (sunrealtype) cv_mem->cv_nst);
     }
     else
     {
@@ -1729,11 +1729,11 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (cv_mem->cv_nni > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) cvls_mem->nli / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nli / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) cvls_mem->nje / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nje / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) cvls_mem->npe / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->npe / (sunrealtype) cv_mem->cv_nni);
       }
       else
       {
diff --git a/src/cvode/cvode_ls.c b/src/cvode/cvode_ls.c
index a9d986c193..11e6c857f0 100644
--- a/src/cvode/cvode_ls.c
+++ b/src/cvode/cvode_ls.c
@@ -27,19 +27,19 @@
 #include <sunmatrix/sunmatrix_sparse.h>
 
 /* Private constants */
-#define MIN_INC_MULT RCONST(1000.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
 #define MAX_DQITERS  3  /* max. number of attempts to recover in DQ J*v */
-#define ZERO         RCONST(0.0)
-#define PT25         RCONST(0.25)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define ZERO         SUN_RCONST(0.0)
+#define PT25         SUN_RCONST(0.25)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /*=================================================================
   PRIVATE FUNCTION PROTOTYPES
   =================================================================*/
 
-static int cvLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                      booleantype jok, booleantype *jcur, realtype gamma,
+static int cvLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                      sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                       void *user_data, N_Vector tmp1, N_Vector tmp2,
                       N_Vector tmp3);
 
@@ -56,8 +56,8 @@ int CVodeSetLinearSolver(void *cvode_mem, SUNLinearSolver LS,
   CVodeMem    cv_mem;
   CVLsMem     cvls_mem;
   int         retval, LSType;
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if either cvode_mem or LS inputs are NULL */
   if (cvode_mem == NULL) {
@@ -309,7 +309,7 @@ int CVodeSetJacFn(void *cvode_mem, CVLsJacFn jac)
 /* CVodeSetDeltaGammaMaxBadJac specifies the maximum gamma ratio change
  * after a NLS convergence failure with a potentially bad Jacobian. If
  * |gamma/gammap-1| < dgmax_jbad then the Jacobian is marked as bad */
-int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, realtype dgmax_jbad)
+int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, sunrealtype dgmax_jbad)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -331,7 +331,7 @@ int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, realtype dgmax_jbad)
 
 
 /* CVodeSetEpsLin specifies the nonlinear -> linear tolerance scale factor */
-int CVodeSetEpsLin(void *cvode_mem, realtype eplifac)
+int CVodeSetEpsLin(void *cvode_mem, sunrealtype eplifac)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -357,7 +357,7 @@ int CVodeSetEpsLin(void *cvode_mem, realtype eplifac)
 
 /* CVodeSetLSNormFactor sets or computes the factor to use when converting from
    the integrator tolerance to the linear solver tolerance (WRMS to L2 norm). */
-int CVodeSetLSNormFactor(void *cvode_mem, realtype nrmfac)
+int CVodeSetLSNormFactor(void *cvode_mem, sunrealtype nrmfac)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -411,7 +411,7 @@ int CVodeSetJacEvalFrequency(void *cvode_mem, long int msbj)
 
 /* CVodeSetLinearSolutionScaling enables or disables scaling the
    linear solver solution to account for changes in gamma. */
-int CVodeSetLinearSolutionScaling(void *cvode_mem, booleantype onoff)
+int CVodeSetLinearSolutionScaling(void *cvode_mem, sunbooleantype onoff)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -985,7 +985,7 @@ int cvLsPSetup(void *cvode_mem)
   only case in which the user's psolve routine is allowed to be
   NULL.
   -----------------------------------------------------------------*/
-int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, realtype tol, int lr)
+int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -1013,7 +1013,7 @@ int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, realtype tol, int lr)
   implementations of the difference quotient Jacobian
   approximation routines.
   ---------------------------------------------------------------*/
-int cvLsDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDQJac(sunrealtype t, N_Vector y, N_Vector fy,
               SUNMatrix Jac, void *cvode_mem, N_Vector tmp1,
               N_Vector tmp2, N_Vector tmp3)
 {
@@ -1074,11 +1074,11 @@ int cvLsDQJac(realtype t, N_Vector y, N_Vector fy,
   function.  Finally, the actual computation of the jth column of
   the Jacobian is done with a call to N_VLinearSum.
   -----------------------------------------------------------------*/
-int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1)
 {
-  realtype fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
-  realtype *y_data, *ewt_data, *cns_data;
+  sunrealtype fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
+  sunrealtype *y_data, *ewt_data, *cns_data;
   N_Vector ftemp, jthCol;
   sunindextype j, N;
   CVLsMem cvls_mem;
@@ -1158,13 +1158,13 @@ int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
   a simple for loop to set each of the elements of a column in
   succession.
   -----------------------------------------------------------------*/
-int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+int cvLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
                   CVodeMem cv_mem, N_Vector tmp1, N_Vector tmp2)
 {
   N_Vector ftemp, ytemp;
-  realtype fnorm, minInc, inc, inc_inv, srur, conj;
-  realtype *col_j, *ewt_data, *fy_data, *ftemp_data;
-  realtype *y_data, *ytemp_data, *cns_data;
+  sunrealtype fnorm, minInc, inc, inc_inv, srur, conj;
+  sunrealtype *col_j, *ewt_data, *fy_data, *ftemp_data;
+  sunrealtype *y_data, *ytemp_data, *cns_data;
   sunindextype group, i, j, width, ngroups, i1, i2;
   sunindextype N, mupper, mlower;
   CVLsMem cvls_mem;
@@ -1262,13 +1262,13 @@ int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
   Jv = [f(y + v*sig) - f(y)]/sig, where sig = 1 / ||v||_WRMS,
   i.e. the WRMS norm of v*sig is 1.
   -----------------------------------------------------------------*/
-int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int cvLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                  N_Vector y, N_Vector fy, void *cvode_mem,
                  N_Vector work)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
-  realtype sig, siginv;
+  sunrealtype sig, siginv;
   int      iter, retval;
 
   /* access CVLsMem structure */
@@ -1310,8 +1310,8 @@ int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
 
   Setup the linear system A = I - gamma J
   -----------------------------------------------------------------*/
-static int cvLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                      booleantype jok, booleantype *jcur, realtype gamma,
+static int cvLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                      sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                       void *cvode_mem, N_Vector vtemp1, N_Vector vtemp2,
                       N_Vector vtemp3)
 {
@@ -1531,11 +1531,11 @@ int cvLsInitialize(CVodeMem cv_mem)
   This routine then calls the LS 'setup' routine with A.
   -----------------------------------------------------------------*/
 int cvLsSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-              N_Vector fpred, booleantype *jcurPtr,
+              N_Vector fpred, sunbooleantype *jcurPtr,
               N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3)
 {
   CVLsMem  cvls_mem;
-  realtype dgamma;
+  sunrealtype dgamma;
   int      retval;
 
   /* access CVLsMem structure */
@@ -1636,11 +1636,11 @@ int cvLsSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
               N_Vector ynow, N_Vector fnow)
 {
   CVLsMem  cvls_mem;
-  realtype bnorm = ZERO;
-  realtype deltar, delta, w_mean;
+  sunrealtype bnorm = ZERO;
+  sunrealtype deltar, delta, w_mean;
   int      curiter, nli_inc, retval;
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
-  realtype resnorm;
+  sunrealtype resnorm;
   long int nps_inc;
 #endif
 
diff --git a/src/cvode/cvode_ls_impl.h b/src/cvode/cvode_ls_impl.h
index c5fcbfb4e6..9b7692d905 100644
--- a/src/cvode/cvode_ls_impl.h
+++ b/src/cvode/cvode_ls_impl.h
@@ -38,8 +38,8 @@ extern "C" {
               tolerance on the linear iteration
   -----------------------------------------------------------------*/
 #define CVLS_MSBJ   51
-#define CVLS_DGMAX  RCONST(0.2)
-#define CVLS_EPLIN  RCONST(0.05)
+#define CVLS_DGMAX  SUN_RCONST(0.2)
+#define CVLS_EPLIN  SUN_RCONST(0.05)
 
 
 /*-----------------------------------------------------------------
@@ -50,23 +50,23 @@ extern "C" {
 typedef struct CVLsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;   /* SUNTRUE if using internal DQ Jac approx.     */
+  sunbooleantype jacDQ;   /* SUNTRUE if using internal DQ Jac approx.     */
   CVLsJacFn jac;       /* Jacobian routine to be called                */
   void *J_data;        /* user data is passed to jac                   */
-  booleantype jbad;    /* heuristic suggestion for pset                */
-  realtype dgmax_jbad; /* if convfail = FAIL_BAD_J and the gamma ratio *
+  sunbooleantype jbad;    /* heuristic suggestion for pset                */
+  sunrealtype dgmax_jbad; /* if convfail = FAIL_BAD_J and the gamma ratio *
                         * |gamma/gammap-1| < dgmax_jbad then J is bad  */
 
   /* Matrix-based solver, scale solution to account for change in gamma */
-  booleantype scalesol;
+  sunbooleantype scalesol;
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor       */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor      */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor       */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor      */
 
   /* Linear solver, matrix and vector objects/pointers */
   SUNLinearSolver LS; /* generic linear solver object                 */
@@ -110,7 +110,7 @@ typedef struct CVLsMemRec {
    * (b) internal jtimes
    *     - jt_data == cvode_mem
    *     - jtimesDQ == SUNTRUE */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   CVLsJacTimesSetupFn jtsetup;
   CVLsJacTimesVecFn jtimes;
   CVRhsFn jt_f;
@@ -123,7 +123,7 @@ typedef struct CVLsMemRec {
    * (b) internal linsys function:
    *     - user_linsys = SUNFALSE
    *     - A_data      = cvode_mem */
-  booleantype user_linsys;
+  sunbooleantype user_linsys;
   CVLsLinSysFn linsys;
   void* A_data;
 
@@ -139,26 +139,26 @@ typedef struct CVLsMemRec {
 int cvLsATimes(void* cvode_mem, N_Vector v, N_Vector z);
 int cvLsPSetup(void* cvode_mem);
 int cvLsPSolve(void* cvode_mem, N_Vector r, N_Vector z,
-               realtype tol, int lr);
+               sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jac times vector */
-int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int cvLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                  N_Vector y, N_Vector fy, void *data,
                  N_Vector work);
 
 /* Difference-quotient Jacobian approximation routines */
-int cvLsDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+int cvLsDQJac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
               void *data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1);
-int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                   SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1,
                   N_Vector tmp2);
 
 /* Generic linit/lsetup/lsolve/lfree interface routines for CVode to call */
 int cvLsInitialize(CVodeMem cv_mem);
 int cvLsSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-              N_Vector fpred, booleantype *jcurPtr,
+              N_Vector fpred, sunbooleantype *jcurPtr,
               N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3);
 int cvLsSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
               N_Vector ycur, N_Vector fcur);
diff --git a/src/cvode/cvode_nls.c b/src/cvode/cvode_nls.c
index 8754fed436..5349b11892 100644
--- a/src/cvode/cvode_nls.c
+++ b/src/cvode/cvode_nls.c
@@ -18,7 +18,7 @@
 #include "sundials/sundials_math.h"
 
 /* constant macros */
-#define ONE RCONST(1.0) /* real 1.0 */
+#define ONE SUN_RCONST(1.0) /* real 1.0 */
 
 /* nonlinear solver constants
      NLS_MAXCOR  maximum no. of corrector iterations for the nonlinear solver
@@ -27,21 +27,21 @@
      RDIV        declare divergence if ratio del/delp > RDIV
  */
 #define NLS_MAXCOR 3
-#define CRDOWN     RCONST(0.3)
-#define RDIV       RCONST(2.0)
+#define CRDOWN     SUN_RCONST(0.3)
+#define RDIV       SUN_RCONST(2.0)
 
 /* private functions */
 static int cvNlsResidual(N_Vector ycor, N_Vector res, void* cvode_mem);
 static int cvNlsFPFunction(N_Vector ycor, N_Vector res, void* cvode_mem);
 
-static int cvNlsLSetup(booleantype jbad, booleantype* jcur, void* cvode_mem);
+static int cvNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* cvode_mem);
 static int cvNlsLSolve(N_Vector delta, void* cvode_mem);
 static int cvNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                         realtype tol, N_Vector ewt, void* cvode_mem);
+                         sunrealtype tol, N_Vector ewt, void* cvode_mem);
 
 #ifdef SUNDIALS_BUILD_PACKAGE_FUSED_KERNELS
-int cvNlsResid_fused(const realtype rl1,
-                     const realtype ngamma,
+int cvNlsResid_fused(const sunrealtype rl1,
+                     const sunrealtype ngamma,
                      const N_Vector zn1,
                      const N_Vector ycor,
                      const N_Vector ftemp,
@@ -173,10 +173,10 @@ int CVodeSetNlsRhsFn(void *cvode_mem, CVRhsFn f)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur,
+int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur,
                                 N_Vector *ypred, N_Vector *yn,
-                                N_Vector *fn, realtype *gamma,
-                                realtype *rl1, N_Vector *zn1,
+                                N_Vector *fn, sunrealtype *gamma,
+                                sunrealtype *rl1, N_Vector *zn1,
                                 void **user_data)
 {
   CVodeMem cv_mem;
@@ -248,7 +248,7 @@ int cvNlsInit(CVodeMem cvode_mem)
 }
 
 
-static int cvNlsLSetup(booleantype jbad, booleantype* jcur, void* cvode_mem)
+static int cvNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int      retval;
@@ -305,12 +305,12 @@ static int cvNlsLSolve(N_Vector delta, void* cvode_mem)
 
 
 static int cvNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector delta,
-                         realtype tol, N_Vector ewt, void* cvode_mem)
+                         sunrealtype tol, N_Vector ewt, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int m, retval;
-  realtype del;
-  realtype dcon;
+  sunrealtype del;
+  sunrealtype dcon;
 
   if (cvode_mem == NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODE", "cvNlsConvTest", MSGCV_NO_MEM);
diff --git a/src/cvode/cvode_proj.c b/src/cvode/cvode_proj.c
index 687b62dd37..d87b2a96a1 100644
--- a/src/cvode/cvode_proj.c
+++ b/src/cvode/cvode_proj.c
@@ -23,10 +23,10 @@
 #include "cvode_impl.h"
 
 /* Private constants */
-#define ZERO  RCONST(0.0)  /* real 0.0 */
-#define ONE   RCONST(1.0)  /* real 1.0 */
+#define ZERO  SUN_RCONST(0.0)  /* real 0.0 */
+#define ONE   SUN_RCONST(1.0)  /* real 1.0 */
 
-#define ONEPSM RCONST(1.000001)
+#define ONEPSM SUN_RCONST(1.000001)
 
 /* Private utility function prototypes */
 static int cvProjCreate(CVodeProjMem *proj_mem);
@@ -103,7 +103,7 @@ int CVodeSetProjFn(void *cvode_mem, CVProjFn pfun)
  * ===========================================================================*/
 
 
-int CVodeSetProjErrEst(void *cvode_mem, booleantype onoff)
+int CVodeSetProjErrEst(void *cvode_mem, sunbooleantype onoff)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -183,7 +183,7 @@ int CVodeSetMaxNumProjFails(void *cvode_mem, int max_fails)
 }
 
 
-int CVodeSetEpsProj(void *cvode_mem, realtype eps)
+int CVodeSetEpsProj(void *cvode_mem, sunrealtype eps)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -210,7 +210,7 @@ int CVodeSetEpsProj(void *cvode_mem, realtype eps)
 }
 
 
-int CVodeSetProjFailEta(void *cvode_mem, realtype eta)
+int CVodeSetProjFailEta(void *cvode_mem, sunrealtype eta)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -292,7 +292,7 @@ int CVodeGetNumProjFails(void *cvode_mem, long int *npfails)
  * until it is potentially used in cvCompleteStep).
  */
 
-int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                    int *npfailPtr)
 {
   int          retval;
diff --git a/src/cvode/cvode_proj_impl.h b/src/cvode/cvode_proj_impl.h
index a66e49980a..a4f37f7c0f 100644
--- a/src/cvode/cvode_proj_impl.h
+++ b/src/cvode/cvode_proj_impl.h
@@ -34,8 +34,8 @@ extern "C" {
  * ===========================================================================*/
 
 #define PROJ_MAX_FAILS 10
-#define PROJ_EPS       RCONST(0.1)
-#define PROJ_FAIL_ETA  RCONST(0.25)
+#define PROJ_EPS       SUN_RCONST(0.1)
+#define PROJ_FAIL_ETA  SUN_RCONST(0.25)
 
 /* =============================================================================
  * Projection Data Structure
@@ -49,9 +49,9 @@ extern "C" {
  * ---------------------------------------------------------------------------*/
 typedef struct CVodeProjMemRec {
 
-  booleantype internal_proj;  /* use the internal projection algorithm?      */
-  booleantype err_proj;       /* is error projection enabled?                */
-  booleantype first_proj;     /* is this the first time we project?          */
+  sunbooleantype internal_proj;  /* use the internal projection algorithm?      */
+  sunbooleantype err_proj;       /* is error projection enabled?                */
+  sunbooleantype first_proj;     /* is this the first time we project?          */
 
   long int freq;              /* projection frequency                        */
   long int nstlprj;           /* step number of last projection              */
@@ -60,8 +60,8 @@ typedef struct CVodeProjMemRec {
 
   CVProjFn pfun;              /* function to perform projection              */
 
-  realtype eps_proj;          /* projection solve tolerance                  */
-  realtype eta_pfail;         /* projection failure step reduction factor    */
+  sunrealtype eps_proj;          /* projection solve tolerance                  */
+  sunrealtype eta_pfail;         /* projection failure step reduction factor    */
 
   long int nproj;             /* number of projections performed             */
   long int npfails;           /* number of projection failures               */
diff --git a/src/cvode/fmod/fcvode_mod.c b/src/cvode/fmod/fcvode_mod.c
index 5b63d2b605..7ca6b948e5 100644
--- a/src/cvode/fmod/fcvode_mod.c
+++ b/src/cvode/fmod/fcvode_mod.c
@@ -256,13 +256,13 @@ SWIGEXPORT int _wrap_FCVodeInit(void *farg1, CVRhsFn farg2, double const *farg3,
   int fresult ;
   void *arg1 = (void *) 0 ;
   CVRhsFn arg2 = (CVRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (CVRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -273,12 +273,12 @@ SWIGEXPORT int _wrap_FCVodeInit(void *farg1, CVRhsFn farg2, double const *farg3,
 SWIGEXPORT int _wrap_FCVodeReInit(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeReInit(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -289,13 +289,13 @@ SWIGEXPORT int _wrap_FCVodeReInit(void *farg1, double const *farg2, N_Vector far
 SWIGEXPORT int _wrap_FCVodeSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -305,12 +305,12 @@ SWIGEXPORT int _wrap_FCVodeSStolerances(void *farg1, double const *farg2, double
 SWIGEXPORT int _wrap_FCVodeSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -349,11 +349,11 @@ SWIGEXPORT int _wrap_FCVodeSetConstraints(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxLSetup(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetDeltaGammaMaxLSetup(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -393,11 +393,11 @@ SWIGEXPORT int _wrap_FCVodeSetErrHandlerFn(void *farg1, CVErrHandlerFn farg2, vo
 SWIGEXPORT int _wrap_FCVodeSetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -505,11 +505,11 @@ SWIGEXPORT int _wrap_FCVodeSetMaxOrd(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -519,11 +519,11 @@ SWIGEXPORT int _wrap_FCVodeSetMaxStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -575,11 +575,11 @@ SWIGEXPORT int _wrap_FCVodeSetNlsRhsFn(void *farg1, CVRhsFn farg2) {
 SWIGEXPORT int _wrap_FCVodeSetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -617,11 +617,11 @@ SWIGEXPORT int _wrap_FCVodeSetStabLimDet(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -685,13 +685,13 @@ SWIGEXPORT int _wrap_FCVodeSetUserData(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetEtaFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -701,11 +701,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaFixedStepBounds(void *farg1, double const *farg
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxFirstStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxFirstStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -715,11 +715,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMaxFirstStep(void *farg1, double const *farg2)
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxEarlyStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxEarlyStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -743,11 +743,11 @@ SWIGEXPORT int _wrap_FCVodeSetNumStepsEtaMaxEarlyStep(void *farg1, long const *f
 SWIGEXPORT int _wrap_FCVodeSetEtaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -757,11 +757,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMax(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -771,11 +771,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMinErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMinErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -785,11 +785,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMinErrFail(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -813,11 +813,11 @@ SWIGEXPORT int _wrap_FCVodeSetNumFailsEtaMaxErrFail(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FCVodeSetEtaConvFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaConvFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -869,16 +869,16 @@ SWIGEXPORT int _wrap_FCVodeSetNoInactiveRootWarn(void *farg1) {
 SWIGEXPORT int _wrap_FCVode(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)CVode(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -905,13 +905,13 @@ SWIGEXPORT int _wrap_FCVodeComputeState(void *farg1, N_Vector farg2, N_Vector fa
 SWIGEXPORT int _wrap_FCVodeGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetDky(arg1,arg2,arg3,arg4);
@@ -1023,11 +1023,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentOrder(void *farg1, int *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentGamma(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentGamma(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1051,11 +1051,11 @@ SWIGEXPORT int _wrap_FCVodeGetNumStabLimOrderReds(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1065,11 +1065,11 @@ SWIGEXPORT int _wrap_FCVodeGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1079,11 +1079,11 @@ SWIGEXPORT int _wrap_FCVodeGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1107,11 +1107,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentState(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1121,11 +1121,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1197,10 +1197,10 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
   long *arg5 = (long *) 0 ;
   int *arg6 = (int *) 0 ;
   int *arg7 = (int *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
-  realtype *arg9 = (realtype *) 0 ;
-  realtype *arg10 = (realtype *) 0 ;
-  realtype *arg11 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
+  sunrealtype *arg9 = (sunrealtype *) 0 ;
+  sunrealtype *arg10 = (sunrealtype *) 0 ;
+  sunrealtype *arg11 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -1210,10 +1210,10 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
   arg5 = (long *)(farg5);
   arg6 = (int *)(farg6);
   arg7 = (int *)(farg7);
-  arg8 = (realtype *)(farg8);
-  arg9 = (realtype *)(farg9);
-  arg10 = (realtype *)(farg10);
-  arg11 = (realtype *)(farg11);
+  arg8 = (sunrealtype *)(farg8);
+  arg9 = (sunrealtype *)(farg9);
+  arg10 = (sunrealtype *)(farg10);
+  arg11 = (sunrealtype *)(farg11);
   result = (int)CVodeGetIntegratorStats(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
   fresult = (int)(result);
   return fresult;
@@ -1223,23 +1223,23 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
 SWIGEXPORT int _wrap_FCVodeGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, double *farg6, double *farg7, void *farg8, void *farg9) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
-  realtype *arg7 = (realtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
+  sunrealtype *arg7 = (sunrealtype *) 0 ;
   N_Vector *arg8 = (N_Vector *) 0 ;
   void **arg9 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
-  arg6 = (realtype *)(farg6);
-  arg7 = (realtype *)(farg7);
+  arg6 = (sunrealtype *)(farg6);
+  arg7 = (sunrealtype *)(farg7);
   arg8 = (N_Vector *)(farg8);
   arg9 = (void **)(farg9);
   result = (int)CVodeGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -1427,7 +1427,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInit(void *farg1, int64_t const *farg2, int64_t c
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   CVLocalFn arg8 = (CVLocalFn) 0 ;
   CVCommFn arg9 = (CVCommFn) 0 ;
   int result;
@@ -1438,7 +1438,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInit(void *farg1, int64_t const *farg2, int64_t c
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (CVLocalFn)(farg8);
   arg9 = (CVCommFn)(farg9);
   result = (int)CVBBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -1452,13 +1452,13 @@ SWIGEXPORT int _wrap_FCVBBDPrecReInit(void *farg1, int64_t const *farg2, int64_t
   void *arg1 = (void *) 0 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)CVBBDPrecReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -1625,11 +1625,11 @@ SWIGEXPORT int _wrap_FCVodeSetLinearSolutionScaling(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxBadJac(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetDeltaGammaMaxBadJac(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1639,11 +1639,11 @@ SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxBadJac(void *farg1, double const *far
 SWIGEXPORT int _wrap_FCVodeSetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1653,11 +1653,11 @@ SWIGEXPORT int _wrap_FCVodeSetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1994,11 +1994,11 @@ SWIGEXPORT int _wrap_FCVodeSetMaxNumProjFails(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEpsProj(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEpsProj(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -2008,11 +2008,11 @@ SWIGEXPORT int _wrap_FCVodeSetEpsProj(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetProjFailEta(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetProjFailEta(arg1,arg2);
   fresult = (int)(result);
   return fresult;
diff --git a/src/cvode/fmod/fcvode_mod.f90 b/src/cvode/fmod/fcvode_mod.f90
index 738f334a3f..6cad0fc9f2 100644
--- a/src/cvode/fmod/fcvode_mod.f90
+++ b/src/cvode/fmod/fcvode_mod.f90
@@ -3132,13 +3132,13 @@ function FCVodeGetJacTime(cvode_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: cvode_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = cvode_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FCVodeGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/cvodes/cvodea.c b/src/cvodes/cvodea.c
index c382e80a2f..e7b22994e9 100644
--- a/src/cvodes/cvodea.c
+++ b/src/cvodes/cvodea.c
@@ -36,11 +36,11 @@
  * =================================================================
  */
 
-#define ZERO        RCONST(0.0)        /* real 0.0   */
-#define ONE         RCONST(1.0)        /* real 1.0   */
-#define TWO         RCONST(2.0)        /* real 2.0   */
-#define HUNDRED     RCONST(100.0)      /* real 100.0 */
-#define FUZZ_FACTOR RCONST(1000000.0)  /* fuzz factor for IMget */
+#define ZERO        SUN_RCONST(0.0)        /* real 0.0   */
+#define ONE         SUN_RCONST(1.0)        /* real 1.0   */
+#define TWO         SUN_RCONST(2.0)        /* real 2.0   */
+#define HUNDRED     SUN_RCONST(100.0)      /* real 100.0 */
+#define FUZZ_FACTOR SUN_RCONST(1000000.0)  /* fuzz factor for IMget */
 
 /*=================================================================*/
 /* Shortcuts                                                       */
@@ -63,25 +63,25 @@ static void CVAbckpbDelete(CVodeBMem *cvB_memPtr);
 static int  CVAdataStore(CVodeMem cv_mem, CVckpntMem ck_mem);
 static int  CVAckpntGet(CVodeMem cv_mem, CVckpntMem ck_mem);
 
-static int CVAfindIndex(CVodeMem cv_mem, realtype t,
-                        long int *indx, booleantype *newpoint);
+static int CVAfindIndex(CVodeMem cv_mem, sunrealtype t,
+                        long int *indx, sunbooleantype *newpoint);
 
-static booleantype CVAhermiteMalloc(CVodeMem cv_mem);
+static sunbooleantype CVAhermiteMalloc(CVodeMem cv_mem);
 static void CVAhermiteFree(CVodeMem cv_mem);
-static int CVAhermiteGetY(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
+static int CVAhermiteGetY(CVodeMem cv_mem, sunrealtype t, N_Vector y, N_Vector *yS);
 static int CVAhermiteStorePnt(CVodeMem cv_mem, CVdtpntMem d);
 
-static booleantype CVApolynomialMalloc(CVodeMem cv_mem);
+static sunbooleantype CVApolynomialMalloc(CVodeMem cv_mem);
 static void CVApolynomialFree(CVodeMem cv_mem);
-static int CVApolynomialGetY(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
+static int CVApolynomialGetY(CVodeMem cv_mem, sunrealtype t, N_Vector y, N_Vector *yS);
 static int CVApolynomialStorePnt(CVodeMem cv_mem, CVdtpntMem d);
 
 /* Wrappers */
 
-static int CVArhs(realtype t, N_Vector yB,
+static int CVArhs(sunrealtype t, N_Vector yB,
                   N_Vector yBdot, void *cvode_mem);
 
-static int CVArhsQ(realtype t, N_Vector yB,
+static int CVArhsQ(sunrealtype t, N_Vector yB,
                    N_Vector qBdot, void *cvode_mem);
 
 /*
@@ -375,8 +375,8 @@ void CVodeAdjFree(void *cvode_mem)
  * ncheckPtr points to the number of check points stored so far.
  */
 
-int CVodeF(void *cvode_mem, realtype tout, N_Vector yout,
-           realtype *tret, int itask, int *ncheckPtr)
+int CVodeF(void *cvode_mem, sunrealtype tout, N_Vector yout,
+           sunrealtype *tret, int itask, int *ncheckPtr)
 {
   CVadjMem ca_mem;
   CVodeMem cv_mem;
@@ -384,8 +384,8 @@ int CVodeF(void *cvode_mem, realtype tout, N_Vector yout,
   CVdtpntMem *dt_mem;
   long int nstloc;
   int flag, i;
-  booleantype allocOK, earlyret;
-  realtype ttest;
+  sunbooleantype allocOK, earlyret;
+  sunrealtype ttest;
 
   /* Check if cvode_mem exists */
   if (cvode_mem == NULL) {
@@ -717,7 +717,7 @@ int CVodeCreateB(void *cvode_mem, int lmmB, int *which)
 
 int CVodeInitB(void *cvode_mem, int which,
                CVRhsFnB fB,
-               realtype tB0, N_Vector yB0)
+               sunrealtype tB0, N_Vector yB0)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -788,7 +788,7 @@ int CVodeInitB(void *cvode_mem, int which,
 
 int CVodeInitBS(void *cvode_mem, int which,
                 CVRhsFnBS fBs,
-                realtype tB0, N_Vector yB0)
+                sunrealtype tB0, N_Vector yB0)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -859,7 +859,7 @@ int CVodeInitBS(void *cvode_mem, int which,
 
 
 int CVodeReInitB(void *cvode_mem, int which,
-                 realtype tB0, N_Vector yB0)
+                 sunrealtype tB0, N_Vector yB0)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -909,7 +909,7 @@ int CVodeReInitB(void *cvode_mem, int which,
 }
 
 
-int CVodeSStolerancesB(void *cvode_mem, int which, realtype reltolB, realtype abstolB)
+int CVodeSStolerancesB(void *cvode_mem, int which, sunrealtype reltolB, sunrealtype abstolB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -958,7 +958,7 @@ int CVodeSStolerancesB(void *cvode_mem, int which, realtype reltolB, realtype ab
 }
 
 
-int CVodeSVtolerancesB(void *cvode_mem, int which, realtype reltolB, N_Vector abstolB)
+int CVodeSVtolerancesB(void *cvode_mem, int which, sunrealtype reltolB, N_Vector abstolB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -1168,7 +1168,7 @@ int CVodeQuadReInitB(void *cvode_mem, int which, N_Vector yQB0)
   return(CV_SUCCESS);
 }
 
-int CVodeQuadSStolerancesB(void *cvode_mem, int which, realtype reltolQB, realtype abstolQB)
+int CVodeQuadSStolerancesB(void *cvode_mem, int which, sunrealtype reltolQB, sunrealtype abstolQB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -1215,7 +1215,7 @@ int CVodeQuadSStolerancesB(void *cvode_mem, int which, realtype reltolQB, realty
   return(flag);
 }
 
-int CVodeQuadSVtolerancesB(void *cvode_mem, int which, realtype reltolQB, N_Vector abstolQB)
+int CVodeQuadSVtolerancesB(void *cvode_mem, int which, sunrealtype reltolQB, N_Vector abstolQB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -1276,15 +1276,15 @@ int CVodeQuadSVtolerancesB(void *cvode_mem, int which, realtype reltolQB, N_Vect
  * when called in ONE_STEP mode.
  */
 
-int CVodeB(void *cvode_mem, realtype tBout, int itaskB)
+int CVodeB(void *cvode_mem, sunrealtype tBout, int itaskB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
   CVodeBMem cvB_mem, tmp_cvB_mem;
   CVckpntMem ck_mem;
   int sign, flag=0;
-  realtype tfuzz, tBret, tBn;
-  booleantype gotCheckpoint, isActive, reachedTBout;
+  sunrealtype tfuzz, tBret, tBn;
+  sunbooleantype gotCheckpoint, isActive, reachedTBout;
 
   /* Check if cvode_mem exists */
 
@@ -1517,7 +1517,7 @@ int CVodeB(void *cvode_mem, realtype tBout, int itaskB)
 }
 
 
-int CVodeGetB(void *cvode_mem, int which, realtype *tret, N_Vector yB)
+int CVodeGetB(void *cvode_mem, int which, sunrealtype *tret, N_Vector yB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -1562,7 +1562,7 @@ int CVodeGetB(void *cvode_mem, int which, realtype *tret, N_Vector yB)
  * CVodeGetQuadB
  */
 
-int CVodeGetQuadB(void *cvode_mem, int which, realtype *tret, N_Vector qB)
+int CVodeGetQuadB(void *cvode_mem, int which, sunrealtype *tret, N_Vector qB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -2099,7 +2099,7 @@ static int CVAdataStore(CVodeMem cv_mem, CVckpntMem ck_mem)
 {
   CVadjMem ca_mem;
   CVdtpntMem *dt_mem;
-  realtype t;
+  sunrealtype t;
   long int i;
   int flag, sign;
 
@@ -2306,13 +2306,13 @@ static int CVAckpntGet(CVodeMem cv_mem, CVckpntMem ck_mem)
  * find indx (t is too far beyond limits).
  */
 
-static int CVAfindIndex(CVodeMem cv_mem, realtype t,
-                        long int *indx, booleantype *newpoint)
+static int CVAfindIndex(CVodeMem cv_mem, sunrealtype t,
+                        long int *indx, sunbooleantype *newpoint)
 {
   CVadjMem ca_mem;
   CVdtpntMem *dt_mem;
   int sign;
-  booleantype to_left, to_right;
+  sunbooleantype to_left, to_right;
 
   ca_mem = cv_mem->cv_adj_mem;
   dt_mem = ca_mem->dt_mem;
@@ -2390,7 +2390,7 @@ static int CVAfindIndex(CVodeMem cv_mem, realtype t,
  * The user must allocate space for y.
  */
 
-int CVodeGetAdjY(void *cvode_mem, realtype t, N_Vector y)
+int CVodeGetAdjY(void *cvode_mem, sunrealtype t, N_Vector y)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -2424,13 +2424,13 @@ int CVodeGetAdjY(void *cvode_mem, realtype t, N_Vector y)
  * at any other time.
  */
 
-static booleantype CVAhermiteMalloc(CVodeMem cv_mem)
+static sunbooleantype CVAhermiteMalloc(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
   CVdtpntMem *dt_mem;
   CVhermiteDataMem content;
   long int i, ii=0;
-  booleantype allocOK;
+  sunbooleantype allocOK;
 
   allocOK = SUNTRUE;
 
@@ -2643,26 +2643,26 @@ static int CVAhermiteStorePnt(CVodeMem cv_mem, CVdtpntMem d)
  * can be directly called by the user through CVodeGetAdjY
  */
 
-static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
+static int CVAhermiteGetY(CVodeMem cv_mem, sunrealtype t,
                           N_Vector y, N_Vector *yS)
 {
   CVadjMem ca_mem;
   CVdtpntMem *dt_mem;
   CVhermiteDataMem content0, content1;
 
-  realtype t0, t1, delta;
-  realtype factor1, factor2, factor3;
+  sunrealtype t0, t1, delta;
+  sunrealtype factor1, factor2, factor3;
 
   N_Vector y0, yd0, y1, yd1;
   N_Vector *yS0=NULL, *ySd0=NULL, *yS1, *ySd1;
 
   int flag, is, NS;
   long int indx;
-  booleantype newpoint;
+  sunbooleantype newpoint;
 
   /* local variables for fused vector oerations */
   int retval;
-  realtype  cvals[4];
+  sunrealtype  cvals[4];
   N_Vector  Xvecs[4];
   N_Vector* XXvecs[4];
 
@@ -2819,13 +2819,13 @@ static int CVAhermiteGetY(CVodeMem cv_mem, realtype t,
  * at any other time.
  */
 
-static booleantype CVApolynomialMalloc(CVodeMem cv_mem)
+static sunbooleantype CVApolynomialMalloc(CVodeMem cv_mem)
 {
   CVadjMem ca_mem;
   CVdtpntMem *dt_mem;
   CVpolynomialDataMem content;
   long int i, ii=0;
-  booleantype allocOK;
+  sunbooleantype allocOK;
 
   allocOK = SUNTRUE;
 
@@ -2985,7 +2985,7 @@ static int CVApolynomialStorePnt(CVodeMem cv_mem, CVdtpntMem d)
  * can be directly called by the user through CVodeGetAdjY.
  */
 
-static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
+static int CVApolynomialGetY(CVodeMem cv_mem, sunrealtype t,
                              N_Vector y, N_Vector *yS)
 {
   CVadjMem ca_mem;
@@ -2994,8 +2994,8 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
 
   int flag, dir, order, i, j, is, NS, retval;
   long int indx, base;
-  booleantype newpoint;
-  realtype dt, factor;
+  sunbooleantype newpoint;
+  sunrealtype dt, factor;
 
   ca_mem = cv_mem->cv_adj_mem;
   dt_mem = ca_mem->dt_mem;
@@ -3130,7 +3130,7 @@ static int CVApolynomialGetY(CVodeMem cv_mem, realtype t,
  * provided by the user.
  */
 
-static int CVArhs(realtype t, N_Vector yB,
+static int CVArhs(sunrealtype t, N_Vector yB,
                   N_Vector yBdot, void *cvode_mem)
 {
   CVodeMem cv_mem;
@@ -3173,7 +3173,7 @@ static int CVArhs(realtype t, N_Vector yB,
  * provided by the user.
  */
 
-static int CVArhsQ(realtype t, N_Vector yB,
+static int CVArhsQ(sunrealtype t, N_Vector yB,
                    N_Vector qBdot, void *cvode_mem)
 {
   CVodeMem cv_mem;
diff --git a/src/cvodes/cvodea_io.c b/src/cvodes/cvodea_io.c
index 3cd6ac7af2..ca5458de94 100644
--- a/src/cvodes/cvodea_io.c
+++ b/src/cvodes/cvodea_io.c
@@ -38,7 +38,7 @@
  * =================================================================
  */
 
-#define ONE         RCONST(1.0) 
+#define ONE         SUN_RCONST(1.0) 
 
 /* 
  * =================================================================
@@ -248,7 +248,7 @@ int CVodeSetMaxNumStepsB(void *cvode_mem, int which, long int mxstepsB)
   return(flag);
 }
 
-int CVodeSetStabLimDetB(void *cvode_mem, int which, booleantype stldetB)
+int CVodeSetStabLimDetB(void *cvode_mem, int which, sunbooleantype stldetB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -290,7 +290,7 @@ int CVodeSetStabLimDetB(void *cvode_mem, int which, booleantype stldetB)
   return(flag);
 }
 
-int CVodeSetInitStepB(void *cvode_mem, int which, realtype hinB)
+int CVodeSetInitStepB(void *cvode_mem, int which, sunrealtype hinB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -332,7 +332,7 @@ int CVodeSetInitStepB(void *cvode_mem, int which, realtype hinB)
   return(flag);
 }
 
-int CVodeSetMinStepB(void *cvode_mem, int which, realtype hminB)
+int CVodeSetMinStepB(void *cvode_mem, int which, sunrealtype hminB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -374,7 +374,7 @@ int CVodeSetMinStepB(void *cvode_mem, int which, realtype hminB)
   return(flag);
 }
 
-int CVodeSetMaxStepB(void *cvode_mem, int which, realtype hmaxB)
+int CVodeSetMaxStepB(void *cvode_mem, int which, sunrealtype hmaxB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -463,7 +463,7 @@ int CVodeSetConstraintsB(void *cvode_mem, int which, N_Vector constraintsB)
  * CVODES quadrature optional input functions
  */
 
-int CVodeSetQuadErrConB(void *cvode_mem, int which, booleantype errconQB)
+int CVodeSetQuadErrConB(void *cvode_mem, int which, sunbooleantype errconQB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -626,7 +626,7 @@ int CVodeGetAdjCheckPointsInfo(void *cvode_mem, CVadjCheckPointRec *ckpnt)
  */
 
 int CVodeGetAdjDataPointHermite(void *cvode_mem, int which, 
-                                realtype *t, N_Vector y, N_Vector yd)
+                                sunrealtype *t, N_Vector y, N_Vector yd)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -675,7 +675,7 @@ int CVodeGetAdjDataPointHermite(void *cvode_mem, int which,
  */
 
 int CVodeGetAdjDataPointPolynomial(void *cvode_mem, int which, 
-                                   realtype *t, int *order, N_Vector y)
+                                   sunrealtype *t, int *order, N_Vector y)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
diff --git a/src/cvodes/cvodes.c b/src/cvodes/cvodes.c
index cd1fabfd3d..7500d58e9f 100644
--- a/src/cvodes/cvodes.c
+++ b/src/cvodes/cvodes.c
@@ -198,21 +198,21 @@
 /* CVODE Private Constants                                         */
 /*=================================================================*/
 
-#define ZERO    RCONST(0.0)     /* real 0.0     */
-#define TINY    RCONST(1.0e-10) /* small number */
-#define PT1     RCONST(0.1)     /* real 0.1     */
-#define POINT2  RCONST(0.2)     /* real 0.2     */
-#define FOURTH  RCONST(0.25)    /* real 0.25    */
-#define HALF    RCONST(0.5)     /* real 0.5     */
-#define PT9     RCONST(0.9)     /* real 0.9     */
-#define ONE     RCONST(1.0)     /* real 1.0     */
-#define ONEPT5  RCONST(1.50)    /* real 1.5     */
-#define TWO     RCONST(2.0)     /* real 2.0     */
-#define THREE   RCONST(3.0)     /* real 3.0     */
-#define FOUR    RCONST(4.0)     /* real 4.0     */
-#define FIVE    RCONST(5.0)     /* real 5.0     */
-#define TWELVE  RCONST(12.0)    /* real 12.0    */
-#define HUNDRED RCONST(100.0)   /* real 100.0   */
+#define ZERO    SUN_RCONST(0.0)     /* real 0.0     */
+#define TINY    SUN_RCONST(1.0e-10) /* small number */
+#define PT1     SUN_RCONST(0.1)     /* real 0.1     */
+#define POINT2  SUN_RCONST(0.2)     /* real 0.2     */
+#define FOURTH  SUN_RCONST(0.25)    /* real 0.25    */
+#define HALF    SUN_RCONST(0.5)     /* real 0.5     */
+#define PT9     SUN_RCONST(0.9)     /* real 0.9     */
+#define ONE     SUN_RCONST(1.0)     /* real 1.0     */
+#define ONEPT5  SUN_RCONST(1.50)    /* real 1.5     */
+#define TWO     SUN_RCONST(2.0)     /* real 2.0     */
+#define THREE   SUN_RCONST(3.0)     /* real 3.0     */
+#define FOUR    SUN_RCONST(4.0)     /* real 4.0     */
+#define FIVE    SUN_RCONST(5.0)     /* real 5.0     */
+#define TWELVE  SUN_RCONST(12.0)    /* real 12.0    */
+#define HUNDRED SUN_RCONST(100.0)   /* real 100.0   */
 
 /*=================================================================*/
 /* CVODE Routine-Specific Constants                                */
@@ -293,20 +293,20 @@
  *
  */
 
-#define FUZZ_FACTOR RCONST(100.0)
+#define FUZZ_FACTOR SUN_RCONST(100.0)
 
-#define HLB_FACTOR RCONST(100.0)
-#define HUB_FACTOR RCONST(0.1)
+#define HLB_FACTOR SUN_RCONST(100.0)
+#define HUB_FACTOR SUN_RCONST(0.1)
 #define H_BIAS     HALF
 #define MAX_ITERS  4
 
-#define CORTES RCONST(0.1)
+#define CORTES SUN_RCONST(0.1)
 
 /*=================================================================*/
 /* Private Helper Functions Prototypes                             */
 /*=================================================================*/
 
-static booleantype cvCheckNvector(N_Vector tmpl);
+static sunbooleantype cvCheckNvector(N_Vector tmpl);
 
 /* Initial setup */
 
@@ -314,16 +314,16 @@ static int cvInitialSetup(CVodeMem cv_mem);
 
 /* Memory allocation/deallocation */
 
-static booleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
+static sunbooleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
 static void cvFreeVectors(CVodeMem cv_mem);
 
-static booleantype cvQuadAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
+static sunbooleantype cvQuadAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
 static void cvQuadFreeVectors(CVodeMem cv_mem);
 
-static booleantype cvSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
+static sunbooleantype cvSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
 static void cvSensFreeVectors(CVodeMem cv_mem);
 
-static booleantype cvQuadSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
+static sunbooleantype cvQuadSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl);
 static void cvQuadSensFreeVectors(CVodeMem cv_mem);
 
 
@@ -347,9 +347,9 @@ static int cvQuadSensEwtSetSV(CVodeMem cv_mem, N_Vector *yQScur, N_Vector *weigh
 
 /* Initial stepsize calculation */
 
-static int cvHin(CVodeMem cv_mem, realtype tout);
-static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist);
-static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm);
+static int cvHin(CVodeMem cv_mem, sunrealtype tout);
+static sunrealtype cvUpperBoundH0(CVodeMem cv_mem, sunrealtype tdist);
+static int cvYddNorm(CVodeMem cv_mem, sunrealtype hg, sunrealtype *yddnrm);
 
 /* Main cvStep function */
 
@@ -366,12 +366,12 @@ static void cvDecreaseBDF(CVodeMem cv_mem);
 static void cvPredict(CVodeMem cv_mem);
 static void cvSet(CVodeMem cv_mem);
 static void cvSetAdams(CVodeMem cv_mem);
-static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[]);
-static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype hsum);
-static realtype cvAltSum(int iend, realtype a[], int k);
+static sunrealtype cvAdamsStart(CVodeMem cv_mem, sunrealtype m[]);
+static void cvAdamsFinish(CVodeMem cv_mem, sunrealtype m[], sunrealtype M[], sunrealtype hsum);
+static sunrealtype cvAltSum(int iend, sunrealtype a[], int k);
 static void cvSetBDF(CVodeMem cv_mem);
-static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
-                       realtype alpha0_hat, realtype xi_inv, realtype xistar_inv);
+static void cvSetTqBDF(CVodeMem cv_mem, sunrealtype hsum, sunrealtype alpha0,
+                       sunrealtype alpha0_hat, sunrealtype xi_inv, sunrealtype xistar_inv);
 
 /* Nonlinear solver functions */
 
@@ -383,22 +383,22 @@ static int cvQuadSensNls(CVodeMem cv_mem);
 
 static int cvCheckConstraints(CVodeMem cv_mem);
 
-static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                          int *ncfPtr, long int *ncfnPtr);
 
 /* Error Test */
 
-static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
-                         realtype acor_nrm,
-                         int *nefPtr, long int *netfPtr, realtype *dsmPtr);
+static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
+                         sunrealtype acor_nrm,
+                         int *nefPtr, long int *netfPtr, sunrealtype *dsmPtr);
 
 /* Function called after a successful step */
 
 static void cvCompleteStep(CVodeMem cv_mem);
-static void cvPrepareNextStep(CVodeMem cv_mem, realtype dsm);
+static void cvPrepareNextStep(CVodeMem cv_mem, sunrealtype dsm);
 static void cvSetEta(CVodeMem cv_mem);
-static realtype cvComputeEtaqm1(CVodeMem cv_mem);
-static realtype cvComputeEtaqp1(CVodeMem cv_mem);
+static sunrealtype cvComputeEtaqm1(CVodeMem cv_mem);
+static sunrealtype cvComputeEtaqp1(CVodeMem cv_mem);
 static void cvChooseEta(CVodeMem cv_mem);
 
 /* Function to handle failures */
@@ -419,22 +419,22 @@ static int cvRootfind(CVodeMem cv_mem);
 
 /* Function for combined norms */
 
-static realtype cvQuadUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+static sunrealtype cvQuadUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                                  N_Vector xQ, N_Vector wQ);
 
-static realtype cvQuadSensNorm(CVodeMem cv_mem, N_Vector *xQS, N_Vector *wQS);
-static realtype cvQuadSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+static sunrealtype cvQuadSensNorm(CVodeMem cv_mem, N_Vector *xQS, N_Vector *wQS);
+static sunrealtype cvQuadSensUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                                      N_Vector *xQS, N_Vector *wQS);
 
 /* Internal sensitivity RHS DQ functions */
 
-static int cvQuadSensRhsInternalDQ(int Ns, realtype t,
+static int cvQuadSensRhsInternalDQ(int Ns, sunrealtype t,
                                    N_Vector y, N_Vector *yS,
                                    N_Vector yQdot, N_Vector *yQSdot,
                                    void *cvode_mem,
                                    N_Vector tmp, N_Vector tmpQ);
 
-static int cvQuadSensRhs1InternalDQ(CVodeMem cv_mem, int is, realtype t,
+static int cvQuadSensRhs1InternalDQ(CVodeMem cv_mem, int is, sunrealtype t,
                                     N_Vector y, N_Vector yS,
                                     N_Vector yQdot, N_Vector yQSdot,
                                     N_Vector tmp, N_Vector tmpQ);
@@ -496,7 +496,7 @@ void *CVodeCreate(int lmm, SUNContext sunctx)
   cv_mem->cv_lmm  = lmm;
 
   /* Set uround */
-  cv_mem->cv_uround = UNIT_ROUNDOFF;
+  cv_mem->cv_uround = SUN_UNIT_ROUNDOFF;
 
   /* Set default values for integrator optional inputs */
   cv_mem->cv_f                = NULL;
@@ -674,10 +674,10 @@ void *CVodeCreate(int lmm, SUNContext sunctx)
  * errfp and an error flag is returned. Otherwise, it returns CV_SUCCESS
  */
 
-int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
+int CVodeInit(void *cvode_mem, CVRhsFn f, sunrealtype t0, N_Vector y0)
 {
   CVodeMem cv_mem;
-  booleantype nvectorOK, allocOK;
+  sunbooleantype nvectorOK, allocOK;
   sunindextype lrw1, liw1;
   int i,k, retval;
   SUNNonlinearSolver NLS;
@@ -738,7 +738,7 @@ int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
 
   /* Allocate temporary work arrays for fused vector ops */
   cv_mem->cv_cvals = NULL;
-  cv_mem->cv_cvals = (realtype *) malloc(L_MAX*sizeof(realtype));
+  cv_mem->cv_cvals = (sunrealtype *) malloc(L_MAX*sizeof(sunrealtype));
 
   cv_mem->cv_Xvecs = NULL;
   cv_mem->cv_Xvecs = (N_Vector *) malloc(L_MAX*sizeof(N_Vector));
@@ -872,7 +872,7 @@ int CVodeInit(void *cvode_mem, CVRhsFn f, realtype t0, N_Vector y0)
  * a negative value otherwise.
  */
 
-int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0)
+int CVodeReInit(void *cvode_mem, sunrealtype t0, N_Vector y0)
 {
   CVodeMem cv_mem;
   int i,k;
@@ -981,7 +981,7 @@ int CVodeReInit(void *cvode_mem, realtype t0, N_Vector y0)
  *   which will be called to set the error weight vector.
  */
 
-int CVodeSStolerances(void *cvode_mem, realtype reltol, realtype abstol)
+int CVodeSStolerances(void *cvode_mem, sunrealtype reltol, sunrealtype abstol)
 {
   CVodeMem cv_mem;
 
@@ -1028,10 +1028,10 @@ int CVodeSStolerances(void *cvode_mem, realtype reltol, realtype abstol)
 }
 
 
-int CVodeSVtolerances(void *cvode_mem, realtype reltol, N_Vector abstol)
+int CVodeSVtolerances(void *cvode_mem, sunrealtype reltol, N_Vector abstol)
 {
   CVodeMem cv_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES", "CVodeSVtolerances",
@@ -1131,7 +1131,7 @@ int CVodeWFtolerances(void *cvode_mem, CVEwtFn efun)
 int CVodeQuadInit(void *cvode_mem, CVQuadRhsFn fQ, N_Vector yQ0)
 {
   CVodeMem cv_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   sunindextype lrw1Q, liw1Q;
 
   /* Check cvode_mem */
@@ -1238,7 +1238,7 @@ int CVodeQuadReInit(void *cvode_mem, N_Vector yQ0)
  *   vector component).
  */
 
-int CVodeQuadSStolerances(void *cvode_mem, realtype reltolQ, realtype abstolQ)
+int CVodeQuadSStolerances(void *cvode_mem, sunrealtype reltolQ, sunrealtype abstolQ)
 {
   CVodeMem cv_mem;
 
@@ -1282,10 +1282,10 @@ int CVodeQuadSStolerances(void *cvode_mem, realtype reltolQ, realtype abstolQ)
   return(CV_SUCCESS);
 }
 
-int CVodeQuadSVtolerances(void *cvode_mem, realtype reltolQ, N_Vector abstolQ)
+int CVodeQuadSVtolerances(void *cvode_mem, sunrealtype reltolQ, N_Vector abstolQ)
 {
   CVodeMem cv_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES",
@@ -1365,7 +1365,7 @@ int CVodeQuadSVtolerances(void *cvode_mem, realtype reltolQ, N_Vector abstolQ)
 int CVodeSensInit(void *cvode_mem, int Ns, int ism, CVSensRhsFn fS, N_Vector *yS0)
 {
   CVodeMem cv_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   int is, retval;
   SUNNonlinearSolver NLS;
 
@@ -1458,7 +1458,7 @@ int CVodeSensInit(void *cvode_mem, int Ns, int ism, CVSensRhsFn fS, N_Vector *yS
     free(cv_mem->cv_Xvecs); cv_mem->cv_Xvecs = NULL;
     free(cv_mem->cv_Zvecs); cv_mem->cv_Zvecs = NULL;
 
-    cv_mem->cv_cvals = (realtype *) malloc((Ns*L_MAX)*sizeof(realtype));
+    cv_mem->cv_cvals = (sunrealtype *) malloc((Ns*L_MAX)*sizeof(sunrealtype));
     cv_mem->cv_Xvecs = (N_Vector *) malloc((Ns*L_MAX)*sizeof(N_Vector));
     cv_mem->cv_Zvecs = (N_Vector *) malloc((Ns*L_MAX)*sizeof(N_Vector));
 
@@ -1559,7 +1559,7 @@ int CVodeSensInit(void *cvode_mem, int Ns, int ism, CVSensRhsFn fS, N_Vector *yS
 int CVodeSensInit1(void *cvode_mem, int Ns, int ism, CVSensRhs1Fn fS1, N_Vector *yS0)
 {
   CVodeMem cv_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   int is, retval;
   SUNNonlinearSolver NLS;
 
@@ -1670,7 +1670,7 @@ int CVodeSensInit1(void *cvode_mem, int Ns, int ism, CVSensRhs1Fn fS1, N_Vector
     free(cv_mem->cv_Xvecs); cv_mem->cv_Xvecs = NULL;
     free(cv_mem->cv_Zvecs); cv_mem->cv_Zvecs = NULL;
 
-    cv_mem->cv_cvals = (realtype *) malloc((Ns*L_MAX)*sizeof(realtype));
+    cv_mem->cv_cvals = (sunrealtype *) malloc((Ns*L_MAX)*sizeof(sunrealtype));
     cv_mem->cv_Xvecs = (N_Vector *) malloc((Ns*L_MAX)*sizeof(N_Vector));
     cv_mem->cv_Zvecs = (N_Vector *) malloc((Ns*L_MAX)*sizeof(N_Vector));
 
@@ -1979,7 +1979,7 @@ int CVodeSensReInit(void *cvode_mem, int ism, N_Vector *yS0)
  *   should be estimated from those provided for the state variables.
  */
 
-int CVodeSensSStolerances(void *cvode_mem, realtype reltolS, realtype *abstolS)
+int CVodeSensSStolerances(void *cvode_mem, sunrealtype reltolS, sunrealtype *abstolS)
 {
   CVodeMem cv_mem;
   int is;
@@ -2028,8 +2028,8 @@ int CVodeSensSStolerances(void *cvode_mem, realtype reltolS, realtype *abstolS)
 
   if ( !(cv_mem->cv_SabstolSMallocDone) ) {
     cv_mem->cv_SabstolS = NULL;
-    cv_mem->cv_SabstolS = (realtype *)malloc(cv_mem->cv_Ns*sizeof(realtype));
-    cv_mem->cv_atolSmin0 = (booleantype *)malloc(cv_mem->cv_Ns*sizeof(booleantype));
+    cv_mem->cv_SabstolS = (sunrealtype *)malloc(cv_mem->cv_Ns*sizeof(sunrealtype));
+    cv_mem->cv_atolSmin0 = (sunbooleantype *)malloc(cv_mem->cv_Ns*sizeof(sunbooleantype));
     cv_mem->cv_lrw += cv_mem->cv_Ns;
     cv_mem->cv_SabstolSMallocDone = SUNTRUE;
   }
@@ -2042,11 +2042,11 @@ int CVodeSensSStolerances(void *cvode_mem, realtype reltolS, realtype *abstolS)
   return(CV_SUCCESS);
 }
 
-int CVodeSensSVtolerances(void *cvode_mem,  realtype reltolS, N_Vector *abstolS)
+int CVodeSensSVtolerances(void *cvode_mem,  sunrealtype reltolS, N_Vector *abstolS)
 {
   CVodeMem cv_mem;
   int is, retval;
-  realtype *atolmin;
+  sunrealtype *atolmin;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES", "CVodeSensSVtolerances",
@@ -2083,7 +2083,7 @@ int CVodeSensSVtolerances(void *cvode_mem,  realtype reltolS, N_Vector *abstolS)
                    "Missing N_VMin routine from N_Vector");
     return(CV_ILL_INPUT);
   }
-  atolmin = (realtype *)malloc(cv_mem->cv_Ns*sizeof(realtype));
+  atolmin = (sunrealtype *)malloc(cv_mem->cv_Ns*sizeof(sunrealtype));
   for (is=0; is<cv_mem->cv_Ns; is++) {
     atolmin[is] = N_VMin(abstolS[is]);
     if (atolmin[is] < ZERO) {
@@ -2102,7 +2102,7 @@ int CVodeSensSVtolerances(void *cvode_mem,  realtype reltolS, N_Vector *abstolS)
 
   if ( !(cv_mem->cv_VabstolSMallocDone) ) {
     cv_mem->cv_VabstolS = N_VCloneVectorArray(cv_mem->cv_Ns, cv_mem->cv_tempv);
-    cv_mem->cv_atolSmin0 = (booleantype *)malloc(cv_mem->cv_Ns*sizeof(booleantype));
+    cv_mem->cv_atolSmin0 = (sunbooleantype *)malloc(cv_mem->cv_Ns*sizeof(sunbooleantype));
     cv_mem->cv_lrw += cv_mem->cv_Ns*cv_mem->cv_lrw1;
     cv_mem->cv_liw += cv_mem->cv_Ns*cv_mem->cv_liw1;
     cv_mem->cv_VabstolSMallocDone = SUNTRUE;
@@ -2157,7 +2157,7 @@ int CVodeSensEEtolerances(void *cvode_mem)
 int CVodeQuadSensInit(void *cvode_mem, CVQuadSensRhsFn fQS, N_Vector *yQS0)
 {
   CVodeMem    cv_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   int is, retval;
 
   /* Check cvode_mem */
@@ -2315,7 +2315,7 @@ int CVodeQuadSensReInit(void *cvode_mem, N_Vector *yQS0)
  *   specified through a call to one of CVodeQuad**tolerances.
  */
 
-int CVodeQuadSensSStolerances(void *cvode_mem, realtype reltolQS, realtype *abstolQS)
+int CVodeQuadSensSStolerances(void *cvode_mem, sunrealtype reltolQS, sunrealtype *abstolQS)
 {
   CVodeMem cv_mem;
   int is;
@@ -2372,8 +2372,8 @@ int CVodeQuadSensSStolerances(void *cvode_mem, realtype reltolQS, realtype *abst
 
   if ( !(cv_mem->cv_SabstolQSMallocDone) ) {
     cv_mem->cv_SabstolQS = NULL;
-    cv_mem->cv_SabstolQS = (realtype *)malloc(cv_mem->cv_Ns*sizeof(realtype));
-    cv_mem->cv_atolQSmin0 = (booleantype *)malloc(cv_mem->cv_Ns*sizeof(booleantype));
+    cv_mem->cv_SabstolQS = (sunrealtype *)malloc(cv_mem->cv_Ns*sizeof(sunrealtype));
+    cv_mem->cv_atolQSmin0 = (sunbooleantype *)malloc(cv_mem->cv_Ns*sizeof(sunbooleantype));
     cv_mem->cv_lrw += cv_mem->cv_Ns;
     cv_mem->cv_SabstolQSMallocDone = SUNTRUE;
   }
@@ -2386,11 +2386,11 @@ int CVodeQuadSensSStolerances(void *cvode_mem, realtype reltolQS, realtype *abst
   return(CV_SUCCESS);
 }
 
-int CVodeQuadSensSVtolerances(void *cvode_mem,  realtype reltolQS, N_Vector *abstolQS)
+int CVodeQuadSensSVtolerances(void *cvode_mem,  sunrealtype reltolQS, N_Vector *abstolQS)
 {
   CVodeMem cv_mem;
   int is, retval;
-  realtype *atolmin;
+  sunrealtype *atolmin;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES",
@@ -2435,7 +2435,7 @@ int CVodeQuadSensSVtolerances(void *cvode_mem,  realtype reltolQS, N_Vector *abs
                    "Missing N_VMin routine from N_Vector");
     return(CV_ILL_INPUT);
   }
-  atolmin = (realtype *)malloc(cv_mem->cv_Ns*sizeof(realtype));
+  atolmin = (sunrealtype *)malloc(cv_mem->cv_Ns*sizeof(sunrealtype));
   for (is=0; is<cv_mem->cv_Ns; is++) {
     atolmin[is] = N_VMin(abstolQS[is]);
     if (atolmin[is] < ZERO) {
@@ -2454,7 +2454,7 @@ int CVodeQuadSensSVtolerances(void *cvode_mem,  realtype reltolQS, N_Vector *abs
 
   if ( !(cv_mem->cv_VabstolQSMallocDone) ) {
     cv_mem->cv_VabstolQS = N_VCloneVectorArray(cv_mem->cv_Ns, cv_mem->cv_tempvQ);
-    cv_mem->cv_atolQSmin0 = (booleantype *)malloc(cv_mem->cv_Ns*sizeof(booleantype));
+    cv_mem->cv_atolQSmin0 = (sunbooleantype *)malloc(cv_mem->cv_Ns*sizeof(sunbooleantype));
     cv_mem->cv_lrw += cv_mem->cv_Ns*cv_mem->cv_lrw1Q;
     cv_mem->cv_liw += cv_mem->cv_Ns*cv_mem->cv_liw1Q;
     cv_mem->cv_VabstolQSMallocDone = SUNTRUE;
@@ -2624,7 +2624,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
 
   /* Allocate necessary memory and return */
   cv_mem->cv_glo = NULL;
-  cv_mem->cv_glo = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_glo = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_glo == NULL) {
     cvProcessError(cv_mem, CV_MEM_FAIL, "CVODES", "CVodeRootInit",
                    MSGCV_MEM_FAIL);
@@ -2632,7 +2632,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_ghi = NULL;
-  cv_mem->cv_ghi = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_ghi = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_ghi == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     cvProcessError(cv_mem, CV_MEM_FAIL, "CVODES", "CVodeRootInit",
@@ -2641,7 +2641,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_grout = NULL;
-  cv_mem->cv_grout = (realtype *) malloc(nrt*sizeof(realtype));
+  cv_mem->cv_grout = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (cv_mem->cv_grout == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     free(cv_mem->cv_ghi); cv_mem->cv_ghi = NULL;
@@ -2674,7 +2674,7 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
   }
 
   cv_mem->cv_gactive = NULL;
-  cv_mem->cv_gactive = (booleantype *) malloc(nrt*sizeof(booleantype));
+  cv_mem->cv_gactive = (sunbooleantype *) malloc(nrt*sizeof(sunbooleantype));
   if (cv_mem->cv_gactive == NULL) {
     free(cv_mem->cv_glo); cv_mem->cv_glo = NULL;
     free(cv_mem->cv_ghi); cv_mem->cv_ghi = NULL;
@@ -2721,14 +2721,14 @@ int CVodeRootInit(void *cvode_mem, int nrtfn, CVRootFn g)
  * In the CV_ONE_STEP mode, it takes one internal step and returns.
  */
 
-int CVode(void *cvode_mem, realtype tout, N_Vector yout,
-          realtype *tret, int itask)
+int CVode(void *cvode_mem, sunrealtype tout, N_Vector yout,
+          sunrealtype *tret, int itask)
 {
   CVodeMem cv_mem;
   long int nstloc;
   int retval, hflag, kflag, istate, is, ir, ier, irfndp;
-  realtype troundoff, tout_hin, rh, nrm;
-  booleantype inactive_roots;
+  sunrealtype troundoff, tout_hin, rh, nrm;
+  sunbooleantype inactive_roots;
 
   /*
    * -------------------------------------
@@ -3475,10 +3475,10 @@ int CVodeComputeStateSens1(void *cvode_mem, int idx, N_Vector ycorS1,
  * may also be called directly by the user.
  */
 
-int CVodeGetDky(void *cvode_mem, realtype t, int k, N_Vector dky)
+int CVodeGetDky(void *cvode_mem, sunrealtype t, int k, N_Vector dky)
 {
-  realtype s, r;
-  realtype tfuzz, tp, tn1;
+  sunrealtype s, r;
+  sunrealtype tfuzz, tp, tn1;
   int i, j, nvec, ier;
   CVodeMem cv_mem;
 
@@ -3555,7 +3555,7 @@ int CVodeGetDky(void *cvode_mem, realtype t, int k, N_Vector dky)
  * This is just a wrapper that calls CVodeGetQuadDky with k=0.
  */
 
-int CVodeGetQuad(void *cvode_mem, realtype *tret, N_Vector yQout)
+int CVodeGetQuad(void *cvode_mem, sunrealtype *tret, N_Vector yQout)
 {
   CVodeMem cv_mem;
   int flag;
@@ -3590,10 +3590,10 @@ int CVodeGetQuad(void *cvode_mem, realtype *tret, N_Vector yQout)
  * computation enabled.
  */
 
-int CVodeGetQuadDky(void *cvode_mem, realtype t, int k, N_Vector dkyQ)
+int CVodeGetQuadDky(void *cvode_mem, sunrealtype t, int k, N_Vector dkyQ)
 {
-  realtype s, r;
-  realtype tfuzz, tp, tn1;
+  sunrealtype s, r;
+  sunrealtype tfuzz, tp, tn1;
   int i, j, nvec, ier;
   CVodeMem cv_mem;
 
@@ -3675,7 +3675,7 @@ int CVodeGetQuadDky(void *cvode_mem, realtype t, int k, N_Vector dkyQ)
  * This is just a wrapper that calls CVodeSensDky with k=0.
  */
 
-int CVodeGetSens(void *cvode_mem, realtype *tret, N_Vector *ySout)
+int CVodeGetSens(void *cvode_mem, sunrealtype *tret, N_Vector *ySout)
 {
   CVodeMem cv_mem;
   int flag;
@@ -3704,7 +3704,7 @@ int CVodeGetSens(void *cvode_mem, realtype *tret, N_Vector *ySout)
  * This is just a wrapper that calls CVodeSensDky1 with k=0.
  */
 
-int CVodeGetSens1(void *cvode_mem, realtype *tret, int is, N_Vector ySout)
+int CVodeGetSens1(void *cvode_mem, sunrealtype *tret, int is, N_Vector ySout)
 {
   CVodeMem cv_mem;
   int flag;
@@ -3734,7 +3734,7 @@ int CVodeGetSens1(void *cvode_mem, realtype *tret, int is, N_Vector ySout)
  * ier=CV_BAD_T are possible.
  */
 
-int CVodeGetSensDky(void *cvode_mem, realtype t, int k, N_Vector *dkyS)
+int CVodeGetSensDky(void *cvode_mem, sunrealtype t, int k, N_Vector *dkyS)
 {
   int ier=CV_SUCCESS;
   int is;
@@ -3778,10 +3778,10 @@ int CVodeGetSensDky(void *cvode_mem, realtype t, int k, N_Vector *dkyS)
  * computation enabled.
  */
 
-int CVodeGetSensDky1(void *cvode_mem, realtype t, int k, int is, N_Vector dkyS)
+int CVodeGetSensDky1(void *cvode_mem, sunrealtype t, int k, int is, N_Vector dkyS)
 {
-  realtype s, r;
-  realtype tfuzz, tp, tn1;
+  sunrealtype s, r;
+  sunrealtype tfuzz, tp, tn1;
   int i, j, nvec, ier;
   CVodeMem cv_mem;
 
@@ -3874,7 +3874,7 @@ int CVodeGetSensDky1(void *cvode_mem, realtype t, int k, int is, N_Vector dkyS)
  * vectors at the time at which CVode returned the ODE solution.
  */
 
-int CVodeGetQuadSens(void *cvode_mem, realtype *tret, N_Vector *yQSout)
+int CVodeGetQuadSens(void *cvode_mem, sunrealtype *tret, N_Vector *yQSout)
 {
   CVodeMem cv_mem;
   int flag;
@@ -3896,7 +3896,7 @@ int CVodeGetQuadSens(void *cvode_mem, realtype *tret, N_Vector *yQSout)
   return(flag);
 }
 
-int CVodeGetQuadSens1(void *cvode_mem, realtype *tret, int is, N_Vector yQSout)
+int CVodeGetQuadSens1(void *cvode_mem, sunrealtype *tret, int is, N_Vector yQSout)
 {
   CVodeMem cv_mem;
   int flag;
@@ -3925,7 +3925,7 @@ int CVodeGetQuadSens1(void *cvode_mem, realtype *tret, int is, N_Vector yQSout)
  * vectors (or derivative thereof).
  */
 
-int CVodeGetQuadSensDky(void *cvode_mem, realtype t, int k, N_Vector *dkyQS_all)
+int CVodeGetQuadSensDky(void *cvode_mem, sunrealtype t, int k, N_Vector *dkyQS_all)
 {
   int ier=CV_SUCCESS;
   int is;
@@ -3956,10 +3956,10 @@ int CVodeGetQuadSensDky(void *cvode_mem, realtype t, int k, N_Vector *dkyQS_all)
   return(ier);
 }
 
-int CVodeGetQuadSensDky1(void *cvode_mem, realtype t, int k, int is, N_Vector dkyQS)
+int CVodeGetQuadSensDky1(void *cvode_mem, sunrealtype t, int k, int is, N_Vector dkyQS)
 {
-  realtype s, r;
-  realtype tfuzz, tp, tn1;
+  sunrealtype s, r;
+  sunrealtype tfuzz, tp, tn1;
   int i, j, nvec, ier;
   CVodeMem cv_mem;
 
@@ -4238,7 +4238,7 @@ void CVodeQuadSensFree(void *cvode_mem)
  * If any of them is missing it returns SUNFALSE.
  */
 
-static booleantype cvCheckNvector(N_Vector tmpl)
+static sunbooleantype cvCheckNvector(N_Vector tmpl)
 {
   if((tmpl->ops->nvclone     == NULL) ||
      (tmpl->ops->nvdestroy   == NULL) ||
@@ -4275,7 +4275,7 @@ static booleantype cvCheckNvector(N_Vector tmpl)
  * allocated here.
  */
 
-static booleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
+static sunbooleantype cvAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -4410,7 +4410,7 @@ static void cvFreeVectors(CVodeMem cv_mem)
  * CVodeQuadReInit.
  */
 
-static booleantype cvQuadAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
+static sunbooleantype cvQuadAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -4506,7 +4506,7 @@ static void cvQuadFreeVectors(CVodeMem cv_mem)
  * using the N_Vector 'tmpl' as a template.
  */
 
-static booleantype cvSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
+static sunbooleantype cvSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -4567,7 +4567,7 @@ static booleantype cvSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 
   /* Allocate space for pbar and plist */
   cv_mem->cv_pbar = NULL;
-  cv_mem->cv_pbar = (realtype *)malloc(cv_mem->cv_Ns*sizeof(realtype));
+  cv_mem->cv_pbar = (sunrealtype *)malloc(cv_mem->cv_Ns*sizeof(sunrealtype));
   if (cv_mem->cv_pbar == NULL) {
     N_VDestroyVectorArray(cv_mem->cv_yS, cv_mem->cv_Ns);
     N_VDestroyVectorArray(cv_mem->cv_ewtS, cv_mem->cv_Ns);
@@ -4650,7 +4650,7 @@ static void cvSensFreeVectors(CVodeMem cv_mem)
  * using the N_Vector 'tmpl' as a template.
  */
 
-static booleantype cvQuadSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
+static sunbooleantype cvQuadSensAllocVectors(CVodeMem cv_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -4777,7 +4777,7 @@ static void cvQuadSensFreeVectors(CVodeMem cv_mem)
 static int cvInitialSetup(CVodeMem cv_mem)
 {
   int ier;
-  booleantype conOK;
+  sunbooleantype conOK;
 
   /* Did the user specify tolerances? */
   if (cv_mem->cv_itol == CV_NN) {
@@ -5045,12 +5045,12 @@ static int cvInitialSetup(CVodeMem cv_mem)
  * Finally, we apply a bias (0.5) and verify that h0 is within bounds.
  */
 
-static int cvHin(CVodeMem cv_mem, realtype tout)
+static int cvHin(CVodeMem cv_mem, sunrealtype tout)
 {
   int retval, sign, count1, count2;
-  realtype tdiff, tdist, tround, hlb, hub;
-  realtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
-  booleantype hgOK;
+  sunrealtype tdiff, tdist, tround, hlb, hub;
+  sunrealtype hg, hgs, hs, hnew, hrat, h0, yddnrm;
+  sunbooleantype hgOK;
 
   /* If tout is too close to tn, give up */
 
@@ -5158,9 +5158,9 @@ static int cvHin(CVodeMem cv_mem, realtype tout)
  * tdist = tn - t0 and the values of y[i]/y'[i].
  */
 
-static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist)
+static sunrealtype cvUpperBoundH0(CVodeMem cv_mem, sunrealtype tdist)
 {
-  realtype hub_inv, hubQ_inv, hubS_inv, hubQS_inv, hub;
+  sunrealtype hub_inv, hubQ_inv, hubS_inv, hubQS_inv, hub;
   N_Vector temp1, temp2;
   N_Vector tempQ1, tempQ2;
   N_Vector *tempS1;
@@ -5282,7 +5282,7 @@ static realtype cvUpperBoundH0(CVodeMem cv_mem, realtype tdist)
  * Y contains all variables included in the error test.
  */
 
-static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm)
+static int cvYddNorm(CVodeMem cv_mem, sunrealtype hg, sunrealtype *yddnrm)
 {
   int retval;
   N_Vector wrk1, wrk2;
@@ -5406,11 +5406,11 @@ static int cvYddNorm(CVodeMem cv_mem, realtype hg, realtype *yddnrm)
 
 static int cvStep(CVodeMem cv_mem)
 {
-  realtype saved_t;          /* time to restore to if a failure occurs   */
-  realtype dsm;              /* local truncation error estimate          */
-  realtype dsmQ;             /* quadrature error estimate                */
-  realtype dsmS;             /* sensitivity error estimate               */
-  realtype dsmQS;            /* quadrature sensitivity error estimate    */
+  sunrealtype saved_t;          /* time to restore to if a failure occurs   */
+  sunrealtype dsm;              /* local truncation error estimate          */
+  sunrealtype dsmQ;             /* quadrature error estimate                */
+  sunrealtype dsmS;             /* sensitivity error estimate               */
+  sunrealtype dsmQS;            /* quadrature sensitivity error estimate    */
   int ncf;                   /* corrector failures in this step attempt  */
   int ncfS;                  /* sensitivity corrector failures           */
   int npf;                   /* projection failures in this step attempt */
@@ -5422,9 +5422,9 @@ static int cvStep(CVodeMem cv_mem)
   int pflag;                 /* projection return flag                   */
   int eflag;                 /* error test return flag                   */
   int retval, is;
-  booleantype doProjection;  /* flag to apply projection in this step    */
-  booleantype do_sensi_stg;  /* staggered strategy                       */
-  booleantype do_sensi_stg1; /* staggered 1 strategy                     */
+  sunbooleantype doProjection;  /* flag to apply projection in this step    */
+  sunbooleantype do_sensi_stg;  /* staggered strategy                       */
+  sunbooleantype do_sensi_stg1; /* staggered 1 strategy                     */
 
   /* Are we computing sensitivities with a staggered approach? */
 
@@ -5743,7 +5743,7 @@ static void cvAdjustOrder(CVodeMem cv_mem, int deltaq)
 static void cvAdjustAdams(CVodeMem cv_mem, int deltaq)
 {
   int i, j;
-  realtype xi, hsum;
+  sunrealtype xi, hsum;
 
   /* On an order increase, set new column of zn to zero and return */
 
@@ -5838,7 +5838,7 @@ static void cvAdjustBDF(CVodeMem cv_mem, int deltaq)
 
 static void cvIncreaseBDF(CVodeMem cv_mem)
 {
-  realtype alpha0, alpha1, prod, xi, xiold, hsum, A1;
+  sunrealtype alpha0, alpha1, prod, xi, xiold, hsum, A1;
   int i, j;
   int is;
 
@@ -5938,7 +5938,7 @@ static void cvIncreaseBDF(CVodeMem cv_mem)
 
 static void cvDecreaseBDF(CVodeMem cv_mem)
 {
-  realtype hsum, xi;
+  sunrealtype hsum, xi;
   int i, j;
 
   for (i=0; i <= cv_mem->cv_qmax; i++) cv_mem->cv_l[i] = ZERO;
@@ -6180,7 +6180,7 @@ static void cvSet(CVodeMem cv_mem)
 
 static void cvSetAdams(CVodeMem cv_mem)
 {
-  realtype m[L_MAX], M[3], hsum;
+  sunrealtype m[L_MAX], M[3], hsum;
 
   if (cv_mem->cv_q == 1) {
     cv_mem->cv_l[0] = cv_mem->cv_l[1] = cv_mem->cv_tq[1] = cv_mem->cv_tq[5] = ONE;
@@ -6205,9 +6205,9 @@ static void cvSetAdams(CVodeMem cv_mem)
  * polynomial needed for the Adams l and tq coefficients for q > 1.
  */
 
-static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[])
+static sunrealtype cvAdamsStart(CVodeMem cv_mem, sunrealtype m[])
 {
-  realtype hsum, xi_inv, sum;
+  sunrealtype hsum, xi_inv, sum;
   int i, j;
 
   hsum = cv_mem->cv_h;
@@ -6232,10 +6232,10 @@ static realtype cvAdamsStart(CVodeMem cv_mem, realtype m[])
  * This routine completes the calculation of the Adams l and tq.
  */
 
-static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype hsum)
+static void cvAdamsFinish(CVodeMem cv_mem, sunrealtype m[], sunrealtype M[], sunrealtype hsum)
 {
   int i;
-  realtype M0_inv, xi, xi_inv;
+  sunrealtype M0_inv, xi, xi_inv;
 
   M0_inv = ONE / M[0];
 
@@ -6267,10 +6267,10 @@ static void cvAdamsFinish(CVodeMem cv_mem, realtype m[], realtype M[], realtype
  * of a polynomial x^(k-1) M(x) given the coefficients of M(x).
  */
 
-static realtype cvAltSum(int iend, realtype a[], int k)
+static sunrealtype cvAltSum(int iend, sunrealtype a[], int k)
 {
   int i, sign;
-  realtype sum;
+  sunrealtype sum;
 
   if (iend < 0) return(ZERO);
 
@@ -6311,7 +6311,7 @@ static realtype cvAltSum(int iend, realtype a[], int k)
 
 static void cvSetBDF(CVodeMem cv_mem)
 {
-  realtype alpha0, alpha0_hat, xi_inv, xistar_inv, hsum;
+  sunrealtype alpha0, alpha0_hat, xi_inv, xistar_inv, hsum;
   int i,j;
 
   cv_mem->cv_l[0] = cv_mem->cv_l[1] = xi_inv = xistar_inv = ONE;
@@ -6357,11 +6357,11 @@ static void cvSetBDF(CVodeMem cv_mem)
  * lmm == CV_BDF.
  */
 
-static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
-                       realtype alpha0_hat, realtype xi_inv, realtype xistar_inv)
+static void cvSetTqBDF(CVodeMem cv_mem, sunrealtype hsum, sunrealtype alpha0,
+                       sunrealtype alpha0_hat, sunrealtype xi_inv, sunrealtype xistar_inv)
 {
-  realtype A1, A2, A3, A4, A5, A6;
-  realtype C, Cpinv, Cppinv;
+  sunrealtype A1, A2, A3, A4, A5, A6;
+  sunrealtype C, Cpinv, Cppinv;
 
   A1 = ONE - alpha0_hat + alpha0;
   A2 = ONE + cv_mem->cv_q * A1;
@@ -6402,8 +6402,8 @@ static void cvSetTqBDF(CVodeMem cv_mem, realtype hsum, realtype alpha0,
 static int cvNls(CVodeMem cv_mem, int nflag)
 {
   int flag = CV_SUCCESS;
-  booleantype callSetup;
-  booleantype do_sensi_sim;
+  sunbooleantype callSetup;
+  sunbooleantype do_sensi_sim;
   long int nni_inc = 0;
   long int nnf_inc = 0;
 
@@ -6525,8 +6525,8 @@ static int cvNls(CVodeMem cv_mem, int nflag)
 
 static int cvCheckConstraints(CVodeMem cv_mem)
 {
-  booleantype constraintsPassed;
-  realtype vnorm;
+  sunbooleantype constraintsPassed;
+  sunrealtype vnorm;
   N_Vector mm  = cv_mem->cv_ftemp;
   N_Vector tmp = cv_mem->cv_tempv;
 
@@ -6664,7 +6664,7 @@ static int cvQuadSensNls(CVodeMem cv_mem)
 
 static int cvStgrNls(CVodeMem cv_mem)
 {
-  booleantype callSetup;
+  sunbooleantype callSetup;
   int flag=CV_SUCCESS;
   long int nniS_inc = 0;
   long int nnfS_inc = 0;
@@ -6719,7 +6719,7 @@ static int cvStgrNls(CVodeMem cv_mem)
 
 static int cvStgr1Nls(CVodeMem cv_mem, int is)
 {
-  booleantype callSetup;
+  sunbooleantype callSetup;
   long int nniS1_inc = 0;
   long int nnfS1_inc = 0;
   int flag=CV_SUCCESS;
@@ -6808,7 +6808,7 @@ static int cvStgr1Nls(CVodeMem cv_mem, int is)
  *
  */
 
-static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                          int *ncfPtr, long int *ncfnPtr)
 {
   int nflag;
@@ -6868,7 +6868,7 @@ static int cvHandleNFlag(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
  * the same values as before the call to cvPredict.
  */
 
-void cvRestore(CVodeMem cv_mem, realtype saved_t)
+void cvRestore(CVodeMem cv_mem, sunrealtype saved_t)
 {
   int j, k;
 
@@ -6939,11 +6939,11 @@ void cvRestore(CVodeMem cv_mem, realtype saved_t)
  *
  */
 
-static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
-                         realtype acor_nrm,
-                         int *nefPtr, long int *netfPtr, realtype *dsmPtr)
+static int cvDoErrorTest(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
+                         sunrealtype acor_nrm,
+                         int *nefPtr, long int *netfPtr, sunrealtype *dsmPtr)
 {
-  realtype dsm;
+  sunrealtype dsm;
   int retval, is;
   N_Vector wrk1, wrk2;
 
@@ -7204,7 +7204,7 @@ static void cvCompleteStep(CVodeMem cv_mem)
  * related to a change of step size or order.
  */
 
-static void cvPrepareNextStep(CVodeMem cv_mem, realtype dsm)
+static void cvPrepareNextStep(CVodeMem cv_mem, sunrealtype dsm)
 {
   /* If etamax = 1, defer step size or order changes */
   if (cv_mem->cv_etamax == ONE) {
@@ -7285,9 +7285,9 @@ static void cvSetEta(CVodeMem cv_mem)
  * possible decrease in order by 1.
  */
 
-static realtype cvComputeEtaqm1(CVodeMem cv_mem)
+static sunrealtype cvComputeEtaqm1(CVodeMem cv_mem)
 {
-  realtype ddn;
+  sunrealtype ddn;
 
   cv_mem->cv_etaqm1 = ZERO;
   if (cv_mem->cv_q > 1) {
@@ -7318,9 +7318,9 @@ static realtype cvComputeEtaqm1(CVodeMem cv_mem)
  * possible increase in order by 1.
  */
 
-static realtype cvComputeEtaqp1(CVodeMem cv_mem)
+static sunrealtype cvComputeEtaqp1(CVodeMem cv_mem)
 {
-  realtype dup, cquot;
+  sunrealtype dup, cquot;
 
   cv_mem->cv_etaqp1 = ZERO;
   if (cv_mem->cv_q != cv_mem->cv_qmax) {
@@ -7375,7 +7375,7 @@ static realtype cvComputeEtaqp1(CVodeMem cv_mem)
 
 static void cvChooseEta(CVodeMem cv_mem)
 {
-  realtype etam;
+  sunrealtype etam;
   int is;
 
   etam = SUNMAX(cv_mem->cv_etaqm1, SUNMAX(cv_mem->cv_etaq, cv_mem->cv_etaqp1));
@@ -7598,7 +7598,7 @@ static int cvHandleFailure(CVodeMem cv_mem, int flag)
 static void cvBDFStab(CVodeMem cv_mem)
 {
   int i,k, ldflag, factorial;
-  realtype sq, sqm1, sqm2;
+  sunrealtype sq, sqm1, sqm2;
 
   /* If order is 3 or greater, then save scaled derivative data,
      push old data down in i, then add current values to top.    */
@@ -7687,22 +7687,22 @@ static void cvBDFStab(CVodeMem cv_mem)
 static int cvSLdet(CVodeMem cv_mem)
 {
   int i, k, j, it, kmin = 0, kflag = 0;
-  realtype rat[5][4], rav[4], qkr[4], sigsq[4], smax[4], ssmax[4];
-  realtype drr[4], rrc[4],sqmx[4], qjk[4][4], vrat[5], qc[6][4], qco[6][4];
-  realtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol;
-  realtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr;
-  realtype tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin;
-  realtype rsa, rsb, rsc, rsd, rd1a, rd1b, rd1c;
-  realtype rd2a, rd2b, rd3a, cest1, corr1;
-  realtype ratp, ratm, qfac1, qfac2, bb, rrb;
+  sunrealtype rat[5][4], rav[4], qkr[4], sigsq[4], smax[4], ssmax[4];
+  sunrealtype drr[4], rrc[4],sqmx[4], qjk[4][4], vrat[5], qc[6][4], qco[6][4];
+  sunrealtype rr, rrcut, vrrtol, vrrt2, sqtol, rrtol;
+  sunrealtype smink, smaxk, sumrat, sumrsq, vmin, vmax, drrmax, adrr;
+  sunrealtype tem, sqmax, saqk, qp, s, sqmaxk, saqj, sqmin;
+  sunrealtype rsa, rsb, rsc, rsd, rd1a, rd1b, rd1c;
+  sunrealtype rd2a, rd2b, rd3a, cest1, corr1;
+  sunrealtype ratp, ratm, qfac1, qfac2, bb, rrb;
 
   /* The following are cutoffs and tolerances used by this routine */
 
-  rrcut  = RCONST(0.98);
-  vrrtol = RCONST(1.0e-4);
-  vrrt2  = RCONST(5.0e-4);
-  sqtol  = RCONST(1.0e-3);
-  rrtol  = RCONST(1.0e-2);
+  rrcut  = SUN_RCONST(0.98);
+  vrrtol = SUN_RCONST(1.0e-4);
+  vrrt2  = SUN_RCONST(5.0e-4);
+  sqtol  = SUN_RCONST(1.0e-3);
+  rrtol  = SUN_RCONST(1.0e-2);
 
   rr = ZERO;
 
@@ -7979,8 +7979,8 @@ static int cvSLdet(CVodeMem cv_mem)
 static int cvRcheck1(CVodeMem cv_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   for (i = 0; i < cv_mem->cv_nrtfn; i++) cv_mem->cv_iroots[i] = 0;
   cv_mem->cv_tlo = cv_mem->cv_tn;
@@ -8047,8 +8047,8 @@ static int cvRcheck1(CVodeMem cv_mem)
 static int cvRcheck2(CVodeMem cv_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   if (cv_mem->cv_irfnd == 0) return(CV_SUCCESS);
 
@@ -8242,9 +8242,9 @@ static int cvRcheck3(CVodeMem cv_mem)
 
 static int cvRootfind(CVodeMem cv_mem)
 {
-  realtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
+  sunrealtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
   int i, retval, imax, side, sideprev;
-  booleantype zroot, sgnchg;
+  sunbooleantype zroot, sgnchg;
 
   imax = 0;
 
@@ -8744,10 +8744,10 @@ static int cvQuadSensEwtSetSV(CVodeMem cv_mem, N_Vector *yQScur, N_Vector *weigh
  * Updates the norm old_nrm to account for all quadratures.
  */
 
-static realtype cvQuadUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+static sunrealtype cvQuadUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                                  N_Vector xQ, N_Vector wQ)
 {
-  realtype qnrm;
+  sunrealtype qnrm;
 
   qnrm = N_VWrmsNorm(xQ, wQ);
   if (old_nrm > qnrm) return(old_nrm);
@@ -8766,10 +8766,10 @@ static realtype cvQuadUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
  * during the NLS solution and before the error test.
  */
 
-realtype cvSensNorm(CVodeMem cv_mem, N_Vector *xS, N_Vector *wS)
+sunrealtype cvSensNorm(CVodeMem cv_mem, N_Vector *xS, N_Vector *wS)
 {
   int is;
-  realtype nrm;
+  sunrealtype nrm;
 
   (void) N_VWrmsNormVectorArray(cv_mem->cv_Ns, xS, wS, cv_mem->cv_cvals);
 
@@ -8786,10 +8786,10 @@ realtype cvSensNorm(CVodeMem cv_mem, N_Vector *xS, N_Vector *wS)
  * Updates the norm old_nrm to account for all sensitivities.
  */
 
-realtype cvSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+sunrealtype cvSensUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                           N_Vector *xS, N_Vector *wS)
 {
-  realtype snrm;
+  sunrealtype snrm;
 
   snrm = cvSensNorm(cv_mem, xS, wS);
   if (old_nrm > snrm) return(old_nrm);
@@ -8807,10 +8807,10 @@ realtype cvSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
  * Called by cvQuadSensUpdateNorm.
  */
 
-static realtype cvQuadSensNorm(CVodeMem cv_mem, N_Vector *xQS, N_Vector *wQS)
+static sunrealtype cvQuadSensNorm(CVodeMem cv_mem, N_Vector *xQS, N_Vector *wQS)
 {
   int is;
-  realtype nrm;
+  sunrealtype nrm;
 
   (void) N_VWrmsNormVectorArray(cv_mem->cv_Ns, xQS, wQS, cv_mem->cv_cvals);
 
@@ -8827,10 +8827,10 @@ static realtype cvQuadSensNorm(CVodeMem cv_mem, N_Vector *xQS, N_Vector *wQS)
  * Updates the norm old_nrm to account for all quadrature sensitivities.
  */
 
-static realtype cvQuadSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+static sunrealtype cvQuadSensUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                                      N_Vector *xQS, N_Vector *wQS)
 {
-  realtype snrm;
+  sunrealtype snrm;
 
   snrm = cvQuadSensNorm(cv_mem, xQS, wQS);
   if (old_nrm > snrm) return(old_nrm);
@@ -8863,7 +8863,7 @@ static realtype cvQuadSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
  *
  */
 
-int cvSensRhsWrapper(CVodeMem cv_mem, realtype time,
+int cvSensRhsWrapper(CVodeMem cv_mem, sunrealtype time,
                      N_Vector ycur, N_Vector fcur,
                      N_Vector *yScur, N_Vector *fScur,
                      N_Vector temp1, N_Vector temp2)
@@ -8899,7 +8899,7 @@ int cvSensRhsWrapper(CVodeMem cv_mem, realtype time,
  * The return value is that of the sensitivity RHS function fS1,
  */
 
-int cvSensRhs1Wrapper(CVodeMem cv_mem, realtype time,
+int cvSensRhs1Wrapper(CVodeMem cv_mem, sunrealtype time,
                       N_Vector ycur, N_Vector fcur,
                       int is, N_Vector yScur, N_Vector fScur,
                       N_Vector temp1, N_Vector temp2)
@@ -8930,7 +8930,7 @@ int cvSensRhs1Wrapper(CVodeMem cv_mem, realtype time,
  * by finite differences
  */
 
-int cvSensRhsInternalDQ(int Ns, realtype t,
+int cvSensRhsInternalDQ(int Ns, sunrealtype t,
                         N_Vector y, N_Vector ydot,
                         N_Vector *yS, N_Vector *ySdot,
                         void *cvode_mem,
@@ -8957,7 +8957,7 @@ int cvSensRhsInternalDQ(int Ns, realtype t,
  * non-zero return value from f().
  */
 
-int cvSensRhs1InternalDQ(int Ns, realtype t,
+int cvSensRhs1InternalDQ(int Ns, sunrealtype t,
                          N_Vector y, N_Vector ydot,
                          int is, N_Vector yS, N_Vector ySdot,
                          void *cvode_mem,
@@ -8966,15 +8966,15 @@ int cvSensRhs1InternalDQ(int Ns, realtype t,
   CVodeMem cv_mem;
   int retval, method;
   int nfel = 0, which;
-  realtype psave, pbari;
-  realtype delta , rdelta;
-  realtype Deltap, rDeltap, r2Deltap;
-  realtype Deltay, rDeltay, r2Deltay;
-  realtype Delta , rDelta , r2Delta ;
-  realtype norms, ratio;
+  sunrealtype psave, pbari;
+  sunrealtype delta , rdelta;
+  sunrealtype Deltap, rDeltap, r2Deltap;
+  sunrealtype Deltay, rDeltay, r2Deltay;
+  sunrealtype Delta , rDelta , r2Delta ;
+  sunrealtype norms, ratio;
 
   /* local variables for fused vector operations */
-  realtype cvals[3];
+  sunrealtype cvals[3];
   N_Vector Xvecs[3];
 
   /* cvode_mem is passed here as user data */
@@ -9131,7 +9131,7 @@ int cvSensRhs1InternalDQ(int Ns, realtype t,
  * done in cvQuadSensRhs1InternalDQ.
  */
 
-static int cvQuadSensRhsInternalDQ(int Ns, realtype t,
+static int cvQuadSensRhsInternalDQ(int Ns, sunrealtype t,
                                    N_Vector y, N_Vector *yS,
                                    N_Vector yQdot, N_Vector *yQSdot,
                                    void *cvode_mem,
@@ -9154,19 +9154,19 @@ static int cvQuadSensRhsInternalDQ(int Ns, realtype t,
   return(0);
 }
 
-static int cvQuadSensRhs1InternalDQ(CVodeMem cv_mem, int is, realtype t,
+static int cvQuadSensRhs1InternalDQ(CVodeMem cv_mem, int is, sunrealtype t,
                                     N_Vector y, N_Vector yS,
                                     N_Vector yQdot, N_Vector yQSdot,
                                     N_Vector tmp, N_Vector tmpQ)
 {
   int retval, method;
   int nfel = 0, which;
-  realtype psave, pbari;
-  realtype delta , rdelta;
-  realtype Deltap;
-  realtype Deltay, rDeltay;
-  realtype Delta , rDelta , r2Delta ;
-  realtype norms;
+  sunrealtype psave, pbari;
+  sunrealtype delta , rdelta;
+  sunrealtype Deltap;
+  sunrealtype Deltay, rDeltay;
+  sunrealtype Delta , rDelta , r2Delta ;
+  sunrealtype norms;
 
   delta = SUNRsqrt(SUNMAX(cv_mem->cv_reltol, cv_mem->cv_uround));
   rdelta = ONE/delta;
diff --git a/src/cvodes/cvodes_bandpre.c b/src/cvodes/cvodes_bandpre.c
index 8ae636b94f..02edf174f3 100644
--- a/src/cvodes/cvodes_bandpre.c
+++ b/src/cvodes/cvodes_bandpre.c
@@ -27,25 +27,25 @@
 #include "cvodes_ls_impl.h"
 #include <sundials/sundials_math.h>
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /* Prototypes of cvBandPrecSetup and cvBandPrecSolve */
-static int cvBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bp_data);
-static int cvBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int cvBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bp_data);
+static int cvBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                            N_Vector r, N_Vector z,
-                           realtype gamma, realtype delta,
+                           sunrealtype gamma, sunrealtype delta,
                            int lr, void *bp_data);
 
 /* Prototype for cvBandPrecFree */
 static int cvBandPrecFree(CVodeMem cv_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int cvBandPrecDQJac(CVBandPrecData pdata, realtype t, N_Vector y,
+static int cvBandPrecDQJac(CVBandPrecData pdata, sunrealtype t, N_Vector y,
                            N_Vector fy, N_Vector ftemp, N_Vector ytemp);
 
 
@@ -336,9 +336,9 @@ int CVBandPrecGetNumRhsEvals(void *cvode_mem, long int *nfevalsBP)
     0  if successful, or
     1  if the band factorization failed.
   -----------------------------------------------------------------*/
-static int cvBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                           booleantype jok, booleantype *jcurPtr,
-                           realtype gamma, void *bp_data)
+static int cvBandPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                           sunbooleantype jok, sunbooleantype *jcurPtr,
+                           sunrealtype gamma, void *bp_data)
 {
   CVBandPrecData pdata;
   CVodeMem cv_mem;
@@ -430,9 +430,9 @@ static int cvBandPrecSetup(realtype t, N_Vector y, N_Vector fy,
   The value returned by the cvBandPrecSolve function is always 0,
   indicating success.
   -----------------------------------------------------------------*/
-static int cvBandPrecSolve(realtype t, N_Vector y, N_Vector fy,
-                           N_Vector r, N_Vector z, realtype gamma,
-                           realtype delta, int lr, void *bp_data)
+static int cvBandPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
+                           N_Vector r, N_Vector z, sunrealtype gamma,
+                           sunrealtype delta, int lr, void *bp_data)
 {
   CVBandPrecData pdata;
   int retval;
@@ -481,14 +481,14 @@ static int cvBandPrecFree(CVodeMem cv_mem)
   write a simple for loop to set each of the elements of a column
   in succession.
   -----------------------------------------------------------------*/
-static int cvBandPrecDQJac(CVBandPrecData pdata, realtype t, N_Vector y,
+static int cvBandPrecDQJac(CVBandPrecData pdata, sunrealtype t, N_Vector y,
                            N_Vector fy, N_Vector ftemp, N_Vector ytemp)
 {
   CVodeMem cv_mem;
-  realtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
+  sunrealtype fnorm, minInc, inc, inc_inv, yj, srur, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *col_j, *ewt_data, *fy_data, *ftemp_data;
-  realtype *y_data, *ytemp_data, *cns_data;
+  sunrealtype *col_j, *ewt_data, *fy_data, *ftemp_data;
+  sunrealtype *y_data, *ytemp_data, *cns_data;
   int retval;
 
   /* initialize cns_data to avoid compiler warning */
diff --git a/src/cvodes/cvodes_bbdpre.c b/src/cvodes/cvodes_bbdpre.c
index 423319a72b..c84f844b7d 100644
--- a/src/cvodes/cvodes_bbdpre.c
+++ b/src/cvodes/cvodes_bbdpre.c
@@ -29,32 +29,32 @@
 #include <sundials/sundials_math.h>
 #include <nvector/nvector_serial.h>
 
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /* Prototypes of functions cvBBDPrecSetup and cvBBDPrecSolve */
-static int cvBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                          booleantype jok, booleantype *jcurPtr,
-                          realtype gamma, void *bbd_data);
-static int cvBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int cvBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                          sunbooleantype jok, sunbooleantype *jcurPtr,
+                          sunrealtype gamma, void *bbd_data);
+static int cvBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                           N_Vector r, N_Vector z,
-                          realtype gamma, realtype delta,
+                          sunrealtype gamma, sunrealtype delta,
                           int lr, void *bbd_data);
 
 /* Prototype for cvBBDPrecFree */
 static int cvBBDPrecFree(CVodeMem cv_mem);
 
 /* Wrapper functions for adjoint code */
-static int cvGlocWrapper(sunindextype NlocalB, realtype t,
+static int cvGlocWrapper(sunindextype NlocalB, sunrealtype t,
                          N_Vector yB, N_Vector gB,
                          void *cvadj_mem);
-static int cvCfnWrapper(sunindextype NlocalB, realtype t,
+static int cvCfnWrapper(sunindextype NlocalB, sunrealtype t,
                         N_Vector yB, void *cvadj_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int cvBBDDQJac(CVBBDPrecData pdata, realtype t,
+static int cvBBDDQJac(CVBBDPrecData pdata, sunrealtype t,
                       N_Vector y, N_Vector gy,
                       N_Vector ytemp, N_Vector gtemp);
 
@@ -72,7 +72,7 @@ static int CVBBDPrecFreeB(CVodeBMem cvB_mem);
 int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
                   sunindextype mudq, sunindextype mldq,
                   sunindextype mukeep, sunindextype mlkeep,
-                  realtype dqrely, CVLocalFn gloc, CVCommFn cfn)
+                  sunrealtype dqrely, CVLocalFn gloc, CVCommFn cfn)
 {
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
@@ -295,7 +295,7 @@ int CVBBDPrecInit(void *cvode_mem, sunindextype Nlocal,
 
 
 int CVBBDPrecReInit(void *cvode_mem, sunindextype mudq,
-                    sunindextype mldq, realtype dqrely)
+                    sunindextype mldq, sunrealtype dqrely)
 {
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
@@ -457,9 +457,9 @@ int CVBBDPrecGetNumGfnEvals(void *cvode_mem,
     0  if successful,
     1  for a recoverable error (step will be retried).
   -----------------------------------------------------------------*/
-static int cvBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
-                          booleantype jok, booleantype *jcurPtr,
-                          realtype gamma, void *bbd_data)
+static int cvBBDPrecSetup(sunrealtype t, N_Vector y, N_Vector fy,
+                          sunbooleantype jok, sunbooleantype *jcurPtr,
+                          sunrealtype gamma, void *bbd_data)
 {
   CVBBDPrecData pdata;
   CVodeMem cv_mem;
@@ -551,9 +551,9 @@ static int cvBBDPrecSetup(realtype t, N_Vector y, N_Vector fy,
   The value returned by the cvBBDPrecSolve function is always 0,
   indicating success.
   -----------------------------------------------------------------*/
-static int cvBBDPrecSolve(realtype t, N_Vector y, N_Vector fy,
+static int cvBBDPrecSolve(sunrealtype t, N_Vector y, N_Vector fy,
                           N_Vector r, N_Vector z,
-                          realtype gamma, realtype delta,
+                          sunrealtype gamma, sunrealtype delta,
                           int lr, void *bbd_data)
 {
   int retval;
@@ -618,14 +618,14 @@ static int cvBBDPrecFree(CVodeMem cv_mem)
   This routine also assumes that the local elements of a vector are
   stored contiguously.
   -----------------------------------------------------------------*/
-static int cvBBDDQJac(CVBBDPrecData pdata, realtype t, N_Vector y,
+static int cvBBDDQJac(CVBBDPrecData pdata, sunrealtype t, N_Vector y,
                       N_Vector gy, N_Vector ytemp, N_Vector gtemp)
 {
   CVodeMem cv_mem;
-  realtype gnorm, minInc, inc, inc_inv, yj, conj;
+  sunrealtype gnorm, minInc, inc, inc_inv, yj, conj;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *y_data, *ewt_data, *gy_data, *gtemp_data;
-  realtype *ytemp_data, *col_j, *cns_data;
+  sunrealtype *y_data, *ewt_data, *gy_data, *gtemp_data;
+  sunrealtype *ytemp_data, *col_j, *cns_data;
   int retval;
 
   /* initialize cns_data to avoid compiler warning */
@@ -726,7 +726,7 @@ static int cvBBDDQJac(CVBBDPrecData pdata, realtype t, N_Vector y,
 int CVBBDPrecInitB(void *cvode_mem, int which, sunindextype NlocalB,
                    sunindextype mudqB, sunindextype mldqB,
                    sunindextype mukeepB, sunindextype mlkeepB,
-                   realtype dqrelyB, CVLocalFnB glocB, CVCommFnB cfnB)
+                   sunrealtype dqrelyB, CVLocalFnB glocB, CVCommFnB cfnB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -796,7 +796,7 @@ int CVBBDPrecInitB(void *cvode_mem, int which, sunindextype NlocalB,
 
 
 int CVBBDPrecReInitB(void *cvode_mem, int which, sunindextype mudqB,
-                     sunindextype mldqB, realtype dqrelyB)
+                     sunindextype mldqB, sunrealtype dqrelyB)
 {
   CVodeMem cv_mem;
   CVadjMem ca_mem;
@@ -856,7 +856,7 @@ static int CVBBDPrecFreeB(CVodeBMem cvB_mem)
   ----------------------------------------------------------------*/
 
 /* cvGlocWrapper interfaces to the CVLocalFnB routine provided by the user */
-static int cvGlocWrapper(sunindextype NlocalB, realtype t, N_Vector yB,
+static int cvGlocWrapper(sunindextype NlocalB, sunrealtype t, N_Vector yB,
                          N_Vector gB, void *cvode_mem)
 {
   CVodeMem cv_mem;
@@ -885,7 +885,7 @@ static int cvGlocWrapper(sunindextype NlocalB, realtype t, N_Vector yB,
 
 
 /* cvCfnWrapper interfaces to the CVCommFnB routine provided by the user */
-static int cvCfnWrapper(sunindextype NlocalB, realtype t,
+static int cvCfnWrapper(sunindextype NlocalB, sunrealtype t,
                         N_Vector yB, void *cvode_mem)
 {
   CVodeMem cv_mem;
diff --git a/src/cvodes/cvodes_bbdpre_impl.h b/src/cvodes/cvodes_bbdpre_impl.h
index 34ff4f1f61..a9ad69c611 100644
--- a/src/cvodes/cvodes_bbdpre_impl.h
+++ b/src/cvodes/cvodes_bbdpre_impl.h
@@ -36,7 +36,7 @@ typedef struct CVBBDPrecDataRec {
 
   /* passed by user to CVBBDPrecInit and used by PrecSetup/PrecSolve */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype dqrely;
+  sunrealtype dqrely;
   CVLocalFn gloc;
   CVCommFn cfn;
 
diff --git a/src/cvodes/cvodes_diag.c b/src/cvodes/cvodes_diag.c
index 3da59d0102..5854403436 100644
--- a/src/cvodes/cvodes_diag.c
+++ b/src/cvodes/cvodes_diag.c
@@ -24,15 +24,15 @@
 
 /* Other Constants */
   
-#define FRACT RCONST(0.1)
-#define ONE   RCONST(1.0)
+#define FRACT SUN_RCONST(0.1)
+#define ONE   SUN_RCONST(1.0)
 
 /* CVDIAG linit, lsetup, lsolve, and lfree routines */
 
 static int CVDiagInit(CVodeMem cv_mem);
 
 static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-                       N_Vector fpred, booleantype *jcurPtr, N_Vector vtemp1,
+                       N_Vector fpred, sunbooleantype *jcurPtr, N_Vector vtemp1,
                        N_Vector vtemp2, N_Vector vtemp3);
 
 static int CVDiagSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
@@ -324,12 +324,12 @@ static int CVDiagInit(CVodeMem cv_mem)
  */
 
 static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-                       N_Vector fpred, booleantype *jcurPtr, N_Vector vtemp1,
+                       N_Vector fpred, sunbooleantype *jcurPtr, N_Vector vtemp1,
                        N_Vector vtemp2, N_Vector vtemp3)
 {
-  realtype r;
+  sunrealtype r;
   N_Vector ftemp, y;
-  booleantype invOK;
+  sunbooleantype invOK;
   CVDiagMem cvdiag_mem;
   int retval;
 
@@ -396,8 +396,8 @@ static int CVDiagSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
 static int CVDiagSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
                        N_Vector ycur, N_Vector fcur)
 {
-  booleantype invOK;
-  realtype r;
+  sunbooleantype invOK;
+  sunrealtype r;
   CVDiagMem cvdiag_mem;
 
   cvdiag_mem = (CVDiagMem) lmem;
diff --git a/src/cvodes/cvodes_diag_impl.h b/src/cvodes/cvodes_diag_impl.h
index 975dcf6cc4..a8190eb914 100644
--- a/src/cvodes/cvodes_diag_impl.h
+++ b/src/cvodes/cvodes_diag_impl.h
@@ -36,7 +36,7 @@ extern "C" {
 
 typedef struct {
 
-  realtype di_gammasv; /* gammasv = gamma at the last call to setup or solve */
+  sunrealtype di_gammasv; /* gammasv = gamma at the last call to setup or solve */
 
   N_Vector di_M;       /* M = (I - gamma J)^{-1} , gamma = h / l1   */
 
diff --git a/src/cvodes/cvodes_impl.h b/src/cvodes/cvodes_impl.h
index c1f9721427..9e0a28f618 100644
--- a/src/cvodes/cvodes_impl.h
+++ b/src/cvodes/cvodes_impl.h
@@ -58,13 +58,13 @@ extern "C" {
 #define L_MAX  (Q_MAX+1)   /* max value of L for either lmm       */
 #define NUM_TESTS    5     /* number of error test quantities     */
 
-#define HMIN_DEFAULT     RCONST(0.0)    /* hmin default value     */
-#define HMAX_INV_DEFAULT RCONST(0.0)    /* hmax_inv default value */
+#define HMIN_DEFAULT     SUN_RCONST(0.0)    /* hmin default value     */
+#define HMAX_INV_DEFAULT SUN_RCONST(0.0)    /* hmax_inv default value */
 #define MXHNIL_DEFAULT   10             /* mxhnil default value   */
 #define MXSTEP_DEFAULT   500            /* mxstep default value   */
 
 #define MSBP_DEFAULT         20          /* max steps between lsetup calls */
-#define DGMAX_LSETUP_DEFAULT RCONST(0.3) /* gamma threshold to call lsetup */
+#define DGMAX_LSETUP_DEFAULT SUN_RCONST(0.3) /* gamma threshold to call lsetup */
 
 /* Step size change constants
  * --------------------------
@@ -82,18 +82,18 @@ extern "C" {
  * ONEPSM (1+epsilon)  used in testing if the step size is below its bound
  */
 
-#define ETA_MIN_FX_DEFAULT RCONST(0.0)
-#define ETA_MAX_FX_DEFAULT RCONST(1.5)
-#define ETA_MAX_FS_DEFAULT RCONST(10000.0)
-#define ETA_MAX_ES_DEFAULT RCONST(10.0)
-#define ETA_MAX_GS_DEFAULT RCONST(10.0)
-#define ETA_MIN_DEFAULT    RCONST(0.1)
-#define ETA_MAX_EF_DEFAULT RCONST(0.2)
-#define ETA_MIN_EF_DEFAULT RCONST(0.1)
-#define ETA_CF_DEFAULT     RCONST(0.25)
+#define ETA_MIN_FX_DEFAULT SUN_RCONST(0.0)
+#define ETA_MAX_FX_DEFAULT SUN_RCONST(1.5)
+#define ETA_MAX_FS_DEFAULT SUN_RCONST(10000.0)
+#define ETA_MAX_ES_DEFAULT SUN_RCONST(10.0)
+#define ETA_MAX_GS_DEFAULT SUN_RCONST(10.0)
+#define ETA_MIN_DEFAULT    SUN_RCONST(0.1)
+#define ETA_MAX_EF_DEFAULT SUN_RCONST(0.2)
+#define ETA_MIN_EF_DEFAULT SUN_RCONST(0.1)
+#define ETA_CF_DEFAULT     SUN_RCONST(0.25)
 #define SMALL_NST_DEFAULT  10
 #define SMALL_NEF_DEFAULT  2
-#define ONEPSM             RCONST(1.000001)
+#define ONEPSM             SUN_RCONST(1.000001)
 
 /* Step size controller constants
  * ------------------------------
@@ -103,10 +103,10 @@ extern "C" {
  * BIAS3  -+
  */
 
-#define ADDON     RCONST(0.000001)
-#define BIAS1     RCONST(6.0)
-#define BIAS2     RCONST(6.0)
-#define BIAS3     RCONST(10.0)
+#define ADDON     SUN_RCONST(0.000001)
+#define BIAS1     SUN_RCONST(6.0)
+#define BIAS2     SUN_RCONST(6.0)
+#define BIAS3     SUN_RCONST(10.0)
 
 /* Order selection constants
  * -------------------------
@@ -197,8 +197,8 @@ extern "C" {
    RDIV        declare divergence if ratio del/delp > RDIV
 */
 #define NLS_MAXCOR 3
-#define CRDOWN     RCONST(0.3)
-#define RDIV       RCONST(2.0)
+#define CRDOWN     SUN_RCONST(0.3)
+#define RDIV       SUN_RCONST(2.0)
 
 /*
  * =================================================================
@@ -231,7 +231,7 @@ typedef struct CVodeMemRec {
 
   SUNContext cv_sunctx;
 
-  realtype cv_uround;    /* machine unit roundoff */
+  sunrealtype cv_uround;    /* machine unit roundoff */
 
   /*--------------------------
     Problem Specification Data
@@ -242,38 +242,38 @@ typedef struct CVodeMemRec {
   int cv_lmm;                /* lmm = CV_ADAMS or CV_BDF                      */
   int cv_itol;               /* itol = CV_SS, CV_SV, CV_WF, CV_NN             */
 
-  realtype cv_reltol;        /* relative tolerance                            */
-  realtype cv_Sabstol;       /* scalar absolute tolerance                     */
+  sunrealtype cv_reltol;        /* relative tolerance                            */
+  sunrealtype cv_Sabstol;       /* scalar absolute tolerance                     */
   N_Vector cv_Vabstol;       /* vector absolute tolerance                     */
-  booleantype cv_atolmin0;   /* flag indicating that min(abstol) = 0          */
-  booleantype cv_user_efun;  /* SUNTRUE if user sets efun                     */
+  sunbooleantype cv_atolmin0;   /* flag indicating that min(abstol) = 0          */
+  sunbooleantype cv_user_efun;  /* SUNTRUE if user sets efun                     */
   CVEwtFn cv_efun;           /* function to set ewt                           */
   void *cv_e_data;           /* user pointer passed to efun                   */
 
-  booleantype cv_constraintsSet; /* constraints vector present:
+  sunbooleantype cv_constraintsSet; /* constraints vector present:
                                     do constraints calc                       */
 
   /*-----------------------
     Quadrature Related Data
     -----------------------*/
 
-  booleantype cv_quadr;       /* SUNTRUE if integrating quadratures            */
+  sunbooleantype cv_quadr;       /* SUNTRUE if integrating quadratures            */
 
   CVQuadRhsFn cv_fQ;          /* q' = fQ(t, y(t))                              */
 
-  booleantype cv_errconQ;     /* SUNTRUE if quadrs. are included in error test */
+  sunbooleantype cv_errconQ;     /* SUNTRUE if quadrs. are included in error test */
 
   int cv_itolQ;               /* itolQ = CV_SS or CV_SV                        */
-  realtype cv_reltolQ;        /* relative tolerance for quadratures            */
-  realtype cv_SabstolQ;       /* scalar absolute tolerance for quadratures     */
+  sunrealtype cv_reltolQ;        /* relative tolerance for quadratures            */
+  sunrealtype cv_SabstolQ;       /* scalar absolute tolerance for quadratures     */
   N_Vector cv_VabstolQ;       /* vector absolute tolerance for quadratures     */
-  booleantype cv_atolQmin0;   /* flag indicating that min(abstolQ) = 0         */
+  sunbooleantype cv_atolQmin0;   /* flag indicating that min(abstolQ) = 0         */
 
   /*------------------------
     Sensitivity Related Data
     ------------------------*/
 
-  booleantype cv_sensi;       /* SUNTRUE if computing sensitivities           */
+  sunbooleantype cv_sensi;       /* SUNTRUE if computing sensitivities           */
 
   int cv_Ns;                  /* Number of sensitivities                      */
 
@@ -282,40 +282,40 @@ typedef struct CVodeMemRec {
   CVSensRhsFn cv_fS;          /* fS = (df/dy)*yS + (df/dp)                    */
   CVSensRhs1Fn cv_fS1;        /* fS1 = (df/dy)*yS_i + (df/dp)                 */
   void *cv_fS_data;           /* data pointer passed to fS                    */
-  booleantype cv_fSDQ;        /* SUNTRUE if using internal DQ functions       */
+  sunbooleantype cv_fSDQ;        /* SUNTRUE if using internal DQ functions       */
   int cv_ifS;                 /* ifS = ALLSENS or ONESENS                     */
 
-  realtype *cv_p;             /* parameters in f(t,y,p)                       */
-  realtype *cv_pbar;          /* scale factors for parameters                 */
+  sunrealtype *cv_p;             /* parameters in f(t,y,p)                       */
+  sunrealtype *cv_pbar;          /* scale factors for parameters                 */
   int *cv_plist;              /* list of sensitivities                        */
   int cv_DQtype;              /* central/forward finite differences           */
-  realtype cv_DQrhomax;       /* cut-off value for separate/simultaneous FD   */
+  sunrealtype cv_DQrhomax;       /* cut-off value for separate/simultaneous FD   */
 
-  booleantype cv_errconS;     /* SUNTRUE if yS are considered in err. control */
+  sunbooleantype cv_errconS;     /* SUNTRUE if yS are considered in err. control */
 
   int cv_itolS;
-  realtype cv_reltolS;        /* relative tolerance for sensitivities         */
-  realtype *cv_SabstolS;      /* scalar absolute tolerances for sensi.        */
+  sunrealtype cv_reltolS;        /* relative tolerance for sensitivities         */
+  sunrealtype *cv_SabstolS;      /* scalar absolute tolerances for sensi.        */
   N_Vector *cv_VabstolS;      /* vector absolute tolerances for sensi.        */
-  booleantype *cv_atolSmin0;  /* flags indicating that min(abstolS[i]) = 0    */
+  sunbooleantype *cv_atolSmin0;  /* flags indicating that min(abstolS[i]) = 0    */
 
   /*-----------------------------------
     Quadrature Sensitivity Related Data
     -----------------------------------*/
 
-  booleantype cv_quadr_sensi; /* SUNTRUE if computing sensitivties of quadrs. */
+  sunbooleantype cv_quadr_sensi; /* SUNTRUE if computing sensitivties of quadrs. */
 
   CVQuadSensRhsFn cv_fQS;     /* fQS = (dfQ/dy)*yS + (dfQ/dp)                 */
   void *cv_fQS_data;          /* data pointer passed to fQS                   */
-  booleantype cv_fQSDQ;       /* SUNTRUE if using internal DQ functions       */
+  sunbooleantype cv_fQSDQ;       /* SUNTRUE if using internal DQ functions       */
 
-  booleantype cv_errconQS;    /* SUNTRUE if yQS are considered in err. con.   */
+  sunbooleantype cv_errconQS;    /* SUNTRUE if yQS are considered in err. con.   */
 
   int cv_itolQS;
-  realtype cv_reltolQS;       /* relative tolerance for yQS                   */
-  realtype *cv_SabstolQS;     /* scalar absolute tolerances for yQS           */
+  sunrealtype cv_reltolQS;       /* relative tolerance for yQS                   */
+  sunrealtype *cv_SabstolQS;     /* scalar absolute tolerances for yQS           */
   N_Vector *cv_VabstolQS;     /* vector absolute tolerances for yQS           */
-  booleantype *cv_atolQSmin0; /* flags indicating that min(abstolQS[i]) = 0   */
+  sunbooleantype *cv_atolQSmin0; /* flags indicating that min(abstolQS[i]) = 0   */
 
   /*-----------------------
     Nordsieck History Array
@@ -366,7 +366,7 @@ typedef struct CVodeMemRec {
   N_Vector *cv_tempvS;        /* temporary storage vector (~ tempv)           */
   N_Vector *cv_ftempS;        /* temporary storage vector (~ ftemp)           */
 
-  booleantype cv_stgr1alloc;  /* Did we allocate ncfS1, ncfnS1, and nniS1?    */
+  sunbooleantype cv_stgr1alloc;  /* Did we allocate ncfS1, ncfnS1, and nniS1?    */
 
   /*--------------------------------------
     Quadrature Sensitivity Related Vectors
@@ -383,9 +383,9 @@ typedef struct CVodeMemRec {
     Tstop information
     -----------------*/
 
-  booleantype cv_tstopset;
-  booleantype cv_tstopinterp;
-  realtype cv_tstop;
+  sunbooleantype cv_tstopset;
+  sunbooleantype cv_tstopinterp;
+  sunrealtype cv_tstop;
 
   /*---------
     Step Data
@@ -399,36 +399,36 @@ typedef struct CVodeMemRec {
                                   considering a change in q                   */
   int cv_L;                    /* L = q + 1                                   */
 
-  realtype cv_hin;             /* initial step size                           */
-  realtype cv_h;               /* current step size                           */
-  realtype cv_hprime;          /* step size to be used on the next step       */
-  realtype cv_next_h;          /* step size to be used on the next step       */
-  realtype cv_eta;             /* eta = hprime / h                            */
-  realtype cv_hscale;          /* value of h used in zn                       */
-  realtype cv_tn;              /* current internal value of t                 */
-  realtype cv_tretlast;        /* last value of t returned by CVode           */
+  sunrealtype cv_hin;             /* initial step size                           */
+  sunrealtype cv_h;               /* current step size                           */
+  sunrealtype cv_hprime;          /* step size to be used on the next step       */
+  sunrealtype cv_next_h;          /* step size to be used on the next step       */
+  sunrealtype cv_eta;             /* eta = hprime / h                            */
+  sunrealtype cv_hscale;          /* value of h used in zn                       */
+  sunrealtype cv_tn;              /* current internal value of t                 */
+  sunrealtype cv_tretlast;        /* last value of t returned by CVode           */
 
-  realtype cv_tau[L_MAX+1];    /* array of previous q+1 successful step
+  sunrealtype cv_tau[L_MAX+1];    /* array of previous q+1 successful step
                                   sizes indexed from 1 to q+1                 */
-  realtype cv_tq[NUM_TESTS+1]; /* array of test quantities indexed from
+  sunrealtype cv_tq[NUM_TESTS+1]; /* array of test quantities indexed from
                                   1 to NUM_TESTS(=5)                          */
-  realtype cv_l[L_MAX];        /* coefficients of l(x) (degree q poly)        */
-
-  realtype cv_rl1;             /* the scalar 1/l[1]                           */
-  realtype cv_gamma;           /* gamma = h * rl1                             */
-  realtype cv_gammap;          /* gamma at the last setup call                */
-  realtype cv_gamrat;          /* gamma / gammap                              */
-
-  realtype cv_crate;           /* estimated corrector convergence rate        */
-  realtype cv_crateS;          /* estimated corrector convergence rate (Stgr) */
-  realtype cv_delp;            /* norm of previous nonlinear solver update    */
-  realtype cv_acnrm;           /* | acor |                                    */
-  booleantype cv_acnrmcur;     /* is | acor | current?                        */
-  realtype cv_acnrmQ;          /* | acorQ |                                   */
-  realtype cv_acnrmS;          /* | acorS |                                   */
-  booleantype cv_acnrmScur;    /* is | acorS | current?                       */
-  realtype cv_acnrmQS;         /* | acorQS |                                  */
-  realtype cv_nlscoef;         /* coeficient in nonlinear convergence test    */
+  sunrealtype cv_l[L_MAX];        /* coefficients of l(x) (degree q poly)        */
+
+  sunrealtype cv_rl1;             /* the scalar 1/l[1]                           */
+  sunrealtype cv_gamma;           /* gamma = h * rl1                             */
+  sunrealtype cv_gammap;          /* gamma at the last setup call                */
+  sunrealtype cv_gamrat;          /* gamma / gammap                              */
+
+  sunrealtype cv_crate;           /* estimated corrector convergence rate        */
+  sunrealtype cv_crateS;          /* estimated corrector convergence rate (Stgr) */
+  sunrealtype cv_delp;            /* norm of previous nonlinear solver update    */
+  sunrealtype cv_acnrm;           /* | acor |                                    */
+  sunbooleantype cv_acnrmcur;     /* is | acor | current?                        */
+  sunrealtype cv_acnrmQ;          /* | acorQ |                                   */
+  sunrealtype cv_acnrmS;          /* | acorS |                                   */
+  sunbooleantype cv_acnrmScur;    /* is | acorS | current?                       */
+  sunrealtype cv_acnrmQS;         /* | acorQS |                                  */
+  sunrealtype cv_nlscoef;         /* coeficient in nonlinear convergence test    */
   int  *cv_ncfS1;              /* Array of Ns local counters for conv.
                                 * failures (used in CVStep for STAGGERED1)    */
 
@@ -443,18 +443,18 @@ typedef struct CVodeMemRec {
   int cv_maxnef;          /* maximum number of error test failures              */
   int cv_maxncf;          /* maximum number of nonlinear convergence failures   */
 
-  realtype cv_hmin;       /* |h| >= hmin                                        */
-  realtype cv_hmax_inv;   /* |h| <= 1/hmax_inv                                  */
-  realtype cv_etamax;     /* eta <= etamax                                      */
-  realtype cv_eta_min_fx; /* eta_min_fx < eta < eta_max_fx keep the current h   */
-  realtype cv_eta_max_fx;
-  realtype cv_eta_max_fs; /* eta <= eta_max_fs on the first step                */
-  realtype cv_eta_max_es; /* eta <= eta_max_es on early steps                   */
-  realtype cv_eta_max_gs; /* eta <= eta_max_gs on a general step                */
-  realtype cv_eta_min;    /* eta >= eta_min on a general step                   */
-  realtype cv_eta_min_ef; /* eta >= eta_min_ef after an error test failure      */
-  realtype cv_eta_max_ef; /* eta on multiple (>= small_nef) error test failures */
-  realtype cv_eta_cf;     /* eta on a nonlinear solver convergence failure      */
+  sunrealtype cv_hmin;       /* |h| >= hmin                                        */
+  sunrealtype cv_hmax_inv;   /* |h| <= 1/hmax_inv                                  */
+  sunrealtype cv_etamax;     /* eta <= etamax                                      */
+  sunrealtype cv_eta_min_fx; /* eta_min_fx < eta < eta_max_fx keep the current h   */
+  sunrealtype cv_eta_max_fx;
+  sunrealtype cv_eta_max_fs; /* eta <= eta_max_fs on the first step                */
+  sunrealtype cv_eta_max_es; /* eta <= eta_max_es on early steps                   */
+  sunrealtype cv_eta_max_gs; /* eta <= eta_max_gs on a general step                */
+  sunrealtype cv_eta_min;    /* eta >= eta_min on a general step                   */
+  sunrealtype cv_eta_min_ef; /* eta >= eta_min_ef after an error test failure      */
+  sunrealtype cv_eta_max_ef; /* eta on multiple (>= small_nef) error test failures */
+  sunrealtype cv_eta_cf;     /* eta on a nonlinear solver convergence failure      */
 
   long int cv_small_nst; /* nst <= small_nst use eta_max_es */
   int cv_small_nef;      /* nef >= small_nef use eta_max_ef */
@@ -499,19 +499,19 @@ typedef struct CVodeMemRec {
     Step size ratios
     ----------------*/
 
-  realtype cv_etaqm1;      /* ratio of new to old h for order q-1             */
-  realtype cv_etaq;        /* ratio of new to old h for order q               */
-  realtype cv_etaqp1;      /* ratio of new to old h for order q+1             */
+  sunrealtype cv_etaqm1;      /* ratio of new to old h for order q-1             */
+  sunrealtype cv_etaq;        /* ratio of new to old h for order q               */
+  sunrealtype cv_etaqp1;      /* ratio of new to old h for order q+1             */
 
   /*------------------
     Space requirements
     ------------------*/
 
-  sunindextype cv_lrw1;        /* no. of realtype words in 1 N_Vector y           */
+  sunindextype cv_lrw1;        /* no. of sunrealtype words in 1 N_Vector y           */
   sunindextype cv_liw1;        /* no. of integer words in 1 N_Vector y            */
-  sunindextype cv_lrw1Q;       /* no. of realtype words in 1 N_Vector yQ          */
+  sunindextype cv_lrw1Q;       /* no. of sunrealtype words in 1 N_Vector yQ          */
   sunindextype cv_liw1Q;       /* no. of integer words in 1 N_Vector yQ           */
-  long int cv_lrw;             /* no. of realtype words in CVODE work vectors     */
+  long int cv_lrw;             /* no. of sunrealtype words in CVODE work vectors     */
   long int cv_liw;             /* no. of integer words in CVODE work vectors      */
 
   /*---------------------
@@ -519,20 +519,20 @@ typedef struct CVodeMemRec {
     ---------------------*/
 
   SUNNonlinearSolver NLS;      /* nonlinear solver object                   */
-  booleantype ownNLS;          /* flag indicating NLS ownership             */
+  sunbooleantype ownNLS;          /* flag indicating NLS ownership             */
 
   SUNNonlinearSolver NLSsim;   /* NLS object for the simultaneous corrector */
-  booleantype ownNLSsim;       /* flag indicating NLS ownership             */
+  sunbooleantype ownNLSsim;       /* flag indicating NLS ownership             */
 
   SUNNonlinearSolver NLSstg;   /* NLS object for the staggered corrector */
-  booleantype ownNLSstg;       /* flag indicating NLS ownership          */
+  sunbooleantype ownNLSstg;       /* flag indicating NLS ownership          */
 
   SUNNonlinearSolver NLSstg1;  /* NLS object for the staggered1 corrector */
-  booleantype ownNLSstg1;      /* flag indicating NLS ownership           */
+  sunbooleantype ownNLSstg1;      /* flag indicating NLS ownership           */
   int sens_solve_idx;          /* index of the current staggered1 solve   */
   long int nnip;               /* previous total number of iterations     */
 
-  booleantype sens_solve;      /* flag indicating if the current solve is a
+  sunbooleantype sens_solve;      /* flag indicating if the current solve is a
                                   staggered or staggered1 sensitivity solve */
   CVRhsFn nls_f;               /* f(t,y(t)) used in the nonlinear solver    */
   int convfail;                /* flag to indicate when a Jacobian update may
@@ -554,8 +554,8 @@ typedef struct CVodeMemRec {
 
   /* flags indicating if vector wrappers for the simultaneous and staggered
      correctors have been allocated */
-  booleantype simMallocDone;
-  booleantype stgMallocDone;
+  sunbooleantype simMallocDone;
+  sunbooleantype stgMallocDone;
 
 
   /*------------------
@@ -567,7 +567,7 @@ typedef struct CVodeMemRec {
   int (*cv_linit)(struct CVodeMemRec *cv_mem);
 
   int (*cv_lsetup)(struct CVodeMemRec *cv_mem, int convfail,
-                   N_Vector ypred, N_Vector fpred, booleantype *jcurPtr,
+                   N_Vector ypred, N_Vector fpred, sunbooleantype *jcurPtr,
                    N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3);
 
   int (*cv_lsolve)(struct CVodeMemRec *cv_mem, N_Vector b, N_Vector weight,
@@ -579,9 +579,9 @@ typedef struct CVodeMemRec {
 
   void     *cv_lmem;         /* linear solver interface memory structure */
   long int  cv_msbp;         /* max number of steps between lsetip calls */
-  realtype  cv_dgmax_lsetup; /* gamma ratio threshold to signal for a linear
+  sunrealtype  cv_dgmax_lsetup; /* gamma ratio threshold to signal for a linear
                               * solver setup */
-  booleantype cv_forceSetup; /* flag to request a call to the setup routine */
+  sunbooleantype cv_forceSetup; /* flag to request a call to the setup routine */
 
   /*------------
     Saved Values
@@ -589,12 +589,12 @@ typedef struct CVodeMemRec {
 
   int cv_qu;                   /* last successful q value used                */
   long int cv_nstlp;           /* step number of last setup call              */
-  realtype cv_h0u;             /* actual initial stepsize                     */
-  realtype cv_hu;              /* last successful h value used                */
-  realtype cv_saved_tq5;       /* saved value of tq[5]                        */
-  booleantype cv_jcur;         /* is Jacobian info for linear solver current? */
+  sunrealtype cv_h0u;             /* actual initial stepsize                     */
+  sunrealtype cv_hu;              /* last successful h value used                */
+  sunrealtype cv_saved_tq5;       /* saved value of tq[5]                        */
+  sunbooleantype cv_jcur;         /* is Jacobian info for linear solver current? */
   int cv_convfail;             /* flag storing previous solver failure mode   */
-  realtype cv_tolsf;           /* tolerance scale factor                      */
+  sunrealtype cv_tolsf;           /* tolerance scale factor                      */
   int cv_qmax_alloc;           /* value of qmax used when allocating mem      */
   int cv_qmax_allocQ;          /* qmax used when allocating quad. mem         */
   int cv_qmax_allocS;          /* qmax used when allocating sensi. mem        */
@@ -606,20 +606,20 @@ typedef struct CVodeMemRec {
     and read by CVodeReInit, CVodeSensReInit, and CVodeQuadReInit
     --------------------------------------------------------------------*/
 
-  booleantype cv_VabstolMallocDone;
-  booleantype cv_MallocDone;
-  booleantype cv_constraintsMallocDone;
+  sunbooleantype cv_VabstolMallocDone;
+  sunbooleantype cv_MallocDone;
+  sunbooleantype cv_constraintsMallocDone;
 
-  booleantype cv_VabstolQMallocDone;
-  booleantype cv_QuadMallocDone;
+  sunbooleantype cv_VabstolQMallocDone;
+  sunbooleantype cv_QuadMallocDone;
 
-  booleantype cv_VabstolSMallocDone;
-  booleantype cv_SabstolSMallocDone;
-  booleantype cv_SensMallocDone;
+  sunbooleantype cv_VabstolSMallocDone;
+  sunbooleantype cv_SabstolSMallocDone;
+  sunbooleantype cv_SensMallocDone;
 
-  booleantype cv_VabstolQSMallocDone;
-  booleantype cv_SabstolQSMallocDone;
-  booleantype cv_QuadSensMallocDone;
+  sunbooleantype cv_VabstolQSMallocDone;
+  sunbooleantype cv_SabstolQSMallocDone;
+  sunbooleantype cv_QuadSensMallocDone;
 
   /*-------------------------------------------
     Error handler function and error ouput file
@@ -639,8 +639,8 @@ typedef struct CVodeMemRec {
     Stability Limit Detection
     -------------------------*/
 
-  booleantype cv_sldeton;     /* is Stability Limit Detection on?             */
-  realtype cv_ssdat[6][4];    /* scaled data array for STALD                  */
+  sunbooleantype cv_sldeton;     /* is Stability Limit Detection on?             */
+  sunrealtype cv_ssdat[6][4];    /* scaled data array for STALD                  */
   int cv_nscon;               /* counter for STALD method                     */
   long int cv_nor;            /* counter for number of order reductions       */
 
@@ -652,18 +652,18 @@ typedef struct CVodeMemRec {
   int cv_nrtfn;            /* number of components of g                       */
   int *cv_iroots;          /* array for root information                      */
   int *cv_rootdir;         /* array specifying direction of zero-crossing     */
-  realtype cv_tlo;         /* nearest endpoint of interval in root search     */
-  realtype cv_thi;         /* farthest endpoint of interval in root search    */
-  realtype cv_trout;       /* t value returned by rootfinding routine         */
-  realtype *cv_glo;        /* saved array of g values at t = tlo              */
-  realtype *cv_ghi;        /* saved array of g values at t = thi              */
-  realtype *cv_grout;      /* array of g values at t = trout                  */
-  realtype cv_toutc;       /* copy of tout (if NORMAL mode)                   */
-  realtype cv_ttol;        /* tolerance on root location trout                */
+  sunrealtype cv_tlo;         /* nearest endpoint of interval in root search     */
+  sunrealtype cv_thi;         /* farthest endpoint of interval in root search    */
+  sunrealtype cv_trout;       /* t value returned by rootfinding routine         */
+  sunrealtype *cv_glo;        /* saved array of g values at t = tlo              */
+  sunrealtype *cv_ghi;        /* saved array of g values at t = thi              */
+  sunrealtype *cv_grout;      /* array of g values at t = trout                  */
+  sunrealtype cv_toutc;       /* copy of tout (if NORMAL mode)                   */
+  sunrealtype cv_ttol;        /* tolerance on root location trout                */
   int cv_taskc;            /* copy of parameter itask                         */
   int cv_irfnd;            /* flag showing whether last step had a root       */
   long int cv_nge;         /* counter for g evaluations                       */
-  booleantype *cv_gactive; /* array with active/inactive event functions      */
+  sunbooleantype *cv_gactive; /* array with active/inactive event functions      */
   int cv_mxgnull;          /* number of warning messages about possible g==0  */
 
   /*---------------
@@ -671,15 +671,15 @@ typedef struct CVodeMemRec {
     ---------------*/
 
   CVodeProjMem proj_mem;      /* projection memory structure               */
-  booleantype  proj_enabled;  /* flag indicating if projection is enabled  */
-  booleantype  proj_applied;  /* flag indicating if projection was applied */
-  realtype     proj_p[L_MAX]; /* coefficients of p(x) (degree q poly)      */
+  sunbooleantype  proj_enabled;  /* flag indicating if projection is enabled  */
+  sunbooleantype  proj_applied;  /* flag indicating if projection was applied */
+  sunrealtype     proj_p[L_MAX]; /* coefficients of p(x) (degree q poly)      */
 
   /*-----------------------
     Fused Vector Operations
     -----------------------*/
 
-  realtype* cv_cvals; /* array of scalars */
+  sunrealtype* cv_cvals; /* array of scalars */
   N_Vector* cv_Xvecs; /* array of vectors */
   N_Vector* cv_Zvecs; /* array of vectors */
 
@@ -687,11 +687,11 @@ typedef struct CVodeMemRec {
     Adjoint sensitivity data
     ------------------------*/
 
-  booleantype cv_adj;             /* SUNTRUE if performing ASA                */
+  sunbooleantype cv_adj;             /* SUNTRUE if performing ASA                */
 
   struct CVadjMemRec *cv_adj_mem; /* Pointer to adjoint memory structure      */
 
-  booleantype cv_adjMallocDone;
+  sunbooleantype cv_adjMallocDone;
 
 } *CVodeMem;
 
@@ -715,20 +715,20 @@ typedef struct CVodeMemRec {
 struct CVckpntMemRec {
 
   /* Integration limits */
-  realtype ck_t0;
-  realtype ck_t1;
+  sunrealtype ck_t0;
+  sunrealtype ck_t1;
 
   /* Nordsieck History Array */
   N_Vector ck_zn[L_MAX];
 
   /* Do we need to carry quadratures? */
-  booleantype ck_quadr;
+  sunbooleantype ck_quadr;
 
   /* Nordsieck History Array for quadratures */
   N_Vector ck_znQ[L_MAX];
 
   /* Do we need to carry sensitivities? */
-  booleantype ck_sensi;
+  sunbooleantype ck_sensi;
 
   /* number of sensitivities */
   int ck_Ns;
@@ -737,7 +737,7 @@ struct CVckpntMemRec {
   N_Vector *ck_znS[L_MAX];
 
   /* Do we need to carry quadrature sensitivities? */
-  booleantype ck_quadr_sensi;
+  sunbooleantype ck_quadr_sensi;
 
   /* Nordsieck History Array for quadrature sensitivities */
   N_Vector *ck_znQS[L_MAX];
@@ -749,23 +749,23 @@ struct CVckpntMemRec {
 
   /* Step data */
   long int ck_nst;
-  realtype ck_tretlast;
+  sunrealtype ck_tretlast;
   int      ck_q;
   int      ck_qprime;
   int      ck_qwait;
   int      ck_L;
-  realtype ck_gammap;
-  realtype ck_h;
-  realtype ck_hprime;
-  realtype ck_hscale;
-  realtype ck_eta;
-  realtype ck_etamax;
-  realtype ck_tau[L_MAX+1];
-  realtype ck_tq[NUM_TESTS+1];
-  realtype ck_l[L_MAX];
+  sunrealtype ck_gammap;
+  sunrealtype ck_h;
+  sunrealtype ck_hprime;
+  sunrealtype ck_hscale;
+  sunrealtype ck_eta;
+  sunrealtype ck_etamax;
+  sunrealtype ck_tau[L_MAX+1];
+  sunrealtype ck_tq[NUM_TESTS+1];
+  sunrealtype ck_l[L_MAX];
 
   /* Saved values */
-  realtype ck_saved_tq5;
+  sunrealtype ck_saved_tq5;
 
   /* Pointer to next structure in list */
   struct CVckpntMemRec *ck_next;
@@ -787,9 +787,9 @@ struct CVckpntMemRec {
  * -----------------------------------------------------------------
  */
 
-typedef booleantype (*cvaIMMallocFn)(CVodeMem cv_mem);
+typedef sunbooleantype (*cvaIMMallocFn)(CVodeMem cv_mem);
 typedef void (*cvaIMFreeFn)(CVodeMem cv_mem);
-typedef int (*cvaIMGetYFn)(CVodeMem cv_mem, realtype t, N_Vector y, N_Vector *yS);
+typedef int (*cvaIMGetYFn)(CVodeMem cv_mem, sunrealtype t, N_Vector y, N_Vector *yS);
 typedef int (*cvaIMStorePntFn)(CVodeMem cv_mem, CVdtpntMem d);
 
 /*
@@ -803,7 +803,7 @@ typedef int (*cvaIMStorePntFn)(CVodeMem cv_mem, CVdtpntMem d);
  */
 
 struct CVdtpntMemRec {
-  realtype t;    /* time */
+  sunrealtype t;    /* time */
   void *content; /* IMtype-dependent content */
 };
 
@@ -839,15 +839,15 @@ struct CVodeBMemRec {
   int cv_index;
 
   /* Time at which the backward problem is initialized */
-  realtype cv_t0;
+  sunrealtype cv_t0;
 
   /* CVODES memory for this backward problem */
   CVodeMem cv_mem;
 
   /* Flags to indicate that this backward problem's RHS or quad RHS
    * require forward sensitivities */
-  booleantype cv_f_withSensi;
-  booleantype cv_fQ_withSensi;
+  sunbooleantype cv_f_withSensi;
+  sunbooleantype cv_fQ_withSensi;
 
   /* Right hand side function for backward run */
   CVRhsFnB cv_f;
@@ -873,7 +873,7 @@ struct CVodeBMemRec {
   int (*cv_pfree)(CVodeBMem cvB_mem);
 
   /* Time at which to extract solution / quadratures */
-  realtype cv_tout;
+  sunrealtype cv_tout;
 
   /* Workspace Nvector */
   N_Vector cv_y;
@@ -900,19 +900,19 @@ struct CVadjMemRec {
    * -------------------- */
 
   /* Integration interval */
-  realtype ca_tinitial, ca_tfinal;
+  sunrealtype ca_tinitial, ca_tfinal;
 
   /* Flag for first call to CVodeF */
-  booleantype ca_firstCVodeFcall;
+  sunbooleantype ca_firstCVodeFcall;
 
   /* Flag if CVodeF was called with TSTOP */
-  booleantype ca_tstopCVodeFcall;
-  realtype ca_tstopCVodeF;
+  sunbooleantype ca_tstopCVodeFcall;
+  sunrealtype ca_tstopCVodeF;
 
   /* Flag if CVodeF was called in CV_NORMAL_MODE and encountered a
      root after tout */
-  booleantype ca_rootret;
-  realtype ca_troot;
+  sunbooleantype ca_rootret;
+  sunrealtype ca_troot;
 
   /* ----------------------
    * Backward problems data
@@ -928,7 +928,7 @@ struct CVadjMemRec {
   struct CVodeBMemRec *ca_bckpbCrt;
 
   /* Flag for first call to CVodeB */
-  booleantype ca_firstCVodeBcall;
+  sunbooleantype ca_firstCVodeBcall;
 
   /* ----------------
    * Check point data
@@ -969,15 +969,15 @@ struct CVadjMemRec {
   cvaIMGetYFn     ca_IMget;   /* interpolate forward solution    */
 
   /* Flags controlling the interpolation module */
-  booleantype ca_IMmallocDone;   /* IM initialized? */
-  booleantype ca_IMnewData;      /* new data available in dt_mem?*/
-  booleantype ca_IMstoreSensi;   /* store sensitivities? */
-  booleantype ca_IMinterpSensi;  /* interpolate sensitivities? */
+  sunbooleantype ca_IMmallocDone;   /* IM initialized? */
+  sunbooleantype ca_IMnewData;      /* new data available in dt_mem?*/
+  sunbooleantype ca_IMstoreSensi;   /* store sensitivities? */
+  sunbooleantype ca_IMinterpSensi;  /* interpolate sensitivities? */
 
   /* Workspace for the interpolation module */
   N_Vector ca_Y[L_MAX];     /* pointers to zn[i] */
   N_Vector *ca_YS[L_MAX];   /* pointers to znS[i] */
-  realtype ca_T[L_MAX];
+  sunrealtype ca_T[L_MAX];
 
   /* -------------------------------
    * Workspace for wrapper functions
@@ -1049,7 +1049,7 @@ struct CVadjMemRec {
 /*
  * -----------------------------------------------------------------
  * int (*cv_lsetup)(CVodeMem cv_mem, int convfail, N_Vector ypred,
- *                 N_Vector fpred, booleantype *jcurPtr,
+ *                 N_Vector fpred, sunbooleantype *jcurPtr,
  *                 N_Vector vtemp1, N_Vector vtemp2,
  *                 N_Vector vtemp3);
  * -----------------------------------------------------------------
@@ -1130,9 +1130,9 @@ struct CVadjMemRec {
 
 /* Norm functions */
 
-realtype cvSensNorm(CVodeMem cv_mem, N_Vector *xS, N_Vector *wS);
+sunrealtype cvSensNorm(CVodeMem cv_mem, N_Vector *xS, N_Vector *wS);
 
-realtype cvSensUpdateNorm(CVodeMem cv_mem, realtype old_nrm,
+sunrealtype cvSensUpdateNorm(CVodeMem cv_mem, sunrealtype old_nrm,
                           N_Vector *xS, N_Vector *wS);
 
 /* Prototype of internal ewtSet function */
@@ -1158,14 +1158,14 @@ int cvNlsInitSensStg1(CVodeMem cv_mem);
 
 /* Projection functions */
 
-int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                    int *npfPtr);
 int cvProjInit(CVodeProjMem proj_mem);
 int cvProjFree(CVodeProjMem *proj_mem);
 
 /* Restore tn and undo prediction to reattempt a step */
 
-void cvRestore(CVodeMem cv_mem, realtype saved_t);
+void cvRestore(CVodeMem cv_mem, sunrealtype saved_t);
 
 /* Reset h and rescale history array to prepare for a step */
 
@@ -1173,25 +1173,25 @@ void cvRescale(CVodeMem cv_mem);
 
 /* Prototypes for internal sensitivity rhs wrappers */
 
-int cvSensRhsWrapper(CVodeMem cv_mem, realtype time,
+int cvSensRhsWrapper(CVodeMem cv_mem, sunrealtype time,
                      N_Vector ycur, N_Vector fcur,
                      N_Vector *yScur, N_Vector *fScur,
                      N_Vector temp1, N_Vector temp2);
 
-int cvSensRhs1Wrapper(CVodeMem cv_mem, realtype time,
+int cvSensRhs1Wrapper(CVodeMem cv_mem, sunrealtype time,
                       N_Vector ycur, N_Vector fcur,
                       int is, N_Vector yScur, N_Vector fScur,
                       N_Vector temp1, N_Vector temp2);
 
 /* Prototypes for internal sensitivity rhs DQ functions */
 
-int cvSensRhsInternalDQ(int Ns, realtype t,
+int cvSensRhsInternalDQ(int Ns, sunrealtype t,
                         N_Vector y, N_Vector ydot,
                         N_Vector *yS, N_Vector *ySdot,
                         void *fS_data,
                         N_Vector tempv, N_Vector ftemp);
 
-int cvSensRhs1InternalDQ(int Ns, realtype t,
+int cvSensRhs1InternalDQ(int Ns, sunrealtype t,
                          N_Vector y, N_Vector ydot,
                          int is, N_Vector yS, N_Vector ySdot,
                          void *fS_data,
diff --git a/src/cvodes/cvodes_io.c b/src/cvodes/cvodes_io.c
index 93525e3477..1111e09142 100644
--- a/src/cvodes/cvodes_io.c
+++ b/src/cvodes/cvodes_io.c
@@ -22,10 +22,10 @@
 #include "cvodes_ls_impl.h"
 #include "sundials/sundials_types.h"
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define TWOPT5 RCONST(2.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define TWOPT5 SUN_RCONST(2.5)
 
 /*
  * =================================================================
@@ -40,7 +40,7 @@
  * Specifies the gamma ratio threshold to signal for a linear solver setup
  */
 
-int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem, realtype dgmax_lsetup)
+int CVodeSetDeltaGammaMaxLSetup(void *cvode_mem, sunrealtype dgmax_lsetup)
 {
   CVodeMem cv_mem;
 
@@ -279,7 +279,7 @@ int CVodeSetMaxHnilWarns(void *cvode_mem, int mxhnil)
  * Turns on/off the stability limit detection algorithm
  */
 
-int CVodeSetStabLimDet(void *cvode_mem, booleantype sldet)
+int CVodeSetStabLimDet(void *cvode_mem, sunbooleantype sldet)
 {
   CVodeMem cv_mem;
 
@@ -306,7 +306,7 @@ int CVodeSetStabLimDet(void *cvode_mem, booleantype sldet)
  * Specifies the initial step size
  */
 
-int CVodeSetInitStep(void *cvode_mem, realtype hin)
+int CVodeSetInitStep(void *cvode_mem, sunrealtype hin)
 {
   CVodeMem cv_mem;
 
@@ -328,7 +328,7 @@ int CVodeSetInitStep(void *cvode_mem, realtype hin)
  * Specifies the minimum step size
  */
 
-int CVodeSetMinStep(void *cvode_mem, realtype hmin)
+int CVodeSetMinStep(void *cvode_mem, sunrealtype hmin)
 {
   CVodeMem cv_mem;
 
@@ -366,9 +366,9 @@ int CVodeSetMinStep(void *cvode_mem, realtype hmin)
  * Specifies the maximum step size
  */
 
-int CVodeSetMaxStep(void *cvode_mem, realtype hmax)
+int CVodeSetMaxStep(void *cvode_mem, sunrealtype hmax)
 {
-  realtype hmax_inv;
+  sunrealtype hmax_inv;
   CVodeMem cv_mem;
 
   if (cvode_mem==NULL) {
@@ -407,8 +407,8 @@ int CVodeSetMaxStep(void *cvode_mem, realtype hmax)
  */
 
 
-int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
-                               realtype eta_max_fx)
+int CVodeSetEtaFixedStepBounds(void* cvode_mem, sunrealtype eta_min_fx,
+                               sunrealtype eta_max_fx)
 {
   CVodeMem cv_mem;
 
@@ -440,7 +440,7 @@ int CVodeSetEtaFixedStepBounds(void* cvode_mem, realtype eta_min_fx,
  * Specifies the maximum step size change on the first step
  */
 
-int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
+int CVodeSetEtaMaxFirstStep(void* cvode_mem, sunrealtype eta_max_fs)
 {
   CVodeMem cv_mem;
 
@@ -468,7 +468,7 @@ int CVodeSetEtaMaxFirstStep(void* cvode_mem, realtype eta_max_fs)
  * when nst <= small_nst
  */
 
-int CVodeSetEtaMaxEarlyStep(void* cvode_mem, realtype eta_max_es)
+int CVodeSetEtaMaxEarlyStep(void* cvode_mem, sunrealtype eta_max_es)
 {
   CVodeMem cv_mem;
 
@@ -523,7 +523,7 @@ int CVodeSetNumStepsEtaMaxEarlyStep(void* cvode_mem, long int small_nst)
  * Specifies the maximum step size change on a general steps (nst > small_nst)
  */
 
-int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
+int CVodeSetEtaMax(void* cvode_mem, sunrealtype eta_max_gs)
 {
   CVodeMem cv_mem;
 
@@ -550,7 +550,7 @@ int CVodeSetEtaMax(void* cvode_mem, realtype eta_max_gs)
  * Specifies the minimum change on a general steps
  */
 
-int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
+int CVodeSetEtaMin(void* cvode_mem, sunrealtype eta_min)
 {
   CVodeMem cv_mem;
 
@@ -577,7 +577,7 @@ int CVodeSetEtaMin(void* cvode_mem, realtype eta_min)
  * Specifies the minimum step size change after an error test failure
  */
 
-int CVodeSetEtaMinErrFail(void* cvode_mem, realtype eta_min_ef)
+int CVodeSetEtaMinErrFail(void* cvode_mem, sunrealtype eta_min_ef)
 {
   CVodeMem cv_mem;
 
@@ -605,7 +605,7 @@ int CVodeSetEtaMinErrFail(void* cvode_mem, realtype eta_min_ef)
  * test failures
  */
 
-int CVodeSetEtaMaxErrFail(void* cvode_mem, realtype eta_max_ef)
+int CVodeSetEtaMaxErrFail(void* cvode_mem, sunrealtype eta_max_ef)
 {
   CVodeMem cv_mem;
 
@@ -660,7 +660,7 @@ int CVodeSetNumFailsEtaMaxErrFail(void* cvode_mem, int small_nef)
  * Specifies the step size change after a nonlinear solver failure
  */
 
-int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
+int CVodeSetEtaConvFail(void* cvode_mem, sunrealtype eta_cf)
 {
   CVodeMem cv_mem;
 
@@ -687,7 +687,7 @@ int CVodeSetEtaConvFail(void* cvode_mem, realtype eta_cf)
  * Specifies the time beyond which the integration is not to proceed.
  */
 
-int CVodeSetStopTime(void *cvode_mem, realtype tstop)
+int CVodeSetStopTime(void *cvode_mem, sunrealtype tstop)
 {
   CVodeMem cv_mem;
 
@@ -722,7 +722,7 @@ int CVodeSetStopTime(void *cvode_mem, realtype tstop)
  * Specifies to use interpolation to fill the returned solution at the stop time (instead of a copy).
  */
 
-int CVodeSetInterpolateStopTime(void *cvode_mem, booleantype interp)
+int CVodeSetInterpolateStopTime(void *cvode_mem, sunbooleantype interp)
 {
   CVodeMem cv_mem;
 
@@ -812,7 +812,7 @@ int CVodeSetMaxConvFails(void *cvode_mem, int maxncf)
 int CVodeSetMaxNonlinIters(void *cvode_mem, int maxcor)
 {
   CVodeMem cv_mem;
-  booleantype sensi_sim;
+  sunbooleantype sensi_sim;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES",
@@ -858,7 +858,7 @@ int CVodeSetMaxNonlinIters(void *cvode_mem, int maxcor)
  * test
  */
 
-int CVodeSetNonlinConvCoef(void *cvode_mem, realtype nlscoef)
+int CVodeSetNonlinConvCoef(void *cvode_mem, sunrealtype nlscoef)
 {
   CVodeMem cv_mem;
 
@@ -968,7 +968,7 @@ int CVodeSetNoInactiveRootWarn(void *cvode_mem)
 int CVodeSetConstraints(void *cvode_mem, N_Vector constraints)
 {
   CVodeMem cv_mem;
-  realtype temptest;
+  sunrealtype temptest;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES", "CVodeSetConstraints", MSGCV_NO_MEM);
@@ -1028,7 +1028,7 @@ int CVodeSetConstraints(void *cvode_mem, N_Vector constraints)
  * =================================================================
  */
 
-int CVodeSetQuadErrCon(void *cvode_mem, booleantype errconQ)
+int CVodeSetQuadErrCon(void *cvode_mem, sunbooleantype errconQ)
 {
   CVodeMem cv_mem;
 
@@ -1049,7 +1049,7 @@ int CVodeSetQuadErrCon(void *cvode_mem, booleantype errconQ)
  * =================================================================
  */
 
-int CVodeSetSensDQMethod(void *cvode_mem, int DQtype, realtype DQrhomax)
+int CVodeSetSensDQMethod(void *cvode_mem, int DQtype, sunrealtype DQrhomax)
 {
   CVodeMem cv_mem;
 
@@ -1078,7 +1078,7 @@ int CVodeSetSensDQMethod(void *cvode_mem, int DQtype, realtype DQrhomax)
 
 /*-----------------------------------------------------------------*/
 
-int CVodeSetSensErrCon(void *cvode_mem, booleantype errconS)
+int CVodeSetSensErrCon(void *cvode_mem, sunbooleantype errconS)
 {
   CVodeMem cv_mem;
 
@@ -1098,7 +1098,7 @@ int CVodeSetSensErrCon(void *cvode_mem, booleantype errconS)
 int CVodeSetSensMaxNonlinIters(void *cvode_mem, int maxcorS)
 {
   CVodeMem cv_mem;
-  booleantype sensi_stg;
+  sunbooleantype sensi_stg;
 
   if (cvode_mem==NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES",
@@ -1139,7 +1139,7 @@ int CVodeSetSensMaxNonlinIters(void *cvode_mem, int maxcorS)
 
 /*-----------------------------------------------------------------*/
 
-int CVodeSetSensParams(void *cvode_mem, realtype *p, realtype *pbar, int *plist)
+int CVodeSetSensParams(void *cvode_mem, sunrealtype *p, sunrealtype *pbar, int *plist)
 {
   CVodeMem cv_mem;
   int is, Ns;
@@ -1197,7 +1197,7 @@ int CVodeSetSensParams(void *cvode_mem, realtype *p, realtype *pbar, int *plist)
 
 /*-----------------------------------------------------------------*/
 
-int CVodeSetQuadSensErrCon(void *cvode_mem, booleantype errconQS)
+int CVodeSetQuadSensErrCon(void *cvode_mem, sunbooleantype errconQS)
 {
   CVodeMem cv_mem;
 
@@ -1370,7 +1370,7 @@ int CVodeGetCurrentOrder(void *cvode_mem, int *qcur)
  * Returns the value of gamma for the current step.
  */
 
-int CVodeGetCurrentGamma(void *cvode_mem, realtype *gamma)
+int CVodeGetCurrentGamma(void *cvode_mem, sunrealtype *gamma)
 {
   CVodeMem cv_mem;
 
@@ -1418,7 +1418,7 @@ int CVodeGetNumStabLimOrderReds(void *cvode_mem, long int *nslred)
  * Returns the step size used on the first step
  */
 
-int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused)
+int CVodeGetActualInitStep(void *cvode_mem, sunrealtype *hinused)
 {
   CVodeMem cv_mem;
 
@@ -1440,7 +1440,7 @@ int CVodeGetActualInitStep(void *cvode_mem, realtype *hinused)
  * Returns the step size used on the last successful step
  */
 
-int CVodeGetLastStep(void *cvode_mem, realtype *hlast)
+int CVodeGetLastStep(void *cvode_mem, sunrealtype *hlast)
 {
   CVodeMem cv_mem;
 
@@ -1462,7 +1462,7 @@ int CVodeGetLastStep(void *cvode_mem, realtype *hlast)
  * Returns the step size to be attempted on the next step
  */
 
-int CVodeGetCurrentStep(void *cvode_mem, realtype *hcur)
+int CVodeGetCurrentStep(void *cvode_mem, sunrealtype *hcur)
 {
   CVodeMem cv_mem;
 
@@ -1551,7 +1551,7 @@ int CVodeGetCurrentSensSolveIndex(void *cvode_mem, int *index)
  * Returns the current value of the independent variable
  */
 
-int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur)
+int CVodeGetCurrentTime(void *cvode_mem, sunrealtype *tcur)
 {
   CVodeMem cv_mem;
 
@@ -1573,7 +1573,7 @@ int CVodeGetCurrentTime(void *cvode_mem, realtype *tcur)
  * Returns a suggested factor for scaling tolerances
  */
 
-int CVodeGetTolScaleFactor(void *cvode_mem, realtype *tolsfact)
+int CVodeGetTolScaleFactor(void *cvode_mem, sunrealtype *tolsfact)
 {
   CVodeMem cv_mem;
 
@@ -1664,8 +1664,8 @@ int CVodeGetWorkSpace(void *cvode_mem, long int *lenrw, long int *leniw)
 
 int CVodeGetIntegratorStats(void *cvode_mem, long int *nsteps, long int *nfevals,
                             long int *nlinsetups, long int *netfails, int *qlast,
-                            int *qcur, realtype *hinused, realtype *hlast,
-                            realtype *hcur, realtype *tcur)
+                            int *qcur, sunrealtype *hinused, sunrealtype *hlast,
+                            sunrealtype *hcur, sunrealtype *tcur)
 {
   CVodeMem cv_mem;
 
@@ -2447,7 +2447,7 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (cv_mem->cv_nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) cv_mem->cv_nni / (realtype) cv_mem->cv_nst);
+              (sunrealtype) cv_mem->cv_nni / (sunrealtype) cv_mem->cv_nst);
     }
 
     /* linear solver stats */
@@ -2466,11 +2466,11 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (cv_mem->cv_nni > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) cvls_mem->nli / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nli / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) cvls_mem->nje / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nje / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) cvls_mem->npe / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->npe / (sunrealtype) cv_mem->cv_nni);
       }
     }
 
@@ -2552,7 +2552,7 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
     if (cv_mem->cv_nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) cv_mem->cv_nni / (realtype) cv_mem->cv_nst);
+              (sunrealtype) cv_mem->cv_nni / (sunrealtype) cv_mem->cv_nst);
     }
     else
     {
@@ -2575,11 +2575,11 @@ int CVodePrintAllStats(void *cvode_mem, FILE *outfile, SUNOutputFormat fmt)
       if (cv_mem->cv_nni > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) cvls_mem->nli / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nli / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) cvls_mem->nje / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->nje / (sunrealtype) cv_mem->cv_nni);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) cvls_mem->npe / (realtype) cv_mem->cv_nni);
+                (sunrealtype) cvls_mem->npe / (sunrealtype) cv_mem->cv_nni);
       }
       else
       {
diff --git a/src/cvodes/cvodes_ls.c b/src/cvodes/cvodes_ls.c
index 14d12a9bc6..8ca7d8c8b2 100644
--- a/src/cvodes/cvodes_ls.c
+++ b/src/cvodes/cvodes_ls.c
@@ -32,19 +32,19 @@
 #include <sunmatrix/sunmatrix_sparse.h>
 
 /* Private constants */
-#define MIN_INC_MULT RCONST(1000.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
 #define MAX_DQITERS  3  /* max. number of attempts to recover in DQ J*v */
-#define ZERO         RCONST(0.0)
-#define PT25         RCONST(0.25)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define ZERO         SUN_RCONST(0.0)
+#define PT25         SUN_RCONST(0.25)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 /*=================================================================
   PRIVATE FUNCTION PROTOTYPES - forward problems
   =================================================================*/
 
-static int cvLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                      booleantype jok, booleantype *jcur, realtype gamma,
+static int cvLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                      sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                       void *user_data, N_Vector tmp1, N_Vector tmp2,
                       N_Vector tmp3);
 
@@ -55,12 +55,12 @@ static int cvLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
 /* cvLsJacBWrapper and cvLsJacBSWrapper have type CVLsJacFn, and
    wrap around user-provided functions of type CVLsJacFnB and
    CVLsJacFnBS, respectively */
-static int cvLsJacBWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsJacBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                            SUNMatrix JB, void *cvode_mem,
                            N_Vector tmp1B, N_Vector tmp2B,
                            N_Vector tmp3B);
 
-static int cvLsJacBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsJacBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                             SUNMatrix JB, void *cvode_mem,
                             N_Vector tmp1B, N_Vector tmp2B,
                             N_Vector tmp3B);
@@ -68,54 +68,54 @@ static int cvLsJacBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
 /* cvLsPrecSetupBWrapper and cvLsPrecSetupBSWrapper have type
    CVLsPrecSetupFn, and wrap around user-provided functions of
    type CVLsPrecSetupFnB and CVLsPrecSetupFnBS, respectively */
-static int cvLsPrecSetupBWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                                 booleantype jokB, booleantype *jcurPtrB,
-                                 realtype gammaB, void *cvode_mem);
-static int cvLsPrecSetupBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                                  booleantype jokB, booleantype *jcurPtrB,
-                                  realtype gammaB, void *cvode_mem);
+static int cvLsPrecSetupBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                                 sunbooleantype jokB, sunbooleantype *jcurPtrB,
+                                 sunrealtype gammaB, void *cvode_mem);
+static int cvLsPrecSetupBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                                  sunbooleantype jokB, sunbooleantype *jcurPtrB,
+                                  sunrealtype gammaB, void *cvode_mem);
 
 /* cvLsPrecSolveBWrapper and cvLsPrecSolveBSWrapper have type
    CVLsPrecSolveFn, and wrap around user-provided functions of
    type CVLsPrecSolveFnB and CVLsPrecSolveFnBS, respectively */
-static int cvLsPrecSolveBWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsPrecSolveBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                                  N_Vector rB, N_Vector zB,
-                                 realtype gammaB, realtype deltaB,
+                                 sunrealtype gammaB, sunrealtype deltaB,
                                  int lrB, void *cvode_mem);
-static int cvLsPrecSolveBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsPrecSolveBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                                   N_Vector rB, N_Vector zB,
-                                  realtype gammaB, realtype deltaB,
+                                  sunrealtype gammaB, sunrealtype deltaB,
                                   int lrB, void *cvode_mem);
 
 /* cvLsJacTimesSetupBWrapper and cvLsJacTimesSetupBSWrapper have type
    CVLsJacTimesSetupFn, and wrap around user-provided functions of
    type CVLsJacTimesSetupFnB and CVLsJacTimesSetupFnBS, respectively */
-static int cvLsJacTimesSetupBWrapper(realtype t, N_Vector yB,
+static int cvLsJacTimesSetupBWrapper(sunrealtype t, N_Vector yB,
                                      N_Vector fyB, void *cvode_mem);
-static int cvLsJacTimesSetupBSWrapper(realtype t, N_Vector yB,
+static int cvLsJacTimesSetupBSWrapper(sunrealtype t, N_Vector yB,
                                       N_Vector fyB, void *cvode_mem);
 
 /* cvLsJacTimesVecBWrapper and cvLsJacTimesVecBSWrapper have type
    CVLsJacTimesVecFn, and wrap around user-provided functions of
    type CVLsJacTimesVecFnB and CVLsJacTimesVecFnBS, respectively */
-static int cvLsJacTimesVecBWrapper(N_Vector vB, N_Vector JvB, realtype t,
+static int cvLsJacTimesVecBWrapper(N_Vector vB, N_Vector JvB, sunrealtype t,
                                    N_Vector yB, N_Vector fyB,
                                    void *cvode_mem, N_Vector tmpB);
-static int cvLsJacTimesVecBSWrapper(N_Vector vB, N_Vector JvB, realtype t,
+static int cvLsJacTimesVecBSWrapper(N_Vector vB, N_Vector JvB, sunrealtype t,
                                     N_Vector yB, N_Vector fyB,
                                     void *cvode_mem, N_Vector tmpB);
 
 /* cvLsLinSysFnBWrapper and cvLsLinSysFnBSWrapper have type CVLsLinSysFn, and
    wrap around user-provided functions of type CVLsLinSysFnB and CVLsLinSysFnBS,
    respectively */
-static int cvLsLinSysBWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                              SUNMatrix AB, booleantype jokB,
-                              booleantype *jcurB, realtype gammaB,
+static int cvLsLinSysBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                              SUNMatrix AB, sunbooleantype jokB,
+                              sunbooleantype *jcurB, sunrealtype gammaB,
                               void *user_dataB, N_Vector tmp1B, N_Vector tmp2B,
                               N_Vector tmp3B);
-static int cvLsLinSysBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                               SUNMatrix AB, booleantype jokB,
-                               booleantype *jcurB, realtype gammaB,
+static int cvLsLinSysBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                               SUNMatrix AB, sunbooleantype jokB,
+                               sunbooleantype *jcurB, sunrealtype gammaB,
                                void *user_dataB, N_Vector tmp1B, N_Vector tmp2B,
                                N_Vector tmp3);
 
@@ -137,8 +137,8 @@ int CVodeSetLinearSolver(void *cvode_mem, SUNLinearSolver LS,
   CVodeMem    cv_mem;
   CVLsMem     cvls_mem;
   int         retval, LSType;
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if either cvode_mem or LS inputs are NULL */
   if (cvode_mem == NULL) {
@@ -390,7 +390,7 @@ int CVodeSetJacFn(void *cvode_mem, CVLsJacFn jac)
 /* CVodeSetDeltaGammaMaxBadJac specifies the maximum gamma ratio change
  * after a NLS convergence failure with a potentially bad Jacobian. If
  * |gamma/gammap-1| < dgmax_jbad then the Jacobian is marked as bad */
-int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, realtype dgmax_jbad)
+int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, sunrealtype dgmax_jbad)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -412,7 +412,7 @@ int CVodeSetDeltaGammaMaxBadJac(void *cvode_mem, realtype dgmax_jbad)
 
 
 /* CVodeSetEpsLin specifies the nonlinear -> linear tolerance scale factor */
-int CVodeSetEpsLin(void *cvode_mem, realtype eplifac)
+int CVodeSetEpsLin(void *cvode_mem, sunrealtype eplifac)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -438,7 +438,7 @@ int CVodeSetEpsLin(void *cvode_mem, realtype eplifac)
 
 /* CVodeSetLSNormFactor sets or computes the factor to use when converting from
    the integrator tolerance to the linear solver tolerance (WRMS to L2 norm). */
-int CVodeSetLSNormFactor(void *cvode_mem, realtype nrmfac)
+int CVodeSetLSNormFactor(void *cvode_mem, sunrealtype nrmfac)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -492,7 +492,7 @@ int CVodeSetJacEvalFrequency(void *cvode_mem, long int msbj)
 
 /* CVodeSetLinearSolutionScaling enables or disables scaling the
    linear solver solution to account for changes in gamma. */
-int CVodeSetLinearSolutionScaling(void *cvode_mem, booleantype onoff)
+int CVodeSetLinearSolutionScaling(void *cvode_mem, sunbooleantype onoff)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -1072,7 +1072,7 @@ int cvLsPSetup(void *cvode_mem)
   only case in which the user's psolve routine is allowed to be
   NULL.
   -----------------------------------------------------------------*/
-int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, realtype tol, int lr)
+int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
@@ -1100,7 +1100,7 @@ int cvLsPSolve(void *cvode_mem, N_Vector r, N_Vector z, realtype tol, int lr)
   implementations of the difference quotient Jacobian
   approximation routines.
   ---------------------------------------------------------------*/
-int cvLsDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDQJac(sunrealtype t, N_Vector y, N_Vector fy,
               SUNMatrix Jac, void *cvode_mem, N_Vector tmp1,
               N_Vector tmp2, N_Vector tmp3)
 {
@@ -1161,11 +1161,11 @@ int cvLsDQJac(realtype t, N_Vector y, N_Vector fy,
   function.  Finally, the actual computation of the jth column of
   the Jacobian is done with a call to N_VLinearSum.
   -----------------------------------------------------------------*/
-int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1)
 {
-  realtype fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
-  realtype *y_data, *ewt_data, *cns_data;
+  sunrealtype fnorm, minInc, inc, inc_inv, yjsaved, srur, conj;
+  sunrealtype *y_data, *ewt_data, *cns_data;
   N_Vector ftemp, jthCol;
   sunindextype j, N;
   CVLsMem cvls_mem;
@@ -1245,13 +1245,13 @@ int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
   a simple for loop to set each of the elements of a column in
   succession.
   -----------------------------------------------------------------*/
-int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+int cvLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
                   CVodeMem cv_mem, N_Vector tmp1, N_Vector tmp2)
 {
   N_Vector ftemp, ytemp;
-  realtype fnorm, minInc, inc, inc_inv, srur, conj;
-  realtype *col_j, *ewt_data, *fy_data, *ftemp_data;
-  realtype *y_data, *ytemp_data, *cns_data;
+  sunrealtype fnorm, minInc, inc, inc_inv, srur, conj;
+  sunrealtype *col_j, *ewt_data, *fy_data, *ftemp_data;
+  sunrealtype *y_data, *ytemp_data, *cns_data;
   sunindextype group, i, j, width, ngroups, i1, i2;
   sunindextype N, mupper, mlower;
   CVLsMem cvls_mem;
@@ -1349,13 +1349,13 @@ int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
   Jv = [f(y + v*sig) - f(y)]/sig, where sig = 1 / ||v||_WRMS,
   i.e. the WRMS norm of v*sig is 1.
   -----------------------------------------------------------------*/
-int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int cvLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                  N_Vector y, N_Vector fy, void *cvode_mem,
                  N_Vector work)
 {
   CVodeMem cv_mem;
   CVLsMem  cvls_mem;
-  realtype sig, siginv;
+  sunrealtype sig, siginv;
   int      iter, retval;
 
   /* access CVLsMem structure */
@@ -1397,8 +1397,8 @@ int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
 
   Setup the linear system A = I - gamma J
   -----------------------------------------------------------------*/
-static int cvLsLinSys(realtype t, N_Vector y, N_Vector fy, SUNMatrix A,
-                      booleantype jok, booleantype *jcur, realtype gamma,
+static int cvLsLinSys(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix A,
+                      sunbooleantype jok, sunbooleantype *jcur, sunrealtype gamma,
                       void *cvode_mem, N_Vector vtemp1, N_Vector vtemp2,
                       N_Vector vtemp3)
 {
@@ -1618,11 +1618,11 @@ int cvLsInitialize(CVodeMem cv_mem)
   This routine then calls the LS 'setup' routine with A.
   -----------------------------------------------------------------*/
 int cvLsSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-              N_Vector fpred, booleantype *jcurPtr,
+              N_Vector fpred, sunbooleantype *jcurPtr,
               N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3)
 {
   CVLsMem  cvls_mem;
-  realtype dgamma;
+  sunrealtype dgamma;
   int      retval;
 
   /* access CVLsMem structure */
@@ -1723,12 +1723,12 @@ int cvLsSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
               N_Vector ynow, N_Vector fnow)
 {
   CVLsMem  cvls_mem;
-  realtype bnorm = ZERO;
-  realtype deltar, delta, w_mean;
+  sunrealtype bnorm = ZERO;
+  sunrealtype deltar, delta, w_mean;
   int      curiter, nli_inc, retval;
-  booleantype do_sensi_sim, do_sensi_stg, do_sensi_stg1;
+  sunbooleantype do_sensi_sim, do_sensi_stg, do_sensi_stg1;
 #if SUNDIALS_LOGGING_LEVEL >= SUNDIALS_LOGGING_DEBUG
-  realtype resnorm;
+  sunrealtype resnorm;
   long int nps_inc;
 #endif
 
@@ -2168,7 +2168,7 @@ int CVodeSetJacFnBS(void *cvode_mem, int which, CVLsJacFnBS jacBS)
 }
 
 
-int CVodeSetEpsLinB(void *cvode_mem, int which, realtype eplifacB)
+int CVodeSetEpsLinB(void *cvode_mem, int which, sunrealtype eplifacB)
 {
   CVodeMem  cv_mem;
   CVadjMem  ca_mem;
@@ -2188,7 +2188,7 @@ int CVodeSetEpsLinB(void *cvode_mem, int which, realtype eplifacB)
 }
 
 
-int CVodeSetLSNormFactorB(void *cvode_mem, int which, realtype nrmfacB)
+int CVodeSetLSNormFactorB(void *cvode_mem, int which, sunrealtype nrmfacB)
 {
   CVodeMem  cv_mem;
   CVadjMem  ca_mem;
@@ -2209,7 +2209,7 @@ int CVodeSetLSNormFactorB(void *cvode_mem, int which, realtype nrmfacB)
 
 
 int CVodeSetLinearSolutionScalingB(void *cvode_mem, int which,
-                                   booleantype onoffB)
+                                   sunbooleantype onoffB)
 {
   CVodeMem  cv_mem;
   CVadjMem  ca_mem;
@@ -2433,7 +2433,7 @@ int CVodeSetLinSysFnBS(void *cvode_mem, int which, CVLsLinSysFnBS linsysBS)
 
 /* cvLsJacBWrapper interfaces to the CVLsJacFnB routine provided
    by the user. cvLsJacBWrapper is of type CVLsJacFn. */
-static int cvLsJacBWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsJacBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                            SUNMatrix JB, void *cvode_mem,
                            N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
@@ -2463,7 +2463,7 @@ static int cvLsJacBWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsJacBSWrapper interfaces to the CVLsJacFnBS routine provided
    by the user. cvLsJacBSWrapper is of type CVLsJacFn. */
-static int cvLsJacBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsJacBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                             SUNMatrix JB, void *cvode_mem,
                             N_Vector tmp1B, N_Vector tmp2B, N_Vector tmp3B)
 {
@@ -2497,9 +2497,9 @@ static int cvLsJacBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsPrecSetupBWrapper interfaces to the CVLsPrecSetupFnB
    routine provided by the user */
-static int cvLsPrecSetupBWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                                 booleantype jokB, booleantype *jcurPtrB,
-                                 realtype gammaB, void *cvode_mem)
+static int cvLsPrecSetupBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                                 sunbooleantype jokB, sunbooleantype *jcurPtrB,
+                                 sunrealtype gammaB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
   CVadjMem  ca_mem;
@@ -2527,9 +2527,9 @@ static int cvLsPrecSetupBWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsPrecSetupBSWrapper interfaces to the CVLsPrecSetupFnBS routine
    provided by the user */
-static int cvLsPrecSetupBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                                  booleantype jokB, booleantype *jcurPtrB,
-                                  realtype gammaB, void *cvode_mem)
+static int cvLsPrecSetupBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                                  sunbooleantype jokB, sunbooleantype *jcurPtrB,
+                                  sunrealtype gammaB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
   CVadjMem  ca_mem;
@@ -2562,9 +2562,9 @@ static int cvLsPrecSetupBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsPrecSolveBWrapper interfaces to the CVLsPrecSolveFnB routine
    provided by the user */
-static int cvLsPrecSolveBWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsPrecSolveBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                                  N_Vector rB, N_Vector zB,
-                                 realtype gammaB, realtype deltaB,
+                                 sunrealtype gammaB, sunrealtype deltaB,
                                  int lrB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
@@ -2594,9 +2594,9 @@ static int cvLsPrecSolveBWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsPrecSolveBSWrapper interfaces to the CVLsPrecSolveFnBS routine
    provided by the user */
-static int cvLsPrecSolveBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
+static int cvLsPrecSolveBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
                                   N_Vector rB, N_Vector zB,
-                                  realtype gammaB, realtype deltaB,
+                                  sunrealtype gammaB, sunrealtype deltaB,
                                   int lrB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
@@ -2630,7 +2630,7 @@ static int cvLsPrecSolveBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsJacTimesSetupBWrapper interfaces to the CVLsJacTimesSetupFnB
    routine provided by the user */
-static int cvLsJacTimesSetupBWrapper(realtype t, N_Vector yB,
+static int cvLsJacTimesSetupBWrapper(sunrealtype t, N_Vector yB,
                                      N_Vector fyB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
@@ -2660,7 +2660,7 @@ static int cvLsJacTimesSetupBWrapper(realtype t, N_Vector yB,
 
 /* cvLsJacTimesSetupBSWrapper interfaces to the CVLsJacTimesSetupFnBS
    routine provided by the user */
-static int cvLsJacTimesSetupBSWrapper(realtype t, N_Vector yB,
+static int cvLsJacTimesSetupBSWrapper(sunrealtype t, N_Vector yB,
                                       N_Vector fyB, void *cvode_mem)
 {
   CVodeMem  cv_mem;
@@ -2694,7 +2694,7 @@ static int cvLsJacTimesSetupBSWrapper(realtype t, N_Vector yB,
 
 /* cvLsJacTimesVecBWrapper interfaces to the CVLsJacTimesVecFnB routine
    provided by the user */
-static int cvLsJacTimesVecBWrapper(N_Vector vB, N_Vector JvB, realtype t,
+static int cvLsJacTimesVecBWrapper(N_Vector vB, N_Vector JvB, sunrealtype t,
                                    N_Vector yB, N_Vector fyB,
                                    void *cvode_mem, N_Vector tmpB)
 {
@@ -2725,7 +2725,7 @@ static int cvLsJacTimesVecBWrapper(N_Vector vB, N_Vector JvB, realtype t,
 
 /* cvLsJacTimesVecBSWrapper interfaces to the CVLsJacTimesVecFnBS
    routine provided by the user */
-static int cvLsJacTimesVecBSWrapper(N_Vector vB, N_Vector JvB, realtype t,
+static int cvLsJacTimesVecBSWrapper(N_Vector vB, N_Vector JvB, sunrealtype t,
                                     N_Vector yB, N_Vector fyB,
                                     void *cvode_mem, N_Vector tmpB)
 {
@@ -2760,9 +2760,9 @@ static int cvLsJacTimesVecBSWrapper(N_Vector vB, N_Vector JvB, realtype t,
 
 /* cvLsLinSysBWrapper interfaces to the CVLsLinSysFnB routine provided
    by the user. cvLsLinSysBWrapper is of type CVLsLinSysFn. */
-static int cvLsLinSysBWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                              SUNMatrix AB, booleantype jokB,
-                              booleantype *jcurB, realtype gammaB,
+static int cvLsLinSysBWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                              SUNMatrix AB, sunbooleantype jokB,
+                              sunbooleantype *jcurB, sunrealtype gammaB,
                               void *cvode_mem, N_Vector tmp1B, N_Vector tmp2B,
                               N_Vector tmp3B)
 {
@@ -2794,9 +2794,9 @@ static int cvLsLinSysBWrapper(realtype t, N_Vector yB, N_Vector fyB,
 
 /* cvLsLinSysBSWrapper interfaces to the CVLsLinSysFnBS routine provided
    by the user. cvLsLinSysBSWrapper is of type CVLsLinSysFn. */
-static int cvLsLinSysBSWrapper(realtype t, N_Vector yB, N_Vector fyB,
-                               SUNMatrix AB, booleantype jokB,
-                               booleantype *jcurB, realtype gammaB,
+static int cvLsLinSysBSWrapper(sunrealtype t, N_Vector yB, N_Vector fyB,
+                               SUNMatrix AB, sunbooleantype jokB,
+                               sunbooleantype *jcurB, sunrealtype gammaB,
                                void *cvode_mem, N_Vector tmp1B, N_Vector tmp2B,
                                N_Vector tmp3B)
 {
diff --git a/src/cvodes/cvodes_ls_impl.h b/src/cvodes/cvodes_ls_impl.h
index 2617f2d984..b7854ce2c2 100644
--- a/src/cvodes/cvodes_ls_impl.h
+++ b/src/cvodes/cvodes_ls_impl.h
@@ -38,8 +38,8 @@ extern "C" {
               tolerance on the linear iteration
   -----------------------------------------------------------------*/
 #define CVLS_MSBJ   51
-#define CVLS_DGMAX  RCONST(0.2)
-#define CVLS_EPLIN  RCONST(0.05)
+#define CVLS_DGMAX  SUN_RCONST(0.2)
+#define CVLS_EPLIN  SUN_RCONST(0.05)
 
 
 /*=================================================================
@@ -54,23 +54,23 @@ extern "C" {
 typedef struct CVLsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;   /* SUNTRUE if using internal DQ Jac approx.     */
+  sunbooleantype jacDQ;   /* SUNTRUE if using internal DQ Jac approx.     */
   CVLsJacFn jac;       /* Jacobian routine to be called                */
   void *J_data;        /* user data is passed to jac                   */
-  booleantype jbad;    /* heuristic suggestion for pset                */
-  realtype dgmax_jbad; /* if convfail = FAIL_BAD_J and the gamma ratio *
+  sunbooleantype jbad;    /* heuristic suggestion for pset                */
+  sunrealtype dgmax_jbad; /* if convfail = FAIL_BAD_J and the gamma ratio *
                         * |gamma/gammap-1| < dgmax_jbad then J is bad  */
 
   /* Matrix-based solver, scale solution to account for change in gamma */
-  booleantype scalesol;
+  sunbooleantype scalesol;
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor       */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor      */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor       */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor      */
 
   /* Linear solver, matrix and vector objects/pointers */
   SUNLinearSolver LS; /* generic linear solver object                 */
@@ -114,7 +114,7 @@ typedef struct CVLsMemRec {
    * (b) internal jtimes
    *     - jt_data == cvode_mem
    *     - jtimesDQ == SUNTRUE */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   CVLsJacTimesSetupFn jtsetup;
   CVLsJacTimesVecFn jtimes;
   CVRhsFn jt_f;
@@ -127,7 +127,7 @@ typedef struct CVLsMemRec {
    * (b) internal linsys function:
    *     - user_linsys = SUNFALSE
    *     - A_data      = cvode_mem */
-  booleantype user_linsys;
+  sunbooleantype user_linsys;
   CVLsLinSysFn linsys;
   void* A_data;
 
@@ -143,26 +143,26 @@ typedef struct CVLsMemRec {
 int cvLsATimes(void* cvode_mem, N_Vector v, N_Vector z);
 int cvLsPSetup(void* cvode_mem);
 int cvLsPSolve(void* cvode_mem, N_Vector r, N_Vector z,
-               realtype tol, int lr);
+               sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jac times vector */
-int cvLsDQJtimes(N_Vector v, N_Vector Jv, realtype t,
+int cvLsDQJtimes(N_Vector v, N_Vector Jv, sunrealtype t,
                  N_Vector y, N_Vector fy, void *data,
                  N_Vector work);
 
 /* Difference-quotient Jacobian approximation routines */
-int cvLsDQJac(realtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
+int cvLsDQJac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix Jac,
               void *data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-int cvLsDenseDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsDenseDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                    SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1);
-int cvLsBandDQJac(realtype t, N_Vector y, N_Vector fy,
+int cvLsBandDQJac(sunrealtype t, N_Vector y, N_Vector fy,
                   SUNMatrix Jac, CVodeMem cv_mem, N_Vector tmp1,
                   N_Vector tmp2);
 
 /* Generic linit/lsetup/lsolve/lfree interface routines for CVode to call */
 int cvLsInitialize(CVodeMem cv_mem);
 int cvLsSetup(CVodeMem cv_mem, int convfail, N_Vector ypred,
-              N_Vector fpred, booleantype *jcurPtr,
+              N_Vector fpred, sunbooleantype *jcurPtr,
               N_Vector vtemp1, N_Vector vtemp2, N_Vector vtemp3);
 int cvLsSolve(CVodeMem cv_mem, N_Vector b, N_Vector weight,
               N_Vector ycur, N_Vector fcur);
diff --git a/src/cvodes/cvodes_nls.c b/src/cvodes/cvodes_nls.c
index 59b4ffdce2..0b0c472e78 100644
--- a/src/cvodes/cvodes_nls.c
+++ b/src/cvodes/cvodes_nls.c
@@ -19,16 +19,16 @@
 #include "sundials/sundials_nvector_senswrapper.h"
 
 /* constant macros */
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 /* private functions */
 static int cvNlsResidual(N_Vector ycor, N_Vector res, void* cvode_mem);
 static int cvNlsFPFunction(N_Vector ycor, N_Vector res, void* cvode_mem);
 
-static int cvNlsLSetup(booleantype jbad, booleantype* jcur, void* cvode_mem);
+static int cvNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* cvode_mem);
 static int cvNlsLSolve(N_Vector delta, void* cvode_mem);
 static int cvNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                         realtype tol, N_Vector ewt, void* cvode_mem);
+                         sunrealtype tol, N_Vector ewt, void* cvode_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -155,10 +155,10 @@ int CVodeSetNlsRhsFn(void *cvode_mem, CVRhsFn f)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int CVodeGetNonlinearSystemData(void *cvode_mem, realtype *tcur,
+int CVodeGetNonlinearSystemData(void *cvode_mem, sunrealtype *tcur,
                                 N_Vector *ypred, N_Vector *yn,
-                                N_Vector *fn, realtype *gamma,
-                                realtype *rl1, N_Vector *zn1,
+                                N_Vector *fn, sunrealtype *gamma,
+                                sunrealtype *rl1, N_Vector *zn1,
                                 void **user_data)
 {
   CVodeMem cv_mem;
@@ -230,7 +230,7 @@ int cvNlsInit(CVodeMem cvode_mem)
 }
 
 
-static int cvNlsLSetup(booleantype jbad, booleantype* jcur, void* cvode_mem)
+static int cvNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int      retval;
@@ -289,12 +289,12 @@ static int cvNlsLSolve(N_Vector delta, void* cvode_mem)
 
 
 static int cvNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector delta,
-                         realtype tol, N_Vector ewt, void* cvode_mem)
+                         sunrealtype tol, N_Vector ewt, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int m, retval;
-  realtype del;
-  realtype dcon;
+  sunrealtype del;
+  sunrealtype dcon;
 
   if (cvode_mem == NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODE", "cvNlsConvTest", MSGCV_NO_MEM);
diff --git a/src/cvodes/cvodes_nls_sim.c b/src/cvodes/cvodes_nls_sim.c
index b965df0d8a..89d654522a 100644
--- a/src/cvodes/cvodes_nls_sim.c
+++ b/src/cvodes/cvodes_nls_sim.c
@@ -28,7 +28,7 @@
 #include "sundials/sundials_nvector_senswrapper.h"
 
 /* constant macros */
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 /* private functions */
 static int cvNlsResidualSensSim(N_Vector ycorSim, N_Vector resSim,
@@ -36,12 +36,12 @@ static int cvNlsResidualSensSim(N_Vector ycorSim, N_Vector resSim,
 static int cvNlsFPFunctionSensSim(N_Vector ycorSim, N_Vector resSim,
                                   void* cvode_mem);
 
-static int cvNlsLSetupSensSim(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensSim(sunbooleantype jbad, sunbooleantype* jcur,
                               void* cvode_mem);
 static int cvNlsLSolveSensSim(N_Vector deltaSim, void* cvode_mem);
 static int cvNlsConvTestSensSim(SUNNonlinearSolver NLS,
                                 N_Vector ycorSim, N_Vector delSim,
-                                realtype tol, N_Vector ewtSim, void* cvode_mem);
+                                sunrealtype tol, N_Vector ewtSim, void* cvode_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -206,9 +206,9 @@ int CVodeSetNonlinearSolverSensSim(void *cvode_mem, SUNNonlinearSolver NLS)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int CVodeGetNonlinearSystemDataSens(void *cvode_mem, realtype *tcur,
+int CVodeGetNonlinearSystemDataSens(void *cvode_mem, sunrealtype *tcur,
                                     N_Vector **ySpred, N_Vector **ySn,
-                                    realtype *gamma, realtype *rl1,
+                                    sunrealtype *gamma, sunrealtype *rl1,
                                     N_Vector **znS1, void **user_data)
 {
   CVodeMem cv_mem;
@@ -279,7 +279,7 @@ int cvNlsInitSensSim(CVodeMem cvode_mem)
 }
 
 
-static int cvNlsLSetupSensSim(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensSim(sunbooleantype jbad, sunbooleantype* jcur,
                               void* cvode_mem)
 {
   CVodeMem cv_mem;
@@ -362,12 +362,12 @@ static int cvNlsLSolveSensSim(N_Vector deltaSim, void* cvode_mem)
 
 static int cvNlsConvTestSensSim(SUNNonlinearSolver NLS,
                                 N_Vector ycorSim, N_Vector deltaSim,
-                                realtype tol, N_Vector ewtSim, void* cvode_mem)
+                                sunrealtype tol, N_Vector ewtSim, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int m, retval;
-  realtype del, delS, Del;
-  realtype dcon;
+  sunrealtype del, delS, Del;
+  sunrealtype dcon;
   N_Vector ycor, delta, ewt;
   N_Vector *deltaS, *ewtS;
 
@@ -442,7 +442,7 @@ static int cvNlsResidualSensSim(N_Vector ycorSim, N_Vector resSim, void* cvode_m
   int retval;
   N_Vector ycor, res;
   N_Vector *ycorS, *resS;
-  realtype cvals[3];
+  sunrealtype cvals[3];
   N_Vector* XXvecs[3];
 
   if (cvode_mem == NULL) {
diff --git a/src/cvodes/cvodes_nls_stg.c b/src/cvodes/cvodes_nls_stg.c
index 8f3d7bf471..ddc6e5be11 100644
--- a/src/cvodes/cvodes_nls_stg.c
+++ b/src/cvodes/cvodes_nls_stg.c
@@ -19,7 +19,7 @@
 #include "sundials/sundials_nvector_senswrapper.h"
 
 /* constant macros */
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 /* private functions */
 static int cvNlsResidualSensStg(N_Vector ycorStg, N_Vector resStg,
@@ -27,12 +27,12 @@ static int cvNlsResidualSensStg(N_Vector ycorStg, N_Vector resStg,
 static int cvNlsFPFunctionSensStg(N_Vector ycorStg, N_Vector resStg,
                                   void* cvode_mem);
 
-static int cvNlsLSetupSensStg(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensStg(sunbooleantype jbad, sunbooleantype* jcur,
                               void* cvode_mem);
 static int cvNlsLSolveSensStg(N_Vector deltaStg, void* cvode_mem);
 static int cvNlsConvTestSensStg(SUNNonlinearSolver NLS,
                                 N_Vector ycorStg, N_Vector delStg,
-                                realtype tol, N_Vector ewtStg, void* cvode_mem);
+                                sunrealtype tol, N_Vector ewtStg, void* cvode_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -224,7 +224,7 @@ int cvNlsInitSensStg(CVodeMem cvode_mem)
 }
 
 
-static int cvNlsLSetupSensStg(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensStg(sunbooleantype jbad, sunbooleantype* jcur,
                               void* cvode_mem)
 {
   CVodeMem cv_mem;
@@ -296,12 +296,12 @@ static int cvNlsLSolveSensStg(N_Vector deltaStg, void* cvode_mem)
 
 static int cvNlsConvTestSensStg(SUNNonlinearSolver NLS,
                                 N_Vector ycorStg, N_Vector deltaStg,
-                                realtype tol, N_Vector ewtStg, void* cvode_mem)
+                                sunrealtype tol, N_Vector ewtStg, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int m, retval;
-  realtype Del;
-  realtype dcon;
+  sunrealtype Del;
+  sunrealtype dcon;
   N_Vector *ycorS, *deltaS, *ewtS;
 
   if (cvode_mem == NULL) {
@@ -365,7 +365,7 @@ static int cvNlsResidualSensStg(N_Vector ycorStg, N_Vector resStg, void* cvode_m
   CVodeMem cv_mem;
   int retval;
   N_Vector *ycorS, *resS;
-  realtype cvals[3];
+  sunrealtype cvals[3];
   N_Vector* XXvecs[3];
 
   if (cvode_mem == NULL) {
diff --git a/src/cvodes/cvodes_nls_stg1.c b/src/cvodes/cvodes_nls_stg1.c
index 5f00a00f99..e230119d5f 100644
--- a/src/cvodes/cvodes_nls_stg1.c
+++ b/src/cvodes/cvodes_nls_stg1.c
@@ -18,7 +18,7 @@
 #include "sundials/sundials_math.h"
 
 /* constant macros */
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 /* private functions */
 static int cvNlsResidualSensStg1(N_Vector ycor, N_Vector res,
@@ -26,12 +26,12 @@ static int cvNlsResidualSensStg1(N_Vector ycor, N_Vector res,
 static int cvNlsFPFunctionSensStg1(N_Vector ycor, N_Vector res,
                                    void* cvode_mem);
 
-static int cvNlsLSetupSensStg1(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensStg1(sunbooleantype jbad, sunbooleantype* jcur,
                                void* cvode_mem);
 static int cvNlsLSolveSensStg1(N_Vector delta, void* cvode_mem);
 static int cvNlsConvTestSensStg1(SUNNonlinearSolver NLS,
                                  N_Vector ycor, N_Vector del,
-                                 realtype tol, N_Vector ewt, void* cvode_mem);
+                                 sunrealtype tol, N_Vector ewt, void* cvode_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -189,7 +189,7 @@ int cvNlsInitSensStg1(CVodeMem cvode_mem)
 }
 
 
-static int cvNlsLSetupSensStg1(booleantype jbad, booleantype* jcur,
+static int cvNlsLSetupSensStg1(sunbooleantype jbad, sunbooleantype* jcur,
                                void* cvode_mem)
 {
   CVodeMem cv_mem;
@@ -258,12 +258,12 @@ static int cvNlsLSolveSensStg1(N_Vector delta, void* cvode_mem)
 
 static int cvNlsConvTestSensStg1(SUNNonlinearSolver NLS,
                                  N_Vector ycor, N_Vector delta,
-                                 realtype tol, N_Vector ewt, void* cvode_mem)
+                                 sunrealtype tol, N_Vector ewt, void* cvode_mem)
 {
   CVodeMem cv_mem;
   int m, retval;
-  realtype del;
-  realtype dcon;
+  sunrealtype del;
+  sunrealtype dcon;
 
   if (cvode_mem == NULL) {
     cvProcessError(NULL, CV_MEM_NULL, "CVODES",
diff --git a/src/cvodes/cvodes_proj.c b/src/cvodes/cvodes_proj.c
index b55310c3d4..c7f51ba4f4 100644
--- a/src/cvodes/cvodes_proj.c
+++ b/src/cvodes/cvodes_proj.c
@@ -23,10 +23,10 @@
 #include "cvodes_impl.h"
 
 /* Private constants */
-#define ZERO  RCONST(0.0)  /* real 0.0 */
-#define ONE   RCONST(1.0)  /* real 1.0 */
+#define ZERO  SUN_RCONST(0.0)  /* real 0.0 */
+#define ONE   SUN_RCONST(1.0)  /* real 1.0 */
 
-#define ONEPSM RCONST(1.000001)
+#define ONEPSM SUN_RCONST(1.000001)
 
 /* Private utility function prototypes */
 static int cvProjCreate(CVodeProjMem *proj_mem);
@@ -103,7 +103,7 @@ int CVodeSetProjFn(void *cvode_mem, CVProjFn pfun)
  * ===========================================================================*/
 
 
-int CVodeSetProjErrEst(void *cvode_mem, booleantype onoff)
+int CVodeSetProjErrEst(void *cvode_mem, sunbooleantype onoff)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -183,7 +183,7 @@ int CVodeSetMaxNumProjFails(void *cvode_mem, int max_fails)
 }
 
 
-int CVodeSetEpsProj(void *cvode_mem, realtype eps)
+int CVodeSetEpsProj(void *cvode_mem, sunrealtype eps)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -210,7 +210,7 @@ int CVodeSetEpsProj(void *cvode_mem, realtype eps)
 }
 
 
-int CVodeSetProjFailEta(void *cvode_mem, realtype eta)
+int CVodeSetProjFailEta(void *cvode_mem, sunrealtype eta)
 {
   int          retval;
   CVodeMem     cv_mem;
@@ -292,7 +292,7 @@ int CVodeGetNumProjFails(void *cvode_mem, long int *npfails)
  * until it is potentially used in cvCompleteStep).
  */
 
-int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, realtype saved_t,
+int cvDoProjection(CVodeMem cv_mem, int *nflagPtr, sunrealtype saved_t,
                    int *npfailPtr)
 {
   int          retval;
diff --git a/src/cvodes/cvodes_proj_impl.h b/src/cvodes/cvodes_proj_impl.h
index 6debbd5f7f..dbe75ee684 100644
--- a/src/cvodes/cvodes_proj_impl.h
+++ b/src/cvodes/cvodes_proj_impl.h
@@ -34,8 +34,8 @@ extern "C" {
  * ===========================================================================*/
 
 #define PROJ_MAX_FAILS 10
-#define PROJ_EPS       RCONST(0.1)
-#define PROJ_FAIL_ETA  RCONST(0.25)
+#define PROJ_EPS       SUN_RCONST(0.1)
+#define PROJ_FAIL_ETA  SUN_RCONST(0.25)
 
 /* =============================================================================
  * Projection Data Structure
@@ -49,9 +49,9 @@ extern "C" {
  * ---------------------------------------------------------------------------*/
 typedef struct CVodeProjMemRec {
 
-  booleantype internal_proj;  /* use the internal projection algorithm?      */
-  booleantype err_proj;       /* is error projection enabled?                */
-  booleantype first_proj;     /* is this the first time we project?          */
+  sunbooleantype internal_proj;  /* use the internal projection algorithm?      */
+  sunbooleantype err_proj;       /* is error projection enabled?                */
+  sunbooleantype first_proj;     /* is this the first time we project?          */
 
   long int freq;              /* projection frequency                        */
   long int nstlprj;           /* step number of last projection              */
@@ -60,8 +60,8 @@ typedef struct CVodeProjMemRec {
 
   CVProjFn pfun;              /* function to perform projection              */
 
-  realtype eps_proj;          /* projection solve tolerance                  */
-  realtype eta_pfail;         /* projection failure step reduction factor    */
+  sunrealtype eps_proj;          /* projection solve tolerance                  */
+  sunrealtype eta_pfail;         /* projection failure step reduction factor    */
 
   long int nproj;             /* number of projections performed             */
   long int npfails;           /* number of projection failures               */
diff --git a/src/cvodes/fmod/fcvodes_mod.c b/src/cvodes/fmod/fcvodes_mod.c
index 7c5b85e0af..2011945585 100644
--- a/src/cvodes/fmod/fcvodes_mod.c
+++ b/src/cvodes/fmod/fcvodes_mod.c
@@ -330,13 +330,13 @@ SWIGEXPORT int _wrap_FCVodeInit(void *farg1, CVRhsFn farg2, double const *farg3,
   int fresult ;
   void *arg1 = (void *) 0 ;
   CVRhsFn arg2 = (CVRhsFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (CVRhsFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -347,12 +347,12 @@ SWIGEXPORT int _wrap_FCVodeInit(void *farg1, CVRhsFn farg2, double const *farg3,
 SWIGEXPORT int _wrap_FCVodeReInit(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeReInit(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -363,13 +363,13 @@ SWIGEXPORT int _wrap_FCVodeReInit(void *farg1, double const *farg2, N_Vector far
 SWIGEXPORT int _wrap_FCVodeSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -379,12 +379,12 @@ SWIGEXPORT int _wrap_FCVodeSStolerances(void *farg1, double const *farg2, double
 SWIGEXPORT int _wrap_FCVodeSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -423,11 +423,11 @@ SWIGEXPORT int _wrap_FCVodeSetConstraints(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxLSetup(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetDeltaGammaMaxLSetup(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -467,11 +467,11 @@ SWIGEXPORT int _wrap_FCVodeSetErrHandlerFn(void *farg1, CVErrHandlerFn farg2, vo
 SWIGEXPORT int _wrap_FCVodeSetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -579,11 +579,11 @@ SWIGEXPORT int _wrap_FCVodeSetMaxOrd(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -593,11 +593,11 @@ SWIGEXPORT int _wrap_FCVodeSetMaxStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -649,11 +649,11 @@ SWIGEXPORT int _wrap_FCVodeSetNlsRhsFn(void *farg1, CVRhsFn farg2) {
 SWIGEXPORT int _wrap_FCVodeSetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -691,11 +691,11 @@ SWIGEXPORT int _wrap_FCVodeSetStabLimDet(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -745,13 +745,13 @@ SWIGEXPORT int _wrap_FCVodeSetUserData(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetEtaFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -761,11 +761,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaFixedStepBounds(void *farg1, double const *farg
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxFirstStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxFirstStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -775,11 +775,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMaxFirstStep(void *farg1, double const *farg2)
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxEarlyStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxEarlyStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -803,11 +803,11 @@ SWIGEXPORT int _wrap_FCVodeSetNumStepsEtaMaxEarlyStep(void *farg1, long const *f
 SWIGEXPORT int _wrap_FCVodeSetEtaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -817,11 +817,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMax(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -831,11 +831,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMinErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMinErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -845,11 +845,11 @@ SWIGEXPORT int _wrap_FCVodeSetEtaMinErrFail(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetEtaMaxErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaMaxErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -873,11 +873,11 @@ SWIGEXPORT int _wrap_FCVodeSetNumFailsEtaMaxErrFail(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FCVodeSetEtaConvFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEtaConvFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -929,16 +929,16 @@ SWIGEXPORT int _wrap_FCVodeSetNoInactiveRootWarn(void *farg1) {
 SWIGEXPORT int _wrap_FCVode(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   result = (int)CVode(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -999,13 +999,13 @@ SWIGEXPORT int _wrap_FCVodeComputeStateSens1(void *farg1, int const *farg2, N_Ve
 SWIGEXPORT int _wrap_FCVodeGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetDky(arg1,arg2,arg3,arg4);
@@ -1117,11 +1117,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentOrder(void *farg1, int *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentGamma(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentGamma(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1145,11 +1145,11 @@ SWIGEXPORT int _wrap_FCVodeGetNumStabLimOrderReds(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1159,11 +1159,11 @@ SWIGEXPORT int _wrap_FCVodeGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1173,11 +1173,11 @@ SWIGEXPORT int _wrap_FCVodeGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1229,11 +1229,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentSensSolveIndex(void *farg1, int *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1243,11 +1243,11 @@ SWIGEXPORT int _wrap_FCVodeGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)CVodeGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1319,10 +1319,10 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
   long *arg5 = (long *) 0 ;
   int *arg6 = (int *) 0 ;
   int *arg7 = (int *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
-  realtype *arg9 = (realtype *) 0 ;
-  realtype *arg10 = (realtype *) 0 ;
-  realtype *arg11 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
+  sunrealtype *arg9 = (sunrealtype *) 0 ;
+  sunrealtype *arg10 = (sunrealtype *) 0 ;
+  sunrealtype *arg11 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -1332,10 +1332,10 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
   arg5 = (long *)(farg5);
   arg6 = (int *)(farg6);
   arg7 = (int *)(farg7);
-  arg8 = (realtype *)(farg8);
-  arg9 = (realtype *)(farg9);
-  arg10 = (realtype *)(farg10);
-  arg11 = (realtype *)(farg11);
+  arg8 = (sunrealtype *)(farg8);
+  arg9 = (sunrealtype *)(farg9);
+  arg10 = (sunrealtype *)(farg10);
+  arg11 = (sunrealtype *)(farg11);
   result = (int)CVodeGetIntegratorStats(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
   fresult = (int)(result);
   return fresult;
@@ -1345,23 +1345,23 @@ SWIGEXPORT int _wrap_FCVodeGetIntegratorStats(void *farg1, long *farg2, long *fa
 SWIGEXPORT int _wrap_FCVodeGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, double *farg6, double *farg7, void *farg8, void *farg9) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
-  realtype *arg7 = (realtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
+  sunrealtype *arg7 = (sunrealtype *) 0 ;
   N_Vector *arg8 = (N_Vector *) 0 ;
   void **arg9 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
-  arg6 = (realtype *)(farg6);
-  arg7 = (realtype *)(farg7);
+  arg6 = (sunrealtype *)(farg6);
+  arg7 = (sunrealtype *)(farg7);
   arg8 = (N_Vector *)(farg8);
   arg9 = (void **)(farg9);
   result = (int)CVodeGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -1373,21 +1373,21 @@ SWIGEXPORT int _wrap_FCVodeGetNonlinearSystemData(void *farg1, double *farg2, vo
 SWIGEXPORT int _wrap_FCVodeGetNonlinearSystemDataSens(void *farg1, double *farg2, void *farg3, void *farg4, double *farg5, double *farg6, void *farg7, void *farg8) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector **arg3 = (N_Vector **) 0 ;
   N_Vector **arg4 = (N_Vector **) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   N_Vector **arg7 = (N_Vector **) 0 ;
   void **arg8 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector **)(farg3);
   arg4 = (N_Vector **)(farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
   arg7 = (N_Vector **)(farg7);
   arg8 = (void **)(farg8);
   result = (int)CVodeGetNonlinearSystemDataSens(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
@@ -1552,13 +1552,13 @@ SWIGEXPORT int _wrap_FCVodeQuadReInit(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FCVodeQuadSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeQuadSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1568,12 +1568,12 @@ SWIGEXPORT int _wrap_FCVodeQuadSStolerances(void *farg1, double const *farg2, do
 SWIGEXPORT int _wrap_FCVodeQuadSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeQuadSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1598,12 +1598,12 @@ SWIGEXPORT int _wrap_FCVodeSetQuadErrCon(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetQuad(void *farg1, double *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeGetQuad(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1614,13 +1614,13 @@ SWIGEXPORT int _wrap_FCVodeGetQuad(void *farg1, double *farg2, N_Vector farg3) {
 SWIGEXPORT int _wrap_FCVodeGetQuadDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetQuadDky(arg1,arg2,arg3,arg4);
@@ -1754,13 +1754,13 @@ SWIGEXPORT int _wrap_FCVodeSensReInit(void *farg1, int const *farg2, void *farg3
 SWIGEXPORT int _wrap_FCVodeSensSStolerances(void *farg1, double const *farg2, double *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)CVodeSensSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1770,12 +1770,12 @@ SWIGEXPORT int _wrap_FCVodeSensSStolerances(void *farg1, double const *farg2, do
 SWIGEXPORT int _wrap_FCVodeSensSVtolerances(void *farg1, double const *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)CVodeSensSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1799,12 +1799,12 @@ SWIGEXPORT int _wrap_FCVodeSetSensDQMethod(void *farg1, int const *farg2, double
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetSensDQMethod(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1842,14 +1842,14 @@ SWIGEXPORT int _wrap_FCVodeSetSensMaxNonlinIters(void *farg1, int const *farg2)
 SWIGEXPORT int _wrap_FCVodeSetSensParams(void *farg1, double *farg2, double *farg3, int *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int *arg4 = (int *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype *)(farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (int *)(farg4);
   result = (int)CVodeSetSensParams(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -1914,12 +1914,12 @@ SWIGEXPORT int _wrap_FCVodeSensToggleOff(void *farg1) {
 SWIGEXPORT int _wrap_FCVodeGetSens(void *farg1, double *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)CVodeGetSens(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1930,13 +1930,13 @@ SWIGEXPORT int _wrap_FCVodeGetSens(void *farg1, double *farg2, void *farg3) {
 SWIGEXPORT int _wrap_FCVodeGetSens1(void *farg1, double *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetSens1(arg1,arg2,arg3,arg4);
@@ -1948,13 +1948,13 @@ SWIGEXPORT int _wrap_FCVodeGetSens1(void *farg1, double *farg2, int const *farg3
 SWIGEXPORT int _wrap_FCVodeGetSensDky(void *farg1, double const *farg2, int const *farg3, void *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)CVodeGetSensDky(arg1,arg2,arg3,arg4);
@@ -1966,14 +1966,14 @@ SWIGEXPORT int _wrap_FCVodeGetSensDky(void *farg1, double const *farg2, int cons
 SWIGEXPORT int _wrap_FCVodeGetSensDky1(void *farg1, double const *farg2, int const *farg3, int const *farg4, N_Vector farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
   arg5 = (N_Vector)(farg5);
@@ -2230,13 +2230,13 @@ SWIGEXPORT int _wrap_FCVodeQuadSensReInit(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FCVodeQuadSensSStolerances(void *farg1, double const *farg2, double *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)CVodeQuadSensSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2246,12 +2246,12 @@ SWIGEXPORT int _wrap_FCVodeQuadSensSStolerances(void *farg1, double const *farg2
 SWIGEXPORT int _wrap_FCVodeQuadSensSVtolerances(void *farg1, double const *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)CVodeQuadSensSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2288,12 +2288,12 @@ SWIGEXPORT int _wrap_FCVodeSetQuadSensErrCon(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetQuadSens(void *farg1, double *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)CVodeGetQuadSens(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2304,13 +2304,13 @@ SWIGEXPORT int _wrap_FCVodeGetQuadSens(void *farg1, double *farg2, void *farg3)
 SWIGEXPORT int _wrap_FCVodeGetQuadSens1(void *farg1, double *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetQuadSens1(arg1,arg2,arg3,arg4);
@@ -2322,13 +2322,13 @@ SWIGEXPORT int _wrap_FCVodeGetQuadSens1(void *farg1, double *farg2, int const *f
 SWIGEXPORT int _wrap_FCVodeGetQuadSensDky(void *farg1, double const *farg2, int const *farg3, void *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)CVodeGetQuadSensDky(arg1,arg2,arg3,arg4);
@@ -2340,14 +2340,14 @@ SWIGEXPORT int _wrap_FCVodeGetQuadSensDky(void *farg1, double const *farg2, int
 SWIGEXPORT int _wrap_FCVodeGetQuadSensDky1(void *farg1, double const *farg2, int const *farg3, int const *farg4, N_Vector farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
   arg5 = (N_Vector)(farg5);
@@ -2480,14 +2480,14 @@ SWIGEXPORT int _wrap_FCVodeInitB(void *farg1, int const *farg2, CVRhsFnB farg3,
   void *arg1 = (void *) 0 ;
   int arg2 ;
   CVRhsFnB arg3 = (CVRhsFnB) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (CVRhsFnB)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)CVodeInitB(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -2500,14 +2500,14 @@ SWIGEXPORT int _wrap_FCVodeInitBS(void *farg1, int const *farg2, CVRhsFnBS farg3
   void *arg1 = (void *) 0 ;
   int arg2 ;
   CVRhsFnBS arg3 = (CVRhsFnBS) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (CVRhsFnBS)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)CVodeInitBS(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
@@ -2519,13 +2519,13 @@ SWIGEXPORT int _wrap_FCVodeReInitB(void *farg1, int const *farg2, double const *
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeReInitB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2537,14 +2537,14 @@ SWIGEXPORT int _wrap_FCVodeSStolerancesB(void *farg1, int const *farg2, double c
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)CVodeSStolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -2555,13 +2555,13 @@ SWIGEXPORT int _wrap_FCVodeSVtolerancesB(void *farg1, int const *farg2, double c
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeSVtolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2625,14 +2625,14 @@ SWIGEXPORT int _wrap_FCVodeQuadSStolerancesB(void *farg1, int const *farg2, doub
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)CVodeQuadSStolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -2643,13 +2643,13 @@ SWIGEXPORT int _wrap_FCVodeQuadSVtolerancesB(void *farg1, int const *farg2, doub
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeQuadSVtolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2660,17 +2660,17 @@ SWIGEXPORT int _wrap_FCVodeQuadSVtolerancesB(void *farg1, int const *farg2, doub
 SWIGEXPORT int _wrap_FCVodeF(void *farg1, double const *farg2, N_Vector farg3, double *farg4, int const *farg5, int *farg6) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int arg5 ;
   int *arg6 = (int *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (int)(*farg5);
   arg6 = (int *)(farg6);
   result = (int)CVodeF(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -2682,12 +2682,12 @@ SWIGEXPORT int _wrap_FCVodeF(void *farg1, double const *farg2, N_Vector farg3, d
 SWIGEXPORT int _wrap_FCVodeB(void *farg1, double const *farg2, int const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   result = (int)CVodeB(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2775,12 +2775,12 @@ SWIGEXPORT int _wrap_FCVodeSetInitStepB(void *farg1, int const *farg2, double co
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetInitStepB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2791,12 +2791,12 @@ SWIGEXPORT int _wrap_FCVodeSetMinStepB(void *farg1, int const *farg2, double con
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetMinStepB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2807,12 +2807,12 @@ SWIGEXPORT int _wrap_FCVodeSetMaxStepB(void *farg1, int const *farg2, double con
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetMaxStepB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2871,13 +2871,13 @@ SWIGEXPORT int _wrap_FCVodeGetB(void *farg1, int const *farg2, double *farg3, N_
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2889,13 +2889,13 @@ SWIGEXPORT int _wrap_FCVodeGetQuadB(void *farg1, int const *farg2, double *farg3
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)CVodeGetQuadB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2920,12 +2920,12 @@ SWIGEXPORT void * _wrap_FCVodeGetAdjCVodeBmem(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FCVodeGetAdjY(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)CVodeGetAdjY(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2983,11 +2983,11 @@ SWIGEXPORT void * _wrap_CVadjCheckPointRec_next_addr_get(SwigClassWrapper const
 
 SWIGEXPORT void _wrap_CVadjCheckPointRec_t0_set(SwigClassWrapper const *farg1, double const *farg2) {
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::t0", return );
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->t0 = arg2;
 }
 
@@ -2995,23 +2995,23 @@ SWIGEXPORT void _wrap_CVadjCheckPointRec_t0_set(SwigClassWrapper const *farg1, d
 SWIGEXPORT double _wrap_CVadjCheckPointRec_t0_get(SwigClassWrapper const *farg1) {
   double fresult ;
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::t0", return 0);
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->t0);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->t0);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_CVadjCheckPointRec_t1_set(SwigClassWrapper const *farg1, double const *farg2) {
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::t1", return );
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->t1 = arg2;
 }
 
@@ -3019,12 +3019,12 @@ SWIGEXPORT void _wrap_CVadjCheckPointRec_t1_set(SwigClassWrapper const *farg1, d
 SWIGEXPORT double _wrap_CVadjCheckPointRec_t1_get(SwigClassWrapper const *farg1) {
   double fresult ;
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::t1", return 0);
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->t1);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->t1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -3079,11 +3079,11 @@ SWIGEXPORT int _wrap_CVadjCheckPointRec_order_get(SwigClassWrapper const *farg1)
 
 SWIGEXPORT void _wrap_CVadjCheckPointRec_step_set(SwigClassWrapper const *farg1, double const *farg2) {
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::step", return );
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->step = arg2;
 }
 
@@ -3091,12 +3091,12 @@ SWIGEXPORT void _wrap_CVadjCheckPointRec_step_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double _wrap_CVadjCheckPointRec_step_get(SwigClassWrapper const *farg1) {
   double fresult ;
   CVadjCheckPointRec *arg1 = (CVadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "CVadjCheckPointRec *", "CVadjCheckPointRec", "CVadjCheckPointRec::step", return 0);
   arg1 = (CVadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->step);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->step);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -3167,14 +3167,14 @@ SWIGEXPORT int _wrap_FCVodeGetAdjDataPointHermite(void *farg1, int const *farg2,
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)CVodeGetAdjDataPointHermite(arg1,arg2,arg3,arg4,arg5);
@@ -3187,14 +3187,14 @@ SWIGEXPORT int _wrap_FCVodeGetAdjDataPointPolynomial(void *farg1, int const *far
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int *arg4 = (int *) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (int *)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)CVodeGetAdjDataPointPolynomial(arg1,arg2,arg3,arg4,arg5);
@@ -3293,7 +3293,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInit(void *farg1, int64_t const *farg2, int64_t c
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   CVLocalFn arg8 = (CVLocalFn) 0 ;
   CVCommFn arg9 = (CVCommFn) 0 ;
   int result;
@@ -3304,7 +3304,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInit(void *farg1, int64_t const *farg2, int64_t c
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (CVLocalFn)(farg8);
   arg9 = (CVCommFn)(farg9);
   result = (int)CVBBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -3318,13 +3318,13 @@ SWIGEXPORT int _wrap_FCVBBDPrecReInit(void *farg1, int64_t const *farg2, int64_t
   void *arg1 = (void *) 0 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)CVBBDPrecReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -3370,7 +3370,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInitB(void *farg1, int const *farg2, int64_t cons
   sunindextype arg5 ;
   sunindextype arg6 ;
   sunindextype arg7 ;
-  realtype arg8 ;
+  sunrealtype arg8 ;
   CVLocalFnB arg9 = (CVLocalFnB) 0 ;
   CVCommFnB arg10 = (CVCommFnB) 0 ;
   int result;
@@ -3382,7 +3382,7 @@ SWIGEXPORT int _wrap_FCVBBDPrecInitB(void *farg1, int const *farg2, int64_t cons
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
   arg7 = (sunindextype)(*farg7);
-  arg8 = (realtype)(*farg8);
+  arg8 = (sunrealtype)(*farg8);
   arg9 = (CVLocalFnB)(farg9);
   arg10 = (CVCommFnB)(farg10);
   result = (int)CVBBDPrecInitB(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
@@ -3397,14 +3397,14 @@ SWIGEXPORT int _wrap_FCVBBDPrecReInitB(void *farg1, int const *farg2, int64_t co
   int arg2 ;
   sunindextype arg3 ;
   sunindextype arg4 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (sunindextype)(*farg3);
   arg4 = (sunindextype)(*farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)CVBBDPrecReInitB(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -3555,11 +3555,11 @@ SWIGEXPORT int _wrap_FCVodeSetLinearSolutionScaling(void *farg1, int const *farg
 SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxBadJac(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetDeltaGammaMaxBadJac(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3569,11 +3569,11 @@ SWIGEXPORT int _wrap_FCVodeSetDeltaGammaMaxBadJac(void *farg1, double const *far
 SWIGEXPORT int _wrap_FCVodeSetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3583,11 +3583,11 @@ SWIGEXPORT int _wrap_FCVodeSetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FCVodeSetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)CVodeSetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3919,12 +3919,12 @@ SWIGEXPORT int _wrap_FCVodeSetEpsLinB(void *farg1, int const *farg2, double cons
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetEpsLinB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -3935,12 +3935,12 @@ SWIGEXPORT int _wrap_FCVodeSetLSNormFactorB(void *farg1, int const *farg2, doubl
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)CVodeSetLSNormFactorB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
diff --git a/src/cvodes/fmod/fcvodes_mod.f90 b/src/cvodes/fmod/fcvodes_mod.f90
index 505ed54f8a..d34ac805dd 100644
--- a/src/cvodes/fmod/fcvodes_mod.f90
+++ b/src/cvodes/fmod/fcvodes_mod.f90
@@ -6722,13 +6722,13 @@ function FCVodeGetJacTime(cvode_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: cvode_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = cvode_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FCVodeGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/ida/fmod/fida_mod.c b/src/ida/fmod/fida_mod.c
index 4712e19298..a9fb0ea73c 100644
--- a/src/ida/fmod/fida_mod.c
+++ b/src/ida/fmod/fida_mod.c
@@ -251,14 +251,14 @@ SWIGEXPORT int _wrap_FIDAInit(void *farg1, IDAResFn farg2, double const *farg3,
   int fresult ;
   void *arg1 = (void *) 0 ;
   IDAResFn arg2 = (IDAResFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (IDAResFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAInit(arg1,arg2,arg3,arg4,arg5);
@@ -270,13 +270,13 @@ SWIGEXPORT int _wrap_FIDAInit(void *farg1, IDAResFn farg2, double const *farg3,
 SWIGEXPORT int _wrap_FIDAReInit(void *farg1, double const *farg2, N_Vector farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAReInit(arg1,arg2,arg3,arg4);
@@ -288,13 +288,13 @@ SWIGEXPORT int _wrap_FIDAReInit(void *farg1, double const *farg2, N_Vector farg3
 SWIGEXPORT int _wrap_FIDASStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -304,12 +304,12 @@ SWIGEXPORT int _wrap_FIDASStolerances(void *farg1, double const *farg2, double c
 SWIGEXPORT int _wrap_FIDASVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)IDASVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -335,12 +335,12 @@ SWIGEXPORT int _wrap_FIDACalcIC(void *farg1, int const *farg2, double const *far
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDACalcIC(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -350,11 +350,11 @@ SWIGEXPORT int _wrap_FIDACalcIC(void *farg1, int const *farg2, double const *far
 SWIGEXPORT int _wrap_FIDASetNonlinConvCoefIC(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetNonlinConvCoefIC(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -420,11 +420,11 @@ SWIGEXPORT int _wrap_FIDASetLineSearchOffIC(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDASetStepToleranceIC(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetStepToleranceIC(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -448,11 +448,11 @@ SWIGEXPORT int _wrap_FIDASetMaxBacksIC(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDASetDeltaCjLSetup(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetDeltaCjLSetup(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -534,11 +534,11 @@ SWIGEXPORT int _wrap_FIDASetMaxNumSteps(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FIDASetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -548,11 +548,11 @@ SWIGEXPORT int _wrap_FIDASetInitStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -562,11 +562,11 @@ SWIGEXPORT int _wrap_FIDASetMaxStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -576,11 +576,11 @@ SWIGEXPORT int _wrap_FIDASetMinStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -658,13 +658,13 @@ SWIGEXPORT int _wrap_FIDASetConstraints(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetEtaFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -674,11 +674,11 @@ SWIGEXPORT int _wrap_FIDASetEtaFixedStepBounds(void *farg1, double const *farg2,
 SWIGEXPORT int _wrap_FIDASetEtaMin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -688,11 +688,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -702,11 +702,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMax(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaLow(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaLow(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -716,11 +716,11 @@ SWIGEXPORT int _wrap_FIDASetEtaLow(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaMinErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMinErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -730,11 +730,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMinErrFail(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaConvFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaConvFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -786,11 +786,11 @@ SWIGEXPORT int _wrap_FIDASetNlsResFn(void *farg1, IDAResFn farg2) {
 SWIGEXPORT int _wrap_FIDASetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -856,16 +856,16 @@ SWIGEXPORT int _wrap_FIDASetNoInactiveRootWarn(void *farg1) {
 SWIGEXPORT int _wrap_FIDASolve(void *farg1, double const *farg2, double *farg3, N_Vector farg4, N_Vector farg5, int const *farg6) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int arg6 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (int)(*farg6);
@@ -910,13 +910,13 @@ SWIGEXPORT int _wrap_FIDAComputeYp(void *farg1, N_Vector farg2, N_Vector farg3)
 SWIGEXPORT int _wrap_FIDAGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetDky(arg1,arg2,arg3,arg4);
@@ -1058,11 +1058,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentOrder(void *farg1, int *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentCj(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentCj(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1100,11 +1100,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentYp(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FIDAGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1114,11 +1114,11 @@ SWIGEXPORT int _wrap_FIDAGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1128,11 +1128,11 @@ SWIGEXPORT int _wrap_FIDAGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1142,11 +1142,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1156,11 +1156,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1232,10 +1232,10 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
   long *arg5 = (long *) 0 ;
   int *arg6 = (int *) 0 ;
   int *arg7 = (int *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
-  realtype *arg9 = (realtype *) 0 ;
-  realtype *arg10 = (realtype *) 0 ;
-  realtype *arg11 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
+  sunrealtype *arg9 = (sunrealtype *) 0 ;
+  sunrealtype *arg10 = (sunrealtype *) 0 ;
+  sunrealtype *arg11 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -1245,10 +1245,10 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
   arg5 = (long *)(farg5);
   arg6 = (int *)(farg6);
   arg7 = (int *)(farg7);
-  arg8 = (realtype *)(farg8);
-  arg9 = (realtype *)(farg9);
-  arg10 = (realtype *)(farg10);
-  arg11 = (realtype *)(farg11);
+  arg8 = (sunrealtype *)(farg8);
+  arg9 = (sunrealtype *)(farg9);
+  arg10 = (sunrealtype *)(farg10);
+  arg11 = (sunrealtype *)(farg11);
   result = (int)IDAGetIntegratorStats(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
   fresult = (int)(result);
   return fresult;
@@ -1258,24 +1258,24 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
 SWIGEXPORT int _wrap_FIDAGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, void *farg6, void *farg7, double *farg8, void *farg9) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   N_Vector *arg7 = (N_Vector *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
   void **arg9 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   arg7 = (N_Vector *)(farg7);
-  arg8 = (realtype *)(farg8);
+  arg8 = (sunrealtype *)(farg8);
   arg9 = (void **)(farg9);
   result = (int)IDAGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
   fresult = (int)(result);
@@ -1414,7 +1414,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   IDABBDLocalFn arg8 = (IDABBDLocalFn) 0 ;
   IDABBDCommFn arg9 = (IDABBDCommFn) 0 ;
   int result;
@@ -1425,7 +1425,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (IDABBDLocalFn)(farg8);
   arg9 = (IDABBDCommFn)(farg9);
   result = (int)IDABBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -1439,13 +1439,13 @@ SWIGEXPORT int _wrap_FIDABBDPrecReInit(void *farg1, int64_t const *farg2, int64_
   void *arg1 = (void *) 0 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)IDABBDPrecReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -1547,11 +1547,11 @@ SWIGEXPORT int _wrap_FIDASetJacTimes(void *farg1, IDALsJacTimesSetupFn farg2, ID
 SWIGEXPORT int _wrap_FIDASetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1561,11 +1561,11 @@ SWIGEXPORT int _wrap_FIDASetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1589,11 +1589,11 @@ SWIGEXPORT int _wrap_FIDASetLinearSolutionScaling(void *farg1, int const *farg2)
 SWIGEXPORT int _wrap_FIDASetIncrementFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetIncrementFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
diff --git a/src/ida/fmod/fida_mod.f90 b/src/ida/fmod/fida_mod.f90
index d4bcd98bc9..b868c16a47 100644
--- a/src/ida/fmod/fida_mod.f90
+++ b/src/ida/fmod/fida_mod.f90
@@ -2837,13 +2837,13 @@ function FIDAGetJacCj(ida_mem, cj_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: ida_mem
-real(C_DOUBLE), target, intent(inout) :: cj_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: cj_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = ida_mem
-farg2 = c_loc(cj_j)
+farg2 = c_loc(cj_j(1))
 fresult = swigc_FIDAGetJacCj(farg1, farg2)
 swig_result = fresult
 end function
@@ -2853,13 +2853,13 @@ function FIDAGetJacTime(ida_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: ida_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = ida_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FIDAGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/ida/ida.c b/src/ida/ida.c
index 2250bd6937..dd8e1c5604 100644
--- a/src/ida/ida.c
+++ b/src/ida/ida.c
@@ -94,27 +94,27 @@
  * =================================================================
  */
 
-#define ZERO      RCONST(0.0)    /* real 0.0    */
-#define HALF      RCONST(0.5)    /* real 0.5    */
-#define TWOTHIRDS RCONST(0.667)  /* real 2/3    */
-#define ONE       RCONST(1.0)    /* real 1.0    */
-#define ONEPT5    RCONST(1.5)    /* real 1.5    */
-#define TWO       RCONST(2.0)    /* real 2.0    */
-#define FOUR      RCONST(4.0)    /* real 4.0    */
-#define FIVE      RCONST(5.0)    /* real 5.0    */
-#define TEN       RCONST(10.0)   /* real 10.0   */
-#define TWELVE    RCONST(12.0)   /* real 12.0   */
-#define TWENTY    RCONST(20.0)   /* real 20.0   */
-#define HUNDRED   RCONST(100.0)  /* real 100.0  */
-#define PT9       RCONST(0.9)    /* real 0.9    */
-#define PT99      RCONST(0.99)   /* real 0.99   */
-#define PT1       RCONST(0.1)    /* real 0.1    */
-#define PT01      RCONST(0.01)   /* real 0.01   */
-#define PT001     RCONST(0.001)  /* real 0.001  */
-#define PT0001    RCONST(0.0001) /* real 0.0001 */
+#define ZERO      SUN_RCONST(0.0)    /* real 0.0    */
+#define HALF      SUN_RCONST(0.5)    /* real 0.5    */
+#define TWOTHIRDS SUN_RCONST(0.667)  /* real 2/3    */
+#define ONE       SUN_RCONST(1.0)    /* real 1.0    */
+#define ONEPT5    SUN_RCONST(1.5)    /* real 1.5    */
+#define TWO       SUN_RCONST(2.0)    /* real 2.0    */
+#define FOUR      SUN_RCONST(4.0)    /* real 4.0    */
+#define FIVE      SUN_RCONST(5.0)    /* real 5.0    */
+#define TEN       SUN_RCONST(10.0)   /* real 10.0   */
+#define TWELVE    SUN_RCONST(12.0)   /* real 12.0   */
+#define TWENTY    SUN_RCONST(20.0)   /* real 20.0   */
+#define HUNDRED   SUN_RCONST(100.0)  /* real 100.0  */
+#define PT9       SUN_RCONST(0.9)    /* real 0.9    */
+#define PT99      SUN_RCONST(0.99)   /* real 0.99   */
+#define PT1       SUN_RCONST(0.1)    /* real 0.1    */
+#define PT01      SUN_RCONST(0.01)   /* real 0.01   */
+#define PT001     SUN_RCONST(0.001)  /* real 0.001  */
+#define PT0001    SUN_RCONST(0.0001) /* real 0.0001 */
 
 /* real 1 + epsilon used in testing if the step size is below its bound */
-#define ONEPSM    RCONST(1.000001)
+#define ONEPSM    SUN_RCONST(1.000001)
 
 /*
  * =================================================================
@@ -174,7 +174,7 @@
 #define MAXNH            5  /* max. number of h tries in IC calc. */
 #define MAXNJ            4  /* max. number of J tries in IC calc. */
 #define MAXNI           10  /* max. Newton iterations in IC calc. */
-#define EPCON RCONST(0.33)  /* Newton convergence test constant */
+#define EPCON SUN_RCONST(0.33)  /* Newton convergence test constant */
 #define MAXBACKS       100  /* max backtracks per Newton step in IDACalcIC */
 
 /*
@@ -183,11 +183,11 @@
  * =================================================================
  */
 
-static booleantype IDACheckNvector(N_Vector tmpl);
+static sunbooleantype IDACheckNvector(N_Vector tmpl);
 
 /* Memory allocation/deallocation */
 
-static booleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
+static sunbooleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
 static void IDAFreeVectors(IDAMem IDA_mem);
 
 /* Initial setup */
@@ -203,7 +203,7 @@ static int IDAStep(IDAMem IDA_mem);
 
 /* Function called at beginning of step */
 
-static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck);
+static void IDASetCoeffs(IDAMem IDA_mem, sunrealtype *ck);
 
 /* Nonlinear solver functions */
 
@@ -212,29 +212,29 @@ static int IDANls(IDAMem IDA_mem);
 
 /* Error test */
 
-static int IDATestError(IDAMem IDA_mem, realtype ck,
-                        realtype *err_k, realtype *err_km1);
+static int IDATestError(IDAMem IDA_mem, sunrealtype ck,
+                        sunrealtype *err_k, sunrealtype *err_km1);
 
 /* Handling of convergence and/or error test failures */
 
-static void IDARestore(IDAMem IDA_mem, realtype saved_t);
-static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, realtype err_k, realtype err_km1,
+static void IDARestore(IDAMem IDA_mem, sunrealtype saved_t);
+static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, sunrealtype err_k, sunrealtype err_km1,
                           long int *ncfnPtr, int *ncfPtr, long int *netfPtr, int *nefPtr);
 static void IDAReset(IDAMem IDA_mem);
 
 /* Function called after a successful step */
 
-static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1);
+static void IDACompleteStep(IDAMem IDA_mem, sunrealtype err_k, sunrealtype err_km1);
 
 /* Function called to evaluate the solutions y(t) and y'(t) at t */
 
-int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret);
+int IDAGetSolution(void *ida_mem, sunrealtype t, N_Vector yret, N_Vector ypret);
 
 /* Stopping tests and failure handling */
 
-static int IDAStopTest1(IDAMem IDA_mem, realtype tout,realtype *tret,
+static int IDAStopTest1(IDAMem IDA_mem, sunrealtype tout,sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask);
-static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest2(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask);
 static int IDAHandleFailure(IDAMem IDA_mem, int sflag);
 
@@ -291,7 +291,7 @@ void *IDACreate(SUNContext sunctx)
   IDA_mem->ida_sunctx = sunctx;
 
   /* Set unit roundoff in IDA_mem */
-  IDA_mem->ida_uround = UNIT_ROUNDOFF;
+  IDA_mem->ida_uround = SUN_UNIT_ROUNDOFF;
 
   /* Set default values for integrator optional inputs */
   IDA_mem->ida_res            = NULL;
@@ -371,11 +371,11 @@ void *IDACreate(SUNContext sunctx)
  */
 
 int IDAInit(void *ida_mem, IDAResFn res,
-            realtype t0, N_Vector yy0, N_Vector yp0)
+            sunrealtype t0, N_Vector yy0, N_Vector yp0)
 {
   int retval;
   IDAMem IDA_mem;
-  booleantype nvectorOK, allocOK;
+  sunbooleantype nvectorOK, allocOK;
   sunindextype lrw1, liw1;
   SUNNonlinearSolver NLS;
 
@@ -548,7 +548,7 @@ int IDAInit(void *ida_mem, IDAResFn res,
  */
 
 int IDAReInit(void *ida_mem,
-              realtype t0, N_Vector yy0, N_Vector yp0)
+              sunrealtype t0, N_Vector yy0, N_Vector yp0)
 {
   IDAMem IDA_mem;
 
@@ -639,7 +639,7 @@ int IDAReInit(void *ida_mem,
  *   which will be called to set the error weight vector.
  */
 
-int IDASStolerances(void *ida_mem, realtype reltol, realtype abstol)
+int IDASStolerances(void *ida_mem, sunrealtype reltol, sunrealtype abstol)
 {
   IDAMem IDA_mem;
 
@@ -682,10 +682,10 @@ int IDASStolerances(void *ida_mem, realtype reltol, realtype abstol)
 }
 
 
-int IDASVtolerances(void *ida_mem, realtype reltol, N_Vector abstol)
+int IDASVtolerances(void *ida_mem, sunrealtype reltol, N_Vector abstol)
 {
   IDAMem IDA_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDA", "IDASVtolerances", MSG_NO_MEM);
@@ -859,7 +859,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
 
   /* Allocate necessary memory and return */
   IDA_mem->ida_glo = NULL;
-  IDA_mem->ida_glo = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_glo = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_glo == NULL) {
     IDAProcessError(IDA_mem, IDA_MEM_FAIL, "IDA", "IDARootInit", MSG_MEM_FAIL);
     SUNDIALS_MARK_FUNCTION_END(IDA_PROFILER);
@@ -867,7 +867,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_ghi = NULL;
-  IDA_mem->ida_ghi = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_ghi = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_ghi == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     IDAProcessError(IDA_mem, IDA_MEM_FAIL, "IDA", "IDARootInit", MSG_MEM_FAIL);
@@ -876,7 +876,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_grout = NULL;
-  IDA_mem->ida_grout = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_grout = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_grout == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     free(IDA_mem->ida_ghi); IDA_mem->ida_ghi = NULL;
@@ -909,7 +909,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_gactive = NULL;
-  IDA_mem->ida_gactive = (booleantype *) malloc(nrt*sizeof(booleantype));
+  IDA_mem->ida_gactive = (sunbooleantype *) malloc(nrt*sizeof(sunbooleantype));
   if (IDA_mem->ida_gactive == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     free(IDA_mem->ida_ghi); IDA_mem->ida_ghi = NULL;
@@ -979,14 +979,14 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
  * IDA_RES_FAIL
  */
 
-int IDASolve(void *ida_mem, realtype tout, realtype *tret,
+int IDASolve(void *ida_mem, sunrealtype tout, sunrealtype *tret,
              N_Vector yret, N_Vector ypret, int itask)
 {
   long int nstloc;
   int sflag, istate, ier, irfndp, ir;
-  realtype tdist, troundoff, ypnorm, rh, nrm;
+  sunrealtype tdist, troundoff, ypnorm, rh, nrm;
   IDAMem IDA_mem;
-  booleantype inactive_roots;
+  sunbooleantype inactive_roots;
 
   /* Check for legal inputs in all cases. */
 
@@ -1358,13 +1358,13 @@ int IDASolve(void *ida_mem, realtype tout, realtype *tret,
  *
  */
 
-int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky)
+int IDAGetDky(void *ida_mem, sunrealtype t, int k, N_Vector dky)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, psij_1;
+  sunrealtype tfuzz, tp, delt, psij_1;
   int i, j, retval;
-  realtype cjk  [MXORDP1];
-  realtype cjk_1[MXORDP1];
+  sunrealtype cjk  [MXORDP1];
+  sunrealtype cjk_1[MXORDP1];
 
   /* Check ida_mem */
   if (ida_mem == NULL) {
@@ -1572,7 +1572,7 @@ void IDAFree(void **ida_mem)
  * If any of them is missing it returns SUNFALSE.
  */
 
-static booleantype IDACheckNvector(N_Vector tmpl)
+static sunbooleantype IDACheckNvector(N_Vector tmpl)
 {
   if ((tmpl->ops->nvclone        == NULL) ||
      (tmpl->ops->nvdestroy      == NULL) ||
@@ -1609,7 +1609,7 @@ static booleantype IDACheckNvector(N_Vector tmpl)
  * allocated here.
  */
 
-static booleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
+static sunbooleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
 {
   int i, j, maxcol;
 
@@ -1794,7 +1794,7 @@ static void IDAFreeVectors(IDAMem IDA_mem)
 
 int IDAInitialSetup(IDAMem IDA_mem)
 {
-  booleantype conOK;
+  sunbooleantype conOK;
   int ier;
 
   /* Test for more vector operations, depending on options */
@@ -1971,11 +1971,11 @@ static int IDAEwtSetSV(IDAMem IDA_mem, N_Vector ycur, N_Vector weight)
  * the next step to reach tstop exactly.
  */
 
-static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest1(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask)
 {
   int ier;
-  realtype troundoff;
+  sunrealtype troundoff;
 
   if (IDA_mem->ida_tstopset)
   {
@@ -2073,11 +2073,11 @@ static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
  * because the same test was made prior to the step.
  */
 
-static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest2(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask)
 {
   /* int ier; */
-  realtype troundoff;
+  sunrealtype troundoff;
 
   if (IDA_mem->ida_tstopset)
   {
@@ -2264,8 +2264,8 @@ static int IDAHandleFailure(IDAMem IDA_mem, int sflag)
 
 static int IDAStep(IDAMem IDA_mem)
 {
-  realtype saved_t, ck;
-  realtype err_k, err_km1;
+  sunrealtype saved_t, ck;
+  sunrealtype err_k, err_km1;
   int ncf, nef;
   int nflag, kflag;
 
@@ -2383,10 +2383,10 @@ static int IDAStep(IDAMem IDA_mem)
  *  Also, IDACompleteStep prohibits an order increase until ns = k + 2.
  */
 
-static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck)
+static void IDASetCoeffs(IDAMem IDA_mem, sunrealtype *ck)
 {
   int i;
-  realtype temp1, temp2, alpha0, alphas;
+  sunrealtype temp1, temp2, alpha0, alphas;
 
   /* Set coefficients for the current stepsize h */
 
@@ -2469,8 +2469,8 @@ static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck)
 static int IDANls(IDAMem IDA_mem)
 {
   int retval;
-  booleantype constraintsPassed, callLSetup;
-  realtype temp1, temp2, vnorm;
+  sunbooleantype constraintsPassed, callLSetup;
+  sunrealtype temp1, temp2, vnorm;
   N_Vector mm, tmp;
   long int nni_inc = 0;
   long int nnf_inc = 0;
@@ -2619,12 +2619,12 @@ static void IDAPredict(IDAMem IDA_mem)
  * IDATestError returns either IDA_SUCCESS or ERROR_TEST_FAIL.
  */
 
-static int IDATestError(IDAMem IDA_mem, realtype ck,
-                        realtype *err_k, realtype *err_km1)
+static int IDATestError(IDAMem IDA_mem, sunrealtype ck,
+                        sunrealtype *err_k, sunrealtype *err_km1)
 {
-  realtype err_km2;                         /* estimated error at k-2 */
-  realtype enorm_k, enorm_km1, enorm_km2;   /* error norms */
-  realtype terr_k, terr_km1, terr_km2;      /* local truncation error norms */
+  sunrealtype err_km2;                         /* estimated error at k-2 */
+  sunrealtype enorm_k, enorm_km1, enorm_km2;   /* error norms */
+  sunrealtype terr_k, terr_km1, terr_km2;      /* local truncation error norms */
 
   /* Compute error for order k. */
   enorm_k = IDAWrmsNorm(IDA_mem, IDA_mem->ida_ee, IDA_mem->ida_ewt, IDA_mem->ida_suppressalg);
@@ -2709,7 +2709,7 @@ static int IDATestError(IDAMem IDA_mem, realtype ck,
  * It changes back phi-star to phi (changed in IDASetCoeffs)
  */
 
-static void IDARestore(IDAMem IDA_mem, realtype saved_t)
+static void IDARestore(IDAMem IDA_mem, sunrealtype saved_t)
 {
   int j;
 
@@ -2774,10 +2774,10 @@ static void IDARestore(IDAMem IDA_mem, realtype saved_t)
  *   IDA_LSOLVE_FAIL
  */
 
-static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, realtype err_k, realtype err_km1,
+static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, sunrealtype err_k, sunrealtype err_km1,
                           long int *ncfnPtr, int *ncfPtr, long int *netfPtr, int *nefPtr)
 {
-  realtype err_knew;
+  sunrealtype err_knew;
 
   IDA_mem->ida_phase = 1;
 
@@ -2927,12 +2927,12 @@ static void IDAReset(IDAMem IDA_mem)
  * stepsize and order for the next step, and updates the phi array.
  */
 
-static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1)
+static void IDACompleteStep(IDAMem IDA_mem, sunrealtype err_k, sunrealtype err_km1)
 {
   int j, kdiff, action;
-  realtype terr_k, terr_km1, terr_kp1;
-  realtype err_knew, err_kp1;
-  realtype enorm, tmp, hnew;
+  sunrealtype terr_k, terr_km1, terr_kp1;
+  sunrealtype err_knew, err_kp1;
+  sunrealtype enorm, tmp, hnew;
 
   IDA_mem->ida_nst++;
   kdiff = IDA_mem->ida_kk - IDA_mem->ida_kused;
@@ -3132,10 +3132,10 @@ static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1)
  *   IDA_BAD_T    if t is not within the interval of the last step taken.
  */
 
-int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret)
+int IDAGetSolution(void *ida_mem, sunrealtype t, N_Vector yret, N_Vector ypret)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, c, d, gam;
+  sunrealtype tfuzz, tp, delt, c, d, gam;
   int j, kord, retval;
 
   if (ida_mem == NULL) {
@@ -3206,10 +3206,10 @@ int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret)
  * mask = suppressalg otherwise.
  */
 
-realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
-                     booleantype mask)
+sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
+                     sunbooleantype mask)
 {
-  realtype nrm;
+  sunrealtype nrm;
 
   if (mask) nrm = N_VWrmsNormMask(x, w, IDA_mem->ida_id);
   else      nrm = N_VWrmsNorm(x, w);
@@ -3238,8 +3238,8 @@ realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
 static int IDARcheck1(IDAMem IDA_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   for (i = 0; i < IDA_mem->ida_nrtfn; i++)
     IDA_mem->ida_iroots[i] = 0;
@@ -3307,8 +3307,8 @@ static int IDARcheck1(IDAMem IDA_mem)
 static int IDARcheck2(IDAMem IDA_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   if (IDA_mem->ida_irfnd == 0) return(IDA_SUCCESS);
 
@@ -3502,9 +3502,9 @@ static int IDARcheck3(IDAMem IDA_mem)
 
 static int IDARootfind(IDAMem IDA_mem)
 {
-  realtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
+  sunrealtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
   int i, retval, imax, side, sideprev;
-  booleantype zroot, sgnchg;
+  sunbooleantype zroot, sgnchg;
 
   imax = 0;
 
diff --git a/src/ida/ida_bbdpre.c b/src/ida/ida_bbdpre.c
index 510a2c4740..af4b922213 100644
--- a/src/ida/ida_bbdpre.c
+++ b/src/ida/ida_bbdpre.c
@@ -34,22 +34,22 @@
 #include <nvector/nvector_serial.h>
 
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* Prototypes of functions IDABBDPrecSetup and IDABBDPrecSolve */
-static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
-                           N_Vector rr, realtype c_j, void *prec_data);
-static int IDABBDPrecSolve(realtype tt, N_Vector yy, N_Vector yp,
+static int IDABBDPrecSetup(sunrealtype tt, N_Vector yy, N_Vector yp,
+                           N_Vector rr, sunrealtype c_j, void *prec_data);
+static int IDABBDPrecSolve(sunrealtype tt, N_Vector yy, N_Vector yp,
                            N_Vector rr, N_Vector rvec, N_Vector zvec,
-                           realtype c_j, realtype delta, void *prec_data);
+                           sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototype for IDABBDPrecFree */
 static int IDABBDPrecFree(IDAMem ida_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
+static int IBBDDQJac(IBBDPrecData pdata, sunrealtype tt, sunrealtype cj,
                      N_Vector yy, N_Vector yp, N_Vector gref,
                      N_Vector ytemp, N_Vector yptemp, N_Vector gtemp);
 
@@ -59,7 +59,7 @@ static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
 int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
                    sunindextype mudq, sunindextype mldq,
                    sunindextype mukeep, sunindextype mlkeep,
-                   realtype dq_rel_yy,
+                   sunrealtype dq_rel_yy,
                    IDABBDLocalFn Gres, IDABBDCommFn Gcomm)
 {
   IDAMem IDA_mem;
@@ -282,7 +282,7 @@ int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
 
 /*-------------------------------------------------------------*/
 int IDABBDPrecReInit(void *ida_mem, sunindextype mudq,
-                     sunindextype mldq, realtype dq_rel_yy)
+                     sunindextype mldq, sunrealtype dq_rel_yy)
 {
   IDAMem IDA_mem;
   IDALsMem idals_mem;
@@ -433,8 +433,8 @@ int IDABBDPrecGetNumGfnEvals(void *ida_mem,
    > 0    for a recoverable error (step will be retried), or
    < 0    for a nonrecoverable error (step fails).
  ----------------------------------------------------------------*/
-static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
-                           N_Vector rr, realtype c_j, void *bbd_data)
+static int IDABBDPrecSetup(sunrealtype tt, N_Vector yy, N_Vector yp,
+                           N_Vector rr, sunrealtype c_j, void *bbd_data)
 {
   IBBDPrecData pdata;
   IDAMem IDA_mem;
@@ -483,9 +483,9 @@ static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
   IDABBDPrecSolve returns the value returned from the linear
   solver object.
   ---------------------------------------------------------------*/
-static int IDABBDPrecSolve(realtype tt, N_Vector yy, N_Vector yp,
+static int IDABBDPrecSolve(sunrealtype tt, N_Vector yy, N_Vector yp,
                            N_Vector rr, N_Vector rvec, N_Vector zvec,
-                           realtype c_j, realtype delta, void *bbd_data)
+                           sunrealtype c_j, sunrealtype delta, void *bbd_data)
 {
   IBBDPrecData pdata;
   int retval;
@@ -554,17 +554,17 @@ static int IDABBDPrecFree(IDAMem IDA_mem)
   Return values are: 0 (success), > 0 (recoverable error),
   or < 0 (nonrecoverable error).
   ----------------------------------------------------------------*/
-static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
+static int IBBDDQJac(IBBDPrecData pdata, sunrealtype tt, sunrealtype cj,
                      N_Vector yy, N_Vector yp, N_Vector gref,
                      N_Vector ytemp, N_Vector yptemp, N_Vector gtemp)
 {
   IDAMem IDA_mem;
-  realtype inc, inc_inv;
+  sunrealtype inc, inc_inv;
   int retval;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *ydata, *ypdata, *ytempdata, *yptempdata, *grefdata, *gtempdata;
-  realtype *cnsdata = NULL, *ewtdata;
-  realtype *col_j, conj, yj, ypj, ewtj;
+  sunrealtype *ydata, *ypdata, *ytempdata, *yptempdata, *grefdata, *gtempdata;
+  sunrealtype *cnsdata = NULL, *ewtdata;
+  sunrealtype *col_j, conj, yj, ypj, ewtj;
 
   IDA_mem = (IDAMem) pdata->ida_mem;
 
diff --git a/src/ida/ida_bbdpre_impl.h b/src/ida/ida_bbdpre_impl.h
index f7037fcaad..ee5607ab8e 100644
--- a/src/ida/ida_bbdpre_impl.h
+++ b/src/ida/ida_bbdpre_impl.h
@@ -40,7 +40,7 @@ typedef struct IBBDPrecDataRec {
   /* passed by user to IDABBDPrecAlloc and used by
      IDABBDPrecSetup/IDABBDPrecSolve functions */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype rel_yy;
+  sunrealtype rel_yy;
   IDABBDLocalFn glocal;
   IDABBDCommFn gcomm;
 
diff --git a/src/ida/ida_ic.c b/src/ida/ida_ic.c
index e3877960dd..7016819e58 100644
--- a/src/ida/ida_ic.c
+++ b/src/ida/ida_ic.c
@@ -30,18 +30,18 @@
 
 /* Private Constants */
 
-#define ZERO       RCONST(0.0)    /* real 0.0    */
-#define HALF       RCONST(0.5)    /* real 0.5    */
-#define ONE        RCONST(1.0)    /* real 1.0    */
-#define TWO        RCONST(2.0)    /* real 2.0    */
-#define PT99       RCONST(0.99)   /* real 0.99   */
-#define PT1        RCONST(0.1)    /* real 0.1    */
-#define PT001      RCONST(0.001)  /* real 0.001  */
+#define ZERO       SUN_RCONST(0.0)    /* real 0.0    */
+#define HALF       SUN_RCONST(0.5)    /* real 0.5    */
+#define ONE        SUN_RCONST(1.0)    /* real 1.0    */
+#define TWO        SUN_RCONST(2.0)    /* real 2.0    */
+#define PT99       SUN_RCONST(0.99)   /* real 0.99   */
+#define PT1        SUN_RCONST(0.1)    /* real 0.1    */
+#define PT001      SUN_RCONST(0.001)  /* real 0.001  */
 
 /* IDACalcIC control constants */
 
-#define ICRATEMAX  RCONST(0.9)    /* max. Newton conv. rate */
-#define ALPHALS    RCONST(0.0001) /* alpha in linesearch conv. test */
+#define ICRATEMAX  SUN_RCONST(0.9)    /* max. Newton conv. rate */
+#define ALPHALS    SUN_RCONST(0.0001) /* alpha in linesearch conv. test */
 
 /* Return values for lower level routines used by IDACalcIC */
 
@@ -58,14 +58,14 @@
  */
 
 extern int IDAInitialSetup(IDAMem IDA_mem);
-extern realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
-                            booleantype mask);
+extern sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
+                            sunbooleantype mask);
 
 static int IDAnlsIC(IDAMem IDA_mem);
 static int IDANewtonIC(IDAMem IDA_mem);
-static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm);
-static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm);
-static int IDANewyyp(IDAMem IDA_mem, realtype lambda);
+static int IDALineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm);
+static int IDAfnorm(IDAMem IDA_mem, sunrealtype *fnorm);
+static int IDANewyyp(IDAMem IDA_mem, sunrealtype lambda);
 static int IDANewy(IDAMem IDA_mem);
 static int IDAICFailFlag(IDAMem IDA_mem, int retval);
 
@@ -103,11 +103,11 @@ static int IDAICFailFlag(IDAMem IDA_mem, int retval);
  * -----------------------------------------------------------------
  */
 
-int IDACalcIC(void *ida_mem, int icopt, realtype tout1)
+int IDACalcIC(void *ida_mem, int icopt, sunrealtype tout1)
 {
   int ewtsetOK;
   int ier, nwt, nh, mxnh, icret, retval=0;
-  realtype tdist, troundoff, minid, hic, ypnorm;
+  sunrealtype tdist, troundoff, minid, hic, ypnorm;
   IDAMem IDA_mem;
 
   /* Check if IDA memory exists */
@@ -381,7 +381,7 @@ static int IDAnlsIC (IDAMem IDA_mem)
 static int IDANewtonIC(IDAMem IDA_mem)
 {
   int retval, mnewt;
-  realtype delnorm, fnorm, fnorm0, oldfnrm, rate;
+  sunrealtype delnorm, fnorm, fnorm0, oldfnrm, rate;
 
   /* Set pointer for vector delnew */
   IDA_mem->ida_delnew = IDA_mem->ida_phi[2];
@@ -459,11 +459,11 @@ static int IDANewtonIC(IDAMem IDA_mem)
  * -----------------------------------------------------------------
  */
 
-static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
+static int IDALineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm)
 {
-  booleantype conOK;
+  sunbooleantype conOK;
   int retval, nbacks;
-  realtype f1norm, fnormp, f1normp, ratio, lambda, minlam, slpi;
+  sunrealtype f1norm, fnormp, f1normp, ratio, lambda, minlam, slpi;
   N_Vector mc;
 
   /* Initialize work space pointers, f1norm, ratio.
@@ -551,7 +551,7 @@ static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm)
+static int IDAfnorm(IDAMem IDA_mem, sunrealtype *fnorm)
 {
   int retval;
 
@@ -593,7 +593,7 @@ static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDANewyyp(IDAMem IDA_mem, realtype lambda)
+static int IDANewyyp(IDAMem IDA_mem, sunrealtype lambda)
 {
 
   /* IDA_YA_YDP_INIT case: ynew  = yy0 - lambda*delta    where id_i = 0
diff --git a/src/ida/ida_impl.h b/src/ida/ida_impl.h
index 016f037a80..d55f1c4c39 100644
--- a/src/ida/ida_impl.h
+++ b/src/ida/ida_impl.h
@@ -53,21 +53,21 @@ extern "C" {
 
 /* Basic IDA constants */
 
-#define HMAX_INV_DEFAULT RCONST(0.0) /* hmax_inv default value          */
-#define HMIN_DEFAULT     RCONST(0.0) /* hmin default value              */
+#define HMAX_INV_DEFAULT SUN_RCONST(0.0) /* hmax_inv default value          */
+#define HMIN_DEFAULT     SUN_RCONST(0.0) /* hmin default value              */
 #define MAXORD_DEFAULT   5           /* maxord default value            */
 #define MXORDP1          6           /* max. number of N_Vectors in phi */
 #define MXSTEP_DEFAULT   500         /* mxstep default value            */
 
-#define ETA_MAX_FX_DEFAULT RCONST(2.0)  /* threshold to increase step size   */
-#define ETA_MIN_FX_DEFAULT RCONST(1.0)  /* threshold to decrease step size   */
-#define ETA_MAX_DEFAULT    RCONST(2.0)  /* max step size increase factor     */
-#define ETA_MIN_DEFAULT    RCONST(0.5)  /* min step size decrease factor     */
-#define ETA_LOW_DEFAULT    RCONST(0.9)  /* upper bound on decrease factor    */
-#define ETA_MIN_EF_DEFAULT RCONST(0.25) /* err test fail min decrease factor */
-#define ETA_CF_DEFAULT     RCONST(0.25) /* NLS failure decrease factor       */
+#define ETA_MAX_FX_DEFAULT SUN_RCONST(2.0)  /* threshold to increase step size   */
+#define ETA_MIN_FX_DEFAULT SUN_RCONST(1.0)  /* threshold to decrease step size   */
+#define ETA_MAX_DEFAULT    SUN_RCONST(2.0)  /* max step size increase factor     */
+#define ETA_MIN_DEFAULT    SUN_RCONST(0.5)  /* min step size decrease factor     */
+#define ETA_LOW_DEFAULT    SUN_RCONST(0.9)  /* upper bound on decrease factor    */
+#define ETA_MIN_EF_DEFAULT SUN_RCONST(0.25) /* err test fail min decrease factor */
+#define ETA_CF_DEFAULT     SUN_RCONST(0.25) /* NLS failure decrease factor       */
 
-#define DCJ_DEFAULT RCONST(0.25)  /* constant for updating Jacobian/preconditioner */
+#define DCJ_DEFAULT SUN_RCONST(0.25)  /* constant for updating Jacobian/preconditioner */
 
 /* Return values for lower level routines used by IDASolve and functions
    provided to the nonlinear solver */
@@ -91,7 +91,7 @@ typedef struct IDAMemRec {
 
   SUNContext ida_sunctx;
 
-  realtype ida_uround;    /* machine unit roundoff */
+  sunrealtype ida_uround;    /* machine unit roundoff */
 
   /*--------------------------
     Problem Specification Data
@@ -101,17 +101,17 @@ typedef struct IDAMemRec {
   void        *ida_user_data; /* user pointer passed to res            */
 
   int         ida_itol;       /* itol = IDA_SS, IDA_SV, IDA_WF, IDA_NN */
-  realtype    ida_rtol;       /* relative tolerance                    */
-  realtype    ida_Satol;      /* scalar absolute tolerance             */
+  sunrealtype    ida_rtol;       /* relative tolerance                    */
+  sunrealtype    ida_Satol;      /* scalar absolute tolerance             */
   N_Vector    ida_Vatol;      /* vector absolute tolerance             */
-  booleantype ida_atolmin0;   /* flag indicating that min(atol) = 0    */
-  booleantype ida_user_efun;  /* SUNTRUE if user provides efun         */
+  sunbooleantype ida_atolmin0;   /* flag indicating that min(atol) = 0    */
+  sunbooleantype ida_user_efun;  /* SUNTRUE if user provides efun         */
   IDAEwtFn    ida_efun;       /* function to set ewt                   */
   void        *ida_edata;     /* user pointer passed to efun           */
 
-  booleantype    ida_constraintsSet; /* constraints vector present:
+  sunbooleantype    ida_constraintsSet; /* constraints vector present:
                                         do constraints calc                   */
-  booleantype    ida_suppressalg;    /* SUNTRUE means suppress algebraic vars
+  sunbooleantype    ida_suppressalg;    /* SUNTRUE means suppress algebraic vars
                                         in local error tests                  */
 
   /*-----------------------------------------------
@@ -120,11 +120,11 @@ typedef struct IDAMemRec {
 
   N_Vector ida_phi[MXORDP1];   /* phi = (maxord+1) arrays of divided differences */
 
-  realtype ida_psi[MXORDP1];   /* differences in t (sums of recent step sizes)   */
-  realtype ida_alpha[MXORDP1]; /* ratios of current stepsize to psi values       */
-  realtype ida_beta[MXORDP1];  /* ratios of current to previous product of psi's */
-  realtype ida_sigma[MXORDP1]; /* product successive alpha values and factorial  */
-  realtype ida_gamma[MXORDP1]; /* sum of reciprocals of psi values               */
+  sunrealtype ida_psi[MXORDP1];   /* differences in t (sums of recent step sizes)   */
+  sunrealtype ida_alpha[MXORDP1]; /* ratios of current stepsize to psi values       */
+  sunrealtype ida_beta[MXORDP1];  /* ratios of current to previous product of psi's */
+  sunrealtype ida_sigma[MXORDP1]; /* product successive alpha values and factorial  */
+  sunrealtype ida_gamma[MXORDP1]; /* sum of reciprocals of psi values               */
 
   /*-------------------------
     N_Vectors for integration
@@ -154,26 +154,26 @@ typedef struct IDAMemRec {
     Variables for use by IDACalcIC
     ------------------------------*/
 
-  realtype ida_t0;          /* initial t                                      */
+  sunrealtype ida_t0;          /* initial t                                      */
   N_Vector ida_yy0;         /* initial y vector (user-supplied).              */
   N_Vector ida_yp0;         /* initial y' vector (user-supplied).             */
 
   int ida_icopt;            /* IC calculation user option                     */
-  booleantype ida_lsoff;    /* IC calculation linesearch turnoff option       */
+  sunbooleantype ida_lsoff;    /* IC calculation linesearch turnoff option       */
   int ida_maxnh;            /* max. number of h tries in IC calculation       */
   int ida_maxnj;            /* max. number of J tries in IC calculation       */
   int ida_maxnit;           /* max. number of Netwon iterations in IC calc.   */
   int ida_nbacktr;          /* number of IC linesearch backtrack operations   */
   int ida_sysindex;         /* computed system index (0 or 1)                 */
   int ida_maxbacks;         /* max backtracks per Newton step                 */
-  realtype ida_epiccon;     /* IC nonlinear convergence test constant         */
-  realtype ida_steptol;     /* minimum Newton step size in IC calculation     */
-  realtype ida_tscale;      /* time scale factor = abs(tout1 - t0)            */
+  sunrealtype ida_epiccon;     /* IC nonlinear convergence test constant         */
+  sunrealtype ida_steptol;     /* minimum Newton step size in IC calculation     */
+  sunrealtype ida_tscale;      /* time scale factor = abs(tout1 - t0)            */
 
   /* Tstop information */
 
-  booleantype ida_tstopset;
-  realtype ida_tstop;
+  sunbooleantype ida_tstopset;
+  sunrealtype ida_tstop;
 
   /* Step Data */
 
@@ -183,22 +183,22 @@ typedef struct IDAMemRec {
   int ida_phase;     /* flag to trigger step doubling in first few steps      */
   int ida_ns;        /* counts steps at fixed stepsize and order              */
 
-  realtype ida_hin;      /* initial step                                      */
-  realtype ida_h0u;      /* actual initial stepsize                           */
-  realtype ida_hh;       /* current step size h                               */
-  realtype ida_hused;    /* step size used on last successful step            */
-  realtype ida_eta;      /* eta = hnext / hused                               */
-  realtype ida_tn;       /* current internal value of t                       */
-  realtype ida_tretlast; /* value of tret previously returned by IDASolve     */
-  realtype ida_cj;       /* current value of scalar (-alphas/hh) in Jacobian  */
-  realtype ida_cjlast;   /* cj value saved from last successful step          */
-  realtype ida_cjold;    /* cj value saved from last call to lsetup           */
-  realtype ida_cjratio;  /* ratio of cj values: cj/cjold                      */
-  realtype ida_ss;       /* scalar used in Newton iteration convergence test  */
-  realtype ida_oldnrm;   /* norm of previous nonlinear solver update          */
-  realtype ida_epsNewt;  /* test constant in Newton convergence test          */
-  realtype ida_epcon;    /* coeficient of the Newton covergence test          */
-  realtype ida_toldel;   /* tolerance in direct test on Newton corrections    */
+  sunrealtype ida_hin;      /* initial step                                      */
+  sunrealtype ida_h0u;      /* actual initial stepsize                           */
+  sunrealtype ida_hh;       /* current step size h                               */
+  sunrealtype ida_hused;    /* step size used on last successful step            */
+  sunrealtype ida_eta;      /* eta = hnext / hused                               */
+  sunrealtype ida_tn;       /* current internal value of t                       */
+  sunrealtype ida_tretlast; /* value of tret previously returned by IDASolve     */
+  sunrealtype ida_cj;       /* current value of scalar (-alphas/hh) in Jacobian  */
+  sunrealtype ida_cjlast;   /* cj value saved from last successful step          */
+  sunrealtype ida_cjold;    /* cj value saved from last call to lsetup           */
+  sunrealtype ida_cjratio;  /* ratio of cj values: cj/cjold                      */
+  sunrealtype ida_ss;       /* scalar used in Newton iteration convergence test  */
+  sunrealtype ida_oldnrm;   /* norm of previous nonlinear solver update          */
+  sunrealtype ida_epsNewt;  /* test constant in Newton convergence test          */
+  sunrealtype ida_epcon;    /* coeficient of the Newton covergence test          */
+  sunrealtype ida_toldel;   /* tolerance in direct test on Newton corrections    */
 
   /*------
     Limits
@@ -210,16 +210,16 @@ typedef struct IDAMemRec {
   int ida_maxord;        /* max value of method order k:                      */
   int ida_maxord_alloc;  /* value of maxord used when allocating memory       */
   long int ida_mxstep;   /* max number of internal steps for one user call    */
-  realtype ida_hmax_inv; /* inverse of max. step size hmax (default = 0.0)    */
-  realtype ida_hmin;     /* min step size hmin (default = 0.0)                */
+  sunrealtype ida_hmax_inv; /* inverse of max. step size hmax (default = 0.0)    */
+  sunrealtype ida_hmin;     /* min step size hmin (default = 0.0)                */
 
-  realtype ida_eta_max_fx; /* threshold to increase step size */
-  realtype ida_eta_min_fx; /* threshold to decrease step size */
-  realtype ida_eta_max;    /* max step size increase factor   */
-  realtype ida_eta_min;    /* min step size decrease factor   */
-  realtype ida_eta_low;    /* upper bound on decrease factor  */
-  realtype ida_eta_min_ef; /* eta >= eta_min_ef after an error test failure */
-  realtype ida_eta_cf;     /* eta on a nonlinear solver convergence failure */
+  sunrealtype ida_eta_max_fx; /* threshold to increase step size */
+  sunrealtype ida_eta_min_fx; /* threshold to decrease step size */
+  sunrealtype ida_eta_max;    /* max step size increase factor   */
+  sunrealtype ida_eta_min;    /* min step size decrease factor   */
+  sunrealtype ida_eta_low;    /* upper bound on decrease factor  */
+  sunrealtype ida_eta_min_ef; /* eta >= eta_min_ef after an error test failure */
+  sunrealtype ida_eta_cf;     /* eta on a nonlinear solver convergence failure */
 
   /*--------
     Counters
@@ -237,12 +237,12 @@ typedef struct IDAMemRec {
     Space requirements
     ------------------*/
 
-  sunindextype ida_lrw1; /* no. of realtype words in 1 N_Vector               */
+  sunindextype ida_lrw1; /* no. of sunrealtype words in 1 N_Vector               */
   sunindextype ida_liw1; /* no. of integer words in 1 N_Vector                */
-  long int     ida_lrw;  /* number of realtype words in IDA work vectors      */
+  long int     ida_lrw;  /* number of sunrealtype words in IDA work vectors      */
   long int     ida_liw;  /* no. of integer words in IDA work vectors          */
 
-  realtype ida_tolsf;    /* tolerance scale factor (saved value)              */
+  sunrealtype ida_tolsf;    /* tolerance scale factor (saved value)              */
 
   /*-------------------------------------------
     Error handler function and error ouput file
@@ -254,14 +254,14 @@ typedef struct IDAMemRec {
 
   /* Flags to verify correct calling sequence */
 
-  booleantype ida_SetupDone;  /* set to SUNFALSE by IDAMalloc and IDAReInit
+  sunbooleantype ida_SetupDone;  /* set to SUNFALSE by IDAMalloc and IDAReInit
                                  set to SUNTRUE by IDACalcIC or IDASolve      */
 
-  booleantype ida_VatolMallocDone;
-  booleantype ida_constraintsMallocDone;
-  booleantype ida_idMallocDone;
+  sunbooleantype ida_VatolMallocDone;
+  sunbooleantype ida_constraintsMallocDone;
+  sunbooleantype ida_idMallocDone;
 
-  booleantype ida_MallocDone; /* set to SUNFALSE by IDACreate
+  sunbooleantype ida_MallocDone; /* set to SUNFALSE by IDACreate
                                  set to SUNTRUE by IDAMAlloc
                                  tested by IDAReInit and IDASolve             */
 
@@ -270,7 +270,7 @@ typedef struct IDAMemRec {
     ---------------------*/
 
   SUNNonlinearSolver NLS;    /* nonlinear solver object */
-  booleantype ownNLS;        /* flag indicating NLS ownership */
+  sunbooleantype ownNLS;        /* flag indicating NLS ownership */
   IDAResFn nls_res;          /* F(t,y(t),y'(t))=0; used in the nonlinear
                                 solver */
 
@@ -296,12 +296,12 @@ typedef struct IDAMemRec {
   /* Linear Solver specific memory */
 
   void *ida_lmem;   /* linear solver interface structure */
-  realtype ida_dcj; /* parameter that determines cj ratio thresholds for calling
+  sunrealtype ida_dcj; /* parameter that determines cj ratio thresholds for calling
                      * the linear solver setup function */
 
   /* Flag to indicate successful ida_linit call */
 
-  booleantype ida_linitOK;
+  sunbooleantype ida_linitOK;
 
   /*----------------
     Rootfinding Data
@@ -311,25 +311,25 @@ typedef struct IDAMemRec {
   int ida_nrtfn;            /* number of components of g                       */
   int *ida_iroots;          /* array for root information                      */
   int *ida_rootdir;         /* array specifying direction of zero-crossing     */
-  realtype ida_tlo;         /* nearest endpoint of interval in root search     */
-  realtype ida_thi;         /* farthest endpoint of interval in root search    */
-  realtype ida_trout;       /* t return value from rootfinder routine          */
-  realtype *ida_glo;        /* saved array of g values at t = tlo              */
-  realtype *ida_ghi;        /* saved array of g values at t = thi              */
-  realtype *ida_grout;      /* array of g values at t = trout                  */
-  realtype ida_toutc;       /* copy of tout (if NORMAL mode)                   */
-  realtype ida_ttol;        /* tolerance on root location                      */
+  sunrealtype ida_tlo;         /* nearest endpoint of interval in root search     */
+  sunrealtype ida_thi;         /* farthest endpoint of interval in root search    */
+  sunrealtype ida_trout;       /* t return value from rootfinder routine          */
+  sunrealtype *ida_glo;        /* saved array of g values at t = tlo              */
+  sunrealtype *ida_ghi;        /* saved array of g values at t = thi              */
+  sunrealtype *ida_grout;      /* array of g values at t = trout                  */
+  sunrealtype ida_toutc;       /* copy of tout (if NORMAL mode)                   */
+  sunrealtype ida_ttol;        /* tolerance on root location                      */
   int ida_taskc;            /* copy of parameter itask                         */
   int ida_irfnd;            /* flag showing whether last step had a root       */
   long int ida_nge;         /* counter for g evaluations                       */
-  booleantype *ida_gactive; /* array with active/inactive event functions      */
+  sunbooleantype *ida_gactive; /* array with active/inactive event functions      */
   int ida_mxgnull;          /* number of warning messages about possible g==0  */
 
   /* Arrays for Fused Vector Operations */
 
   /* scalar arrays */
-  realtype ida_cvals[MXORDP1];
-  realtype ida_dvals[MAXORD_DEFAULT];
+  sunrealtype ida_cvals[MXORDP1];
+  sunrealtype ida_dvals[MAXORD_DEFAULT];
 
   /* vector  arrays */
   N_Vector ida_Xvecs[MXORDP1];
@@ -451,8 +451,8 @@ void IDAErrHandler(int error_code, const char *module, const char *function,
 
 /* Norm functions. Also used for IC, so they are global.*/
 
-realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
-                     booleantype mask);
+sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
+                     sunbooleantype mask);
 
 /* Nonlinear solver initialization */
 
diff --git a/src/ida/ida_io.c b/src/ida/ida_io.c
index 528aab8694..f811f0dd0d 100644
--- a/src/ida/ida_io.c
+++ b/src/ida/ida_io.c
@@ -24,10 +24,10 @@
 #include "sundials/sundials_types.h"
 #include "sundials/sundials_math.h"
 
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWOPT5  RCONST(2.5)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWOPT5  SUN_RCONST(2.5)
 
 /*
  * =================================================================
@@ -35,7 +35,7 @@
  * =================================================================
  */
 
-int IDASetDeltaCjLSetup(void *ida_mem, realtype dcj)
+int IDASetDeltaCjLSetup(void *ida_mem, sunrealtype dcj)
 {
   IDAMem IDA_mem;
 
@@ -109,8 +109,8 @@ int IDASetUserData(void *ida_mem, void *user_data)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
-                             realtype eta_max_fx)
+int IDASetEtaFixedStepBounds(void *ida_mem, sunrealtype eta_min_fx,
+                             sunrealtype eta_max_fx)
 {
   IDAMem IDA_mem;
 
@@ -137,7 +137,7 @@ int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMax(void *ida_mem, realtype eta_max)
+int IDASetEtaMax(void *ida_mem, sunrealtype eta_max)
 {
   IDAMem IDA_mem;
 
@@ -159,7 +159,7 @@ int IDASetEtaMax(void *ida_mem, realtype eta_max)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMin(void *ida_mem, realtype eta_min)
+int IDASetEtaMin(void *ida_mem, sunrealtype eta_min)
 {
   IDAMem IDA_mem;
 
@@ -181,7 +181,7 @@ int IDASetEtaMin(void *ida_mem, realtype eta_min)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaLow(void *ida_mem, realtype eta_low)
+int IDASetEtaLow(void *ida_mem, sunrealtype eta_low)
 {
   IDAMem IDA_mem;
 
@@ -203,7 +203,7 @@ int IDASetEtaLow(void *ida_mem, realtype eta_low)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef)
+int IDASetEtaMinErrFail(void *ida_mem, sunrealtype eta_min_ef)
 {
   IDAMem IDA_mem;
 
@@ -225,7 +225,7 @@ int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaConvFail(void *ida_mem, realtype eta_cf)
+int IDASetEtaConvFail(void *ida_mem, sunrealtype eta_cf)
 {
   IDAMem IDA_mem;
 
@@ -303,7 +303,7 @@ int IDASetMaxNumSteps(void *ida_mem, long int mxsteps)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetInitStep(void *ida_mem, realtype hin)
+int IDASetInitStep(void *ida_mem, sunrealtype hin)
 {
   IDAMem IDA_mem;
 
@@ -321,7 +321,7 @@ int IDASetInitStep(void *ida_mem, realtype hin)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetMaxStep(void *ida_mem, realtype hmax)
+int IDASetMaxStep(void *ida_mem, sunrealtype hmax)
 {
   IDAMem IDA_mem;
 
@@ -350,7 +350,7 @@ int IDASetMaxStep(void *ida_mem, realtype hmax)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetMinStep(void *ida_mem, realtype hmin)
+int IDASetMinStep(void *ida_mem, sunrealtype hmin)
 {
   IDAMem IDA_mem;
 
@@ -380,7 +380,7 @@ int IDASetMinStep(void *ida_mem, realtype hmin)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetStopTime(void *ida_mem, realtype tstop)
+int IDASetStopTime(void *ida_mem, sunrealtype tstop)
 {
   IDAMem IDA_mem;
 
@@ -430,7 +430,7 @@ int IDAClearStopTime(void *ida_mem)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetNonlinConvCoef(void *ida_mem, realtype epcon)
+int IDASetNonlinConvCoef(void *ida_mem, sunrealtype epcon)
 {
   IDAMem IDA_mem;
 
@@ -513,7 +513,7 @@ int IDASetMaxNonlinIters(void *ida_mem, int maxcor)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetSuppressAlg(void *ida_mem, booleantype suppressalg)
+int IDASetSuppressAlg(void *ida_mem, sunbooleantype suppressalg)
 {
   IDAMem IDA_mem;
 
@@ -571,7 +571,7 @@ int IDASetId(void *ida_mem, N_Vector id)
 int IDASetConstraints(void *ida_mem, N_Vector constraints)
 {
   IDAMem IDA_mem;
-  realtype temptest;
+  sunrealtype temptest;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDA", "IDASetConstraints", MSG_NO_MEM);
@@ -686,7 +686,7 @@ int IDASetNoInactiveRootWarn(void *ida_mem)
  * =================================================================
  */
 
-int IDASetNonlinConvCoefIC(void *ida_mem, realtype epiccon)
+int IDASetNonlinConvCoefIC(void *ida_mem, sunrealtype epiccon)
 {
   IDAMem IDA_mem;
 
@@ -801,7 +801,7 @@ int IDASetMaxBacksIC(void *ida_mem, int maxbacks)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff)
+int IDASetLineSearchOffIC(void *ida_mem, sunbooleantype lsoff)
 {
   IDAMem IDA_mem;
 
@@ -819,7 +819,7 @@ int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetStepToleranceIC(void *ida_mem, realtype steptol)
+int IDASetStepToleranceIC(void *ida_mem, sunrealtype steptol)
 {
   IDAMem IDA_mem;
 
@@ -996,7 +996,7 @@ int IDAGetCurrentOrder(void *ida_mem, int *kcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentCj(void *ida_mem, realtype *cj)
+int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj)
 {
   IDAMem IDA_mem;
 
@@ -1050,7 +1050,7 @@ int IDAGetCurrentYp(void *ida_mem, N_Vector *ypcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetActualInitStep(void *ida_mem, realtype *hinused)
+int IDAGetActualInitStep(void *ida_mem, sunrealtype *hinused)
 {
   IDAMem IDA_mem;
 
@@ -1068,7 +1068,7 @@ int IDAGetActualInitStep(void *ida_mem, realtype *hinused)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetLastStep(void *ida_mem, realtype *hlast)
+int IDAGetLastStep(void *ida_mem, sunrealtype *hlast)
 {
   IDAMem IDA_mem;
 
@@ -1086,7 +1086,7 @@ int IDAGetLastStep(void *ida_mem, realtype *hlast)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentStep(void *ida_mem, realtype *hcur)
+int IDAGetCurrentStep(void *ida_mem, sunrealtype *hcur)
 {
   IDAMem IDA_mem;
 
@@ -1104,7 +1104,7 @@ int IDAGetCurrentStep(void *ida_mem, realtype *hcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentTime(void *ida_mem, realtype *tcur)
+int IDAGetCurrentTime(void *ida_mem, sunrealtype *tcur)
 {
   IDAMem IDA_mem;
 
@@ -1122,7 +1122,7 @@ int IDAGetCurrentTime(void *ida_mem, realtype *tcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetTolScaleFactor(void *ida_mem, realtype *tolsfact)
+int IDAGetTolScaleFactor(void *ida_mem, sunrealtype *tolsfact)
 {
   IDAMem IDA_mem;
 
@@ -1196,8 +1196,8 @@ int IDAGetWorkSpace(void *ida_mem, long int *lenrw, long int *leniw)
 
 int IDAGetIntegratorStats(void *ida_mem, long int *nsteps, long int *nrevals,
                           long int *nlinsetups, long int *netfails,
-                          int *klast, int *kcur, realtype *hinused, realtype *hlast,
-                          realtype *hcur, realtype *tcur)
+                          int *klast, int *kcur, sunrealtype *hinused, sunrealtype *hlast,
+                          sunrealtype *hcur, sunrealtype *tcur)
 {
   IDAMem IDA_mem;
 
@@ -1397,7 +1397,7 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
     if (IDA_mem->ida_nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) IDA_mem->ida_nre / (realtype) IDA_mem->ida_nst);
+              (sunrealtype) IDA_mem->ida_nre / (sunrealtype) IDA_mem->ida_nst);
     }
 
     /* linear solver stats */
@@ -1416,11 +1416,11 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
       if (IDA_mem->ida_nni > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) idals_mem->nli / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nli / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) idals_mem->nje / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nje / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) idals_mem->npe / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->npe / (sunrealtype) IDA_mem->ida_nni);
       }
     }
 
@@ -1452,7 +1452,7 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
     if (IDA_mem->ida_nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) IDA_mem->ida_nre / (realtype) IDA_mem->ida_nst);
+              (sunrealtype) IDA_mem->ida_nre / (sunrealtype) IDA_mem->ida_nst);
     }
     else
     {
@@ -1475,11 +1475,11 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
       if (IDA_mem->ida_nni > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) idals_mem->nli / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nli / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) idals_mem->nje / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nje / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) idals_mem->npe / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->npe / (sunrealtype) IDA_mem->ida_nni);
       }
       else
       {
diff --git a/src/ida/ida_ls.c b/src/ida/ida_ls.c
index 0dece17d19..17a75ed3c3 100644
--- a/src/ida/ida_ls.c
+++ b/src/ida/ida_ls.c
@@ -29,12 +29,12 @@
 
 /* constants */
 #define MAX_ITERS  3  /* max. number of attempts to recover in DQ J*v */
-#define ZERO       RCONST(0.0)
-#define PT25       RCONST(0.25)
-#define PT05       RCONST(0.05)
-#define PT9        RCONST(0.9)
-#define ONE        RCONST(1.0)
-#define TWO        RCONST(2.0)
+#define ZERO       SUN_RCONST(0.0)
+#define PT25       SUN_RCONST(0.25)
+#define PT05       SUN_RCONST(0.05)
+#define PT9        SUN_RCONST(0.9)
+#define ONE        SUN_RCONST(1.0)
+#define TWO        SUN_RCONST(2.0)
 
 
 /*===============================================================
@@ -49,8 +49,8 @@ int IDASetLinearSolver(void *ida_mem, SUNLinearSolver LS, SUNMatrix A)
   IDAMem      IDA_mem;
   IDALsMem    idals_mem;
   int         retval, LSType;
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if any input is NULL */
   if (ida_mem == NULL) {
@@ -304,7 +304,7 @@ int IDASetJacFn(void *ida_mem, IDALsJacFn jac)
 
 
 /* IDASetEpsLin specifies the nonlinear -> linear tolerance scale factor */
-int IDASetEpsLin(void *ida_mem, realtype eplifac)
+int IDASetEpsLin(void *ida_mem, sunrealtype eplifac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -330,7 +330,7 @@ int IDASetEpsLin(void *ida_mem, realtype eplifac)
 
 /* IDASetWRMSNormFactor sets or computes the factor to use when converting from
    the integrator tolerance to the linear solver tolerance (WRMS to L2 norm). */
-int IDASetLSNormFactor(void *ida_mem, realtype nrmfac)
+int IDASetLSNormFactor(void *ida_mem, sunrealtype nrmfac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -359,7 +359,7 @@ int IDASetLSNormFactor(void *ida_mem, realtype nrmfac)
 
 /* IDASetLinearSolutionScaling enables or disables scaling the linear solver
    solution to account for changes in cj. */
-int IDASetLinearSolutionScaling(void *ida_mem, booleantype onoff)
+int IDASetLinearSolutionScaling(void *ida_mem, sunbooleantype onoff)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -381,7 +381,7 @@ int IDASetLinearSolutionScaling(void *ida_mem, booleantype onoff)
 
 
 /* IDASetIncrementFactor specifies increment factor for DQ approximations to Jv */
-int IDASetIncrementFactor(void *ida_mem, realtype dqincfac)
+int IDASetIncrementFactor(void *ida_mem, sunrealtype dqincfac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -890,7 +890,7 @@ int idaLsPSetup(void *ida_mem)
   is the only case in which the user's psolve routine is allowed
   to be NULL.
   ---------------------------------------------------------------*/
-int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, realtype tol, int lr)
+int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -918,7 +918,7 @@ int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, realtype tol, int lr)
   implementations of the difference quotient Jacobian
   approximation routines.
 ---------------------------------------------------------------*/
-int idaLsDQJac(realtype t, realtype c_j, N_Vector y, N_Vector yp,
+int idaLsDQJac(sunrealtype t, sunrealtype c_j, N_Vector y, N_Vector yp,
                N_Vector r, SUNMatrix Jac, void *ida_mem,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
@@ -980,12 +980,12 @@ int idaLsDQJac(realtype t, realtype c_j, N_Vector y, N_Vector yp,
   actual computation of the jth column of the Jacobian is
   done with a call to N_VLinearSum.
 ---------------------------------------------------------------*/
-int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsDenseDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                     N_Vector yp, N_Vector rr, SUNMatrix Jac,
                     IDAMem IDA_mem, N_Vector tmp1)
 {
-  realtype inc, inc_inv, yj, ypj, srur, conj;
-  realtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
+  sunrealtype inc, inc_inv, yj, ypj, srur, conj;
+  sunrealtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
   N_Vector rtemp, jthCol;
   sunindextype j, N;
   IDALsMem idals_mem;
@@ -1076,14 +1076,14 @@ int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
   The return value is either IDABAND_SUCCESS = 0, or the nonzero
   value returned by the res routine, if any.
   ---------------------------------------------------------------*/
-int idaLsBandDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsBandDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                    N_Vector yp, N_Vector rr, SUNMatrix Jac,
                    IDAMem IDA_mem, N_Vector tmp1, N_Vector tmp2,
                    N_Vector tmp3)
 {
-  realtype inc, inc_inv, yj, ypj, srur, conj, ewtj;
-  realtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
-  realtype *ytemp_data, *yptemp_data, *rtemp_data, *r_data, *col_j;
+  sunrealtype inc, inc_inv, yj, ypj, srur, conj, ewtj;
+  sunrealtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
+  sunrealtype *ytemp_data, *yptemp_data, *rtemp_data, *r_data, *col_j;
   N_Vector rtemp, ytemp, yptemp;
   sunindextype i, j, i1, i2, width, ngroups, group;
   sunindextype N, mupper, mlower;
@@ -1203,14 +1203,14 @@ int idaLsBandDQJac(realtype tt, realtype c_j, N_Vector yy,
   The return value from the call to res is saved in order to set
   the return flag from idaLsSolve.
   ---------------------------------------------------------------*/
-int idaLsDQJtimes(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-                  N_Vector v, N_Vector Jv, realtype c_j,
+int idaLsDQJtimes(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+                  N_Vector v, N_Vector Jv, sunrealtype c_j,
                   void *ida_mem, N_Vector work1, N_Vector work2)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
   N_Vector y_tmp, yp_tmp;
-  realtype sig, siginv;
+  sunrealtype sig, siginv;
   int      iter, retval;
   SUNLinearSolver_ID LSID;
 
@@ -1435,7 +1435,7 @@ int idaLsSolve(IDAMem IDA_mem, N_Vector b, N_Vector weight,
 {
   IDALsMem idals_mem;
   int      nli_inc, retval;
-  realtype tol, w_mean;
+  sunrealtype tol, w_mean;
 
   /* access IDALsMem structure */
   if (IDA_mem->ida_lmem == NULL) {
@@ -1593,9 +1593,9 @@ int idaLsSolve(IDAMem IDA_mem, N_Vector b, N_Vector weight,
 int idaLsPerf(IDAMem IDA_mem, int perftask)
 {
   IDALsMem    idals_mem;
-  realtype    rcfn, rcfl;
+  sunrealtype    rcfn, rcfl;
   long int    nstd, nnid;
-  booleantype lcfn, lcfl;
+  sunbooleantype lcfn, lcfl;
 
   /* access IDALsMem structure */
   if (IDA_mem->ida_lmem == NULL) {
@@ -1626,8 +1626,8 @@ int idaLsPerf(IDAMem IDA_mem, int perftask)
   nnid = IDA_mem->ida_nni - idals_mem->nni0;
   if (nstd == 0 || nnid == 0) return(0);
 
-  rcfn = ((realtype) (IDA_mem->ida_ncfn - idals_mem->ncfn0)) / ((realtype) nstd);
-  rcfl = ((realtype) (idals_mem->ncfl - idals_mem->ncfl0)) / ((realtype) nnid);
+  rcfn = ((sunrealtype) (IDA_mem->ida_ncfn - idals_mem->ncfn0)) / ((sunrealtype) nstd);
+  rcfl = ((sunrealtype) (idals_mem->ncfl - idals_mem->ncfl0)) / ((sunrealtype) nnid);
   lcfn = (rcfn > PT9);
   lcfl = (rcfl > PT9);
   if (!(lcfn || lcfl)) return(0);
diff --git a/src/ida/ida_ls_impl.h b/src/ida/ida_ls_impl.h
index a32222e38a..1971a5935b 100644
--- a/src/ida/ida_ls_impl.h
+++ b/src/ida/ida_ls_impl.h
@@ -35,11 +35,11 @@ extern "C" {
 typedef struct IDALsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;    /* SUNTRUE if using internal DQ Jacobian approx. */
+  sunbooleantype jacDQ;    /* SUNTRUE if using internal DQ Jacobian approx. */
   IDALsJacFn jac;       /* Jacobian routine to be called                 */
   void *J_data;         /* J_data is passed to jac                       */
 
@@ -54,14 +54,14 @@ typedef struct IDALsMemRec {
   N_Vector rcur;        /* rcur = F(tn, ycur, ypcur)                     */
 
   /* Matrix-based solver, scale solution to account for change in cj */
-  booleantype scalesol;
+  sunbooleantype scalesol;
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor       */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor      */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor       */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor      */
 
   /* Statistics and associated parameters */
-  realtype dqincfac;  /* dqincfac = optional increment factor in Jv   */
+  sunrealtype dqincfac;  /* dqincfac = optional increment factor in Jv   */
   long int nje;       /* nje = no. of calls to jac                    */
   long int npe;       /* npe = total number of precond calls          */
   long int nli;       /* nli = total number of linear iterations      */
@@ -99,7 +99,7 @@ typedef struct IDALsMemRec {
      (b) internal jtimes
          - jt_data == ida_mem
          - jtimesDQ == SUNTRUE */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   IDALsJacTimesSetupFn jtsetup;
   IDALsJacTimesVecFn jtimes;
   IDAResFn jt_res;
@@ -116,22 +116,22 @@ typedef struct IDALsMemRec {
 int idaLsATimes(void *ida_mem, N_Vector v, N_Vector z);
 int idaLsPSetup(void *ida_mem);
 int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z,
-                realtype tol, int lr);
+                sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jac times vector */
-int idaLsDQJtimes(realtype tt, N_Vector yy, N_Vector yp,
+int idaLsDQJtimes(sunrealtype tt, N_Vector yy, N_Vector yp,
                   N_Vector rr, N_Vector v, N_Vector Jv,
-                  realtype c_j, void *data,
+                  sunrealtype c_j, void *data,
                   N_Vector work1, N_Vector work2);
 
 /* Difference-quotient Jacobian approximation routines */
-int idaLsDQJac(realtype tt, realtype c_j, N_Vector yy, N_Vector yp,
+int idaLsDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy, N_Vector yp,
                N_Vector rr, SUNMatrix Jac, void *data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsDenseDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                     N_Vector yp, N_Vector rr, SUNMatrix Jac,
                     IDAMem IDA_mem, N_Vector tmp1);
-int idaLsBandDQJac(realtype tt, realtype c_j,  N_Vector yy,
+int idaLsBandDQJac(sunrealtype tt, sunrealtype c_j,  N_Vector yy,
                    N_Vector yp, N_Vector rr, SUNMatrix Jac,
                    IDAMem IDA_mem, N_Vector tmp1,
                    N_Vector tmp2, N_Vector tmp3);
diff --git a/src/ida/ida_nls.c b/src/ida/ida_nls.c
index 4424c3ad28..5660360f0d 100644
--- a/src/ida/ida_nls.c
+++ b/src/ida/ida_nls.c
@@ -18,20 +18,20 @@
 #include "sundials/sundials_math.h"
 
 /* constant macros */
-#define PT0001  RCONST(0.0001) /* real 0.0001 */
-#define ONE     RCONST(1.0)    /* real 1.0    */
-#define TWENTY  RCONST(20.0)   /* real 20.0   */
+#define PT0001  SUN_RCONST(0.0001) /* real 0.0001 */
+#define ONE     SUN_RCONST(1.0)    /* real 1.0    */
+#define TWENTY  SUN_RCONST(20.0)   /* real 20.0   */
 
 /* nonlinear solver parameters */
 #define MAXIT   4           /* default max number of nonlinear iterations    */
-#define RATEMAX RCONST(0.9) /* max convergence rate used in divergence check */
+#define RATEMAX SUN_RCONST(0.9) /* max convergence rate used in divergence check */
 
 /* private functions passed to nonlinear solver */
 static int idaNlsResidual(N_Vector ycor, N_Vector res, void* ida_mem);
-static int idaNlsLSetup(booleantype jbad, booleantype* jcur, void* ida_mem);
+static int idaNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* ida_mem);
 static int idaNlsLSolve(N_Vector delta, void* ida_mem);
 static int idaNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                          realtype tol, N_Vector ewt, void* ida_mem);
+                          sunrealtype tol, N_Vector ewt, void* ida_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -160,9 +160,9 @@ int IDASetNlsResFn(void *ida_mem, IDAResFn res)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur, N_Vector *yypred,
+int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur, N_Vector *yypred,
                               N_Vector *yppred, N_Vector *yyn, N_Vector *ypn,
-                              N_Vector *res, realtype *cj, void **user_data)
+                              N_Vector *res, sunrealtype *cj, void **user_data)
 {
   IDAMem IDA_mem;
 
@@ -233,7 +233,7 @@ int idaNlsInit(IDAMem IDA_mem)
 }
 
 
-static int idaNlsLSetup(booleantype jbad, booleantype* jcur, void* ida_mem)
+static int idaNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* ida_mem)
 {
   IDAMem IDA_mem;
   int retval;
@@ -319,12 +319,12 @@ static int idaNlsResidual(N_Vector ycor, N_Vector res, void* ida_mem)
 
 
 static int idaNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                          realtype tol, N_Vector ewt, void* ida_mem)
+                          sunrealtype tol, N_Vector ewt, void* ida_mem)
 {
   IDAMem IDA_mem;
   int m, retval;
-  realtype delnrm;
-  realtype rate;
+  sunrealtype delnrm;
+  sunrealtype rate;
 
   if (ida_mem == NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDA", "idaNlsConvTest", MSG_NO_MEM);
diff --git a/src/idas/fmod/fidas_mod.c b/src/idas/fmod/fidas_mod.c
index 029d76752f..165f47ecd6 100644
--- a/src/idas/fmod/fidas_mod.c
+++ b/src/idas/fmod/fidas_mod.c
@@ -326,14 +326,14 @@ SWIGEXPORT int _wrap_FIDAInit(void *farg1, IDAResFn farg2, double const *farg3,
   int fresult ;
   void *arg1 = (void *) 0 ;
   IDAResFn arg2 = (IDAResFn) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (IDAResFn)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAInit(arg1,arg2,arg3,arg4,arg5);
@@ -345,13 +345,13 @@ SWIGEXPORT int _wrap_FIDAInit(void *farg1, IDAResFn farg2, double const *farg3,
 SWIGEXPORT int _wrap_FIDAReInit(void *farg1, double const *farg2, N_Vector farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAReInit(arg1,arg2,arg3,arg4);
@@ -363,13 +363,13 @@ SWIGEXPORT int _wrap_FIDAReInit(void *farg1, double const *farg2, N_Vector farg3
 SWIGEXPORT int _wrap_FIDASStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -379,12 +379,12 @@ SWIGEXPORT int _wrap_FIDASStolerances(void *farg1, double const *farg2, double c
 SWIGEXPORT int _wrap_FIDASVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)IDASVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -410,12 +410,12 @@ SWIGEXPORT int _wrap_FIDACalcIC(void *farg1, int const *farg2, double const *far
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDACalcIC(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -425,11 +425,11 @@ SWIGEXPORT int _wrap_FIDACalcIC(void *farg1, int const *farg2, double const *far
 SWIGEXPORT int _wrap_FIDASetNonlinConvCoefIC(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetNonlinConvCoefIC(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -495,11 +495,11 @@ SWIGEXPORT int _wrap_FIDASetLineSearchOffIC(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDASetStepToleranceIC(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetStepToleranceIC(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -523,11 +523,11 @@ SWIGEXPORT int _wrap_FIDASetMaxBacksIC(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDASetDeltaCjLSetup(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetDeltaCjLSetup(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -609,11 +609,11 @@ SWIGEXPORT int _wrap_FIDASetMaxNumSteps(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FIDASetInitStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -623,11 +623,11 @@ SWIGEXPORT int _wrap_FIDASetInitStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetMaxStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetMaxStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -637,11 +637,11 @@ SWIGEXPORT int _wrap_FIDASetMaxStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetMinStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetMinStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -651,11 +651,11 @@ SWIGEXPORT int _wrap_FIDASetMinStep(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetStopTime(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetStopTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -733,13 +733,13 @@ SWIGEXPORT int _wrap_FIDASetConstraints(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaFixedStepBounds(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetEtaFixedStepBounds(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -749,11 +749,11 @@ SWIGEXPORT int _wrap_FIDASetEtaFixedStepBounds(void *farg1, double const *farg2,
 SWIGEXPORT int _wrap_FIDASetEtaMin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -763,11 +763,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaMax(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMax(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -777,11 +777,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMax(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaLow(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaLow(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -791,11 +791,11 @@ SWIGEXPORT int _wrap_FIDASetEtaLow(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaMinErrFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaMinErrFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -805,11 +805,11 @@ SWIGEXPORT int _wrap_FIDASetEtaMinErrFail(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetEtaConvFail(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEtaConvFail(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -861,11 +861,11 @@ SWIGEXPORT int _wrap_FIDASetNlsResFn(void *farg1, IDAResFn farg2) {
 SWIGEXPORT int _wrap_FIDASetNonlinConvCoef(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetNonlinConvCoef(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -931,16 +931,16 @@ SWIGEXPORT int _wrap_FIDASetNoInactiveRootWarn(void *farg1) {
 SWIGEXPORT int _wrap_FIDASolve(void *farg1, double const *farg2, double *farg3, N_Vector farg4, N_Vector farg5, int const *farg6) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int arg6 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (int)(*farg6);
@@ -1017,13 +1017,13 @@ SWIGEXPORT int _wrap_FIDAComputeYpSens(void *farg1, void *farg2, void *farg3) {
 SWIGEXPORT int _wrap_FIDAGetDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetDky(arg1,arg2,arg3,arg4);
@@ -1165,11 +1165,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentOrder(void *farg1, int *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentCj(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentCj(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1235,11 +1235,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentYpSens(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FIDAGetActualInitStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetActualInitStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1249,11 +1249,11 @@ SWIGEXPORT int _wrap_FIDAGetActualInitStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetLastStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetLastStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1263,11 +1263,11 @@ SWIGEXPORT int _wrap_FIDAGetLastStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentStep(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1277,11 +1277,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentStep(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetCurrentTime(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetCurrentTime(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1291,11 +1291,11 @@ SWIGEXPORT int _wrap_FIDAGetCurrentTime(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FIDAGetTolScaleFactor(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)IDAGetTolScaleFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -1367,10 +1367,10 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
   long *arg5 = (long *) 0 ;
   int *arg6 = (int *) 0 ;
   int *arg7 = (int *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
-  realtype *arg9 = (realtype *) 0 ;
-  realtype *arg10 = (realtype *) 0 ;
-  realtype *arg11 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
+  sunrealtype *arg9 = (sunrealtype *) 0 ;
+  sunrealtype *arg10 = (sunrealtype *) 0 ;
+  sunrealtype *arg11 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
@@ -1380,10 +1380,10 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
   arg5 = (long *)(farg5);
   arg6 = (int *)(farg6);
   arg7 = (int *)(farg7);
-  arg8 = (realtype *)(farg8);
-  arg9 = (realtype *)(farg9);
-  arg10 = (realtype *)(farg10);
-  arg11 = (realtype *)(farg11);
+  arg8 = (sunrealtype *)(farg8);
+  arg9 = (sunrealtype *)(farg9);
+  arg10 = (sunrealtype *)(farg10);
+  arg11 = (sunrealtype *)(farg11);
   result = (int)IDAGetIntegratorStats(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10,arg11);
   fresult = (int)(result);
   return fresult;
@@ -1393,24 +1393,24 @@ SWIGEXPORT int _wrap_FIDAGetIntegratorStats(void *farg1, long *farg2, long *farg
 SWIGEXPORT int _wrap_FIDAGetNonlinearSystemData(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, void *farg6, void *farg7, double *farg8, void *farg9) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   N_Vector *arg7 = (N_Vector *) 0 ;
-  realtype *arg8 = (realtype *) 0 ;
+  sunrealtype *arg8 = (sunrealtype *) 0 ;
   void **arg9 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   arg7 = (N_Vector *)(farg7);
-  arg8 = (realtype *)(farg8);
+  arg8 = (sunrealtype *)(farg8);
   arg9 = (void **)(farg9);
   result = (int)IDAGetNonlinearSystemData(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
   fresult = (int)(result);
@@ -1421,22 +1421,22 @@ SWIGEXPORT int _wrap_FIDAGetNonlinearSystemData(void *farg1, double *farg2, void
 SWIGEXPORT int _wrap_FIDAGetNonlinearSystemDataSens(void *farg1, double *farg2, void *farg3, void *farg4, void *farg5, void *farg6, double *farg7, void *farg8) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector **arg3 = (N_Vector **) 0 ;
   N_Vector **arg4 = (N_Vector **) 0 ;
   N_Vector **arg5 = (N_Vector **) 0 ;
   N_Vector **arg6 = (N_Vector **) 0 ;
-  realtype *arg7 = (realtype *) 0 ;
+  sunrealtype *arg7 = (sunrealtype *) 0 ;
   void **arg8 = (void **) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector **)(farg3);
   arg4 = (N_Vector **)(farg4);
   arg5 = (N_Vector **)(farg5);
   arg6 = (N_Vector **)(farg6);
-  arg7 = (realtype *)(farg7);
+  arg7 = (sunrealtype *)(farg7);
   arg8 = (void **)(farg8);
   result = (int)IDAGetNonlinearSystemDataSens(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8);
   fresult = (int)(result);
@@ -1600,13 +1600,13 @@ SWIGEXPORT int _wrap_FIDAQuadReInit(void *farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FIDAQuadSStolerances(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDAQuadSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1616,12 +1616,12 @@ SWIGEXPORT int _wrap_FIDAQuadSStolerances(void *farg1, double const *farg2, doub
 SWIGEXPORT int _wrap_FIDAQuadSVtolerances(void *farg1, double const *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)IDAQuadSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1646,12 +1646,12 @@ SWIGEXPORT int _wrap_FIDASetQuadErrCon(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDAGetQuad(void *farg1, double *farg2, N_Vector farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   result = (int)IDAGetQuad(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1662,13 +1662,13 @@ SWIGEXPORT int _wrap_FIDAGetQuad(void *farg1, double *farg2, N_Vector farg3) {
 SWIGEXPORT int _wrap_FIDAGetQuadDky(void *farg1, double const *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetQuadDky(arg1,arg2,arg3,arg4);
@@ -1786,13 +1786,13 @@ SWIGEXPORT int _wrap_FIDASensReInit(void *farg1, int const *farg2, void *farg3,
 SWIGEXPORT int _wrap_FIDASensSStolerances(void *farg1, double const *farg2, double *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)IDASensSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1802,12 +1802,12 @@ SWIGEXPORT int _wrap_FIDASensSStolerances(void *farg1, double const *farg2, doub
 SWIGEXPORT int _wrap_FIDASensSVtolerances(void *farg1, double const *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)IDASensSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1847,12 +1847,12 @@ SWIGEXPORT int _wrap_FIDASetSensDQMethod(void *farg1, int const *farg2, double c
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetSensDQMethod(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1890,14 +1890,14 @@ SWIGEXPORT int _wrap_FIDASetSensMaxNonlinIters(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDASetSensParams(void *farg1, double *farg2, double *farg3, int *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int *arg4 = (int *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype *)(farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (int *)(farg4);
   result = (int)IDASetSensParams(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -1948,12 +1948,12 @@ SWIGEXPORT int _wrap_FIDASensToggleOff(void *farg1) {
 SWIGEXPORT int _wrap_FIDAGetSens(void *farg1, double *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)IDAGetSens(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -1964,13 +1964,13 @@ SWIGEXPORT int _wrap_FIDAGetSens(void *farg1, double *farg2, void *farg3) {
 SWIGEXPORT int _wrap_FIDAGetSens1(void *farg1, double *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetSens1(arg1,arg2,arg3,arg4);
@@ -1982,13 +1982,13 @@ SWIGEXPORT int _wrap_FIDAGetSens1(void *farg1, double *farg2, int const *farg3,
 SWIGEXPORT int _wrap_FIDAGetSensDky(void *farg1, double const *farg2, int const *farg3, void *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)IDAGetSensDky(arg1,arg2,arg3,arg4);
@@ -2000,14 +2000,14 @@ SWIGEXPORT int _wrap_FIDAGetSensDky(void *farg1, double const *farg2, int const
 SWIGEXPORT int _wrap_FIDAGetSensDky1(void *farg1, double const *farg2, int const *farg3, int const *farg4, N_Vector farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
   arg5 = (N_Vector)(farg5);
@@ -2206,13 +2206,13 @@ SWIGEXPORT int _wrap_FIDAQuadSensReInit(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FIDAQuadSensSStolerances(void *farg1, double const *farg2, double *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)IDAQuadSensSStolerances(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2222,12 +2222,12 @@ SWIGEXPORT int _wrap_FIDAQuadSensSStolerances(void *farg1, double const *farg2,
 SWIGEXPORT int _wrap_FIDAQuadSensSVtolerances(void *farg1, double const *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)IDAQuadSensSVtolerances(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2264,12 +2264,12 @@ SWIGEXPORT int _wrap_FIDASetQuadSensErrCon(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FIDAGetQuadSens(void *farg1, double *farg2, void *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)IDAGetQuadSens(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2280,13 +2280,13 @@ SWIGEXPORT int _wrap_FIDAGetQuadSens(void *farg1, double *farg2, void *farg3) {
 SWIGEXPORT int _wrap_FIDAGetQuadSens1(void *farg1, double *farg2, int const *farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetQuadSens1(arg1,arg2,arg3,arg4);
@@ -2298,13 +2298,13 @@ SWIGEXPORT int _wrap_FIDAGetQuadSens1(void *farg1, double *farg2, int const *far
 SWIGEXPORT int _wrap_FIDAGetQuadSensDky(void *farg1, double const *farg2, int const *farg3, void *farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)IDAGetQuadSensDky(arg1,arg2,arg3,arg4);
@@ -2316,14 +2316,14 @@ SWIGEXPORT int _wrap_FIDAGetQuadSensDky(void *farg1, double const *farg2, int co
 SWIGEXPORT int _wrap_FIDAGetQuadSensDky1(void *farg1, double const *farg2, int const *farg3, int const *farg4, N_Vector farg5) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
   arg5 = (N_Vector)(farg5);
@@ -2454,7 +2454,7 @@ SWIGEXPORT int _wrap_FIDAInitB(void *farg1, int const *farg2, IDAResFnB farg3, d
   void *arg1 = (void *) 0 ;
   int arg2 ;
   IDAResFnB arg3 = (IDAResFnB) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   N_Vector arg6 = (N_Vector) 0 ;
   int result;
@@ -2462,7 +2462,7 @@ SWIGEXPORT int _wrap_FIDAInitB(void *farg1, int const *farg2, IDAResFnB farg3, d
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (IDAResFnB)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (N_Vector)(farg6);
   result = (int)IDAInitB(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -2476,7 +2476,7 @@ SWIGEXPORT int _wrap_FIDAInitBS(void *farg1, int const *farg2, IDAResFnBS farg3,
   void *arg1 = (void *) 0 ;
   int arg2 ;
   IDAResFnBS arg3 = (IDAResFnBS) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector arg5 = (N_Vector) 0 ;
   N_Vector arg6 = (N_Vector) 0 ;
   int result;
@@ -2484,7 +2484,7 @@ SWIGEXPORT int _wrap_FIDAInitBS(void *farg1, int const *farg2, IDAResFnBS farg3,
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (IDAResFnBS)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (N_Vector)(farg6);
   result = (int)IDAInitBS(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -2497,14 +2497,14 @@ SWIGEXPORT int _wrap_FIDAReInitB(void *farg1, int const *farg2, double const *fa
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAReInitB(arg1,arg2,arg3,arg4,arg5);
@@ -2517,14 +2517,14 @@ SWIGEXPORT int _wrap_FIDASStolerancesB(void *farg1, int const *farg2, double con
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)IDASStolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -2535,13 +2535,13 @@ SWIGEXPORT int _wrap_FIDASVtolerancesB(void *farg1, int const *farg2, double con
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDASVtolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2605,14 +2605,14 @@ SWIGEXPORT int _wrap_FIDAQuadSStolerancesB(void *farg1, int const *farg2, double
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg3 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg3 = (sunrealtype)(*farg3);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)IDAQuadSStolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -2623,13 +2623,13 @@ SWIGEXPORT int _wrap_FIDAQuadSVtolerancesB(void *farg1, int const *farg2, double
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAQuadSVtolerancesB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2641,14 +2641,14 @@ SWIGEXPORT int _wrap_FIDACalcICB(void *farg1, int const *farg2, double const *fa
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDACalcICB(arg1,arg2,arg3,arg4,arg5);
@@ -2661,7 +2661,7 @@ SWIGEXPORT int _wrap_FIDACalcICBS(void *farg1, int const *farg2, double const *f
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
@@ -2670,7 +2670,7 @@ SWIGEXPORT int _wrap_FIDACalcICBS(void *farg1, int const *farg2, double const *f
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (N_Vector *)(farg6);
@@ -2684,8 +2684,8 @@ SWIGEXPORT int _wrap_FIDACalcICBS(void *farg1, int const *farg2, double const *f
 SWIGEXPORT int _wrap_FIDASolveF(void *farg1, double const *farg2, double *farg3, N_Vector farg4, N_Vector farg5, int const *farg6, int *farg7) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype arg2 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int arg6 ;
@@ -2693,8 +2693,8 @@ SWIGEXPORT int _wrap_FIDASolveF(void *farg1, double const *farg2, double *farg3,
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   arg6 = (int)(*farg6);
@@ -2708,12 +2708,12 @@ SWIGEXPORT int _wrap_FIDASolveF(void *farg1, double const *farg2, double *farg3,
 SWIGEXPORT int _wrap_FIDASolveB(void *farg1, double const *farg2, int const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   result = (int)IDASolveB(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -2785,12 +2785,12 @@ SWIGEXPORT int _wrap_FIDASetInitStepB(void *farg1, int const *farg2, double cons
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetInitStepB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2801,12 +2801,12 @@ SWIGEXPORT int _wrap_FIDASetMaxStepB(void *farg1, int const *farg2, double const
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetMaxStepB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -2897,14 +2897,14 @@ SWIGEXPORT int _wrap_FIDAGetB(void *farg1, int const *farg2, double *farg3, N_Ve
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAGetB(arg1,arg2,arg3,arg4,arg5);
@@ -2917,13 +2917,13 @@ SWIGEXPORT int _wrap_FIDAGetQuadB(void *farg1, int const *farg2, double *farg3,
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetQuadB(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -2966,13 +2966,13 @@ SWIGEXPORT int _wrap_FIDAGetConsistentICB(void *farg1, int const *farg2, N_Vecto
 SWIGEXPORT int _wrap_FIDAGetAdjY(void *farg1, double const *farg2, N_Vector farg3, N_Vector farg4) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)IDAGetAdjY(arg1,arg2,arg3,arg4);
@@ -3031,11 +3031,11 @@ SWIGEXPORT void * _wrap_IDAadjCheckPointRec_next_addr_get(SwigClassWrapper const
 
 SWIGEXPORT void _wrap_IDAadjCheckPointRec_t0_set(SwigClassWrapper const *farg1, double const *farg2) {
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::t0", return );
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->t0 = arg2;
 }
 
@@ -3043,23 +3043,23 @@ SWIGEXPORT void _wrap_IDAadjCheckPointRec_t0_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double _wrap_IDAadjCheckPointRec_t0_get(SwigClassWrapper const *farg1) {
   double fresult ;
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::t0", return 0);
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->t0);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->t0);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_IDAadjCheckPointRec_t1_set(SwigClassWrapper const *farg1, double const *farg2) {
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::t1", return );
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->t1 = arg2;
 }
 
@@ -3067,12 +3067,12 @@ SWIGEXPORT void _wrap_IDAadjCheckPointRec_t1_set(SwigClassWrapper const *farg1,
 SWIGEXPORT double _wrap_IDAadjCheckPointRec_t1_get(SwigClassWrapper const *farg1) {
   double fresult ;
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::t1", return 0);
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->t1);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->t1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -3127,11 +3127,11 @@ SWIGEXPORT int _wrap_IDAadjCheckPointRec_order_get(SwigClassWrapper const *farg1
 
 SWIGEXPORT void _wrap_IDAadjCheckPointRec_step_set(SwigClassWrapper const *farg1, double const *farg2) {
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::step", return );
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   if (arg1) (arg1)->step = arg2;
 }
 
@@ -3139,12 +3139,12 @@ SWIGEXPORT void _wrap_IDAadjCheckPointRec_step_set(SwigClassWrapper const *farg1
 SWIGEXPORT double _wrap_IDAadjCheckPointRec_step_get(SwigClassWrapper const *farg1) {
   double fresult ;
   IDAadjCheckPointRec *arg1 = (IDAadjCheckPointRec *) 0 ;
-  realtype result;
+  sunrealtype result;
   
   SWIG_check_mutable_nonnull(*farg1, "IDAadjCheckPointRec *", "IDAadjCheckPointRec", "IDAadjCheckPointRec::step", return 0);
   arg1 = (IDAadjCheckPointRec *)(farg1->cptr);
-  result = (realtype) ((arg1)->step);
-  fresult = (realtype)(result);
+  result = (sunrealtype) ((arg1)->step);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -3215,14 +3215,14 @@ SWIGEXPORT int _wrap_FIDAGetAdjDataPointHermite(void *farg1, int const *farg2, d
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAGetAdjDataPointHermite(arg1,arg2,arg3,arg4,arg5);
@@ -3235,14 +3235,14 @@ SWIGEXPORT int _wrap_FIDAGetAdjDataPointPolynomial(void *farg1, int const *farg2
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int *arg4 = (int *) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (int *)(farg4);
   arg5 = (N_Vector)(farg5);
   result = (int)IDAGetAdjDataPointPolynomial(arg1,arg2,arg3,arg4,arg5);
@@ -3273,7 +3273,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   IDABBDLocalFn arg8 = (IDABBDLocalFn) 0 ;
   IDABBDCommFn arg9 = (IDABBDCommFn) 0 ;
   int result;
@@ -3284,7 +3284,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (IDABBDLocalFn)(farg8);
   arg9 = (IDABBDCommFn)(farg9);
   result = (int)IDABBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
@@ -3298,13 +3298,13 @@ SWIGEXPORT int _wrap_FIDABBDPrecReInit(void *farg1, int64_t const *farg2, int64_
   void *arg1 = (void *) 0 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   result = (int)IDABBDPrecReInit(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -3350,7 +3350,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInitB(void *farg1, int const *farg2, int64_t con
   sunindextype arg5 ;
   sunindextype arg6 ;
   sunindextype arg7 ;
-  realtype arg8 ;
+  sunrealtype arg8 ;
   IDABBDLocalFnB arg9 = (IDABBDLocalFnB) 0 ;
   IDABBDCommFnB arg10 = (IDABBDCommFnB) 0 ;
   int result;
@@ -3362,7 +3362,7 @@ SWIGEXPORT int _wrap_FIDABBDPrecInitB(void *farg1, int const *farg2, int64_t con
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
   arg7 = (sunindextype)(*farg7);
-  arg8 = (realtype)(*farg8);
+  arg8 = (sunrealtype)(*farg8);
   arg9 = (IDABBDLocalFnB)(farg9);
   arg10 = (IDABBDCommFnB)(farg10);
   result = (int)IDABBDPrecInitB(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
@@ -3377,14 +3377,14 @@ SWIGEXPORT int _wrap_FIDABBDPrecReInitB(void *farg1, int const *farg2, int64_t c
   int arg2 ;
   sunindextype arg3 ;
   sunindextype arg4 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
   arg3 = (sunindextype)(*farg3);
   arg4 = (sunindextype)(*farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)IDABBDPrecReInitB(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -3456,11 +3456,11 @@ SWIGEXPORT int _wrap_FIDASetJacTimes(void *farg1, IDALsJacTimesSetupFn farg2, ID
 SWIGEXPORT int _wrap_FIDASetEpsLin(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetEpsLin(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3470,11 +3470,11 @@ SWIGEXPORT int _wrap_FIDASetEpsLin(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FIDASetLSNormFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetLSNormFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3498,11 +3498,11 @@ SWIGEXPORT int _wrap_FIDASetLinearSolutionScaling(void *farg1, int const *farg2)
 SWIGEXPORT int _wrap_FIDASetIncrementFactor(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)IDASetIncrementFactor(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -3774,12 +3774,12 @@ SWIGEXPORT int _wrap_FIDASetEpsLinB(void *farg1, int const *farg2, double const
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetEpsLinB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -3790,12 +3790,12 @@ SWIGEXPORT int _wrap_FIDASetLSNormFactorB(void *farg1, int const *farg2, double
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetLSNormFactorB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -3822,12 +3822,12 @@ SWIGEXPORT int _wrap_FIDASetIncrementFactorB(void *farg1, int const *farg2, doub
   int fresult ;
   void *arg1 = (void *) 0 ;
   int arg2 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)IDASetIncrementFactorB(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
diff --git a/src/idas/fmod/fidas_mod.f90 b/src/idas/fmod/fidas_mod.f90
index 1f4e76d256..81f8480540 100644
--- a/src/idas/fmod/fidas_mod.f90
+++ b/src/idas/fmod/fidas_mod.f90
@@ -6452,13 +6452,13 @@ function FIDAGetJacCj(ida_mem, cj_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: ida_mem
-real(C_DOUBLE), target, intent(inout) :: cj_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: cj_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = ida_mem
-farg2 = c_loc(cj_j)
+farg2 = c_loc(cj_j(1))
 fresult = swigc_FIDAGetJacCj(farg1, farg2)
 swig_result = fresult
 end function
@@ -6468,13 +6468,13 @@ function FIDAGetJacTime(ida_mem, t_j) &
 use, intrinsic :: ISO_C_BINDING
 integer(C_INT) :: swig_result
 type(C_PTR) :: ida_mem
-real(C_DOUBLE), target, intent(inout) :: t_j
+real(C_DOUBLE), dimension(*), target, intent(inout) :: t_j
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 type(C_PTR) :: farg2 
 
 farg1 = ida_mem
-farg2 = c_loc(t_j)
+farg2 = c_loc(t_j(1))
 fresult = swigc_FIDAGetJacTime(farg1, farg2)
 swig_result = fresult
 end function
diff --git a/src/idas/idaa.c b/src/idas/idaa.c
index 64ccdd45b1..115a9e6606 100644
--- a/src/idas/idaa.c
+++ b/src/idas/idaa.c
@@ -30,11 +30,11 @@
 /*                 IDAA Private Constants                          */
 /*=================================================================*/
 
-#define ZERO        RCONST(0.0)    /* real   0.0 */
-#define ONE         RCONST(1.0)    /* real   1.0 */
-#define TWO         RCONST(2.0)    /* real   2.0 */
-#define HUNDRED     RCONST(100.0)  /* real 100.0 */
-#define FUZZ_FACTOR RCONST(1000000.0)  /* fuzz factor for IDAAgetY */
+#define ZERO        SUN_RCONST(0.0)    /* real   0.0 */
+#define ONE         SUN_RCONST(1.0)    /* real   1.0 */
+#define TWO         SUN_RCONST(2.0)    /* real   2.0 */
+#define HUNDRED     SUN_RCONST(100.0)  /* real 100.0 */
+#define FUZZ_FACTOR SUN_RCONST(1000000.0)  /* fuzz factor for IDAAgetY */
 
 /*=================================================================*/
 /* Shortcuts                                                       */
@@ -49,46 +49,46 @@
 static IDAckpntMem IDAAckpntInit(IDAMem IDA_mem);
 static IDAckpntMem IDAAckpntNew(IDAMem IDA_mem);
 static void IDAAckpntCopyVectors(IDAMem IDA_mem, IDAckpntMem ck_mem);
-static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem);
+static sunbooleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem);
 static void IDAAckpntDelete(IDAckpntMem *ck_memPtr);
 
 static void IDAAbckpbDelete(IDABMem *IDAB_memPtr);
 
-static booleantype IDAAdataMalloc(IDAMem IDA_mem);
+static sunbooleantype IDAAdataMalloc(IDAMem IDA_mem);
 static void IDAAdataFree(IDAMem IDA_mem);
 static int  IDAAdataStore(IDAMem IDA_mem, IDAckpntMem ck_mem);
 
 static int  IDAAckpntGet(IDAMem IDA_mem, IDAckpntMem ck_mem);
 
-static booleantype IDAAhermiteMalloc(IDAMem IDA_mem);
+static sunbooleantype IDAAhermiteMalloc(IDAMem IDA_mem);
 static void        IDAAhermiteFree(IDAMem IDA_mem);
 static int         IDAAhermiteStorePnt(IDAMem IDA_mem, IDAdtpntMem d);
-static int         IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
+static int         IDAAhermiteGetY(IDAMem IDA_mem, sunrealtype t,
                                    N_Vector yy, N_Vector yp,
                                    N_Vector *yyS, N_Vector *ypS);
 
-static booleantype IDAApolynomialMalloc(IDAMem IDA_mem);
+static sunbooleantype IDAApolynomialMalloc(IDAMem IDA_mem);
 static void        IDAApolynomialFree(IDAMem IDA_mem);
 static int         IDAApolynomialStorePnt(IDAMem IDA_mem, IDAdtpntMem d);
-static int         IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
+static int         IDAApolynomialGetY(IDAMem IDA_mem, sunrealtype t,
                                       N_Vector yy, N_Vector yp,
                                       N_Vector *yyS, N_Vector *ypS);
 
-static int IDAAfindIndex(IDAMem ida_mem, realtype t,
-                         long int *indx, booleantype *newpoint);
+static int IDAAfindIndex(IDAMem ida_mem, sunrealtype t,
+                         long int *indx, sunbooleantype *newpoint);
 
-static int IDAAres(realtype tt,
+static int IDAAres(sunrealtype tt,
                    N_Vector yyB, N_Vector ypB,
                    N_Vector resvalB,  void *ida_mem);
 
-static int IDAArhsQ(realtype tt,
+static int IDAArhsQ(sunrealtype tt,
                      N_Vector yyB, N_Vector ypB,
                      N_Vector rrQB, void *ida_mem);
 
 static int IDAAGettnSolutionYp(IDAMem IDA_mem, N_Vector yp);
 static int IDAAGettnSolutionYpS(IDAMem IDA_mem, N_Vector *ypS);
 
-extern int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret);
+extern int IDAGetSolution(void *ida_mem, sunrealtype t, N_Vector yret, N_Vector ypret);
 
 
 /*=================================================================*/
@@ -355,7 +355,7 @@ static void IDAAbckpbDelete(IDABMem *IDAB_memPtr)
  *  ncheckPtr points to the number of check points stored so far.
 */
 
-int IDASolveF(void *ida_mem, realtype tout, realtype *tret,
+int IDASolveF(void *ida_mem, sunrealtype tout, sunrealtype *tret,
               N_Vector yret, N_Vector ypret, int itask, int *ncheckPtr)
 {
   IDAadjMem IDAADJ_mem;
@@ -364,8 +364,8 @@ int IDASolveF(void *ida_mem, realtype tout, realtype *tret,
   IDAdtpntMem *dt_mem;
   long int nstloc;
   int flag, i;
-  booleantype allocOK, earlyret;
-  realtype ttest;
+  sunbooleantype allocOK, earlyret;
+  sunrealtype ttest;
 
   /* Is the mem OK? */
   if (ida_mem == NULL) {
@@ -696,7 +696,7 @@ int IDACreateB(void *ida_mem, int *which)
 }
 
 int IDAInitB(void *ida_mem, int which, IDAResFnB resB,
-             realtype tB0, N_Vector yyB0, N_Vector ypB0)
+             sunrealtype tB0, N_Vector yyB0, N_Vector ypB0)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem IDA_mem;
@@ -770,7 +770,7 @@ int IDAInitB(void *ida_mem, int which, IDAResFnB resB,
 }
 
 int IDAInitBS(void *ida_mem, int which, IDAResFnBS resS,
-                realtype tB0, N_Vector yyB0, N_Vector ypB0)
+                sunrealtype tB0, N_Vector yyB0, N_Vector ypB0)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem IDA_mem;
@@ -851,7 +851,7 @@ int IDAInitBS(void *ida_mem, int which, IDAResFnBS resS,
 
 
 int IDAReInitB(void *ida_mem, int which,
-               realtype tB0, N_Vector yyB0, N_Vector ypB0)
+               sunrealtype tB0, N_Vector yyB0, N_Vector ypB0)
 {
 
   IDAadjMem IDAADJ_mem;
@@ -910,7 +910,7 @@ int IDAReInitB(void *ida_mem, int which,
 }
 
 int IDASStolerancesB(void *ida_mem, int which,
-                     realtype relTolB, realtype absTolB)
+                     sunrealtype relTolB, sunrealtype absTolB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -953,7 +953,7 @@ int IDASStolerancesB(void *ida_mem, int which,
 
 }
 int IDASVtolerancesB(void *ida_mem, int which,
-                     realtype relTolB, N_Vector absTolB)
+                     sunrealtype relTolB, N_Vector absTolB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -996,7 +996,7 @@ int IDASVtolerancesB(void *ida_mem, int which,
 }
 
 int IDAQuadSStolerancesB(void *ida_mem, int which,
-                         realtype reltolQB, realtype abstolQB)
+                         sunrealtype reltolQB, sunrealtype abstolQB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -1037,7 +1037,7 @@ int IDAQuadSStolerancesB(void *ida_mem, int which,
 
 
 int IDAQuadSVtolerancesB(void *ida_mem, int which,
-                         realtype reltolQB, N_Vector abstolQB)
+                         sunrealtype reltolQB, N_Vector abstolQB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -1253,7 +1253,7 @@ int IDAQuadReInitB(void *ida_mem, int which, N_Vector yQB0)
  * a call to IDACalcIC is NOT necessary (for index-one problems).
 */
 
-int IDACalcICB(void *ida_mem, int which, realtype tout1,
+int IDACalcICB(void *ida_mem, int which, sunrealtype tout1,
                N_Vector yy0, N_Vector yp0)
 {
   IDAMem IDA_mem;
@@ -1328,7 +1328,7 @@ int IDACalcICB(void *ida_mem, int which, realtype tout1,
  * It calls IDACalcIC for the 'which' backward problem.
 */
 
-int IDACalcICBS(void *ida_mem, int which, realtype tout1,
+int IDACalcICBS(void *ida_mem, int which, sunrealtype tout1,
                N_Vector yy0, N_Vector yp0,
                N_Vector *yyS0, N_Vector *ypS0)
 {
@@ -1447,15 +1447,15 @@ int IDACalcICBS(void *ida_mem, int which, realtype tout1,
  * when called in ONE_STEP mode.
  */
 
-int IDASolveB(void *ida_mem, realtype tBout, int itaskB)
+int IDASolveB(void *ida_mem, sunrealtype tBout, int itaskB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
   IDAckpntMem ck_mem;
   IDABMem IDAB_mem, tmp_IDAB_mem;
   int flag=0, sign;
-  realtype tfuzz, tBret, tBn;
-  booleantype gotCkpnt, reachedTBout, isActive;
+  sunrealtype tfuzz, tBret, tBn;
+  sunbooleantype gotCkpnt, reachedTBout, isActive;
 
   /* Is the mem OK? */
   if (ida_mem == NULL) {
@@ -1682,7 +1682,7 @@ int IDASolveB(void *ida_mem, realtype tBout, int itaskB)
  * in tret) as that at which IDASolveBreturned the solution.
  */
 
-int IDAGetB(void* ida_mem, int which, realtype *tret,
+int IDAGetB(void* ida_mem, int which, sunrealtype *tret,
                             N_Vector yy, N_Vector yp)
 {
   IDAMem IDA_mem;
@@ -1734,7 +1734,7 @@ int IDAGetB(void* ida_mem, int which, realtype *tret,
  * returned the solution.
  */
 
-int IDAGetQuadB(void *ida_mem, int which, realtype *tret, N_Vector qB)
+int IDAGetQuadB(void *ida_mem, int which, sunrealtype *tret, N_Vector qB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -1951,7 +1951,7 @@ static void IDAAckpntDelete(IDAckpntMem *ck_memPtr)
  * current state of IDAMem.
  *
  */
-static booleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem)
+static sunbooleantype IDAAckpntAllocVectors(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   int j, jj;
 
@@ -2093,7 +2093,7 @@ static void IDAAckpntCopyVectors(IDAMem IDA_mem, IDAckpntMem ck_mem)
  * at any other time.
 */
 
-static booleantype IDAAdataMalloc(IDAMem IDA_mem)
+static sunbooleantype IDAAdataMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
   IDAdtpntMem *dt_mem;
@@ -2170,7 +2170,7 @@ static int IDAAdataStore(IDAMem IDA_mem, IDAckpntMem ck_mem)
 {
   IDAadjMem IDAADJ_mem;
   IDAdtpntMem *dt_mem;
-  realtype t;
+  sunrealtype t;
   long int i;
   int flag, sign;
 
@@ -2328,13 +2328,13 @@ static int IDAAckpntGet(IDAMem IDA_mem, IDAckpntMem ck_mem)
  * at any other time.
  */
 
-static booleantype IDAAhermiteMalloc(IDAMem IDA_mem)
+static sunbooleantype IDAAhermiteMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
   IDAdtpntMem *dt_mem;
   IDAhermiteDataMem content;
   long int i, ii=0;
-  booleantype allocOK;
+  sunbooleantype allocOK;
 
   allocOK = SUNTRUE;
 
@@ -2554,7 +2554,7 @@ static int IDAAhermiteStorePnt(IDAMem IDA_mem, IDAdtpntMem d)
  * can be directly called by the user through IDAGetAdjY
  */
 
-static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
+static int IDAAhermiteGetY(IDAMem IDA_mem, sunrealtype t,
                            N_Vector yy, N_Vector yp,
                           N_Vector *yyS, N_Vector *ypS)
 {
@@ -2562,19 +2562,19 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
   IDAdtpntMem *dt_mem;
   IDAhermiteDataMem content0, content1;
 
-  realtype t0, t1, delta;
-  realtype factor1, factor2, factor3;
+  sunrealtype t0, t1, delta;
+  sunrealtype factor1, factor2, factor3;
 
   N_Vector y0, yd0, y1, yd1;
   N_Vector *yS0=NULL, *ySd0=NULL, *yS1, *ySd1;
 
   int flag, is, NS;
   long int indx;
-  booleantype newpoint;
+  sunbooleantype newpoint;
 
   /* local variables for fused vector oerations */
   int retval;
-  realtype  cvals[4];
+  sunrealtype  cvals[4];
   N_Vector  Xvecs[4];
   N_Vector* XXvecs[4];
 
@@ -2767,13 +2767,13 @@ static int IDAAhermiteGetY(IDAMem IDA_mem, realtype t,
  * data point.
  */
 
-static booleantype IDAApolynomialMalloc(IDAMem IDA_mem)
+static sunbooleantype IDAApolynomialMalloc(IDAMem IDA_mem)
 {
   IDAadjMem IDAADJ_mem;
   IDAdtpntMem *dt_mem;
   IDApolynomialDataMem content;
   long int i, ii=0;
-  booleantype allocOK;
+  sunbooleantype allocOK;
 
   allocOK = SUNTRUE;
 
@@ -3008,7 +3008,7 @@ static int IDAApolynomialStorePnt(IDAMem IDA_mem, IDAdtpntMem d)
  * can be directly called by the user through CVodeGetAdjY.
  */
 
-static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
+static int IDAApolynomialGetY(IDAMem IDA_mem, sunrealtype t,
                               N_Vector yy, N_Vector yp,
                               N_Vector *yyS, N_Vector *ypS)
 {
@@ -3018,8 +3018,8 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
 
   int flag, dir, order, i, j, is, NS, retval;
   long int indx, base;
-  booleantype newpoint;
-  realtype delt, factor, Psi, Psiprime;
+  sunbooleantype newpoint;
+  sunrealtype delt, factor, Psi, Psiprime;
 
   IDAADJ_mem = IDA_mem->ida_adj_mem;
   dt_mem = IDAADJ_mem->dt_mem;
@@ -3190,7 +3190,7 @@ static int IDAApolynomialGetY(IDAMem IDA_mem, realtype t,
 static int IDAAGettnSolutionYp(IDAMem IDA_mem, N_Vector yp)
 {
   int j, kord, retval;
-  realtype C, D, gam;
+  sunrealtype C, D, gam;
 
   if (IDA_mem->ida_nst==0) {
 
@@ -3233,7 +3233,7 @@ static int IDAAGettnSolutionYp(IDAMem IDA_mem, N_Vector yp)
 static int IDAAGettnSolutionYpS(IDAMem IDA_mem, N_Vector *ypS)
 {
   int j, kord, is, retval;
-  realtype C, D, gam;
+  sunrealtype C, D, gam;
 
   if (IDA_mem->ida_nst==0) {
 
@@ -3284,14 +3284,14 @@ static int IDAAGettnSolutionYpS(IDAMem IDA_mem, N_Vector *ypS)
  * find indx (t is too far beyond limits).
  */
 
-static int IDAAfindIndex(IDAMem ida_mem, realtype t,
-                        long int *indx, booleantype *newpoint)
+static int IDAAfindIndex(IDAMem ida_mem, sunrealtype t,
+                        long int *indx, sunbooleantype *newpoint)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem IDA_mem;
   IDAdtpntMem *dt_mem;
   int sign;
-  booleantype to_left, to_right;
+  sunbooleantype to_left, to_right;
 
   IDA_mem = (IDAMem) ida_mem;
   IDAADJ_mem = IDA_mem->ida_adj_mem;
@@ -3367,7 +3367,7 @@ static int IDAAfindIndex(IDAMem ida_mem, realtype t,
  * The user must allocate space for y.
  */
 
-int IDAGetAdjY(void *ida_mem, realtype t, N_Vector yy, N_Vector yp)
+int IDAGetAdjY(void *ida_mem, sunrealtype t, N_Vector yy, N_Vector yp)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -3396,7 +3396,7 @@ int IDAGetAdjY(void *ida_mem, realtype t, N_Vector yy, N_Vector yp)
  * the user.
 */
 
-static int IDAAres(realtype tt,
+static int IDAAres(sunrealtype tt,
                    N_Vector yyB, N_Vector ypB, N_Vector rrB,
                    void *ida_mem)
 {
@@ -3447,7 +3447,7 @@ static int IDAAres(realtype tt,
  * be of IDAQuadRhsFn type.
 */
 
-static int IDAArhsQ(realtype tt,
+static int IDAArhsQ(sunrealtype tt,
                     N_Vector yyB, N_Vector ypB,
                     N_Vector resvalQB, void *ida_mem)
 {
diff --git a/src/idas/idaa_io.c b/src/idas/idaa_io.c
index 4af2ec0e05..7ecc060bbd 100644
--- a/src/idas/idaa_io.c
+++ b/src/idas/idaa_io.c
@@ -39,7 +39,7 @@
  * =================================================================
  */
 
-#define ONE         RCONST(1.0) 
+#define ONE         SUN_RCONST(1.0) 
 
 /* 
  * -----------------------------------------------------------------
@@ -246,7 +246,7 @@ int IDASetMaxNumStepsB(void *ida_mem, int which, long int mxstepsB)
   return IDASetMaxNumSteps(ida_memB, mxstepsB);
 }
 
-int IDASetInitStepB(void *ida_mem, int which, realtype hinB)
+int IDASetInitStepB(void *ida_mem, int which, sunrealtype hinB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -285,7 +285,7 @@ int IDASetInitStepB(void *ida_mem, int which, realtype hinB)
   return IDASetInitStep(ida_memB, hinB);
 }
 
-int IDASetMaxStepB(void *ida_mem, int which, realtype hmaxB)
+int IDASetMaxStepB(void *ida_mem, int which, sunrealtype hmaxB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -324,7 +324,7 @@ int IDASetMaxStepB(void *ida_mem, int which, realtype hmaxB)
   return IDASetMaxStep(ida_memB, hmaxB);
 }
 
-int IDASetSuppressAlgB(void *ida_mem, int which,  booleantype suppressalgB)
+int IDASetSuppressAlgB(void *ida_mem, int which,  sunbooleantype suppressalgB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -661,7 +661,7 @@ int IDAGetConsistentICB(void *ida_mem, int which, N_Vector yyB0_mod, N_Vector yp
  *
  */
 int IDAGetAdjDataPointHermite(void *ida_mem, int which,
-                              realtype *t, N_Vector yy, N_Vector yd)
+                              sunrealtype *t, N_Vector yy, N_Vector yd)
 
 {
   IDAMem IDA_mem;
@@ -712,7 +712,7 @@ int IDAGetAdjDataPointHermite(void *ida_mem, int which,
 
 
 int IDAGetAdjDataPointPolynomial(void *ida_mem, int which,
-                                 realtype *t, int *order, N_Vector y)
+                                 sunrealtype *t, int *order, N_Vector y)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
diff --git a/src/idas/idas.c b/src/idas/idas.c
index 0008a13375..40327c6e10 100644
--- a/src/idas/idas.c
+++ b/src/idas/idas.c
@@ -152,27 +152,27 @@
  * =================================================================
  */
 
-#define ZERO      RCONST(0.0)    /* real 0.0    */
-#define HALF      RCONST(0.5)    /* real 0.5    */
-#define TWOTHIRDS RCONST(0.667)  /* real 2/3    */
-#define ONE       RCONST(1.0)    /* real 1.0    */
-#define ONEPT5    RCONST(1.5)    /* real 1.5    */
-#define TWO       RCONST(2.0)    /* real 2.0    */
-#define FOUR      RCONST(4.0)    /* real 4.0    */
-#define FIVE      RCONST(5.0)    /* real 5.0    */
-#define TEN       RCONST(10.0)   /* real 10.0   */
-#define TWELVE    RCONST(12.0)   /* real 12.0   */
-#define TWENTY    RCONST(20.0)   /* real 20.0   */
-#define HUNDRED   RCONST(100.0)  /* real 100.0  */
-#define PT9       RCONST(0.9)    /* real 0.9    */
-#define PT99      RCONST(0.99)   /* real 0.99   */
-#define PT1       RCONST(0.1)    /* real 0.1    */
-#define PT01      RCONST(0.01)   /* real 0.01   */
-#define PT001     RCONST(0.001)  /* real 0.001  */
-#define PT0001    RCONST(0.0001) /* real 0.0001 */
+#define ZERO      SUN_RCONST(0.0)    /* real 0.0    */
+#define HALF      SUN_RCONST(0.5)    /* real 0.5    */
+#define TWOTHIRDS SUN_RCONST(0.667)  /* real 2/3    */
+#define ONE       SUN_RCONST(1.0)    /* real 1.0    */
+#define ONEPT5    SUN_RCONST(1.5)    /* real 1.5    */
+#define TWO       SUN_RCONST(2.0)    /* real 2.0    */
+#define FOUR      SUN_RCONST(4.0)    /* real 4.0    */
+#define FIVE      SUN_RCONST(5.0)    /* real 5.0    */
+#define TEN       SUN_RCONST(10.0)   /* real 10.0   */
+#define TWELVE    SUN_RCONST(12.0)   /* real 12.0   */
+#define TWENTY    SUN_RCONST(20.0)   /* real 20.0   */
+#define HUNDRED   SUN_RCONST(100.0)  /* real 100.0  */
+#define PT9       SUN_RCONST(0.9)    /* real 0.9    */
+#define PT99      SUN_RCONST(0.99)   /* real 0.99   */
+#define PT1       SUN_RCONST(0.1)    /* real 0.1    */
+#define PT01      SUN_RCONST(0.01)   /* real 0.01   */
+#define PT001     SUN_RCONST(0.001)  /* real 0.001  */
+#define PT0001    SUN_RCONST(0.0001) /* real 0.0001 */
 
 /* real 1 + epsilon used in testing if the step size is below its bound */
-#define ONEPSM    RCONST(1.000001)
+#define ONEPSM    SUN_RCONST(1.000001)
 
 /*
  * =================================================================
@@ -232,7 +232,7 @@
 #define MAXNH            5  /* max. number of h tries in IC calc. */
 #define MAXNJ            4  /* max. number of J tries in IC calc. */
 #define MAXNI           10  /* max. Newton iterations in IC calc. */
-#define EPCON RCONST(0.33)  /* Newton convergence test constant */
+#define EPCON SUN_RCONST(0.33)  /* Newton convergence test constant */
 #define MAXBACKS       100  /* max backtracks per Newton step in IDACalcIC */
 
 /*
@@ -241,20 +241,20 @@
  * =================================================================
  */
 
-static booleantype IDACheckNvector(N_Vector tmpl);
+static sunbooleantype IDACheckNvector(N_Vector tmpl);
 
 /* Memory allocation/deallocation */
 
-static booleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
+static sunbooleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
 static void IDAFreeVectors(IDAMem IDA_mem);
 
-static booleantype IDAQuadAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
+static sunbooleantype IDAQuadAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
 static void IDAQuadFreeVectors(IDAMem IDA_mem);
 
-static booleantype IDASensAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
+static sunbooleantype IDASensAllocVectors(IDAMem IDA_mem, N_Vector tmpl);
 static void IDASensFreeVectors(IDAMem IDA_mem);
 
-static booleantype IDAQuadSensAllocVectors(IDAMem ida_mem, N_Vector tmpl);
+static sunbooleantype IDAQuadSensAllocVectors(IDAMem ida_mem, N_Vector tmpl);
 static void IDAQuadSensFreeVectors(IDAMem ida_mem);
 
 /* Initial setup */
@@ -285,7 +285,7 @@ static int IDAStep(IDAMem IDA_mem);
 
 /* Function called at beginning of step */
 
-static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck);
+static void IDASetCoeffs(IDAMem IDA_mem, sunrealtype *ck);
 
 /* Nonlinear solver functions */
 
@@ -302,45 +302,45 @@ static int IDAQuadSensNls(IDAMem IDA_mem);
 
 /* Error test */
 
-static int IDATestError(IDAMem IDA_mem, realtype ck,
-                        realtype *err_k, realtype *err_km1, realtype *err_km2);
-static int IDAQuadTestError(IDAMem IDA_mem, realtype ck,
-                            realtype *err_k, realtype *err_km1, realtype *err_km2);
-static int IDASensTestError(IDAMem IDA_mem, realtype ck,
-                            realtype *err_k, realtype *err_km1, realtype *err_km2);
-static int IDAQuadSensTestError(IDAMem IDA_mem, realtype ck,
-                                realtype *err_k, realtype *err_km1, realtype *err_km2);
+static int IDATestError(IDAMem IDA_mem, sunrealtype ck,
+                        sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2);
+static int IDAQuadTestError(IDAMem IDA_mem, sunrealtype ck,
+                            sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2);
+static int IDASensTestError(IDAMem IDA_mem, sunrealtype ck,
+                            sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2);
+static int IDAQuadSensTestError(IDAMem IDA_mem, sunrealtype ck,
+                                sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2);
 
 /* Handling of convergence and/or error test failures */
 
-static void IDARestore(IDAMem IDA_mem, realtype saved_t);
-static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, realtype err_k, realtype err_km1,
+static void IDARestore(IDAMem IDA_mem, sunrealtype saved_t);
+static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, sunrealtype err_k, sunrealtype err_km1,
                           long int *ncfnPtr, int *ncfPtr, long int *netfPtr, int *nefPtr);
 static void IDAReset(IDAMem IDA_mem);
 
 /* Function called after a successful step */
 
-static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1);
+static void IDACompleteStep(IDAMem IDA_mem, sunrealtype err_k, sunrealtype err_km1);
 
 /* Function called to evaluate the solutions y(t) and y'(t) at t. Also used in IDAA */
 
-int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret);
+int IDAGetSolution(void *ida_mem, sunrealtype t, N_Vector yret, N_Vector ypret);
 
 /* Stopping tests and failure handling */
 
-static int IDAStopTest1(IDAMem IDA_mem, realtype tout,realtype *tret,
+static int IDAStopTest1(IDAMem IDA_mem, sunrealtype tout,sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask);
-static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest2(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask);
 static int IDAHandleFailure(IDAMem IDA_mem, int sflag);
 
 /* Norm functions */
 
-static realtype IDAQuadWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+static sunrealtype IDAQuadWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                       N_Vector xQ, N_Vector wQ);
 
-static realtype IDAQuadSensWrmsNorm(IDAMem IDA_mem, N_Vector *xQS, N_Vector *wQS);
-static realtype IDAQuadSensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+static sunrealtype IDAQuadSensWrmsNorm(IDAMem IDA_mem, N_Vector *xQS, N_Vector *wQS);
+static sunrealtype IDAQuadSensWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                           N_Vector *xQS, N_Vector *wQS);
 
 /* Functions for rootfinding */
@@ -352,21 +352,21 @@ static int IDARootfind(IDAMem IDA_mem);
 
 /* Sensitivity residual DQ function */
 
-static int IDASensRes1DQ(int Ns, realtype t,
+static int IDASensRes1DQ(int Ns, sunrealtype t,
                          N_Vector yy, N_Vector yp, N_Vector resval,
                          int iS,
                          N_Vector yyS, N_Vector ypS, N_Vector resvalS,
                          void *user_dataS,
                          N_Vector ytemp, N_Vector yptemp, N_Vector restemp);
 
-static int IDAQuadSensRhsInternalDQ(int Ns, realtype t,
+static int IDAQuadSensRhsInternalDQ(int Ns, sunrealtype t,
                                     N_Vector yy,   N_Vector yp,
                                     N_Vector *yyS, N_Vector *ypS,
                                     N_Vector rrQ,  N_Vector *resvalQS,
                                     void *ida_mem,
                                     N_Vector yytmp, N_Vector yptmp, N_Vector tmpQS);
 
-static int IDAQuadSensRhs1InternalDQ(IDAMem IDA_mem, int is, realtype t,
+static int IDAQuadSensRhs1InternalDQ(IDAMem IDA_mem, int is, sunrealtype t,
                                      N_Vector yy, N_Vector y,
                                      N_Vector yyS, N_Vector ypS,
                                      N_Vector resvalQ, N_Vector resvalQS,
@@ -417,7 +417,7 @@ void *IDACreate(SUNContext sunctx)
   IDA_mem->ida_sunctx = sunctx;
 
   /* Set unit roundoff in IDA_mem */
-  IDA_mem->ida_uround = UNIT_ROUNDOFF;
+  IDA_mem->ida_uround = SUN_UNIT_ROUNDOFF;
 
   /* Set default values for integrator optional inputs */
   IDA_mem->ida_res            = NULL;
@@ -559,11 +559,11 @@ void *IDACreate(SUNContext sunctx)
  */
 
 int IDAInit(void *ida_mem, IDAResFn res,
-            realtype t0, N_Vector yy0, N_Vector yp0)
+            sunrealtype t0, N_Vector yy0, N_Vector yp0)
 {
   int retval;
   IDAMem IDA_mem;
-  booleantype nvectorOK, allocOK;
+  sunbooleantype nvectorOK, allocOK;
   sunindextype lrw1, liw1;
   SUNNonlinearSolver NLS;
 
@@ -628,7 +628,7 @@ int IDAInit(void *ida_mem, IDAResFn res,
 
   /* Allocate temporary work arrays for fused vector ops */
   IDA_mem->ida_cvals = NULL;
-  IDA_mem->ida_cvals = (realtype *) malloc(MXORDP1*sizeof(realtype));
+  IDA_mem->ida_cvals = (sunrealtype *) malloc(MXORDP1*sizeof(sunrealtype));
 
   IDA_mem->ida_Xvecs = NULL;
   IDA_mem->ida_Xvecs = (N_Vector *) malloc(MXORDP1*sizeof(N_Vector));
@@ -759,7 +759,7 @@ int IDAInit(void *ida_mem, IDAResFn res,
  */
 
 int IDAReInit(void *ida_mem,
-              realtype t0, N_Vector yy0, N_Vector yp0)
+              sunrealtype t0, N_Vector yy0, N_Vector yp0)
 {
   IDAMem IDA_mem;
 
@@ -854,7 +854,7 @@ int IDAReInit(void *ida_mem,
  *   which will be called to set the error weight vector.
  */
 
-int IDASStolerances(void *ida_mem, realtype reltol, realtype abstol)
+int IDASStolerances(void *ida_mem, sunrealtype reltol, sunrealtype abstol)
 {
   IDAMem IDA_mem;
 
@@ -897,10 +897,10 @@ int IDASStolerances(void *ida_mem, realtype reltol, realtype abstol)
 }
 
 
-int IDASVtolerances(void *ida_mem, realtype reltol, N_Vector abstol)
+int IDASVtolerances(void *ida_mem, sunrealtype reltol, N_Vector abstol)
 {
   IDAMem IDA_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "IDASVtolerances", MSG_NO_MEM);
@@ -989,7 +989,7 @@ int IDAWFtolerances(void *ida_mem, IDAEwtFn efun)
 int IDAQuadInit(void *ida_mem, IDAQuadRhsFn rhsQ, N_Vector yQ0)
 {
   IDAMem IDA_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   sunindextype lrw1Q, liw1Q;
   int retval;
 
@@ -1113,7 +1113,7 @@ int IDAQuadReInit(void *ida_mem, N_Vector yQ0)
  *   absolute tolerance (a potentially different absolute tolerance
  *   for each vector component).
  */
-int IDAQuadSStolerances(void *ida_mem, realtype reltolQ, realtype abstolQ)
+int IDAQuadSStolerances(void *ida_mem, sunrealtype reltolQ, sunrealtype abstolQ)
 {
   IDAMem IDA_mem;
 
@@ -1152,10 +1152,10 @@ int IDAQuadSStolerances(void *ida_mem, realtype reltolQ, realtype abstolQ)
   return (IDA_SUCCESS);
 }
 
-int IDAQuadSVtolerances(void *ida_mem, realtype reltolQ, N_Vector abstolQ)
+int IDAQuadSVtolerances(void *ida_mem, sunrealtype reltolQ, N_Vector abstolQ)
 {
   IDAMem IDA_mem;
-  realtype atolmin;
+  sunrealtype atolmin;
 
   /*Check ida mem*/
   if (ida_mem==NULL) {
@@ -1222,7 +1222,7 @@ int IDASensInit(void *ida_mem, int Ns, int ism,
 
 {
   IDAMem IDA_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   int is, retval;
   SUNNonlinearSolver NLS;
 
@@ -1290,7 +1290,7 @@ int IDASensInit(void *ida_mem, int Ns, int ism,
     free(IDA_mem->ida_Xvecs); IDA_mem->ida_Xvecs = NULL;
     free(IDA_mem->ida_Zvecs); IDA_mem->ida_Zvecs = NULL;
 
-    IDA_mem->ida_cvals = (realtype *) malloc((Ns*MXORDP1)*sizeof(realtype));
+    IDA_mem->ida_cvals = (sunrealtype *) malloc((Ns*MXORDP1)*sizeof(sunrealtype));
     IDA_mem->ida_Xvecs = (N_Vector *) malloc((Ns*MXORDP1)*sizeof(N_Vector));
     IDA_mem->ida_Zvecs = (N_Vector *) malloc((Ns*MXORDP1)*sizeof(N_Vector));
 
@@ -1570,7 +1570,7 @@ int IDASensReInit(void *ida_mem, int ism, N_Vector *yS0, N_Vector *ypS0)
  */
 
 
-int IDASensSStolerances(void *ida_mem, realtype reltolS, realtype *abstolS)
+int IDASensSStolerances(void *ida_mem, sunrealtype reltolS, sunrealtype *abstolS)
 {
   IDAMem IDA_mem;
   int is;
@@ -1615,8 +1615,8 @@ int IDASensSStolerances(void *ida_mem, realtype reltolS, realtype *abstolS)
 
   if ( !(IDA_mem->ida_SatolSMallocDone) ) {
     IDA_mem->ida_SatolS = NULL;
-    IDA_mem->ida_SatolS = (realtype *)malloc(IDA_mem->ida_Ns*sizeof(realtype));
-    IDA_mem->ida_atolSmin0 = (booleantype *)malloc(IDA_mem->ida_Ns*sizeof(booleantype));
+    IDA_mem->ida_SatolS = (sunrealtype *)malloc(IDA_mem->ida_Ns*sizeof(sunrealtype));
+    IDA_mem->ida_atolSmin0 = (sunbooleantype *)malloc(IDA_mem->ida_Ns*sizeof(sunbooleantype));
     IDA_mem->ida_lrw += IDA_mem->ida_Ns;
     IDA_mem->ida_SatolSMallocDone = SUNTRUE;
   }
@@ -1630,11 +1630,11 @@ int IDASensSStolerances(void *ida_mem, realtype reltolS, realtype *abstolS)
 }
 
 
-int IDASensSVtolerances(void *ida_mem,  realtype reltolS, N_Vector *abstolS)
+int IDASensSVtolerances(void *ida_mem,  sunrealtype reltolS, N_Vector *abstolS)
 {
   IDAMem IDA_mem;
   int is, retval;
-  realtype *atolmin;
+  sunrealtype *atolmin;
 
   /* Check ida_mem pointer */
   if (ida_mem == NULL) {
@@ -1662,7 +1662,7 @@ int IDASensSVtolerances(void *ida_mem,  realtype reltolS, N_Vector *abstolS)
     return(IDA_ILL_INPUT);
   }
 
-  atolmin = (realtype *)malloc(IDA_mem->ida_Ns*sizeof(realtype));
+  atolmin = (sunrealtype *)malloc(IDA_mem->ida_Ns*sizeof(sunrealtype));
   for (is=0; is<IDA_mem->ida_Ns; is++) {
     atolmin[is] = N_VMin(abstolS[is]);
     if (atolmin[is] < ZERO) {
@@ -1677,7 +1677,7 @@ int IDASensSVtolerances(void *ida_mem,  realtype reltolS, N_Vector *abstolS)
 
   if ( SUNFALSE == IDA_mem->ida_VatolSMallocDone ) {
     IDA_mem->ida_VatolS = N_VCloneVectorArray(IDA_mem->ida_Ns, IDA_mem->ida_tempv1);
-    IDA_mem->ida_atolSmin0 = (booleantype *)malloc(IDA_mem->ida_Ns*sizeof(booleantype));
+    IDA_mem->ida_atolSmin0 = (sunbooleantype *)malloc(IDA_mem->ida_Ns*sizeof(sunbooleantype));
     IDA_mem->ida_lrw += IDA_mem->ida_Ns*IDA_mem->ida_lrw1;
     IDA_mem->ida_liw += IDA_mem->ida_Ns*IDA_mem->ida_liw1;
     IDA_mem->ida_VatolSMallocDone = SUNTRUE;
@@ -1722,7 +1722,7 @@ int IDASensEEtolerances(void *ida_mem)
 int IDAQuadSensInit(void *ida_mem, IDAQuadSensRhsFn rhsQS, N_Vector *yQS0)
 {
   IDAMem IDA_mem;
-  booleantype allocOK;
+  sunbooleantype allocOK;
   int is, retval;
 
   if (ida_mem==NULL) {
@@ -1870,7 +1870,7 @@ int IDAQuadSensReInit(void *ida_mem, N_Vector *yQS0)
  *   specified through a call to one of IDAQuad**tolerances.
  */
 
-int IDAQuadSensSStolerances(void *ida_mem, realtype reltolQS, realtype *abstolQS)
+int IDAQuadSensSStolerances(void *ida_mem, sunrealtype reltolQS, sunrealtype *abstolQS)
 {
   IDAMem IDA_mem;
   int is;
@@ -1916,8 +1916,8 @@ int IDAQuadSensSStolerances(void *ida_mem, realtype reltolQS, realtype *abstolQS
   IDA_mem->ida_rtolQS = reltolQS;
 
   if ( !(IDA_mem->ida_SatolQSMallocDone) ) {
-    IDA_mem->ida_SatolQS = (realtype *)malloc(IDA_mem->ida_Ns*sizeof(realtype));
-    IDA_mem->ida_atolQSmin0 = (booleantype *)malloc(IDA_mem->ida_Ns*sizeof(booleantype));
+    IDA_mem->ida_SatolQS = (sunrealtype *)malloc(IDA_mem->ida_Ns*sizeof(sunrealtype));
+    IDA_mem->ida_atolQSmin0 = (sunbooleantype *)malloc(IDA_mem->ida_Ns*sizeof(sunbooleantype));
     IDA_mem->ida_lrw += IDA_mem->ida_Ns;
     IDA_mem->ida_SatolQSMallocDone = SUNTRUE;
   }
@@ -1930,11 +1930,11 @@ int IDAQuadSensSStolerances(void *ida_mem, realtype reltolQS, realtype *abstolQS
   return(IDA_SUCCESS);
 }
 
-int IDAQuadSensSVtolerances(void *ida_mem, realtype reltolQS, N_Vector *abstolQS)
+int IDAQuadSensSVtolerances(void *ida_mem, sunrealtype reltolQS, N_Vector *abstolQS)
 {
   IDAMem IDA_mem;
   int is, retval;
-  realtype *atolmin;
+  sunrealtype *atolmin;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "IDAQuadSensSVtolerances", MSG_NO_MEM);
@@ -1966,7 +1966,7 @@ int IDAQuadSensSVtolerances(void *ida_mem, realtype reltolQS, N_Vector *abstolQS
     return(IDA_ILL_INPUT);
   }
 
-  atolmin = (realtype *)malloc(IDA_mem->ida_Ns*sizeof(realtype));
+  atolmin = (sunrealtype *)malloc(IDA_mem->ida_Ns*sizeof(sunrealtype));
   for (is=0; is<IDA_mem->ida_Ns; is++) {
     atolmin[is] = N_VMin(abstolQS[is]);
     if (atolmin[is] < ZERO) {
@@ -1982,7 +1982,7 @@ int IDAQuadSensSVtolerances(void *ida_mem, realtype reltolQS, N_Vector *abstolQS
 
   if ( !(IDA_mem->ida_VatolQSMallocDone) ) {
     IDA_mem->ida_VatolQS = N_VCloneVectorArray(IDA_mem->ida_Ns, abstolQS[0]);
-    IDA_mem->ida_atolQSmin0 = (booleantype *)malloc(IDA_mem->ida_Ns*sizeof(booleantype));
+    IDA_mem->ida_atolQSmin0 = (sunbooleantype *)malloc(IDA_mem->ida_Ns*sizeof(sunbooleantype));
     IDA_mem->ida_lrw += IDA_mem->ida_Ns*IDA_mem->ida_lrw1Q;
     IDA_mem->ida_liw += IDA_mem->ida_Ns*IDA_mem->ida_liw1Q;
     IDA_mem->ida_VatolQSMallocDone = SUNTRUE;
@@ -2152,7 +2152,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
 
   /* Allocate necessary memory and return */
   IDA_mem->ida_glo = NULL;
-  IDA_mem->ida_glo = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_glo = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_glo == NULL) {
     IDAProcessError(IDA_mem, IDA_MEM_FAIL, "IDAS", "IDARootInit", MSG_MEM_FAIL);
     SUNDIALS_MARK_FUNCTION_END(IDA_PROFILER);
@@ -2160,7 +2160,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_ghi = NULL;
-  IDA_mem->ida_ghi = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_ghi = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_ghi == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     IDAProcessError(IDA_mem, IDA_MEM_FAIL, "IDAS", "IDARootInit", MSG_MEM_FAIL);
@@ -2169,7 +2169,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_grout = NULL;
-  IDA_mem->ida_grout = (realtype *) malloc(nrt*sizeof(realtype));
+  IDA_mem->ida_grout = (sunrealtype *) malloc(nrt*sizeof(sunrealtype));
   if (IDA_mem->ida_grout == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     free(IDA_mem->ida_ghi); IDA_mem->ida_ghi = NULL;
@@ -2202,7 +2202,7 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
   }
 
   IDA_mem->ida_gactive = NULL;
-  IDA_mem->ida_gactive = (booleantype *) malloc(nrt*sizeof(booleantype));
+  IDA_mem->ida_gactive = (sunbooleantype *) malloc(nrt*sizeof(sunbooleantype));
   if (IDA_mem->ida_gactive == NULL) {
     free(IDA_mem->ida_glo); IDA_mem->ida_glo = NULL;
     free(IDA_mem->ida_ghi); IDA_mem->ida_ghi = NULL;
@@ -2272,14 +2272,14 @@ int IDARootInit(void *ida_mem, int nrtfn, IDARootFn g)
  * IDA_RES_FAIL
  */
 
-int IDASolve(void *ida_mem, realtype tout, realtype *tret,
+int IDASolve(void *ida_mem, sunrealtype tout, sunrealtype *tret,
              N_Vector yret, N_Vector ypret, int itask)
 {
   long int nstloc;
   int sflag, istate, ier, irfndp, ir, is;
-  realtype tdist, troundoff, ypnorm, rh, nrm;
+  sunrealtype tdist, troundoff, ypnorm, rh, nrm;
   IDAMem IDA_mem;
-  booleantype inactive_roots;
+  sunbooleantype inactive_roots;
 
   /* Check for legal inputs in all cases. */
 
@@ -2756,13 +2756,13 @@ int IDASolve(void *ida_mem, realtype tout, realtype *tret,
  *
  */
 
-int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky)
+int IDAGetDky(void *ida_mem, sunrealtype t, int k, N_Vector dky)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, psij_1;
+  sunrealtype tfuzz, tp, delt, psij_1;
   int i, j, retval;
-  realtype cjk  [MXORDP1];
-  realtype cjk_1[MXORDP1];
+  sunrealtype cjk  [MXORDP1];
+  sunrealtype cjk_1[MXORDP1];
 
   /* Check ida_mem */
   if (ida_mem == NULL) {
@@ -2870,7 +2870,7 @@ int IDAGetDky(void *ida_mem, realtype t, int k, N_Vector dky)
  * This is just a wrapper that calls IDAGetQuadDky with k=0.
  */
 
-int IDAGetQuad(void *ida_mem, realtype *ptret, N_Vector yQout)
+int IDAGetQuad(void *ida_mem, sunrealtype *ptret, N_Vector yQout)
 {
   IDAMem IDA_mem;
   int retval;
@@ -2898,13 +2898,13 @@ int IDAGetQuad(void *ida_mem, realtype *ptret, N_Vector yQout)
  * derivatives up to the current method order) at any time within
  * the last integration step (dense output).
  */
-int IDAGetQuadDky(void *ida_mem, realtype t, int k, N_Vector dkyQ)
+int IDAGetQuadDky(void *ida_mem, sunrealtype t, int k, N_Vector dkyQ)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, psij_1;
+  sunrealtype tfuzz, tp, delt, psij_1;
   int i, j, retval;
-  realtype cjk  [MXORDP1];
-  realtype cjk_1[MXORDP1];
+  sunrealtype cjk  [MXORDP1];
+  sunrealtype cjk_1[MXORDP1];
 
   /* Check ida_mem */
   if (ida_mem == NULL) {
@@ -2995,7 +2995,7 @@ int IDAGetQuadDky(void *ida_mem, realtype t, int k, N_Vector dkyQ)
  * is=0, 1, ... ,NS-1.
  */
 
-int IDAGetSens(void *ida_mem, realtype *ptret, N_Vector *yySout)
+int IDAGetSens(void *ida_mem, sunrealtype *ptret, N_Vector *yySout)
 {
   IDAMem IDA_mem;
   int is, ierr=0;
@@ -3040,7 +3040,7 @@ int IDAGetSens(void *ida_mem, realtype *ptret, N_Vector *yySout)
  * a pointer to N_Vector and must be allocated by the user to hold at
  * least Ns vectors.
  */
-int IDAGetSensDky(void *ida_mem, realtype t, int k, N_Vector *dkySout)
+int IDAGetSensDky(void *ida_mem, sunrealtype t, int k, N_Vector *dkySout)
 {
   int is, ier=0;
   IDAMem IDA_mem;
@@ -3091,7 +3091,7 @@ int IDAGetSensDky(void *ida_mem, realtype t, int k, N_Vector *dkySout)
  * This is just a wrapper that calls IDASensDky1 with k=0.
  */
 
-int IDAGetSens1(void *ida_mem, realtype *ptret, int is, N_Vector yySret)
+int IDAGetSens1(void *ida_mem, sunrealtype *ptret, int is, N_Vector yySret)
 {
   IDAMem IDA_mem;
   int retval;
@@ -3125,13 +3125,13 @@ int IDAGetSens1(void *ida_mem, realtype *ptret, int is, N_Vector yySret)
  * function after a successful return from IDASolve with sensitivity
  * computation enabled.
  */
-int IDAGetSensDky1(void *ida_mem, realtype t, int k, int is, N_Vector dkyS)
+int IDAGetSensDky1(void *ida_mem, sunrealtype t, int k, int is, N_Vector dkyS)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, psij_1;
+  sunrealtype tfuzz, tp, delt, psij_1;
   int i, j, retval;
-  realtype cjk  [MXORDP1];
-  realtype cjk_1[MXORDP1];
+  sunrealtype cjk  [MXORDP1];
+  sunrealtype cjk_1[MXORDP1];
 
   /* Check all inputs for legality */
   if (ida_mem == NULL) {
@@ -3232,7 +3232,7 @@ int IDAGetSensDky1(void *ida_mem, realtype t, int k, int is, N_Vector dkyS)
  * is=0, 1, ... ,NS-1.
  */
 
-int IDAGetQuadSens(void *ida_mem, realtype *ptret, N_Vector *yyQSout)
+int IDAGetQuadSens(void *ida_mem, sunrealtype *ptret, N_Vector *yyQSout)
 {
   IDAMem IDA_mem;
   int is, ierr=0;
@@ -3277,7 +3277,7 @@ int IDAGetQuadSens(void *ida_mem, realtype *ptret, N_Vector *yyQSout)
  * a pointer to N_Vector and must be allocated by the user to hold at
  * least Ns vectors.
  */
-int IDAGetQuadSensDky(void *ida_mem, realtype t, int k, N_Vector *dkyQSout)
+int IDAGetQuadSensDky(void *ida_mem, sunrealtype t, int k, N_Vector *dkyQSout)
 {
   int is, ier=0;
   IDAMem IDA_mem;
@@ -3334,7 +3334,7 @@ int IDAGetQuadSensDky(void *ida_mem, realtype t, int k, N_Vector *dkyQSout)
  * This is just a wrapper that calls IDASensDky1 with k=0.
  */
 
-int IDAGetQuadSens1(void *ida_mem, realtype *ptret, int is, N_Vector yyQSret)
+int IDAGetQuadSens1(void *ida_mem, sunrealtype *ptret, int is, N_Vector yyQSret)
 {
   IDAMem IDA_mem;
   int retval;
@@ -3386,13 +3386,13 @@ int IDAGetQuadSens1(void *ida_mem, realtype *ptret, int is, N_Vector yyQSret)
  * function after a successful return from IDASolve with sensitivity
  * computation enabled.
  */
-int IDAGetQuadSensDky1(void *ida_mem, realtype t, int k, int is, N_Vector dkyQS)
+int IDAGetQuadSensDky1(void *ida_mem, sunrealtype t, int k, int is, N_Vector dkyQS)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, psij_1;
+  sunrealtype tfuzz, tp, delt, psij_1;
   int i, j, retval;
-  realtype cjk  [MXORDP1];
-  realtype cjk_1[MXORDP1];
+  sunrealtype cjk  [MXORDP1];
+  sunrealtype cjk_1[MXORDP1];
 
   /* Check all inputs for legality */
   if (ida_mem == NULL) {
@@ -3768,7 +3768,7 @@ void IDAQuadSensFree(void* ida_mem)
  * If any of them is missing it returns SUNFALSE.
  */
 
-static booleantype IDACheckNvector(N_Vector tmpl)
+static sunbooleantype IDACheckNvector(N_Vector tmpl)
 {
   if ((tmpl->ops->nvclone        == NULL) ||
      (tmpl->ops->nvdestroy      == NULL) ||
@@ -3805,7 +3805,7 @@ static booleantype IDACheckNvector(N_Vector tmpl)
  * allocated here.
  */
 
-static booleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
+static sunbooleantype IDAAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
 {
   int i, j, maxcol;
 
@@ -3981,7 +3981,7 @@ static void IDAFreeVectors(IDAMem IDA_mem)
  * IDAQuadReInit.
  */
 
-static booleantype IDAQuadAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
+static sunbooleantype IDAQuadAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
 {
   int i, j;
 
@@ -4072,7 +4072,7 @@ static void IDAQuadFreeVectors(IDAMem IDA_mem)
  * Allocates space for the N_Vectors, plist, and pbar required for FSA.
  */
 
-static booleantype IDASensAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
+static sunbooleantype IDASensAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
 {
   int j, maxcol;
 
@@ -4180,7 +4180,7 @@ static booleantype IDASensAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
   /* Allocate space for pbar and plist */
 
   IDA_mem->ida_pbar = NULL;
-  IDA_mem->ida_pbar = (realtype *)malloc(IDA_mem->ida_Ns*sizeof(realtype));
+  IDA_mem->ida_pbar = (sunrealtype *)malloc(IDA_mem->ida_Ns*sizeof(sunrealtype));
   if (IDA_mem->ida_pbar == NULL) {
     N_VDestroy(IDA_mem->ida_tmpS3);
     N_VDestroyVectorArray(IDA_mem->ida_ewtS, IDA_mem->ida_Ns);
@@ -4267,7 +4267,7 @@ static void IDASensFreeVectors(IDAMem IDA_mem)
  * using the N_Vector 'tmpl' as a template.
  */
 
-static booleantype IDAQuadSensAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
+static sunbooleantype IDAQuadSensAllocVectors(IDAMem IDA_mem, N_Vector tmpl)
 {
   int i, j, maxcol;
 
@@ -4389,7 +4389,7 @@ static void IDAQuadSensFreeVectors(IDAMem IDA_mem)
 
 int IDAInitialSetup(IDAMem IDA_mem)
 {
-  booleantype conOK;
+  sunbooleantype conOK;
   int ier;
 
   /* Test for more vector operations, depending on options */
@@ -4979,11 +4979,11 @@ static int IDAQuadSensEwtSetSV(IDAMem IDA_mem, N_Vector *yQScur, N_Vector *weigh
  * the next step to reach tstop exactly.
  */
 
-static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest1(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask)
 {
   int ier;
-  realtype troundoff;
+  sunrealtype troundoff;
 
   if (IDA_mem->ida_tstopset)
   {
@@ -5081,11 +5081,11 @@ static int IDAStopTest1(IDAMem IDA_mem, realtype tout, realtype *tret,
  * because the same test was made prior to the step.
  */
 
-static int IDAStopTest2(IDAMem IDA_mem, realtype tout, realtype *tret,
+static int IDAStopTest2(IDAMem IDA_mem, sunrealtype tout, sunrealtype *tret,
                         N_Vector yret, N_Vector ypret, int itask)
 {
   /* int ier; */
-  realtype troundoff;
+  sunrealtype troundoff;
 
   if (IDA_mem->ida_tstopset)
   {
@@ -5302,12 +5302,12 @@ static int IDAHandleFailure(IDAMem IDA_mem, int sflag)
 
 static int IDAStep(IDAMem IDA_mem)
 {
-  realtype saved_t, ck;
-  realtype err_k, err_km1, err_km2;
+  sunrealtype saved_t, ck;
+  sunrealtype err_k, err_km1, err_km2;
   int ncf, nef;
   int nflag, kflag;
   int retval;
-  booleantype sensi_stg, sensi_sim;
+  sunbooleantype sensi_stg, sensi_sim;
 
   /* Are we computing sensitivities with the staggered or simultaneous approach? */
   sensi_stg = (IDA_mem->ida_sensi && (IDA_mem->ida_ism==IDA_STAGGERED));
@@ -5534,10 +5534,10 @@ static int IDAStep(IDAMem IDA_mem)
  *  Also, IDACompleteStep prohibits an order increase until ns = k + 2.
  */
 
-static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck)
+static void IDASetCoeffs(IDAMem IDA_mem, sunrealtype *ck)
 {
   int i, j, is;
-  realtype temp1, temp2, alpha0, alphas;
+  sunrealtype temp1, temp2, alpha0, alphas;
 
   /* Set coefficients for the current stepsize h */
 
@@ -5666,8 +5666,8 @@ static void IDASetCoeffs(IDAMem IDA_mem, realtype *ck)
 static int IDANls(IDAMem IDA_mem)
 {
   int retval;
-  booleantype constraintsPassed, callLSetup, sensi_sim;
-  realtype temp1, temp2, vnorm;
+  sunbooleantype constraintsPassed, callLSetup, sensi_sim;
+  sunrealtype temp1, temp2, vnorm;
   N_Vector mm, tmp;
   long int nni_inc = 0;
   long int nnf_inc = 0;
@@ -5909,7 +5909,7 @@ static void IDAQuadPredict(IDAMem IDA_mem)
 
 static int IDASensNls(IDAMem IDA_mem)
 {
-  booleantype callLSetup;
+  sunbooleantype callLSetup;
   long int nniS_inc = 0;
   long int nnfS_inc = 0;
   int retval;
@@ -6064,11 +6064,11 @@ static void IDAQuadSensPredict(IDAMem IDA_mem, N_Vector *yQS, N_Vector *ypQS)
  * IDATestError returns either IDA_SUCCESS or ERROR_TEST_FAIL.
  */
 
-static int IDATestError(IDAMem IDA_mem, realtype ck,
-                        realtype *err_k, realtype *err_km1, realtype *err_km2)
+static int IDATestError(IDAMem IDA_mem, sunrealtype ck,
+                        sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2)
 {
-  realtype enorm_k, enorm_km1, enorm_km2;   /* error norms */
-  realtype terr_k, terr_km1, terr_km2;      /* local truncation error norms */
+  sunrealtype enorm_k, enorm_km1, enorm_km2;   /* error norms */
+  sunrealtype terr_k, terr_km1, terr_km2;      /* local truncation error norms */
 
   /* Compute error for order k. */
   enorm_k = IDAWrmsNorm(IDA_mem, IDA_mem->ida_ee, IDA_mem->ida_ewt, IDA_mem->ida_suppressalg);
@@ -6159,14 +6159,14 @@ static int IDATestError(IDAMem IDA_mem, realtype ck,
  * The return flag can be either IDA_SUCCESS or ERROR_TEST_FAIL.
  */
 
-static int IDAQuadTestError(IDAMem IDA_mem, realtype ck,
-                            realtype *err_k, realtype *err_km1, realtype *err_km2)
+static int IDAQuadTestError(IDAMem IDA_mem, sunrealtype ck,
+                            sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2)
 {
-  realtype enormQ;
-  realtype errQ_k, errQ_km1, errQ_km2;
-  realtype terr_k, terr_km1, terr_km2;
+  sunrealtype enormQ;
+  sunrealtype errQ_k, errQ_km1, errQ_km2;
+  sunrealtype terr_k, terr_km1, terr_km2;
   N_Vector tempv;
-  booleantype check_for_reduction = SUNFALSE;
+  sunbooleantype check_for_reduction = SUNFALSE;
 
   /* Rename ypQ */
   tempv = IDA_mem->ida_ypQ;
@@ -6242,14 +6242,14 @@ static int IDAQuadTestError(IDAMem IDA_mem, realtype ck,
  * The return flag can be either IDA_SUCCESS or ERROR_TEST_FAIL.
  */
 
-static int IDASensTestError(IDAMem IDA_mem, realtype ck,
-                            realtype *err_k, realtype *err_km1, realtype *err_km2)
+static int IDASensTestError(IDAMem IDA_mem, sunrealtype ck,
+                            sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2)
 {
-  realtype enormS;
-  realtype errS_k, errS_km1, errS_km2;
-  realtype terr_k, terr_km1, terr_km2;
+  sunrealtype enormS;
+  sunrealtype errS_k, errS_km1, errS_km2;
+  sunrealtype terr_k, terr_km1, terr_km2;
   N_Vector *tempv;
-  booleantype check_for_reduction = SUNFALSE;
+  sunbooleantype check_for_reduction = SUNFALSE;
   int retval;
 
   /* Rename deltaS */
@@ -6340,14 +6340,14 @@ static int IDASensTestError(IDAMem IDA_mem, realtype ck,
  * The return flag can be either IDA_SUCCESS or ERROR_TEST_FAIL.
  */
 
-static int IDAQuadSensTestError(IDAMem IDA_mem, realtype ck,
-                                realtype *err_k, realtype *err_km1, realtype *err_km2)
+static int IDAQuadSensTestError(IDAMem IDA_mem, sunrealtype ck,
+                                sunrealtype *err_k, sunrealtype *err_km1, sunrealtype *err_km2)
 {
-  realtype enormQS;
-  realtype errQS_k, errQS_km1, errQS_km2;
-  realtype terr_k, terr_km1, terr_km2;
+  sunrealtype enormQS;
+  sunrealtype errQS_k, errQS_km1, errQS_km2;
+  sunrealtype terr_k, terr_km1, terr_km2;
   N_Vector *tempv;
-  booleantype check_for_reduction = SUNFALSE;
+  sunbooleantype check_for_reduction = SUNFALSE;
   int retval;
 
   tempv = IDA_mem->ida_yyQS;
@@ -6422,7 +6422,7 @@ static int IDAQuadSensTestError(IDAMem IDA_mem, realtype ck,
  * It changes back phi-star to phi (changed in IDASetCoeffs)
  */
 
-static void IDARestore(IDAMem IDA_mem, realtype saved_t)
+static void IDARestore(IDAMem IDA_mem, sunrealtype saved_t)
 {
   int i, j, is;
 
@@ -6534,10 +6534,10 @@ static void IDARestore(IDAMem IDA_mem, realtype saved_t)
  *   IDA_REP_QRHS_ERR
  */
 
-static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, realtype err_k, realtype err_km1,
+static int IDAHandleNFlag(IDAMem IDA_mem, int nflag, sunrealtype err_k, sunrealtype err_km1,
                           long int *ncfnPtr, int *ncfPtr, long int *netfPtr, int *nefPtr)
 {
-  realtype err_knew;
+  sunrealtype err_knew;
 
   IDA_mem->ida_phase = 1;
 
@@ -6710,12 +6710,12 @@ static void IDAReset(IDAMem IDA_mem)
  * stepsize and order for the next step, and updates the phi array.
  */
 
-static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1)
+static void IDACompleteStep(IDAMem IDA_mem, sunrealtype err_k, sunrealtype err_km1)
 {
   int i, j, is, kdiff, action;
-  realtype terr_k, terr_km1, terr_kp1;
-  realtype err_knew, err_kp1;
-  realtype enorm, tmp, hnew;
+  sunrealtype terr_k, terr_km1, terr_kp1;
+  sunrealtype err_knew, err_kp1;
+  sunrealtype enorm, tmp, hnew;
   N_Vector tempvQ, *tempvS;
 
   IDA_mem->ida_nst++;
@@ -7022,10 +7022,10 @@ static void IDACompleteStep(IDAMem IDA_mem, realtype err_k, realtype err_km1)
  *   IDA_BAD_T    if t is not within the interval of the last step taken.
  */
 
-int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret)
+int IDAGetSolution(void *ida_mem, sunrealtype t, N_Vector yret, N_Vector ypret)
 {
   IDAMem IDA_mem;
-  realtype tfuzz, tp, delt, c, d, gam;
+  sunrealtype tfuzz, tp, delt, c, d, gam;
   int j, kord, retval;
 
   if (ida_mem == NULL) {
@@ -7096,10 +7096,10 @@ int IDAGetSolution(void *ida_mem, realtype t, N_Vector yret, N_Vector ypret)
  * mask = suppressalg otherwise.
  */
 
-realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
-                     booleantype mask)
+sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
+                     sunbooleantype mask)
 {
-  realtype nrm;
+  sunrealtype nrm;
 
   if (mask) nrm = N_VWrmsNormMask(x, w, IDA_mem->ida_id);
   else      nrm = N_VWrmsNorm(x, w);
@@ -7121,11 +7121,11 @@ realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
  * Declared global for use in the computation of IC for sensitivities.
  */
 
-realtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS, N_Vector *wS,
-                                booleantype mask)
+sunrealtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS, N_Vector *wS,
+                                sunbooleantype mask)
 {
   int is;
-  realtype nrm;
+  sunrealtype nrm;
 
   if (mask)
     (void) N_VWrmsNormMaskVectorArray(IDA_mem->ida_Ns, xS, wS,
@@ -7150,10 +7150,10 @@ realtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS, N_Vector *wS,
  *   max { wrms(xQS[0],wQS[0]) ... wrms(xQS[Ns-1],wQS[Ns-1]) }
  */
 
-static realtype IDAQuadSensWrmsNorm(IDAMem IDA_mem, N_Vector *xQS, N_Vector *wQS)
+static sunrealtype IDAQuadSensWrmsNorm(IDAMem IDA_mem, N_Vector *xQS, N_Vector *wQS)
 {
   int is;
-  realtype nrm;
+  sunrealtype nrm;
 
   (void) N_VWrmsNormVectorArray(IDA_mem->ida_Ns, xQS, wQS,
                                 IDA_mem->ida_cvals);
@@ -7171,10 +7171,10 @@ static realtype IDAQuadSensWrmsNorm(IDAMem IDA_mem, N_Vector *xQS, N_Vector *wQS
  * Updates the norm old_nrm to account for all quadratures.
  */
 
-static realtype IDAQuadWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+static sunrealtype IDAQuadWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                       N_Vector xQ, N_Vector wQ)
 {
-  realtype qnrm;
+  sunrealtype qnrm;
 
   qnrm = N_VWrmsNorm(xQ, wQ);
   if (old_nrm > qnrm) return(old_nrm);
@@ -7190,21 +7190,21 @@ static realtype IDAQuadWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
  * IC for sensitivities,
  */
 
-realtype IDASensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+sunrealtype IDASensWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                       N_Vector *xS, N_Vector *wS,
-                                      booleantype mask)
+                                      sunbooleantype mask)
 {
-  realtype snrm;
+  sunrealtype snrm;
 
   snrm = IDASensWrmsNorm(IDA_mem, xS, wS, mask);
   if (old_nrm > snrm) return(old_nrm);
   else                return(snrm);
 }
 
-static realtype IDAQuadSensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+static sunrealtype IDAQuadSensWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                           N_Vector *xQS, N_Vector *wQS)
 {
-  realtype qsnrm;
+  sunrealtype qsnrm;
 
   qsnrm = IDAQuadSensWrmsNorm(IDA_mem, xQS, wQS);
   if (old_nrm > qsnrm) return(old_nrm);
@@ -7232,8 +7232,8 @@ static realtype IDAQuadSensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
 static int IDARcheck1(IDAMem IDA_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   for (i = 0; i < IDA_mem->ida_nrtfn; i++)
     IDA_mem->ida_iroots[i] = 0;
@@ -7301,8 +7301,8 @@ static int IDARcheck1(IDAMem IDA_mem)
 static int IDARcheck2(IDAMem IDA_mem)
 {
   int i, retval;
-  realtype smallh, hratio, tplus;
-  booleantype zroot;
+  sunrealtype smallh, hratio, tplus;
+  sunbooleantype zroot;
 
   if (IDA_mem->ida_irfnd == 0) return(IDA_SUCCESS);
 
@@ -7496,9 +7496,9 @@ static int IDARcheck3(IDAMem IDA_mem)
 
 static int IDARootfind(IDAMem IDA_mem)
 {
-  realtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
+  sunrealtype alph, tmid, gfrac, maxfrac, fracint, fracsub;
   int i, retval, imax, side, sideprev;
-  booleantype zroot, sgnchg;
+  sunbooleantype zroot, sgnchg;
 
   imax = 0;
 
@@ -7681,7 +7681,7 @@ static int IDARootfind(IDAMem IDA_mem)
  * >0 for a recoverable error.
  */
 
-int IDASensResDQ(int Ns, realtype t,
+int IDASensResDQ(int Ns, sunrealtype t,
                  N_Vector yy, N_Vector yp, N_Vector resval,
                  N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                  void *user_dataS,
@@ -7710,7 +7710,7 @@ int IDASensResDQ(int Ns, realtype t,
  * (<0 if res fails unrecoverably, >0 if res has a recoverable error).
  */
 
-static int IDASensRes1DQ(int Ns, realtype t,
+static int IDASensRes1DQ(int Ns, sunrealtype t,
                          N_Vector yy, N_Vector yp, N_Vector resval,
                          int is,
                          N_Vector yyS, N_Vector ypS, N_Vector resvalS,
@@ -7721,12 +7721,12 @@ static int IDASensRes1DQ(int Ns, realtype t,
   int method;
   int which;
   int retval;
-  realtype psave, pbari;
-  realtype del , rdel;
-  realtype Delp, rDelp, r2Delp;
-  realtype Dely, rDely, r2Dely;
-  realtype Del , rDel , r2Del ;
-  realtype norms, ratio;
+  sunrealtype psave, pbari;
+  sunrealtype del , rdel;
+  sunrealtype Delp, rDelp, r2Delp;
+  sunrealtype Dely, rDely, r2Dely;
+  sunrealtype Del , rDel , r2Del ;
+  sunrealtype norms, ratio;
 
   /* user_dataS points to IDA_mem */
   IDA_mem = (IDAMem) user_dataS;
@@ -7908,7 +7908,7 @@ static int IDASensRes1DQ(int Ns, realtype t,
  * done in IDAQuadSensRhs1InternalDQ.
  */
 
-static int IDAQuadSensRhsInternalDQ(int Ns, realtype t,
+static int IDAQuadSensRhsInternalDQ(int Ns, sunrealtype t,
                                     N_Vector yy,   N_Vector yp,
                                     N_Vector *yyS, N_Vector *ypS,
                                     N_Vector rrQ,  N_Vector *resvalQS,
@@ -7932,7 +7932,7 @@ static int IDAQuadSensRhsInternalDQ(int Ns, realtype t,
   return(0);
 }
 
-static int IDAQuadSensRhs1InternalDQ(IDAMem IDA_mem, int is, realtype t,
+static int IDAQuadSensRhs1InternalDQ(IDAMem IDA_mem, int is, sunrealtype t,
                                     N_Vector yy, N_Vector yp,
                                     N_Vector yyS, N_Vector ypS,
                                     N_Vector resvalQ, N_Vector resvalQS,
@@ -7940,12 +7940,12 @@ static int IDAQuadSensRhs1InternalDQ(IDAMem IDA_mem, int is, realtype t,
 {
   int retval, method;
   int nfel = 0, which;
-  realtype psave, pbari;
-  realtype del , rdel;
-  realtype Delp;
-  realtype Dely, rDely;
-  realtype Del , r2Del ;
-  realtype norms;
+  sunrealtype psave, pbari;
+  sunrealtype del , rdel;
+  sunrealtype Delp;
+  sunrealtype Dely, rDely;
+  sunrealtype Del , r2Del ;
+  sunrealtype norms;
 
   del = SUNRsqrt(SUNMAX(IDA_mem->ida_rtol, IDA_mem->ida_uround));
   rdel = ONE/del;
diff --git a/src/idas/idas_bbdpre.c b/src/idas/idas_bbdpre.c
index 230762dbbd..0bd05b92ef 100644
--- a/src/idas/idas_bbdpre.c
+++ b/src/idas/idas_bbdpre.c
@@ -34,30 +34,30 @@
 #include <nvector/nvector_serial.h>
 
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* Prototypes of IDABBDPrecSetup and IDABBDPrecSolve */
-static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
-                           N_Vector rr, realtype c_j, void *prec_data);
-static int IDABBDPrecSolve(realtype tt, N_Vector yy, N_Vector yp,
+static int IDABBDPrecSetup(sunrealtype tt, N_Vector yy, N_Vector yp,
+                           N_Vector rr, sunrealtype c_j, void *prec_data);
+static int IDABBDPrecSolve(sunrealtype tt, N_Vector yy, N_Vector yp,
                            N_Vector rr, N_Vector rvec, N_Vector zvec,
-                           realtype c_j, realtype delta, void *prec_data);
+                           sunrealtype c_j, sunrealtype delta, void *prec_data);
 
 /* Prototype for IDABBDPrecFree */
 static int IDABBDPrecFree(IDAMem ida_mem);
 
 /* Prototype for difference quotient Jacobian calculation routine */
-static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
+static int IBBDDQJac(IBBDPrecData pdata, sunrealtype tt, sunrealtype cj,
                      N_Vector yy, N_Vector yp, N_Vector gref,
                      N_Vector ytemp, N_Vector yptemp, N_Vector gtemp);
 
 /* Wrapper functions for adjoint code */
-static int IDAAglocal(sunindextype NlocalB, realtype tt, N_Vector yyB,
+static int IDAAglocal(sunindextype NlocalB, sunrealtype tt, N_Vector yyB,
                       N_Vector ypB, N_Vector gvalB, void *user_dataB);
 
-static int IDAAgcomm(sunindextype NlocalB, realtype tt, N_Vector yyB,
+static int IDAAgcomm(sunindextype NlocalB, sunrealtype tt, N_Vector yyB,
                      N_Vector ypB, void *user_dataB);
 
 /* Prototype for the pfree routine for backward problems. */
@@ -74,7 +74,7 @@ static int IDABBDPrecFreeB(IDABMem IDAB_mem);
 int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
                    sunindextype mudq, sunindextype mldq,
                    sunindextype mukeep, sunindextype mlkeep,
-                   realtype dq_rel_yy,
+                   sunrealtype dq_rel_yy,
                    IDABBDLocalFn Gres, IDABBDCommFn Gcomm)
 {
   IDAMem IDA_mem;
@@ -296,7 +296,7 @@ int IDABBDPrecInit(void *ida_mem, sunindextype Nlocal,
 
 /*-------------------------------------------------------------*/
 int IDABBDPrecReInit(void *ida_mem, sunindextype mudq,
-                     sunindextype mldq, realtype dq_rel_yy)
+                     sunindextype mldq, sunrealtype dq_rel_yy)
 {
   IDAMem IDA_mem;
   IDALsMem idals_mem;
@@ -449,8 +449,8 @@ int IDABBDPrecGetNumGfnEvals(void *ida_mem,
    > 0    for a recoverable error (step will be retried), or
    < 0    for a nonrecoverable error (step fails).
  ----------------------------------------------------------------*/
-static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
-                           N_Vector rr, realtype c_j, void *bbd_data)
+static int IDABBDPrecSetup(sunrealtype tt, N_Vector yy, N_Vector yp,
+                           N_Vector rr, sunrealtype c_j, void *bbd_data)
 {
   IBBDPrecData pdata;
   IDAMem IDA_mem;
@@ -499,9 +499,9 @@ static int IDABBDPrecSetup(realtype tt, N_Vector yy, N_Vector yp,
   IDABBDPrecSolve returns the value returned from the linear
   solver object.
   ---------------------------------------------------------------*/
-static int IDABBDPrecSolve(realtype tt, N_Vector yy, N_Vector yp,
+static int IDABBDPrecSolve(sunrealtype tt, N_Vector yy, N_Vector yp,
                            N_Vector rr, N_Vector rvec, N_Vector zvec,
-                           realtype c_j, realtype delta, void *bbd_data)
+                           sunrealtype c_j, sunrealtype delta, void *bbd_data)
 {
   IBBDPrecData pdata;
   int retval;
@@ -570,17 +570,17 @@ static int IDABBDPrecFree(IDAMem IDA_mem)
   Return values are: 0 (success), > 0 (recoverable error),
   or < 0 (nonrecoverable error).
   ----------------------------------------------------------------*/
-static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
+static int IBBDDQJac(IBBDPrecData pdata, sunrealtype tt, sunrealtype cj,
                      N_Vector yy, N_Vector yp, N_Vector gref,
                      N_Vector ytemp, N_Vector yptemp, N_Vector gtemp)
 {
   IDAMem IDA_mem;
-  realtype inc, inc_inv;
+  sunrealtype inc, inc_inv;
   int retval;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *ydata, *ypdata, *ytempdata, *yptempdata, *grefdata, *gtempdata;
-  realtype *cnsdata = NULL, *ewtdata;
-  realtype *col_j, conj, yj, ypj, ewtj;
+  sunrealtype *ydata, *ypdata, *ytempdata, *yptempdata, *grefdata, *gtempdata;
+  sunrealtype *cnsdata = NULL, *ewtdata;
+  sunrealtype *col_j, conj, yj, ypj, ewtj;
 
   IDA_mem = (IDAMem) pdata->ida_mem;
 
@@ -691,7 +691,7 @@ static int IBBDDQJac(IBBDPrecData pdata, realtype tt, realtype cj,
 int IDABBDPrecInitB(void *ida_mem, int which, sunindextype NlocalB,
                     sunindextype mudqB, sunindextype mldqB,
                     sunindextype mukeepB, sunindextype mlkeepB,
-                    realtype dq_rel_yyB, IDABBDLocalFnB glocalB,
+                    sunrealtype dq_rel_yyB, IDABBDLocalFnB glocalB,
                     IDABBDCommFnB gcommB)
 {
   IDAMem IDA_mem;
@@ -763,7 +763,7 @@ int IDABBDPrecInitB(void *ida_mem, int which, sunindextype NlocalB,
 
 /*-------------------------------------------------------------*/
 int IDABBDPrecReInitB(void *ida_mem, int which, sunindextype mudqB,
-                      sunindextype mldqB, realtype dq_rel_yyB)
+                      sunindextype mldqB, sunrealtype dq_rel_yyB)
 {
   IDAMem IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -829,7 +829,7 @@ static int IDABBDPrecFreeB(IDABMem IDAB_mem)
   This routine interfaces to the IDALocalFnB routine
   provided by the user.
   ----------------------------------------------------------------*/
-static int IDAAglocal(sunindextype NlocalB, realtype tt, N_Vector yyB,
+static int IDAAglocal(sunindextype NlocalB, sunrealtype tt, N_Vector yyB,
                       N_Vector ypB, N_Vector gvalB, void *ida_mem)
 {
   IDAMem IDA_mem;
@@ -870,7 +870,7 @@ static int IDAAglocal(sunindextype NlocalB, realtype tt, N_Vector yyB,
   This routine interfaces to the IDACommFnB routine
   provided by the user.
   ----------------------------------------------------------------*/
-static int IDAAgcomm(sunindextype NlocalB, realtype tt,
+static int IDAAgcomm(sunindextype NlocalB, sunrealtype tt,
                      N_Vector yyB, N_Vector ypB, void *ida_mem)
 {
   IDAMem IDA_mem;
diff --git a/src/idas/idas_bbdpre_impl.h b/src/idas/idas_bbdpre_impl.h
index c2263b68e3..d63e44e608 100644
--- a/src/idas/idas_bbdpre_impl.h
+++ b/src/idas/idas_bbdpre_impl.h
@@ -40,7 +40,7 @@ typedef struct IBBDPrecDataRec {
   /* passed by user to IDABBDPrecAlloc and used by
      IDABBDPrecSetup/IDABBDPrecSolve functions */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype rel_yy;
+  sunrealtype rel_yy;
   IDABBDLocalFn glocal;
   IDABBDCommFn gcomm;
 
diff --git a/src/idas/idas_ic.c b/src/idas/idas_ic.c
index 0d273414be..edc8034758 100644
--- a/src/idas/idas_ic.c
+++ b/src/idas/idas_ic.c
@@ -30,18 +30,18 @@
 
 /* Private Constants */
 
-#define ZERO       RCONST(0.0)    /* real 0.0    */
-#define HALF       RCONST(0.5)    /* real 0.5    */
-#define ONE        RCONST(1.0)    /* real 1.0    */
-#define TWO        RCONST(2.0)    /* real 2.0    */
-#define PT99       RCONST(0.99)   /* real 0.99   */
-#define PT1        RCONST(0.1)    /* real 0.1    */
-#define PT001      RCONST(0.001)  /* real 0.001  */
+#define ZERO       SUN_RCONST(0.0)    /* real 0.0    */
+#define HALF       SUN_RCONST(0.5)    /* real 0.5    */
+#define ONE        SUN_RCONST(1.0)    /* real 1.0    */
+#define TWO        SUN_RCONST(2.0)    /* real 2.0    */
+#define PT99       SUN_RCONST(0.99)   /* real 0.99   */
+#define PT1        SUN_RCONST(0.1)    /* real 0.1    */
+#define PT001      SUN_RCONST(0.001)  /* real 0.001  */
 
 /* IDACalcIC control constants */
 
-#define ICRATEMAX  RCONST(0.9)    /* max. Newton conv. rate */
-#define ALPHALS    RCONST(0.0001) /* alpha in linesearch conv. test */
+#define ICRATEMAX  SUN_RCONST(0.9)    /* max. Newton conv. rate */
+#define ALPHALS    SUN_RCONST(0.0001) /* alpha in linesearch conv. test */
 
 /* Return values for lower level routines used by IDACalcIC */
 
@@ -58,28 +58,28 @@
  */
 
 extern int IDAInitialSetup(IDAMem IDA_mem);
-extern realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x,
-                            N_Vector w, booleantype mask);
-extern realtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS,
-                                N_Vector *wS, booleantype mask);
-extern realtype IDASensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+extern sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x,
+                            N_Vector w, sunbooleantype mask);
+extern sunrealtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS,
+                                N_Vector *wS, sunbooleantype mask);
+extern sunrealtype IDASensWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                       N_Vector *xS, N_Vector *wS,
-                                      booleantype mask);
+                                      sunbooleantype mask);
 
 extern int IDASensEwtSet(IDAMem IDA_mem, N_Vector *yScur, N_Vector *weightS);
 
 static int IDANlsIC(IDAMem IDA_mem);
 
 static int IDANewtonIC(IDAMem IDA_mem);
-static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm);
-static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm);
-static int IDANewyyp(IDAMem IDA_mem, realtype lambda);
+static int IDALineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm);
+static int IDAfnorm(IDAMem IDA_mem, sunrealtype *fnorm);
+static int IDANewyyp(IDAMem IDA_mem, sunrealtype lambda);
 static int IDANewy(IDAMem IDA_mem);
 
 static int IDASensNewtonIC(IDAMem IDA_mem);
-static int IDASensLineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm);
-static int IDASensNewyyp(IDAMem IDA_mem, realtype lambda);
-static int IDASensfnorm(IDAMem IDA_mem, realtype *fnorm);
+static int IDASensLineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm);
+static int IDASensNewyyp(IDAMem IDA_mem, sunrealtype lambda);
+static int IDASensfnorm(IDAMem IDA_mem, sunrealtype *fnorm);
 static int IDASensNlsIC(IDAMem IDA_mem);
 
 static int IDAICFailFlag(IDAMem IDA_mem, int retval);
@@ -119,14 +119,14 @@ static int IDAICFailFlag(IDAMem IDA_mem, int retval);
  * -----------------------------------------------------------------
  */
 
-int IDACalcIC(void *ida_mem, int icopt, realtype tout1)
+int IDACalcIC(void *ida_mem, int icopt, sunrealtype tout1)
 {
   int ewtsetOK;
   int ier, nwt, nh, mxnh, icret, retval=0;
   int is;
-  realtype tdist, troundoff, minid, hic, ypnorm;
+  sunrealtype tdist, troundoff, minid, hic, ypnorm;
   IDAMem IDA_mem;
-  booleantype sensi_stg, sensi_sim;
+  sunbooleantype sensi_stg, sensi_sim;
 
   /* Check if IDA memory exists */
 
@@ -489,7 +489,7 @@ static int IDANlsIC(IDAMem IDA_mem)
 {
   int retval, nj, is;
   N_Vector tv1, tv2, tv3;
-  booleantype sensi_sim;
+  sunbooleantype sensi_sim;
 
   /* Are we computing sensitivities with the IDA_SIMULTANEOUS approach? */
   sensi_sim = (IDA_mem->ida_sensi && (IDA_mem->ida_ism==IDA_SIMULTANEOUS));
@@ -592,8 +592,8 @@ static int IDANlsIC(IDAMem IDA_mem)
 static int IDANewtonIC(IDAMem IDA_mem)
 {
   int retval, mnewt, is;
-  realtype delnorm, fnorm, fnorm0, oldfnrm, rate;
-  booleantype sensi_sim;
+  sunrealtype delnorm, fnorm, fnorm0, oldfnrm, rate;
+  sunbooleantype sensi_sim;
 
   /* Are we computing sensitivities with the IDA_SIMULTANEOUS approach? */
   sensi_sim = (IDA_mem->ida_sensi && (IDA_mem->ida_ism==IDA_SIMULTANEOUS));
@@ -695,13 +695,13 @@ static int IDANewtonIC(IDAMem IDA_mem)
  * -----------------------------------------------------------------
  */
 
-static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
+static int IDALineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm)
 {
-  booleantype conOK;
+  sunbooleantype conOK;
   int retval, is, nbacks;
-  realtype f1norm, fnormp, f1normp, ratio, lambda, minlam, slpi;
+  sunrealtype f1norm, fnormp, f1normp, ratio, lambda, minlam, slpi;
   N_Vector mc;
-  booleantype sensi_sim;
+  sunbooleantype sensi_sim;
 
   /* Initialize work space pointers, f1norm, ratio.
      (Use of mc in constraint check does not conflict with ypnew.) */
@@ -812,7 +812,7 @@ static int IDALineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm)
+static int IDAfnorm(IDAMem IDA_mem, sunrealtype *fnorm)
 {
   int retval, is;
 
@@ -896,7 +896,7 @@ static int IDAfnorm(IDAMem IDA_mem, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDANewyyp(IDAMem IDA_mem, realtype lambda)
+static int IDANewyyp(IDAMem IDA_mem, sunrealtype lambda)
 {
   int retval;
 
@@ -1070,7 +1070,7 @@ static int IDASensNlsIC(IDAMem IDA_mem)
 static int IDASensNewtonIC(IDAMem IDA_mem)
 {
   int retval, is, mnewt;
-  realtype delnorm, fnorm, fnorm0, oldfnrm, rate;
+  sunrealtype delnorm, fnorm, fnorm0, oldfnrm, rate;
 
   for(is=0;is<IDA_mem->ida_Ns;is++) {
 
@@ -1147,11 +1147,11 @@ static int IDASensNewtonIC(IDAMem IDA_mem)
  * -----------------------------------------------------------------
  */
 
-static int IDASensLineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
+static int IDASensLineSrch(IDAMem IDA_mem, sunrealtype *delnorm, sunrealtype *fnorm)
 {
   int is, retval, nbacks;
-  realtype f1norm, fnormp, f1normp, slpi, minlam;
-  realtype lambda, ratio;
+  sunrealtype f1norm, fnormp, f1normp, slpi, minlam;
+  sunrealtype lambda, ratio;
 
   /* Set work space pointer. */
   IDA_mem->ida_dtemp = IDA_mem->ida_phi[3];
@@ -1218,7 +1218,7 @@ static int IDASensLineSrch(IDAMem IDA_mem, realtype *delnorm, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDASensfnorm(IDAMem IDA_mem, realtype *fnorm)
+static int IDASensfnorm(IDAMem IDA_mem, sunrealtype *fnorm)
 {
   int is, retval;
 
@@ -1271,7 +1271,7 @@ static int IDASensfnorm(IDAMem IDA_mem, realtype *fnorm)
  * -----------------------------------------------------------------
  */
 
-static int IDASensNewyyp(IDAMem IDA_mem, realtype lambda)
+static int IDASensNewyyp(IDAMem IDA_mem, sunrealtype lambda)
 {
   int is;
 
diff --git a/src/idas/idas_impl.h b/src/idas/idas_impl.h
index ee29def3ea..0afa86d94a 100644
--- a/src/idas/idas_impl.h
+++ b/src/idas/idas_impl.h
@@ -52,21 +52,21 @@ extern "C" {
 
 /* Basic IDA constants */
 
-#define HMAX_INV_DEFAULT RCONST(0.0) /* hmax_inv default value          */
-#define HMIN_DEFAULT     RCONST(0.0) /* hmin default value              */
+#define HMAX_INV_DEFAULT SUN_RCONST(0.0) /* hmax_inv default value          */
+#define HMIN_DEFAULT     SUN_RCONST(0.0) /* hmin default value              */
 #define MAXORD_DEFAULT   5           /* maxord default value            */
 #define MXORDP1          6           /* max. number of N_Vectors in phi */
 #define MXSTEP_DEFAULT   500         /* mxstep default value            */
 
-#define ETA_MAX_FX_DEFAULT RCONST(2.0)  /* threshold to increase step size   */
-#define ETA_MIN_FX_DEFAULT RCONST(1.0)  /* threshold to decrease step size   */
-#define ETA_MAX_DEFAULT    RCONST(2.0)  /* max step size increase factor     */
-#define ETA_MIN_DEFAULT    RCONST(0.5)  /* min step size decrease factor     */
-#define ETA_LOW_DEFAULT    RCONST(0.9)  /* upper bound on decrease factor    */
-#define ETA_MIN_EF_DEFAULT RCONST(0.25) /* err test fail min decrease factor */
-#define ETA_CF_DEFAULT     RCONST(0.25) /* NLS failure decrease factor       */
+#define ETA_MAX_FX_DEFAULT SUN_RCONST(2.0)  /* threshold to increase step size   */
+#define ETA_MIN_FX_DEFAULT SUN_RCONST(1.0)  /* threshold to decrease step size   */
+#define ETA_MAX_DEFAULT    SUN_RCONST(2.0)  /* max step size increase factor     */
+#define ETA_MIN_DEFAULT    SUN_RCONST(0.5)  /* min step size decrease factor     */
+#define ETA_LOW_DEFAULT    SUN_RCONST(0.9)  /* upper bound on decrease factor    */
+#define ETA_MIN_EF_DEFAULT SUN_RCONST(0.25) /* err test fail min decrease factor */
+#define ETA_CF_DEFAULT     SUN_RCONST(0.25) /* NLS failure decrease factor       */
 
-#define DCJ_DEFAULT RCONST(0.25)  /* constant for updating Jacobian/preconditioner */
+#define DCJ_DEFAULT SUN_RCONST(0.25)  /* constant for updating Jacobian/preconditioner */
 
 /* Return values for lower level routines used by IDASolve and functions
    provided to the nonlinear solver */
@@ -101,7 +101,7 @@ typedef struct IDAMemRec {
 
   SUNContext ida_sunctx;
 
-  realtype ida_uround;    /* machine unit roundoff */
+  sunrealtype ida_uround;    /* machine unit roundoff */
 
   /*--------------------------
     Problem Specification Data
@@ -111,79 +111,79 @@ typedef struct IDAMemRec {
   void        *ida_user_data; /* user pointer passed to res            */
 
   int         ida_itol;       /* itol = IDA_SS, IDA_SV, IDA_WF, IDA_NN */
-  realtype    ida_rtol;       /* relative tolerance                    */
-  realtype    ida_Satol;      /* scalar absolute tolerance             */
+  sunrealtype    ida_rtol;       /* relative tolerance                    */
+  sunrealtype    ida_Satol;      /* scalar absolute tolerance             */
   N_Vector    ida_Vatol;      /* vector absolute tolerance             */
-  booleantype ida_atolmin0;   /* flag indicating that min(atol) = 0    */
-  booleantype ida_user_efun;  /* SUNTRUE if user provides efun         */
+  sunbooleantype ida_atolmin0;   /* flag indicating that min(atol) = 0    */
+  sunbooleantype ida_user_efun;  /* SUNTRUE if user provides efun         */
   IDAEwtFn    ida_efun;       /* function to set ewt                   */
   void        *ida_edata;     /* user pointer passed to efun           */
 
-  booleantype    ida_constraintsSet; /* constraints vector present:
+  sunbooleantype    ida_constraintsSet; /* constraints vector present:
                                         do constraints calc                   */
-  booleantype    ida_suppressalg;    /* SUNTRUE means suppress algebraic vars
+  sunbooleantype    ida_suppressalg;    /* SUNTRUE means suppress algebraic vars
                                         in local error tests                  */
 
   /*-----------------------
     Quadrature Related Data
     -----------------------*/
 
-  booleantype    ida_quadr;
+  sunbooleantype    ida_quadr;
 
   IDAQuadRhsFn   ida_rhsQ;
   void           *ida_user_dataQ;
 
-  booleantype    ida_errconQ;
+  sunbooleantype    ida_errconQ;
 
   int            ida_itolQ;
-  realtype       ida_rtolQ;
-  realtype       ida_SatolQ;    /* scalar absolute tolerance for quadratures  */
+  sunrealtype       ida_rtolQ;
+  sunrealtype       ida_SatolQ;    /* scalar absolute tolerance for quadratures  */
   N_Vector       ida_VatolQ;    /* vector absolute tolerance for quadratures  */
-  booleantype    ida_atolQmin0; /* flag indicating that min(atolQ) = 0        */
+  sunbooleantype    ida_atolQmin0; /* flag indicating that min(atolQ) = 0        */
 
   /*------------------------
     Sensitivity Related Data
     ------------------------*/
 
-  booleantype    ida_sensi;
+  sunbooleantype    ida_sensi;
   int            ida_Ns;
   int            ida_ism;
 
   IDASensResFn   ida_resS;
   void           *ida_user_dataS;
-  booleantype    ida_resSDQ;
+  sunbooleantype    ida_resSDQ;
 
-  realtype       *ida_p;
-  realtype       *ida_pbar;
+  sunrealtype       *ida_p;
+  sunrealtype       *ida_pbar;
   int            *ida_plist;
   int            ida_DQtype;
-  realtype       ida_DQrhomax;
+  sunrealtype       ida_DQrhomax;
 
-  booleantype    ida_errconS;       /* SUNTRUE if sensitivities in err. control  */
+  sunbooleantype    ida_errconS;       /* SUNTRUE if sensitivities in err. control  */
 
   int            ida_itolS;
-  realtype       ida_rtolS;         /* relative tolerance for sensitivities    */
-  realtype       *ida_SatolS;       /* scalar absolute tolerances for sensi.   */
+  sunrealtype       ida_rtolS;         /* relative tolerance for sensitivities    */
+  sunrealtype       *ida_SatolS;       /* scalar absolute tolerances for sensi.   */
   N_Vector       *ida_VatolS;       /* vector absolute tolerances for sensi.   */
-  booleantype    *ida_atolSmin0;    /* flag indicating that min(atolS[is]) = 0 */
+  sunbooleantype    *ida_atolSmin0;    /* flag indicating that min(atolS[is]) = 0 */
 
   /*-----------------------------------
     Quadrature Sensitivity Related Data
     -----------------------------------*/
 
-  booleantype ida_quadr_sensi;   /* SUNTRUE if computing sensitivities of quadrs. */
+  sunbooleantype ida_quadr_sensi;   /* SUNTRUE if computing sensitivities of quadrs. */
 
   IDAQuadSensRhsFn ida_rhsQS;    /* fQS = (dfQ/dy)*yS + (dfQ/dp)                  */
   void *ida_user_dataQS;         /* data pointer passed to fQS                    */
-  booleantype ida_rhsQSDQ;       /* SUNTRUE if using internal DQ functions        */
+  sunbooleantype ida_rhsQSDQ;       /* SUNTRUE if using internal DQ functions        */
 
-  booleantype ida_errconQS;      /* SUNTRUE if yQS are considered in err. con.    */
+  sunbooleantype ida_errconQS;      /* SUNTRUE if yQS are considered in err. con.    */
 
   int ida_itolQS;
-  realtype ida_rtolQS;           /* relative tolerance for yQS                */
-  realtype *ida_SatolQS;         /* scalar absolute tolerances for yQS        */
+  sunrealtype ida_rtolQS;           /* relative tolerance for yQS                */
+  sunrealtype *ida_SatolQS;         /* scalar absolute tolerances for yQS        */
   N_Vector *ida_VatolQS;         /* vector absolute tolerances for yQS        */
-  booleantype *ida_atolQSmin0;   /* flag indicating that min(atolQS[is]) = 0  */
+  sunbooleantype *ida_atolQSmin0;   /* flag indicating that min(atolQS[is]) = 0  */
 
   /*-----------------------------------------------
     Divided differences array and associated arrays
@@ -191,11 +191,11 @@ typedef struct IDAMemRec {
 
   N_Vector ida_phi[MXORDP1];   /* phi = (maxord+1) arrays of divided differences */
 
-  realtype ida_psi[MXORDP1];   /* differences in t (sums of recent step sizes)   */
-  realtype ida_alpha[MXORDP1]; /* ratios of current stepsize to psi values       */
-  realtype ida_beta[MXORDP1];  /* ratios of current to previous product of psi's */
-  realtype ida_sigma[MXORDP1]; /* product successive alpha values and factorial  */
-  realtype ida_gamma[MXORDP1]; /* sum of reciprocals of psi values               */
+  sunrealtype ida_psi[MXORDP1];   /* differences in t (sums of recent step sizes)   */
+  sunrealtype ida_alpha[MXORDP1]; /* ratios of current stepsize to psi values       */
+  sunrealtype ida_beta[MXORDP1];  /* ratios of current to previous product of psi's */
+  sunrealtype ida_sigma[MXORDP1]; /* product successive alpha values and factorial  */
+  sunrealtype ida_gamma[MXORDP1]; /* sum of reciprocals of psi values               */
 
   /*-------------------------
     N_Vectors for integration
@@ -277,26 +277,26 @@ typedef struct IDAMemRec {
     Variables for use by IDACalcIC
     ------------------------------*/
 
-  realtype ida_t0;          /* initial t                                      */
+  sunrealtype ida_t0;          /* initial t                                      */
   N_Vector ida_yy0;         /* initial y vector (user-supplied).              */
   N_Vector ida_yp0;         /* initial y' vector (user-supplied).             */
 
   int ida_icopt;            /* IC calculation user option                     */
-  booleantype ida_lsoff;    /* IC calculation linesearch turnoff option       */
+  sunbooleantype ida_lsoff;    /* IC calculation linesearch turnoff option       */
   int ida_maxnh;            /* max. number of h tries in IC calculation       */
   int ida_maxnj;            /* max. number of J tries in IC calculation       */
   int ida_maxnit;           /* max. number of Netwon iterations in IC calc.   */
   int ida_nbacktr;          /* number of IC linesearch backtrack operations   */
   int ida_sysindex;         /* computed system index (0 or 1)                 */
   int ida_maxbacks;         /* max backtracks per Newton step                 */
-  realtype ida_epiccon;     /* IC nonlinear convergence test constant         */
-  realtype ida_steptol;     /* minimum Newton step size in IC calculation     */
-  realtype ida_tscale;      /* time scale factor = abs(tout1 - t0)            */
+  sunrealtype ida_epiccon;     /* IC nonlinear convergence test constant         */
+  sunrealtype ida_steptol;     /* minimum Newton step size in IC calculation     */
+  sunrealtype ida_tscale;      /* time scale factor = abs(tout1 - t0)            */
 
   /* Tstop information */
 
-  booleantype ida_tstopset;
-  realtype ida_tstop;
+  sunbooleantype ida_tstopset;
+  sunrealtype ida_tstop;
 
   /* Step Data */
 
@@ -306,24 +306,24 @@ typedef struct IDAMemRec {
   int ida_phase;     /* flag to trigger step doubling in first few steps      */
   int ida_ns;        /* counts steps at fixed stepsize and order              */
 
-  realtype ida_hin;      /* initial step                                      */
-  realtype ida_h0u;      /* actual initial stepsize                           */
-  realtype ida_hh;       /* current step size h                               */
-  realtype ida_hused;    /* step size used on last successful step            */
-  realtype ida_eta;      /* eta = hnext / hused                               */
-  realtype ida_tn;       /* current internal value of t                       */
-  realtype ida_tretlast; /* value of tret previously returned by IDASolve     */
-  realtype ida_cj;       /* current value of scalar (-alphas/hh) in Jacobian  */
-  realtype ida_cjlast;   /* cj value saved from last successful step          */
-  realtype ida_cjold;    /* cj value saved from last call to lsetup           */
-  realtype ida_cjratio;  /* ratio of cj values: cj/cjold                      */
-  realtype ida_ss;       /* scalar used in Newton iteration convergence test  */
-  realtype ida_oldnrm;   /* norm of previous nonlinear solver update          */
-  realtype ida_epsNewt;  /* test constant in Newton convergence test          */
-  realtype ida_epcon;    /* coeficient of the Newton covergence test          */
-  realtype ida_toldel;   /* tolerance in direct test on Newton corrections    */
-
-  realtype ida_ssS;      /* scalar ss for staggered sensitivities             */
+  sunrealtype ida_hin;      /* initial step                                      */
+  sunrealtype ida_h0u;      /* actual initial stepsize                           */
+  sunrealtype ida_hh;       /* current step size h                               */
+  sunrealtype ida_hused;    /* step size used on last successful step            */
+  sunrealtype ida_eta;      /* eta = hnext / hused                               */
+  sunrealtype ida_tn;       /* current internal value of t                       */
+  sunrealtype ida_tretlast; /* value of tret previously returned by IDASolve     */
+  sunrealtype ida_cj;       /* current value of scalar (-alphas/hh) in Jacobian  */
+  sunrealtype ida_cjlast;   /* cj value saved from last successful step          */
+  sunrealtype ida_cjold;    /* cj value saved from last call to lsetup           */
+  sunrealtype ida_cjratio;  /* ratio of cj values: cj/cjold                      */
+  sunrealtype ida_ss;       /* scalar used in Newton iteration convergence test  */
+  sunrealtype ida_oldnrm;   /* norm of previous nonlinear solver update          */
+  sunrealtype ida_epsNewt;  /* test constant in Newton convergence test          */
+  sunrealtype ida_epcon;    /* coeficient of the Newton covergence test          */
+  sunrealtype ida_toldel;   /* tolerance in direct test on Newton corrections    */
+
+  sunrealtype ida_ssS;      /* scalar ss for staggered sensitivities             */
 
   /*------
     Limits
@@ -335,16 +335,16 @@ typedef struct IDAMemRec {
   int ida_maxord;        /* max value of method order k:                      */
   int ida_maxord_alloc;  /* value of maxord used when allocating memory       */
   long int ida_mxstep;   /* max number of internal steps for one user call    */
-  realtype ida_hmax_inv; /* inverse of max. step size hmax (default = 0.0)    */
-  realtype ida_hmin;     /* min step size hmin (default = 0.0)                */
+  sunrealtype ida_hmax_inv; /* inverse of max. step size hmax (default = 0.0)    */
+  sunrealtype ida_hmin;     /* min step size hmin (default = 0.0)                */
 
-  realtype ida_eta_max_fx; /* threshold to increase step size */
-  realtype ida_eta_min_fx; /* threshold to decrease step size */
-  realtype ida_eta_max;    /* max step size increase factor   */
-  realtype ida_eta_min;    /* min step size decrease factor   */
-  realtype ida_eta_low;    /* upper bound on decrease factor  */
-  realtype ida_eta_min_ef; /* eta >= eta_min_ef after an error test failure */
-  realtype ida_eta_cf;     /* eta on a nonlinear solver convergence failure */
+  sunrealtype ida_eta_max_fx; /* threshold to increase step size */
+  sunrealtype ida_eta_min_fx; /* threshold to decrease step size */
+  sunrealtype ida_eta_max;    /* max step size increase factor   */
+  sunrealtype ida_eta_min;    /* min step size decrease factor   */
+  sunrealtype ida_eta_low;    /* upper bound on decrease factor  */
+  sunrealtype ida_eta_min_ef; /* eta >= eta_min_ef after an error test failure */
+  sunrealtype ida_eta_cf;     /* eta on a nonlinear solver convergence failure */
 
   /*--------
     Counters
@@ -382,14 +382,14 @@ typedef struct IDAMemRec {
     Space requirements
     ------------------*/
 
-  sunindextype ida_lrw1; /* no. of realtype words in 1 N_Vector               */
+  sunindextype ida_lrw1; /* no. of sunrealtype words in 1 N_Vector               */
   sunindextype ida_liw1; /* no. of integer words in 1 N_Vector                */
   sunindextype ida_lrw1Q;
   sunindextype ida_liw1Q;
-  long int     ida_lrw;  /* number of realtype words in IDA work vectors      */
+  long int     ida_lrw;  /* number of sunrealtype words in IDA work vectors      */
   long int     ida_liw;  /* no. of integer words in IDA work vectors          */
 
-  realtype ida_tolsf;    /* tolerance scale factor (saved value)              */
+  sunrealtype ida_tolsf;    /* tolerance scale factor (saved value)              */
 
   /*-------------------------------------------
     Error handler function and error ouput file
@@ -401,42 +401,42 @@ typedef struct IDAMemRec {
 
   /* Flags to verify correct calling sequence */
 
-  booleantype ida_SetupDone;  /* set to SUNFALSE by IDAMalloc and IDAReInit
+  sunbooleantype ida_SetupDone;  /* set to SUNFALSE by IDAMalloc and IDAReInit
                                  set to SUNTRUE by IDACalcIC or IDASolve      */
 
-  booleantype ida_VatolMallocDone;
-  booleantype ida_constraintsMallocDone;
-  booleantype ida_idMallocDone;
+  sunbooleantype ida_VatolMallocDone;
+  sunbooleantype ida_constraintsMallocDone;
+  sunbooleantype ida_idMallocDone;
 
-  booleantype ida_MallocDone; /* set to SUNFALSE by IDACreate
+  sunbooleantype ida_MallocDone; /* set to SUNFALSE by IDACreate
                                  set to SUNTRUE by IDAMAlloc
                                  tested by IDAReInit and IDASolve             */
 
-  booleantype ida_VatolQMallocDone;
-  booleantype ida_quadMallocDone;
+  sunbooleantype ida_VatolQMallocDone;
+  sunbooleantype ida_quadMallocDone;
 
-  booleantype ida_VatolSMallocDone;
-  booleantype ida_SatolSMallocDone;
-  booleantype ida_sensMallocDone;
+  sunbooleantype ida_VatolSMallocDone;
+  sunbooleantype ida_SatolSMallocDone;
+  sunbooleantype ida_sensMallocDone;
 
-  booleantype ida_VatolQSMallocDone;
-  booleantype ida_SatolQSMallocDone;
-  booleantype ida_quadSensMallocDone;
+  sunbooleantype ida_VatolQSMallocDone;
+  sunbooleantype ida_SatolQSMallocDone;
+  sunbooleantype ida_quadSensMallocDone;
 
   /*---------------------
     Nonlinear Solver Data
     ---------------------*/
 
   SUNNonlinearSolver NLS;    /* nonlinear solver object */
-  booleantype ownNLS;        /* flag indicating NLS ownership */
+  sunbooleantype ownNLS;        /* flag indicating NLS ownership */
 
   SUNNonlinearSolver NLSsim; /* nonlinear solver object for DAE+Sens solves
                                 with the simultaneous corrector option */
-  booleantype ownNLSsim;     /* flag indicating NLS ownership */
+  sunbooleantype ownNLSsim;     /* flag indicating NLS ownership */
 
   SUNNonlinearSolver NLSstg; /* nonlinear solver object for DAE+Sens solves
                                 with the staggered corrector option */
-  booleantype ownNLSstg;     /* flag indicating NLS ownership */
+  sunbooleantype ownNLSstg;     /* flag indicating NLS ownership */
 
   /* The following vectors are NVector wrappers for use with the simultaneous
      and staggered corrector methods:
@@ -454,8 +454,8 @@ typedef struct IDAMemRec {
 
   /* flags indicating if vector wrappers for the simultaneous and staggered
      correctors have been allocated */
-  booleantype simMallocDone;
-  booleantype stgMallocDone;
+  sunbooleantype simMallocDone;
+  sunbooleantype stgMallocDone;
 
   IDAResFn nls_res;          /* F(t,y(t),y'(t))=0; used in the nonlinear
                                 solver */
@@ -482,16 +482,16 @@ typedef struct IDAMemRec {
   /* Linear Solver specific memory */
 
   void *ida_lmem;   /* linear solver interface structure */
-  realtype ida_dcj; /* parameter that determines cj ratio thresholds for calling
+  sunrealtype ida_dcj; /* parameter that determines cj ratio thresholds for calling
                      * the linear solver setup function */
 
   /* Flag to request a call to the setup routine */
 
-  booleantype ida_forceSetup;
+  sunbooleantype ida_forceSetup;
 
   /* Flag to indicate successful ida_linit call */
 
-  booleantype ida_linitOK;
+  sunbooleantype ida_linitOK;
 
   /*----------------
     Rootfinding Data
@@ -501,25 +501,25 @@ typedef struct IDAMemRec {
   int ida_nrtfn;            /* number of components of g                       */
   int *ida_iroots;          /* array for root information                      */
   int *ida_rootdir;         /* array specifying direction of zero-crossing     */
-  realtype ida_tlo;         /* nearest endpoint of interval in root search     */
-  realtype ida_thi;         /* farthest endpoint of interval in root search    */
-  realtype ida_trout;       /* t return value from rootfinder routine          */
-  realtype *ida_glo;        /* saved array of g values at t = tlo              */
-  realtype *ida_ghi;        /* saved array of g values at t = thi              */
-  realtype *ida_grout;      /* array of g values at t = trout                  */
-  realtype ida_toutc;       /* copy of tout (if NORMAL mode)                   */
-  realtype ida_ttol;        /* tolerance on root location                      */
+  sunrealtype ida_tlo;         /* nearest endpoint of interval in root search     */
+  sunrealtype ida_thi;         /* farthest endpoint of interval in root search    */
+  sunrealtype ida_trout;       /* t return value from rootfinder routine          */
+  sunrealtype *ida_glo;        /* saved array of g values at t = tlo              */
+  sunrealtype *ida_ghi;        /* saved array of g values at t = thi              */
+  sunrealtype *ida_grout;      /* array of g values at t = trout                  */
+  sunrealtype ida_toutc;       /* copy of tout (if NORMAL mode)                   */
+  sunrealtype ida_ttol;        /* tolerance on root location                      */
   int ida_taskc;            /* copy of parameter itask                         */
   int ida_irfnd;            /* flag showing whether last step had a root       */
   long int ida_nge;         /* counter for g evaluations                       */
-  booleantype *ida_gactive; /* array with active/inactive event functions      */
+  sunbooleantype *ida_gactive; /* array with active/inactive event functions      */
   int ida_mxgnull;          /* number of warning messages about possible g==0  */
 
   /* Arrays for Fused Vector Operations */
 
   /* scalar arrays */
-  realtype* ida_cvals;
-  realtype  ida_dvals[MAXORD_DEFAULT];
+  sunrealtype* ida_cvals;
+  sunrealtype  ida_dvals[MAXORD_DEFAULT];
 
   /* vector  arrays */
   N_Vector* ida_Xvecs;
@@ -529,11 +529,11 @@ typedef struct IDAMemRec {
     Adjoint sensitivity data
     ------------------------*/
 
-  booleantype ida_adj;              /* SUNTRUE if performing ASA              */
+  sunbooleantype ida_adj;              /* SUNTRUE if performing ASA              */
 
   struct IDAadjMemRec *ida_adj_mem; /* Pointer to adjoint memory structure    */
 
-  booleantype ida_adjMallocDone;
+  sunbooleantype ida_adjMallocDone;
 
 } *IDAMem;
 
@@ -569,9 +569,9 @@ typedef struct IDABMemRec *IDABMem;
  * -----------------------------------------------------------------
  */
 
-typedef booleantype (*IDAAMMallocFn)(IDAMem IDA_mem);
+typedef sunbooleantype (*IDAAMMallocFn)(IDAMem IDA_mem);
 typedef void (*IDAAMFreeFn)(IDAMem IDA_mem);
-typedef int (*IDAAGetYFn)(IDAMem IDA_mem, realtype t,
+typedef int (*IDAAGetYFn)(IDAMem IDA_mem, sunrealtype t,
                           N_Vector yy, N_Vector yp,
                           N_Vector *yyS, N_Vector *ypS);
 typedef int (*IDAAStorePntFn)(IDAMem IDA_mem, IDAdtpntMem d);
@@ -589,20 +589,20 @@ typedef int (*IDAAStorePntFn)(IDAMem IDA_mem, IDAdtpntMem d);
 struct IDAckpntMemRec {
 
   /* Integration limits */
-  realtype ck_t0;
-  realtype ck_t1;
+  sunrealtype ck_t0;
+  sunrealtype ck_t1;
 
   /* Modified divided difference array */
   N_Vector ck_phi[MXORDP1];
 
   /* Do we need to carry quadratures? */
-  booleantype ck_quadr;
+  sunbooleantype ck_quadr;
 
   /* Modified divided difference array for quadratures */
   N_Vector ck_phiQ[MXORDP1];
 
   /* Do we need to carry sensitivities? */
-  booleantype ck_sensi;
+  sunbooleantype ck_sensi;
 
   /* number of sensitivities */
   int ck_Ns;
@@ -611,7 +611,7 @@ struct IDAckpntMemRec {
   N_Vector *ck_phiS[MXORDP1];
 
   /* Do we need to carry quadrature sensitivities? */
-  booleantype ck_quadr_sensi;
+  sunbooleantype ck_quadr_sensi;
 
   /* Modified divided difference array for quadrature sensitivities */
   N_Vector *ck_phiQS[MXORDP1];
@@ -619,28 +619,28 @@ struct IDAckpntMemRec {
 
   /* Step data */
   long int     ck_nst;
-  realtype     ck_tretlast;
+  sunrealtype     ck_tretlast;
   int          ck_ns;
   int          ck_kk;
   int          ck_kused;
   int          ck_knew;
   int          ck_phase;
 
-  realtype     ck_hh;
-  realtype     ck_hused;
-  realtype     ck_eta;
-  realtype     ck_cj;
-  realtype     ck_cjlast;
-  realtype     ck_cjold;
-  realtype     ck_cjratio;
-  realtype     ck_ss;
-  realtype     ck_ssS;
-
-  realtype     ck_psi[MXORDP1];
-  realtype     ck_alpha[MXORDP1];
-  realtype     ck_beta[MXORDP1];
-  realtype     ck_sigma[MXORDP1];
-  realtype     ck_gamma[MXORDP1];
+  sunrealtype     ck_hh;
+  sunrealtype     ck_hused;
+  sunrealtype     ck_eta;
+  sunrealtype     ck_cj;
+  sunrealtype     ck_cjlast;
+  sunrealtype     ck_cjold;
+  sunrealtype     ck_cjratio;
+  sunrealtype     ck_ss;
+  sunrealtype     ck_ssS;
+
+  sunrealtype     ck_psi[MXORDP1];
+  sunrealtype     ck_alpha[MXORDP1];
+  sunrealtype     ck_beta[MXORDP1];
+  sunrealtype     ck_sigma[MXORDP1];
+  sunrealtype     ck_gamma[MXORDP1];
 
   /* How many phi, phiS, phiQ and phiQS were allocated? */
   int          ck_phi_alloc;
@@ -660,7 +660,7 @@ struct IDAckpntMemRec {
  */
 
 struct IDAdtpntMemRec {
-  realtype t;    /* time */
+  sunrealtype t;    /* time */
   void *content; /* interpType-dependent content */
 };
 
@@ -699,15 +699,15 @@ struct IDABMemRec {
   int ida_index;
 
   /* Time at which the backward problem is initialized. */
-  realtype ida_t0;
+  sunrealtype ida_t0;
 
   /* Memory for this backward problem */
   IDAMem IDA_mem;
 
   /* Flags to indicate that this backward problem's RHS or quad RHS
    * require forward sensitivities */
-  booleantype ida_res_withSensi;
-  booleantype ida_rhsQ_withSensi;
+  sunbooleantype ida_res_withSensi;
+  sunbooleantype ida_rhsQ_withSensi;
 
   /* Residual function for backward run */
   IDAResFnB   ida_res;
@@ -735,7 +735,7 @@ struct IDABMemRec {
   int (*ida_pfree)(IDABMem IDAB_mem);
 
   /* Time at which to extract solution / quadratures */
-  realtype ida_tout;
+  sunrealtype ida_tout;
 
   /* Workspace Nvectors */
   N_Vector ida_yy;
@@ -763,19 +763,19 @@ struct IDAadjMemRec {
    * -------------------- */
 
   /* Integration interval */
-  realtype ia_tinitial, ia_tfinal;
+  sunrealtype ia_tinitial, ia_tfinal;
 
   /* Flag for first call to IDASolveF */
-  booleantype ia_firstIDAFcall;
+  sunbooleantype ia_firstIDAFcall;
 
   /* Flag if IDASolveF was called with TSTOP */
-  booleantype ia_tstopIDAFcall;
-  realtype ia_tstopIDAF;
+  sunbooleantype ia_tstopIDAFcall;
+  sunrealtype ia_tstopIDAF;
 
   /* Flag if IDASolveF was called in IDA_NORMAL_MODE and encountered
      a root after tout */
-  booleantype ia_rootret;
-  realtype ia_troot;
+  sunbooleantype ia_rootret;
+  sunrealtype ia_troot;
 
   /* ----------------------
    * Backward problems data
@@ -791,7 +791,7 @@ struct IDAadjMemRec {
   struct IDABMemRec *ia_bckpbCrt;
 
   /* Flag for first call to IDASolveB */
-  booleantype ia_firstIDABcall;
+  sunbooleantype ia_firstIDABcall;
 
   /* ----------------
    * Check point data
@@ -834,18 +834,18 @@ struct IDAadjMemRec {
   IDAAMFreeFn    ia_free;     /* destroys data point             */
 
   /* Flags controlling the interpolation module */
-  booleantype ia_mallocDone;   /* IM initialized?                */
-  booleantype ia_newData;      /* new data available in dt_mem?  */
-  booleantype ia_storeSensi;   /* store sensitivities?           */
-  booleantype ia_interpSensi;  /* interpolate sensitivities?     */
+  sunbooleantype ia_mallocDone;   /* IM initialized?                */
+  sunbooleantype ia_newData;      /* new data available in dt_mem?  */
+  sunbooleantype ia_storeSensi;   /* store sensitivities?           */
+  sunbooleantype ia_interpSensi;  /* interpolate sensitivities?     */
 
-  booleantype ia_noInterp;     /* interpolations are temporarly  */
+  sunbooleantype ia_noInterp;     /* interpolations are temporarly  */
                                /* disabled ( IDACalcICB )        */
 
   /* Workspace for polynomial interpolation */
   N_Vector ia_Y[MXORDP1];      /* pointers  phi[i]               */
   N_Vector *ia_YS[MXORDP1];    /* pointers phiS[i]               */
-  realtype ia_T[MXORDP1];
+  sunrealtype ia_T[MXORDP1];
 
   /* Workspace for wrapper functions */
   N_Vector ia_yyTmp, ia_ypTmp;
@@ -968,15 +968,15 @@ void IDAErrHandler(int error_code, const char *module, const char *function,
 
 /* Norm functions. Also used for IC, so they are global.*/
 
-realtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
-                     booleantype mask);
+sunrealtype IDAWrmsNorm(IDAMem IDA_mem, N_Vector x, N_Vector w,
+                     sunbooleantype mask);
 
-realtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS, N_Vector *wS,
-                         booleantype mask);
+sunrealtype IDASensWrmsNorm(IDAMem IDA_mem, N_Vector *xS, N_Vector *wS,
+                         sunbooleantype mask);
 
-realtype IDASensWrmsNormUpdate(IDAMem IDA_mem, realtype old_nrm,
+sunrealtype IDASensWrmsNormUpdate(IDAMem IDA_mem, sunrealtype old_nrm,
                                       N_Vector *xS, N_Vector *wS,
-                                      booleantype mask);
+                                      sunbooleantype mask);
 
 /* Nonlinear solver initialization */
 
@@ -986,7 +986,7 @@ int idaNlsInitSensStg(IDAMem IDA_mem);
 
 /* Prototype for internal sensitivity residual DQ function */
 
-int IDASensResDQ(int Ns, realtype t,
+int IDASensResDQ(int Ns, sunrealtype t,
                  N_Vector yy, N_Vector yp, N_Vector resval,
                  N_Vector *yyS, N_Vector *ypS, N_Vector *resvalS,
                  void *user_dataS,
diff --git a/src/idas/idas_io.c b/src/idas/idas_io.c
index 6abe42efe3..164d536eb2 100644
--- a/src/idas/idas_io.c
+++ b/src/idas/idas_io.c
@@ -23,10 +23,10 @@
 #include "sundials/sundials_types.h"
 #include "sundials/sundials_math.h"
 
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWOPT5  RCONST(2.5)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWOPT5  SUN_RCONST(2.5)
 
 /*
  * =================================================================
@@ -34,7 +34,7 @@
  * =================================================================
  */
 
-int IDASetDeltaCjLSetup(void *ida_mem, realtype dcj)
+int IDASetDeltaCjLSetup(void *ida_mem, sunrealtype dcj)
 {
   IDAMem IDA_mem;
 
@@ -109,8 +109,8 @@ int IDASetUserData(void *ida_mem, void *user_data)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
-                             realtype eta_max_fx)
+int IDASetEtaFixedStepBounds(void *ida_mem, sunrealtype eta_min_fx,
+                             sunrealtype eta_max_fx)
 {
   IDAMem IDA_mem;
 
@@ -137,7 +137,7 @@ int IDASetEtaFixedStepBounds(void *ida_mem, realtype eta_min_fx,
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMax(void *ida_mem, realtype eta_max)
+int IDASetEtaMax(void *ida_mem, sunrealtype eta_max)
 {
   IDAMem IDA_mem;
 
@@ -159,7 +159,7 @@ int IDASetEtaMax(void *ida_mem, realtype eta_max)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMin(void *ida_mem, realtype eta_min)
+int IDASetEtaMin(void *ida_mem, sunrealtype eta_min)
 {
   IDAMem IDA_mem;
 
@@ -181,7 +181,7 @@ int IDASetEtaMin(void *ida_mem, realtype eta_min)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaLow(void *ida_mem, realtype eta_low)
+int IDASetEtaLow(void *ida_mem, sunrealtype eta_low)
 {
   IDAMem IDA_mem;
 
@@ -203,7 +203,7 @@ int IDASetEtaLow(void *ida_mem, realtype eta_low)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef)
+int IDASetEtaMinErrFail(void *ida_mem, sunrealtype eta_min_ef)
 {
   IDAMem IDA_mem;
 
@@ -225,7 +225,7 @@ int IDASetEtaMinErrFail(void *ida_mem, realtype eta_min_ef)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetEtaConvFail(void *ida_mem, realtype eta_cf)
+int IDASetEtaConvFail(void *ida_mem, sunrealtype eta_cf)
 {
   IDAMem IDA_mem;
 
@@ -303,7 +303,7 @@ int IDASetMaxNumSteps(void *ida_mem, long int mxsteps)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetInitStep(void *ida_mem, realtype hin)
+int IDASetInitStep(void *ida_mem, sunrealtype hin)
 {
   IDAMem IDA_mem;
 
@@ -321,7 +321,7 @@ int IDASetInitStep(void *ida_mem, realtype hin)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetMaxStep(void *ida_mem, realtype hmax)
+int IDASetMaxStep(void *ida_mem, sunrealtype hmax)
 {
   IDAMem IDA_mem;
 
@@ -350,7 +350,7 @@ int IDASetMaxStep(void *ida_mem, realtype hmax)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetMinStep(void *ida_mem, realtype hmin)
+int IDASetMinStep(void *ida_mem, sunrealtype hmin)
 {
   IDAMem IDA_mem;
 
@@ -380,7 +380,7 @@ int IDASetMinStep(void *ida_mem, realtype hmin)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetStopTime(void *ida_mem, realtype tstop)
+int IDASetStopTime(void *ida_mem, sunrealtype tstop)
 {
   IDAMem IDA_mem;
 
@@ -430,7 +430,7 @@ int IDAClearStopTime(void *ida_mem)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetNonlinConvCoef(void *ida_mem, realtype epcon)
+int IDASetNonlinConvCoef(void *ida_mem, sunrealtype epcon)
 {
   IDAMem IDA_mem;
 
@@ -492,7 +492,7 @@ int IDASetMaxConvFails(void *ida_mem, int maxncf)
 int IDASetMaxNonlinIters(void *ida_mem, int maxcor)
 {
   IDAMem IDA_mem;
-  booleantype sensi_sim;
+  sunbooleantype sensi_sim;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS",
@@ -531,7 +531,7 @@ int IDASetMaxNonlinIters(void *ida_mem, int maxcor)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetSuppressAlg(void *ida_mem, booleantype suppressalg)
+int IDASetSuppressAlg(void *ida_mem, sunbooleantype suppressalg)
 {
   IDAMem IDA_mem;
 
@@ -589,7 +589,7 @@ int IDASetId(void *ida_mem, N_Vector id)
 int IDASetConstraints(void *ida_mem, N_Vector constraints)
 {
   IDAMem IDA_mem;
-  realtype temptest;
+  sunrealtype temptest;
 
   if (ida_mem==NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "IDASetConstraints", MSG_NO_MEM);
@@ -704,7 +704,7 @@ int IDASetNoInactiveRootWarn(void *ida_mem)
  * =================================================================
  */
 
-int IDASetNonlinConvCoefIC(void *ida_mem, realtype epiccon)
+int IDASetNonlinConvCoefIC(void *ida_mem, sunrealtype epiccon)
 {
   IDAMem IDA_mem;
 
@@ -819,7 +819,7 @@ int IDASetMaxBacksIC(void *ida_mem, int maxbacks)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff)
+int IDASetLineSearchOffIC(void *ida_mem, sunbooleantype lsoff)
 {
   IDAMem IDA_mem;
 
@@ -837,7 +837,7 @@ int IDASetLineSearchOffIC(void *ida_mem, booleantype lsoff)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetStepToleranceIC(void *ida_mem, realtype steptol)
+int IDASetStepToleranceIC(void *ida_mem, sunrealtype steptol)
 {
   IDAMem IDA_mem;
 
@@ -866,7 +866,7 @@ int IDASetStepToleranceIC(void *ida_mem, realtype steptol)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetQuadErrCon(void *ida_mem, booleantype errconQ)
+int IDASetQuadErrCon(void *ida_mem, sunbooleantype errconQ)
 {
   IDAMem IDA_mem;
 
@@ -892,7 +892,7 @@ int IDASetQuadErrCon(void *ida_mem, booleantype errconQ)
  * =================================================================
  */
 
-int IDASetSensDQMethod(void *ida_mem, int DQtype, realtype DQrhomax)
+int IDASetSensDQMethod(void *ida_mem, int DQtype, sunrealtype DQrhomax)
 {
   IDAMem IDA_mem;
 
@@ -921,7 +921,7 @@ int IDASetSensDQMethod(void *ida_mem, int DQtype, realtype DQrhomax)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetSensErrCon(void *ida_mem, booleantype errconS)
+int IDASetSensErrCon(void *ida_mem, sunbooleantype errconS)
 {
   IDAMem IDA_mem;
 
@@ -962,7 +962,7 @@ int IDASetSensMaxNonlinIters(void *ida_mem, int maxcorS)
 
 /*-----------------------------------------------------------------*/
 
-int IDASetSensParams(void *ida_mem, realtype *p, realtype *pbar, int *plist)
+int IDASetSensParams(void *ida_mem, sunrealtype *p, sunrealtype *pbar, int *plist)
 {
   IDAMem IDA_mem;
   int Ns, is;
@@ -1026,7 +1026,7 @@ int IDASetSensParams(void *ida_mem, realtype *p, realtype *pbar, int *plist)
  * are considered or not in the error control.
  * -----------------------------------------------------------------
  */
-int IDASetQuadSensErrCon(void *ida_mem, booleantype errconQS)
+int IDASetQuadSensErrCon(void *ida_mem, sunbooleantype errconQS)
 {
   IDAMem IDA_mem;
 
@@ -1209,7 +1209,7 @@ int IDAGetCurrentOrder(void *ida_mem, int *kcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentCj(void *ida_mem, realtype *cj)
+int IDAGetCurrentCj(void *ida_mem, sunrealtype *cj)
 {
   IDAMem IDA_mem;
 
@@ -1299,7 +1299,7 @@ int IDAGetCurrentYpSens(void *ida_mem, N_Vector **ypS)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetActualInitStep(void *ida_mem, realtype *hinused)
+int IDAGetActualInitStep(void *ida_mem, sunrealtype *hinused)
 {
   IDAMem IDA_mem;
 
@@ -1317,7 +1317,7 @@ int IDAGetActualInitStep(void *ida_mem, realtype *hinused)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetLastStep(void *ida_mem, realtype *hlast)
+int IDAGetLastStep(void *ida_mem, sunrealtype *hlast)
 {
   IDAMem IDA_mem;
 
@@ -1335,7 +1335,7 @@ int IDAGetLastStep(void *ida_mem, realtype *hlast)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentStep(void *ida_mem, realtype *hcur)
+int IDAGetCurrentStep(void *ida_mem, sunrealtype *hcur)
 {
   IDAMem IDA_mem;
 
@@ -1353,7 +1353,7 @@ int IDAGetCurrentStep(void *ida_mem, realtype *hcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetCurrentTime(void *ida_mem, realtype *tcur)
+int IDAGetCurrentTime(void *ida_mem, sunrealtype *tcur)
 {
   IDAMem IDA_mem;
 
@@ -1371,7 +1371,7 @@ int IDAGetCurrentTime(void *ida_mem, realtype *tcur)
 
 /*-----------------------------------------------------------------*/
 
-int IDAGetTolScaleFactor(void *ida_mem, realtype *tolsfact)
+int IDAGetTolScaleFactor(void *ida_mem, sunrealtype *tolsfact)
 {
   IDAMem IDA_mem;
 
@@ -1445,8 +1445,8 @@ int IDAGetWorkSpace(void *ida_mem, long int *lenrw, long int *leniw)
 
 int IDAGetIntegratorStats(void *ida_mem, long int *nsteps, long int *nrevals,
                           long int *nlinsetups, long int *netfails,
-                          int *klast, int *kcur, realtype *hinused, realtype *hlast,
-                          realtype *hcur, realtype *tcur)
+                          int *klast, int *kcur, sunrealtype *hinused, sunrealtype *hlast,
+                          sunrealtype *hcur, sunrealtype *tcur)
 {
   IDAMem IDA_mem;
 
@@ -2132,7 +2132,7 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
     if (IDA_mem->ida_nst > 0)
     {
       fprintf(outfile, "NLS iters per step           = %"RSYM"\n",
-              (realtype) IDA_mem->ida_nre / (realtype) IDA_mem->ida_nst);
+              (sunrealtype) IDA_mem->ida_nre / (sunrealtype) IDA_mem->ida_nst);
     }
 
     /* linear solver stats */
@@ -2151,11 +2151,11 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
       if (IDA_mem->ida_nni > 0)
       {
         fprintf(outfile, "LS iters per NLS iter        = %"RSYM"\n",
-                (realtype) idals_mem->nli / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nli / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, "Jac evals per NLS iter       = %"RSYM"\n",
-                (realtype) idals_mem->nje / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nje / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, "Prec evals per NLS iter      = %"RSYM"\n",
-                (realtype) idals_mem->npe / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->npe / (sunrealtype) IDA_mem->ida_nni);
       }
     }
 
@@ -2216,7 +2216,7 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
     if (IDA_mem->ida_nst > 0)
     {
       fprintf(outfile, ",NLS iters per step,%"RSYM,
-              (realtype) IDA_mem->ida_nre / (realtype) IDA_mem->ida_nst);
+              (sunrealtype) IDA_mem->ida_nre / (sunrealtype) IDA_mem->ida_nst);
     }
     else
     {
@@ -2239,11 +2239,11 @@ int IDAPrintAllStats(void *ida_mem, FILE *outfile, SUNOutputFormat fmt)
       if (IDA_mem->ida_nni > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) idals_mem->nli / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nli / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) idals_mem->nje / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->nje / (sunrealtype) IDA_mem->ida_nni);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) idals_mem->npe / (realtype) IDA_mem->ida_nni);
+                (sunrealtype) idals_mem->npe / (sunrealtype) IDA_mem->ida_nni);
       }
       else
       {
diff --git a/src/idas/idas_ls.c b/src/idas/idas_ls.c
index 09ac481fa6..87a35eddf7 100644
--- a/src/idas/idas_ls.c
+++ b/src/idas/idas_ls.c
@@ -29,61 +29,61 @@
 
 /* constants */
 #define MAX_ITERS  3  /* max. number of attempts to recover in DQ J*v */
-#define ZERO       RCONST(0.0)
-#define PT25       RCONST(0.25)
-#define PT05       RCONST(0.05)
-#define PT9        RCONST(0.9)
-#define ONE        RCONST(1.0)
-#define TWO        RCONST(2.0)
+#define ZERO       SUN_RCONST(0.0)
+#define PT25       SUN_RCONST(0.25)
+#define PT05       SUN_RCONST(0.05)
+#define PT9        SUN_RCONST(0.9)
+#define ONE        SUN_RCONST(1.0)
+#define TWO        SUN_RCONST(2.0)
 
 
 /*=================================================================
   PRIVATE FUNCTION PROTOTYPES
   =================================================================*/
 
-static int idaLsJacBWrapper(realtype tt, realtype c_jB, N_Vector yyB,
+static int idaLsJacBWrapper(sunrealtype tt, sunrealtype c_jB, N_Vector yyB,
                             N_Vector ypB, N_Vector rBr, SUNMatrix JacB,
                             void *ida_mem, N_Vector tmp1B,
                             N_Vector tmp2B, N_Vector tmp3B);
-static int idaLsJacBSWrapper(realtype tt, realtype c_jB, N_Vector yyB,
+static int idaLsJacBSWrapper(sunrealtype tt, sunrealtype c_jB, N_Vector yyB,
                              N_Vector ypB, N_Vector rBr, SUNMatrix JacB,
                              void *ida_mem, N_Vector tmp1B,
                              N_Vector tmp2B, N_Vector tmp3B);
 
-static int idaLsPrecSetupB(realtype tt, N_Vector yyB,
+static int idaLsPrecSetupB(sunrealtype tt, N_Vector yyB,
                            N_Vector ypB, N_Vector rrB,
-                           realtype c_jB, void *idaadj_mem);
-static int idaLsPrecSetupBS(realtype tt, N_Vector yyB,
+                           sunrealtype c_jB, void *idaadj_mem);
+static int idaLsPrecSetupBS(sunrealtype tt, N_Vector yyB,
                             N_Vector ypB, N_Vector rrB,
-                            realtype c_jB, void *idaadj_mem);
+                            sunrealtype c_jB, void *idaadj_mem);
 
-static int idaLsPrecSolveB(realtype tt, N_Vector yyB,
+static int idaLsPrecSolveB(sunrealtype tt, N_Vector yyB,
                            N_Vector ypB, N_Vector rrB,
                            N_Vector rvecB, N_Vector zvecB,
-                           realtype c_jB, realtype deltaB,
+                           sunrealtype c_jB, sunrealtype deltaB,
                            void *idaadj_mem);
-static int idaLsPrecSolveBS(realtype tt, N_Vector yyB,
+static int idaLsPrecSolveBS(sunrealtype tt, N_Vector yyB,
                             N_Vector ypB, N_Vector rrB,
                             N_Vector rvecB, N_Vector zvecB,
-                            realtype c_jB, realtype deltaB,
+                            sunrealtype c_jB, sunrealtype deltaB,
                             void *idaadj_mem);
 
-static int idaLsJacTimesSetupB(realtype tt, N_Vector yyB,
+static int idaLsJacTimesSetupB(sunrealtype tt, N_Vector yyB,
                                N_Vector ypB, N_Vector rrB,
-                               realtype c_jB, void *idaadj_mem);
-static int idaLsJacTimesSetupBS(realtype tt, N_Vector yyB,
+                               sunrealtype c_jB, void *idaadj_mem);
+static int idaLsJacTimesSetupBS(sunrealtype tt, N_Vector yyB,
                                 N_Vector ypB, N_Vector rrB,
-                                realtype c_jB, void *idaadj_mem);
+                                sunrealtype c_jB, void *idaadj_mem);
 
-static int idaLsJacTimesVecB(realtype tt, N_Vector yyB,
+static int idaLsJacTimesVecB(sunrealtype tt, N_Vector yyB,
                              N_Vector ypB, N_Vector rrB,
                              N_Vector vB, N_Vector JvB,
-                             realtype c_jB, void *idaadj_mem,
+                             sunrealtype c_jB, void *idaadj_mem,
                              N_Vector tmp1B, N_Vector tmp2B);
-static int idaLsJacTimesVecBS(realtype tt, N_Vector yyB,
+static int idaLsJacTimesVecBS(sunrealtype tt, N_Vector yyB,
                               N_Vector ypB, N_Vector rrB,
                               N_Vector vB, N_Vector JvB,
-                              realtype c_jB, void *idaadj_mem,
+                              sunrealtype c_jB, void *idaadj_mem,
                               N_Vector tmp1B, N_Vector tmp2B);
 
 
@@ -100,8 +100,8 @@ int IDASetLinearSolver(void *ida_mem, SUNLinearSolver LS, SUNMatrix A)
   IDAMem      IDA_mem;
   IDALsMem    idals_mem;
   int         retval, LSType;
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if any input is NULL */
   if (ida_mem == NULL) {
@@ -355,7 +355,7 @@ int IDASetJacFn(void *ida_mem, IDALsJacFn jac)
 
 
 /* IDASetEpsLin specifies the nonlinear -> linear tolerance scale factor */
-int IDASetEpsLin(void *ida_mem, realtype eplifac)
+int IDASetEpsLin(void *ida_mem, sunrealtype eplifac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -381,7 +381,7 @@ int IDASetEpsLin(void *ida_mem, realtype eplifac)
 
 /* IDASetWRMSNormFactor sets or computes the factor to use when converting from
    the integrator tolerance to the linear solver tolerance (WRMS to L2 norm). */
-int IDASetLSNormFactor(void *ida_mem, realtype nrmfac)
+int IDASetLSNormFactor(void *ida_mem, sunrealtype nrmfac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -410,7 +410,7 @@ int IDASetLSNormFactor(void *ida_mem, realtype nrmfac)
 
 /* IDASetLinearSolutionScaling enables or disables scaling the linear solver
    solution to account for changes in cj. */
-int IDASetLinearSolutionScaling(void *ida_mem, booleantype onoff)
+int IDASetLinearSolutionScaling(void *ida_mem, sunbooleantype onoff)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -432,7 +432,7 @@ int IDASetLinearSolutionScaling(void *ida_mem, booleantype onoff)
 
 
 /* IDASetIncrementFactor specifies increment factor for DQ approximations to Jv */
-int IDASetIncrementFactor(void *ida_mem, realtype dqincfac)
+int IDASetIncrementFactor(void *ida_mem, sunrealtype dqincfac)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -941,7 +941,7 @@ int idaLsPSetup(void *ida_mem)
   is the only case in which the user's psolve routine is allowed
   to be NULL.
   ---------------------------------------------------------------*/
-int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, realtype tol, int lr)
+int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
@@ -969,7 +969,7 @@ int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z, realtype tol, int lr)
   implementations of the difference quotient Jacobian
   approximation routines.
 ---------------------------------------------------------------*/
-int idaLsDQJac(realtype t, realtype c_j, N_Vector y, N_Vector yp,
+int idaLsDQJac(sunrealtype t, sunrealtype c_j, N_Vector y, N_Vector yp,
                N_Vector r, SUNMatrix Jac, void *ida_mem,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
@@ -1031,12 +1031,12 @@ int idaLsDQJac(realtype t, realtype c_j, N_Vector y, N_Vector yp,
   actual computation of the jth column of the Jacobian is
   done with a call to N_VLinearSum.
 ---------------------------------------------------------------*/
-int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsDenseDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                     N_Vector yp, N_Vector rr, SUNMatrix Jac,
                     IDAMem IDA_mem, N_Vector tmp1)
 {
-  realtype inc, inc_inv, yj, ypj, srur, conj;
-  realtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
+  sunrealtype inc, inc_inv, yj, ypj, srur, conj;
+  sunrealtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
   N_Vector rtemp, jthCol;
   sunindextype j, N;
   IDALsMem idals_mem;
@@ -1127,14 +1127,14 @@ int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
   The return value is either IDABAND_SUCCESS = 0, or the nonzero
   value returned by the res routine, if any.
   ---------------------------------------------------------------*/
-int idaLsBandDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsBandDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                    N_Vector yp, N_Vector rr, SUNMatrix Jac,
                    IDAMem IDA_mem, N_Vector tmp1, N_Vector tmp2,
                    N_Vector tmp3)
 {
-  realtype inc, inc_inv, yj, ypj, srur, conj, ewtj;
-  realtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
-  realtype *ytemp_data, *yptemp_data, *rtemp_data, *r_data, *col_j;
+  sunrealtype inc, inc_inv, yj, ypj, srur, conj, ewtj;
+  sunrealtype *y_data, *yp_data, *ewt_data, *cns_data = NULL;
+  sunrealtype *ytemp_data, *yptemp_data, *rtemp_data, *r_data, *col_j;
   N_Vector rtemp, ytemp, yptemp;
   sunindextype i, j, i1, i2, width, ngroups, group;
   sunindextype N, mupper, mlower;
@@ -1254,14 +1254,14 @@ int idaLsBandDQJac(realtype tt, realtype c_j, N_Vector yy,
   The return value from the call to res is saved in order to set
   the return flag from idaLsSolve.
   ---------------------------------------------------------------*/
-int idaLsDQJtimes(realtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
-                  N_Vector v, N_Vector Jv, realtype c_j,
+int idaLsDQJtimes(sunrealtype tt, N_Vector yy, N_Vector yp, N_Vector rr,
+                  N_Vector v, N_Vector Jv, sunrealtype c_j,
                   void *ida_mem, N_Vector work1, N_Vector work2)
 {
   IDAMem   IDA_mem;
   IDALsMem idals_mem;
   N_Vector y_tmp, yp_tmp;
-  realtype sig, siginv;
+  sunrealtype sig, siginv;
   int      iter, retval;
   SUNLinearSolver_ID LSID;
 
@@ -1486,7 +1486,7 @@ int idaLsSolve(IDAMem IDA_mem, N_Vector b, N_Vector weight,
 {
   IDALsMem idals_mem;
   int      nli_inc, retval;
-  realtype tol, w_mean;
+  sunrealtype tol, w_mean;
 
   /* access IDALsMem structure */
   if (IDA_mem->ida_lmem == NULL) {
@@ -1644,9 +1644,9 @@ int idaLsSolve(IDAMem IDA_mem, N_Vector b, N_Vector weight,
 int idaLsPerf(IDAMem IDA_mem, int perftask)
 {
   IDALsMem    idals_mem;
-  realtype    rcfn, rcfl;
+  sunrealtype    rcfn, rcfl;
   long int    nstd, nnid;
-  booleantype lcfn, lcfl;
+  sunbooleantype lcfn, lcfl;
 
   /* access IDALsMem structure */
   if (IDA_mem->ida_lmem == NULL) {
@@ -1677,8 +1677,8 @@ int idaLsPerf(IDAMem IDA_mem, int perftask)
   nnid = IDA_mem->ida_nni - idals_mem->nni0;
   if (nstd == 0 || nnid == 0) return(0);
 
-  rcfn = ((realtype) (IDA_mem->ida_ncfn - idals_mem->ncfn0)) / ((realtype) nstd);
-  rcfl = ((realtype) (idals_mem->ncfl - idals_mem->ncfl0)) / ((realtype) nnid);
+  rcfn = ((sunrealtype) (IDA_mem->ida_ncfn - idals_mem->ncfn0)) / ((sunrealtype) nstd);
+  rcfl = ((sunrealtype) (idals_mem->ncfl - idals_mem->ncfl0)) / ((sunrealtype) nnid);
   lcfn = (rcfn > PT9);
   lcfl = (rcfl > PT9);
   if (!(lcfn || lcfl)) return(0);
@@ -1938,7 +1938,7 @@ int IDASetJacFnBS(void *ida_mem, int which, IDALsJacFnBS jacBS)
 }
 
 
-int IDASetEpsLinB(void *ida_mem, int which, realtype eplifacB)
+int IDASetEpsLinB(void *ida_mem, int which, sunrealtype eplifacB)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem    IDA_mem;
@@ -1958,7 +1958,7 @@ int IDASetEpsLinB(void *ida_mem, int which, realtype eplifacB)
 }
 
 
-int IDASetLSNormFactorB(void *ida_mem, int which, realtype nrmfacB)
+int IDASetLSNormFactorB(void *ida_mem, int which, sunrealtype nrmfacB)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem    IDA_mem;
@@ -1978,7 +1978,7 @@ int IDASetLSNormFactorB(void *ida_mem, int which, realtype nrmfacB)
 }
 
 
-int IDASetLinearSolutionScalingB(void *ida_mem, int which, booleantype onoffB)
+int IDASetLinearSolutionScalingB(void *ida_mem, int which, sunbooleantype onoffB)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem    IDA_mem;
@@ -1998,7 +1998,7 @@ int IDASetLinearSolutionScalingB(void *ida_mem, int which, booleantype onoffB)
 }
 
 
-int IDASetIncrementFactorB(void *ida_mem, int which, realtype dqincfacB)
+int IDASetIncrementFactorB(void *ida_mem, int which, sunrealtype dqincfacB)
 {
   IDAadjMem IDAADJ_mem;
   IDAMem    IDA_mem;
@@ -2164,7 +2164,7 @@ int IDASetJacTimesResFnB(void *ida_mem, int which, IDAResFn jtimesResFn)
 
 /* idaLsJacBWrapper interfaces to the IDAJacFnB routine provided
    by the user. idaLsJacBWrapper is of type IDALsJacFn. */
-static int idaLsJacBWrapper(realtype tt, realtype c_jB, N_Vector yyB,
+static int idaLsJacBWrapper(sunrealtype tt, sunrealtype c_jB, N_Vector yyB,
                             N_Vector ypB, N_Vector rrB, SUNMatrix JacB,
                             void *ida_mem, N_Vector tmp1B,
                             N_Vector tmp2B, N_Vector tmp3B)
@@ -2203,7 +2203,7 @@ static int idaLsJacBWrapper(realtype tt, realtype c_jB, N_Vector yyB,
 
 /* idaLsJacBSWrapper interfaces to the IDAJacFnBS routine provided
    by the user. idaLsJacBSWrapper is of type IDALsJacFn. */
-static int idaLsJacBSWrapper(realtype tt, realtype c_jB, N_Vector yyB,
+static int idaLsJacBSWrapper(sunrealtype tt, sunrealtype c_jB, N_Vector yyB,
                              N_Vector ypB, N_Vector rrB, SUNMatrix JacB,
                              void *ida_mem, N_Vector tmp1B,
                              N_Vector tmp2B, N_Vector tmp3B)
@@ -2249,8 +2249,8 @@ static int idaLsJacBSWrapper(realtype tt, realtype c_jB, N_Vector yyB,
 
 /* idaLsPrecSetupB interfaces to the IDALsPrecSetupFnB
    routine provided by the user */
-static int idaLsPrecSetupB(realtype tt, N_Vector yyB, N_Vector ypB,
-                           N_Vector rrB, realtype c_jB, void *ida_mem)
+static int idaLsPrecSetupB(sunrealtype tt, N_Vector yyB, N_Vector ypB,
+                           N_Vector rrB, sunrealtype c_jB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2286,8 +2286,8 @@ static int idaLsPrecSetupB(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsPrecSetupBS interfaces to the IDALsPrecSetupFnBS routine
    provided by the user */
-static int idaLsPrecSetupBS(realtype tt, N_Vector yyB, N_Vector ypB,
-                            N_Vector rrB, realtype c_jB, void *ida_mem)
+static int idaLsPrecSetupBS(sunrealtype tt, N_Vector yyB, N_Vector ypB,
+                            N_Vector rrB, sunrealtype c_jB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2331,10 +2331,10 @@ static int idaLsPrecSetupBS(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsPrecSolveB interfaces to the IDALsPrecSolveFnB routine
    provided by the user */
-static int idaLsPrecSolveB(realtype tt, N_Vector yyB, N_Vector ypB,
+static int idaLsPrecSolveB(sunrealtype tt, N_Vector yyB, N_Vector ypB,
                            N_Vector rrB, N_Vector rvecB,
-                           N_Vector zvecB, realtype c_jB,
-                           realtype deltaB, void *ida_mem)
+                           N_Vector zvecB, sunrealtype c_jB,
+                           sunrealtype deltaB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2371,10 +2371,10 @@ static int idaLsPrecSolveB(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsPrecSolveBS interfaces to the IDALsPrecSolveFnBS routine
    provided by the user */
-static int idaLsPrecSolveBS(realtype tt, N_Vector yyB, N_Vector ypB,
+static int idaLsPrecSolveBS(sunrealtype tt, N_Vector yyB, N_Vector ypB,
                             N_Vector rrB, N_Vector rvecB,
-                            N_Vector zvecB, realtype c_jB,
-                            realtype deltaB, void *ida_mem)
+                            N_Vector zvecB, sunrealtype c_jB,
+                            sunrealtype deltaB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2419,8 +2419,8 @@ static int idaLsPrecSolveBS(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsJacTimesSetupB interfaces to the IDALsJacTimesSetupFnB
    routine provided by the user */
-static int idaLsJacTimesSetupB(realtype tt, N_Vector yyB, N_Vector ypB,
-                               N_Vector rrB, realtype c_jB, void *ida_mem)
+static int idaLsJacTimesSetupB(sunrealtype tt, N_Vector yyB, N_Vector ypB,
+                               N_Vector rrB, sunrealtype c_jB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2455,8 +2455,8 @@ static int idaLsJacTimesSetupB(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsJacTimesSetupBS interfaces to the IDALsJacTimesSetupFnBS
    routine provided by the user */
-static int idaLsJacTimesSetupBS(realtype tt, N_Vector yyB, N_Vector ypB,
-                                N_Vector rrB, realtype c_jB, void *ida_mem)
+static int idaLsJacTimesSetupBS(sunrealtype tt, N_Vector yyB, N_Vector ypB,
+                                N_Vector rrB, sunrealtype c_jB, void *ida_mem)
 {
   IDAMem    IDA_mem;
   IDAadjMem IDAADJ_mem;
@@ -2501,9 +2501,9 @@ static int idaLsJacTimesSetupBS(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsJacTimesVecB interfaces to the IDALsJacTimesVecFnB routine
    provided by the user */
-static int idaLsJacTimesVecB(realtype tt, N_Vector yyB, N_Vector ypB,
+static int idaLsJacTimesVecB(sunrealtype tt, N_Vector yyB, N_Vector ypB,
                              N_Vector rrB, N_Vector vB, N_Vector JvB,
-                             realtype c_jB, void *ida_mem,
+                             sunrealtype c_jB, void *ida_mem,
                              N_Vector tmp1B, N_Vector tmp2B)
 {
   IDAMem    IDA_mem;
@@ -2542,9 +2542,9 @@ static int idaLsJacTimesVecB(realtype tt, N_Vector yyB, N_Vector ypB,
 
 /* idaLsJacTimesVecBS interfaces to the IDALsJacTimesVecFnBS routine
    provided by the user */
-static int idaLsJacTimesVecBS(realtype tt, N_Vector yyB, N_Vector ypB,
+static int idaLsJacTimesVecBS(sunrealtype tt, N_Vector yyB, N_Vector ypB,
                               N_Vector rrB, N_Vector vB, N_Vector JvB,
-                              realtype c_jB, void *ida_mem,
+                              sunrealtype c_jB, void *ida_mem,
                               N_Vector tmp1B, N_Vector tmp2B)
 {
   IDAMem    IDA_mem;
diff --git a/src/idas/idas_ls_impl.h b/src/idas/idas_ls_impl.h
index 42b7062329..49adc45603 100644
--- a/src/idas/idas_ls_impl.h
+++ b/src/idas/idas_ls_impl.h
@@ -35,11 +35,11 @@ extern "C" {
 typedef struct IDALsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;    /* SUNTRUE if using internal DQ Jacobian approx. */
+  sunbooleantype jacDQ;    /* SUNTRUE if using internal DQ Jacobian approx. */
   IDALsJacFn jac;       /* Jacobian routine to be called                 */
   void *J_data;         /* J_data is passed to jac                       */
 
@@ -54,14 +54,14 @@ typedef struct IDALsMemRec {
   N_Vector rcur;        /* rcur = F(tn, ycur, ypcur)                     */
 
   /* Matrix-based solver, scale solution to account for change in cj */
-  booleantype scalesol;
+  sunbooleantype scalesol;
 
   /* Iterative solver tolerance */
-  realtype eplifac;   /* nonlinear -> linear tol scaling factor       */
-  realtype nrmfac;    /* integrator -> LS norm conversion factor      */
+  sunrealtype eplifac;   /* nonlinear -> linear tol scaling factor       */
+  sunrealtype nrmfac;    /* integrator -> LS norm conversion factor      */
 
   /* Statistics and associated parameters */
-  realtype dqincfac;  /* dqincfac = optional increment factor in Jv   */
+  sunrealtype dqincfac;  /* dqincfac = optional increment factor in Jv   */
   long int nje;       /* nje = no. of calls to jac                    */
   long int npe;       /* npe = total number of precond calls          */
   long int nli;       /* nli = total number of linear iterations      */
@@ -99,7 +99,7 @@ typedef struct IDALsMemRec {
      (b) internal jtimes
          - jt_data == ida_mem
          - jtimesDQ == SUNTRUE */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   IDALsJacTimesSetupFn jtsetup;
   IDALsJacTimesVecFn jtimes;
   IDAResFn jt_res;
@@ -116,22 +116,22 @@ typedef struct IDALsMemRec {
 int idaLsATimes(void *ida_mem, N_Vector v, N_Vector z);
 int idaLsPSetup(void *ida_mem);
 int idaLsPSolve(void *ida_mem, N_Vector r, N_Vector z,
-                realtype tol, int lr);
+                sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jac times vector */
-int idaLsDQJtimes(realtype tt, N_Vector yy, N_Vector yp,
+int idaLsDQJtimes(sunrealtype tt, N_Vector yy, N_Vector yp,
                   N_Vector rr, N_Vector v, N_Vector Jv,
-                  realtype c_j, void *data,
+                  sunrealtype c_j, void *data,
                   N_Vector work1, N_Vector work2);
 
 /* Difference-quotient Jacobian approximation routines */
-int idaLsDQJac(realtype tt, realtype c_j, N_Vector yy, N_Vector yp,
+int idaLsDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy, N_Vector yp,
                N_Vector rr, SUNMatrix Jac, void *data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
-int idaLsDenseDQJac(realtype tt, realtype c_j, N_Vector yy,
+int idaLsDenseDQJac(sunrealtype tt, sunrealtype c_j, N_Vector yy,
                     N_Vector yp, N_Vector rr, SUNMatrix Jac,
                     IDAMem IDA_mem, N_Vector tmp1);
-int idaLsBandDQJac(realtype tt, realtype c_j,  N_Vector yy,
+int idaLsBandDQJac(sunrealtype tt, sunrealtype c_j,  N_Vector yy,
                    N_Vector yp, N_Vector rr, SUNMatrix Jac,
                    IDAMem IDA_mem, N_Vector tmp1,
                    N_Vector tmp2, N_Vector tmp3);
diff --git a/src/idas/idas_nls.c b/src/idas/idas_nls.c
index 9a8cbf7593..6b7a6a07a9 100644
--- a/src/idas/idas_nls.c
+++ b/src/idas/idas_nls.c
@@ -18,20 +18,20 @@
 #include "sundials/sundials_math.h"
 
 /* constant macros */
-#define PT0001  RCONST(0.0001) /* real 0.0001 */
-#define ONE     RCONST(1.0)    /* real 1.0    */
-#define TWENTY  RCONST(20.0)   /* real 20.0   */
+#define PT0001  SUN_RCONST(0.0001) /* real 0.0001 */
+#define ONE     SUN_RCONST(1.0)    /* real 1.0    */
+#define TWENTY  SUN_RCONST(20.0)   /* real 20.0   */
 
 /* nonlinear solver parameters */
 #define MAXIT   4           /* default max number of nonlinear iterations    */
-#define RATEMAX RCONST(0.9) /* max convergence rate used in divergence check */
+#define RATEMAX SUN_RCONST(0.9) /* max convergence rate used in divergence check */
 
 /* private functions passed to nonlinear solver */
 static int idaNlsResidual(N_Vector ycor, N_Vector res, void* ida_mem);
-static int idaNlsLSetup(booleantype jbad, booleantype* jcur, void* ida_mem);
+static int idaNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* ida_mem);
 static int idaNlsLSolve(N_Vector delta, void* ida_mem);
 static int idaNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                          realtype tol, N_Vector ewt, void* ida_mem);
+                          sunrealtype tol, N_Vector ewt, void* ida_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -160,9 +160,9 @@ int IDASetNlsResFn(void *ida_mem, IDAResFn res)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int IDAGetNonlinearSystemData(void *ida_mem, realtype *tcur, N_Vector *yypred,
+int IDAGetNonlinearSystemData(void *ida_mem, sunrealtype *tcur, N_Vector *yypred,
                               N_Vector *yppred, N_Vector *yyn, N_Vector *ypn,
-                              N_Vector *res, realtype *cj, void **user_data)
+                              N_Vector *res, sunrealtype *cj, void **user_data)
 {
   IDAMem IDA_mem;
 
@@ -233,7 +233,7 @@ int idaNlsInit(IDAMem IDA_mem)
 }
 
 
-static int idaNlsLSetup(booleantype jbad, booleantype* jcur, void* ida_mem)
+static int idaNlsLSetup(sunbooleantype jbad, sunbooleantype* jcur, void* ida_mem)
 {
   IDAMem IDA_mem;
   int retval;
@@ -322,12 +322,12 @@ static int idaNlsResidual(N_Vector ycor, N_Vector res, void* ida_mem)
 
 
 static int idaNlsConvTest(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                          realtype tol, N_Vector ewt, void* ida_mem)
+                          sunrealtype tol, N_Vector ewt, void* ida_mem)
 {
   IDAMem IDA_mem;
   int m, retval;
-  realtype delnrm;
-  realtype rate;
+  sunrealtype delnrm;
+  sunrealtype rate;
 
   if (ida_mem == NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "idaNlsConvTest", MSG_NO_MEM);
diff --git a/src/idas/idas_nls_sim.c b/src/idas/idas_nls_sim.c
index 6ec372a18a..ecd04a7026 100644
--- a/src/idas/idas_nls_sim.c
+++ b/src/idas/idas_nls_sim.c
@@ -19,21 +19,21 @@
 #include "sundials/sundials_nvector_senswrapper.h"
 
 /* constant macros */
-#define PT0001  RCONST(0.0001) /* real 0.0001 */
-#define ONE     RCONST(1.0)    /* real 1.0    */
-#define TWENTY  RCONST(20.0)   /* real 20.0   */
+#define PT0001  SUN_RCONST(0.0001) /* real 0.0001 */
+#define ONE     SUN_RCONST(1.0)    /* real 1.0    */
+#define TWENTY  SUN_RCONST(20.0)   /* real 20.0   */
 
 /* nonlinear solver parameters */
 #define MAXIT   4           /* default max number of nonlinear iterations    */
-#define RATEMAX RCONST(0.9) /* max convergence rate used in divergence check */
+#define RATEMAX SUN_RCONST(0.9) /* max convergence rate used in divergence check */
 
 /* private functions passed to nonlinear solver */
 static int idaNlsResidualSensSim(N_Vector ycor, N_Vector res, void* ida_mem);
-static int idaNlsLSetupSensSim(booleantype jbad, booleantype* jcur,
+static int idaNlsLSetupSensSim(sunbooleantype jbad, sunbooleantype* jcur,
                                void* ida_mem);
 static int idaNlsLSolveSensSim(N_Vector delta, void* ida_mem);
 static int idaNlsConvTestSensSim(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                                 realtype tol, N_Vector ewt, void* ida_mem);
+                                 sunrealtype tol, N_Vector ewt, void* ida_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -193,10 +193,10 @@ int IDASetNonlinearSolverSensSim(void *ida_mem, SUNNonlinearSolver NLS)
   This routine provides access to the relevant data needed to
   compute the nonlinear system function.
   ---------------------------------------------------------------*/
-int IDAGetNonlinearSystemDataSens(void *ida_mem, realtype *tcur,
+int IDAGetNonlinearSystemDataSens(void *ida_mem, sunrealtype *tcur,
                                   N_Vector **yySpred, N_Vector **ypSpred,
                                   N_Vector **yySn, N_Vector **ypSn,
-                                  realtype *cj, void **user_data)
+                                  sunrealtype *cj, void **user_data)
 {
   IDAMem IDA_mem;
 
@@ -265,7 +265,7 @@ int idaNlsInitSensSim(IDAMem IDA_mem)
 }
 
 
-static int idaNlsLSetupSensSim(booleantype jbad, booleantype* jcur,
+static int idaNlsLSetupSensSim(sunbooleantype jbad, sunbooleantype* jcur,
                                void* ida_mem)
 {
   IDAMem IDA_mem;
@@ -408,12 +408,12 @@ static int idaNlsResidualSensSim(N_Vector ycorSim, N_Vector resSim, void* ida_me
 
 
 static int idaNlsConvTestSensSim(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                                 realtype tol, N_Vector ewt, void* ida_mem)
+                                 sunrealtype tol, N_Vector ewt, void* ida_mem)
 {
   IDAMem IDA_mem;
   int m, retval;
-  realtype delnrm;
-  realtype rate;
+  sunrealtype delnrm;
+  sunrealtype rate;
 
   if (ida_mem == NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "idaNlsConvTestSensSim", MSG_NO_MEM);
diff --git a/src/idas/idas_nls_stg.c b/src/idas/idas_nls_stg.c
index 82dbaa87b1..1d8935ea5f 100644
--- a/src/idas/idas_nls_stg.c
+++ b/src/idas/idas_nls_stg.c
@@ -19,21 +19,21 @@
 #include "sundials/sundials_nvector_senswrapper.h"
 
 /* constant macros */
-#define PT0001  RCONST(0.0001) /* real 0.0001 */
-#define ONE     RCONST(1.0)    /* real 1.0    */
-#define TWENTY  RCONST(20.0)   /* real 20.0   */
+#define PT0001  SUN_RCONST(0.0001) /* real 0.0001 */
+#define ONE     SUN_RCONST(1.0)    /* real 1.0    */
+#define TWENTY  SUN_RCONST(20.0)   /* real 20.0   */
 
 /* nonlinear solver parameters */
 #define MAXIT   4           /* default max number of nonlinear iterations    */
-#define RATEMAX RCONST(0.9) /* max convergence rate used in divergence check */
+#define RATEMAX SUN_RCONST(0.9) /* max convergence rate used in divergence check */
 
 /* private functions passed to nonlinear solver */
 static int idaNlsResidualSensStg(N_Vector ycor, N_Vector res, void* ida_mem);
-static int idaNlsLSetupSensStg(booleantype jbad, booleantype* jcur,
+static int idaNlsLSetupSensStg(sunbooleantype jbad, sunbooleantype* jcur,
                                void* ida_mem);
 static int idaNlsLSolveSensStg(N_Vector delta, void* ida_mem);
 static int idaNlsConvTestSensStg(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                                 realtype tol, N_Vector ewt, void* ida_mem);
+                                 sunrealtype tol, N_Vector ewt, void* ida_mem);
 
 /* -----------------------------------------------------------------------------
  * Exported functions
@@ -219,7 +219,7 @@ int idaNlsInitSensStg(IDAMem IDA_mem)
 }
 
 
-static int idaNlsLSetupSensStg(booleantype jbad, booleantype* jcur,
+static int idaNlsLSetupSensStg(sunbooleantype jbad, sunbooleantype* jcur,
                                void* ida_mem)
 {
   IDAMem IDA_mem;
@@ -313,12 +313,12 @@ static int idaNlsResidualSensStg(N_Vector ycorStg, N_Vector resStg, void* ida_me
 
 
 static int idaNlsConvTestSensStg(SUNNonlinearSolver NLS, N_Vector ycor, N_Vector del,
-                                 realtype tol, N_Vector ewt, void* ida_mem)
+                                 sunrealtype tol, N_Vector ewt, void* ida_mem)
 {
   IDAMem IDA_mem;
   int m, retval;
-  realtype delnrm;
-  realtype rate;
+  sunrealtype delnrm;
+  sunrealtype rate;
 
   if (ida_mem == NULL) {
     IDAProcessError(NULL, IDA_MEM_NULL, "IDAS", "idaNlsConvTestSensStg", MSG_NO_MEM);
diff --git a/src/kinsol/fmod/fkinsol_mod.c b/src/kinsol/fmod/fkinsol_mod.c
index 11473b35fb..f7ecc29115 100644
--- a/src/kinsol/fmod/fkinsol_mod.c
+++ b/src/kinsol/fmod/fkinsol_mod.c
@@ -300,11 +300,11 @@ SWIGEXPORT int _wrap_FKINSetUserData(void *farg1, void *farg2) {
 SWIGEXPORT int _wrap_FKINSetDamping(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetDamping(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -356,11 +356,11 @@ SWIGEXPORT int _wrap_FKINSetDelayAA(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FKINSetDampingAA(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetDampingAA(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -468,11 +468,11 @@ SWIGEXPORT int _wrap_FKINSetEtaForm(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FKINSetEtaConstValue(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetEtaConstValue(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -482,13 +482,13 @@ SWIGEXPORT int _wrap_FKINSetEtaConstValue(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FKINSetEtaParams(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)KINSetEtaParams(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -498,13 +498,13 @@ SWIGEXPORT int _wrap_FKINSetEtaParams(void *farg1, double const *farg2, double c
 SWIGEXPORT int _wrap_FKINSetResMonParams(void *farg1, double const *farg2, double const *farg3) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
-  realtype arg3 ;
+  sunrealtype arg2 ;
+  sunrealtype arg3 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
-  arg3 = (realtype)(*farg3);
+  arg2 = (sunrealtype)(*farg2);
+  arg3 = (sunrealtype)(*farg3);
   result = (int)KINSetResMonParams(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -514,11 +514,11 @@ SWIGEXPORT int _wrap_FKINSetResMonParams(void *farg1, double const *farg2, doubl
 SWIGEXPORT int _wrap_FKINSetResMonConstValue(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetResMonConstValue(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -542,11 +542,11 @@ SWIGEXPORT int _wrap_FKINSetNoMinEps(void *farg1, int const *farg2) {
 SWIGEXPORT int _wrap_FKINSetMaxNewtonStep(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetMaxNewtonStep(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -570,11 +570,11 @@ SWIGEXPORT int _wrap_FKINSetMaxBetaFails(void *farg1, long const *farg2) {
 SWIGEXPORT int _wrap_FKINSetRelErrFunc(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetRelErrFunc(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -584,11 +584,11 @@ SWIGEXPORT int _wrap_FKINSetRelErrFunc(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FKINSetFuncNormTol(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetFuncNormTol(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -598,11 +598,11 @@ SWIGEXPORT int _wrap_FKINSetFuncNormTol(void *farg1, double const *farg2) {
 SWIGEXPORT int _wrap_FKINSetScaledStepTol(void *farg1, double const *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)KINSetScaledStepTol(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -742,11 +742,11 @@ SWIGEXPORT int _wrap_FKINGetNumBacktrackOps(void *farg1, long *farg2) {
 SWIGEXPORT int _wrap_FKINGetFuncNorm(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)KINGetFuncNorm(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -756,11 +756,11 @@ SWIGEXPORT int _wrap_FKINGetFuncNorm(void *farg1, double *farg2) {
 SWIGEXPORT int _wrap_FKINGetStepLength(void *farg1, double *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (void *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   result = (int)KINGetStepLength(arg1,arg2);
   fresult = (int)(result);
   return fresult;
@@ -840,7 +840,7 @@ SWIGEXPORT int _wrap_FKINBBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   sunindextype arg4 ;
   sunindextype arg5 ;
   sunindextype arg6 ;
-  realtype arg7 ;
+  sunrealtype arg7 ;
   KINBBDLocalFn arg8 = (KINBBDLocalFn) 0 ;
   KINBBDCommFn arg9 = (KINBBDCommFn) 0 ;
   int result;
@@ -851,7 +851,7 @@ SWIGEXPORT int _wrap_FKINBBDPrecInit(void *farg1, int64_t const *farg2, int64_t
   arg4 = (sunindextype)(*farg4);
   arg5 = (sunindextype)(*farg5);
   arg6 = (sunindextype)(*farg6);
-  arg7 = (realtype)(*farg7);
+  arg7 = (sunrealtype)(*farg7);
   arg8 = (KINBBDLocalFn)(farg8);
   arg9 = (KINBBDCommFn)(farg9);
   result = (int)KINBBDPrecInit(arg1,arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9);
diff --git a/src/kinsol/kinsol.c b/src/kinsol/kinsol.c
index 3446f0ff65..1ed8952f1f 100644
--- a/src/kinsol/kinsol.c
+++ b/src/kinsol/kinsol.c
@@ -76,22 +76,22 @@
  * =================================================================
  */
 
-#define HALF      RCONST(0.5)
-#define ZERO      RCONST(0.0)
-#define ONE       RCONST(1.0)
-#define ONEPT5    RCONST(1.5)
-#define TWO       RCONST(2.0)
-#define THREE     RCONST(3.0)
-#define FIVE      RCONST(5.0)
-#define TWELVE    RCONST(12.0)
-#define POINT1    RCONST(0.1)
-#define POINT01   RCONST(0.01)
-#define POINT99   RCONST(0.99)
-#define THOUSAND  RCONST(1000.0)
-#define ONETHIRD  RCONST(0.3333333333333333)
-#define TWOTHIRDS RCONST(0.6666666666666667)
-#define POINT9    RCONST(0.9)
-#define POINT0001 RCONST(0.0001)
+#define HALF      SUN_RCONST(0.5)
+#define ZERO      SUN_RCONST(0.0)
+#define ONE       SUN_RCONST(1.0)
+#define ONEPT5    SUN_RCONST(1.5)
+#define TWO       SUN_RCONST(2.0)
+#define THREE     SUN_RCONST(3.0)
+#define FIVE      SUN_RCONST(5.0)
+#define TWELVE    SUN_RCONST(12.0)
+#define POINT1    SUN_RCONST(0.1)
+#define POINT01   SUN_RCONST(0.01)
+#define POINT99   SUN_RCONST(0.99)
+#define THOUSAND  SUN_RCONST(1000.0)
+#define ONETHIRD  SUN_RCONST(0.3333333333333333)
+#define TWOTHIRDS SUN_RCONST(0.6666666666666667)
+#define POINT9    SUN_RCONST(0.9)
+#define POINT0001 SUN_RCONST(0.0001)
 
 /*
  * =================================================================
@@ -161,29 +161,29 @@
  * =================================================================
  */
 
-static booleantype KINCheckNvector(N_Vector tmpl);
-static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl);
+static sunbooleantype KINCheckNvector(N_Vector tmpl);
+static sunbooleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl);
 static int KINSolInit(KINMem kin_mem);
 static int KINConstraint(KINMem kin_mem );
-static void KINForcingTerm(KINMem kin_mem, realtype fnormp);
+static void KINForcingTerm(KINMem kin_mem, sunrealtype fnormp);
 static void KINFreeVectors(KINMem kin_mem);
 
-static int  KINFullNewton(KINMem kin_mem, realtype *fnormp,
-                          realtype *f1normp, booleantype *maxStepTaken);
-static int  KINLineSearch(KINMem kin_mem, realtype *fnormp,
-                          realtype *f1normp, booleantype *maxStepTaken);
+static int  KINFullNewton(KINMem kin_mem, sunrealtype *fnormp,
+                          sunrealtype *f1normp, sunbooleantype *maxStepTaken);
+static int  KINLineSearch(KINMem kin_mem, sunrealtype *fnormp,
+                          sunrealtype *f1normp, sunbooleantype *maxStepTaken);
 static int  KINPicardAA(KINMem kin_mem);
 static int  KINFP(KINMem kin_mem);
 
 static int  KINLinSolDrv(KINMem kinmem);
 static int  KINPicardFcnEval(KINMem kin_mem, N_Vector gval, N_Vector uval,
                              N_Vector fval1);
-static realtype KINScFNorm(KINMem kin_mem, N_Vector v, N_Vector scale);
-static realtype KINScSNorm(KINMem kin_mem, N_Vector v, N_Vector u);
-static int KINStop(KINMem kin_mem, booleantype maxStepTaken,
+static sunrealtype KINScFNorm(KINMem kin_mem, N_Vector v, N_Vector scale);
+static sunrealtype KINScSNorm(KINMem kin_mem, N_Vector v, N_Vector u);
+static int KINStop(KINMem kin_mem, sunbooleantype maxStepTaken,
                    int sflag);
 static int AndersonAcc(KINMem kin_mem, N_Vector gval, N_Vector fv, N_Vector x,
-                       N_Vector x_old, long int iter, realtype *R, realtype *gamma);
+                       N_Vector x_old, long int iter, sunrealtype *R, sunrealtype *gamma);
 
 /*
  * =================================================================
@@ -210,7 +210,7 @@ static int AndersonAcc(KINMem kin_mem, N_Vector gval, N_Vector fv, N_Vector x,
 void *KINCreate(SUNContext sunctx)
 {
   KINMem kin_mem;
-  realtype uround;
+  sunrealtype uround;
 
   /* Test inputs */
   if (sunctx == NULL) {
@@ -232,7 +232,7 @@ void *KINCreate(SUNContext sunctx)
 
   /* set uround (unit roundoff) */
 
-  kin_mem->kin_uround = uround = UNIT_ROUNDOFF;
+  kin_mem->kin_uround = uround = SUN_UNIT_ROUNDOFF;
 
   /* set default values for solver optional inputs */
 
@@ -328,7 +328,7 @@ int KINInit(void *kinmem, KINSysFn func, N_Vector tmpl)
 {
   sunindextype liw1, lrw1;
   KINMem kin_mem;
-  booleantype allocOK, nvectorOK, dotprodSB;
+  sunbooleantype allocOK, nvectorOK, dotprodSB;
 
   /* check kinmem */
 
@@ -467,10 +467,10 @@ int KINInit(void *kinmem, KINSysFn func, N_Vector tmpl)
 int KINSol(void *kinmem, N_Vector u, int strategy_in,
            N_Vector u_scale, N_Vector f_scale)
 {
-  realtype fnormp, f1normp, epsmin;
+  sunrealtype fnormp, f1normp, epsmin;
   KINMem kin_mem;
   int ret, sflag;
-  booleantype maxStepTaken;
+  sunbooleantype maxStepTaken;
 
   /* intialize to avoid compiler warning messages */
 
@@ -774,7 +774,7 @@ void KINFree(void **kinmem)
  * SUNTRUE. Otherwise, SUNFALSE is returned.
  */
 
-static booleantype KINCheckNvector(N_Vector tmpl)
+static sunbooleantype KINCheckNvector(N_Vector tmpl)
 {
   if ((tmpl->ops->nvclone     == NULL) ||
       (tmpl->ops->nvdestroy   == NULL) ||
@@ -805,7 +805,7 @@ static booleantype KINCheckNvector(N_Vector tmpl)
  * returns SUNFALSE.
  */
 
-static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
+static sunbooleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
 {
   /* allocate unew, fval, pp, vtemp1 and vtemp2. */
   /* allocate df, dg, q, for Anderson Acceleration, Broyden and EN */
@@ -877,7 +877,7 @@ static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
   if (kin_mem->kin_m_aa) {
 
     if (kin_mem->kin_R_aa == NULL) {
-      kin_mem->kin_R_aa = (realtype *) malloc((kin_mem->kin_m_aa*kin_mem->kin_m_aa) * sizeof(realtype));
+      kin_mem->kin_R_aa = (sunrealtype *) malloc((kin_mem->kin_m_aa*kin_mem->kin_m_aa) * sizeof(sunrealtype));
       if (kin_mem->kin_R_aa == NULL) {
         KINProcessError(kin_mem, 0, "KINSOL", "KINAllocVectors", MSG_MEM_FAIL);
         N_VDestroy(kin_mem->kin_unew);
@@ -892,7 +892,7 @@ static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
     }
 
     if (kin_mem->kin_gamma_aa == NULL) {
-      kin_mem->kin_gamma_aa = (realtype *) malloc(kin_mem->kin_m_aa * sizeof(realtype));
+      kin_mem->kin_gamma_aa = (sunrealtype *) malloc(kin_mem->kin_m_aa * sizeof(sunrealtype));
       if (kin_mem->kin_gamma_aa == NULL) {
         KINProcessError(kin_mem, 0, "KINSOL", "KINAllocVectors", MSG_MEM_FAIL);
         N_VDestroy(kin_mem->kin_unew);
@@ -925,7 +925,7 @@ static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
     }
 
     if (kin_mem->kin_cv == NULL) {
-      kin_mem->kin_cv = (realtype *) malloc(2 * (kin_mem->kin_m_aa+1) * sizeof(realtype));
+      kin_mem->kin_cv = (sunrealtype *) malloc(2 * (kin_mem->kin_m_aa+1) * sizeof(sunrealtype));
       if (kin_mem->kin_cv == NULL) {
         KINProcessError(kin_mem, 0, "KINSOL", "KINAllocVectors", MSG_MEM_FAIL);
         N_VDestroy(kin_mem->kin_unew);
@@ -1134,7 +1134,7 @@ static booleantype KINAllocVectors(KINMem kin_mem, N_Vector tmpl)
       if (kin_mem->kin_orth_aa == KIN_ORTH_ICWY)
       {
         if (kin_mem->kin_T_aa == NULL) {
-          kin_mem->kin_T_aa = (realtype *) malloc(((kin_mem->kin_m_aa*kin_mem->kin_m_aa)) * sizeof(realtype));
+          kin_mem->kin_T_aa = (sunrealtype *) malloc(((kin_mem->kin_m_aa*kin_mem->kin_m_aa)) * sizeof(sunrealtype));
           if (kin_mem->kin_T_aa == NULL) {
             KINProcessError(kin_mem, 0, "KINSOL", "KINAllocVectors", MSG_MEM_FAIL);
             N_VDestroy(kin_mem->kin_unew);
@@ -1333,7 +1333,7 @@ static void KINFreeVectors(KINMem kin_mem)
 static int KINSolInit(KINMem kin_mem)
 {
   int retval;
-  realtype fmax;
+  sunrealtype fmax;
 
   /* check for illegal input parameters */
 
@@ -1567,11 +1567,11 @@ static int KINLinSolDrv(KINMem kin_mem)
  * violated, or if the norm of pp is greater than mxnewtstep.
  */
 
-static int KINFullNewton(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
-                         booleantype *maxStepTaken)
+static int KINFullNewton(KINMem kin_mem, sunrealtype *fnormp, sunrealtype *f1normp,
+                         sunbooleantype *maxStepTaken)
 {
-  realtype pnorm, ratio;
-  booleantype fOK;
+  sunrealtype pnorm, ratio;
+  sunbooleantype fOK;
   int ircvr, retval;
 
   *maxStepTaken = SUNFALSE;
@@ -1702,14 +1702,14 @@ static int KINFullNewton(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
  * condition, as rl can only decrease from 1 at that stage)
  */
 
-static int KINLineSearch(KINMem kin_mem, realtype *fnormp, realtype *f1normp,
-                         booleantype *maxStepTaken)
+static int KINLineSearch(KINMem kin_mem, sunrealtype *fnormp, sunrealtype *f1normp,
+                         sunbooleantype *maxStepTaken)
 {
-  realtype pnorm, ratio, slpi, rlmin, rlength, rl, rlmax, rldiff;
-  realtype rltmp, rlprev, pt1trl, f1nprv, rllo, rlinc, alpha, beta;
-  realtype alpha_cond, beta_cond, rl_a, tmp1, rl_b, tmp2, disc;
+  sunrealtype pnorm, ratio, slpi, rlmin, rlength, rl, rlmax, rldiff;
+  sunrealtype rltmp, rlprev, pt1trl, f1nprv, rllo, rlinc, alpha, beta;
+  sunrealtype alpha_cond, beta_cond, rl_a, tmp1, rl_b, tmp2, disc;
   int ircvr, nbktrk_l, retval;
-  booleantype firstBacktrack, fOK;
+  sunbooleantype firstBacktrack, fOK;
 
   /* Initializations */
 
@@ -2043,9 +2043,9 @@ static int KINConstraint(KINMem kin_mem)
  * sflag    is one of KIN_SUCCESS, STEP_TOO_SMALL
  */
 
-static int KINStop(KINMem kin_mem, booleantype maxStepTaken, int sflag)
+static int KINStop(KINMem kin_mem, sunbooleantype maxStepTaken, int sflag)
 {
-  realtype fmax, rlength, omexp;
+  sunrealtype fmax, rlength, omexp;
   N_Vector delta;
 
   /* Check for too small a step */
@@ -2185,9 +2185,9 @@ static int KINStop(KINMem kin_mem, booleantype maxStepTaken, int sflag)
  * 6/94/75 of the same title.
  */
 
-static void KINForcingTerm(KINMem kin_mem, realtype fnormp)
+static void KINForcingTerm(KINMem kin_mem, sunrealtype fnormp)
 {
-  realtype eta_max, eta_min, eta_safe, linmodel_norm;
+  sunrealtype eta_max, eta_min, eta_safe, linmodel_norm;
 
   eta_max  = POINT9;
   eta_min  = POINT0001;
@@ -2246,7 +2246,7 @@ static void KINForcingTerm(KINMem kin_mem, realtype fnormp)
  * functions from the vector module.
  */
 
-static realtype KINScFNorm(KINMem kin_mem, N_Vector v, N_Vector scale)
+static sunrealtype KINScFNorm(KINMem kin_mem, N_Vector v, N_Vector scale)
 {
   N_VProd(scale, v, kin_mem->kin_vtemp1);
   return(N_VMaxNorm(kin_mem->kin_vtemp1));
@@ -2259,9 +2259,9 @@ static realtype KINScFNorm(KINMem kin_mem, N_Vector v, N_Vector scale)
  * Here ucur is the current step and usc is the u scale factor.
  */
 
-static realtype KINScSNorm(KINMem kin_mem, N_Vector v, N_Vector u)
+static sunrealtype KINScSNorm(KINMem kin_mem, N_Vector v, N_Vector u)
 {
-  realtype length;
+  sunrealtype length;
 
   N_VInv(kin_mem->kin_uscale, kin_mem->kin_vtemp1);
   N_VAbs(u, kin_mem->kin_vtemp2);
@@ -2467,8 +2467,8 @@ static int KINPicardAA(KINMem kin_mem)
   int ret;          /* iteration status            */
   long int iter_aa; /* iteration count for AA      */
   N_Vector delta;   /* temporary workspace vector  */
-  realtype epsmin;
-  realtype fnormp;
+  sunrealtype epsmin;
+  sunrealtype fnormp;
 
   delta  = kin_mem->kin_vtemp1;
   ret    = CONTINUE_ITERATIONS;
@@ -2663,7 +2663,7 @@ static int KINFP(KINMem kin_mem)
   int retval;       /* return value from user func */
   int ret;          /* iteration status            */
   long int iter_aa; /* iteration count for AA      */
-  realtype tolfac;  /* tolerance adjustment factor */
+  sunrealtype tolfac;  /* tolerance adjustment factor */
   N_Vector delta;   /* temporary workspace vector  */
 
   delta  = kin_mem->kin_vtemp1;
@@ -2810,19 +2810,19 @@ static int KINFP(KINMem kin_mem)
 
 static int AndersonAcc(KINMem kin_mem, N_Vector gval, N_Vector fv,
                        N_Vector x, N_Vector xold,
-                       long int iter, realtype *R, realtype *gamma)
+                       long int iter, sunrealtype *R, sunrealtype *gamma)
 {
   int retval;
   long int i_pt, i, j, lAA;
   long int *ipt_map;
-  realtype alfa;
-  realtype onembeta;
-  realtype a, b, temp, c, s;
-  booleantype dotprodSB = SUNFALSE;
+  sunrealtype alfa;
+  sunrealtype onembeta;
+  sunrealtype a, b, temp, c, s;
+  sunbooleantype dotprodSB = SUNFALSE;
 
   /* local shortcuts for fused vector operation */
   int       nvec=0;
-  realtype* cv=kin_mem->kin_cv;
+  sunrealtype* cv=kin_mem->kin_cv;
   N_Vector* Xv=kin_mem->kin_Xv;
 
   /* local dot product flag for single buffer reductions */
diff --git a/src/kinsol/kinsol_bbdpre.c b/src/kinsol/kinsol_bbdpre.c
index 9a15448228..18f8d13418 100644
--- a/src/kinsol/kinsol_bbdpre.c
+++ b/src/kinsol/kinsol_bbdpre.c
@@ -33,8 +33,8 @@
 #include <sundials/sundials_math.h>
 #include <nvector/nvector_serial.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Prototypes of functions KINBBDPrecSetup and KINBBDPrecSolve */
 static int KINBBDPrecSetup(N_Vector uu, N_Vector uscale,
@@ -63,7 +63,7 @@ static int KBBDDQJac(KBBDPrecData pdata,
 int KINBBDPrecInit(void *kinmem, sunindextype Nlocal,
                    sunindextype mudq, sunindextype mldq,
                    sunindextype mukeep, sunindextype mlkeep,
-                   realtype dq_rel_uu,
+                   sunrealtype dq_rel_uu,
                    KINBBDLocalFn gloc, KINBBDCommFn gcomm)
 {
   KINMem kin_mem;
@@ -448,8 +448,8 @@ static int KINBBDPrecSolve(N_Vector uu, N_Vector uscale,
                            N_Vector vv, void *bbd_data)
 {
   KBBDPrecData pdata;
-  realtype *vd;
-  realtype *zd;
+  sunrealtype *vd;
+  sunrealtype *zd;
   int i, retval;
 
   pdata = (KBBDPrecData) bbd_data;
@@ -520,10 +520,10 @@ static int KBBDDQJac(KBBDPrecData pdata,
                      N_Vector gu, N_Vector gtemp, N_Vector utemp)
 {
   KINMem kin_mem;
-  realtype inc, inc_inv;
+  sunrealtype inc, inc_inv;
   int retval;
   sunindextype group, i, j, width, ngroups, i1, i2;
-  realtype *udata, *uscdata, *gudata, *gtempdata, *utempdata, *col_j;
+  sunrealtype *udata, *uscdata, *gudata, *gtempdata, *utempdata, *col_j;
 
   kin_mem = (KINMem) pdata->kin_mem;
 
diff --git a/src/kinsol/kinsol_bbdpre_impl.h b/src/kinsol/kinsol_bbdpre_impl.h
index ac5276b777..b490f8a7c5 100644
--- a/src/kinsol/kinsol_bbdpre_impl.h
+++ b/src/kinsol/kinsol_bbdpre_impl.h
@@ -35,7 +35,7 @@ typedef struct KBBDPrecDataRec {
 
   /* passed by user to KINBBDPrecAlloc, used by pset/psolve functions */
   sunindextype mudq, mldq, mukeep, mlkeep;
-  realtype rel_uu;  /* relative error for the Jacobian DQ routine */
+  sunrealtype rel_uu;  /* relative error for the Jacobian DQ routine */
   KINBBDLocalFn gloc;
   KINBBDCommFn gcomm;
 
diff --git a/src/kinsol/kinsol_impl.h b/src/kinsol/kinsol_impl.h
index d76542cfdc..495267963f 100644
--- a/src/kinsol/kinsol_impl.h
+++ b/src/kinsol/kinsol_impl.h
@@ -52,8 +52,8 @@ extern "C" {
 #define MSBSET_DEFAULT     10
 #define MSBSET_SUB_DEFAULT 5
 
-#define OMEGA_MIN RCONST(0.00001)
-#define OMEGA_MAX RCONST(0.9)
+#define OMEGA_MIN SUN_RCONST(0.00001)
+#define OMEGA_MAX SUN_RCONST(0.9)
 
 /*=================================================================*/
 /* Shortcuts                                                       */
@@ -77,16 +77,16 @@ typedef struct KINMemRec {
 
   SUNContext kin_sunctx;
 
-  realtype kin_uround;        /* machine epsilon (or unit roundoff error)
+  sunrealtype kin_uround;        /* machine epsilon (or unit roundoff error)
                                  (defined in sundials_types.h)                */
 
   /* problem specification data */
 
   KINSysFn kin_func;           /* nonlinear system function implementation     */
   void *kin_user_data;         /* work space available to func routine         */
-  realtype kin_fnormtol;       /* stopping tolerance on L2-norm of function
+  sunrealtype kin_fnormtol;       /* stopping tolerance on L2-norm of function
                                   value                                        */
-  realtype kin_scsteptol;      /* scaled step length tolerance                 */
+  sunrealtype kin_scsteptol;      /* scaled step length tolerance                 */
   int kin_globalstrategy;      /* choices are KIN_NONE, KIN_LINESEARCH
                                   KIN_PICARD and KIN_FP                        */
   long int kin_mxiter;         /* maximum number of nonlinear iterations       */
@@ -97,40 +97,40 @@ typedef struct KINMemRec {
   long int kin_mxnbcf;         /* maximum number of beta condition failures    */
   int kin_etaflag;             /* choices are KIN_ETACONSTANT, KIN_ETACHOICE1
                                   and KIN_ETACHOICE2                           */
-  booleantype kin_noMinEps;    /* flag controlling whether or not the value
+  sunbooleantype kin_noMinEps;    /* flag controlling whether or not the value
                                   of eps is bounded below                      */
-  booleantype kin_constraintsSet; /* flag indicating if constraints are being
+  sunbooleantype kin_constraintsSet; /* flag indicating if constraints are being
                                      used                                      */
-  booleantype kin_jacCurrent;     /* flag indicating if the Jacobian info.
+  sunbooleantype kin_jacCurrent;     /* flag indicating if the Jacobian info.
                                      used by the linear solver is current      */
-  booleantype kin_callForcingTerm; /* flag set if using either KIN_ETACHOICE1
+  sunbooleantype kin_callForcingTerm; /* flag set if using either KIN_ETACHOICE1
                                       or KIN_ETACHOICE2                        */
-  booleantype kin_noResMon;         /* flag indicating if the nonlinear
+  sunbooleantype kin_noResMon;         /* flag indicating if the nonlinear
                                        residual monitoring scheme should be
                                        used                                    */
-  booleantype kin_retry_nni;        /* flag indicating if nonlinear iteration
+  sunbooleantype kin_retry_nni;        /* flag indicating if nonlinear iteration
                                        should be retried (set by residual
                                        monitoring algorithm)                   */
-  booleantype kin_update_fnorm_sub; /* flag indicating if the fnorm associated
+  sunbooleantype kin_update_fnorm_sub; /* flag indicating if the fnorm associated
                                        with the subinterval needs to be
                                        updated (set by residual monitoring
                                        algorithm)                              */
 
-  realtype kin_mxnewtstep;     /* maximum allowable scaled step length         */
-  realtype kin_mxnstepin;      /* input (or preset) value for mxnewtstep       */
-  realtype kin_sqrt_relfunc;   /* relative error bound for func(u)             */
-  realtype kin_stepl;          /* scaled length of current step                */
-  realtype kin_stepmul;        /* step scaling factor                          */
-  realtype kin_eps;            /* current value of eps                         */
-  realtype kin_eta;            /* current value of eta                         */
-  realtype kin_eta_gamma;      /* gamma value used in eta calculation
+  sunrealtype kin_mxnewtstep;     /* maximum allowable scaled step length         */
+  sunrealtype kin_mxnstepin;      /* input (or preset) value for mxnewtstep       */
+  sunrealtype kin_sqrt_relfunc;   /* relative error bound for func(u)             */
+  sunrealtype kin_stepl;          /* scaled length of current step                */
+  sunrealtype kin_stepmul;        /* step scaling factor                          */
+  sunrealtype kin_eps;            /* current value of eps                         */
+  sunrealtype kin_eta;            /* current value of eta                         */
+  sunrealtype kin_eta_gamma;      /* gamma value used in eta calculation
                                   (choice #2)                                  */
-  realtype kin_eta_alpha;      /* alpha value used in eta calculation
+  sunrealtype kin_eta_alpha;      /* alpha value used in eta calculation
                                   (choice #2)                                  */
-  booleantype kin_noInitSetup; /* flag controlling whether or not the KINSol
+  sunbooleantype kin_noInitSetup; /* flag controlling whether or not the KINSol
                                   routine makes an initial call to the
                                   linear solver setup routine (lsetup)         */
-  realtype kin_sthrsh;         /* threshold value for calling the linear
+  sunrealtype kin_sthrsh;         /* threshold value for calling the linear
                                   solver setup routine                         */
 
   /* counters */
@@ -170,9 +170,9 @@ typedef struct KINMemRec {
   N_Vector kin_vtemp3;      /* scratch vector #3                               */
 
   /* fixed point and Picard options */
-  booleantype kin_ret_newest; /* return the newest FP iteration     */
-  booleantype kin_damping;    /* flag to apply damping in FP/Picard */
-  realtype    kin_beta;       /* damping parameter for FP/Picard    */
+  sunbooleantype kin_ret_newest; /* return the newest FP iteration     */
+  sunbooleantype kin_damping;    /* flag to apply damping in FP/Picard */
+  sunrealtype    kin_beta;       /* damping parameter for FP/Picard    */
 
   /* space requirements for AA, Broyden and NLEN */
   N_Vector kin_fold_aa;       /* vector needed for AA, Broyden, and NLEN         */
@@ -180,10 +180,10 @@ typedef struct KINMemRec {
   N_Vector *kin_df_aa;        /* vector array needed for AA, Broyden, and NLEN   */
   N_Vector *kin_dg_aa;        /* vector array needed for AA, Broyden and NLEN    */
   N_Vector *kin_q_aa;         /* vector array needed for AA                      */
-  realtype kin_beta_aa;       /* beta damping parameter for AA                   */
-  realtype *kin_gamma_aa;     /* array of size maa used in AA                    */
-  realtype *kin_R_aa;         /* array of size maa*maa used in AA                */
-  realtype *kin_T_aa;         /* array of size maa*maa used in AA with ICWY MGS  */
+  sunrealtype kin_beta_aa;       /* beta damping parameter for AA                   */
+  sunrealtype *kin_gamma_aa;     /* array of size maa used in AA                    */
+  sunrealtype *kin_R_aa;         /* array of size maa*maa used in AA                */
+  sunrealtype *kin_T_aa;         /* array of size maa*maa used in AA with ICWY MGS  */
   long int *kin_ipt_map;      /* array of size maa*maa/2 used in AA              */
   long int kin_m_aa;          /* parameter for AA, Broyden or NLEN               */
   long int kin_delay_aa;      /* number of iterations to delay AA */
@@ -196,17 +196,17 @@ typedef struct KINMemRec {
   SUNQRAddFn kin_qr_func;     /* QRAdd function for AA orthogonalization         */
   SUNQRData  kin_qr_data;     /* Additional parameters required for QRAdd routine
                                  set for AA                                      */
-  booleantype kin_damping_aa; /* flag to apply damping in AA                     */
-  realtype *kin_cv;           /* scalar array for fused vector operations        */
+  sunbooleantype kin_damping_aa; /* flag to apply damping in AA                     */
+  sunrealtype *kin_cv;           /* scalar array for fused vector operations        */
   N_Vector *kin_Xv;           /* vector array for fused vector operations        */
 
   /* space requirements for vector storage */
 
-  sunindextype kin_lrw1;    /* number of realtype-sized memory blocks needed
+  sunindextype kin_lrw1;    /* number of sunrealtype-sized memory blocks needed
                                for a single N_Vector                           */
   sunindextype kin_liw1;    /* number of int-sized memory blocks needed for
                                a single N_Vecotr                               */
-  long int kin_lrw;         /* total number of realtype-sized memory blocks
+  long int kin_lrw;         /* total number of sunrealtype-sized memory blocks
                                needed for all KINSOL work vectors              */
   long int kin_liw;         /* total number of int-sized memory blocks needed
                                for all KINSOL work vectors                     */
@@ -220,33 +220,33 @@ typedef struct KINMemRec {
   int (*kin_lsetup)(struct KINMemRec *kin_mem);
 
   int (*kin_lsolve)(struct KINMemRec *kin_mem, N_Vector xx, N_Vector bb,
-                    realtype *sJpnorm, realtype *sFdotJp);
+                    sunrealtype *sJpnorm, sunrealtype *sFdotJp);
 
   int (*kin_lfree)(struct KINMemRec *kin_mem);
 
-  booleantype kin_inexact_ls; /* flag set by the linear solver module
+  sunbooleantype kin_inexact_ls; /* flag set by the linear solver module
                                  (in linit) indicating whether this is an
                                  iterative linear solver (SUNTRUE), or a direct
                                  linear solver (SUNFALSE)                       */
 
   void *kin_lmem;         /* pointer to linear solver memory block             */
 
-  realtype kin_fnorm;     /* value of L2-norm of fscale*fval                   */
-  realtype kin_f1norm;    /* f1norm = 0.5*(fnorm)^2                            */
-  realtype kin_sFdotJp;   /* value of scaled F(u) vector (fscale*fval)
+  sunrealtype kin_fnorm;     /* value of L2-norm of fscale*fval                   */
+  sunrealtype kin_f1norm;    /* f1norm = 0.5*(fnorm)^2                            */
+  sunrealtype kin_sFdotJp;   /* value of scaled F(u) vector (fscale*fval)
                              dotted with scaled J(u)*pp vector (set by lsolve) */
-  realtype kin_sJpnorm;   /* value of L2-norm of fscale*(J(u)*pp)
+  sunrealtype kin_sJpnorm;   /* value of L2-norm of fscale*(J(u)*pp)
                              (set by lsolve)                                   */
 
-  realtype kin_fnorm_sub; /* value of L2-norm of fscale*fval (subinterval)     */
-  booleantype kin_eval_omega; /* flag indicating that omega must be evaluated. */
-  realtype kin_omega;     /* constant value for real scalar used in test to
+  sunrealtype kin_fnorm_sub; /* value of L2-norm of fscale*fval (subinterval)     */
+  sunbooleantype kin_eval_omega; /* flag indicating that omega must be evaluated. */
+  sunrealtype kin_omega;     /* constant value for real scalar used in test to
                              determine if reduction of norm of nonlinear
                              residual is sufficient. Unless a valid constant
                              value is specified by the user, omega is estimated
                              from omega_min and omega_max at each iteration.    */
-  realtype kin_omega_min; /* lower bound on omega                               */
-  realtype kin_omega_max; /* upper bound on omega                               */
+  sunrealtype kin_omega_min; /* lower bound on omega                               */
+  sunrealtype kin_omega_max; /* upper bound on omega                               */
 
   /*
    * -----------------------------------------------------------------
@@ -265,7 +265,7 @@ typedef struct KINMemRec {
    * -----------------------------------------------------------------
    */
 
-  booleantype kin_MallocDone; /* flag indicating if KINMalloc has been
+  sunbooleantype kin_MallocDone; /* flag indicating if KINMalloc has been
                                  called yet                                    */
 
   /* message files */
@@ -294,7 +294,7 @@ typedef struct KINMemRec {
  * but system memory allocation should be done by the subroutine
  * that actually initializes the environment for liner solver
  * package. If the linear system is to be preconditioned, then the
- * variable setupNonNull (type booleantype) should be set to SUNTRUE
+ * variable setupNonNull (type sunbooleantype) should be set to SUNTRUE
  * (predefined constant) and the kin_lsetup routine should be
  * appropriately defined.
  *
@@ -329,7 +329,7 @@ typedef struct KINMemRec {
 /*
  * -----------------------------------------------------------------
  * Function : int (*kin_lsolve)(KINMem kin_mem, N_Vector xx,
- *                N_Vector bb, realtype *sJpnorm, realtype *sFdotJp)
+ *                N_Vector bb, sunrealtype *sJpnorm, sunrealtype *sFdotJp)
  * -----------------------------------------------------------------
  * kin_lsolve interfaces with the subroutine implementing the
  * numerical method to be used to solve the linear system J*xx = bb,
diff --git a/src/kinsol/kinsol_io.c b/src/kinsol/kinsol_io.c
index e46968053b..c07e65d03f 100644
--- a/src/kinsol/kinsol_io.c
+++ b/src/kinsol/kinsol_io.c
@@ -25,15 +25,15 @@
 #include <sundials/sundials_types.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO      RCONST(0.0)
-#define POINT1    RCONST(0.1)
-#define ONETHIRD  RCONST(0.3333333333333333)
-#define HALF      RCONST(0.5)
-#define TWOTHIRDS RCONST(0.6666666666666667)
-#define POINT9    RCONST(0.9)
-#define ONE       RCONST(1.0)
-#define TWO       RCONST(2.0)
-#define TWOPT5    RCONST(2.5)
+#define ZERO      SUN_RCONST(0.0)
+#define POINT1    SUN_RCONST(0.1)
+#define ONETHIRD  SUN_RCONST(0.3333333333333333)
+#define HALF      SUN_RCONST(0.5)
+#define TWOTHIRDS SUN_RCONST(0.6666666666666667)
+#define POINT9    SUN_RCONST(0.9)
+#define ONE       SUN_RCONST(1.0)
+#define TWO       SUN_RCONST(2.0)
+#define TWOPT5    SUN_RCONST(2.5)
 
 /*
  * =================================================================
@@ -112,7 +112,7 @@ int KINSetUserData(void *kinmem, void *user_data)
  * -----------------------------------------------------------------
  */
 
-int KINSetDamping(void *kinmem, realtype beta)
+int KINSetDamping(void *kinmem, sunrealtype beta)
 {
   KINMem kin_mem;
 
@@ -237,7 +237,7 @@ int KINSetOrthAA(void *kinmem, int orthaa)
  * -----------------------------------------------------------------
  */
 
-int KINSetDampingAA(void *kinmem, realtype beta)
+int KINSetDampingAA(void *kinmem, sunrealtype beta)
 {
   KINMem kin_mem;
 
@@ -274,7 +274,7 @@ int KINSetDampingAA(void *kinmem, realtype beta)
  * -----------------------------------------------------------------
  */
 
-int KINSetReturnNewest(void *kinmem, booleantype ret_newest)
+int KINSetReturnNewest(void *kinmem, sunbooleantype ret_newest)
 {
   KINMem kin_mem;
 
@@ -326,7 +326,7 @@ int KINSetNumMaxIters(void *kinmem, long int mxiter)
  * -----------------------------------------------------------------
  */
 
-int KINSetNoInitSetup(void *kinmem, booleantype noInitSetup)
+int KINSetNoInitSetup(void *kinmem, sunbooleantype noInitSetup)
 {
   KINMem kin_mem;
 
@@ -347,7 +347,7 @@ int KINSetNoInitSetup(void *kinmem, booleantype noInitSetup)
  * -----------------------------------------------------------------
  */
 
-int KINSetNoResMon(void *kinmem, booleantype noResMon)
+int KINSetNoResMon(void *kinmem, sunbooleantype noResMon)
 {
   KINMem kin_mem;
 
@@ -457,7 +457,7 @@ int KINSetEtaForm(void *kinmem, int etachoice)
  * -----------------------------------------------------------------
  */
 
-int KINSetEtaConstValue(void *kinmem, realtype eta)
+int KINSetEtaConstValue(void *kinmem, sunrealtype eta)
 {
   KINMem kin_mem;
 
@@ -487,7 +487,7 @@ int KINSetEtaConstValue(void *kinmem, realtype eta)
  * -----------------------------------------------------------------
  */
 
-int KINSetEtaParams(void *kinmem, realtype egamma, realtype ealpha)
+int KINSetEtaParams(void *kinmem, sunrealtype egamma, sunrealtype ealpha)
 {
   KINMem kin_mem;
 
@@ -529,7 +529,7 @@ int KINSetEtaParams(void *kinmem, realtype egamma, realtype ealpha)
  * -----------------------------------------------------------------
  */
 
-int KINSetResMonParams(void *kinmem, realtype omegamin, realtype omegamax)
+int KINSetResMonParams(void *kinmem, sunrealtype omegamin, sunrealtype omegamax)
 {
   KINMem kin_mem;
 
@@ -586,7 +586,7 @@ int KINSetResMonParams(void *kinmem, realtype omegamin, realtype omegamax)
  * -----------------------------------------------------------------
  */
 
-int KINSetResMonConstValue(void *kinmem, realtype omegaconst)
+int KINSetResMonConstValue(void *kinmem, sunrealtype omegaconst)
 {
   KINMem kin_mem;
 
@@ -616,7 +616,7 @@ int KINSetResMonConstValue(void *kinmem, realtype omegaconst)
  * -----------------------------------------------------------------
  */
 
-int KINSetNoMinEps(void *kinmem, booleantype noMinEps)
+int KINSetNoMinEps(void *kinmem, sunbooleantype noMinEps)
 {
   KINMem kin_mem;
 
@@ -637,7 +637,7 @@ int KINSetNoMinEps(void *kinmem, booleantype noMinEps)
  * -----------------------------------------------------------------
  */
 
-int KINSetMaxNewtonStep(void *kinmem, realtype mxnewtstep)
+int KINSetMaxNewtonStep(void *kinmem, sunrealtype mxnewtstep)
 {
   KINMem kin_mem;
 
@@ -698,10 +698,10 @@ int KINSetMaxBetaFails(void *kinmem, long int mxnbcf)
  * -----------------------------------------------------------------
  */
 
-int KINSetRelErrFunc(void *kinmem, realtype relfunc)
+int KINSetRelErrFunc(void *kinmem, sunrealtype relfunc)
 {
   KINMem kin_mem;
-  realtype uround;
+  sunrealtype uround;
 
   if (kinmem == NULL) {
     KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetRelErrFunc", MSG_NO_MEM);
@@ -731,10 +731,10 @@ int KINSetRelErrFunc(void *kinmem, realtype relfunc)
  * -----------------------------------------------------------------
  */
 
-int KINSetFuncNormTol(void *kinmem, realtype fnormtol)
+int KINSetFuncNormTol(void *kinmem, sunrealtype fnormtol)
 {
   KINMem kin_mem;
-  realtype uround;
+  sunrealtype uround;
 
   if (kinmem == NULL) {
     KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetFuncNormTol", MSG_NO_MEM);
@@ -764,10 +764,10 @@ int KINSetFuncNormTol(void *kinmem, realtype fnormtol)
  * -----------------------------------------------------------------
  */
 
-int KINSetScaledStepTol(void *kinmem, realtype scsteptol)
+int KINSetScaledStepTol(void *kinmem, sunrealtype scsteptol)
 {
   KINMem kin_mem;
-  realtype uround;
+  sunrealtype uround;
 
   if (kinmem == NULL) {
     KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetScaledStepTol", MSG_NO_MEM);
@@ -800,7 +800,7 @@ int KINSetScaledStepTol(void *kinmem, realtype scsteptol)
 int KINSetConstraints(void *kinmem, N_Vector constraints)
 {
   KINMem kin_mem;
-  realtype temptest;
+  sunrealtype temptest;
 
   if (kinmem == NULL) {
     KINProcessError(NULL, KIN_MEM_NULL, "KINSOL", "KINSetConstraints", MSG_NO_MEM);
@@ -988,7 +988,7 @@ int KINGetNumBacktrackOps(void *kinmem, long int *nbacktr)
  * -----------------------------------------------------------------
  */
 
-int KINGetFuncNorm(void *kinmem, realtype *funcnorm)
+int KINGetFuncNorm(void *kinmem, sunrealtype *funcnorm)
 {
   KINMem kin_mem;
 
@@ -1009,7 +1009,7 @@ int KINGetFuncNorm(void *kinmem, realtype *funcnorm)
  * -----------------------------------------------------------------
  */
 
-int KINGetStepLength(void *kinmem, realtype *steplength)
+int KINGetStepLength(void *kinmem, sunrealtype *steplength)
 {
   KINMem kin_mem;
 
@@ -1090,11 +1090,11 @@ int KINPrintAllStats(void *kinmem, FILE* outfile, SUNOutputFormat fmt)
       if (kin_mem->kin_nni > 0)
       {
         fprintf(outfile, "LS iters per NLS iter   = %"RSYM"\n",
-                (realtype) kinls_mem->nli / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->nli / (sunrealtype) kin_mem->kin_nni);
         fprintf(outfile, "Jac evals per NLS iter  = %"RSYM"\n",
-                (realtype) kinls_mem->nje / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->nje / (sunrealtype) kin_mem->kin_nni);
         fprintf(outfile, "Prec evals per NLS iter = %"RSYM"\n",
-                (realtype) kinls_mem->npe / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->npe / (sunrealtype) kin_mem->kin_nni);
       }
     }
 
@@ -1122,11 +1122,11 @@ int KINPrintAllStats(void *kinmem, FILE* outfile, SUNOutputFormat fmt)
       if (kin_mem->kin_nni > 0)
       {
         fprintf(outfile, ",LS iters per NLS iter,%"RSYM,
-                (realtype) kinls_mem->nli / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->nli / (sunrealtype) kin_mem->kin_nni);
         fprintf(outfile, ",Jac evals per NLS iter,%"RSYM,
-                (realtype) kinls_mem->nje / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->nje / (sunrealtype) kin_mem->kin_nni);
         fprintf(outfile, ",Prec evals per NLS iter,%"RSYM,
-                (realtype) kinls_mem->npe / (realtype) kin_mem->kin_nni);
+                (sunrealtype) kinls_mem->npe / (sunrealtype) kin_mem->kin_nni);
       }
       else
       {
diff --git a/src/kinsol/kinsol_ls.c b/src/kinsol/kinsol_ls.c
index 59dd1ccb8c..70052e45f2 100644
--- a/src/kinsol/kinsol_ls.c
+++ b/src/kinsol/kinsol_ls.c
@@ -29,10 +29,10 @@
 #include <sunmatrix/sunmatrix_sparse.h>
 
 /* constants */
-#define MIN_INC_MULT RCONST(1000.0)
-#define ZERO         RCONST(0.0)
-#define ONE          RCONST(1.0)
-#define TWO          RCONST(2.0)
+#define MIN_INC_MULT SUN_RCONST(1000.0)
+#define ZERO         SUN_RCONST(0.0)
+#define ONE          SUN_RCONST(1.0)
+#define TWO          SUN_RCONST(2.0)
 
 
 /*==================================================================
@@ -47,8 +47,8 @@ int KINSetLinearSolver(void *kinmem, SUNLinearSolver LS, SUNMatrix A)
   KINMem      kin_mem;
   KINLsMem    kinls_mem;
   int         retval, LSType;
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Return immediately if either kinmem or LS inputs are NULL */
   if (kinmem == NULL) {
@@ -694,7 +694,7 @@ int kinLsPSetup(void *kinmem)
   in the case in which preconditioning is not done. This is the only
   case in which the user's psolve routine is allowed to be NULL.
   ------------------------------------------------------------------*/
-int kinLsPSolve(void *kinmem, N_Vector r, N_Vector z, realtype tol, int lr)
+int kinLsPSolve(void *kinmem, N_Vector r, N_Vector z, sunrealtype tol, int lr)
 {
   KINMem   kin_mem;
   KINLsMem kinls_mem;
@@ -786,8 +786,8 @@ int kinLsDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
 int kinLsDenseDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
                     KINMem kin_mem, N_Vector tmp1, N_Vector tmp2)
 {
-  realtype inc, inc_inv, ujsaved, ujscale, sign;
-  realtype *tmp2_data, *u_data, *uscale_data;
+  sunrealtype inc, inc_inv, ujsaved, ujscale, sign;
+  sunrealtype *tmp2_data, *u_data, *uscale_data;
   N_Vector ftemp, jthCol;
   sunindextype j, N;
   KINLsMem kinls_mem;
@@ -864,11 +864,11 @@ int kinLsDenseDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
 int kinLsBandDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
                    KINMem kin_mem, N_Vector tmp1, N_Vector tmp2)
 {
-  realtype inc, inc_inv;
+  sunrealtype inc, inc_inv;
   N_Vector futemp, utemp;
   sunindextype group, i, j, width, ngroups, i1, i2;
   sunindextype N, mupper, mlower;
-  realtype *col_j, *fu_data, *futemp_data, *u_data, *utemp_data, *uscale_data;
+  sunrealtype *col_j, *fu_data, *futemp_data, *u_data, *utemp_data, *uscale_data;
   KINLsMem kinls_mem;
   int retval = 0;
 
@@ -951,9 +951,9 @@ int kinLsBandDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
         fails (recoverably).
   ------------------------------------------------------------------*/
 int kinLsDQJtimes(N_Vector v, N_Vector Jv, N_Vector u,
-                  booleantype *new_u, void *kinmem)
+                  sunbooleantype *new_u, void *kinmem)
 {
-  realtype sigma, sigma_inv, sutsv, sq1norm, sign, vtv;
+  sunrealtype sigma, sigma_inv, sutsv, sq1norm, sign, vtv;
   KINMem   kin_mem;
   KINLsMem kinls_mem;
   int      retval;
@@ -1204,11 +1204,11 @@ int kinLsSetup(KINMem kin_mem)
   SUNLinearSolver object
   ------------------------------------------------------------------*/
 int kinLsSolve(KINMem kin_mem, N_Vector xx, N_Vector bb,
-               realtype *sJpnorm, realtype *sFdotJp)
+               sunrealtype *sJpnorm, sunrealtype *sFdotJp)
 {
   KINLsMem kinls_mem;
   int      nli_inc, retval;
-  realtype res_norm, tol;
+  sunrealtype res_norm, tol;
 
   /* Access KINLsMem structure */
   if (kin_mem->kin_lmem == NULL) {
diff --git a/src/kinsol/kinsol_ls_impl.h b/src/kinsol/kinsol_ls_impl.h
index 2124649a4a..78d9fcc1eb 100644
--- a/src/kinsol/kinsol_ls_impl.h
+++ b/src/kinsol/kinsol_ls_impl.h
@@ -43,11 +43,11 @@ extern "C" {
 typedef struct KINLsMemRec {
 
   /* Linear solver type information */
-  booleantype iterative;    /* is the solver iterative?    */
-  booleantype matrixbased;  /* is a matrix structure used? */
+  sunbooleantype iterative;    /* is the solver iterative?    */
+  sunbooleantype matrixbased;  /* is a matrix structure used? */
 
   /* Jacobian construction & storage */
-  booleantype jacDQ;   /* SUNTRUE if using internal DQ Jacobian approx. */
+  sunbooleantype jacDQ;   /* SUNTRUE if using internal DQ Jacobian approx. */
   KINLsJacFn jac;      /* Jacobian routine to be called                 */
   void *J_data;        /* J_data is passed to jac                       */
 
@@ -56,7 +56,7 @@ typedef struct KINLsMemRec {
   SUNMatrix J;         /* problem Jacobian                              */
 
   /* Solver tolerance adjustment factor (if needed, see kinLsSolve)     */
-  realtype tol_fac;
+  sunrealtype tol_fac;
 
   /* Statistics and associated parameters */
   long int nje;        /* no. of calls to jac                           */
@@ -68,7 +68,7 @@ typedef struct KINLsMemRec {
   long int ncfl;       /* ncfl = total number of convergence failures   */
   long int njtimes;    /* njtimes = total number of calls to jtimes     */
 
-  booleantype new_uu;  /* flag indicating if the iterate has been
+  sunbooleantype new_uu;  /* flag indicating if the iterate has been
                           updated - the Jacobian must be updated or
                           reevaluated (meant to be used by a
                           user-supplied jtimes function                 */
@@ -94,7 +94,7 @@ typedef struct KINLsMemRec {
      (b) internal jtimes
          - jt_data == kin_mem
          - jtimesDQ == SUNTRUE */
-  booleantype jtimesDQ;
+  sunbooleantype jtimesDQ;
   KINLsJacTimesVecFn jtimes;
   KINSysFn jt_func;
   void *jt_data;
@@ -110,11 +110,11 @@ typedef struct KINLsMemRec {
 int kinLsATimes(void *kinmem, N_Vector v, N_Vector z);
 int kinLsPSetup(void *kinmem);
 int kinLsPSolve(void *kinmem, N_Vector r, N_Vector z,
-                realtype tol, int lr);
+                sunrealtype tol, int lr);
 
 /* Difference quotient approximation for Jacobian times vector */
 int kinLsDQJtimes(N_Vector v, N_Vector Jv, N_Vector u,
-                  booleantype *new_u, void *data);
+                  sunbooleantype *new_u, void *data);
 
 /* Difference-quotient Jacobian approximation routines */
 int kinLsDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
@@ -130,7 +130,7 @@ int kinLsBandDQJac(N_Vector u, N_Vector fu, SUNMatrix Jac,
 int kinLsInitialize(KINMem kin_mem);
 int kinLsSetup(KINMem kin_mem);
 int kinLsSolve(KINMem kin_mem, N_Vector x, N_Vector b,
-               realtype *sJpnorm, realtype *sFdotJp);
+               sunrealtype *sJpnorm, sunrealtype *sFdotJp);
 int kinLsFree(KINMem kin_mem);
 
 /* Auxilliary functions */
diff --git a/src/nvector/cuda/nvector_cuda.cu b/src/nvector/cuda/nvector_cuda.cu
index 469e62de65..2ea12cc836 100644
--- a/src/nvector/cuda/nvector_cuda.cu
+++ b/src/nvector/cuda/nvector_cuda.cu
@@ -28,8 +28,8 @@
 #include "sundials_cuda.h"
 #include "sundials_debug.h"
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
 
 using namespace sundials;
 using namespace sundials::cuda;
@@ -45,25 +45,25 @@ static int AllocateData(N_Vector v);
 // Reduction buffer functions
 static int InitializeDeviceCounter(N_Vector v);
 static int FreeDeviceCounter(N_Vector v);
-static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n = 1);
+static int InitializeReductionBuffer(N_Vector v, sunrealtype value, size_t n = 1);
 static void FreeReductionBuffer(N_Vector v);
 static int CopyReductionBufferFromDevice(N_Vector v, size_t n = 1);
 
 // Fused operation buffer functions
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr);
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *r_data, int nval,
-                                     realtype **shortcut);
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *r_data, int nval,
+                                     sunrealtype **shortcut);
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut);
+                                      sunrealtype ***shortcut);
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut);
+                                      int nsum, sunrealtype ***shortcut);
 static int FusedBuffer_CopyToDevice(N_Vector v);
 static int FusedBuffer_Free(N_Vector v);
 
 // Kernel launch parameters
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid, size_t& block,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid, size_t& block,
                                size_t& shMemSize, cudaStream_t& stream, size_t n = 0);
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid, size_t& block,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid, size_t& block,
                                 size_t& shMemSize, cudaStream_t& stream, bool& atomic, size_t n = 0);
 static void PostKernelLaunch();
 
@@ -73,16 +73,16 @@ static void PostKernelLaunch();
 
 // Macros to access vector content
 #define NVEC_CUDA_CONTENT(x)  ((N_VectorContent_Cuda)(x->content))
-#define NVEC_CUDA_MEMSIZE(x)  (NVEC_CUDA_CONTENT(x)->length * sizeof(realtype))
+#define NVEC_CUDA_MEMSIZE(x)  (NVEC_CUDA_CONTENT(x)->length * sizeof(sunrealtype))
 #define NVEC_CUDA_MEMHELP(x)  (NVEC_CUDA_CONTENT(x)->mem_helper)
-#define NVEC_CUDA_HDATAp(x)   ((realtype*) NVEC_CUDA_CONTENT(x)->host_data->ptr)
-#define NVEC_CUDA_DDATAp(x)   ((realtype*) NVEC_CUDA_CONTENT(x)->device_data->ptr)
+#define NVEC_CUDA_HDATAp(x)   ((sunrealtype*) NVEC_CUDA_CONTENT(x)->host_data->ptr)
+#define NVEC_CUDA_DDATAp(x)   ((sunrealtype*) NVEC_CUDA_CONTENT(x)->device_data->ptr)
 #define NVEC_CUDA_STREAM(x)   (NVEC_CUDA_CONTENT(x)->stream_exec_policy->stream())
 
 // Macros to access vector private content
 #define NVEC_CUDA_PRIVATE(x)   ((N_PrivateVectorContent_Cuda)(NVEC_CUDA_CONTENT(x)->priv))
-#define NVEC_CUDA_HBUFFERp(x)  ((realtype*) NVEC_CUDA_PRIVATE(x)->reduce_buffer_host->ptr)
-#define NVEC_CUDA_DBUFFERp(x)  ((realtype*) NVEC_CUDA_PRIVATE(x)->reduce_buffer_dev->ptr)
+#define NVEC_CUDA_HBUFFERp(x)  ((sunrealtype*) NVEC_CUDA_PRIVATE(x)->reduce_buffer_host->ptr)
+#define NVEC_CUDA_DBUFFERp(x)  ((sunrealtype*) NVEC_CUDA_PRIVATE(x)->reduce_buffer_dev->ptr)
 #define NVEC_CUDA_DCOUNTERp(x) ((unsigned int*) NVEC_CUDA_PRIVATE(x)->device_counter->ptr)
 
 /*
@@ -91,7 +91,7 @@ static void PostKernelLaunch();
 
 struct _N_PrivateVectorContent_Cuda
 {
-  booleantype use_managed_mem; /* do data pointers use managed memory */
+  sunbooleantype use_managed_mem; /* do data pointers use managed memory */
 
   // reduction workspace
   SUNMemory device_counter;      // device memory for a counter (used in LDS reductions)
@@ -253,7 +253,7 @@ N_Vector N_VNew_Cuda(sunindextype length, SUNContext sunctx)
   return(v);
 }
 
-N_Vector N_VNewWithMemHelp_Cuda(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
+N_Vector N_VNewWithMemHelp_Cuda(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -322,7 +322,7 @@ N_Vector N_VNewManaged_Cuda(sunindextype length, SUNContext sunctx)
   return(v);
 }
 
-N_Vector N_VMake_Cuda(sunindextype length, realtype *h_vdata, realtype *d_vdata, SUNContext sunctx)
+N_Vector N_VMake_Cuda(sunindextype length, sunrealtype *h_vdata, sunrealtype *d_vdata, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -359,7 +359,7 @@ N_Vector N_VMake_Cuda(sunindextype length, realtype *h_vdata, realtype *d_vdata,
   return(v);
 }
 
-N_Vector N_VMakeManaged_Cuda(sunindextype length, realtype *vdata, SUNContext sunctx)
+N_Vector N_VMakeManaged_Cuda(sunindextype length, sunrealtype *vdata, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -400,7 +400,7 @@ N_Vector N_VMakeManaged_Cuda(sunindextype length, realtype *vdata, SUNContext su
  * Set pointer to the raw host data. Does not free the existing pointer.
  */
 
-void N_VSetHostArrayPointer_Cuda(realtype* h_vdata, N_Vector v)
+void N_VSetHostArrayPointer_Cuda(sunrealtype* h_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Cuda(v))
   {
@@ -432,7 +432,7 @@ void N_VSetHostArrayPointer_Cuda(realtype* h_vdata, N_Vector v)
  * Set pointer to the raw device data
  */
 
-void N_VSetDeviceArrayPointer_Cuda(realtype* d_vdata, N_Vector v)
+void N_VSetDeviceArrayPointer_Cuda(sunrealtype* d_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Cuda(v))
   {
@@ -464,7 +464,7 @@ void N_VSetDeviceArrayPointer_Cuda(realtype* d_vdata, N_Vector v)
  * Return a flag indicating if the memory for the vector data is managed
  */
 
-booleantype N_VIsManagedMemory_Cuda(N_Vector x)
+sunbooleantype N_VIsManagedMemory_Cuda(N_Vector x)
 {
   return NVEC_CUDA_PRIVATE(x)->use_managed_mem;
 }
@@ -698,7 +698,7 @@ void N_VSpace_Cuda(N_Vector X, sunindextype *lrw, sunindextype *liw)
   *liw = 2;
 }
 
-void N_VConst_Cuda(realtype a, N_Vector X)
+void N_VConst_Cuda(sunrealtype a, N_Vector X)
 {
   size_t grid, block, shMemSize;
   cudaStream_t stream;
@@ -717,7 +717,7 @@ void N_VConst_Cuda(realtype a, N_Vector X)
   PostKernelLaunch();
 }
 
-void N_VLinearSum_Cuda(realtype a, N_Vector X, realtype b, N_Vector Y, N_Vector Z)
+void N_VLinearSum_Cuda(sunrealtype a, N_Vector X, sunrealtype b, N_Vector Y, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   cudaStream_t stream;
@@ -780,7 +780,7 @@ void N_VDiv_Cuda(N_Vector X, N_Vector Y, N_Vector Z)
   PostKernelLaunch();
 }
 
-void N_VScale_Cuda(realtype a, N_Vector X, N_Vector Z)
+void N_VScale_Cuda(sunrealtype a, N_Vector X, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   cudaStream_t stream;
@@ -838,7 +838,7 @@ void N_VInv_Cuda(N_Vector X, N_Vector Z)
   PostKernelLaunch();
 }
 
-void N_VAddConst_Cuda(N_Vector X, realtype b, N_Vector Z)
+void N_VAddConst_Cuda(N_Vector X, sunrealtype b, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   cudaStream_t stream;
@@ -858,13 +858,13 @@ void N_VAddConst_Cuda(N_Vector X, realtype b, N_Vector Z)
   PostKernelLaunch();
 }
 
-realtype N_VDotProd_Cuda(N_Vector X, N_Vector Y)
+sunrealtype N_VDotProd_Cuda(N_Vector X, N_Vector Y)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -880,7 +880,7 @@ realtype N_VDotProd_Cuda(N_Vector X, N_Vector Y)
 
   if (atomic)
   {
-    dotProdKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    dotProdKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(Y),
@@ -891,7 +891,7 @@ realtype N_VDotProd_Cuda(N_Vector X, N_Vector Y)
   }
   else
   {
-    dotProdKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    dotProdKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(Y),
@@ -909,13 +909,13 @@ realtype N_VDotProd_Cuda(N_Vector X, N_Vector Y)
   return gpu_result;
 }
 
-realtype N_VMaxNorm_Cuda(N_Vector X)
+sunrealtype N_VMaxNorm_Cuda(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -931,7 +931,7 @@ realtype N_VMaxNorm_Cuda(N_Vector X)
 
   if (atomic)
   {
-    maxNormKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    maxNormKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DBUFFERp(X),
@@ -941,7 +941,7 @@ realtype N_VMaxNorm_Cuda(N_Vector X)
   }
   else
   {
-    maxNormKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    maxNormKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DBUFFERp(X),
@@ -959,13 +959,13 @@ realtype N_VMaxNorm_Cuda(N_Vector X)
   return gpu_result;
 }
 
-realtype N_VWSqrSumLocal_Cuda(N_Vector X, N_Vector W)
+sunrealtype N_VWSqrSumLocal_Cuda(N_Vector X, N_Vector W)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -980,7 +980,7 @@ realtype N_VWSqrSumLocal_Cuda(N_Vector X, N_Vector W)
 
   if (atomic)
   {
-    wL2NormSquareKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(W),
@@ -991,7 +991,7 @@ realtype N_VWSqrSumLocal_Cuda(N_Vector X, N_Vector W)
   }
   else
   {
-    wL2NormSquareKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(W),
@@ -1010,19 +1010,19 @@ realtype N_VWSqrSumLocal_Cuda(N_Vector X, N_Vector W)
   return gpu_result;
 }
 
-realtype N_VWrmsNorm_Cuda(N_Vector X, N_Vector W)
+sunrealtype N_VWrmsNorm_Cuda(N_Vector X, N_Vector W)
 {
-  const realtype sum = N_VWSqrSumLocal_Cuda(X, W);
+  const sunrealtype sum = N_VWSqrSumLocal_Cuda(X, W);
   return std::sqrt(sum/NVEC_CUDA_CONTENT(X)->length);
 }
 
-realtype N_VWSqrSumMaskLocal_Cuda(N_Vector X, N_Vector W, N_Vector Id)
+sunrealtype N_VWSqrSumMaskLocal_Cuda(N_Vector X, N_Vector W, N_Vector Id)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1037,7 +1037,7 @@ realtype N_VWSqrSumMaskLocal_Cuda(N_Vector X, N_Vector W, N_Vector Id)
 
   if (atomic)
   {
-    wL2NormSquareMaskKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareMaskKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(W),
@@ -1049,7 +1049,7 @@ realtype N_VWSqrSumMaskLocal_Cuda(N_Vector X, N_Vector W, N_Vector Id)
   }
   else
   {
-    wL2NormSquareMaskKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareMaskKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(W),
@@ -1069,19 +1069,19 @@ realtype N_VWSqrSumMaskLocal_Cuda(N_Vector X, N_Vector W, N_Vector Id)
   return gpu_result;
 }
 
-realtype N_VWrmsNormMask_Cuda(N_Vector X, N_Vector W, N_Vector Id)
+sunrealtype N_VWrmsNormMask_Cuda(N_Vector X, N_Vector W, N_Vector Id)
 {
-  const realtype sum = N_VWSqrSumMaskLocal_Cuda(X, W, Id);
+  const sunrealtype sum = N_VWSqrSumMaskLocal_Cuda(X, W, Id);
   return std::sqrt(sum/NVEC_CUDA_CONTENT(X)->length);
 }
 
-realtype N_VMin_Cuda(N_Vector X)
+sunrealtype N_VMin_Cuda(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = std::numeric_limits<realtype>::max();
+  sunrealtype gpu_result = std::numeric_limits<sunrealtype>::max();
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1096,7 +1096,7 @@ realtype N_VMin_Cuda(N_Vector X)
 
   if (atomic)
   {
-    findMinKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    findMinKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_CUDA_DDATAp(X),
@@ -1107,7 +1107,7 @@ realtype N_VMin_Cuda(N_Vector X)
   }
   else
   {
-    findMinKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    findMinKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_CUDA_DDATAp(X),
@@ -1126,19 +1126,19 @@ realtype N_VMin_Cuda(N_Vector X)
   return gpu_result;
 }
 
-realtype N_VWL2Norm_Cuda(N_Vector X, N_Vector W)
+sunrealtype N_VWL2Norm_Cuda(N_Vector X, N_Vector W)
 {
-  const realtype sum = N_VWSqrSumLocal_Cuda(X, W);
+  const sunrealtype sum = N_VWSqrSumLocal_Cuda(X, W);
   return std::sqrt(sum);
 }
 
-realtype N_VL1Norm_Cuda(N_Vector X)
+sunrealtype N_VL1Norm_Cuda(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1153,7 +1153,7 @@ realtype N_VL1Norm_Cuda(N_Vector X)
 
   if (atomic)
   {
-    L1NormKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    L1NormKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DBUFFERp(X),
@@ -1163,7 +1163,7 @@ realtype N_VL1Norm_Cuda(N_Vector X)
   }
   else
   {
-    L1NormKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    L1NormKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DBUFFERp(X),
@@ -1181,7 +1181,7 @@ realtype N_VL1Norm_Cuda(N_Vector X)
   return gpu_result;
 }
 
-void N_VCompare_Cuda(realtype c, N_Vector X, N_Vector Z)
+void N_VCompare_Cuda(sunrealtype c, N_Vector X, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   cudaStream_t stream;
@@ -1201,13 +1201,13 @@ void N_VCompare_Cuda(realtype c, N_Vector X, N_Vector Z)
   PostKernelLaunch();
 }
 
-booleantype N_VInvTest_Cuda(N_Vector X, N_Vector Z)
+sunbooleantype N_VInvTest_Cuda(N_Vector X, N_Vector Z)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1222,7 +1222,7 @@ booleantype N_VInvTest_Cuda(N_Vector X, N_Vector Z)
 
   if (atomic)
   {
-    invTestKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    invTestKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(Z),
@@ -1233,7 +1233,7 @@ booleantype N_VInvTest_Cuda(N_Vector X, N_Vector Z)
   }
   else
   {
-    invTestKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    invTestKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(X),
       NVEC_CUDA_DDATAp(Z),
@@ -1252,13 +1252,13 @@ booleantype N_VInvTest_Cuda(N_Vector X, N_Vector Z)
   return (gpu_result < HALF);
 }
 
-booleantype N_VConstrMask_Cuda(N_Vector C, N_Vector X, N_Vector M)
+sunbooleantype N_VConstrMask_Cuda(N_Vector C, N_Vector X, N_Vector M)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1273,7 +1273,7 @@ booleantype N_VConstrMask_Cuda(N_Vector C, N_Vector X, N_Vector M)
 
   if (atomic)
   {
-    constrMaskKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    constrMaskKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(C),
       NVEC_CUDA_DDATAp(X),
@@ -1285,7 +1285,7 @@ booleantype N_VConstrMask_Cuda(N_Vector C, N_Vector X, N_Vector M)
   }
   else
   {
-    constrMaskKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    constrMaskKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_CUDA_DDATAp(C),
       NVEC_CUDA_DDATAp(X),
@@ -1305,13 +1305,13 @@ booleantype N_VConstrMask_Cuda(N_Vector C, N_Vector X, N_Vector M)
   return (gpu_result < HALF);
 }
 
-realtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   cudaStream_t stream;
 
-  realtype gpu_result = std::numeric_limits<realtype>::max();;
+  sunrealtype gpu_result = std::numeric_limits<sunrealtype>::max();;
 
   if (GetKernelParameters(num, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1326,7 +1326,7 @@ realtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom)
 
   if (atomic)
   {
-    minQuotientKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    minQuotientKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_CUDA_DDATAp(num),
@@ -1338,7 +1338,7 @@ realtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom)
   }
   else
   {
-    minQuotientKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    minQuotientKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_CUDA_DDATAp(num),
@@ -1366,11 +1366,11 @@ realtype N_VMinQuotient_Cuda(N_Vector num, N_Vector denom)
  */
 
 
-int N_VLinearCombination_Cuda(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Cuda(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   // Fused op workspace shortcuts
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(z, nvec, nvec))
@@ -1421,13 +1421,13 @@ int N_VLinearCombination_Cuda(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_Cuda(int nvec, realtype* c, N_Vector x, N_Vector* Y,
+int N_VScaleAddMulti_Cuda(int nvec, sunrealtype* c, N_Vector x, N_Vector* Y,
                           N_Vector* Z)
 {
   // Shortcuts to the fused op workspace
-  realtype*  cdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(x, nvec, 2 * nvec))
@@ -1485,10 +1485,10 @@ int N_VScaleAddMulti_Cuda(int nvec, realtype* c, N_Vector x, N_Vector* Y,
 }
 
 
-int N_VDotProdMulti_Cuda(int nvec, N_Vector x, N_Vector* Y, realtype* dots)
+int N_VDotProdMulti_Cuda(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dots)
 {
   // Fused op workspace shortcuts
-  realtype** ydata = NULL;
+  sunrealtype** ydata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(x, 0, nvec))
@@ -1525,7 +1525,7 @@ int N_VDotProdMulti_Cuda(int nvec, N_Vector x, N_Vector* Y, realtype* dots)
     SUNDIALS_DEBUG_PRINT("ERROR in N_VDotProd_Cuda: InitializeReductionBuffer returned nonzero\n");
   }
 
-  dotProdMultiKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+  dotProdMultiKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
   (
     nvec,
     NVEC_CUDA_DDATAp(x),
@@ -1555,14 +1555,14 @@ int N_VDotProdMulti_Cuda(int nvec, N_Vector x, N_Vector* Y, realtype* dots)
 
 
 int N_VLinearSumVectorArray_Cuda(int nvec,
-                                 realtype a, N_Vector* X,
-                                 realtype b, N_Vector* Y,
+                                 sunrealtype a, N_Vector* X,
+                                 sunrealtype b, N_Vector* Y,
                                  N_Vector* Z)
 {
   // Shortcuts to the fused op workspace
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], 0, 3 * nvec))
@@ -1621,12 +1621,12 @@ int N_VLinearSumVectorArray_Cuda(int nvec,
 }
 
 
-int N_VScaleVectorArray_Cuda(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Cuda(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   // Shortcuts to the fused op workspace arrays
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], nvec, 2 * nvec))
@@ -1683,10 +1683,10 @@ int N_VScaleVectorArray_Cuda(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_Cuda(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Cuda(int nvec, sunrealtype c, N_Vector* Z)
 {
   // Shortcuts to the fused op workspace arrays
-  realtype** zdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], 0, nvec))
@@ -1731,11 +1731,11 @@ int N_VConstVectorArray_Cuda(int nvec, realtype c, N_Vector* Z)
 
 
 int N_VWrmsNormVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
-                                realtype* norms)
+                                sunrealtype* norms)
 {
   // Fused op workspace shortcuts
-  realtype** xdata = NULL;
-  realtype** wdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** wdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(W[0], 0, 2 * nvec))
@@ -1778,7 +1778,7 @@ int N_VWrmsNormVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
   }
   grid = nvec;
 
-  wL2NormSquareVectorArrayKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+  wL2NormSquareVectorArrayKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
   (
     nvec,
     xdata,
@@ -1801,11 +1801,11 @@ int N_VWrmsNormVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
 
 
 int N_VWrmsNormMaskVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
-                                    N_Vector id, realtype* norms)
+                                    N_Vector id, sunrealtype* norms)
 {
   // Fused op workspace shortcuts
-  realtype** xdata = NULL;
-  realtype** wdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** wdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(W[0], 0, 2 * nvec))
@@ -1848,7 +1848,7 @@ int N_VWrmsNormMaskVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
   }
   grid = nvec;
 
-  wL2NormSquareMaskVectorArrayKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+  wL2NormSquareMaskVectorArrayKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
   (
     nvec,
     xdata,
@@ -1871,14 +1871,14 @@ int N_VWrmsNormMaskVectorArray_Cuda(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_Cuda(int nvec, int nsum, realtype* c,
+int N_VScaleAddMultiVectorArray_Cuda(int nvec, int nsum, sunrealtype* c,
                                      N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   // Shortcuts to the fused op workspace
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(X[0], nsum, nvec + 2 * nvec * nsum))
@@ -1943,13 +1943,13 @@ int N_VScaleAddMultiVectorArray_Cuda(int nvec, int nsum, realtype* c,
 }
 
 
-int N_VLinearCombinationVectorArray_Cuda(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Cuda(int nvec, int nsum, sunrealtype* c,
                                          N_Vector** X, N_Vector* Z)
 {
   // Shortcuts to the fused op workspace arrays
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], nsum, nvec + nvec * nsum))
@@ -2079,7 +2079,7 @@ int N_VBufUnpack_Cuda(N_Vector x, void *buf)
  */
 
 
-int N_VEnableFusedOps_Cuda(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Cuda(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2126,7 +2126,7 @@ int N_VEnableFusedOps_Cuda(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombination_Cuda(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2135,7 +2135,7 @@ int N_VEnableLinearCombination_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleAddMulti_Cuda(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2144,7 +2144,7 @@ int N_VEnableScaleAddMulti_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableDotProdMulti_Cuda(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2154,7 +2154,7 @@ int N_VEnableDotProdMulti_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2163,7 +2163,7 @@ int N_VEnableLinearSumVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2172,7 +2172,7 @@ int N_VEnableScaleVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableConstVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2181,7 +2181,7 @@ int N_VEnableConstVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2190,7 +2190,7 @@ int N_VEnableWrmsNormVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2200,7 +2200,7 @@ int N_VEnableWrmsNormMaskVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2210,7 +2210,7 @@ int N_VEnableScaleAddMultiVectorArray_Cuda(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Cuda(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2275,12 +2275,12 @@ static int AllocateData(N_Vector v)
  * of the vector is increased. The buffer is initialized to the
  * value given.
  */
-static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n)
+static int InitializeReductionBuffer(N_Vector v, sunrealtype value, size_t n)
 {
   int         alloc_fail = 0;
   int         copy_fail  = 0;
-  booleantype alloc_mem  = SUNFALSE;
-  size_t      bytes      = n * sizeof(realtype);
+  sunbooleantype alloc_mem  = SUNFALSE;
+  size_t      bytes      = n * sizeof(sunrealtype);
 
   // Get the vector private memory structure
   N_PrivateVectorContent_Cuda vcp = NVEC_CUDA_PRIVATE(v);
@@ -2329,7 +2329,7 @@ static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n)
 
     // Initialize the host memory with the value
     for (int i = 0; i < n; ++i)
-      ((realtype*)vcp->reduce_buffer_host->ptr)[i] = value;
+      ((sunrealtype*)vcp->reduce_buffer_host->ptr)[i] = value;
 
     // Initialize the device memory with the value
     copy_fail = SUNMemoryHelper_CopyAsync(NVEC_CUDA_MEMHELP(v),
@@ -2379,7 +2379,7 @@ static int CopyReductionBufferFromDevice(N_Vector v, size_t n)
   copy_fail = SUNMemoryHelper_CopyAsync(NVEC_CUDA_MEMHELP(v),
                                         NVEC_CUDA_PRIVATE(v)->reduce_buffer_host,
                                         NVEC_CUDA_PRIVATE(v)->reduce_buffer_dev,
-                                        n * sizeof(realtype),
+                                        n * sizeof(sunrealtype),
                                         (void*) NVEC_CUDA_STREAM(v));
 
   if (copy_fail)
@@ -2396,13 +2396,13 @@ static int CopyReductionBufferFromDevice(N_Vector v, size_t n)
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 {
   int         alloc_fail = 0;
-  booleantype alloc_mem  = SUNFALSE;
+  sunbooleantype alloc_mem  = SUNFALSE;
 
   // pad buffer with single precision data
 #if defined(SUNDIALS_SINGLE_PRECISION)
-  size_t bytes = nreal * 2 * sizeof(realtype) + nptr * sizeof(realtype*);
+  size_t bytes = nreal * 2 * sizeof(sunrealtype) + nptr * sizeof(sunrealtype*);
 #elif defined(SUNDIALS_DOUBLE_PRECISION)
-  size_t bytes = nreal * sizeof(realtype) + nptr * sizeof(realtype*);
+  size_t bytes = nreal * sizeof(sunrealtype) + nptr * sizeof(sunrealtype*);
 #else
 #error Incompatible precision for CUDA
 #endif
@@ -2459,8 +2459,8 @@ static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 }
 
 
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
-                                     realtype **shortcut)
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *rdata, int nval,
+                                     sunrealtype **shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Cuda vcp = NVEC_CUDA_PRIVATE(v);
@@ -2472,7 +2472,7 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
     return -1;
   }
 
-  realtype* h_buffer = (realtype*) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype* h_buffer = (sunrealtype*) ((char*)(vcp->fused_buffer_host->ptr) +
                                     vcp->fused_buffer_offset);
 
   for (int j = 0; j < nval; j++)
@@ -2481,14 +2481,14 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
                            vcp->fused_buffer_offset);
 
   // accounting for buffer padding
 #if defined(SUNDIALS_SINGLE_PRECISION)
-  vcp->fused_buffer_offset += nval * 2 * sizeof(realtype);
+  vcp->fused_buffer_offset += nval * 2 * sizeof(sunrealtype);
 #elif defined(SUNDIALS_DOUBLE_PRECISION)
-  vcp->fused_buffer_offset += nval * sizeof(realtype);
+  vcp->fused_buffer_offset += nval * sizeof(sunrealtype);
 #else
 #error Incompatible precision for CUDA
 #endif
@@ -2498,7 +2498,7 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
 
 
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut)
+                                      sunrealtype ***shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Cuda vcp = NVEC_CUDA_PRIVATE(v);
@@ -2510,7 +2510,7 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -2519,17 +2519,17 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
-  vcp->fused_buffer_offset += nvec * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * sizeof(sunrealtype*);
 
   return 0;
 }
 
 
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut)
+                                      int nsum, sunrealtype ***shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Cuda vcp = NVEC_CUDA_PRIVATE(v);
@@ -2541,7 +2541,7 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -2553,11 +2553,11 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
   // Update the offset
-  vcp->fused_buffer_offset += nvec * nsum * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * nsum * sizeof(sunrealtype*);
 
   return 0;
 }
@@ -2638,7 +2638,7 @@ static int FreeDeviceCounter(N_Vector v)
 /* Get the kernel launch parameters based on the kernel type (reduction or not),
  * using the appropriate kernel execution policy.
  */
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid,
                                size_t& block, size_t& shMemSize,
                                cudaStream_t& stream, bool& atomic, size_t n)
 {
@@ -2699,7 +2699,7 @@ static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
   return(0);
 }
 
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid,
                                size_t& block, size_t& shMemSize, cudaStream_t& stream,
                                size_t n)
 {
diff --git a/src/nvector/hip/nvector_hip.hip.cpp b/src/nvector/hip/nvector_hip.hip.cpp
index ca660fb89d..2121a38cb3 100644
--- a/src/nvector/hip/nvector_hip.hip.cpp
+++ b/src/nvector/hip/nvector_hip.hip.cpp
@@ -28,8 +28,8 @@
 #include "sundials_hip.h"
 #include "sundials_debug.h"
 
-#define ZERO RCONST(0.0)
-#define HALF RCONST(0.5)
+#define ZERO SUN_RCONST(0.0)
+#define HALF SUN_RCONST(0.5)
 
 using namespace sundials;
 using namespace sundials::hip;
@@ -45,14 +45,14 @@ static int AllocateData(N_Vector v);
 // Reduction buffer functions
 static int InitializeDeviceCounter(N_Vector v);
 static int FreeDeviceCounter(N_Vector v);
-static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n = 1);
+static int InitializeReductionBuffer(N_Vector v, sunrealtype value, size_t n = 1);
 static void FreeReductionBuffer(N_Vector v);
 static int CopyReductionBufferFromDevice(N_Vector v, size_t n = 1);
 
 // Kernel launch parameters
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid, size_t& block,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid, size_t& block,
                                size_t& shMemSize, hipStream_t& stream, size_t n = 0);
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid, size_t& block,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid, size_t& block,
                                 size_t& shMemSize, hipStream_t& stream, bool& atomic, size_t n = 0);
 static void PostKernelLaunch();
 
@@ -62,16 +62,16 @@ static void PostKernelLaunch();
 
 // Macros to access vector content
 #define NVEC_HIP_CONTENT(x)  ((N_VectorContent_Hip)(x->content))
-#define NVEC_HIP_MEMSIZE(x)  (NVEC_HIP_CONTENT(x)->length * sizeof(realtype))
+#define NVEC_HIP_MEMSIZE(x)  (NVEC_HIP_CONTENT(x)->length * sizeof(sunrealtype))
 #define NVEC_HIP_MEMHELP(x)  (NVEC_HIP_CONTENT(x)->mem_helper)
-#define NVEC_HIP_HDATAp(x)   ((realtype*) NVEC_HIP_CONTENT(x)->host_data->ptr)
-#define NVEC_HIP_DDATAp(x)   ((realtype*) NVEC_HIP_CONTENT(x)->device_data->ptr)
+#define NVEC_HIP_HDATAp(x)   ((sunrealtype*) NVEC_HIP_CONTENT(x)->host_data->ptr)
+#define NVEC_HIP_DDATAp(x)   ((sunrealtype*) NVEC_HIP_CONTENT(x)->device_data->ptr)
 #define NVEC_HIP_STREAM(x)   (NVEC_HIP_CONTENT(x)->stream_exec_policy->stream())
 
 // Macros to access vector private content
 #define NVEC_HIP_PRIVATE(x)   ((N_PrivateVectorContent_Hip)(NVEC_HIP_CONTENT(x)->priv))
-#define NVEC_HIP_HBUFFERp(x)  ((realtype*) NVEC_HIP_PRIVATE(x)->reduce_buffer_host->ptr)
-#define NVEC_HIP_DBUFFERp(x)  ((realtype*) NVEC_HIP_PRIVATE(x)->reduce_buffer_dev->ptr)
+#define NVEC_HIP_HBUFFERp(x)  ((sunrealtype*) NVEC_HIP_PRIVATE(x)->reduce_buffer_host->ptr)
+#define NVEC_HIP_DBUFFERp(x)  ((sunrealtype*) NVEC_HIP_PRIVATE(x)->reduce_buffer_dev->ptr)
 #define NVEC_HIP_DCOUNTERp(x) ((unsigned int*) NVEC_HIP_PRIVATE(x)->device_counter->ptr)
 
 /*
@@ -80,7 +80,7 @@ static void PostKernelLaunch();
 
 struct _N_PrivateVectorContent_Hip
 {
-  booleantype     use_managed_mem;               /* indicates if the data pointers and buffer pointers are managed memory */
+  sunbooleantype     use_managed_mem;               /* indicates if the data pointers and buffer pointers are managed memory */
   size_t          reduce_buffer_allocated_bytes; /* current size of the reduction buffer */
   SUNMemory       reduce_buffer_dev;             /* device buffer used for reductions */
   SUNMemory       reduce_buffer_host;            /* host buffer used for reductions */
@@ -230,7 +230,7 @@ N_Vector N_VNew_Hip(sunindextype length, SUNContext sunctx)
   return(v);
 }
 
-N_Vector N_VNewWithMemHelp_Hip(sunindextype length, booleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
+N_Vector N_VNewWithMemHelp_Hip(sunindextype length, sunbooleantype use_managed_mem, SUNMemoryHelper helper, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -299,7 +299,7 @@ N_Vector N_VNewManaged_Hip(sunindextype length, SUNContext sunctx)
   return(v);
 }
 
-N_Vector N_VMake_Hip(sunindextype length, realtype *h_vdata, realtype *d_vdata, SUNContext sunctx)
+N_Vector N_VMake_Hip(sunindextype length, sunrealtype *h_vdata, sunrealtype *d_vdata, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -336,7 +336,7 @@ N_Vector N_VMake_Hip(sunindextype length, realtype *h_vdata, realtype *d_vdata,
   return(v);
 }
 
-N_Vector N_VMakeManaged_Hip(sunindextype length, realtype *vdata, SUNContext sunctx)
+N_Vector N_VMakeManaged_Hip(sunindextype length, sunrealtype *vdata, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -377,7 +377,7 @@ N_Vector N_VMakeManaged_Hip(sunindextype length, realtype *vdata, SUNContext sun
  * Set pointer to the raw host data. Does not free the existing pointer.
  */
 
-void N_VSetHostArrayPointer_Hip(realtype* h_vdata, N_Vector v)
+void N_VSetHostArrayPointer_Hip(sunrealtype* h_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Hip(v))
   {
@@ -409,7 +409,7 @@ void N_VSetHostArrayPointer_Hip(realtype* h_vdata, N_Vector v)
  * Set pointer to the raw device data
  */
 
-void N_VSetDeviceArrayPointer_Hip(realtype* d_vdata, N_Vector v)
+void N_VSetDeviceArrayPointer_Hip(sunrealtype* d_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Hip(v))
   {
@@ -441,7 +441,7 @@ void N_VSetDeviceArrayPointer_Hip(realtype* d_vdata, N_Vector v)
  * Return a flag indicating if the memory for the vector data is managed
  */
 
-booleantype N_VIsManagedMemory_Hip(N_Vector x)
+sunbooleantype N_VIsManagedMemory_Hip(N_Vector x)
 {
   return NVEC_HIP_PRIVATE(x)->use_managed_mem;
 }
@@ -674,7 +674,7 @@ void N_VSpace_Hip(N_Vector X, sunindextype *lrw, sunindextype *liw)
   *liw = 2;
 }
 
-void N_VConst_Hip(realtype a, N_Vector X)
+void N_VConst_Hip(sunrealtype a, N_Vector X)
 {
   size_t grid, block, shMemSize;
   hipStream_t stream;
@@ -693,7 +693,7 @@ void N_VConst_Hip(realtype a, N_Vector X)
   PostKernelLaunch();
 }
 
-void N_VLinearSum_Hip(realtype a, N_Vector X, realtype b, N_Vector Y, N_Vector Z)
+void N_VLinearSum_Hip(sunrealtype a, N_Vector X, sunrealtype b, N_Vector Y, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   hipStream_t stream;
@@ -756,7 +756,7 @@ void N_VDiv_Hip(N_Vector X, N_Vector Y, N_Vector Z)
   PostKernelLaunch();
 }
 
-void N_VScale_Hip(realtype a, N_Vector X, N_Vector Z)
+void N_VScale_Hip(sunrealtype a, N_Vector X, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   hipStream_t stream;
@@ -814,7 +814,7 @@ void N_VInv_Hip(N_Vector X, N_Vector Z)
   PostKernelLaunch();
 }
 
-void N_VAddConst_Hip(N_Vector X, realtype b, N_Vector Z)
+void N_VAddConst_Hip(N_Vector X, sunrealtype b, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   hipStream_t stream;
@@ -834,13 +834,13 @@ void N_VAddConst_Hip(N_Vector X, realtype b, N_Vector Z)
   PostKernelLaunch();
 }
 
-realtype N_VDotProd_Hip(N_Vector X, N_Vector Y)
+sunrealtype N_VDotProd_Hip(N_Vector X, N_Vector Y)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -856,7 +856,7 @@ realtype N_VDotProd_Hip(N_Vector X, N_Vector Y)
 
   if (atomic)
   {
-    dotProdKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    dotProdKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(Y),
@@ -867,7 +867,7 @@ realtype N_VDotProd_Hip(N_Vector X, N_Vector Y)
   }
   else
   {
-    dotProdKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    dotProdKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(Y),
@@ -885,13 +885,13 @@ realtype N_VDotProd_Hip(N_Vector X, N_Vector Y)
   return gpu_result;
 }
 
-realtype N_VMaxNorm_Hip(N_Vector X)
+sunrealtype N_VMaxNorm_Hip(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -907,7 +907,7 @@ realtype N_VMaxNorm_Hip(N_Vector X)
 
   if (atomic)
   {
-    maxNormKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    maxNormKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DBUFFERp(X),
@@ -917,7 +917,7 @@ realtype N_VMaxNorm_Hip(N_Vector X)
   }
   else
   {
-    maxNormKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    maxNormKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DBUFFERp(X),
@@ -935,13 +935,13 @@ realtype N_VMaxNorm_Hip(N_Vector X)
   return gpu_result;
 }
 
-realtype N_VWSqrSumLocal_Hip(N_Vector X, N_Vector W)
+sunrealtype N_VWSqrSumLocal_Hip(N_Vector X, N_Vector W)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -956,7 +956,7 @@ realtype N_VWSqrSumLocal_Hip(N_Vector X, N_Vector W)
 
   if (atomic)
   {
-    wL2NormSquareKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(W),
@@ -967,7 +967,7 @@ realtype N_VWSqrSumLocal_Hip(N_Vector X, N_Vector W)
   }
   else
   {
-    wL2NormSquareKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(W),
@@ -986,19 +986,19 @@ realtype N_VWSqrSumLocal_Hip(N_Vector X, N_Vector W)
   return gpu_result;
 }
 
-realtype N_VWrmsNorm_Hip(N_Vector X, N_Vector W)
+sunrealtype N_VWrmsNorm_Hip(N_Vector X, N_Vector W)
 {
-  const realtype sum = N_VWSqrSumLocal_Hip(X, W);
+  const sunrealtype sum = N_VWSqrSumLocal_Hip(X, W);
   return std::sqrt(sum/NVEC_HIP_CONTENT(X)->length);
 }
 
-realtype N_VWSqrSumMaskLocal_Hip(N_Vector X, N_Vector W, N_Vector Id)
+sunrealtype N_VWSqrSumMaskLocal_Hip(N_Vector X, N_Vector W, N_Vector Id)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1013,7 +1013,7 @@ realtype N_VWSqrSumMaskLocal_Hip(N_Vector X, N_Vector W, N_Vector Id)
 
   if (atomic)
   {
-    wL2NormSquareMaskKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareMaskKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(W),
@@ -1025,7 +1025,7 @@ realtype N_VWSqrSumMaskLocal_Hip(N_Vector X, N_Vector W, N_Vector Id)
   }
   else
   {
-    wL2NormSquareMaskKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    wL2NormSquareMaskKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(W),
@@ -1045,19 +1045,19 @@ realtype N_VWSqrSumMaskLocal_Hip(N_Vector X, N_Vector W, N_Vector Id)
   return gpu_result;
 }
 
-realtype N_VWrmsNormMask_Hip(N_Vector X, N_Vector W, N_Vector Id)
+sunrealtype N_VWrmsNormMask_Hip(N_Vector X, N_Vector W, N_Vector Id)
 {
-  const realtype sum = N_VWSqrSumMaskLocal_Hip(X, W, Id);
+  const sunrealtype sum = N_VWSqrSumMaskLocal_Hip(X, W, Id);
   return std::sqrt(sum/NVEC_HIP_CONTENT(X)->length);
 }
 
-realtype N_VMin_Hip(N_Vector X)
+sunrealtype N_VMin_Hip(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = std::numeric_limits<realtype>::max();
+  sunrealtype gpu_result = std::numeric_limits<sunrealtype>::max();
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1072,7 +1072,7 @@ realtype N_VMin_Hip(N_Vector X)
 
   if (atomic)
   {
-    findMinKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    findMinKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_HIP_DDATAp(X),
@@ -1083,7 +1083,7 @@ realtype N_VMin_Hip(N_Vector X)
   }
   else
   {
-    findMinKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    findMinKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_HIP_DDATAp(X),
@@ -1102,19 +1102,19 @@ realtype N_VMin_Hip(N_Vector X)
   return gpu_result;
 }
 
-realtype N_VWL2Norm_Hip(N_Vector X, N_Vector W)
+sunrealtype N_VWL2Norm_Hip(N_Vector X, N_Vector W)
 {
-  const realtype sum = N_VWSqrSumLocal_Hip(X, W);
+  const sunrealtype sum = N_VWSqrSumLocal_Hip(X, W);
   return std::sqrt(sum);
 }
 
-realtype N_VL1Norm_Hip(N_Vector X)
+sunrealtype N_VL1Norm_Hip(N_Vector X)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1129,7 +1129,7 @@ realtype N_VL1Norm_Hip(N_Vector X)
 
   if (atomic)
   {
-    L1NormKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    L1NormKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DBUFFERp(X),
@@ -1139,7 +1139,7 @@ realtype N_VL1Norm_Hip(N_Vector X)
   }
   else
   {
-    L1NormKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    L1NormKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DBUFFERp(X),
@@ -1157,7 +1157,7 @@ realtype N_VL1Norm_Hip(N_Vector X)
   return gpu_result;
 }
 
-void N_VCompare_Hip(realtype c, N_Vector X, N_Vector Z)
+void N_VCompare_Hip(sunrealtype c, N_Vector X, N_Vector Z)
 {
   size_t grid, block, shMemSize;
   hipStream_t stream;
@@ -1177,13 +1177,13 @@ void N_VCompare_Hip(realtype c, N_Vector X, N_Vector Z)
   PostKernelLaunch();
 }
 
-booleantype N_VInvTest_Hip(N_Vector X, N_Vector Z)
+sunbooleantype N_VInvTest_Hip(N_Vector X, N_Vector Z)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1198,7 +1198,7 @@ booleantype N_VInvTest_Hip(N_Vector X, N_Vector Z)
 
   if (atomic)
   {
-    invTestKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    invTestKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(Z),
@@ -1209,7 +1209,7 @@ booleantype N_VInvTest_Hip(N_Vector X, N_Vector Z)
   }
   else
   {
-    invTestKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    invTestKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(X),
       NVEC_HIP_DDATAp(Z),
@@ -1228,13 +1228,13 @@ booleantype N_VInvTest_Hip(N_Vector X, N_Vector Z)
   return (gpu_result < HALF);
 }
 
-booleantype N_VConstrMask_Hip(N_Vector C, N_Vector X, N_Vector M)
+sunbooleantype N_VConstrMask_Hip(N_Vector C, N_Vector X, N_Vector M)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = ZERO;
+  sunrealtype gpu_result = ZERO;
 
   if (GetKernelParameters(X, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1249,7 +1249,7 @@ booleantype N_VConstrMask_Hip(N_Vector C, N_Vector X, N_Vector M)
 
   if (atomic)
   {
-    constrMaskKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    constrMaskKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(C),
       NVEC_HIP_DDATAp(X),
@@ -1261,7 +1261,7 @@ booleantype N_VConstrMask_Hip(N_Vector C, N_Vector X, N_Vector M)
   }
   else
   {
-    constrMaskKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    constrMaskKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       NVEC_HIP_DDATAp(C),
       NVEC_HIP_DDATAp(X),
@@ -1281,13 +1281,13 @@ booleantype N_VConstrMask_Hip(N_Vector C, N_Vector X, N_Vector M)
   return (gpu_result < HALF);
 }
 
-realtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom)
 {
   bool atomic;
   size_t grid, block, shMemSize;
   hipStream_t stream;
 
-  realtype gpu_result = std::numeric_limits<realtype>::max();;
+  sunrealtype gpu_result = std::numeric_limits<sunrealtype>::max();;
 
   if (GetKernelParameters(num, true, grid, block, shMemSize, stream, atomic))
   {
@@ -1302,7 +1302,7 @@ realtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom)
 
   if (atomic)
   {
-    minQuotientKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
+    minQuotientKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_HIP_DDATAp(num),
@@ -1314,7 +1314,7 @@ realtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom)
   }
   else
   {
-    minQuotientKernel<realtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
+    minQuotientKernel<sunrealtype, sunindextype, GridReducerLDS><<<grid, block, shMemSize, stream>>>
     (
       gpu_result,
       NVEC_HIP_DDATAp(num),
@@ -1341,27 +1341,27 @@ realtype N_VMinQuotient_Hip(N_Vector num, N_Vector denom)
  * -----------------------------------------------------------------
  */
 
-int N_VLinearCombination_Hip(int nvec, realtype* c, N_Vector* X, N_Vector Z)
+int N_VLinearCombination_Hip(int nvec, sunrealtype* c, N_Vector* X, N_Vector Z)
 {
   hipError_t err;
 
   // Copy c array to device
-  realtype* d_c;
-  err = hipMalloc((void**) &d_c, nvec*sizeof(realtype));
+  sunrealtype* d_c;
+  err = hipMalloc((void**) &d_c, nvec*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_c, c, nvec*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_c, c, nvec*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters and launch
@@ -1390,38 +1390,38 @@ int N_VLinearCombination_Hip(int nvec, realtype* c, N_Vector* X, N_Vector Z)
   return(0);
 }
 
-int N_VScaleAddMulti_Hip(int nvec, realtype* c, N_Vector X, N_Vector* Y,
+int N_VScaleAddMulti_Hip(int nvec, sunrealtype* c, N_Vector X, N_Vector* Y,
                           N_Vector* Z)
 {
   hipError_t err;
 
   // Copy c array to device
-  realtype* d_c;
-  err = hipMalloc((void**) &d_c, nvec*sizeof(realtype));
+  sunrealtype* d_c;
+  err = hipMalloc((void**) &d_c, nvec*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_c, c, nvec*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_c, c, nvec*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Create array of device pointers on host
-  realtype** h_Yd = new realtype*[nvec];
+  sunrealtype** h_Yd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Yd[i] = NVEC_HIP_DDATAp(Y[i]);
 
-  realtype** h_Zd = new realtype*[nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Zd[i] = NVEC_HIP_DDATAp(Z[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Yd;
-  err = hipMalloc((void**) &d_Yd, nvec*sizeof(realtype*));
+  sunrealtype** d_Yd;
+  err = hipMalloc((void**) &d_Yd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1454,20 +1454,20 @@ int N_VScaleAddMulti_Hip(int nvec, realtype* c, N_Vector X, N_Vector* Y,
   return(0);
 }
 
-int N_VDotProdMulti_Hip(int nvec, N_Vector X, N_Vector* Y, realtype* dots)
+int N_VDotProdMulti_Hip(int nvec, N_Vector X, N_Vector* Y, sunrealtype* dots)
 {
   hipError_t err;
 
   // Create array of device pointers on host
-  realtype** h_Yd = new realtype*[nvec];
+  sunrealtype** h_Yd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Yd[i] = NVEC_HIP_DDATAp(Y[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Yd;
-  err = hipMalloc((void**) &d_Yd, nvec*sizeof(realtype*));
+  sunrealtype** d_Yd;
+  err = hipMalloc((void**) &d_Yd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1478,13 +1478,13 @@ int N_VDotProdMulti_Hip(int nvec, N_Vector X, N_Vector* Y, realtype* dots)
   grid = nvec;
 
   // Allocate reduction buffer on device
-  realtype* d_buff;
-  err = hipMalloc((void**) &d_buff, grid*sizeof(realtype));
+  sunrealtype* d_buff;
+  err = hipMalloc((void**) &d_buff, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemsetAsync(d_buff, 0, grid*sizeof(realtype));
+  err = hipMemsetAsync(d_buff, 0, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  dotProdMultiKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
+  dotProdMultiKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
     nvec,
     NVEC_HIP_DDATAp(X),
     d_Yd,
@@ -1494,7 +1494,7 @@ int N_VDotProdMulti_Hip(int nvec, N_Vector X, N_Vector* Y, realtype* dots)
   PostKernelLaunch();
 
   // Copy GPU result to the cpu.
-  err = hipMemcpy(dots, d_buff, grid*sizeof(realtype), hipMemcpyDeviceToHost);
+  err = hipMemcpy(dots, d_buff, grid*sizeof(sunrealtype), hipMemcpyDeviceToHost);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Free host array
@@ -1516,41 +1516,41 @@ int N_VDotProdMulti_Hip(int nvec, N_Vector X, N_Vector* Y, realtype* dots)
  * -----------------------------------------------------------------------------
  */
 
-int N_VLinearSumVectorArray_Hip(int nvec, realtype a, N_Vector* X, realtype b,
+int N_VLinearSumVectorArray_Hip(int nvec, sunrealtype a, N_Vector* X, sunrealtype b,
                                  N_Vector* Y, N_Vector* Z)
 {
   hipError_t err;
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
 
-  realtype** h_Yd = new realtype*[nvec];
+  sunrealtype** h_Yd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Yd[i] = NVEC_HIP_DDATAp(Y[i]);
 
-  realtype** h_Zd = new realtype*[nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Zd[i] = NVEC_HIP_DDATAp(Z[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Yd;
-  err = hipMalloc((void**) &d_Yd, nvec*sizeof(realtype*));
+  sunrealtype** d_Yd;
+  err = hipMalloc((void**) &d_Yd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Yd, h_Yd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1585,37 +1585,37 @@ int N_VLinearSumVectorArray_Hip(int nvec, realtype a, N_Vector* X, realtype b,
   return(0);
 }
 
-int N_VScaleVectorArray_Hip(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Hip(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   hipError_t err;
 
   // Copy c array to device
-  realtype* d_c;
-  err = hipMalloc((void**) &d_c, nvec*sizeof(realtype));
+  sunrealtype* d_c;
+  err = hipMalloc((void**) &d_c, nvec*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_c, c, nvec*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_c, c, nvec*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
 
-  realtype** h_Zd = new realtype*[nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Zd[i] = NVEC_HIP_DDATAp(Z[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1647,20 +1647,20 @@ int N_VScaleVectorArray_Hip(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
   return(0);
 }
 
-int N_VConstVectorArray_Hip(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Hip(int nvec, sunrealtype c, N_Vector* Z)
 {
   hipError_t err;
 
   // Create array of device pointers on host
-  realtype** h_Zd = new realtype*[nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Zd[i] = NVEC_HIP_DDATAp(Z[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1687,29 +1687,29 @@ int N_VConstVectorArray_Hip(int nvec, realtype c, N_Vector* Z)
 }
 
 int N_VWrmsNormVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
-                                realtype* norms)
+                                sunrealtype* norms)
 {
   hipError_t err;
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
-  realtype** h_Wd = new realtype*[nvec];
+  sunrealtype** h_Wd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Wd[i] = NVEC_HIP_DDATAp(W[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Wd;
-  err = hipMalloc((void**) &d_Wd, nvec*sizeof(realtype*));
+  sunrealtype** d_Wd;
+  err = hipMalloc((void**) &d_Wd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Wd, h_Wd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Wd, h_Wd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1720,13 +1720,13 @@ int N_VWrmsNormVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
   grid = nvec;
 
   // Allocate reduction buffer on device
-  realtype* d_buff;
-  err = hipMalloc((void**) &d_buff, grid*sizeof(realtype));
+  sunrealtype* d_buff;
+  err = hipMalloc((void**) &d_buff, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemsetAsync(d_buff, 0, grid*sizeof(realtype));
+  err = hipMemsetAsync(d_buff, 0, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  wL2NormSquareVectorArrayKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
+  wL2NormSquareVectorArrayKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
     nvec,
     d_Xd,
     d_Wd,
@@ -1736,7 +1736,7 @@ int N_VWrmsNormVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
   PostKernelLaunch();
 
   // Copy GPU result to the cpu.
-  err = hipMemcpy(norms, d_buff, grid*sizeof(realtype), hipMemcpyDeviceToHost);
+  err = hipMemcpy(norms, d_buff, grid*sizeof(sunrealtype), hipMemcpyDeviceToHost);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Finish computation
@@ -1759,30 +1759,30 @@ int N_VWrmsNormVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
 }
 
 int N_VWrmsNormMaskVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
-                                    N_Vector id, realtype* norms)
+                                    N_Vector id, sunrealtype* norms)
 {
   hipError_t err;
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
 
-  realtype** h_Wd = new realtype*[nvec];
+  sunrealtype** h_Wd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Wd[i] = NVEC_HIP_DDATAp(W[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Wd;
-  err = hipMalloc((void**) &d_Wd, nvec*sizeof(realtype*));
+  sunrealtype** d_Wd;
+  err = hipMalloc((void**) &d_Wd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Wd, h_Wd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Wd, h_Wd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1793,13 +1793,13 @@ int N_VWrmsNormMaskVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
   grid = nvec;
 
   // Allocate reduction buffer on device
-  realtype* d_buff;
-  err = hipMalloc((void**) &d_buff, grid*sizeof(realtype));
+  sunrealtype* d_buff;
+  err = hipMalloc((void**) &d_buff, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemsetAsync(d_buff, 0, grid*sizeof(realtype));
+  err = hipMemsetAsync(d_buff, 0, grid*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  wL2NormSquareMaskVectorArrayKernel<realtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
+  wL2NormSquareMaskVectorArrayKernel<sunrealtype, sunindextype, GridReducerAtomic><<<grid, block, shMemSize, stream>>>(
     nvec,
     d_Xd,
     d_Wd,
@@ -1810,7 +1810,7 @@ int N_VWrmsNormMaskVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
   PostKernelLaunch();
 
   // Copy GPU result to the cpu.
-  err = hipMemcpy(norms, d_buff, grid*sizeof(realtype), hipMemcpyDeviceToHost);
+  err = hipMemcpy(norms, d_buff, grid*sizeof(sunrealtype), hipMemcpyDeviceToHost);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Finish computation
@@ -1832,50 +1832,50 @@ int N_VWrmsNormMaskVectorArray_Hip(int nvec, N_Vector* X, N_Vector* W,
   return(0);
 }
 
-int N_VScaleAddMultiVectorArray_Hip(int nvec, int nsum, realtype* c,
+int N_VScaleAddMultiVectorArray_Hip(int nvec, int nsum, sunrealtype* c,
                                      N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   hipError_t err;
 
   // Copy c array to device
-  realtype* d_c;
-  err = hipMalloc((void**) &d_c, nsum*sizeof(realtype));
+  sunrealtype* d_c;
+  err = hipMalloc((void**) &d_c, nsum*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_c, c, nsum*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_c, c, nsum*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Xd[i] = NVEC_HIP_DDATAp(X[i]);
 
-  realtype** h_Yd = new realtype*[nsum*nvec];
+  sunrealtype** h_Yd = new sunrealtype*[nsum*nvec];
   for (int j=0; j<nvec; j++)
     for (int i=0; i<nsum; i++)
       h_Yd[j*nsum+i] = NVEC_HIP_DDATAp(Y[i][j]);
 
-  realtype** h_Zd = new realtype*[nsum*nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nsum*nvec];
   for (int j=0; j<nvec; j++)
     for (int i=0; i<nsum; i++)
       h_Zd[j*nsum+i] = NVEC_HIP_DDATAp(Z[i][j]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Yd;
-  err = hipMalloc((void**) &d_Yd, nsum*nvec*sizeof(realtype*));
+  sunrealtype** d_Yd;
+  err = hipMalloc((void**) &d_Yd, nsum*nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Yd, h_Yd, nsum*nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Yd, h_Yd, nsum*nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nsum*nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nsum*nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nsum*nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nsum*nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -1912,39 +1912,39 @@ int N_VScaleAddMultiVectorArray_Hip(int nvec, int nsum, realtype* c,
   return(0);
 }
 
-int N_VLinearCombinationVectorArray_Hip(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Hip(int nvec, int nsum, sunrealtype* c,
                                          N_Vector** X, N_Vector* Z)
 {
   hipError_t err;
 
   // Copy c array to device
-  realtype* d_c;
-  err = hipMalloc((void**) &d_c, nsum*sizeof(realtype));
+  sunrealtype* d_c;
+  err = hipMalloc((void**) &d_c, nsum*sizeof(sunrealtype));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_c, c, nsum*sizeof(realtype), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_c, c, nsum*sizeof(sunrealtype), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Create array of device pointers on host
-  realtype** h_Xd = new realtype*[nsum*nvec];
+  sunrealtype** h_Xd = new sunrealtype*[nsum*nvec];
   for (int j=0; j<nvec; j++)
     for (int i=0; i<nsum; i++)
       h_Xd[j*nsum+i] = NVEC_HIP_DDATAp(X[i][j]);
 
-  realtype** h_Zd = new realtype*[nvec];
+  sunrealtype** h_Zd = new sunrealtype*[nvec];
   for (int i=0; i<nvec; i++)
     h_Zd[i] = NVEC_HIP_DDATAp(Z[i]);
 
   // Copy array of device pointers to device from host
-  realtype** d_Xd;
-  err = hipMalloc((void**) &d_Xd, nsum*nvec*sizeof(realtype*));
+  sunrealtype** d_Xd;
+  err = hipMalloc((void**) &d_Xd, nsum*nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Xd, h_Xd, nsum*nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Xd, h_Xd, nsum*nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
-  realtype** d_Zd;
-  err = hipMalloc((void**) &d_Zd, nvec*sizeof(realtype*));
+  sunrealtype** d_Zd;
+  err = hipMalloc((void**) &d_Zd, nvec*sizeof(sunrealtype*));
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
-  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(realtype*), hipMemcpyHostToDevice);
+  err = hipMemcpy(d_Zd, h_Zd, nvec*sizeof(sunrealtype*), hipMemcpyHostToDevice);
   if (!SUNDIALS_HIP_VERIFY(err)) return(-1);
 
   // Set kernel parameters
@@ -2050,7 +2050,7 @@ int N_VBufUnpack_Hip(N_Vector x, void *buf)
  */
 
 
-int N_VEnableFusedOps_Hip(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2097,7 +2097,7 @@ int N_VEnableFusedOps_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombination_Hip(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2115,7 +2115,7 @@ int N_VEnableLinearCombination_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Hip(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2133,7 +2133,7 @@ int N_VEnableScaleAddMulti_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_Hip(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2154,7 +2154,7 @@ int N_VEnableDotProdMulti_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2172,7 +2172,7 @@ int N_VEnableLinearSumVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2190,7 +2190,7 @@ int N_VEnableScaleVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2208,7 +2208,7 @@ int N_VEnableConstVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2226,7 +2226,7 @@ int N_VEnableWrmsNormVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2244,7 +2244,7 @@ int N_VEnableWrmsNormMaskVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2262,7 +2262,7 @@ int N_VEnableScaleAddMultiVectorArray_Hip(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Hip(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2334,12 +2334,12 @@ int AllocateData(N_Vector v)
  * of the vector is increased. The buffer is initialized to the
  * value given.
  */
-static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n)
+static int InitializeReductionBuffer(N_Vector v, sunrealtype value, size_t n)
 {
   int         alloc_fail = 0;
   int         copy_fail  = 0;
-  booleantype alloc_mem  = SUNFALSE;
-  size_t      bytes      = n * sizeof(realtype);
+  sunbooleantype alloc_mem  = SUNFALSE;
+  size_t      bytes      = n * sizeof(sunrealtype);
 
   // Get the vector private memory structure
   N_PrivateVectorContent_Hip vcp = NVEC_HIP_PRIVATE(v);
@@ -2388,7 +2388,7 @@ static int InitializeReductionBuffer(N_Vector v, realtype value, size_t n)
 
     // Initialize the host memory with the value
     for (int i = 0; i < n; ++i)
-      ((realtype*)vcp->reduce_buffer_host->ptr)[i] = value;
+      ((sunrealtype*)vcp->reduce_buffer_host->ptr)[i] = value;
 
     // Initialize the device memory with the value
     copy_fail = SUNMemoryHelper_CopyAsync(NVEC_HIP_MEMHELP(v),
@@ -2438,7 +2438,7 @@ static int CopyReductionBufferFromDevice(N_Vector v, size_t n)
   copy_fail = SUNMemoryHelper_CopyAsync(NVEC_HIP_MEMHELP(v),
                                         NVEC_HIP_PRIVATE(v)->reduce_buffer_host,
                                         NVEC_HIP_PRIVATE(v)->reduce_buffer_dev,
-                                        n * sizeof(realtype),
+                                        n * sizeof(sunrealtype),
                                         (void*) NVEC_HIP_STREAM(v));
 
   if (copy_fail)
@@ -2477,7 +2477,7 @@ static int FreeDeviceCounter(N_Vector v)
 /* Get the kernel launch parameters based on the kernel type (reduction or not),
  * using the appropriate kernel execution policy.
  */
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid,
                                size_t& block, size_t& shMemSize,
                                hipStream_t& stream, bool& atomic, size_t n)
 {
@@ -2538,7 +2538,7 @@ static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
   return(0);
 }
 
-static int GetKernelParameters(N_Vector v, booleantype reduction, size_t& grid,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction, size_t& grid,
                                size_t& block, size_t& shMemSize, hipStream_t& stream,
                                size_t n)
 {
diff --git a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c
index 5509af24c4..2b4ed1cf4b 100644
--- a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c
+++ b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c
@@ -240,12 +240,12 @@ SWIGEXPORT N_Vector _wrap_FN_VGetSubvector_ManyVector(N_Vector farg1, int64_t co
 
 SWIGEXPORT int _wrap_FN_VSetSubvectorArrayPointer_ManyVector(double *farg1, N_Vector farg2, int64_t const *farg3) {
   int fresult ;
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   sunindextype arg3 ;
   int result;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (sunindextype)(*farg3);
   result = (int)N_VSetSubvectorArrayPointer_ManyVector(arg1,arg2,arg3);
@@ -367,15 +367,15 @@ SWIGEXPORT int64_t _wrap_FN_VGetSubvectorLocalLength_ManyVector(N_Vector farg1,
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_ManyVector(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_ManyVector(arg1,arg2,arg3,arg4,arg5);
@@ -383,10 +383,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_ManyVector(double const *farg1, N_Vector far
 
 
 SWIGEXPORT void _wrap_FN_VConst_ManyVector(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_ManyVector(arg1,arg2);
 }
@@ -417,11 +417,11 @@ SWIGEXPORT void _wrap_FN_VDiv_ManyVector(N_Vector farg1, N_Vector farg2, N_Vecto
 
 
 SWIGEXPORT void _wrap_FN_VScale_ManyVector(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_ManyVector(arg1,arg2,arg3);
@@ -450,11 +450,11 @@ SWIGEXPORT void _wrap_FN_VInv_ManyVector(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_ManyVector(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_ManyVector(arg1,arg2,arg3);
 }
@@ -464,12 +464,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_ManyVector(N_Vector farg1, N_Vector farg2)
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_ManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_ManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -479,13 +479,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_ManyVector(N_Vector farg1, N_Vector far
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_ManyVector(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_ManyVector(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -494,22 +494,22 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_ManyVector(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_ManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_ManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_ManyVector(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_ManyVector(arg1,arg2,arg3);
@@ -519,13 +519,13 @@ SWIGEXPORT void _wrap_FN_VCompare_ManyVector(double const *farg1, N_Vector farg2
 SWIGEXPORT int _wrap_FN_VLinearCombination_ManyVector(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_ManyVector(arg1,arg2,arg3,arg4);
@@ -537,14 +537,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_ManyVector(int const *farg1, double *
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_ManyVector(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -559,13 +559,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_ManyVector(int const *farg1, N_Vector farg
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_ManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -575,17 +575,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_ManyVector(int const *farg1, N_Vector farg
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_ManyVector(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_ManyVector(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -597,13 +597,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_ManyVector(int const *farg1, doubl
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_ManyVector(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_ManyVector(arg1,arg2,arg3,arg4);
@@ -615,12 +615,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_ManyVector(int const *farg1, double *f
 SWIGEXPORT int _wrap_FN_VConstVectorArray_ManyVector(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_ManyVector(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -633,13 +633,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_ManyVector(int const *farg1, void *
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_ManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -652,14 +652,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_ManyVector(int const *farg1, vo
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_ManyVector(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -670,12 +670,12 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_ManyVector(N_Vector farg1, N_Vector far
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProdLocal_ManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProdLocal_ManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -683,11 +683,11 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_ManyVector(N_Vector farg1, N_Vector far
 SWIGEXPORT double _wrap_FN_VMaxNormLocal_ManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNormLocal_ManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNormLocal_ManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -695,11 +695,11 @@ SWIGEXPORT double _wrap_FN_VMaxNormLocal_ManyVector(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VMinLocal_ManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMinLocal_ManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinLocal_ManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -707,11 +707,11 @@ SWIGEXPORT double _wrap_FN_VMinLocal_ManyVector(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VL1NormLocal_ManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1NormLocal_ManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1NormLocal_ManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -720,12 +720,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_ManyVector(N_Vector farg1, N_Vector far
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_ManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_ManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -735,13 +735,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_ManyVector(N_Vector farg1, N_Vector
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_ManyVector(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_ManyVector(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -780,12 +780,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotientLocal_ManyVector(N_Vector farg1, N_Vector
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotientLocal_ManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotientLocal_ManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -795,13 +795,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiLocal_ManyVector(int const *farg1, N_Vector
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMultiLocal_ManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -995,11 +995,11 @@ SWIGEXPORT double * _wrap_FN_VGetSubvectorArrayPointer_ManyVector(N_Vector farg1
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)N_VGetSubvectorArrayPointer_ManyVector(arg1,arg2);
+  result = (sunrealtype *)N_VGetSubvectorArrayPointer_ManyVector(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c
index 7e50b664f1..314eee4d75 100644
--- a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c
+++ b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c
@@ -262,12 +262,12 @@ SWIGEXPORT N_Vector _wrap_FN_VGetSubvector_MPIManyVector(N_Vector farg1, int64_t
 
 SWIGEXPORT int _wrap_FN_VSetSubvectorArrayPointer_MPIManyVector(double *farg1, N_Vector farg2, int64_t const *farg3) {
   int fresult ;
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   sunindextype arg3 ;
   int result;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (sunindextype)(*farg3);
   result = (int)N_VSetSubvectorArrayPointer_MPIManyVector(arg1,arg2,arg3);
@@ -401,15 +401,15 @@ SWIGEXPORT int64_t _wrap_FN_VGetSubvectorLocalLength_MPIManyVector(N_Vector farg
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_MPIManyVector(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_MPIManyVector(arg1,arg2,arg3,arg4,arg5);
@@ -417,10 +417,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_MPIManyVector(double const *farg1, N_Vector
 
 
 SWIGEXPORT void _wrap_FN_VConst_MPIManyVector(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_MPIManyVector(arg1,arg2);
 }
@@ -451,11 +451,11 @@ SWIGEXPORT void _wrap_FN_VDiv_MPIManyVector(N_Vector farg1, N_Vector farg2, N_Ve
 
 
 SWIGEXPORT void _wrap_FN_VScale_MPIManyVector(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_MPIManyVector(arg1,arg2,arg3);
@@ -484,11 +484,11 @@ SWIGEXPORT void _wrap_FN_VInv_MPIManyVector(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_MPIManyVector(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_MPIManyVector(arg1,arg2,arg3);
 }
@@ -498,12 +498,12 @@ SWIGEXPORT double _wrap_FN_VDotProd_MPIManyVector(N_Vector farg1, N_Vector farg2
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -511,11 +511,11 @@ SWIGEXPORT double _wrap_FN_VDotProd_MPIManyVector(N_Vector farg1, N_Vector farg2
 SWIGEXPORT double _wrap_FN_VMaxNorm_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -524,12 +524,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_MPIManyVector(N_Vector farg1, N_Vector farg
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -539,13 +539,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_MPIManyVector(N_Vector farg1, N_Vector
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_MPIManyVector(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_MPIManyVector(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -553,11 +553,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_MPIManyVector(N_Vector farg1, N_Vector
 SWIGEXPORT double _wrap_FN_VMin_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -566,12 +566,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_MPIManyVector(N_Vector farg1, N_Vector farg2
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -579,21 +579,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_MPIManyVector(N_Vector farg1, N_Vector farg2
 SWIGEXPORT double _wrap_FN_VL1Norm_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_MPIManyVector(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_MPIManyVector(arg1,arg2,arg3);
@@ -634,12 +634,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_MPIManyVector(N_Vector farg1, N_Vector f
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -647,13 +647,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_MPIManyVector(N_Vector farg1, N_Vector f
 SWIGEXPORT int _wrap_FN_VLinearCombination_MPIManyVector(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_MPIManyVector(arg1,arg2,arg3,arg4);
@@ -665,14 +665,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_MPIManyVector(int const *farg1, doubl
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_MPIManyVector(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -687,13 +687,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_MPIManyVector(int const *farg1, N_Vector f
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_MPIManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -705,13 +705,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiLocal_MPIManyVector(int const *farg1, N_Vec
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMultiLocal_MPIManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -722,12 +722,12 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiAllReduce_MPIManyVector(int const *farg1, N
   int fresult ;
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)N_VDotProdMultiAllReduce_MPIManyVector(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -737,17 +737,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiAllReduce_MPIManyVector(int const *farg1, N
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_MPIManyVector(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_MPIManyVector(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -759,13 +759,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_MPIManyVector(int const *farg1, do
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_MPIManyVector(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_MPIManyVector(arg1,arg2,arg3,arg4);
@@ -777,12 +777,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_MPIManyVector(int const *farg1, double
 SWIGEXPORT int _wrap_FN_VConstVectorArray_MPIManyVector(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_MPIManyVector(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -795,13 +795,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_MPIManyVector(int const *farg1, voi
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_MPIManyVector(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -814,14 +814,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_MPIManyVector(int const *farg1,
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_MPIManyVector(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -832,12 +832,12 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_MPIManyVector(N_Vector farg1, N_Vector
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProdLocal_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProdLocal_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -845,11 +845,11 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_MPIManyVector(N_Vector farg1, N_Vector
 SWIGEXPORT double _wrap_FN_VMaxNormLocal_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNormLocal_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNormLocal_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -857,11 +857,11 @@ SWIGEXPORT double _wrap_FN_VMaxNormLocal_MPIManyVector(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VMinLocal_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMinLocal_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinLocal_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -869,11 +869,11 @@ SWIGEXPORT double _wrap_FN_VMinLocal_MPIManyVector(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VL1NormLocal_MPIManyVector(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1NormLocal_MPIManyVector(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1NormLocal_MPIManyVector(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -882,12 +882,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_MPIManyVector(N_Vector farg1, N_Vector
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -897,13 +897,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_MPIManyVector(N_Vector farg1, N_Vec
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_MPIManyVector(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_MPIManyVector(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -942,12 +942,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotientLocal_MPIManyVector(N_Vector farg1, N_Vec
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotientLocal_MPIManyVector(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotientLocal_MPIManyVector(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -1139,11 +1139,11 @@ SWIGEXPORT double * _wrap_FN_VGetSubvectorArrayPointer_MPIManyVector(N_Vector fa
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)N_VGetSubvectorArrayPointer_MPIManyVector(arg1,arg2);
+  result = (sunrealtype *)N_VGetSubvectorArrayPointer_MPIManyVector(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/manyvector/nvector_manyvector.c b/src/nvector/manyvector/nvector_manyvector.c
index c663f2ced3..baa4e0921f 100644
--- a/src/nvector/manyvector/nvector_manyvector.c
+++ b/src/nvector/manyvector/nvector_manyvector.c
@@ -32,8 +32,8 @@
 #define MVAPPEND(fun) fun##_ManyVector
 #endif
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* -----------------------------------------------------------------
    ManyVector content accessor macros
@@ -53,7 +53,7 @@
 /* -----------------------------------------------------------------
    Prototypes of utility routines
    -----------------------------------------------------------------*/
-static N_Vector ManyVectorClone(N_Vector w, booleantype cloneempty);
+static N_Vector ManyVectorClone(N_Vector w, sunbooleantype cloneempty);
 #ifdef MANYVECTOR_BUILD_WITH_MPI
 static int SubvectorMPIRank(N_Vector w);
 #endif
@@ -219,7 +219,7 @@ N_Vector N_VNew_MPIManyVector(sunindextype num_subvectors,
                               SUNContext sunctx)
 {
   sunindextype i;
-  booleantype nocommfound;
+  sunbooleantype nocommfound;
   void* tmpcomm;
   MPI_Comm comm, *vcomm;
   int retval, comparison;
@@ -399,7 +399,7 @@ N_Vector MVAPPEND(N_VGetSubvector)(N_Vector v, sunindextype vec_num)
    the N_Vector array.  If vec_num is outside of applicable bounds, or if
    the subvector does not support the N_VGetArrayPointer routine, then
    NULL is returned. */
-realtype *MVAPPEND(N_VGetSubvectorArrayPointer)(N_Vector v, sunindextype vec_num)
+sunrealtype *MVAPPEND(N_VGetSubvectorArrayPointer)(N_Vector v, sunindextype vec_num)
 {
   if ( (vec_num < 0) || (vec_num > MANYVECTOR_NUM_SUBVECS(v)) )
     return(NULL);
@@ -413,7 +413,7 @@ realtype *MVAPPEND(N_VGetSubvectorArrayPointer)(N_Vector v, sunindextype vec_num
    the N_Vector array.  If vec_num is outside of applicable bounds, or if
    the subvector does not support the N_VSetArrayPointer routine, then
    -1 is returned; otherwise this routine returns 0. */
-int MVAPPEND(N_VSetSubvectorArrayPointer)(realtype *v_data, N_Vector v, sunindextype vec_num)
+int MVAPPEND(N_VSetSubvectorArrayPointer)(sunrealtype *v_data, N_Vector v, sunindextype vec_num)
 {
   if ( (vec_num < 0) || (vec_num > MANYVECTOR_NUM_SUBVECS(v)) )
     return(-1);
@@ -570,7 +570,7 @@ sunindextype MVAPPEND(N_VGetSubvectorLocalLength)(N_Vector v, sunindextype vec_n
 /* Performs the linear sum z = a*x + b*y by calling N_VLinearSum on all subvectors;
    this routine does not check that x, y and z are ManyVectors, if they have the
    same number of subvectors, or if these subvectors are compatible. */
-void MVAPPEND(N_VLinearSum)(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void MVAPPEND(N_VLinearSum)(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i;
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(x); i++)
@@ -581,7 +581,7 @@ void MVAPPEND(N_VLinearSum)(realtype a, N_Vector x, realtype b, N_Vector y, N_Ve
 
 
 /* Performs the operation z = c by calling N_VConst on all subvectors. */
-void MVAPPEND(N_VConst)(realtype c, N_Vector z)
+void MVAPPEND(N_VConst)(sunrealtype c, N_Vector z)
 {
   sunindextype i;
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(z); i++)
@@ -619,7 +619,7 @@ void MVAPPEND(N_VDiv)(N_Vector x, N_Vector y, N_Vector z)
 /* Performs the operation z_j = c*x_j by calling N_VScale on all subvectors;
    this routine does not check that x and z are ManyVectors, if they have the
    same number of subvectors, or if these subvectors are compatible. */
-void MVAPPEND(N_VScale)(realtype c, N_Vector x, N_Vector z)
+void MVAPPEND(N_VScale)(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i;
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(x); i++)
@@ -655,7 +655,7 @@ void MVAPPEND(N_VInv)(N_Vector x, N_Vector z)
 /* Performs the operation z_j = x_j + b by calling N_VAddConst on all subvectors;
    this routine does not check that x and z are ManyVectors, if they have the
    same number of subvectors, or if these subvectors are compatible. */
-void MVAPPEND(N_VAddConst)(N_Vector x, realtype b, N_Vector z)
+void MVAPPEND(N_VAddConst)(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i;
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(x); i++)
@@ -673,12 +673,12 @@ void MVAPPEND(N_VAddConst)(N_Vector x, realtype b, N_Vector z)
    function pointer), then this routine will call N_VDotProd, but only
    accumulate the sum if this is the root task for that subvector's
    communicator (note: serial vectors are always root task). */
-realtype MVAPPEND(N_VDotProdLocal)(N_Vector x, N_Vector y)
+sunrealtype MVAPPEND(N_VDotProdLocal)(N_Vector x, N_Vector y)
 {
   sunindextype i;
-  realtype sum;
+  sunrealtype sum;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-  realtype contrib;
+  sunrealtype contrib;
   int rank;
 #endif
 
@@ -725,9 +725,9 @@ realtype MVAPPEND(N_VDotProdLocal)(N_Vector x, N_Vector y)
    combining the results.  This routine does not check that x and y are
    ManyVectors, if they have the same number of subvectors, or if these
    subvectors are compatible. */
-realtype N_VDotProd_MPIManyVector(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_MPIManyVector(N_Vector x, N_Vector y)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = gsum = N_VDotProdLocal_MPIManyVector(x,y);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, MANYVECTOR_COMM(x));
@@ -741,10 +741,10 @@ realtype N_VDotProd_MPIManyVector(N_Vector x, N_Vector y)
 
    If any subvector does not implement the N_VMaxNormLocal routine (NULL
    function pointer), then this routine will call N_VMaxNorm instead. */
-realtype MVAPPEND(N_VMaxNormLocal)(N_Vector x)
+sunrealtype MVAPPEND(N_VMaxNormLocal)(N_Vector x)
 {
   sunindextype i;
-  realtype max, lmax;
+  sunrealtype max, lmax;
 
   /* initialize output*/
   max = ZERO;
@@ -773,9 +773,9 @@ realtype MVAPPEND(N_VMaxNormLocal)(N_Vector x)
 #ifdef MANYVECTOR_BUILD_WITH_MPI
 /* Performs the maximum norm of a ManyVector by calling N_VMaxNormLocal and
    combining the results. */
-realtype N_VMaxNorm_MPIManyVector(N_Vector x)
+sunrealtype N_VMaxNorm_MPIManyVector(N_Vector x)
 {
-  realtype lmax, gmax;
+  sunrealtype lmax, gmax;
   lmax = gmax = N_VMaxNormLocal_MPIManyVector(x);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lmax, &gmax, 1, MPI_SUNREALTYPE, MPI_MAX, MANYVECTOR_COMM(x));
@@ -794,10 +794,10 @@ realtype N_VMaxNorm_MPIManyVector(N_Vector x)
    to unravel the squared sum of the subvector components.  It will then only
    accumulate this to the overall sum if this is the root task for that
    subvector's communicator (note: serial vectors are always root task). */
-realtype MVAPPEND(N_VWSqrSumLocal)(N_Vector x, N_Vector w)
+sunrealtype MVAPPEND(N_VWSqrSumLocal)(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, contrib;
+  sunrealtype sum, contrib;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
   int rank;
 #endif
@@ -848,11 +848,11 @@ realtype MVAPPEND(N_VWSqrSumLocal)(N_Vector x, N_Vector w)
    combining the results; this routine does not check that x and
    w are ManyVectors, if they have the same number of subvectors, or if these
    subvectors are compatible. */
-realtype MVAPPEND(N_VWrmsNorm)(N_Vector x, N_Vector w)
+sunrealtype MVAPPEND(N_VWrmsNorm)(N_Vector x, N_Vector w)
 {
-  realtype gsum;
+  sunrealtype gsum;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-  realtype lsum;
+  sunrealtype lsum;
   lsum = gsum = N_VWSqrSumLocal_MPIManyVector(x, w);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, MANYVECTOR_COMM(x));
@@ -874,10 +874,10 @@ realtype MVAPPEND(N_VWrmsNorm)(N_Vector x, N_Vector w)
    It will then only accumulate this to the overall sum if this is the root
    task for that subvector's communicator (note: serial vectors are always
    root task). */
-realtype MVAPPEND(N_VWSqrSumMaskLocal)(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype MVAPPEND(N_VWSqrSumMaskLocal)(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, contrib;
+  sunrealtype sum, contrib;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
   int rank;
 #endif
@@ -931,11 +931,11 @@ realtype MVAPPEND(N_VWSqrSumMaskLocal)(N_Vector x, N_Vector w, N_Vector id)
    and combining the results; this routine does not check that x, w and id are
    ManyVectors, if they have the same number of subvectors, or if these subvectors
    are compatible. */
-realtype MVAPPEND(N_VWrmsNormMask)(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype MVAPPEND(N_VWrmsNormMask)(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype gsum;
+  sunrealtype gsum;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-  realtype lsum;
+  sunrealtype lsum;
   lsum = gsum = N_VWSqrSumMaskLocal_MPIManyVector(x, w, id);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, MANYVECTOR_COMM(x));
@@ -951,13 +951,13 @@ realtype MVAPPEND(N_VWrmsNormMask)(N_Vector x, N_Vector w, N_Vector id)
 
    If any subvector does not implement the N_VMinLocal routine (NULL
    function pointer), then this routine will call N_VMin instead. */
-realtype MVAPPEND(N_VMinLocal)(N_Vector x)
+sunrealtype MVAPPEND(N_VMinLocal)(N_Vector x)
 {
   sunindextype i;
-  realtype min, lmin;
+  sunrealtype min, lmin;
 
   /* initialize output*/
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(x); i++) {
 
@@ -983,9 +983,9 @@ realtype MVAPPEND(N_VMinLocal)(N_Vector x)
 #ifdef MANYVECTOR_BUILD_WITH_MPI
 /* Computes the minimum entry of a ManyVector by calling N_VMinLocal and
    combining the results. */
-realtype N_VMin_MPIManyVector(N_Vector x)
+sunrealtype N_VMin_MPIManyVector(N_Vector x)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = gmin = N_VMinLocal_MPIManyVector(x);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, MANYVECTOR_COMM(x));
@@ -998,11 +998,11 @@ realtype N_VMin_MPIManyVector(N_Vector x)
    'massaging' the result.  This routine does not check that x and w are
    ManyVectors, if they have the same number of subvectors, or if these
    subvectors are compatible. */
-realtype MVAPPEND(N_VWL2Norm)(N_Vector x, N_Vector w)
+sunrealtype MVAPPEND(N_VWL2Norm)(N_Vector x, N_Vector w)
 {
-  realtype gsum;
+  sunrealtype gsum;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-  realtype lsum;
+  sunrealtype lsum;
   lsum = gsum = N_VWSqrSumLocal_MPIManyVector(x, w);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, MANYVECTOR_COMM(x));
@@ -1018,12 +1018,12 @@ realtype MVAPPEND(N_VWL2Norm)(N_Vector x, N_Vector w)
    (NULL function pointer), then this routine will call N_VL1Norm, but only
    accumulate the sum if this is the root task for that subvector's
    communicator (note: serial vectors are always root task). */
-realtype MVAPPEND(N_VL1NormLocal)(N_Vector x)
+sunrealtype MVAPPEND(N_VL1NormLocal)(N_Vector x)
 {
   sunindextype i;
-  realtype sum;
+  sunrealtype sum;
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-  realtype contrib;
+  sunrealtype contrib;
   int rank;
 #endif
 
@@ -1068,9 +1068,9 @@ realtype MVAPPEND(N_VL1NormLocal)(N_Vector x)
 #ifdef MANYVECTOR_BUILD_WITH_MPI
 /* Performs the L1 norm of a ManyVector by calling N_VL1NormLocal and
    combining the results. */
-realtype N_VL1Norm_MPIManyVector(N_Vector x)
+sunrealtype N_VL1Norm_MPIManyVector(N_Vector x)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = gsum = N_VL1NormLocal_MPIManyVector(x);
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, MANYVECTOR_COMM(x));
@@ -1082,7 +1082,7 @@ realtype N_VL1Norm_MPIManyVector(N_Vector x)
 /* Performs N_VCompare on all subvectors; this routine does not check that x and z are
    ManyVectors, if they have the same number of subvectors, or if these subvectors are
    compatible. */
-void MVAPPEND(N_VCompare)(realtype c, N_Vector x, N_Vector z)
+void MVAPPEND(N_VCompare)(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i;
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(x); i++)
@@ -1098,10 +1098,10 @@ void MVAPPEND(N_VCompare)(realtype c, N_Vector x, N_Vector z)
 
    If any subvector does not implement the N_VInvTestLocal routine (NULL
    function pointer), then this routine will call N_VInvTest instead. */
-booleantype MVAPPEND(N_VInvTestLocal)(N_Vector x, N_Vector z)
+sunbooleantype MVAPPEND(N_VInvTestLocal)(N_Vector x, N_Vector z)
 {
   sunindextype i;
-  booleantype val, subval;
+  sunbooleantype val, subval;
 
   /* initialize output*/
   val = SUNTRUE;
@@ -1132,9 +1132,9 @@ booleantype MVAPPEND(N_VInvTestLocal)(N_Vector x, N_Vector z)
    combining the results. This routine does not check that x and z
    are ManyVectors, if they have the same number of subvectors, or if these
    subvectors are compatible. */
-booleantype N_VInvTest_MPIManyVector(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_MPIManyVector(N_Vector x, N_Vector z)
 {
-  realtype val, gval;
+  sunrealtype val, gval;
   val = gval = (N_VInvTestLocal_MPIManyVector(x, z)) ? ONE : ZERO;
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&val, &gval, 1, MPI_SUNREALTYPE, MPI_MIN, MANYVECTOR_COMM(x));
@@ -1150,10 +1150,10 @@ booleantype N_VInvTest_MPIManyVector(N_Vector x, N_Vector z)
 
    If any subvector does not implement the N_VConstrMaskLocal routine (NULL
    function pointer), then this routine will call N_VConstrMask instead. */
-booleantype MVAPPEND(N_VConstrMaskLocal)(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype MVAPPEND(N_VConstrMaskLocal)(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i;
-  booleantype val, subval;
+  sunbooleantype val, subval;
 
   /* initialize output*/
   val = SUNTRUE;
@@ -1186,9 +1186,9 @@ booleantype MVAPPEND(N_VConstrMaskLocal)(N_Vector c, N_Vector x, N_Vector m)
    combining the results.  This routine does not check that c, x and m
    are ManyVectors, if they have the same number of subvectors, or if these
    subvectors are compatible. */
-booleantype N_VConstrMask_MPIManyVector(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_MPIManyVector(N_Vector c, N_Vector x, N_Vector m)
 {
-  realtype val, gval;
+  sunrealtype val, gval;
   val = gval = (N_VConstrMaskLocal_MPIManyVector(c, x, m)) ? ONE : ZERO;
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
     MPI_Allreduce(&val, &gval, 1, MPI_SUNREALTYPE, MPI_MIN, MANYVECTOR_COMM(x));
@@ -1204,13 +1204,13 @@ booleantype N_VConstrMask_MPIManyVector(N_Vector c, N_Vector x, N_Vector m)
 
    If any subvector does not implement the N_VMinQuotientLocal routine (NULL
    function pointer), then this routine will call N_VMinQuotient instead. */
-realtype MVAPPEND(N_VMinQuotientLocal)(N_Vector num, N_Vector denom)
+sunrealtype MVAPPEND(N_VMinQuotientLocal)(N_Vector num, N_Vector denom)
 {
   sunindextype i;
-  realtype min, lmin;
+  sunrealtype min, lmin;
 
   /* initialize output*/
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   for (i=0; i<MANYVECTOR_NUM_SUBVECS(num); i++) {
 
@@ -1240,9 +1240,9 @@ realtype MVAPPEND(N_VMinQuotientLocal)(N_Vector num, N_Vector denom)
    and combining the results.  This routine does not check that num and
    denom are ManyVectors, if they have the same number of subvectors, or if
    these subvectors are compatible. */
-realtype N_VMinQuotient_MPIManyVector(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_MPIManyVector(N_Vector num, N_Vector denom)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = gmin = N_VMinQuotientLocal_MPIManyVector(num, denom);
   if (MANYVECTOR_COMM(num) != MPI_COMM_NULL)
     MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, MANYVECTOR_COMM(num));
@@ -1257,12 +1257,12 @@ realtype N_VMinQuotient_MPIManyVector(N_Vector num, N_Vector denom)
 
 
 int MVAPPEND(N_VDotProdMultiLocal)(int nvec, N_Vector x, N_Vector* Y,
-                                   realtype* dotprods)
+                                   sunrealtype* dotprods)
 {
   int          j, retval;
   sunindextype i;
   N_Vector*    Ysub;
-  realtype*    contrib;
+  sunrealtype*    contrib;
 
   /* create temporary workspace arrays */
   Ysub = NULL;
@@ -1270,7 +1270,7 @@ int MVAPPEND(N_VDotProdMultiLocal)(int nvec, N_Vector x, N_Vector* Y,
   if (!Ysub) return -1;
 
   contrib = NULL;
-  contrib = (realtype*) malloc(nvec * sizeof(realtype));
+  contrib = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
   if (!contrib) return -1;
 
   /* initialize output */
@@ -1307,7 +1307,7 @@ int MVAPPEND(N_VDotProdMultiLocal)(int nvec, N_Vector x, N_Vector* Y,
 
 
 #ifdef MANYVECTOR_BUILD_WITH_MPI
-int N_VDotProdMultiAllReduce_MPIManyVector(int nvec_total, N_Vector x, realtype* sum)
+int N_VDotProdMultiAllReduce_MPIManyVector(int nvec_total, N_Vector x, sunrealtype* sum)
 {
   /* accumulate totals and return */
   if (MANYVECTOR_COMM(x) != MPI_COMM_NULL)
@@ -1332,7 +1332,7 @@ int N_VDotProdMultiAllReduce_MPIManyVector(int nvec_total, N_Vector x, realtype*
    array-of-arrays of N_Vectors that comprise X.  This routine will be
    passed an array of ManyVectors, so to call the subvector-specific routines
    we must unravel the subvectors while retaining an array of outer vectors. */
-int MVAPPEND(N_VLinearCombination)(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int MVAPPEND(N_VLinearCombination)(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   sunindextype i, j;
   int retval;
@@ -1375,7 +1375,7 @@ int MVAPPEND(N_VLinearCombination)(int nvec, realtype* c, N_Vector* X, N_Vector
    N_Vectors that comprise Y and Z.  This routine will be passed an array of
    ManyVectors, so to call the subvector-specific routines we must unravel
    the subvectors while retaining an array of outer vectors. */
-int MVAPPEND(N_VScaleAddMulti)(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int MVAPPEND(N_VScaleAddMulti)(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   sunindextype i, j;
   int retval;
@@ -1423,7 +1423,7 @@ int MVAPPEND(N_VScaleAddMulti)(int nvec, realtype* a, N_Vector x, N_Vector* Y, N
    will require only a single array-valued reduction operation (in contrast to calling
    N_VDotProdMulti on all subvectors, where we would require num_subvectors separate
    reductions). */
-int MVAPPEND(N_VDotProdMulti)(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int MVAPPEND(N_VDotProdMulti)(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   sunindextype i;
 
@@ -1454,8 +1454,8 @@ int MVAPPEND(N_VDotProdMulti)(int nvec, N_Vector x, N_Vector* Y, realtype* dotpr
    N_Vectors that comprise X, Y and Z.  This routine will be passed arrays of
    ManyVectors, so to call the subvector-specific routines we must unravel
    the subvectors while retaining arrays of outer vectors. */
-int MVAPPEND(N_VLinearSumVectorArray)(int nvec, realtype a,
-                                      N_Vector *X, realtype b,
+int MVAPPEND(N_VLinearSumVectorArray)(int nvec, sunrealtype a,
+                                      N_Vector *X, sunrealtype b,
                                       N_Vector *Y, N_Vector *Z)
 {
   sunindextype i, j;
@@ -1512,7 +1512,7 @@ int MVAPPEND(N_VLinearSumVectorArray)(int nvec, realtype a,
    N_Vectors that comprise X and Z.  This routine will be passed arrays of
    ManyVectors, so to call the subvector-specific routines we must unravel
    the subvectors while retaining arrays of outer vectors. */
-int MVAPPEND(N_VScaleVectorArray)(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int MVAPPEND(N_VScaleVectorArray)(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   sunindextype i, j;
   int retval;
@@ -1562,7 +1562,7 @@ int MVAPPEND(N_VScaleVectorArray)(int nvec, realtype* c, N_Vector* X, N_Vector*
    N_Vectors that comprise Z.  This routine will be passed an array of
    ManyVectors, so to call the subvector-specific routines we must unravel
    the subvectors while retaining an array of outer vectors. */
-int MVAPPEND(N_VConstVectorArray)(int nvec, realtype c, N_Vector* Z)
+int MVAPPEND(N_VConstVectorArray)(int nvec, sunrealtype c, N_Vector* Z)
 {
   sunindextype i, j;
   int retval;
@@ -1608,7 +1608,7 @@ int MVAPPEND(N_VConstVectorArray)(int nvec, realtype c, N_Vector* Z)
    will require only a single array-valued reduction operation (in contrast to calling
    N_VWrmsNormVectorArray on all subvectors, where we would require num_subvectors
    separate reductions). */
-int MVAPPEND(N_VWrmsNormVectorArray)(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int MVAPPEND(N_VWrmsNormVectorArray)(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   sunindextype i;
   int retval;
@@ -1645,7 +1645,7 @@ int MVAPPEND(N_VWrmsNormVectorArray)(int nvec, N_Vector* X, N_Vector* W, realtyp
    to calling N_VWrmsNormMaskVectorArray on all subvectors, where we would require
    num_subvectors separate reductions). */
 int MVAPPEND(N_VWrmsNormMaskVectorArray)(int nvec, N_Vector* X, N_Vector* W,
-                                         N_Vector id, realtype* nrm)
+                                         N_Vector id, sunrealtype* nrm)
 {
   sunindextype i;
   int retval;
@@ -1766,7 +1766,7 @@ int MVAPPEND(N_VBufUnpack)(N_Vector x, void *buf)
    Enable / Disable fused and vector array operations
    ----------------------------------------------------------------- */
 
-int MVAPPEND(N_VEnableFusedOps)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableFusedOps)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1811,7 +1811,7 @@ int MVAPPEND(N_VEnableFusedOps)(N_Vector v, booleantype tf)
 }
 
 
-int MVAPPEND(N_VEnableLinearCombination)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableLinearCombination)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1829,7 +1829,7 @@ int MVAPPEND(N_VEnableLinearCombination)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableScaleAddMulti)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableScaleAddMulti)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1847,7 +1847,7 @@ int MVAPPEND(N_VEnableScaleAddMulti)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableDotProdMulti)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableDotProdMulti)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1865,7 +1865,7 @@ int MVAPPEND(N_VEnableDotProdMulti)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableLinearSumVectorArray)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableLinearSumVectorArray)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1883,7 +1883,7 @@ int MVAPPEND(N_VEnableLinearSumVectorArray)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableScaleVectorArray)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableScaleVectorArray)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1901,7 +1901,7 @@ int MVAPPEND(N_VEnableScaleVectorArray)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableConstVectorArray)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableConstVectorArray)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1919,7 +1919,7 @@ int MVAPPEND(N_VEnableConstVectorArray)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableWrmsNormVectorArray)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableWrmsNormVectorArray)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1937,7 +1937,7 @@ int MVAPPEND(N_VEnableWrmsNormVectorArray)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableWrmsNormMaskVectorArray)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableWrmsNormMaskVectorArray)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1955,7 +1955,7 @@ int MVAPPEND(N_VEnableWrmsNormMaskVectorArray)(N_Vector v, booleantype tf)
   return(0);
 }
 
-int MVAPPEND(N_VEnableDotProdMultiLocal)(N_Vector v, booleantype tf)
+int MVAPPEND(N_VEnableDotProdMultiLocal)(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1980,7 +1980,7 @@ int MVAPPEND(N_VEnableDotProdMultiLocal)(N_Vector v, booleantype tf)
 /* This function performs a generic clone operation on an input N_Vector.
    Based on the 'cloneempty' flag it will either call "nvclone" or
    "nvcloneempty" when creating subvectors in the cloned vector. */
-static N_Vector ManyVectorClone(N_Vector w, booleantype cloneempty)
+static N_Vector ManyVectorClone(N_Vector w, sunbooleantype cloneempty)
 {
   N_Vector v;
   MVAPPEND(N_VectorContent) content;
diff --git a/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c b/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c
index c9bdee0eb3..800c1c9819 100644
--- a/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c
+++ b/src/nvector/mpiplusx/fmod/fnvector_mpiplusx_mod.c
@@ -241,10 +241,10 @@ SWIGEXPORT int _wrap_FN_VGetVectorID_MPIPlusX(N_Vector farg1) {
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer_MPIPlusX(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer_MPIPlusX(arg1,arg2);
 }
@@ -310,10 +310,10 @@ SWIGEXPORT int _wrap_FN_VEnableFusedOps_MPIPlusX(N_Vector farg1, int const *farg
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_MPIPlusX(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_MPIPlusX(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_MPIPlusX(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/mpiplusx/nvector_mpiplusx.c b/src/nvector/mpiplusx/nvector_mpiplusx.c
index 2f20e65692..6fd10b2dc7 100644
--- a/src/nvector/mpiplusx/nvector_mpiplusx.c
+++ b/src/nvector/mpiplusx/nvector_mpiplusx.c
@@ -53,12 +53,12 @@ N_Vector_ID N_VGetVectorID_MPIPlusX(N_Vector v)
   return SUNDIALS_NVEC_MPIPLUSX;
 }
 
-realtype* N_VGetArrayPointer_MPIPlusX(N_Vector v)
+sunrealtype* N_VGetArrayPointer_MPIPlusX(N_Vector v)
 {
   return N_VGetSubvectorArrayPointer_MPIManyVector(v, 0);
 }
 
-void N_VSetArrayPointer_MPIPlusX(realtype *vdata, N_Vector v)
+void N_VSetArrayPointer_MPIPlusX(sunrealtype *vdata, N_Vector v)
 {
   N_VSetSubvectorArrayPointer_MPIManyVector(vdata, v, 0);
 }
diff --git a/src/nvector/openmp/fmod/fnvector_openmp_mod.c b/src/nvector/openmp/fmod/fnvector_openmp_mod.c
index 91edfc2791..d403deb446 100644
--- a/src/nvector/openmp/fmod/fnvector_openmp_mod.c
+++ b/src/nvector/openmp/fmod/fnvector_openmp_mod.c
@@ -243,13 +243,13 @@ SWIGEXPORT N_Vector _wrap_FN_VNewEmpty_OpenMP(int64_t const *farg1, int const *f
 SWIGEXPORT N_Vector _wrap_FN_VMake_OpenMP(int64_t const *farg1, double *farg2, int const *farg3, void *farg4) {
   N_Vector fresult ;
   sunindextype arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   int arg3 ;
   SUNContext arg4 = (SUNContext) 0 ;
   N_Vector result;
   
   arg1 = (sunindextype)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (SUNContext)(farg4);
   result = (N_Vector)N_VMake_OpenMP(arg1,arg2,arg3,arg4);
@@ -345,25 +345,25 @@ SWIGEXPORT void _wrap_FN_VSpace_OpenMP(N_Vector farg1, int64_t *farg2, int64_t *
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer_OpenMP(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer_OpenMP(arg1,arg2);
 }
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_OpenMP(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_OpenMP(arg1,arg2,arg3,arg4,arg5);
@@ -371,10 +371,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_OpenMP(double const *farg1, N_Vector farg2,
 
 
 SWIGEXPORT void _wrap_FN_VConst_OpenMP(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_OpenMP(arg1,arg2);
 }
@@ -405,11 +405,11 @@ SWIGEXPORT void _wrap_FN_VDiv_OpenMP(N_Vector farg1, N_Vector farg2, N_Vector fa
 
 
 SWIGEXPORT void _wrap_FN_VScale_OpenMP(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_OpenMP(arg1,arg2,arg3);
@@ -438,11 +438,11 @@ SWIGEXPORT void _wrap_FN_VInv_OpenMP(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_OpenMP(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_OpenMP(arg1,arg2,arg3);
 }
@@ -452,12 +452,12 @@ SWIGEXPORT double _wrap_FN_VDotProd_OpenMP(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd_OpenMP(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd_OpenMP(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -465,11 +465,11 @@ SWIGEXPORT double _wrap_FN_VDotProd_OpenMP(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNorm_OpenMP(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm_OpenMP(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm_OpenMP(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -478,12 +478,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_OpenMP(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_OpenMP(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_OpenMP(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -493,13 +493,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_OpenMP(N_Vector farg1, N_Vector farg2,
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_OpenMP(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_OpenMP(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -507,11 +507,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_OpenMP(N_Vector farg1, N_Vector farg2,
 SWIGEXPORT double _wrap_FN_VMin_OpenMP(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin_OpenMP(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin_OpenMP(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -520,12 +520,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_OpenMP(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_OpenMP(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_OpenMP(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -533,21 +533,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_OpenMP(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VL1Norm_OpenMP(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm_OpenMP(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm_OpenMP(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_OpenMP(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_OpenMP(arg1,arg2,arg3);
@@ -588,12 +588,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_OpenMP(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient_OpenMP(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient_OpenMP(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -601,13 +601,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_OpenMP(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FN_VLinearCombination_OpenMP(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_OpenMP(arg1,arg2,arg3,arg4);
@@ -619,14 +619,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_OpenMP(int const *farg1, double *farg
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_OpenMP(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -641,13 +641,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_OpenMP(int const *farg1, N_Vector farg2, v
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_OpenMP(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -657,17 +657,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_OpenMP(int const *farg1, N_Vector farg2, v
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_OpenMP(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_OpenMP(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -679,13 +679,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_OpenMP(int const *farg1, double co
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_OpenMP(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_OpenMP(arg1,arg2,arg3,arg4);
@@ -697,12 +697,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_OpenMP(int const *farg1, double *farg2
 SWIGEXPORT int _wrap_FN_VConstVectorArray_OpenMP(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_OpenMP(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -715,13 +715,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_OpenMP(int const *farg1, void *farg
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_OpenMP(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -734,14 +734,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_OpenMP(int const *farg1, void *
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_OpenMP(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -752,12 +752,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_OpenMP(N_Vector farg1, N_Vector farg2)
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_OpenMP(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_OpenMP(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -767,13 +767,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_OpenMP(N_Vector farg1, N_Vector far
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_OpenMP(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_OpenMP(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -950,10 +950,10 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector farg1, in
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_OpenMP(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_OpenMP(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_OpenMP(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/openmp/nvector_openmp.c b/src/nvector/openmp/nvector_openmp.c
index 5b8db6e85a..3878d563f6 100644
--- a/src/nvector/openmp/nvector_openmp.c
+++ b/src/nvector/openmp/nvector_openmp.c
@@ -28,31 +28,31 @@
 #include <nvector/nvector_openmp.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Private functions for special cases of vector operations */
 static void VCopy_OpenMP(N_Vector x, N_Vector z);                              /* z=x       */
 static void VSum_OpenMP(N_Vector x, N_Vector y, N_Vector z);                   /* z=x+y     */
 static void VDiff_OpenMP(N_Vector x, N_Vector y, N_Vector z);                  /* z=x-y     */
 static void VNeg_OpenMP(N_Vector x, N_Vector z);                               /* z=-x      */
-static void VScaleSum_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
-static void VScaleDiff_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
-static void VLin1_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
-static void VLin2_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
-static void Vaxpy_OpenMP(realtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
-static void VScaleBy_OpenMP(realtype a, N_Vector x);                           /* x <- ax   */
+static void VScaleSum_OpenMP(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
+static void VScaleDiff_OpenMP(sunrealtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
+static void VLin1_OpenMP(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
+static void VLin2_OpenMP(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
+static void Vaxpy_OpenMP(sunrealtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
+static void VScaleBy_OpenMP(sunrealtype a, N_Vector x);                           /* x <- ax   */
 
 /* Private functions for special cases of vector array operations */
 static int VSumVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                   /* Z=X+Y     */
 static int VDiffVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                  /* Z=X-Y     */
-static int VScaleSumVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
-static int VScaleDiffVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
-static int VLin1VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
-static int VLin2VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
-static int VaxpyVectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
+static int VScaleSumVectorArray_OpenMP(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
+static int VScaleDiffVectorArray_OpenMP(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
+static int VLin1VectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
+static int VLin2VectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
+static int VaxpyVectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
 
 /*
  * -----------------------------------------------------------------
@@ -166,7 +166,7 @@ N_Vector N_VNewEmpty_OpenMP(sunindextype length, int num_threads, SUNContext sun
 N_Vector N_VNew_OpenMP(sunindextype length, int num_threads, SUNContext sunctx)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
 
   v = NULL;
   v = N_VNewEmpty_OpenMP(length, num_threads, sunctx);
@@ -177,7 +177,7 @@ N_Vector N_VNew_OpenMP(sunindextype length, int num_threads, SUNContext sunctx)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_OpenMP(v); return(NULL); }
 
     /* Attach data */
@@ -193,7 +193,7 @@ N_Vector N_VNew_OpenMP(sunindextype length, int num_threads, SUNContext sunctx)
  * Function to create a vector with user data component
  */
 
-N_Vector N_VMake_OpenMP(sunindextype length, realtype *v_data, int num_threads, SUNContext sunctx)
+N_Vector N_VMake_OpenMP(sunindextype length, sunrealtype *v_data, int num_threads, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -243,7 +243,7 @@ void N_VPrint_OpenMP(N_Vector x)
 void N_VPrintFile_OpenMP(N_Vector x, FILE *outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -314,7 +314,7 @@ N_Vector N_VCloneEmpty_OpenMP(N_Vector w)
 N_Vector N_VClone_OpenMP(N_Vector w)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
   sunindextype length;
 
   v = NULL;
@@ -328,7 +328,7 @@ N_Vector N_VClone_OpenMP(N_Vector w)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_OpenMP(v); return(NULL); }
 
     /* Attach data */
@@ -385,9 +385,9 @@ void N_VSpace_OpenMP(N_Vector v, sunindextype *lrw, sunindextype *liw)
  * Get vector data pointer
  */
 
-realtype *N_VGetArrayPointer_OpenMP(N_Vector v)
+sunrealtype *N_VGetArrayPointer_OpenMP(N_Vector v)
 {
-  return((realtype *) NV_DATA_OMP(v));
+  return((sunrealtype *) NV_DATA_OMP(v));
 }
 
 
@@ -395,7 +395,7 @@ realtype *N_VGetArrayPointer_OpenMP(N_Vector v)
  * Set vector data pointer
  */
 
-void N_VSetArrayPointer_OpenMP(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_OpenMP(sunrealtype *v_data, N_Vector v)
 {
   if (NV_LENGTH_OMP(v) > 0) NV_DATA_OMP(v) = v_data;
 
@@ -407,12 +407,12 @@ void N_VSetArrayPointer_OpenMP(realtype *v_data, N_Vector v)
  * Compute linear combination z[i] = a*x[i]+b*y[i]
  */
 
-void N_VLinearSum_OpenMP(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_OpenMP(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype c, *xd, *yd, *zd;
+  sunrealtype c, *xd, *yd, *zd;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -502,10 +502,10 @@ void N_VLinearSum_OpenMP(realtype a, N_Vector x, realtype b, N_Vector y, N_Vecto
  * Assigns constant value to all vector elements, z[i] = c
  */
 
-void N_VConst_OpenMP(realtype c, N_Vector z)
+void N_VConst_OpenMP(sunrealtype c, N_Vector z)
 {
   sunindextype i, N;
-  realtype *zd;
+  sunrealtype *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   zd = NULL;
@@ -528,7 +528,7 @@ void N_VConst_OpenMP(realtype c, N_Vector z)
 void N_VProd_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -554,7 +554,7 @@ void N_VProd_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -577,10 +577,10 @@ void N_VDiv_OpenMP(N_Vector x, N_Vector y, N_Vector z)
  * Compute scaler multiplication z[i] = c*x[i]
  */
 
-void N_VScale_OpenMP(realtype c, N_Vector x, N_Vector z)
+void N_VScale_OpenMP(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -616,7 +616,7 @@ void N_VScale_OpenMP(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_OpenMP(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -640,7 +640,7 @@ void N_VAbs_OpenMP(N_Vector x, N_Vector z)
 void N_VInv_OpenMP(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -662,10 +662,10 @@ void N_VInv_OpenMP(N_Vector x, N_Vector z)
  * Compute componentwise addition of a scaler to a vector z[i] = x[i] + b
  */
 
-void N_VAddConst_OpenMP(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_OpenMP(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -687,10 +687,10 @@ void N_VAddConst_OpenMP(N_Vector x, realtype b, N_Vector z)
  * Computes the dot product of two vectors, a = sum(x[i]*y[i])
  */
 
-realtype N_VDotProd_OpenMP(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_OpenMP(N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype sum, *xd, *yd;
+  sunrealtype sum, *xd, *yd;
 
   i   = 0; /* initialize to suppress clang warning */
   sum = ZERO;
@@ -714,10 +714,10 @@ realtype N_VDotProd_OpenMP(N_Vector x, N_Vector y)
  * Computes max norm of a vector
  */
 
-realtype N_VMaxNorm_OpenMP(N_Vector x)
+sunrealtype N_VMaxNorm_OpenMP(N_Vector x)
 {
   sunindextype i, N;
-  realtype tmax, max, *xd;
+  sunrealtype tmax, max, *xd;
 
   i   = 0; /* initialize to suppress clang warning */
   max = ZERO;
@@ -748,7 +748,7 @@ realtype N_VMaxNorm_OpenMP(N_Vector x)
  * Computes weighted root mean square norm of a vector
  */
 
-realtype N_VWrmsNorm_OpenMP(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_OpenMP(N_Vector x, N_Vector w)
 {
   return(SUNRsqrt(N_VWSqrSumLocal_OpenMP(x, w)/(NV_LENGTH_OMP(x))));
 }
@@ -758,7 +758,7 @@ realtype N_VWrmsNorm_OpenMP(N_Vector x, N_Vector w)
  * Computes weighted root mean square norm of a masked vector
  */
 
-realtype N_VWrmsNormMask_OpenMP(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_OpenMP(N_Vector x, N_Vector w, N_Vector id)
 {
   return(SUNRsqrt(N_VWSqrSumMaskLocal_OpenMP(x, w, id)/(NV_LENGTH_OMP(x))));
 }
@@ -768,11 +768,11 @@ realtype N_VWrmsNormMask_OpenMP(N_Vector x, N_Vector w, N_Vector id)
  * Finds the minimun component of a vector
  */
 
-realtype N_VMin_OpenMP(N_Vector x)
+sunrealtype N_VMin_OpenMP(N_Vector x)
 {
   sunindextype i, N;
-  realtype min, *xd;
-  realtype tmin;
+  sunrealtype min, *xd;
+  sunrealtype tmin;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = NULL;
@@ -806,10 +806,10 @@ realtype N_VMin_OpenMP(N_Vector x)
  * Computes weighted L2 norm of a vector
  */
 
-realtype N_VWL2Norm_OpenMP(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_OpenMP(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, *xd, *wd;
+  sunrealtype sum, *xd, *wd;
 
   i   = 0; /* initialize to suppress clang warning */
   sum = ZERO;
@@ -833,10 +833,10 @@ realtype N_VWL2Norm_OpenMP(N_Vector x, N_Vector w)
  * Computes L1 norm of a vector
  */
 
-realtype N_VL1Norm_OpenMP(N_Vector x)
+sunrealtype N_VL1Norm_OpenMP(N_Vector x)
 {
   sunindextype i, N;
-  realtype sum, *xd;
+  sunrealtype sum, *xd;
 
   i   = 0; /* initialize to suppress clang warning */
   sum = ZERO;
@@ -858,10 +858,10 @@ realtype N_VL1Norm_OpenMP(N_Vector x)
  * Compare vector component values to a scaler
  */
 
-void N_VCompare_OpenMP(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_OpenMP(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -884,10 +884,10 @@ void N_VCompare_OpenMP(realtype c, N_Vector x, N_Vector z)
  * Compute componentwise inverse z[i] = ONE/x[i] and checks if x[i] == ZERO
  */
 
-booleantype N_VInvTest_OpenMP(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_OpenMP(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd, val;
+  sunrealtype *xd, *zd, val;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -918,12 +918,12 @@ booleantype N_VInvTest_OpenMP(N_Vector x, N_Vector z)
  * Compute constraint mask of a vector
  */
 
-booleantype N_VConstrMask_OpenMP(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_OpenMP(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i, N;
-  realtype temp;
-  realtype *cd, *xd, *md;
-  booleantype test;
+  sunrealtype temp;
+  sunrealtype *cd, *xd, *md;
+  sunbooleantype test;
 
   i  = 0; /* initialize to suppress clang warning */
   cd = xd = md = NULL;
@@ -960,10 +960,10 @@ booleantype N_VConstrMask_OpenMP(N_Vector c, N_Vector x, N_Vector m)
  * Compute minimum componentwise quotient
  */
 
-realtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom)
 {
   sunindextype i, N;
-  realtype *nd, *dd, min, tmin, val;
+  sunrealtype *nd, *dd, min, tmin, val;
 
   i  = 0; /* initialize to suppress clang warning */
   nd = dd = NULL;
@@ -972,12 +972,12 @@ realtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom)
   nd = NV_DATA_OMP(num);
   dd = NV_DATA_OMP(denom);
 
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
 #pragma omp parallel default(none) private(i,tmin,val) shared(N,min,nd,dd) \
    num_threads(NV_NUM_THREADS_OMP(num))
   {
-    tmin = BIG_REAL;
+    tmin = SUN_BIG_REAL;
 #pragma omp for schedule(static)
     for (i = 0; i < N; i++) {
       if (dd[i] != ZERO) {
@@ -1001,10 +1001,10 @@ realtype N_VMinQuotient_OpenMP(N_Vector num, N_Vector denom)
  * Computes weighted square sum of a vector
  */
 
-realtype N_VWSqrSumLocal_OpenMP(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_OpenMP(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, *xd, *wd;
+  sunrealtype sum, *xd, *wd;
 
   i   = 0; /* initialize to suppress clang warning */
   sum = ZERO;
@@ -1028,10 +1028,10 @@ realtype N_VWSqrSumLocal_OpenMP(N_Vector x, N_Vector w)
  * Computes weighted square sum of a masked vector
  */
 
-realtype N_VWSqrSumMaskLocal_OpenMP(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_OpenMP(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, *xd, *wd, *idd;
+  sunrealtype sum, *xd, *wd, *idd;
 
   i   = 0; /* initialize to suppress clang warning */
   sum = ZERO;
@@ -1060,12 +1060,12 @@ realtype N_VWSqrSumMaskLocal_OpenMP(N_Vector x, N_Vector w, N_Vector id)
  * -----------------------------------------------------------------
  */
 
-int N_VLinearCombination_OpenMP(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_OpenMP(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1155,13 +1155,13 @@ int N_VLinearCombination_OpenMP(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_OpenMP(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_OpenMP(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1216,13 +1216,13 @@ int N_VScaleAddMulti_OpenMP(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Ve
 }
 
 
-int N_VDotProdMulti_OpenMP(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_OpenMP(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int          i;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype     sum;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1274,19 +1274,19 @@ int N_VDotProdMulti_OpenMP(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods
  */
 
 int N_VLinearSumVectorArray_OpenMP(int nvec,
-                                   realtype a, N_Vector* X,
-                                   realtype b, N_Vector* Y,
+                                   sunrealtype a, N_Vector* X,
+                                   sunrealtype b, N_Vector* Y,
                                    N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
-  realtype     c;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype     c;
   N_Vector*   V1;
   N_Vector*   V2;
-  booleantype  test;
+  sunbooleantype  test;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1378,12 +1378,12 @@ int N_VLinearSumVectorArray_OpenMP(int nvec,
 }
 
 
-int N_VScaleVectorArray_OpenMP(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_OpenMP(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1437,11 +1437,11 @@ int N_VScaleVectorArray_OpenMP(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_OpenMP(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_OpenMP(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1475,13 +1475,13 @@ int N_VConstVectorArray_OpenMP(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VWrmsNormVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int          i;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype     sum;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1531,14 +1531,14 @@ int N_VWrmsNormVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* W, realtype*
 
 
 int N_VWrmsNormMaskVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* W,
-                                      N_Vector id, realtype* nrm)
+                                      N_Vector id, sunrealtype* nrm)
 {
   int          i;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
-  realtype*    idd=NULL;
+  sunrealtype     sum;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    idd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -1589,14 +1589,14 @@ int N_VWrmsNormMaskVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_OpenMP(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_OpenMP(int nvec, int nsum, sunrealtype* a,
                                         N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j;
   sunindextype k, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   int          retval;
   N_Vector*   YY;
@@ -1698,7 +1698,7 @@ int N_VScaleAddMultiVectorArray_OpenMP(int nvec, int nsum, realtype* a,
 
 
 int N_VLinearCombinationVectorArray_OpenMP(int nvec, int nsum,
-                                           realtype* c,
+                                           sunrealtype* c,
                                            N_Vector** X,
                                            N_Vector* Z)
 {
@@ -1706,10 +1706,10 @@ int N_VLinearCombinationVectorArray_OpenMP(int nvec, int nsum,
   int          j; /* vector index in vector array     [0,nvec) */
   sunindextype k; /* element index in vector          [0,N)    */
   sunindextype N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*   Y;
 
   i = 0; /* initialize to suppress clang warning */
@@ -1757,7 +1757,7 @@ int N_VLinearCombinationVectorArray_OpenMP(int nvec, int nsum,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -1866,7 +1866,7 @@ int N_VLinearCombinationVectorArray_OpenMP(int nvec, int nsum,
 int N_VBufSize_OpenMP(N_Vector x, sunindextype *size)
 {
   if (x == NULL) return(-1);
-  *size = NV_LENGTH_OMP(x) * ((sunindextype)sizeof(realtype));
+  *size = NV_LENGTH_OMP(x) * ((sunindextype)sizeof(sunrealtype));
   return(0);
 }
 
@@ -1874,14 +1874,14 @@ int N_VBufSize_OpenMP(N_Vector x, sunindextype *size)
 int N_VBufPack_OpenMP(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LENGTH_OMP(x);
   xd = NV_DATA_OMP(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
 #pragma omp for schedule(static)
   for (i = 0; i < N; i++)
@@ -1894,14 +1894,14 @@ int N_VBufPack_OpenMP(N_Vector x, void *buf)
 int N_VBufUnpack_OpenMP(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LENGTH_OMP(x);
   xd = NV_DATA_OMP(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
 #pragma omp for schedule(static)
   for (i = 0; i < N; i++)
@@ -1925,7 +1925,7 @@ int N_VBufUnpack_OpenMP(N_Vector x, void *buf)
 static void VCopy_OpenMP(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -1950,7 +1950,7 @@ static void VCopy_OpenMP(N_Vector x, N_Vector z)
 static void VSum_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -1976,7 +1976,7 @@ static void VSum_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 static void VDiff_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -2002,7 +2002,7 @@ static void VDiff_OpenMP(N_Vector x, N_Vector y, N_Vector z)
 static void VNeg_OpenMP(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = zd = NULL;
@@ -2024,10 +2024,10 @@ static void VNeg_OpenMP(N_Vector x, N_Vector z)
  * Compute scaled vector sum
  */
 
-static void VScaleSum_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_OpenMP(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -2050,10 +2050,10 @@ static void VScaleSum_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z)
  * Compute scaled vector difference
  */
 
-static void VScaleDiff_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_OpenMP(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -2076,10 +2076,10 @@ static void VScaleDiff_OpenMP(realtype c, N_Vector x, N_Vector y, N_Vector z)
  * Compute vector sum z[i] = a*x[i]+y[i]
  */
 
-static void VLin1_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_OpenMP(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -2102,10 +2102,10 @@ static void VLin1_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z)
  * Compute vector difference z[i] = a*x[i]-y[i]
  */
 
-static void VLin2_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_OpenMP(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = zd = NULL;
@@ -2128,10 +2128,10 @@ static void VLin2_OpenMP(realtype a, N_Vector x, N_Vector y, N_Vector z)
  * Compute special cases of linear sum
  */
 
-static void Vaxpy_OpenMP(realtype a, N_Vector x, N_Vector y)
+static void Vaxpy_OpenMP(sunrealtype a, N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype *xd, *yd;
+  sunrealtype *xd, *yd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = yd = NULL;
@@ -2169,10 +2169,10 @@ static void Vaxpy_OpenMP(realtype a, N_Vector x, N_Vector y)
  * Compute scaled vector x[i] = a*x[i]
  */
 
-static void VScaleBy_OpenMP(realtype a, N_Vector x)
+static void VScaleBy_OpenMP(sunrealtype a, N_Vector x)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   i  = 0; /* initialize to suppress clang warning */
   xd = NULL;
@@ -2199,9 +2199,9 @@ static int VSumVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2228,9 +2228,9 @@ static int VDiffVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2253,13 +2253,13 @@ static int VDiffVectorArray_OpenMP(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
   return(0);
 }
 
-static int VScaleSumVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleSumVectorArray_OpenMP(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2282,13 +2282,13 @@ static int VScaleSumVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vect
   return(0);
 }
 
-static int VScaleDiffVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleDiffVectorArray_OpenMP(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2311,13 +2311,13 @@ static int VScaleDiffVectorArray_OpenMP(int nvec, realtype c, N_Vector* X, N_Vec
   return(0);
 }
 
-static int VLin1VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin1VectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2340,13 +2340,13 @@ static int VLin1VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector*
   return(0);
 }
 
-static int VLin2VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin2VectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2369,12 +2369,12 @@ static int VLin2VectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector*
   return(0);
 }
 
-static int VaxpyVectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector* Y)
+static int VaxpyVectorArray_OpenMP(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   i = 0; /* initialize to suppress clang warning */
   j = 0;
@@ -2432,7 +2432,7 @@ static int VaxpyVectorArray_OpenMP(int nvec, realtype a, N_Vector* X, N_Vector*
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2477,7 +2477,7 @@ int N_VEnableFusedOps_OpenMP(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2495,7 +2495,7 @@ int N_VEnableLinearCombination_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2513,7 +2513,7 @@ int N_VEnableScaleAddMulti_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2534,7 +2534,7 @@ int N_VEnableDotProdMulti_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2552,7 +2552,7 @@ int N_VEnableLinearSumVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2570,7 +2570,7 @@ int N_VEnableScaleVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2588,7 +2588,7 @@ int N_VEnableConstVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2606,7 +2606,7 @@ int N_VEnableWrmsNormVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2624,7 +2624,7 @@ int N_VEnableWrmsNormMaskVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2642,7 +2642,7 @@ int N_VEnableScaleAddMultiVectorArray_OpenMP(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_OpenMP(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/openmpdev/nvector_openmpdev.c b/src/nvector/openmpdev/nvector_openmpdev.c
index 3d4ccd8355..767d606aa1 100644
--- a/src/nvector/openmpdev/nvector_openmpdev.c
+++ b/src/nvector/openmpdev/nvector_openmpdev.c
@@ -28,31 +28,31 @@
 #include <nvector/nvector_openmpdev.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Private functions for special cases of vector operations */
 static void VCopy_OpenMPDEV(N_Vector x, N_Vector z);                              /* z=x       */
 static void VSum_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z);                   /* z=x+y     */
 static void VDiff_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z);                  /* z=x-y     */
 static void VNeg_OpenMPDEV(N_Vector x, N_Vector z);                               /* z=-x      */
-static void VScaleSum_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
-static void VScaleDiff_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
-static void VLin1_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
-static void VLin2_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
-static void Vaxpy_OpenMPDEV(realtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
-static void VScaleBy_OpenMPDEV(realtype a, N_Vector x);                           /* x <- ax   */
+static void VScaleSum_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
+static void VScaleDiff_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
+static void VLin1_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
+static void VLin2_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
+static void Vaxpy_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
+static void VScaleBy_OpenMPDEV(sunrealtype a, N_Vector x);                           /* x <- ax   */
 
 /* Private functions for special cases of vector array operations */
 static int VSumVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                   /* Z=X+Y     */
 static int VDiffVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                  /* Z=X-Y     */
-static int VScaleSumVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
-static int VScaleDiffVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
-static int VLin1VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
-static int VLin2VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
-static int VaxpyVectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
+static int VScaleSumVectorArray_OpenMPDEV(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
+static int VScaleDiffVectorArray_OpenMPDEV(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
+static int VLin1VectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
+static int VLin2VectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
+static int VaxpyVectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
 
 /*
  * -----------------------------------------------------------------
@@ -158,8 +158,8 @@ N_Vector N_VNewEmpty_OpenMPDEV(sunindextype length, SUNContext sunctx)
 N_Vector N_VNew_OpenMPDEV(sunindextype length)
 {
   N_Vector v;
-  realtype *data;
-  realtype *dev_data;
+  sunrealtype *data;
+  sunrealtype *dev_data;
   int dev;
 
   v = NULL;
@@ -174,12 +174,12 @@ N_Vector N_VNew_OpenMPDEV(sunindextype length)
 
     /* Allocate memory on host */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if (data == NULL) { N_VDestroy(v); return(NULL); }
 
     /* Allocate memory on device */
     dev = omp_get_default_device();
-    dev_data = omp_target_alloc(length * sizeof(realtype), dev);
+    dev_data = omp_target_alloc(length * sizeof(sunrealtype), dev);
     if (dev_data == NULL) { N_VDestroy(v); return(NULL); }
 
     /* Attach data */
@@ -195,8 +195,8 @@ N_Vector N_VNew_OpenMPDEV(sunindextype length)
  * Function to create a vector with user data component
  */
 
-N_Vector N_VMake_OpenMPDEV(sunindextype length, realtype *h_vdata,
-                           realtype *d_vdata)
+N_Vector N_VMake_OpenMPDEV(sunindextype length, sunrealtype *h_vdata,
+                           sunrealtype *d_vdata)
 {
   N_Vector v;
   int dev, host;
@@ -241,17 +241,17 @@ sunindextype N_VGetLength_OpenMPDEV(N_Vector v)
 /* ----------------------------------------------------------------------------
  * Function to return a pointer to the data array on the host.
  */
-realtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v)
+sunrealtype *N_VGetHostArrayPointer_OpenMPDEV(N_Vector v)
 {
-  return((realtype *) NV_DATA_HOST_OMPDEV(v));
+  return((sunrealtype *) NV_DATA_HOST_OMPDEV(v));
 }
 
 /* ----------------------------------------------------------------------------
  * Function to return a pointer to the data array on the device.
  */
-realtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v)
+sunrealtype *N_VGetDeviceArrayPointer_OpenMPDEV(N_Vector v)
 {
-  return((realtype *) NV_DATA_DEV_OMPDEV(v));
+  return((sunrealtype *) NV_DATA_DEV_OMPDEV(v));
 }
 
 /* ----------------------------------------------------------------------------
@@ -270,7 +270,7 @@ void N_VPrint_OpenMPDEV(N_Vector x)
 void N_VPrintFile_OpenMPDEV(N_Vector x, FILE *outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -299,8 +299,8 @@ void N_VCopyToDevice_OpenMPDEV(N_Vector x)
 {
   int dev, host;
   sunindextype length;
-  realtype *host_ptr;
-  realtype *dev_ptr;
+  sunrealtype *host_ptr;
+  sunrealtype *dev_ptr;
 
   /* Get array information */
   length   = NV_LENGTH_OMPDEV(x);
@@ -312,7 +312,7 @@ void N_VCopyToDevice_OpenMPDEV(N_Vector x)
   host = omp_get_initial_device();
 
   /* Copy array from host to device */
-  omp_target_memcpy(dev_ptr, host_ptr, sizeof(realtype) * length, 0, 0, dev, host);
+  omp_target_memcpy(dev_ptr, host_ptr, sizeof(sunrealtype) * length, 0, 0, dev, host);
 
   return;
 }
@@ -325,8 +325,8 @@ void N_VCopyFromDevice_OpenMPDEV(N_Vector x)
 {
   int dev, host;
   sunindextype length;
-  realtype *host_ptr;
-  realtype *dev_ptr;
+  sunrealtype *host_ptr;
+  sunrealtype *dev_ptr;
 
   /* Get array information */
   length   = NV_LENGTH_OMPDEV(x);
@@ -338,7 +338,7 @@ void N_VCopyFromDevice_OpenMPDEV(N_Vector x)
   host = omp_get_initial_device();
 
   /* Copy array from device to host */
-  omp_target_memcpy(host_ptr, dev_ptr, sizeof(realtype) * length, 0, 0, host, dev);
+  omp_target_memcpy(host_ptr, dev_ptr, sizeof(sunrealtype) * length, 0, 0, host, dev);
 
   return;
 }
@@ -395,8 +395,8 @@ N_Vector N_VCloneEmpty_OpenMPDEV(N_Vector w)
 N_Vector N_VClone_OpenMPDEV(N_Vector w)
 {
   N_Vector v;
-  realtype *data;
-  realtype *dev_data;
+  sunrealtype *data;
+  sunrealtype *dev_data;
   sunindextype length;
   int dev;
 
@@ -414,12 +414,12 @@ N_Vector N_VClone_OpenMPDEV(N_Vector w)
 
     /* Allocate memory on host */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if (data == NULL) { N_VDestroy(v); return(NULL); }
 
     /* Allocate memory on device */
     dev = omp_get_default_device();
-    dev_data = omp_target_alloc(length * sizeof(realtype), dev);
+    dev_data = omp_target_alloc(length * sizeof(sunrealtype), dev);
     if (dev_data == NULL) { N_VDestroy(v); return(NULL); }
 
     /* Attach data */
@@ -486,12 +486,12 @@ void N_VSpace_OpenMPDEV(N_Vector v, sunindextype *lrw, sunindextype *liw)
  * Compute linear combination z[i] = a*x[i]+b*y[i]
  */
 
-void N_VLinearSum_OpenMPDEV(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_OpenMPDEV(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype c, *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype c, *xd_dev, *yd_dev, *zd_dev;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -584,10 +584,10 @@ void N_VLinearSum_OpenMPDEV(realtype a, N_Vector x, realtype b, N_Vector y, N_Ve
  * Assigns constant value to all vector elements, z[i] = c
  */
 
-void N_VConst_OpenMPDEV(realtype c, N_Vector z)
+void N_VConst_OpenMPDEV(sunrealtype c, N_Vector z)
 {
   sunindextype i, N;
-  realtype *zd_dev;
+  sunrealtype *zd_dev;
   int dev;
 
   zd_dev = NULL;
@@ -612,7 +612,7 @@ void N_VConst_OpenMPDEV(realtype c, N_Vector z)
 void N_VProd_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -641,7 +641,7 @@ void N_VProd_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -667,10 +667,10 @@ void N_VDiv_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
  * Compute scaler multiplication z[i] = c*x[i]
  */
 
-void N_VScale_OpenMPDEV(realtype c, N_Vector x, N_Vector z)
+void N_VScale_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -709,7 +709,7 @@ void N_VScale_OpenMPDEV(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_OpenMPDEV(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -737,7 +737,7 @@ void N_VAbs_OpenMPDEV(N_Vector x, N_Vector z)
 void N_VInv_OpenMPDEV(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -762,10 +762,10 @@ void N_VInv_OpenMPDEV(N_Vector x, N_Vector z)
  * Compute componentwise addition of a scaler to a vector z[i] = x[i] + b
  */
 
-void N_VAddConst_OpenMPDEV(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_OpenMPDEV(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -790,10 +790,10 @@ void N_VAddConst_OpenMPDEV(N_Vector x, realtype b, N_Vector z)
  * Computes the dot product of two vectors, a = sum(x[i]*y[i])
  */
 
-realtype N_VDotProd_OpenMPDEV(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_OpenMPDEV(N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype sum, *xd_dev, *yd_dev;
+  sunrealtype sum, *xd_dev, *yd_dev;
   int dev;
 
   xd_dev = yd_dev = NULL;
@@ -821,10 +821,10 @@ realtype N_VDotProd_OpenMPDEV(N_Vector x, N_Vector y)
  * Computes max norm of a vector
  */
 
-realtype N_VMaxNorm_OpenMPDEV(N_Vector x)
+sunrealtype N_VMaxNorm_OpenMPDEV(N_Vector x)
 {
   sunindextype i, N;
-  realtype max, *xd_dev;
+  sunrealtype max, *xd_dev;
   int dev;
 
   max = ZERO;
@@ -850,7 +850,7 @@ realtype N_VMaxNorm_OpenMPDEV(N_Vector x)
  * Computes weighted root mean square norm of a vector
  */
 
-realtype N_VWrmsNorm_OpenMPDEV(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_OpenMPDEV(N_Vector x, N_Vector w)
 {
   return(SUNRsqrt(N_VWSqrSumLocal_OpenMPDEV(x, w)/(NV_LENGTH_OMPDEV(x))));
 }
@@ -860,7 +860,7 @@ realtype N_VWrmsNorm_OpenMPDEV(N_Vector x, N_Vector w)
  * Computes weighted root mean square norm of a masked vector
  */
 
-realtype N_VWrmsNormMask_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
 {
   return(SUNRsqrt(N_VWSqrSumMaskLocal_OpenMPDEV(x, w, id) / (NV_LENGTH_OMPDEV(x))));
 }
@@ -870,10 +870,10 @@ realtype N_VWrmsNormMask_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
  * Computes weighted square sum of a vector
  */
 
-realtype N_VWSqrSumLocal_OpenMPDEV(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_OpenMPDEV(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, *xd_dev, *wd_dev;
+  sunrealtype sum, *xd_dev, *wd_dev;
   int dev;
 
   sum = ZERO;
@@ -900,10 +900,10 @@ realtype N_VWSqrSumLocal_OpenMPDEV(N_Vector x, N_Vector w)
  * Computes weighted square sum of a masked vector
  */
 
-realtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, *xd_dev, *wd_dev, *idd_dev;
+  sunrealtype sum, *xd_dev, *wd_dev, *idd_dev;
   int dev;
 
   sum = ZERO;
@@ -933,10 +933,10 @@ realtype N_VWSqrSumMaskLocal_OpenMPDEV(N_Vector x, N_Vector w, N_Vector id)
  * Finds the minimun component of a vector
  */
 
-realtype N_VMin_OpenMPDEV(N_Vector x)
+sunrealtype N_VMin_OpenMPDEV(N_Vector x)
 {
   sunindextype i, N;
-  realtype min, *xd_dev;
+  sunrealtype min, *xd_dev;
   int dev;
 
   xd_dev = NULL;
@@ -965,10 +965,10 @@ realtype N_VMin_OpenMPDEV(N_Vector x)
  * Computes weighted L2 norm of a vector
  */
 
-realtype N_VWL2Norm_OpenMPDEV(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_OpenMPDEV(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, *xd_dev, *wd_dev;
+  sunrealtype sum, *xd_dev, *wd_dev;
   int dev;
 
   sum = ZERO;
@@ -995,10 +995,10 @@ realtype N_VWL2Norm_OpenMPDEV(N_Vector x, N_Vector w)
  * Computes L1 norm of a vector
  */
 
-realtype N_VL1Norm_OpenMPDEV(N_Vector x)
+sunrealtype N_VL1Norm_OpenMPDEV(N_Vector x)
 {
   sunindextype i, N;
-  realtype sum, *xd_dev;
+  sunrealtype sum, *xd_dev;
   int dev;
 
   sum = ZERO;
@@ -1023,10 +1023,10 @@ realtype N_VL1Norm_OpenMPDEV(N_Vector x)
  * Compare vector component values to a scaler
  */
 
-void N_VCompare_OpenMPDEV(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -1051,10 +1051,10 @@ void N_VCompare_OpenMPDEV(realtype c, N_Vector x, N_Vector z)
  * Compute componentwise inverse z[i] = ONE/x[i] and checks if x[i] == ZERO
  */
 
-booleantype N_VInvTest_OpenMPDEV(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_OpenMPDEV(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev, val;
+  sunrealtype *xd_dev, *zd_dev, val;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -1088,11 +1088,11 @@ booleantype N_VInvTest_OpenMPDEV(N_Vector x, N_Vector z)
  * Compute constraint mask of a vector
  */
 
-booleantype N_VConstrMask_OpenMPDEV(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_OpenMPDEV(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i, N;
-  realtype temp;
-  realtype *cd_dev, *xd_dev, *md_dev;
+  sunrealtype temp;
+  sunrealtype *cd_dev, *xd_dev, *md_dev;
   int dev;
 
   cd_dev = xd_dev = md_dev = NULL;
@@ -1130,10 +1130,10 @@ booleantype N_VConstrMask_OpenMPDEV(N_Vector c, N_Vector x, N_Vector m)
  * Compute minimum componentwise quotient
  */
 
-realtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom)
 {
   sunindextype i, N;
-  realtype *nd_dev, *dd_dev, min;
+  sunrealtype *nd_dev, *dd_dev, min;
   int dev;
 
   nd_dev = dd_dev = NULL;
@@ -1145,7 +1145,7 @@ realtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom)
   /* get default device identifier */
   dev = omp_get_default_device();
 
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
 #pragma omp target map(tofrom:min) is_device_ptr(nd_dev, dd_dev) device(dev)
 #pragma omp teams distribute parallel for reduction(min:min) schedule(static, 1)
@@ -1162,14 +1162,14 @@ realtype N_VMinQuotient_OpenMPDEV(N_Vector num, N_Vector denom)
  * -----------------------------------------------------------------
  */
 
-int N_VLinearCombination_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_OpenMPDEV(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int          i, dev;
-  realtype     to_add; /* temporary variable to hold sum being added in atomic operation */
+  sunrealtype     to_add; /* temporary variable to hold sum being added in atomic operation */
   sunindextype j, N;
-  realtype*    zd_dev=NULL;
-  realtype*    xd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1194,7 +1194,7 @@ int N_VLinearCombination_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector
   dev = omp_get_default_device();
 
   /* Allocate and store X dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
 
@@ -1281,15 +1281,15 @@ int N_VLinearCombination_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector
   return(0);
 }
 
-int N_VScaleAddMulti_OpenMPDEV(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_OpenMPDEV(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1308,7 +1308,7 @@ int N_VScaleAddMulti_OpenMPDEV(int nvec, realtype* a, N_Vector x, N_Vector* Y, N
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     yd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(Y[i]);
 
@@ -1332,7 +1332,7 @@ int N_VScaleAddMulti_OpenMPDEV(int nvec, realtype* a, N_Vector x, N_Vector* Y, N
   }
 
   /* Allocate and store dev pointers to copy to device */
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     zd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(Z[i]);
 
@@ -1356,14 +1356,14 @@ int N_VScaleAddMulti_OpenMPDEV(int nvec, realtype* a, N_Vector x, N_Vector* Y, N
   return(0);
 }
 
-int N_VDotProdMulti_OpenMPDEV(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_OpenMPDEV(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype**   yd_dev_ptrs=NULL;
+  sunrealtype     sum;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1387,7 +1387,7 @@ int N_VDotProdMulti_OpenMPDEV(int nvec, N_Vector x, N_Vector* Y, realtype* dotpr
   }
 
   /* Allocate and store dev pointers to copy to device */
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     yd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(Y[i]);
 
@@ -1416,22 +1416,22 @@ int N_VDotProdMulti_OpenMPDEV(int nvec, N_Vector x, N_Vector* Y, realtype* dotpr
  */
 
 int N_VLinearSumVectorArray_OpenMPDEV(int nvec,
-                                     realtype a, N_Vector* X,
-                                     realtype b, N_Vector* Y,
+                                     sunrealtype a, N_Vector* X,
+                                     sunrealtype b, N_Vector* Y,
                                      N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
   N_Vector*    V1;
   N_Vector*    V2;
-  booleantype  test;
-  realtype     c;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunbooleantype  test;
+  sunrealtype     c;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1505,9 +1505,9 @@ int N_VLinearSumVectorArray_OpenMPDEV(int nvec,
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -1536,14 +1536,14 @@ int N_VLinearSumVectorArray_OpenMPDEV(int nvec,
   return(0);
 }
 
-int N_VScaleVectorArray_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_OpenMPDEV(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1561,7 +1561,7 @@ int N_VScaleVectorArray_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector*
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++) {
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   }
@@ -1586,7 +1586,7 @@ int N_VScaleVectorArray_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector*
   }
 
   /* Allocate and store dev pointers to copy to device */
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     zd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(Z[i]);
 
@@ -1610,12 +1610,12 @@ int N_VScaleVectorArray_OpenMPDEV(int nvec, realtype* c, N_Vector* X, N_Vector*
   return(0);
 }
 
-int N_VConstVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_OpenMPDEV(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    zd_dev=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1633,7 +1633,7 @@ int N_VConstVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* Z)
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     zd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(Z[i]);
 
@@ -1654,15 +1654,15 @@ int N_VConstVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* Z)
   return(0);
 }
 
-int N_VWrmsNormVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    wd_dev=NULL;
-  realtype*    xd_dev=NULL;
-  realtype**   wd_dev_ptrs=NULL;
-  realtype**   xd_dev_ptrs=NULL;
+  sunrealtype     sum;
+  sunrealtype*    wd_dev=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype**   wd_dev_ptrs=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1684,8 +1684,8 @@ int N_VWrmsNormVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W, realtyp
     nrm[i] = ZERO;
 
   /* Allocate and store dev pointers to copy to device */
-  wd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  wd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     wd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(W[i]);
   for (i=0; i<nvec; i++)
@@ -1716,16 +1716,16 @@ int N_VWrmsNormVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W, realtyp
 
 
 int N_VWrmsNormMaskVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W,
-                                        N_Vector id, realtype* nrm)
+                                        N_Vector id, sunrealtype* nrm)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype     sum;
-  realtype*    wd_dev=NULL;
-  realtype*    xd_dev=NULL;
-  realtype*    idd_dev=NULL;
-  realtype**   wd_dev_ptrs=NULL;
-  realtype**   xd_dev_ptrs=NULL;
+  sunrealtype     sum;
+  sunrealtype*    wd_dev=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    idd_dev=NULL;
+  sunrealtype**   wd_dev_ptrs=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1748,8 +1748,8 @@ int N_VWrmsNormMaskVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W,
     nrm[i] = ZERO;
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  wd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  wd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -1780,17 +1780,17 @@ int N_VWrmsNormMaskVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* W,
   return(0);
 }
 
-int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum, sunrealtype* a,
                                           N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j, dev;
   sunindextype k, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   int          retval;
   N_Vector*    YY;
@@ -1849,8 +1849,8 @@ int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum, realtype* a,
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * nsum * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * nsum * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++) {
@@ -1882,7 +1882,7 @@ int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum, realtype* a,
   }
 
   /* Allocate and store dev pointers to copy to device */
-  zd_dev_ptrs = (realtype**) malloc(nvec * nsum * sizeof(realtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * nsum * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++) {
     for (j=0; j<nsum; j++)
       zd_dev_ptrs[i * nsum + j] = NV_DATA_DEV_OMPDEV(Z[j][i]);
@@ -1914,7 +1914,7 @@ int N_VScaleAddMultiVectorArray_OpenMPDEV(int nvec, int nsum, realtype* a,
 }
 
 int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
-                                             realtype* c,
+                                             sunrealtype* c,
                                              N_Vector** X,
                                              N_Vector* Z)
 {
@@ -1922,13 +1922,13 @@ int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
   int          j; /* vector index in vector array     [0,nvec) */
   sunindextype k; /* element index in vector          [0,N)    */
   sunindextype N;
-  realtype*    zd_dev=NULL;
-  realtype*    xd_dev=NULL;
-  realtype**   zd_dev_ptrs=NULL;
-  realtype**   xd_dev_ptrs=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
   int dev;
 
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*    Y;
 
   /* invalid number of vectors */
@@ -1973,7 +1973,7 @@ int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -2002,8 +2002,8 @@ int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  xd_dev_ptrs = (realtype**) malloc(nvec * nsum * sizeof(realtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * nsum * sizeof(sunrealtype*));
   for (j=0; j<nvec; j++)
     zd_dev_ptrs[j] = NV_DATA_DEV_OMPDEV(Z[j]);
   for (j=0; j<nvec; j++) {
@@ -2105,7 +2105,7 @@ int N_VLinearCombinationVectorArray_OpenMPDEV(int nvec, int nsum,
 static void VCopy_OpenMPDEV(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -2133,7 +2133,7 @@ static void VCopy_OpenMPDEV(N_Vector x, N_Vector z)
 static void VSum_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2162,7 +2162,7 @@ static void VSum_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 static void VDiff_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2191,7 +2191,7 @@ static void VDiff_OpenMPDEV(N_Vector x, N_Vector y, N_Vector z)
 static void VNeg_OpenMPDEV(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *zd_dev;
+  sunrealtype *xd_dev, *zd_dev;
   int dev;
 
   xd_dev = zd_dev = NULL;
@@ -2216,10 +2216,10 @@ static void VNeg_OpenMPDEV(N_Vector x, N_Vector z)
  * Compute scaled vector sum
  */
 
-static void VScaleSum_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2245,10 +2245,10 @@ static void VScaleSum_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z)
  * Compute scaled vector difference
  */
 
-static void VScaleDiff_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_OpenMPDEV(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2274,10 +2274,10 @@ static void VScaleDiff_OpenMPDEV(realtype c, N_Vector x, N_Vector y, N_Vector z)
  * Compute vector sum z[i] = a*x[i]+y[i]
  */
 
-static void VLin1_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2303,10 +2303,10 @@ static void VLin1_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z)
  * Compute vector difference z[i] = a*x[i]-y[i]
  */
 
-static void VLin2_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev, *zd_dev;
+  sunrealtype *xd_dev, *yd_dev, *zd_dev;
   int dev;
 
   xd_dev = yd_dev = zd_dev = NULL;
@@ -2332,10 +2332,10 @@ static void VLin2_OpenMPDEV(realtype a, N_Vector x, N_Vector y, N_Vector z)
  * Compute special cases of linear sum
  */
 
-static void Vaxpy_OpenMPDEV(realtype a, N_Vector x, N_Vector y)
+static void Vaxpy_OpenMPDEV(sunrealtype a, N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype *xd_dev, *yd_dev;
+  sunrealtype *xd_dev, *yd_dev;
   int dev;
 
   xd_dev = yd_dev = NULL;
@@ -2376,10 +2376,10 @@ static void Vaxpy_OpenMPDEV(realtype a, N_Vector x, N_Vector y)
  * Compute scaled vector x[i] = a*x[i]
  */
 
-static void VScaleBy_OpenMPDEV(realtype a, N_Vector x)
+static void VScaleBy_OpenMPDEV(sunrealtype a, N_Vector x)
 {
   sunindextype i, N;
-  realtype *xd_dev;
+  sunrealtype *xd_dev;
   int dev;
 
   xd_dev = NULL;
@@ -2409,12 +2409,12 @@ static int VSumVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vecto
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2422,9 +2422,9 @@ static int VSumVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vecto
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2456,12 +2456,12 @@ static int VDiffVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vect
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2469,9 +2469,9 @@ static int VDiffVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vect
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2499,16 +2499,16 @@ static int VDiffVectorArray_OpenMPDEV(int nvec, N_Vector* X, N_Vector* Y, N_Vect
   return(0);
 }
 
-static int VScaleSumVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleSumVectorArray_OpenMPDEV(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2516,9 +2516,9 @@ static int VScaleSumVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_V
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2546,16 +2546,16 @@ static int VScaleSumVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_V
   return(0);
 }
 
-static int VScaleDiffVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleDiffVectorArray_OpenMPDEV(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2563,9 +2563,9 @@ static int VScaleDiffVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_
   dev = omp_get_default_device();
 
   /* Allocate and store dev ointer to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2593,16 +2593,16 @@ static int VScaleDiffVectorArray_OpenMPDEV(int nvec, realtype c, N_Vector* X, N_
   return(0);
 }
 
-static int VLin1VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin1VectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2610,9 +2610,9 @@ static int VLin1VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2640,16 +2640,16 @@ static int VLin1VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
   return(0);
 }
 
-static int VLin2VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin2VectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype*    zd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
-  realtype**   zd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype*    zd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
+  sunrealtype**   zd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2657,9 +2657,9 @@ static int VLin2VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  zd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  zd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2687,14 +2687,14 @@ static int VLin2VectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
   return(0);
 }
 
-static int VaxpyVectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vector* Y)
+static int VaxpyVectorArray_OpenMPDEV(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y)
 {
   int          i, dev;
   sunindextype j, N;
-  realtype*    xd_dev=NULL;
-  realtype*    yd_dev=NULL;
-  realtype**   xd_dev_ptrs=NULL;
-  realtype**   yd_dev_ptrs=NULL;
+  sunrealtype*    xd_dev=NULL;
+  sunrealtype*    yd_dev=NULL;
+  sunrealtype**   xd_dev_ptrs=NULL;
+  sunrealtype**   yd_dev_ptrs=NULL;
 
   N = NV_LENGTH_OMPDEV(X[0]);
 
@@ -2702,8 +2702,8 @@ static int VaxpyVectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
   dev = omp_get_default_device();
 
   /* Allocate and store dev pointers to copy to device */
-  xd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
-  yd_dev_ptrs = (realtype**) malloc(nvec * sizeof(realtype*));
+  xd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
+  yd_dev_ptrs = (sunrealtype**) malloc(nvec * sizeof(sunrealtype*));
   for (i=0; i<nvec; i++)
     xd_dev_ptrs[i] = NV_DATA_DEV_OMPDEV(X[i]);
   for (i=0; i<nvec; i++)
@@ -2769,7 +2769,7 @@ static int VaxpyVectorArray_OpenMPDEV(int nvec, realtype a, N_Vector* X, N_Vecto
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2814,7 +2814,7 @@ int N_VEnableFusedOps_OpenMPDEV(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2832,7 +2832,7 @@ int N_VEnableLinearCombination_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2850,7 +2850,7 @@ int N_VEnableScaleAddMulti_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2871,7 +2871,7 @@ int N_VEnableDotProdMulti_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2889,7 +2889,7 @@ int N_VEnableLinearSumVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2907,7 +2907,7 @@ int N_VEnableScaleVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2925,7 +2925,7 @@ int N_VEnableConstVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2943,7 +2943,7 @@ int N_VEnableWrmsNormVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2961,7 +2961,7 @@ int N_VEnableWrmsNormMaskVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2979,7 +2979,7 @@ int N_VEnableScaleAddMultiVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_OpenMPDEV(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/parallel/fmod/fnvector_parallel_mod.c b/src/nvector/parallel/fmod/fnvector_parallel_mod.c
index c2668e3c4c..12a91f0714 100644
--- a/src/nvector/parallel/fmod/fnvector_parallel_mod.c
+++ b/src/nvector/parallel/fmod/fnvector_parallel_mod.c
@@ -257,7 +257,7 @@ SWIGEXPORT N_Vector _wrap_FN_VMake_Parallel(int const *farg1, int64_t const *far
   MPI_Comm arg1 ;
   sunindextype arg2 ;
   sunindextype arg3 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   SUNContext arg5 = (SUNContext) 0 ;
   N_Vector result;
   
@@ -268,7 +268,7 @@ SWIGEXPORT N_Vector _wrap_FN_VMake_Parallel(int const *farg1, int64_t const *far
 #endif
   arg2 = (sunindextype)(*farg2);
   arg3 = (sunindextype)(*farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   arg5 = (SUNContext)(farg5);
   result = (N_Vector)N_VMake_Parallel(arg1,arg2,arg3,arg4,arg5);
   fresult = result;
@@ -375,10 +375,10 @@ SWIGEXPORT void _wrap_FN_VSpace_Parallel(N_Vector farg1, int64_t *farg2, int64_t
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer_Parallel(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer_Parallel(arg1,arg2);
 }
@@ -397,15 +397,15 @@ SWIGEXPORT void * _wrap_FN_VGetCommunicator_Parallel(N_Vector farg1) {
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_Parallel(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_Parallel(arg1,arg2,arg3,arg4,arg5);
@@ -413,10 +413,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_Parallel(double const *farg1, N_Vector farg2
 
 
 SWIGEXPORT void _wrap_FN_VConst_Parallel(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_Parallel(arg1,arg2);
 }
@@ -447,11 +447,11 @@ SWIGEXPORT void _wrap_FN_VDiv_Parallel(N_Vector farg1, N_Vector farg2, N_Vector
 
 
 SWIGEXPORT void _wrap_FN_VScale_Parallel(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_Parallel(arg1,arg2,arg3);
@@ -480,11 +480,11 @@ SWIGEXPORT void _wrap_FN_VInv_Parallel(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_Parallel(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_Parallel(arg1,arg2,arg3);
 }
@@ -494,12 +494,12 @@ SWIGEXPORT double _wrap_FN_VDotProd_Parallel(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -507,11 +507,11 @@ SWIGEXPORT double _wrap_FN_VDotProd_Parallel(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNorm_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -520,12 +520,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_Parallel(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -535,13 +535,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Parallel(N_Vector farg1, N_Vector farg2
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_Parallel(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_Parallel(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -549,11 +549,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Parallel(N_Vector farg1, N_Vector farg2
 SWIGEXPORT double _wrap_FN_VMin_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -562,12 +562,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Parallel(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -575,21 +575,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Parallel(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VL1Norm_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_Parallel(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_Parallel(arg1,arg2,arg3);
@@ -630,12 +630,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Parallel(N_Vector farg1, N_Vector farg2)
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -643,13 +643,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Parallel(N_Vector farg1, N_Vector farg2)
 SWIGEXPORT int _wrap_FN_VLinearCombination_Parallel(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_Parallel(arg1,arg2,arg3,arg4);
@@ -661,14 +661,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_Parallel(int const *farg1, double *fa
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_Parallel(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -683,13 +683,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Parallel(int const *farg1, N_Vector farg2,
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_Parallel(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -699,17 +699,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Parallel(int const *farg1, N_Vector farg2,
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Parallel(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_Parallel(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -721,13 +721,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Parallel(int const *farg1, double
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_Parallel(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_Parallel(arg1,arg2,arg3,arg4);
@@ -739,12 +739,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_Parallel(int const *farg1, double *far
 SWIGEXPORT int _wrap_FN_VConstVectorArray_Parallel(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_Parallel(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -757,13 +757,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_Parallel(int const *farg1, void *fa
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_Parallel(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -776,14 +776,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_Parallel(int const *farg1, void
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_Parallel(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -794,12 +794,12 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_Parallel(N_Vector farg1, N_Vector farg2
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProdLocal_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProdLocal_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -807,11 +807,11 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal_Parallel(N_Vector farg1, N_Vector farg2
 SWIGEXPORT double _wrap_FN_VMaxNormLocal_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNormLocal_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNormLocal_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -819,11 +819,11 @@ SWIGEXPORT double _wrap_FN_VMaxNormLocal_Parallel(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VMinLocal_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMinLocal_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinLocal_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -831,11 +831,11 @@ SWIGEXPORT double _wrap_FN_VMinLocal_Parallel(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VL1NormLocal_Parallel(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1NormLocal_Parallel(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1NormLocal_Parallel(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -844,12 +844,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_Parallel(N_Vector farg1, N_Vector farg2
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -859,13 +859,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_Parallel(N_Vector farg1, N_Vector f
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_Parallel(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_Parallel(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -904,12 +904,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotientLocal_Parallel(N_Vector farg1, N_Vector f
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotientLocal_Parallel(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotientLocal_Parallel(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -919,13 +919,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiLocal_Parallel(int const *farg1, N_Vector f
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMultiLocal_Parallel(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -936,12 +936,12 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiAllReduce_Parallel(int const *farg1, N_Vect
   int fresult ;
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)N_VDotProdMultiAllReduce_Parallel(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1134,10 +1134,10 @@ SWIGEXPORT int _wrap_FN_VEnableDotProdMultiLocal_Parallel(N_Vector farg1, int co
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Parallel(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Parallel(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Parallel(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/parallel/nvector_parallel.c b/src/nvector/parallel/nvector_parallel.c
index 097e2cd1ee..5d7d6b16c5 100644
--- a/src/nvector/parallel/nvector_parallel.c
+++ b/src/nvector/parallel/nvector_parallel.c
@@ -22,31 +22,31 @@
 #include <nvector/nvector_parallel.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Private functions for special cases of vector operations */
 static void VCopy_Parallel(N_Vector x, N_Vector z);                              /* z=x       */
 static void VSum_Parallel(N_Vector x, N_Vector y, N_Vector z);                   /* z=x+y     */
 static void VDiff_Parallel(N_Vector x, N_Vector y, N_Vector z);                  /* z=x-y     */
 static void VNeg_Parallel(N_Vector x, N_Vector z);                               /* z=-x      */
-static void VScaleSum_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
-static void VScaleDiff_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
-static void VLin1_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
-static void VLin2_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
-static void Vaxpy_Parallel(realtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
-static void VScaleBy_Parallel(realtype a, N_Vector x);                           /* x <- ax   */
+static void VScaleSum_Parallel(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
+static void VScaleDiff_Parallel(sunrealtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
+static void VLin1_Parallel(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
+static void VLin2_Parallel(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
+static void Vaxpy_Parallel(sunrealtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
+static void VScaleBy_Parallel(sunrealtype a, N_Vector x);                           /* x <- ax   */
 
 /* Private functions for special cases of vector array operations */
 static int VSumVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                   /* Z=X+Y     */
 static int VDiffVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                  /* Z=X-Y     */
-static int VScaleSumVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
-static int VScaleDiffVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
-static int VLin1VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
-static int VLin2VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
-static int VaxpyVectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
+static int VScaleSumVectorArray_Parallel(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
+static int VScaleDiffVectorArray_Parallel(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
+static int VLin1VectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
+static int VLin2VectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
+static int VaxpyVectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y);                   /* Y <- aX+Y */
 
 /* Error Message */
 #define BAD_N1 "N_VNew_Parallel -- Sum of local vector lengths differs from "
@@ -184,7 +184,7 @@ N_Vector N_VNew_Parallel(MPI_Comm comm,
                          SUNContext sunctx)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
 
   v = NULL;
   v = N_VNewEmpty_Parallel(comm, local_length, global_length, sunctx);
@@ -195,7 +195,7 @@ N_Vector N_VNew_Parallel(MPI_Comm comm,
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(local_length * sizeof(realtype));
+    data = (sunrealtype *) malloc(local_length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Parallel(v); return(NULL); }
 
     /* Attach data */
@@ -214,7 +214,7 @@ N_Vector N_VNew_Parallel(MPI_Comm comm,
 N_Vector N_VMake_Parallel(MPI_Comm comm,
                           sunindextype local_length,
                           sunindextype global_length,
-                          realtype *v_data,
+                          sunrealtype *v_data,
                           SUNContext sunctx)
 {
   N_Vector v;
@@ -275,7 +275,7 @@ void N_VPrint_Parallel(N_Vector x)
 void N_VPrintFile_Parallel(N_Vector x, FILE* outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -338,7 +338,7 @@ N_Vector N_VCloneEmpty_Parallel(N_Vector w)
 N_Vector N_VClone_Parallel(N_Vector w)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
   sunindextype local_length;
 
   v = NULL;
@@ -352,7 +352,7 @@ N_Vector N_VClone_Parallel(N_Vector w)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(local_length * sizeof(realtype));
+    data = (sunrealtype *) malloc(local_length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Parallel(v); return(NULL); }
 
     /* Attach data */
@@ -398,12 +398,12 @@ void N_VSpace_Parallel(N_Vector v, sunindextype *lrw, sunindextype *liw)
   return;
 }
 
-realtype *N_VGetArrayPointer_Parallel(N_Vector v)
+sunrealtype *N_VGetArrayPointer_Parallel(N_Vector v)
 {
-  return((realtype *) NV_DATA_P(v));
+  return((sunrealtype *) NV_DATA_P(v));
 }
 
-void N_VSetArrayPointer_Parallel(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_Parallel(sunrealtype *v_data, N_Vector v)
 {
   if (NV_LOCLENGTH_P(v) > 0) NV_DATA_P(v) = v_data;
 
@@ -415,12 +415,12 @@ void *N_VGetCommunicator_Parallel(N_Vector v)
   return((void *) &(NV_COMM_P(v)));
 }
 
-void N_VLinearSum_Parallel(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Parallel(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype c, *xd, *yd, *zd;
+  sunrealtype c, *xd, *yd, *zd;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
 
   xd = yd = zd = NULL;
 
@@ -502,10 +502,10 @@ void N_VLinearSum_Parallel(realtype a, N_Vector x, realtype b, N_Vector y, N_Vec
   return;
 }
 
-void N_VConst_Parallel(realtype c, N_Vector z)
+void N_VConst_Parallel(sunrealtype c, N_Vector z)
 {
   sunindextype i, N;
-  realtype *zd;
+  sunrealtype *zd;
 
   zd = NULL;
 
@@ -520,7 +520,7 @@ void N_VConst_Parallel(realtype c, N_Vector z)
 void N_VProd_Parallel(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -538,7 +538,7 @@ void N_VProd_Parallel(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_Parallel(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -553,10 +553,10 @@ void N_VDiv_Parallel(N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-void N_VScale_Parallel(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Parallel(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -583,7 +583,7 @@ void N_VScale_Parallel(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_Parallel(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -600,7 +600,7 @@ void N_VAbs_Parallel(N_Vector x, N_Vector z)
 void N_VInv_Parallel(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -614,10 +614,10 @@ void N_VInv_Parallel(N_Vector x, N_Vector z)
   return;
 }
 
-void N_VAddConst_Parallel(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Parallel(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -630,10 +630,10 @@ void N_VAddConst_Parallel(N_Vector x, realtype b, N_Vector z)
   return;
 }
 
-realtype N_VDotProdLocal_Parallel(N_Vector x, N_Vector y)
+sunrealtype N_VDotProdLocal_Parallel(N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype sum, *xd, *yd;
+  sunrealtype sum, *xd, *yd;
 
   sum = ZERO;
   xd = yd = NULL;
@@ -646,18 +646,18 @@ realtype N_VDotProdLocal_Parallel(N_Vector x, N_Vector y)
   return(sum);
 }
 
-realtype N_VDotProd_Parallel(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Parallel(N_Vector x, N_Vector y)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VDotProdLocal_Parallel(x,y);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_P(x));
   return(gsum);
 }
 
-realtype N_VMaxNormLocal_Parallel(N_Vector x)
+sunrealtype N_VMaxNormLocal_Parallel(N_Vector x)
 {
   sunindextype i, N;
-  realtype max, *xd;
+  sunrealtype max, *xd;
 
   xd = NULL;
 
@@ -672,18 +672,18 @@ realtype N_VMaxNormLocal_Parallel(N_Vector x)
   return(max);
 }
 
-realtype N_VMaxNorm_Parallel(N_Vector x)
+sunrealtype N_VMaxNorm_Parallel(N_Vector x)
 {
-  realtype lmax, gmax;
+  sunrealtype lmax, gmax;
   lmax = N_VMaxNormLocal_Parallel(x);
   MPI_Allreduce(&lmax, &gmax, 1, MPI_SUNREALTYPE, MPI_MAX, NV_COMM_P(x));
   return(gmax);
 }
 
-realtype N_VWSqrSumLocal_Parallel(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Parallel(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd;
+  sunrealtype sum, prodi, *xd, *wd;
 
   sum = ZERO;
   xd = wd = NULL;
@@ -700,18 +700,18 @@ realtype N_VWSqrSumLocal_Parallel(N_Vector x, N_Vector w)
   return(sum);
 }
 
-realtype N_VWrmsNorm_Parallel(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Parallel(N_Vector x, N_Vector w)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumLocal_Parallel(x, w);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_P(x));
   return(SUNRsqrt(gsum/(NV_GLOBLENGTH_P(x))));
 }
 
-realtype N_VWSqrSumMaskLocal_Parallel(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Parallel(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd, *idd;
+  sunrealtype sum, prodi, *xd, *wd, *idd;
 
   sum = ZERO;
   xd = wd = idd = NULL;
@@ -730,22 +730,22 @@ realtype N_VWSqrSumMaskLocal_Parallel(N_Vector x, N_Vector w, N_Vector id)
   return(sum);
 }
 
-realtype N_VWrmsNormMask_Parallel(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Parallel(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumMaskLocal_Parallel(x, w, id);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_P(x));
   return(SUNRsqrt(gsum/(NV_GLOBLENGTH_P(x))));
 }
 
-realtype N_VMinLocal_Parallel(N_Vector x)
+sunrealtype N_VMinLocal_Parallel(N_Vector x)
 {
   sunindextype i, N;
-  realtype min, *xd;
+  sunrealtype min, *xd;
 
   xd  = NULL;
   N   = NV_LOCLENGTH_P(x);
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   if (N > 0) {
     xd = NV_DATA_P(x);
@@ -756,26 +756,26 @@ realtype N_VMinLocal_Parallel(N_Vector x)
   return(min);
 }
 
-realtype N_VMin_Parallel(N_Vector x)
+sunrealtype N_VMin_Parallel(N_Vector x)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = N_VMinLocal_Parallel(x);
   MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_P(x));
   return(gmin);
 }
 
-realtype N_VWL2Norm_Parallel(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Parallel(N_Vector x, N_Vector w)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumLocal_Parallel(x, w);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_P(x));
   return(SUNRsqrt(gsum));
 }
 
-realtype N_VL1NormLocal_Parallel(N_Vector x)
+sunrealtype N_VL1NormLocal_Parallel(N_Vector x)
 {
   sunindextype i, N;
-  realtype sum, *xd;
+  sunrealtype sum, *xd;
 
   sum = ZERO;
   xd  = NULL;
@@ -788,18 +788,18 @@ realtype N_VL1NormLocal_Parallel(N_Vector x)
   return(sum);
 }
 
-realtype N_VL1Norm_Parallel(N_Vector x)
+sunrealtype N_VL1Norm_Parallel(N_Vector x)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VL1NormLocal_Parallel(x);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_P(x));
   return(gsum);
 }
 
-void N_VCompare_Parallel(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Parallel(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -814,10 +814,10 @@ void N_VCompare_Parallel(realtype c, N_Vector x, N_Vector z)
   return;
 }
 
-booleantype N_VInvTestLocal_Parallel(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTestLocal_Parallel(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd, val;
+  sunrealtype *xd, *zd, val;
 
   xd = zd = NULL;
 
@@ -839,9 +839,9 @@ booleantype N_VInvTestLocal_Parallel(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VInvTest_Parallel(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Parallel(N_Vector x, N_Vector z)
 {
-  realtype val, gval;
+  sunrealtype val, gval;
   val = (N_VInvTestLocal_Parallel(x, z)) ? ONE : ZERO;
   MPI_Allreduce(&val, &gval, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_P(x));
   if (gval == ZERO)
@@ -850,12 +850,12 @@ booleantype N_VInvTest_Parallel(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VConstrMaskLocal_Parallel(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMaskLocal_Parallel(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i, N;
-  realtype temp;
-  realtype *cd, *xd, *md;
-  booleantype test;
+  sunrealtype temp;
+  sunrealtype *cd, *xd, *md;
+  sunbooleantype test;
 
   cd = xd = md = NULL;
 
@@ -885,19 +885,19 @@ booleantype N_VConstrMaskLocal_Parallel(N_Vector c, N_Vector x, N_Vector m)
   return (temp == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-booleantype N_VConstrMask_Parallel(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Parallel(N_Vector c, N_Vector x, N_Vector m)
 {
-  realtype temp, temp2;
+  sunrealtype temp, temp2;
   temp = (N_VConstrMaskLocal_Parallel(c, x, m)) ? ZERO : ONE;
   MPI_Allreduce(&temp, &temp2, 1, MPI_SUNREALTYPE, MPI_MAX, NV_COMM_P(x));
   return (temp2 == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-realtype N_VMinQuotientLocal_Parallel(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotientLocal_Parallel(N_Vector num, N_Vector denom)
 {
-  booleantype notEvenOnce;
+  sunbooleantype notEvenOnce;
   sunindextype i, N;
-  realtype *nd, *dd, min;
+  sunrealtype *nd, *dd, min;
 
   nd = dd = NULL;
 
@@ -906,7 +906,7 @@ realtype N_VMinQuotientLocal_Parallel(N_Vector num, N_Vector denom)
   dd = NV_DATA_P(denom);
 
   notEvenOnce = SUNTRUE;
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   for (i = 0; i < N; i++) {
     if (dd[i] == ZERO) continue;
@@ -921,9 +921,9 @@ realtype N_VMinQuotientLocal_Parallel(N_Vector num, N_Vector denom)
   return(min);
 }
 
-realtype N_VMinQuotient_Parallel(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Parallel(N_Vector num, N_Vector denom)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = N_VMinQuotientLocal_Parallel(num, denom);
   MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_P(num));
   return(gmin);
@@ -936,12 +936,12 @@ realtype N_VMinQuotient_Parallel(N_Vector num, N_Vector denom)
  * -----------------------------------------------------------------
  */
 
-int N_VLinearCombination_Parallel(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Parallel(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1008,13 +1008,13 @@ int N_VLinearCombination_Parallel(int nvec, realtype* c, N_Vector* X, N_Vector z
 }
 
 
-int N_VScaleAddMulti_Parallel(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_Parallel(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1056,12 +1056,12 @@ int N_VScaleAddMulti_Parallel(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_
 }
 
 
-int N_VDotProdMulti_Parallel(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_Parallel(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int          i, retval;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1100,12 +1100,12 @@ int N_VDotProdMulti_Parallel(int nvec, N_Vector x, N_Vector* Y, realtype* dotpro
 
 
 int N_VDotProdMultiLocal_Parallel(int nvec, N_Vector x, N_Vector* Y,
-                                  realtype* dotprods)
+                                  sunrealtype* dotprods)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1127,7 +1127,7 @@ int N_VDotProdMultiLocal_Parallel(int nvec, N_Vector x, N_Vector* Y,
 }
 
 
-int N_VDotProdMultiAllReduce_Parallel(int nvec_total, N_Vector x, realtype* sum)
+int N_VDotProdMultiAllReduce_Parallel(int nvec_total, N_Vector x, sunrealtype* sum)
 {
   int      retval;
   MPI_Comm comm;
@@ -1153,19 +1153,19 @@ int N_VDotProdMultiAllReduce_Parallel(int nvec_total, N_Vector x, realtype* sum)
  */
 
 int N_VLinearSumVectorArray_Parallel(int nvec,
-                                   realtype a, N_Vector* X,
-                                   realtype b, N_Vector* Y,
+                                   sunrealtype a, N_Vector* X,
+                                   sunrealtype b, N_Vector* Y,
                                    N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
-  realtype     c;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype     c;
   N_Vector*    V1;
   N_Vector*    V2;
-  booleantype  test;
+  sunbooleantype  test;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1249,12 +1249,12 @@ int N_VLinearSumVectorArray_Parallel(int nvec,
 }
 
 
-int N_VScaleVectorArray_Parallel(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Parallel(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1295,11 +1295,11 @@ int N_VScaleVectorArray_Parallel(int nvec, realtype* c, N_Vector* X, N_Vector* Z
 }
 
 
-int N_VConstVectorArray_Parallel(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Parallel(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1325,12 +1325,12 @@ int N_VConstVectorArray_Parallel(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VWrmsNormVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1366,13 +1366,13 @@ int N_VWrmsNormVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* W, realtype
 
 
 int N_VWrmsNormMaskVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* W,
-                                        N_Vector id, realtype* nrm)
+                                        N_Vector id, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
-  realtype*    idd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    idd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1409,14 +1409,14 @@ int N_VWrmsNormMaskVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_Parallel(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_Parallel(int nvec, int nsum, sunrealtype* a,
                                           N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j;
   sunindextype k, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   int          retval;
   N_Vector*    YY;
@@ -1505,7 +1505,7 @@ int N_VScaleAddMultiVectorArray_Parallel(int nvec, int nsum, realtype* a,
 
 
 int N_VLinearCombinationVectorArray_Parallel(int nvec, int nsum,
-                                             realtype* c,
+                                             sunrealtype* c,
                                              N_Vector** X,
                                              N_Vector* Z)
 {
@@ -1513,10 +1513,10 @@ int N_VLinearCombinationVectorArray_Parallel(int nvec, int nsum,
   int          j; /* vector index in vector array     [0,nvec) */
   sunindextype k; /* element index in vector          [0,N)    */
   sunindextype N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*    Y;
 
   /* invalid number of vectors */
@@ -1561,7 +1561,7 @@ int N_VLinearCombinationVectorArray_Parallel(int nvec, int nsum,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -1651,7 +1651,7 @@ int N_VLinearCombinationVectorArray_Parallel(int nvec, int nsum,
 int N_VBufSize_Parallel(N_Vector x, sunindextype *size)
 {
   if (x == NULL) return(-1);
-  *size = NV_LOCLENGTH_P(x) * ((sunindextype)sizeof(realtype));
+  *size = NV_LOCLENGTH_P(x) * ((sunindextype)sizeof(sunrealtype));
   return(0);
 }
 
@@ -1659,14 +1659,14 @@ int N_VBufSize_Parallel(N_Vector x, sunindextype *size)
 int N_VBufPack_Parallel(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LOCLENGTH_P(x);
   xd = NV_DATA_P(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     bd[i] = xd[i];
@@ -1678,14 +1678,14 @@ int N_VBufPack_Parallel(N_Vector x, void *buf)
 int N_VBufUnpack_Parallel(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LOCLENGTH_P(x);
   xd = NV_DATA_P(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     xd[i] = bd[i];
@@ -1703,7 +1703,7 @@ int N_VBufUnpack_Parallel(N_Vector x, void *buf)
 static void VCopy_Parallel(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -1720,7 +1720,7 @@ static void VCopy_Parallel(N_Vector x, N_Vector z)
 static void VSum_Parallel(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1738,7 +1738,7 @@ static void VSum_Parallel(N_Vector x, N_Vector y, N_Vector z)
 static void VDiff_Parallel(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1756,7 +1756,7 @@ static void VDiff_Parallel(N_Vector x, N_Vector y, N_Vector z)
 static void VNeg_Parallel(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -1770,10 +1770,10 @@ static void VNeg_Parallel(N_Vector x, N_Vector z)
   return;
 }
 
-static void VScaleSum_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_Parallel(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1788,10 +1788,10 @@ static void VScaleSum_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VScaleDiff_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_Parallel(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1806,10 +1806,10 @@ static void VScaleDiff_Parallel(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin1_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_Parallel(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1824,10 +1824,10 @@ static void VLin1_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin2_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_Parallel(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1842,10 +1842,10 @@ static void VLin2_Parallel(realtype a, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void Vaxpy_Parallel(realtype a, N_Vector x, N_Vector y)
+static void Vaxpy_Parallel(sunrealtype a, N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype *xd, *yd;
+  sunrealtype *xd, *yd;
 
   xd = yd = NULL;
 
@@ -1871,10 +1871,10 @@ static void Vaxpy_Parallel(realtype a, N_Vector x, N_Vector y)
   return;
 }
 
-static void VScaleBy_Parallel(realtype a, N_Vector x)
+static void VScaleBy_Parallel(sunrealtype a, N_Vector x)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -1898,9 +1898,9 @@ static int VSumVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* Y, N_Vector
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -1919,9 +1919,9 @@ static int VDiffVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* Y, N_Vecto
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -1936,13 +1936,13 @@ static int VDiffVectorArray_Parallel(int nvec, N_Vector* X, N_Vector* Y, N_Vecto
   return(0);
 }
 
-static int VScaleSumVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleSumVectorArray_Parallel(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -1957,13 +1957,13 @@ static int VScaleSumVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_Ve
   return(0);
 }
 
-static int VScaleDiffVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleDiffVectorArray_Parallel(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -1978,13 +1978,13 @@ static int VScaleDiffVectorArray_Parallel(int nvec, realtype c, N_Vector* X, N_V
   return(0);
 }
 
-static int VLin1VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin1VectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -1999,13 +1999,13 @@ static int VLin1VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector
   return(0);
 }
 
-static int VLin2VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin2VectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -2020,12 +2020,12 @@ static int VLin2VectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector
   return(0);
 }
 
-static int VaxpyVectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector* Y)
+static int VaxpyVectorArray_Parallel(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   N = NV_LOCLENGTH_P(X[0]);
 
@@ -2068,7 +2068,7 @@ static int VaxpyVectorArray_Parallel(int nvec, realtype a, N_Vector* X, N_Vector
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_Parallel(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2113,7 +2113,7 @@ int N_VEnableFusedOps_Parallel(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_Parallel(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2131,7 +2131,7 @@ int N_VEnableLinearCombination_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Parallel(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2149,7 +2149,7 @@ int N_VEnableScaleAddMulti_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_Parallel(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2167,7 +2167,7 @@ int N_VEnableDotProdMulti_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2185,7 +2185,7 @@ int N_VEnableLinearSumVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2203,7 +2203,7 @@ int N_VEnableScaleVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2221,7 +2221,7 @@ int N_VEnableConstVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2239,7 +2239,7 @@ int N_VEnableWrmsNormVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2257,7 +2257,7 @@ int N_VEnableWrmsNormMaskVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2275,7 +2275,7 @@ int N_VEnableScaleAddMultiVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2293,7 +2293,7 @@ int N_VEnableLinearCombinationVectorArray_Parallel(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMultiLocal_Parallel(N_Vector v, booleantype tf)
+int N_VEnableDotProdMultiLocal_Parallel(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/parhyp/nvector_parhyp.c b/src/nvector/parhyp/nvector_parhyp.c
index 5397f0308b..6336b34b6d 100644
--- a/src/nvector/parhyp/nvector_parhyp.c
+++ b/src/nvector/parhyp/nvector_parhyp.c
@@ -25,10 +25,10 @@
 #include <sundials/sundials_math.h>
 #include "sundials/sundials_nvector.h"
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /*
  * -----------------------------------------------------------------
@@ -115,13 +115,13 @@ static void VSum_ParHyp(N_Vector x, N_Vector y, N_Vector z);
 /* z=x-y */
 static void VDiff_ParHyp(N_Vector x, N_Vector y, N_Vector z);
 /* z=c(x+y) */
-static void VScaleSum_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z);
+static void VScaleSum_ParHyp(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);
 /* z=c(x-y) */
-static void VScaleDiff_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z);
+static void VScaleDiff_ParHyp(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);
 /* z=ax+y */
-static void VLin1_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z);
+static void VLin1_ParHyp(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);
 /* z=ax-y */
-static void VLin2_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z);
+static void VLin2_ParHyp(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);
 
 /*
  * -----------------------------------------------------------------
@@ -293,7 +293,7 @@ void N_VPrint_ParHyp(N_Vector x)
 void N_VPrintFile_ParHyp(N_Vector x, FILE *outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -426,9 +426,9 @@ void N_VSpace_ParHyp(N_Vector v, sunindextype *lrw, sunindextype *liw)
  * then use HYPRE functions to get pointer to raw data of the local HYPRE
  * vector.
  */
-realtype *N_VGetArrayPointer_ParHyp(N_Vector v)
+sunrealtype *N_VGetArrayPointer_ParHyp(N_Vector v)
 {
-  return NULL; /* ((realtype *) NV_DATA_PH(v)); */
+  return NULL; /* ((sunrealtype *) NV_DATA_PH(v)); */
 }
 
 
@@ -436,7 +436,7 @@ realtype *N_VGetArrayPointer_ParHyp(N_Vector v)
  * This method is not implemented for HYPRE vector wrapper.
  * TODO: Put error handler in the function body.
  */
-void N_VSetArrayPointer_ParHyp(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_ParHyp(sunrealtype *v_data, N_Vector v)
 {
   /* Not implemented for Hypre vector */
 }
@@ -456,12 +456,12 @@ sunindextype N_VGetLength_ParHyp(N_Vector v)
  * Computes z[i] = a*x[i] + b*y[i]
  *
  */
-void N_VLinearSum_ParHyp(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_ParHyp(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype c, *xd, *yd, *zd;
+  sunrealtype c, *xd, *yd, *zd;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
 
   xd = yd = zd = NULL;
 
@@ -547,7 +547,7 @@ void N_VLinearSum_ParHyp(realtype a, N_Vector x, realtype b, N_Vector y, N_Vecto
   return;
 }
 
-void N_VConst_ParHyp(realtype c, N_Vector z)
+void N_VConst_ParHyp(sunrealtype c, N_Vector z)
 {
   HYPRE_Complex value = c;
   HYPRE_ParVectorSetConstantValues( (HYPRE_ParVector) NV_HYPRE_PARVEC_PH(z), value);
@@ -561,7 +561,7 @@ void N_VConst_ParHyp(realtype c, N_Vector z)
 void N_VProd_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -584,7 +584,7 @@ void N_VProd_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -600,7 +600,7 @@ void N_VDiv_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 }
 
 
-void N_VScale_ParHyp(realtype c, N_Vector x, N_Vector z)
+void N_VScale_ParHyp(sunrealtype c, N_Vector x, N_Vector z)
 {
   HYPRE_Complex value = c;
 
@@ -616,7 +616,7 @@ void N_VScale_ParHyp(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_ParHyp(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -633,7 +633,7 @@ void N_VAbs_ParHyp(N_Vector x, N_Vector z)
 void N_VInv_ParHyp(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -647,10 +647,10 @@ void N_VInv_ParHyp(N_Vector x, N_Vector z)
   return;
 }
 
-void N_VAddConst_ParHyp(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_ParHyp(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -664,10 +664,10 @@ void N_VAddConst_ParHyp(N_Vector x, realtype b, N_Vector z)
   return;
 }
 
-realtype N_VDotProdLocal_ParHyp(N_Vector x, N_Vector y)
+sunrealtype N_VDotProdLocal_ParHyp(N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype sum, *xd, *yd;
+  sunrealtype sum, *xd, *yd;
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
   yd = NV_DATA_PH(y);
@@ -678,7 +678,7 @@ realtype N_VDotProdLocal_ParHyp(N_Vector x, N_Vector y)
   return(sum);
 }
 
-realtype N_VDotProd_ParHyp(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_ParHyp(N_Vector x, N_Vector y)
 {
   HYPRE_Real gsum;
   HYPRE_ParVectorInnerProd( (HYPRE_ParVector) NV_HYPRE_PARVEC_PH(x),
@@ -687,10 +687,10 @@ realtype N_VDotProd_ParHyp(N_Vector x, N_Vector y)
   return(gsum);
 }
 
-realtype N_VMaxNormLocal_ParHyp(N_Vector x)
+sunrealtype N_VMaxNormLocal_ParHyp(N_Vector x)
 {
   sunindextype i, N;
-  realtype max, *xd;
+  sunrealtype max, *xd;
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
@@ -701,18 +701,18 @@ realtype N_VMaxNormLocal_ParHyp(N_Vector x)
   return(max);
 }
 
-realtype N_VMaxNorm_ParHyp(N_Vector x)
+sunrealtype N_VMaxNorm_ParHyp(N_Vector x)
 {
-  realtype lmax, gmax;
+  sunrealtype lmax, gmax;
   lmax = N_VMaxNormLocal_ParHyp(x);
   MPI_Allreduce(&lmax, &gmax, 1, MPI_SUNREALTYPE, MPI_MAX, NV_COMM_PH(x));
   return(gmax);
 }
 
-realtype N_VWSqrSumLocal_ParHyp(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_ParHyp(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd;
+  sunrealtype sum, prodi, *xd, *wd;
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
@@ -726,18 +726,18 @@ realtype N_VWSqrSumLocal_ParHyp(N_Vector x, N_Vector w)
   return(sum);
 }
 
-realtype N_VWrmsNorm_ParHyp(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_ParHyp(N_Vector x, N_Vector w)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumLocal_ParHyp(x, w);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PH(x));
   return(SUNRsqrt(gsum/(NV_GLOBLENGTH_PH(x))));
 }
 
-realtype N_VWSqrSumMaskLocal_ParHyp(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_ParHyp(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd, *idd;
+  sunrealtype sum, prodi, *xd, *wd, *idd;
 
   N   = NV_LOCLENGTH_PH(x);
   xd  = NV_DATA_PH(x);
@@ -754,22 +754,22 @@ realtype N_VWSqrSumMaskLocal_ParHyp(N_Vector x, N_Vector w, N_Vector id)
   return(sum);
 }
 
-realtype N_VWrmsNormMask_ParHyp(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_ParHyp(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumMaskLocal_ParHyp(x, w, id);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PH(x));
   return(SUNRsqrt(gsum/(NV_GLOBLENGTH_PH(x))));
 }
 
-realtype N_VMinLocal_ParHyp(N_Vector x)
+sunrealtype N_VMinLocal_ParHyp(N_Vector x)
 {
   sunindextype i, N;
-  realtype min, *xd;
+  sunrealtype min, *xd;
 
   xd  = NULL;
   N   = NV_LOCLENGTH_PH(x);
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   if (N > 0) {
     xd = NV_DATA_PH(x);
@@ -780,26 +780,26 @@ realtype N_VMinLocal_ParHyp(N_Vector x)
   return(min);
 }
 
-realtype N_VMin_ParHyp(N_Vector x)
+sunrealtype N_VMin_ParHyp(N_Vector x)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = N_VMinLocal_ParHyp(x);
   MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_PH(x));
   return(gmin);
 }
 
-realtype N_VWL2Norm_ParHyp(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_ParHyp(N_Vector x, N_Vector w)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VWSqrSumLocal_ParHyp(x, w);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PH(x));
   return(SUNRsqrt(gsum));
 }
 
-realtype N_VL1NormLocal_ParHyp(N_Vector x)
+sunrealtype N_VL1NormLocal_ParHyp(N_Vector x)
 {
   sunindextype i, N;
-  realtype sum, *xd;
+  sunrealtype sum, *xd;
 
   N   = NV_LOCLENGTH_PH(x);
   xd  = NV_DATA_PH(x);
@@ -809,18 +809,18 @@ realtype N_VL1NormLocal_ParHyp(N_Vector x)
   return(sum);
 }
 
-realtype N_VL1Norm_ParHyp(N_Vector x)
+sunrealtype N_VL1Norm_ParHyp(N_Vector x)
 {
-  realtype lsum, gsum;
+  sunrealtype lsum, gsum;
   lsum = N_VL1NormLocal_ParHyp(x);
   MPI_Allreduce(&lsum, &gsum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PH(x));
   return(gsum);
 }
 
-void N_VCompare_ParHyp(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_ParHyp(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -835,10 +835,10 @@ void N_VCompare_ParHyp(realtype c, N_Vector x, N_Vector z)
   return;
 }
 
-booleantype N_VInvTestLocal_ParHyp(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTestLocal_ParHyp(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd, val;
+  sunrealtype *xd, *zd, val;
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
@@ -857,9 +857,9 @@ booleantype N_VInvTestLocal_ParHyp(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VInvTest_ParHyp(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_ParHyp(N_Vector x, N_Vector z)
 {
-  realtype val, gval;
+  sunrealtype val, gval;
   val = (N_VInvTestLocal_ParHyp(x, z)) ? ONE : ZERO;
   MPI_Allreduce(&val, &gval, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_PH(x));
   if (gval == ZERO)
@@ -868,12 +868,12 @@ booleantype N_VInvTest_ParHyp(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VConstrMaskLocal_ParHyp(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMaskLocal_ParHyp(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i, N;
-  realtype temp;
-  realtype *cd, *xd, *md;
-  booleantype test;
+  sunrealtype temp;
+  sunrealtype *cd, *xd, *md;
+  sunbooleantype test;
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
@@ -901,19 +901,19 @@ booleantype N_VConstrMaskLocal_ParHyp(N_Vector c, N_Vector x, N_Vector m)
   return (temp == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-booleantype N_VConstrMask_ParHyp(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_ParHyp(N_Vector c, N_Vector x, N_Vector m)
 {
-  realtype temp, temp2;
+  sunrealtype temp, temp2;
   temp = (N_VConstrMaskLocal_ParHyp(c, x, m)) ? ZERO : ONE;
   MPI_Allreduce(&temp, &temp2, 1, MPI_SUNREALTYPE, MPI_MAX, NV_COMM_PH(x));
   return (temp2 == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-realtype N_VMinQuotientLocal_ParHyp(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotientLocal_ParHyp(N_Vector num, N_Vector denom)
 {
-  booleantype notEvenOnce;
+  sunbooleantype notEvenOnce;
   sunindextype i, N;
-  realtype *nd, *dd, min;
+  sunrealtype *nd, *dd, min;
 
   nd = dd = NULL;
 
@@ -922,7 +922,7 @@ realtype N_VMinQuotientLocal_ParHyp(N_Vector num, N_Vector denom)
   dd = NV_DATA_PH(denom);
 
   notEvenOnce = SUNTRUE;
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   for (i = 0; i < N; i++) {
     if (dd[i] == ZERO) continue;
@@ -937,9 +937,9 @@ realtype N_VMinQuotientLocal_ParHyp(N_Vector num, N_Vector denom)
   return(min);
 }
 
-realtype N_VMinQuotient_ParHyp(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_ParHyp(N_Vector num, N_Vector denom)
 {
-  realtype lmin, gmin;
+  sunrealtype lmin, gmin;
   lmin = N_VMinQuotientLocal_ParHyp(num, denom);
   MPI_Allreduce(&lmin, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_PH(num));
   return(gmin);
@@ -953,12 +953,12 @@ realtype N_VMinQuotient_ParHyp(N_Vector num, N_Vector denom)
  */
 
 
-int N_VLinearCombination_ParHyp(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_ParHyp(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1025,14 +1025,14 @@ int N_VLinearCombination_ParHyp(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_ParHyp(int nvec, realtype* a, N_Vector x, N_Vector* Y,
+int N_VScaleAddMulti_ParHyp(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y,
                              N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1075,12 +1075,12 @@ int N_VScaleAddMulti_ParHyp(int nvec, realtype* a, N_Vector x, N_Vector* Y,
 
 
 int N_VDotProdMulti_ParHyp(int nvec, N_Vector x, N_Vector* Y,
-                           realtype* dotprods)
+                           sunrealtype* dotprods)
 {
   int          i, retval;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1119,12 +1119,12 @@ int N_VDotProdMulti_ParHyp(int nvec, N_Vector x, N_Vector* Y,
 
 
 int N_VDotProdMultiLocal_ParHyp(int nvec, N_Vector x, N_Vector* Y,
-                                realtype* dotprods)
+                                sunrealtype* dotprods)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1146,7 +1146,7 @@ int N_VDotProdMultiLocal_ParHyp(int nvec, N_Vector x, N_Vector* Y,
 }
 
 
-int N_VDotProdMultiAllReduce_ParHyp(int nvec, N_Vector x, realtype* sum)
+int N_VDotProdMultiAllReduce_ParHyp(int nvec, N_Vector x, sunrealtype* sum)
 {
   int retval;
   retval = MPI_Allreduce(MPI_IN_PLACE, sum, nvec, MPI_SUNREALTYPE, MPI_SUM,
@@ -1163,15 +1163,15 @@ int N_VDotProdMultiAllReduce_ParHyp(int nvec, N_Vector x, realtype* sum)
 
 
 int N_VLinearSumVectorArray_ParHyp(int nvec,
-                                   realtype a, N_Vector* X,
-                                   realtype b, N_Vector* Y,
+                                   sunrealtype a, N_Vector* X,
+                                   sunrealtype b, N_Vector* Y,
                                    N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1199,12 +1199,12 @@ int N_VLinearSumVectorArray_ParHyp(int nvec,
 }
 
 
-int N_VScaleVectorArray_ParHyp(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_ParHyp(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1246,11 +1246,11 @@ int N_VScaleVectorArray_ParHyp(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_ParHyp(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_ParHyp(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1276,12 +1276,12 @@ int N_VConstVectorArray_ParHyp(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VWrmsNormVectorArray_ParHyp(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_ParHyp(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1317,13 +1317,13 @@ int N_VWrmsNormVectorArray_ParHyp(int nvec, N_Vector* X, N_Vector* W, realtype*
 
 
 int N_VWrmsNormMaskVectorArray_ParHyp(int nvec, N_Vector* X, N_Vector* W,
-                                        N_Vector id, realtype* nrm)
+                                        N_Vector id, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
-  realtype*    idd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    idd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1360,14 +1360,14 @@ int N_VWrmsNormMaskVectorArray_ParHyp(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_ParHyp(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_ParHyp(int nvec, int nsum, sunrealtype* a,
                                           N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j;
   sunindextype k, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   int          retval;
   N_Vector*    YY;
@@ -1456,7 +1456,7 @@ int N_VScaleAddMultiVectorArray_ParHyp(int nvec, int nsum, realtype* a,
 
 
 int N_VLinearCombinationVectorArray_ParHyp(int nvec, int nsum,
-                                             realtype* c,
+                                             sunrealtype* c,
                                              N_Vector** X,
                                              N_Vector* Z)
 {
@@ -1464,10 +1464,10 @@ int N_VLinearCombinationVectorArray_ParHyp(int nvec, int nsum,
   int          j; /* vector index in vector array     [0,nvec) */
   sunindextype k; /* element index in vector          [0,N)    */
   sunindextype N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*    Y;
 
   /* invalid number of vectors */
@@ -1512,7 +1512,7 @@ int N_VLinearCombinationVectorArray_ParHyp(int nvec, int nsum,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -1602,7 +1602,7 @@ int N_VLinearCombinationVectorArray_ParHyp(int nvec, int nsum,
 int N_VBufSize_ParHyp(N_Vector x, sunindextype *size)
 {
   if (x == NULL) return(-1);
-  *size = NV_LOCLENGTH_PH(x) * ((sunindextype)sizeof(realtype));
+  *size = NV_LOCLENGTH_PH(x) * ((sunindextype)sizeof(sunrealtype));
   return(0);
 }
 
@@ -1610,14 +1610,14 @@ int N_VBufSize_ParHyp(N_Vector x, sunindextype *size)
 int N_VBufPack_ParHyp(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     bd[i] = xd[i];
@@ -1629,14 +1629,14 @@ int N_VBufPack_ParHyp(N_Vector x, void *buf)
 int N_VBufUnpack_ParHyp(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LOCLENGTH_PH(x);
   xd = NV_DATA_PH(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     xd[i] = bd[i];
@@ -1654,7 +1654,7 @@ int N_VBufUnpack_ParHyp(N_Vector x, void *buf)
 static void VSum_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1672,7 +1672,7 @@ static void VSum_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 static void VDiff_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1688,10 +1688,10 @@ static void VDiff_ParHyp(N_Vector x, N_Vector y, N_Vector z)
 }
 
 
-static void VScaleSum_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_ParHyp(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1706,10 +1706,10 @@ static void VScaleSum_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VScaleDiff_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_ParHyp(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1724,10 +1724,10 @@ static void VScaleDiff_ParHyp(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin1_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_ParHyp(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1742,10 +1742,10 @@ static void VLin1_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin2_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_ParHyp(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1767,7 +1767,7 @@ static void VLin2_ParHyp(realtype a, N_Vector x, N_Vector y, N_Vector z)
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1812,7 +1812,7 @@ int N_VEnableFusedOps_ParHyp(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1830,7 +1830,7 @@ int N_VEnableLinearCombination_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1848,7 +1848,7 @@ int N_VEnableScaleAddMulti_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1866,7 +1866,7 @@ int N_VEnableDotProdMulti_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1884,7 +1884,7 @@ int N_VEnableLinearSumVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1902,7 +1902,7 @@ int N_VEnableScaleVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1920,7 +1920,7 @@ int N_VEnableConstVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1938,7 +1938,7 @@ int N_VEnableWrmsNormVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1956,7 +1956,7 @@ int N_VEnableWrmsNormMaskVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1974,7 +1974,7 @@ int N_VEnableScaleAddMultiVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1992,7 +1992,7 @@ int N_VEnableLinearCombinationVectorArray_ParHyp(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMultiLocal_ParHyp(N_Vector v, booleantype tf)
+int N_VEnableDotProdMultiLocal_ParHyp(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/petsc/nvector_petsc.c b/src/nvector/petsc/nvector_petsc.c
index 3dbff29050..c34b5650f0 100644
--- a/src/nvector/petsc/nvector_petsc.c
+++ b/src/nvector/petsc/nvector_petsc.c
@@ -24,10 +24,10 @@
 #include <nvector/nvector_petsc.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Error Message */
 #define BAD_N1 "N_VNewEmpty_Petsc -- Sum of local vector lengths differs from "
@@ -402,7 +402,7 @@ void N_VSpace_Petsc(N_Vector v, sunindextype *lrw, sunindextype *liw)
 /*
  * Not implemented for PETSc wrapper.
  */
-realtype *N_VGetArrayPointer_Petsc(N_Vector v)
+sunrealtype *N_VGetArrayPointer_Petsc(N_Vector v)
 {
   return NULL;
 }
@@ -410,7 +410,7 @@ realtype *N_VGetArrayPointer_Petsc(N_Vector v)
 /*
  * Not implemented for PETSc wrapper.
  */
-void N_VSetArrayPointer_Petsc(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_Petsc(sunrealtype *v_data, N_Vector v)
 {
   return;
 }
@@ -425,7 +425,7 @@ sunindextype N_VGetLength_Petsc(N_Vector v)
   return(NV_GLOBLENGTH_PTC(v));
 }
 
-void N_VLinearSum_Petsc(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Petsc(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   Vec xv = NV_PVEC_PTC(x);
   Vec yv = NV_PVEC_PTC(y);
@@ -465,7 +465,7 @@ void N_VLinearSum_Petsc(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector
   return;
 }
 
-void N_VConst_Petsc(realtype c, N_Vector z)
+void N_VConst_Petsc(sunrealtype c, N_Vector z)
 {
   Vec zv = NV_PVEC_PTC(z);
 
@@ -496,7 +496,7 @@ void N_VDiv_Petsc(N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-void N_VScale_Petsc(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Petsc(sunrealtype c, N_Vector x, N_Vector z)
 {
   Vec xv = NV_PVEC_PTC(x);
   Vec zv = NV_PVEC_PTC(z);
@@ -535,7 +535,7 @@ void N_VInv_Petsc(N_Vector x, N_Vector z)
   return;
 }
 
-void N_VAddConst_Petsc(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Petsc(N_Vector x, sunrealtype b, N_Vector z)
 {
   Vec xv = NV_PVEC_PTC(x);
   Vec zv = NV_PVEC_PTC(z);
@@ -547,7 +547,7 @@ void N_VAddConst_Petsc(N_Vector x, realtype b, N_Vector z)
   return;
 }
 
-realtype N_VDotProdLocal_Petsc(N_Vector x, N_Vector y)
+sunrealtype N_VDotProdLocal_Petsc(N_Vector x, N_Vector y)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -563,10 +563,10 @@ realtype N_VDotProdLocal_Petsc(N_Vector x, N_Vector y)
     sum += xd[i] * yd[i];
   VecRestoreArray(xv, &xd);
   VecRestoreArray(yv, &yd);
-  return ((realtype) sum);
+  return ((sunrealtype) sum);
 }
 
-realtype N_VDotProd_Petsc(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Petsc(N_Vector x, N_Vector y)
 {
   Vec xv = NV_PVEC_PTC(x);
   Vec yv = NV_PVEC_PTC(y);
@@ -576,7 +576,7 @@ realtype N_VDotProd_Petsc(N_Vector x, N_Vector y)
   return dotprod;
 }
 
-realtype N_VMaxNormLocal_Petsc(N_Vector x)
+sunrealtype N_VMaxNormLocal_Petsc(N_Vector x)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -589,10 +589,10 @@ realtype N_VMaxNormLocal_Petsc(N_Vector x)
     if (PetscAbsScalar(xd[i]) > max) max = PetscAbsScalar(xd[i]);
   }
   VecRestoreArray(xv, &xd);
-  return ((realtype) max);
+  return ((sunrealtype) max);
 }
 
-realtype N_VMaxNorm_Petsc(N_Vector x)
+sunrealtype N_VMaxNorm_Petsc(N_Vector x)
 {
   Vec xv = NV_PVEC_PTC(x);
   PetscReal norm;
@@ -601,7 +601,7 @@ realtype N_VMaxNorm_Petsc(N_Vector x)
   return norm;
 }
 
-realtype N_VWSqrSumLocal_Petsc(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Petsc(N_Vector x, N_Vector w)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -618,19 +618,19 @@ realtype N_VWSqrSumLocal_Petsc(N_Vector x, N_Vector w)
   }
   VecRestoreArray(xv, &xd);
   VecRestoreArray(wv, &wd);
-  return ((realtype) sum);
+  return ((sunrealtype) sum);
 }
 
-realtype N_VWrmsNorm_Petsc(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Petsc(N_Vector x, N_Vector w)
 {
-  realtype global_sum;
+  sunrealtype global_sum;
   sunindextype N_global = NV_GLOBLENGTH_PTC(x);
-  realtype sum = N_VWSqrSumLocal_Petsc(x, w);
+  sunrealtype sum = N_VWSqrSumLocal_Petsc(x, w);
   (void) MPI_Allreduce(&sum, &global_sum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PTC(x));
   return (SUNRsqrt(global_sum/N_global));
 }
 
-realtype N_VWSqrSumMaskLocal_Petsc(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Petsc(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -657,32 +657,32 @@ realtype N_VWSqrSumMaskLocal_Petsc(N_Vector x, N_Vector w, N_Vector id)
   return sum;
 }
 
-realtype N_VWrmsNormMask_Petsc(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Petsc(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype global_sum;
+  sunrealtype global_sum;
   sunindextype N_global = NV_GLOBLENGTH_PTC(x);
-  realtype sum = N_VWSqrSumMaskLocal_Petsc(x, w, id);
+  sunrealtype sum = N_VWSqrSumMaskLocal_Petsc(x, w, id);
   (void) MPI_Allreduce(&sum, &global_sum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PTC(x));
   return (SUNRsqrt(global_sum/N_global));
 }
 
-realtype N_VMinLocal_Petsc(N_Vector x)
+sunrealtype N_VMinLocal_Petsc(N_Vector x)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
   Vec xv = NV_PVEC_PTC(x);
   PetscScalar *xd;
-  PetscReal min = BIG_REAL;
+  PetscReal min = SUN_BIG_REAL;
 
   VecGetArray(xv, &xd);
   for (i = 0; i < N; i++) {
     if (xd[i] < min) min = xd[i];
   }
   VecRestoreArray(xv, &xd);
-  return ((realtype) min);
+  return ((sunrealtype) min);
 }
 
-realtype N_VMin_Petsc(N_Vector x)
+sunrealtype N_VMin_Petsc(N_Vector x)
 {
   Vec xv = NV_PVEC_PTC(x);
   PetscReal minval;
@@ -692,15 +692,15 @@ realtype N_VMin_Petsc(N_Vector x)
   return minval;
 }
 
-realtype N_VWL2Norm_Petsc(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Petsc(N_Vector x, N_Vector w)
 {
-  realtype global_sum;
-  realtype sum = N_VWSqrSumLocal_Petsc(x, w);
+  sunrealtype global_sum;
+  sunrealtype sum = N_VWSqrSumLocal_Petsc(x, w);
   (void) MPI_Allreduce(&sum, &global_sum, 1, MPI_SUNREALTYPE, MPI_SUM, NV_COMM_PTC(x));
   return (SUNRsqrt(global_sum));
 }
 
-realtype N_VL1NormLocal_Petsc(N_Vector x)
+sunrealtype N_VL1NormLocal_Petsc(N_Vector x)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -713,10 +713,10 @@ realtype N_VL1NormLocal_Petsc(N_Vector x)
     sum += PetscAbsScalar(xd[i]);
   }
   VecRestoreArray(xv, &xd);
-  return ((realtype) sum);
+  return ((sunrealtype) sum);
 }
 
-realtype N_VL1Norm_Petsc(N_Vector x)
+sunrealtype N_VL1Norm_Petsc(N_Vector x)
 {
   Vec xv = NV_PVEC_PTC(x);
   PetscReal norm;
@@ -725,13 +725,13 @@ realtype N_VL1Norm_Petsc(N_Vector x)
   return norm;
 }
 
-void N_VCompare_Petsc(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Petsc(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
   Vec xv = NV_PVEC_PTC(x);
   Vec zv = NV_PVEC_PTC(z);
-  PetscReal cpet = c; /* <~ realtype should typedef to PETScReal */
+  PetscReal cpet = c; /* <~ sunrealtype should typedef to PETScReal */
   PetscScalar *xdata;
   PetscScalar *zdata;
 
@@ -746,7 +746,7 @@ void N_VCompare_Petsc(realtype c, N_Vector x, N_Vector z)
   return;
 }
 
-booleantype N_VInvTestLocal_Petsc(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTestLocal_Petsc(N_Vector x, N_Vector z)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
@@ -773,10 +773,10 @@ booleantype N_VInvTestLocal_Petsc(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VInvTest_Petsc(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Petsc(N_Vector x, N_Vector z)
 {
-  realtype val2;
-  realtype val = (N_VInvTestLocal_Petsc(x, z)) ? ONE : ZERO;
+  sunrealtype val2;
+  sunrealtype val = (N_VInvTestLocal_Petsc(x, z)) ? ONE : ZERO;
   (void) MPI_Allreduce(&val, &val2, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_PTC(x));
   if (val2 == ZERO)
     return(SUNFALSE);
@@ -784,12 +784,12 @@ booleantype N_VInvTest_Petsc(N_Vector x, N_Vector z)
     return(SUNTRUE);
 }
 
-booleantype N_VConstrMaskLocal_Petsc(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMaskLocal_Petsc(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(x);
-  realtype temp;
-  booleantype test;
+  sunrealtype temp;
+  sunbooleantype test;
   Vec xv = NV_PVEC_PTC(x);
   Vec cv = NV_PVEC_PTC(c);
   Vec mv = NV_PVEC_PTC(m);
@@ -826,17 +826,17 @@ booleantype N_VConstrMaskLocal_Petsc(N_Vector c, N_Vector x, N_Vector m)
   return (temp == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-booleantype N_VConstrMask_Petsc(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Petsc(N_Vector c, N_Vector x, N_Vector m)
 {
-  realtype temp2;
-  realtype temp = (N_VConstrMaskLocal_Petsc(c, x, m)) ? ZERO : ONE;
+  sunrealtype temp2;
+  sunrealtype temp = (N_VConstrMaskLocal_Petsc(c, x, m)) ? ZERO : ONE;
   (void) MPI_Allreduce(&temp, &temp2, 1, MPI_SUNREALTYPE, MPI_MAX, NV_COMM_PTC(x));
   return (temp2 == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-realtype N_VMinQuotientLocal_Petsc(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotientLocal_Petsc(N_Vector num, N_Vector denom)
 {
-  booleantype notEvenOnce = SUNTRUE;
+  sunbooleantype notEvenOnce = SUNTRUE;
   sunindextype i;
   sunindextype N = NV_LOCLENGTH_PTC(num);
 
@@ -844,7 +844,7 @@ realtype N_VMinQuotientLocal_Petsc(N_Vector num, N_Vector denom)
   Vec dv = NV_PVEC_PTC(denom);
   PetscScalar *nd;
   PetscScalar *dd;
-  PetscReal minval = BIG_REAL;
+  PetscReal minval = SUN_BIG_REAL;
 
   VecGetArray(nv, &nd);
   VecGetArray(dv, &dd);
@@ -864,13 +864,13 @@ realtype N_VMinQuotientLocal_Petsc(N_Vector num, N_Vector denom)
   }
   VecRestoreArray(nv, &nd);
   VecRestoreArray(dv, &dd);
-  return((realtype) minval);
+  return((sunrealtype) minval);
 }
 
-realtype N_VMinQuotient_Petsc(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Petsc(N_Vector num, N_Vector denom)
 {
   PetscReal gmin;
-  realtype minval = N_VMinQuotientLocal_Petsc(num, denom);
+  sunrealtype minval = N_VMinQuotientLocal_Petsc(num, denom);
   (void) MPI_Allreduce(&minval, &gmin, 1, MPI_SUNREALTYPE, MPI_MIN, NV_COMM_PTC(num));
   return(gmin);
 }
@@ -883,7 +883,7 @@ realtype N_VMinQuotient_Petsc(N_Vector num, N_Vector denom)
  */
 
 
-int N_VLinearCombination_Petsc(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Petsc(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int  i;
   Vec* xv;
@@ -941,7 +941,7 @@ int N_VLinearCombination_Petsc(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_Petsc(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_Petsc(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
@@ -990,7 +990,7 @@ int N_VScaleAddMulti_Petsc(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vec
 }
 
 
-int N_VDotProdMulti_Petsc(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_Petsc(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int  i;
   Vec* yv;
@@ -1025,7 +1025,7 @@ int N_VDotProdMulti_Petsc(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
  */
 
 int N_VDotProdMultiLocal_Petsc(int nvec, N_Vector x, N_Vector* Y,
-                               realtype* dotprods)
+                               sunrealtype* dotprods)
 {
   int j;
   sunindextype i;
@@ -1050,7 +1050,7 @@ int N_VDotProdMultiLocal_Petsc(int nvec, N_Vector x, N_Vector* Y,
   return (0);
 }
 
-int N_VDotProdMultiAllReduce_Petsc(int nvec, N_Vector x, realtype* dotprods)
+int N_VDotProdMultiAllReduce_Petsc(int nvec, N_Vector x, sunrealtype* dotprods)
 {
   int retval;
   retval = MPI_Allreduce(MPI_IN_PLACE, dotprods, nvec, MPI_SUNREALTYPE,
@@ -1065,8 +1065,8 @@ int N_VDotProdMultiAllReduce_Petsc(int nvec, N_Vector x, realtype* dotprods)
  */
 
 int N_VLinearSumVectorArray_Petsc(int nvec,
-                                  realtype a, N_Vector* X,
-                                  realtype b, N_Vector* Y,
+                                  sunrealtype a, N_Vector* X,
+                                  sunrealtype b, N_Vector* Y,
                                   N_Vector* Z)
 {
   int          i;
@@ -1102,7 +1102,7 @@ int N_VLinearSumVectorArray_Petsc(int nvec,
 }
 
 
-int N_VScaleVectorArray_Petsc(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Petsc(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
@@ -1150,7 +1150,7 @@ int N_VScaleVectorArray_Petsc(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_Petsc(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Petsc(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
@@ -1181,12 +1181,12 @@ int N_VConstVectorArray_Petsc(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VWrmsNormVectorArray_Petsc(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_Petsc(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
   MPI_Comm     comm;
 
   /* invalid number of vectors */
@@ -1224,7 +1224,7 @@ int N_VWrmsNormVectorArray_Petsc(int nvec, N_Vector* X, N_Vector* W, realtype* n
 
 
 int N_VWrmsNormMaskVectorArray_Petsc(int nvec, N_Vector* X, N_Vector* W,
-                                        N_Vector id, realtype* nrm)
+                                        N_Vector id, sunrealtype* nrm)
 {
   int          i, retval;
   sunindextype j, Nl, Ng;
@@ -1269,7 +1269,7 @@ int N_VWrmsNormMaskVectorArray_Petsc(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_Petsc(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_Petsc(int nvec, int nsum, sunrealtype* a,
                                           N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j;
@@ -1369,7 +1369,7 @@ int N_VScaleAddMultiVectorArray_Petsc(int nvec, int nsum, realtype* a,
 
 
 int N_VLinearCombinationVectorArray_Petsc(int nvec, int nsum,
-                                             realtype* c,
+                                             sunrealtype* c,
                                              N_Vector** X,
                                              N_Vector* Z)
 {
@@ -1379,7 +1379,7 @@ int N_VLinearCombinationVectorArray_Petsc(int nvec, int nsum,
   sunindextype N;
   PetscScalar  *zd, *xd;
 
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*    Y;
 
   /* invalid number of vectors */
@@ -1424,7 +1424,7 @@ int N_VLinearCombinationVectorArray_Petsc(int nvec, int nsum,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -1576,7 +1576,7 @@ int N_VBufUnpack_Petsc(N_Vector x, void *buf)
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_Petsc(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1621,7 +1621,7 @@ int N_VEnableFusedOps_Petsc(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_Petsc(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1639,7 +1639,7 @@ int N_VEnableLinearCombination_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Petsc(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1657,7 +1657,7 @@ int N_VEnableScaleAddMulti_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_Petsc(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1675,7 +1675,7 @@ int N_VEnableDotProdMulti_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1693,7 +1693,7 @@ int N_VEnableLinearSumVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1711,7 +1711,7 @@ int N_VEnableScaleVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1729,7 +1729,7 @@ int N_VEnableConstVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1747,7 +1747,7 @@ int N_VEnableWrmsNormVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1765,7 +1765,7 @@ int N_VEnableWrmsNormMaskVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1783,7 +1783,7 @@ int N_VEnableScaleAddMultiVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1801,7 +1801,7 @@ int N_VEnableLinearCombinationVectorArray_Petsc(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMultiLocal_Petsc(N_Vector v, booleantype tf)
+int N_VEnableDotProdMultiLocal_Petsc(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
index 73c8ca0c51..933b3d5d42 100644
--- a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
+++ b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c
@@ -244,13 +244,13 @@ SWIGEXPORT N_Vector _wrap_FN_VMake_Pthreads(int64_t const *farg1, int const *far
   N_Vector fresult ;
   sunindextype arg1 ;
   int arg2 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   SUNContext arg4 = (SUNContext) 0 ;
   N_Vector result;
   
   arg1 = (sunindextype)(*farg1);
   arg2 = (int)(*farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (SUNContext)(farg4);
   result = (N_Vector)N_VMake_Pthreads(arg1,arg2,arg3,arg4);
   fresult = result;
@@ -345,25 +345,25 @@ SWIGEXPORT void _wrap_FN_VSpace_Pthreads(N_Vector farg1, int64_t *farg2, int64_t
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer_Pthreads(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer_Pthreads(arg1,arg2);
 }
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_Pthreads(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_Pthreads(arg1,arg2,arg3,arg4,arg5);
@@ -371,10 +371,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_Pthreads(double const *farg1, N_Vector farg2
 
 
 SWIGEXPORT void _wrap_FN_VConst_Pthreads(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_Pthreads(arg1,arg2);
 }
@@ -405,11 +405,11 @@ SWIGEXPORT void _wrap_FN_VDiv_Pthreads(N_Vector farg1, N_Vector farg2, N_Vector
 
 
 SWIGEXPORT void _wrap_FN_VScale_Pthreads(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_Pthreads(arg1,arg2,arg3);
@@ -438,11 +438,11 @@ SWIGEXPORT void _wrap_FN_VInv_Pthreads(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_Pthreads(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_Pthreads(arg1,arg2,arg3);
 }
@@ -452,12 +452,12 @@ SWIGEXPORT double _wrap_FN_VDotProd_Pthreads(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd_Pthreads(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd_Pthreads(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -465,11 +465,11 @@ SWIGEXPORT double _wrap_FN_VDotProd_Pthreads(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNorm_Pthreads(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm_Pthreads(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm_Pthreads(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -478,12 +478,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_Pthreads(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_Pthreads(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_Pthreads(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -493,13 +493,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Pthreads(N_Vector farg1, N_Vector farg2
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_Pthreads(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_Pthreads(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -507,11 +507,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Pthreads(N_Vector farg1, N_Vector farg2
 SWIGEXPORT double _wrap_FN_VMin_Pthreads(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin_Pthreads(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin_Pthreads(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -520,12 +520,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Pthreads(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_Pthreads(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_Pthreads(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -533,21 +533,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Pthreads(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VL1Norm_Pthreads(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm_Pthreads(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm_Pthreads(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_Pthreads(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_Pthreads(arg1,arg2,arg3);
@@ -588,12 +588,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Pthreads(N_Vector farg1, N_Vector farg2)
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient_Pthreads(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient_Pthreads(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -601,13 +601,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Pthreads(N_Vector farg1, N_Vector farg2)
 SWIGEXPORT int _wrap_FN_VLinearCombination_Pthreads(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_Pthreads(arg1,arg2,arg3,arg4);
@@ -619,14 +619,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_Pthreads(int const *farg1, double *fa
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_Pthreads(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -641,13 +641,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Pthreads(int const *farg1, N_Vector farg2,
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_Pthreads(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -657,17 +657,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Pthreads(int const *farg1, N_Vector farg2,
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Pthreads(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_Pthreads(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -679,13 +679,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Pthreads(int const *farg1, double
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_Pthreads(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_Pthreads(arg1,arg2,arg3,arg4);
@@ -697,12 +697,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_Pthreads(int const *farg1, double *far
 SWIGEXPORT int _wrap_FN_VConstVectorArray_Pthreads(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_Pthreads(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -715,13 +715,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_Pthreads(int const *farg1, void *fa
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_Pthreads(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -734,14 +734,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_Pthreads(int const *farg1, void
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_Pthreads(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -752,12 +752,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_Pthreads(N_Vector farg1, N_Vector farg2
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_Pthreads(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_Pthreads(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -767,13 +767,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_Pthreads(N_Vector farg1, N_Vector f
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_Pthreads(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_Pthreads(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -950,10 +950,10 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector farg1,
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Pthreads(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Pthreads(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Pthreads(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/pthreads/nvector_pthreads.c b/src/nvector/pthreads/nvector_pthreads.c
index d4b3b10caa..745268250c 100644
--- a/src/nvector/pthreads/nvector_pthreads.c
+++ b/src/nvector/pthreads/nvector_pthreads.c
@@ -28,31 +28,31 @@
 #include <sundials/sundials_math.h>
 #include <math.h> /* define NAN */
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Private functions for special cases of vector operations */
 static void VCopy_Pthreads(N_Vector x, N_Vector z);                              /* z=x       */
 static void VSum_Pthreads(N_Vector x, N_Vector y, N_Vector z);                   /* z=x+y     */
 static void VDiff_Pthreads(N_Vector x, N_Vector y, N_Vector z);                  /* z=x-y     */
 static void VNeg_Pthreads(N_Vector x, N_Vector z);                               /* z=-x      */
-static void VScaleSum_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
-static void VScaleDiff_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
-static void VLin1_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
-static void VLin2_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
-static void Vaxpy_Pthreads(realtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
-static void VScaleBy_Pthreads(realtype a, N_Vector x);                           /* x <- ax   */
+static void VScaleSum_Pthreads(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
+static void VScaleDiff_Pthreads(sunrealtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
+static void VLin1_Pthreads(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
+static void VLin2_Pthreads(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
+static void Vaxpy_Pthreads(sunrealtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
+static void VScaleBy_Pthreads(sunrealtype a, N_Vector x);                           /* x <- ax   */
 
 /* Private functions for special cases of vector array operations */
 static int VSumVectorArray_Pthreads(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                   /* Z=X+Y     */
 static int VDiffVectorArray_Pthreads(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                  /* Z=X-Y     */
-static int VScaleSumVectorArray_Pthreads(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
-static int VScaleDiffVectorArray_Pthreads(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
-static int VLin1VectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
-static int VLin2VectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
-static int VaxpyVectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y);                    /* Y <- aX+Y */
+static int VScaleSumVectorArray_Pthreads(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
+static int VScaleDiffVectorArray_Pthreads(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
+static int VLin1VectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
+static int VLin2VectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
+static int VaxpyVectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y);                    /* Y <- aX+Y */
 
 /* Pthread companion functions for vector operations */
 static void *N_VLinearSum_PT(void *thread_data);
@@ -235,7 +235,7 @@ N_Vector N_VNew_Pthreads(sunindextype length, int num_threads,
                          SUNContext sunctx)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
 
   v = NULL;
   v = N_VNewEmpty_Pthreads(length, num_threads, sunctx);
@@ -246,7 +246,7 @@ N_Vector N_VNew_Pthreads(sunindextype length, int num_threads,
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Pthreads(v); return(NULL); }
 
     /* Attach data */
@@ -263,7 +263,7 @@ N_Vector N_VNew_Pthreads(sunindextype length, int num_threads,
  */
 
 N_Vector N_VMake_Pthreads(sunindextype length, int num_threads,
-                          realtype *v_data, SUNContext sunctx)
+                          sunrealtype *v_data, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -313,7 +313,7 @@ void N_VPrint_Pthreads(N_Vector x)
 void N_VPrintFile_Pthreads(N_Vector x, FILE *outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -384,7 +384,7 @@ N_Vector N_VCloneEmpty_Pthreads(N_Vector w)
 N_Vector N_VClone_Pthreads(N_Vector w)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
   sunindextype length;
 
   v = NULL;
@@ -398,7 +398,7 @@ N_Vector N_VClone_Pthreads(N_Vector w)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Pthreads(v); return(NULL); }
 
     /* Attach data */
@@ -452,9 +452,9 @@ void N_VSpace_Pthreads(N_Vector v, sunindextype *lrw, sunindextype *liw)
  * Get vector data pointer
  */
 
-realtype *N_VGetArrayPointer_Pthreads(N_Vector v)
+sunrealtype *N_VGetArrayPointer_Pthreads(N_Vector v)
 {
-  return((realtype *) NV_DATA_PT(v));
+  return((sunrealtype *) NV_DATA_PT(v));
 }
 
 
@@ -462,7 +462,7 @@ realtype *N_VGetArrayPointer_Pthreads(N_Vector v)
  * Set vector data pointer
  */
 
-void N_VSetArrayPointer_Pthreads(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_Pthreads(sunrealtype *v_data, N_Vector v)
 {
   if (NV_LENGTH_PT(v) > 0) NV_DATA_PT(v) = v_data;
 
@@ -474,7 +474,7 @@ void N_VSetArrayPointer_Pthreads(realtype *v_data, N_Vector v)
  * Compute linear sum z[i] = a*x[i]+b*y[i]
  */
 
-void N_VLinearSum_Pthreads(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Pthreads(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -482,9 +482,9 @@ void N_VLinearSum_Pthreads(realtype a, N_Vector x, realtype b, N_Vector y, N_Vec
   Pthreads_Data  *thread_data;
   pthread_attr_t attr;
 
-  realtype c;
+  sunrealtype c;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
 
   if ((b == ONE) && (z == y)) {    /* BLAS usage: axpy y <- ax+y */
     Vaxpy_Pthreads(a,x,y);
@@ -601,8 +601,8 @@ void N_VLinearSum_Pthreads(realtype a, N_Vector x, realtype b, N_Vector y, N_Vec
 static void *N_VLinearSum_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype a, b;
-  realtype *xd, *yd, *zd;
+  sunrealtype a, b;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -631,7 +631,7 @@ static void *N_VLinearSum_PT(void *thread_data)
  * Assigns constant value to all vector elements, z[i] = c
  */
 
-void N_VConst_Pthreads(realtype c, N_Vector z)
+void N_VConst_Pthreads(sunrealtype c, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -685,8 +685,8 @@ void N_VConst_Pthreads(realtype c, N_Vector z)
 static void *N_VConst_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype c;
-  realtype *zd;
+  sunrealtype c;
+  sunrealtype *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -765,7 +765,7 @@ void N_VProd_Pthreads(N_Vector x, N_Vector y, N_Vector z)
 static void *N_VProd_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -846,7 +846,7 @@ void N_VDiv_Pthreads(N_Vector x, N_Vector y, N_Vector z)
 static void *N_VDiv_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -872,7 +872,7 @@ static void *N_VDiv_PT(void *thread_data)
  * Compute scaler multiplication z[i] = c*x[i]
  */
 
-void N_VScale_Pthreads(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Pthreads(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -938,8 +938,8 @@ void N_VScale_Pthreads(realtype c, N_Vector x, N_Vector z)
 static void *N_VScale_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype c;
-  realtype *xd, *zd;
+  sunrealtype c;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -1019,7 +1019,7 @@ void N_VAbs_Pthreads(N_Vector x, N_Vector z)
 static void *N_VAbs_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -1098,7 +1098,7 @@ void N_VInv_Pthreads(N_Vector x, N_Vector z)
 static void *N_VInv_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -1123,7 +1123,7 @@ static void *N_VInv_PT(void *thread_data)
  * Compute componentwise addition of a scaler to a vector z[i] = x[i] + b
  */
 
-void N_VAddConst_Pthreads(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Pthreads(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -1178,8 +1178,8 @@ void N_VAddConst_Pthreads(N_Vector x, realtype b, N_Vector z)
 static void *N_VAddConst_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype b;
-  realtype *xd, *zd;
+  sunrealtype b;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -1205,7 +1205,7 @@ static void *N_VAddConst_PT(void *thread_data)
  * Computes the dot product of two vectors, a = sum(x[i]*y[i])
  */
 
-realtype N_VDotProd_Pthreads(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Pthreads(N_Vector x, N_Vector y)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1213,7 +1213,7 @@ realtype N_VDotProd_Pthreads(N_Vector x, N_Vector y)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        sum = ZERO;
+  sunrealtype        sum = ZERO;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(x);
@@ -1267,8 +1267,8 @@ realtype N_VDotProd_Pthreads(N_Vector x, N_Vector y)
 static void *N_VDotProd_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *yd;
-  realtype local_sum, *global_sum;
+  sunrealtype *xd, *yd;
+  sunrealtype local_sum, *global_sum;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1303,7 +1303,7 @@ static void *N_VDotProd_PT(void *thread_data)
  * Computes max norm of the vector
  */
 
-realtype N_VMaxNorm_Pthreads(N_Vector x)
+sunrealtype N_VMaxNorm_Pthreads(N_Vector x)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1311,7 +1311,7 @@ realtype N_VMaxNorm_Pthreads(N_Vector x)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        max = ZERO;
+  sunrealtype        max = ZERO;
 
   /* allocate threads and thread data structs */
   N            = NV_LENGTH_PT(x);
@@ -1364,8 +1364,8 @@ realtype N_VMaxNorm_Pthreads(N_Vector x)
 static void *N_VMaxNorm_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd;
-  realtype local_max, *global_max;
+  sunrealtype *xd;
+  sunrealtype local_max, *global_max;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1401,7 +1401,7 @@ static void *N_VMaxNorm_PT(void *thread_data)
  * Computes weighted root mean square norm of a vector
  */
 
-realtype N_VWrmsNorm_Pthreads(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Pthreads(N_Vector x, N_Vector w)
 {
   return(SUNRsqrt(N_VWSqrSumLocal_Pthreads(x, w)/(NV_LENGTH_PT(x))));
 }
@@ -1411,7 +1411,7 @@ realtype N_VWrmsNorm_Pthreads(N_Vector x, N_Vector w)
  * Computes weighted square sum of a vector
  */
 
-realtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1419,7 +1419,7 @@ realtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        sum = ZERO;
+  sunrealtype        sum = ZERO;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(x);
@@ -1473,8 +1473,8 @@ realtype N_VWSqrSumLocal_Pthreads(N_Vector x, N_Vector w)
 static void *N_VWSqrSum_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *wd;
-  realtype local_sum, *global_sum;
+  sunrealtype *xd, *wd;
+  sunrealtype local_sum, *global_sum;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1509,7 +1509,7 @@ static void *N_VWSqrSum_PT(void *thread_data)
  * Computes weighted root mean square norm of a masked vector
  */
 
-realtype N_VWrmsNormMask_Pthreads(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Pthreads(N_Vector x, N_Vector w, N_Vector id)
 {
   return(SUNRsqrt(N_VWSqrSumMaskLocal_Pthreads(x, w, id)/(NV_LENGTH_PT(x))));
 }
@@ -1519,7 +1519,7 @@ realtype N_VWrmsNormMask_Pthreads(N_Vector x, N_Vector w, N_Vector id)
  * Computes weighted square sum of a masked vector
  */
 
-realtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1527,7 +1527,7 @@ realtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w, N_Vector id)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        sum = ZERO;
+  sunrealtype        sum = ZERO;
 
   /* allocate threads and thread data structs */
   N            = NV_LENGTH_PT(x);
@@ -1582,8 +1582,8 @@ realtype N_VWSqrSumMaskLocal_Pthreads(N_Vector x, N_Vector w, N_Vector id)
 static void *N_VWSqrSumMask_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *wd, *idd;
-  realtype local_sum, *global_sum;
+  sunrealtype *xd, *wd, *idd;
+  sunrealtype local_sum, *global_sum;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1621,7 +1621,7 @@ static void *N_VWSqrSumMask_PT(void *thread_data)
  * Finds the minimun component of a vector
  */
 
-realtype N_VMin_Pthreads(N_Vector x)
+sunrealtype N_VMin_Pthreads(N_Vector x)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1629,7 +1629,7 @@ realtype N_VMin_Pthreads(N_Vector x)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        min;
+  sunrealtype        min;
 
   /* initialize global min */
   min = NV_Ith_PT(x,0);
@@ -1685,8 +1685,8 @@ realtype N_VMin_Pthreads(N_Vector x)
 static void *N_VMin_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd;
-  realtype local_min, *global_min;
+  sunrealtype *xd;
+  sunrealtype local_min, *global_min;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1723,7 +1723,7 @@ static void *N_VMin_PT(void *thread_data)
  * Computes weighted L2 norm of a vector
  */
 
-realtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1731,7 +1731,7 @@ realtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        sum = ZERO;
+  sunrealtype        sum = ZERO;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(x);
@@ -1785,8 +1785,8 @@ realtype N_VWL2Norm_Pthreads(N_Vector x, N_Vector w)
 static void *N_VWL2Norm_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *wd;
-  realtype local_sum, *global_sum;
+  sunrealtype *xd, *wd;
+  sunrealtype local_sum, *global_sum;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1821,7 +1821,7 @@ static void *N_VWL2Norm_PT(void *thread_data)
  * Computes L1 norm of a vector
  */
 
-realtype N_VL1Norm_Pthreads(N_Vector x)
+sunrealtype N_VL1Norm_Pthreads(N_Vector x)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -1829,7 +1829,7 @@ realtype N_VL1Norm_Pthreads(N_Vector x)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        sum = ZERO;
+  sunrealtype        sum = ZERO;
 
   /* allocate threads and thread data structs */
   N            = NV_LENGTH_PT(x);
@@ -1882,8 +1882,8 @@ realtype N_VL1Norm_Pthreads(N_Vector x)
 static void *N_VL1Norm_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd;
-  realtype local_sum, *global_sum;
+  sunrealtype *xd;
+  sunrealtype local_sum, *global_sum;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -1917,7 +1917,7 @@ static void *N_VL1Norm_PT(void *thread_data)
  * Compare vector component values to a scaler
  */
 
-void N_VCompare_Pthreads(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Pthreads(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -1971,8 +1971,8 @@ void N_VCompare_Pthreads(realtype c, N_Vector x, N_Vector z)
 static void *N_VCompare_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype c;
-  realtype *xd, *zd;
+  sunrealtype c;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -1998,7 +1998,7 @@ static void *N_VCompare_PT(void *thread_data)
  * Compute componentwise inverse z[i] = ONE/x[i] and check if x[i] == ZERO
  */
 
-booleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2006,7 +2006,7 @@ booleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z)
   Pthreads_Data  *thread_data;
   pthread_attr_t attr;
 
-  realtype val = ZERO;
+  sunrealtype val = ZERO;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(x);
@@ -2058,8 +2058,8 @@ booleantype N_VInvTest_Pthreads(N_Vector x, N_Vector z)
 static void *N_VInvTest_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *zd;
-  realtype local_val, *global_val;
+  sunrealtype *xd, *zd;
+  sunrealtype local_val, *global_val;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -2096,7 +2096,7 @@ static void *N_VInvTest_PT(void *thread_data)
  * Compute constraint mask of a vector
  */
 
-booleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2104,7 +2104,7 @@ booleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x, N_Vector m)
   Pthreads_Data  *thread_data;
   pthread_attr_t attr;
 
-  realtype val = ZERO;
+  sunrealtype val = ZERO;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(x);
@@ -2157,8 +2157,8 @@ booleantype N_VConstrMask_Pthreads(N_Vector c, N_Vector x, N_Vector m)
 static void *N_VConstrMask_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *cd, *xd, *md;
-  realtype local_val, *global_val;
+  sunrealtype *cd, *xd, *md;
+  sunrealtype local_val, *global_val;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -2203,7 +2203,7 @@ static void *N_VConstrMask_PT(void *thread_data)
  * Compute minimum componentwise quotient
  */
 
-realtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -2211,7 +2211,7 @@ realtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom)
   Pthreads_Data   *thread_data;
   pthread_attr_t  attr;
   pthread_mutex_t global_mutex;
-  realtype        min = BIG_REAL;
+  sunrealtype        min = SUN_BIG_REAL;
 
   /* allocate threads and thread data structs */
   N           = NV_LENGTH_PT(num);
@@ -2265,8 +2265,8 @@ realtype N_VMinQuotient_Pthreads(N_Vector num, N_Vector denom)
 static void *N_VMinQuotient_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *nd, *dd;
-  realtype local_min, *global_min;
+  sunrealtype *nd, *dd;
+  sunrealtype local_min, *global_min;
   Pthreads_Data *my_data;
   pthread_mutex_t *global_mutex;
 
@@ -2283,7 +2283,7 @@ static void *N_VMinQuotient_PT(void *thread_data)
   end   = my_data->end;
 
   /* compute minimum quotient */
-  local_min = BIG_REAL;
+  local_min = SUN_BIG_REAL;
   for (i = start; i < end; i++) {
     if (dd[i] == ZERO)
       continue;
@@ -2312,7 +2312,7 @@ static void *N_VMinQuotient_PT(void *thread_data)
  * Compute the linear combination z = c[i]*X[i]
  */
 
-int N_VLinearCombination_Pthreads(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Pthreads(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2386,9 +2386,9 @@ static void *N_VLinearCombination_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* c=NULL;
-  realtype* xd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* c=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -2449,7 +2449,7 @@ static void *N_VLinearCombination_PT(void *thread_data)
  * Compute multiple linear sums Z[i] = Y[i] + a*x
  */
 
-int N_VScaleAddMulti_Pthreads(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_Pthreads(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2518,10 +2518,10 @@ static void *N_VScaleAddMulti_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* a=NULL;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* a=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -2563,7 +2563,7 @@ static void *N_VScaleAddMulti_PT(void *thread_data)
  * Compute the dot product of a vector with multiple vectors, a[i] = sum(x*Y[i])
  */
 
-int N_VDotProdMulti_Pthreads(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_Pthreads(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -2643,10 +2643,10 @@ static void *N_VDotProdMulti_PT(void *thread_data)
   pthread_mutex_t *lock;
 
   int       i;
-  realtype  sum;
-  realtype* dotprods=NULL;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
+  sunrealtype  sum;
+  sunrealtype* dotprods=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -2687,8 +2687,8 @@ static void *N_VDotProdMulti_PT(void *thread_data)
  * Compute multiple linear sums Z[i] = a*X[i] + b*Y[i]
  */
 
-int N_VLinearSumVectorArray_Pthreads(int nvec, realtype a, N_Vector* X,
-                                     realtype b, N_Vector* Y,  N_Vector* Z)
+int N_VLinearSumVectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X,
+                                     sunrealtype b, N_Vector* Y,  N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2696,10 +2696,10 @@ int N_VLinearSumVectorArray_Pthreads(int nvec, realtype a, N_Vector* X,
   Pthreads_Data  *thread_data;
   pthread_attr_t attr;
 
-  realtype    c;
+  sunrealtype    c;
   N_Vector*  V1;
   N_Vector*  V2;
-  booleantype test;
+  sunbooleantype test;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -2820,10 +2820,10 @@ static void *N_VLinearSumVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  a, b;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype  a, b;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -2853,7 +2853,7 @@ static void *N_VLinearSumVectorArray_PT(void *thread_data)
  * Scale multiple vectors Z[i] = c[i]*X[i]
  */
 
-int N_VScaleVectorArray_Pthreads(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Pthreads(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -2922,9 +2922,9 @@ static void *N_VScaleVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* c;
-  realtype* xd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* c;
+  sunrealtype* xd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -2965,7 +2965,7 @@ static void *N_VScaleVectorArray_PT(void *thread_data)
  * Set multiple vectors to a constant value Z[i] = c
  */
 
-int N_VConstVectorArray_Pthreads(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Pthreads(int nvec, sunrealtype c, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -3033,7 +3033,7 @@ static void *N_VConstVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* zd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -3058,7 +3058,7 @@ static void *N_VConstVectorArray_PT(void *thread_data)
  * Compute the weighted root mean square norm of multiple vectors
  */
 
-int N_VWrmsNormVectorArray_Pthreads(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray_Pthreads(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -3143,10 +3143,10 @@ static void *N_VWrmsNormVectorArray_PT(void *thread_data)
   pthread_mutex_t *lock;
 
   int       i;
-  realtype  sum;
-  realtype* nrm=NULL;
-  realtype* xd=NULL;
-  realtype* wd=NULL;
+  sunrealtype  sum;
+  sunrealtype* nrm=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* wd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -3181,7 +3181,7 @@ static void *N_VWrmsNormVectorArray_PT(void *thread_data)
  */
 
 int N_VWrmsNormMaskVectorArray_Pthreads(int nvec, N_Vector* X, N_Vector* W,
-                                        N_Vector id, realtype* nrm)
+                                        N_Vector id, sunrealtype* nrm)
 {
   sunindextype    N;
   int             i, nthreads;
@@ -3267,11 +3267,11 @@ static void *N_VWrmsNormMaskVectorArray_PT(void *thread_data)
   pthread_mutex_t *lock;
 
   int       i;
-  realtype  sum;
-  realtype* nrm=NULL;
-  realtype* xd=NULL;
-  realtype* wd=NULL;
-  realtype* idd=NULL;
+  sunrealtype  sum;
+  sunrealtype* nrm=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* wd=NULL;
+  sunrealtype* idd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -3307,7 +3307,7 @@ static void *N_VWrmsNormMaskVectorArray_PT(void *thread_data)
  * Scale and add a vector to multiple vectors Z = Y + a*X
  */
 
-int N_VScaleAddMultiVectorArray_Pthreads(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_Pthreads(int nvec, int nsum, sunrealtype* a,
                                           N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   sunindextype   N;
@@ -3420,10 +3420,10 @@ static void *N_VScaleAddMultiVectorArray_PT(void *thread_data)
   sunindextype  k, start, end;
 
   int       i, j;
-  realtype* a=NULL;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* a=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -3470,7 +3470,7 @@ static void *N_VScaleAddMultiVectorArray_PT(void *thread_data)
  * Compute a linear combination for multiple vectors
  */
 
-int N_VLinearCombinationVectorArray_Pthreads(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Pthreads(int nvec, int nsum, sunrealtype* c,
                                            N_Vector** X, N_Vector* Z)
 {
   sunindextype   N;
@@ -3480,7 +3480,7 @@ int N_VLinearCombinationVectorArray_Pthreads(int nvec, int nsum, realtype* c,
   pthread_attr_t attr;
 
   int          retval;
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*   Y;
 
   /* invalid number of vectors */
@@ -3525,7 +3525,7 @@ int N_VLinearCombinationVectorArray_Pthreads(int nvec, int nsum, realtype* c,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -3601,9 +3601,9 @@ static void *N_VLinearCombinationVectorArray_PT(void *thread_data)
 
   int       i; /* vector arrays index in summation [0,nsum) */
   int       j; /* vector index in vector array     [0,nvec) */
-  realtype* c=NULL;
-  realtype* zd=NULL;
-  realtype* xd=NULL;
+  sunrealtype* c=NULL;
+  sunrealtype* zd=NULL;
+  sunrealtype* xd=NULL;
 
   /* extract thread data */
   my_data = (Pthreads_Data *) thread_data;
@@ -3683,7 +3683,7 @@ static void *N_VLinearCombinationVectorArray_PT(void *thread_data)
 int N_VBufSize_Pthreads(N_Vector x, sunindextype *size)
 {
   if (x == NULL) return(-1);
-  *size = NV_LENGTH_PT(x) * ((sunindextype)sizeof(realtype));
+  *size = NV_LENGTH_PT(x) * ((sunindextype)sizeof(sunrealtype));
   return(0);
 }
 
@@ -3721,7 +3721,7 @@ int N_VBufPack_Pthreads(N_Vector x, void *buf)
 
     /* pack thread data */
     thread_data[i].v1 = NV_DATA_PT(x);
-    thread_data[i].v2 = (realtype*)buf;
+    thread_data[i].v2 = (sunrealtype*)buf;
 
     /* create threads and call pthread companion function */
     pthread_create(&threads[i], &attr, VBufPack_PT, (void *) &thread_data[i]);
@@ -3749,7 +3749,7 @@ int N_VBufPack_Pthreads(N_Vector x, void *buf)
 static void *VBufPack_PT(void *thread_data)
 {
   sunindextype  i, start, end;
-  realtype      *xd, *bd;
+  sunrealtype      *xd, *bd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -3803,7 +3803,7 @@ int N_VBufUnpack_Pthreads(N_Vector x, void *buf)
 
     /* pack thread data */
     thread_data[i].v1 = NV_DATA_PT(x);
-    thread_data[i].v2 = (realtype*)buf;
+    thread_data[i].v2 = (sunrealtype*)buf;
 
     /* create threads and call pthread companion function */
     pthread_create(&threads[i], &attr, VBufUnpack_PT, (void *) &thread_data[i]);
@@ -3831,7 +3831,7 @@ int N_VBufUnpack_Pthreads(N_Vector x, void *buf)
 static void *VBufUnpack_PT(void *thread_data)
 {
   sunindextype  i, start, end;
-  realtype      *xd, *bd;
+  sunrealtype      *xd, *bd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -3917,7 +3917,7 @@ static void VCopy_Pthreads(N_Vector x, N_Vector z)
 static void *VCopy_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -3997,7 +3997,7 @@ static void VSum_Pthreads(N_Vector x, N_Vector y, N_Vector z)
 static void *VSum_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4078,7 +4078,7 @@ static void VDiff_Pthreads(N_Vector x, N_Vector y, N_Vector z)
 static void *VDiff_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4158,7 +4158,7 @@ static void VNeg_Pthreads(N_Vector x, N_Vector z)
 static void *VNeg_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4183,7 +4183,7 @@ static void *VNeg_PT(void *thread_data)
  * Compute scaled vector sum
  */
 
-static void VScaleSum_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_Pthreads(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4239,8 +4239,8 @@ static void VScaleSum_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z)
 static void *VScaleSum_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype c;
-  realtype *xd, *yd, *zd;
+  sunrealtype c;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4267,7 +4267,7 @@ static void *VScaleSum_PT(void *thread_data)
  * Compute scaled vector difference
  */
 
-static void VScaleDiff_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_Pthreads(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4323,8 +4323,8 @@ static void VScaleDiff_Pthreads(realtype c, N_Vector x, N_Vector y, N_Vector z)
 static void *VScaleDiff_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype c;
-  realtype *xd, *yd, *zd;
+  sunrealtype c;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4351,7 +4351,7 @@ static void *VScaleDiff_PT(void *thread_data)
  * Compute vector sum z[i] = a*x[i]+y[i]
  */
 
-static void VLin1_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_Pthreads(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4407,8 +4407,8 @@ static void VLin1_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z)
 static void *VLin1_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype a;
-  realtype *xd, *yd, *zd;
+  sunrealtype a;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4435,7 +4435,7 @@ static void *VLin1_PT(void *thread_data)
  * Compute vector difference z[i] = a*x[i]-y[i]
  */
 
-static void VLin2_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_Pthreads(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4490,8 +4490,8 @@ static void VLin2_Pthreads(realtype a, N_Vector x, N_Vector y, N_Vector z)
 static void *VLin2_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype a;
-  realtype *xd, *yd, *zd;
+  sunrealtype a;
+  sunrealtype *xd, *yd, *zd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4518,7 +4518,7 @@ static void *VLin2_PT(void *thread_data)
  * Compute special cases of linear sum
  */
 
-static void Vaxpy_Pthreads(realtype a, N_Vector x, N_Vector y)
+static void Vaxpy_Pthreads(sunrealtype a, N_Vector x, N_Vector y)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4572,8 +4572,8 @@ static void Vaxpy_Pthreads(realtype a, N_Vector x, N_Vector y)
 static void *Vaxpy_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype a;
-  realtype *xd, *yd;
+  sunrealtype a;
+  sunrealtype *xd, *yd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4615,7 +4615,7 @@ static void *Vaxpy_PT(void *thread_data)
  * Compute scaled vector
  */
 
-static void VScaleBy_Pthreads(realtype a, N_Vector x)
+static void VScaleBy_Pthreads(sunrealtype a, N_Vector x)
 {
   sunindextype  N;
   int           i, nthreads;
@@ -4669,8 +4669,8 @@ static void VScaleBy_Pthreads(realtype a, N_Vector x)
 static void *VScaleBy_PT(void *thread_data)
 {
   sunindextype i, start, end;
-  realtype a;
-  realtype *xd;
+  sunrealtype a;
+  sunrealtype *xd;
   Pthreads_Data *my_data;
 
   /* extract thread data */
@@ -4747,9 +4747,9 @@ static void *VSumVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -4817,9 +4817,9 @@ static void *VDiffVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -4837,7 +4837,7 @@ static void *VDiffVectorArray_PT(void *thread_data)
 }
 
 
-static int VScaleSumVectorArray_Pthreads(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleSumVectorArray_Pthreads(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -4888,10 +4888,10 @@ static void *VScaleSumVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  c;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype  c;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -4910,7 +4910,7 @@ static void *VScaleSumVectorArray_PT(void *thread_data)
 }
 
 
-static int VScaleDiffVectorArray_Pthreads(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleDiffVectorArray_Pthreads(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -4961,10 +4961,10 @@ static void *VScaleDiffVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  c;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype  c;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -4983,7 +4983,7 @@ static void *VScaleDiffVectorArray_PT(void *thread_data)
 }
 
 
-static int VLin1VectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin1VectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -5034,10 +5034,10 @@ static void *VLin1VectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  a;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype  a;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -5056,7 +5056,7 @@ static void *VLin1VectorArray_PT(void *thread_data)
 }
 
 
-static int VLin2VectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin2VectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -5107,10 +5107,10 @@ static void *VLin2VectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  a;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
-  realtype* zd=NULL;
+  sunrealtype  a;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
+  sunrealtype* zd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -5129,7 +5129,7 @@ static void *VLin2VectorArray_PT(void *thread_data)
 }
 
 
-static int VaxpyVectorArray_Pthreads(int nvec, realtype a, N_Vector* X, N_Vector* Y)
+static int VaxpyVectorArray_Pthreads(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y)
 {
   sunindextype   N;
   int            i, nthreads;
@@ -5179,9 +5179,9 @@ static void *VaxpyVectorArray_PT(void *thread_data)
   sunindextype  j, start, end;
 
   int       i;
-  realtype  a;
-  realtype* xd=NULL;
-  realtype* yd=NULL;
+  sunrealtype  a;
+  sunrealtype* xd=NULL;
+  sunrealtype* yd=NULL;
 
   my_data = (Pthreads_Data *) thread_data;
   start   = my_data->start;
@@ -5286,7 +5286,7 @@ static void N_VInitThreadData(Pthreads_Data *thread_data)
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5331,7 +5331,7 @@ int N_VEnableFusedOps_Pthreads(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5349,7 +5349,7 @@ int N_VEnableLinearCombination_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5367,7 +5367,7 @@ int N_VEnableScaleAddMulti_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5388,7 +5388,7 @@ int N_VEnableDotProdMulti_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5406,7 +5406,7 @@ int N_VEnableLinearSumVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5424,7 +5424,7 @@ int N_VEnableScaleVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5442,7 +5442,7 @@ int N_VEnableConstVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5460,7 +5460,7 @@ int N_VEnableWrmsNormVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5478,7 +5478,7 @@ int N_VEnableWrmsNormMaskVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -5496,7 +5496,7 @@ int N_VEnableScaleAddMultiVectorArray_Pthreads(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Pthreads(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/raja/nvector_raja.cpp b/src/nvector/raja/nvector_raja.cpp
index 4227739660..a9609c0451 100644
--- a/src/nvector/raja/nvector_raja.cpp
+++ b/src/nvector/raja/nvector_raja.cpp
@@ -55,10 +55,10 @@
 #error "Unknown RAJA backend"
 #endif
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 extern "C" {
 
@@ -67,15 +67,15 @@ static constexpr sunindextype zeroIdx = 0;
 
 // Helpful macros
 #define NVEC_RAJA_CONTENT(x) ((N_VectorContent_Raja)(x->content))
-#define NVEC_RAJA_MEMSIZE(x) (NVEC_RAJA_CONTENT(x)->length * sizeof(realtype))
+#define NVEC_RAJA_MEMSIZE(x) (NVEC_RAJA_CONTENT(x)->length * sizeof(sunrealtype))
 #define NVEC_RAJA_MEMHELP(x) (NVEC_RAJA_CONTENT(x)->mem_helper)
-#define NVEC_RAJA_HDATAp(x)  ((realtype*) NVEC_RAJA_CONTENT(x)->host_data->ptr)
-#define NVEC_RAJA_DDATAp(x)  ((realtype*) NVEC_RAJA_CONTENT(x)->device_data->ptr)
+#define NVEC_RAJA_HDATAp(x)  ((sunrealtype*) NVEC_RAJA_CONTENT(x)->host_data->ptr)
+#define NVEC_RAJA_DDATAp(x)  ((sunrealtype*) NVEC_RAJA_CONTENT(x)->device_data->ptr)
 
 // Macros to access vector private content
 #define NVEC_RAJA_PRIVATE(x)  ((N_PrivateVectorContent_Raja)(NVEC_RAJA_CONTENT(x)->priv))
-#define NVEC_RAJA_HBUFFERp(x) ((realtype*) NVEC_RAJA_PRIVATE(x)->reduce_buffer_host->ptr)
-#define NVEC_RAJA_DBUFFERp(x) ((realtype*) NVEC_RAJA_PRIVATE(x)->reduce_buffer_dev->ptr)
+#define NVEC_RAJA_HBUFFERp(x) ((sunrealtype*) NVEC_RAJA_PRIVATE(x)->reduce_buffer_host->ptr)
+#define NVEC_RAJA_DBUFFERp(x) ((sunrealtype*) NVEC_RAJA_PRIVATE(x)->reduce_buffer_dev->ptr)
 
 /*
  * Private structure definition
@@ -83,7 +83,7 @@ static constexpr sunindextype zeroIdx = 0;
 
 struct _N_PrivateVectorContent_Raja
 {
-  booleantype use_managed_mem; /* do data pointers use managed memory */
+  sunbooleantype use_managed_mem; /* do data pointers use managed memory */
 
   /* fused op workspace */
   SUNMemory fused_buffer_dev;    /* device memory for fused ops    */
@@ -105,12 +105,12 @@ static int AllocateData(N_Vector v);
 
 // Fused operation buffer functions
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr);
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *r_data, int nval,
-                                     realtype **shortcut);
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *r_data, int nval,
+                                     sunrealtype **shortcut);
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut);
+                                      sunrealtype ***shortcut);
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut);
+                                      int nsum, sunrealtype ***shortcut);
 static int FusedBuffer_CopyToDevice(N_Vector v);
 static int FusedBuffer_Free(N_Vector v);
 
@@ -249,7 +249,7 @@ N_Vector N_VNew_Raja(sunindextype length, SUNContext sunctx)
 }
 
 N_Vector N_VNewWithMemHelp_Raja(sunindextype length,
-                                booleantype use_managed_mem,
+                                sunbooleantype use_managed_mem,
                                 SUNMemoryHelper helper,
                                 SUNContext sunctx)
 {
@@ -326,7 +326,7 @@ N_Vector N_VNewManaged_Raja(sunindextype length, SUNContext sunctx)
   return(v);
 }
 
-N_Vector N_VMake_Raja(sunindextype length, realtype *h_vdata, realtype *d_vdata,
+N_Vector N_VMake_Raja(sunindextype length, sunrealtype *h_vdata, sunrealtype *d_vdata,
                       SUNContext sunctx)
 {
   N_Vector v;
@@ -369,7 +369,7 @@ N_Vector N_VMake_Raja(sunindextype length, realtype *h_vdata, realtype *d_vdata,
   return(v);
 }
 
-N_Vector N_VMakeManaged_Raja(sunindextype length, realtype *vdata,
+N_Vector N_VMakeManaged_Raja(sunindextype length, sunrealtype *vdata,
                              SUNContext sunctx)
 {
   N_Vector v;
@@ -424,7 +424,7 @@ extern sunindextype N_VGetLength_Raja(N_Vector v);
  * we just mark it as extern here.
  */
 
-extern realtype *N_VGetHostArrayPointer_Raja(N_Vector x);
+extern sunrealtype *N_VGetHostArrayPointer_Raja(N_Vector x);
 
 /* ----------------------------------------------------------------------------
  * Return pointer to the raw device data.
@@ -432,14 +432,14 @@ extern realtype *N_VGetHostArrayPointer_Raja(N_Vector x);
  * we just mark it as extern here.
  */
 
-extern realtype *N_VGetDeviceArrayPointer_Raja(N_Vector x);
+extern sunrealtype *N_VGetDeviceArrayPointer_Raja(N_Vector x);
 
 
 /* ----------------------------------------------------------------------------
  * Set pointer to the raw host data. Does not free the existing pointer.
  */
 
-void N_VSetHostArrayPointer_Raja(realtype* h_vdata, N_Vector v)
+void N_VSetHostArrayPointer_Raja(sunrealtype* h_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Raja(v))
   {
@@ -471,7 +471,7 @@ void N_VSetHostArrayPointer_Raja(realtype* h_vdata, N_Vector v)
  * Set pointer to the raw device data
  */
 
-void N_VSetDeviceArrayPointer_Raja(realtype* d_vdata, N_Vector v)
+void N_VSetDeviceArrayPointer_Raja(sunrealtype* d_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Raja(v))
   {
@@ -502,7 +502,7 @@ void N_VSetDeviceArrayPointer_Raja(realtype* d_vdata, N_Vector v)
 /* ----------------------------------------------------------------------------
  * Return a flag indicating if the memory for the vector data is managed
  */
-booleantype N_VIsManagedMemory_Raja(N_Vector x)
+sunbooleantype N_VIsManagedMemory_Raja(N_Vector x)
 {
   return NVEC_RAJA_PRIVATE(x)->use_managed_mem;
 }
@@ -727,22 +727,22 @@ void N_VSpace_Raja(N_Vector X, sunindextype *lrw, sunindextype *liw)
   *liw = 2;
 }
 
-void N_VConst_Raja(realtype c, N_Vector Z)
+void N_VConst_Raja(sunrealtype c, N_Vector Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(Z)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N), [=] RAJA_DEVICE (sunindextype i) {
      zdata[i] = c;
   });
 }
 
-void N_VLinearSum_Raja(realtype a, N_Vector X, realtype b, N_Vector Y, N_Vector Z)
+void N_VLinearSum_Raja(sunrealtype a, N_Vector X, sunrealtype b, N_Vector Y, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *ydata = NVEC_RAJA_DDATAp(Y);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *ydata = NVEC_RAJA_DDATAp(Y);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -753,10 +753,10 @@ void N_VLinearSum_Raja(realtype a, N_Vector X, realtype b, N_Vector Y, N_Vector
 
 void N_VProd_Raja(N_Vector X, N_Vector Y, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *ydata = NVEC_RAJA_DDATAp(Y);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *ydata = NVEC_RAJA_DDATAp(Y);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -767,10 +767,10 @@ void N_VProd_Raja(N_Vector X, N_Vector Y, N_Vector Z)
 
 void N_VDiv_Raja(N_Vector X, N_Vector Y, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *ydata = NVEC_RAJA_DDATAp(Y);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *ydata = NVEC_RAJA_DDATAp(Y);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -779,11 +779,11 @@ void N_VDiv_Raja(N_Vector X, N_Vector Y, N_Vector Z)
   );
 }
 
-void N_VScale_Raja(realtype c, N_Vector X, N_Vector Z)
+void N_VScale_Raja(sunrealtype c, N_Vector X, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -794,9 +794,9 @@ void N_VScale_Raja(realtype c, N_Vector X, N_Vector Z)
 
 void N_VAbs_Raja(N_Vector X, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -807,9 +807,9 @@ void N_VAbs_Raja(N_Vector X, N_Vector Z)
 
 void N_VInv_Raja(N_Vector X, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -818,11 +818,11 @@ void N_VInv_Raja(N_Vector X, N_Vector Z)
   );
 }
 
-void N_VAddConst_Raja(N_Vector X, realtype b, N_Vector Z)
+void N_VAddConst_Raja(N_Vector X, sunrealtype b, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -831,68 +831,68 @@ void N_VAddConst_Raja(N_Vector X, realtype b, N_Vector Z)
   );
 }
 
-realtype N_VDotProd_Raja(N_Vector X, N_Vector Y)
+sunrealtype N_VDotProd_Raja(N_Vector X, N_Vector Y)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *ydata = NVEC_RAJA_DDATAp(Y);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *ydata = NVEC_RAJA_DDATAp(Y);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(0.0);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(0.0);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       gpu_result += xdata[i] * ydata[i] ;
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-realtype N_VMaxNorm_Raja(N_Vector X)
+sunrealtype N_VMaxNorm_Raja(N_Vector X)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceMax< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(0.0);
+  RAJA::ReduceMax< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(0.0);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       gpu_result.max(abs(xdata[i]));
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-realtype N_VWSqrSumLocal_Raja(N_Vector X, N_Vector W)
+sunrealtype N_VWSqrSumLocal_Raja(N_Vector X, N_Vector W)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *wdata = NVEC_RAJA_DDATAp(W);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *wdata = NVEC_RAJA_DDATAp(W);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(0.0);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(0.0);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       gpu_result += (xdata[i] * wdata[i] * xdata[i] * wdata[i]);
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-realtype N_VWrmsNorm_Raja(N_Vector X, N_Vector W)
+sunrealtype N_VWrmsNorm_Raja(N_Vector X, N_Vector W)
 {
-  const realtype sum = N_VWSqrSumLocal_Raja(X, W);
+  const sunrealtype sum = N_VWSqrSumLocal_Raja(X, W);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
   return std::sqrt(sum/N);
 }
 
-realtype N_VWSqrSumMaskLocal_Raja(N_Vector X, N_Vector W, N_Vector ID)
+sunrealtype N_VWSqrSumMaskLocal_Raja(N_Vector X, N_Vector W, N_Vector ID)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
-  const realtype *wdata = NVEC_RAJA_DDATAp(W);
-  const realtype *iddata = NVEC_RAJA_DDATAp(ID);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *wdata = NVEC_RAJA_DDATAp(W);
+  const sunrealtype *iddata = NVEC_RAJA_DDATAp(ID);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(0.0);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(0.0);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       if (iddata[i] > ZERO)
@@ -900,56 +900,56 @@ realtype N_VWSqrSumMaskLocal_Raja(N_Vector X, N_Vector W, N_Vector ID)
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-realtype N_VWrmsNormMask_Raja(N_Vector X, N_Vector W, N_Vector ID)
+sunrealtype N_VWrmsNormMask_Raja(N_Vector X, N_Vector W, N_Vector ID)
 {
-  const realtype sum = N_VWSqrSumMaskLocal_Raja(X, W, ID);
+  const sunrealtype sum = N_VWSqrSumMaskLocal_Raja(X, W, ID);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
   return std::sqrt(sum/N);
 }
 
-realtype N_VMin_Raja(N_Vector X)
+sunrealtype N_VMin_Raja(N_Vector X)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceMin< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(std::numeric_limits<realtype>::max());
+  RAJA::ReduceMin< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(std::numeric_limits<sunrealtype>::max());
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       gpu_result.min(xdata[i]);
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-realtype N_VWL2Norm_Raja(N_Vector X, N_Vector W)
+sunrealtype N_VWL2Norm_Raja(N_Vector X, N_Vector W)
 {
   return std::sqrt(N_VWSqrSumLocal_Raja(X, W));
 }
 
-realtype N_VL1Norm_Raja(N_Vector X)
+sunrealtype N_VL1Norm_Raja(N_Vector X)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(0.0);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(0.0);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       gpu_result += (abs(xdata[i]));
     }
   );
 
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
-void N_VCompare_Raja(realtype c, N_Vector X, N_Vector Z)
+void N_VCompare_Raja(sunrealtype c, N_Vector X, N_Vector Z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(X);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(X);
   const sunindextype N = NVEC_RAJA_CONTENT(X)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(Z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(Z);
 
   RAJA::forall< SUNDIALS_RAJA_EXEC_STREAM >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
@@ -958,13 +958,13 @@ void N_VCompare_Raja(realtype c, N_Vector X, N_Vector Z)
   );
 }
 
-booleantype N_VInvTest_Raja(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Raja(N_Vector x, N_Vector z)
 {
-  const realtype *xdata = NVEC_RAJA_DDATAp(x);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(x);
   const sunindextype N = NVEC_RAJA_CONTENT(x)->length;
-  realtype *zdata = NVEC_RAJA_DDATAp(z);
+  sunrealtype *zdata = NVEC_RAJA_DDATAp(z);
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(ZERO);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(ZERO);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       if (xdata[i] == ZERO) {
@@ -974,18 +974,18 @@ booleantype N_VInvTest_Raja(N_Vector x, N_Vector z)
       }
     }
   );
-  realtype minimum = static_cast<realtype>(gpu_result);
+  sunrealtype minimum = static_cast<sunrealtype>(gpu_result);
   return (minimum < HALF);
 }
 
-booleantype N_VConstrMask_Raja(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Raja(N_Vector c, N_Vector x, N_Vector m)
 {
-  const realtype *cdata = NVEC_RAJA_DDATAp(c);
-  const realtype *xdata = NVEC_RAJA_DDATAp(x);
+  const sunrealtype *cdata = NVEC_RAJA_DDATAp(c);
+  const sunrealtype *xdata = NVEC_RAJA_DDATAp(x);
   const sunindextype N = NVEC_RAJA_CONTENT(x)->length;
-  realtype *mdata = NVEC_RAJA_DDATAp(m);
+  sunrealtype *mdata = NVEC_RAJA_DDATAp(m);
 
-  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(ZERO);
+  RAJA::ReduceSum< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(ZERO);
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       bool test = (abs(cdata[i]) > ONEPT5 && cdata[i]*xdata[i] <= ZERO) ||
@@ -995,24 +995,24 @@ booleantype N_VConstrMask_Raja(N_Vector c, N_Vector x, N_Vector m)
     }
   );
 
-  realtype sum = static_cast<realtype>(gpu_result);
+  sunrealtype sum = static_cast<sunrealtype>(gpu_result);
   return(sum < HALF);
 }
 
-realtype N_VMinQuotient_Raja(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Raja(N_Vector num, N_Vector denom)
 {
-  const realtype *ndata = NVEC_RAJA_DDATAp(num);
-  const realtype *ddata = NVEC_RAJA_DDATAp(denom);
+  const sunrealtype *ndata = NVEC_RAJA_DDATAp(num);
+  const sunrealtype *ddata = NVEC_RAJA_DDATAp(denom);
   const sunindextype N = NVEC_RAJA_CONTENT(num)->length;
 
-  RAJA::ReduceMin< SUNDIALS_RAJA_REDUCE, realtype> gpu_result(std::numeric_limits<realtype>::max());
+  RAJA::ReduceMin< SUNDIALS_RAJA_REDUCE, sunrealtype> gpu_result(std::numeric_limits<sunrealtype>::max());
   RAJA::forall< SUNDIALS_RAJA_EXEC_REDUCE >(RAJA::RangeSegment(zeroIdx, N),
     [=] RAJA_DEVICE (sunindextype i) {
       if (ddata[i] != ZERO)
         gpu_result.min(ndata[i]/ddata[i]);
     }
   );
-  return (static_cast<realtype>(gpu_result));
+  return (static_cast<sunrealtype>(gpu_result));
 }
 
 
@@ -1023,14 +1023,14 @@ realtype N_VMinQuotient_Raja(N_Vector num, N_Vector denom)
  */
 
 
-int N_VLinearCombination_Raja(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Raja(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   const sunindextype N     = NVEC_RAJA_CONTENT(z)->length;
-  realtype*          zdata = NVEC_RAJA_DDATAp(z);
+  sunrealtype*          zdata = NVEC_RAJA_DDATAp(z);
 
   // Fused op workspace shortcuts
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(z, nvec, nvec))
@@ -1069,16 +1069,16 @@ int N_VLinearCombination_Raja(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_Raja(int nvec, realtype* c, N_Vector x, N_Vector* Y,
+int N_VScaleAddMulti_Raja(int nvec, sunrealtype* c, N_Vector x, N_Vector* Y,
                           N_Vector* Z)
 {
   const sunindextype N      = NVEC_RAJA_CONTENT(x)->length;
-  const realtype     *xdata = NVEC_RAJA_DDATAp(x);
+  const sunrealtype     *xdata = NVEC_RAJA_DDATAp(x);
 
   // Shortcuts to the fused op workspace
-  realtype*  cdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(x, nvec, 2 * nvec))
@@ -1130,16 +1130,16 @@ int N_VScaleAddMulti_Raja(int nvec, realtype* c, N_Vector x, N_Vector* Y,
 
 
 int N_VLinearSumVectorArray_Raja(int nvec,
-                                 realtype a, N_Vector* X,
-                                 realtype b, N_Vector* Y,
+                                 sunrealtype a, N_Vector* X,
+                                 sunrealtype b, N_Vector* Y,
                                  N_Vector* Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(Z[0])->length;
 
   // Shortcuts to the fused op workspace
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], 0, 3 * nvec))
@@ -1183,14 +1183,14 @@ int N_VLinearSumVectorArray_Raja(int nvec,
 }
 
 
-int N_VScaleVectorArray_Raja(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Raja(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(Z[0])->length;
 
   // Shortcuts to the fused op workspace arrays
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], nvec, 2 * nvec))
@@ -1234,12 +1234,12 @@ int N_VScaleVectorArray_Raja(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_Raja(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Raja(int nvec, sunrealtype c, N_Vector* Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(Z[0])->length;
 
   // Shortcuts to the fused op workspace arrays
-  realtype** zdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], 0, nvec))
@@ -1271,16 +1271,16 @@ int N_VConstVectorArray_Raja(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VScaleAddMultiVectorArray_Raja(int nvec, int nsum, realtype* c,
+int N_VScaleAddMultiVectorArray_Raja(int nvec, int nsum, sunrealtype* c,
                                      N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(X[0])->length;
 
   // Shortcuts to the fused op workspace
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(X[0], nsum, nvec + 2 * nvec * nsum))
@@ -1332,15 +1332,15 @@ int N_VScaleAddMultiVectorArray_Raja(int nvec, int nsum, realtype* c,
 }
 
 
-int N_VLinearCombinationVectorArray_Raja(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Raja(int nvec, int nsum, sunrealtype* c,
                                          N_Vector** X, N_Vector* Z)
 {
   const sunindextype N = NVEC_RAJA_CONTENT(Z[0])->length;
 
   // Shortcuts to the fused op workspace arrays
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   // Setup the fused op workspace
   if (FusedBuffer_Init(Z[0], nsum, nvec + nvec * nsum))
@@ -1493,7 +1493,7 @@ int N_VBufUnpack_Raja(N_Vector x, void *buf)
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_Raja(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1533,7 +1533,7 @@ int N_VEnableFusedOps_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombination_Raja(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1551,7 +1551,7 @@ int N_VEnableLinearCombination_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Raja(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1569,7 +1569,7 @@ int N_VEnableScaleAddMulti_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Raja(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1587,7 +1587,7 @@ int N_VEnableLinearSumVectorArray_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Raja(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1605,7 +1605,7 @@ int N_VEnableScaleVectorArray_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Raja(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1623,7 +1623,7 @@ int N_VEnableConstVectorArray_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1641,7 +1641,7 @@ int N_VEnableScaleAddMultiVectorArray_Raja(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Raja(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1717,8 +1717,8 @@ int AllocateData(N_Vector v)
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 {
   int         alloc_fail = 0;
-  booleantype alloc_mem  = SUNFALSE;
-  size_t      bytes      = nreal * sizeof(realtype) + nptr * sizeof(realtype*);
+  sunbooleantype alloc_mem  = SUNFALSE;
+  size_t      bytes      = nreal * sizeof(sunrealtype) + nptr * sizeof(sunrealtype*);
 
   // Get the vector private memory structure
   N_PrivateVectorContent_Raja vcp = NVEC_RAJA_PRIVATE(v);
@@ -1778,8 +1778,8 @@ static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 }
 
 
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
-                                     realtype **shortcut)
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *rdata, int nval,
+                                     sunrealtype **shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Raja vcp = NVEC_RAJA_PRIVATE(v);
@@ -1791,7 +1791,7 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
     return -1;
   }
 
-  realtype* h_buffer = (realtype*) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype* h_buffer = (sunrealtype*) ((char*)(vcp->fused_buffer_host->ptr) +
                                     vcp->fused_buffer_offset);
 
   for (int j = 0; j < nval; j++)
@@ -1800,17 +1800,17 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
                            vcp->fused_buffer_offset);
 
-  vcp->fused_buffer_offset += nval * sizeof(realtype);
+  vcp->fused_buffer_offset += nval * sizeof(sunrealtype);
 
   return 0;
 }
 
 
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut)
+                                      sunrealtype ***shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Raja vcp = NVEC_RAJA_PRIVATE(v);
@@ -1822,7 +1822,7 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -1831,17 +1831,17 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
-  vcp->fused_buffer_offset += nvec * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * sizeof(sunrealtype*);
 
   return 0;
 }
 
 
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut)
+                                      int nsum, sunrealtype ***shortcut)
 {
   // Get the vector private memory structure
   N_PrivateVectorContent_Raja vcp = NVEC_RAJA_PRIVATE(v);
@@ -1853,7 +1853,7 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -1865,11 +1865,11 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
   }
 
   // Set shortcut to the device buffer and update offset
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
   // Update the offset
-  vcp->fused_buffer_offset += nvec * nsum * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * nsum * sizeof(sunrealtype*);
 
   return 0;
 }
diff --git a/src/nvector/serial/fmod/fnvector_serial_mod.c b/src/nvector/serial/fmod/fnvector_serial_mod.c
index 591ee2c0f7..fd4aa8c1e0 100644
--- a/src/nvector/serial/fmod/fnvector_serial_mod.c
+++ b/src/nvector/serial/fmod/fnvector_serial_mod.c
@@ -239,12 +239,12 @@ SWIGEXPORT N_Vector _wrap_FN_VNewEmpty_Serial(int64_t const *farg1, void *farg2)
 SWIGEXPORT N_Vector _wrap_FN_VMake_Serial(int64_t const *farg1, double *farg2, void *farg3) {
   N_Vector fresult ;
   sunindextype arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   SUNContext arg3 = (SUNContext) 0 ;
   N_Vector result;
   
   arg1 = (sunindextype)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (SUNContext)(farg3);
   result = (N_Vector)N_VMake_Serial(arg1,arg2,arg3);
   fresult = result;
@@ -339,25 +339,25 @@ SWIGEXPORT void _wrap_FN_VSpace_Serial(N_Vector farg1, int64_t *farg2, int64_t *
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer_Serial(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer_Serial(arg1,arg2);
 }
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum_Serial(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum_Serial(arg1,arg2,arg3,arg4,arg5);
@@ -365,10 +365,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum_Serial(double const *farg1, N_Vector farg2,
 
 
 SWIGEXPORT void _wrap_FN_VConst_Serial(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst_Serial(arg1,arg2);
 }
@@ -399,11 +399,11 @@ SWIGEXPORT void _wrap_FN_VDiv_Serial(N_Vector farg1, N_Vector farg2, N_Vector fa
 
 
 SWIGEXPORT void _wrap_FN_VScale_Serial(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale_Serial(arg1,arg2,arg3);
@@ -432,11 +432,11 @@ SWIGEXPORT void _wrap_FN_VInv_Serial(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst_Serial(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst_Serial(arg1,arg2,arg3);
 }
@@ -446,12 +446,12 @@ SWIGEXPORT double _wrap_FN_VDotProd_Serial(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd_Serial(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd_Serial(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -459,11 +459,11 @@ SWIGEXPORT double _wrap_FN_VDotProd_Serial(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNorm_Serial(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm_Serial(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm_Serial(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -472,12 +472,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm_Serial(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm_Serial(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm_Serial(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -487,13 +487,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Serial(N_Vector farg1, N_Vector farg2,
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask_Serial(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask_Serial(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -501,11 +501,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask_Serial(N_Vector farg1, N_Vector farg2,
 SWIGEXPORT double _wrap_FN_VMin_Serial(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin_Serial(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin_Serial(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -514,12 +514,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Serial(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm_Serial(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm_Serial(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -527,21 +527,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm_Serial(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VL1Norm_Serial(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm_Serial(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm_Serial(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare_Serial(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare_Serial(arg1,arg2,arg3);
@@ -582,12 +582,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Serial(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient_Serial(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient_Serial(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -595,13 +595,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient_Serial(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FN_VLinearCombination_Serial(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination_Serial(arg1,arg2,arg3,arg4);
@@ -613,14 +613,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination_Serial(int const *farg1, double *farg
 SWIGEXPORT int _wrap_FN_VScaleAddMulti_Serial(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -635,13 +635,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Serial(int const *farg1, N_Vector farg2, v
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti_Serial(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -651,17 +651,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti_Serial(int const *farg1, N_Vector farg2, v
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Serial(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray_Serial(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -673,13 +673,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray_Serial(int const *farg1, double co
 SWIGEXPORT int _wrap_FN_VScaleVectorArray_Serial(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray_Serial(arg1,arg2,arg3,arg4);
@@ -691,12 +691,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray_Serial(int const *farg1, double *farg2
 SWIGEXPORT int _wrap_FN_VConstVectorArray_Serial(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray_Serial(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -709,13 +709,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray_Serial(int const *farg1, void *farg
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray_Serial(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -728,14 +728,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray_Serial(int const *farg1, void *
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray_Serial(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -746,12 +746,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal_Serial(N_Vector farg1, N_Vector farg2)
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal_Serial(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal_Serial(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -761,13 +761,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal_Serial(N_Vector farg1, N_Vector far
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal_Serial(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal_Serial(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -944,10 +944,10 @@ SWIGEXPORT int _wrap_FN_VEnableWrmsNormMaskVectorArray_Serial(N_Vector farg1, in
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Serial(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Serial(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Serial(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/nvector/serial/nvector_serial.c b/src/nvector/serial/nvector_serial.c
index 43ced7bc82..49c8b2cd5a 100644
--- a/src/nvector/serial/nvector_serial.c
+++ b/src/nvector/serial/nvector_serial.c
@@ -23,31 +23,31 @@
 #include <sundials/sundials_math.h>
 #include "sundials/sundials_nvector.h"
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 /* Private functions for special cases of vector operations */
 static void VCopy_Serial(N_Vector x, N_Vector z);                              /* z=x       */
 static void VSum_Serial(N_Vector x, N_Vector y, N_Vector z);                   /* z=x+y     */
 static void VDiff_Serial(N_Vector x, N_Vector y, N_Vector z);                  /* z=x-y     */
 static void VNeg_Serial(N_Vector x, N_Vector z);                               /* z=-x      */
-static void VScaleSum_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
-static void VScaleDiff_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
-static void VLin1_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
-static void VLin2_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
-static void Vaxpy_Serial(realtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
-static void VScaleBy_Serial(realtype a, N_Vector x);                           /* x <- ax   */
+static void VScaleSum_Serial(sunrealtype c, N_Vector x, N_Vector y, N_Vector z);  /* z=c(x+y)  */
+static void VScaleDiff_Serial(sunrealtype c, N_Vector x, N_Vector y, N_Vector z); /* z=c(x-y)  */
+static void VLin1_Serial(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax+y    */
+static void VLin2_Serial(sunrealtype a, N_Vector x, N_Vector y, N_Vector z);      /* z=ax-y    */
+static void Vaxpy_Serial(sunrealtype a, N_Vector x, N_Vector y);                  /* y <- ax+y */
+static void VScaleBy_Serial(sunrealtype a, N_Vector x);                           /* x <- ax   */
 
 /* Private functions for special cases of vector array operations */
 static int VSumVectorArray_Serial(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                   /* Z=X+Y     */
 static int VDiffVectorArray_Serial(int nvec, N_Vector* X, N_Vector* Y, N_Vector* Z);                  /* Z=X-Y     */
-static int VScaleSumVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
-static int VScaleDiffVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
-static int VLin1VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
-static int VLin2VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
-static int VaxpyVectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y);                    /* Y <- aX+Y */
+static int VScaleSumVectorArray_Serial(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z);  /* Z=c(X+Y)  */
+static int VScaleDiffVectorArray_Serial(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z); /* Z=c(X-Y)  */
+static int VLin1VectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX+Y    */
+static int VLin2VectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z);      /* Z=aX-Y    */
+static int VaxpyVectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y);                    /* Y <- aX+Y */
 
 /*
  * -----------------------------------------------------------------
@@ -160,7 +160,7 @@ N_Vector N_VNewEmpty_Serial(sunindextype length, SUNContext sunctx)
 N_Vector N_VNew_Serial(sunindextype length, SUNContext sunctx)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
 
   v = NULL;
   v = N_VNewEmpty_Serial(length, sunctx);
@@ -171,7 +171,7 @@ N_Vector N_VNew_Serial(sunindextype length, SUNContext sunctx)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Serial(v); return(NULL); }
 
     /* Attach data */
@@ -187,7 +187,7 @@ N_Vector N_VNew_Serial(sunindextype length, SUNContext sunctx)
  * Function to create a serial N_Vector with user data component
  */
 
-N_Vector N_VMake_Serial(sunindextype length, realtype *v_data, SUNContext sunctx)
+N_Vector N_VMake_Serial(sunindextype length, sunrealtype *v_data, SUNContext sunctx)
 {
   N_Vector v;
 
@@ -237,7 +237,7 @@ void N_VPrint_Serial(N_Vector x)
 void N_VPrintFile_Serial(N_Vector x, FILE* outfile)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -298,7 +298,7 @@ N_Vector N_VCloneEmpty_Serial(N_Vector w)
 N_Vector N_VClone_Serial(N_Vector w)
 {
   N_Vector v;
-  realtype *data;
+  sunrealtype *data;
   sunindextype length;
 
   v = NULL;
@@ -312,7 +312,7 @@ N_Vector N_VClone_Serial(N_Vector w)
 
     /* Allocate memory */
     data = NULL;
-    data = (realtype *) malloc(length * sizeof(realtype));
+    data = (sunrealtype *) malloc(length * sizeof(sunrealtype));
     if(data == NULL) { N_VDestroy_Serial(v); return(NULL); }
 
     /* Attach data */
@@ -354,24 +354,24 @@ void N_VSpace_Serial(N_Vector v, sunindextype *lrw, sunindextype *liw)
   return;
 }
 
-realtype *N_VGetArrayPointer_Serial(N_Vector v)
+sunrealtype *N_VGetArrayPointer_Serial(N_Vector v)
 {
-  return((realtype *) NV_DATA_S(v));
+  return((sunrealtype *) NV_DATA_S(v));
 }
 
-void N_VSetArrayPointer_Serial(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer_Serial(sunrealtype *v_data, N_Vector v)
 {
   if (NV_LENGTH_S(v) > 0) NV_DATA_S(v) = v_data;
 
   return;
 }
 
-void N_VLinearSum_Serial(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Serial(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype c, *xd, *yd, *zd;
+  sunrealtype c, *xd, *yd, *zd;
   N_Vector v1, v2;
-  booleantype test;
+  sunbooleantype test;
 
   xd = yd = zd = NULL;
 
@@ -453,10 +453,10 @@ void N_VLinearSum_Serial(realtype a, N_Vector x, realtype b, N_Vector y, N_Vecto
   return;
 }
 
-void N_VConst_Serial(realtype c, N_Vector z)
+void N_VConst_Serial(sunrealtype c, N_Vector z)
 {
   sunindextype i, N;
-  realtype *zd;
+  sunrealtype *zd;
 
   zd = NULL;
 
@@ -471,7 +471,7 @@ void N_VConst_Serial(realtype c, N_Vector z)
 void N_VProd_Serial(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -489,7 +489,7 @@ void N_VProd_Serial(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_Serial(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -504,10 +504,10 @@ void N_VDiv_Serial(N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-void N_VScale_Serial(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Serial(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -534,7 +534,7 @@ void N_VScale_Serial(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_Serial(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -551,7 +551,7 @@ void N_VAbs_Serial(N_Vector x, N_Vector z)
 void N_VInv_Serial(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -565,10 +565,10 @@ void N_VInv_Serial(N_Vector x, N_Vector z)
   return;
 }
 
-void N_VAddConst_Serial(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Serial(N_Vector x, sunrealtype b, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -582,10 +582,10 @@ void N_VAddConst_Serial(N_Vector x, realtype b, N_Vector z)
   return;
 }
 
-realtype N_VDotProd_Serial(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Serial(N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype sum, *xd, *yd;
+  sunrealtype sum, *xd, *yd;
 
   sum = ZERO;
   xd = yd = NULL;
@@ -600,10 +600,10 @@ realtype N_VDotProd_Serial(N_Vector x, N_Vector y)
   return(sum);
 }
 
-realtype N_VMaxNorm_Serial(N_Vector x)
+sunrealtype N_VMaxNorm_Serial(N_Vector x)
 {
   sunindextype i, N;
-  realtype max, *xd;
+  sunrealtype max, *xd;
 
   max = ZERO;
   xd = NULL;
@@ -618,15 +618,15 @@ realtype N_VMaxNorm_Serial(N_Vector x)
   return(max);
 }
 
-realtype N_VWrmsNorm_Serial(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Serial(N_Vector x, N_Vector w)
 {
   return(SUNRsqrt(N_VWSqrSumLocal_Serial(x, w)/(NV_LENGTH_S(x))));
 }
 
-realtype N_VWSqrSumLocal_Serial(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Serial(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd;
+  sunrealtype sum, prodi, *xd, *wd;
 
   sum = ZERO;
   xd = wd = NULL;
@@ -643,15 +643,15 @@ realtype N_VWSqrSumLocal_Serial(N_Vector x, N_Vector w)
   return(sum);
 }
 
-realtype N_VWrmsNormMask_Serial(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Serial(N_Vector x, N_Vector w, N_Vector id)
 {
   return(SUNRsqrt(N_VWSqrSumMaskLocal_Serial(x, w, id) / (NV_LENGTH_S(x))));
 }
 
-realtype N_VWSqrSumMaskLocal_Serial(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Serial(N_Vector x, N_Vector w, N_Vector id)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd, *idd;
+  sunrealtype sum, prodi, *xd, *wd, *idd;
 
   sum = ZERO;
   xd = wd = idd = NULL;
@@ -671,10 +671,10 @@ realtype N_VWSqrSumMaskLocal_Serial(N_Vector x, N_Vector w, N_Vector id)
   return(sum);
 }
 
-realtype N_VMin_Serial(N_Vector x)
+sunrealtype N_VMin_Serial(N_Vector x)
 {
   sunindextype i, N;
-  realtype min, *xd;
+  sunrealtype min, *xd;
 
   xd = NULL;
 
@@ -690,10 +690,10 @@ realtype N_VMin_Serial(N_Vector x)
   return(min);
 }
 
-realtype N_VWL2Norm_Serial(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Serial(N_Vector x, N_Vector w)
 {
   sunindextype i, N;
-  realtype sum, prodi, *xd, *wd;
+  sunrealtype sum, prodi, *xd, *wd;
 
   sum = ZERO;
   xd = wd = NULL;
@@ -710,10 +710,10 @@ realtype N_VWL2Norm_Serial(N_Vector x, N_Vector w)
   return(SUNRsqrt(sum));
 }
 
-realtype N_VL1Norm_Serial(N_Vector x)
+sunrealtype N_VL1Norm_Serial(N_Vector x)
 {
   sunindextype i, N;
-  realtype sum, *xd;
+  sunrealtype sum, *xd;
 
   sum = ZERO;
   xd = NULL;
@@ -727,10 +727,10 @@ realtype N_VL1Norm_Serial(N_Vector x)
   return(sum);
 }
 
-void N_VCompare_Serial(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Serial(sunrealtype c, N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -745,11 +745,11 @@ void N_VCompare_Serial(realtype c, N_Vector x, N_Vector z)
   return;
 }
 
-booleantype N_VInvTest_Serial(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Serial(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
-  booleantype no_zero_found;
+  sunrealtype *xd, *zd;
+  sunbooleantype no_zero_found;
 
   xd = zd = NULL;
 
@@ -768,12 +768,12 @@ booleantype N_VInvTest_Serial(N_Vector x, N_Vector z)
   return no_zero_found;
 }
 
-booleantype N_VConstrMask_Serial(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Serial(N_Vector c, N_Vector x, N_Vector m)
 {
   sunindextype i, N;
-  realtype temp;
-  realtype *cd, *xd, *md;
-  booleantype test;
+  sunrealtype temp;
+  sunrealtype *cd, *xd, *md;
+  sunbooleantype test;
 
   cd = xd = md = NULL;
 
@@ -803,11 +803,11 @@ booleantype N_VConstrMask_Serial(N_Vector c, N_Vector x, N_Vector m)
   return (temp == ONE) ? SUNFALSE : SUNTRUE;
 }
 
-realtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom)
 {
-  booleantype notEvenOnce;
+  sunbooleantype notEvenOnce;
   sunindextype i, N;
-  realtype *nd, *dd, min;
+  sunrealtype *nd, *dd, min;
 
   nd = dd = NULL;
 
@@ -816,7 +816,7 @@ realtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom)
   dd = NV_DATA_S(denom);
 
   notEvenOnce = SUNTRUE;
-  min = BIG_REAL;
+  min = SUN_BIG_REAL;
 
   for (i = 0; i < N; i++) {
     if (dd[i] == ZERO) continue;
@@ -839,12 +839,12 @@ realtype N_VMinQuotient_Serial(N_Vector num, N_Vector denom)
  * -----------------------------------------------------------------
  */
 
-int N_VLinearCombination_Serial(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Serial(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -911,13 +911,13 @@ int N_VLinearCombination_Serial(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_Serial(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti_Serial(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -959,12 +959,12 @@ int N_VScaleAddMulti_Serial(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Ve
 }
 
 
-int N_VDotProdMulti_Serial(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti_Serial(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -999,19 +999,19 @@ int N_VDotProdMulti_Serial(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods
  */
 
 int N_VLinearSumVectorArray_Serial(int nvec,
-                                   realtype a, N_Vector* X,
-                                   realtype b, N_Vector* Y,
+                                   sunrealtype a, N_Vector* X,
+                                   sunrealtype b, N_Vector* Y,
                                    N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
-  realtype     c;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype     c;
   N_Vector*   V1;
   N_Vector*   V2;
-  booleantype  test;
+  sunbooleantype  test;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1095,12 +1095,12 @@ int N_VLinearSumVectorArray_Serial(int nvec,
 }
 
 
-int N_VScaleVectorArray_Serial(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Serial(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1141,11 +1141,11 @@ int N_VScaleVectorArray_Serial(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_Serial(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Serial(int nvec, sunrealtype c, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    zd=NULL;
+  sunrealtype*    zd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1172,12 +1172,12 @@ int N_VConstVectorArray_Serial(int nvec, realtype c, N_Vector* Z)
 
 
 int N_VWrmsNormVectorArray_Serial(int nvec, N_Vector* X, N_Vector* W,
-                                  realtype* nrm)
+                                  sunrealtype* nrm)
 {
   int          i;
   sunindextype j, N;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1207,13 +1207,13 @@ int N_VWrmsNormVectorArray_Serial(int nvec, N_Vector* X, N_Vector* W,
 
 
 int N_VWrmsNormMaskVectorArray_Serial(int nvec, N_Vector* X, N_Vector* W,
-                                      N_Vector id, realtype* nrm)
+                                      N_Vector id, sunrealtype* nrm)
 {
   int          i;
   sunindextype j, N;
-  realtype*    wd=NULL;
-  realtype*    xd=NULL;
-  realtype*    idd=NULL;
+  sunrealtype*    wd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    idd=NULL;
 
   /* invalid number of vectors */
   if (nvec < 1) return(-1);
@@ -1244,14 +1244,14 @@ int N_VWrmsNormMaskVectorArray_Serial(int nvec, N_Vector* X, N_Vector* W,
 }
 
 
-int N_VScaleAddMultiVectorArray_Serial(int nvec, int nsum, realtype* a,
+int N_VScaleAddMultiVectorArray_Serial(int nvec, int nsum, sunrealtype* a,
                                         N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   int          i, j;
   sunindextype k, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   int          retval;
   N_Vector*   YY;
@@ -1339,18 +1339,18 @@ int N_VScaleAddMultiVectorArray_Serial(int nvec, int nsum, realtype* a,
 }
 
 
-int N_VLinearCombinationVectorArray_Serial(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Serial(int nvec, int nsum, sunrealtype* c,
                                            N_Vector** X, N_Vector* Z)
 {
   int          i; /* vector arrays index in summation [0,nsum) */
   int          j; /* vector index in vector array     [0,nvec) */
   sunindextype k; /* element index in vector          [0,N)    */
   sunindextype N;
-  realtype*    zd=NULL;
-  realtype*    xd=NULL;
+  sunrealtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
 
   int          retval;
-  realtype*    ctmp;
+  sunrealtype*    ctmp;
   N_Vector*   Y;
 
   /* invalid number of vectors */
@@ -1395,7 +1395,7 @@ int N_VLinearCombinationVectorArray_Serial(int nvec, int nsum, realtype* c,
   /* should have called N_VScaleVectorArray */
   if (nsum == 1) {
 
-    ctmp = (realtype*) malloc(nvec * sizeof(realtype));
+    ctmp = (sunrealtype*) malloc(nvec * sizeof(sunrealtype));
 
     for (j=0; j<nvec; j++) {
       ctmp[j] = c[0];
@@ -1485,7 +1485,7 @@ int N_VLinearCombinationVectorArray_Serial(int nvec, int nsum, realtype* c,
 int N_VBufSize_Serial(N_Vector x, sunindextype *size)
 {
   if (x == NULL) return(-1);
-  *size = NV_LENGTH_S(x) * ((sunindextype)sizeof(realtype));
+  *size = NV_LENGTH_S(x) * ((sunindextype)sizeof(sunrealtype));
   return(0);
 }
 
@@ -1493,14 +1493,14 @@ int N_VBufSize_Serial(N_Vector x, sunindextype *size)
 int N_VBufPack_Serial(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LENGTH_S(x);
   xd = NV_DATA_S(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     bd[i] = xd[i];
@@ -1512,14 +1512,14 @@ int N_VBufPack_Serial(N_Vector x, void *buf)
 int N_VBufUnpack_Serial(N_Vector x, void *buf)
 {
   sunindextype i, N;
-  realtype     *xd = NULL;
-  realtype     *bd = NULL;
+  sunrealtype     *xd = NULL;
+  sunrealtype     *bd = NULL;
 
   if (x == NULL || buf == NULL) return(-1);
 
   N  = NV_LENGTH_S(x);
   xd = NV_DATA_S(x);
-  bd = (realtype*) buf;
+  bd = (sunrealtype*) buf;
 
   for (i = 0; i < N; i++)
     xd[i] = bd[i];
@@ -1537,7 +1537,7 @@ int N_VBufUnpack_Serial(N_Vector x, void *buf)
 static void VCopy_Serial(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -1554,7 +1554,7 @@ static void VCopy_Serial(N_Vector x, N_Vector z)
 static void VSum_Serial(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1572,7 +1572,7 @@ static void VSum_Serial(N_Vector x, N_Vector y, N_Vector z)
 static void VDiff_Serial(N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1590,7 +1590,7 @@ static void VDiff_Serial(N_Vector x, N_Vector y, N_Vector z)
 static void VNeg_Serial(N_Vector x, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *zd;
+  sunrealtype *xd, *zd;
 
   xd = zd = NULL;
 
@@ -1604,10 +1604,10 @@ static void VNeg_Serial(N_Vector x, N_Vector z)
   return;
 }
 
-static void VScaleSum_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleSum_Serial(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1622,10 +1622,10 @@ static void VScaleSum_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VScaleDiff_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z)
+static void VScaleDiff_Serial(sunrealtype c, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1640,10 +1640,10 @@ static void VScaleDiff_Serial(realtype c, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin1_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin1_Serial(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1658,10 +1658,10 @@ static void VLin1_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void VLin2_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z)
+static void VLin2_Serial(sunrealtype a, N_Vector x, N_Vector y, N_Vector z)
 {
   sunindextype i, N;
-  realtype *xd, *yd, *zd;
+  sunrealtype *xd, *yd, *zd;
 
   xd = yd = zd = NULL;
 
@@ -1676,10 +1676,10 @@ static void VLin2_Serial(realtype a, N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-static void Vaxpy_Serial(realtype a, N_Vector x, N_Vector y)
+static void Vaxpy_Serial(sunrealtype a, N_Vector x, N_Vector y)
 {
   sunindextype i, N;
-  realtype *xd, *yd;
+  sunrealtype *xd, *yd;
 
   xd = yd = NULL;
 
@@ -1705,10 +1705,10 @@ static void Vaxpy_Serial(realtype a, N_Vector x, N_Vector y)
   return;
 }
 
-static void VScaleBy_Serial(realtype a, N_Vector x)
+static void VScaleBy_Serial(sunrealtype a, N_Vector x)
 {
   sunindextype i, N;
-  realtype *xd;
+  sunrealtype *xd;
 
   xd = NULL;
 
@@ -1732,9 +1732,9 @@ static int VSumVectorArray_Serial(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1753,9 +1753,9 @@ static int VDiffVectorArray_Serial(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1770,13 +1770,13 @@ static int VDiffVectorArray_Serial(int nvec, N_Vector* X, N_Vector* Y, N_Vector*
   return(0);
 }
 
-static int VScaleSumVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleSumVectorArray_Serial(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1791,13 +1791,13 @@ static int VScaleSumVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vect
   return(0);
 }
 
-static int VScaleDiffVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VScaleDiffVectorArray_Serial(int nvec, sunrealtype c, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1812,13 +1812,13 @@ static int VScaleDiffVectorArray_Serial(int nvec, realtype c, N_Vector* X, N_Vec
   return(0);
 }
 
-static int VLin1VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin1VectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1833,13 +1833,13 @@ static int VLin1VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector*
   return(0);
 }
 
-static int VLin2VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
+static int VLin2VectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y, N_Vector* Z)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
-  realtype*    zd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
+  sunrealtype*    zd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1854,12 +1854,12 @@ static int VLin2VectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector*
   return(0);
 }
 
-static int VaxpyVectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector* Y)
+static int VaxpyVectorArray_Serial(int nvec, sunrealtype a, N_Vector* X, N_Vector* Y)
 {
   int          i;
   sunindextype j, N;
-  realtype*    xd=NULL;
-  realtype*    yd=NULL;
+  sunrealtype*    xd=NULL;
+  sunrealtype*    yd=NULL;
 
   N = NV_LENGTH_S(X[0]);
 
@@ -1902,7 +1902,7 @@ static int VaxpyVectorArray_Serial(int nvec, realtype a, N_Vector* X, N_Vector*
  * -----------------------------------------------------------------
  */
 
-int N_VEnableFusedOps_Serial(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1947,7 +1947,7 @@ int N_VEnableFusedOps_Serial(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_Serial(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1965,7 +1965,7 @@ int N_VEnableLinearCombination_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMulti_Serial(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -1983,7 +1983,7 @@ int N_VEnableScaleAddMulti_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableDotProdMulti_Serial(N_Vector v, booleantype tf)
+int N_VEnableDotProdMulti_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2004,7 +2004,7 @@ int N_VEnableDotProdMulti_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearSumVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2022,7 +2022,7 @@ int N_VEnableLinearSumVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2040,7 +2040,7 @@ int N_VEnableScaleVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableConstVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2058,7 +2058,7 @@ int N_VEnableConstVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2076,7 +2076,7 @@ int N_VEnableWrmsNormVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2094,7 +2094,7 @@ int N_VEnableWrmsNormMaskVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
@@ -2112,7 +2112,7 @@ int N_VEnableScaleAddMultiVectorArray_Serial(N_Vector v, booleantype tf)
   return(0);
 }
 
-int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Serial(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return(-1);
diff --git a/src/nvector/sycl/nvector_sycl.cpp b/src/nvector/sycl/nvector_sycl.cpp
index 69cba8a02b..e0013594a9 100644
--- a/src/nvector/sycl/nvector_sycl.cpp
+++ b/src/nvector/sycl/nvector_sycl.cpp
@@ -28,10 +28,10 @@
 #include "sundials_debug.h"
 #include "sundials_sycl.h"
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 extern "C" {
 
@@ -48,15 +48,15 @@ using namespace sundials::sycl;
 #define NVEC_SYCL_CONTENT(x)  ((N_VectorContent_Sycl)(x->content))
 #define NVEC_SYCL_LENGTH(x)   (NVEC_SYCL_CONTENT(x)->length)
 #define NVEC_SYCL_MEMHELP(x)  (NVEC_SYCL_CONTENT(x)->mem_helper)
-#define NVEC_SYCL_MEMSIZE(x)  (NVEC_SYCL_CONTENT(x)->length * sizeof(realtype))
-#define NVEC_SYCL_HDATAp(x)   ((realtype*) NVEC_SYCL_CONTENT(x)->host_data->ptr)
-#define NVEC_SYCL_DDATAp(x)   ((realtype*) NVEC_SYCL_CONTENT(x)->device_data->ptr)
+#define NVEC_SYCL_MEMSIZE(x)  (NVEC_SYCL_CONTENT(x)->length * sizeof(sunrealtype))
+#define NVEC_SYCL_HDATAp(x)   ((sunrealtype*) NVEC_SYCL_CONTENT(x)->host_data->ptr)
+#define NVEC_SYCL_DDATAp(x)   ((sunrealtype*) NVEC_SYCL_CONTENT(x)->device_data->ptr)
 #define NVEC_SYCL_QUEUE(x)    (NVEC_SYCL_CONTENT(x)->queue)
 
 /* Macros to access vector private content */
 #define NVEC_SYCL_PRIVATE(x)      ((N_PrivateVectorContent_Sycl)(NVEC_SYCL_CONTENT(x)->priv))
-#define NVEC_SYCL_HBUFFERp(x)     ((realtype*) NVEC_SYCL_PRIVATE(x)->reduce_buffer_host->ptr)
-#define NVEC_SYCL_DBUFFERp(x)     ((realtype*) NVEC_SYCL_PRIVATE(x)->reduce_buffer_dev->ptr)
+#define NVEC_SYCL_HBUFFERp(x)     ((sunrealtype*) NVEC_SYCL_PRIVATE(x)->reduce_buffer_host->ptr)
+#define NVEC_SYCL_DBUFFERp(x)     ((sunrealtype*) NVEC_SYCL_PRIVATE(x)->reduce_buffer_dev->ptr)
 
 
 /* --------------------------------------------------------------------------
@@ -66,7 +66,7 @@ using namespace sundials::sycl;
 
 struct _N_PrivateVectorContent_Sycl
 {
-  booleantype use_managed_mem; /* do data pointers use managed memory */
+  sunbooleantype use_managed_mem; /* do data pointers use managed memory */
 
   /* reduction workspace */
   SUNMemory reduce_buffer_dev;   /* device memory for reductions      */
@@ -92,24 +92,24 @@ typedef struct _N_PrivateVectorContent_Sycl *N_PrivateVectorContent_Sycl;
 static int AllocateData(N_Vector v);
 
 /* Reduction buffer functions */
-static int InitializeReductionBuffer(N_Vector v, const realtype value,
+static int InitializeReductionBuffer(N_Vector v, const sunrealtype value,
                                      size_t n = 1);
 static void FreeReductionBuffer(N_Vector v);
 static int CopyReductionBufferFromDevice(N_Vector v, size_t n = 1);
 
 /* Fused operation buffer functions */
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr);
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *r_data, int nval,
-                                     realtype **shortcut);
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *r_data, int nval,
+                                     sunrealtype **shortcut);
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut);
+                                      sunrealtype ***shortcut);
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut);
+                                      int nsum, sunrealtype ***shortcut);
 static int FusedBuffer_CopyToDevice(N_Vector v);
 static int FusedBuffer_Free(N_Vector v);
 
 /* Kernel launch parameters */
-static int GetKernelParameters(N_Vector v, booleantype reduction,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction,
                                size_t& nthreads_total,
                                size_t& nthreads_per_block);
 
@@ -279,7 +279,7 @@ N_Vector N_VNew_Sycl(sunindextype length, ::sycl::queue *Q, SUNContext sunctx)
 
 
 N_Vector N_VNewWithMemHelp_Sycl(sunindextype length,
-                                booleantype use_managed_mem,
+                                sunbooleantype use_managed_mem,
                                 SUNMemoryHelper helper,
                                 ::sycl::queue *Q,
                                 SUNContext sunctx)
@@ -388,7 +388,7 @@ N_Vector N_VNewManaged_Sycl(sunindextype length, ::sycl::queue *Q,
 }
 
 
-N_Vector N_VMake_Sycl(sunindextype length, realtype *h_vdata, realtype *d_vdata,
+N_Vector N_VMake_Sycl(sunindextype length, sunrealtype *h_vdata, sunrealtype *d_vdata,
                       ::sycl::queue *Q, SUNContext sunctx)
 {
   /* Check inputs */
@@ -448,7 +448,7 @@ N_Vector N_VMake_Sycl(sunindextype length, realtype *h_vdata, realtype *d_vdata,
 }
 
 
-N_Vector N_VMakeManaged_Sycl(sunindextype length, realtype *vdata,
+N_Vector N_VMakeManaged_Sycl(sunindextype length, sunrealtype *vdata,
                              ::sycl::queue *Q, SUNContext sunctx)
 {
   /* Check inputs */
@@ -520,16 +520,16 @@ extern sunindextype N_VGetLength_Sycl(N_Vector v);
 
 /* Return pointer to the raw host data. This is defined as an inline function in
  * nvector_sycl.h, so we just mark it as extern here. */
-extern realtype *N_VGetHostArrayPointer_Sycl(N_Vector x);
+extern sunrealtype *N_VGetHostArrayPointer_Sycl(N_Vector x);
 
 
 /* Return pointer to the raw device data. This is defined as an inline function
  * in nvector_sycl.h, so we just mark it as extern here. */
-extern realtype *N_VGetDeviceArrayPointer_Sycl(N_Vector x);
+extern sunrealtype *N_VGetDeviceArrayPointer_Sycl(N_Vector x);
 
 
 /* Set pointer to the raw host data. Does not free the existing pointer. */
-void N_VSetHostArrayPointer_Sycl(realtype* h_vdata, N_Vector v)
+void N_VSetHostArrayPointer_Sycl(sunrealtype* h_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Sycl(v))
   {
@@ -559,7 +559,7 @@ void N_VSetHostArrayPointer_Sycl(realtype* h_vdata, N_Vector v)
 
 
 /* Set pointer to the raw device data */
-void N_VSetDeviceArrayPointer_Sycl(realtype* d_vdata, N_Vector v)
+void N_VSetDeviceArrayPointer_Sycl(sunrealtype* d_vdata, N_Vector v)
 {
   if (N_VIsManagedMemory_Sycl(v))
   {
@@ -589,7 +589,7 @@ void N_VSetDeviceArrayPointer_Sycl(realtype* d_vdata, N_Vector v)
 
 
 /* Return a flag indicating if the memory for the vector data is managed */
-booleantype N_VIsManagedMemory_Sycl(N_Vector x)
+sunbooleantype N_VIsManagedMemory_Sycl(N_Vector x)
 {
   return NVEC_SYCL_PRIVATE(x)->use_managed_mem;
 }
@@ -845,10 +845,10 @@ void N_VSpace_Sycl(N_Vector X, sunindextype *lrw, sunindextype *liw)
 }
 
 
-void N_VConst_Sycl(realtype c, N_Vector z)
+void N_VConst_Sycl(sunrealtype c, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -865,12 +865,12 @@ void N_VConst_Sycl(realtype c, N_Vector z)
 }
 
 
-void N_VLinearSum_Sycl(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Sycl(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  const realtype     *ydata = NVEC_SYCL_DDATAp(y);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *ydata = NVEC_SYCL_DDATAp(y);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -890,9 +890,9 @@ void N_VLinearSum_Sycl(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector
 void N_VProd_Sycl(N_Vector x, N_Vector y, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  const realtype     *ydata = NVEC_SYCL_DDATAp(y);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *ydata = NVEC_SYCL_DDATAp(y);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -912,9 +912,9 @@ void N_VProd_Sycl(N_Vector x, N_Vector y, N_Vector z)
 void N_VDiv_Sycl(N_Vector x, N_Vector y, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  const realtype     *ydata = NVEC_SYCL_DDATAp(y);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *ydata = NVEC_SYCL_DDATAp(y);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -931,11 +931,11 @@ void N_VDiv_Sycl(N_Vector x, N_Vector y, N_Vector z)
 }
 
 
-void N_VScale_Sycl(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Sycl(sunrealtype c, N_Vector x, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -955,8 +955,8 @@ void N_VScale_Sycl(realtype c, N_Vector x, N_Vector z)
 void N_VAbs_Sycl(N_Vector x, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -976,8 +976,8 @@ void N_VAbs_Sycl(N_Vector x, N_Vector z)
 void N_VInv_Sycl(N_Vector x, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -994,11 +994,11 @@ void N_VInv_Sycl(N_Vector x, N_Vector z)
 }
 
 
-void N_VAddConst_Sycl(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Sycl(N_Vector x, sunrealtype b, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1015,11 +1015,11 @@ void N_VAddConst_Sycl(N_Vector x, realtype b, N_Vector z)
 }
 
 
-realtype N_VDotProd_Sycl(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Sycl(N_Vector x, N_Vector y)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  const realtype     *ydata = NVEC_SYCL_DDATAp(y);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *ydata = NVEC_SYCL_DDATAp(y);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1034,10 +1034,10 @@ realtype N_VDotProd_Sycl(N_Vector x, N_Vector y)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     sum += xdata[i] * ydata[i];
@@ -1052,10 +1052,10 @@ realtype N_VDotProd_Sycl(N_Vector x, N_Vector y)
 }
 
 
-realtype N_VMaxNorm_Sycl(N_Vector x)
+sunrealtype N_VMaxNorm_Sycl(N_Vector x)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1070,10 +1070,10 @@ realtype N_VMaxNorm_Sycl(N_Vector x)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *max = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *max = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  max, ::sycl::maximum<realtype>(),
+                  max, ::sycl::maximum<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     max.combine(abs(xdata[i]));
@@ -1088,11 +1088,11 @@ realtype N_VMaxNorm_Sycl(N_Vector x)
 }
 
 
-realtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  const realtype     *wdata = NVEC_SYCL_DDATAp(w);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *wdata = NVEC_SYCL_DDATAp(w);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1107,10 +1107,10 @@ realtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     sum += xdata[i] * wdata[i] * xdata[i] * wdata[i];
@@ -1125,20 +1125,20 @@ realtype N_VWSqrSumLocal_Sycl(N_Vector x, N_Vector w)
 }
 
 
-realtype N_VWrmsNorm_Sycl(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Sycl(N_Vector x, N_Vector w)
 {
   const sunindextype N   = NVEC_SYCL_LENGTH(x);
-  const realtype     sum = N_VWSqrSumLocal_Sycl(x, w);
+  const sunrealtype     sum = N_VWSqrSumLocal_Sycl(x, w);
   return std::sqrt(sum/N);
 }
 
 
-realtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w, N_Vector id)
 {
   const sunindextype N       = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata  = NVEC_SYCL_DDATAp(x);
-  const realtype     *wdata  = NVEC_SYCL_DDATAp(w);
-  const realtype     *iddata = NVEC_SYCL_DDATAp(id);
+  const sunrealtype     *xdata  = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *wdata  = NVEC_SYCL_DDATAp(w);
+  const sunrealtype     *iddata = NVEC_SYCL_DDATAp(id);
   ::sycl::queue      *Q      = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1153,10 +1153,10 @@ realtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w, N_Vector id)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     if (iddata[i] > ZERO)
@@ -1172,22 +1172,22 @@ realtype N_VWSqrSumMaskLocal_Sycl(N_Vector x, N_Vector w, N_Vector id)
 }
 
 
-realtype N_VWrmsNormMask_Sycl(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Sycl(N_Vector x, N_Vector w, N_Vector id)
 {
   const sunindextype N   = NVEC_SYCL_LENGTH(x);
-  const realtype     sum = N_VWSqrSumMaskLocal_Sycl(x, w, id);
+  const sunrealtype     sum = N_VWSqrSumMaskLocal_Sycl(x, w, id);
   return std::sqrt(sum/N);
 }
 
 
-realtype N_VMin_Sycl(N_Vector x)
+sunrealtype N_VMin_Sycl(N_Vector x)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
-  if (InitializeReductionBuffer(x, std::numeric_limits<realtype>::max()))
+  if (InitializeReductionBuffer(x, std::numeric_limits<sunrealtype>::max()))
   {
     SUNDIALS_DEBUG_PRINT("ERROR in N_VMin_Sycl: InitializeReductionBuffer returned nonzero\n");
   }
@@ -1198,10 +1198,10 @@ realtype N_VMin_Sycl(N_Vector x)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *min = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *min = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  min, ::sycl::minimum<realtype>(),
+                  min, ::sycl::minimum<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     min.combine(xdata[i]);
@@ -1216,16 +1216,16 @@ realtype N_VMin_Sycl(N_Vector x)
 }
 
 
-realtype N_VWL2Norm_Sycl(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Sycl(N_Vector x, N_Vector w)
 {
   return std::sqrt(N_VWSqrSumLocal_Sycl(x, w));
 }
 
 
-realtype N_VL1Norm_Sycl(N_Vector x)
+sunrealtype N_VL1Norm_Sycl(N_Vector x)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1240,10 +1240,10 @@ realtype N_VL1Norm_Sycl(N_Vector x)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     sum += abs(xdata[i]);
@@ -1258,11 +1258,11 @@ realtype N_VL1Norm_Sycl(N_Vector x)
 }
 
 
-void N_VCompare_Sycl(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Sycl(sunrealtype c, N_Vector x, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1279,11 +1279,11 @@ void N_VCompare_Sycl(realtype c, N_Vector x, N_Vector z)
 }
 
 
-booleantype N_VInvTest_Sycl(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Sycl(N_Vector x, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1298,10 +1298,10 @@ booleantype N_VInvTest_Sycl(N_Vector x, N_Vector z)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     if (xdata[i] == ZERO)
@@ -1323,12 +1323,12 @@ booleantype N_VInvTest_Sycl(N_Vector x, N_Vector z)
 }
 
 
-booleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x, N_Vector m)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *cdata = NVEC_SYCL_DDATAp(c);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
-  realtype           *mdata = NVEC_SYCL_DDATAp(m);
+  const sunrealtype     *cdata = NVEC_SYCL_DDATAp(c);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
+  sunrealtype           *mdata = NVEC_SYCL_DDATAp(m);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -1343,10 +1343,10 @@ booleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x, N_Vector m)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *sum = NVEC_SYCL_DBUFFERp(x);
+  sunrealtype *sum = NVEC_SYCL_DBUFFERp(x);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  sum, ::sycl::plus<realtype>(),
+                  sum, ::sycl::plus<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     bool test =
@@ -1365,15 +1365,15 @@ booleantype N_VConstrMask_Sycl(N_Vector c, N_Vector x, N_Vector m)
 }
 
 
-realtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(num);
-  const realtype     *ndata = NVEC_SYCL_DDATAp(num);
-  const realtype     *ddata = NVEC_SYCL_DDATAp(denom);
+  const sunrealtype     *ndata = NVEC_SYCL_DDATAp(num);
+  const sunrealtype     *ddata = NVEC_SYCL_DDATAp(denom);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(num);
   size_t             nthreads_total, nthreads_per_block;
 
-  if (InitializeReductionBuffer(num, std::numeric_limits<realtype>::max()))
+  if (InitializeReductionBuffer(num, std::numeric_limits<sunrealtype>::max()))
   {
     SUNDIALS_DEBUG_PRINT("ERROR in N_VMinQuotient_Sycl: InitializeReductionBuffer returned nonzero\n");
   }
@@ -1384,10 +1384,10 @@ realtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom)
   }
 
   /* Shortcut to the reduction buffer */
-  realtype *min = NVEC_SYCL_DBUFFERp(num);
+  sunrealtype *min = NVEC_SYCL_DBUFFERp(num);
 
   SYCL_FOR_REDUCE(Q, nthreads_total, nthreads_per_block, item,
-                  min, ::sycl::minimum<realtype>(),
+                  min, ::sycl::minimum<sunrealtype>(),
                   GRID_STRIDE_XLOOP(item, i, N)
                   {
                     if (ddata[i] != ZERO)
@@ -1408,16 +1408,16 @@ realtype N_VMinQuotient_Sycl(N_Vector num, N_Vector denom)
  * -------------------------------------------------------------------------- */
 
 
-int N_VLinearCombination_Sycl(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination_Sycl(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(z);
-  realtype           *zdata = NVEC_SYCL_DDATAp(z);
+  sunrealtype           *zdata = NVEC_SYCL_DDATAp(z);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(z);
   size_t             nthreads_total, nthreads_per_block;
 
   /* Fused op workspace shortcuts */
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(z, nvec, nvec))
@@ -1464,18 +1464,18 @@ int N_VLinearCombination_Sycl(int nvec, realtype* c, N_Vector* X, N_Vector z)
 }
 
 
-int N_VScaleAddMulti_Sycl(int nvec, realtype* c, N_Vector x, N_Vector* Y,
+int N_VScaleAddMulti_Sycl(int nvec, sunrealtype* c, N_Vector x, N_Vector* Y,
                           N_Vector* Z)
 {
   const sunindextype N      = NVEC_SYCL_LENGTH(x);
-  const realtype     *xdata = NVEC_SYCL_DDATAp(x);
+  const sunrealtype     *xdata = NVEC_SYCL_DDATAp(x);
   ::sycl::queue      *Q     = NVEC_SYCL_QUEUE(x);
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace */
-  realtype*  cdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(x, nvec, 2 * nvec))
@@ -1533,8 +1533,8 @@ int N_VScaleAddMulti_Sycl(int nvec, realtype* c, N_Vector x, N_Vector* Y,
 
 
 int N_VLinearSumVectorArray_Sycl(int nvec,
-                                 realtype a, N_Vector* X,
-                                 realtype b, N_Vector* Y,
+                                 sunrealtype a, N_Vector* X,
+                                 sunrealtype b, N_Vector* Y,
                                  N_Vector* Z)
 {
   const sunindextype N  = NVEC_SYCL_LENGTH(Z[0]);
@@ -1542,9 +1542,9 @@ int N_VLinearSumVectorArray_Sycl(int nvec,
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace */
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(Z[0], 0, 3 * nvec))
@@ -1596,16 +1596,16 @@ int N_VLinearSumVectorArray_Sycl(int nvec,
 }
 
 
-int N_VScaleVectorArray_Sycl(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray_Sycl(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   const sunindextype N  = NVEC_SYCL_LENGTH(Z[0]);
   ::sycl::queue      *Q = NVEC_SYCL_QUEUE(Z[0]);
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace arrays */
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(Z[0], nvec, 2 * nvec))
@@ -1657,14 +1657,14 @@ int N_VScaleVectorArray_Sycl(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
 }
 
 
-int N_VConstVectorArray_Sycl(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray_Sycl(int nvec, sunrealtype c, N_Vector* Z)
 {
   const sunindextype N  = NVEC_SYCL_LENGTH(Z[0]);
   ::sycl::queue      *Q = NVEC_SYCL_QUEUE(Z[0]);
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace arrays */
-  realtype** zdata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(Z[0], 0, nvec))
@@ -1704,7 +1704,7 @@ int N_VConstVectorArray_Sycl(int nvec, realtype c, N_Vector* Z)
 }
 
 
-int N_VScaleAddMultiVectorArray_Sycl(int nvec, int nsum, realtype* c,
+int N_VScaleAddMultiVectorArray_Sycl(int nvec, int nsum, sunrealtype* c,
                                      N_Vector* X, N_Vector** Y, N_Vector** Z)
 {
   const sunindextype N  = NVEC_SYCL_LENGTH(X[0]);
@@ -1712,10 +1712,10 @@ int N_VScaleAddMultiVectorArray_Sycl(int nvec, int nsum, realtype* c,
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace */
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** ydata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** ydata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(X[0], nsum, nvec + 2 * nvec * nsum))
@@ -1777,7 +1777,7 @@ int N_VScaleAddMultiVectorArray_Sycl(int nvec, int nsum, realtype* c,
 }
 
 
-int N_VLinearCombinationVectorArray_Sycl(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray_Sycl(int nvec, int nsum, sunrealtype* c,
                                          N_Vector** X, N_Vector* Z)
 {
   const sunindextype N  = NVEC_SYCL_LENGTH(Z[0]);
@@ -1785,9 +1785,9 @@ int N_VLinearCombinationVectorArray_Sycl(int nvec, int nsum, realtype* c,
   size_t             nthreads_total, nthreads_per_block;
 
   /* Shortcuts to the fused op workspace arrays */
-  realtype*  cdata = NULL;
-  realtype** xdata = NULL;
-  realtype** zdata = NULL;
+  sunrealtype*  cdata = NULL;
+  sunrealtype** xdata = NULL;
+  sunrealtype** zdata = NULL;
 
   /* Setup the fused op workspace */
   if (FusedBuffer_Init(Z[0], nsum, nvec + nvec * nsum))
@@ -1909,7 +1909,7 @@ int N_VBufUnpack_Sycl(N_Vector x, void *buf)
  * -------------------------------------------------------------------------- */
 
 
-int N_VEnableFusedOps_Sycl(N_Vector v, booleantype tf)
+int N_VEnableFusedOps_Sycl(N_Vector v, sunbooleantype tf)
 {
   /* check that vector is non-NULL */
   if (v == NULL) return -1;
@@ -1950,7 +1950,7 @@ int N_VEnableFusedOps_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombination_Sycl(N_Vector v, booleantype tf)
+int N_VEnableLinearCombination_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -1959,7 +1959,7 @@ int N_VEnableLinearCombination_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleAddMulti_Sycl(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMulti_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -1968,7 +1968,7 @@ int N_VEnableScaleAddMulti_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearSumVectorArray_Sycl(N_Vector v, booleantype tf)
+int N_VEnableLinearSumVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -1977,7 +1977,7 @@ int N_VEnableLinearSumVectorArray_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleVectorArray_Sycl(N_Vector v, booleantype tf)
+int N_VEnableScaleVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -1986,7 +1986,7 @@ int N_VEnableScaleVectorArray_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableConstVectorArray_Sycl(N_Vector v, booleantype tf)
+int N_VEnableConstVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -1995,7 +1995,7 @@ int N_VEnableConstVectorArray_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v, booleantype tf)
+int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2005,7 +2005,7 @@ int N_VEnableScaleAddMultiVectorArray_Sycl(N_Vector v, booleantype tf)
 }
 
 
-int N_VEnableLinearCombinationVectorArray_Sycl(N_Vector v, booleantype tf)
+int N_VEnableLinearCombinationVectorArray_Sycl(N_Vector v, sunbooleantype tf)
 {
   if (v == NULL) return -1;
   if (v->ops == NULL) return -1;
@@ -2063,12 +2063,12 @@ static int AllocateData(N_Vector v)
 
 
 /* Allocate and initializes the internal memory used for reductions */
-static int InitializeReductionBuffer(N_Vector v, const realtype value, size_t n)
+static int InitializeReductionBuffer(N_Vector v, const sunrealtype value, size_t n)
 {
   int         alloc_fail = 0;
   int         copy_fail  = 0;
-  booleantype alloc_mem  = SUNFALSE;
-  size_t      bytes      = n * sizeof(realtype);
+  sunbooleantype alloc_mem  = SUNFALSE;
+  size_t      bytes      = n * sizeof(sunrealtype);
 
   /* Get the vector private memory structure */
   N_PrivateVectorContent_Sycl vcp = NVEC_SYCL_PRIVATE(v);
@@ -2171,7 +2171,7 @@ static int CopyReductionBufferFromDevice(N_Vector v, size_t n)
   copy_fail = SUNMemoryHelper_CopyAsync(NVEC_SYCL_MEMHELP(v),
                                         NVEC_SYCL_PRIVATE(v)->reduce_buffer_host,
                                         NVEC_SYCL_PRIVATE(v)->reduce_buffer_dev,
-                                        n * sizeof(realtype),
+                                        n * sizeof(sunrealtype),
                                         (void*) NVEC_SYCL_QUEUE(v));
 
   if (copy_fail)
@@ -2189,8 +2189,8 @@ static int CopyReductionBufferFromDevice(N_Vector v, size_t n)
 static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 {
   int         alloc_fail = 0;
-  booleantype alloc_mem  = SUNFALSE;
-  size_t      bytes      = nreal * sizeof(realtype) + nptr * sizeof(realtype*);
+  sunbooleantype alloc_mem  = SUNFALSE;
+  size_t      bytes      = nreal * sizeof(sunrealtype) + nptr * sizeof(sunrealtype*);
 
   /* Get the vector private memory structure */
   N_PrivateVectorContent_Sycl vcp = NVEC_SYCL_PRIVATE(v);
@@ -2244,8 +2244,8 @@ static int FusedBuffer_Init(N_Vector v, int nreal, int nptr)
 }
 
 
-static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
-                                     realtype **shortcut)
+static int FusedBuffer_CopyRealArray(N_Vector v, sunrealtype *rdata, int nval,
+                                     sunrealtype **shortcut)
 {
   /* Get the vector private memory structure */
   N_PrivateVectorContent_Sycl vcp = NVEC_SYCL_PRIVATE(v);
@@ -2257,7 +2257,7 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
     return -1;
   }
 
-  realtype* h_buffer = (realtype*) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype* h_buffer = (sunrealtype*) ((char*)(vcp->fused_buffer_host->ptr) +
                                     vcp->fused_buffer_offset);
 
   for (int j = 0; j < nval; j++)
@@ -2266,17 +2266,17 @@ static int FusedBuffer_CopyRealArray(N_Vector v, realtype *rdata, int nval,
   }
 
   /* Set shortcut to the device buffer and update offset*/
-  *shortcut = (realtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype*) ((char*)(vcp->fused_buffer_dev->ptr) +
                            vcp->fused_buffer_offset);
 
-  vcp->fused_buffer_offset += nval * sizeof(realtype);
+  vcp->fused_buffer_offset += nval * sizeof(sunrealtype);
 
   return 0;
 }
 
 
 static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
-                                      realtype ***shortcut)
+                                      sunrealtype ***shortcut)
 {
   /* Get the vector private memory structure */
   N_PrivateVectorContent_Sycl vcp = NVEC_SYCL_PRIVATE(v);
@@ -2288,7 +2288,7 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -2297,17 +2297,17 @@ static int FusedBuffer_CopyPtrArray1D(N_Vector v, N_Vector *X, int nvec,
   }
 
   /* Set shortcut to the device buffer and update offset*/
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
-  vcp->fused_buffer_offset += nvec * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * sizeof(sunrealtype*);
 
   return 0;
 }
 
 
 static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
-                                      int nsum, realtype ***shortcut)
+                                      int nsum, sunrealtype ***shortcut)
 {
   /* Get the vector private memory structure */
   N_PrivateVectorContent_Sycl vcp = NVEC_SYCL_PRIVATE(v);
@@ -2319,7 +2319,7 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
     return -1;
   }
 
-  realtype** h_buffer = (realtype**) ((char*)(vcp->fused_buffer_host->ptr) +
+  sunrealtype** h_buffer = (sunrealtype**) ((char*)(vcp->fused_buffer_host->ptr) +
                                       vcp->fused_buffer_offset);
 
   for (int j = 0; j < nvec; j++)
@@ -2331,11 +2331,11 @@ static int FusedBuffer_CopyPtrArray2D(N_Vector v, N_Vector **X, int nvec,
   }
 
   /* Set shortcut to the device buffer and update offset*/
-  *shortcut = (realtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
+  *shortcut = (sunrealtype**) ((char*)(vcp->fused_buffer_dev->ptr) +
                             vcp->fused_buffer_offset);
 
   /* Update the offset */
-  vcp->fused_buffer_offset += nvec * nsum * sizeof(realtype*);
+  vcp->fused_buffer_offset += nvec * nsum * sizeof(sunrealtype*);
 
   return 0;
 }
@@ -2391,7 +2391,7 @@ static int FusedBuffer_Free(N_Vector v)
 
 /* Get the kernel launch parameters based on the kernel type (reduction or not),
  * using the appropriate kernel execution policy. */
-static int GetKernelParameters(N_Vector v, booleantype reduction,
+static int GetKernelParameters(N_Vector v, sunbooleantype reduction,
                                size_t& nthreads_total,
                                size_t& nthreads_per_block)
 {
diff --git a/src/nvector/trilinos/nvector_trilinos.cpp b/src/nvector/trilinos/nvector_trilinos.cpp
index cdcab30b34..ffffe41f21 100644
--- a/src/nvector/trilinos/nvector_trilinos.cpp
+++ b/src/nvector/trilinos/nvector_trilinos.cpp
@@ -25,10 +25,10 @@
 #include <nvector/trilinos/SundialsTpetraVectorInterface.hpp>
 #include <nvector/trilinos/SundialsTpetraVectorKernels.hpp>
 
-#define ZERO   RCONST(0.0)
-#define HALF   RCONST(0.5)
-#define ONE    RCONST(1.0)
-#define ONEPT5 RCONST(1.5)
+#define ZERO   SUN_RCONST(0.0)
+#define HALF   SUN_RCONST(0.5)
+#define ONE    SUN_RCONST(1.0)
+#define ONEPT5 SUN_RCONST(1.5)
 
 
 
@@ -250,7 +250,7 @@ sunindextype N_VGetLength_Trilinos(N_Vector x)
 /*
  * Linear combination of two vectors: z = a*x + b*y
  */
-void N_VLinearSum_Trilinos(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_Trilinos(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> yv = N_VGetVector_Trilinos(y);
@@ -269,7 +269,7 @@ void N_VLinearSum_Trilinos(realtype a, N_Vector x, realtype b, N_Vector y, N_Vec
 /*
  * Set all vector elements to a constant: z[i] = c
  */
-void N_VConst_Trilinos(realtype c, N_Vector z)
+void N_VConst_Trilinos(sunrealtype c, N_Vector z)
 {
   Teuchos::RCP<vector_type> zv = N_VGetVector_Trilinos(z);
 
@@ -303,7 +303,7 @@ void N_VDiv_Trilinos(N_Vector x, N_Vector y, N_Vector z)
 /*
  * Scale vector: z = c*x
  */
-void N_VScale_Trilinos(realtype c, N_Vector x, N_Vector z)
+void N_VScale_Trilinos(sunrealtype c, N_Vector x, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<vector_type> zv       = N_VGetVector_Trilinos(z);
@@ -336,7 +336,7 @@ void N_VInv_Trilinos(N_Vector x, N_Vector z)
 /*
  * Add constant: z = x + b
  */
-void N_VAddConst_Trilinos(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_Trilinos(N_Vector x, sunrealtype b, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<vector_type> zv       = N_VGetVector_Trilinos(z);
@@ -347,7 +347,7 @@ void N_VAddConst_Trilinos(N_Vector x, realtype b, N_Vector z)
 /*
  * Scalar product of vectors x and y
  */
-realtype N_VDotProd_Trilinos(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_Trilinos(N_Vector x, N_Vector y)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> yv = N_VGetVector_Trilinos(y);
@@ -358,7 +358,7 @@ realtype N_VDotProd_Trilinos(N_Vector x, N_Vector y)
 /*
  * Max norm (L infinity) of vector x
  */
-realtype N_VMaxNorm_Trilinos(N_Vector x)
+sunrealtype N_VMaxNorm_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
 
@@ -368,7 +368,7 @@ realtype N_VMaxNorm_Trilinos(N_Vector x)
 /*
  * Weighted RMS norm
  */
-realtype N_VWrmsNorm_Trilinos(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_Trilinos(N_Vector x, N_Vector w)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> wv = N_VGetVector_Trilinos(w);
@@ -379,7 +379,7 @@ realtype N_VWrmsNorm_Trilinos(N_Vector x, N_Vector w)
 /*
  * Masked weighted RMS norm
  */
-realtype N_VWrmsNormMask_Trilinos(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_Trilinos(N_Vector x, N_Vector w, N_Vector id)
 {
   Teuchos::RCP<const vector_type> xv  = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> wv  = N_VGetVector_Trilinos(w);
@@ -391,7 +391,7 @@ realtype N_VWrmsNormMask_Trilinos(N_Vector x, N_Vector w, N_Vector id)
 /*
  * Returns minimum vector element
  */
-realtype N_VMin_Trilinos(N_Vector x)
+sunrealtype N_VMin_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv  = N_VGetVector_Trilinos(x);
 
@@ -401,7 +401,7 @@ realtype N_VMin_Trilinos(N_Vector x)
 /*
  * Weighted L2 norm
  */
-realtype N_VWL2Norm_Trilinos(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_Trilinos(N_Vector x, N_Vector w)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> wv = N_VGetVector_Trilinos(w);
@@ -412,7 +412,7 @@ realtype N_VWL2Norm_Trilinos(N_Vector x, N_Vector w)
 /*
  * L1 norm
  */
-realtype N_VL1Norm_Trilinos(N_Vector x)
+sunrealtype N_VL1Norm_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
 
@@ -422,7 +422,7 @@ realtype N_VL1Norm_Trilinos(N_Vector x)
 /*
  * Elementwise z[i] = |x[i]| >= c ? 1 : 0
  */
-void N_VCompare_Trilinos(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_Trilinos(sunrealtype c, N_Vector x, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<vector_type> zv       = N_VGetVector_Trilinos(z);
@@ -433,7 +433,7 @@ void N_VCompare_Trilinos(realtype c, N_Vector x, N_Vector z)
 /*
  * Elementwise inverse with zero checking: z[i] = 1/x[i], x[i] != 0
  */
-booleantype N_VInvTest_Trilinos(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_Trilinos(N_Vector x, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<vector_type> zv       = N_VGetVector_Trilinos(z);
@@ -445,7 +445,7 @@ booleantype N_VInvTest_Trilinos(N_Vector x, N_Vector z)
  * Checks constraint violations for vector x. Constraints are defined in
  * vector c, and constraint violation flags are stored in vector m.
  */
-booleantype N_VConstrMask_Trilinos(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_Trilinos(N_Vector c, N_Vector x, N_Vector m)
 {
   Teuchos::RCP<const vector_type> cv = N_VGetVector_Trilinos(c);
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
@@ -457,7 +457,7 @@ booleantype N_VConstrMask_Trilinos(N_Vector c, N_Vector x, N_Vector m)
 /*
  * Find minimum quotient: minq  = min ( num[i]/denom[i]), denom[i] != 0.
  */
-realtype N_VMinQuotient_Trilinos(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_Trilinos(N_Vector num, N_Vector denom)
 {
   Teuchos::RCP<const vector_type> numv = N_VGetVector_Trilinos(num);
   Teuchos::RCP<const vector_type> denv = N_VGetVector_Trilinos(denom);
@@ -468,7 +468,7 @@ realtype N_VMinQuotient_Trilinos(N_Vector num, N_Vector denom)
 /*
  * MPI task-local dot product
  */
-realtype N_VDotProdLocal_Trilinos(N_Vector x, N_Vector y)
+sunrealtype N_VDotProdLocal_Trilinos(N_Vector x, N_Vector y)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> yv = N_VGetVector_Trilinos(y);
@@ -479,7 +479,7 @@ realtype N_VDotProdLocal_Trilinos(N_Vector x, N_Vector y)
 /*
  * MPI task-local maximum norm
  */
-realtype N_VMaxNormLocal_Trilinos(N_Vector x)
+sunrealtype N_VMaxNormLocal_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
 
@@ -489,7 +489,7 @@ realtype N_VMaxNormLocal_Trilinos(N_Vector x)
 /*
  * MPI task-local minimum element
  */
-realtype N_VMinLocal_Trilinos(N_Vector x)
+sunrealtype N_VMinLocal_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
 
@@ -499,7 +499,7 @@ realtype N_VMinLocal_Trilinos(N_Vector x)
 /*
  * MPI task-local L1 norm
  */
-realtype N_VL1NormLocal_Trilinos(N_Vector x)
+sunrealtype N_VL1NormLocal_Trilinos(N_Vector x)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
 
@@ -509,7 +509,7 @@ realtype N_VL1NormLocal_Trilinos(N_Vector x)
 /*
  * MPI task-local weighted squared sum
  */
-realtype N_VWSqrSumLocal_Trilinos(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal_Trilinos(N_Vector x, N_Vector w)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> wv = N_VGetVector_Trilinos(w);
@@ -520,7 +520,7 @@ realtype N_VWSqrSumLocal_Trilinos(N_Vector x, N_Vector w)
 /*
  * MPI task-local weighted masked squared sum
  */
-realtype N_VWSqrSumMaskLocal_Trilinos(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal_Trilinos(N_Vector x, N_Vector w, N_Vector id)
 {
   Teuchos::RCP<const vector_type> xv  = N_VGetVector_Trilinos(x);
   Teuchos::RCP<const vector_type> wv  = N_VGetVector_Trilinos(w);
@@ -532,7 +532,7 @@ realtype N_VWSqrSumMaskLocal_Trilinos(N_Vector x, N_Vector w, N_Vector id)
 /*
  * MPI task-local elementwise inverse with zero checking: z[i] = 1/x[i], x[i] != 0
  */
-booleantype N_VInvTestLocal_Trilinos(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTestLocal_Trilinos(N_Vector x, N_Vector z)
 {
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
   Teuchos::RCP<vector_type> zv = N_VGetVector_Trilinos(z);
@@ -544,7 +544,7 @@ booleantype N_VInvTestLocal_Trilinos(N_Vector x, N_Vector z)
  * MPI task-local constraint checking for vector x. Constraints are defined in
  * vector c, and constraint violation flags are stored in vector m.
  */
-booleantype N_VConstrMaskLocal_Trilinos(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMaskLocal_Trilinos(N_Vector c, N_Vector x, N_Vector m)
 {
   Teuchos::RCP<const vector_type> cv = N_VGetVector_Trilinos(c);
   Teuchos::RCP<const vector_type> xv = N_VGetVector_Trilinos(x);
@@ -556,7 +556,7 @@ booleantype N_VConstrMaskLocal_Trilinos(N_Vector c, N_Vector x, N_Vector m)
 /*
  * MPI task-local minimum quotient: minq  = min ( num[i]/denom[i]), denom[i] != 0.
  */
-realtype N_VMinQuotientLocal_Trilinos(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotientLocal_Trilinos(N_Vector num, N_Vector denom)
 {
   Teuchos::RCP<const vector_type> numv = N_VGetVector_Trilinos(num);
   Teuchos::RCP<const vector_type> denv = N_VGetVector_Trilinos(denom);
diff --git a/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90 b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
index 11443858ac..bb6525471f 100644
--- a/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
+++ b/src/sunadaptcontroller/imexgus/fmod/fsunadaptcontroller_imexgus_mod.f90
@@ -198,7 +198,7 @@ function FSUNAdaptController_EstimateStep_ImExGus(c, h, p, dsm, hnew) &
 real(C_DOUBLE), intent(in) :: h
 integer(C_INT), intent(in) :: p
 real(C_DOUBLE), intent(in) :: dsm
-real(C_DOUBLE), target, intent(inout) :: hnew
+real(C_DOUBLE), dimension(*), target, intent(inout) :: hnew
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 real(C_DOUBLE) :: farg2 
@@ -210,7 +210,7 @@ function FSUNAdaptController_EstimateStep_ImExGus(c, h, p, dsm, hnew) &
 farg2 = h
 farg3 = p
 farg4 = dsm
-farg5 = c_loc(hnew)
+farg5 = c_loc(hnew(1))
 fresult = swigc_FSUNAdaptController_EstimateStep_ImExGus(farg1, farg2, farg3, farg4, farg5)
 swig_result = fresult
 end function
diff --git a/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c b/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
index 9f9f1d39ab..c33adecb1d 100644
--- a/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
+++ b/src/sunadaptcontroller/imexgus/sunadaptcontroller_imexgus.c
@@ -39,12 +39,12 @@
  * Default parameters
  * ------------------ */
 
-#define DEFAULT_K1E    RCONST(0.367)
-#define DEFAULT_K2E    RCONST(0.268)
-#define DEFAULT_K1I    RCONST(0.95)
-#define DEFAULT_K2I    RCONST(0.95)
-#define DEFAULT_BIAS   RCONST(1.5)
-#define TINY           RCONST(1.0e-10)
+#define DEFAULT_K1E    SUN_RCONST(0.367)
+#define DEFAULT_K2E    SUN_RCONST(0.268)
+#define DEFAULT_K1I    SUN_RCONST(0.95)
+#define DEFAULT_K2I    SUN_RCONST(0.95)
+#define DEFAULT_BIAS   SUN_RCONST(1.5)
+#define TINY           SUN_RCONST(1.0e-10)
 
 
 /* -----------------------------------------------------------------
@@ -128,7 +128,7 @@ int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,
   const int ord = p + 1;
 
   /* set usable time-step adaptivity parameters -- first step */
-  const sunrealtype k = -RCONST(1.0) / ord;
+  const sunrealtype k = -SUN_RCONST(1.0) / ord;
   const sunrealtype e = SUNMAX(SACIMEXGUS_BIAS(C) * dsm, TINY);
 
   /* set usable time-step adaptivity parameters -- subsequent steps */
@@ -159,7 +159,7 @@ int SUNAdaptController_EstimateStep_ImExGus(SUNAdaptController C, sunrealtype h,
 
 int SUNAdaptController_Reset_ImExGus(SUNAdaptController C)
 {
-  SACIMEXGUS_EP(C) = RCONST(1.0);
+  SACIMEXGUS_EP(C) = SUN_RCONST(1.0);
   SACIMEXGUS_FIRSTSTEP(C) = SUNTRUE;
   return SUNADAPTCONTROLLER_SUCCESS;
 }
@@ -203,7 +203,7 @@ int SUNAdaptController_SetErrorBias_ImExGus(SUNAdaptController C, sunrealtype bi
 {
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   /* set allowed value, otherwise set default */
-  if (bias <= RCONST(0.0)) {
+  if (bias <= SUN_RCONST(0.0)) {
     SACIMEXGUS_BIAS(C) = DEFAULT_BIAS;
   } else {
     SACIMEXGUS_BIAS(C) = bias;
diff --git a/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90 b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
index 720482cd6f..c186227418 100644
--- a/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
+++ b/src/sunadaptcontroller/soderlind/fmod/fsunadaptcontroller_soderlind_mod.f90
@@ -302,7 +302,7 @@ function FSUNAdaptController_EstimateStep_Soderlind(c, h, p, dsm, hnew) &
 real(C_DOUBLE), intent(in) :: h
 integer(C_INT), intent(in) :: p
 real(C_DOUBLE), intent(in) :: dsm
-real(C_DOUBLE), target, intent(inout) :: hnew
+real(C_DOUBLE), dimension(*), target, intent(inout) :: hnew
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 real(C_DOUBLE) :: farg2 
@@ -314,7 +314,7 @@ function FSUNAdaptController_EstimateStep_Soderlind(c, h, p, dsm, hnew) &
 farg2 = h
 farg3 = p
 farg4 = dsm
-farg5 = c_loc(hnew)
+farg5 = c_loc(hnew(1))
 fresult = swigc_FSUNAdaptController_EstimateStep_Soderlind(farg1, farg2, farg3, farg4, farg5)
 swig_result = fresult
 end function
diff --git a/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c b/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
index 4d16ac8f09..70a91eda01 100644
--- a/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
+++ b/src/sunadaptcontroller/soderlind/sunadaptcontroller_soderlind.c
@@ -42,23 +42,23 @@
  * Default parameters
  * ------------------ */
 
-#define DEFAULT_K1          RCONST(1.25)    /* H_{0}321 parameters */
-#define DEFAULT_K2          RCONST(0.5)
-#define DEFAULT_K3          RCONST(-0.75)
-#define DEFAULT_K4          RCONST(0.25)
-#define DEFAULT_K5          RCONST(0.75)
-#define DEFAULT_PID_K1      RCONST(0.58)    /* PID parameters */
-#define DEFAULT_PID_K2     -RCONST(0.21)
-#define DEFAULT_PID_K3      RCONST(0.1)
-#define DEFAULT_PI_K1       RCONST(0.8)     /* PI parameters */
-#define DEFAULT_PI_K2      -RCONST(0.31)
-#define DEFAULT_I_K1        RCONST(1.0)     /* I parameters */
-#define DEFAULT_EXPGUS_K1   RCONST(0.367)   /* Explicit Gustafsson parameters */
-#define DEFAULT_EXPGUS_K2   RCONST(0.268)
-#define DEFAULT_IMPGUS_K1   RCONST(0.98)    /* Implicit Gustafsson parameters */
-#define DEFAULT_IMPGUS_K2   RCONST(0.95)
-#define DEFAULT_BIAS        RCONST(1.5)
-#define TINY                RCONST(1.0e-10)
+#define DEFAULT_K1          SUN_RCONST(1.25)    /* H_{0}321 parameters */
+#define DEFAULT_K2          SUN_RCONST(0.5)
+#define DEFAULT_K3          SUN_RCONST(-0.75)
+#define DEFAULT_K4          SUN_RCONST(0.25)
+#define DEFAULT_K5          SUN_RCONST(0.75)
+#define DEFAULT_PID_K1      SUN_RCONST(0.58)    /* PID parameters */
+#define DEFAULT_PID_K2     -SUN_RCONST(0.21)
+#define DEFAULT_PID_K3      SUN_RCONST(0.1)
+#define DEFAULT_PI_K1       SUN_RCONST(0.8)     /* PI parameters */
+#define DEFAULT_PI_K2      -SUN_RCONST(0.31)
+#define DEFAULT_I_K1        SUN_RCONST(1.0)     /* I parameters */
+#define DEFAULT_EXPGUS_K1   SUN_RCONST(0.367)   /* Explicit Gustafsson parameters */
+#define DEFAULT_EXPGUS_K2   SUN_RCONST(0.268)
+#define DEFAULT_IMPGUS_K1   SUN_RCONST(0.98)    /* Implicit Gustafsson parameters */
+#define DEFAULT_IMPGUS_K2   SUN_RCONST(0.95)
+#define DEFAULT_BIAS        SUN_RCONST(1.5)
+#define TINY                SUN_RCONST(1.0e-10)
 
 
 /* -----------------------------------------------------------------
@@ -162,8 +162,8 @@ int SUNAdaptController_SetParams_PID(SUNAdaptController C,
   SODERLIND_K1(C) = k1;
   SODERLIND_K2(C) = k2;
   SODERLIND_K3(C) = k3;
-  SODERLIND_K4(C) = RCONST(0.0);
-  SODERLIND_K5(C) = RCONST(0.0);
+  SODERLIND_K4(C) = SUN_RCONST(0.0);
+  SODERLIND_K5(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -198,9 +198,9 @@ int SUNAdaptController_SetParams_PI(SUNAdaptController C,
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   SODERLIND_K1(C) = k1;
   SODERLIND_K2(C) = k2;
-  SODERLIND_K3(C) = RCONST(0.0);
-  SODERLIND_K4(C) = RCONST(0.0);
-  SODERLIND_K5(C) = RCONST(0.0);
+  SODERLIND_K3(C) = SUN_RCONST(0.0);
+  SODERLIND_K4(C) = SUN_RCONST(0.0);
+  SODERLIND_K5(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -231,10 +231,10 @@ int SUNAdaptController_SetParams_I(SUNAdaptController C, sunrealtype k1)
 {
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   SODERLIND_K1(C) = k1;
-  SODERLIND_K2(C) = RCONST(0.0);
-  SODERLIND_K3(C) = RCONST(0.0);
-  SODERLIND_K4(C) = RCONST(0.0);
-  SODERLIND_K5(C) = RCONST(0.0);
+  SODERLIND_K2(C) = SUN_RCONST(0.0);
+  SODERLIND_K3(C) = SUN_RCONST(0.0);
+  SODERLIND_K4(C) = SUN_RCONST(0.0);
+  SODERLIND_K5(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -269,9 +269,9 @@ int SUNAdaptController_SetParams_ExpGus(SUNAdaptController C,
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   SODERLIND_K1(C) = k1+k2;
   SODERLIND_K2(C) = -k2;
-  SODERLIND_K3(C) = RCONST(0.0);
-  SODERLIND_K4(C) = RCONST(0.0);
-  SODERLIND_K5(C) = RCONST(0.0);
+  SODERLIND_K3(C) = SUN_RCONST(0.0);
+  SODERLIND_K4(C) = SUN_RCONST(0.0);
+  SODERLIND_K5(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -306,9 +306,9 @@ int SUNAdaptController_SetParams_ImpGus(SUNAdaptController C,
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   SODERLIND_K1(C) = k1+k2;
   SODERLIND_K2(C) = -k2;
-  SODERLIND_K3(C) = RCONST(0.0);
-  SODERLIND_K4(C) = RCONST(1.0);
-  SODERLIND_K5(C) = RCONST(0.0);
+  SODERLIND_K3(C) = SUN_RCONST(0.0);
+  SODERLIND_K4(C) = SUN_RCONST(1.0);
+  SODERLIND_K5(C) = SUN_RCONST(0.0);
   return SUNADAPTCONTROLLER_SUCCESS;
 }
 
@@ -358,10 +358,10 @@ int SUNAdaptController_EstimateStep_Soderlind(SUNAdaptController C, sunrealtype
 int SUNAdaptController_Reset_Soderlind(SUNAdaptController C)
 {
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
-  SODERLIND_EP(C)  = RCONST(1.0);
-  SODERLIND_EPP(C) = RCONST(1.0);
-  SODERLIND_HP(C)  = RCONST(1.0);
-  SODERLIND_HPP(C) = RCONST(1.0);
+  SODERLIND_EP(C)  = SUN_RCONST(1.0);
+  SODERLIND_EPP(C) = SUN_RCONST(1.0);
+  SODERLIND_HP(C)  = SUN_RCONST(1.0);
+  SODERLIND_HPP(C) = SUN_RCONST(1.0);
   SODERLIND_FIRSTSTEPS(C) = 0;
   return SUNADAPTCONTROLLER_SUCCESS;
 }
@@ -413,7 +413,7 @@ int SUNAdaptController_SetErrorBias_Soderlind(SUNAdaptController C, sunrealtype
 {
   if (C == NULL) { return SUNADAPTCONTROLLER_ILL_INPUT; }
   /* set allowed value, otherwise set default */
-  if (bias <= RCONST(0.0)) {
+  if (bias <= SUN_RCONST(0.0)) {
     SODERLIND_BIAS(C) = DEFAULT_BIAS;
   } else {
     SODERLIND_BIAS(C) = bias;
diff --git a/src/sundials/CMakeLists.txt b/src/sundials/CMakeLists.txt
index d782ef0103..13521d9798 100644
--- a/src/sundials/CMakeLists.txt
+++ b/src/sundials/CMakeLists.txt
@@ -46,6 +46,7 @@ set(sundials_HEADERS
   sundials_profiler.hpp
   sundials_logger.h
   sundials_types.h
+  sundials_types_deprecated.h
   sundials_version.h
   )
 
diff --git a/src/sundials/fmod/fsundials_adaptcontroller_mod.f90 b/src/sundials/fmod/fsundials_adaptcontroller_mod.f90
index c804548d50..0e59f3f6d3 100644
--- a/src/sundials/fmod/fsundials_adaptcontroller_mod.f90
+++ b/src/sundials/fmod/fsundials_adaptcontroller_mod.f90
@@ -196,7 +196,7 @@ function FSUNAdaptController_EstimateStep(c, h, p, dsm, hnew) &
 real(C_DOUBLE), intent(in) :: h
 integer(C_INT), intent(in) :: p
 real(C_DOUBLE), intent(in) :: dsm
-real(C_DOUBLE), target, intent(inout) :: hnew
+real(C_DOUBLE), dimension(*), target, intent(inout) :: hnew
 integer(C_INT) :: fresult 
 type(C_PTR) :: farg1 
 real(C_DOUBLE) :: farg2 
@@ -208,7 +208,7 @@ function FSUNAdaptController_EstimateStep(c, h, p, dsm, hnew) &
 farg2 = h
 farg3 = p
 farg4 = dsm
-farg5 = c_loc(hnew)
+farg5 = c_loc(hnew(1))
 fresult = swigc_FSUNAdaptController_EstimateStep(farg1, farg2, farg3, farg4, farg5)
 swig_result = fresult
 end function
diff --git a/src/sundials/fmod/fsundials_linearsolver_mod.c b/src/sundials/fmod/fsundials_linearsolver_mod.c
index 9c6ed9076e..dde63dc63a 100644
--- a/src/sundials/fmod/fsundials_linearsolver_mod.c
+++ b/src/sundials/fmod/fsundials_linearsolver_mod.c
@@ -194,17 +194,17 @@
 SWIGEXPORT int _wrap_FSUNModifiedGS(void *farg1, void *farg2, int const *farg3, int const *farg4, double *farg5) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype **arg2 = (realtype **) 0 ;
+  sunrealtype **arg2 = (sunrealtype **) 0 ;
   int arg3 ;
   int arg4 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype **)(farg2);
+  arg2 = (sunrealtype **)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)SUNModifiedGS(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -214,20 +214,20 @@ SWIGEXPORT int _wrap_FSUNModifiedGS(void *farg1, void *farg2, int const *farg3,
 SWIGEXPORT int _wrap_FSUNClassicalGS(void *farg1, void *farg2, int const *farg3, int const *farg4, double *farg5, double *farg6, void *farg7) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype **arg2 = (realtype **) 0 ;
+  sunrealtype **arg2 = (sunrealtype **) 0 ;
   int arg3 ;
   int arg4 ;
-  realtype *arg5 = (realtype *) 0 ;
-  realtype *arg6 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
+  sunrealtype *arg6 = (sunrealtype *) 0 ;
   N_Vector *arg7 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype **)(farg2);
+  arg2 = (sunrealtype **)(farg2);
   arg3 = (int)(*farg3);
   arg4 = (int)(*farg4);
-  arg5 = (realtype *)(farg5);
-  arg6 = (realtype *)(farg6);
+  arg5 = (sunrealtype *)(farg5);
+  arg6 = (sunrealtype *)(farg6);
   arg7 = (N_Vector *)(farg7);
   result = (int)SUNClassicalGS(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
   fresult = (int)(result);
@@ -238,14 +238,14 @@ SWIGEXPORT int _wrap_FSUNClassicalGS(void *farg1, void *farg2, int const *farg3,
 SWIGEXPORT int _wrap_FSUNQRfact(int const *farg1, void *farg2, double *farg3, int const *farg4) {
   int fresult ;
   int arg1 ;
-  realtype **arg2 = (realtype **) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype **arg2 = (sunrealtype **) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int arg4 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg2 = (sunrealtype **)(farg2);
+  arg3 = (sunrealtype *)(farg3);
   arg4 = (int)(*farg4);
   result = (int)SUNQRfact(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
@@ -256,15 +256,15 @@ SWIGEXPORT int _wrap_FSUNQRfact(int const *farg1, void *farg2, double *farg3, in
 SWIGEXPORT int _wrap_FSUNQRsol(int const *farg1, void *farg2, double *farg3, double *farg4) {
   int fresult ;
   int arg1 ;
-  realtype **arg2 = (realtype **) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype **arg2 = (sunrealtype **) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype **)(farg2);
-  arg3 = (realtype *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg2 = (sunrealtype **)(farg2);
+  arg3 = (sunrealtype *)(farg3);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)SUNQRsol(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -274,7 +274,7 @@ SWIGEXPORT int _wrap_FSUNQRsol(int const *farg1, void *farg2, double *farg3, dou
 SWIGEXPORT int _wrap_FSUNQRAdd_MGS(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -282,7 +282,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_MGS(void *farg1, double *farg2, N_Vector farg3, i
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -296,7 +296,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_MGS(void *farg1, double *farg2, N_Vector farg3, i
 SWIGEXPORT int _wrap_FSUNQRAdd_ICWY(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -304,7 +304,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_ICWY(void *farg1, double *farg2, N_Vector farg3,
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -318,7 +318,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_ICWY(void *farg1, double *farg2, N_Vector farg3,
 SWIGEXPORT int _wrap_FSUNQRAdd_ICWY_SB(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -326,7 +326,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_ICWY_SB(void *farg1, double *farg2, N_Vector farg
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -340,7 +340,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_ICWY_SB(void *farg1, double *farg2, N_Vector farg
 SWIGEXPORT int _wrap_FSUNQRAdd_CGS2(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -348,7 +348,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_CGS2(void *farg1, double *farg2, N_Vector farg3,
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -362,7 +362,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_CGS2(void *farg1, double *farg2, N_Vector farg3,
 SWIGEXPORT int _wrap_FSUNQRAdd_DCGS2(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -370,7 +370,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_DCGS2(void *farg1, double *farg2, N_Vector farg3,
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -384,7 +384,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_DCGS2(void *farg1, double *farg2, N_Vector farg3,
 SWIGEXPORT int _wrap_FSUNQRAdd_DCGS2_SB(void *farg1, double *farg2, N_Vector farg3, int const *farg4, int const *farg5, void *farg6) {
   int fresult ;
   N_Vector *arg1 = (N_Vector *) 0 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   int arg4 ;
   int arg5 ;
@@ -392,7 +392,7 @@ SWIGEXPORT int _wrap_FSUNQRAdd_DCGS2_SB(void *farg1, double *farg2, N_Vector far
   int result;
   
   arg1 = (N_Vector *)(farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (int)(*farg4);
   arg5 = (int)(*farg5);
@@ -543,14 +543,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve(SUNLinearSolver farg1, SUNMatrix farg2, N_V
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -572,11 +572,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sundials/fmod/fsundials_matrix_mod.c b/src/sundials/fmod/fsundials_matrix_mod.c
index 1376f3fe58..279e17bf31 100644
--- a/src/sundials/fmod/fsundials_matrix_mod.c
+++ b/src/sundials/fmod/fsundials_matrix_mod.c
@@ -284,12 +284,12 @@ SWIGEXPORT int _wrap_FSUNMatCopy(SUNMatrix farg1, SUNMatrix farg2) {
 
 SWIGEXPORT int _wrap_FSUNMatScaleAdd(double const *farg1, SUNMatrix farg2, SUNMatrix farg3) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   SUNMatrix arg3 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (SUNMatrix)(farg3);
   result = (int)SUNMatScaleAdd(arg1,arg2,arg3);
@@ -300,11 +300,11 @@ SWIGEXPORT int _wrap_FSUNMatScaleAdd(double const *farg1, SUNMatrix farg2, SUNMa
 
 SWIGEXPORT int _wrap_FSUNMatScaleAddI(double const *farg1, SUNMatrix farg2) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   result = (int)SUNMatScaleAddI(arg1,arg2);
   fresult = (int)(result);
diff --git a/src/sundials/fmod/fsundials_nonlinearsolver_mod.c b/src/sundials/fmod/fsundials_nonlinearsolver_mod.c
index 6f0d545336..de0f8abcf8 100644
--- a/src/sundials/fmod/fsundials_nonlinearsolver_mod.c
+++ b/src/sundials/fmod/fsundials_nonlinearsolver_mod.c
@@ -256,7 +256,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve(SUNNonlinearSolver farg1, N_Vector farg2
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int arg6 ;
   void *arg7 = (void *) 0 ;
   int result;
@@ -265,7 +265,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve(SUNNonlinearSolver farg1, N_Vector farg2
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   arg6 = (int)(*farg6);
   arg7 = (void *)(farg7);
   result = (int)SUNNonlinSolSolve(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
diff --git a/src/sundials/fmod/fsundials_nvector_mod.c b/src/sundials/fmod/fsundials_nvector_mod.c
index b653ff48ea..3cc84776ff 100644
--- a/src/sundials/fmod/fsundials_nvector_mod.c
+++ b/src/sundials/fmod/fsundials_nvector_mod.c
@@ -281,10 +281,10 @@ SWIGEXPORT void _wrap_FN_VSpace(N_Vector farg1, int64_t *farg2, int64_t *farg3)
 
 
 SWIGEXPORT void _wrap_FN_VSetArrayPointer(double *farg1, N_Vector farg2) {
-  realtype *arg1 = (realtype *) 0 ;
+  sunrealtype *arg1 = (sunrealtype *) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype *)(farg1);
+  arg1 = (sunrealtype *)(farg1);
   arg2 = (N_Vector)(farg2);
   N_VSetArrayPointer(arg1,arg2);
 }
@@ -327,15 +327,15 @@ SWIGEXPORT int64_t _wrap_FN_VGetLocalLength(N_Vector farg1) {
 
 
 SWIGEXPORT void _wrap_FN_VLinearSum(double const *farg1, N_Vector farg2, double const *farg3, N_Vector farg4, N_Vector farg5) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype arg3 ;
+  sunrealtype arg3 ;
   N_Vector arg4 = (N_Vector) 0 ;
   N_Vector arg5 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype)(*farg3);
+  arg3 = (sunrealtype)(*farg3);
   arg4 = (N_Vector)(farg4);
   arg5 = (N_Vector)(farg5);
   N_VLinearSum(arg1,arg2,arg3,arg4,arg5);
@@ -343,10 +343,10 @@ SWIGEXPORT void _wrap_FN_VLinearSum(double const *farg1, N_Vector farg2, double
 
 
 SWIGEXPORT void _wrap_FN_VConst(double const *farg1, N_Vector farg2) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   N_VConst(arg1,arg2);
 }
@@ -377,11 +377,11 @@ SWIGEXPORT void _wrap_FN_VDiv(N_Vector farg1, N_Vector farg2, N_Vector farg3) {
 
 
 SWIGEXPORT void _wrap_FN_VScale(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VScale(arg1,arg2,arg3);
@@ -410,11 +410,11 @@ SWIGEXPORT void _wrap_FN_VInv(N_Vector farg1, N_Vector farg2) {
 
 SWIGEXPORT void _wrap_FN_VAddConst(N_Vector farg1, double const *farg2, N_Vector farg3) {
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
   arg1 = (N_Vector)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector)(farg3);
   N_VAddConst(arg1,arg2,arg3);
 }
@@ -424,12 +424,12 @@ SWIGEXPORT double _wrap_FN_VDotProd(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProd(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProd(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -437,11 +437,11 @@ SWIGEXPORT double _wrap_FN_VDotProd(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNorm(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNorm(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNorm(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -450,12 +450,12 @@ SWIGEXPORT double _wrap_FN_VWrmsNorm(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWrmsNorm(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNorm(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -465,13 +465,13 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask(N_Vector farg1, N_Vector farg2, N_Vecto
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWrmsNormMask(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWrmsNormMask(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -479,11 +479,11 @@ SWIGEXPORT double _wrap_FN_VWrmsNormMask(N_Vector farg1, N_Vector farg2, N_Vecto
 SWIGEXPORT double _wrap_FN_VMin(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMin(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMin(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -492,12 +492,12 @@ SWIGEXPORT double _wrap_FN_VWL2Norm(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWL2Norm(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWL2Norm(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -505,21 +505,21 @@ SWIGEXPORT double _wrap_FN_VWL2Norm(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VL1Norm(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1Norm(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1Norm(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
 
 SWIGEXPORT void _wrap_FN_VCompare(double const *farg1, N_Vector farg2, N_Vector farg3) {
-  realtype arg1 ;
+  sunrealtype arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   N_VCompare(arg1,arg2,arg3);
@@ -560,12 +560,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotient(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotient(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotient(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -573,13 +573,13 @@ SWIGEXPORT double _wrap_FN_VMinQuotient(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT int _wrap_FN_VLinearCombination(int const *farg1, double *farg2, void *farg3, N_Vector farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
   result = (int)N_VLinearCombination(arg1,arg2,arg3,arg4);
@@ -591,14 +591,14 @@ SWIGEXPORT int _wrap_FN_VLinearCombination(int const *farg1, double *farg2, void
 SWIGEXPORT int _wrap_FN_VScaleAddMulti(int const *farg1, double *farg2, N_Vector farg3, void *farg4, void *farg5) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector *)(farg4);
   arg5 = (N_Vector *)(farg5);
@@ -613,13 +613,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti(int const *farg1, N_Vector farg2, void *fa
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMulti(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -629,17 +629,17 @@ SWIGEXPORT int _wrap_FN_VDotProdMulti(int const *farg1, N_Vector farg2, void *fa
 SWIGEXPORT int _wrap_FN_VLinearSumVectorArray(int const *farg1, double const *farg2, void *farg3, double const *farg4, void *farg5, void *farg6) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype arg4 ;
+  sunrealtype arg4 ;
   N_Vector *arg5 = (N_Vector *) 0 ;
   N_Vector *arg6 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype)(*farg4);
+  arg4 = (sunrealtype)(*farg4);
   arg5 = (N_Vector *)(farg5);
   arg6 = (N_Vector *)(farg6);
   result = (int)N_VLinearSumVectorArray(arg1,arg2,arg3,arg4,arg5,arg6);
@@ -651,13 +651,13 @@ SWIGEXPORT int _wrap_FN_VLinearSumVectorArray(int const *farg1, double const *fa
 SWIGEXPORT int _wrap_FN_VScaleVectorArray(int const *farg1, double *farg2, void *farg3, void *farg4) {
   int fresult ;
   int arg1 ;
-  realtype *arg2 = (realtype *) 0 ;
+  sunrealtype *arg2 = (sunrealtype *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector *arg4 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype *)(farg2);
+  arg2 = (sunrealtype *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector *)(farg4);
   result = (int)N_VScaleVectorArray(arg1,arg2,arg3,arg4);
@@ -669,12 +669,12 @@ SWIGEXPORT int _wrap_FN_VScaleVectorArray(int const *farg1, double *farg2, void
 SWIGEXPORT int _wrap_FN_VConstVectorArray(int const *farg1, double const *farg2, void *farg3) {
   int fresult ;
   int arg1 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (N_Vector *)(farg3);
   result = (int)N_VConstVectorArray(arg1,arg2,arg3);
   fresult = (int)(result);
@@ -687,13 +687,13 @@ SWIGEXPORT int _wrap_FN_VWrmsNormVectorArray(int const *farg1, void *farg2, void
   int arg1 ;
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VWrmsNormVectorArray(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -706,14 +706,14 @@ SWIGEXPORT int _wrap_FN_VWrmsNormMaskVectorArray(int const *farg1, void *farg2,
   N_Vector *arg2 = (N_Vector *) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype *arg5 = (realtype *) 0 ;
+  sunrealtype *arg5 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector *)(farg2);
   arg3 = (N_Vector *)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype *)(farg5);
+  arg5 = (sunrealtype *)(farg5);
   result = (int)N_VWrmsNormMaskVectorArray(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -724,12 +724,12 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VDotProdLocal(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VDotProdLocal(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -737,11 +737,11 @@ SWIGEXPORT double _wrap_FN_VDotProdLocal(N_Vector farg1, N_Vector farg2) {
 SWIGEXPORT double _wrap_FN_VMaxNormLocal(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMaxNormLocal(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMaxNormLocal(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -749,11 +749,11 @@ SWIGEXPORT double _wrap_FN_VMaxNormLocal(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VMinLocal(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VMinLocal(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinLocal(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -761,11 +761,11 @@ SWIGEXPORT double _wrap_FN_VMinLocal(N_Vector farg1) {
 SWIGEXPORT double _wrap_FN_VL1NormLocal(N_Vector farg1) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype)N_VL1NormLocal(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VL1NormLocal(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -774,12 +774,12 @@ SWIGEXPORT double _wrap_FN_VWSqrSumLocal(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VWSqrSumLocal(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumLocal(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -789,13 +789,13 @@ SWIGEXPORT double _wrap_FN_VWSqrSumMaskLocal(N_Vector farg1, N_Vector farg2, N_V
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
-  result = (realtype)N_VWSqrSumMaskLocal(arg1,arg2,arg3);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VWSqrSumMaskLocal(arg1,arg2,arg3);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -834,12 +834,12 @@ SWIGEXPORT double _wrap_FN_VMinQuotientLocal(N_Vector farg1, N_Vector farg2) {
   double fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (N_Vector)(farg2);
-  result = (realtype)N_VMinQuotientLocal(arg1,arg2);
-  fresult = (realtype)(result);
+  result = (sunrealtype)N_VMinQuotientLocal(arg1,arg2);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
@@ -849,13 +849,13 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiLocal(int const *farg1, N_Vector farg2, voi
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector *arg3 = (N_Vector *) 0 ;
-  realtype *arg4 = (realtype *) 0 ;
+  sunrealtype *arg4 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector *)(farg3);
-  arg4 = (realtype *)(farg4);
+  arg4 = (sunrealtype *)(farg4);
   result = (int)N_VDotProdMultiLocal(arg1,arg2,arg3,arg4);
   fresult = (int)(result);
   return fresult;
@@ -866,12 +866,12 @@ SWIGEXPORT int _wrap_FN_VDotProdMultiAllReduce(int const *farg1, N_Vector farg2,
   int fresult ;
   int arg1 ;
   N_Vector arg2 = (N_Vector) 0 ;
-  realtype *arg3 = (realtype *) 0 ;
+  sunrealtype *arg3 = (sunrealtype *) 0 ;
   int result;
   
   arg1 = (int)(*farg1);
   arg2 = (N_Vector)(farg2);
-  arg3 = (realtype *)(farg3);
+  arg3 = (sunrealtype *)(farg3);
   result = (int)N_VDotProdMultiAllReduce(arg1,arg2,arg3);
   fresult = (int)(result);
   return fresult;
@@ -1018,10 +1018,10 @@ SWIGEXPORT void _wrap_FN_VPrintFile(N_Vector farg1, void *farg2) {
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer(arg1);
   fresult = result;
   return fresult;
 }
@@ -1030,10 +1030,10 @@ SWIGEXPORT double * _wrap_FN_VGetArrayPointer(N_Vector farg1) {
 SWIGEXPORT double * _wrap_FN_VGetDeviceArrayPointer(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetDeviceArrayPointer(arg1);
+  result = (sunrealtype *)N_VGetDeviceArrayPointer(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/sundials/sundials_band.c b/src/sundials/sundials_band.c
index e874e5f575..14a8898aec 100644
--- a/src/sundials/sundials_band.c
+++ b/src/sundials/sundials_band.c
@@ -26,8 +26,8 @@
 #include <sundials/sundials_band.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 #define ROW(i,j,smu) (i-j+smu)
 
@@ -47,12 +47,12 @@ sunindextype BandGBTRF(SUNDlsMat A, sunindextype *p)
   return(SUNDlsMat_bandGBTRF(A->cols, A->M, A->mu, A->ml, A->s_mu, p));
 }
 
-void SUNDlsMat_BandGBTRS(SUNDlsMat A, sunindextype *p, realtype *b)
+void SUNDlsMat_BandGBTRS(SUNDlsMat A, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_bandGBTRS(A->cols, A->M, A->s_mu, A->ml, p, b);
 }
 
-void BandGBTRS(SUNDlsMat A, sunindextype *p, realtype *b)
+void BandGBTRS(SUNDlsMat A, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_bandGBTRS(A->cols, A->M, A->s_mu, A->ml, p, b);
 }
@@ -67,44 +67,44 @@ void BandCopy(SUNDlsMat A, SUNDlsMat B, sunindextype copymu, sunindextype copyml
   SUNDlsMat_bandCopy(A->cols, B->cols, A->M, A->s_mu, B->s_mu, copymu, copyml);
 }
 
-void SUNDlsMat_BandScale(realtype c, SUNDlsMat A)
+void SUNDlsMat_BandScale(sunrealtype c, SUNDlsMat A)
 {
   SUNDlsMat_bandScale(c, A->cols, A->M, A->mu, A->ml, A->s_mu);
 }
 
-void BandScale(realtype c, SUNDlsMat A)
+void BandScale(sunrealtype c, SUNDlsMat A)
 {
   SUNDlsMat_bandScale(c, A->cols, A->M, A->mu, A->ml, A->s_mu);
 }
 
-void SUNDlsMat_BandMatvec(SUNDlsMat A, realtype *x, realtype *y)
+void SUNDlsMat_BandMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y)
 {
   SUNDlsMat_bandMatvec(A->cols, x, y, A->M, A->mu, A->ml, A->s_mu);
 }
 
-void BandMatvec(SUNDlsMat A, realtype *x, realtype *y)
+void BandMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y)
 {
   SUNDlsMat_bandMatvec(A->cols, x, y, A->M, A->mu, A->ml, A->s_mu);
 }
 
 /*
  * -----------------------------------------------------
- * Functions working on realtype**
+ * Functions working on sunrealtype**
  * -----------------------------------------------------
  */
 
-sunindextype bandGBTRF(realtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu, sunindextype *p)
+sunindextype bandGBTRF(sunrealtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu, sunindextype *p)
 {
   return(SUNDlsMat_bandGBTRF(a, n, mu, ml, smu, p));
 }
 
-sunindextype SUNDlsMat_bandGBTRF(realtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu, sunindextype *p)
+sunindextype SUNDlsMat_bandGBTRF(sunrealtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu, sunindextype *p)
 {
   sunindextype c, r, num_rows;
   sunindextype i, j, k, l, storage_l, storage_k, last_col_k, last_row_k;
-  realtype *a_c, *col_k, *diag_k, *sub_diag_k, *col_j, *kptr, *jptr;
-  realtype max, temp, mult, a_kj;
-  booleantype swap;
+  sunrealtype *a_c, *col_k, *diag_k, *sub_diag_k, *col_j, *kptr, *jptr;
+  sunrealtype max, temp, mult, a_kj;
+  sunbooleantype swap;
 
   /* zero out the first smu - mu rows of the rectangular array a */
 
@@ -204,16 +204,16 @@ sunindextype SUNDlsMat_bandGBTRF(realtype **a, sunindextype n, sunindextype mu,
   return(0);
 }
 
-void bandGBTRS(realtype **a, sunindextype n, sunindextype smu,
-               sunindextype ml, sunindextype *p, realtype *b)
+void bandGBTRS(sunrealtype **a, sunindextype n, sunindextype smu,
+               sunindextype ml, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_bandGBTRS(a, n, smu, ml, p, b);
 }
 
-void SUNDlsMat_bandGBTRS(realtype **a, sunindextype n, sunindextype smu, sunindextype ml, sunindextype *p, realtype *b)
+void SUNDlsMat_bandGBTRS(sunrealtype **a, sunindextype n, sunindextype smu, sunindextype ml, sunindextype *p, sunrealtype *b)
 {
   sunindextype k, l, i, first_row_k, last_row_k;
-  realtype mult, *diag_k;
+  sunrealtype mult, *diag_k;
 
   /* Solve Ly = Pb, store solution y in b */
 
@@ -242,17 +242,17 @@ void SUNDlsMat_bandGBTRS(realtype **a, sunindextype n, sunindextype smu, suninde
   }
 }
 
-void bandCopy(realtype **a, realtype **b, sunindextype n, sunindextype a_smu, sunindextype b_smu,
+void bandCopy(sunrealtype **a, sunrealtype **b, sunindextype n, sunindextype a_smu, sunindextype b_smu,
               sunindextype copymu, sunindextype copyml)
 {
   SUNDlsMat_bandCopy(a, b, n, a_smu, b_smu, copymu, copyml);
 }
 
-void SUNDlsMat_bandCopy(realtype **a, realtype **b, sunindextype n, sunindextype a_smu, sunindextype b_smu,
+void SUNDlsMat_bandCopy(sunrealtype **a, sunrealtype **b, sunindextype n, sunindextype a_smu, sunindextype b_smu,
                         sunindextype copymu, sunindextype copyml)
 {
   sunindextype i, j, copySize;
-  realtype *a_col_j, *b_col_j;
+  sunrealtype *a_col_j, *b_col_j;
 
   copySize = copymu + copyml + 1;
 
@@ -264,15 +264,15 @@ void SUNDlsMat_bandCopy(realtype **a, realtype **b, sunindextype n, sunindextype
   }
 }
 
-void bandScale(realtype c, realtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu)
+void bandScale(sunrealtype c, sunrealtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu)
 {
   SUNDlsMat_bandScale(c, a, n, mu, ml, smu);
 }
 
-void SUNDlsMat_bandScale(realtype c, realtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu)
+void SUNDlsMat_bandScale(sunrealtype c, sunrealtype **a, sunindextype n, sunindextype mu, sunindextype ml, sunindextype smu)
 {
   sunindextype i, j, colSize;
-  realtype *col_j;
+  sunrealtype *col_j;
 
   colSize = mu + ml + 1;
 
@@ -283,12 +283,12 @@ void SUNDlsMat_bandScale(realtype c, realtype **a, sunindextype n, sunindextype
   }
 }
 
-void bandAddIdentity(realtype **a, sunindextype n, sunindextype smu)
+void bandAddIdentity(sunrealtype **a, sunindextype n, sunindextype smu)
 {
   SUNDlsMat_bandAddIdentity(a, n, smu);
 }
 
-void SUNDlsMat_bandAddIdentity(realtype **a, sunindextype n, sunindextype smu)
+void SUNDlsMat_bandAddIdentity(sunrealtype **a, sunindextype n, sunindextype smu)
 {
   sunindextype j;
 
@@ -296,17 +296,17 @@ void SUNDlsMat_bandAddIdentity(realtype **a, sunindextype n, sunindextype smu)
     a[j][smu] += ONE;
 }
 
-void bandMatvec(realtype **a, realtype *x, realtype *y, sunindextype n,
+void bandMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y, sunindextype n,
                 sunindextype mu, sunindextype ml, sunindextype smu)
 {
   SUNDlsMat_bandMatvec(a, x, y, n, mu, ml,  smu);
 }
 
-void SUNDlsMat_bandMatvec(realtype **a, realtype *x, realtype *y, sunindextype n,
+void SUNDlsMat_bandMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y, sunindextype n,
                           sunindextype mu, sunindextype ml, sunindextype smu)
 {
   sunindextype i, j, is, ie;
-  realtype *col_j;
+  sunrealtype *col_j;
 
   for (i=0; i<n; i++)
     y[i] = 0.0;
diff --git a/src/sundials/sundials_context_impl.h b/src/sundials/sundials_context_impl.h
index dd09076611..fb2825d42d 100644
--- a/src/sundials/sundials_context_impl.h
+++ b/src/sundials/sundials_context_impl.h
@@ -28,9 +28,9 @@ extern "C" {
 
 struct _SUNContext {
   SUNProfiler profiler;
-  booleantype own_profiler;
+  sunbooleantype own_profiler;
   SUNLogger logger;
-  booleantype own_logger;
+  sunbooleantype own_logger;
 };
 
 #ifdef __cplusplus
diff --git a/src/sundials/sundials_cuda.h b/src/sundials/sundials_cuda.h
index 75c0749da4..db8b6ac3d0 100644
--- a/src/sundials/sundials_cuda.h
+++ b/src/sundials/sundials_cuda.h
@@ -54,7 +54,7 @@ extern "C" {
  * Utility functions
  * ---------------------------------------------------------------------------*/
 
-inline booleantype SUNDIALS_CUDA_Assert(cudaError_t cuerr, const char *file, int line)
+inline sunbooleantype SUNDIALS_CUDA_Assert(cudaError_t cuerr, const char *file, int line)
 {
   if (cuerr != cudaSuccess)
   {
diff --git a/src/sundials/sundials_cusolver.h b/src/sundials/sundials_cusolver.h
index b1aee9b266..f61d67c1e8 100644
--- a/src/sundials/sundials_cusolver.h
+++ b/src/sundials/sundials_cusolver.h
@@ -44,7 +44,7 @@ extern "C" {
  * Utility functions
  * ---------------------------------------------------------------------------*/
 
-inline booleantype SUNDIALS_CUSOLVER_Assert(cusolverStatus_t status, const char *file, int line)
+inline sunbooleantype SUNDIALS_CUSOLVER_Assert(cusolverStatus_t status, const char *file, int line)
 {
   if (status != CUSOLVER_STATUS_SUCCESS)
   {
diff --git a/src/sundials/sundials_cusparse.h b/src/sundials/sundials_cusparse.h
index 3f9c3ae493..0e514c3905 100644
--- a/src/sundials/sundials_cusparse.h
+++ b/src/sundials/sundials_cusparse.h
@@ -42,7 +42,7 @@ extern "C" {
  * Utility functions
  * ---------------------------------------------------------------------------*/
 
-inline booleantype SUNDIALS_CUSPARSE_Assert(cusparseStatus_t status, const char *file, int line)
+inline sunbooleantype SUNDIALS_CUSPARSE_Assert(cusparseStatus_t status, const char *file, int line)
 {
   if (status != CUSPARSE_STATUS_SUCCESS)
   {
diff --git a/src/sundials/sundials_dense.c b/src/sundials/sundials_dense.c
index 1212e150c9..1e5bc729b1 100644
--- a/src/sundials/sundials_dense.c
+++ b/src/sundials/sundials_dense.c
@@ -27,9 +27,9 @@
 #include <sundials/sundials_dense.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /*
  * -----------------------------------------------------
@@ -47,12 +47,12 @@ sunindextype DenseGETRF(SUNDlsMat A, sunindextype *p)
   return(SUNDlsMat_denseGETRF(A->cols, A->M, A->N, p));
 }
 
-void SUNDlsMat_DenseGETRS(SUNDlsMat A, sunindextype *p, realtype *b)
+void SUNDlsMat_DenseGETRS(SUNDlsMat A, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_denseGETRS(A->cols, A->N, p, b);
 }
 
-void DenseGETRS(SUNDlsMat A, sunindextype *p, realtype *b)
+void DenseGETRS(SUNDlsMat A, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_denseGETRS(A->cols, A->N, p, b);
 }
@@ -67,32 +67,32 @@ sunindextype DensePOTRF(SUNDlsMat A)
   return(SUNDlsMat_densePOTRF(A->cols, A->M));
 }
 
-void SUNDlsMat_DensePOTRS(SUNDlsMat A, realtype *b)
+void SUNDlsMat_DensePOTRS(SUNDlsMat A, sunrealtype *b)
 {
   SUNDlsMat_densePOTRS(A->cols, A->M, b);
 }
 
-void DensePOTRS(SUNDlsMat A, realtype *b)
+void DensePOTRS(SUNDlsMat A, sunrealtype *b)
 {
   SUNDlsMat_densePOTRS(A->cols, A->M, b);
 }
 
-int SUNDlsMat_DenseGEQRF(SUNDlsMat A, realtype *beta, realtype *wrk)
+int SUNDlsMat_DenseGEQRF(SUNDlsMat A, sunrealtype *beta, sunrealtype *wrk)
 {
   return(SUNDlsMat_denseGEQRF(A->cols, A->M, A->N, beta, wrk));
 }
 
-int DenseGEQRF(SUNDlsMat A, realtype *beta, realtype *wrk)
+int DenseGEQRF(SUNDlsMat A, sunrealtype *beta, sunrealtype *wrk)
 {
   return(SUNDlsMat_denseGEQRF(A->cols, A->M, A->N, beta, wrk));
 }
 
-int SUNDlsMat_DenseORMQR(SUNDlsMat A, realtype *beta, realtype *vn, realtype *vm, realtype *wrk)
+int SUNDlsMat_DenseORMQR(SUNDlsMat A, sunrealtype *beta, sunrealtype *vn, sunrealtype *vm, sunrealtype *wrk)
 {
   return(SUNDlsMat_denseORMQR(A->cols, A->M, A->N, beta, vn, vm, wrk));
 }
 
-int DenseORMQR(SUNDlsMat A, realtype *beta, realtype *vn, realtype *vm, realtype *wrk)
+int DenseORMQR(SUNDlsMat A, sunrealtype *beta, sunrealtype *vn, sunrealtype *vm, sunrealtype *wrk)
 {
   return(SUNDlsMat_denseORMQR(A->cols, A->M, A->N, beta, vn, vm, wrk));
 }
@@ -107,36 +107,36 @@ void DenseCopy(SUNDlsMat A, SUNDlsMat B)
   SUNDlsMat_denseCopy(A->cols, B->cols, A->M, A->N);
 }
 
-void SUNDlsMat_DenseScale(realtype c, SUNDlsMat A)
+void SUNDlsMat_DenseScale(sunrealtype c, SUNDlsMat A)
 {
   SUNDlsMat_denseScale(c, A->cols, A->M, A->N);
 }
 
-void DenseScale(realtype c, SUNDlsMat A)
+void DenseScale(sunrealtype c, SUNDlsMat A)
 {
   SUNDlsMat_denseScale(c, A->cols, A->M, A->N);
 }
 
-void SUNDlsMat_DenseMatvec(SUNDlsMat A, realtype *x, realtype *y)
+void SUNDlsMat_DenseMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y)
 {
   SUNDlsMat_denseMatvec(A->cols, x, y, A->M, A->N);
 }
 
-void DenseMatvec(SUNDlsMat A, realtype *x, realtype *y)
+void DenseMatvec(SUNDlsMat A, sunrealtype *x, sunrealtype *y)
 {
   SUNDlsMat_denseMatvec(A->cols, x, y, A->M, A->N);
 }
 
-sunindextype denseGETRF(realtype **a, sunindextype m, sunindextype n, sunindextype *p)
+sunindextype denseGETRF(sunrealtype **a, sunindextype m, sunindextype n, sunindextype *p)
 {
   return(SUNDlsMat_denseGETRF(a, m, n, p));
 }
 
-sunindextype SUNDlsMat_denseGETRF(realtype **a, sunindextype m, sunindextype n, sunindextype *p)
+sunindextype SUNDlsMat_denseGETRF(sunrealtype **a, sunindextype m, sunindextype n, sunindextype *p)
 {
   sunindextype i, j, k, l;
-  realtype *col_j, *col_k;
-  realtype temp, mult, a_kj;
+  sunrealtype *col_j, *col_k;
+  sunrealtype temp, mult, a_kj;
 
   /* k-th elimination step number */
   for (k=0; k < n; k++) {
@@ -195,15 +195,15 @@ sunindextype SUNDlsMat_denseGETRF(realtype **a, sunindextype m, sunindextype n,
   return(0);
 }
 
-void denseGETRS(realtype **a, sunindextype n, sunindextype *p, realtype *b)
+void denseGETRS(sunrealtype **a, sunindextype n, sunindextype *p, sunrealtype *b)
 {
   SUNDlsMat_denseGETRS(a, n, p, b);
 }
 
-void SUNDlsMat_denseGETRS(realtype **a, sunindextype n, sunindextype *p, realtype *b)
+void SUNDlsMat_denseGETRS(sunrealtype **a, sunindextype n, sunindextype *p, sunrealtype *b)
 {
   sunindextype i, k, pk;
-  realtype *col_k, tmp;
+  sunrealtype *col_k, tmp;
 
   /* Permute b, based on pivot information in p */
   for (k=0; k<n; k++) {
@@ -238,15 +238,15 @@ void SUNDlsMat_denseGETRS(realtype **a, sunindextype n, sunindextype *p, realtyp
  * the lower triangle of C.
  */
 
-sunindextype densePOTRF(realtype **a, sunindextype m)
+sunindextype densePOTRF(sunrealtype **a, sunindextype m)
 {
   return(SUNDlsMat_densePOTRF(a, m));
 }
 
-sunindextype SUNDlsMat_densePOTRF(realtype **a, sunindextype m)
+sunindextype SUNDlsMat_densePOTRF(sunrealtype **a, sunindextype m)
 {
-  realtype *a_col_j, *a_col_k;
-  realtype a_diag;
+  sunrealtype *a_col_j, *a_col_k;
+  sunrealtype a_diag;
   sunindextype i, j, k;
 
   for (j=0; j<m; j++) {
@@ -279,14 +279,14 @@ sunindextype SUNDlsMat_densePOTRF(realtype **a, sunindextype m)
  *
  */
 
-void densePOTRS(realtype **a, sunindextype m, realtype *b)
+void densePOTRS(sunrealtype **a, sunindextype m, sunrealtype *b)
 {
   SUNDlsMat_densePOTRS(a, m, b);
 }
 
-void SUNDlsMat_densePOTRS(realtype **a, sunindextype m, realtype *b)
+void SUNDlsMat_densePOTRS(sunrealtype **a, sunindextype m, sunrealtype *b)
 {
-  realtype *col_j, *col_i;
+  sunrealtype *col_j, *col_i;
   sunindextype i, j;
 
   /* Solve C y = b, forward substitution - column version.
@@ -325,15 +325,15 @@ void SUNDlsMat_densePOTRS(realtype **a, sunindextype m, realtype *b)
  *
  */
 
-int denseGEQRF(realtype **a, sunindextype m, sunindextype n, realtype *beta, realtype *v)
+int denseGEQRF(sunrealtype **a, sunindextype m, sunindextype n, sunrealtype *beta, sunrealtype *v)
 {
   return(SUNDlsMat_denseGEQRF(a, m, n, beta, v));
 }
 
-int SUNDlsMat_denseGEQRF(realtype **a, sunindextype m, sunindextype n, realtype *beta, realtype *v)
+int SUNDlsMat_denseGEQRF(sunrealtype **a, sunindextype m, sunindextype n, sunrealtype *beta, sunrealtype *v)
 {
-  realtype ajj, s, mu, v1, v1_2;
-  realtype *col_j, *col_k;
+  sunrealtype ajj, s, mu, v1, v1_2;
+  sunrealtype *col_j, *col_k;
   sunindextype i, j, k;
 
   /* For each column...*/
@@ -392,16 +392,16 @@ int SUNDlsMat_denseGEQRF(realtype **a, sunindextype m, sunindextype n, realtype
  * v (of length m) must be provided as workspace.
  */
 
-int denseORMQR(realtype **a, sunindextype m, sunindextype n, realtype *beta,
-               realtype *vn, realtype *vm, realtype *v)
+int denseORMQR(sunrealtype **a, sunindextype m, sunindextype n, sunrealtype *beta,
+               sunrealtype *vn, sunrealtype *vm, sunrealtype *v)
 {
   return(SUNDlsMat_denseORMQR(a, m, n, beta, vn, vm, v));
 }
 
-int SUNDlsMat_denseORMQR(realtype **a, sunindextype m, sunindextype n, realtype *beta,
-                         realtype *vn, realtype *vm, realtype *v)
+int SUNDlsMat_denseORMQR(sunrealtype **a, sunindextype m, sunindextype n, sunrealtype *beta,
+                         sunrealtype *vn, sunrealtype *vm, sunrealtype *v)
 {
-  realtype *col_j, s;
+  sunrealtype *col_j, s;
   sunindextype i, j;
 
   /* Initialize vm */
@@ -428,15 +428,15 @@ int SUNDlsMat_denseORMQR(realtype **a, sunindextype m, sunindextype n, realtype
   return(0);
 }
 
-void denseCopy(realtype **a, realtype **b, sunindextype m, sunindextype n)
+void denseCopy(sunrealtype **a, sunrealtype **b, sunindextype m, sunindextype n)
 {
   SUNDlsMat_denseCopy(a, b, m, n);
 }
 
-void SUNDlsMat_denseCopy(realtype **a, realtype **b, sunindextype m, sunindextype n)
+void SUNDlsMat_denseCopy(sunrealtype **a, sunrealtype **b, sunindextype m, sunindextype n)
 {
   sunindextype i, j;
-  realtype *a_col_j, *b_col_j;
+  sunrealtype *a_col_j, *b_col_j;
 
   for (j=0; j < n; j++) {
     a_col_j = a[j];
@@ -447,15 +447,15 @@ void SUNDlsMat_denseCopy(realtype **a, realtype **b, sunindextype m, sunindextyp
 
 }
 
-void denseScale(realtype c, realtype **a, sunindextype m, sunindextype n)
+void denseScale(sunrealtype c, sunrealtype **a, sunindextype m, sunindextype n)
 {
   SUNDlsMat_denseScale(c, a, m, n);
 }
 
-void SUNDlsMat_denseScale(realtype c, realtype **a, sunindextype m, sunindextype n)
+void SUNDlsMat_denseScale(sunrealtype c, sunrealtype **a, sunindextype m, sunindextype n)
 {
   sunindextype i, j;
-  realtype *col_j;
+  sunrealtype *col_j;
 
   for (j=0; j < n; j++) {
     col_j = a[j];
@@ -464,27 +464,27 @@ void SUNDlsMat_denseScale(realtype c, realtype **a, sunindextype m, sunindextype
   }
 }
 
-void denseAddIdentity(realtype **a, sunindextype n)
+void denseAddIdentity(sunrealtype **a, sunindextype n)
 {
   SUNDlsMat_denseAddIdentity(a, n);
 }
 
-void SUNDlsMat_denseAddIdentity(realtype **a, sunindextype n)
+void SUNDlsMat_denseAddIdentity(sunrealtype **a, sunindextype n)
 {
   sunindextype i;
 
   for (i=0; i < n; i++) a[i][i] += ONE;
 }
 
-void denseMatvec(realtype **a, realtype *x, realtype *y, sunindextype m, sunindextype n)
+void denseMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y, sunindextype m, sunindextype n)
 {
   SUNDlsMat_denseMatvec(a, x, y, m, n);
 }
 
-void SUNDlsMat_denseMatvec(realtype **a, realtype *x, realtype *y, sunindextype m, sunindextype n)
+void SUNDlsMat_denseMatvec(sunrealtype **a, sunrealtype *x, sunrealtype *y, sunindextype m, sunindextype n)
 {
   sunindextype i, j;
-  realtype *col_j;
+  sunrealtype *col_j;
 
   for (i=0; i<m; i++) {
     y[i] = 0.0;
diff --git a/src/sundials/sundials_direct.c b/src/sundials/sundials_direct.c
index 69ec5e2377..68a93e57d4 100644
--- a/src/sundials/sundials_direct.c
+++ b/src/sundials/sundials_direct.c
@@ -21,8 +21,8 @@
 #include <sundials/sundials_direct.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 SUNDlsMat NewDenseMat(sunindextype M, sunindextype N)
 {
@@ -40,12 +40,12 @@ SUNDlsMat SUNDlsMat_NewDenseMat(sunindextype M, sunindextype N)
   A = (SUNDlsMat) malloc(sizeof *A);
   if (A==NULL) return (NULL);
 
-  A->data = (realtype *) malloc(M * N * sizeof(realtype));
+  A->data = (sunrealtype *) malloc(M * N * sizeof(sunrealtype));
   if (A->data == NULL) {
     free(A); A = NULL;
     return(NULL);
   }
-  A->cols = (realtype **) malloc(N * sizeof(realtype *));
+  A->cols = (sunrealtype **) malloc(N * sizeof(sunrealtype *));
   if (A->cols == NULL) {
     free(A->data); A->data = NULL;
     free(A); A = NULL;
@@ -64,24 +64,24 @@ SUNDlsMat SUNDlsMat_NewDenseMat(sunindextype M, sunindextype N)
   return(A);
 }
 
-realtype** newDenseMat(sunindextype m, sunindextype n)
+sunrealtype** newDenseMat(sunindextype m, sunindextype n)
 {
   return(SUNDlsMat_newDenseMat(m, n));
 }
 
-realtype** SUNDlsMat_newDenseMat(sunindextype m, sunindextype n)
+sunrealtype** SUNDlsMat_newDenseMat(sunindextype m, sunindextype n)
 {
   sunindextype j;
-  realtype **a;
+  sunrealtype **a;
 
   if ( (n <= 0) || (m <= 0) ) return(NULL);
 
   a = NULL;
-  a = (realtype **) malloc(n * sizeof(realtype *));
+  a = (sunrealtype **) malloc(n * sizeof(sunrealtype *));
   if (a == NULL) return(NULL);
 
   a[0] = NULL;
-  a[0] = (realtype *) malloc(m * n * sizeof(realtype));
+  a[0] = (sunrealtype *) malloc(m * n * sizeof(sunrealtype));
   if (a[0] == NULL) {
     free(a); a = NULL;
     return(NULL);
@@ -111,14 +111,14 @@ SUNDlsMat SUNDlsMat_NewBandMat(sunindextype N, sunindextype mu, sunindextype ml,
 
   colSize = smu + ml + 1;
   A->data = NULL;
-  A->data = (realtype *) malloc(N * colSize * sizeof(realtype));
+  A->data = (sunrealtype *) malloc(N * colSize * sizeof(sunrealtype));
   if (A->data == NULL) {
     free(A); A = NULL;
     return(NULL);
   }
 
   A->cols = NULL;
-  A->cols = (realtype **) malloc(N * sizeof(realtype *));
+  A->cols = (sunrealtype **) malloc(N * sizeof(sunrealtype *));
   if (A->cols == NULL) {
     free(A->data);
     free(A); A = NULL;
@@ -140,25 +140,25 @@ SUNDlsMat SUNDlsMat_NewBandMat(sunindextype N, sunindextype mu, sunindextype ml,
   return(A);
 }
 
-realtype** newBandMat(sunindextype n, sunindextype smu, sunindextype ml)
+sunrealtype** newBandMat(sunindextype n, sunindextype smu, sunindextype ml)
 {
   return(SUNDlsMat_newBandMat(n, smu, ml));
 }
 
-realtype** SUNDlsMat_newBandMat(sunindextype n, sunindextype smu, sunindextype ml)
+sunrealtype** SUNDlsMat_newBandMat(sunindextype n, sunindextype smu, sunindextype ml)
 {
-  realtype **a;
+  sunrealtype **a;
   sunindextype j, colSize;
 
   if (n <= 0) return(NULL);
 
   a = NULL;
-  a = (realtype **) malloc(n * sizeof(realtype *));
+  a = (sunrealtype **) malloc(n * sizeof(sunrealtype *));
   if (a == NULL) return(NULL);
 
   colSize = smu + ml + 1;
   a[0] = NULL;
-  a[0] = (realtype *) malloc(n * colSize * sizeof(realtype));
+  a[0] = (sunrealtype *) malloc(n * colSize * sizeof(sunrealtype));
   if (a[0] == NULL) {
     free(a); a = NULL;
     return(NULL);
@@ -181,12 +181,12 @@ void SUNDlsMat_DestroyMat(SUNDlsMat A)
   free(A); A = NULL;
 }
 
-void destroyMat(realtype **a)
+void destroyMat(sunrealtype **a)
 {
   SUNDlsMat_destroyMat(a);
 }
 
-void SUNDlsMat_destroyMat(realtype **a)
+void SUNDlsMat_destroyMat(sunrealtype **a)
 {
   free(a[0]); a[0] = NULL;
   free(a); a = NULL;
@@ -260,36 +260,36 @@ sunindextype* SUNDlsMat_newIndexArray(sunindextype n)
   return(v);
 }
 
-realtype* NewRealArray(sunindextype N)
+sunrealtype* NewRealArray(sunindextype N)
 {
   return(SUNDlsMat_NewRealArray(N));
 }
 
-realtype* SUNDlsMat_NewRealArray(sunindextype N)
+sunrealtype* SUNDlsMat_NewRealArray(sunindextype N)
 {
-  realtype *vec;
+  sunrealtype *vec;
 
   if (N <= 0) return(NULL);
 
   vec = NULL;
-  vec = (realtype *) malloc(N * sizeof(realtype));
+  vec = (sunrealtype *) malloc(N * sizeof(sunrealtype));
 
   return(vec);
 }
 
-realtype* newRealArray(sunindextype N)
+sunrealtype* newRealArray(sunindextype N)
 {
   return(SUNDlsMat_newRealArray(N));
 }
 
-realtype* SUNDlsMat_newRealArray(sunindextype m)
+sunrealtype* SUNDlsMat_newRealArray(sunindextype m)
 {
-  realtype *v;
+  sunrealtype *v;
 
   if (m <= 0) return(NULL);
 
   v = NULL;
-  v = (realtype *) malloc(m * sizeof(realtype));
+  v = (sunrealtype *) malloc(m * sizeof(sunrealtype));
 
   return(v);
 }
@@ -347,7 +347,7 @@ void SetToZero(SUNDlsMat A)
 void SUNDlsMat_SetToZero(SUNDlsMat A)
 {
   sunindextype i, j, colSize;
-  realtype *col_j;
+  sunrealtype *col_j;
 
   switch (A->type) {
 
@@ -384,7 +384,7 @@ void PrintMat(SUNDlsMat A, FILE *outfile)
 void SUNDlsMat_PrintMat(SUNDlsMat A, FILE *outfile)
 {
   sunindextype i, j, start, finish;
-  realtype **a;
+  sunrealtype **a;
 
   switch (A->type) {
 
diff --git a/src/sundials/sundials_hip.h b/src/sundials/sundials_hip.h
index 8a735cb474..e246e5996b 100644
--- a/src/sundials/sundials_hip.h
+++ b/src/sundials/sundials_hip.h
@@ -52,7 +52,7 @@ extern "C" {
 /* ---------------------------------------------------------------------------
  * Utility functions
  * ---------------------------------------------------------------------------*/
-inline booleantype SUNDIALS_HIP_Assert(hipError_t hiperr, const char *file, int line)
+inline sunbooleantype SUNDIALS_HIP_Assert(hipError_t hiperr, const char *file, int line)
 {
   if (hiperr != hipSuccess)
   {
diff --git a/src/sundials/sundials_iterative.c b/src/sundials/sundials_iterative.c
index 6772db83e9..58c7c6448c 100644
--- a/src/sundials/sundials_iterative.c
+++ b/src/sundials/sundials_iterative.c
@@ -23,9 +23,9 @@
 #include "sundials_iterative_impl.h"
 #include <sundials/sundials_math.h>
 
-#define FACTOR RCONST(1000.0)
-#define ZERO   RCONST(0.0)
-#define ONE    RCONST(1.0)
+#define FACTOR SUN_RCONST(1000.0)
+#define ZERO   SUN_RCONST(0.0)
+#define ONE    SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -37,17 +37,17 @@
  * -----------------------------------------------------------------
  */
 
-int ModifiedGS(N_Vector *v, realtype **h, int k, int p,
-               realtype *new_vk_norm)
+int ModifiedGS(N_Vector *v, sunrealtype **h, int k, int p,
+               sunrealtype *new_vk_norm)
 {
   return(SUNModifiedGS(v, h, k, p, new_vk_norm));
 }
 
-int SUNModifiedGS(N_Vector *v, realtype **h, int k, int p,
-                  realtype *new_vk_norm)
+int SUNModifiedGS(N_Vector *v, sunrealtype **h, int k, int p,
+                  sunrealtype *new_vk_norm)
 {
   int  i, k_minus_1, i0;
-  realtype new_norm_2, new_product, vk_norm, temp;
+  sunrealtype new_norm_2, new_product, vk_norm, temp;
 
   vk_norm = SUNRsqrt(N_VDotProd(v[k],v[k]));
   k_minus_1 = k - 1;
@@ -101,17 +101,17 @@ int SUNModifiedGS(N_Vector *v, realtype **h, int k, int p,
  * -----------------------------------------------------------------
  */
 
-int ClassicalGS(N_Vector *v, realtype **h, int k, int p, realtype *new_vk_norm,
-                realtype *stemp, N_Vector *vtemp)
+int ClassicalGS(N_Vector *v, sunrealtype **h, int k, int p, sunrealtype *new_vk_norm,
+                sunrealtype *stemp, N_Vector *vtemp)
 {
   return(SUNClassicalGS(v, h, k, p, new_vk_norm, stemp, vtemp));
 }
 
-int SUNClassicalGS(N_Vector *v, realtype **h, int k, int p, realtype *new_vk_norm,
-                   realtype *stemp, N_Vector *vtemp)
+int SUNClassicalGS(N_Vector *v, sunrealtype **h, int k, int p, sunrealtype *new_vk_norm,
+                   sunrealtype *stemp, N_Vector *vtemp)
 {
   int  i, i0, k_minus_1, retval;
-  realtype vk_norm;
+  sunrealtype vk_norm;
 
   k_minus_1 = k - 1;
   i0 = SUNMAX(k-p,0);
@@ -170,14 +170,14 @@ int SUNClassicalGS(N_Vector *v, realtype **h, int k, int p, realtype *new_vk_nor
  * -----------------------------------------------------------------
  */
 
-int QRfact(int n, realtype **h, realtype *q, int job)
+int QRfact(int n, sunrealtype **h, sunrealtype *q, int job)
 {
   return(SUNQRfact(n, h, q, job));
 }
 
-int SUNQRfact(int n, realtype **h, realtype *q, int job)
+int SUNQRfact(int n, sunrealtype **h, sunrealtype *q, int job)
 {
-  realtype c, s, temp1, temp2, temp3;
+  sunrealtype c, s, temp1, temp2, temp3;
   int i, j, k, q_ptr, n_minus_1, code=0;
 
   switch (job) {
@@ -279,14 +279,14 @@ int SUNQRfact(int n, realtype **h, realtype *q, int job)
  * -----------------------------------------------------------------
  */
 
-int QRsol(int n, realtype **h, realtype *q, realtype *b)
+int QRsol(int n, sunrealtype **h, sunrealtype *q, sunrealtype *b)
 {
   return(SUNQRsol(n, h, q, b));
 }
 
-int SUNQRsol(int n, realtype **h, realtype *q, realtype *b)
+int SUNQRsol(int n, sunrealtype **h, sunrealtype *q, sunrealtype *b)
 {
-  realtype c, s, temp1, temp2;
+  sunrealtype c, s, temp1, temp2;
   int i, k, q_ptr, code=0;
 
   /* Compute Q*b */
@@ -324,7 +324,7 @@ int SUNQRsol(int n, realtype **h, realtype *q, realtype *b)
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_MGS(N_Vector *Q, sunrealtype *R, N_Vector df,
                  int m, int mMax, void *QRdata)
 {
     sunindextype j;
@@ -351,7 +351,7 @@ int SUNQRAdd_MGS(N_Vector *Q, realtype *R, N_Vector df,
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_ICWY(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_ICWY(N_Vector *Q, sunrealtype *R, N_Vector df,
                   int m, int mMax, void *QRdata)
 {
     sunindextype j, k;
@@ -401,7 +401,7 @@ int SUNQRAdd_ICWY(N_Vector *Q, realtype *R, N_Vector df,
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_ICWY_SB(N_Vector *Q, sunrealtype *R, N_Vector df,
                      int m, int mMax, void *QRdata)
 {
     sunindextype j, k;
@@ -458,7 +458,7 @@ int SUNQRAdd_ICWY_SB(N_Vector *Q, realtype *R, N_Vector df,
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_CGS2(N_Vector *Q, sunrealtype *R, N_Vector df,
                   int m, int mMax, void *QRdata)
 {
     sunindextype j;
@@ -467,7 +467,7 @@ int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
     N_VScale(ONE, df, qrdata->vtemp); /* temp = df */
 
     if (m > 0) {
-      /* s_k = Q_k-1^T df_aa -- update with sdata as a realtype* array */
+      /* s_k = Q_k-1^T df_aa -- update with sdata as a sunrealtype* array */
       N_VDotProdMulti(m, qrdata->vtemp, Q, R + m * mMax);
 
       /* y = df - Q_k-1 s_k */
@@ -505,7 +505,7 @@ int SUNQRAdd_CGS2(N_Vector *Q, realtype *R, N_Vector df,
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_DCGS2(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_DCGS2(N_Vector *Q, sunrealtype *R, N_Vector df,
                    int m, int mMax, void *QRdata)
 {
     sunindextype j;
@@ -554,7 +554,7 @@ int SUNQRAdd_DCGS2(N_Vector *Q, realtype *R, N_Vector df,
  * -----------------------------------------------------------------
  */
 
-int SUNQRAdd_DCGS2_SB(N_Vector *Q, realtype *R, N_Vector df,
+int SUNQRAdd_DCGS2_SB(N_Vector *Q, sunrealtype *R, N_Vector df,
                       int m, int mMax, void *QRdata)
 {
     sunindextype j;
diff --git a/src/sundials/sundials_iterative_impl.h b/src/sundials/sundials_iterative_impl.h
index 45fad78e98..3d1551947b 100644
--- a/src/sundials/sundials_iterative_impl.h
+++ b/src/sundials/sundials_iterative_impl.h
@@ -20,8 +20,8 @@
 /* -----------------------------------------------------------------------------
  * Type: SUNQRData
  * -----------------------------------------------------------------------------
- * A SUNQRData struct holds temporary workspace vectors and realtype arrays for
- * a SUNQRAddFn. The N_Vectors and realtype arrays it contains are created by
+ * A SUNQRData struct holds temporary workspace vectors and sunrealtype arrays for
+ * a SUNQRAddFn. The N_Vectors and sunrealtype arrays it contains are created by
  * the routine calling a SUNQRAdd function.
  * ---------------------------------------------------------------------------*/
 
@@ -31,5 +31,5 @@ struct _SUNQRData
 {
   N_Vector vtemp;
   N_Vector vtemp2;
-  realtype *temp_array;
+  sunrealtype *temp_array;
 };
diff --git a/src/sundials/sundials_linearsolver.c b/src/sundials/sundials_linearsolver.c
index 75d4b6baa2..33304de3f8 100644
--- a/src/sundials/sundials_linearsolver.c
+++ b/src/sundials/sundials_linearsolver.c
@@ -150,7 +150,7 @@ int SUNLinSolSetScalingVectors(SUNLinearSolver S,
   return(ier);
 }
 
-int SUNLinSolSetZeroGuess(SUNLinearSolver S, booleantype onoff)
+int SUNLinSolSetZeroGuess(SUNLinearSolver S, sunbooleantype onoff)
 {
   if (S->ops->setzeroguess)
     return ((int) S->ops->setzeroguess(S, onoff));
@@ -183,7 +183,7 @@ int SUNLinSolSetup(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                   N_Vector b, realtype tol)
+                   N_Vector b, sunrealtype tol)
 {
   int ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(S));
@@ -202,14 +202,14 @@ int SUNLinSolNumIters(SUNLinearSolver S)
   return(ier);
 }
 
-realtype SUNLinSolResNorm(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm(SUNLinearSolver S)
 {
   double result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(S));
   if (S->ops->resnorm)
     result = S->ops->resnorm(S);
   else
-    result = RCONST(0.0);
+    result = SUN_RCONST(0.0);
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(S));
   return(result);
 }
diff --git a/src/sundials/sundials_math.c b/src/sundials/sundials_math.c
index fc1928dc8b..c30904e7aa 100644
--- a/src/sundials/sundials_math.c
+++ b/src/sundials/sundials_math.c
@@ -25,16 +25,16 @@
 
 static long double sunNextafterl(long double from, long double to);
 
-static booleantype sunIsInf(sunrealtype a)
+static sunbooleantype sunIsInf(sunrealtype a)
 {
 #if defined(__cplusplus) || defined(SUNDIALS_C_COMPILER_HAS_ISINF_ISNAN)
   return(isinf(a));
 #else
-  return(a < -BIG_REAL || a > BIG_REAL);
+  return(a < -SUN_BIG_REAL || a > SUN_BIG_REAL);
 #endif
 }
 
-static booleantype sunIsNaN(sunrealtype a)
+static sunbooleantype sunIsNaN(sunrealtype a)
 {
 #if defined(__cplusplus) || defined(SUNDIALS_C_COMPILER_HAS_ISINF_ISNAN)
   return(isnan(a));
@@ -52,16 +52,16 @@ sunrealtype SUNRpowerI(sunrealtype base, int exponent)
   int i, expt;
   sunrealtype prod;
 
-  prod = RCONST(1.0);
+  prod = SUN_RCONST(1.0);
   expt = abs(exponent);
   for(i = 1; i <= expt; i++) prod *= base;
-  if (exponent < 0) prod = RCONST(1.0)/prod;
+  if (exponent < 0) prod = SUN_RCONST(1.0)/prod;
   return(prod);
 }
 
 sunrealtype SUNRpowerR(sunrealtype base, sunrealtype exponent)
 {
-  if (base <= RCONST(0.0)) return(RCONST(0.0));
+  if (base <= SUN_RCONST(0.0)) return(SUN_RCONST(0.0));
 
 #if defined(__cplusplus) || defined(SUNDIALS_C_COMPILER_HAS_MATH_PRECISIONS)
 #if defined(SUNDIALS_DOUBLE_PRECISION)
@@ -76,12 +76,12 @@ sunrealtype SUNRpowerR(sunrealtype base, sunrealtype exponent)
 #endif
 }
 
-booleantype SUNRCompare(sunrealtype a, sunrealtype b)
+sunbooleantype SUNRCompare(sunrealtype a, sunrealtype b)
 {
-  return(SUNRCompareTol(a, b, 10*UNIT_ROUNDOFF));
+  return(SUNRCompareTol(a, b, 10*SUN_UNIT_ROUNDOFF));
 }
 
-booleantype SUNRCompareTol(sunrealtype a, sunrealtype b, sunrealtype tol)
+sunbooleantype SUNRCompareTol(sunrealtype a, sunrealtype b, sunrealtype tol)
 {
   sunrealtype diff;
   sunrealtype norm;
@@ -98,18 +98,18 @@ booleantype SUNRCompareTol(sunrealtype a, sunrealtype b, sunrealtype tol)
   if (sunIsInf(a) || sunIsInf(b)) return(SUNTRUE);
 
   diff = SUNRabs(a - b);
-  norm = SUNMIN(SUNRabs(a + b), BIG_REAL);
+  norm = SUNMIN(SUNRabs(a + b), SUN_BIG_REAL);
 
-  /* When |a + b| is very small (less than 10*UNIT_ROUNDOFF) or zero, we use an
+  /* When |a + b| is very small (less than 10*SUN_UNIT_ROUNDOFF) or zero, we use an
    * absolute difference:
-   *    |a - b| >= 10*UNIT_ROUNDOFF
+   *    |a - b| >= 10*SUN_UNIT_ROUNDOFF
    * Otherwise we use a relative difference:
    *    |a - b| < tol * |a + b|
    * The choice to use |a + b| over max(a, b)
    * is arbitrary, as is the choice to use
-   * 10*UNIT_ROUNDOFF.
+   * 10*SUN_UNIT_ROUNDOFF.
    */
-  return(diff >= SUNMAX(10*UNIT_ROUNDOFF, tol*norm));
+  return(diff >= SUNMAX(10*SUN_UNIT_ROUNDOFF, tol*norm));
 }
 
 long double sunNextafterl(long double from, long double to)
diff --git a/src/sundials/sundials_matrix.c b/src/sundials/sundials_matrix.c
index bc399ce08d..4be9a7135a 100644
--- a/src/sundials/sundials_matrix.c
+++ b/src/sundials/sundials_matrix.c
@@ -173,7 +173,7 @@ int SUNMatCopy(SUNMatrix A, SUNMatrix B)
   return(ier);
 }
 
-int SUNMatScaleAdd(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   int ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(A));
@@ -182,7 +182,7 @@ int SUNMatScaleAdd(realtype c, SUNMatrix A, SUNMatrix B)
   return(ier);
 }
 
-int SUNMatScaleAddI(realtype c, SUNMatrix A)
+int SUNMatScaleAddI(sunrealtype c, SUNMatrix A)
 {
   int ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(A));
diff --git a/src/sundials/sundials_memory.c b/src/sundials/sundials_memory.c
index c013f9a977..6271d44680 100644
--- a/src/sundials/sundials_memory.c
+++ b/src/sundials/sundials_memory.c
@@ -85,7 +85,7 @@ int SUNMemoryHelper_CopyOps(SUNMemoryHelper src, SUNMemoryHelper dst)
 }
 
 
-booleantype SUNMemoryHelper_ImplementsRequiredOps(SUNMemoryHelper helper)
+sunbooleantype SUNMemoryHelper_ImplementsRequiredOps(SUNMemoryHelper helper)
 {
   if (helper->ops->alloc == NULL || helper->ops->dealloc == NULL ||
       helper->ops->copy == NULL)
diff --git a/src/sundials/sundials_nonlinearsolver.c b/src/sundials/sundials_nonlinearsolver.c
index 63863026ef..c50652a251 100644
--- a/src/sundials/sundials_nonlinearsolver.c
+++ b/src/sundials/sundials_nonlinearsolver.c
@@ -124,8 +124,8 @@ int SUNNonlinSolSetup(SUNNonlinearSolver NLS, N_Vector y, void* mem)
 
 int SUNNonlinSolSolve(SUNNonlinearSolver NLS,
                       N_Vector y0, N_Vector y,
-                      N_Vector w, realtype tol,
-                      booleantype callLSetup, void* mem)
+                      N_Vector w, sunrealtype tol,
+                      sunbooleantype callLSetup, void* mem)
 {
   int ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(NLS));
diff --git a/src/sundials/sundials_nvector.c b/src/sundials/sundials_nvector.c
index f526ed4f87..018a8f20e4 100644
--- a/src/sundials/sundials_nvector.c
+++ b/src/sundials/sundials_nvector.c
@@ -320,20 +320,20 @@ void N_VSpace(N_Vector v, sunindextype *lrw, sunindextype *liw)
   return;
 }
 
-realtype *N_VGetArrayPointer(N_Vector v)
+sunrealtype *N_VGetArrayPointer(N_Vector v)
 {
-  return((realtype *) v->ops->nvgetarraypointer(v));
+  return((sunrealtype *) v->ops->nvgetarraypointer(v));
 }
 
-realtype *N_VGetDeviceArrayPointer(N_Vector v)
+sunrealtype *N_VGetDeviceArrayPointer(N_Vector v)
 {
   if (v->ops->nvgetdevicearraypointer)
-    return((realtype *) v->ops->nvgetdevicearraypointer(v));
+    return((sunrealtype *) v->ops->nvgetdevicearraypointer(v));
   else
     return(NULL);
 }
 
-void N_VSetArrayPointer(realtype *v_data, N_Vector v)
+void N_VSetArrayPointer(sunrealtype *v_data, N_Vector v)
 {
   v->ops->nvsetarraypointer(v_data, v);
   return;
@@ -361,7 +361,7 @@ sunindextype N_VGetLocalLength(N_Vector v)
  * standard vector operations
  * -----------------------------------------------------------------*/
 
-void N_VLinearSum(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
   z->ops->nvlinearsum(a, x, b, y, z);
@@ -369,7 +369,7 @@ void N_VLinearSum(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
   return;
 }
 
-void N_VConst(realtype c, N_Vector z)
+void N_VConst(sunrealtype c, N_Vector z)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(z));
   z->ops->nvconst(c, z);
@@ -393,7 +393,7 @@ void N_VDiv(N_Vector x, N_Vector y, N_Vector z)
   return;
 }
 
-void N_VScale(realtype c, N_Vector x, N_Vector z)
+void N_VScale(sunrealtype c, N_Vector x, N_Vector z)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
   z->ops->nvscale(c, x, z);
@@ -417,7 +417,7 @@ void N_VInv(N_Vector x, N_Vector z)
   return;
 }
 
-void N_VAddConst(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst(N_Vector x, sunrealtype b, N_Vector z)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
   z->ops->nvaddconst(x, b, z);
@@ -425,70 +425,70 @@ void N_VAddConst(N_Vector x, realtype b, N_Vector z)
   return;
 }
 
-realtype N_VDotProd(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd(N_Vector x, N_Vector y)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) y->ops->nvdotprod(x, y));
+  result = ((sunrealtype) y->ops->nvdotprod(x, y));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VMaxNorm(N_Vector x)
+sunrealtype N_VMaxNorm(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvmaxnorm(x));
+  result = ((sunrealtype) x->ops->nvmaxnorm(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VWrmsNorm(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm(N_Vector x, N_Vector w)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvwrmsnorm(x, w));
+  result = ((sunrealtype) x->ops->nvwrmsnorm(x, w));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvwrmsnormmask(x, w, id));
+  result = ((sunrealtype) x->ops->nvwrmsnormmask(x, w, id));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VMin(N_Vector x)
+sunrealtype N_VMin(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvmin(x));
+  result = ((sunrealtype) x->ops->nvmin(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VWL2Norm(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm(N_Vector x, N_Vector w)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvwl2norm(x, w));
+  result = ((sunrealtype) x->ops->nvwl2norm(x, w));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VL1Norm(N_Vector x)
+sunrealtype N_VL1Norm(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvl1norm(x));
+  result = ((sunrealtype) x->ops->nvl1norm(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-void N_VCompare(realtype c, N_Vector x, N_Vector z)
+void N_VCompare(sunrealtype c, N_Vector x, N_Vector z)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
   z->ops->nvcompare(c, x, z);
@@ -496,29 +496,29 @@ void N_VCompare(realtype c, N_Vector x, N_Vector z)
   return;
 }
 
-booleantype N_VInvTest(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest(N_Vector x, N_Vector z)
 {
-  booleantype result;
+  sunbooleantype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((booleantype) z->ops->nvinvtest(x, z));
+  result = ((sunbooleantype) z->ops->nvinvtest(x, z));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-booleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask(N_Vector c, N_Vector x, N_Vector m)
 {
-  booleantype result;
+  sunbooleantype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(c));
-  result = ((booleantype) x->ops->nvconstrmask(c, x, m));
+  result = ((sunbooleantype) x->ops->nvconstrmask(c, x, m));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(c));
   return(result);
 }
 
-realtype N_VMinQuotient(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient(N_Vector num, N_Vector denom)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(num));
-  result = ((realtype) num->ops->nvminquotient(num, denom));
+  result = ((sunrealtype) num->ops->nvminquotient(num, denom));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(num));
   return(result);
 }
@@ -529,7 +529,7 @@ realtype N_VMinQuotient(N_Vector num, N_Vector denom)
  * OPTIONAL fused vector operations
  * -----------------------------------------------------------------*/
 
-int N_VLinearCombination(int nvec, realtype* c, N_Vector* X, N_Vector z)
+int N_VLinearCombination(int nvec, sunrealtype* c, N_Vector* X, N_Vector z)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(X[0]));
@@ -542,7 +542,7 @@ int N_VLinearCombination(int nvec, realtype* c, N_Vector* X, N_Vector z)
 
     z->ops->nvscale(c[0], X[0], z);
     for (i=1; i<nvec; i++) {
-      z->ops->nvlinearsum(c[i], X[i], RCONST(1.0), z, z);
+      z->ops->nvlinearsum(c[i], X[i], SUN_RCONST(1.0), z, z);
     }
     ier = 0;
 
@@ -552,7 +552,7 @@ int N_VLinearCombination(int nvec, realtype* c, N_Vector* X, N_Vector z)
   return(ier);
 }
 
-int N_VScaleAddMulti(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
+int N_VScaleAddMulti(int nvec, sunrealtype* a, N_Vector x, N_Vector* Y, N_Vector* Z)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
@@ -564,7 +564,7 @@ int N_VScaleAddMulti(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z
   } else {
 
     for (i=0; i<nvec; i++) {
-      x->ops->nvlinearsum(a[i], x, RCONST(1.0), Y[i], Z[i]);
+      x->ops->nvlinearsum(a[i], x, SUN_RCONST(1.0), Y[i], Z[i]);
     }
     ier = 0;
 
@@ -574,7 +574,7 @@ int N_VScaleAddMulti(int nvec, realtype* a, N_Vector x, N_Vector* Y, N_Vector* Z
   return(ier);
 }
 
-int N_VDotProdMulti(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMulti(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
@@ -600,8 +600,8 @@ int N_VDotProdMulti(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
  * OPTIONAL vector array operations
  * -----------------------------------------------------------------*/
 
-int N_VLinearSumVectorArray(int nvec, realtype a, N_Vector* X,
-                            realtype b, N_Vector* Y, N_Vector* Z)
+int N_VLinearSumVectorArray(int nvec, sunrealtype a, N_Vector* X,
+                            sunrealtype b, N_Vector* Y, N_Vector* Z)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(X[0]));
@@ -623,7 +623,7 @@ int N_VLinearSumVectorArray(int nvec, realtype a, N_Vector* X,
   return(ier);
 }
 
-int N_VScaleVectorArray(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
+int N_VScaleVectorArray(int nvec, sunrealtype* c, N_Vector* X, N_Vector* Z)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(X[0]));
@@ -645,7 +645,7 @@ int N_VScaleVectorArray(int nvec, realtype* c, N_Vector* X, N_Vector* Z)
   return(ier);
 }
 
-int N_VConstVectorArray(int nvec, realtype c, N_Vector* Z)
+int N_VConstVectorArray(int nvec, sunrealtype c, N_Vector* Z)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(Z[0]));
@@ -667,7 +667,7 @@ int N_VConstVectorArray(int nvec, realtype c, N_Vector* Z)
   return(ier);
 }
 
-int N_VWrmsNormVectorArray(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
+int N_VWrmsNormVectorArray(int nvec, N_Vector* X, N_Vector* W, sunrealtype* nrm)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(X[0]));
@@ -690,7 +690,7 @@ int N_VWrmsNormVectorArray(int nvec, N_Vector* X, N_Vector* W, realtype* nrm)
 }
 
 int N_VWrmsNormMaskVectorArray(int nvec, N_Vector* X, N_Vector* W, N_Vector id,
-                               realtype* nrm)
+                               sunrealtype* nrm)
 {
   int i, ier;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(X[0]));
@@ -712,7 +712,7 @@ int N_VWrmsNormMaskVectorArray(int nvec, N_Vector* X, N_Vector* W, N_Vector id,
   return(ier);
 }
 
-int N_VScaleAddMultiVectorArray(int nvec, int nsum, realtype* a, N_Vector* X,
+int N_VScaleAddMultiVectorArray(int nvec, int nsum, sunrealtype* a, N_Vector* X,
                                  N_Vector** Y, N_Vector** Z)
 {
   int i, j, ier;
@@ -749,7 +749,7 @@ int N_VScaleAddMultiVectorArray(int nvec, int nsum, realtype* a, N_Vector* X,
 
     for (i=0; i<nvec; i++) {
       for (j=0; j<nsum; j++) {
-        X[0]->ops->nvlinearsum(a[j], X[i], RCONST(1.0), Y[j][i], Z[j][i]);
+        X[0]->ops->nvlinearsum(a[j], X[i], SUN_RCONST(1.0), Y[j][i], Z[j][i]);
       }
     }
     ier = 0;
@@ -759,7 +759,7 @@ int N_VScaleAddMultiVectorArray(int nvec, int nsum, realtype* a, N_Vector* X,
   return(ier);
 }
 
-int N_VLinearCombinationVectorArray(int nvec, int nsum, realtype* c,
+int N_VLinearCombinationVectorArray(int nvec, int nsum, sunrealtype* c,
                                     N_Vector** X, N_Vector* Z)
 {
   int i, j, ier;
@@ -793,7 +793,7 @@ int N_VLinearCombinationVectorArray(int nvec, int nsum, realtype* c,
     for (i=0; i<nvec; i++) {
       Z[0]->ops->nvscale(c[0], X[0][i], Z[i]);
       for (j=1; j<nsum; j++) {
-        Z[0]->ops->nvlinearsum(c[j], X[j][i], RCONST(1.0), Z[i], Z[i]);
+        Z[0]->ops->nvlinearsum(c[j], X[j][i], SUN_RCONST(1.0), Z[i], Z[i]);
       }
     }
     ier = 0;
@@ -807,83 +807,83 @@ int N_VLinearCombinationVectorArray(int nvec, int nsum, realtype* c,
  * OPTIONAL local reduction kernels (no parallel communication)
  * -----------------------------------------------------------------*/
 
-realtype N_VDotProdLocal(N_Vector x, N_Vector y)
+sunrealtype N_VDotProdLocal(N_Vector x, N_Vector y)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) y->ops->nvdotprodlocal(x, y));
+  result = ((sunrealtype) y->ops->nvdotprodlocal(x, y));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VMaxNormLocal(N_Vector x)
+sunrealtype N_VMaxNormLocal(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvmaxnormlocal(x));
+  result = ((sunrealtype) x->ops->nvmaxnormlocal(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VMinLocal(N_Vector x)
+sunrealtype N_VMinLocal(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvminlocal(x));
+  result = ((sunrealtype) x->ops->nvminlocal(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VL1NormLocal(N_Vector x)
+sunrealtype N_VL1NormLocal(N_Vector x)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvl1normlocal(x));
+  result = ((sunrealtype) x->ops->nvl1normlocal(x));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VWSqrSumLocal(N_Vector x, N_Vector w)
+sunrealtype N_VWSqrSumLocal(N_Vector x, N_Vector w)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvwsqrsumlocal(x,w));
+  result = ((sunrealtype) x->ops->nvwsqrsumlocal(x,w));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWSqrSumMaskLocal(N_Vector x, N_Vector w, N_Vector id)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((realtype) x->ops->nvwsqrsummasklocal(x,w,id));
+  result = ((sunrealtype) x->ops->nvwsqrsummasklocal(x,w,id));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-booleantype N_VInvTestLocal(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTestLocal(N_Vector x, N_Vector z)
 {
-  booleantype result;
+  sunbooleantype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((booleantype) z->ops->nvinvtestlocal(x,z));
+  result = ((sunbooleantype) z->ops->nvinvtestlocal(x,z));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-booleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMaskLocal(N_Vector c, N_Vector x, N_Vector m)
 {
-  booleantype result;
+  sunbooleantype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
-  result = ((booleantype) x->ops->nvconstrmasklocal(c,x,m));
+  result = ((sunbooleantype) x->ops->nvconstrmasklocal(c,x,m));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(x));
   return(result);
 }
 
-realtype N_VMinQuotientLocal(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotientLocal(N_Vector num, N_Vector denom)
 {
-  realtype result;
+  sunrealtype result;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(num));
-  result = ((realtype) num->ops->nvminquotientlocal(num,denom));
+  result = ((sunrealtype) num->ops->nvminquotientlocal(num,denom));
   SUNDIALS_MARK_FUNCTION_END(getSUNProfiler(num));
   return(result);
 }
@@ -892,7 +892,7 @@ realtype N_VMinQuotientLocal(N_Vector num, N_Vector denom)
  * OPTIONAL single buffer reduction operations
  * -------------------------------------------*/
 
-int N_VDotProdMultiLocal(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
+int N_VDotProdMultiLocal(int nvec, N_Vector x, N_Vector* Y, sunrealtype* dotprods)
 {
   int i;
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
@@ -911,7 +911,7 @@ int N_VDotProdMultiLocal(int nvec, N_Vector x, N_Vector* Y, realtype* dotprods)
   return(-1);
 }
 
-int N_VDotProdMultiAllReduce(int nvec, N_Vector x, realtype* sum)
+int N_VDotProdMultiAllReduce(int nvec, N_Vector x, sunrealtype* sum)
 {
   SUNDIALS_MARK_FUNCTION_BEGIN(getSUNProfiler(x));
   if (x->ops->nvdotprodmultiallreduce)
diff --git a/src/sundials/sundials_nvector_senswrapper.c b/src/sundials/sundials_nvector_senswrapper.c
index d8f0ac6826..3b7500acda 100644
--- a/src/sundials/sundials_nvector_senswrapper.c
+++ b/src/sundials/sundials_nvector_senswrapper.c
@@ -23,7 +23,7 @@
 #include <sundials/sundials_nvector.h>
 #include <sundials/sundials_nvector_senswrapper.h>
 
-#define ZERO RCONST(0.0)
+#define ZERO SUN_RCONST(0.0)
 
 /*==============================================================================
   Constructors
@@ -267,7 +267,7 @@ void N_VDestroy_SensWrapper(N_Vector v)
   Standard vector operations
   ============================================================================*/
 
-void N_VLinearSum_SensWrapper(realtype a, N_Vector x, realtype b, N_Vector y, N_Vector z)
+void N_VLinearSum_SensWrapper(sunrealtype a, N_Vector x, sunrealtype b, N_Vector y, N_Vector z)
 {
   int i;
 
@@ -278,7 +278,7 @@ void N_VLinearSum_SensWrapper(realtype a, N_Vector x, realtype b, N_Vector y, N_
 }
 
 
-void N_VConst_SensWrapper(realtype c, N_Vector z)
+void N_VConst_SensWrapper(sunrealtype c, N_Vector z)
 {
   int i;
 
@@ -311,7 +311,7 @@ void N_VDiv_SensWrapper(N_Vector x, N_Vector y, N_Vector z)
 }
 
 
-void N_VScale_SensWrapper(realtype c, N_Vector x, N_Vector z)
+void N_VScale_SensWrapper(sunrealtype c, N_Vector x, N_Vector z)
 {
   int i;
 
@@ -344,7 +344,7 @@ void N_VInv_SensWrapper(N_Vector x, N_Vector z)
 }
 
 
-void N_VAddConst_SensWrapper(N_Vector x, realtype b, N_Vector z)
+void N_VAddConst_SensWrapper(N_Vector x, sunrealtype b, N_Vector z)
 {
   int i;
 
@@ -355,10 +355,10 @@ void N_VAddConst_SensWrapper(N_Vector x, realtype b, N_Vector z)
 }
 
 
-realtype N_VDotProd_SensWrapper(N_Vector x, N_Vector y)
+sunrealtype N_VDotProd_SensWrapper(N_Vector x, N_Vector y)
 {
   int i;
-  realtype sum;
+  sunrealtype sum;
 
   sum = ZERO;
 
@@ -369,10 +369,10 @@ realtype N_VDotProd_SensWrapper(N_Vector x, N_Vector y)
 }
 
 
-realtype N_VMaxNorm_SensWrapper(N_Vector x)
+sunrealtype N_VMaxNorm_SensWrapper(N_Vector x)
 {
   int i;
-  realtype max, tmp;
+  sunrealtype max, tmp;
 
   max = ZERO;
 
@@ -385,10 +385,10 @@ realtype N_VMaxNorm_SensWrapper(N_Vector x)
 }
 
 
-realtype N_VWrmsNorm_SensWrapper(N_Vector x, N_Vector w)
+sunrealtype N_VWrmsNorm_SensWrapper(N_Vector x, N_Vector w)
 {
   int i;
-  realtype nrm, tmp;
+  sunrealtype nrm, tmp;
 
   nrm = ZERO;
 
@@ -401,10 +401,10 @@ realtype N_VWrmsNorm_SensWrapper(N_Vector x, N_Vector w)
 }
 
 
-realtype N_VWrmsNormMask_SensWrapper(N_Vector x, N_Vector w, N_Vector id)
+sunrealtype N_VWrmsNormMask_SensWrapper(N_Vector x, N_Vector w, N_Vector id)
 {
   int i;
-  realtype nrm, tmp;
+  sunrealtype nrm, tmp;
 
   nrm = ZERO;
 
@@ -417,10 +417,10 @@ realtype N_VWrmsNormMask_SensWrapper(N_Vector x, N_Vector w, N_Vector id)
 }
 
 
-realtype N_VMin_SensWrapper(N_Vector x)
+sunrealtype N_VMin_SensWrapper(N_Vector x)
 {
   int i;
-  realtype min, tmp;
+  sunrealtype min, tmp;
 
   min = N_VMin(NV_VEC_SW(x,0));
 
@@ -433,10 +433,10 @@ realtype N_VMin_SensWrapper(N_Vector x)
 }
 
 
-realtype N_VWL2Norm_SensWrapper(N_Vector x, N_Vector w)
+sunrealtype N_VWL2Norm_SensWrapper(N_Vector x, N_Vector w)
 {
   int i;
-  realtype nrm, tmp;
+  sunrealtype nrm, tmp;
 
   nrm = ZERO;
 
@@ -449,10 +449,10 @@ realtype N_VWL2Norm_SensWrapper(N_Vector x, N_Vector w)
 }
 
 
-realtype N_VL1Norm_SensWrapper(N_Vector x)
+sunrealtype N_VL1Norm_SensWrapper(N_Vector x)
 {
   int i;
-  realtype nrm, tmp;
+  sunrealtype nrm, tmp;
 
   nrm = ZERO;
 
@@ -465,7 +465,7 @@ realtype N_VL1Norm_SensWrapper(N_Vector x)
 }
 
 
-void N_VCompare_SensWrapper(realtype c, N_Vector x, N_Vector z)
+void N_VCompare_SensWrapper(sunrealtype c, N_Vector x, N_Vector z)
 {
   int i;
 
@@ -476,10 +476,10 @@ void N_VCompare_SensWrapper(realtype c, N_Vector x, N_Vector z)
 }
 
 
-booleantype N_VInvTest_SensWrapper(N_Vector x, N_Vector z)
+sunbooleantype N_VInvTest_SensWrapper(N_Vector x, N_Vector z)
 {
   int i;
-  booleantype no_zero_found, tmp;
+  sunbooleantype no_zero_found, tmp;
 
   no_zero_found = SUNTRUE;
 
@@ -492,10 +492,10 @@ booleantype N_VInvTest_SensWrapper(N_Vector x, N_Vector z)
 }
 
 
-booleantype N_VConstrMask_SensWrapper(N_Vector c, N_Vector x, N_Vector m)
+sunbooleantype N_VConstrMask_SensWrapper(N_Vector c, N_Vector x, N_Vector m)
 {
   int i;
-  booleantype test, tmp;
+  sunbooleantype test, tmp;
 
   test = SUNTRUE;
 
@@ -508,10 +508,10 @@ booleantype N_VConstrMask_SensWrapper(N_Vector c, N_Vector x, N_Vector m)
 }
 
 
-realtype N_VMinQuotient_SensWrapper(N_Vector num, N_Vector denom)
+sunrealtype N_VMinQuotient_SensWrapper(N_Vector num, N_Vector denom)
 {
   int i;
-  realtype min, tmp;
+  sunrealtype min, tmp;
 
   min = N_VMinQuotient(NV_VEC_SW(num,0), NV_VEC_SW(denom,0));
 
diff --git a/src/sundials/sundials_xbraid.c b/src/sundials/sundials_xbraid.c
index 37788e30b4..37e0a2e293 100644
--- a/src/sundials/sundials_xbraid.c
+++ b/src/sundials/sundials_xbraid.c
@@ -17,7 +17,7 @@
 #include "sundials/sundials_xbraid.h"
 #include "sundials/sundials_math.h"
 
-#define ONE RCONST(1.0)
+#define ONE SUN_RCONST(1.0)
 
 
 /* -------------------------
diff --git a/src/sunlinsol/band/fmod/fsunlinsol_band_mod.c b/src/sunlinsol/band/fmod/fsunlinsol_band_mod.c
index b137b1101d..99f9a333c0 100644
--- a/src/sunlinsol/band/fmod/fsunlinsol_band_mod.c
+++ b/src/sunlinsol/band/fmod/fsunlinsol_band_mod.c
@@ -280,14 +280,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_Band(SUNLinearSolver farg1, SUNMatrix farg2
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_Band(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
diff --git a/src/sunlinsol/band/sunlinsol_band.c b/src/sunlinsol/band/sunlinsol_band.c
index 9ea45b6dff..a98767ad5c 100644
--- a/src/sunlinsol/band/sunlinsol_band.c
+++ b/src/sunlinsol/band/sunlinsol_band.c
@@ -21,8 +21,8 @@
 #include <sunlinsol/sunlinsol_band.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 #define ROW(i,j,smu) (i-j+smu)
 
 /*
@@ -131,7 +131,7 @@ int SUNLinSolInitialize_Band(SUNLinearSolver S)
 
 int SUNLinSolSetup_Band(SUNLinearSolver S, SUNMatrix A)
 {
-  realtype **A_cols;
+  sunrealtype **A_cols;
   sunindextype *pivots;
 
   /* check for valid inputs */
@@ -171,9 +171,9 @@ int SUNLinSolSetup_Band(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve_Band(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                        N_Vector b, realtype tol)
+                        N_Vector b, sunrealtype tol)
 {
-  realtype **A_cols, *xdata;
+  sunrealtype **A_cols, *xdata;
   sunindextype *pivots;
 
   /* check for valid inputs */
diff --git a/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu b/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
index 915f6163e9..30a1c575ad 100644
--- a/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
+++ b/src/sunlinsol/cusolversp/sunlinsol_cusolversp_batchqr.cu
@@ -26,9 +26,9 @@
 #include "sundials_cusolver.h"
 #include "sundials_debug.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 /* macros for handling the different function names based on precision */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
@@ -182,7 +182,7 @@ int SUNLinSolSetup_cuSolverSp_batchQR(SUNLinearSolver S, SUNMatrix A)
 {
   int blockrows, blockcols, blocknnz, nblock;
   int *d_rowptr, *d_colind;
-  realtype *d_data;
+  sunrealtype *d_data;
   cusparseMatDescr_t mat_descr;
   cudaError_t cuerr;
   cusolverStatus_t status;
@@ -270,12 +270,12 @@ int SUNLinSolSetup_cuSolverSp_batchQR(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve_cuSolverSp_batchQR(SUNLinearSolver S, SUNMatrix A,
-                                      N_Vector x, N_Vector b, realtype tol)
+                                      N_Vector x, N_Vector b, sunrealtype tol)
 {
   cusolverStatus_t status;
   int blockrows, blockcols, blocknnz, nblock;
   int *d_rowptr, *d_colind;
-  realtype *d_data;
+  sunrealtype *d_data;
   cusparseMatDescr_t mat_descr;
 
   if ((S == NULL) || (A == NULL) || (x == NULL) || (b == NULL))
@@ -283,8 +283,8 @@ int SUNLinSolSolve_cuSolverSp_batchQR(SUNLinearSolver S, SUNMatrix A,
 
   SUN_CUSP_LASTFLAG(S) = SUNLS_SUCCESS;
 
-  realtype* device_b = N_VGetDeviceArrayPointer(b);
-  realtype* device_x = N_VGetDeviceArrayPointer(x);
+  sunrealtype* device_b = N_VGetDeviceArrayPointer(b);
+  sunrealtype* device_x = N_VGetDeviceArrayPointer(x);
 
   if (SUN_CUSP_LASTFLAG(S) != SUNLS_SUCCESS)
     return SUN_CUSP_LASTFLAG(S);
diff --git a/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.c b/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.c
index 82ad5846c6..14a61798fe 100644
--- a/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.c
+++ b/src/sunlinsol/dense/fmod/fsunlinsol_dense_mod.c
@@ -280,14 +280,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_Dense(SUNLinearSolver farg1, SUNMatrix farg
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_Dense(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
diff --git a/src/sunlinsol/dense/sunlinsol_dense.c b/src/sunlinsol/dense/sunlinsol_dense.c
index bed6afb5b0..ed9e075f98 100644
--- a/src/sunlinsol/dense/sunlinsol_dense.c
+++ b/src/sunlinsol/dense/sunlinsol_dense.c
@@ -21,7 +21,7 @@
 #include <sunlinsol/sunlinsol_dense.h>
 #include <sundials/sundials_math.h>
 
-#define ONE  RCONST(1.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -122,7 +122,7 @@ int SUNLinSolInitialize_Dense(SUNLinearSolver S)
 
 int SUNLinSolSetup_Dense(SUNLinearSolver S, SUNMatrix A)
 {
-  realtype **A_cols;
+  sunrealtype **A_cols;
   sunindextype *pivots;
 
   /* check for valid inputs */
@@ -156,9 +156,9 @@ int SUNLinSolSetup_Dense(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve_Dense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                         N_Vector b, realtype tol)
+                         N_Vector b, sunrealtype tol)
 {
-  realtype **A_cols, *xdata;
+  sunrealtype **A_cols, *xdata;
   sunindextype *pivots;
 
   if ( (A == NULL) || (S == NULL) || (x == NULL) || (b == NULL) )
diff --git a/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c b/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c
index 939d70b048..105aa042ed 100644
--- a/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c
+++ b/src/sunlinsol/klu/fmod/fsunlinsol_klu_mod.c
@@ -372,14 +372,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_KLU(SUNLinearSolver farg1, SUNMatrix farg2,
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_KLU(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
diff --git a/src/sunlinsol/klu/sunlinsol_klu.c b/src/sunlinsol/klu/sunlinsol_klu.c
index 502d9b1014..5ba90f7e0e 100644
--- a/src/sunlinsol/klu/sunlinsol_klu.c
+++ b/src/sunlinsol/klu/sunlinsol_klu.c
@@ -22,10 +22,10 @@
 #include <sunlinsol/sunlinsol_klu.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO      RCONST(0.0)
-#define ONE       RCONST(1.0)
-#define TWO       RCONST(2.0)
-#define TWOTHIRDS RCONST(0.666666666666666666666666666666667)
+#define ZERO      SUN_RCONST(0.0)
+#define ONE       SUN_RCONST(1.0)
+#define TWO       SUN_RCONST(2.0)
+#define TWOTHIRDS SUN_RCONST(0.666666666666666666666666666666667)
 
 /*
  * -----------------------------------------------------------------
@@ -244,9 +244,9 @@ int SUNLinSolInitialize_KLU(SUNLinearSolver S)
 int SUNLinSolSetup_KLU(SUNLinearSolver S, SUNMatrix A)
 {
   int retval;
-  realtype uround_twothirds;
+  sunrealtype uround_twothirds;
 
-  uround_twothirds = SUNRpowerR(UNIT_ROUNDOFF,TWOTHIRDS);
+  uround_twothirds = SUNRpowerR(SUN_UNIT_ROUNDOFF,TWOTHIRDS);
 
   /* Ensure that A is a sparse matrix */
   if (SUNMatGetID(A) != SUNMATRIX_SPARSE) {
@@ -350,10 +350,10 @@ int SUNLinSolSetup_KLU(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_KLU(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                       N_Vector b, realtype tol)
+                       N_Vector b, sunrealtype tol)
 {
   int flag;
-  realtype *xdata;
+  sunrealtype *xdata;
 
   /* check for valid inputs */
   if ( (A == NULL) || (S == NULL) || (x == NULL) || (b == NULL) )
diff --git a/src/sunlinsol/lapackband/sunlinsol_lapackband.c b/src/sunlinsol/lapackband/sunlinsol_lapackband.c
index 0affcb5474..274520cbf7 100644
--- a/src/sunlinsol/lapackband/sunlinsol_lapackband.c
+++ b/src/sunlinsol/lapackband/sunlinsol_lapackband.c
@@ -24,7 +24,7 @@
 
 #include "sundials_lapack_defs.h"
 
-/* Interfaces to match 'realtype' with the correct LAPACK functions */
+/* Interfaces to match 'sunrealtype' with the correct LAPACK functions */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
 #define xgbtrf_f77    dgbtrf_f77
 #define xgbtrs_f77    dgbtrs_f77
@@ -32,11 +32,11 @@
 #define xgbtrf_f77    sgbtrf_f77
 #define xgbtrs_f77    sgbtrs_f77
 #else
-#error  Incompatible realtype for LAPACK; disable LAPACK and rebuild
+#error  Incompatible sunrealtype for LAPACK; disable LAPACK and rebuild
 #endif
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -172,10 +172,10 @@ int SUNLinSolSetup_LapackBand(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_LapackBand(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                              N_Vector b, realtype tol)
+                              N_Vector b, sunrealtype tol)
 {
   sunindextype n, ml, mu, ldim, one, ier;
-  realtype *xdata;
+  sunrealtype *xdata;
 
   /* check for valid inputs */
   if ( (A == NULL) || (S == NULL) || (x == NULL) || (b == NULL) )
diff --git a/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
index 2ed9147d9f..f2b2b221d7 100644
--- a/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
+++ b/src/sunlinsol/lapackdense/fmod/fsunlinsol_lapackdense_mod.c
@@ -280,14 +280,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_LapackDense(SUNLinearSolver farg1, SUNMatri
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_LapackDense(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
diff --git a/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c b/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c
index d89e4ebfe5..ad829f07f1 100644
--- a/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c
+++ b/src/sunlinsol/lapackdense/sunlinsol_lapackdense.c
@@ -24,7 +24,7 @@
 
 #include "sundials_lapack_defs.h"
 
-/* Interfaces to match 'realtype' with the correct LAPACK functions */
+/* Interfaces to match 'sunrealtype' with the correct LAPACK functions */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
 #define xgetrf_f77    dgetrf_f77
 #define xgetrs_f77    dgetrs_f77
@@ -32,11 +32,11 @@
 #define xgetrf_f77    sgetrf_f77
 #define xgetrs_f77    sgetrs_f77
 #else
-#error  Incompatible realtype for LAPACK; disable LAPACK and rebuild
+#error  Incompatible sunrealtype for LAPACK; disable LAPACK and rebuild
 #endif
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -167,10 +167,10 @@ int SUNLinSolSetup_LapackDense(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_LapackDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                               N_Vector b, realtype tol)
+                               N_Vector b, sunrealtype tol)
 {
   sunindextype n, one, ier;
-  realtype *xdata;
+  sunrealtype *xdata;
 
   if ( (A == NULL) || (S == NULL) || (x == NULL) || (b == NULL) )
     return(SUNLS_MEM_NULL);
diff --git a/src/sunlinsol/magmadense/sunlinsol_magmadense.cpp b/src/sunlinsol/magmadense/sunlinsol_magmadense.cpp
index 4d9f2ab46b..3b4c86bc03 100644
--- a/src/sunlinsol/magmadense/sunlinsol_magmadense.cpp
+++ b/src/sunlinsol/magmadense/sunlinsol_magmadense.cpp
@@ -19,7 +19,7 @@
 #include <sunmatrix/sunmatrix_magmadense.h>
 #include <sundials/sundials_math.h>
 
-/* Interfaces to match 'realtype' with the correct MAGMA functions */
+/* Interfaces to match 'sunrealtype' with the correct MAGMA functions */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
 #define xgetrf magma_dgetrf_gpu
 #define xgetrf_batched magma_dgetrf_batched
@@ -33,11 +33,11 @@
 #define xgetrs_batched magma_sgetrs_batched
 #define xset_pointer magma_sset_pointer
 #else
-#error  Incompatible realtype for MAGMA
+#error  Incompatible sunrealtype for MAGMA
 #endif
 
-#define ZERO  RCONST(0.0)
-#define ONE   RCONST(1.0)
+#define ZERO  SUN_RCONST(0.0)
+#define ONE   SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -50,7 +50,7 @@
 #define QUEUE(S)              ( MAGMADENSE_CONTENT(S)->q )
 #define PIVOTS(S)             ( (sunindextype*)MAGMADENSE_CONTENT(S)->pivots->ptr )
 #define PIVOTSARRAY(S)        ( (sunindextype**)MAGMADENSE_CONTENT(S)->pivotsarr->ptr )
-#define RHSARRAY(S)           ( (realtype**)MAGMADENSE_CONTENT(S)->rhsarr->ptr )
+#define RHSARRAY(S)           ( (sunrealtype**)MAGMADENSE_CONTENT(S)->rhsarr->ptr )
 #define INFOARRAY(S)          ( (sunindextype*)MAGMADENSE_CONTENT(S)->infoarr->ptr )
 #define LASTFLAG(S)           ( MAGMADENSE_CONTENT(S)->last_flag )
 #define ASYNCHRONOUS(S)       ( MAGMADENSE_CONTENT(S)->async)
@@ -175,7 +175,7 @@ SUNLinearSolver SUNLinSol_MagmaDense(N_Vector y, SUNMatrix Amat, SUNContext sunc
     if (retval) { SUNLinSolFree(S); return(NULL); }
 
     retval = SUNMemoryHelper_Alloc(content->memhelp, &content->rhsarr,
-                                   nblocks * sizeof(realtype*),
+                                   nblocks * sizeof(sunrealtype*),
                                    SUNMEMTYPE_DEVICE, nullptr);
     if (retval) { SUNLinSolFree(S); return(NULL); }
   }
@@ -187,7 +187,7 @@ SUNLinearSolver SUNLinSol_MagmaDense(N_Vector y, SUNMatrix Amat, SUNContext sunc
  * Set functions
  */
 
-int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver S, booleantype onoff)
+int SUNLinSol_MagmaDense_SetAsync(SUNLinearSolver S, sunbooleantype onoff)
 {
   if (S == NULL) return SUNLS_MEM_NULL;
   ASYNCHRONOUS(S) = onoff;
@@ -253,7 +253,7 @@ int SUNLinSolSetup_MagmaDense(SUNLinearSolver S, SUNMatrix A)
                    nblocks,
                    QUEUE(S));
 #else
-    realtype** blocks = SUNMatrix_MagmaDense_BlockData(A);
+    sunrealtype** blocks = SUNMatrix_MagmaDense_BlockData(A);
     for (int k = 0; k < nblocks; k++)
     {
       xgetrf(M, /* number of rows */
@@ -298,7 +298,7 @@ int SUNLinSolSetup_MagmaDense(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve_MagmaDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                              N_Vector b, realtype tol)
+                              N_Vector b, sunrealtype tol)
 {
   /* Check for valid inputs */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -324,7 +324,7 @@ int SUNLinSolSolve_MagmaDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   N_VScale(ONE, b, x);
 
   /* Access x data array */
-  realtype* xdata = N_VGetDeviceArrayPointer(x);
+  sunrealtype* xdata = N_VGetDeviceArrayPointer(x);
   if (xdata == NULL)
   {
     LASTFLAG(S) = SUNLS_MEM_FAIL;
diff --git a/src/sunlinsol/onemkldense/sunlinsol_onemkldense.cpp b/src/sunlinsol/onemkldense/sunlinsol_onemkldense.cpp
index 72e87f53f9..83ff3df6d7 100644
--- a/src/sunlinsol/onemkldense/sunlinsol_onemkldense.cpp
+++ b/src/sunlinsol/onemkldense/sunlinsol_onemkldense.cpp
@@ -51,12 +51,12 @@ using namespace oneapi::mkl::lapack;
 // Getrf scratch space size and memory
 #define LS_F_SCRATCH_SIZE(S)  (LS_CONTENT(S)->f_scratch_size)
 #define LS_F_SCRATCH(S)       (LS_CONTENT(S)->f_scratchpad)
-#define LS_F_SCRATCHp(S)      ((realtype*) LS_CONTENT(S)->f_scratchpad->ptr)
+#define LS_F_SCRATCHp(S)      ((sunrealtype*) LS_CONTENT(S)->f_scratchpad->ptr)
 
 // Getrs scratch space size and memory
 #define LS_S_SCRATCH_SIZE(S)  (LS_CONTENT(S)->s_scratch_size)
 #define LS_S_SCRATCH(S)       (LS_CONTENT(S)->s_scratchpad)
-#define LS_S_SCRATCHp(S)      ((realtype*) LS_CONTENT(S)->s_scratchpad->ptr)
+#define LS_S_SCRATCHp(S)      ((sunrealtype*) LS_CONTENT(S)->s_scratchpad->ptr)
 
 // Memory type, helper, and SYCL queue
 #define LS_MEM_TYPE(S)    (LS_CONTENT(S)->mem_type)
@@ -182,13 +182,13 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
   {
 #ifdef SUNDIALS_ONEMKL_USE_GETRF_LOOP
     LS_F_SCRATCH_SIZE(S) =
-      getrf_scratchpad_size<realtype>(*queue, // device queue
+      getrf_scratchpad_size<sunrealtype>(*queue, // device queue
                                       M,      // rows in A_i
                                       N,      // columns in A_i
                                       M);     // leading dimension
 #else
     LS_F_SCRATCH_SIZE(S) =
-      getrf_batch_scratchpad_size<realtype>(*queue,      // device queue
+      getrf_batch_scratchpad_size<sunrealtype>(*queue,      // device queue
                                             M,           // rows in A_i
                                             N,           // columns in A_i
                                             M,           // leading dimension
@@ -199,7 +199,7 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
 
 #ifdef SUNDIALS_ONEMKL_USE_GETRS_LOOP
     LS_S_SCRATCH_SIZE(S) =
-      getrs_scratchpad_size<realtype>(*queue,  // device queue
+      getrs_scratchpad_size<sunrealtype>(*queue,  // device queue
                                       oneapi::mkl::transpose::nontrans,
                                       M,      // number of rows in A
                                       1,      // number of right-hand sizes
@@ -207,7 +207,7 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
                                       M);     // leading dimension of B
 #else
     LS_S_SCRATCH_SIZE(S)=
-      getrs_batch_scratchpad_size<realtype>(*queue,      // device queue
+      getrs_batch_scratchpad_size<sunrealtype>(*queue,      // device queue
                                             oneapi::mkl::transpose::nontrans,
                                             M,           // number of rows in A_i
                                             1,           // number of right-hand sides
@@ -222,13 +222,13 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
   else
   {
     LS_F_SCRATCH_SIZE(S) =
-      getrf_scratchpad_size<realtype>(*queue, // device queue
+      getrf_scratchpad_size<sunrealtype>(*queue, // device queue
                                       M,      // rows in A_i
                                       N,      // columns in A_i
                                       M);     // leading dimension
 
     LS_S_SCRATCH_SIZE(S) =
-      getrs_scratchpad_size<realtype>(*queue,  // device queue
+      getrs_scratchpad_size<sunrealtype>(*queue,  // device queue
                                       oneapi::mkl::transpose::nontrans,
                                       M,      // number of rows in A
                                       1,      // number of right-hand sizes
@@ -238,7 +238,7 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
 
   // Allocate factorization scratchpad if necessary
   retval = SUNMemoryHelper_Alloc(LS_MEM_HELPER(S), &(LS_F_SCRATCH(S)),
-                                 LS_F_SCRATCH_SIZE(S) * sizeof(realtype),
+                                 LS_F_SCRATCH_SIZE(S) * sizeof(sunrealtype),
                                  LS_MEM_TYPE(S), queue);
   if (retval)
   {
@@ -249,7 +249,7 @@ SUNLinearSolver SUNLinSol_OneMklDense(N_Vector y, SUNMatrix Amat, SUNContext sun
 
   // Allocate solve scratchpad if necessary
   retval = SUNMemoryHelper_Alloc(LS_MEM_HELPER(S), &(LS_S_SCRATCH(S)),
-                                 LS_S_SCRATCH_SIZE(S) * sizeof(realtype),
+                                 LS_S_SCRATCH_SIZE(S) * sizeof(sunrealtype),
                                  LS_MEM_TYPE(S), queue);
   if (retval)
   {
@@ -306,7 +306,7 @@ int SUNLinSolSetup_OneMklDense(SUNLinearSolver S, SUNMatrix A)
   }
 
   // Access A matrix data array
-  realtype* Adata = SUNMatrix_OneMklDense_Data(A);
+  sunrealtype* Adata = SUNMatrix_OneMklDense_Data(A);
   if (!Adata)
   {
     SUNDIALS_DEBUG_ERROR("Matrix data array is NULL\n");
@@ -330,7 +330,7 @@ int SUNLinSolSetup_OneMklDense(SUNLinearSolver S, SUNMatrix A)
   sunindextype N            = SUNMatrix_OneMklDense_BlockColumns(A);
   sunindextype num_blocks   = SUNMatrix_OneMklDense_NumBlocks(A);
   sunindextype scratch_size = LS_F_SCRATCH_SIZE(S);
-  realtype*    scratchpad   = LS_F_SCRATCHp(S);
+  sunrealtype*    scratchpad   = LS_F_SCRATCHp(S);
 
   if (num_blocks > 1)
   {
@@ -441,7 +441,7 @@ int SUNLinSolSetup_OneMklDense(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_OneMklDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                               N_Vector b, realtype tol)
+                               N_Vector b, sunrealtype tol)
 {
   // Check for valid inputs
   if (!S)
@@ -466,10 +466,10 @@ int SUNLinSolSolve_OneMklDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   }
 
   // Copy b into x
-  N_VScale(RCONST(1.0), b, x);
+  N_VScale(SUN_RCONST(1.0), b, x);
 
   // Access x vector data array
-  realtype* xdata = N_VGetDeviceArrayPointer(x);
+  sunrealtype* xdata = N_VGetDeviceArrayPointer(x);
   if (!xdata)
   {
     SUNDIALS_DEBUG_ERROR("Vector data array is NULL\n");
@@ -478,7 +478,7 @@ int SUNLinSolSolve_OneMklDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   }
 
   // Access A matrix data array
-  realtype* Adata = SUNMatrix_OneMklDense_Data(A);
+  sunrealtype* Adata = SUNMatrix_OneMklDense_Data(A);
   if (!Adata)
   {
     SUNDIALS_DEBUG_ERROR("Matrix data array is NULL\n");
@@ -502,7 +502,7 @@ int SUNLinSolSolve_OneMklDense(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   sunindextype N            = SUNMatrix_OneMklDense_BlockColumns(A);
   sunindextype num_blocks   = SUNMatrix_OneMklDense_NumBlocks(A);
   sunindextype scratch_size = LS_S_SCRATCH_SIZE(S);
-  realtype*    scratchpad   = LS_S_SCRATCHp(S);
+  sunrealtype*    scratchpad   = LS_S_SCRATCHp(S);
 
   if (num_blocks > 1)
   {
diff --git a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
index 68489d3520..f2c3f51ee1 100644
--- a/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
+++ b/src/sunlinsol/pcg/fmod/fsunlinsol_pcg_mod.c
@@ -374,14 +374,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_PCG(SUNLinearSolver farg1, SUNMatrix farg2,
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_PCG(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -403,11 +403,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters_PCG(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm_PCG(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm_PCG(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm_PCG(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sunlinsol/pcg/sunlinsol_pcg.c b/src/sunlinsol/pcg/sunlinsol_pcg.c
index 46d0a24842..ce70fa251f 100644
--- a/src/sunlinsol/pcg/sunlinsol_pcg.c
+++ b/src/sunlinsol/pcg/sunlinsol_pcg.c
@@ -25,8 +25,8 @@
 #include "sundials_context_impl.h"
 #include "sundials_logger_impl.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -258,7 +258,7 @@ int SUNLinSolSetScalingVectors_PCG(SUNLinearSolver S, N_Vector s,
 }
 
 
-int SUNLinSolSetZeroGuess_PCG(SUNLinearSolver S, booleantype onoff)
+int SUNLinSolSetZeroGuess_PCG(SUNLinearSolver S, sunbooleantype onoff)
 {
   /* set flag indicating a zero initial guess */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -297,18 +297,18 @@ int SUNLinSolSetup_PCG(SUNLinearSolver S, SUNMatrix nul)
 
 
 int SUNLinSolSolve_PCG(SUNLinearSolver S, SUNMatrix nul, N_Vector x,
-                       N_Vector b, realtype delta)
+                       N_Vector b, sunrealtype delta)
 {
   /* local data and shortcut variables */
-  realtype alpha, beta, r0_norm, rho, rz, rz_old;
+  sunrealtype alpha, beta, r0_norm, rho, rz, rz_old;
   N_Vector r, p, z, Ap, w;
-  booleantype UsePrec, UseScaling, converged;
-  booleantype *zeroguess;
+  sunbooleantype UsePrec, UseScaling, converged;
+  sunbooleantype *zeroguess;
   int l, l_max, pretype, ier;
   void *A_data, *P_data;
   SUNATimesFn atimes;
   SUNPSolveFn psolve;
-  realtype *res_norm;
+  sunrealtype *res_norm;
   int *nli;
 
   /* Make local shorcuts to solver variables. */
@@ -332,7 +332,7 @@ int SUNLinSolSolve_PCG(SUNLinearSolver S, SUNMatrix nul, N_Vector x,
   *nli = 0;
   converged = SUNFALSE;
 
-  /* set booleantype flags for internal solver options */
+  /* set sunbooleantype flags for internal solver options */
   UsePrec = ( (pretype == SUN_PREC_BOTH) ||
               (pretype == SUN_PREC_LEFT) ||
               (pretype == SUN_PREC_RIGHT) );
@@ -515,7 +515,7 @@ int SUNLinSolNumIters_PCG(SUNLinearSolver S)
 }
 
 
-realtype SUNLinSolResNorm_PCG(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm_PCG(SUNLinearSolver S)
 {
   /* return the stored 'resnorm' value */
   if (S == NULL) return(-ONE);
diff --git a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
index e6e3e56704..404d520680 100644
--- a/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
+++ b/src/sunlinsol/spbcgs/fmod/fsunlinsol_spbcgs_mod.c
@@ -374,14 +374,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_SPBCGS(SUNLinearSolver farg1, SUNMatrix far
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_SPBCGS(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -403,11 +403,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters_SPBCGS(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm_SPBCGS(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm_SPBCGS(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm_SPBCGS(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c b/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
index efdc437f70..64b14bd6fa 100644
--- a/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
+++ b/src/sunlinsol/spbcgs/sunlinsol_spbcgs.c
@@ -26,8 +26,8 @@
 #include "sundials_context_impl.h"
 #include "sundials_logger_impl.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -280,7 +280,7 @@ int SUNLinSolSetScalingVectors_SPBCGS(SUNLinearSolver S, N_Vector s1,
 }
 
 
-int SUNLinSolSetZeroGuess_SPBCGS(SUNLinearSolver S, booleantype onoff)
+int SUNLinSolSetZeroGuess_SPBCGS(SUNLinearSolver S, sunbooleantype onoff)
 {
   /* set flag indicating a zero initial guess */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -319,23 +319,23 @@ int SUNLinSolSetup_SPBCGS(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_SPBCGS(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                          N_Vector b, realtype delta)
+                          N_Vector b, sunrealtype delta)
 {
   /* local data and shortcut variables */
-  realtype alpha, beta, omega, omega_denom, beta_num, beta_denom, r_norm, rho;
+  sunrealtype alpha, beta, omega, omega_denom, beta_num, beta_denom, r_norm, rho;
   N_Vector r_star, r, p, q, u, Ap, vtemp;
-  booleantype preOnLeft, preOnRight, scale_x, scale_b, converged;
-  booleantype *zeroguess;
+  sunbooleantype preOnLeft, preOnRight, scale_x, scale_b, converged;
+  sunbooleantype *zeroguess;
   int l, l_max, ier;
   void *A_data, *P_data;
   N_Vector sx, sb;
   SUNATimesFn atimes;
   SUNPSolveFn psolve;
-  realtype *res_norm;
+  sunrealtype *res_norm;
   int *nli;
 
   /* local variables for fused vector operations */
-  realtype cv[3];
+  sunrealtype cv[3];
   N_Vector Xv[3];
 
   /* Make local shorcuts to solver variables. */
@@ -362,7 +362,7 @@ int SUNLinSolSolve_SPBCGS(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   *nli = 0;
   converged = SUNFALSE;
 
-  /* set booleantype flags for internal solver options */
+  /* set sunbooleantype flags for internal solver options */
   preOnLeft  = ( (PRETYPE(S) == SUN_PREC_LEFT) ||
                  (PRETYPE(S) == SUN_PREC_BOTH) );
   preOnRight = ( (PRETYPE(S) == SUN_PREC_RIGHT) ||
@@ -701,7 +701,7 @@ int SUNLinSolNumIters_SPBCGS(SUNLinearSolver S)
 }
 
 
-realtype SUNLinSolResNorm_SPBCGS(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm_SPBCGS(SUNLinearSolver S)
 {
   /* return the stored 'resnorm' value */
   if (S == NULL) return(-ONE);
diff --git a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
index 69904ab23d..f56328e942 100644
--- a/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
+++ b/src/sunlinsol/spfgmr/fmod/fsunlinsol_spfgmr_mod.c
@@ -388,14 +388,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_SPFGMR(SUNLinearSolver farg1, SUNMatrix far
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_SPFGMR(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -417,11 +417,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters_SPFGMR(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm_SPFGMR(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm_SPFGMR(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm_SPFGMR(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c b/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
index ef5e759eee..634e4af80b 100644
--- a/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
+++ b/src/sunlinsol/spfgmr/sunlinsol_spfgmr.c
@@ -26,8 +26,8 @@
 #include "sundials_context_impl.h"
 #include "sundials_logger_impl.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -270,7 +270,7 @@ int SUNLinSolInitialize_SPFGMR(SUNLinearSolver S)
 
   /*   Hessenberg matrix Hes */
   if (content->Hes == NULL) {
-    content->Hes = (realtype **) malloc((content->maxl+1)*sizeof(realtype *));
+    content->Hes = (sunrealtype **) malloc((content->maxl+1)*sizeof(sunrealtype *));
     if (content->Hes == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -278,7 +278,7 @@ int SUNLinSolInitialize_SPFGMR(SUNLinearSolver S)
 
     for (k=0; k<=content->maxl; k++) {
       content->Hes[k] = NULL;
-      content->Hes[k] = (realtype *) malloc(content->maxl*sizeof(realtype));
+      content->Hes[k] = (sunrealtype *) malloc(content->maxl*sizeof(sunrealtype));
       if (content->Hes[k] == NULL) {
         content->last_flag = SUNLS_MEM_FAIL;
         return(SUNLS_MEM_FAIL);
@@ -288,7 +288,7 @@ int SUNLinSolInitialize_SPFGMR(SUNLinearSolver S)
 
   /*   Givens rotation components */
   if (content->givens == NULL) {
-    content->givens = (realtype *) malloc(2*content->maxl*sizeof(realtype));
+    content->givens = (sunrealtype *) malloc(2*content->maxl*sizeof(sunrealtype));
     if (content->givens == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -297,7 +297,7 @@ int SUNLinSolInitialize_SPFGMR(SUNLinearSolver S)
 
   /*    y and g vectors */
   if (content->yg == NULL) {
-    content->yg = (realtype *) malloc((content->maxl+1)*sizeof(realtype));
+    content->yg = (sunrealtype *) malloc((content->maxl+1)*sizeof(sunrealtype));
     if (content->yg == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -306,7 +306,7 @@ int SUNLinSolInitialize_SPFGMR(SUNLinearSolver S)
 
   /*    cv vector for fused vector ops */
   if (content->cv == NULL) {
-    content->cv = (realtype *) malloc((content->maxl+1)*sizeof(realtype));
+    content->cv = (sunrealtype *) malloc((content->maxl+1)*sizeof(sunrealtype));
     if (content->cv == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -368,7 +368,7 @@ int SUNLinSolSetScalingVectors_SPFGMR(SUNLinearSolver S, N_Vector s1,
 }
 
 
-int SUNLinSolSetZeroGuess_SPFGMR(SUNLinearSolver S, booleantype onoff)
+int SUNLinSolSetZeroGuess_SPFGMR(SUNLinearSolver S, sunbooleantype onoff)
 {
   /* set flag indicating a zero initial guess */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -406,14 +406,14 @@ int SUNLinSolSetup_SPFGMR(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_SPFGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                          N_Vector b, realtype delta)
+                          N_Vector b, sunrealtype delta)
 {
   /* local data and shortcut variables */
   N_Vector *V, *Z, xcor, vtemp, s1, s2;
-  realtype **Hes, *givens, *yg, *res_norm;
-  realtype beta, rotation_product, r_norm, s_product, rho;
-  booleantype preOnRight, scale1, scale2, converged;
-  booleantype *zeroguess;
+  sunrealtype **Hes, *givens, *yg, *res_norm;
+  sunrealtype beta, rotation_product, r_norm, s_product, rho;
+  sunbooleantype preOnRight, scale1, scale2, converged;
+  sunbooleantype *zeroguess;
   int i, j, k, l, l_max, krydim, ier, ntries, max_restarts, gstype;
   int *nli;
   void *A_data, *P_data;
@@ -421,7 +421,7 @@ int SUNLinSolSolve_SPFGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   SUNPSolveFn psolve;
 
   /* local shortcuts for fused vector operations */
-  realtype* cv;
+  sunrealtype* cv;
   N_Vector* Xv;
 
   /* Initialize some variables */
@@ -455,7 +455,7 @@ int SUNLinSolSolve_SPFGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   *nli = 0;
   converged = SUNFALSE;
 
-  /* Set booleantype flags for internal solver options */
+  /* Set sunbooleantype flags for internal solver options */
   preOnRight = ( (SPFGMR_CONTENT(S)->pretype == SUN_PREC_LEFT) ||
                  (SPFGMR_CONTENT(S)->pretype == SUN_PREC_RIGHT) ||
                  (SPFGMR_CONTENT(S)->pretype == SUN_PREC_BOTH) );
@@ -722,7 +722,7 @@ int SUNLinSolNumIters_SPFGMR(SUNLinearSolver S)
 }
 
 
-realtype SUNLinSolResNorm_SPFGMR(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm_SPFGMR(SUNLinearSolver S)
 {
   /* return the stored 'resnorm' value */
   if (S == NULL) return(-ONE);
diff --git a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
index eaa89837b1..2f9165a238 100644
--- a/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
+++ b/src/sunlinsol/spgmr/fmod/fsunlinsol_spgmr_mod.c
@@ -388,14 +388,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_SPGMR(SUNLinearSolver farg1, SUNMatrix farg
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_SPGMR(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -417,11 +417,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters_SPGMR(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm_SPGMR(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm_SPGMR(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm_SPGMR(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sunlinsol/spgmr/sunlinsol_spgmr.c b/src/sunlinsol/spgmr/sunlinsol_spgmr.c
index 4922c71740..b655749b1a 100644
--- a/src/sunlinsol/spgmr/sunlinsol_spgmr.c
+++ b/src/sunlinsol/spgmr/sunlinsol_spgmr.c
@@ -26,8 +26,8 @@
 #include "sundials_context_impl.h"
 #include "sundials_logger_impl.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -258,7 +258,7 @@ int SUNLinSolInitialize_SPGMR(SUNLinearSolver S)
 
   /*   Hessenberg matrix Hes */
   if (content->Hes == NULL) {
-    content->Hes = (realtype **) malloc((content->maxl+1)*sizeof(realtype *));
+    content->Hes = (sunrealtype **) malloc((content->maxl+1)*sizeof(sunrealtype *));
     if (content->Hes == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -266,7 +266,7 @@ int SUNLinSolInitialize_SPGMR(SUNLinearSolver S)
 
     for (k=0; k<=content->maxl; k++) {
       content->Hes[k] = NULL;
-      content->Hes[k] = (realtype *) malloc(content->maxl*sizeof(realtype));
+      content->Hes[k] = (sunrealtype *) malloc(content->maxl*sizeof(sunrealtype));
       if (content->Hes[k] == NULL) {
         content->last_flag = SUNLS_MEM_FAIL;
         return(SUNLS_MEM_FAIL);
@@ -276,7 +276,7 @@ int SUNLinSolInitialize_SPGMR(SUNLinearSolver S)
 
   /*   Givens rotation components */
   if (content->givens == NULL) {
-    content->givens = (realtype *) malloc(2*content->maxl*sizeof(realtype));
+    content->givens = (sunrealtype *) malloc(2*content->maxl*sizeof(sunrealtype));
     if (content->givens == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -285,7 +285,7 @@ int SUNLinSolInitialize_SPGMR(SUNLinearSolver S)
 
   /*    y and g vectors */
   if (content->yg == NULL) {
-    content->yg = (realtype *) malloc((content->maxl+1)*sizeof(realtype));
+    content->yg = (sunrealtype *) malloc((content->maxl+1)*sizeof(sunrealtype));
     if (content->yg == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -294,7 +294,7 @@ int SUNLinSolInitialize_SPGMR(SUNLinearSolver S)
 
   /*    cv vector for fused vector ops */
   if (content->cv == NULL) {
-    content->cv = (realtype *) malloc((content->maxl+1)*sizeof(realtype));
+    content->cv = (sunrealtype *) malloc((content->maxl+1)*sizeof(sunrealtype));
     if (content->cv == NULL) {
       content->last_flag = SUNLS_MEM_FAIL;
       return(SUNLS_MEM_FAIL);
@@ -356,7 +356,7 @@ int SUNLinSolSetScalingVectors_SPGMR(SUNLinearSolver S, N_Vector s1,
 }
 
 
-int SUNLinSolSetZeroGuess_SPGMR(SUNLinearSolver S, booleantype onff)
+int SUNLinSolSetZeroGuess_SPGMR(SUNLinearSolver S, sunbooleantype onff)
 {
   /* set flag indicating a zero initial guess */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -394,14 +394,14 @@ int SUNLinSolSetup_SPGMR(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_SPGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                         N_Vector b, realtype delta)
+                         N_Vector b, sunrealtype delta)
 {
   /* local data and shortcut variables */
   N_Vector *V, xcor, vtemp, s1, s2;
-  realtype **Hes, *givens, *yg, *res_norm;
-  realtype beta, rotation_product, r_norm, s_product, rho;
-  booleantype preOnLeft, preOnRight, scale2, scale1, converged;
-  booleantype *zeroguess;
+  sunrealtype **Hes, *givens, *yg, *res_norm;
+  sunrealtype beta, rotation_product, r_norm, s_product, rho;
+  sunbooleantype preOnLeft, preOnRight, scale2, scale1, converged;
+  sunbooleantype *zeroguess;
   int i, j, k, l, l_plus_1, l_max, krydim, ier, ntries, max_restarts, gstype;
   int *nli;
   void *A_data, *P_data;
@@ -409,7 +409,7 @@ int SUNLinSolSolve_SPGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   SUNPSolveFn psolve;
 
   /* local shortcuts for fused vector operations */
-  realtype* cv;
+  sunrealtype* cv;
   N_Vector* Xv;
 
   /* Initialize some variables */
@@ -443,7 +443,7 @@ int SUNLinSolSolve_SPGMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   *nli = 0;
   converged = SUNFALSE;
 
-  /* Set booleantype flags for internal solver options */
+  /* Set sunbooleantype flags for internal solver options */
   preOnLeft  = ( (SPGMR_CONTENT(S)->pretype == SUN_PREC_LEFT) ||
                  (SPGMR_CONTENT(S)->pretype == SUN_PREC_BOTH) );
   preOnRight = ( (SPGMR_CONTENT(S)->pretype == SUN_PREC_RIGHT) ||
@@ -775,7 +775,7 @@ int SUNLinSolNumIters_SPGMR(SUNLinearSolver S)
 }
 
 
-realtype SUNLinSolResNorm_SPGMR(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm_SPGMR(SUNLinearSolver S)
 {
   /* return the stored 'resnorm' value */
   if (S == NULL) return(-ONE);
diff --git a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
index 9a46dee3a2..6035841980 100644
--- a/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
+++ b/src/sunlinsol/sptfqmr/fmod/fsunlinsol_sptfqmr_mod.c
@@ -374,14 +374,14 @@ SWIGEXPORT int _wrap_FSUNLinSolSolve_SPTFQMR(SUNLinearSolver farg1, SUNMatrix fa
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int result;
   
   arg1 = (SUNLinearSolver)(farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   result = (int)SUNLinSolSolve_SPTFQMR(arg1,arg2,arg3,arg4,arg5);
   fresult = (int)(result);
   return fresult;
@@ -403,11 +403,11 @@ SWIGEXPORT int _wrap_FSUNLinSolNumIters_SPTFQMR(SUNLinearSolver farg1) {
 SWIGEXPORT double _wrap_FSUNLinSolResNorm_SPTFQMR(SUNLinearSolver farg1) {
   double fresult ;
   SUNLinearSolver arg1 = (SUNLinearSolver) 0 ;
-  realtype result;
+  sunrealtype result;
   
   arg1 = (SUNLinearSolver)(farg1);
-  result = (realtype)SUNLinSolResNorm_SPTFQMR(arg1);
-  fresult = (realtype)(result);
+  result = (sunrealtype)SUNLinSolResNorm_SPTFQMR(arg1);
+  fresult = (sunrealtype)(result);
   return fresult;
 }
 
diff --git a/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c b/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
index 4a5c5e6c8d..1cea06e18c 100644
--- a/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
+++ b/src/sunlinsol/sptfqmr/sunlinsol_sptfqmr.c
@@ -25,8 +25,8 @@
 #include "sundials_context_impl.h"
 #include "sundials_logger_impl.h"
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /*
  * -----------------------------------------------------------------
@@ -295,7 +295,7 @@ int SUNLinSolSetScalingVectors_SPTFQMR(SUNLinearSolver S,
 }
 
 
-int SUNLinSolSetZeroGuess_SPTFQMR(SUNLinearSolver S, booleantype onoff)
+int SUNLinSolSetZeroGuess_SPTFQMR(SUNLinearSolver S, sunbooleantype onoff)
 {
   /* set flag indicating a zero initial guess */
   if (S == NULL) return(SUNLS_MEM_NULL);
@@ -333,25 +333,25 @@ int SUNLinSolSetup_SPTFQMR(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_SPTFQMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                           N_Vector b, realtype delta)
+                           N_Vector b, sunrealtype delta)
 {
   /* local data and shortcut variables */
-  realtype alpha, tau, eta, beta, c, sigma, v_bar, omega;
-  realtype rho[2];
-  realtype r_init_norm, r_curr_norm;
-  realtype temp_val;
-  booleantype preOnLeft, preOnRight, scale_x, scale_b, converged, b_ok;
-  booleantype *zeroguess;
+  sunrealtype alpha, tau, eta, beta, c, sigma, v_bar, omega;
+  sunrealtype rho[2];
+  sunrealtype r_init_norm, r_curr_norm;
+  sunrealtype temp_val;
+  sunbooleantype preOnLeft, preOnRight, scale_x, scale_b, converged, b_ok;
+  sunbooleantype *zeroguess;
   int n, m, ier, l_max;
   void *A_data, *P_data;
   SUNATimesFn atimes;
   SUNPSolveFn psolve;
-  realtype *res_norm;
+  sunrealtype *res_norm;
   int *nli;
   N_Vector sx, sb, r_star, q, d, v, p, *r, u, vtemp1, vtemp2, vtemp3;
 
   /* local variables for fused vector operations */
-  realtype cv[3];
+  sunrealtype cv[3];
   N_Vector Xv[3];
 
   /* Make local shorcuts to solver variables. */
@@ -383,7 +383,7 @@ int SUNLinSolSolve_SPTFQMR(SUNLinearSolver S, SUNMatrix A, N_Vector x,
   converged = SUNFALSE;
   b_ok = SUNFALSE;
 
-  /* set booleantype flags for internal solver options */
+  /* set sunbooleantype flags for internal solver options */
   preOnLeft  = ( (SPTFQMR_CONTENT(S)->pretype == SUN_PREC_LEFT) ||
                  (SPTFQMR_CONTENT(S)->pretype == SUN_PREC_BOTH) );
   preOnRight = ( (SPTFQMR_CONTENT(S)->pretype == SUN_PREC_RIGHT) ||
@@ -817,7 +817,7 @@ int SUNLinSolNumIters_SPTFQMR(SUNLinearSolver S)
 }
 
 
-realtype SUNLinSolResNorm_SPTFQMR(SUNLinearSolver S)
+sunrealtype SUNLinSolResNorm_SPTFQMR(SUNLinearSolver S)
 {
   /* return the stored 'resnorm' value */
   if (S == NULL) return(-ONE);
diff --git a/src/sunlinsol/superludist/sunlinsol_superludist.c b/src/sunlinsol/superludist/sunlinsol_superludist.c
index 4540f413a5..dc813b23bc 100644
--- a/src/sunlinsol/superludist/sunlinsol_superludist.c
+++ b/src/sunlinsol/superludist/sunlinsol_superludist.c
@@ -23,9 +23,9 @@
 #include <sundials/sundials_math.h>
 #include <superlu_ddefs.h>
 
-#define ZERO      RCONST(0.0)
-#define ONE       RCONST(1.0)
-#define TWO       RCONST(2.0)
+#define ZERO      SUN_RCONST(0.0)
+#define ONE       SUN_RCONST(1.0)
+#define TWO       SUN_RCONST(2.0)
 
 /*
  * -----------------------------------------------------------------
@@ -118,7 +118,7 @@ SUNLinearSolver SUNLinSol_SuperLUDIST(N_Vector y, SUNMatrix A, gridinfo_t *grid,
  * -----------------------------------------------------------------
  */
 
-realtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS)
+sunrealtype SUNLinSol_SuperLUDIST_GetBerr(SUNLinearSolver LS)
 {
   return(SLU_BERR(LS));
 }
@@ -199,10 +199,10 @@ int SUNLinSolSetup_SuperLUDIST(SUNLinearSolver S, SUNMatrix A)
 }
 
 int SUNLinSolSolve_SuperLUDIST(SUNLinearSolver S, SUNMatrix A,
-                               N_Vector x, N_Vector b, realtype tol)
+                               N_Vector x, N_Vector b, sunrealtype tol)
 {
   int retval;
-  realtype *xdata;
+  sunrealtype *xdata;
   SuperMatrix *Asuper;
   NRformat_loc *Astore;
 
diff --git a/src/sunlinsol/superlumt/sunlinsol_superlumt.c b/src/sunlinsol/superlumt/sunlinsol_superlumt.c
index c63a46a171..a0313c5569 100644
--- a/src/sunlinsol/superlumt/sunlinsol_superlumt.c
+++ b/src/sunlinsol/superlumt/sunlinsol_superlumt.c
@@ -24,9 +24,9 @@
 #include <sunlinsol/sunlinsol_superlumt.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO      RCONST(0.0)
-#define ONE       RCONST(1.0)
-#define TWO       RCONST(2.0)
+#define ZERO      SUN_RCONST(0.0)
+#define ONE       SUN_RCONST(1.0)
+#define TWO       SUN_RCONST(2.0)
 
 /*
  * -----------------------------------------------------------------
@@ -281,10 +281,10 @@ int SUNLinSolSetup_SuperLUMT(SUNLinearSolver S, SUNMatrix A)
 
 
 int SUNLinSolSolve_SuperLUMT(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                             N_Vector b, realtype tol)
+                             N_Vector b, sunrealtype tol)
 {
   int_t retval;
-  realtype *xdata;
+  sunrealtype *xdata;
   DNformat *Bstore;
   trans_t trans;
 
diff --git a/src/sunmatrix/band/fmod/fsunmatrix_band_mod.c b/src/sunmatrix/band/fmod/fsunmatrix_band_mod.c
index edae3c0c1e..b22e62ca89 100644
--- a/src/sunmatrix/band/fmod/fsunmatrix_band_mod.c
+++ b/src/sunmatrix/band/fmod/fsunmatrix_band_mod.c
@@ -343,10 +343,10 @@ SWIGEXPORT int64_t _wrap_FSUNBandMatrix_LData(SUNMatrix farg1) {
 SWIGEXPORT void * _wrap_FSUNBandMatrix_Cols(SUNMatrix farg1) {
   void * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype **result = 0 ;
+  sunrealtype **result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype **)SUNBandMatrix_Cols(arg1);
+  result = (sunrealtype **)SUNBandMatrix_Cols(arg1);
   fresult = result;
   return fresult;
 }
@@ -412,12 +412,12 @@ SWIGEXPORT int _wrap_FSUNMatCopy_Band(SUNMatrix farg1, SUNMatrix farg2) {
 
 SWIGEXPORT int _wrap_FSUNMatScaleAdd_Band(double const *farg1, SUNMatrix farg2, SUNMatrix farg3) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   SUNMatrix arg3 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (SUNMatrix)(farg3);
   result = (int)SUNMatScaleAdd_Band(arg1,arg2,arg3);
@@ -428,11 +428,11 @@ SWIGEXPORT int _wrap_FSUNMatScaleAdd_Band(double const *farg1, SUNMatrix farg2,
 
 SWIGEXPORT int _wrap_FSUNMatScaleAddI_Band(double const *farg1, SUNMatrix farg2) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   result = (int)SUNMatScaleAddI_Band(arg1,arg2);
   fresult = (int)(result);
@@ -476,10 +476,10 @@ SWIGEXPORT int _wrap_FSUNMatSpace_Band(SUNMatrix farg1, long *farg2, long *farg3
 SWIGEXPORT double * _wrap_FSUNBandMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNBandMatrix_Data(arg1);
+  result = (sunrealtype *)SUNBandMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
@@ -488,11 +488,11 @@ SWIGEXPORT double * _wrap_FSUNBandMatrix_Column(SUNMatrix farg1, int64_t const *
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)SUNBandMatrix_Column(arg1,arg2);
+  result = (sunrealtype *)SUNBandMatrix_Column(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/src/sunmatrix/band/sunmatrix_band.c b/src/sunmatrix/band/sunmatrix_band.c
index 0b5dd613f0..7048d49e8d 100644
--- a/src/sunmatrix/band/sunmatrix_band.c
+++ b/src/sunmatrix/band/sunmatrix_band.c
@@ -26,14 +26,14 @@
 #include <sunmatrix/sunmatrix_band.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 
 /* Private function prototypes */
-static booleantype SMCompatible_Band(SUNMatrix A, SUNMatrix B);
-static booleantype SMCompatible2_Band(SUNMatrix A, N_Vector x, N_Vector y);
-static int SMScaleAddNew_Band(realtype c, SUNMatrix A, SUNMatrix B);
+static sunbooleantype SMCompatible_Band(SUNMatrix A, SUNMatrix B);
+static sunbooleantype SMCompatible2_Band(SUNMatrix A, N_Vector x, N_Vector y);
+static int SMScaleAddNew_Band(sunrealtype c, SUNMatrix A, SUNMatrix B);
 
 
 /*
@@ -104,10 +104,10 @@ SUNMatrix SUNBandMatrixStorage(sunindextype N, sunindextype mu,
   content->cols  = NULL;
 
   /* Allocate content */
-  content->data = (realtype *) calloc(N * colSize, sizeof(realtype));
+  content->data = (sunrealtype *) calloc(N * colSize, sizeof(sunrealtype));
   if (content->data == NULL) { SUNMatDestroy(A); return(NULL); }
 
-  content->cols = (realtype **) malloc(N * sizeof(realtype *));
+  content->cols = (sunrealtype **) malloc(N * sizeof(sunrealtype *));
   if (content->cols == NULL) { SUNMatDestroy(A); return(NULL); }
   for (j=0; j<N; j++) content->cols[j] = content->data + j * colSize;
 
@@ -209,7 +209,7 @@ sunindextype SUNBandMatrix_LData(SUNMatrix A)
     return SUNMAT_ILL_INPUT;
 }
 
-realtype* SUNBandMatrix_Data(SUNMatrix A)
+sunrealtype* SUNBandMatrix_Data(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_BAND)
     return SM_DATA_B(A);
@@ -217,7 +217,7 @@ realtype* SUNBandMatrix_Data(SUNMatrix A)
     return NULL;
 }
 
-realtype** SUNBandMatrix_Cols(SUNMatrix A)
+sunrealtype** SUNBandMatrix_Cols(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_BAND)
     return SM_COLS_B(A);
@@ -225,7 +225,7 @@ realtype** SUNBandMatrix_Cols(SUNMatrix A)
     return NULL;
 }
 
-realtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j)
+sunrealtype* SUNBandMatrix_Column(SUNMatrix A, sunindextype j)
 {
   if (SUNMatGetID(A) == SUNMATRIX_BAND)
     return SM_COLUMN_B(A,j);
@@ -282,7 +282,7 @@ void SUNMatDestroy_Band(SUNMatrix A)
 int SUNMatZero_Band(SUNMatrix A)
 {
   sunindextype i;
-  realtype *Adata;
+  sunrealtype *Adata;
 
   /* Verify that A is a band matrix */
   if (SUNMatGetID(A) != SUNMATRIX_BAND)
@@ -298,7 +298,7 @@ int SUNMatZero_Band(SUNMatrix A)
 int SUNMatCopy_Band(SUNMatrix A, SUNMatrix B)
 {
   sunindextype i, j, colSize, ml, mu, smu;
-  realtype *A_colj, *B_colj;
+  sunrealtype *A_colj, *B_colj;
 
   /* Verify that A and B have compatible dimensions */
   if (!SMCompatible_Band(A, B))
@@ -316,8 +316,8 @@ int SUNMatCopy_Band(SUNMatrix A, SUNMatrix B)
     SM_CONTENT_B(B)->s_mu = smu;
     SM_CONTENT_B(B)->ldim = colSize;
     SM_CONTENT_B(B)->ldata = SM_COLUMNS_B(B) * colSize;
-    SM_CONTENT_B(B)->data = (realtype *)
-      realloc(SM_CONTENT_B(B)->data, SM_COLUMNS_B(B) * colSize*sizeof(realtype));
+    SM_CONTENT_B(B)->data = (sunrealtype *)
+      realloc(SM_CONTENT_B(B)->data, SM_COLUMNS_B(B) * colSize*sizeof(sunrealtype));
     for (j=0; j<SM_COLUMNS_B(B); j++)
       SM_CONTENT_B(B)->cols[j] = SM_CONTENT_B(B)->data + j * colSize;
   }
@@ -334,10 +334,10 @@ int SUNMatCopy_Band(SUNMatrix A, SUNMatrix B)
   return SUNMAT_SUCCESS;
 }
 
-int SUNMatScaleAddI_Band(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_Band(sunrealtype c, SUNMatrix A)
 {
   sunindextype i, j;
-  realtype *A_colj;
+  sunrealtype *A_colj;
 
   /* Verify that A is a band matrix */
   if (SUNMatGetID(A) != SUNMATRIX_BAND)
@@ -353,10 +353,10 @@ int SUNMatScaleAddI_Band(realtype c, SUNMatrix A)
   return SUNMAT_SUCCESS;
 }
 
-int SUNMatScaleAdd_Band(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_Band(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   sunindextype i, j;
-  realtype *A_colj, *B_colj;
+  sunrealtype *A_colj, *B_colj;
 
   /* Verify that A and B are compatible */
   if (!SMCompatible_Band(A, B))
@@ -381,7 +381,7 @@ int SUNMatScaleAdd_Band(realtype c, SUNMatrix A, SUNMatrix B)
 int SUNMatMatvec_Band(SUNMatrix A, N_Vector x, N_Vector y)
 {
   sunindextype i, j, is, ie;
-  realtype *col_j, *xd, *yd;
+  sunrealtype *col_j, *xd, *yd;
 
   /* Verify that A, x and y are compatible */
   if (!SMCompatible2_Band(A, x, y))
@@ -420,7 +420,7 @@ int SUNMatSpace_Band(SUNMatrix A, long int *lenrw, long int *leniw)
  * -----------------------------------------------------------------
  */
 
-static booleantype SMCompatible_Band(SUNMatrix A, SUNMatrix B)
+static sunbooleantype SMCompatible_Band(SUNMatrix A, SUNMatrix B)
 {
   /* both matrices must be SUNMATRIX_BAND */
   if (SUNMatGetID(A) != SUNMATRIX_BAND)
@@ -439,7 +439,7 @@ static booleantype SMCompatible_Band(SUNMatrix A, SUNMatrix B)
 }
 
 
-static booleantype SMCompatible2_Band(SUNMatrix A, N_Vector x, N_Vector y)
+static sunbooleantype SMCompatible2_Band(SUNMatrix A, N_Vector x, N_Vector y)
 {
   /*   matrix must be SUNMATRIX_BAND */
   if (SUNMatGetID(A) != SUNMATRIX_BAND)
@@ -458,10 +458,10 @@ static booleantype SMCompatible2_Band(SUNMatrix A, N_Vector x, N_Vector y)
 }
 
 
-int SMScaleAddNew_Band(realtype c, SUNMatrix A, SUNMatrix B)
+int SMScaleAddNew_Band(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   sunindextype i, j, ml, mu, smu;
-  realtype *A_colj, *B_colj, *C_colj;
+  sunrealtype *A_colj, *B_colj, *C_colj;
   SUNMatrix C;
 
   /* create new matrix large enough to hold both A and B */
diff --git a/src/sunmatrix/cusparse/sunmatrix_cusparse.cu b/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
index 70fbc47da9..bcdde8b59d 100644
--- a/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
+++ b/src/sunmatrix/cusparse/sunmatrix_cusparse.cu
@@ -34,11 +34,11 @@ using namespace sundials::cuda;
 using namespace sundials::sunmatrix_cusparse;
 
 /* Constants */
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Private function prototypes */
-static booleantype SMCompatible_cuSparse(SUNMatrix, SUNMatrix);
+static sunbooleantype SMCompatible_cuSparse(SUNMatrix, SUNMatrix);
 static SUNMatrix SUNMatrix_cuSparse_NewEmpty(SUNContext sunctx);
 #if CUDART_VERSION >= 11000
 static cusparseStatus_t CreateSpMatDescr(SUNMatrix, cusparseSpMatDescr_t*);
@@ -72,7 +72,7 @@ static cusparseStatus_t CreateSpMatDescr(SUNMatrix, cusparseSpMatDescr_t*);
 #define SMCU_SPARSETYPE(A)  ( SMCU_CONTENT(A)->sparse_type )
 #define SMCU_OWNMATD(A)     ( SMCU_CONTENT(A)->own_matd )
 #define SMCU_DATA(A)        ( SMCU_CONTENT(A)->data )
-#define SMCU_DATAp(A)       ( (realtype*)SMCU_CONTENT(A)->data->ptr )
+#define SMCU_DATAp(A)       ( (sunrealtype*)SMCU_CONTENT(A)->data->ptr )
 #define SMCU_INDEXVALS(A)   ( SMCU_CONTENT(A)->colind )
 #define SMCU_INDEXPTRS(A)   ( SMCU_CONTENT(A)->rowptrs )
 #define SMCU_INDEXVALSp(A)  ( (int*) SMCU_CONTENT(A)->colind->ptr )
@@ -171,7 +171,7 @@ SUNMatrix SUNMatrix_cuSparse_NewCSR(int M, int N, int NNZ, cusparseHandle_t cusp
                                       sizeof(int)*(M+1), SUNMEMTYPE_DEVICE,
                                       nullptr);
   alloc_fail += SUNMemoryHelper_Alloc(SMCU_MEMHELP(A), &d_values,
-                                      sizeof(realtype)*NNZ, SUNMEMTYPE_DEVICE,
+                                      sizeof(sunrealtype)*NNZ, SUNMEMTYPE_DEVICE,
                                       nullptr);
   if (alloc_fail)
   {
@@ -266,7 +266,7 @@ SUNMatrix SUNMatrix_cuSparse_NewCSR(int M, int N, int NNZ, cusparseHandle_t cusp
 
 
 SUNMatrix SUNMatrix_cuSparse_MakeCSR(cusparseMatDescr_t mat_descr, int M, int N, int NNZ,
-                                     int *rowptrs , int *colind , realtype *data,
+                                     int *rowptrs , int *colind , sunrealtype *data,
                                      cusparseHandle_t cusp, SUNContext sunctx)
 {
   /* return with NULL matrix on illegal input */
@@ -404,7 +404,7 @@ SUNMatrix SUNMatrix_cuSparse_NewBlockCSR(int nblocks, int blockrows, int blockco
                                       sizeof(int)*(blockrows + 1),
                                       SUNMEMTYPE_DEVICE, nullptr);
   alloc_fail += SUNMemoryHelper_Alloc(SMCU_MEMHELP(A), &d_values,
-                                      sizeof(realtype)*blocknnz*nblocks,
+                                      sizeof(sunrealtype)*blocknnz*nblocks,
                                       SUNMEMTYPE_DEVICE, nullptr);
   if (alloc_fail)
   {
@@ -549,7 +549,7 @@ int* SUNMatrix_cuSparse_IndexValues(SUNMatrix A)
     return(NULL);
 }
 
-realtype* SUNMatrix_cuSparse_Data(SUNMatrix A)
+sunrealtype* SUNMatrix_cuSparse_Data(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_CUSPARSE)
     return(SMCU_DATAp(A));
@@ -589,9 +589,9 @@ int SUNMatrix_cuSparse_BlockNNZ(SUNMatrix A)
     return(SUNMAT_ILL_INPUT);
 }
 
-realtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx)
+sunrealtype* SUNMatrix_cuSparse_BlockData(SUNMatrix A, int blockidx)
 {
-  realtype *matdata;
+  sunrealtype *matdata;
   int offset;
 
   if (SUNMatGetID(A) != SUNMATRIX_CUSPARSE)
@@ -614,7 +614,7 @@ cusparseMatDescr_t SUNMatrix_cuSparse_MatDescr(SUNMatrix A)
     return(NULL);
 }
 
-int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, booleantype yesno)
+int SUNMatrix_cuSparse_SetFixedPattern(SUNMatrix A, sunbooleantype yesno)
 {
   if (SUNMatGetID(A) != SUNMATRIX_CUSPARSE)
     return(SUNMAT_ILL_INPUT);
@@ -641,7 +641,7 @@ int SUNMatrix_cuSparse_SetKernelExecPolicy(SUNMatrix A, SUNCudaExecPolicy* exec_
 }
 
 
-int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix dA, realtype* h_data,
+int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix dA, sunrealtype* h_data,
                                     int* h_idxptrs, int* h_idxvals)
 {
   int retval;
@@ -660,7 +660,7 @@ int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix dA, realtype* h_data,
     retval  = SUNMemoryHelper_CopyAsync(SMCU_MEMHELP(dA),
                                         SMCU_DATA(dA),
                                         _h_data,
-                                        SMCU_NNZ(dA)*sizeof(realtype),
+                                        SMCU_NNZ(dA)*sizeof(sunrealtype),
                                         (void*) stream);
     SUNMemoryHelper_Dealloc(SMCU_MEMHELP(dA), _h_data, nullptr);
     if (retval != 0) return(SUNMAT_OPERATION_FAIL);
@@ -709,7 +709,7 @@ int SUNMatrix_cuSparse_CopyToDevice(SUNMatrix dA, realtype* h_data,
 }
 
 
-int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix dA, realtype* h_data,
+int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix dA, sunrealtype* h_data,
                                       int* h_idxptrs, int* h_idxvals)
 {
   int retval;
@@ -728,7 +728,7 @@ int SUNMatrix_cuSparse_CopyFromDevice(SUNMatrix dA, realtype* h_data,
     retval  = SUNMemoryHelper_CopyAsync(SMCU_MEMHELP(dA),
                                         _h_data,
                                         SMCU_DATA(dA),
-                                        SMCU_NNZ(dA)*sizeof(realtype),
+                                        SMCU_NNZ(dA)*sizeof(sunrealtype),
                                         (void*) stream);
     SUNMemoryHelper_Dealloc(SMCU_MEMHELP(dA), _h_data, nullptr);
     if (retval != 0) return(SUNMAT_OPERATION_FAIL);
@@ -877,7 +877,7 @@ int SUNMatZero_cuSparse(SUNMatrix A)
   stream = *SMCU_EXECPOLICY(A)->stream();
 
   /* set all data to zero */
-  cuerr = cudaMemsetAsync(SMCU_DATAp(A), 0, SMCU_NNZ(A)*sizeof(realtype), stream);
+  cuerr = cudaMemsetAsync(SMCU_DATAp(A), 0, SMCU_NNZ(A)*sizeof(sunrealtype), stream);
   if (!SUNDIALS_CUDA_VERIFY(cuerr)) return(SUNMAT_OPERATION_FAIL);
 
   /* set all rowptrs to zero unless the sparsity pattern is fixed */
@@ -930,7 +930,7 @@ int SUNMatCopy_cuSparse(SUNMatrix src, SUNMatrix dst)
   retval = SUNMemoryHelper_CopyAsync(SMCU_MEMHELP(src),
                                      SMCU_DATA(dst),
                                      SMCU_DATA(src),
-                                     SMCU_NNZ(src)*sizeof(realtype),
+                                     SMCU_NNZ(src)*sizeof(sunrealtype),
                                      (void*) stream);
   if (retval) return(SUNMAT_OPERATION_FAIL);
 
@@ -955,7 +955,7 @@ int SUNMatCopy_cuSparse(SUNMatrix src, SUNMatrix dst)
 
 
 /* Performs A = cA + I. Requires the diagonal to be allocated already. */
-int SUNMatScaleAddI_cuSparse(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_cuSparse(sunrealtype c, SUNMatrix A)
 {
   unsigned threadsPerBlock, gridSize;
   cudaStream_t stream = *SMCU_EXECPOLICY(A)->stream();
@@ -968,7 +968,7 @@ int SUNMatScaleAddI_cuSparse(realtype c, SUNMatrix A)
         that results in enough threads to have one per 2 columns. */
       threadsPerBlock = SMCU_EXECPOLICY(A)->blockSize(SMCU_COLUMNS(A)/2);
       gridSize = SMCU_EXECPOLICY(A)->gridSize(SMCU_ROWS(A)*SMCU_COLUMNS(A)/2, threadsPerBlock);
-      scaleAddIKernelCSR<realtype, int>
+      scaleAddIKernelCSR<sunrealtype, int>
         <<<gridSize, threadsPerBlock, 0, stream>>>(SMCU_ROWS(A),
                                                    c,
                                                    SMCU_DATAp(A),
@@ -981,7 +981,7 @@ int SUNMatScaleAddI_cuSparse(realtype c, SUNMatrix A)
          that results in enough threads to have one per row of the block. */
       threadsPerBlock = SMCU_EXECPOLICY(A)->blockSize(SMCU_BLOCKROWS(A));
       gridSize = SMCU_EXECPOLICY(A)->gridSize(SMCU_NBLOCKS(A)*SMCU_BLOCKROWS(A), threadsPerBlock);
-      scaleAddIKernelBCSR<realtype, int>
+      scaleAddIKernelBCSR<sunrealtype, int>
         <<<gridSize, threadsPerBlock, 0, stream>>>(SMCU_BLOCKROWS(A),
                                                    SMCU_NBLOCKS(A),
                                                    SMCU_BLOCKNNZ(A),
@@ -1005,7 +1005,7 @@ int SUNMatScaleAddI_cuSparse(realtype c, SUNMatrix A)
 
 
 /* Performs A = cA + B */
-int SUNMatScaleAdd_cuSparse(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_cuSparse(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   cudaStream_t stream;
   unsigned threadsPerBlock, gridSize;
@@ -1026,7 +1026,7 @@ int SUNMatScaleAdd_cuSparse(realtype c, SUNMatrix A, SUNMatrix B)
         that results in enough threads to have one per 2 columns. */
       threadsPerBlock = SMCU_EXECPOLICY(A)->blockSize(SMCU_COLUMNS(A)/2);
       gridSize = SMCU_EXECPOLICY(A)->gridSize(SMCU_ROWS(A)*SMCU_COLUMNS(A)/2, threadsPerBlock);
-      scaleAddKernelCSR<realtype, int>
+      scaleAddKernelCSR<sunrealtype, int>
         <<<gridSize, threadsPerBlock, 0, stream>>>(SMCU_NNZ(A),
                                                    c,
                                                    SMCU_DATAp(A),
@@ -1038,7 +1038,7 @@ int SUNMatScaleAdd_cuSparse(realtype c, SUNMatrix A, SUNMatrix B)
          that results in enough threads to have one per row of the block. */
       threadsPerBlock = SMCU_EXECPOLICY(A)->blockSize(SMCU_BLOCKROWS(A));
       gridSize = SMCU_EXECPOLICY(A)->gridSize(SMCU_NBLOCKS(A)*SMCU_BLOCKROWS(A), threadsPerBlock);
-      scaleAddKernelCSR<realtype, int>
+      scaleAddKernelCSR<sunrealtype, int>
         <<<gridSize, threadsPerBlock, 0, stream>>>(SMCU_NNZ(A),
                                                    c,
                                                    SMCU_DATAp(A),
@@ -1061,8 +1061,8 @@ int SUNMatScaleAdd_cuSparse(realtype c, SUNMatrix A, SUNMatrix B)
 int SUNMatMatvecSetup_cuSparse(SUNMatrix A)
 {
 #if CUDART_VERSION >= 11000
-  realtype placeholder[1];
-  const realtype one = ONE;
+  sunrealtype placeholder[1];
+  const sunrealtype one = ONE;
 
   /* Check if setup has already been done */
   if (!(SMCU_CONTENT(A)->matvec_issetup))
@@ -1103,12 +1103,12 @@ int SUNMatMatvec_cuSparse(SUNMatrix A, N_Vector x, N_Vector y)
     return(SUNMAT_ILL_INPUT);
   }
 
-  realtype *d_xdata = N_VGetDeviceArrayPointer(x);
-  realtype *d_ydata = N_VGetDeviceArrayPointer(y);
+  sunrealtype *d_xdata = N_VGetDeviceArrayPointer(x);
+  sunrealtype *d_ydata = N_VGetDeviceArrayPointer(y);
 
   if (SMCU_SPARSETYPE(A) == SUNMAT_CUSPARSE_CSR)
   {
-    const realtype one = ONE;
+    const sunrealtype one = ONE;
 
     /* Zero result vector */
     N_VConst(ZERO, y);
@@ -1154,7 +1154,7 @@ int SUNMatMatvec_cuSparse(SUNMatrix A, N_Vector x, N_Vector y)
        that results in enough threads to have one per row of the block. */
     threadsPerBlock = SMCU_EXECPOLICY(A)->blockSize(SMCU_COLUMNS(A)/2);
     gridSize = SMCU_EXECPOLICY(A)->gridSize(SMCU_ROWS(A)*SMCU_COLUMNS(A)/2, threadsPerBlock);
-    matvecBCSR<realtype, int>
+    matvecBCSR<sunrealtype, int>
       <<<gridSize, threadsPerBlock, 0, stream>>>(SMCU_BLOCKROWS(A),
                                                  SMCU_NBLOCKS(A),
                                                  SMCU_BLOCKNNZ(A),
@@ -1189,7 +1189,7 @@ int SUNMatMatvec_cuSparse(SUNMatrix A, N_Vector x, N_Vector y)
 /* -----------------------------------------------------------------
  * Function to check compatibility of two sparse SUNMatrix objects
  */
-static booleantype SMCompatible_cuSparse(SUNMatrix A, SUNMatrix B)
+static sunbooleantype SMCompatible_cuSparse(SUNMatrix A, SUNMatrix B)
 {
   /* both matrices must be sparse */
   if ( (SUNMatGetID(A) != SUNMATRIX_CUSPARSE) ||
diff --git a/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.c b/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.c
index 215c9eb8a0..2575f53579 100644
--- a/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.c
+++ b/src/sunmatrix/dense/fmod/fsunmatrix_dense_mod.c
@@ -273,10 +273,10 @@ SWIGEXPORT int64_t _wrap_FSUNDenseMatrix_LData(SUNMatrix farg1) {
 SWIGEXPORT void * _wrap_FSUNDenseMatrix_Cols(SUNMatrix farg1) {
   void * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype **result = 0 ;
+  sunrealtype **result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype **)SUNDenseMatrix_Cols(arg1);
+  result = (sunrealtype **)SUNDenseMatrix_Cols(arg1);
   fresult = result;
   return fresult;
 }
@@ -342,12 +342,12 @@ SWIGEXPORT int _wrap_FSUNMatCopy_Dense(SUNMatrix farg1, SUNMatrix farg2) {
 
 SWIGEXPORT int _wrap_FSUNMatScaleAdd_Dense(double const *farg1, SUNMatrix farg2, SUNMatrix farg3) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   SUNMatrix arg3 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (SUNMatrix)(farg3);
   result = (int)SUNMatScaleAdd_Dense(arg1,arg2,arg3);
@@ -358,11 +358,11 @@ SWIGEXPORT int _wrap_FSUNMatScaleAdd_Dense(double const *farg1, SUNMatrix farg2,
 
 SWIGEXPORT int _wrap_FSUNMatScaleAddI_Dense(double const *farg1, SUNMatrix farg2) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   result = (int)SUNMatScaleAddI_Dense(arg1,arg2);
   fresult = (int)(result);
@@ -406,10 +406,10 @@ SWIGEXPORT int _wrap_FSUNMatSpace_Dense(SUNMatrix farg1, long *farg2, long *farg
 SWIGEXPORT double * _wrap_FSUNDenseMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNDenseMatrix_Data(arg1);
+  result = (sunrealtype *)SUNDenseMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
@@ -418,11 +418,11 @@ SWIGEXPORT double * _wrap_FSUNDenseMatrix_Column(SUNMatrix farg1, int64_t const
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)SUNDenseMatrix_Column(arg1,arg2);
+  result = (sunrealtype *)SUNDenseMatrix_Column(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/src/sunmatrix/dense/sunmatrix_dense.c b/src/sunmatrix/dense/sunmatrix_dense.c
index 43fa9507ef..55f5788a07 100644
--- a/src/sunmatrix/dense/sunmatrix_dense.c
+++ b/src/sunmatrix/dense/sunmatrix_dense.c
@@ -23,12 +23,12 @@
 #include <sundials/sundials_math.h>
 #include <sunmatrix/sunmatrix_dense.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Private function prototypes */
-static booleantype compatibleMatrices(SUNMatrix A, SUNMatrix B);
-static booleantype compatibleMatrixAndVectors(SUNMatrix A, N_Vector x, N_Vector y);
+static sunbooleantype compatibleMatrices(SUNMatrix A, SUNMatrix B);
+static sunbooleantype compatibleMatrixAndVectors(SUNMatrix A, N_Vector x, N_Vector y);
 
 /*
  * -----------------------------------------------------------------
@@ -86,13 +86,13 @@ SUNMatrix SUNDenseMatrix(sunindextype M, sunindextype N, SUNContext sunctx)
   content->cols  = NULL;
 
   /* Allocate content */
-  content->data = (realtype*)calloc(M * N, sizeof(realtype));
+  content->data = (sunrealtype*)calloc(M * N, sizeof(sunrealtype));
   if (content->data == NULL) {
     SUNMatDestroy(A);
     return (NULL);
   }
 
-  content->cols = (realtype**)malloc(N * sizeof(realtype*));
+  content->cols = (sunrealtype**)malloc(N * sizeof(sunrealtype*));
   if (content->cols == NULL) {
     SUNMatDestroy(A);
     return (NULL);
@@ -162,7 +162,7 @@ sunindextype SUNDenseMatrix_LData(SUNMatrix A)
     return SUNMAT_ILL_INPUT;
 }
 
-realtype* SUNDenseMatrix_Data(SUNMatrix A)
+sunrealtype* SUNDenseMatrix_Data(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_DENSE)
     return SM_DATA_D(A);
@@ -170,7 +170,7 @@ realtype* SUNDenseMatrix_Data(SUNMatrix A)
     return NULL;
 }
 
-realtype** SUNDenseMatrix_Cols(SUNMatrix A)
+sunrealtype** SUNDenseMatrix_Cols(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_DENSE)
     return SM_COLS_D(A);
@@ -178,7 +178,7 @@ realtype** SUNDenseMatrix_Cols(SUNMatrix A)
     return NULL;
 }
 
-realtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j)
+sunrealtype* SUNDenseMatrix_Column(SUNMatrix A, sunindextype j)
 {
   if (SUNMatGetID(A) == SUNMATRIX_DENSE)
     return SM_COLUMN_D(A, j);
@@ -236,7 +236,7 @@ void SUNMatDestroy_Dense(SUNMatrix A)
 int SUNMatZero_Dense(SUNMatrix A)
 {
   sunindextype i;
-  realtype* Adata;
+  sunrealtype* Adata;
 
   /* Perform operation A_ij = 0 */
   Adata = SM_DATA_D(A);
@@ -261,7 +261,7 @@ int SUNMatCopy_Dense(SUNMatrix A, SUNMatrix B)
   return SUNMAT_SUCCESS;
 }
 
-int SUNMatScaleAddI_Dense(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_Dense(sunrealtype c, SUNMatrix A)
 {
   sunindextype i, j;
 
@@ -277,7 +277,7 @@ int SUNMatScaleAddI_Dense(realtype c, SUNMatrix A)
   return SUNMAT_SUCCESS;
 }
 
-int SUNMatScaleAdd_Dense(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_Dense(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   sunindextype i, j;
 
@@ -295,7 +295,7 @@ int SUNMatScaleAdd_Dense(realtype c, SUNMatrix A, SUNMatrix B)
 int SUNMatMatvec_Dense(SUNMatrix A, N_Vector x, N_Vector y)
 {
   sunindextype i, j;
-  realtype *col_j, *xd, *yd;
+  sunrealtype *col_j, *xd, *yd;
 
   if (!compatibleMatrixAndVectors(A, x, y))
     return SUNMAT_ILL_INPUT;
@@ -331,7 +331,7 @@ int SUNMatSpace_Dense(SUNMatrix A, long int* lenrw, long int* leniw)
  * -----------------------------------------------------------------
  */
 
-static booleantype compatibleMatrices(SUNMatrix A, SUNMatrix B)
+static sunbooleantype compatibleMatrices(SUNMatrix A, SUNMatrix B)
 {
   /* both matrices must be SUNMATRIX_DENSE */
   if ((SUNMatGetID(A) != SUNMATRIX_DENSE) || (SUNMatGetID(B) != SUNMATRIX_DENSE)) {
@@ -346,7 +346,7 @@ static booleantype compatibleMatrices(SUNMatrix A, SUNMatrix B)
   return SUNTRUE;
 }
 
-static booleantype compatibleMatrixAndVectors(SUNMatrix A, N_Vector x, N_Vector y)
+static sunbooleantype compatibleMatrixAndVectors(SUNMatrix A, N_Vector x, N_Vector y)
 {
   /* Vectors must provide nvgetarraypointer and cannot be a parallel vector */
   if (!x->ops->nvgetarraypointer || !y->ops->nvgetarraypointer) {
diff --git a/src/sunmatrix/magmadense/sunmatrix_magmadense.cpp b/src/sunmatrix/magmadense/sunmatrix_magmadense.cpp
index 1f9274af1d..c8a4bd5160 100644
--- a/src/sunmatrix/magmadense/sunmatrix_magmadense.cpp
+++ b/src/sunmatrix/magmadense/sunmatrix_magmadense.cpp
@@ -38,8 +38,8 @@ using namespace sundials::sunmatrix_gpudense::hip;
 #define SMLD_CONTENT(A)  ( (SUNMatrixContent_MagmaDense) (A->content) )
 
 /* Constants */
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Macros for magma operations based on precision */
 #if defined(SUNDIALS_DOUBLE_PRECISION)
@@ -57,8 +57,8 @@ using namespace sundials::sunmatrix_gpudense::hip;
 #endif
 
 /* Private function prototypes */
-static booleantype SMCompatible_MagmaDense(SUNMatrix A, SUNMatrix B);
-static booleantype SMCompatible2_MagmaDense(SUNMatrix A, N_Vector x, N_Vector y);
+static sunbooleantype SMCompatible_MagmaDense(SUNMatrix A, SUNMatrix B);
+static sunbooleantype SMCompatible2_MagmaDense(SUNMatrix A, N_Vector x, N_Vector y);
 
 /*
  * ----------------------------------------------------------------------------
@@ -145,19 +145,19 @@ SUNMatrix SUNMatrix_MagmaDenseBlock(sunindextype nblocks, sunindextype M, sunind
 
   /* Allocate data */
   retval = SUNMemoryHelper_Alloc(A->memhelp, &A->data,
-                                 sizeof(realtype) * A->ldata, memtype, nullptr);
+                                 sizeof(sunrealtype) * A->ldata, memtype, nullptr);
   if (retval) { SUNMatDestroy(Amat); return(NULL); }
 
   if (A->nblocks > 1)
   {
     /* Allocate array of pointers to block data */
     retval = SUNMemoryHelper_Alloc(A->memhelp, &A->blocks,
-                                   sizeof(realtype*) * A->nblocks, memtype,
+                                   sizeof(sunrealtype*) * A->nblocks, memtype,
                                    nullptr);
     if (retval) { SUNMatDestroy(Amat); return(NULL); }
 
     /* Initialize array of pointers to block data */
-    magma_xset_pointer(A->q, (realtype**)A->blocks->ptr, (realtype*)A->data->ptr,
+    magma_xset_pointer(A->q, (sunrealtype**)A->blocks->ptr, (sunrealtype*)A->data->ptr,
                        A->M, 0, 0, A->M*A->N, A->nblocks);
   }
 
@@ -238,31 +238,31 @@ sunindextype SUNMatrix_MagmaDense_BlockLData(SUNMatrix Amat)
     return SUNMAT_ILL_INPUT;
 }
 
-realtype* SUNMatrix_MagmaDense_Data(SUNMatrix Amat)
+sunrealtype* SUNMatrix_MagmaDense_Data(SUNMatrix Amat)
 {
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
 
   if (SUNMatGetID(Amat) == SUNMATRIX_MAGMADENSE)
-    return((realtype*) A->data->ptr);
+    return((sunrealtype*) A->data->ptr);
   else
     return(NULL);
 }
 
-realtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix Amat)
+sunrealtype** SUNMatrix_MagmaDense_BlockData(SUNMatrix Amat)
 {
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
 
   if (SUNMatGetID(Amat) == SUNMATRIX_MAGMADENSE)
-    return((realtype**) A->blocks->ptr);
+    return((sunrealtype**) A->blocks->ptr);
   else
     return(NULL);
 }
 
-extern realtype* SUNMatrix_MagmaDense_Block(SUNMatrix Amat, sunindextype k);
+extern sunrealtype* SUNMatrix_MagmaDense_Block(SUNMatrix Amat, sunindextype k);
 
-extern realtype* SUNMatrix_MagmaDense_Column(SUNMatrix Amat, sunindextype j);
+extern sunrealtype* SUNMatrix_MagmaDense_Column(SUNMatrix Amat, sunindextype j);
 
-extern realtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix Amat, sunindextype k, sunindextype j);
+extern sunrealtype* SUNMatrix_MagmaDense_BlockColumn(SUNMatrix Amat, sunindextype k, sunindextype j);
 
 /*
  * Utility functions
@@ -278,7 +278,7 @@ void SUNMatrix_MagmaDense_Print(SUNMatrix Amat)
     xprint(A->q, A->M, A->N, SUNMatrix_MagmaDense_Block(Amat,k), A->M);
 }
 
-int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix Amat, realtype* h_data)
+int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix Amat, sunrealtype* h_data)
 {
   if (SUNMatGetID(Amat) != SUNMATRIX_MAGMADENSE) return(SUNMAT_ILL_INPUT);
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
@@ -291,7 +291,7 @@ int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix Amat, realtype* h_data)
   retval = SUNMemoryHelper_CopyAsync(A->memhelp,
                                      A->data,
                                      _h_data,
-                                     sizeof(realtype) * A->ldata,
+                                     sizeof(sunrealtype) * A->ldata,
                                      (void*) &stream);
   magma_queue_sync(A->q); /* sync with respect to host, but only this stream */
 
@@ -299,7 +299,7 @@ int SUNMatrix_MagmaDense_CopyToDevice(SUNMatrix Amat, realtype* h_data)
   return(retval == 0 ? SUNMAT_SUCCESS : SUNMAT_MEM_FAIL);
 }
 
-int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix Amat, realtype* h_data)
+int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix Amat, sunrealtype* h_data)
 {
   if (SUNMatGetID(Amat) != SUNMATRIX_MAGMADENSE) return(SUNMAT_ILL_INPUT);
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
@@ -312,7 +312,7 @@ int SUNMatrix_MagmaDense_CopyFromDevice(SUNMatrix Amat, realtype* h_data)
   retval = SUNMemoryHelper_CopyAsync(A->memhelp,
                                      _h_data,
                                      A->data,
-                                     sizeof(realtype) * A->ldata,
+                                     sizeof(sunrealtype) * A->ldata,
                                      (void*) &stream);
   magma_queue_sync(A->q); /* sync with respect to host, but only this stream */
 
@@ -400,7 +400,7 @@ int SUNMatZero_MagmaDense(SUNMatrix Amat)
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
 
   /* Zero out matrix */
-  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(zeroKernel<realtype,sunindextype>),
+  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(zeroKernel<sunrealtype,sunindextype>),
     dim3(std::min<sunindextype>(A->nblocks,INT_MAX),1,1),
     SUNDIALS_HIP_OR_CUDA( dim3(1,16,16), dim3(1,16,32) ), /* We choose slightly larger thread blocks when using HIP since the warps are larger */
     0,
@@ -408,7 +408,7 @@ int SUNMatZero_MagmaDense(SUNMatrix Amat)
     A->M,
     A->N,
     A->nblocks,
-    (realtype*) A->data->ptr
+    (sunrealtype*) A->data->ptr
   );
 
   return(SUNMAT_SUCCESS);
@@ -428,7 +428,7 @@ int SUNMatCopy_MagmaDense(SUNMatrix Amat, SUNMatrix Bmat)
     return SUNMAT_ILL_INPUT;
 
   /* Copy A into B */
-  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(copyKernel<realtype,sunindextype>),
+  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(copyKernel<sunrealtype,sunindextype>),
     dim3(std::min<sunindextype>(A->nblocks,INT_MAX),1,1),
     SUNDIALS_HIP_OR_CUDA( dim3(1,16,16), dim3(1,16,32) ),
     0,
@@ -436,14 +436,14 @@ int SUNMatCopy_MagmaDense(SUNMatrix Amat, SUNMatrix Bmat)
     A->M,
     A->N,
     A->nblocks,
-    (const realtype*) A->data->ptr,
-    (realtype*) B->data->ptr
+    (const sunrealtype*) A->data->ptr,
+    (sunrealtype*) B->data->ptr
   );
 
   return(SUNMAT_SUCCESS);
 }
 
-int SUNMatScaleAddI_MagmaDense(realtype c, SUNMatrix Amat)
+int SUNMatScaleAddI_MagmaDense(sunrealtype c, SUNMatrix Amat)
 {
   if (Amat == NULL) return(SUNMAT_ILL_INPUT);
 
@@ -452,7 +452,7 @@ int SUNMatScaleAddI_MagmaDense(realtype c, SUNMatrix Amat)
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
 
 
-  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(scaleAddIKernel<realtype,sunindextype>),
+  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(scaleAddIKernel<sunrealtype,sunindextype>),
     dim3(std::min<sunindextype>(A->nblocks,INT_MAX),1,1),
     SUNDIALS_HIP_OR_CUDA( dim3(1,16,16), dim3(1,16,32) ),
     0,
@@ -461,13 +461,13 @@ int SUNMatScaleAddI_MagmaDense(realtype c, SUNMatrix Amat)
     A->N,
     A->nblocks,
     c,
-    (realtype*) A->data->ptr
+    (sunrealtype*) A->data->ptr
   );
 
   return(SUNMAT_SUCCESS);
 }
 
-int SUNMatScaleAdd_MagmaDense(realtype c, SUNMatrix Amat, SUNMatrix Bmat)
+int SUNMatScaleAdd_MagmaDense(sunrealtype c, SUNMatrix Amat, SUNMatrix Bmat)
 {
   if ((Amat == NULL) || (Bmat == NULL)) return(SUNMAT_ILL_INPUT);
 
@@ -478,7 +478,7 @@ int SUNMatScaleAdd_MagmaDense(realtype c, SUNMatrix Amat, SUNMatrix Bmat)
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
   SUNMatrixContent_MagmaDense B = SMLD_CONTENT(Bmat);
 
-  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(scaleAddKernel<realtype,sunindextype>),
+  SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(scaleAddKernel<sunrealtype,sunindextype>),
     dim3(std::min<sunindextype>(A->nblocks,INT_MAX),1,1),
     SUNDIALS_HIP_OR_CUDA( dim3(1,16,16), dim3(1,16,32) ),
     0,
@@ -487,8 +487,8 @@ int SUNMatScaleAdd_MagmaDense(realtype c, SUNMatrix Amat, SUNMatrix Bmat)
     A->N,
     A->nblocks,
     c,
-    (realtype*) A->data->ptr,
-    (const realtype*) B->data->ptr
+    (sunrealtype*) A->data->ptr,
+    (const sunrealtype*) B->data->ptr
   );
 
   return(SUNMAT_SUCCESS);
@@ -507,13 +507,13 @@ int SUNMatMatvecSetup_MagmaDense(SUNMatrix Amat)
     /* Allocate array of pointers to blocks on device */
     if (A->xblocks == NULL)
       retval = SUNMemoryHelper_Alloc(A->memhelp, &A->xblocks,
-                                     sizeof(realtype*) * A->nblocks,
+                                     sizeof(sunrealtype*) * A->nblocks,
                                      A->data->type, nullptr);
     if (retval) return(SUNMAT_MEM_FAIL);
 
     if (A->yblocks == NULL)
       retval = SUNMemoryHelper_Alloc(A->memhelp, &A->yblocks,
-                                     sizeof(realtype*) * A->nblocks,
+                                     sizeof(sunrealtype*) * A->nblocks,
                                      A->data->type, nullptr);
     if (retval) return(SUNMAT_MEM_FAIL);
   }
@@ -534,7 +534,7 @@ int SUNMatMatvec_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
   if (A->nblocks > 1)
   {
     /* First, we need to create an array of pointers to the matrix and vector blocks */
-    SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(getBlockPointers<realtype,sunindextype>),
+    SUNDIALS_LAUNCH_KERNEL(SUNDIALS_KERNEL_NAME(getBlockPointers<sunrealtype,sunindextype>),
       A->nblocks,
       256,
       0,
@@ -542,12 +542,12 @@ int SUNMatMatvec_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
       A->M,
       A->N,
       A->nblocks,
-      (realtype*)A->data->ptr,
-      (realtype**)A->blocks->ptr,
-      (realtype*)N_VGetDeviceArrayPointer(x),
-      (realtype**)A->xblocks->ptr,
-      (realtype*)N_VGetDeviceArrayPointer(y),
-      (realtype**)A->yblocks->ptr
+      (sunrealtype*)A->data->ptr,
+      (sunrealtype**)A->blocks->ptr,
+      (sunrealtype*)N_VGetDeviceArrayPointer(x),
+      (sunrealtype**)A->xblocks->ptr,
+      (sunrealtype*)N_VGetDeviceArrayPointer(y),
+      (sunrealtype**)A->yblocks->ptr
     );
 
     /* Now we can use a batched gemv to do y = alpha*A*x + beta*y where A is block diagonal */
@@ -557,12 +557,12 @@ int SUNMatMatvec_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
       A->M,         /* number of rows for a block */
       A->N,         /* number of cols for a block */
       ONE,          /* alpha */
-      (realtype**)A->blocks->ptr,
+      (sunrealtype**)A->blocks->ptr,
       A->M,         /* leading dimension of A */
-      (realtype**)A->xblocks->ptr,
+      (sunrealtype**)A->xblocks->ptr,
       1,            /* increment (stride) of xblocks */
       ZERO,         /* beta */
-      (realtype**)A->yblocks->ptr,
+      (sunrealtype**)A->yblocks->ptr,
       1,            /* increment (stride) of yblocks */
       A->nblocks    /* number of blocks */
     );
@@ -576,12 +576,12 @@ int SUNMatMatvec_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
       A->M,         /* number of rows */
       A->N,         /* number of cols */
       ONE,          /* alpha */
-      (const realtype*)A->data->ptr,
+      (const sunrealtype*)A->data->ptr,
       A->M,         /* leading dimension of A */
-      (const realtype*)N_VGetDeviceArrayPointer(x),
+      (const sunrealtype*)N_VGetDeviceArrayPointer(x),
       1,            /* increment for x data */
       ZERO,         /* beta */
-      (realtype*)N_VGetDeviceArrayPointer(y),
+      (sunrealtype*)N_VGetDeviceArrayPointer(y),
       1             /* increment for y data */
     );
   }
@@ -610,7 +610,7 @@ int SUNMatSpace_MagmaDense(SUNMatrix Amat, long int *lenrw, long int *leniw)
  * -----------------------------------------------------------------
  */
 
-static booleantype SMCompatible_MagmaDense(SUNMatrix Amat, SUNMatrix Bmat)
+static sunbooleantype SMCompatible_MagmaDense(SUNMatrix Amat, SUNMatrix Bmat)
 {
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
   SUNMatrixContent_MagmaDense B = SMLD_CONTENT(Bmat);
@@ -632,7 +632,7 @@ static booleantype SMCompatible_MagmaDense(SUNMatrix Amat, SUNMatrix Bmat)
   return(SUNTRUE);
 }
 
-static booleantype SMCompatible2_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
+static sunbooleantype SMCompatible2_MagmaDense(SUNMatrix Amat, N_Vector x, N_Vector y)
 {
   SUNMatrixContent_MagmaDense A = SMLD_CONTENT(Amat);
 
diff --git a/src/sunmatrix/onemkldense/sunmatrix_onemkldense.cpp b/src/sunmatrix/onemkldense/sunmatrix_onemkldense.cpp
index 7306ea68bc..0f1b700212 100644
--- a/src/sunmatrix/onemkldense/sunmatrix_onemkldense.cpp
+++ b/src/sunmatrix/onemkldense/sunmatrix_onemkldense.cpp
@@ -35,8 +35,8 @@
 #endif
 
 // Constants
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 // Content accessor macros
 #define MAT_CONTENT(A)     ((SUNMatrixContent_OneMklDense) (A->content))
@@ -48,20 +48,20 @@
 #define MAT_NBLOCKS(A)     (MAT_CONTENT(A)->num_blocks)
 #define MAT_LDATA(A)       (MAT_CONTENT(A)->ldata)
 #define MAT_DATA(A)        (MAT_CONTENT(A)->data)
-#define MAT_DATAp(A)       ((realtype*) MAT_CONTENT(A)->data->ptr)
+#define MAT_DATAp(A)       ((sunrealtype*) MAT_CONTENT(A)->data->ptr)
 #define MAT_BLOCKS(A)      (MAT_CONTENT(A)->blocks)
-#define MAT_BLOCKSp(A)     ((realtype**) MAT_CONTENT(A)->blocks->ptr)
+#define MAT_BLOCKSp(A)     ((sunrealtype**) MAT_CONTENT(A)->blocks->ptr)
 #define MAT_EXECPOLICY(A)  (MAT_CONTENT(A)->exec_policy)
 #define MAT_MEMTYPE(A)     (MAT_CONTENT(A)->mem_type)
 #define MAT_MEMHELPER(A)   (MAT_CONTENT(A)->mem_helper)
 #define MAT_QUEUE(A)       (MAT_CONTENT(A)->queue)
 
 // Private function prototypes
-static booleantype Compatible_AB(SUNMatrix A, SUNMatrix B);
-static booleantype Compatible_Axy(SUNMatrix A, N_Vector x, N_Vector y);
+static sunbooleantype Compatible_AB(SUNMatrix A, SUNMatrix B);
+static sunbooleantype Compatible_Axy(SUNMatrix A, N_Vector x, N_Vector y);
 
 // Kernel launch parameters
-static int GetKernelParameters(SUNMatrix A, booleantype reduction,
+static int GetKernelParameters(SUNMatrix A, sunbooleantype reduction,
                                size_t& nthreads_total,
                                size_t& nthreads_per_block);
 
@@ -140,7 +140,7 @@ SUNMatrix SUNMatrix_OneMklDenseBlock(sunindextype num_blocks, sunindextype M,
 
   // Allocate data
   retval = SUNMemoryHelper_Alloc(MAT_MEMHELPER(A), &(MAT_DATA(A)),
-                                 sizeof(realtype) * MAT_LDATA(A), mem_type,
+                                 sizeof(sunrealtype) * MAT_LDATA(A), mem_type,
                                  queue);
   if (retval)
   {
@@ -153,7 +153,7 @@ SUNMatrix SUNMatrix_OneMklDenseBlock(sunindextype num_blocks, sunindextype M,
   {
     // Allocate array of pointers to block data
     retval = SUNMemoryHelper_Alloc(MAT_MEMHELPER(A), &(MAT_BLOCKS(A)),
-                                   sizeof(realtype*) * MAT_NBLOCKS(A), mem_type,
+                                   sizeof(sunrealtype*) * MAT_NBLOCKS(A), mem_type,
                                    queue);
     if (retval)
     {
@@ -171,8 +171,8 @@ SUNMatrix SUNMatrix_OneMklDenseBlock(sunindextype num_blocks, sunindextype M,
       return NULL;
     }
 
-    realtype*  Adata   = MAT_DATAp(A);
-    realtype** Ablocks = MAT_BLOCKSp(A);
+    sunrealtype*  Adata   = MAT_DATAp(A);
+    sunrealtype** Ablocks = MAT_BLOCKSp(A);
 
     // Initialize array of pointers to block data
     SYCL_FOR(queue, nthreads_total, nthreads_per_block, item,
@@ -245,7 +245,7 @@ sunindextype SUNMatrix_OneMklDense_LData(SUNMatrix A)
 }
 
 
-realtype* SUNMatrix_OneMklDense_Data(SUNMatrix A)
+sunrealtype* SUNMatrix_OneMklDense_Data(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_ONEMKLDENSE)
     return MAT_DATAp(A);
@@ -263,7 +263,7 @@ sunindextype SUNMatrix_OneMklDense_BlockLData(SUNMatrix A)
 }
 
 
-realtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A)
+sunrealtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_ONEMKLDENSE)
     return MAT_BLOCKSp(A);
@@ -276,11 +276,11 @@ realtype** SUNMatrix_OneMklDense_BlockData(SUNMatrix A)
    column. These are defined as inline functions in sunmatrix_onemkldense.h, so
    we just mark them as extern here. */
 
-extern realtype* SUNMatrix_OneMklDense_Block(SUNMatrix A, sunindextype k);
+extern sunrealtype* SUNMatrix_OneMklDense_Block(SUNMatrix A, sunindextype k);
 
-extern realtype* SUNMatrix_OneMklDense_Column(SUNMatrix A, sunindextype j);
+extern sunrealtype* SUNMatrix_OneMklDense_Column(SUNMatrix A, sunindextype j);
 
-extern realtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix A, sunindextype k,
+extern sunrealtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix A, sunindextype k,
                                                    sunindextype j);
 
 
@@ -289,7 +289,7 @@ extern realtype* SUNMatrix_OneMklDense_BlockColumn(SUNMatrix A, sunindextype k,
  * -------------------------------------------------------------------------- */
 
 
-int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, realtype* h_data)
+int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, sunrealtype* h_data)
 {
   if (SUNMatGetID(A) != SUNMATRIX_ONEMKLDENSE)
   {
@@ -309,7 +309,7 @@ int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, realtype* h_data)
   int copy_fail = SUNMemoryHelper_CopyAsync(MAT_MEMHELPER(A),
                                             MAT_DATA(A),
                                             _h_data,
-                                            sizeof(realtype) * MAT_LDATA(A),
+                                            sizeof(sunrealtype) * MAT_LDATA(A),
                                             MAT_QUEUE(A));
 
   // Sync with respect to host, but only this queue
@@ -326,7 +326,7 @@ int SUNMatrix_OneMklDense_CopyToDevice(SUNMatrix A, realtype* h_data)
 }
 
 
-int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, realtype* h_data)
+int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, sunrealtype* h_data)
 {
   if (SUNMatGetID(A) != SUNMATRIX_ONEMKLDENSE)
   {
@@ -344,7 +344,7 @@ int SUNMatrix_OneMklDense_CopyFromDevice(SUNMatrix A, realtype* h_data)
   int copy_fail = SUNMemoryHelper_CopyAsync(MAT_MEMHELPER(A),
                                             _h_data,
                                             MAT_DATA(A),
-                                            sizeof(realtype) * MAT_LDATA(A),
+                                            sizeof(sunrealtype) * MAT_LDATA(A),
                                             MAT_QUEUE(A));
 
   // Sync with respect to host, but only this queue
@@ -449,7 +449,7 @@ int SUNMatZero_OneMklDense(SUNMatrix A)
   }
 
   const sunindextype ldata  = MAT_LDATA(A);
-  realtype           *Adata = MAT_DATAp(A);
+  sunrealtype           *Adata = MAT_DATAp(A);
   sycl::queue        *Q     = MAT_QUEUE(A);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -492,8 +492,8 @@ int SUNMatCopy_OneMklDense(SUNMatrix A, SUNMatrix B)
   }
 
   const sunindextype ldata  = MAT_LDATA(A);
-  realtype           *Adata = MAT_DATAp(A);
-  realtype           *Bdata = MAT_DATAp(B);
+  sunrealtype           *Adata = MAT_DATAp(A);
+  sunrealtype           *Bdata = MAT_DATAp(B);
   sycl::queue        *Q     = MAT_QUEUE(A);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -514,7 +514,7 @@ int SUNMatCopy_OneMklDense(SUNMatrix A, SUNMatrix B)
 }
 
 
-int SUNMatScaleAddI_OneMklDense(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_OneMklDense(sunrealtype c, SUNMatrix A)
 {
   if (!A)
   {
@@ -531,7 +531,7 @@ int SUNMatScaleAddI_OneMklDense(realtype c, SUNMatrix A)
   const size_t M     = static_cast<size_t>(MAT_BLOCK_ROWS(A));
   const size_t N     = static_cast<size_t>(MAT_BLOCK_COLS(A));
   const size_t B     = static_cast<size_t>(MAT_NBLOCKS(A));
-  realtype*    Adata = MAT_DATAp(A);
+  sunrealtype*    Adata = MAT_DATAp(A);
   sycl::queue* Q     = MAT_QUEUE(A);
 
   // Compute A = c * A + I
@@ -561,7 +561,7 @@ int SUNMatScaleAddI_OneMklDense(realtype c, SUNMatrix A)
 }
 
 
-int SUNMatScaleAdd_OneMklDense(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_OneMklDense(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   if (!A || !B)
   {
@@ -576,8 +576,8 @@ int SUNMatScaleAdd_OneMklDense(realtype c, SUNMatrix A, SUNMatrix B)
   }
 
   const sunindextype ldata  = MAT_LDATA(A);
-  realtype           *Adata = MAT_DATAp(A);
-  realtype           *Bdata = MAT_DATAp(B);
+  sunrealtype           *Adata = MAT_DATAp(A);
+  sunrealtype           *Bdata = MAT_DATAp(B);
   sycl::queue        *Q     = MAT_QUEUE(A);
   size_t             nthreads_total, nthreads_per_block;
 
@@ -621,9 +621,9 @@ int SUNMatMatvec_OneMklDense(SUNMatrix A, N_Vector x, N_Vector y)
     // TODO(DJG): Replace with batched function
     for (sunindextype i = 0; i < MAT_NBLOCKS(A); i++)
     {
-      const realtype* Adata = MAT_DATAp(A) + i * M * N;
-      const realtype* xdata = N_VGetDeviceArrayPointer(x) + i * N;
-      realtype*       ydata = N_VGetDeviceArrayPointer(y) + i * M;
+      const sunrealtype* Adata = MAT_DATAp(A) + i * M * N;
+      const sunrealtype* xdata = N_VGetDeviceArrayPointer(x) + i * N;
+      sunrealtype*       ydata = N_VGetDeviceArrayPointer(y) + i * M;
 
       // Copmute y = a * A * x + b * y
       oneapi::mkl::blas::gemv(*Q, oneapi::mkl::transpose::N, M, N, ONE, Adata,
@@ -635,9 +635,9 @@ int SUNMatMatvec_OneMklDense(SUNMatrix A, N_Vector x, N_Vector y)
     sycl::queue*    Q     = MAT_QUEUE(A);
     sunindextype    M     = MAT_ROWS(A);
     sunindextype    N     = MAT_COLS(A);
-    const realtype* Adata = MAT_DATAp(A);
-    const realtype* xdata = N_VGetDeviceArrayPointer(x);
-    realtype*       ydata = N_VGetDeviceArrayPointer(y);
+    const sunrealtype* Adata = MAT_DATAp(A);
+    const sunrealtype* xdata = N_VGetDeviceArrayPointer(x);
+    sunrealtype*       ydata = N_VGetDeviceArrayPointer(y);
 
     // Copmute y = a * A * x + b * y
     oneapi::mkl::blas::gemv(*Q, oneapi::mkl::transpose::N, M, N, ONE, Adata, M,
@@ -675,7 +675,7 @@ int SUNMatSpace_OneMklDense(SUNMatrix A, long int *lenrw, long int *leniw)
 
 
 // Get the kernel launch parameters
-static int GetKernelParameters(SUNMatrix A, booleantype reduction,
+static int GetKernelParameters(SUNMatrix A, sunbooleantype reduction,
                                size_t& nthreads_total,
                                size_t& nthreads_per_block)
 {
@@ -706,7 +706,7 @@ static int GetKernelParameters(SUNMatrix A, booleantype reduction,
 }
 
 
-static booleantype Compatible_AB(SUNMatrix A, SUNMatrix B)
+static sunbooleantype Compatible_AB(SUNMatrix A, SUNMatrix B)
 {
   // Both matrices must have the SUNMATRIEX_MKLDENSE ID
   if (SUNMatGetID(A) != SUNMATRIX_ONEMKLDENSE)
@@ -744,7 +744,7 @@ static booleantype Compatible_AB(SUNMatrix A, SUNMatrix B)
 }
 
 
-static booleantype Compatible_Axy(SUNMatrix A, N_Vector x, N_Vector y)
+static sunbooleantype Compatible_Axy(SUNMatrix A, N_Vector x, N_Vector y)
 {
   //  Vectors must implement N_VGetDeviceArrayPointer
   if (!(x->ops->nvgetdevicearraypointer) || !(y->ops->nvgetdevicearraypointer))
diff --git a/src/sunmatrix/slunrloc/sunmatrix_slunrloc.c b/src/sunmatrix/slunrloc/sunmatrix_slunrloc.c
index 6db53270b9..da187aa7f5 100644
--- a/src/sunmatrix/slunrloc/sunmatrix_slunrloc.c
+++ b/src/sunmatrix/slunrloc/sunmatrix_slunrloc.c
@@ -58,17 +58,17 @@
 
 #define SM_FSTROW_SLUNRLOC(A)        ( SM_SUPERSTORE_SLUNRLOC(A)->fst_row )
 
-#define SM_DATA_SLUNRLOC(A)          ( (realtype*)SM_SUPERSTORE_SLUNRLOC(A)->nzval )
+#define SM_DATA_SLUNRLOC(A)          ( (sunrealtype*)SM_SUPERSTORE_SLUNRLOC(A)->nzval )
 
 #define SM_COLIND_SLUNRLOC(A)        ( SM_SUPERSTORE_SLUNRLOC(A)->colind )
 
 #define SM_ROWPTRS_SLUNRLOC(A)       ( SM_SUPERSTORE_SLUNRLOC(A)->rowptr )
 
 /* constants */
-#define ZERO RCONST(0.0)
+#define ZERO SUN_RCONST(0.0)
 
 /* Private function prototypes */
-static booleantype SMCompatible_SLUNRloc(SUNMatrix A, SUNMatrix B);
+static sunbooleantype SMCompatible_SLUNRloc(SUNMatrix A, SUNMatrix B);
 
 /*
  * ----------------------------------------------------------------------------
@@ -155,7 +155,7 @@ gridinfo_t* SUNMatrix_SLUNRloc_ProcessGrid(SUNMatrix A)
   return(SM_GRID_SLUNRLOC(A));
 }
 
-booleantype SUNMatrix_SLUNRloc_OwnData(SUNMatrix A)
+sunbooleantype SUNMatrix_SLUNRloc_OwnData(SUNMatrix A)
 {
   return(SM_OWNDATA_SLUNRLOC(A));
 }
@@ -260,7 +260,7 @@ int SUNMatCopy_SLUNRloc(SUNMatrix A, SUNMatrix B)
   return(SUNMAT_SUCCESS);
 }
 
-int SUNMatScaleAdd_SLUNRloc(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_SLUNRloc(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   /* check that B can be added into A */
   if (!SMCompatible_SLUNRloc(A, B)) return(SUNMAT_ILL_INPUT);
@@ -271,7 +271,7 @@ int SUNMatScaleAdd_SLUNRloc(realtype c, SUNMatrix A, SUNMatrix B)
   return(SUNMAT_SUCCESS);
 }
 
-int SUNMatScaleAddI_SLUNRloc(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_SLUNRloc(sunrealtype c, SUNMatrix A)
 {
   /* call SuperLU-DIST ScaleAddI function */
   dScaleAddId_CompRowLoc_Matrix_dist(SM_SUPERMATRIX_SLUNRLOC(A), c);
@@ -281,7 +281,7 @@ int SUNMatScaleAddI_SLUNRloc(realtype c, SUNMatrix A)
 int SUNMatMatvec_SLUNRloc(SUNMatrix A, N_Vector x, N_Vector y)
 {
   SuperMatrix *ACS;
-  realtype *xdata, *ydata;
+  sunrealtype *xdata, *ydata;
 
   /* Extract the column-sorted A */
   ACS = SM_COLSORTED_SLUNRLOC(A);
@@ -389,7 +389,7 @@ int SUNMatSpace_SLUNRloc(SUNMatrix A, long int *lenrw, long int *leniw)
 /* Function to check compatibility of two sparse SUNMatrix objects.
    Checks to make sure that the the matrices are both SLUNRLOC,
    have the same number of rows, cols and nonzeros.*/
-static booleantype SMCompatible_SLUNRloc(SUNMatrix A, SUNMatrix B)
+static sunbooleantype SMCompatible_SLUNRloc(SUNMatrix A, SUNMatrix B)
 {
   /* both matrices must be SLUNRLOC */
   if ((SUNMatGetID(A) != SUNMATRIX_SLUNRLOC) ||
diff --git a/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.c b/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.c
index faf4e71545..62e384a066 100644
--- a/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.c
+++ b/src/sunmatrix/sparse/fmod/fsunmatrix_sparse_mod.c
@@ -231,12 +231,12 @@ SWIGEXPORT SUNMatrix _wrap_FSUNSparseMatrix(int64_t const *farg1, int64_t const
 SWIGEXPORT SUNMatrix _wrap_FSUNSparseFromDenseMatrix(SUNMatrix farg1, double const *farg2, int const *farg3) {
   SUNMatrix fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   SUNMatrix result;
   
   arg1 = (SUNMatrix)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   result = (SUNMatrix)SUNSparseFromDenseMatrix(arg1,arg2,arg3);
   fresult = result;
@@ -247,12 +247,12 @@ SWIGEXPORT SUNMatrix _wrap_FSUNSparseFromDenseMatrix(SUNMatrix farg1, double con
 SWIGEXPORT SUNMatrix _wrap_FSUNSparseFromBandMatrix(SUNMatrix farg1, double const *farg2, int const *farg3) {
   SUNMatrix fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int arg3 ;
   SUNMatrix result;
   
   arg1 = (SUNMatrix)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   arg3 = (int)(*farg3);
   result = (SUNMatrix)SUNSparseFromBandMatrix(arg1,arg2,arg3);
   fresult = result;
@@ -444,12 +444,12 @@ SWIGEXPORT int _wrap_FSUNMatCopy_Sparse(SUNMatrix farg1, SUNMatrix farg2) {
 
 SWIGEXPORT int _wrap_FSUNMatScaleAdd_Sparse(double const *farg1, SUNMatrix farg2, SUNMatrix farg3) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   SUNMatrix arg3 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   arg3 = (SUNMatrix)(farg3);
   result = (int)SUNMatScaleAdd_Sparse(arg1,arg2,arg3);
@@ -460,11 +460,11 @@ SWIGEXPORT int _wrap_FSUNMatScaleAdd_Sparse(double const *farg1, SUNMatrix farg2
 
 SWIGEXPORT int _wrap_FSUNMatScaleAddI_Sparse(double const *farg1, SUNMatrix farg2) {
   int fresult ;
-  realtype arg1 ;
+  sunrealtype arg1 ;
   SUNMatrix arg2 = (SUNMatrix) 0 ;
   int result;
   
-  arg1 = (realtype)(*farg1);
+  arg1 = (sunrealtype)(*farg1);
   arg2 = (SUNMatrix)(farg2);
   result = (int)SUNMatScaleAddI_Sparse(arg1,arg2);
   fresult = (int)(result);
@@ -508,10 +508,10 @@ SWIGEXPORT int _wrap_FSUNMatSpace_Sparse(SUNMatrix farg1, long *farg2, long *far
 SWIGEXPORT double * _wrap_FSUNSparseMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNSparseMatrix_Data(arg1);
+  result = (sunrealtype *)SUNSparseMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/src/sunmatrix/sparse/sunmatrix_sparse.c b/src/sunmatrix/sparse/sunmatrix_sparse.c
index efa956f84f..298160c662 100644
--- a/src/sunmatrix/sparse/sunmatrix_sparse.c
+++ b/src/sunmatrix/sparse/sunmatrix_sparse.c
@@ -27,12 +27,12 @@
 #include <sundials/sundials_nvector.h>
 #include <sundials/sundials_math.h>
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 /* Private function prototypes */
-static booleantype SMCompatible_Sparse(SUNMatrix A, SUNMatrix B);
-static booleantype SMCompatible2_Sparse(SUNMatrix A, N_Vector x, N_Vector y);
+static sunbooleantype SMCompatible_Sparse(SUNMatrix A, SUNMatrix B);
+static sunbooleantype SMCompatible2_Sparse(SUNMatrix A, N_Vector x, N_Vector y);
 static int Matvec_SparseCSC(SUNMatrix A, N_Vector x, N_Vector y);
 static int Matvec_SparseCSR(SUNMatrix A, N_Vector x, N_Vector y);
 static int format_convert(const SUNMatrix A, SUNMatrix B);
@@ -115,7 +115,7 @@ SUNMatrix SUNSparseMatrix(sunindextype M, sunindextype N,
   content->indexptrs = NULL;
 
   /* Allocate content */
-  content->data = (realtype *) calloc(NNZ, sizeof(realtype));
+  content->data = (sunrealtype *) calloc(NNZ, sizeof(sunrealtype));
   if (content->data == NULL) { SUNMatDestroy(A); return(NULL); }
 
   content->indexvals = (sunindextype *) calloc(NNZ, sizeof(sunindextype));
@@ -137,7 +137,7 @@ SUNMatrix SUNSparseMatrix(sunindextype M, sunindextype N,
  * if the request for matrix storage cannot be satisfied.
  */
 
-SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix Ad, realtype droptol,
+SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix Ad, sunrealtype droptol,
                                    int sparsetype)
 {
   sunindextype i, j, nnz;
@@ -203,7 +203,7 @@ SUNMatrix SUNSparseFromDenseMatrix(SUNMatrix Ad, realtype droptol,
  * if the request for matrix storage cannot be satisfied.
  */
 
-SUNMatrix SUNSparseFromBandMatrix(SUNMatrix Ad, realtype droptol, int sparsetype)
+SUNMatrix SUNSparseFromBandMatrix(SUNMatrix Ad, sunrealtype droptol, int sparsetype)
 {
   sunindextype i, j, nnz;
   sunindextype M, N;
@@ -311,7 +311,7 @@ int SUNSparseMatrix_Realloc(SUNMatrix A)
 
   /* perform reallocation */
   SM_INDEXVALS_S(A) = (sunindextype *) realloc(SM_INDEXVALS_S(A), nzmax*sizeof(sunindextype));
-  SM_DATA_S(A) = (realtype *) realloc(SM_DATA_S(A), nzmax*sizeof(realtype));
+  SM_DATA_S(A) = (sunrealtype *) realloc(SM_DATA_S(A), nzmax*sizeof(sunrealtype));
   SM_NNZ_S(A) = nzmax;
 
   return SUNMAT_SUCCESS;
@@ -335,7 +335,7 @@ int SUNSparseMatrix_Reallocate(SUNMatrix A, sunindextype NNZ)
 
   /* perform reallocation */
   SM_INDEXVALS_S(A) = (sunindextype *) realloc(SM_INDEXVALS_S(A), NNZ*sizeof(sunindextype));
-  SM_DATA_S(A) = (realtype *) realloc(SM_DATA_S(A), NNZ*sizeof(realtype));
+  SM_DATA_S(A) = (sunrealtype *) realloc(SM_DATA_S(A), NNZ*sizeof(sunrealtype));
   SM_NNZ_S(A) = NNZ;
 
   return SUNMAT_SUCCESS;
@@ -437,7 +437,7 @@ int SUNSparseMatrix_SparseType(SUNMatrix A)
     return SUNMAT_ILL_INPUT;
 }
 
-realtype* SUNSparseMatrix_Data(SUNMatrix A)
+sunrealtype* SUNSparseMatrix_Data(SUNMatrix A)
 {
   if (SUNMatGetID(A) == SUNMATRIX_SPARSE)
     return SM_DATA_S(A);
@@ -547,7 +547,7 @@ int SUNMatCopy_Sparse(SUNMatrix A, SUNMatrix B)
      much memory as we have nonzeros in A */
   if (SM_NNZ_S(B) < A_nz) {
     SM_INDEXVALS_S(B) = (sunindextype *) realloc(SM_INDEXVALS_S(B), A_nz*sizeof(sunindextype));
-    SM_DATA_S(B) = (realtype *) realloc(SM_DATA_S(B), A_nz*sizeof(realtype));
+    SM_DATA_S(B) = (sunrealtype *) realloc(SM_DATA_S(B), A_nz*sizeof(sunrealtype));
     SM_NNZ_S(B) = A_nz;
   }
 
@@ -570,12 +570,12 @@ int SUNMatCopy_Sparse(SUNMatrix A, SUNMatrix B)
   return SUNMAT_SUCCESS;
 }
 
-int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
+int SUNMatScaleAddI_Sparse(sunrealtype c, SUNMatrix A)
 {
   sunindextype j, i, p, nz, newvals, M, N, cend, nw;
-  booleantype newmat, found;
+  sunbooleantype newmat, found;
   sunindextype *w, *Ap, *Ai, *Cp, *Ci;
-  realtype *x, *Ax, *Cx;
+  sunrealtype *x, *Ax, *Cx;
   SUNMatrix C;
 
   /* store shortcuts to matrix dimensions (M is inner dimension, N is outer) */
@@ -642,7 +642,7 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
 
     /* create work arrays for nonzero row (column) indices and values in a single column (row) */
     w = (sunindextype *) malloc(M * sizeof(sunindextype));
-    x = (realtype *) malloc(M * sizeof(realtype));
+    x = (sunrealtype *) malloc(M * sizeof(sunrealtype));
 
     /* determine storage location where last column (row) should end */
     nz = Ap[N] + newvals;
@@ -704,7 +704,7 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
   } else {
 
     /* create work array for nonzero values in a single column (row) */
-    x = (realtype *) malloc(M * sizeof(realtype));
+    x = (sunrealtype *) malloc(M * sizeof(sunrealtype));
 
     /* create new matrix for sum */
     C = SUNSparseMatrix(SM_ROWS_S(A), SM_COLUMNS_S(A),
@@ -791,12 +791,12 @@ int SUNMatScaleAddI_Sparse(realtype c, SUNMatrix A)
 
 }
 
-int SUNMatScaleAdd_Sparse(realtype c, SUNMatrix A, SUNMatrix B)
+int SUNMatScaleAdd_Sparse(sunrealtype c, SUNMatrix A, SUNMatrix B)
 {
   sunindextype j, i, p, nz, newvals, M, N, cend;
-  booleantype newmat;
+  sunbooleantype newmat;
   sunindextype *w, *Ap, *Ai, *Bp, *Bi, *Cp, *Ci;
-  realtype *x, *Ax, *Bx, *Cx;
+  sunrealtype *x, *Ax, *Bx, *Cx;
   SUNMatrix C;
 
   /* Verify that A and B are compatible */
@@ -831,7 +831,7 @@ int SUNMatScaleAdd_Sparse(realtype c, SUNMatrix A, SUNMatrix B)
 
   /* create work arrays for row indices and nonzero column values */
   w = (sunindextype *) malloc(M * sizeof(sunindextype));
-  x = (realtype *) malloc(M * sizeof(realtype));
+  x = (sunrealtype *) malloc(M * sizeof(sunrealtype));
 
   /* determine if A already contains the sparsity pattern of B */
   newvals = 0;
@@ -900,7 +900,7 @@ int SUNMatScaleAdd_Sparse(realtype c, SUNMatrix A, SUNMatrix B)
       /* clear out temporary arrays for this column (row) */
       for (i=0; i<M; i++) {
         w[i] = 0;
-        x[i] = RCONST(0.0);
+        x[i] = SUN_RCONST(0.0);
       }
 
       /* iterate down column (row) of A, collecting nonzeros */
@@ -960,7 +960,7 @@ int SUNMatScaleAdd_Sparse(realtype c, SUNMatrix A, SUNMatrix B)
       /* clear out temporary arrays for this column (row) */
       for (i=0; i<M; i++) {
         w[i] = 0;
-        x[i] = RCONST(0.0);
+        x[i] = SUN_RCONST(0.0);
       }
 
       /* iterate down column of A, collecting nonzeros */
@@ -1047,7 +1047,7 @@ int SUNMatSpace_Sparse(SUNMatrix A, long int *lenrw, long int *leniw)
  * Function to check compatibility of two sparse SUNMatrix objects
  */
 
-static booleantype SMCompatible_Sparse(SUNMatrix A, SUNMatrix B)
+static sunbooleantype SMCompatible_Sparse(SUNMatrix A, SUNMatrix B)
 {
   /* both matrices must be sparse */
   if ( (SUNMatGetID(A) != SUNMATRIX_SPARSE) ||
@@ -1071,7 +1071,7 @@ static booleantype SMCompatible_Sparse(SUNMatrix A, SUNMatrix B)
  * N_Vectors (A*x = b)
  */
 
-static booleantype SMCompatible2_Sparse(SUNMatrix A, N_Vector x, N_Vector y)
+static sunbooleantype SMCompatible2_Sparse(SUNMatrix A, N_Vector x, N_Vector y)
 {
   /* vectors must implement N_VGetArrayPointer */
   if ( (x->ops->nvgetarraypointer == NULL) ||
@@ -1099,7 +1099,7 @@ int Matvec_SparseCSC(SUNMatrix A, N_Vector x, N_Vector y)
 {
   sunindextype i, j;
   sunindextype *Ap, *Ai;
-  realtype *Ax, *xd, *yd;
+  sunrealtype *Ax, *xd, *yd;
 
   /* access data from CSC structure (return if failure) */
   Ap = SM_INDEXPTRS_S(A);
@@ -1142,7 +1142,7 @@ int Matvec_SparseCSR(SUNMatrix A, N_Vector x, N_Vector y)
 {
   sunindextype i, j;
   sunindextype *Ap, *Aj;
-  realtype *Ax, *xd, *yd;
+  sunrealtype *Ax, *xd, *yd;
 
   /* access data from CSR structure (return if failure) */
   Ap = SM_INDEXPTRS_S(A);
@@ -1180,7 +1180,7 @@ int Matvec_SparseCSR(SUNMatrix A, N_Vector x, N_Vector y)
  */
 int format_convert(const SUNMatrix A, SUNMatrix B)
 {
-    realtype *Ax, *Bx;
+    sunrealtype *Ax, *Bx;
     sunindextype *Ap, *Aj;
     sunindextype *Bp, *Bi;
     sunindextype n_row, n_col, nnz;
diff --git a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
index 3afafbe18c..d200856483 100644
--- a/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
+++ b/src/sunnonlinsol/fixedpoint/fmod/fsunnonlinsol_fixedpoint_mod.c
@@ -272,7 +272,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve_FixedPoint(SUNNonlinearSolver farg1, N_V
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int arg6 ;
   void *arg7 = (void *) 0 ;
   int result;
@@ -281,7 +281,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve_FixedPoint(SUNNonlinearSolver farg1, N_V
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   arg6 = (int)(*farg6);
   arg7 = (void *)(farg7);
   result = (int)SUNNonlinSolSolve_FixedPoint(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
@@ -349,11 +349,11 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSetMaxIters_FixedPoint(SUNNonlinearSolver farg
 SWIGEXPORT int _wrap_FSUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver farg1, double const *farg2) {
   int fresult ;
   SUNNonlinearSolver arg1 = (SUNNonlinearSolver) 0 ;
-  realtype arg2 ;
+  sunrealtype arg2 ;
   int result;
   
   arg1 = (SUNNonlinearSolver)(farg1);
-  arg2 = (realtype)(*farg2);
+  arg2 = (sunrealtype)(*farg2);
   result = (int)SUNNonlinSolSetDamping_FixedPoint(arg1,arg2);
   fresult = (int)(result);
   return fresult;
diff --git a/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c b/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
index 64249652b3..8dd02cd179 100644
--- a/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
+++ b/src/sunnonlinsol/fixedpoint/sunnonlinsol_fixedpoint.c
@@ -37,8 +37,8 @@ static void FreeContent(SUNNonlinearSolver NLS);
 #define FP_CONTENT(S)  ( (SUNNonlinearSolverContent_FixedPoint)(S->content) )
 
 /* Constant macros */
-#define ONE  RCONST(1.0)
-#define ZERO RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
 
 /*==============================================================================
   Constructor to create a new fixed point solver
@@ -182,8 +182,8 @@ int SUNNonlinSolInitialize_FixedPoint(SUNNonlinearSolver NLS)
   by the Sys function provided to the nonlinear solver.
   ---------------------------------------------------------------------------*/
 int SUNNonlinSolSolve_FixedPoint(SUNNonlinearSolver NLS, N_Vector y0,
-                                 N_Vector ycor, N_Vector w, realtype tol,
-                                 booleantype callSetup, void* mem)
+                                 N_Vector ycor, N_Vector w, sunrealtype tol,
+                                 sunbooleantype callSetup, void* mem)
 {
   /* local variables */
   int retval;
@@ -371,7 +371,7 @@ int SUNNonlinSolSetMaxIters_FixedPoint(SUNNonlinearSolver NLS, int maxiters)
   return(SUN_NLS_SUCCESS);
 }
 
-int SUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver NLS, realtype beta)
+int SUNNonlinSolSetDamping_FixedPoint(SUNNonlinearSolver NLS, sunrealtype beta)
 {
   /* check that the nonlinear solver is non-null */
   if (NLS == NULL)
@@ -469,9 +469,9 @@ static int AndersonAccelerate(SUNNonlinearSolver NLS, N_Vector gval,
 {
   /* local variables */
   int         nvec, retval, i_pt, i, j, lAA, maa, *ipt_map;
-  realtype    a, b, rtemp, c, s, beta, onembeta, *cvals, *R, *gamma;
+  sunrealtype    a, b, rtemp, c, s, beta, onembeta, *cvals, *R, *gamma;
   N_Vector    fv, vtemp, gold, fold, *df, *dg, *Q, *Xvecs;
-  booleantype damping;
+  sunbooleantype damping;
 
   /* local shortcut variables */
   vtemp   = x;    /* use result as temporary vector */
@@ -651,15 +651,15 @@ static int AllocateContent(SUNNonlinearSolver NLS, N_Vector y)
     if (FP_CONTENT(NLS)->imap == NULL) {
       FreeContent(NLS); return(SUN_NLS_MEM_FAIL); }
 
-    FP_CONTENT(NLS)->R = (realtype *) malloc((m*m) * sizeof(realtype));
+    FP_CONTENT(NLS)->R = (sunrealtype *) malloc((m*m) * sizeof(sunrealtype));
     if (FP_CONTENT(NLS)->R == NULL) {
       FreeContent(NLS); return(SUN_NLS_MEM_FAIL); }
 
-    FP_CONTENT(NLS)->gamma = (realtype *) malloc(m * sizeof(realtype));
+    FP_CONTENT(NLS)->gamma = (sunrealtype *) malloc(m * sizeof(sunrealtype));
     if (FP_CONTENT(NLS)->gamma == NULL) {
       FreeContent(NLS); return(SUN_NLS_MEM_FAIL); }
 
-    FP_CONTENT(NLS)->cvals = (realtype *) malloc(2*(m+1) * sizeof(realtype));
+    FP_CONTENT(NLS)->cvals = (sunrealtype *) malloc(2*(m+1) * sizeof(sunrealtype));
     if (FP_CONTENT(NLS)->cvals == NULL) {
       FreeContent(NLS); return(SUN_NLS_MEM_FAIL); }
 
diff --git a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
index fc17b3040e..94d12cb79b 100644
--- a/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
+++ b/src/sunnonlinsol/newton/fmod/fsunnonlinsol_newton_mod.c
@@ -268,7 +268,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve_Newton(SUNNonlinearSolver farg1, N_Vecto
   N_Vector arg2 = (N_Vector) 0 ;
   N_Vector arg3 = (N_Vector) 0 ;
   N_Vector arg4 = (N_Vector) 0 ;
-  realtype arg5 ;
+  sunrealtype arg5 ;
   int arg6 ;
   void *arg7 = (void *) 0 ;
   int result;
@@ -277,7 +277,7 @@ SWIGEXPORT int _wrap_FSUNNonlinSolSolve_Newton(SUNNonlinearSolver farg1, N_Vecto
   arg2 = (N_Vector)(farg2);
   arg3 = (N_Vector)(farg3);
   arg4 = (N_Vector)(farg4);
-  arg5 = (realtype)(*farg5);
+  arg5 = (sunrealtype)(*farg5);
   arg6 = (int)(*farg6);
   arg7 = (void *)(farg7);
   result = (int)SUNNonlinSolSolve_Newton(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
diff --git a/src/sunnonlinsol/newton/sunnonlinsol_newton.c b/src/sunnonlinsol/newton/sunnonlinsol_newton.c
index 75781e6018..c999cd797d 100644
--- a/src/sunnonlinsol/newton/sunnonlinsol_newton.c
+++ b/src/sunnonlinsol/newton/sunnonlinsol_newton.c
@@ -30,8 +30,8 @@
 #define NEWTON_CONTENT(S) ( (SUNNonlinearSolverContent_Newton)(S->content) )
 
 /* Constant macros */
-#define ZERO RCONST(0.0) /* real 0.0 */
-#define ONE  RCONST(1.0) /* real 1.0 */
+#define ZERO SUN_RCONST(0.0) /* real 0.0 */
+#define ONE  SUN_RCONST(1.0) /* real 1.0 */
 
 /*==============================================================================
   Constructor to create a new Newton solver
@@ -186,12 +186,12 @@ int SUNNonlinSolInitialize_Newton(SUNNonlinearSolver NLS)
   ----------------------------------------------------------------------------*/
 int SUNNonlinSolSolve_Newton(SUNNonlinearSolver NLS,
                              N_Vector y0, N_Vector ycor,
-                             N_Vector w, realtype tol,
-                             booleantype callLSetup, void* mem)
+                             N_Vector w, sunrealtype tol,
+                             sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   int retval;
-  booleantype jbad;
+  sunbooleantype jbad;
   N_Vector delta;
 
   /* check that the inputs are non-null */
diff --git a/src/sunnonlinsol/petscsnes/sunnonlinsol_petscsnes.c b/src/sunnonlinsol/petscsnes/sunnonlinsol_petscsnes.c
index a3d006611e..a8cf32c2fd 100644
--- a/src/sunnonlinsol/petscsnes/sunnonlinsol_petscsnes.c
+++ b/src/sunnonlinsol/petscsnes/sunnonlinsol_petscsnes.c
@@ -161,8 +161,8 @@ int SUNNonlinSolInitialize_PetscSNES(SUNNonlinearSolver NLS)
   ----------------------------------------------------------------------------*/
 int SUNNonlinSolSolve_PetscSNES(SUNNonlinearSolver NLS,
                                 N_Vector y0, N_Vector y,
-                                N_Vector w, realtype tol,
-                                booleantype callLSetup, void* mem)
+                                N_Vector w, sunrealtype tol,
+                                sunbooleantype callLSetup, void* mem)
 {
   /* local variables */
   PetscErrorCode ierr;
diff --git a/swig/nvector/fnvector_manyvector_mod.i b/swig/nvector/fnvector_manyvector_mod.i
index b27c97f4e6..51cf7efdd9 100644
--- a/swig/nvector/fnvector_manyvector_mod.i
+++ b/swig/nvector/fnvector_manyvector_mod.i
@@ -35,11 +35,11 @@ SWIGEXPORT double * _wrap_FN_VGetSubvectorArrayPointer_ManyVector(N_Vector farg1
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)N_VGetSubvectorArrayPointer_ManyVector(arg1,arg2);
+  result = (sunrealtype *)N_VGetSubvectorArrayPointer_ManyVector(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_mpimanyvector_mod.i b/swig/nvector/fnvector_mpimanyvector_mod.i
index 260286fe07..7c2a355f5a 100644
--- a/swig/nvector/fnvector_mpimanyvector_mod.i
+++ b/swig/nvector/fnvector_mpimanyvector_mod.i
@@ -63,11 +63,11 @@ SWIGEXPORT double * _wrap_FN_VGetSubvectorArrayPointer_MPIManyVector(N_Vector fa
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)N_VGetSubvectorArrayPointer_MPIManyVector(arg1,arg2);
+  result = (sunrealtype *)N_VGetSubvectorArrayPointer_MPIManyVector(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_mpiplusx_mod.i b/swig/nvector/fnvector_mpiplusx_mod.i
index 39865b7053..14f3a45c73 100644
--- a/swig/nvector/fnvector_mpiplusx_mod.i
+++ b/swig/nvector/fnvector_mpiplusx_mod.i
@@ -62,10 +62,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_MPIPlusX(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_MPIPlusX(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_MPIPlusX(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_openmp_mod.i b/swig/nvector/fnvector_openmp_mod.i
index 4df2439934..5878e40cb0 100644
--- a/swig/nvector/fnvector_openmp_mod.i
+++ b/swig/nvector/fnvector_openmp_mod.i
@@ -34,10 +34,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_OpenMP(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_OpenMP(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_OpenMP(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_parallel_mod.i b/swig/nvector/fnvector_parallel_mod.i
index 2dd2e127c3..1501186b6e 100644
--- a/swig/nvector/fnvector_parallel_mod.i
+++ b/swig/nvector/fnvector_parallel_mod.i
@@ -62,10 +62,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Parallel(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Parallel(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Parallel(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_pthreads_mod.i b/swig/nvector/fnvector_pthreads_mod.i
index 9c70141781..fce44f8f20 100644
--- a/swig/nvector/fnvector_pthreads_mod.i
+++ b/swig/nvector/fnvector_pthreads_mod.i
@@ -37,10 +37,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Pthreads(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Pthreads(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Pthreads(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/nvector/fnvector_serial_mod.i b/swig/nvector/fnvector_serial_mod.i
index c27824d4d8..31de082136 100644
--- a/swig/nvector/fnvector_serial_mod.i
+++ b/swig/nvector/fnvector_serial_mod.i
@@ -34,10 +34,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer_Serial(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer_Serial(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer_Serial(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/sundials/fsundials.i b/swig/sundials/fsundials.i
index bac0f74646..9988d8ab29 100644
--- a/swig/sundials/fsundials.i
+++ b/swig/sundials/fsundials.i
@@ -45,8 +45,8 @@
 // Treat array of N_Vectors as an opaque pointer
 %apply void* { N_Vector* };
 
-// Assume realtype* is an array of doubles
-%apply double[] { realtype* };
+// Assume sunrealtype* is an array of doubles
+%apply double[] { sunrealtype* };
 
 // Assume sunindextype* is an array of long int
 %apply long int[] { sunindextype* };
diff --git a/swig/sundials/fsundials_nvector_mod.i b/swig/sundials/fsundials_nvector_mod.i
index 568c0d7750..b7bbce0130 100644
--- a/swig/sundials/fsundials_nvector_mod.i
+++ b/swig/sundials/fsundials_nvector_mod.i
@@ -40,10 +40,10 @@
 SWIGEXPORT double * _wrap_FN_VGetArrayPointer(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetArrayPointer(arg1);
+  result = (sunrealtype *)N_VGetArrayPointer(arg1);
   fresult = result;
   return fresult;
 }
@@ -52,10 +52,10 @@ SWIGEXPORT double * _wrap_FN_VGetArrayPointer(N_Vector farg1) {
 SWIGEXPORT double * _wrap_FN_VGetDeviceArrayPointer(N_Vector farg1) {
   double * fresult ;
   N_Vector arg1 = (N_Vector) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (N_Vector)(farg1);
-  result = (realtype *)N_VGetDeviceArrayPointer(arg1);
+  result = (sunrealtype *)N_VGetDeviceArrayPointer(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/swig/sundials/fsundials_types_mod.i b/swig/sundials/fsundials_types_mod.i
index 5f00272317..085b370c19 100644
--- a/swig/sundials/fsundials_types_mod.i
+++ b/swig/sundials/fsundials_types_mod.i
@@ -24,7 +24,7 @@
 #define SUNDIALS_INT64_T
 #define SUNDIALS_INDEX_TYPE int64_t
 #define SUNDIALS_DOUBLE_PRECISION
-#define booleantype int
+#define sunbooleantype int
 
 // Insert code into the C wrapper to check that the sizes match
 %{
diff --git a/swig/sunmatrix/fsunmatrix_band_mod.i b/swig/sunmatrix/fsunmatrix_band_mod.i
index 31df8f4085..b9fcdfc5e5 100644
--- a/swig/sunmatrix/fsunmatrix_band_mod.i
+++ b/swig/sunmatrix/fsunmatrix_band_mod.i
@@ -37,10 +37,10 @@
 SWIGEXPORT double * _wrap_FSUNBandMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNBandMatrix_Data(arg1);
+  result = (sunrealtype *)SUNBandMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
@@ -49,11 +49,11 @@ SWIGEXPORT double * _wrap_FSUNBandMatrix_Column(SUNMatrix farg1, int64_t const *
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)SUNBandMatrix_Column(arg1,arg2);
+  result = (sunrealtype *)SUNBandMatrix_Column(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/swig/sunmatrix/fsunmatrix_dense_mod.i b/swig/sunmatrix/fsunmatrix_dense_mod.i
index 04010bc9f0..4a01a5e3fb 100644
--- a/swig/sunmatrix/fsunmatrix_dense_mod.i
+++ b/swig/sunmatrix/fsunmatrix_dense_mod.i
@@ -37,10 +37,10 @@
 SWIGEXPORT double * _wrap_FSUNDenseMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNDenseMatrix_Data(arg1);
+  result = (sunrealtype *)SUNDenseMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
@@ -49,11 +49,11 @@ SWIGEXPORT double * _wrap_FSUNDenseMatrix_Column(SUNMatrix farg1, int64_t const
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
   sunindextype arg2 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
   arg2 = (sunindextype)(*farg2);
-  result = (realtype *)SUNDenseMatrix_Column(arg1,arg2);
+  result = (sunrealtype *)SUNDenseMatrix_Column(arg1,arg2);
   fresult = result;
   return fresult;
 }
diff --git a/swig/sunmatrix/fsunmatrix_sparse_mod.i b/swig/sunmatrix/fsunmatrix_sparse_mod.i
index 0d43c5dfbc..8c819482cf 100644
--- a/swig/sunmatrix/fsunmatrix_sparse_mod.i
+++ b/swig/sunmatrix/fsunmatrix_sparse_mod.i
@@ -39,10 +39,10 @@
 SWIGEXPORT double * _wrap_FSUNSparseMatrix_Data(SUNMatrix farg1) {
   double * fresult ;
   SUNMatrix arg1 = (SUNMatrix) 0 ;
-  realtype *result = 0 ;
+  sunrealtype *result = 0 ;
   
   arg1 = (SUNMatrix)(farg1);
-  result = (realtype *)SUNSparseMatrix_Data(arg1);
+  result = (sunrealtype *)SUNSparseMatrix_Data(arg1);
   fresult = result;
   return fresult;
 }
diff --git a/test/test_driver.sh b/test/test_driver.sh
index 3dd0209141..2355514034 100755
--- a/test/test_driver.sh
+++ b/test/test_driver.sh
@@ -63,7 +63,7 @@ help ()
             kinsol   -- create tarball containing KINSOL only
             all      -- create all possible tarballs
 
-        --realtype TYPE
+        --sunrealtype TYPE
             Real type precision to use in a custom test. TYPE must be one of:
 
             double   -- (default) use double precision
@@ -142,7 +142,7 @@ buildjobs=0
 testjobs=0
 testtype="CUSTOM"
 tarball="NONE"
-realtype="double"
+sunrealtype="double"
 indexsize="64"
 libtype="both"
 tpls="OFF"
@@ -219,20 +219,20 @@ while [[ $# -gt 0 ]]; do
             esac
             shift 2;;
 
-        --realtype)
-            realtype=$2
-            case "$realtype" in
+        --sunrealtype)
+            sunrealtype=$2
+            case "$sunrealtype" in
                 SINGLE|Single|single)
-                    realtype=single
+                    sunrealtype=single
                     ;;
                 DOUBLE|Double|double)
-                    realtype=double
+                    sunrealtype=double
                     ;;
                 EXTENDED|Extended|extended)
-                    realtype=extended
+                    sunrealtype=extended
                     ;;
                 *)
-                    echo "ERROR: Invaid real type option $realtype"
+                    echo "ERROR: Invaid real type option $sunrealtype"
                     help
                     exit 1;;
             esac
@@ -466,14 +466,14 @@ case "$testtype" in
 
     CUSTOM)
         # Use default or user defined values
-        args_realtypes+=("${realtype}")
+        args_realtypes+=("${sunrealtype}")
         args_indexsizes+=("${indexsize}")
         args_libtypes+=("${libtype}")
         args_tpls+=("${tpls}")
         args_suntests+=("${suntesttype}")
         args_phase+=("${phase}")
-        if [ "${realtype}" != "double" ] && [ "${suntesttype}" == "DEV" ]; then
-            echo "WARNING: DEV tests may fail with ${realtype} precision"
+        if [ "${sunrealtype}" != "double" ] && [ "${suntesttype}" == "DEV" ]; then
+            echo "WARNING: DEV tests may fail with ${sunrealtype} precision"
         fi
         ;;
 
diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
index 479524e8e4..096c602bfb 100644
--- a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
+++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri.cpp
@@ -31,7 +31,7 @@
 #include "arkode/arkode_mristep.h"    // prototypes for MRIStep fcts., consts
 #include "nvector/nvector_parallel.h" // parallel N_Vector types, fcts., macros
 #include "sunlinsol/sunlinsol_pcg.h"  // access to PCG SUNLinearSolver
-#include "sundials/sundials_types.h"  // def. of type 'realtype'
+#include "sundials/sundials_types.h"  // def. of type 'sunrealtype'
 #include "mpi.h"                      // MPI header file
 
 #if defined(SUNDIALS_EXTENDED_PRECISION)
@@ -48,10 +48,10 @@ using namespace std;
 
 // accessor macros between (x,y) location and 1D NVector array
 #define IDX(x,y,n) ((n)*(y)+(x))
-#define PI   RCONST(3.141592653589793238462643383279502884197169)
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
-#define TWO  RCONST(2.0)
+#define PI   SUN_RCONST(3.141592653589793238462643383279502884197169)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
+#define TWO  SUN_RCONST(2.0)
 
 // user data structure
 typedef struct {
@@ -63,33 +63,33 @@ typedef struct {
   sunindextype je;
   sunindextype nxl;         // local number of x grid points
   sunindextype nyl;         // local number of y grid points
-  realtype dx;          // x-directional mesh spacing
-  realtype dy;          // y-directional mesh spacing
-  realtype kx;          // x-directional diffusion coefficient
-  realtype ky;          // y-directional diffusion coefficient
+  sunrealtype dx;          // x-directional mesh spacing
+  sunrealtype dy;          // y-directional mesh spacing
+  sunrealtype kx;          // x-directional diffusion coefficient
+  sunrealtype ky;          // y-directional diffusion coefficient
   N_Vector h;           // heat source vector
   N_Vector d;           // inverse of Jacobian diagonal
   MPI_Comm comm;        // communicator object
   int myid;             // MPI process ID
   int nprocs;           // total number of MPI processes
   bool HaveBdry[2][2];  // flags denoting if on physical boundary
-  realtype *Erecv;      // receive buffers for neighbor exchange
-  realtype *Wrecv;
-  realtype *Nrecv;
-  realtype *Srecv;
-  realtype *Esend;      // send buffers for neighbor exchange
-  realtype *Wsend;
-  realtype *Nsend;
-  realtype *Ssend;
+  sunrealtype *Erecv;      // receive buffers for neighbor exchange
+  sunrealtype *Wrecv;
+  sunrealtype *Nrecv;
+  sunrealtype *Srecv;
+  sunrealtype *Esend;      // send buffers for neighbor exchange
+  sunrealtype *Wsend;
+  sunrealtype *Nsend;
+  sunrealtype *Ssend;
 } UserData;
 
 // User-supplied Functions Called by the Solver
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int PSet(realtype t, N_Vector y, N_Vector fy, booleantype jok,
-                booleantype *jcurPtr, realtype gamma, void *user_data);
-static int PSol(realtype t, N_Vector y, N_Vector fy, N_Vector r,
-                N_Vector z, realtype gamma, realtype delta, int lr,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int PSet(sunrealtype t, N_Vector y, N_Vector fy, sunbooleantype jok,
+                sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data);
+static int PSol(sunrealtype t, N_Vector y, N_Vector fy, N_Vector r,
+                N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                 void *user_data);
 
 // Private functions
@@ -113,21 +113,21 @@ int main(int argc, char* argv[]) {
   SUNContext_Create(NULL, &ctx);
 
   // general problem parameters
-  realtype T0 = RCONST(0.0);     // initial time
-  realtype Tf = RCONST(0.3);     // final time
+  sunrealtype T0 = SUN_RCONST(0.0);     // initial time
+  sunrealtype Tf = SUN_RCONST(0.3);     // final time
   int Nt = 1000;                 // total number of internal steps
   sunindextype nx = 60;          // spatial mesh size
   sunindextype ny = 120;
-  realtype kx = RCONST(0.5);     // heat conductivity coefficients
-  realtype ky = RCONST(0.75);
-  realtype rtol = RCONST(1.e-5); // relative and absolute tolerances
-  realtype atol = RCONST(1.e-10);
+  sunrealtype kx = SUN_RCONST(0.5);     // heat conductivity coefficients
+  sunrealtype ky = SUN_RCONST(0.75);
+  sunrealtype rtol = SUN_RCONST(1.e-5); // relative and absolute tolerances
+  sunrealtype atol = SUN_RCONST(1.e-10);
   UserData *udata = NULL;
-  realtype *data;
+  sunrealtype *data;
   sunindextype N, Ntot, i, j;
   int numfails;
-  booleantype linear;
-  realtype t;
+  sunbooleantype linear;
+  sunrealtype t;
   long int ark_nst, ark_nfe, ark_nfi, ark_nsetups, ark_nli, ark_nJv, ark_nlcf, ark_nni, ark_ncfn, ark_npe, ark_nps;
   long int mri_nst, mri_nfse, mri_nfsi, mri_nsetups, mri_nli, mri_nJv, mri_nlcf, mri_nni, mri_ncfn, mri_npe, mri_nps;
 
@@ -227,10 +227,10 @@ int main(int argc, char* argv[]) {
   // Create solve-decoupled DIRK2 (trapezoidal) Butcher table
   ARKodeButcherTable B = ARKodeButcherTable_Alloc(2, SUNFALSE);
   if (check_flag((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-  B->A[1][0] = RCONST(0.5);
-  B->A[1][1] = RCONST(0.5);
-  B->b[0] = RCONST(0.5);
-  B->b[1] = RCONST(0.5);
+  B->A[1][0] = SUN_RCONST(0.5);
+  B->A[1][1] = SUN_RCONST(0.5);
+  B->b[0] = SUN_RCONST(0.5);
+  B->b[1] = SUN_RCONST(0.5);
   B->c[1] = ONE;
   B->q=2;
 
@@ -238,10 +238,10 @@ int main(int argc, char* argv[]) {
   ARKodeButcherTable Bc = ARKodeButcherTable_Alloc(3, SUNFALSE);
   if (check_flag((void *)Bc, "ARKodeButcherTable_Alloc", 0)) return 1;
   Bc->A[1][0] = ONE;
-  Bc->A[2][0] = RCONST(0.5);
-  Bc->A[2][2] = RCONST(0.5);
-  Bc->b[0] = RCONST(0.5);
-  Bc->b[2] = RCONST(0.5);
+  Bc->A[2][0] = SUN_RCONST(0.5);
+  Bc->A[2][2] = SUN_RCONST(0.5);
+  Bc->b[0] = SUN_RCONST(0.5);
+  Bc->b[2] = SUN_RCONST(0.5);
   Bc->c[1] = ONE;
   Bc->c[2] = ONE;
   Bc->q=2;
@@ -253,7 +253,7 @@ int main(int argc, char* argv[]) {
   // Set routines
   flag = ARKStepSetUserData(arkstep_mem, (void *) udata);      // Pass udata to user functions
   if (check_flag(&flag, "ARKStepSetUserData", 1)) return 1;
-  flag = ARKStepSetNonlinConvCoef(arkstep_mem, RCONST(1.e-7)); // Update solver convergence coeff.
+  flag = ARKStepSetNonlinConvCoef(arkstep_mem, SUN_RCONST(1.e-7)); // Update solver convergence coeff.
   if (check_flag(&flag, "ARKStepSetNonlinConvCoef", 1)) return 1;
   flag = ARKStepSStolerances(arkstep_mem, rtol, atol);         // Specify tolerances
   if (check_flag(&flag, "ARKStepSStolerances", 1)) return 1;
@@ -266,7 +266,7 @@ int main(int argc, char* argv[]) {
 
   flag = MRIStepSetUserData(mristep_mem, (void *) udata);      // Pass udata to user functions
   if (check_flag(&flag, "MRIStepSetUserData", 1)) return 1;
-  flag = MRIStepSetNonlinConvCoef(mristep_mem, RCONST(1.e-7)); // Update solver convergence coeff.
+  flag = MRIStepSetNonlinConvCoef(mristep_mem, SUN_RCONST(1.e-7)); // Update solver convergence coeff.
   if (check_flag(&flag, "MRIStepSetNonlinConvCoef", 1)) return 1;
   flag = MRIStepSStolerances(mristep_mem, rtol, atol);         // Specify tolerances
   if (check_flag(&flag, "MRIStepSStolerances", 1)) return 1;
@@ -463,19 +463,19 @@ int main(int argc, char* argv[]) {
  *--------------------------------*/
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   N_VConst(ZERO, ydot);                          // Initialize ydot to zero
   UserData *udata = (UserData *) user_data;      // access problem data
   sunindextype nxl = udata->nxl;                     // set variable shortcuts
   sunindextype nyl = udata->nyl;
-  realtype kx = udata->kx;
-  realtype ky = udata->ky;
-  realtype dx = udata->dx;
-  realtype dy = udata->dy;
-  realtype *Y = N_VGetArrayPointer(y);           // access data arrays
+  sunrealtype kx = udata->kx;
+  sunrealtype ky = udata->ky;
+  sunrealtype dx = udata->dx;
+  sunrealtype dy = udata->dy;
+  sunrealtype *Y = N_VGetArrayPointer(y);           // access data arrays
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
-  realtype *Ydot = N_VGetArrayPointer(ydot);
+  sunrealtype *Ydot = N_VGetArrayPointer(ydot);
   if (check_flag((void *) Ydot, "N_VGetArrayPointer", 0)) return -1;
 
   // Exchange boundary data with neighbors
@@ -483,9 +483,9 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
   if (check_flag(&ierr, "Exchange", 1)) return -1;
 
   // iterate over subdomain interior, computing approximation to RHS
-  realtype c1 = kx/dx/dx;
-  realtype c2 = ky/dy/dy;
-  realtype c3 = -TWO*(c1 + c2);
+  sunrealtype c1 = kx/dx/dx;
+  sunrealtype c2 = ky/dy/dy;
+  sunrealtype c3 = -TWO*(c1 + c2);
   sunindextype i, j;
   for (j=1; j<nyl-1; j++)                        // diffusive terms
     for (i=1; i<nxl-1; i++)
@@ -557,7 +557,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // f0 routine to compute a zero-valued ODE RHS function f(t,y).
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   // Initialize ydot to zero and return
   N_VConst(ZERO, ydot);
@@ -565,28 +565,28 @@ static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // Preconditioner setup routine (fills inverse of Jacobian diagonal)
-static int PSet(realtype t, N_Vector y, N_Vector fy, booleantype jok,
-                booleantype *jcurPtr, realtype gamma, void *user_data)
+static int PSet(sunrealtype t, N_Vector y, N_Vector fy, sunbooleantype jok,
+                sunbooleantype *jcurPtr, sunrealtype gamma, void *user_data)
 {
   UserData *udata = (UserData *) user_data;      // variable shortcuts
-  realtype kx = udata->kx;
-  realtype ky = udata->ky;
-  realtype dx = udata->dx;
-  realtype dy = udata->dy;
-  realtype *diag = N_VGetArrayPointer(udata->d);  // access data arrays
+  sunrealtype kx = udata->kx;
+  sunrealtype ky = udata->ky;
+  sunrealtype dx = udata->dx;
+  sunrealtype dy = udata->dy;
+  sunrealtype *diag = N_VGetArrayPointer(udata->d);  // access data arrays
   if (check_flag((void *) diag, "N_VGetArrayPointer", 0)) return -1;
 
   // set all entries of d to the diagonal values of interior
   // (since boundary RHS is 0, set boundary diagonals to the same)
-  realtype c = ONE + gamma*TWO*(kx/dx/dx + ky/dy/dy);
+  sunrealtype c = ONE + gamma*TWO*(kx/dx/dx + ky/dy/dy);
   N_VConst(c, udata->d);
   N_VInv(udata->d, udata->d);  // invert diagonal
   return 0;                    // Return with success
 }
 
 // Preconditioner solve routine
-static int PSol(realtype t, N_Vector y, N_Vector fy, N_Vector r,
-                N_Vector z, realtype gamma, realtype delta, int lr,
+static int PSol(sunrealtype t, N_Vector y, N_Vector fy, N_Vector r,
+                N_Vector z, sunrealtype gamma, sunrealtype delta, int lr,
                 void *user_data)
 {
   UserData *udata = (UserData *) user_data;  // access user_data structure
@@ -688,20 +688,20 @@ static int SetupDecomp(UserData *udata)
   udata->HaveBdry[1][0] = (udata->js == 0);
   udata->HaveBdry[1][1] = (udata->je == udata->ny-1);
   if (!udata->HaveBdry[0][0]) {
-    udata->Wrecv = new realtype[udata->nyl];
-    udata->Wsend = new realtype[udata->nyl];
+    udata->Wrecv = new sunrealtype[udata->nyl];
+    udata->Wsend = new sunrealtype[udata->nyl];
   }
   if (!udata->HaveBdry[0][1]) {
-    udata->Erecv = new realtype[udata->nyl];
-    udata->Esend = new realtype[udata->nyl];
+    udata->Erecv = new sunrealtype[udata->nyl];
+    udata->Esend = new sunrealtype[udata->nyl];
   }
   if (!udata->HaveBdry[1][0]) {
-    udata->Srecv = new realtype[udata->nxl];
-    udata->Ssend = new realtype[udata->nxl];
+    udata->Srecv = new sunrealtype[udata->nxl];
+    udata->Ssend = new sunrealtype[udata->nxl];
   }
   if (!udata->HaveBdry[1][1]) {
-    udata->Nrecv = new realtype[udata->nxl];
-    udata->Nsend = new realtype[udata->nxl];
+    udata->Nrecv = new sunrealtype[udata->nxl];
+    udata->Nsend = new sunrealtype[udata->nxl];
   }
 
   return 0;     // return with success flag
@@ -719,7 +719,7 @@ static int Exchange(N_Vector y, UserData *udata)
   sunindextype nxl = udata->nxl;
 
   // access data array
-  realtype *Y = N_VGetArrayPointer(y);
+  sunrealtype *Y = N_VGetArrayPointer(y);
   if (check_flag((void *) Y, "N_VGetArrayPointer", 0)) return -1;
 
   // MPI neighborhood information
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
index ecb951f6c0..ff9403d76f 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_analytic_sys_mri.cpp
@@ -47,13 +47,13 @@
 
 using namespace std;
 
-#define ZERO RCONST(0.0)
-#define ONE  RCONST(1.0)
+#define ZERO SUN_RCONST(0.0)
+#define ONE  SUN_RCONST(1.0)
 
 // User-supplied Functions Called by the Solver
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // Private function to perform matrix-matrix product
@@ -75,13 +75,13 @@ int main(int argc, char* argv[])
   SUNContext_Create(NULL, &sunctx);
 
   // general problem parameters
-  realtype T0 = RCONST(0.0);         // initial time
-  realtype Tf = RCONST(0.05);        // final time
+  sunrealtype T0 = SUN_RCONST(0.0);         // initial time
+  sunrealtype Tf = SUN_RCONST(0.05);        // final time
   int Nt = 1000;                     // total number of internal steps
   sunindextype NEQ = 3;              // number of dependent vars.
-  realtype reltol = RCONST(1.0e-6);  // tolerances
-  realtype abstol = RCONST(1.0e-10);
-  realtype lamda  = RCONST(-100.0);  // stiffness parameter
+  sunrealtype reltol = SUN_RCONST(1.0e-6);  // tolerances
+  sunrealtype abstol = SUN_RCONST(1.0e-10);
+  sunrealtype lamda  = SUN_RCONST(-100.0);  // stiffness parameter
 
   // general problem variables
   int flag;                       // reusable error-checking flag
@@ -96,8 +96,8 @@ int main(int argc, char* argv[])
   void *mristep_mem = NULL;       // empty MRIStep memory structure
   void *inner_mem = NULL;         // empty inner ARKStep memory structure
   int numfails;
-  booleantype fixedpoint;
-  realtype t, tcur;
+  sunbooleantype fixedpoint;
+  sunrealtype t, tcur;
   long int ark_nst, ark_nfe, ark_nfi, ark_nsetups, ark_nje, ark_nfeLS, ark_nni, ark_ncfn;
   long int mri_nst, mri_nfse, mri_nfsi, mri_nsetups, mri_nje, mri_nfeLS, mri_nni, mri_ncfn;
 
@@ -139,10 +139,10 @@ int main(int argc, char* argv[])
   // Create DIRK2 (trapezoidal) Butcher table
   ARKodeButcherTable B = ARKodeButcherTable_Alloc(2, SUNFALSE);
   if (check_flag((void *)B, "ARKodeButcherTable_Alloc", 0)) return 1;
-  B->A[1][0] = RCONST(0.5);
-  B->A[1][1] = RCONST(0.5);
-  B->b[0] = RCONST(0.5);
-  B->b[1] = RCONST(0.5);
+  B->A[1][0] = SUN_RCONST(0.5);
+  B->A[1][1] = SUN_RCONST(0.5);
+  B->b[0] = SUN_RCONST(0.5);
+  B->b[1] = SUN_RCONST(0.5);
   B->c[1] = ONE;
   B->q=2;
 
@@ -150,10 +150,10 @@ int main(int argc, char* argv[])
   ARKodeButcherTable Bc = ARKodeButcherTable_Alloc(3, SUNFALSE);
   if (check_flag((void *)Bc, "ARKodeButcherTable_Alloc", 0)) return 1;
   Bc->A[1][0] = ONE;
-  Bc->A[2][0] = RCONST(0.5);
-  Bc->A[2][2] = RCONST(0.5);
-  Bc->b[0] = RCONST(0.5);
-  Bc->b[2] = RCONST(0.5);
+  Bc->A[2][0] = SUN_RCONST(0.5);
+  Bc->A[2][2] = SUN_RCONST(0.5);
+  Bc->b[0] = SUN_RCONST(0.5);
+  Bc->b[2] = SUN_RCONST(0.5);
   Bc->c[1] = ONE;
   Bc->c[2] = ONE;
   Bc->q=2;
@@ -376,25 +376,25 @@ int main(int argc, char* argv[])
  *-------------------------------*/
 
 // f routine to compute the ODE RHS function f(t,y).
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   // cast user_data to realtype
-  realtype lam = rdata[0];                    // set shortcut for stiffness parameter
-  realtype y0 = NV_Ith_S(y,0);                // access current solution values
-  realtype y1 = NV_Ith_S(y,1);
-  realtype y2 = NV_Ith_S(y,2);
-  realtype yd0, yd1, yd2;
+  sunrealtype *rdata = (sunrealtype *) user_data;   // cast user_data to sunrealtype
+  sunrealtype lam = rdata[0];                    // set shortcut for stiffness parameter
+  sunrealtype y0 = NV_Ith_S(y,0);                // access current solution values
+  sunrealtype y1 = NV_Ith_S(y,1);
+  sunrealtype y2 = NV_Ith_S(y,2);
+  sunrealtype yd0, yd1, yd2;
 
   // fill in the RHS function: f(t,y) = V*D*Vi*y
-  yd0 = RCONST(0.25)*(RCONST(5.0)*y0 + RCONST(1.0)*y1 - RCONST(3.0)*y2);  // yd = Vi*y
-  yd1 = RCONST(0.25)*(RCONST(2.0)*y0 + RCONST(2.0)*y1 - RCONST(2.0)*y2);
-  yd2 = RCONST(0.25)*(RCONST(1.0)*y0 + RCONST(1.0)*y1 + RCONST(1.0)*y2);
-  y0  = -RCONST(0.5)*yd0;                                                 //  y = D*yd
-  y1  = -RCONST(0.1)*yd1;
+  yd0 = SUN_RCONST(0.25)*(SUN_RCONST(5.0)*y0 + SUN_RCONST(1.0)*y1 - SUN_RCONST(3.0)*y2);  // yd = Vi*y
+  yd1 = SUN_RCONST(0.25)*(SUN_RCONST(2.0)*y0 + SUN_RCONST(2.0)*y1 - SUN_RCONST(2.0)*y2);
+  yd2 = SUN_RCONST(0.25)*(SUN_RCONST(1.0)*y0 + SUN_RCONST(1.0)*y1 + SUN_RCONST(1.0)*y2);
+  y0  = -SUN_RCONST(0.5)*yd0;                                                 //  y = D*yd
+  y1  = -SUN_RCONST(0.1)*yd1;
   y2  =  lam*yd2;
-  yd0 =  RCONST(1.0)*y0 - RCONST(1.0)*y1 + RCONST(1.0)*y2;                // yd = V*y
-  yd1 = -RCONST(1.0)*y0 + RCONST(2.0)*y1 + RCONST(1.0)*y2;
-  yd2 =  RCONST(0.0)*y0 - RCONST(1.0)*y1 + RCONST(2.0)*y2;
+  yd0 =  SUN_RCONST(1.0)*y0 - SUN_RCONST(1.0)*y1 + SUN_RCONST(1.0)*y2;                // yd = V*y
+  yd1 = -SUN_RCONST(1.0)*y0 + SUN_RCONST(2.0)*y1 + SUN_RCONST(1.0)*y2;
+  yd2 =  SUN_RCONST(0.0)*y0 - SUN_RCONST(1.0)*y1 + SUN_RCONST(2.0)*y2;
   NV_Ith_S(ydot,0) = yd0;
   NV_Ith_S(ydot,1) = yd1;
   NV_Ith_S(ydot,2) = yd2;
@@ -403,7 +403,7 @@ static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // f0 routine to compute a zero-valued ODE RHS function f(t,y).
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   // Initialize ydot to zero and return
   N_VConst(ZERO, ydot);
@@ -411,12 +411,12 @@ static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // Jacobian routine to compute J(t,y) = df/dy.
-static int Jac(realtype t, N_Vector y, N_Vector fy,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy,
                SUNMatrix J, void *user_data,
                N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rdata = (realtype *) user_data;   // cast user_data to realtype
-  realtype lam = rdata[0];                    // set shortcut for stiffness parameter
+  sunrealtype *rdata = (sunrealtype *) user_data;   // cast user_data to sunrealtype
+  sunrealtype lam = rdata[0];                    // set shortcut for stiffness parameter
   SUNMatrix V  = SUNDenseMatrix(3,3,sunctx);  // create temporary SUNMatrix objects
   SUNMatrix D  = SUNDenseMatrix(3,3,sunctx);  // create temporary SUNMatrix objects
   SUNMatrix Vi = SUNDenseMatrix(3,3,sunctx);  // create temporary SUNMatrix objects
@@ -427,30 +427,30 @@ static int Jac(realtype t, N_Vector y, N_Vector fy,
 
   // Fill in temporary matrices:
   //    V = [1 -1 1; -1 2 1; 0 -1 2]
-  SM_ELEMENT_D(V,0,0) =  RCONST(1.0);
-  SM_ELEMENT_D(V,0,1) = -RCONST(1.0);
-  SM_ELEMENT_D(V,0,2) =  RCONST(1.0);
-  SM_ELEMENT_D(V,1,0) = -RCONST(1.0);
-  SM_ELEMENT_D(V,1,1) =  RCONST(2.0);
-  SM_ELEMENT_D(V,1,2) =  RCONST(1.0);
-  SM_ELEMENT_D(V,2,0) =  RCONST(0.0);
-  SM_ELEMENT_D(V,2,1) = -RCONST(1.0);
-  SM_ELEMENT_D(V,2,2) =  RCONST(2.0);
+  SM_ELEMENT_D(V,0,0) =  SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,0,1) = -SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,0,2) =  SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,1,0) = -SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,1,1) =  SUN_RCONST(2.0);
+  SM_ELEMENT_D(V,1,2) =  SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,2,0) =  SUN_RCONST(0.0);
+  SM_ELEMENT_D(V,2,1) = -SUN_RCONST(1.0);
+  SM_ELEMENT_D(V,2,2) =  SUN_RCONST(2.0);
 
   //    Vi = 0.25*[5 1 -3; 2 2 -2; 1 1 1]
-  SM_ELEMENT_D(Vi,0,0) =  RCONST(0.25)*RCONST(5.0);
-  SM_ELEMENT_D(Vi,0,1) =  RCONST(0.25)*RCONST(1.0);
-  SM_ELEMENT_D(Vi,0,2) = -RCONST(0.25)*RCONST(3.0);
-  SM_ELEMENT_D(Vi,1,0) =  RCONST(0.25)*RCONST(2.0);
-  SM_ELEMENT_D(Vi,1,1) =  RCONST(0.25)*RCONST(2.0);
-  SM_ELEMENT_D(Vi,1,2) = -RCONST(0.25)*RCONST(2.0);
-  SM_ELEMENT_D(Vi,2,0) =  RCONST(0.25)*RCONST(1.0);
-  SM_ELEMENT_D(Vi,2,1) =  RCONST(0.25)*RCONST(1.0);
-  SM_ELEMENT_D(Vi,2,2) =  RCONST(0.25)*RCONST(1.0);
+  SM_ELEMENT_D(Vi,0,0) =  SUN_RCONST(0.25)*SUN_RCONST(5.0);
+  SM_ELEMENT_D(Vi,0,1) =  SUN_RCONST(0.25)*SUN_RCONST(1.0);
+  SM_ELEMENT_D(Vi,0,2) = -SUN_RCONST(0.25)*SUN_RCONST(3.0);
+  SM_ELEMENT_D(Vi,1,0) =  SUN_RCONST(0.25)*SUN_RCONST(2.0);
+  SM_ELEMENT_D(Vi,1,1) =  SUN_RCONST(0.25)*SUN_RCONST(2.0);
+  SM_ELEMENT_D(Vi,1,2) = -SUN_RCONST(0.25)*SUN_RCONST(2.0);
+  SM_ELEMENT_D(Vi,2,0) =  SUN_RCONST(0.25)*SUN_RCONST(1.0);
+  SM_ELEMENT_D(Vi,2,1) =  SUN_RCONST(0.25)*SUN_RCONST(1.0);
+  SM_ELEMENT_D(Vi,2,2) =  SUN_RCONST(0.25)*SUN_RCONST(1.0);
 
   //    D = [-0.5 0 0; 0 -0.1 0; 0 0 lam]
-  SM_ELEMENT_D(D,0,0) = -RCONST(0.5);
-  SM_ELEMENT_D(D,1,1) = -RCONST(0.1);
+  SM_ELEMENT_D(D,0,0) = -SUN_RCONST(0.5);
+  SM_ELEMENT_D(D,1,1) = -SUN_RCONST(0.1);
   SM_ELEMENT_D(D,2,2) = lam;
 
   // Compute J = V*D*Vi
@@ -486,9 +486,9 @@ static int dense_MM(SUNMatrix A, SUNMatrix B, SUNMatrix C)
     return 1;
   }
 
-  realtype **adata = SUNDenseMatrix_Cols(A);     // access data and extents
-  realtype **bdata = SUNDenseMatrix_Cols(B);
-  realtype **cdata = SUNDenseMatrix_Cols(C);
+  sunrealtype **adata = SUNDenseMatrix_Cols(A);     // access data and extents
+  sunrealtype **bdata = SUNDenseMatrix_Cols(B);
+  sunrealtype **cdata = SUNDenseMatrix_Cols(C);
   sunindextype m = SUNDenseMatrix_Rows(C);
   sunindextype n = SUNDenseMatrix_Columns(C);
   sunindextype l = SUNDenseMatrix_Columns(A);
diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
index 0e491eb229..8156aa3572 100644
--- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
+++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri.cpp
@@ -47,24 +47,24 @@ using namespace std;
 // User data structure
 struct UserData
 {
-  realtype lambda_e = RCONST(-1.0);
-  realtype lambda_i = RCONST(-1.0);
-  realtype lambda_f = RCONST(-1.0);
+  sunrealtype lambda_e = SUN_RCONST(-1.0);
+  sunrealtype lambda_i = SUN_RCONST(-1.0);
+  sunrealtype lambda_f = SUN_RCONST(-1.0);
 };
 
 // User-supplied Functions called by the solver
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Ji(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Ji(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
               void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // Private function to check function return values
 static int check_flag(void *flagvalue, const string funcname, int opt);
 
 // Test drivers
-static int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
-                     realtype hs, realtype hf, realtype reltol, realtype abstol,
+static int run_tests(MRISTEP_METHOD_TYPE type, sunrealtype t0, int nsteps,
+                     sunrealtype hs, sunrealtype hf, sunrealtype reltol, sunrealtype abstol,
                      UserData* udata, SUNContext ctx);
 
 
@@ -76,18 +76,18 @@ static int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
 int main(int argc, char* argv[])
 {
   // Initial time
-  realtype t0 = RCONST(0.0);
+  sunrealtype t0 = SUN_RCONST(0.0);
 
   // Number of time steps
   int nsteps = 1;
 
   // Relative and absolute tolerances
-  realtype reltol = RCONST(1.0e-4);
-  realtype abstol = RCONST(1.0e-6);
+  sunrealtype reltol = SUN_RCONST(1.0e-4);
+  sunrealtype abstol = SUN_RCONST(1.0e-6);
 
   // Slow and fast step sizes
-  realtype hs = RCONST(0.01);
-  realtype hf = RCONST(0.01);
+  sunrealtype hs = SUN_RCONST(0.01);
+  sunrealtype hf = SUN_RCONST(0.01);
 
   // User data structure
   UserData udata;
@@ -144,8 +144,8 @@ int main(int argc, char* argv[])
 // -----------------------------------------------------------------------------
 
 
-int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
-              realtype hs, realtype hf, realtype reltol, realtype abstol,
+int run_tests(MRISTEP_METHOD_TYPE type, sunrealtype t0, int nsteps,
+              sunrealtype hs, sunrealtype hf, sunrealtype reltol, sunrealtype abstol,
               UserData* udata, SUNContext sunctx)
 {
   // Reusable error-checking flag
@@ -158,7 +158,7 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
   N_Vector y = N_VNew_Serial(1, sunctx);
   if (check_flag((void *)y, "N_VNew_Serial", 0)) return 1;
 
-  N_VConst(RCONST(1.0), y);
+  N_VConst(SUN_RCONST(1.0), y);
 
   // Create matrix and linear solver (if necessary)
   SUNMatrix       A  = nullptr;
@@ -348,8 +348,8 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     // Output statistics
     // -----------------
 
-    realtype t  = t0;
-    realtype tf = nsteps * hs;
+    sunrealtype t  = t0;
+    sunrealtype tf = nsteps * hs;
 
     for (int i = 0; i < nsteps; i++)
     {
@@ -393,7 +393,7 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
       check_flag(&flag, "MRIStepGetNumLinRhsEvals", 1);
     }
 
-    realtype  pow   = udata->lambda_f;
+    sunrealtype  pow   = udata->lambda_f;
     if (type == MRISTEP_EXPLICIT || type == MRISTEP_IMEX)
     {
       pow += udata->lambda_e;
@@ -402,10 +402,10 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     {
       pow += udata->lambda_i;
     }
-    realtype  ytrue = exp(pow * t);
+    sunrealtype  ytrue = exp(pow * t);
 
-    realtype* ydata = N_VGetArrayPointer(y);
-    realtype  error = ytrue - ydata[0];
+    sunrealtype* ydata = N_VGetArrayPointer(y);
+    sunrealtype  error = ytrue - ydata[0];
 
     cout << "\nMRIStep Statistics:\n";
     cout << "   Time        = " << t           << "\n";
@@ -485,7 +485,7 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
     MRIStepCoupling_Free(C);
 
     // Reset state vector to the initial condition
-    N_VConst(RCONST(1.0), y);
+    N_VConst(SUN_RCONST(1.0), y);
 
     // Re-initialize fast integrator
     flag = ARKStepReInit(arkstep_mem, ff, nullptr, t0, y);
@@ -534,10 +534,10 @@ int run_tests(MRISTEP_METHOD_TYPE type, realtype t0, int nsteps,
 
 
 // Explicit ODE RHS function fe(t,y)
-static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fe(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* y_data  = N_VGetArrayPointer(y);
-  realtype* yd_data = N_VGetArrayPointer(ydot);
+  sunrealtype* y_data  = N_VGetArrayPointer(y);
+  sunrealtype* yd_data = N_VGetArrayPointer(ydot);
   UserData* udata   = static_cast<UserData*>(user_data);
 
   yd_data[0] = udata->lambda_e * y_data[0];
@@ -546,10 +546,10 @@ static int fe(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 }
 
 // Implicit ODE RHS function fi(t,y)
-static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int fi(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* y_data  = N_VGetArrayPointer(y);
-  realtype* yd_data = N_VGetArrayPointer(ydot);
+  sunrealtype* y_data  = N_VGetArrayPointer(y);
+  sunrealtype* yd_data = N_VGetArrayPointer(ydot);
   UserData* udata   = static_cast<UserData*>(user_data);
 
   yd_data[0] = udata->lambda_i * y_data[0];
@@ -559,10 +559,10 @@ static int fi(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 // Fast ODE RHS function ff(t,y)
-static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int ff(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* y_data  = N_VGetArrayPointer(y);
-  realtype* yd_data = N_VGetArrayPointer(ydot);
+  sunrealtype* y_data  = N_VGetArrayPointer(y);
+  sunrealtype* yd_data = N_VGetArrayPointer(ydot);
   UserData* udata   = static_cast<UserData*>(user_data);
 
   yd_data[0] = udata->lambda_f * y_data[0];
@@ -572,11 +572,11 @@ static int ff(realtype t, N_Vector y, N_Vector ydot, void *user_data)
 
 
 // Jacobian routine to compute J(t,y) = dfi/dy.
-static int Ji(realtype t, N_Vector y, N_Vector fy,
+static int Ji(sunrealtype t, N_Vector y, N_Vector fy,
               SUNMatrix J, void *user_data,
               N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype* J_data = SUNDenseMatrix_Data(J);
+  sunrealtype* J_data = SUNDenseMatrix_Data(J);
   UserData* udata  = static_cast<UserData*>(user_data);
 
   J_data[0] = udata->lambda_i;
diff --git a/test/unit_tests/arkode/C_serial/ark_test_arkstepsetforcing.c b/test/unit_tests/arkode/C_serial/ark_test_arkstepsetforcing.c
index 92b3aa5191..08818856a4 100644
--- a/test/unit_tests/arkode/C_serial/ark_test_arkstepsetforcing.c
+++ b/test/unit_tests/arkode/C_serial/ark_test_arkstepsetforcing.c
@@ -45,19 +45,19 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int compute_ans(realtype t, realtype tshift, realtype tscale,
+static int compute_ans(sunrealtype t, sunrealtype tshift, sunrealtype tscale,
                        N_Vector* forcing, int order, N_Vector ans);
-static int compute_error(N_Vector y, N_Vector ans, N_Vector tmp, realtype rtol,
-                         realtype atol);
+static int compute_error(N_Vector y, N_Vector ans, N_Vector tmp, sunrealtype rtol,
+                         sunrealtype atol);
 
 /* Main Program */
 int main(int argc, char *argv[])
@@ -67,14 +67,14 @@ int main(int argc, char *argv[])
   /* default input values */
   sunindextype NEQ    = 1;           /* number of dependent vars.    */
   int          order  = 3;           /* order of polynomial forcing  */
-  realtype     T0     = RCONST(0.0); /* initial time                 */
-  realtype     Tf     = RCONST(1.0); /* final time                   */
-  realtype     tshift = T0;          /* time shift for normalization */
-  realtype     tscale = Tf;          /* time scale for normalization */
+  sunrealtype     T0     = SUN_RCONST(0.0); /* initial time                 */
+  sunrealtype     Tf     = SUN_RCONST(1.0); /* final time                   */
+  sunrealtype     tshift = T0;          /* time shift for normalization */
+  sunrealtype     tscale = Tf;          /* time scale for normalization */
 
   /* tolerances */
-  realtype reltol = SUNRsqrt(UNIT_ROUNDOFF);
-  realtype abstol = SUNRsqrt(UNIT_ROUNDOFF)/100;
+  sunrealtype reltol = SUNRsqrt(SUN_UNIT_ROUNDOFF);
+  sunrealtype abstol = SUNRsqrt(SUN_UNIT_ROUNDOFF)/100;
 
   /* general problem variables */
   int flag;                  /* reusable error-checking flag             */
@@ -86,8 +86,8 @@ int main(int argc, char *argv[])
   SUNLinearSolver LS = NULL; /* linear solver object                     */
   void *arkode_mem = NULL;   /* ARKode memory structure                  */
   int i, j;                  /* loop counters                            */
-  realtype tret;             /* integrator return time                   */
-  realtype* data;            /* array for accessing vector data          */
+  sunrealtype tret;             /* integrator return time                   */
+  sunrealtype* data;            /* array for accessing vector data          */
   long int nst, nst_a;       /* number of integrator steps               */
   long int mxsteps = 100000; /* max steps before output                  */
 
@@ -113,8 +113,8 @@ int main(int argc, char *argv[])
       printf("ERROR: Both the initial and final time are required\n");
       return(1);
     }
-    T0 = (realtype) atof(argv[3]);
-    Tf = (realtype) atof(argv[4]);
+    T0 = (sunrealtype) atof(argv[3]);
+    Tf = (sunrealtype) atof(argv[4]);
     if (SUNRabs(T0) >= SUNRabs(Tf)) {
       printf("ERROR: |T0| must be less than |Tf|\n");
       return(1);
@@ -126,8 +126,8 @@ int main(int argc, char *argv[])
       printf("ERROR: Both tshift and tscale are required\n");
       return(1);
     }
-    tshift = (realtype) atof(argv[5]);
-    tscale = (realtype) atof(argv[6]);
+    tshift = (sunrealtype) atof(argv[5]);
+    tscale = (sunrealtype) atof(argv[6]);
     if (SUNRabs(tscale) < TINY) {
       printf("ERROR: |tscale| must be greater than %"GSYM"\n", TINY);
       return(1);
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
   for (i = 0; i < order + 1; i++) {
     data = N_VGetArrayPointer(forcing[i]);
     for (j = 0; j < NEQ; j++) {
-      data[j] = (realtype) rand() / (realtype) RAND_MAX;
+      data[j] = (sunrealtype) rand() / (sunrealtype) RAND_MAX;
     }
   }
 
@@ -406,14 +406,14 @@ int main(int argc, char *argv[])
  *-------------------------------*/
 
 /* ODE RHS function */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   N_VConst(ZERO, ydot);
   return 0;
 }
 
 /* ODE RHS Jacobian function */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   SUNMatZero(J);
@@ -460,16 +460,16 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
 }
 
 /* computed the true solution at a given time */
-static int compute_ans(realtype t, realtype tshift, realtype tscale,
+static int compute_ans(sunrealtype t, sunrealtype tshift, sunrealtype tscale,
                        N_Vector* forcing, int order, N_Vector ans)
 {
   int       i;
-  realtype  tau;
+  sunrealtype  tau;
   N_Vector* vecs;
-  realtype* vals;
+  sunrealtype* vals;
 
   vals = NULL;
-  vals = (realtype*) calloc(order + 1, sizeof(realtype));
+  vals = (sunrealtype*) calloc(order + 1, sizeof(sunrealtype));
   if (vals == NULL) return(1);
 
   vecs = NULL;
@@ -493,11 +493,11 @@ static int compute_ans(realtype t, realtype tshift, realtype tscale,
 }
 
 /* compure the weighted max norm of the difference of two vectors */
-static int compute_error(N_Vector y, N_Vector ans, N_Vector tmp, realtype rtol,
-                         realtype atol)
+static int compute_error(N_Vector y, N_Vector ans, N_Vector tmp, sunrealtype rtol,
+                         sunrealtype atol)
 {
   int      status; /* success (0) or failure (1) flag */
-  realtype error;
+  sunrealtype error;
 
   /* compute the error in y */
   N_VLinearSum(ONE, y, -ONE, ans, y);
diff --git a/test/unit_tests/arkode/C_serial/ark_test_getuserdata.c b/test/unit_tests/arkode/C_serial/ark_test_getuserdata.c
index 7fd3aeea30..14d027503d 100644
--- a/test/unit_tests/arkode/C_serial/ark_test_getuserdata.c
+++ b/test/unit_tests/arkode/C_serial/ark_test_getuserdata.c
@@ -26,7 +26,7 @@
 #define ONE  SUN_RCONST(1.0)
 
 /* Dummy user-supplied function */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   return 0;
 }
diff --git a/test/unit_tests/arkode/C_serial/ark_test_interp.c b/test/unit_tests/arkode/C_serial/ark_test_interp.c
index 5e7d614016..cd79b34b07 100644
--- a/test/unit_tests/arkode/C_serial/ark_test_interp.c
+++ b/test/unit_tests/arkode/C_serial/ark_test_interp.c
@@ -49,22 +49,22 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 /* Private function to check function return values */
 static int check_flag(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to verify test results */
-static int verify_results(realtype lambda, int rtype,
-                          realtype *yrate, realtype *dyrate,
-                          realtype *d2yrate, realtype *yrate2,
-                          realtype *dyrate2, realtype *d2yrate2);
+static int verify_results(sunrealtype lambda, int rtype,
+                          sunrealtype *yrate, sunrealtype *dyrate,
+                          sunrealtype *d2yrate, sunrealtype *yrate2,
+                          sunrealtype *dyrate2, sunrealtype *d2yrate2);
 
 /* Main Program */
 int main(int argc, char *argv[])
 {
   /* initial declaration of all variables */
-  realtype T0, Tf, lambda, t, t_test, hbase, rtol, atol;
+  sunrealtype T0, Tf, lambda, t, t_test, hbase, rtol, atol;
   sunindextype NEQ;
   int flag, nttest, ideg, ih, itest, rtype;
   N_Vector y, ytest, dytest, d2ytest, d3ytest, d4ytest, d5ytest;
@@ -72,35 +72,35 @@ int main(int argc, char *argv[])
   SUNMatrix A;
   SUNLinearSolver LS;
   void *arkode_mem;
-  realtype hvals[NHVALS], yerrs[NHVALS], dyerrs[NHVALS], d2yerrs[NHVALS];
-  realtype d3yerrs[NHVALS], d4yerrs[NHVALS], d5yerrs[NHVALS];
-  realtype yrate[ARK_INTERP_MAX_DEGREE+1], dyrate[ARK_INTERP_MAX_DEGREE+1];
-  realtype d2yrate[ARK_INTERP_MAX_DEGREE+1], d3yrate[ARK_INTERP_MAX_DEGREE+1];
-  realtype d4yrate[ARK_INTERP_MAX_DEGREE+1], d5yrate[ARK_INTERP_MAX_DEGREE+1];
-  realtype yferr[ARK_INTERP_MAX_DEGREE+1], dyferr[ARK_INTERP_MAX_DEGREE+1];
-  realtype d2yferr[ARK_INTERP_MAX_DEGREE+1], d3yferr[ARK_INTERP_MAX_DEGREE+1];
-  realtype d4yferr[ARK_INTERP_MAX_DEGREE+1], d5yferr[ARK_INTERP_MAX_DEGREE+1];
-  realtype yrate2[ARK_INTERP_MAX_DEGREE+1], dyrate2[ARK_INTERP_MAX_DEGREE+1];
-  realtype d2yrate2[ARK_INTERP_MAX_DEGREE+1], yferr2[ARK_INTERP_MAX_DEGREE+1];
-  realtype dyferr2[ARK_INTERP_MAX_DEGREE+1], d2yferr2[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype hvals[NHVALS], yerrs[NHVALS], dyerrs[NHVALS], d2yerrs[NHVALS];
+  sunrealtype d3yerrs[NHVALS], d4yerrs[NHVALS], d5yerrs[NHVALS];
+  sunrealtype yrate[ARK_INTERP_MAX_DEGREE+1], dyrate[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype d2yrate[ARK_INTERP_MAX_DEGREE+1], d3yrate[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype d4yrate[ARK_INTERP_MAX_DEGREE+1], d5yrate[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype yferr[ARK_INTERP_MAX_DEGREE+1], dyferr[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype d2yferr[ARK_INTERP_MAX_DEGREE+1], d3yferr[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype d4yferr[ARK_INTERP_MAX_DEGREE+1], d5yferr[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype yrate2[ARK_INTERP_MAX_DEGREE+1], dyrate2[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype d2yrate2[ARK_INTERP_MAX_DEGREE+1], yferr2[ARK_INTERP_MAX_DEGREE+1];
+  sunrealtype dyferr2[ARK_INTERP_MAX_DEGREE+1], d2yferr2[ARK_INTERP_MAX_DEGREE+1];
 
   /* Create the SUNDIALS context object for this simulation. */
   SUNContext sunctx = NULL;
   SUNContext_Create(NULL, &sunctx);
 
   /* general problem parameters */
-  T0 = RCONST(0.0);       /* initial time */
-  Tf = RCONST(10.0);      /* final time */
+  T0 = SUN_RCONST(0.0);       /* initial time */
+  Tf = SUN_RCONST(10.0);      /* final time */
   NEQ = 2;                /* number of dependent vars. */
 
   /* if an argument supplied, set lambda (otherwise use -100) */
-  lambda = -RCONST(100.0);
+  lambda = -SUN_RCONST(100.0);
   if (argc > 1)  lambda = strtod(argv[1], NULL);
 
   /* determine test configuration */
-  if (sizeof(realtype) == 4) {
+  if (sizeof(sunrealtype) == 4) {
     rtype = 32;
-  } else if (sizeof(realtype) == 8) {
+  } else if (sizeof(sunrealtype) == 8) {
     rtype = 64;
   } else {
     rtype = 128;
@@ -164,7 +164,7 @@ int main(int argc, char *argv[])
 
   /* test parameters */
   nttest = 500;
-  hbase = RCONST(2.0);
+  hbase = SUN_RCONST(2.0);
 
   /*---- Part I: Hermite interpolation module ----*/
   printf("\nHermite interpolation module tests:\n");
@@ -174,23 +174,23 @@ int main(int argc, char *argv[])
 
     /* reset error/convergence arrays */
     for (ih=0; ih<NHVALS; ih++) {
-      yerrs[ih]   = RCONST(0.0);
-      dyerrs[ih]  = RCONST(0.0);
-      d2yerrs[ih] = RCONST(0.0);
-      d3yerrs[ih] = RCONST(0.0);
-      d4yerrs[ih] = RCONST(0.0);
-      d5yerrs[ih] = RCONST(0.0);
+      yerrs[ih]   = SUN_RCONST(0.0);
+      dyerrs[ih]  = SUN_RCONST(0.0);
+      d2yerrs[ih] = SUN_RCONST(0.0);
+      d3yerrs[ih] = SUN_RCONST(0.0);
+      d4yerrs[ih] = SUN_RCONST(0.0);
+      d5yerrs[ih] = SUN_RCONST(0.0);
     }
 
     /* run tests for this dense output polynomial degree */
     for (ih=0; ih<NHVALS; ih++) {
 
       /* set test stepsize */
-      hvals[ih] = RCONST(2.0)/pow(hbase,ih);
+      hvals[ih] = SUN_RCONST(2.0)/pow(hbase,ih);
 
       /* Initialize y values */
-      NV_Ith_S(y,0) = RCONST(0.0);
-      NV_Ith_S(y,1) = RCONST(1.0);
+      NV_Ith_S(y,0) = SUN_RCONST(0.0);
+      NV_Ith_S(y,1) = SUN_RCONST(1.0);
 
       /* Create/initialize ARKStep module */
       arkode_mem = ARKStepCreate(NULL, f, T0, y, sunctx);
@@ -261,23 +261,23 @@ int main(int argc, char *argv[])
 
         /* set error values */
         /*   y */
-        NV_Ith_S(yerr,0) = SUNRabs(SIN(RCONST(2.0)*t_test) - NV_Ith_S(ytest,0));
-        NV_Ith_S(yerr,1) = SUNRabs(COS(RCONST(3.0)*t_test) - NV_Ith_S(ytest,1));
+        NV_Ith_S(yerr,0) = SUNRabs(SIN(SUN_RCONST(2.0)*t_test) - NV_Ith_S(ytest,0));
+        NV_Ith_S(yerr,1) = SUNRabs(COS(SUN_RCONST(3.0)*t_test) - NV_Ith_S(ytest,1));
         /*   dy */
-        NV_Ith_S(dyerr,0) = SUNRabs(RCONST(2.0)*COS(RCONST(2.0)*t_test) - NV_Ith_S(dytest,0));
-        NV_Ith_S(dyerr,1) = SUNRabs(-RCONST(3.0)*SIN(RCONST(3.0)*t_test) - NV_Ith_S(dytest,1));
+        NV_Ith_S(dyerr,0) = SUNRabs(SUN_RCONST(2.0)*COS(SUN_RCONST(2.0)*t_test) - NV_Ith_S(dytest,0));
+        NV_Ith_S(dyerr,1) = SUNRabs(-SUN_RCONST(3.0)*SIN(SUN_RCONST(3.0)*t_test) - NV_Ith_S(dytest,1));
         /*   d2y */
-        NV_Ith_S(d2yerr,0) = SUNRabs(-RCONST(4.0)*SIN(RCONST(2.0)*t_test) - NV_Ith_S(d2ytest,0));
-        NV_Ith_S(d2yerr,1) = SUNRabs(-RCONST(9.0)*COS(RCONST(3.0)*t_test) - NV_Ith_S(d2ytest,1));
+        NV_Ith_S(d2yerr,0) = SUNRabs(-SUN_RCONST(4.0)*SIN(SUN_RCONST(2.0)*t_test) - NV_Ith_S(d2ytest,0));
+        NV_Ith_S(d2yerr,1) = SUNRabs(-SUN_RCONST(9.0)*COS(SUN_RCONST(3.0)*t_test) - NV_Ith_S(d2ytest,1));
         /*   d3y */
-        NV_Ith_S(d3yerr,0) = SUNRabs(-RCONST(8.0)*COS(RCONST(2.0)*t_test) - NV_Ith_S(d3ytest,0));
-        NV_Ith_S(d3yerr,1) = SUNRabs(RCONST(27.0)*SIN(RCONST(3.0)*t_test) - NV_Ith_S(d3ytest,1));
+        NV_Ith_S(d3yerr,0) = SUNRabs(-SUN_RCONST(8.0)*COS(SUN_RCONST(2.0)*t_test) - NV_Ith_S(d3ytest,0));
+        NV_Ith_S(d3yerr,1) = SUNRabs(SUN_RCONST(27.0)*SIN(SUN_RCONST(3.0)*t_test) - NV_Ith_S(d3ytest,1));
         /*   d4y */
-        NV_Ith_S(d4yerr,0) = SUNRabs(RCONST(16.0)*SIN(RCONST(2.0)*t_test) - NV_Ith_S(d4ytest,0));
-        NV_Ith_S(d4yerr,1) = SUNRabs(RCONST(81.0)*COS(RCONST(3.0)*t_test) - NV_Ith_S(d4ytest,1));
+        NV_Ith_S(d4yerr,0) = SUNRabs(SUN_RCONST(16.0)*SIN(SUN_RCONST(2.0)*t_test) - NV_Ith_S(d4ytest,0));
+        NV_Ith_S(d4yerr,1) = SUNRabs(SUN_RCONST(81.0)*COS(SUN_RCONST(3.0)*t_test) - NV_Ith_S(d4ytest,1));
         /*   d5y */
-        NV_Ith_S(d5yerr,0) = SUNRabs(RCONST(32.0)*COS(RCONST(2.0)*t_test) - NV_Ith_S(d5ytest,0));
-        NV_Ith_S(d5yerr,1) = SUNRabs(-RCONST(243.0)*SIN(RCONST(3.0)*t_test) - NV_Ith_S(d5ytest,1));
+        NV_Ith_S(d5yerr,0) = SUNRabs(SUN_RCONST(32.0)*COS(SUN_RCONST(2.0)*t_test) - NV_Ith_S(d5ytest,0));
+        NV_Ith_S(d5yerr,1) = SUNRabs(-SUN_RCONST(243.0)*SIN(SUN_RCONST(3.0)*t_test) - NV_Ith_S(d5ytest,1));
 
         /* compute error norms (2-norm per test, max-norm over interval) */
         yerrs[ih] = SUNMAX(yerrs[ih], SQRT(N_VDotProd(yerr,yerr)));
@@ -361,20 +361,20 @@ int main(int argc, char *argv[])
 
     /* reset error/convergence arrays */
     for (ih=0; ih<NHVALS; ih++) {
-      yerrs[ih] = RCONST(0.0);
-      dyerrs[ih] = RCONST(0.0);
-      d2yerrs[ih] = RCONST(0.0);
+      yerrs[ih] = SUN_RCONST(0.0);
+      dyerrs[ih] = SUN_RCONST(0.0);
+      d2yerrs[ih] = SUN_RCONST(0.0);
     }
 
     /* run tests for this dense output polynomial degree */
     for (ih=0; ih<NHVALS; ih++) {
 
       /* set test stepsize */
-      hvals[ih] = RCONST(2.0)/pow(hbase,ih);
+      hvals[ih] = SUN_RCONST(2.0)/pow(hbase,ih);
 
       /* Initialize y values */
-      NV_Ith_S(y,0) = RCONST(0.0);
-      NV_Ith_S(y,1) = RCONST(1.0);
+      NV_Ith_S(y,0) = SUN_RCONST(0.0);
+      NV_Ith_S(y,1) = SUN_RCONST(1.0);
 
       /* Create/initialize ARKStep module */
       arkode_mem = ARKStepCreate(NULL, f, T0, y, sunctx);
@@ -438,14 +438,14 @@ int main(int argc, char *argv[])
 
         /* set error values */
         /*   y */
-        NV_Ith_S(yerr,0) = SUNRabs(SIN(RCONST(2.0)*t_test) - NV_Ith_S(ytest,0));
-        NV_Ith_S(yerr,1) = SUNRabs(COS(RCONST(3.0)*t_test) - NV_Ith_S(ytest,1));
+        NV_Ith_S(yerr,0) = SUNRabs(SIN(SUN_RCONST(2.0)*t_test) - NV_Ith_S(ytest,0));
+        NV_Ith_S(yerr,1) = SUNRabs(COS(SUN_RCONST(3.0)*t_test) - NV_Ith_S(ytest,1));
         /*   dy */
-        NV_Ith_S(dyerr,0) = SUNRabs(RCONST(2.0)*COS(RCONST(2.0)*t_test) - NV_Ith_S(dytest,0));
-        NV_Ith_S(dyerr,1) = SUNRabs(-RCONST(3.0)*SIN(RCONST(3.0)*t_test) - NV_Ith_S(dytest,1));
+        NV_Ith_S(dyerr,0) = SUNRabs(SUN_RCONST(2.0)*COS(SUN_RCONST(2.0)*t_test) - NV_Ith_S(dytest,0));
+        NV_Ith_S(dyerr,1) = SUNRabs(-SUN_RCONST(3.0)*SIN(SUN_RCONST(3.0)*t_test) - NV_Ith_S(dytest,1));
         /*   d2y */
-        NV_Ith_S(d2yerr,0) = SUNRabs(-RCONST(4.0)*SIN(RCONST(2.0)*t_test) - NV_Ith_S(d2ytest,0));
-        NV_Ith_S(d2yerr,1) = SUNRabs(-RCONST(9.0)*COS(RCONST(3.0)*t_test) - NV_Ith_S(d2ytest,1));
+        NV_Ith_S(d2yerr,0) = SUNRabs(-SUN_RCONST(4.0)*SIN(SUN_RCONST(2.0)*t_test) - NV_Ith_S(d2ytest,0));
+        NV_Ith_S(d2yerr,1) = SUNRabs(-SUN_RCONST(9.0)*COS(SUN_RCONST(3.0)*t_test) - NV_Ith_S(d2ytest,1));
 
         /* compute error norms (2-norm per test, max-norm over interval) */
         yerrs[ih] = SUNMAX(yerrs[ih], SQRT(N_VDotProd(yerr,yerr)));
@@ -548,13 +548,13 @@ int main(int argc, char *argv[])
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *lambda = (realtype *) user_data;
-  NV_Ith_S(ydot,0) = (*lambda)*(NV_Ith_S(y,0) - SIN(RCONST(2.0)*t))
-    + NV_Ith_S(y,1) - COS(RCONST(3.0)*t) + RCONST(2.0)*COS(RCONST(2.0)*t);
-  NV_Ith_S(ydot,1) = NV_Ith_S(y,0) - NV_Ith_S(y,1) - SIN(RCONST(2.0)*t)
-    + COS(RCONST(3.0)*t) - RCONST(3.0)*SIN(RCONST(3.0)*t);
+  sunrealtype *lambda = (sunrealtype *) user_data;
+  NV_Ith_S(ydot,0) = (*lambda)*(NV_Ith_S(y,0) - SIN(SUN_RCONST(2.0)*t))
+    + NV_Ith_S(y,1) - COS(SUN_RCONST(3.0)*t) + SUN_RCONST(2.0)*COS(SUN_RCONST(2.0)*t);
+  NV_Ith_S(ydot,1) = NV_Ith_S(y,0) - NV_Ith_S(y,1) - SIN(SUN_RCONST(2.0)*t)
+    + COS(SUN_RCONST(3.0)*t) - SUN_RCONST(3.0)*SIN(SUN_RCONST(3.0)*t);
   return 0;  /* Return with success */
 }
 
@@ -608,13 +608,13 @@ static int check_flag(void *flagvalue, const char *funcname, int opt)
    error values >1 are omitted from these checks, as non-convergence
    may occur differently on various architectures.
 
-   We consider realtype precisions {32,64,128} and stiffness values
+   We consider sunrealtype precisions {32,64,128} and stiffness values
    lambda = {-1e2, -1e4, -1e6}.
 */
-static int verify_results(realtype lambda, int rtype,
-                          realtype *yrate, realtype *dyrate,
-                          realtype *d2yrate, realtype *yrate2,
-                          realtype *dyrate2, realtype *d2yrate2)
+static int verify_results(sunrealtype lambda, int rtype,
+                          sunrealtype *yrate, sunrealtype *dyrate,
+                          sunrealtype *d2yrate, sunrealtype *yrate2,
+                          sunrealtype *dyrate2, sunrealtype *d2yrate2)
 {
   int tests=0;
   int failure=0;
diff --git a/test/unit_tests/arkode/C_serial/ark_test_reset.c b/test/unit_tests/arkode/C_serial/ark_test_reset.c
index f9c7a61c24..3b191255c8 100644
--- a/test/unit_tests/arkode/C_serial/ark_test_reset.c
+++ b/test/unit_tests/arkode/C_serial/ark_test_reset.c
@@ -54,29 +54,29 @@
 #endif
 
 /* User-supplied Functions Called by the Solver */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data);
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 /* Analytical solution */
-static realtype ytrue(realtype t);
+static sunrealtype ytrue(sunrealtype t);
 
 /* Private function to check function return values */
 static int check_retval(void *flagvalue, const char *funcname, int opt);
 
 /* Private function to check computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol);
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol);
 
 /* Main Program */
 int main()
 {
   /* general problem parameters */
-  realtype T0     = RCONST(0.0);
-  realtype dTout  = RCONST(0.1);
-  realtype lambda = RCONST(-25.0);
-  realtype rtol   = RCONST(1e-3);
-  realtype atol   = RCONST(1e-6);
+  sunrealtype T0     = SUN_RCONST(0.0);
+  sunrealtype dTout  = SUN_RCONST(0.1);
+  sunrealtype lambda = SUN_RCONST(-25.0);
+  sunrealtype rtol   = SUN_RCONST(1e-3);
+  sunrealtype atol   = SUN_RCONST(1e-6);
 
   /* general problem variables */
   N_Vector y = NULL;
@@ -86,7 +86,7 @@ int main()
   void *mristep_mem = NULL;
   MRIStepInnerStepper inner_stepper = NULL;
   int retval;
-  realtype t;
+  sunrealtype t;
 
   SUNContext ctx;
 
@@ -125,7 +125,7 @@ int main()
   check_retval(&retval, "ERKStepSetStopTime", 1);
   retval = ERKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ERKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Initial ERKStepEvolve had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -144,7 +144,7 @@ int main()
   check_retval(&retval, "ERKStepReset", 1);
   retval = ERKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ERKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Second ERKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -156,13 +156,13 @@ int main()
   }
 
   /* Reset state to analytical solution at 3*dTout, evolve to 4*dTout and check result */
-  t = T0 + RCONST(3.0)*dTout;
+  t = T0 + SUN_RCONST(3.0)*dTout;
   N_VConst(ytrue(t), y);
   retval = ERKStepReset(arkode_mem, t, y);
   check_retval(&retval, "ERKStepReset", 1);
   retval = ERKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ERKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Third ERKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -180,7 +180,7 @@ int main()
   check_retval(&retval, "ERKStepReset", 1);
   retval = ERKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ERKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Fourth ERKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -220,7 +220,7 @@ int main()
   /* Initially evolve to dTout, and check result */
   retval = ARKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ARKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Initial ARKStepEvolve had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -238,7 +238,7 @@ int main()
   check_retval(&retval, "ARKStepReset", 1);
   retval = ARKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ARKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Second ARKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -250,13 +250,13 @@ int main()
   }
 
   /* Reset state to analytical solution at 3*dTout, evolve to 4*dTout and check result */
-  t = T0 + RCONST(3.0)*dTout;
+  t = T0 + SUN_RCONST(3.0)*dTout;
   N_VConst(ytrue(t), y);
   retval = ARKStepReset(arkode_mem, t, y);
   check_retval(&retval, "ARKStepReset", 1);
   retval = ARKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ARKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Third ARKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -274,7 +274,7 @@ int main()
   check_retval(&retval, "ARKStepReset", 1);
   retval = ARKStepEvolve(arkode_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "ARKStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Fourth ARKStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -316,13 +316,13 @@ int main()
   if (check_retval(&retval, "MRIStepSetLinear", 1)) return 1;
   retval = MRIStepSetMaxNumSteps(mristep_mem, 100);
   check_retval(&retval, "MRIStepSetMaxNumSteps", 1);
-  retval = MRIStepSetFixedStep(mristep_mem, dTout*RCONST(0.105));
+  retval = MRIStepSetFixedStep(mristep_mem, dTout*SUN_RCONST(0.105));
   check_retval(&retval, "MRIStepSetFixedStep", 1);
 
   /* Initially evolve to dTout, and check result */
   retval = MRIStepEvolve(mristep_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "MRIStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Initial MRIStepEvolve had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -340,7 +340,7 @@ int main()
   check_retval(&retval, "MRIStepReset", 1);
   retval = MRIStepEvolve(mristep_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "MRIStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Second MRIStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -352,13 +352,13 @@ int main()
   }
 
   /* Reset state to analytical solution at 3*dTout, evolve to 4*dTout and check result */
-  t = T0 + RCONST(3.0)*dTout;
+  t = T0 + SUN_RCONST(3.0)*dTout;
   N_VConst(ytrue(t), y);
   retval = MRIStepReset(mristep_mem, t, y);
   check_retval(&retval, "MRIStepReset", 1);
   retval = MRIStepEvolve(mristep_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "MRIStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Third MRIStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -376,7 +376,7 @@ int main()
   check_retval(&retval, "MRIStepReset", 1);
   retval = MRIStepEvolve(mristep_mem, t + dTout, y, &t, ARK_NORMAL);
   if (check_retval(&retval, "MRIStepEvolve", 1)) return 1;
-  if (check_ans(y, t, RCONST(0.001), RCONST(0.000001))) {
+  if (check_ans(y, t, SUN_RCONST(0.001), SUN_RCONST(0.000001))) {
     printf("  Fourth MRIStepEvolve call had insufficient accuracy\n");
     printf("    t = %" GSYM "\n", t);
     printf("    y = %" GSYM "\n", NV_Ith_S(y,0));
@@ -406,32 +406,32 @@ int main()
  *-------------------------------*/
 
 /* f routine to compute the ODE RHS function f(t,y). */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lambda = rdata[0];                 /* set shortcut for stiffness parameter */
-  realtype u = NV_Ith_S(y,0);                 /* access current solution value */
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lambda = rdata[0];                 /* set shortcut for stiffness parameter */
+  sunrealtype u = NV_Ith_S(y,0);                 /* access current solution value */
 
   /* fill in the RHS function: "NV_Ith_S" accesses the 0th entry of ydot */
-  NV_Ith_S(ydot,0) = lambda*u + RCONST(1.0)/(RCONST(1.0)+t*t) - lambda*atan(t);
+  NV_Ith_S(ydot,0) = lambda*u + SUN_RCONST(1.0)/(SUN_RCONST(1.0)+t*t) - lambda*atan(t);
 
   return 0;                                   /* return with success */
 }
 
 /* f0 routine to compute a zero-valued ODE RHS function f(t,y). */
-static int f0(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f0(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  N_VConst(RCONST(0.0), ydot);
+  N_VConst(SUN_RCONST(0.0), ydot);
   return 0;
 }
 
 /* Jacobian routine to compute J(t,y) = df/dy. */
-static int Jac(realtype t, N_Vector y, N_Vector fy, SUNMatrix J,
+static int Jac(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J,
                void *user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype *rdata = (realtype *) user_data;   /* cast user_data to realtype */
-  realtype lambda = rdata[0];                  /* set shortcut for stiffness parameter */
-  realtype *Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype *rdata = (sunrealtype *) user_data;   /* cast user_data to sunrealtype */
+  sunrealtype lambda = rdata[0];                  /* set shortcut for stiffness parameter */
+  sunrealtype *Jdata = SUNDenseMatrix_Data(J);
 
   /* Fill in Jacobian of f: set the first entry of the data array to set the (0,0) entry */
   Jdata[0] = lambda;
@@ -479,24 +479,24 @@ static int check_retval(void *flagvalue, const char *funcname, int opt)
 }
 
 /* analytical solution */
-static realtype ytrue(realtype t)
+static sunrealtype ytrue(sunrealtype t)
 {
   return (atan(t));
 }
 
 /* check the computed solution */
-static int check_ans(N_Vector y, realtype t, realtype rtol, realtype atol)
+static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype atol)
 {
   int      passfail=0;     /* answer pass (0) or fail (1) value    */
-  realtype ans, err, ewt;  /* answer data, error, and error weight */
+  sunrealtype ans, err, ewt;  /* answer data, error, and error weight */
 
   /* compute solution error */
   ans = ytrue(t);
-  ewt = RCONST(1.0) / (rtol * fabs(ans) + atol);
+  ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol);
   err = ewt * fabs(NV_Ith_S(y,0) - ans);
 
   /* is the solution within the tolerances? */
-  passfail = (err < RCONST(1.0)) ? 0 : 1;
+  passfail = (err < SUN_RCONST(1.0)) ? 0 : 1;
 
   if (passfail) {
     fprintf(stdout, "\nSUNDIALS_WARNING: check_ans error=%"GSYM"\n\n", err);
diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.cpp b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.cpp
index 7105d57cf0..673e08b636 100644
--- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.cpp
+++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.cpp
@@ -46,11 +46,11 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0] = utrue;
   ydata[1] = vtrue;
 
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
   flag = CVodeSetJacFn(cvode_mem, J);
   if (check_flag(flag, "CVodeSetJacFn")) return 1;
 
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag = CVodeSetUserData(cvode_mem, udata);
   if (check_flag(flag, "CVodeSetUserData")) return 1;
 
@@ -118,12 +118,12 @@ int main(int argc, char* argv[])
   if (check_flag(flag, "CVodeSetDeltaGammaMaxBadJac")) return 1;
 
   // Initial time and fist output time
-  realtype tret  = ZERO;
-  realtype tout  = tret + opts.dtout;
+  sunrealtype tret  = ZERO;
+  sunrealtype tout  = tret + opts.dtout;
 
   // Output initial contion
   cout << scientific;
-  cout << setprecision(numeric_limits<realtype>::digits10);
+  cout << setprecision(numeric_limits<sunrealtype>::digits10);
   cout << "           t              ";
   cout << "          u              ";
   cout << "          v              ";
@@ -179,22 +179,22 @@ int main(int argc, char* argv[])
  *   [a  b] * [ (-1 + u^2 - r(t)) / (2*u) ] + [ r'(t) / (2u) ]
  *   [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ]
  * ---------------------------------------------------------------------------*/
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* fdata = N_VGetArrayPointer(ydot);
+  sunrealtype* fdata = N_VGetArrayPointer(ydot);
   fdata[0] = a * tmp1 + b * tmp2 + rdot(t) / (TWO * u);
   fdata[1] = c * tmp1 + d * tmp2 + sdot(t) / (TWO * v);
 
@@ -206,20 +206,20 @@ int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  *   [a/2 + (a(1+r(t))-rdot(t))/(2u^2)     b/2 + b*(2+s(t))/(2*v^2)         ]
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-sdot(t))/(2u^2) ]
  * ---------------------------------------------------------------------------*/
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  realtype* Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   Jdata[0] = a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u);
   Jdata[1] = c / TWO +  c * (ONE + r(t)) / (TWO * u * u);
diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
index d09f3ba46c..1254616f7e 100644
--- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
+++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.hpp
@@ -31,11 +31,11 @@
 #include "sunlinsol/sunlinsol_dense.h"
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 using namespace std;
 
@@ -46,44 +46,44 @@ using namespace std;
 struct TestOptions
 {
   // Relative and absolute tolerances
-  realtype rtol = RCONST(1.0e-6);
-  realtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Fixed step size eta bounds (use defaults = 0.0 and 1.5)
-  realtype eta_min_fx = -ONE;
-  realtype eta_max_fx = -ONE;
+  sunrealtype eta_min_fx = -ONE;
+  sunrealtype eta_max_fx = -ONE;
 
   // Max first step eta bound (use default = 10,000)
-  realtype eta_max_fs = -ONE;
+  sunrealtype eta_max_fs = -ONE;
 
   // Max early step eta bound and number of steps (use defaults = 10 and 10)
-  realtype eta_max_es = -ONE;
+  sunrealtype eta_max_es = -ONE;
   long int small_nst  = -1;
 
   // Max eta bound on a general step (use default = 10)
-  realtype eta_max_gs = -ONE;
+  sunrealtype eta_max_gs = -ONE;
 
   // Min eta bound on a general step (use default = 0.1)
-  realtype eta_min = -ONE;
+  sunrealtype eta_min = -ONE;
 
   // Min eta bound after an error test fail (use default = 0.1)
-  realtype eta_min_ef = -ONE;
+  sunrealtype eta_min_ef = -ONE;
 
   // Max eta bound after multiple error test fails and number of fails necessary
   // (use defaults = 0.2 and 2)
-  realtype eta_max_ef = -ONE;
+  sunrealtype eta_max_ef = -ONE;
   int      small_nef  = -1;
 
   // Eta value on a nonlinear solver convergence failure (use default = 0.25)
-  realtype eta_cf = -ONE;
+  sunrealtype eta_cf = -ONE;
 
   // Change in gamma to call lsetup or mark a Jacobian as bad (use defaults 0.3
   // and 0.2
-  realtype dgmax_lsetup = -ONE;
-  realtype dgmax_jbad   = -ONE;
+  sunrealtype dgmax_lsetup = -ONE;
+  sunrealtype dgmax_jbad   = -ONE;
 
   // Output options
-  realtype dtout = ONE; // output interval
+  sunrealtype dtout = ONE; // output interval
   int      nout  = 10;  // number of outputs
 };
 
@@ -92,10 +92,10 @@ struct TestOptions
 // -----------------------------------------------------------------------------
 
 // ODE right-hand side function
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 // Jacobian of RHS function
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
@@ -103,31 +103,31 @@ int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
 // -----------------------------------------------------------------------------
 
 // Compute r(t)
-static realtype r(realtype t)
+static sunrealtype r(sunrealtype t)
 {
   return HALF * cos(t);
 }
 
 // Compute the derivative of r(t)
-static realtype rdot(realtype t)
+static sunrealtype rdot(sunrealtype t)
 {
   return -HALF * sin(t);
 }
 
 // Compute s(t)
-static realtype s(realtype t)
+static sunrealtype s(sunrealtype t)
 {
   return cos(TWENTY * t);
 }
 
 // Compute the derivative of s(t)
-static realtype sdot(realtype t)
+static sunrealtype sdot(sunrealtype t)
 {
   return -TWENTY * sin(TWENTY * t);
 }
 
 // Compute the true solution
-static int true_sol(realtype t, realtype* u, realtype* v)
+static int true_sol(sunrealtype t, sunrealtype* u, sunrealtype* v)
 {
   *u = sqrt(ONE + r(t));
   *v = sqrt(TWO + s(t));
@@ -156,7 +156,7 @@ int check_ptr(void *ptr, const string funcname)
   return 1;
 }
 
-inline void find_arg(vector<string> &args, const string key, realtype &dest)
+inline void find_arg(vector<string> &args, const string key, sunrealtype &dest)
 {
   auto it = find(args.begin(), args.end(), key);
   if (it != args.end())
diff --git a/test/unit_tests/cvode/C_serial/cv_test_getuserdata.c b/test/unit_tests/cvode/C_serial/cv_test_getuserdata.c
index 63e348f590..8b3a82ff88 100644
--- a/test/unit_tests/cvode/C_serial/cv_test_getuserdata.c
+++ b/test/unit_tests/cvode/C_serial/cv_test_getuserdata.c
@@ -24,7 +24,7 @@
 #define ONE  SUN_RCONST(1.0)
 
 /* Dummy user-supplied function */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   return 0;
 }
diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.cpp b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.cpp
index 5c0a09d0bd..ead24c6957 100644
--- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.cpp
+++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.cpp
@@ -46,11 +46,11 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0] = utrue;
   ydata[1] = vtrue;
 
@@ -76,7 +76,7 @@ int main(int argc, char* argv[])
   flag = CVodeSetJacFn(cvode_mem, J);
   if (check_flag(flag, "CVodeSetJacFn")) return 1;
 
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag = CVodeSetUserData(cvode_mem, udata);
   if (check_flag(flag, "CVodeSetUserData")) return 1;
 
@@ -118,12 +118,12 @@ int main(int argc, char* argv[])
   if (check_flag(flag, "CVodeSetDeltaGammaMaxBadJac")) return 1;
 
   // Initial time and fist output time
-  realtype tret  = ZERO;
-  realtype tout  = tret + opts.dtout;
+  sunrealtype tret  = ZERO;
+  sunrealtype tout  = tret + opts.dtout;
 
   // Output initial contion
   cout << scientific;
-  cout << setprecision(numeric_limits<realtype>::digits10);
+  cout << setprecision(numeric_limits<sunrealtype>::digits10);
   cout << "           t              ";
   cout << "          u              ";
   cout << "          v              ";
@@ -179,22 +179,22 @@ int main(int argc, char* argv[])
  *   [a  b] * [ (-1 + u^2 - r(t)) / (2*u) ] + [ r'(t) / (2u) ]
  *   [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ]
  * ---------------------------------------------------------------------------*/
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* fdata = N_VGetArrayPointer(ydot);
+  sunrealtype* fdata = N_VGetArrayPointer(ydot);
   fdata[0] = a * tmp1 + b * tmp2 + rdot(t) / (TWO * u);
   fdata[1] = c * tmp1 + d * tmp2 + sdot(t) / (TWO * v);
 
@@ -206,20 +206,20 @@ int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
  *   [a/2 + (a(1+r(t))-rdot(t))/(2u^2)     b/2 + b*(2+s(t))/(2*v^2)         ]
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-sdot(t))/(2u^2) ]
  * ---------------------------------------------------------------------------*/
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  realtype* Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   Jdata[0] = a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u);
   Jdata[1] = c / TWO +  c * (ONE + r(t)) / (TWO * u * u);
diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
index 28c94d0ca3..cfa70b00cb 100644
--- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
+++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.hpp
@@ -31,11 +31,11 @@
 #include "sunlinsol/sunlinsol_dense.h"
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 using namespace std;
 
@@ -46,44 +46,44 @@ using namespace std;
 struct TestOptions
 {
   // Relative and absolute tolerances
-  realtype rtol = RCONST(1.0e-6);
-  realtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Fixed step size eta bounds (use defaults = 0.0 and 1.5)
-  realtype eta_min_fx = -ONE;
-  realtype eta_max_fx = -ONE;
+  sunrealtype eta_min_fx = -ONE;
+  sunrealtype eta_max_fx = -ONE;
 
   // Max first step eta bound (use default = 10,000)
-  realtype eta_max_fs = -ONE;
+  sunrealtype eta_max_fs = -ONE;
 
   // Max early step eta bound and number of steps (use defaults = 10 and 10)
-  realtype eta_max_es = -ONE;
+  sunrealtype eta_max_es = -ONE;
   long int small_nst  = -1;
 
   // Max eta bound on a general step (use default = 10)
-  realtype eta_max_gs = -ONE;
+  sunrealtype eta_max_gs = -ONE;
 
   // Min eta bound on a general step (use default = 0.1)
-  realtype eta_min = -ONE;
+  sunrealtype eta_min = -ONE;
 
   // Min eta bound after an error test fail (use default = 0.1)
-  realtype eta_min_ef = -ONE;
+  sunrealtype eta_min_ef = -ONE;
 
   // Max eta bound after multiple error test fails and number of fails necessary
   // (use defaults = 0.2 and 2)
-  realtype eta_max_ef = -ONE;
+  sunrealtype eta_max_ef = -ONE;
   int      small_nef  = -1;
 
   // Eta value on a nonlinear solver convergence failure (use default = 0.25)
-  realtype eta_cf = -ONE;
+  sunrealtype eta_cf = -ONE;
 
   // Change in gamma to call lsetup or mark a Jacobian as bad (use defaults 0.3
   // and 0.2
-  realtype dgmax_lsetup = -ONE;
-  realtype dgmax_jbad   = -ONE;
+  sunrealtype dgmax_lsetup = -ONE;
+  sunrealtype dgmax_jbad   = -ONE;
 
   // Output options
-  realtype dtout = ONE; // output interval
+  sunrealtype dtout = ONE; // output interval
   int      nout  = 10;  // number of outputs
 };
 
@@ -92,10 +92,10 @@ struct TestOptions
 // -----------------------------------------------------------------------------
 
 // ODE right-hand side function
-int f(realtype t, N_Vector y, N_Vector ydot, void *user_data);
+int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data);
 
 // Jacobian of RHS function
-int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
+int J(sunrealtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
       N_Vector tmp1, N_Vector tmp2, N_Vector tmp3);
 
 // -----------------------------------------------------------------------------
@@ -103,31 +103,31 @@ int J(realtype t, N_Vector y, N_Vector fy, SUNMatrix J, void *user_data,
 // -----------------------------------------------------------------------------
 
 // Compute r(t)
-static realtype r(realtype t)
+static sunrealtype r(sunrealtype t)
 {
   return HALF * cos(t);
 }
 
 // Compute the derivative of r(t)
-static realtype rdot(realtype t)
+static sunrealtype rdot(sunrealtype t)
 {
   return -HALF * sin(t);
 }
 
 // Compute s(t)
-static realtype s(realtype t)
+static sunrealtype s(sunrealtype t)
 {
   return cos(TWENTY * t);
 }
 
 // Compute the derivative of s(t)
-static realtype sdot(realtype t)
+static sunrealtype sdot(sunrealtype t)
 {
   return -TWENTY * sin(TWENTY * t);
 }
 
 // Compute the true solution
-static int true_sol(realtype t, realtype* u, realtype* v)
+static int true_sol(sunrealtype t, sunrealtype* u, sunrealtype* v)
 {
   *u = sqrt(ONE + r(t));
   *v = sqrt(TWO + s(t));
@@ -156,7 +156,7 @@ int check_ptr(void *ptr, const string funcname)
   return 1;
 }
 
-inline void find_arg(vector<string> &args, const string key, realtype &dest)
+inline void find_arg(vector<string> &args, const string key, sunrealtype &dest)
 {
   auto it = find(args.begin(), args.end(), key);
   if (it != args.end())
diff --git a/test/unit_tests/cvodes/C_serial/cvs_test_getuserdata.c b/test/unit_tests/cvodes/C_serial/cvs_test_getuserdata.c
index 45c7b7a879..f108822af8 100644
--- a/test/unit_tests/cvodes/C_serial/cvs_test_getuserdata.c
+++ b/test/unit_tests/cvodes/C_serial/cvs_test_getuserdata.c
@@ -24,7 +24,7 @@
 #define ONE  SUN_RCONST(1.0)
 
 /* Dummy user-supplied function */
-static int f(realtype t, N_Vector y, N_Vector ydot, void *user_data)
+static int f(sunrealtype t, N_Vector y, N_Vector ydot, void *user_data)
 {
   return 0;
 }
diff --git a/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp b/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
index b57874ea40..89767594a7 100644
--- a/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
+++ b/test/unit_tests/ida/CXX_serial/ida_test_getjac.cpp
@@ -136,7 +136,7 @@ int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector res, void* user_data)
  *   [2 a u - 2 u' - 2 cj u   2 b v                 ]
  *   [2 c u                   2 d v - 2 v' - 2 cj v ]
  * ---------------------------------------------------------------------------*/
-int J(sunrealtype t, realtype cj, N_Vector y, N_Vector yp, N_Vector res,
+int J(sunrealtype t, sunrealtype cj, N_Vector y, N_Vector yp, N_Vector res,
       SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunrealtype* udata  = (sunrealtype*)user_data;
@@ -167,7 +167,7 @@ int J(sunrealtype t, realtype cj, N_Vector y, N_Vector yp, N_Vector res,
 // -----------------------------------------------------------------------------
 
 int DenseSetupAndSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                       N_Vector b, realtype tol)
+                       N_Vector b, sunrealtype tol)
 {
   // Create a copy of the matrix for factorization
   SUNMatrix Acpy = SUNMatClone(A);
diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr.cpp b/test/unit_tests/ida/CXX_serial/ida_test_kpr.cpp
index 27ab2f70ad..23ed1f6e93 100644
--- a/test/unit_tests/ida/CXX_serial/ida_test_kpr.cpp
+++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr.cpp
@@ -46,22 +46,22 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0] = utrue;
   ydata[1] = vtrue;
 
   N_Vector yp = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype uptrue, vptrue;
+  sunrealtype uptrue, vptrue;
   flag = true_sol_p(ZERO, &uptrue, &vptrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ypdata = N_VGetArrayPointer(yp);
+  sunrealtype* ypdata = N_VGetArrayPointer(yp);
   ypdata[0] = uptrue;
   ypdata[1] = vptrue;
 
@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
   flag = IDASetJacFn(ida_mem, J);
   if (check_flag(flag, "IDASetJacFn")) return 1;
 
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag = IDASetUserData(ida_mem, udata);
   if (check_flag(flag, "IDASetUserData")) return 1;
 
@@ -111,12 +111,12 @@ int main(int argc, char* argv[])
   if (check_flag(flag, "IDASetDeltaCjLSetup")) return 1;
 
   // Initial time and fist output time
-  realtype tret  = ZERO;
-  realtype tout  = tret + opts.dtout;
+  sunrealtype tret  = ZERO;
+  sunrealtype tout  = tret + opts.dtout;
 
   // Output initial contion
   cout << scientific;
-  cout << setprecision(numeric_limits<realtype>::digits10);
+  cout << setprecision(numeric_limits<sunrealtype>::digits10);
   cout << "           t              ";
   cout << "          u              ";
   cout << "          v              ";
@@ -173,26 +173,26 @@ int main(int argc, char* argv[])
  *   ru = [a  b] * [ (-1 + u^2 - r(t)) / (2*u) ] + [ r'(t) / (2u) ] - [u']
  *   rv = [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ] - [v']
  * ---------------------------------------------------------------------------*/
-int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
+int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  realtype* ypdata = N_VGetArrayPointer(yp);
-  const realtype up = ypdata[0];
-  const realtype vp = ypdata[1];
+  sunrealtype* ypdata = N_VGetArrayPointer(yp);
+  const sunrealtype up = ypdata[0];
+  const sunrealtype vp = ypdata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* rdata = N_VGetArrayPointer(rr);
+  sunrealtype* rdata = N_VGetArrayPointer(rr);
   rdata[0] = (a * tmp1 + b * tmp2 + rdot(t) / (TWO * u)) - up;
   rdata[1] = (c * tmp1 + d * tmp2 + sdot(t) / (TWO * v)) - vp;
 
@@ -204,21 +204,21 @@ int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
  *   [a/2 + (a(1+r(t))-r'(t))/(2u^2) - cj  b/2 + b*(2+s(t))/(2*v^2)            ]
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-s'(t))/(2u^2) - cj ]
  * ---------------------------------------------------------------------------*/
-int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+int J(sunrealtype t,  sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
       SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
       N_Vector tempv3)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  realtype* Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   Jdata[0] = (a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u)) - cj;
   Jdata[1] = c / TWO +  c * (ONE + r(t)) / (TWO * u * u);
diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp b/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
index 97ec70b4f4..f25c91d978 100644
--- a/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
+++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr.hpp
@@ -31,11 +31,11 @@
 #include "sunlinsol/sunlinsol_dense.h"
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 using namespace std;
 
@@ -46,28 +46,28 @@ using namespace std;
 struct TestOptions
 {
   // Relative and absolute tolerances
-  realtype rtol = RCONST(1.0e-6);
-  realtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Fixed step size eta bounds (use defaults = 0.0 and 1.5)
-  realtype eta_min_fx = -ONE;
-  realtype eta_max_fx = -ONE;
+  sunrealtype eta_min_fx = -ONE;
+  sunrealtype eta_max_fx = -ONE;
 
   // Max and min eta bounds on a general step (use default = 10)
-  realtype eta_max = -ONE;
-  realtype eta_min = -ONE;
+  sunrealtype eta_max = -ONE;
+  sunrealtype eta_min = -ONE;
 
   // Min eta bound after an error test fail (use default = 0.25)
-  realtype eta_min_ef = -ONE;
+  sunrealtype eta_min_ef = -ONE;
 
   // Eta value on a nonlinear solver convergence failure (use default = 0.25)
-  realtype eta_cf = -ONE;
+  sunrealtype eta_cf = -ONE;
 
   // Parameter for if a change in c_j needs a call lsetup (use defaults 0.25)
-  realtype dcj = -ONE;
+  sunrealtype dcj = -ONE;
 
   // Output options
-  realtype dtout = ONE; // output interval
+  sunrealtype dtout = ONE; // output interval
   int      nout  = 10;  // number of outputs
 };
 
@@ -76,10 +76,10 @@ struct TestOptions
 // -----------------------------------------------------------------------------
 
 // DAE residual function
-int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data);
+int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data);
 
 // Jacobian of RHS function
-int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+int J(sunrealtype t,  sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
       SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
       N_Vector tempv3);
 
@@ -88,31 +88,31 @@ int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
 // -----------------------------------------------------------------------------
 
 // Compute r(t)
-static realtype r(realtype t)
+static sunrealtype r(sunrealtype t)
 {
   return HALF * cos(t);
 }
 
 // Compute the derivative of r(t)
-static realtype rdot(realtype t)
+static sunrealtype rdot(sunrealtype t)
 {
   return -HALF * sin(t);
 }
 
 // Compute s(t)
-static realtype s(realtype t)
+static sunrealtype s(sunrealtype t)
 {
   return cos(TWENTY * t);
 }
 
 // Compute the derivative of s(t)
-static realtype sdot(realtype t)
+static sunrealtype sdot(sunrealtype t)
 {
   return -TWENTY * sin(TWENTY * t);
 }
 
 // Compute the true solution
-static int true_sol(realtype t, realtype* u, realtype* v)
+static int true_sol(sunrealtype t, sunrealtype* u, sunrealtype* v)
 {
   *u = sqrt(ONE + r(t));
   *v = sqrt(TWO + s(t));
@@ -121,7 +121,7 @@ static int true_sol(realtype t, realtype* u, realtype* v)
 }
 
 // Compute the true solution derivative
-static int true_sol_p(realtype t, realtype* up, realtype* vp)
+static int true_sol_p(sunrealtype t, sunrealtype* up, sunrealtype* vp)
 {
   *up = rdot(t) / (TWO * sqrt(ONE + r(t)));
   *vp = sdot(t) / (TWO * sqrt(TWO + s(t)));
@@ -150,7 +150,7 @@ int check_ptr(void *ptr, const string funcname)
   return 1;
 }
 
-inline void find_arg(vector<string> &args, const string key, realtype &dest)
+inline void find_arg(vector<string> &args, const string key, sunrealtype &dest)
 {
   auto it = find(args.begin(), args.end(), key);
   if (it != args.end())
diff --git a/test/unit_tests/ida/C_serial/ida_test_getuserdata.c b/test/unit_tests/ida/C_serial/ida_test_getuserdata.c
index b745c8bfb3..31e664c189 100644
--- a/test/unit_tests/ida/C_serial/ida_test_getuserdata.c
+++ b/test/unit_tests/ida/C_serial/ida_test_getuserdata.c
@@ -24,7 +24,7 @@
 #define ONE  SUN_RCONST(1.0)
 
 /* Dummy user-supplied function */
-static int r(realtype t, N_Vector y, N_Vector ydot, N_Vector res,
+static int r(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector res,
              void *user_data)
 {
   return 0;
diff --git a/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp b/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
index c084ddc012..bcc4e43d0c 100644
--- a/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
+++ b/test/unit_tests/idas/CXX_serial/idas_test_getjac.cpp
@@ -136,7 +136,7 @@ int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector res, void* user_data)
  *   [2 a u - 2 u' - 2 cj u   2 b v                 ]
  *   [2 c u                   2 d v - 2 v' - 2 cj v ]
  * ---------------------------------------------------------------------------*/
-int J(sunrealtype t, realtype cj, N_Vector y, N_Vector yp, N_Vector res,
+int J(sunrealtype t, sunrealtype cj, N_Vector y, N_Vector yp, N_Vector res,
       SUNMatrix J, void* user_data, N_Vector tmp1, N_Vector tmp2, N_Vector tmp3)
 {
   sunrealtype* udata  = (sunrealtype*)user_data;
@@ -167,7 +167,7 @@ int J(sunrealtype t, realtype cj, N_Vector y, N_Vector yp, N_Vector res,
 // -----------------------------------------------------------------------------
 
 int DenseSetupAndSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                       N_Vector b, realtype tol)
+                       N_Vector b, sunrealtype tol)
 {
   // Create a copy of the matrix for factorization
   SUNMatrix Acpy = SUNMatClone(A);
diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr.cpp b/test/unit_tests/idas/CXX_serial/idas_test_kpr.cpp
index 61bc0b2f59..5816715110 100644
--- a/test/unit_tests/idas/CXX_serial/idas_test_kpr.cpp
+++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr.cpp
@@ -46,22 +46,22 @@ int main(int argc, char* argv[])
   N_Vector y = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype utrue, vtrue;
+  sunrealtype utrue, vtrue;
   flag = true_sol(ZERO, &utrue, &vtrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
   ydata[0] = utrue;
   ydata[1] = vtrue;
 
   N_Vector yp = N_VNew_Serial(2, sunctx);
   if (check_ptr(y, "N_VNew_Serial")) return 1;
 
-  realtype uptrue, vptrue;
+  sunrealtype uptrue, vptrue;
   flag = true_sol_p(ZERO, &uptrue, &vptrue);
   if (check_flag(flag, "true_sol")) return 1;
 
-  realtype* ypdata = N_VGetArrayPointer(yp);
+  sunrealtype* ypdata = N_VGetArrayPointer(yp);
   ypdata[0] = uptrue;
   ypdata[1] = vptrue;
 
@@ -87,7 +87,7 @@ int main(int argc, char* argv[])
   flag = IDASetJacFn(ida_mem, J);
   if (check_flag(flag, "IDASetJacFn")) return 1;
 
-  realtype udata[4] = {-TWO, HALF, HALF, -ONE};
+  sunrealtype udata[4] = {-TWO, HALF, HALF, -ONE};
   flag = IDASetUserData(ida_mem, udata);
   if (check_flag(flag, "IDASetUserData")) return 1;
 
@@ -111,12 +111,12 @@ int main(int argc, char* argv[])
   if (check_flag(flag, "IDASetDeltaCjLSetup")) return 1;
 
   // Initial time and fist output time
-  realtype tret  = ZERO;
-  realtype tout  = tret + opts.dtout;
+  sunrealtype tret  = ZERO;
+  sunrealtype tout  = tret + opts.dtout;
 
   // Output initial contion
   cout << scientific;
-  cout << setprecision(numeric_limits<realtype>::digits10);
+  cout << setprecision(numeric_limits<sunrealtype>::digits10);
   cout << "           t              ";
   cout << "          u              ";
   cout << "          v              ";
@@ -173,26 +173,26 @@ int main(int argc, char* argv[])
  *   ru = [a  b] * [ (-1 + u^2 - r(t)) / (2*u) ] + [ r'(t) / (2u) ] - [u']
  *   rv = [c  d]   [ (-2 + v^2 - s(t)) / (2*v) ]   [ s'(t) / (2v) ] - [v']
  * ---------------------------------------------------------------------------*/
-int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
+int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
-  realtype* ypdata = N_VGetArrayPointer(yp);
-  const realtype up = ypdata[0];
-  const realtype vp = ypdata[1];
+  sunrealtype* ypdata = N_VGetArrayPointer(yp);
+  const sunrealtype up = ypdata[0];
+  const sunrealtype vp = ypdata[1];
 
-  const realtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
-  const realtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
+  const sunrealtype tmp1 = (-ONE + u * u - r(t)) / (TWO * u);
+  const sunrealtype tmp2 = (-TWO + v * v - s(t)) / (TWO * v);
 
-  realtype* rdata = N_VGetArrayPointer(rr);
+  sunrealtype* rdata = N_VGetArrayPointer(rr);
   rdata[0] = (a * tmp1 + b * tmp2 + rdot(t) / (TWO * u)) - up;
   rdata[1] = (c * tmp1 + d * tmp2 + sdot(t) / (TWO * v)) - vp;
 
@@ -204,21 +204,21 @@ int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data)
  *   [a/2 + (a(1+r(t))-r'(t))/(2u^2) - cj  b/2 + b*(2+s(t))/(2*v^2)            ]
  *   [c/2 + c(1+r(t))/(2u^2)               d/2 + (d(2+s(t))-s'(t))/(2u^2) - cj ]
  * ---------------------------------------------------------------------------*/
-int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+int J(sunrealtype t,  sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
       SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
       N_Vector tempv3)
 {
-  realtype* udata = (realtype *) user_data;
-  const realtype a = udata[0];
-  const realtype b = udata[1];
-  const realtype c = udata[2];
-  const realtype d = udata[3];
+  sunrealtype* udata = (sunrealtype *) user_data;
+  const sunrealtype a = udata[0];
+  const sunrealtype b = udata[1];
+  const sunrealtype c = udata[2];
+  const sunrealtype d = udata[3];
 
-  realtype* ydata = N_VGetArrayPointer(y);
-  realtype* Jdata = SUNDenseMatrix_Data(J);
+  sunrealtype* ydata = N_VGetArrayPointer(y);
+  sunrealtype* Jdata = SUNDenseMatrix_Data(J);
 
-  const realtype u = ydata[0];
-  const realtype v = ydata[1];
+  const sunrealtype u = ydata[0];
+  const sunrealtype v = ydata[1];
 
   Jdata[0] = (a / TWO + (a * (ONE + r(t)) - rdot(t)) / (TWO * u * u)) - cj;
   Jdata[1] = c / TWO +  c * (ONE + r(t)) / (TWO * u * u);
diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp b/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
index 6913518e8c..7f4dfa20d2 100644
--- a/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
+++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr.hpp
@@ -31,11 +31,11 @@
 #include "sunlinsol/sunlinsol_dense.h"
 
 // Macros for problem constants
-#define ZERO    RCONST(0.0)
-#define HALF    RCONST(0.5)
-#define ONE     RCONST(1.0)
-#define TWO     RCONST(2.0)
-#define TWENTY  RCONST(20.0)
+#define ZERO    SUN_RCONST(0.0)
+#define HALF    SUN_RCONST(0.5)
+#define ONE     SUN_RCONST(1.0)
+#define TWO     SUN_RCONST(2.0)
+#define TWENTY  SUN_RCONST(20.0)
 
 using namespace std;
 
@@ -46,28 +46,28 @@ using namespace std;
 struct TestOptions
 {
   // Relative and absolute tolerances
-  realtype rtol = RCONST(1.0e-6);
-  realtype atol = RCONST(1.0e-10);
+  sunrealtype rtol = SUN_RCONST(1.0e-6);
+  sunrealtype atol = SUN_RCONST(1.0e-10);
 
   // Fixed step size eta bounds (use defaults = 0.0 and 1.5)
-  realtype eta_min_fx = -ONE;
-  realtype eta_max_fx = -ONE;
+  sunrealtype eta_min_fx = -ONE;
+  sunrealtype eta_max_fx = -ONE;
 
   // Max and min eta bounds on a general step (use default = 10)
-  realtype eta_max = -ONE;
-  realtype eta_min = -ONE;
+  sunrealtype eta_max = -ONE;
+  sunrealtype eta_min = -ONE;
 
   // Min eta bound after an error test fail (use default = 0.25)
-  realtype eta_min_ef = -ONE;
+  sunrealtype eta_min_ef = -ONE;
 
   // Eta value on a nonlinear solver convergence failure (use default = 0.25)
-  realtype eta_cf = -ONE;
+  sunrealtype eta_cf = -ONE;
 
   // Parameter for if a change in c_j needs a call lsetup (use defaults 0.25)
-  realtype dcj = -ONE;
+  sunrealtype dcj = -ONE;
 
   // Output options
-  realtype dtout = ONE; // output interval
+  sunrealtype dtout = ONE; // output interval
   int      nout  = 10;  // number of outputs
 };
 
@@ -76,10 +76,10 @@ struct TestOptions
 // -----------------------------------------------------------------------------
 
 // DAE residual function
-int res(realtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data);
+int res(sunrealtype t, N_Vector y, N_Vector yp, N_Vector rr, void *user_data);
 
 // Jacobian of RHS function
-int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
+int J(sunrealtype t,  sunrealtype cj, N_Vector y, N_Vector yp, N_Vector rr,
       SUNMatrix J, void *user_data, N_Vector tempv1, N_Vector tempv2,
       N_Vector tempv3);
 
@@ -88,31 +88,31 @@ int J(realtype t,  realtype cj, N_Vector y, N_Vector yp, N_Vector rr,
 // -----------------------------------------------------------------------------
 
 // Compute r(t)
-static realtype r(realtype t)
+static sunrealtype r(sunrealtype t)
 {
   return HALF * cos(t);
 }
 
 // Compute the derivative of r(t)
-static realtype rdot(realtype t)
+static sunrealtype rdot(sunrealtype t)
 {
   return -HALF * sin(t);
 }
 
 // Compute s(t)
-static realtype s(realtype t)
+static sunrealtype s(sunrealtype t)
 {
   return cos(TWENTY * t);
 }
 
 // Compute the derivative of s(t)
-static realtype sdot(realtype t)
+static sunrealtype sdot(sunrealtype t)
 {
   return -TWENTY * sin(TWENTY * t);
 }
 
 // Compute the true solution
-static int true_sol(realtype t, realtype* u, realtype* v)
+static int true_sol(sunrealtype t, sunrealtype* u, sunrealtype* v)
 {
   *u = sqrt(ONE + r(t));
   *v = sqrt(TWO + s(t));
@@ -121,7 +121,7 @@ static int true_sol(realtype t, realtype* u, realtype* v)
 }
 
 // Compute the true solution derivative
-static int true_sol_p(realtype t, realtype* up, realtype* vp)
+static int true_sol_p(sunrealtype t, sunrealtype* up, sunrealtype* vp)
 {
   *up = rdot(t) / (TWO * sqrt(ONE + r(t)));
   *vp = sdot(t) / (TWO * sqrt(TWO + s(t)));
@@ -150,7 +150,7 @@ int check_ptr(void *ptr, const string funcname)
   return 1;
 }
 
-inline void find_arg(vector<string> &args, const string key, realtype &dest)
+inline void find_arg(vector<string> &args, const string key, sunrealtype &dest)
 {
   auto it = find(args.begin(), args.end(), key);
   if (it != args.end())
diff --git a/test/unit_tests/idas/C_serial/idas_test_getuserdata.c b/test/unit_tests/idas/C_serial/idas_test_getuserdata.c
index 058fe94e16..d1a42fde65 100644
--- a/test/unit_tests/idas/C_serial/idas_test_getuserdata.c
+++ b/test/unit_tests/idas/C_serial/idas_test_getuserdata.c
@@ -24,7 +24,7 @@
 #define ONE  SUN_RCONST(1.0)
 
 /* Dummy user-supplied function */
-static int r(realtype t, N_Vector y, N_Vector ydot, N_Vector res,
+static int r(sunrealtype t, N_Vector y, N_Vector ydot, N_Vector res,
              void *user_data)
 {
   return 0;
diff --git a/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp b/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
index f9364169e4..ae3dea5a28 100644
--- a/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
+++ b/test/unit_tests/kinsol/CXX_serial/kin_test_getjac.cpp
@@ -140,7 +140,7 @@ int J(N_Vector uu, N_Vector fuu, SUNMatrix J, void *user_data, N_Vector tmp1,
 // -----------------------------------------------------------------------------
 
 int DenseSetupAndSolve(SUNLinearSolver S, SUNMatrix A, N_Vector x,
-                       N_Vector b, realtype tol)
+                       N_Vector b, sunrealtype tol)
 {
   // Create a copy of the matrix for factorization
   SUNMatrix Acpy = SUNMatClone(A);

From 6838fade7c1257483d13fd6090036a9c6e1ee644 Mon Sep 17 00:00:00 2001
From: Steven Roberts <roberts115@llnl.gov>
Date: Thu, 16 Nov 2023 13:17:52 -0800
Subject: [PATCH 28/35] Docs: Fix table name (#374)

Fix table name for the implicit part of 5th order IMEX-ARK methods
---
 doc/arkode/guide/source/Butcher.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst
index b9654211f5..31193f395e 100644
--- a/doc/arkode/guide/source/Butcher.rst
+++ b/doc/arkode/guide/source/Butcher.rst
@@ -2015,13 +2015,13 @@ Butcher table pairs are as follows:
 * :index:`5th-order pair <ARK-8-4-5 ARK method>`:
   :numref:`Butcher.ARK_8_4_5_E` with :numref:`Butcher.ARK_8_4_5_I`,
   corresponding to Butcher tables ``ARKODE_ARK548L2SA_ERK_8_4_5`` and
-  ``ARKODE_ARK548L2SA_ERK_8_4_5`` for :c:func:`ARKStepSetTableNum`
+  ``ARKODE_ARK548L2SA_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum`
   or :c:func:`ARKStepSetTableName`.
 
 * :index:`5th-order pair <ARK-8-4-5b ARK method>`:
   :numref:`Butcher.ARK_8_4_5b_E` with :numref:`Butcher.ARK_8_4_5b_I`,
   corresponding to Butcher tables ``ARKODE_ARK548L2SAb_ERK_8_4_5`` and
-  ``ARKODE_ARK548L2SAb_ERK_8_4_5`` for :c:func:`ARKStepSetTableNum`
+  ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum`
   or :c:func:`ARKStepSetTableName`.
 
 

From 7c8ad3d262dbc614b4a3669f480d78f0698bebd4 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Fri, 17 Nov 2023 10:41:54 -0600
Subject: [PATCH 29/35] Initial import of relevant files from
 https://github.com/danmm16/sundials-f2003-examples/tree/feature/example-guides

---
 .../examples/source/_templates/layout.html    |   24 -
 .../source/_themes/bootstrap/globaltoc.html   |    7 -
 .../source/_themes/bootstrap/layout.html      |   96 -
 .../source/_themes/bootstrap/localtoc.html    |    4 -
 .../source/_themes/bootstrap/relations.html   |    8 -
 .../source/_themes/bootstrap/searchbox.html   |    8 -
 .../source/_themes/bootstrap/sourcelink.html  |    4 -
 .../bootstrap/static/bootstrap-sphinx.css_t   |   35 -
 .../bootstrap/static/bootstrap-sphinx.js      |   96 -
 .../bootstrap/static/css/bootstrap-2.2.1.css  | 5893 ----------
 .../static/css/bootstrap-2.2.1.min.css        |    9 -
 .../static/css/bootstrap-responsive-2.2.1.css | 1088 --
 .../css/bootstrap-responsive-2.2.1.min.css    |    9 -
 .../static/img/glyphicons-halflings-white.png |  Bin 8777 -> 0 bytes
 .../static/img/glyphicons-halflings.png       |  Bin 12799 -> 0 bytes
 .../source/_themes/bootstrap/static/jquery.js |    2 -
 .../bootstrap/static/js/bootstrap-2.2.1.js    | 2025 ----
 .../static/js/bootstrap-2.2.1.min.js          |    6 -
 .../bootstrap/static/js/jquery-1.8.2.js       | 9440 -----------------
 .../bootstrap/static/js/jquery-1.8.2.min.js   |    2 -
 .../source/_themes/bootstrap/theme.conf       |   23 -
 doc/arkode/examples/source/conf.py            |  283 +-
 .../examples/source/figs/doc_logo_blue.pdf    |  Bin 5290 -> 0 bytes
 .../source/figs/sundials_logo_blue.png        |  Bin 0 -> 40321 bytes
 doc/arkode/guide/source/conf.py               |    5 +-
 doc/cvode/Makefile                            |   30 -
 doc/cvode/cv_ex_codes.tex                     |   41 -
 doc/cvode/cv_ex_cuda.tex                      |   42 -
 doc/cvode/cv_ex_fortran.tex                   |   92 -
 doc/cvode/cv_ex_intro.tex                     |  211 -
 doc/cvode/cv_ex_parallel.tex                  |  218 -
 doc/cvode/cv_ex_parhyp.tex                    |   60 -
 doc/cvode/cv_ex_raja.tex                      |   34 -
 doc/cvode/cv_ex_serial.tex                    |  508 -
 doc/cvode/cv_ex_tests.tex                     |  113 -
 doc/cvode/cv_examples.tex                     |   52 -
 doc/cvode/examples/Makefile                   |   20 +
 doc/cvode/examples/source/References.rst      |   30 +
 doc/cvode/examples/source/c_cuda.rst          |   66 +
 doc/cvode/examples/source/c_mpimanyvec.rst    |  113 +
 doc/cvode/examples/source/c_openmp.rst        |  107 +
 doc/cvode/examples/source/c_openmpdev.rst     |   54 +
 doc/cvode/examples/source/c_parallel.rst      |  285 +
 doc/cvode/examples/source/c_parallel_deep.rst |  277 +
 doc/cvode/examples/source/c_parhyp.rst        |  127 +
 doc/cvode/examples/source/c_parhyp_deep.rst   |   76 +
 doc/cvode/examples/source/c_raja.rst          |   58 +
 doc/cvode/examples/source/c_serial.rst        | 1118 ++
 doc/cvode/examples/source/c_serial_deep.rst   |  588 +
 doc/cvode/examples/source/c_tests_deep.rst    |   25 +
 doc/cvode/examples/source/conf.py             |  302 +
 doc/cvode/examples/source/cpp_hypre.rst       |   72 +
 doc/cvode/examples/source/cpp_onemkl.rst      |   94 +
 doc/cvode/examples/source/cpp_parallel.rst    |   50 +
 doc/cvode/examples/source/cpp_serial.rst      |  157 +
 doc/cvode/examples/source/cpp_sycl.rst        |   51 +
 doc/cvode/examples/source/f2003_deep.rst      |  174 +
 doc/cvode/examples/source/f2003_parallel.rst  |  156 +
 doc/cvode/examples/source/f2003_serial.rst    |  576 +
 .../source/figs/sundials_logo_blue.png        |  Bin 0 -> 40321 bytes
 doc/cvode/examples/source/index.rst           |  239 +
 doc/cvode/guide/source/conf.py                |    5 +-
 62 files changed, 4885 insertions(+), 20403 deletions(-)
 delete mode 100644 doc/arkode/examples/source/_templates/layout.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/globaltoc.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/layout.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/localtoc.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/relations.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/searchbox.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/sourcelink.html
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.css_t
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.css
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.min.css
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.css
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.min.css
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings-white.png
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings.png
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/jquery.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.min.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.min.js
 delete mode 100644 doc/arkode/examples/source/_themes/bootstrap/theme.conf
 delete mode 100644 doc/arkode/examples/source/figs/doc_logo_blue.pdf
 create mode 100644 doc/arkode/examples/source/figs/sundials_logo_blue.png
 delete mode 100644 doc/cvode/Makefile
 delete mode 100644 doc/cvode/cv_ex_codes.tex
 delete mode 100644 doc/cvode/cv_ex_cuda.tex
 delete mode 100644 doc/cvode/cv_ex_fortran.tex
 delete mode 100644 doc/cvode/cv_ex_intro.tex
 delete mode 100644 doc/cvode/cv_ex_parallel.tex
 delete mode 100644 doc/cvode/cv_ex_parhyp.tex
 delete mode 100644 doc/cvode/cv_ex_raja.tex
 delete mode 100644 doc/cvode/cv_ex_serial.tex
 delete mode 100644 doc/cvode/cv_ex_tests.tex
 delete mode 100644 doc/cvode/cv_examples.tex
 create mode 100644 doc/cvode/examples/Makefile
 create mode 100644 doc/cvode/examples/source/References.rst
 create mode 100644 doc/cvode/examples/source/c_cuda.rst
 create mode 100644 doc/cvode/examples/source/c_mpimanyvec.rst
 create mode 100644 doc/cvode/examples/source/c_openmp.rst
 create mode 100644 doc/cvode/examples/source/c_openmpdev.rst
 create mode 100644 doc/cvode/examples/source/c_parallel.rst
 create mode 100644 doc/cvode/examples/source/c_parallel_deep.rst
 create mode 100644 doc/cvode/examples/source/c_parhyp.rst
 create mode 100644 doc/cvode/examples/source/c_parhyp_deep.rst
 create mode 100644 doc/cvode/examples/source/c_raja.rst
 create mode 100644 doc/cvode/examples/source/c_serial.rst
 create mode 100644 doc/cvode/examples/source/c_serial_deep.rst
 create mode 100644 doc/cvode/examples/source/c_tests_deep.rst
 create mode 100644 doc/cvode/examples/source/conf.py
 create mode 100644 doc/cvode/examples/source/cpp_hypre.rst
 create mode 100644 doc/cvode/examples/source/cpp_onemkl.rst
 create mode 100644 doc/cvode/examples/source/cpp_parallel.rst
 create mode 100644 doc/cvode/examples/source/cpp_serial.rst
 create mode 100644 doc/cvode/examples/source/cpp_sycl.rst
 create mode 100644 doc/cvode/examples/source/f2003_deep.rst
 create mode 100644 doc/cvode/examples/source/f2003_parallel.rst
 create mode 100644 doc/cvode/examples/source/f2003_serial.rst
 create mode 100644 doc/cvode/examples/source/figs/sundials_logo_blue.png
 create mode 100644 doc/cvode/examples/source/index.rst

diff --git a/doc/arkode/examples/source/_templates/layout.html b/doc/arkode/examples/source/_templates/layout.html
deleted file mode 100644
index ec3dd1863c..0000000000
--- a/doc/arkode/examples/source/_templates/layout.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "!layout.html" %}
-
-{%- block extrahead %}
-{{ super() }}
-<script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-37525145-1']);
-  _gaq.push(['_trackPageview']);
-</script>
-{% endblock %}
-
-{% block footer %}
-{{ super() }}
-<script type="text/javascript">
-  (function() {
-    var ga = document.createElement('script');
-    ga.src = ('https:' == document.location.protocol ?
-              'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    ga.setAttribute('async', 'true');
-    document.documentElement.firstChild.appendChild(ga);
-  })();
-</script>
-</div>
-{% endblock %}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/globaltoc.html b/doc/arkode/examples/source/_themes/bootstrap/globaltoc.html
deleted file mode 100644
index d3fd3a1aef..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/globaltoc.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<li class="dropdown">
-  <a href="{{ pathto(master_doc) }}"
-     class="dropdown-toggle"
-     data-toggle="dropdown">{{ _('Sections') }} <b class="caret"></b></a>
-  <ul class="dropdown-menu globaltoc"
-    >{{ toctree(maxdepth=theme_globaltoc_depth|toint, collapse=False) }}</ul>
-</li>
diff --git a/doc/arkode/examples/source/_themes/bootstrap/layout.html b/doc/arkode/examples/source/_themes/bootstrap/layout.html
deleted file mode 100644
index ae925f896a..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/layout.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% extends "basic/layout.html" %}
-{% set script_files = script_files + ['_static/js/bootstrap-2.2.1.min.js', '_static/bootstrap-sphinx.js'] %}
-{% set css_files = ['_static/css/bootstrap-2.2.1.min.css', '_static/bootstrap-sphinx.css', '_static/css/bootstrap-responsive-2.2.1.min.css'] + css_files %}
-
-{%- block doctype -%}
-<!DOCTYPE html>
-{%- endblock %}
-
-{# Sidebar: Rework into our Boostrap nav section. #}
-{% macro navBar() %}
-  <div id="navbar" class="{{ theme_navbar_class }} {% if theme_navbar_fixed_top == 'true' -%} navbar-fixed-top{%- endif -%}">
-    <div class="navbar-inner">
-      <!-- .btn-navbar is used as the toggle for collapsed navbar content -->
-      <button class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-
-      <a class="brand" href="{{ pathto(master_doc) }}">{{ project|e }}</a>
-      <span class="navbar-text pull-left"><b>{{ version|e }}</b></span>
-
-      <div class="nav-collapse">
-        <ul class="nav">
-          <li class="divider-vertical"></li>
-          {% block sidebartoc %}
-            {% include "globaltoc.html" %}
-            {% include "localtoc.html" %}
-          {% endblock %}
-          {% block sidebarrel %}
-            {% include "relations.html" %}
-          {% endblock %}
-          {% if theme_source_link_position == "nav" %}
-            <li>{% include "sourcelink.html" %}</li>
-          {% endif %}
-        </ul>
-
-        {% block sidebarsearch %}
-          {% include "searchbox.html" %}
-        {% endblock %}
-      </div>
-    </div>
-  </div>
-{% endmacro %}
-
-{%- block extrahead %}
-<meta charset='utf-8'>
-<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
-<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
-<meta name="apple-mobile-web-app-capable" content="yes">
-{% endblock %}
-
-{# Silence the sidebar's, relbar's #}
-{% block header %}{% endblock %}
-{% block sidebar1 %}{% endblock %}
-{% block sidebar2 %}{% endblock %}
-{% block relbar1 %}{% endblock %}
-{% block relbar2 %}{% endblock %}
-{% block sidebarsourcelink %}{% endblock %}
-
-{%- block content %}
-<div class="container">
-  {{ navBar() }}
-  {% block body %}{% endblock %}
-</div>
-{%- endblock %}
-
-{%- block footer %}
-<footer class="footer">
-  <div class="container">
-    <p class="pull-right">
-      <a href="#">Back to top</a>
-      {% if theme_source_link_position == "footer" %}
-        <br/>
-        {% include "sourcelink.html" %}
-      {% endif %}
-    </p>
-    <p>
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}<br/>
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}<br/>
-      {%- endif %}
-    {%- endif %}
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}<br/>
-    {%- endif %}
-    {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx.pocoo.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}<br/>
-    {%- endif %}
-    </p>
-  </div>
-</footer>
-{%- endblock %}
-
diff --git a/doc/arkode/examples/source/_themes/bootstrap/localtoc.html b/doc/arkode/examples/source/_themes/bootstrap/localtoc.html
deleted file mode 100644
index 2041c5c8fc..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/localtoc.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<li class="dropdown">
-  <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Page') }} <b class="caret"></b></a>
-  <ul class="dropdown-menu localtoc">{{ toc }}</ul>
-</li>
diff --git a/doc/arkode/examples/source/_themes/bootstrap/relations.html b/doc/arkode/examples/source/_themes/bootstrap/relations.html
deleted file mode 100644
index b3df68e3b5..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/relations.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- if prev %}
-  <li><a href="{{ prev.link|e }}"
-         title="{{ _('previous chapter') }}">{{ "&laquo;"|safe }} {{ prev.title }}</a></li>
-{%- endif %}
-{%- if next %}
-  <li><a href="{{ next.link|e }}"
-         title="{{ _('next chapter') }}">{{ next.title }} {{ "&raquo;"|safe }}</a></li>
-{%- endif %}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/searchbox.html b/doc/arkode/examples/source/_themes/bootstrap/searchbox.html
deleted file mode 100644
index 0afdacff37..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/searchbox.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{%- if pagename != "search" %}
-<form class="navbar-search pull-right" style="margin-bottom:-3px;" action="{{ pathto('search') }}" method="get">
-  <input type="text" name="q" placeholder="Search" style="color:
-  #333333; background-color: #dddddd;"/>
-  <input type="hidden" name="check_keywords" value="yes" />
-  <input type="hidden" name="area" value="default" />
-</form>
-{%- endif %}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/sourcelink.html b/doc/arkode/examples/source/_themes/bootstrap/sourcelink.html
deleted file mode 100644
index 154f7c7240..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/sourcelink.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{%- if show_source and has_source and sourcename %}
-  <a href="{{ pathto('_sources/' + sourcename, true)|e }}"
-     rel="nofollow">{{ _('Source') }}</a>
-{%- endif %}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.css_t b/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.css_t
deleted file mode 100644
index 43a23c4fee..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.css_t
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-* bootstrap-sphinx.css
-* ~~~~~~~~~~~~~~~~~~~~
-*
-* Sphinx stylesheet -- Twitter Bootstrap theme.
-*/
-
-.navbar-inverse .brand {
-  color: #FFF;
-}
-
-{% if theme_navbar_fixed_top == 'true' %}
-body {
-  padding-top: 40px;
-}
-.navbar-inner {
-  padding-left:  12px !important;
-  padding-right: 12px !important;
-}
-{% endif %}
-
-{%- block sidebarlogo %}
-  {%- if logo %}
-@media (min-width: 980px) {
-  .navbar h3 a, .navbar .brand {
-    background: transparent url("{{ logo }}") no-repeat 22px 3px;
-    padding-left: 62px;
-  }
-}
-  {%- endif %}
-{%- endblock %}
-
-table {
-  border: 0;
-}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.js b/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.js
deleted file mode 100644
index dc25ff4e1d..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/bootstrap-sphinx.js
+++ /dev/null
@@ -1,96 +0,0 @@
-(function () {
-  /**
-   * Patch TOC list.
-   *
-   * Will mutate the underlying span to have a correct ul for nav.
-   *
-   * @param $span: Span containing nested UL's to mutate.
-   * @param minLevel: Starting level for nested lists. (1: global, 2: local).
-   */
-  var patchToc = function ($ul, minLevel) {
-    var findA;
-
-    // Find all a "internal" tags, traversing recursively.
-    findA = function ($elem, level) {
-      var level = level || 0,
-        $items = $elem.find("> li > a.internal, > ul, > li > ul");
-
-      // Iterate everything in order.
-      $items.each(function (index, item) {
-        var $item = $(item),
-          tag = item.tagName.toLowerCase(),
-          $childrenLi = $item.children('li'),
-          $parentLi = $($item.parent('li'), $item.parent().parent('li'));
-
-        // Add dropdowns if more children and above minimum level.
-        if (tag === 'ul' && level >= minLevel && $childrenLi.length > 0) {
-          $parentLi
-            .addClass('dropdown-submenu')
-            .children('a').first().attr('tabindex', -1)
-
-          $item.addClass('dropdown-menu');
-        }
-
-        findA($item, level + 1);
-      });
-    };
-
-    findA($ul);
-  };
-
-  /**
-   * Patch all tables to remove ``docutils`` class and add Bootstrap base
-   * ``table`` class.
-   */
-  var patchTables = function () {
-    $("table.docutils")
-      .removeClass("docutils")
-      .addClass("table")
-      .attr("border", 0);
-  };
-
-  $(document).ready(function () {
-    // Fix iPhone menu clicks.
-    // From: https://github.com/twitter/bootstrap/issues/4550#issuecomment-8476763
-    $('.dropdown-menu').on('touchstart.dropdown.data-api', function(e) {
-      e.stopPropagation();
-    });
-    // See also...
-    // // From: https://github.com/twitter/bootstrap/issues/4550#issuecomment-8879600
-    // $('a.dropdown-toggle, .dropdown-menu a').on('touchstart', function(e) {
-    //   e.stopPropagation();
-    // });
-
-    // Add styling, structure to TOC's.
-    $(".dropdown-menu").each(function () {
-      $(this).find("ul").each(function (index, item){
-        var $item = $(item);
-        $item.addClass('unstyled');
-      });
-      $(this).find("li").each(function () {
-        $(this).parent().append(this);
-      });
-    });
-
-    // Patch in level.
-    patchToc($("ul.globaltoc"), 1);
-    patchToc($("ul.localtoc"), 2);
-
-    // Add divider to local TOC if more children after.
-    if ($("ul.localtoc > ul > li > ul li").length > 0) {
-      $("ul.localtoc > ul > li > a")
-        .first()
-        .after('<li class="divider"></li>');
-    }
-
-    // Enable dropdown.
-    $('.dropdown-toggle').dropdown();
-
-    // Patch tables.
-    patchTables();
-
-    // Add Note, Warning styles.
-    $('div.note').addClass('alert').addClass('alert-info');
-    $('div.warning').addClass('alert');
-  });
-}());
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.css b/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.css
deleted file mode 100644
index 1b519e2200..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.css
+++ /dev/null
@@ -1,5893 +0,0 @@
-/*!
- * Bootstrap v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-audio:not([controls]) {
-  display: none;
-}
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-a:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-a:hover,
-a:active {
-  outline: 0;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sup {
-  top: -0.5em;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-img {
-  width: auto\9;
-  height: auto;
-  max-width: 100%;
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-
-button,
-input {
-  *overflow: visible;
-  line-height: normal;
-}
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  -webkit-appearance: button;
-}
-
-input[type="search"] {
-  -webkit-box-sizing: content-box;
-     -moz-box-sizing: content-box;
-          box-sizing: content-box;
-  -webkit-appearance: textfield;
-}
-
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none;
-}
-
-textarea {
-  overflow: auto;
-  vertical-align: top;
-}
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-body {
-  margin: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 14px;
-  line-height: 20px;
-  color: #333333;
-  background-color: #ffffff;
-}
-
-a {
-  color: #0088cc;
-  text-decoration: none;
-}
-
-a:hover {
-  color: #005580;
-  text-decoration: underline;
-}
-
-.img-rounded {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-
-.img-circle {
-  -webkit-border-radius: 500px;
-     -moz-border-radius: 500px;
-          border-radius: 500px;
-}
-
-.row {
-  margin-left: -20px;
-  *zoom: 1;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row:after {
-  clear: both;
-}
-
-[class*="span"] {
-  float: left;
-  min-height: 1px;
-  margin-left: 20px;
-}
-
-.container,
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.span12 {
-  width: 940px;
-}
-
-.span11 {
-  width: 860px;
-}
-
-.span10 {
-  width: 780px;
-}
-
-.span9 {
-  width: 700px;
-}
-
-.span8 {
-  width: 620px;
-}
-
-.span7 {
-  width: 540px;
-}
-
-.span6 {
-  width: 460px;
-}
-
-.span5 {
-  width: 380px;
-}
-
-.span4 {
-  width: 300px;
-}
-
-.span3 {
-  width: 220px;
-}
-
-.span2 {
-  width: 140px;
-}
-
-.span1 {
-  width: 60px;
-}
-
-.offset12 {
-  margin-left: 980px;
-}
-
-.offset11 {
-  margin-left: 900px;
-}
-
-.offset10 {
-  margin-left: 820px;
-}
-
-.offset9 {
-  margin-left: 740px;
-}
-
-.offset8 {
-  margin-left: 660px;
-}
-
-.offset7 {
-  margin-left: 580px;
-}
-
-.offset6 {
-  margin-left: 500px;
-}
-
-.offset5 {
-  margin-left: 420px;
-}
-
-.offset4 {
-  margin-left: 340px;
-}
-
-.offset3 {
-  margin-left: 260px;
-}
-
-.offset2 {
-  margin-left: 180px;
-}
-
-.offset1 {
-  margin-left: 100px;
-}
-
-.row-fluid {
-  width: 100%;
-  *zoom: 1;
-}
-
-.row-fluid:before,
-.row-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.row-fluid:after {
-  clear: both;
-}
-
-.row-fluid [class*="span"] {
-  display: block;
-  float: left;
-  width: 100%;
-  min-height: 30px;
-  margin-left: 2.127659574468085%;
-  *margin-left: 2.074468085106383%;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.row-fluid [class*="span"]:first-child {
-  margin-left: 0;
-}
-
-.row-fluid .controls-row [class*="span"] + [class*="span"] {
-  margin-left: 2.127659574468085%;
-}
-
-.row-fluid .span12 {
-  width: 100%;
-  *width: 99.94680851063829%;
-}
-
-.row-fluid .span11 {
-  width: 91.48936170212765%;
-  *width: 91.43617021276594%;
-}
-
-.row-fluid .span10 {
-  width: 82.97872340425532%;
-  *width: 82.92553191489361%;
-}
-
-.row-fluid .span9 {
-  width: 74.46808510638297%;
-  *width: 74.41489361702126%;
-}
-
-.row-fluid .span8 {
-  width: 65.95744680851064%;
-  *width: 65.90425531914893%;
-}
-
-.row-fluid .span7 {
-  width: 57.44680851063829%;
-  *width: 57.39361702127659%;
-}
-
-.row-fluid .span6 {
-  width: 48.93617021276595%;
-  *width: 48.88297872340425%;
-}
-
-.row-fluid .span5 {
-  width: 40.42553191489362%;
-  *width: 40.37234042553192%;
-}
-
-.row-fluid .span4 {
-  width: 31.914893617021278%;
-  *width: 31.861702127659576%;
-}
-
-.row-fluid .span3 {
-  width: 23.404255319148934%;
-  *width: 23.351063829787233%;
-}
-
-.row-fluid .span2 {
-  width: 14.893617021276595%;
-  *width: 14.840425531914894%;
-}
-
-.row-fluid .span1 {
-  width: 6.382978723404255%;
-  *width: 6.329787234042553%;
-}
-
-.row-fluid .offset12 {
-  margin-left: 104.25531914893617%;
-  *margin-left: 104.14893617021275%;
-}
-
-.row-fluid .offset12:first-child {
-  margin-left: 102.12765957446808%;
-  *margin-left: 102.02127659574467%;
-}
-
-.row-fluid .offset11 {
-  margin-left: 95.74468085106382%;
-  *margin-left: 95.6382978723404%;
-}
-
-.row-fluid .offset11:first-child {
-  margin-left: 93.61702127659574%;
-  *margin-left: 93.51063829787232%;
-}
-
-.row-fluid .offset10 {
-  margin-left: 87.23404255319149%;
-  *margin-left: 87.12765957446807%;
-}
-
-.row-fluid .offset10:first-child {
-  margin-left: 85.1063829787234%;
-  *margin-left: 84.99999999999999%;
-}
-
-.row-fluid .offset9 {
-  margin-left: 78.72340425531914%;
-  *margin-left: 78.61702127659572%;
-}
-
-.row-fluid .offset9:first-child {
-  margin-left: 76.59574468085106%;
-  *margin-left: 76.48936170212764%;
-}
-
-.row-fluid .offset8 {
-  margin-left: 70.2127659574468%;
-  *margin-left: 70.10638297872339%;
-}
-
-.row-fluid .offset8:first-child {
-  margin-left: 68.08510638297872%;
-  *margin-left: 67.9787234042553%;
-}
-
-.row-fluid .offset7 {
-  margin-left: 61.70212765957446%;
-  *margin-left: 61.59574468085106%;
-}
-
-.row-fluid .offset7:first-child {
-  margin-left: 59.574468085106375%;
-  *margin-left: 59.46808510638297%;
-}
-
-.row-fluid .offset6 {
-  margin-left: 53.191489361702125%;
-  *margin-left: 53.085106382978715%;
-}
-
-.row-fluid .offset6:first-child {
-  margin-left: 51.063829787234035%;
-  *margin-left: 50.95744680851063%;
-}
-
-.row-fluid .offset5 {
-  margin-left: 44.68085106382979%;
-  *margin-left: 44.57446808510638%;
-}
-
-.row-fluid .offset5:first-child {
-  margin-left: 42.5531914893617%;
-  *margin-left: 42.4468085106383%;
-}
-
-.row-fluid .offset4 {
-  margin-left: 36.170212765957444%;
-  *margin-left: 36.06382978723405%;
-}
-
-.row-fluid .offset4:first-child {
-  margin-left: 34.04255319148936%;
-  *margin-left: 33.93617021276596%;
-}
-
-.row-fluid .offset3 {
-  margin-left: 27.659574468085104%;
-  *margin-left: 27.5531914893617%;
-}
-
-.row-fluid .offset3:first-child {
-  margin-left: 25.53191489361702%;
-  *margin-left: 25.425531914893618%;
-}
-
-.row-fluid .offset2 {
-  margin-left: 19.148936170212764%;
-  *margin-left: 19.04255319148936%;
-}
-
-.row-fluid .offset2:first-child {
-  margin-left: 17.02127659574468%;
-  *margin-left: 16.914893617021278%;
-}
-
-.row-fluid .offset1 {
-  margin-left: 10.638297872340425%;
-  *margin-left: 10.53191489361702%;
-}
-
-.row-fluid .offset1:first-child {
-  margin-left: 8.51063829787234%;
-  *margin-left: 8.404255319148938%;
-}
-
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
-}
-
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
-}
-
-.container {
-  margin-right: auto;
-  margin-left: auto;
-  *zoom: 1;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container-fluid {
-  padding-right: 20px;
-  padding-left: 20px;
-  *zoom: 1;
-}
-
-.container-fluid:before,
-.container-fluid:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.container-fluid:after {
-  clear: both;
-}
-
-p {
-  margin: 0 0 10px;
-}
-
-.lead {
-  margin-bottom: 20px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 30px;
-}
-
-small {
-  font-size: 85%;
-}
-
-strong {
-  font-weight: bold;
-}
-
-em {
-  font-style: italic;
-}
-
-cite {
-  font-style: normal;
-}
-
-.muted {
-  color: #999999;
-}
-
-.text-warning {
-  color: #c09853;
-}
-
-a.text-warning:hover {
-  color: #a47e3c;
-}
-
-.text-error {
-  color: #b94a48;
-}
-
-a.text-error:hover {
-  color: #953b39;
-}
-
-.text-info {
-  color: #3a87ad;
-}
-
-a.text-info:hover {
-  color: #2d6987;
-}
-
-.text-success {
-  color: #468847;
-}
-
-a.text-success:hover {
-  color: #356635;
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  margin: 10px 0;
-  font-family: inherit;
-  font-weight: bold;
-  line-height: 20px;
-  color: inherit;
-  text-rendering: optimizelegibility;
-}
-
-h1 small,
-h2 small,
-h3 small,
-h4 small,
-h5 small,
-h6 small {
-  font-weight: normal;
-  line-height: 1;
-  color: #999999;
-}
-
-h1,
-h2,
-h3 {
-  line-height: 40px;
-}
-
-h1 {
-  font-size: 38.5px;
-}
-
-h2 {
-  font-size: 31.5px;
-}
-
-h3 {
-  font-size: 24.5px;
-}
-
-h4 {
-  font-size: 17.5px;
-}
-
-h5 {
-  font-size: 14px;
-}
-
-h6 {
-  font-size: 11.9px;
-}
-
-h1 small {
-  font-size: 24.5px;
-}
-
-h2 small {
-  font-size: 17.5px;
-}
-
-h3 small {
-  font-size: 14px;
-}
-
-h4 small {
-  font-size: 14px;
-}
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 20px 0 30px;
-  border-bottom: 1px solid #eeeeee;
-}
-
-ul,
-ol {
-  padding: 0;
-  margin: 0 0 10px 25px;
-}
-
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-
-li {
-  line-height: 20px;
-}
-
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
-  list-style: none;
-}
-
-dl {
-  margin-bottom: 20px;
-}
-
-dt,
-dd {
-  line-height: 20px;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-left: 10px;
-}
-
-.dl-horizontal {
-  *zoom: 1;
-}
-
-.dl-horizontal:before,
-.dl-horizontal:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.dl-horizontal:after {
-  clear: both;
-}
-
-.dl-horizontal dt {
-  float: left;
-  width: 160px;
-  overflow: hidden;
-  clear: left;
-  text-align: right;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.dl-horizontal dd {
-  margin-left: 180px;
-}
-
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #ffffff;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-  border-bottom: 1px dotted #999999;
-}
-
-abbr.initialism {
-  font-size: 90%;
-  text-transform: uppercase;
-}
-
-blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
-  margin-bottom: 0;
-  font-size: 16px;
-  font-weight: 300;
-  line-height: 25px;
-}
-
-blockquote small {
-  display: block;
-  line-height: 20px;
-  color: #999999;
-}
-
-blockquote small:before {
-  content: '\2014 \00A0';
-}
-
-blockquote.pull-right {
-  float: right;
-  padding-right: 15px;
-  padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small {
-  text-align: right;
-}
-
-blockquote.pull-right small:before {
-  content: '';
-}
-
-blockquote.pull-right small:after {
-  content: '\00A0 \2014';
-}
-
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-
-address {
-  display: block;
-  margin-bottom: 20px;
-  font-style: normal;
-  line-height: 20px;
-}
-
-code,
-pre {
-  padding: 0 3px 2px;
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
-  font-size: 12px;
-  color: #333333;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-code {
-  padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-}
-
-pre {
-  display: block;
-  padding: 9.5px;
-  margin: 0 0 10px;
-  font-size: 13px;
-  line-height: 20px;
-  word-break: break-all;
-  word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-pre.prettyprint {
-  margin-bottom: 20px;
-}
-
-pre code {
-  padding: 0;
-  color: inherit;
-  background-color: transparent;
-  border: 0;
-}
-
-.pre-scrollable {
-  max-height: 340px;
-  overflow-y: scroll;
-}
-
-form {
-  margin: 0 0 20px;
-}
-
-fieldset {
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 20px;
-  font-size: 21px;
-  line-height: 40px;
-  color: #333333;
-  border: 0;
-  border-bottom: 1px solid #e5e5e5;
-}
-
-legend small {
-  font-size: 15px;
-  color: #999999;
-}
-
-label,
-input,
-button,
-select,
-textarea {
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-}
-
-input,
-button,
-select,
-textarea {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-label {
-  display: block;
-  margin-bottom: 5px;
-}
-
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: 20px;
-  padding: 4px 6px;
-  margin-bottom: 10px;
-  font-size: 14px;
-  line-height: 20px;
-  color: #555555;
-  vertical-align: middle;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-input,
-textarea,
-.uneditable-input {
-  width: 206px;
-}
-
-textarea {
-  height: auto;
-}
-
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-     -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-       -o-transition: border linear 0.2s, box-shadow linear 0.2s;
-          transition: border linear 0.2s, box-shadow linear 0.2s;
-}
-
-textarea:focus,
-input[type="text"]:focus,
-input[type="password"]:focus,
-input[type="datetime"]:focus,
-input[type="datetime-local"]:focus,
-input[type="date"]:focus,
-input[type="month"]:focus,
-input[type="time"]:focus,
-input[type="week"]:focus,
-input[type="number"]:focus,
-input[type="email"]:focus,
-input[type="url"]:focus,
-input[type="search"]:focus,
-input[type="tel"]:focus,
-input[type="color"]:focus,
-.uneditable-input:focus {
-  border-color: rgba(82, 168, 236, 0.8);
-  outline: 0;
-  outline: thin dotted \9;
-  /* IE6-9 */
-
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-}
-
-input[type="radio"],
-input[type="checkbox"] {
-  margin: 4px 0 0;
-  margin-top: 1px \9;
-  *margin-top: 0;
-  line-height: normal;
-  cursor: pointer;
-}
-
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto;
-}
-
-select,
-input[type="file"] {
-  height: 30px;
-  /* In IE7, the height of the select element cannot be changed by height, only font-size */
-
-  *margin-top: 4px;
-  /* For IE7, add top margin to align select with labels */
-
-  line-height: 30px;
-}
-
-select {
-  width: 220px;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-}
-
-select[multiple],
-select[size] {
-  height: auto;
-}
-
-select:focus,
-input[type="file"]:focus,
-input[type="radio"]:focus,
-input[type="checkbox"]:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.uneditable-input,
-.uneditable-textarea {
-  color: #999999;
-  cursor: not-allowed;
-  background-color: #fcfcfc;
-  border-color: #cccccc;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-}
-
-.uneditable-input {
-  overflow: hidden;
-  white-space: nowrap;
-}
-
-.uneditable-textarea {
-  width: auto;
-  height: auto;
-}
-
-input:-moz-placeholder,
-textarea:-moz-placeholder {
-  color: #999999;
-}
-
-input:-ms-input-placeholder,
-textarea:-ms-input-placeholder {
-  color: #999999;
-}
-
-input::-webkit-input-placeholder,
-textarea::-webkit-input-placeholder {
-  color: #999999;
-}
-
-.radio,
-.checkbox {
-  min-height: 20px;
-  padding-left: 20px;
-}
-
-.radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
-  margin-left: -20px;
-}
-
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px;
-}
-
-.radio.inline,
-.checkbox.inline {
-  display: inline-block;
-  padding-top: 5px;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
-  margin-left: 10px;
-}
-
-.input-mini {
-  width: 60px;
-}
-
-.input-small {
-  width: 90px;
-}
-
-.input-medium {
-  width: 150px;
-}
-
-.input-large {
-  width: 210px;
-}
-
-.input-xlarge {
-  width: 270px;
-}
-
-.input-xxlarge {
-  width: 530px;
-}
-
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-input,
-textarea,
-.uneditable-input {
-  margin-left: 0;
-}
-
-.controls-row [class*="span"] + [class*="span"] {
-  margin-left: 20px;
-}
-
-input.span12,
-textarea.span12,
-.uneditable-input.span12 {
-  width: 926px;
-}
-
-input.span11,
-textarea.span11,
-.uneditable-input.span11 {
-  width: 846px;
-}
-
-input.span10,
-textarea.span10,
-.uneditable-input.span10 {
-  width: 766px;
-}
-
-input.span9,
-textarea.span9,
-.uneditable-input.span9 {
-  width: 686px;
-}
-
-input.span8,
-textarea.span8,
-.uneditable-input.span8 {
-  width: 606px;
-}
-
-input.span7,
-textarea.span7,
-.uneditable-input.span7 {
-  width: 526px;
-}
-
-input.span6,
-textarea.span6,
-.uneditable-input.span6 {
-  width: 446px;
-}
-
-input.span5,
-textarea.span5,
-.uneditable-input.span5 {
-  width: 366px;
-}
-
-input.span4,
-textarea.span4,
-.uneditable-input.span4 {
-  width: 286px;
-}
-
-input.span3,
-textarea.span3,
-.uneditable-input.span3 {
-  width: 206px;
-}
-
-input.span2,
-textarea.span2,
-.uneditable-input.span2 {
-  width: 126px;
-}
-
-input.span1,
-textarea.span1,
-.uneditable-input.span1 {
-  width: 46px;
-}
-
-.controls-row {
-  *zoom: 1;
-}
-
-.controls-row:before,
-.controls-row:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.controls-row:after {
-  clear: both;
-}
-
-.controls-row [class*="span"],
-.row-fluid .controls-row [class*="span"] {
-  float: left;
-}
-
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
-}
-
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: #eeeeee;
-}
-
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
-
-.control-group.warning > label,
-.control-group.warning .help-block,
-.control-group.warning .help-inline {
-  color: #c09853;
-}
-
-.control-group.warning .checkbox,
-.control-group.warning .radio,
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  color: #c09853;
-}
-
-.control-group.warning input,
-.control-group.warning select,
-.control-group.warning textarea {
-  border-color: #c09853;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.warning input:focus,
-.control-group.warning select:focus,
-.control-group.warning textarea:focus {
-  border-color: #a47e3c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
-}
-
-.control-group.warning .input-prepend .add-on,
-.control-group.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #fcf8e3;
-  border-color: #c09853;
-}
-
-.control-group.error > label,
-.control-group.error .help-block,
-.control-group.error .help-inline {
-  color: #b94a48;
-}
-
-.control-group.error .checkbox,
-.control-group.error .radio,
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  color: #b94a48;
-}
-
-.control-group.error input,
-.control-group.error select,
-.control-group.error textarea {
-  border-color: #b94a48;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.error input:focus,
-.control-group.error select:focus,
-.control-group.error textarea:focus {
-  border-color: #953b39;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
-}
-
-.control-group.error .input-prepend .add-on,
-.control-group.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #b94a48;
-}
-
-.control-group.success > label,
-.control-group.success .help-block,
-.control-group.success .help-inline {
-  color: #468847;
-}
-
-.control-group.success .checkbox,
-.control-group.success .radio,
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  color: #468847;
-}
-
-.control-group.success input,
-.control-group.success select,
-.control-group.success textarea {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.success input:focus,
-.control-group.success select:focus,
-.control-group.success textarea:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-
-.control-group.success .input-prepend .add-on,
-.control-group.success .input-append .add-on {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #468847;
-}
-
-.control-group.info > label,
-.control-group.info .help-block,
-.control-group.info .help-inline {
-  color: #3a87ad;
-}
-
-.control-group.info .checkbox,
-.control-group.info .radio,
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  color: #3a87ad;
-}
-
-.control-group.info input,
-.control-group.info select,
-.control-group.info textarea {
-  border-color: #3a87ad;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.control-group.info input:focus,
-.control-group.info select:focus,
-.control-group.info textarea:focus {
-  border-color: #2d6987;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
-}
-
-.control-group.info .input-prepend .add-on,
-.control-group.info .input-append .add-on {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #3a87ad;
-}
-
-input:focus:required:invalid,
-textarea:focus:required:invalid,
-select:focus:required:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-
-input:focus:required:invalid:focus,
-textarea:focus:required:invalid:focus,
-select:focus:required:invalid:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-     -moz-box-shadow: 0 0 6px #f8b9b7;
-          box-shadow: 0 0 6px #f8b9b7;
-}
-
-.form-actions {
-  padding: 19px 20px 20px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border-top: 1px solid #e5e5e5;
-  *zoom: 1;
-}
-
-.form-actions:before,
-.form-actions:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-actions:after {
-  clear: both;
-}
-
-.help-block,
-.help-inline {
-  color: #595959;
-}
-
-.help-block {
-  display: block;
-  margin-bottom: 10px;
-}
-
-.help-inline {
-  display: inline-block;
-  *display: inline;
-  padding-left: 5px;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.input-append,
-.input-prepend {
-  margin-bottom: 5px;
-  font-size: 0;
-  white-space: nowrap;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input,
-.input-append .dropdown-menu,
-.input-prepend .dropdown-menu {
-  font-size: 14px;
-}
-
-.input-append input,
-.input-prepend input,
-.input-append select,
-.input-prepend select,
-.input-append .uneditable-input,
-.input-prepend .uneditable-input {
-  position: relative;
-  margin-bottom: 0;
-  *margin-left: 0;
-  vertical-align: top;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append input:focus,
-.input-prepend input:focus,
-.input-append select:focus,
-.input-prepend select:focus,
-.input-append .uneditable-input:focus,
-.input-prepend .uneditable-input:focus {
-  z-index: 2;
-}
-
-.input-append .add-on,
-.input-prepend .add-on {
-  display: inline-block;
-  width: auto;
-  height: 20px;
-  min-width: 16px;
-  padding: 4px 5px;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 20px;
-  text-align: center;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #eeeeee;
-  border: 1px solid #ccc;
-}
-
-.input-append .add-on,
-.input-prepend .add-on,
-.input-append .btn,
-.input-prepend .btn {
-  vertical-align: top;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-append .active,
-.input-prepend .active {
-  background-color: #a9dba9;
-  border-color: #46a546;
-}
-
-.input-prepend .add-on,
-.input-prepend .btn {
-  margin-right: -1px;
-}
-
-.input-prepend .add-on:first-child,
-.input-prepend .btn:first-child {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input,
-.input-append select,
-.input-append .uneditable-input {
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-append input + .btn-group .btn,
-.input-append select + .btn-group .btn,
-.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-append .add-on,
-.input-append .btn,
-.input-append .btn-group {
-  margin-left: -1px;
-}
-
-.input-append .add-on:last-child,
-.input-append .btn:last-child {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append input,
-.input-prepend.input-append select,
-.input-prepend.input-append .uneditable-input {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.input-prepend.input-append input + .btn-group .btn,
-.input-prepend.input-append select + .btn-group .btn,
-.input-prepend.input-append .uneditable-input + .btn-group .btn {
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .add-on:first-child,
-.input-prepend.input-append .btn:first-child {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.input-prepend.input-append .add-on:last-child,
-.input-prepend.input-append .btn:last-child {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.input-prepend.input-append .btn-group:first-child {
-  margin-left: 0;
-}
-
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9;
-  /* IE7-8 doesn't have border-radius, so don't indent the padding */
-
-  margin-bottom: 0;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-/* Allow for input prepend/append in search forms */
-
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.form-search .input-append .search-query {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search .input-append .btn {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .search-query {
-  -webkit-border-radius: 0 14px 14px 0;
-     -moz-border-radius: 0 14px 14px 0;
-          border-radius: 0 14px 14px 0;
-}
-
-.form-search .input-prepend .btn {
-  -webkit-border-radius: 14px 0 0 14px;
-     -moz-border-radius: 14px 0 0 14px;
-          border-radius: 14px 0 0 14px;
-}
-
-.form-search input,
-.form-inline input,
-.form-horizontal input,
-.form-search textarea,
-.form-inline textarea,
-.form-horizontal textarea,
-.form-search select,
-.form-inline select,
-.form-horizontal select,
-.form-search .help-inline,
-.form-inline .help-inline,
-.form-horizontal .help-inline,
-.form-search .uneditable-input,
-.form-inline .uneditable-input,
-.form-horizontal .uneditable-input,
-.form-search .input-prepend,
-.form-inline .input-prepend,
-.form-horizontal .input-prepend,
-.form-search .input-append,
-.form-inline .input-append,
-.form-horizontal .input-append {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.form-search .hide,
-.form-inline .hide,
-.form-horizontal .hide {
-  display: none;
-}
-
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-.control-group {
-  margin-bottom: 10px;
-}
-
-legend + .control-group {
-  margin-top: 20px;
-  -webkit-margin-top-collapse: separate;
-}
-
-.form-horizontal .control-group {
-  margin-bottom: 20px;
-  *zoom: 1;
-}
-
-.form-horizontal .control-group:before,
-.form-horizontal .control-group:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.form-horizontal .control-group:after {
-  clear: both;
-}
-
-.form-horizontal .control-label {
-  float: left;
-  width: 160px;
-  padding-top: 5px;
-  text-align: right;
-}
-
-.form-horizontal .controls {
-  *display: inline-block;
-  *padding-left: 20px;
-  margin-left: 180px;
-  *margin-left: 0;
-}
-
-.form-horizontal .controls:first-child {
-  *padding-left: 180px;
-}
-
-.form-horizontal .help-block {
-  margin-bottom: 0;
-}
-
-.form-horizontal input + .help-block,
-.form-horizontal select + .help-block,
-.form-horizontal textarea + .help-block {
-  margin-top: 10px;
-}
-
-.form-horizontal .form-actions {
-  padding-left: 180px;
-}
-
-table {
-  max-width: 100%;
-  background-color: transparent;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-
-.table {
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.table th,
-.table td {
-  padding: 8px;
-  line-height: 20px;
-  text-align: left;
-  vertical-align: top;
-  border-top: 1px solid #dddddd;
-}
-
-.table th {
-  font-weight: bold;
-}
-
-.table thead th {
-  vertical-align: bottom;
-}
-
-.table caption + thead tr:first-child th,
-.table caption + thead tr:first-child td,
-.table colgroup + thead tr:first-child th,
-.table colgroup + thead tr:first-child td,
-.table thead:first-child tr:first-child th,
-.table thead:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #dddddd;
-}
-
-.table-condensed th,
-.table-condensed td {
-  padding: 4px 5px;
-}
-
-.table-bordered {
-  border: 1px solid #dddddd;
-  border-collapse: separate;
-  *border-collapse: collapse;
-  border-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.table-bordered th,
-.table-bordered td {
-  border-left: 1px solid #dddddd;
-}
-
-.table-bordered caption + thead tr:first-child th,
-.table-bordered caption + tbody tr:first-child th,
-.table-bordered caption + tbody tr:first-child td,
-.table-bordered colgroup + thead tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child th,
-.table-bordered colgroup + tbody tr:first-child td,
-.table-bordered thead:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child th,
-.table-bordered tbody:first-child tr:first-child td {
-  border-top: 0;
-}
-
-.table-bordered thead:first-child tr:first-child th:first-child,
-.table-bordered tbody:first-child tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered thead:first-child tr:first-child th:last-child,
-.table-bordered tbody:first-child tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child th:first-child,
-.table-bordered tbody:last-child tr:last-child td:first-child,
-.table-bordered tfoot:last-child tr:last-child td:first-child {
-  -webkit-border-radius: 0 0 0 4px;
-     -moz-border-radius: 0 0 0 4px;
-          border-radius: 0 0 0 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.table-bordered thead:last-child tr:last-child th:last-child,
-.table-bordered tbody:last-child tr:last-child td:last-child,
-.table-bordered tfoot:last-child tr:last-child td:last-child {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:first-child,
-.table-bordered caption + tbody tr:first-child td:first-child,
-.table-bordered colgroup + thead tr:first-child th:first-child,
-.table-bordered colgroup + tbody tr:first-child td:first-child {
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.table-bordered caption + thead tr:first-child th:last-child,
-.table-bordered caption + tbody tr:first-child td:last-child,
-.table-bordered colgroup + thead tr:first-child th:last-child,
-.table-bordered colgroup + tbody tr:first-child td:last-child {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-}
-
-.table-striped tbody tr:nth-child(odd) td,
-.table-striped tbody tr:nth-child(odd) th {
-  background-color: #f9f9f9;
-}
-
-.table-hover tbody tr:hover td,
-.table-hover tbody tr:hover th {
-  background-color: #f5f5f5;
-}
-
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none;
-  margin-left: 0;
-}
-
-.table td.span1,
-.table th.span1 {
-  float: none;
-  width: 44px;
-  margin-left: 0;
-}
-
-.table td.span2,
-.table th.span2 {
-  float: none;
-  width: 124px;
-  margin-left: 0;
-}
-
-.table td.span3,
-.table th.span3 {
-  float: none;
-  width: 204px;
-  margin-left: 0;
-}
-
-.table td.span4,
-.table th.span4 {
-  float: none;
-  width: 284px;
-  margin-left: 0;
-}
-
-.table td.span5,
-.table th.span5 {
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-
-.table td.span6,
-.table th.span6 {
-  float: none;
-  width: 444px;
-  margin-left: 0;
-}
-
-.table td.span7,
-.table th.span7 {
-  float: none;
-  width: 524px;
-  margin-left: 0;
-}
-
-.table td.span8,
-.table th.span8 {
-  float: none;
-  width: 604px;
-  margin-left: 0;
-}
-
-.table td.span9,
-.table th.span9 {
-  float: none;
-  width: 684px;
-  margin-left: 0;
-}
-
-.table td.span10,
-.table th.span10 {
-  float: none;
-  width: 764px;
-  margin-left: 0;
-}
-
-.table td.span11,
-.table th.span11 {
-  float: none;
-  width: 844px;
-  margin-left: 0;
-}
-
-.table td.span12,
-.table th.span12 {
-  float: none;
-  width: 924px;
-  margin-left: 0;
-}
-
-.table tbody tr.success td {
-  background-color: #dff0d8;
-}
-
-.table tbody tr.error td {
-  background-color: #f2dede;
-}
-
-.table tbody tr.warning td {
-  background-color: #fcf8e3;
-}
-
-.table tbody tr.info td {
-  background-color: #d9edf7;
-}
-
-.table-hover tbody tr.success:hover td {
-  background-color: #d0e9c6;
-}
-
-.table-hover tbody tr.error:hover td {
-  background-color: #ebcccc;
-}
-
-.table-hover tbody tr.warning:hover td {
-  background-color: #faf2cc;
-}
-
-.table-hover tbody tr.info:hover td {
-  background-color: #c4e3f3;
-}
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../img/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-}
-
-/* White icons with optional class, or on hover/active states of certain elements */
-
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"] {
-  background-image: url("../img/glyphicons-halflings-white.png");
-}
-
-.icon-glass {
-  background-position: 0      0;
-}
-
-.icon-music {
-  background-position: -24px 0;
-}
-
-.icon-search {
-  background-position: -48px 0;
-}
-
-.icon-envelope {
-  background-position: -72px 0;
-}
-
-.icon-heart {
-  background-position: -96px 0;
-}
-
-.icon-star {
-  background-position: -120px 0;
-}
-
-.icon-star-empty {
-  background-position: -144px 0;
-}
-
-.icon-user {
-  background-position: -168px 0;
-}
-
-.icon-film {
-  background-position: -192px 0;
-}
-
-.icon-th-large {
-  background-position: -216px 0;
-}
-
-.icon-th {
-  background-position: -240px 0;
-}
-
-.icon-th-list {
-  background-position: -264px 0;
-}
-
-.icon-ok {
-  background-position: -288px 0;
-}
-
-.icon-remove {
-  background-position: -312px 0;
-}
-
-.icon-zoom-in {
-  background-position: -336px 0;
-}
-
-.icon-zoom-out {
-  background-position: -360px 0;
-}
-
-.icon-off {
-  background-position: -384px 0;
-}
-
-.icon-signal {
-  background-position: -408px 0;
-}
-
-.icon-cog {
-  background-position: -432px 0;
-}
-
-.icon-trash {
-  background-position: -456px 0;
-}
-
-.icon-home {
-  background-position: 0 -24px;
-}
-
-.icon-file {
-  background-position: -24px -24px;
-}
-
-.icon-time {
-  background-position: -48px -24px;
-}
-
-.icon-road {
-  background-position: -72px -24px;
-}
-
-.icon-download-alt {
-  background-position: -96px -24px;
-}
-
-.icon-download {
-  background-position: -120px -24px;
-}
-
-.icon-upload {
-  background-position: -144px -24px;
-}
-
-.icon-inbox {
-  background-position: -168px -24px;
-}
-
-.icon-play-circle {
-  background-position: -192px -24px;
-}
-
-.icon-repeat {
-  background-position: -216px -24px;
-}
-
-.icon-refresh {
-  background-position: -240px -24px;
-}
-
-.icon-list-alt {
-  background-position: -264px -24px;
-}
-
-.icon-lock {
-  background-position: -287px -24px;
-}
-
-.icon-flag {
-  background-position: -312px -24px;
-}
-
-.icon-headphones {
-  background-position: -336px -24px;
-}
-
-.icon-volume-off {
-  background-position: -360px -24px;
-}
-
-.icon-volume-down {
-  background-position: -384px -24px;
-}
-
-.icon-volume-up {
-  background-position: -408px -24px;
-}
-
-.icon-qrcode {
-  background-position: -432px -24px;
-}
-
-.icon-barcode {
-  background-position: -456px -24px;
-}
-
-.icon-tag {
-  background-position: 0 -48px;
-}
-
-.icon-tags {
-  background-position: -25px -48px;
-}
-
-.icon-book {
-  background-position: -48px -48px;
-}
-
-.icon-bookmark {
-  background-position: -72px -48px;
-}
-
-.icon-print {
-  background-position: -96px -48px;
-}
-
-.icon-camera {
-  background-position: -120px -48px;
-}
-
-.icon-font {
-  background-position: -144px -48px;
-}
-
-.icon-bold {
-  background-position: -167px -48px;
-}
-
-.icon-italic {
-  background-position: -192px -48px;
-}
-
-.icon-text-height {
-  background-position: -216px -48px;
-}
-
-.icon-text-width {
-  background-position: -240px -48px;
-}
-
-.icon-align-left {
-  background-position: -264px -48px;
-}
-
-.icon-align-center {
-  background-position: -288px -48px;
-}
-
-.icon-align-right {
-  background-position: -312px -48px;
-}
-
-.icon-align-justify {
-  background-position: -336px -48px;
-}
-
-.icon-list {
-  background-position: -360px -48px;
-}
-
-.icon-indent-left {
-  background-position: -384px -48px;
-}
-
-.icon-indent-right {
-  background-position: -408px -48px;
-}
-
-.icon-facetime-video {
-  background-position: -432px -48px;
-}
-
-.icon-picture {
-  background-position: -456px -48px;
-}
-
-.icon-pencil {
-  background-position: 0 -72px;
-}
-
-.icon-map-marker {
-  background-position: -24px -72px;
-}
-
-.icon-adjust {
-  background-position: -48px -72px;
-}
-
-.icon-tint {
-  background-position: -72px -72px;
-}
-
-.icon-edit {
-  background-position: -96px -72px;
-}
-
-.icon-share {
-  background-position: -120px -72px;
-}
-
-.icon-check {
-  background-position: -144px -72px;
-}
-
-.icon-move {
-  background-position: -168px -72px;
-}
-
-.icon-step-backward {
-  background-position: -192px -72px;
-}
-
-.icon-fast-backward {
-  background-position: -216px -72px;
-}
-
-.icon-backward {
-  background-position: -240px -72px;
-}
-
-.icon-play {
-  background-position: -264px -72px;
-}
-
-.icon-pause {
-  background-position: -288px -72px;
-}
-
-.icon-stop {
-  background-position: -312px -72px;
-}
-
-.icon-forward {
-  background-position: -336px -72px;
-}
-
-.icon-fast-forward {
-  background-position: -360px -72px;
-}
-
-.icon-step-forward {
-  background-position: -384px -72px;
-}
-
-.icon-eject {
-  background-position: -408px -72px;
-}
-
-.icon-chevron-left {
-  background-position: -432px -72px;
-}
-
-.icon-chevron-right {
-  background-position: -456px -72px;
-}
-
-.icon-plus-sign {
-  background-position: 0 -96px;
-}
-
-.icon-minus-sign {
-  background-position: -24px -96px;
-}
-
-.icon-remove-sign {
-  background-position: -48px -96px;
-}
-
-.icon-ok-sign {
-  background-position: -72px -96px;
-}
-
-.icon-question-sign {
-  background-position: -96px -96px;
-}
-
-.icon-info-sign {
-  background-position: -120px -96px;
-}
-
-.icon-screenshot {
-  background-position: -144px -96px;
-}
-
-.icon-remove-circle {
-  background-position: -168px -96px;
-}
-
-.icon-ok-circle {
-  background-position: -192px -96px;
-}
-
-.icon-ban-circle {
-  background-position: -216px -96px;
-}
-
-.icon-arrow-left {
-  background-position: -240px -96px;
-}
-
-.icon-arrow-right {
-  background-position: -264px -96px;
-}
-
-.icon-arrow-up {
-  background-position: -289px -96px;
-}
-
-.icon-arrow-down {
-  background-position: -312px -96px;
-}
-
-.icon-share-alt {
-  background-position: -336px -96px;
-}
-
-.icon-resize-full {
-  background-position: -360px -96px;
-}
-
-.icon-resize-small {
-  background-position: -384px -96px;
-}
-
-.icon-plus {
-  background-position: -408px -96px;
-}
-
-.icon-minus {
-  background-position: -433px -96px;
-}
-
-.icon-asterisk {
-  background-position: -456px -96px;
-}
-
-.icon-exclamation-sign {
-  background-position: 0 -120px;
-}
-
-.icon-gift {
-  background-position: -24px -120px;
-}
-
-.icon-leaf {
-  background-position: -48px -120px;
-}
-
-.icon-fire {
-  background-position: -72px -120px;
-}
-
-.icon-eye-open {
-  background-position: -96px -120px;
-}
-
-.icon-eye-close {
-  background-position: -120px -120px;
-}
-
-.icon-warning-sign {
-  background-position: -144px -120px;
-}
-
-.icon-plane {
-  background-position: -168px -120px;
-}
-
-.icon-calendar {
-  background-position: -192px -120px;
-}
-
-.icon-random {
-  width: 16px;
-  background-position: -216px -120px;
-}
-
-.icon-comment {
-  background-position: -240px -120px;
-}
-
-.icon-magnet {
-  background-position: -264px -120px;
-}
-
-.icon-chevron-up {
-  background-position: -288px -120px;
-}
-
-.icon-chevron-down {
-  background-position: -313px -119px;
-}
-
-.icon-retweet {
-  background-position: -336px -120px;
-}
-
-.icon-shopping-cart {
-  background-position: -360px -120px;
-}
-
-.icon-folder-close {
-  background-position: -384px -120px;
-}
-
-.icon-folder-open {
-  width: 16px;
-  background-position: -408px -120px;
-}
-
-.icon-resize-vertical {
-  background-position: -432px -119px;
-}
-
-.icon-resize-horizontal {
-  background-position: -456px -118px;
-}
-
-.icon-hdd {
-  background-position: 0 -144px;
-}
-
-.icon-bullhorn {
-  background-position: -24px -144px;
-}
-
-.icon-bell {
-  background-position: -48px -144px;
-}
-
-.icon-certificate {
-  background-position: -72px -144px;
-}
-
-.icon-thumbs-up {
-  background-position: -96px -144px;
-}
-
-.icon-thumbs-down {
-  background-position: -120px -144px;
-}
-
-.icon-hand-right {
-  background-position: -144px -144px;
-}
-
-.icon-hand-left {
-  background-position: -168px -144px;
-}
-
-.icon-hand-up {
-  background-position: -192px -144px;
-}
-
-.icon-hand-down {
-  background-position: -216px -144px;
-}
-
-.icon-circle-arrow-right {
-  background-position: -240px -144px;
-}
-
-.icon-circle-arrow-left {
-  background-position: -264px -144px;
-}
-
-.icon-circle-arrow-up {
-  background-position: -288px -144px;
-}
-
-.icon-circle-arrow-down {
-  background-position: -312px -144px;
-}
-
-.icon-globe {
-  background-position: -336px -144px;
-}
-
-.icon-wrench {
-  background-position: -360px -144px;
-}
-
-.icon-tasks {
-  background-position: -384px -144px;
-}
-
-.icon-filter {
-  background-position: -408px -144px;
-}
-
-.icon-briefcase {
-  background-position: -432px -144px;
-}
-
-.icon-fullscreen {
-  background-position: -456px -144px;
-}
-
-.dropup,
-.dropdown {
-  position: relative;
-}
-
-.dropdown-toggle {
-  *margin-bottom: -3px;
-}
-
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border-top: 4px solid #000000;
-  border-right: 4px solid transparent;
-  border-left: 4px solid transparent;
-  content: "";
-}
-
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
-
-.dropdown-menu {
-  position: absolute;
-  top: 100%;
-  left: 0;
-  z-index: 1000;
-  display: none;
-  float: left;
-  min-width: 160px;
-  padding: 5px 0;
-  margin: 2px 0 0;
-  list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.dropdown-menu .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.dropdown-menu li > a {
-  display: block;
-  padding: 3px 20px;
-  clear: both;
-  font-weight: normal;
-  line-height: 20px;
-  color: #333333;
-  white-space: nowrap;
-}
-
-.dropdown-menu li > a:hover,
-.dropdown-menu li > a:focus,
-.dropdown-submenu:hover > a {
-  color: #ffffff;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu .active > a,
-.dropdown-menu .active > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #0081c2;
-  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
-  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
-  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
-  background-repeat: repeat-x;
-  outline: 0;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
-}
-
-.dropdown-menu .disabled > a,
-.dropdown-menu .disabled > a:hover {
-  color: #999999;
-}
-
-.dropdown-menu .disabled > a:hover {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-  background-image: none;
-}
-
-.open {
-  *z-index: 1000;
-}
-
-.open > .dropdown-menu {
-  display: block;
-}
-
-.pull-right > .dropdown-menu {
-  right: 0;
-  left: auto;
-}
-
-.dropup .caret,
-.navbar-fixed-bottom .dropdown .caret {
-  border-top: 0;
-  border-bottom: 4px solid #000000;
-  content: "";
-}
-
-.dropup .dropdown-menu,
-.navbar-fixed-bottom .dropdown .dropdown-menu {
-  top: auto;
-  bottom: 100%;
-  margin-bottom: 1px;
-}
-
-.dropdown-submenu {
-  position: relative;
-}
-
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-     -moz-border-radius: 0 6px 6px 6px;
-          border-radius: 0 6px 6px 6px;
-}
-
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
-
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  -webkit-border-radius: 5px 5px 5px 0;
-     -moz-border-radius: 5px 5px 5px 0;
-          border-radius: 5px 5px 5px 0;
-}
-
-.dropdown-submenu > a:after {
-  display: block;
-  float: right;
-  width: 0;
-  height: 0;
-  margin-top: 5px;
-  margin-right: -10px;
-  border-color: transparent;
-  border-left-color: #cccccc;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  content: " ";
-}
-
-.dropdown-submenu:hover > a:after {
-  border-left-color: #ffffff;
-}
-
-.dropdown-submenu.pull-left {
-  float: none;
-}
-
-.dropdown-submenu.pull-left > .dropdown-menu {
-  left: -100%;
-  margin-left: 10px;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.dropdown .dropdown-menu .nav-header {
-  padding-right: 20px;
-  padding-left: 20px;
-}
-
-.typeahead {
-  margin-top: 2px;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.well {
-  min-height: 20px;
-  padding: 19px;
-  margin-bottom: 20px;
-  background-color: #f5f5f5;
-  border: 1px solid #e3e3e3;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-}
-
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
-}
-
-.well-large {
-  padding: 24px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.well-small {
-  padding: 9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.fade {
-  opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-     -moz-transition: opacity 0.15s linear;
-       -o-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
-}
-
-.fade.in {
-  opacity: 1;
-}
-
-.collapse {
-  position: relative;
-  height: 0;
-  overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-     -moz-transition: height 0.35s ease;
-       -o-transition: height 0.35s ease;
-          transition: height 0.35s ease;
-}
-
-.collapse.in {
-  height: auto;
-}
-
-.close {
-  float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
-  filter: alpha(opacity=20);
-}
-
-.close:hover {
-  color: #000000;
-  text-decoration: none;
-  cursor: pointer;
-  opacity: 0.4;
-  filter: alpha(opacity=40);
-}
-
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
-}
-
-.btn {
-  display: inline-block;
-  *display: inline;
-  padding: 4px 12px;
-  margin-bottom: 0;
-  *margin-left: .3em;
-  font-size: 14px;
-  line-height: 20px;
-  *line-height: 20px;
-  color: #333333;
-  text-align: center;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  vertical-align: middle;
-  cursor: pointer;
-  background-color: #f5f5f5;
-  *background-color: #e6e6e6;
-  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-  background-repeat: repeat-x;
-  border: 1px solid #bbbbbb;
-  *border: 0;
-  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  border-bottom-color: #a2a2a2;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn:hover,
-.btn:active,
-.btn.active,
-.btn.disabled,
-.btn[disabled] {
-  color: #333333;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-}
-
-.btn:active,
-.btn.active {
-  background-color: #cccccc \9;
-}
-
-.btn:first-child {
-  *margin-left: 0;
-}
-
-.btn:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: #e6e6e6;
-  *background-color: #d9d9d9;
-  /* Buttons in IE7 don't get borders, so darken on hover */
-
-  background-position: 0 -15px;
-  -webkit-transition: background-position 0.1s linear;
-     -moz-transition: background-position 0.1s linear;
-       -o-transition: background-position 0.1s linear;
-          transition: background-position 0.1s linear;
-}
-
-.btn:focus {
-  outline: thin dotted #333;
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-.btn.active,
-.btn:active {
-  background-color: #e6e6e6;
-  background-color: #d9d9d9 \9;
-  background-image: none;
-  outline: 0;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn.disabled,
-.btn[disabled] {
-  cursor: default;
-  background-color: #e6e6e6;
-  background-image: none;
-  opacity: 0.65;
-  filter: alpha(opacity=65);
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-large {
-  padding: 11px 19px;
-  font-size: 17.5px;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 2px;
-}
-
-.btn-small {
-  padding: 2px 10px;
-  font-size: 11.9px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
-
-.btn-mini {
-  padding: 1px 6px;
-  font-size: 10.5px;
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.btn-block {
-  display: block;
-  width: 100%;
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.btn-block + .btn-block {
-  margin-top: 5px;
-}
-
-input[type="submit"].btn-block,
-input[type="reset"].btn-block,
-input[type="button"].btn-block {
-  width: 100%;
-}
-
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255, 255, 255, 0.75);
-}
-
-.btn {
-  border-color: #c5c5c5;
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-}
-
-.btn-primary {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #006dcc;
-  *background-color: #0044cc;
-  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
-  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
-  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
-  background-repeat: repeat-x;
-  border-color: #0044cc #0044cc #002a80;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-primary:hover,
-.btn-primary:active,
-.btn-primary.active,
-.btn-primary.disabled,
-.btn-primary[disabled] {
-  color: #ffffff;
-  background-color: #0044cc;
-  *background-color: #003bb3;
-}
-
-.btn-primary:active,
-.btn-primary.active {
-  background-color: #003399 \9;
-}
-
-.btn-warning {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #faa732;
-  *background-color: #f89406;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  border-color: #f89406 #f89406 #ad6704;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-warning:hover,
-.btn-warning:active,
-.btn-warning.active,
-.btn-warning.disabled,
-.btn-warning[disabled] {
-  color: #ffffff;
-  background-color: #f89406;
-  *background-color: #df8505;
-}
-
-.btn-warning:active,
-.btn-warning.active {
-  background-color: #c67605 \9;
-}
-
-.btn-danger {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #da4f49;
-  *background-color: #bd362f;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
-  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
-  background-repeat: repeat-x;
-  border-color: #bd362f #bd362f #802420;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-danger:hover,
-.btn-danger:active,
-.btn-danger.active,
-.btn-danger.disabled,
-.btn-danger[disabled] {
-  color: #ffffff;
-  background-color: #bd362f;
-  *background-color: #a9302a;
-}
-
-.btn-danger:active,
-.btn-danger.active {
-  background-color: #942a25 \9;
-}
-
-.btn-success {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #5bb75b;
-  *background-color: #51a351;
-  background-image: -moz-linear-gradient(top, #62c462, #51a351);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
-  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
-  background-image: -o-linear-gradient(top, #62c462, #51a351);
-  background-image: linear-gradient(to bottom, #62c462, #51a351);
-  background-repeat: repeat-x;
-  border-color: #51a351 #51a351 #387038;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-success:hover,
-.btn-success:active,
-.btn-success.active,
-.btn-success.disabled,
-.btn-success[disabled] {
-  color: #ffffff;
-  background-color: #51a351;
-  *background-color: #499249;
-}
-
-.btn-success:active,
-.btn-success.active {
-  background-color: #408140 \9;
-}
-
-.btn-info {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #49afcd;
-  *background-color: #2f96b4;
-  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
-  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
-  background-repeat: repeat-x;
-  border-color: #2f96b4 #2f96b4 #1f6377;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-info:hover,
-.btn-info:active,
-.btn-info.active,
-.btn-info.disabled,
-.btn-info[disabled] {
-  color: #ffffff;
-  background-color: #2f96b4;
-  *background-color: #2a85a0;
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #24748c \9;
-}
-
-.btn-inverse {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #363636;
-  *background-color: #222222;
-  background-image: -moz-linear-gradient(top, #444444, #222222);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
-  background-image: -webkit-linear-gradient(top, #444444, #222222);
-  background-image: -o-linear-gradient(top, #444444, #222222);
-  background-image: linear-gradient(to bottom, #444444, #222222);
-  background-repeat: repeat-x;
-  border-color: #222222 #222222 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-inverse:hover,
-.btn-inverse:active,
-.btn-inverse.active,
-.btn-inverse.disabled,
-.btn-inverse[disabled] {
-  color: #ffffff;
-  background-color: #222222;
-  *background-color: #151515;
-}
-
-.btn-inverse:active,
-.btn-inverse.active {
-  background-color: #080808 \9;
-}
-
-button.btn,
-input[type="submit"].btn {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn::-moz-focus-inner,
-input[type="submit"].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
-}
-
-button.btn.btn-large,
-input[type="submit"].btn.btn-large {
-  *padding-top: 7px;
-  *padding-bottom: 7px;
-}
-
-button.btn.btn-small,
-input[type="submit"].btn.btn-small {
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-}
-
-button.btn.btn-mini,
-input[type="submit"].btn.btn-mini {
-  *padding-top: 1px;
-  *padding-bottom: 1px;
-}
-
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  -webkit-box-shadow: none;
-     -moz-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-link {
-  color: #0088cc;
-  cursor: pointer;
-  border-color: transparent;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-link:hover {
-  color: #005580;
-  text-decoration: underline;
-  background-color: transparent;
-}
-
-.btn-link[disabled]:hover {
-  color: #333333;
-  text-decoration: none;
-}
-
-.btn-group {
-  position: relative;
-  display: inline-block;
-  *display: inline;
-  *margin-left: .3em;
-  font-size: 0;
-  white-space: nowrap;
-  vertical-align: middle;
-  *zoom: 1;
-}
-
-.btn-group:first-child {
-  *margin-left: 0;
-}
-
-.btn-group + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-toolbar {
-  margin-top: 10px;
-  margin-bottom: 10px;
-  font-size: 0;
-}
-
-.btn-toolbar .btn + .btn,
-.btn-toolbar .btn-group + .btn,
-.btn-toolbar .btn + .btn-group {
-  margin-left: 5px;
-}
-
-.btn-group > .btn {
-  position: relative;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-
-.btn-group > .btn,
-.btn-group > .dropdown-menu {
-  font-size: 14px;
-}
-
-.btn-group > .btn-mini {
-  font-size: 11px;
-}
-
-.btn-group > .btn-small {
-  font-size: 12px;
-}
-
-.btn-group > .btn-large {
-  font-size: 16px;
-}
-
-.btn-group > .btn:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
-}
-
-.btn-group .dropdown-toggle:active,
-.btn-group.open .dropdown-toggle {
-  outline: 0;
-}
-
-.btn-group > .btn + .dropdown-toggle {
-  *padding-top: 5px;
-  padding-right: 8px;
-  *padding-bottom: 5px;
-  padding-left: 8px;
-  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group > .btn-mini + .dropdown-toggle {
-  *padding-top: 2px;
-  padding-right: 5px;
-  *padding-bottom: 2px;
-  padding-left: 5px;
-}
-
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-
-.btn-group > .btn-large + .dropdown-toggle {
-  *padding-top: 7px;
-  padding-right: 12px;
-  *padding-bottom: 7px;
-  padding-left: 12px;
-}
-
-.btn-group.open .dropdown-toggle {
-  background-image: none;
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.btn-group.open .btn.dropdown-toggle {
-  background-color: #e6e6e6;
-}
-
-.btn-group.open .btn-primary.dropdown-toggle {
-  background-color: #0044cc;
-}
-
-.btn-group.open .btn-warning.dropdown-toggle {
-  background-color: #f89406;
-}
-
-.btn-group.open .btn-danger.dropdown-toggle {
-  background-color: #bd362f;
-}
-
-.btn-group.open .btn-success.dropdown-toggle {
-  background-color: #51a351;
-}
-
-.btn-group.open .btn-info.dropdown-toggle {
-  background-color: #2f96b4;
-}
-
-.btn-group.open .btn-inverse.dropdown-toggle {
-  background-color: #222222;
-}
-
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
-
-.btn-mini .caret,
-.btn-small .caret,
-.btn-large .caret {
-  margin-top: 6px;
-}
-
-.btn-large .caret {
-  border-top-width: 5px;
-  border-right-width: 5px;
-  border-left-width: 5px;
-}
-
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
-}
-
-.btn-primary .caret,
-.btn-warning .caret,
-.btn-danger .caret,
-.btn-info .caret,
-.btn-success .caret,
-.btn-inverse .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.btn-group-vertical {
-  display: inline-block;
-  *display: inline;
-  /* IE7 inline-block hack */
-
-  *zoom: 1;
-}
-
-.btn-group-vertical .btn {
-  display: block;
-  float: none;
-  width: 100%;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.btn-group-vertical .btn + .btn {
-  margin-top: -1px;
-  margin-left: 0;
-}
-
-.btn-group-vertical .btn:first-child {
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.btn-group-vertical .btn:last-child {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.btn-group-vertical .btn-large:first-child {
-  -webkit-border-radius: 6px 6px 0 0;
-     -moz-border-radius: 6px 6px 0 0;
-          border-radius: 6px 6px 0 0;
-}
-
-.btn-group-vertical .btn-large:last-child {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: 20px;
-  color: #c09853;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  background-color: #fcf8e3;
-  border: 1px solid #fbeed5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.alert h4 {
-  margin: 0;
-}
-
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: 20px;
-}
-
-.alert-success {
-  color: #468847;
-  background-color: #dff0d8;
-  border-color: #d6e9c6;
-}
-
-.alert-danger,
-.alert-error {
-  color: #b94a48;
-  background-color: #f2dede;
-  border-color: #eed3d7;
-}
-
-.alert-info {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
-}
-
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
-}
-
-.alert-block p + p {
-  margin-top: 5px;
-}
-
-.nav {
-  margin-bottom: 20px;
-  margin-left: 0;
-  list-style: none;
-}
-
-.nav > li > a {
-  display: block;
-}
-
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: #eeeeee;
-}
-
-.nav > .pull-right {
-  float: right;
-}
-
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: 20px;
-  color: #999999;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  text-transform: uppercase;
-}
-
-.nav li + .nav-header {
-  margin-top: 9px;
-}
-
-.nav-list {
-  padding-right: 15px;
-  padding-left: 15px;
-  margin-bottom: 0;
-}
-
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-right: -15px;
-  margin-left: -15px;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-}
-
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-
-.nav-list > .active > a,
-.nav-list > .active > a:hover {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  background-color: #0088cc;
-}
-
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-
-.nav-list .divider {
-  *width: 100%;
-  height: 1px;
-  margin: 9px 1px;
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: #e5e5e5;
-  border-bottom: 1px solid #ffffff;
-}
-
-.nav-tabs,
-.nav-pills {
-  *zoom: 1;
-}
-
-.nav-tabs:before,
-.nav-pills:before,
-.nav-tabs:after,
-.nav-pills:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
-}
-
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-     -moz-border-radius: 4px 4px 0 0;
-          border-radius: 4px 4px 0 0;
-}
-
-.nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover {
-  color: #555555;
-  cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-}
-
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -webkit-border-radius: 5px;
-     -moz-border-radius: 5px;
-          border-radius: 5px;
-}
-
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover {
-  color: #ffffff;
-  background-color: #0088cc;
-}
-
-.nav-stacked > li {
-  float: none;
-}
-
-.nav-stacked > li > a {
-  margin-right: 0;
-}
-
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.nav-tabs.nav-stacked > li:first-child > a {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li:last-child > a {
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -moz-border-radius-bottomright: 4px;
-  -moz-border-radius-bottomleft: 4px;
-}
-
-.nav-tabs.nav-stacked > li > a:hover {
-  z-index: 2;
-  border-color: #ddd;
-}
-
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px;
-}
-
-.nav-tabs .dropdown-menu {
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-}
-
-.nav-pills .dropdown-menu {
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.nav .dropdown-toggle .caret {
-  margin-top: 6px;
-  border-top-color: #0088cc;
-  border-bottom-color: #0088cc;
-}
-
-.nav .dropdown-toggle:hover .caret {
-  border-top-color: #005580;
-  border-bottom-color: #005580;
-}
-
-/* move down carets for tabs */
-
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.nav > .dropdown.active > a:hover {
-  cursor: pointer;
-}
-
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover {
-  color: #ffffff;
-  background-color: #999999;
-  border-color: #999999;
-}
-
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-  opacity: 1;
-  filter: alpha(opacity=100);
-}
-
-.tabs-stacked .open > a:hover {
-  border-color: #999999;
-}
-
-.tabbable {
-  *zoom: 1;
-}
-
-.tabbable:before,
-.tabbable:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.tabbable:after {
-  clear: both;
-}
-
-.tab-content {
-  overflow: auto;
-}
-
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
-  border-bottom: 0;
-}
-
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
-
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-
-.tabs-below > .nav-tabs > li > a {
-  -webkit-border-radius: 0 0 4px 4px;
-     -moz-border-radius: 0 0 4px 4px;
-          border-radius: 0 0 4px 4px;
-}
-
-.tabs-below > .nav-tabs > li > a:hover {
-  border-top-color: #ddd;
-  border-bottom-color: transparent;
-}
-
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover {
-  border-color: transparent #ddd #ddd #ddd;
-}
-
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  -webkit-border-radius: 4px 0 0 4px;
-     -moz-border-radius: 4px 0 0 4px;
-          border-radius: 4px 0 0 4px;
-}
-
-.tabs-left > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
-}
-
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: #ffffff;
-}
-
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  -webkit-border-radius: 0 4px 4px 0;
-     -moz-border-radius: 0 4px 4px 0;
-          border-radius: 0 4px 4px 0;
-}
-
-.tabs-right > .nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
-}
-
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: #ffffff;
-}
-
-.nav > .disabled > a {
-  color: #999999;
-}
-
-.nav > .disabled > a:hover {
-  text-decoration: none;
-  cursor: default;
-  background-color: transparent;
-}
-
-.navbar {
-  *position: relative;
-  *z-index: 2;
-  margin-bottom: 20px;
-  overflow: visible;
-  color: #777777;
-}
-
-.navbar-inner {
-  min-height: 40px;
-  padding-right: 20px;
-  padding-left: 20px;
-  background-color: #fafafa;
-  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
-  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
-  background-repeat: repeat-x;
-  border: 1px solid #d4d4d4;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
-}
-
-.navbar-inner:before,
-.navbar-inner:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-inner:after {
-  clear: both;
-}
-
-.navbar .container {
-  width: auto;
-}
-
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
-
-.navbar .brand {
-  display: block;
-  float: left;
-  padding: 10px 20px 10px;
-  margin-left: -20px;
-  font-size: 20px;
-  font-weight: 200;
-  color: #777777;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .brand:hover {
-  text-decoration: none;
-}
-
-.navbar-text {
-  margin-bottom: 0;
-  line-height: 40px;
-}
-
-.navbar-link {
-  color: #777777;
-}
-
-.navbar-link:hover {
-  color: #333333;
-}
-
-.navbar .divider-vertical {
-  height: 40px;
-  margin: 0 9px;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #f2f2f2;
-}
-
-.navbar .btn,
-.navbar .btn-group {
-  margin-top: 5px;
-}
-
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn {
-  margin-top: 0;
-}
-
-.navbar-form {
-  margin-bottom: 0;
-  *zoom: 1;
-}
-
-.navbar-form:before,
-.navbar-form:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.navbar-form:after {
-  clear: both;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .radio,
-.navbar-form .checkbox {
-  margin-top: 5px;
-}
-
-.navbar-form input,
-.navbar-form select,
-.navbar-form .btn {
-  display: inline-block;
-  margin-bottom: 0;
-}
-
-.navbar-form input[type="image"],
-.navbar-form input[type="checkbox"],
-.navbar-form input[type="radio"] {
-  margin-top: 3px;
-}
-
-.navbar-form .input-append,
-.navbar-form .input-prepend {
-  margin-top: 6px;
-  white-space: nowrap;
-}
-
-.navbar-form .input-append input,
-.navbar-form .input-prepend input {
-  margin-top: 0;
-}
-
-.navbar-search {
-  position: relative;
-  float: left;
-  margin-top: 5px;
-  margin-bottom: 0;
-}
-
-.navbar-search .search-query {
-  padding: 4px 14px;
-  margin-bottom: 0;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  font-weight: normal;
-  line-height: 1;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0;
-}
-
-.navbar-static-top .navbar-inner {
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-  position: fixed;
-  right: 0;
-  left: 0;
-  z-index: 1030;
-  margin-bottom: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  border-width: 0 0 1px;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  border-width: 1px 0 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-right: 0;
-  padding-left: 0;
-  -webkit-border-radius: 0;
-     -moz-border-radius: 0;
-          border-radius: 0;
-}
-
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  width: 940px;
-}
-
-.navbar-fixed-top {
-  top: 0;
-}
-
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
-  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar-fixed-bottom {
-  bottom: 0;
-}
-
-.navbar-fixed-bottom .navbar-inner {
-  -webkit-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-          box-shadow: 0 -1px 10px rgba(0, 0, 0, 0.1);
-}
-
-.navbar .nav {
-  position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-
-.navbar .nav.pull-right {
-  float: right;
-  margin-right: 0;
-}
-
-.navbar .nav > li {
-  float: left;
-}
-
-.navbar .nav > li > a {
-  float: none;
-  padding: 10px 15px 10px;
-  color: #777777;
-  text-decoration: none;
-  text-shadow: 0 1px 0 #ffffff;
-}
-
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  color: #333333;
-  text-decoration: none;
-  background-color: transparent;
-}
-
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: #555555;
-  text-decoration: none;
-  background-color: #e5e5e5;
-  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-     -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
-}
-
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-right: 5px;
-  margin-left: 5px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #ededed;
-  *background-color: #e5e5e5;
-  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
-  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
-  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
-  background-repeat: repeat-x;
-  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-}
-
-.navbar .btn-navbar:hover,
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active,
-.navbar .btn-navbar.disabled,
-.navbar .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #e5e5e5;
-  *background-color: #d9d9d9;
-}
-
-.navbar .btn-navbar:active,
-.navbar .btn-navbar.active {
-  background-color: #cccccc \9;
-}
-
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 1px;
-     -moz-border-radius: 1px;
-          border-radius: 1px;
-  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-     -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-          box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
-}
-
-.navbar .nav > li > .dropdown-menu:before {
-  position: absolute;
-  top: -7px;
-  left: 9px;
-  display: inline-block;
-  border-right: 7px solid transparent;
-  border-bottom: 7px solid #ccc;
-  border-left: 7px solid transparent;
-  border-bottom-color: rgba(0, 0, 0, 0.2);
-  content: '';
-}
-
-.navbar .nav > li > .dropdown-menu:after {
-  position: absolute;
-  top: -6px;
-  left: 10px;
-  display: inline-block;
-  border-right: 6px solid transparent;
-  border-bottom: 6px solid #ffffff;
-  border-left: 6px solid transparent;
-  content: '';
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
-  top: auto;
-  bottom: -7px;
-  border-top: 7px solid #ccc;
-  border-bottom: 0;
-  border-top-color: rgba(0, 0, 0, 0.2);
-}
-
-.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
-  top: auto;
-  bottom: -6px;
-  border-top: 6px solid #ffffff;
-  border-bottom: 0;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #555555;
-  background-color: #e5e5e5;
-}
-
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #777777;
-  border-bottom-color: #777777;
-}
-
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #555555;
-  border-bottom-color: #555555;
-}
-
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:before,
-.navbar .nav > li > .dropdown-menu.pull-right:before {
-  right: 12px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu:after,
-.navbar .nav > li > .dropdown-menu.pull-right:after {
-  right: 13px;
-  left: auto;
-}
-
-.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
-  right: 100%;
-  left: auto;
-  margin-right: -1px;
-  margin-left: 0;
-  -webkit-border-radius: 6px 0 6px 6px;
-     -moz-border-radius: 6px 0 6px 6px;
-          border-radius: 6px 0 6px 6px;
-}
-
-.navbar-inverse {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-inner {
-  background-color: #1b1b1b;
-  background-image: -moz-linear-gradient(top, #222222, #111111);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
-  background-image: -webkit-linear-gradient(top, #222222, #111111);
-  background-image: -o-linear-gradient(top, #222222, #111111);
-  background-image: linear-gradient(to bottom, #222222, #111111);
-  background-repeat: repeat-x;
-  border-color: #252525;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
-}
-
-.navbar-inverse .brand,
-.navbar-inverse .nav > li > a {
-  color: #999999;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-}
-
-.navbar-inverse .brand:hover,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-}
-
-.navbar-inverse .nav > li > a:focus,
-.navbar-inverse .nav > li > a:hover {
-  color: #ffffff;
-  background-color: transparent;
-}
-
-.navbar-inverse .nav .active > a,
-.navbar-inverse .nav .active > a:hover,
-.navbar-inverse .nav .active > a:focus {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .navbar-link {
-  color: #999999;
-}
-
-.navbar-inverse .navbar-link:hover {
-  color: #ffffff;
-}
-
-.navbar-inverse .divider-vertical {
-  border-right-color: #222222;
-  border-left-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
-  color: #ffffff;
-  background-color: #111111;
-}
-
-.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: #999999;
-  border-bottom-color: #999999;
-}
-
-.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: #ffffff;
-  border-bottom-color: #ffffff;
-}
-
-.navbar-inverse .navbar-search .search-query {
-  color: #ffffff;
-  background-color: #515151;
-  border-color: #111111;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(255, 255, 255, 0.15);
-  -webkit-transition: none;
-     -moz-transition: none;
-       -o-transition: none;
-          transition: none;
-}
-
-.navbar-inverse .navbar-search .search-query:-moz-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
-  color: #cccccc;
-}
-
-.navbar-inverse .navbar-search .search-query:focus,
-.navbar-inverse .navbar-search .search-query.focused {
-  padding: 5px 15px;
-  color: #333333;
-  text-shadow: 0 1px 0 #ffffff;
-  background-color: #ffffff;
-  border: 0;
-  outline: 0;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-          box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-}
-
-.navbar-inverse .btn-navbar {
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e0e0e;
-  *background-color: #040404;
-  background-image: -moz-linear-gradient(top, #151515, #040404);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
-  background-image: -webkit-linear-gradient(top, #151515, #040404);
-  background-image: -o-linear-gradient(top, #151515, #040404);
-  background-image: linear-gradient(to bottom, #151515, #040404);
-  background-repeat: repeat-x;
-  border-color: #040404 #040404 #000000;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.navbar-inverse .btn-navbar:hover,
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active,
-.navbar-inverse .btn-navbar.disabled,
-.navbar-inverse .btn-navbar[disabled] {
-  color: #ffffff;
-  background-color: #040404;
-  *background-color: #000000;
-}
-
-.navbar-inverse .btn-navbar:active,
-.navbar-inverse .btn-navbar.active {
-  background-color: #000000 \9;
-}
-
-.breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 20px;
-  list-style: none;
-  background-color: #f5f5f5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.breadcrumb li {
-  display: inline-block;
-  *display: inline;
-  text-shadow: 0 1px 0 #ffffff;
-  *zoom: 1;
-}
-
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #ccc;
-}
-
-.breadcrumb .active {
-  color: #999999;
-}
-
-.pagination {
-  margin: 20px 0;
-}
-
-.pagination ul {
-  display: inline-block;
-  *display: inline;
-  margin-bottom: 0;
-  margin-left: 0;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  *zoom: 1;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-     -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-}
-
-.pagination ul > li {
-  display: inline;
-}
-
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left;
-  padding: 4px 12px;
-  line-height: 20px;
-  text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
-  border-left-width: 0;
-}
-
-.pagination ul > li > a:hover,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: #f5f5f5;
-}
-
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: #999999;
-  cursor: default;
-}
-
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover {
-  color: #999999;
-  cursor: default;
-  background-color: transparent;
-}
-
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  -webkit-border-bottom-left-radius: 4px;
-          border-bottom-left-radius: 4px;
-  -webkit-border-top-left-radius: 4px;
-          border-top-left-radius: 4px;
-  -moz-border-radius-bottomleft: 4px;
-  -moz-border-radius-topleft: 4px;
-}
-
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  -webkit-border-top-right-radius: 4px;
-          border-top-right-radius: 4px;
-  -webkit-border-bottom-right-radius: 4px;
-          border-bottom-right-radius: 4px;
-  -moz-border-radius-topright: 4px;
-  -moz-border-radius-bottomright: 4px;
-}
-
-.pagination-centered {
-  text-align: center;
-}
-
-.pagination-right {
-  text-align: right;
-}
-
-.pagination-large ul > li > a,
-.pagination-large ul > li > span {
-  padding: 11px 19px;
-  font-size: 17.5px;
-}
-
-.pagination-large ul > li:first-child > a,
-.pagination-large ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 6px;
-          border-bottom-left-radius: 6px;
-  -webkit-border-top-left-radius: 6px;
-          border-top-left-radius: 6px;
-  -moz-border-radius-bottomleft: 6px;
-  -moz-border-radius-topleft: 6px;
-}
-
-.pagination-large ul > li:last-child > a,
-.pagination-large ul > li:last-child > span {
-  -webkit-border-top-right-radius: 6px;
-          border-top-right-radius: 6px;
-  -webkit-border-bottom-right-radius: 6px;
-          border-bottom-right-radius: 6px;
-  -moz-border-radius-topright: 6px;
-  -moz-border-radius-bottomright: 6px;
-}
-
-.pagination-mini ul > li:first-child > a,
-.pagination-small ul > li:first-child > a,
-.pagination-mini ul > li:first-child > span,
-.pagination-small ul > li:first-child > span {
-  -webkit-border-bottom-left-radius: 3px;
-          border-bottom-left-radius: 3px;
-  -webkit-border-top-left-radius: 3px;
-          border-top-left-radius: 3px;
-  -moz-border-radius-bottomleft: 3px;
-  -moz-border-radius-topleft: 3px;
-}
-
-.pagination-mini ul > li:last-child > a,
-.pagination-small ul > li:last-child > a,
-.pagination-mini ul > li:last-child > span,
-.pagination-small ul > li:last-child > span {
-  -webkit-border-top-right-radius: 3px;
-          border-top-right-radius: 3px;
-  -webkit-border-bottom-right-radius: 3px;
-          border-bottom-right-radius: 3px;
-  -moz-border-radius-topright: 3px;
-  -moz-border-radius-bottomright: 3px;
-}
-
-.pagination-small ul > li > a,
-.pagination-small ul > li > span {
-  padding: 2px 10px;
-  font-size: 11.9px;
-}
-
-.pagination-mini ul > li > a,
-.pagination-mini ul > li > span {
-  padding: 1px 6px;
-  font-size: 10.5px;
-}
-
-.pager {
-  margin: 20px 0;
-  text-align: center;
-  list-style: none;
-  *zoom: 1;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager li {
-  display: inline;
-}
-
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 15px;
-     -moz-border-radius: 15px;
-          border-radius: 15px;
-}
-
-.pager li > a:hover {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > span {
-  color: #999999;
-  cursor: default;
-  background-color: #fff;
-}
-
-.modal-backdrop {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 1040;
-  background-color: #000000;
-}
-
-.modal-backdrop.fade {
-  opacity: 0;
-}
-
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.modal {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  z-index: 1050;
-  width: 560px;
-  margin: -250px 0 0 -280px;
-  background-color: #ffffff;
-  border: 1px solid #999;
-  border: 1px solid rgba(0, 0, 0, 0.3);
-  *border: 1px solid #999;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  outline: none;
-  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-          box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding-box;
-          background-clip: padding-box;
-}
-
-.modal.fade {
-  top: -25%;
-  -webkit-transition: opacity 0.3s linear, top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out;
-}
-
-.modal.fade.in {
-  top: 50%;
-}
-
-.modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-}
-
-.modal-header .close {
-  margin-top: 2px;
-}
-
-.modal-header h3 {
-  margin: 0;
-  line-height: 30px;
-}
-
-.modal-body {
-  max-height: 400px;
-  padding: 15px;
-  overflow-y: auto;
-}
-
-.modal-form {
-  margin-bottom: 0;
-}
-
-.modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
-  text-align: right;
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 6px 6px;
-     -moz-border-radius: 0 0 6px 6px;
-          border-radius: 0 0 6px 6px;
-  *zoom: 1;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-     -moz-box-shadow: inset 0 1px 0 #ffffff;
-          box-shadow: inset 0 1px 0 #ffffff;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-
-.modal-footer .btn-group .btn + .btn {
-  margin-left: -1px;
-}
-
-.modal-footer .btn-block + .btn-block {
-  margin-left: 0;
-}
-
-.tooltip {
-  position: absolute;
-  z-index: 1030;
-  display: block;
-  padding: 5px;
-  font-size: 11px;
-  opacity: 0;
-  filter: alpha(opacity=0);
-  visibility: visible;
-}
-
-.tooltip.in {
-  opacity: 0.8;
-  filter: alpha(opacity=80);
-}
-
-.tooltip.top {
-  margin-top: -3px;
-}
-
-.tooltip.right {
-  margin-left: 3px;
-}
-
-.tooltip.bottom {
-  margin-top: 3px;
-}
-
-.tooltip.left {
-  margin-left: -3px;
-}
-
-.tooltip-inner {
-  max-width: 200px;
-  padding: 3px 8px;
-  color: #ffffff;
-  text-align: center;
-  text-decoration: none;
-  background-color: #000000;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.tooltip-arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.tooltip.top .tooltip-arrow {
-  bottom: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-top-color: #000000;
-  border-width: 5px 5px 0;
-}
-
-.tooltip.right .tooltip-arrow {
-  top: 50%;
-  left: 0;
-  margin-top: -5px;
-  border-right-color: #000000;
-  border-width: 5px 5px 5px 0;
-}
-
-.tooltip.left .tooltip-arrow {
-  top: 50%;
-  right: 0;
-  margin-top: -5px;
-  border-left-color: #000000;
-  border-width: 5px 0 5px 5px;
-}
-
-.tooltip.bottom .tooltip-arrow {
-  top: 0;
-  left: 50%;
-  margin-left: -5px;
-  border-bottom-color: #000000;
-  border-width: 0 5px 5px;
-}
-
-.popover {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1010;
-  display: none;
-  width: 236px;
-  padding: 1px;
-  background-color: #ffffff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-}
-
-.popover.top {
-  margin-top: -10px;
-}
-
-.popover.right {
-  margin-left: 10px;
-}
-
-.popover.bottom {
-  margin-top: 10px;
-}
-
-.popover.left {
-  margin-left: -10px;
-}
-
-.popover-title {
-  padding: 8px 14px;
-  margin: 0;
-  font-size: 14px;
-  font-weight: normal;
-  line-height: 18px;
-  background-color: #f7f7f7;
-  border-bottom: 1px solid #ebebeb;
-  -webkit-border-radius: 5px 5px 0 0;
-     -moz-border-radius: 5px 5px 0 0;
-          border-radius: 5px 5px 0 0;
-}
-
-.popover-content {
-  padding: 9px 14px;
-}
-
-.popover-content p,
-.popover-content ul,
-.popover-content ol {
-  margin-bottom: 0;
-}
-
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: inline-block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-}
-
-.popover .arrow:after {
-  z-index: -1;
-  content: "";
-}
-
-.popover.top .arrow {
-  bottom: -10px;
-  left: 50%;
-  margin-left: -10px;
-  border-top-color: #ffffff;
-  border-width: 10px 10px 0;
-}
-
-.popover.top .arrow:after {
-  bottom: -1px;
-  left: -11px;
-  border-top-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 11px 0;
-}
-
-.popover.right .arrow {
-  top: 50%;
-  left: -10px;
-  margin-top: -10px;
-  border-right-color: #ffffff;
-  border-width: 10px 10px 10px 0;
-}
-
-.popover.right .arrow:after {
-  bottom: -11px;
-  left: -1px;
-  border-right-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 11px 11px 0;
-}
-
-.popover.bottom .arrow {
-  top: -10px;
-  left: 50%;
-  margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-width: 0 10px 10px;
-}
-
-.popover.bottom .arrow:after {
-  top: -1px;
-  left: -11px;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
-  border-width: 0 11px 11px;
-}
-
-.popover.left .arrow {
-  top: 50%;
-  right: -10px;
-  margin-top: -10px;
-  border-left-color: #ffffff;
-  border-width: 10px 0 10px 10px;
-}
-
-.popover.left .arrow:after {
-  right: -1px;
-  bottom: -11px;
-  border-left-color: rgba(0, 0, 0, 0.25);
-  border-width: 11px 0 11px 11px;
-}
-
-.thumbnails {
-  margin-left: -20px;
-  list-style: none;
-  *zoom: 1;
-}
-
-.thumbnails:before,
-.thumbnails:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.thumbnails:after {
-  clear: both;
-}
-
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-.thumbnails > li {
-  float: left;
-  margin-bottom: 20px;
-  margin-left: 20px;
-}
-
-.thumbnail {
-  display: block;
-  padding: 4px;
-  line-height: 20px;
-  border: 1px solid #ddd;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-          box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
-  -webkit-transition: all 0.2s ease-in-out;
-     -moz-transition: all 0.2s ease-in-out;
-       -o-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
-}
-
-a.thumbnail:hover {
-  border-color: #0088cc;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-     -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-          box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-}
-
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-right: auto;
-  margin-left: auto;
-}
-
-.thumbnail .caption {
-  padding: 9px;
-  color: #555555;
-}
-
-.media,
-.media-body {
-  overflow: hidden;
-  *overflow: visible;
-  zoom: 1;
-}
-
-.media,
-.media .media {
-  margin-top: 15px;
-}
-
-.media:first-child {
-  margin-top: 0;
-}
-
-.media-object {
-  display: block;
-}
-
-.media-heading {
-  margin: 0 0 5px;
-}
-
-.media .pull-left {
-  margin-right: 10px;
-}
-
-.media .pull-right {
-  margin-left: 10px;
-}
-
-.media-list {
-  margin-left: 0;
-  list-style: none;
-}
-
-.label,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: 11.844px;
-  font-weight: bold;
-  line-height: 14px;
-  color: #ffffff;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  white-space: nowrap;
-  vertical-align: baseline;
-  background-color: #999999;
-}
-
-.label {
-  -webkit-border-radius: 3px;
-     -moz-border-radius: 3px;
-          border-radius: 3px;
-}
-
-.badge {
-  padding-right: 9px;
-  padding-left: 9px;
-  -webkit-border-radius: 9px;
-     -moz-border-radius: 9px;
-          border-radius: 9px;
-}
-
-a.label:hover,
-a.badge:hover {
-  color: #ffffff;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.label-important,
-.badge-important {
-  background-color: #b94a48;
-}
-
-.label-important[href],
-.badge-important[href] {
-  background-color: #953b39;
-}
-
-.label-warning,
-.badge-warning {
-  background-color: #f89406;
-}
-
-.label-warning[href],
-.badge-warning[href] {
-  background-color: #c67605;
-}
-
-.label-success,
-.badge-success {
-  background-color: #468847;
-}
-
-.label-success[href],
-.badge-success[href] {
-  background-color: #356635;
-}
-
-.label-info,
-.badge-info {
-  background-color: #3a87ad;
-}
-
-.label-info[href],
-.badge-info[href] {
-  background-color: #2d6987;
-}
-
-.label-inverse,
-.badge-inverse {
-  background-color: #333333;
-}
-
-.label-inverse[href],
-.badge-inverse[href] {
-  background-color: #1a1a1a;
-}
-
-.btn .label,
-.btn .badge {
-  position: relative;
-  top: -1px;
-}
-
-.btn-mini .label,
-.btn-mini .badge {
-  top: 0;
-}
-
-@-webkit-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-ms-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-
-@keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-.progress {
-  height: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-  background-color: #f7f7f7;
-  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
-  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
-  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
-  background-repeat: repeat-x;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-}
-
-.progress .bar {
-  float: left;
-  width: 0;
-  height: 100%;
-  font-size: 12px;
-  color: #ffffff;
-  text-align: center;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  background-color: #0e90d2;
-  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
-  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
-  background-image: -o-linear-gradient(top, #149bdf, #0480be);
-  background-image: linear-gradient(to bottom, #149bdf, #0480be);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-  -webkit-transition: width 0.6s ease;
-     -moz-transition: width 0.6s ease;
-       -o-transition: width 0.6s ease;
-          transition: width 0.6s ease;
-}
-
-.progress .bar + .bar {
-  -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-     -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-}
-
-.progress-striped .bar {
-  background-color: #149bdf;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  -webkit-background-size: 40px 40px;
-     -moz-background-size: 40px 40px;
-       -o-background-size: 40px 40px;
-          background-size: 40px 40px;
-}
-
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
-}
-
-.progress-danger .bar,
-.progress .bar-danger {
-  background-color: #dd514c;
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
-}
-
-.progress-danger.progress-striped .bar,
-.progress-striped .bar-danger {
-  background-color: #ee5f5b;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-success .bar,
-.progress .bar-success {
-  background-color: #5eb95e;
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(to bottom, #62c462, #57a957);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
-}
-
-.progress-success.progress-striped .bar,
-.progress-striped .bar-success {
-  background-color: #62c462;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-info .bar,
-.progress .bar-info {
-  background-color: #4bb1cf;
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
-}
-
-.progress-info.progress-striped .bar,
-.progress-striped .bar-info {
-  background-color: #5bc0de;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.progress-warning .bar,
-.progress .bar-warning {
-  background-color: #faa732;
-  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
-  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
-  background-image: -o-linear-gradient(top, #fbb450, #f89406);
-  background-image: linear-gradient(to bottom, #fbb450, #f89406);
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
-}
-
-.progress-warning.progress-striped .bar,
-.progress-striped .bar-warning {
-  background-color: #fbb450;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-}
-
-.accordion {
-  margin-bottom: 20px;
-}
-
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  -webkit-border-radius: 4px;
-     -moz-border-radius: 4px;
-          border-radius: 4px;
-}
-
-.accordion-heading {
-  border-bottom: 0;
-}
-
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-.accordion-toggle {
-  cursor: pointer;
-}
-
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
-
-.carousel {
-  position: relative;
-  margin-bottom: 20px;
-  line-height: 1;
-}
-
-.carousel-inner {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-}
-
-.carousel .item {
-  position: relative;
-  display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-     -moz-transition: 0.6s ease-in-out left;
-       -o-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
-}
-
-.carousel .item > img {
-  display: block;
-  line-height: 1;
-}
-
-.carousel .active,
-.carousel .next,
-.carousel .prev {
-  display: block;
-}
-
-.carousel .active {
-  left: 0;
-}
-
-.carousel .next,
-.carousel .prev {
-  position: absolute;
-  top: 0;
-  width: 100%;
-}
-
-.carousel .next {
-  left: 100%;
-}
-
-.carousel .prev {
-  left: -100%;
-}
-
-.carousel .next.left,
-.carousel .prev.right {
-  left: 0;
-}
-
-.carousel .active.left {
-  left: -100%;
-}
-
-.carousel .active.right {
-  left: 100%;
-}
-
-.carousel-control {
-  position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: #ffffff;
-  text-align: center;
-  background: #222222;
-  border: 3px solid #ffffff;
-  -webkit-border-radius: 23px;
-     -moz-border-radius: 23px;
-          border-radius: 23px;
-  opacity: 0.5;
-  filter: alpha(opacity=50);
-}
-
-.carousel-control.right {
-  right: 15px;
-  left: auto;
-}
-
-.carousel-control:hover {
-  color: #ffffff;
-  text-decoration: none;
-  opacity: 0.9;
-  filter: alpha(opacity=90);
-}
-
-.carousel-caption {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  padding: 15px;
-  background: #333333;
-  background: rgba(0, 0, 0, 0.75);
-}
-
-.carousel-caption h4,
-.carousel-caption p {
-  line-height: 20px;
-  color: #ffffff;
-}
-
-.carousel-caption h4 {
-  margin: 0 0 5px;
-}
-
-.carousel-caption p {
-  margin-bottom: 0;
-}
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 30px;
-  color: inherit;
-  background-color: #eeeeee;
-  -webkit-border-radius: 6px;
-     -moz-border-radius: 6px;
-          border-radius: 6px;
-}
-
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
-  color: inherit;
-}
-
-.hero-unit li {
-  line-height: 30px;
-}
-
-.pull-right {
-  float: right;
-}
-
-.pull-left {
-  float: left;
-}
-
-.hide {
-  display: none;
-}
-
-.show {
-  display: block;
-}
-
-.invisible {
-  visibility: hidden;
-}
-
-.affix {
-  position: fixed;
-}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.min.css b/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.min.css
deleted file mode 100644
index b943802e97..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-2.2.1.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}a:hover,a:active{outline:0}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{width:auto\9;height:auto;max-width:100%;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic}#map_canvas img,.google-maps img{max-width:none}button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle}button,input{*overflow:visible;line-height:normal}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}textarea{overflow:auto;vertical-align:top}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333;background-color:#fff}a{color:#005580;text-decoration:none}a:hover{color:#00334d;text-decoration:none}.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.1);box-shadow:0 1px 3px rgba(0,0,0,0.1)}.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px}.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.span12{width:940px}.span11{width:860px}.span10{width:780px}.span9{width:700px}.span8{width:620px}.span7{width:540px}.span6{width:460px}.span5{width:380px}.span4{width:300px}.span3{width:220px}.span2{width:140px}.span1{width:60px}.offset12{margin-left:980px}.offset11{margin-left:900px}.offset10{margin-left:820px}.offset9{margin-left:740px}.offset8{margin-left:660px}.offset7{margin-left:580px}.offset6{margin-left:500px}.offset5{margin-left:420px}.offset4{margin-left:340px}.offset3{margin-left:260px}.offset2{margin-left:180px}.offset1{margin-left:100px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.127659574468085%;*margin-left:2.074468085106383%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.127659574468085%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.48936170212765%;*width:91.43617021276594%}.row-fluid .span10{width:82.97872340425532%;*width:82.92553191489361%}.row-fluid .span9{width:74.46808510638297%;*width:74.41489361702126%}.row-fluid .span8{width:65.95744680851064%;*width:65.90425531914893%}.row-fluid .span7{width:57.44680851063829%;*width:57.39361702127659%}.row-fluid .span6{width:48.93617021276595%;*width:48.88297872340425%}.row-fluid .span5{width:40.42553191489362%;*width:40.37234042553192%}.row-fluid .span4{width:31.914893617021278%;*width:31.861702127659576%}.row-fluid .span3{width:23.404255319148934%;*width:23.351063829787233%}.row-fluid .span2{width:14.893617021276595%;*width:14.840425531914894%}.row-fluid .span1{width:6.382978723404255%;*width:6.329787234042553%}.row-fluid .offset12{margin-left:104.25531914893617%;*margin-left:104.14893617021275%}.row-fluid .offset12:first-child{margin-left:102.12765957446808%;*margin-left:102.02127659574467%}.row-fluid .offset11{margin-left:95.74468085106382%;*margin-left:95.6382978723404%}.row-fluid .offset11:first-child{margin-left:93.61702127659574%;*margin-left:93.51063829787232%}.row-fluid .offset10{margin-left:87.23404255319149%;*margin-left:87.12765957446807%}.row-fluid .offset10:first-child{margin-left:85.1063829787234%;*margin-left:84.99999999999999%}.row-fluid .offset9{margin-left:78.72340425531914%;*margin-left:78.61702127659572%}.row-fluid .offset9:first-child{margin-left:76.59574468085106%;*margin-left:76.48936170212764%}.row-fluid .offset8{margin-left:70.2127659574468%;*margin-left:70.10638297872339%}.row-fluid .offset8:first-child{margin-left:68.08510638297872%;*margin-left:67.9787234042553%}.row-fluid .offset7{margin-left:61.70212765957446%;*margin-left:61.59574468085106%}.row-fluid .offset7:first-child{margin-left:59.574468085106375%;*margin-left:59.46808510638297%}.row-fluid .offset6{margin-left:53.191489361702125%;*margin-left:53.085106382978715%}.row-fluid .offset6:first-child{margin-left:51.063829787234035%;*margin-left:50.95744680851063%}.row-fluid .offset5{margin-left:44.68085106382979%;*margin-left:44.57446808510638%}.row-fluid .offset5:first-child{margin-left:42.5531914893617%;*margin-left:42.4468085106383%}.row-fluid .offset4{margin-left:36.170212765957444%;*margin-left:36.06382978723405%}.row-fluid .offset4:first-child{margin-left:34.04255319148936%;*margin-left:33.93617021276596%}.row-fluid .offset3{margin-left:27.659574468085104%;*margin-left:27.5531914893617%}.row-fluid .offset3:first-child{margin-left:25.53191489361702%;*margin-left:25.425531914893618%}.row-fluid .offset2{margin-left:19.148936170212764%;*margin-left:19.04255319148936%}.row-fluid .offset2:first-child{margin-left:17.02127659574468%;*margin-left:16.914893617021278%}.row-fluid .offset1{margin-left:10.638297872340425%;*margin-left:10.53191489361702%}.row-fluid .offset1:first-child{margin-left:8.51063829787234%;*margin-left:8.404255319148938%}[class*="span"].hide,.row-fluid [class*="span"].hide{display:none}[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right}.container{margin-right:auto;margin-left:auto;*zoom:1}.container:before,.container:after{display:table;line-height:0;content:""}.container:after{clear:both}.container-fluid{padding-right:20px;padding-left:20px;*zoom:1}.container-fluid:before,.container-fluid:after{display:table;line-height:0;content:""}.container-fluid:after{clear:both}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px}small{font-size:85%}strong{font-weight:bold}em{font-style:italic}cite{font-style:normal}.muted{color:#999}.text-warning{color:#c09853}a.text-warning:hover{color:#a47e3c}.text-error{color:#b94a48}a.text-error:hover{color:#953b39}.text-info{color:#3a87ad}a.text-info:hover{color:#2d6987}.text-success{color:#468847}a.text-success:hover{color:#356635}h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{line-height:40px}h1{font-size:38.5px}h2{font-size:31.5px}h3{font-size:24.5px}h4{font-size:17.5px}h5{font-size:14px}h6{font-size:11.9px}h1 small{font-size:24.5px}h2 small{font-size:17.5px}h3 small{font-size:14px}h4 small{font-size:14px}.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eee}ul,ol{padding:0;margin:0 0 10px 25px}ul ul,ul ol,ol ol,ol ul{margin-bottom:0}li{line-height:20px}ul.unstyled,ol.unstyled{margin-left:0;list-style:none}dl{margin-bottom:20px}dt,dd{line-height:20px}dt{font-weight:bold}dd{margin-left:10px}.dl-horizontal{*zoom:1}.dl-horizontal:before,.dl-horizontal:after{display:table;line-height:0;content:""}.dl-horizontal:after{clear:both}.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}hr{margin:20px 0;border:0;border-top:1px solid #eee;border-bottom:1px solid #fff}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}abbr.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:25px}blockquote small{display:block;line-height:20px;color:#999}blockquote small:before{content:'\2014 \00A0'}blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small{text-align:right}blockquote.pull-right small:before{content:''}blockquote.pull-right small:after{content:'\00A0 \2014'}q:before,q:after,blockquote:before,blockquote:after{content:""}address{display:block;margin-bottom:20px;font-style:normal;line-height:20px}code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}pre.prettyprint{margin-bottom:20px}pre code{padding:0;color:inherit;background-color:transparent;border:0}.pre-scrollable{max-height:340px;overflow-y:scroll}form{margin:0 0 20px}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333;border:0;border-bottom:1px solid #e5e5e5}legend small{font-size:15px;color:#999}label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px}input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif}label{display:block;margin-bottom:5px}select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555;vertical-align:middle;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}input,textarea,.uneditable-input{width:206px}textarea{height:auto}textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#fff;border:1px solid #ccc;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border linear .2s,box-shadow linear .2s;-moz-transition:border linear .2s,box-shadow linear .2s;-o-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82,168,236,0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.6)}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;*margin-top:0;line-height:normal;cursor:pointer}input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto}select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px}select{width:220px;background-color:#fff;border:1px solid #ccc}select[multiple],select[size]{height:auto}select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.uneditable-input,.uneditable-textarea{color:#999;cursor:not-allowed;background-color:#fcfcfc;border-color:#ccc;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.025);box-shadow:inset 0 1px 2px rgba(0,0,0,0.025)}.uneditable-input{overflow:hidden;white-space:nowrap}.uneditable-textarea{width:auto;height:auto}input:-moz-placeholder,textarea:-moz-placeholder{color:#999}input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999}input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999}.radio,.checkbox{min-height:20px;padding-left:20px}.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px}.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px}.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle}.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px}.input-mini{width:60px}.input-small{width:90px}.input-medium{width:150px}.input-large{width:210px}.input-xlarge{width:270px}.input-xxlarge{width:530px}input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0}.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:926px}input.span11,textarea.span11,.uneditable-input.span11{width:846px}input.span10,textarea.span10,.uneditable-input.span10{width:766px}input.span9,textarea.span9,.uneditable-input.span9{width:686px}input.span8,textarea.span8,.uneditable-input.span8{width:606px}input.span7,textarea.span7,.uneditable-input.span7{width:526px}input.span6,textarea.span6,.uneditable-input.span6{width:446px}input.span5,textarea.span5,.uneditable-input.span5{width:366px}input.span4,textarea.span4,.uneditable-input.span4{width:286px}input.span3,textarea.span3,.uneditable-input.span3{width:206px}input.span2,textarea.span2,.uneditable-input.span2{width:126px}input.span1,textarea.span1,.uneditable-input.span1{width:46px}.controls-row{*zoom:1}.controls-row:before,.controls-row:after{display:table;line-height:0;content:""}.controls-row:after{clear:both}.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left}.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px}input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eee}input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent}.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853}.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853}.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #dbc59e}.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853}.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48}.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48}.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #d59392}.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48}.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847}.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847}.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7aba7b}.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847}.control-group.info>label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad}.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad}.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #7ab5d3}.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad}input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7}.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1}.form-actions:before,.form-actions:after{display:table;line-height:0;content:""}.form-actions:after{clear:both}.help-block,.help-inline{color:#595959}.help-block{display:block;margin-bottom:10px}.help-inline{display:inline-block;*display:inline;padding-left:5px;vertical-align:middle;*zoom:1}.input-append,.input-prepend{margin-bottom:5px;font-size:0;white-space:nowrap}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu{font-size:14px}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2}.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #fff;background-color:#eee;border:1px solid #ccc}.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546}.input-prepend .add-on,.input-prepend .btn{margin-right:-1px}.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-append input+.btn-group .btn,.input-append select+.btn-group .btn,.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px}.input-append .add-on:last-child,.input-append .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.input-prepend.input-append .btn-group:first-child{margin-left:0}input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0}.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px}.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;margin-bottom:0;vertical-align:middle;*zoom:1}.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none}.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block}.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0}.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle}.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0}.control-group{margin-bottom:10px}legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate}.form-horizontal .control-group{margin-bottom:20px;*zoom:1}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;line-height:0;content:""}.form-horizontal .control-group:after{clear:both}.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right}.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0}.form-horizontal .controls:first-child{*padding-left:180px}.form-horizontal .help-block{margin-bottom:0}.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block{margin-top:10px}.form-horizontal .form-actions{padding-left:180px}table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0}.table{width:100%;margin-bottom:20px}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #ddd}.table th{font-weight:bold}.table thead th{vertical-align:bottom}.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0}.table tbody+tbody{border-top:2px solid #ddd}.table-condensed th,.table-condensed td{padding:4px 5px}.table-bordered{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.table-bordered th,.table-bordered td{border-left:1px solid #ddd}.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0}.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child,.table-bordered tfoot:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px}.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child,.table-bordered tfoot:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px}.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topleft:4px}.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-moz-border-radius-topright:4px}.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9}.table-hover tbody tr:hover td,.table-hover tbody tr:hover th{background-color:#f5f5f5}table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0}.table td.span1,.table th.span1{float:none;width:44px;margin-left:0}.table td.span2,.table th.span2{float:none;width:124px;margin-left:0}.table td.span3,.table th.span3{float:none;width:204px;margin-left:0}.table td.span4,.table th.span4{float:none;width:284px;margin-left:0}.table td.span5,.table th.span5{float:none;width:364px;margin-left:0}.table td.span6,.table th.span6{float:none;width:444px;margin-left:0}.table td.span7,.table th.span7{float:none;width:524px;margin-left:0}.table td.span8,.table th.span8{float:none;width:604px;margin-left:0}.table td.span9,.table th.span9{float:none;width:684px;margin-left:0}.table td.span10,.table th.span10{float:none;width:764px;margin-left:0}.table td.span11,.table th.span11{float:none;width:844px;margin-left:0}.table td.span12,.table th.span12{float:none;width:924px;margin-left:0}.table tbody tr.success td{background-color:#dff0d8}.table tbody tr.error td{background-color:#f2dede}.table tbody tr.warning td{background-color:#fcf8e3}.table tbody tr.info td{background-color:#d9edf7}.table-hover tbody tr.success:hover td{background-color:#d0e9c6}.table-hover tbody tr.error:hover td{background-color:#ebcccc}.table-hover tbody tr.warning:hover td{background-color:#faf2cc}.table-hover tbody tr.info:hover td{background-color:#c4e3f3}[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;margin-top:1px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png")}.icon-glass{background-position:0 0}.icon-music{background-position:-24px 0}.icon-search{background-position:-48px 0}.icon-envelope{background-position:-72px 0}.icon-heart{background-position:-96px 0}.icon-star{background-position:-120px 0}.icon-star-empty{background-position:-144px 0}.icon-user{background-position:-168px 0}.icon-film{background-position:-192px 0}.icon-th-large{background-position:-216px 0}.icon-th{background-position:-240px 0}.icon-th-list{background-position:-264px 0}.icon-ok{background-position:-288px 0}.icon-remove{background-position:-312px 0}.icon-zoom-in{background-position:-336px 0}.icon-zoom-out{background-position:-360px 0}.icon-off{background-position:-384px 0}.icon-signal{background-position:-408px 0}.icon-cog{background-position:-432px 0}.icon-trash{background-position:-456px 0}.icon-home{background-position:0 -24px}.icon-file{background-position:-24px -24px}.icon-time{background-position:-48px -24px}.icon-road{background-position:-72px -24px}.icon-download-alt{background-position:-96px -24px}.icon-download{background-position:-120px -24px}.icon-upload{background-position:-144px -24px}.icon-inbox{background-position:-168px -24px}.icon-play-circle{background-position:-192px -24px}.icon-repeat{background-position:-216px -24px}.icon-refresh{background-position:-240px -24px}.icon-list-alt{background-position:-264px -24px}.icon-lock{background-position:-287px -24px}.icon-flag{background-position:-312px -24px}.icon-headphones{background-position:-336px -24px}.icon-volume-off{background-position:-360px -24px}.icon-volume-down{background-position:-384px -24px}.icon-volume-up{background-position:-408px -24px}.icon-qrcode{background-position:-432px -24px}.icon-barcode{background-position:-456px -24px}.icon-tag{background-position:0 -48px}.icon-tags{background-position:-25px -48px}.icon-book{background-position:-48px -48px}.icon-bookmark{background-position:-72px -48px}.icon-print{background-position:-96px -48px}.icon-camera{background-position:-120px -48px}.icon-font{background-position:-144px -48px}.icon-bold{background-position:-167px -48px}.icon-italic{background-position:-192px -48px}.icon-text-height{background-position:-216px -48px}.icon-text-width{background-position:-240px -48px}.icon-align-left{background-position:-264px -48px}.icon-align-center{background-position:-288px -48px}.icon-align-right{background-position:-312px -48px}.icon-align-justify{background-position:-336px -48px}.icon-list{background-position:-360px -48px}.icon-indent-left{background-position:-384px -48px}.icon-indent-right{background-position:-408px -48px}.icon-facetime-video{background-position:-432px -48px}.icon-picture{background-position:-456px -48px}.icon-pencil{background-position:0 -72px}.icon-map-marker{background-position:-24px -72px}.icon-adjust{background-position:-48px -72px}.icon-tint{background-position:-72px -72px}.icon-edit{background-position:-96px -72px}.icon-share{background-position:-120px -72px}.icon-check{background-position:-144px -72px}.icon-move{background-position:-168px -72px}.icon-step-backward{background-position:-192px -72px}.icon-fast-backward{background-position:-216px -72px}.icon-backward{background-position:-240px -72px}.icon-play{background-position:-264px -72px}.icon-pause{background-position:-288px -72px}.icon-stop{background-position:-312px -72px}.icon-forward{background-position:-336px -72px}.icon-fast-forward{background-position:-360px -72px}.icon-step-forward{background-position:-384px -72px}.icon-eject{background-position:-408px -72px}.icon-chevron-left{background-position:-432px -72px}.icon-chevron-right{background-position:-456px -72px}.icon-plus-sign{background-position:0 -96px}.icon-minus-sign{background-position:-24px -96px}.icon-remove-sign{background-position:-48px -96px}.icon-ok-sign{background-position:-72px -96px}.icon-question-sign{background-position:-96px -96px}.icon-info-sign{background-position:-120px -96px}.icon-screenshot{background-position:-144px -96px}.icon-remove-circle{background-position:-168px -96px}.icon-ok-circle{background-position:-192px -96px}.icon-ban-circle{background-position:-216px -96px}.icon-arrow-left{background-position:-240px -96px}.icon-arrow-right{background-position:-264px -96px}.icon-arrow-up{background-position:-289px -96px}.icon-arrow-down{background-position:-312px -96px}.icon-share-alt{background-position:-336px -96px}.icon-resize-full{background-position:-360px -96px}.icon-resize-small{background-position:-384px -96px}.icon-plus{background-position:-408px -96px}.icon-minus{background-position:-433px -96px}.icon-asterisk{background-position:-456px -96px}.icon-exclamation-sign{background-position:0 -120px}.icon-gift{background-position:-24px -120px}.icon-leaf{background-position:-48px -120px}.icon-fire{background-position:-72px -120px}.icon-eye-open{background-position:-96px -120px}.icon-eye-close{background-position:-120px -120px}.icon-warning-sign{background-position:-144px -120px}.icon-plane{background-position:-168px -120px}.icon-calendar{background-position:-192px -120px}.icon-random{width:16px;background-position:-216px -120px}.icon-comment{background-position:-240px -120px}.icon-magnet{background-position:-264px -120px}.icon-chevron-up{background-position:-288px -120px}.icon-chevron-down{background-position:-313px -119px}.icon-retweet{background-position:-336px -120px}.icon-shopping-cart{background-position:-360px -120px}.icon-folder-close{background-position:-384px -120px}.icon-folder-open{width:16px;background-position:-408px -120px}.icon-resize-vertical{background-position:-432px -119px}.icon-resize-horizontal{background-position:-456px -118px}.icon-hdd{background-position:0 -144px}.icon-bullhorn{background-position:-24px -144px}.icon-bell{background-position:-48px -144px}.icon-certificate{background-position:-72px -144px}.icon-thumbs-up{background-position:-96px -144px}.icon-thumbs-down{background-position:-120px -144px}.icon-hand-right{background-position:-144px -144px}.icon-hand-left{background-position:-168px -144px}.icon-hand-up{background-position:-192px -144px}.icon-hand-down{background-position:-216px -144px}.icon-circle-arrow-right{background-position:-240px -144px}.icon-circle-arrow-left{background-position:-264px -144px}.icon-circle-arrow-up{background-position:-288px -144px}.icon-circle-arrow-down{background-position:-312px -144px}.icon-globe{background-position:-336px -144px}.icon-wrench{background-position:-360px -144px}.icon-tasks{background-position:-384px -144px}.icon-filter{background-position:-408px -144px}.icon-briefcase{background-position:-432px -144px}.icon-fullscreen{background-position:-456px -144px}.dropup,.dropdown{position:relative}.dropdown-toggle{*margin-bottom:-3px}.dropdown-toggle:active,.open .dropdown-toggle{outline:0}.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.dropdown .caret{margin-top:8px;margin-left:2px}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.dropdown-menu li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap}.dropdown-menu li>a:hover,.dropdown-menu li>a:focus,.dropdown-submenu:hover>a{color:#fff;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#333;text-decoration:none;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;outline:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0)}.dropdown-menu .disabled>a,.dropdown-menu .disabled>a:hover{color:#999}.dropdown-menu .disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent;background-image:none}.open{*z-index:1000}.open>.dropdown-menu{display:block}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}.dropdown-submenu{position:relative}.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px}.dropdown-submenu:hover>.dropdown-menu{display:block}.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0}.dropdown-submenu>a:after{display:block;float:right;width:0;height:0;margin-top:5px;margin-right:-10px;border-color:transparent;border-left-color:#ccc;border-style:solid;border-width:5px 0 5px 5px;content:" "}.dropdown-submenu:hover>a:after{border-left-color:#fff}.dropdown-submenu.pull-left{float:none}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.dropdown .dropdown-menu .nav-header{padding-right:20px;padding-left:20px}.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.fade{opacity:0;-webkit-transition:opacity .15s linear;-moz-transition:opacity .15s linear;-o-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;-moz-transition:height .35s ease;-o-transition:height .35s ease;transition:height .35s ease}.collapse.in{height:auto}.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.4;filter:alpha(opacity=40)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.btn{display:inline-block;*display:inline;padding:4px 12px;margin-bottom:0;*margin-left:.3em;font-size:14px;line-height:20px;*line-height:20px;color:#333;text-align:center;text-shadow:0 1px 1px rgba(255,255,255,0.75);vertical-align:middle;cursor:pointer;background-color:#f5f5f5;*background-color:#e6e6e6;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border:1px solid #bbb;*border:0;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);border-bottom-color:#a2a2a2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe6e6e6',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);*zoom:1;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.btn:active,.btn.active{background-color:#ccc \9}.btn:first-child{*margin-left:0}.btn:hover{color:#333;text-decoration:none;background-color:#e6e6e6;*background-color:#d9d9d9;background-position:0 -15px;-webkit-transition:background-position .1s linear;-moz-transition:background-position .1s linear;-o-transition:background-position .1s linear;transition:background-position .1s linear}.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn.active,.btn:active{background-color:#e6e6e6;background-color:#d9d9d9 \9;background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn.disabled,.btn[disabled]{cursor:default;background-color:#e6e6e6;background-image:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:2px}.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0}.btn-mini{padding:1px 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255,255,255,0.75)}.btn{border-color:#c5c5c5;border-color:rgba(0,0,0,0.15) rgba(0,0,0,0.15) rgba(0,0,0,0.25)}.btn-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#006dcc;*background-color:#04c;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;border-color:#04c #04c #002a80;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#fff;background-color:#04c;*background-color:#003bb3}.btn-primary:active,.btn-primary.active{background-color:#039 \9}.btn-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#faa732;*background-color:#f89406;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;border-color:#f89406 #f89406 #ad6704;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#fff;background-color:#f89406;*background-color:#df8505}.btn-warning:active,.btn-warning.active{background-color:#c67605 \9}.btn-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#da4f49;*background-color:#bd362f;background-image:-moz-linear-gradient(top,#ee5f5b,#bd362f);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#bd362f));background-image:-webkit-linear-gradient(top,#ee5f5b,#bd362f);background-image:-o-linear-gradient(top,#ee5f5b,#bd362f);background-image:linear-gradient(to bottom,#ee5f5b,#bd362f);background-repeat:repeat-x;border-color:#bd362f #bd362f #802420;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffbd362f',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#fff;background-color:#bd362f;*background-color:#a9302a}.btn-danger:active,.btn-danger.active{background-color:#942a25 \9}.btn-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#5bb75b;*background-color:#51a351;background-image:-moz-linear-gradient(top,#62c462,#51a351);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#51a351));background-image:-webkit-linear-gradient(top,#62c462,#51a351);background-image:-o-linear-gradient(top,#62c462,#51a351);background-image:linear-gradient(to bottom,#62c462,#51a351);background-repeat:repeat-x;border-color:#51a351 #51a351 #387038;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff51a351',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#fff;background-color:#51a351;*background-color:#499249}.btn-success:active,.btn-success.active{background-color:#408140 \9}.btn-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#49afcd;*background-color:#2f96b4;background-image:-moz-linear-gradient(top,#5bc0de,#2f96b4);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#2f96b4));background-image:-webkit-linear-gradient(top,#5bc0de,#2f96b4);background-image:-o-linear-gradient(top,#5bc0de,#2f96b4);background-image:linear-gradient(to bottom,#5bc0de,#2f96b4);background-repeat:repeat-x;border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2f96b4',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#fff;background-color:#2f96b4;*background-color:#2a85a0}.btn-info:active,.btn-info.active{background-color:#24748c \9}.btn-inverse{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#363636;*background-color:#222;background-image:-moz-linear-gradient(top,#444,#222);background-image:-webkit-gradient(linear,0 0,0 100%,from(#444),to(#222));background-image:-webkit-linear-gradient(top,#444,#222);background-image:-o-linear-gradient(top,#444,#222);background-image:linear-gradient(to bottom,#444,#222);background-repeat:repeat-x;border-color:#222 #222 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#fff;background-color:#222;*background-color:#151515}.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9}button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0}button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px}button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px}button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px}.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.btn-link{color:#08c;cursor:pointer;border-color:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-link:hover{color:#005580;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover{color:#333;text-decoration:none}.btn-group{position:relative;display:inline-block;*display:inline;*margin-left:.3em;font-size:0;white-space:nowrap;vertical-align:middle;*zoom:1}.btn-group:first-child{*margin-left:0}.btn-group+.btn-group{margin-left:5px}.btn-toolbar{margin-top:10px;margin-bottom:10px;font-size:0}.btn-toolbar .btn+.btn,.btn-toolbar .btn-group+.btn,.btn-toolbar .btn+.btn-group{margin-left:5px}.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group>.btn+.btn{margin-left:-1px}.btn-group>.btn,.btn-group>.dropdown-menu{font-size:14px}.btn-group>.btn-mini{font-size:11px}.btn-group>.btn-small{font-size:12px}.btn-group>.btn-large{font-size:16px}.btn-group>.btn:first-child{margin-left:0;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group>.btn+.dropdown-toggle{*padding-top:5px;padding-right:8px;*padding-bottom:5px;padding-left:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 1px 0 0 rgba(255,255,255,0.125),inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05)}.btn-group>.btn-mini+.dropdown-toggle{*padding-top:2px;padding-right:5px;*padding-bottom:2px;padding-left:5px}.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px}.btn-group>.btn-large+.dropdown-toggle{*padding-top:7px;padding-right:12px;*padding-bottom:7px;padding-left:12px}.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6}.btn-group.open .btn-primary.dropdown-toggle{background-color:#04c}.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406}.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f}.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351}.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4}.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222}.btn .caret{margin-top:8px;margin-left:0}.btn-mini .caret,.btn-small .caret,.btn-large .caret{margin-top:6px}.btn-large .caret{border-top-width:5px;border-right-width:5px;border-left-width:5px}.dropup .btn-large .caret{border-bottom-width:5px}.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#fff;border-bottom-color:#fff}.btn-group-vertical{display:inline-block;*display:inline;*zoom:1}.btn-group-vertical .btn{display:block;float:none;width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.btn-group-vertical .btn+.btn{margin-top:-1px;margin-left:0}.btn-group-vertical .btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.btn-group-vertical .btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.btn-group-vertical .btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0}.btn-group-vertical .btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.alert{padding:8px 35px 8px 14px;margin-bottom:20px;color:#c09853;text-shadow:0 1px 0 rgba(255,255,255,0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.alert h4{margin:0}.alert .close{position:relative;top:-2px;right:-21px;line-height:20px}.alert-success{color:#468847;background-color:#dff0d8;border-color:#d6e9c6}.alert-danger,.alert-error{color:#b94a48;background-color:#f2dede;border-color:#eed3d7}.alert-info{color:#3a87ad;background-color:#d9edf7;border-color:#bce8f1}.alert-block{padding-top:14px;padding-bottom:14px}.alert-block>p,.alert-block>ul{margin-bottom:0}.alert-block p+p{margin-top:5px}.nav{margin-bottom:20px;margin-left:0;list-style:none}.nav>li>a{display:block}.nav>li>a:hover{text-decoration:none;background-color:#eee}.nav>.pull-right{float:right}.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999;text-shadow:0 1px 0 rgba(255,255,255,0.5);text-transform:uppercase}.nav li+.nav-header{margin-top:9px}.nav-list{padding-right:15px;padding-left:15px;margin-bottom:0}.nav-list>li>a,.nav-list .nav-header{margin-right:-15px;margin-left:-15px;text-shadow:0 1px 0 rgba(255,255,255,0.5)}.nav-list>li>a{padding:3px 15px}.nav-list>.active>a,.nav-list>.active>a:hover{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.2);background-color:#08c}.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px}.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #fff}.nav-tabs,.nav-pills{*zoom:1}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;line-height:0;content:""}.nav-tabs:after,.nav-pills:after{clear:both}.nav-tabs>li,.nav-pills>li{float:left}.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{margin-bottom:-1px}.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#fff;background-color:#08c}.nav-stacked>li{float:none}.nav-stacked>li>a{margin-right:0}.nav-tabs.nav-stacked{border-bottom:0}.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-topleft:4px}.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-moz-border-radius-bottomright:4px;-moz-border-radius-bottomleft:4px}.nav-tabs.nav-stacked>li>a:hover{z-index:2;border-color:#ddd}.nav-pills.nav-stacked>li>a{margin-bottom:3px}.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px}.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.nav .dropdown-toggle .caret{margin-top:6px;border-top-color:#08c;border-bottom-color:#08c}.nav .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580}.nav-tabs .dropdown-toggle .caret{margin-top:8px}.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.nav>.dropdown.active>a:hover{cursor:pointer}.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover{color:#fff;background-color:#999;border-color:#999}.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret{border-top-color:#fff;border-bottom-color:#fff;opacity:1;filter:alpha(opacity=100)}.tabs-stacked .open>a:hover{border-color:#999}.tabbable{*zoom:1}.tabbable:before,.tabbable:after{display:table;line-height:0;content:""}.tabbable:after{clear:both}.tab-content{overflow:auto}.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0}.tab-content>.tab-pane,.pill-content>.pill-pane{display:none}.tab-content>.active,.pill-content>.active{display:block}.tabs-below>.nav-tabs{border-top:1px solid #ddd}.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0}.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px}.tabs-below>.nav-tabs>li>a:hover{border-top-color:#ddd;border-bottom-color:transparent}.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover{border-color:transparent #ddd #ddd #ddd}.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none}.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px}.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd}.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.tabs-left>.nav-tabs>li>a:hover{border-color:#eee #ddd #eee #eee}.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#fff}.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd}.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.tabs-right>.nav-tabs>li>a:hover{border-color:#eee #eee #eee #ddd}.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#fff}.nav>.disabled>a{color:#999}.nav>.disabled>a:hover{text-decoration:none;cursor:default;background-color:transparent}.navbar{*position:relative;*z-index:2;margin-bottom:20px;overflow:visible;color:#777}.navbar-inner{min-height:40px;padding-right:20px;padding-left:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top,#fff,#f2f2f2);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#f2f2f2));background-image:-webkit-linear-gradient(top,#fff,#f2f2f2);background-image:-o-linear-gradient(top,#fff,#f2f2f2);background-image:linear-gradient(to bottom,#fff,#f2f2f2);background-repeat:repeat-x;border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff2f2f2',GradientType=0);*zoom:1;-webkit-box-shadow:0 1px 4px rgba(0,0,0,0.065);-moz-box-shadow:0 1px 4px rgba(0,0,0,0.065);box-shadow:0 1px 4px rgba(0,0,0,0.065)}.navbar-inner:before,.navbar-inner:after{display:table;line-height:0;content:""}.navbar-inner:after{clear:both}.navbar .container{width:auto}.nav-collapse.collapse{height:auto;overflow:visible}.navbar .brand{display:block;float:left;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777;text-shadow:0 1px 0 #fff}.navbar .brand:hover{text-decoration:none}.navbar-text{margin-bottom:0;line-height:40px}.navbar-link{color:#777}.navbar-link:hover{color:#333}.navbar .divider-vertical{height:40px;margin:0 9px;border-right:1px solid #fff;border-left:1px solid #f2f2f2}.navbar .btn,.navbar .btn-group{margin-top:5px}.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn{margin-top:0}.navbar-form{margin-bottom:0;*zoom:1}.navbar-form:before,.navbar-form:after{display:table;line-height:0;content:""}.navbar-form:after{clear:both}.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px}.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0}.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px}.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0}.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0}.navbar-search .search-query{padding:4px 14px;margin-bottom:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.navbar-static-top{position:static;margin-bottom:0}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px}.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-right:0;padding-left:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px}.navbar-fixed-top{top:0}.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,0.1);box-shadow:0 1px 10px rgba(0,0,0,0.1)}.navbar-fixed-bottom{bottom:0}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,0.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,0.1);box-shadow:0 -1px 10px rgba(0,0,0,0.1)}.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0}.navbar .nav.pull-right{float:right;margin-right:0}.navbar .nav>li{float:left}.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777;text-decoration:none;text-shadow:0 1px 0 #fff}.navbar .nav .dropdown-toggle .caret{margin-top:8px}.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{color:#333;text-decoration:none;background-color:transparent}.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);-moz-box-shadow:inset 0 3px 8px rgba(0,0,0,0.125);box-shadow:inset 0 3px 8px rgba(0,0,0,0.125)}.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-right:5px;margin-left:5px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#ededed;*background-color:#e5e5e5;background-image:-moz-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#e5e5e5));background-image:-webkit-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:-o-linear-gradient(top,#f2f2f2,#e5e5e5);background-image:linear-gradient(to bottom,#f2f2f2,#e5e5e5);background-repeat:repeat-x;border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffe5e5e5',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.075)}.navbar .btn-navbar:hover,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#fff;background-color:#e5e5e5;*background-color:#d9d9d9}.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#ccc \9}.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,0.25);-moz-box-shadow:0 1px 0 rgba(0,0,0,0.25);box-shadow:0 1px 0 rgba(0,0,0,0.25)}.btn-navbar .icon-bar+.icon-bar{margin-top:3px}.navbar .nav>li>.dropdown-menu:before{position:absolute;top:-7px;left:9px;display:inline-block;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-left:7px solid transparent;border-bottom-color:rgba(0,0,0,0.2);content:''}.navbar .nav>li>.dropdown-menu:after{position:absolute;top:-6px;left:10px;display:inline-block;border-right:6px solid transparent;border-bottom:6px solid #fff;border-left:6px solid transparent;content:''}.navbar-fixed-bottom .nav>li>.dropdown-menu:before{top:auto;bottom:-7px;border-top:7px solid #ccc;border-bottom:0;border-top-color:rgba(0,0,0,0.2)}.navbar-fixed-bottom .nav>li>.dropdown-menu:after{top:auto;bottom:-6px;border-top:6px solid #fff;border-bottom:0}.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{color:#555;background-color:#e5e5e5}.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777;border-bottom-color:#777}.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555;border-bottom-color:#555}.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{right:12px;left:auto}.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{right:13px;left:auto}.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{right:100%;left:auto;margin-right:-1px;margin-left:0;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px}.navbar-inverse{color:#999}.navbar-inverse .navbar-inner{background-color:#002234;background-image:-moz-linear-gradient(top,#00334e,#002234);background-image:-webkit-gradient(linear,0 0,0 100%,from(#00334e),to(#002234));background-image:-webkit-linear-gradient(top,#00334e,#002234);background-image:-o-linear-gradient(top,#00334e,#002234);background-image:linear-gradient(to bottom,#00334e,#002234);background-repeat:repeat-x;border-color:#252525;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff00334e',endColorstr='#ff002234',GradientType=0)}.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999;text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover{color:#fff}.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{color:#fff;background-color:transparent}.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#fff;background-color:#002234}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.navbar-inverse .divider-vertical{border-right-color:#00334e;border-left-color:#002234}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{color:#fff;background-color:#111}.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999;border-bottom-color:#999}.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff}.navbar-inverse .navbar-search .search-query{color:#fff;background-color:#515151;border-color:#111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1),0 1px 0 rgba(255,255,255,0.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#ccc}.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333;text-shadow:0 1px 0 #fff;background-color:#fff;border:0;outline:0;-webkit-box-shadow:0 0 3px rgba(0,0,0,0.15);-moz-box-shadow:0 0 3px rgba(0,0,0,0.15);box-shadow:0 0 3px rgba(0,0,0,0.15)}.navbar-inverse .btn-navbar{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e0e0e;*background-color:#040404;background-image:-moz-linear-gradient(top,#151515,#040404);background-image:-webkit-gradient(linear,0 0,0 100%,from(#151515),to(#040404));background-image:-webkit-linear-gradient(top,#151515,#040404);background-image:-o-linear-gradient(top,#151515,#040404);background-image:linear-gradient(to bottom,#151515,#040404);background-repeat:repeat-x;border-color:#040404 #040404 #000;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515',endColorstr='#ff040404',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#fff;background-color:#040404;*background-color:#000}.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000 \9}.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.breadcrumb li{display:inline-block;*display:inline;text-shadow:0 1px 0 #fff;*zoom:1}.breadcrumb .divider{padding:0 5px;color:#ccc}.breadcrumb .active{color:#999}.pagination{margin:20px 0}.pagination ul{display:inline-block;*display:inline;margin-bottom:0;margin-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*zoom:1;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.pagination ul>li{display:inline}.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#fff;border:1px solid #ddd;border-left-width:0}.pagination ul>li>a:hover,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5}.pagination ul>.active>a,.pagination ul>.active>span{color:#999;cursor:default}.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover{color:#999;cursor:default;background-color:transparent}.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-bottom-left-radius:4px;border-bottom-left-radius:4px;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-moz-border-radius-bottomleft:4px;-moz-border-radius-topleft:4px}.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;border-bottom-right-radius:4px;-moz-border-radius-topright:4px;-moz-border-radius-bottomright:4px}.pagination-centered{text-align:center}.pagination-right{text-align:right}.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px}.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-bottom-left-radius:6px;border-bottom-left-radius:6px;-webkit-border-top-left-radius:6px;border-top-left-radius:6px;-moz-border-radius-bottomleft:6px;-moz-border-radius-topleft:6px}.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;border-bottom-right-radius:6px;-moz-border-radius-topright:6px;-moz-border-radius-bottomright:6px}.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-moz-border-radius-bottomleft:3px;-moz-border-radius-topleft:3px}.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px;-moz-border-radius-topright:3px;-moz-border-radius-bottomright:3px}.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px}.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:1px 6px;font-size:10.5px}.pager{margin:20px 0;text-align:center;list-style:none;*zoom:1}.pager:before,.pager:after{display:table;line-height:0;content:""}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px}.pager li>a:hover{text-decoration:none;background-color:#f5f5f5}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>span{color:#999;cursor:default;background-color:#fff}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop,.modal-backdrop.fade.in{opacity:.8;filter:alpha(opacity=80)}.modal{position:fixed;top:50%;left:50%;z-index:1050;width:560px;margin:-250px 0 0 -280px;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;outline:0;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box}.modal.fade{top:-25%;-webkit-transition:opacity .3s linear,top .3s ease-out;-moz-transition:opacity .3s linear,top .3s ease-out;-o-transition:opacity .3s linear,top .3s ease-out;transition:opacity .3s linear,top .3s ease-out}.modal.fade.in{top:50%}.modal-header{padding:9px 15px;border-bottom:1px solid #eee}.modal-header .close{margin-top:2px}.modal-header h3{margin:0;line-height:30px}.modal-body{max-height:400px;padding:15px;overflow-y:auto}.modal-form{margin-bottom:0}.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;*zoom:1;-webkit-box-shadow:inset 0 1px 0 #fff;-moz-box-shadow:inset 0 1px 0 #fff;box-shadow:inset 0 1px 0 #fff}.modal-footer:before,.modal-footer:after{display:table;line-height:0;content:""}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}.tooltip{position:absolute;z-index:1030;display:block;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.8;filter:alpha(opacity=80)}.tooltip.top{margin-top:-3px}.tooltip.right{margin-left:3px}.tooltip.bottom{margin-top:3px}.tooltip.left{margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;width:236px;padding:1px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0}.popover .arrow,.popover .arrow:after{position:absolute;display:inline-block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow:after{z-index:-1;content:""}.popover.top .arrow{bottom:-10px;left:50%;margin-left:-10px;border-top-color:#fff;border-width:10px 10px 0}.popover.top .arrow:after{bottom:-1px;left:-11px;border-top-color:rgba(0,0,0,0.25);border-width:11px 11px 0}.popover.right .arrow{top:50%;left:-10px;margin-top:-10px;border-right-color:#fff;border-width:10px 10px 10px 0}.popover.right .arrow:after{bottom:-11px;left:-1px;border-right-color:rgba(0,0,0,0.25);border-width:11px 11px 11px 0}.popover.bottom .arrow{top:-10px;left:50%;margin-left:-10px;border-bottom-color:#fff;border-width:0 10px 10px}.popover.bottom .arrow:after{top:-1px;left:-11px;border-bottom-color:rgba(0,0,0,0.25);border-width:0 11px 11px}.popover.left .arrow{top:50%;right:-10px;margin-top:-10px;border-left-color:#fff;border-width:10px 0 10px 10px}.popover.left .arrow:after{right:-1px;bottom:-11px;border-left-color:rgba(0,0,0,0.25);border-width:11px 0 11px 11px}.thumbnails{margin-left:-20px;list-style:none;*zoom:1}.thumbnails:before,.thumbnails:after{display:table;line-height:0;content:""}.thumbnails:after{clear:both}.row-fluid .thumbnails{margin-left:0}.thumbnails>li{float:left;margin-bottom:20px;margin-left:20px}.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0,0,0,0.055);-moz-box-shadow:0 1px 3px rgba(0,0,0,0.055);box-shadow:0 1px 3px rgba(0,0,0,0.055);-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out}a.thumbnail:hover{border-color:#08c;-webkit-box-shadow:0 1px 4px rgba(0,105,214,0.25);-moz-box-shadow:0 1px 4px rgba(0,105,214,0.25);box-shadow:0 1px 4px rgba(0,105,214,0.25)}.thumbnail>img{display:block;max-width:100%;margin-right:auto;margin-left:auto}.thumbnail .caption{padding:9px;color:#555}.media,.media-body{overflow:hidden;*overflow:visible;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media .pull-left{margin-right:10px}.media .pull-right{margin-left:10px}.media-list{margin-left:0;list-style:none}.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,0.25);white-space:nowrap;vertical-align:baseline;background-color:#999}.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.badge{padding-right:9px;padding-left:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px}a.label:hover,a.badge:hover{color:#fff;text-decoration:none;cursor:pointer}.label-important,.badge-important{background-color:#b94a48}.label-important[href],.badge-important[href]{background-color:#953b39}.label-warning,.badge-warning{background-color:#f89406}.label-warning[href],.badge-warning[href]{background-color:#c67605}.label-success,.badge-success{background-color:#468847}.label-success[href],.badge-success[href]{background-color:#356635}.label-info,.badge-info{background-color:#3a87ad}.label-info[href],.badge-info[href]{background-color:#2d6987}.label-inverse,.badge-inverse{background-color:#333}.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a}.btn .label,.btn .badge{position:relative;top:-1px}.btn-mini .label,.btn-mini .badge{top:0}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@-o-keyframes progress-bar-stripes{from{background-position:0 0}to{background-position:40px 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f7f7f7;background-image:-moz-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f5f5f5),to(#f9f9f9));background-image:-webkit-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:-o-linear-gradient(top,#f5f5f5,#f9f9f9);background-image:linear-gradient(to bottom,#f5f5f5,#f9f9f9);background-repeat:repeat-x;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#fff9f9f9',GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress .bar{float:left;width:0;height:100%;font-size:12px;color:#fff;text-align:center;text-shadow:0 -1px 0 rgba(0,0,0,0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top,#149bdf,#0480be);background-image:-webkit-gradient(linear,0 0,0 100%,from(#149bdf),to(#0480be));background-image:-webkit-linear-gradient(top,#149bdf,#0480be);background-image:-o-linear-gradient(top,#149bdf,#0480be);background-image:linear-gradient(to bottom,#149bdf,#0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf',endColorstr='#ff0480be',GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width .6s ease;-moz-transition:width .6s ease;-o-transition:width .6s ease;transition:width .6s ease}.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 1px 0 0 rgba(0,0,0,0.15),inset 0 -1px 0 rgba(0,0,0,0.15)}.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px}.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top,#ee5f5b,#c43c35);background-image:-webkit-gradient(linear,0 0,0 100%,from(#ee5f5b),to(#c43c35));background-image:-webkit-linear-gradient(top,#ee5f5b,#c43c35);background-image:-o-linear-gradient(top,#ee5f5b,#c43c35);background-image:linear-gradient(to bottom,#ee5f5b,#c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b',endColorstr='#ffc43c35',GradientType=0)}.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top,#62c462,#57a957);background-image:-webkit-gradient(linear,0 0,0 100%,from(#62c462),to(#57a957));background-image:-webkit-linear-gradient(top,#62c462,#57a957);background-image:-o-linear-gradient(top,#62c462,#57a957);background-image:linear-gradient(to bottom,#62c462,#57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462',endColorstr='#ff57a957',GradientType=0)}.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top,#5bc0de,#339bb9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#5bc0de),to(#339bb9));background-image:-webkit-linear-gradient(top,#5bc0de,#339bb9);background-image:-o-linear-gradient(top,#5bc0de,#339bb9);background-image:linear-gradient(to bottom,#5bc0de,#339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff339bb9',GradientType=0)}.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top,#fbb450,#f89406);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fbb450),to(#f89406));background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:-o-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450',endColorstr='#fff89406',GradientType=0)}.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear,0 100%,100% 0,color-stop(0.25,rgba(255,255,255,0.15)),color-stop(0.25,transparent),color-stop(0.5,transparent),color-stop(0.5,rgba(255,255,255,0.15)),color-stop(0.75,rgba(255,255,255,0.15)),color-stop(0.75,transparent),to(transparent));background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-moz-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.accordion{margin-bottom:20px}.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.accordion-heading{border-bottom:0}.accordion-heading .accordion-toggle{display:block;padding:8px 15px}.accordion-toggle{cursor:pointer}.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5}.carousel{position:relative;margin-bottom:20px;line-height:1}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel .item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;-moz-transition:.6s ease-in-out left;-o-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel .item>img{display:block;line-height:1}.carousel .active,.carousel .next,.carousel .prev{display:block}.carousel .active{left:0}.carousel .next,.carousel .prev{position:absolute;top:0;width:100%}.carousel .next{left:100%}.carousel .prev{left:-100%}.carousel .next.left,.carousel .prev.right{left:0}.carousel .active.left{left:-100%}.carousel .active.right{left:100%}.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#fff;text-align:center;background:#222;border:3px solid #fff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:.5;filter:alpha(opacity=50)}.carousel-control.right{right:15px;left:auto}.carousel-control:hover{color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-caption{position:absolute;right:0;bottom:0;left:0;padding:15px;background:#333;background:rgba(0,0,0,0.75)}.carousel-caption h4,.carousel-caption p{line-height:20px;color:#fff}.carousel-caption h4{margin:0 0 5px}.carousel-caption p{margin-bottom:0}.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;color:inherit}.hero-unit li{line-height:30px}.pull-right{float:right}.pull-left{float:left}.hide{display:none}.show{display:block}.invisible{visibility:hidden}.affix{position:fixed}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.css b/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.css
deleted file mode 100644
index 82fa9cafe6..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.css
+++ /dev/null
@@ -1,1088 +0,0 @@
-/*!
- * Bootstrap Responsive v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-.clearfix {
-  *zoom: 1;
-}
-
-.clearfix:before,
-.clearfix:after {
-  display: table;
-  line-height: 0;
-  content: "";
-}
-
-.clearfix:after {
-  clear: both;
-}
-
-.hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-.input-block-level {
-  display: block;
-  width: 100%;
-  min-height: 30px;
-  -webkit-box-sizing: border-box;
-     -moz-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-.hidden {
-  display: none;
-  visibility: hidden;
-}
-
-.visible-phone {
-  display: none !important;
-}
-
-.visible-tablet {
-  display: none !important;
-}
-
-.hidden-desktop {
-  display: none !important;
-}
-
-.visible-desktop {
-  display: inherit !important;
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important ;
-  }
-  .visible-tablet {
-    display: inherit !important;
-  }
-  .hidden-tablet {
-    display: none !important;
-  }
-}
-
-@media (max-width: 767px) {
-  .hidden-desktop {
-    display: inherit !important;
-  }
-  .visible-desktop {
-    display: none !important;
-  }
-  .visible-phone {
-    display: inherit !important;
-  }
-  .hidden-phone {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .row {
-    margin-left: -30px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 30px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 1170px;
-  }
-  .span12 {
-    width: 1170px;
-  }
-  .span11 {
-    width: 1070px;
-  }
-  .span10 {
-    width: 970px;
-  }
-  .span9 {
-    width: 870px;
-  }
-  .span8 {
-    width: 770px;
-  }
-  .span7 {
-    width: 670px;
-  }
-  .span6 {
-    width: 570px;
-  }
-  .span5 {
-    width: 470px;
-  }
-  .span4 {
-    width: 370px;
-  }
-  .span3 {
-    width: 270px;
-  }
-  .span2 {
-    width: 170px;
-  }
-  .span1 {
-    width: 70px;
-  }
-  .offset12 {
-    margin-left: 1230px;
-  }
-  .offset11 {
-    margin-left: 1130px;
-  }
-  .offset10 {
-    margin-left: 1030px;
-  }
-  .offset9 {
-    margin-left: 930px;
-  }
-  .offset8 {
-    margin-left: 830px;
-  }
-  .offset7 {
-    margin-left: 730px;
-  }
-  .offset6 {
-    margin-left: 630px;
-  }
-  .offset5 {
-    margin-left: 530px;
-  }
-  .offset4 {
-    margin-left: 430px;
-  }
-  .offset3 {
-    margin-left: 330px;
-  }
-  .offset2 {
-    margin-left: 230px;
-  }
-  .offset1 {
-    margin-left: 130px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.564102564102564%;
-    *margin-left: 2.5109110747408616%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.564102564102564%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.45299145299145%;
-    *width: 91.39979996362975%;
-  }
-  .row-fluid .span10 {
-    width: 82.90598290598291%;
-    *width: 82.8527914166212%;
-  }
-  .row-fluid .span9 {
-    width: 74.35897435897436%;
-    *width: 74.30578286961266%;
-  }
-  .row-fluid .span8 {
-    width: 65.81196581196582%;
-    *width: 65.75877432260411%;
-  }
-  .row-fluid .span7 {
-    width: 57.26495726495726%;
-    *width: 57.21176577559556%;
-  }
-  .row-fluid .span6 {
-    width: 48.717948717948715%;
-    *width: 48.664757228587014%;
-  }
-  .row-fluid .span5 {
-    width: 40.17094017094017%;
-    *width: 40.11774868157847%;
-  }
-  .row-fluid .span4 {
-    width: 31.623931623931625%;
-    *width: 31.570740134569924%;
-  }
-  .row-fluid .span3 {
-    width: 23.076923076923077%;
-    *width: 23.023731587561375%;
-  }
-  .row-fluid .span2 {
-    width: 14.52991452991453%;
-    *width: 14.476723040552828%;
-  }
-  .row-fluid .span1 {
-    width: 5.982905982905983%;
-    *width: 5.929714493544281%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.12820512820512%;
-    *margin-left: 105.02182214948171%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.56410256410257%;
-    *margin-left: 102.45771958537915%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.58119658119658%;
-    *margin-left: 96.47481360247316%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.01709401709402%;
-    *margin-left: 93.91071103837061%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.03418803418803%;
-    *margin-left: 87.92780505546462%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.47008547008548%;
-    *margin-left: 85.36370249136206%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.48717948717949%;
-    *margin-left: 79.38079650845607%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 76.92307692307693%;
-    *margin-left: 76.81669394435352%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 70.94017094017094%;
-    *margin-left: 70.83378796144753%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.37606837606839%;
-    *margin-left: 68.26968539734497%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.393162393162385%;
-    *margin-left: 62.28677941443899%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.82905982905982%;
-    *margin-left: 59.72267685033642%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 53.84615384615384%;
-    *margin-left: 53.739770867430444%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.28205128205128%;
-    *margin-left: 51.175668303327875%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.299145299145295%;
-    *margin-left: 45.1927623204219%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.73504273504273%;
-    *margin-left: 42.62865975631933%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 36.75213675213675%;
-    *margin-left: 36.645753773413354%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.18803418803419%;
-    *margin-left: 34.081651209310785%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.205128205128204%;
-    *margin-left: 28.0987452264048%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.641025641025642%;
-    *margin-left: 25.53464266230224%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.65811965811966%;
-    *margin-left: 19.551736679396257%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.094017094017094%;
-    *margin-left: 16.98763411529369%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.11111111111111%;
-    *margin-left: 11.004728132387708%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.547008547008547%;
-    *margin-left: 8.440625568285142%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 30px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 1156px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 1056px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 956px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 856px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 756px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 656px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 556px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 456px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 356px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 256px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 156px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 56px;
-  }
-  .thumbnails {
-    margin-left: -30px;
-  }
-  .thumbnails > li {
-    margin-left: 30px;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 979px) {
-  .row {
-    margin-left: -20px;
-    *zoom: 1;
-  }
-  .row:before,
-  .row:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row:after {
-    clear: both;
-  }
-  [class*="span"] {
-    float: left;
-    min-height: 1px;
-    margin-left: 20px;
-  }
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    width: 724px;
-  }
-  .span12 {
-    width: 724px;
-  }
-  .span11 {
-    width: 662px;
-  }
-  .span10 {
-    width: 600px;
-  }
-  .span9 {
-    width: 538px;
-  }
-  .span8 {
-    width: 476px;
-  }
-  .span7 {
-    width: 414px;
-  }
-  .span6 {
-    width: 352px;
-  }
-  .span5 {
-    width: 290px;
-  }
-  .span4 {
-    width: 228px;
-  }
-  .span3 {
-    width: 166px;
-  }
-  .span2 {
-    width: 104px;
-  }
-  .span1 {
-    width: 42px;
-  }
-  .offset12 {
-    margin-left: 764px;
-  }
-  .offset11 {
-    margin-left: 702px;
-  }
-  .offset10 {
-    margin-left: 640px;
-  }
-  .offset9 {
-    margin-left: 578px;
-  }
-  .offset8 {
-    margin-left: 516px;
-  }
-  .offset7 {
-    margin-left: 454px;
-  }
-  .offset6 {
-    margin-left: 392px;
-  }
-  .offset5 {
-    margin-left: 330px;
-  }
-  .offset4 {
-    margin-left: 268px;
-  }
-  .offset3 {
-    margin-left: 206px;
-  }
-  .offset2 {
-    margin-left: 144px;
-  }
-  .offset1 {
-    margin-left: 82px;
-  }
-  .row-fluid {
-    width: 100%;
-    *zoom: 1;
-  }
-  .row-fluid:before,
-  .row-fluid:after {
-    display: table;
-    line-height: 0;
-    content: "";
-  }
-  .row-fluid:after {
-    clear: both;
-  }
-  .row-fluid [class*="span"] {
-    display: block;
-    float: left;
-    width: 100%;
-    min-height: 30px;
-    margin-left: 2.7624309392265194%;
-    *margin-left: 2.709239449864817%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="span"]:first-child {
-    margin-left: 0;
-  }
-  .row-fluid .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 2.7624309392265194%;
-  }
-  .row-fluid .span12 {
-    width: 100%;
-    *width: 99.94680851063829%;
-  }
-  .row-fluid .span11 {
-    width: 91.43646408839778%;
-    *width: 91.38327259903608%;
-  }
-  .row-fluid .span10 {
-    width: 82.87292817679558%;
-    *width: 82.81973668743387%;
-  }
-  .row-fluid .span9 {
-    width: 74.30939226519337%;
-    *width: 74.25620077583166%;
-  }
-  .row-fluid .span8 {
-    width: 65.74585635359117%;
-    *width: 65.69266486422946%;
-  }
-  .row-fluid .span7 {
-    width: 57.18232044198895%;
-    *width: 57.12912895262725%;
-  }
-  .row-fluid .span6 {
-    width: 48.61878453038674%;
-    *width: 48.56559304102504%;
-  }
-  .row-fluid .span5 {
-    width: 40.05524861878453%;
-    *width: 40.00205712942283%;
-  }
-  .row-fluid .span4 {
-    width: 31.491712707182323%;
-    *width: 31.43852121782062%;
-  }
-  .row-fluid .span3 {
-    width: 22.92817679558011%;
-    *width: 22.87498530621841%;
-  }
-  .row-fluid .span2 {
-    width: 14.3646408839779%;
-    *width: 14.311449394616199%;
-  }
-  .row-fluid .span1 {
-    width: 5.801104972375691%;
-    *width: 5.747913483013988%;
-  }
-  .row-fluid .offset12 {
-    margin-left: 105.52486187845304%;
-    *margin-left: 105.41847889972962%;
-  }
-  .row-fluid .offset12:first-child {
-    margin-left: 102.76243093922652%;
-    *margin-left: 102.6560479605031%;
-  }
-  .row-fluid .offset11 {
-    margin-left: 96.96132596685082%;
-    *margin-left: 96.8549429881274%;
-  }
-  .row-fluid .offset11:first-child {
-    margin-left: 94.1988950276243%;
-    *margin-left: 94.09251204890089%;
-  }
-  .row-fluid .offset10 {
-    margin-left: 88.39779005524862%;
-    *margin-left: 88.2914070765252%;
-  }
-  .row-fluid .offset10:first-child {
-    margin-left: 85.6353591160221%;
-    *margin-left: 85.52897613729868%;
-  }
-  .row-fluid .offset9 {
-    margin-left: 79.8342541436464%;
-    *margin-left: 79.72787116492299%;
-  }
-  .row-fluid .offset9:first-child {
-    margin-left: 77.07182320441989%;
-    *margin-left: 76.96544022569647%;
-  }
-  .row-fluid .offset8 {
-    margin-left: 71.2707182320442%;
-    *margin-left: 71.16433525332079%;
-  }
-  .row-fluid .offset8:first-child {
-    margin-left: 68.50828729281768%;
-    *margin-left: 68.40190431409427%;
-  }
-  .row-fluid .offset7 {
-    margin-left: 62.70718232044199%;
-    *margin-left: 62.600799341718584%;
-  }
-  .row-fluid .offset7:first-child {
-    margin-left: 59.94475138121547%;
-    *margin-left: 59.838368402492065%;
-  }
-  .row-fluid .offset6 {
-    margin-left: 54.14364640883978%;
-    *margin-left: 54.037263430116376%;
-  }
-  .row-fluid .offset6:first-child {
-    margin-left: 51.38121546961326%;
-    *margin-left: 51.27483249088986%;
-  }
-  .row-fluid .offset5 {
-    margin-left: 45.58011049723757%;
-    *margin-left: 45.47372751851417%;
-  }
-  .row-fluid .offset5:first-child {
-    margin-left: 42.81767955801105%;
-    *margin-left: 42.71129657928765%;
-  }
-  .row-fluid .offset4 {
-    margin-left: 37.01657458563536%;
-    *margin-left: 36.91019160691196%;
-  }
-  .row-fluid .offset4:first-child {
-    margin-left: 34.25414364640884%;
-    *margin-left: 34.14776066768544%;
-  }
-  .row-fluid .offset3 {
-    margin-left: 28.45303867403315%;
-    *margin-left: 28.346655695309746%;
-  }
-  .row-fluid .offset3:first-child {
-    margin-left: 25.69060773480663%;
-    *margin-left: 25.584224756083227%;
-  }
-  .row-fluid .offset2 {
-    margin-left: 19.88950276243094%;
-    *margin-left: 19.783119783707537%;
-  }
-  .row-fluid .offset2:first-child {
-    margin-left: 17.12707182320442%;
-    *margin-left: 17.02068884448102%;
-  }
-  .row-fluid .offset1 {
-    margin-left: 11.32596685082873%;
-    *margin-left: 11.219583872105325%;
-  }
-  .row-fluid .offset1:first-child {
-    margin-left: 8.56353591160221%;
-    *margin-left: 8.457152932878806%;
-  }
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 20px;
-  }
-  input.span12,
-  textarea.span12,
-  .uneditable-input.span12 {
-    width: 710px;
-  }
-  input.span11,
-  textarea.span11,
-  .uneditable-input.span11 {
-    width: 648px;
-  }
-  input.span10,
-  textarea.span10,
-  .uneditable-input.span10 {
-    width: 586px;
-  }
-  input.span9,
-  textarea.span9,
-  .uneditable-input.span9 {
-    width: 524px;
-  }
-  input.span8,
-  textarea.span8,
-  .uneditable-input.span8 {
-    width: 462px;
-  }
-  input.span7,
-  textarea.span7,
-  .uneditable-input.span7 {
-    width: 400px;
-  }
-  input.span6,
-  textarea.span6,
-  .uneditable-input.span6 {
-    width: 338px;
-  }
-  input.span5,
-  textarea.span5,
-  .uneditable-input.span5 {
-    width: 276px;
-  }
-  input.span4,
-  textarea.span4,
-  .uneditable-input.span4 {
-    width: 214px;
-  }
-  input.span3,
-  textarea.span3,
-  .uneditable-input.span3 {
-    width: 152px;
-  }
-  input.span2,
-  textarea.span2,
-  .uneditable-input.span2 {
-    width: 90px;
-  }
-  input.span1,
-  textarea.span1,
-  .uneditable-input.span1 {
-    width: 28px;
-  }
-}
-
-@media (max-width: 767px) {
-  body {
-    padding-right: 20px;
-    padding-left: 20px;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-right: -20px;
-    margin-left: -20px;
-  }
-  .container-fluid {
-    padding: 0;
-  }
-  .dl-horizontal dt {
-    float: none;
-    width: auto;
-    clear: none;
-    text-align: left;
-  }
-  .dl-horizontal dd {
-    margin-left: 0;
-  }
-  .container {
-    width: auto;
-  }
-  .row-fluid {
-    width: 100%;
-  }
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0;
-  }
-  [class*="span"],
-  .uneditable-input[class*="span"],
-  .row-fluid [class*="span"] {
-    display: block;
-    float: none;
-    width: 100%;
-    margin-left: 0;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    display: block;
-    width: 100%;
-    min-height: 30px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-  }
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block;
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-  .modal {
-    position: fixed;
-    top: 20px;
-    right: 20px;
-    left: 20px;
-    width: auto;
-    margin: 0;
-  }
-  .modal.fade {
-    top: -100px;
-  }
-  .modal.fade.in {
-    top: 20px;
-  }
-}
-
-@media (max-width: 480px) {
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .page-header h1 small {
-    display: block;
-    line-height: 20px;
-  }
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-  .form-horizontal .control-label {
-    float: none;
-    width: auto;
-    padding-top: 0;
-    text-align: left;
-  }
-  .form-horizontal .controls {
-    margin-left: 0;
-  }
-  .form-horizontal .control-list {
-    padding-top: 0;
-  }
-  .form-horizontal .form-actions {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-  .media .pull-left,
-  .media .pull-right {
-    display: block;
-    float: none;
-    margin-bottom: 10px;
-  }
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-  .modal {
-    top: 10px;
-    right: 10px;
-    left: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-  .carousel-caption {
-    position: static;
-  }
-}
-
-@media (max-width: 979px) {
-  body {
-    padding-top: 0;
-  }
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: 20px;
-  }
-  .navbar-fixed-bottom {
-    margin-top: 20px;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  .navbar .brand {
-    padding-right: 10px;
-    padding-left: 10px;
-    margin: 0 0 0 -5px;
-  }
-  .nav-collapse {
-    clear: both;
-  }
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 10px;
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: #777777;
-    text-shadow: none;
-  }
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: #777777;
-    -webkit-border-radius: 3px;
-       -moz-border-radius: 3px;
-            border-radius: 3px;
-  }
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    -webkit-border-radius: 4px;
-       -moz-border-radius: 4px;
-            border-radius: 4px;
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .dropdown-menu a:hover {
-    background-color: #f2f2f2;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: #999999;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
-    background-color: #111111;
-  }
-  .nav-collapse.in .btn-group {
-    padding: 0;
-    margin-top: 5px;
-  }
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    display: none;
-    float: none;
-    max-width: none;
-    padding: 0;
-    margin: 0 15px;
-    background-color: transparent;
-    border: none;
-    -webkit-border-radius: 0;
-       -moz-border-radius: 0;
-            border-radius: 0;
-    -webkit-box-shadow: none;
-       -moz-box-shadow: none;
-            box-shadow: none;
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu:before,
-  .nav-collapse .nav > li > .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: 10px 15px;
-    margin: 10px 0;
-    border-top: 1px solid #f2f2f2;
-    border-bottom: 1px solid #f2f2f2;
-    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: #111111;
-    border-bottom-color: #111111;
-  }
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  .nav-collapse,
-  .nav-collapse.collapse {
-    height: 0;
-    overflow: hidden;
-  }
-  .navbar .btn-navbar {
-    display: block;
-  }
-  .navbar-static .navbar-inner {
-    padding-right: 10px;
-    padding-left: 10px;
-  }
-}
-
-@media (min-width: 980px) {
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.min.css b/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.min.css
deleted file mode 100644
index 2269019f18..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/css/bootstrap-responsive-2.2.1.min.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Bootstrap Responsive v2.2.1
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .dropdown-menu a:hover{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:hover{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings-white.png b/doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings-white.png
deleted file mode 100644
index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8777
zcmZvC1yGz#v+m*$LXcp=A$ZWB0fL7wNbp_U*$~{_gL`my3oP#L!5tQYy99Ta`+g_q
zKlj|KJ2f@c)ARJx{q*b<Rc{fZDE|-E3z8Qg5C}{9v!pTzga8NZOmrk*O`5892Z0dh
z6y;PuJwHDK9$?(w-u|_L_3`o1($W%e0`}kWUyy&dCnqOQPfu4@SAgf?;o*P$z|s8t
zJh1KR>bkhN_!|Wn*Vos8{TEhUT@5e;_WJsIMMcG5%>DiS&dv_N`4@J0cnAQ-#>RjZ
z00W5t&tJ^l-QC*ST1-p~00u^9XJ=AUl7oW-;2a+x2k__T=grN{+1c4XK0ZL~^z^i$
zp&>vEhr@4fZWb380S18T&!0cQ3IKpHF)?v=b_NIm0Q>v<fKgXh*W25>wY7D0baZ)n
z31Fa5sELUQARIVaU0nqf0XzT+fB_63aA;@<$l~wse|mcA;^G1TmX?-)e)jkGPfkuA
z92@|!<>h5S_4f8QP-JRq>d&7)^Yin8l7K8gED$&_FaV?gY+wLjpoW%~7NDe=nHfMG
z5DO3j{R9kv5GbssrUpO)<pElNvVjx;Inad7%}rnn)BtoiIXM{s0C>Oyv<s*i2m!7M
zNCXUk1jq|?5|99_k&%%AIlu-a0ty3=KxY8j%*;&S3IIajE_Qc!f%*X_5DScgf&xH0
zumu>Vrlx>u0UKD0i;Dpm5S5dY16(DL5l{ixz|mhJU@&-OWCTb7_%}8-fE(P~+XIRO
zJU|wp1|S>|J3KrLcz^+v1f&BDpd>&MAaibR4#5A_4(MucZwG9E1h4@u0P@C8;oo+g
zIVj7kfJi{oV~E(NZ*h(@^<JQ`7oGGHtP>-(Q(C`Psb3KZ{N;^GB(a8NE*Vwc715!9
zr-H4Ao|T_c6+VT_JH9H+P3>iXSt!a$F`>s`jn`w9GZ_~B!{<w2b}Uz=xRP0Noee!5
zHGxHKH;uZjouChSB9)ldcOm@{14~ct04{b8>0soaiV|O_c^R2aWa%}O3jUE)WO=pa
zs~_Wz08z|ieY5A%$@FcBF9^!1a}m5ks@7gjn;67N>}S~Hrm`4sM5Hh`q7&5-N{|31
z6x1{ol7Bn<k_m&K*9NkB7ANp6;_WSmra!UL^eY+pz_w5LlB(g$UY9|-AP@zsw4|7-
zi|#>skoViZ<brlX21G1wL@^v%v2P&MSTZc8SKT&&Tq!~%Uw%k^(D<O<S;ewoH)@(b
zb2Z<#wBV6y-?HHFVJFRg^me&@Reg!dys6F1>0GqbLa#kW`Z<Hy>)VCjt1MysKg|rT
zi!?s#<KsBd5lg=VLu4^|xo0%enAx0mMXMSpk0KF_*gOS;jx!zP=@5TPN+S>#Ck>8c
zpi|>$lGlw#@yMNi&V4`6OBGJ(H&7lqLlcTQ&1zWriG_fL>BnFcr~?;E93{M-xIozQ
zO=EHQ#+?<}%@wbWWv23#!V70h9MOuUVaU>3kpTvYfc|LBw?&b*89~Gc9i&8tlT#kF
ztpbZoAzkdB+UTy=tx%L3Z4)I{zY(Kb)eg{InobSJmNwPZt$14aS-uc4eKuY<?xyi!
z`TeGpun(kP^7#~<fX0r^ExRQwveWDF;DOQbL}?LBzt>8h$dtfyxu^a%zA)<y|4;I#
zFU8x7%0eT|Hd@3!T6Anh3IoHrN%@H8e6ge;3u)_$N2H&Rv2`ml6;kL~xS07C5Nzt<
z>>fYI&)@ZXky?^{5>xSC?;w4r&td6vBdi%vHm4=XJH!3yL3?Ep+T5aU_>i;yr_XGq
zxZfCzUU@GvnoIk+_Nd`aky>S&H!b*{A%L>?*XPAgWL(Vf(k7qUS}>Zn=U(ZfcOc{B
z3*tOHH@t5Ub5D~#N7!Fxx}P2)sy{vE_l(R7$aW&CX>c|&HY+7};vUIietK%}!ph<X
z*_6&Ee=)&D@nDa!y{$f<(Q`UdM+|H2ksGEhG7utFYl`Y6pD#+4LC8Hw@6|1H-x{D`
zE$uaNS!i^Rx(%B(My5}1#H73>rCuh+;C@1usp;XLU<8Gq8P!rEI3<U)y>ieg#W$!=
zQcZr{hp>8sF?k&Yl0?B84OneiQxef-4TEFrq3O~JAZR}yEJHA|Xkqd49tR&8oq{zP
zY@>J^HBV*(gJvJZc_0VFN7Sx?H7#75E3#?N8<p*btH>Z!C+_f53YU}py<FUNWgSuj
zi^M}p>ggxx1?wQi5Yb-_`I`_V*SMx5+*P^b=ec5RON-k1cIlsBLk}(HiaJyab0`CI
zo0{<v3Q5P3@oM!6@v&t6RJy0OS}M??mGqk1x;(pa`FWA#n+2z37<uPHl{#HvB!^?r
zm9?WOv;Tt(gt*?Pw;;%nF3|I0gDBXPM>=1_LO$~oE2%Tl_}KURuX<`+mQN_sTdM&*
zkFf!Xtl^e^gTy6ON=&gTn6)$JHQq2)33R@_!#9?BLNq-Wi{U|rVX7Vny$l6#+S<va
z%-r+y8D)Cm{5=IM8|<{prj)kZfIZ$NiW0)fE9{-SR)@-;NBJtHk@DI_v*mK(N0#s#
z?S8~jyotdcJJAAUt_;Tr)fa|*cT)~*JZ!c_7yVpSb{r2MllfJDbfI~-7n_#K6lw4G
z^Eyhsh^z8eZs2;adrfk9ip%h;IP|>Z@KvQt@VYb%<9JfapI^b9j=wa+Tqb4ei;8c5
z&1>Uz@lVFv6T4Z*YU$r4G`g=91lSeA<=GRZ!*KTWKDPR}NPUW%peCUj`Ix_LDq!8|
zMH-V`Pv!a~QkTL||L@cqiTz)*G-0=ytr1KqTuFPan9y4gYD5>PleK`NZB$ev@W%t=
zkp)_=lBUTLZJpAtZg;pjI;7r2y|26-N7&a(h<zryrg`J^oeC|8V|qszB+|*eQ-(Dy
zbn*nJ1W|b4-1y?dTI6}3IPMw+-O0;Q@eMMtjjQ+G6QfN3ae61Yd9LfQx_UREWecK4
zMn7A~fOz)be1)Yg{2Ysl9G%s8-h-~@C;ALAL0r=<JP2uCe!T|wAywH1r;F|f_q8N(
zYp^0FkyL9uj<8bK@fyTtgo+DT)14B^<SigcSJotgDV02O!M(CS6_B&^bILwyV?Ng4
zm7WQp?{l<Obhuy=22?5<oQDiM22&u4rZrRVG|L9ABfY{=95aTyd~@a$o~1P#ji`=w
zBKmQqX}r3Nlk9Q|gR7)~#n6AzYk`#!R*d5x`A)hU(!1R1%^zXxNJ(kPCw4htU9^(O
zP4cYV^F(I>X|`1YNM9N8{>8JAu<en5+94bD>v}hp1v`3JHT-=5lbXpbMq7X~2J5Kl
zh7tyU`_AusMFZ{ej9D;Uyy;SQ!4nwgSnngsYBwdS&EO3NS*o04)*j<g2BLf;iAZ2(
z7Key$cc6ey>uAYl;57c2Ly0(DEZ8IY?zSph-kyxu+D`tt@oU{32J#I{vmy=#0ySPK
zA+i(A3yl)qmTz*$dZi#y9FS;$;h%bY+;StNx{_R56Otq+?pGe^T^{5d7Gs&?`_r`8
zD&dzOA|j8@3<oPyCd}SOX6AZj_;pT>A&FR5U3*eQNBf<4^4W_iS_()*8b4aaUzfk2
zzIcMWSEjm;EPZPk{j{1>oXd}pXAj!NaRm8{Sjz!D=~q3WJ@vmt6ND_?HI~|wUS1j5
z9!S1MKr7%nxoJ3k`GB^7yV~*{n~O~n6($~x5Bu{7s|JyXbAyKI4+tO(zZYMslK;Zc
zzeHGVl{`iP@jfSKq>R;{+djJ9n%$%EL()Uw+sykjNQdflkJZSjqV_QDWivbZS~S{K
zkE@T^Jcv)Dfm93!mf$XYnCT--_A$zo9MOkPB6&diM8MwOfV?+ApNv`moV@nqn>&lv
zYbN1-M|jc~sG|yLN^1R2=`+1ih3jCshg`iP&mY$GMTcY^W^T`WOCX!{-KHmZ#GiRH
zYl{|+KLn5!PCLtBy~9i}`#d^gCDDx$+GQb~uc;V#K3OgbbOG0j5{BRG-si%Bo{@lB
zGIt+Ain8^C`!*S0d0OSWVO+Z8<kqm;qPrHIJ!qB8;9h5*>9}}O8aFTZ>p&k}2gGCV
zh#<$gswePFxWGT$4DC^8@84_e*^KT74?7n8!$8cg=sL$OlKr&HMh@Rr5%*Wr!xoOl
zo7jItnj-xYgVTX)H1=A2bD(tle<tL7^Z!nJ*fwgn&QUe>EH57#V{xAeW_ezISg5OC
zg=k>hOLA^urTH_e6*vSYRqCm$J{xo}-x3@HH;bsHD1Z`Pzvsn}%cvfw%Q(}h`Dgtb
z0_J^niUmoCM5$*f)6}}qi(u;cPgxfyeV<wtcQgsqG?QDyA@6XXM7siU#+0#mP~AnX
z9f=bMes~9>aaVmOsG<)5`6tzU4wyhF;k|~|x>7-2hXpVBpc5k{L4M`Wbe6Q?tr^*B
z`Y*>6*&R#~%JlBIitlZ^qGe3s21~h3U|&k%%jeMM;6!~UH|+0+<5V-_zDqZQN7<fD
zM2vP&&BMr(%$M51tLpycNES^{gnGn-o~t&>9?n?!Aj!Nj`YMO9?j>uqI9-Tex+nJD
z%e0#Yca6(zqGUR|KITa?9x-#C0!JKJHO(+fy@1!B$%ZwJwncQW7vGYv?~!^`#L~Um
zOL++>4qmqW`0Chc0T23G8|vO)tK=Z2`gvS4*qpqhIJCEv9i&&$09VO8YOz|oZ+ubd
zNXVdLc&p=KsSgtmIPLN69P7xYkYQ1vJ?u1g)T!6Ru`k2wkdj*wDC)VryGu2=yb0?F
z>q~~e>KZ0d<sP$M^)hrN7IC)eGuv*?pAk#*4fxII<8rIx545@9E}-};{IJdo*}!V1
zkUgWQp<TD%7(QQhWkf*vd;SiT1P@}N?jaoKEV?lzqfa1pG1Y^}ikjNMM*Kb?m5(n&
zOz8{+G2z7JatI<J95R%#%#ATAzlwPl$?6)w6WH~ku?(FhO)k1eRlF4I5UqR?T`Iy=
z_bVtkxqs3lQGny-BS%nkzwrXhI_M|P4l_VNVoMjVRoZ*0(JkMQ#AdJLFBj%$oTBx9
z_5|g_ll0@cfLf<j;&lJ>_#7f3UgV%9MY1}vMgF{B8yfE{HL*pMyhYF)WDZ^^3vS8F
zGlOhs%g_~pS3=WQ#494@jAXwOtr^Y|TnQ5zki>qRG)(oPY*f}U_=ip_{qB0!%w7~G
zWE!P4p3khyW-JJnE>eECuYfI?^d366Shq!Wm#x&jA<tFBO~aWRutYg|6S!-V%dvXb
zjpm3-7^fYCzbWmx*ts$8ECu=f{D#|=T{2_Q?C-SVQTSi8ey{G^D$8U&*bY{vQ$kGG
zq$8)>o>=HdCllE$>DPO0N;y#4G)D2y#B@5=N=+F%Xo2n{gKcPcK2!hP*^WSXl+ut;
zyLvVoY>VL{H%Kd9^i~lsb8j4>$EllrparEOJNT?Ym>vJa$(P^tOG)5aVb_5w^*&M0
zYOJ`I`}<NkH4X@iCc57jNSqY3D>9}UoSnYg#E(&yyK(tqr^@n}qU2H2DhkK-`2He%
zgXr_4kpXoQHxAO9S`wEdmqGU4j=1JdG!OixdqB4PPP6<nq;ZS)73s_@N{54U_<mt#
zR{@UUroZJ1=lVB~3y%RbLLE=9Mh=pj4wNruVxXLk8pKH)JVr{Hbx`P1XQ>RXA}>GM
zumruUUH|ZG2$bBj)Qluj&uB=dRb)?^qomw?Z$X%#D+Q*O97eHrgVB2*mR$bFBU`*}
zIem?dM)i}raTFDn@5^caxE^XFXVhBePmH9fqcTi`TLaXiueH=@06sl}>F%}h9H_e9
z>^O?LxM1EjX}NVppaO@NNQr=AtHcH-BU{yBT_vejJ#J)l^cl69Z7$sk`82Zyw7Wxt
z=~J?hZm{f@W}|96FUJfy65Gk8?^{^yjhOahUMCNNpt5DJw}ZKH7b!bGiFY9y6OY&T
z_N)?Jj(MuLTN36ZCJ6<obtKS{VOOSzs>I5Xy7uVlrb$o*Z%=-)kPo9s?<^Yqz~!Z*
z_mP<Y8YDC3(vm~>8(unFq65XSi!$@YtieSQ!<7IEOaA9VkKI?lA`*(nURv<D`3vIl
zzk?RMHDq|}aqs!Q7n{<V(L>fKL8cX}-+~uw9|_5)uC2`ZHca<BJSyCJ7L7R3^ezpJ
zixdU%^Arizo-zh;Lga89_J>eX7L8aG6Ghleg@F9aG%X$#g6^yP5apnB>YTz&EfS{q
z9UVfSyEIczebC)qlVu5cOoMzS_jrC|)rQlAzK7sfiW0`M8mVIohazPE9Jzn*qPt%6
zZL8RELY@L09B83@Be;x5V-IHnn$}{RAT#<2JA%ttlk#^(%u}CGze|1JY5MPhbfnYG
zIw%$XfBmA-<_pKLpGKwbRF$#P;@_)ech#>vj25sv25VM$ouo)?BXdRcO{)*OwTw)G
zv43W~T6ekBMtUD%5Bm>`<n0ehww;K9t*_z=^iZoM2Gjm6Wx6QTWDzOX28g|i7p-G(
znPo(pGb2-Hja^(5g>^Ltv!w4~65N!Ut5twl!Agrzyq4O2Fi3pUMtCU~>9gt_=h-f%
z;1&OuSu?A_sJvIvQ+dZNo3?m1%b1+s&UAx?8sUHEe_sB7zkm4R%6)<@oYB_i5>3Ip
zIA+?jVdX|zL{)?TGpx+=Ta>G80}0}Ax+722$XFNJsC1gcH56{8B)*)eU#r~HrC&}`
z|EWW92&;6y;3}!L5zXa385@?-D%>dSvyK;?jqU2t_R3wvBW;$!j45uQ7tyEIQv<v(
zw)qBpyRhiKBMR9HV)v2ZJdk>a;Db}r&bR3kqNSh)Q_$MJ#Uj3Gj1F;)sO|%6z#@<+
zi{pbYsYS#u`X$Nf($OS+lhw>xgjos1OnF^$-I$u;qhJswhH~p|ab*nO>zBrtb0ndn
zxV0uh!LN`&xckTP+JW}gznSpU492)u+`f{9Yr)js`NmfYH#Wdtradc0TnKNz@Su!e
zu$9}G_=ku;%4xk}eXl>)KgpuT>_<`Ud(A^a++K&pm3LbN;gI}ku@YVrA%FJBZ5$;m
zobR8}OLtW4-i+qPPLS-(7<>M{)rhiPoi@?&vDeVq5%fmZk=mDdRV>Pb-l7pP1y6|J
z8I>sF+TypKV=_<SBxSgNFy@5`t70+_4F<*(g54PNEt&4u%OoVR^n+$TL)qKdP6c)n
z-CoP*_kXZ4vBsj8M^2Y0nDq-^4r-wgu2Y-3fmi6ooPIXTI%UdJhw@7KgR=N+Vl3NO
zcl8-&i~^e%3E1G+u&^#M&5!sI)la$uQ2y&KsaZjx^r8D68BTZd^NrAV{0u$=#SH#4
zLE2)q%<UADH&I$um|>^NwBU^>4JJq<*14GLfM2*XQzYdlqqjnE)gZsPW^E@mp&ww*
zW9i>XL=uwLVZ9pO*8K>t>vdL~Ek_NUL$?LQi5sc#1Q-f6-ywKcIT8Kw?C<o*=Aa~-
z*eA0Mgmu5-j8rTh^;={1$#X=Ck5Gk;@KK#haYa^sXr0^_^Q84%+WOl3?#Mc#{{d}B
z>(_3pbR`e|)%9S-({if|E+hR2W!&qfQ&UiF^I!|M#xhdWsen<tq75@@WHX{+T3S~F
znoMw2v{^ia4`fkd=3p<6XkL)!lsI%8iq@>v^wpKCBiuxXbnp85`{i|;BM?Ba`lqTA
zyRm=UWJl&E{8JzYDHFu>*Z10-?#A8D|5jW9Ho0*CAs0fAy~MqbwYuOq9jjt9*nuHI
zbDwKvh)5Ir$r!fS5|;?Dt>V+@F*v8=TJJF)TdnC#Mk>+tGDGCw;A~^PC`gUt*<(|i
zB{{g{`uFehu`$fm4)&k7`u{xIV)yvA(%5SxX9MS80p2EKnL<HSdiWFiAy=3UmV-rj
zc%^|o`X!t!vuYErrUzbG?ostY(qs7GE^=Z33k*P+F6r($h_?W-bHJ|GUK@Wlv9++M
zG}?Z?8{_X${_c9aOXw4qfk0vTaVRH6FMOnFD?w|zo{zKKg$8wzW&yufWk&idB=+9!
z^dTI@g=>t<HJ%Cd%{u~X`lRpMFg&X{m?Nw#T4cg*?z{+rC($M4z9RHV@8KoueD7_)
z8T@i-6RG$5%_Y`lSjj|?wSvITK5c4g0!Uq49VAn-H<9~;vn7~hBdYuDOt2$gtNuBm
zo8$Y{2lwMxZNbfb$Hm0T528Og7Jfl!35edSr>CZ>tlX>*Z6nd&6-<c}7z{sZ9V^Ux
zMNgR3$iH97>Mv$5rHD*<Fmux@1NkgiA%VmyOAwal{&*L*?*@Cl?&!jtcf3KL{{|8z
z_($$R;SoAei#gUO@=7)M7s~2aAxJ>db;&IBK3KH&M<+ArlGXDRdX1VVO4)&R$f4<g
z`M~bg9+=(|cc^a3vB10?3GZiq$o|Zromh?lE2%m!alG4CIrvmRZHZVSM>NxXI>GBh
zSv|h>5GDAI(4E`@F?En<q4iBUtn-fux#Jt=qU6#PBE4-GhP)}OK!CI;i(sJ6^VIJF
zwJMEAeGKMb_^`VbA1hFYio)roSCrLG-NL5Yqhb{sh3_zt(Zg93UP*;!m?}k&V`1AB
zNYPri&yVkXW8uO1geXM3Oj&$G%~#Jd%h;?JDKwrq;P+!t&4W1Z^1?Ikguvk#bK?Bx
z$w5M*LxgRe=jz?UiDBbfC1I3!cjeMD*ueh4W0S*z6=TAf+ZYkG$}FGti`ipjpIK>W
zS>#c&Gw6~_XL`qQG4bK`W*>hek4LX*efn6|_MY+rXkNyAuu?NxS%L7~9tD3cn7&p(
zCtfqe6sjB&Q-Vs7BP5+%;#Gk};4xtwU!KY0XXbmkUy$kR9)!~?*v)qw00!+Yg^#H>
zc#8*z6zZo>+(bud?K<*!QO<vKd$8TBt^HLIw%iB>4ehiTCK&PD4G&n)Tr9X_3r-we
z?fI+}-G~Yn93gI6F{}Dw_SC*FLZ)5(85zp4%uubtD)J)UELLkvGk4#tw&Tuss<g@J
zd3(n+h;=s-joD7pea}*kl|?T5<3W!rK}V)#HpvFL3uRc{oe_mV<z1l~^m1_TkJDu3
z;JtNs6#g&&@E09TG{#Z`zh|EKwRTiJr)s50$5?Nrhn68HAr=rV#m>a)mTD$R2&O~{
zCI3>fr-!-b@EGRI%g0L8UU%%u_<;e9439JNV;4KSxd|78v+I+8^rmM<g+mx0&Si$a
zgf1uYC03KcCN)Lz!>f3f40Jb}wEszROD?xBZu>Ll3;sUIoNxDK3|j3*sam2tC@@e$
z^!;+AK>efeBJB%ALsQ{uFui)oD<x}JL&L^@dTz{b&_?*nsS;lNnoJ@(k9d5xVq$|w
z<ejC>oq()2USi?n=6C3#eetz?wPswc={I<8x=(8lE4EIsUfyGNZ{|KYn1IR|=E==f
z(;!A5(-2y^2xRFCSPqzHAZn5RCN_bp22T(KEtjA(rFZ%>a4@STrHZflxKoqe9Z4@^
zM*scx_y73<sFS1_?6+u!sT9fvjld*kU~edMy>?Q{<Kw(x)TAd1JfBpLz7(Nk)Jsdz
zj7#eyM{0^=a(C#N_pwZ(&^&zZP@5Qw`oUBRW0i<S2ql<0tEs~>vt6?~WEl?2q*;@8
z3M*&@%l)SQmXkcUm)d@GT2#JdzhfSAP9|n#C;$E8X|pwD!r#X?0P>0ZisQ~TNqupW
z*lUY~+ikD`vQb?@SAWX#r*Y+;=_|oacL$2CL$^(mV}aKO77pg}O+-=T1oLBT5sL2i
z42Qth<Jh0Ysw=K%u7GarF`3bIM1>2+0@C`c+*D0*5!qy26sis<9a7>LN2{z%Qj49t
z=L@x`4$ALHb*3COHoT?5S_c(Hs}g!V>W^=6Q0}zaubkDn)(lTax0+!+%B}9Vqw6{H
zvL|BRM`O<@;eVi1DzM!tXtBrA20Ce@^Jz|>%X-t`vi-%WweXCh_LhI#bUg2*pcP~R
z*RuTUzBKLXO~~uMd&o$v3@d0shHfUjC6c539PE6rF&;Ufa(Rw@K1*m7?f5)t`MjH0
z)_V(cajV5Am>f!kWcI@5rE8t6$S>5M=k=aRZROH6fA^jJp~2NlR4;Q2>L$7F#RT#9
z>4@1RhWG`Khy>P2j1Yx^BBL{S`niMaxlSWV-JBU0-T9zZ%>7mR3l$~QV$({o0;jTI
ze5=cN^!Bc2bT|BcojXp~K#2cM>OTe*cM{Kg-j*CkiW)EGQot^}s;cy8_1_@JA0Whq
zlrNr+R;Efa+`6N)s5rH*|E)nYZ3uqkk2C(E7@A|3YI`ozP~9Lexx#*1(r8luq+YPk
z{J}c$<WQa$CfVIhsE>s`<i2`cEPYHzF!ZIy?L$}MhAPFqQe@_8Lh#cQAH~-zZ5p$u
zZauEKr<oluR2T6z2A|B^#roi2jr3F<X4&!ZjiXo?9nIbJ4iAii=A_@&#n$TqH^#R&
z{$qMQO7u^&7KEB6l{H~A;ylPsJw2kA4#E2@7dO%lsi+3{VJ4?~e4(Bz-tw&^YR9P1
zTlpCH(W_%+@#|?%RN0HM=U?pU5$E2f<RPK1fw%3KLs--hd|lj})1h|Y<6CA3NsuSI
zl=<<g*vcJW=6yZY`aXe5QUB~awgg5fxlu%7u#A8=UXt61U-7wGtR{L&XvKbUf-}PL
z<eXA6<<r^;=`XwtFN1~2J^$Y${#Q0Tyev?j!*Z4q^mjQ4ah)uW_s=JkrRS%l*Ut`>
zPM35Fx(YWB3Z5IYnN+L_4|jaR(5iWJi2~l&xy}aU7kW?o-V*6Av2wyZTG!E2KSW2*
zGRLQkQU;Oz##ie-Z4fI)WSRxn$(ZcD;TL+;^r=a4(G~H3ZhK$lSXZj?cvyY8%d9JM
zzc3#pD^W_QnWy#rx#;<pgDoauRid_B6w$J6XKKeAcZHU9rH9=s!y`%~e@hGc<c#A7
zRRTR`&dt`*;~VYcVGk-~aNB!?q#4B&%52?dI@=%LQ>c&N@sqHhrnHRmj<I9Tx4aSD
zVUQ}9lh=Kd&QIx0uCqYm3pFs_*L;b|$xyZks(AAwgYsH85PAL~ndH7DNUoZKBHCWu
z_<;@&ed^tpoO=DG4Hem|2>#i;s%zLm6SE(n&BWpd&f7>XnjV}OlZntI70fq%8~9<7
zMYaw`E-rp49-oC1N_uZTo)Cu%RR2QWdHpzQIcNsoDp`3xfP+`gI?tVQZ4X={qU?(n
zV>0ASES^Xuc;9JBji{)RnFL(Lez;8XbB1uWaMp@p?7xhXk6V#!6B@aP4Rz7-K%a>i
z?fvf}va_DGUXlI#4--`A3qK7J?-HwnG7O~H2;zR~RLW)_^#La!=}+>KW#anZ{|^D3
B7G?kd

diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings.png b/doc/arkode/examples/source/_themes/bootstrap/static/img/glyphicons-halflings.png
deleted file mode 100644
index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12799
zcma*OWmH^Ivn@*S;K3nSf_t!#;0f+&pm7Po8`nk}2q8f5;M%x$<L>SdAkd9FAvlc$
zx660V9e3Ox@4WZ^?7jZ%QFGU-T~%||Ug4iK6bbQY@zBuF2$hxOw9wF=A)nUSxR_5@
zEX>HBryGrjyuOFFv$Y4<+|3H@gQfEqD<)+}a~mryD|1U9*I_FOG&F%+Ww{SJ-V2BR
zjt<81Ek$}Yb*95D4RS0HCps|uLyovt;P05hchQb-u2bzLtmog&f2}1VlNhxXV);S9
zM2buBg~!q9PtF)&KGRgf3#z7B(hm5WlNClaCWFs!-P!4-u*u5+=+D|ZE9e`KvhTHT
zJBnLwGM%!u&vlE%1ytJ=!xt~y_YkFLQb6bS!E+s8l7PiPGSt9xrmg?LV&&SL?J~cI
zS(e9TF1?SGyh+M_p@o1dyWu7o7_6p;N6hO!;4~<t3w3SV570<|$VWNPP~TbX3|=X>
z2B`I;y`;$ZdtBpvK5%oQ^p4eR2L)BH>B$FQeC*t)c`L71gXHPUa|vyu`Bnz)H$Z<N
z7UVAHFsR+HLO+(tK~=M@pM7ZMPj5gkz>cXGve(}XvR!+*8a>BLV;+ryG1kt0=)ytl
zNJxFUN{V7P?#|Cp85QTa@(*Q3%K-R(Pkv1N8YU*(d(Y}9?PQ(j<e|z%-Bnrh*J1R%
z%JAF*cdp#Zk#h09fv12$TuGUsX=V-wgNcEGe0hhp%mK8EVPi6@!a;xi$k!wcIO|bJ
zPx8DZ*0Y(ggKhnp2=Ax#f<wKp{=pA29>;NzWoEVWRD-~H$=f>j<LsfOZ;WLF*F0cm
z9PSRSlSFQE>9~PN^BM2okI(gY-&_&BCV6RP&I$FnSEM3d=0fCxbxA6~l>54-upTrw
zYgX@%m>jsSGi`0cQt6b8cX~+02IghVlNblR7eI;0ps}mpWUcxty1yG56C5rh%ep(X
z?)#2d?C<4t-KLc*EAn>>M8%HvC1TyBSoPNg(4id~H8JwO#I)Bf;N*y6ai6K9_bA`4
z_g9(-R;qyH&6I$`b<fg~;S@}+8_8-ItZ!TS<!|pei*+CWiVH?M1CEFM{ij_eP4dL+
zsn%eDn^Kp7vLEn|Dq0`Wt&GpZ?eq^%pqXVR^PA!ZyoGLI7ihDaWiNi$M6h)PNwvHR
zEcA82H5fM6RnpZ!R872>42v|0V3Z8IXN*p*8g$gE98+JpXNY+jXxU0zsR^W$#V=KP
z3AEFp@OL}WqwOfsV<)A^UTF4&HF1vQecz?LWE@p^Z2){=KEC_3Iopx_eS42>DeiDG
zWMXGbYfG~W7C8s@@m<_?#Gqk;!&)_Key@^0xJxrJahv{B&{^!>TV7TEDZlP|$=ZCz
zmX=ZWtt4QZK<Y>x**)lQQoW8y-XLiOQy#T`2t}p6l*S`68ojyH@UXJ-b~@tN`WpjF
z%7%Yzv807gsO!v=!(2uR)16!&U5~VPrPHtGzUU?2w(b1Xchq}(5<TwC<%h0ow%K}h
zTlz}37c^dc?7rEmt7Zy9#q|V+5bE1c06?X{e~%TDZ!@uG_uU!n6VJy=odWKS?p#j?
zn;v){i#`+1X;Ls^(9p!?42vli(fu1D-%nf?-3VKCs1JT^-;{Pg82EGZ&|T}A#wtP(
zR^df|3P4JZ0|weuCV=JopL6MLvYycbd;-Xx_r)Hm1~(2>Ed^G|SD7IG+kvgyVksU)
z(0R)SW1V(>&q2nM%Z!C9=;pTg!(8pPSc%H01urXmQI6Gi^dkYCYfu6b4^tW))b^U+
z$2K&iOgN_OU7n#GC2jgiXU{caO5hZt0(>k+c^(r><#m|#J^s?zA6pi;^#*rp&;aqL
zRcZi0Q4HhVX3$ybclxo4FFJW*`IV`)Bj_L3rQe?5{wLJh168Ve1jZv+f1D}f0S$N=
zm4i|9cEWz&C9~ZI3q*gwWH^<6sBWuphgy@S3Qy?MJiL>gwd|E<2h9-$3;gT9V~S6r
z)cAcmE0KXOwDA5eJ02-75d~f?3;n7a9d_xPBJaO;Z)#@s7gk5$Qn(Fc^w@9c5W0zY
z59is0?Mt^@Rolcn{4%)Ioat(kxQH6}hIykSA)zht=9F_W*D#<}N(k&&;k;&gKkWIL
z0Of*sP=X(Uyu$Pw;?F@?j{}=>{aSHFcii#78FC^6JGrg-)!)MV4AKz>pXnhVgTgx8
z1&5Y=>|8RGA6++FrSy=__k_imx|z-EI@foKi>tK0Hq2LetjUotCgk2QFXaej!BWYL
zJc{fv(&qA7UUJ|AXL<Te#svgLe$GRVt~C0`%AZ+-=S0D^On=i42k@^tJ-LZGdLpRi
zdrV5?>c5z*_NW#yWzKtl(c8mEW{A>5Hj^gfZ^HC9lQNQ?RowXjmuCj4!!54Us1=hY
z0{@-phvC}yls!PmA~_z>Y&n&IW9FQcj}9(OLO-t^NN$c0o}YksCUWt|DV(MJB%%Sr
zdf}8!9ylU2TW!=T{?)g-ojAMKc>3pW;KiZ7f0;&g)k}K^#HBhE5ot)%oxq$*$W@b#
zg4p<<e2}@}ZtI091*fR6EHmhc2JFT&S+9NWaDJ!A80$GFF7R`A%xl6?3MWwFH)kiY
zKkO7P(Y}AIYl!b@wU{Hfoy`qG`h+F#SJJ{&-s<{+@b9bRRm+2<>Ou`ME|Kd1WHK@8
zzLD+0(NHWa`B{em3Ye?@aVsEi>y#0XVZfaFuq#;X5C3{*ikRx7UY4FF{ZtNHNO?A_
z#Q?hwRv~D8fPEc%B5E-ZMI&TAmikl||EERumQCRh7p;)>fdZMxvKq;ky0}7IjhJph
zW*uuu*<F&)uV|73Nr>(Y6)S;Od--8uR^R#sb$cmFCnPcj9PPCWhPN;n`i1Q#Qn>ii
z{WR|0>8F`vf&#E(c2NsoH=I7Cd-FV|%(7a`i}gZw4N~QFFG2WtS^H%@c?%9UZ+kez
z;PwGgg_r6V>Kn5n(nZ40P4qMyrCP3bDkJp@hp6&X3>gzC>=f@Hsen<%I~7W+x@}b>
z0}Et*vx_50-q@PIV=(3&Tbm}}QRo*FP2@)A#XX-8jYspIhah`9ukPBr)$8>Tmtg&R
z?JBoH17?+1@Y@r>anoKPQ}F8o9?vhcG79Cjv^V6ct709VOQwg{c0Q#rBSsSmK3Q;O
zBpNihl3S0_IGVE)^`#94#j~$;<ISbQ+zLM8Q_sWpD4<&Sicl|!a~&A@PH`UFRr4^t
zSjAA>7+u870yWiV$@={|GrBmuz4b)*bCOPkaN0{6$MvazOEBxFdKZDlbVvv{8_*kJ
zfE6C`4&Kkz<5u%dEdStd85-5UHG5IOWbo8i9azgg#zw-(P1AA049hddAB*UdG3Vn0
zX`OgM+EM|<+KhJ<=k?z~WA5waVj?T9eBdfJGebVifBKS1u<$#vl^<Wg*!!OoyJ@GG
z%+_%2Ex-A(=Z(Bs6q~agBwBL+Pcns5yTYUCI_zEv3JOnOB;7f=h8xGf|IQl+Qw37#
z{BhR?wjaFo)FpPNNRkn616I`fE=rl+<Vv=sXw)oTB*nsxZd}^hq|lwuLq2tPYK9Ch
zP~rW|kx{-S+q;ojdznAWu9)x>BvSg)xsnT5Aw_ZY#}v*LXO#htB>f}x3qDdDHoFeb
zAq7;0CW;XJ`d&G*9V)@H&739DpfWYzdQt+Kx_E1K#Cg1EMtFa8eQRk_JuUdHD*2;W
zR~XFnl!L2A?48O;_iqCVr1oxEXvOIiN_9CUVTZs3C~P+11}ebyTRLACiJuMIG#`xP
zKlC|E(S@QvN+%pBc6vPiQS8KgQAUh75C0<L{Rx=;M-*LCs2Bp<jfOoZepIeH1&E9@
zECcRp6~TSaxo9}VYr%Om){SqtW<MPRfw2-K1_c9&KORpSyh3Z*9=_y`d-Pn0_zAw+
z=kYI%Xg`=LN{&qw<HTtk2MKE0r;WoX$l}>a2xcPQDD$}*bM&z~g8+=9ltmkT$;c;s
z5_=8%i0H^fEAOQbHXf0;?D<BP;<HVQI1JZt*v)6RAq&gagO^!F$spXEh)>N5z-5+1
zDxj50yYkz4ox9p$HbZ|H?8ukAbLE^P$@h}L%i6QVcY>)i!w=hkv2zvrduut%!8>6b
zcus3bh1w~L804EZ*s96?GB&<V5y;va8bgv&LhJ<YYLxjoJ6PJ;r2T$n2GZZ+&blBq
zN@;fP%v^kz^?uH{Kpq(Ih{eCW5OnE5%HakzY6sMl!wfw!(lBl{oyDuNM|bEKU#YtR
zTTK?n-{?&5Szx)y^~WKl(fG>F7c5?m?|t$-tp2rKMy>F*=4;w*jW}^;8v`st&8)c;
z2Ct2{)?S(Z;@_mjAEjb8x=qAQvx=}S6l9?~H?PmP`-xu;ME*B8sm|!h@BX4>u(xg_
zIHmQzp4Tgf*J}Y=8STR5_s)GKcmgV!<zLBv<JCu*R*$7_b_L{9GvwPbpvkT@1&MS$
zijYfuLM?Pa-BA2}iX9A(2K)AF@cP6QkvvCLyswdDf?LI~tZ|qKPtWR#^oamFBRcUk
zs5b$Sc+=%VrL*7Ba(pp>$JKTg@LO402{{Wrg>#D4-L%vjmtJ4r?p&$F!o-BOf7ej~
z6)BuK^^g1b#(E>$s`t3i13{6-mmSp7{;QkeG5v}GAN&lM2lQT$@(aQCcFP(%UyZbF
z#$HLTqGT^@F#A29b0HqiJ<ZOKS1P#S0IU6AksffR*wx4ca5r>sRJAlh8kngU`BDI6
zJUE~&!cQ*&f95Ot$#mxU5+*^$qg_DWNdfu+1irglB7yDglzH()2!@#rpu)^3S8weW
z_FE$=j^GTY*|5SH95O8o8W9FluYwB=2PwtbW|JG6kcV^dMVmX(wG+Otj;E$%gfu^K
z!t~<3??8=()WQSycsBKy24>NjRtuZ>zxJIED;YXaU<x|u=Vd7uuZ|>z$@0z4rl+TW
zWxmvM$%4jYIpO>j5k1t1&}1VKM~s!<EQ6q8U;EP6<gFYZ!m%POxUBC$P89e*7OnrM
zdWQA)CjX#LYDI-i*mnQZr;sN<6@SPOXNM}9Rp_hcE;y>eLsCVQ`TTjn3JRXZD~>GM
z$-IT~(Y)flNqDkC%DfbxaV9?QuWCV&-U1yzrV@0jRhE;)ZO0=r-{s@W?HOFbRHDDV
zq;eLo+wOW;nI|#mNf(J?RImB9{YSO2Y`9825Lz#u4(nk3)RGv3X8B(A$TsontJ8L!
z9JP^eWxtKC?G8^xAZa1HECx*rp35s!^%;&@Jyk)NexVc)@U4$^<D$wmm?XpH-Sg4*
z8B^w;<H>X1Dag6`WKs|(HhZ#rzO2KEw3xh~-0<;|zcs0L>OcO#YYX{S<TTw)*(lZC
zIx888OkDY0a@=pFP3fhTGE0#kua@EqJ8hp4VSNt-Xfx&Iq8mr)#UbJIBdW*?_9fdi
z7f!0)Iy{xeM7LDi+*QJ?BdGeD5e0(0aSm&GvjQ!V6CD0we*R)~MbsZ|>N8m6`9pp+
zQG@q$I)T?aoe#AoR@%om_#z=c@ych!bj~lV13Qi-xg$i$hXEAB#l=t7QWENGbma4L
zbBf*X*4oNYZUd_;1{Ln_ZeAwQv4z?n9$eoxJeI?lU9^!AB2Y~AwOSq67dT9ADZ)s@
zCRYS7W$Zpkdx$3T>7$I%3EI2ik~m!f7&$Djpt6kZqDWZJ-G{*_eXs*B8$1R4+I}Kf
zqniwCI64r;>h2Lu{0c(#Atn)%E8&)=0S4BMhq9$`vu|Ct;^ur~gL`bD>J@l)P$q_A
zO7b3HGOUG`vgH{}&&Agr<FnKy|IF(G1iR*`GW247VX<aAlJ2F?Q<={Aib+`}_HyE*
zujP5~Z9@I2PBhiOY}cNA6jXAuIimavj#$XIs@HezE!U24{*GtAdHFvr(O>Fy%K^>?
z>wf**coZ2vdSDcNYSm~dZ(vk6&m6bVKmVgrx-X<>{QzA!)2*L+HLTQz$e8UcB&Djq
zl)-%s$ZtUN-R!4ZiG=L0#_P=BbUyH+YPmFl_ogkkQ$=s@T1v}rNnZ^eMaqJ|quc+6
z*ygceDOrldsL30w`H;rNu+I<VKUrjL=bDy~WtS;;K#ThRGVRMNFq&Gco*pd+ChOJI
zqAbbk-&kSt%3!MCpue~I%|gblH{=P#-)jqQC%xCp|J^jUO>jlS+G~p&0SawXCA1+D
zC%cZtjUkLNq%FadtHE?O(yQTP486A{1x<{krq#rpauNQaeyhM3*i0%tBpQHQo-u)x
z{0{&KS`>}vf2_}b160XZO2$b)cyrHq7ZSeiSbRvaxnKUH{Q`-P(nL&^fcF2){vhN-
zbX&WEjP7?b4A%0y6n_=m%l00uZ+}mCYO(!x?j$+O$*TqoD_Q5EoyDJ?w?^UIa491H
zE}87(bR`X;@u#3Qy~9wWdWQIg1`cXrk$x9=ccR|RY1~%{fAJ@uq@J3e872x0v$hmv
ze_KcL(wM|n0EOp;t{hKoohYyDmYO;!`7^Lx;0k=PWPGZpI>V5qYlzjSL_(%|mud50
z7#{p97s`U|Sn$WYF>-i{i4`kzlrV6a<}=72q2sAT7Zh{>P%*6B;Zl;~0xWymt10Mo
zl5{bmR(wJefJpNGK=fSRP|mpCI-)Nf6?Pv==FcFmpSwF1%CTOucV{yqxSyx4Zws3O
z8hr5Uyd%ezIO7?PnEO0T%af#KOiXD$e?V&OX-B|ZX-YsgSs%sv-6U+sLPuz{D4bq|
zpd&|o5tNCmpT>(uIbRf?8c}d3IpOb3sn6>_dr*26R#ev<_~vi)wleW$P<Wyn_7n0-
zl)LIgF0z;$xTz(0JgW0t|K0{|pl+d7{+{fAW)lB*Qg({z1~qrplnmDSP!2>X|5)$_
z+_|=pi(0D(AB_sjQ;sQQSM&AWqzDO1@NHw;C9cPdXRKRI#@nUW)CgFxzQ1nyd!+h&
zcjU!U=&u|>@}R(9D$%lu2TlV>@I2-n@fCr5Pr<dtPlfA<Z*`%$WS?W!M7-X@Sw}lf
zu7sLkI`BK6gTBwv0nqdk^SqiGBO}U16-Ky}DlzfpVxxnEAc|MG(;#A7b;H&MP*riE
zHr?l)sap(Q`P6U_@Ov18QJwI7yr|=6Y+TbD2PUEPfsh&V{s?8AA2dT>ZNVyKWR7hm
zWjoy^<!R*J%IXEk=E5cj6b=;i9u3uQuMH4{qOT^=OGnt_=n2>p7v8m#$qN0K#8jT-
zq`mSirDZDa1Jxm;Rg3<Jf$!Bj9`<kE;Sz+T_M)m3-f__2l^&CsYnIwV?+%t2FG{Ta
zI-67-X7Fu-xbrdN@cn6z3_k9VZ?2i{<ie%nx)UUiUTLNtHEK)0HD_qUYpV0X30}z?
zM!*@omRu>rAPhC)LcI4@-RvKT+@9&KsR3b0_0zuM!Fg7u>oF>3bzOxZPU&$ab$Z9@
zY)f7<va9`_LvY6!5H@PMYi?(=yM97@*rbrsB=oh`t5ydnN2A;15DysI3n?zsE3{ZX
zq+yK*u5H1rVq8mwv!|dvE&PWazz!0^LY7dozu5qaS3Q5~q}uAQUJN5WW+A&wvpho?
z=!z1Q9;>pKh22I7ZykL{YsdjcqeN++=0a}elQM-4;Q)(`Ep3|VFHqnXOh14`!Bus&
z9w%*EWK6AiAM{s$6~SEQS;A>ey$#`7)khZvamem{P?>k)5&7Sl&&NXKk}o!%vd;-!
zpo2p-_h^b$D<fdz<@`H3n|HeSVR76K@6|_9&-VHAVO=;`v1rN8I|9P)PS7vp83efu
z`yTr9OVLz|?h*IHce7sdT@Ktb#!>NBO>{h4JdGB=D>fvGIYN8v&XsfxU~VaefL?q}
z3ekM?<wNDtI4J<DC6XBgM26Nv#0iut=ZwA#^>iOKkCzQHkBkhg=hD!@&(L}FcHKoa
zbZ7)H1C|lHjwEb@tu=n^OvdHOo7o+W`0-y3KdP#bb~wM=Vr_gyoEq|#B?$&d$tals
ziIs-&7isBpvS|CjC|7C&3I0SE?~`a%g~$PI%;au^cUp@ER3?mn-|vyu!$7MV6(uvt
z+CcGuM(Ku2&G0tcRCo7#D$Dirfqef2qPOE5I)oCGzmR5G!o#Q~(k~)c=LpIfrhHQk
zeAva6MilEifE7rgP1M7AyWmLOXK}i8?=z<j)TsCg#MI>2;N=no)`IGm#y%aGE>-FN
zyXCp0Sln{IsfOBuCdE*#@CQof%jzuU*jkR*Su3?5t}F(#g0BD0Zzu|1MDes8U7f9;
z$JBg|mqTXt`muZ8=Z`3wx$uizZG_7>GI7tcfOHW`C2bKxNOR)XAwRkLOaHS4xwlH4
zDpU29#6wLXI;H?0Se`SRa&I_QmI{zo7p%uveBZ0KZKd9H6@U?YGArbfm)D*^5=&Rp
z`k{35?Z5GbZnv>z@NmJ%+sx=1WanWg)8r}C_>EGR8mk(NR$pW<-l8OTU^_u3M@gwS
z7}GGa1)`z5G|DZirw;FB@VhH7Dq*0qc=|9lLe{w2#`g+_nt<uBB~iQoK%j+BR{KW$
zxUoEE;u<56rl_>>_%o<~9(VZe=zI*SSz4w43-_o>4E4`M@NPKTWZuQJs)?KXbWp1M
zimd5F;?AP(LWcaI-^Sl{`~>tmxsQB9Y$Xi*{Zr#py_+I$vx7@NY`S?HFfS!hUiz$a
z{>!&e1(16T!Om)m)&k1W#*d#GslD^4!TwiF2WjFBvi=Ms!ADT)ArEW6zfVuIXcXVk
z>AHjPADW+mJzY`_Ieq(s?jbk4iD2Rb8*V3t6?I+E06(K8H!!xnDzO%GB;Z$N-{M|B
zeT`jo%9)s%op*XZKDd6*)-^lWO{#RaIGFdBH+;XXjI(8RxpBc~azG1H^2v7c^bkFE
zZ<!d@6;Xr=zrz^$h_Zbcf~Z$lrrBw0nL?BbB`hkkx&01qcs_@(`dj5M$3rI2JKgsr
zS^x~?G~LTF&PL>CVPE+E*Q=FSe8Vm&6|^3ki{9~qafiMAf7i4APZg>b%&5>nT@pHH
z%O*pOv(77<h_P}M1fVl@bA%;8!%G$2v2^1K;a|J|258iaFK<JsY+PvseEryJp$5<!
z9lXGNp5qrv`T=s~_@3Ry-B6o<m;T-lQtjLZ)m`X2mKrN#6`?5SI5G#qCc`>?ZiT{W
zBibx}Q12tRc7Py1NcZTp`Q4ey%T_nj@<r4RLoFiQ1cOG!U!@-f&DrHzjFreg6r@E|
zvE{2Q=kFJS$gwo*FVtl=epg~LzgZ(&E7V*y3ct|~AGvI-3JcYr{%DF#=;?cH6~ge-
zxOld^6>1WKg5Fz_Rjl4wlJQj)rtp8yL3r!S<K<bid;Q+mY&EMZN}!KaieT~EVI>hy
zvZvnmh!tH4T6Js-?vI0<-rzzl{mgT*S0d_7^AU_8gBg^03o-J=p(1o6kww2hx|!%T
z-jqp}m^G*W?$!R#M%Ef?&2jYxmx+lXWZszpI4d$p<r;|3!?@3AW<2Zgi0<hN9ff)N
z(zo6I+-$9Bx*(c$-bk0EGqBsb91nmH7yrN`CVj(QCaD{RJgvV-JPkoBQAwGD;nyzn
z*I;L?L=(3oeAQ<rjW4NvWy!bHdLOHMjezGb#Hb+lSX`#>UN`(S)|*c^CgdwY>Fa>>
zgGBJhwe8y#Xd*q0=@SLEgPF>+Qe4?%E*v{a`||luZ~&dqMBrRfJ{SDMaJ!s_;cSJp
zSqZHXIdc@@XteNySUZs^9SG7xK`8=NBN<V=E)OCgg+S0s%X@m8dOqs;y*2U#C_D)u
z81;Mt5p^uC3PVJP@9PH9!<3b5IE^n;kwm}NvP7!(7^P%;1DOYVJumd1Eg9zSvb@M<
z=8_n~reVNX{Rwy18un@y&;emesWi1XQooSmDu!<kFo)-HRP5pn?;0r-+4i~5mY$28
z(;>M)fRVOjw)D^)w%L2OPkTQ$Tel-J)GD3=YXy+F4in(ILy*A3m@3o73uv?JC}Q>f
zr<Ie&tGbM^0N<roTuDj*?S_O(I}B&He=e8Pl8`tjGg-O~5%TUI<1yQ05r*$Oc2#s#
z8%FWrdDtn79-cwa2pX4M_-JFx9zK7mChDM?zK(~_K9>Y&8SWmesiba0|3X-jmlMT3
z*ST|_U@O=i*sM_*48G)dgXqlwoFp5G6qSM3&%_f_*<qxyINw1$We6It<0I>n!P<uj
z?87vdPOI3mk{cGX^R<>iT>?cNI)fAUkA{qWnqdMi+aNK_yVQ&lx4UZknAc9FIzVk%
zo6JmFH~c{_tK!gt4+o2>)zoP{sR}!!vfRjI=13!z<fc;{t9y2@_q+%poab^!jwREr
z2+#Zf9d~36snX-iZ(5U>5}ijMFQ4a4?QIg-BE4T6!#%?d&L;`j5=a`4is>U;%@Rd~
zXC<xcC%fK=hCSNPW&)8o$8W+KO-SU#5LbV{{RyL+099LpC;6!uxU&{MmE<Y{b<h52
z$81YnCmIWu(0dlOntRk)&>~H7eGQhhYWhMPWf9znDbYIgwud(6$W3e>$W4$~d%qoJ
z+JE`1g$qJ%>b|z*xCKenmpV$0pM=Gl-Y*LT8K+P)2X#;XYEFF4mRb<YTI|Oo*wqC5
z0h9Vcyd1-aYw_k;tVodW95W2hdEX}FLSrp|R+GE56fkm-P)-t$V)|A=l7x|mefFZC
zXMAilrJt8o)%dz@>c~jj?DM@(1e`nL=F4Syv)TKIePQUz)bZ<lVCgA$*!Fmgxl6o%
zjdFR@&JKgonL5u$SS;U)hR2JO%(X!<3`;2ma}g7i__wVr1m~_yKAfNhm3c!NlBG8F
zi*)rX!5cY!j#B&Bh5F)#rbPS@4QDD~@ulB?(x|5|p4JWn*dAG|<;_kq<4J3{W|V%$
zFux+io?Ym>?Bi3@G@HO$Aps1DvDGkYF50O$_welu^cL7;vPiMGho74$;4fDqKbE{U
zd1h{;LfM#Fb|Z&uH~Rm_J)R~Vy4b;1?tW_A)Iz#S_=F|~pISaVkCnQ0&u%Yz%o#|!
zS-TSg87LUfFSs{tTuM3$!06ZzH&MFtG)X-l7>3)V?Txuj2HyG*5u;EY2_5vU0ujA?
zHXh5G%6e3y7v?AjhyX79pnRBVr}RmPmtrxoB7lkxEzChX^(vKd+sLh?SBic=Q)5nA
zdz7Mw3_iA>;T^_Kl~?1|5t%GZ;ki_+i>Q~Q1EVdKZ)$Sh3LM@ea&D~{2HOG++7*wF
zAC6jW4>fa~!Vp5+$Z{<)Qxb|<doy+ePfu6oC(7$`&WuO0q0$+a9a%yz_{5phPWBz7
zW*;>{unMgCv2)@%3j=7)Zc%U<^i|SAF88s!A^+Xs!OASYT%7;Jx?olg_6NFP1475N
z#0s<@E~FI}#LNQ{?B1;t+N$2k*`K$Hxb%#8tRQi*Z#No0J}Pl;HWb){l7{A8(pu#@
zfE<FZzTROa?{|??!(1M&=4t#qdoS<^Na+oYIxC;QnUK0am@X-v$)ut<3yca1@z&t9
zM)d{X_R6>-OTvEreoz1+p`9sUI%<waswQ*s(MUS7r-ADfL?@KW0)mbJ;|S&qT$0vX
z+3A>Y{e5L-oTP_^NkgpYhZjp&ykinnW;(fu1;ttpSsgYM8ABX4dHe_HxU+%M(D=~)
zYM}XUJ5guZ;=_ZcOsC`_{CiU$zN3$+x&5C`vX-V3`8&RjlBs^rf00MNYZW+jCd~7N
z%{jJuUUwY(M`8$`B>K&_48!Li682ZaRknMgQ3~dnlp8C?__!P2z@=Auv;T^$yrsNy
zCARmaA@^Yo2sS%2$`031-+h9K<HTVTe5)EQvp!MW(iadmCJS1wSbK_@ufo=dlOY}z
zCO9zVYKg|I&o<%8Sb*|F!S|!19op-p&g=TZ%N9@L#(UmyHRFj))9t+gQpBfbTesf-
za`2nVU~8Sd4Kd<Xb>MZsIHfB>s@}>Y(z988e!`%4=EDoAQ0kbk>+lCoK60Mx9P!~I
zlq~wf7kcm_NFImt3ZYlE(b3O1K^QWiFb$V^a2Jlwvm(!XYx<`i@ZMS3UwFt{;x+-v
zhx{m=m;4dgvkKp5{*lfSN3o^keSpp9{hlXj%=}e_7Ou{Yiw(J@NXuh*;pL6@$HsfB
zh?v+r^cp@jQ4E<vE>spC#RqpwPY(}_SS$wZ{S959`C25777&sgtNh%XTCo9VHJC-G
z;;wi9{-iv+ETiY;K9qvlEc04f;ZnUP>cUL_T*ms``EtGoP^B#Q>n2dSrbAg8a>*Lg
zd0EJ^=tdW~7fbcLFsqryFEcy*-<UjNQKPSE=_Pn2>8!?;n%;F+8i{eZyCDaiYxghr
z$8k>L|2&-!lhvuVdk!r-kpSFl`5F5d4DJr%M4-qOy3<bq6e{+%w<EWihn1$%KzFfu
z`LKHky~)zdoi4^H8U?2zL}?l1u6MD%jgB7&*;Qf>gdmQb<G$UVN?JmKSKB~L!OR=i
zI@^y#3#{3i>qF1=aBtRM<!CT741&i5jO+s2lsMXtwRPLCm;Sn!-GpQ>7)c_Ae?$b8
zQg4c8*KQ{XJmL)1c7#0Yn0#PTMEs4-IH<W7>Pjkn0!=;JdhMXqzMLeh`yOylXROP-
zl#z3+fwM9l3%VN(6R77ua*uI9%hO7l7{+Hcbr(peh;afUK?B4EC09J{-u{mv)+u#?
zdKVBCPt`eU@IzL)OXA`E<o1(5;mC6=k@-!Ol2~E}J9hOE??)KsP;2EQ2{Z(0gwv}f
z!It<n&*dKHQo4x|g+0u^h~lZ5Ov4IC#Tfq*CptilVN;HXz`iK4{1F;tZh8So5XLY*
zXxgB;G7CZ#<Iv1X4e=NIfHyT;2#ek12;Y}7qA*ja41jVbduyrB$HRMX3i4#!N49oM
z=DRz&*@5P2{)@K+w!!IcW58;P<<)I=(H60m7Iz@T{w1f<%~zS?f9pR^Y*#fpT<Noz
z19vhe>bu`Xp?u0m%h&X41}FNfnJ*g1!1wcbbpo%F4x!-#R9ft!8{5`Ho}04?FI#Kg
zL|k`tF1t_`ywdy8(wnTut>HND(qNnq%Sq=AvvZbXnLx|mJhi!*&lwG2g|edBdVgLy
zjvVTKHAx(+&P;P#2Xobo7_RttUi)Nllc}}hX>|N?-u5g7VJ-NNdwYcaOG?NK=5)}`
zMtOL;o|i0mSKm(UI_7BL_^6HnVOTkuPI6y@ZLR(H?c1cr-_ouSLp{5!bx^DiKd*Yb
z{K78Ci<l%%epWQ$#NR9uIf5|S3KV`ZTJ$&qJ6`ry!VhqBuPs(j#jC&+5r^-xzR6fB
zK27~T)ZekimVRRz-lpCAJu2yR?1~gIvHR5a1NYj$*q3Netl55}ts!oix2<m^q4oKA
zx&s$GFeBD?)7%@b7gCQPQkbzcY-#e<IqbmH&`NOUj{m_7zrJE%0%MGK`P$ftHCCyA
z#QEOkdexcb5q+aRNqFbL{IkS#hFvjjH9v~WbirfMFFJD$DOv0$f8V^PmC)h@B?4Tt
zm|Lni^t};e&92Z{h%k-#j#z#sF&$u2EIp%nX3YhhH9Z@UzRMIVYuCt&$V#l>&Twup
zTKm)ioN|wcYy%Qnwb)Izb<b#d)i{+1p{kvKer6Fm8jK>H>W!;Ah5Zdm_jRY`+VRJ2
zhkspZ9hbK3iQD91A$d!0*-1i#%x81|s+SPRmD}d~<1p6!A13(!vABP<Z{iwC7e4%~
z_Ln8-%lvcLY32-Y@1SO1*q92_(j#+rhCS=CLMntrY3Mry$(OvuZNSYRrU>2kNgqEG
z?AMgl^P+iRoIY(9@_I?n1829lGvAsRnHwS~|5vD2+Zi53j<5N4wNn0{q>>jF9*bI)
zL$kMXM-awNOElF>{?Jr^tOz1glbwaD-<Z?hQEA3Pbch{-zrz(GmD@~J*ag^+fZsaw
zY>M0OKOlTeW3C!1ZyxRbB>8JDof(O&R1bh%3x#>y2~<>OXO#IIedH0Q`(&&?eo-c~
z>*Ah#3~09unym~UC-UFqqI>{dmUD$Y4@evG#ORLI*{ZM)J<p{vwhmRDEF0r$s4y_e
z=sJVWn|ZM-lg`hKmi%p5C*Kde*o`ZFJEf1Ej+^5AxXqpoV)MlQbue7)^k_qkb+e;`
zWde0R#5(=H5cM$dK9LAsdS=Yk0oGNTPVR(|j6Ls{ih2+`6_F=VxMEkqB<u_yrMn-7
zem-jG!zg{VfBK=QGIg$ZuYze9uWx?aDxho7OdK|L{6b`Vwt6C>l=e1it!XzY($S3V
zLG!Y6fCjE>x6r@5FG1n|8ompSZaJ>9)q6jqU;XxCQk9zV(?C9<V#w?Lf%1Im<}?28
z%fv0sO4GSZ%zfKH*&?O&xk<I#mt_{KWN@l7yB^%JPt=7^LfPgcr~mEkBmfFP7Db0M
zd#E!M<3epZs@^{m3?RG}!71NRBMkEamf~hxD%`6taJAN-7_P+KIU~cqcmswNPF@u0
zBEd?J2tVMNdm+C_OO1xnDaP<CvO06_?;7EsCcbdr{cefhRUYuKyPaC&4Q})>+i*>w
z21+KYt1gXX&0`x3E)hS7I5}snbBzox9C@Xzcr|{B8Hw;SY1$}&BoYKXH^hpjW-RgJ
z-Fb}tannKCv>y~^`r|(1Q9;+sZlYf3XPSX|^gR01UFtu$B*R;$sPZdIZShRr>|b@J
z;#G{EdoY+O;REEjQ}X7_YzWL<b@Mth=4xckE^wJmIQPsUfw>O+Ey3>a_KDe1CjSe|
z6arqcEZ)CX!8r(si`dqbF$uu&pnf^Np{1f*TdJ<q2__L6D@tfPK*~rzVm(OhYZi{~
zO7D1Cy0z3WdT1AOu^h7D1_(%nFOYSW(8K@CEF1cpVqIf7{ZixjH(=6Z%>`r2;@SaZ
z#hb4xlaCA@Pwqj#LlUEe5L{I$k(Zj$d3(~)u(F%&xb8={N9hKxlZIO1ABsM{Mt|)2
zJ^t9Id;?%4PfR4&Ph9B9cFK~@tG3wlFW-0<w~5R`uK#F{bA6_apO|PKuT2G1V=wh!
zZWPJWbbu)nGiWn?;_;mE<K|T11{jR4I#*v{H=AUuEc3+UXA@7uIuDpTy`jcYhUz%o
zBA}z0OR6}0Iqx8Rc?*~((>fXZS_L4U*EiAA%+`h%q2^6BCC;t0iO<j7`ENmUd8a;m
zq?b}^r<Irhn?t82<3YNwQO;C@tCYRR<pR}s5&giTT+nc?H}mtH3ZX|EFpV#H_g4in
z8Tbrg7JdfQvFh#<ovHft;`1YsxU2!leoc~Y)qNFc1mAL8P2+9584$1X7q1nBToy)y
z$s4}XIl~zQ7=m5m-cT@n8wijJJ$|#uxO(nL+IWs9qk?i9%s#W2ZxqfW`jt6{wIS^q
z*iUq6jHCeqca?Re1w*!C)k-nH(eV#(PnPU`?~ov%Y+nj9)j3~WBrKHnC<W0QlTNC*
z<u_q0O?_PoEKdE%)ty@V5F=^-=y+E`(D|T`;&Jjf?_7CST84~oRyM!RwLEZ{ZM@iY
zIB{U~Ge+IK^?H|Bpj8js3(0P2EU%fWNhAH!9B5rA(2TXL071s~i2t!VlQfp=S*6A2
zkt-CN_z|1uc9QB1_^Gpz5);n_@pEbj*T#DvuqJuuKb_PutQhcu6?7{m7g7o;mzZA9
zf{W$DK$@&k565^Y7M*vmK#vF0i(Zb4TM%~5g7C?du<oAbjjU>4V=s4Qug{M|iDV@s
zC7|ef-dxiR7T&Mpre!%hiUhHM%3Qxi$Lzw6&(Tvlx9QA_7LhYq<(o~=Y>3ka-zrQa
zhGpfFK@)#)rtfz61w35^sN1=IFw&Oc!Nah+8@qhJ0UEGr;JplaxOGI82OVqZHsqfX
ze1}r{jy;G?&}Da}a7>S<aX|!tNbjGLu?E#M_FQ+tx7QwU!f|T#|0pGw8beze%W}X8
zTh%o9Dbrk*KF8LN?^<3buL7%?KbkRMr_jMII=xY`U$vl5f0r@#H-|^ToExGU<wfLd
zXr+GANZ(jz6qI7<1HwuGyQ7H^naJ1E$XxZfl>CDsFDuzusee<BvkaOnN;I1*%q9kj
z^#m2ll1tq&oMv5g`}?0u!-DOva7&B0@Z!bH=K`f(k?GfNkG{%)>CKof|Dz2BPsP8?
zY;a)Tkr2P~0^2BeO?wnzF_<l4Nvqf<W`7QjWtJDSw)B?FOMa{8DG?kxHAQnVhPF5z
zxnU_-^up4Prel^ed-PkB1+y((Pnm`A;p#0KHiAU@r9|EKB!f~*!CI?=fpguhu1lxJ
zNfwd#_vJ<v;}^GGOcxE|6OXh~-#_DXMEuzGXcF>Ul-ekY=-w26VnU%U3f19Z-pj&2
z4J_a|o4Dci+MO)mPQIM>kdPG1<w<ic`+WErB>xydiR9@#<n}&^Z@zb@F^w%zU4>8m
zh27D7GF{p|a{8({Q-Pr-;#jV{2zHR><r}G)UYxpAdB=!PS*(C~*1H#i#3#T1$j2)t
z81k%ZC~^7K<oMng7XOD4<}b)aGe_1j<vxx~;=~OWNZThvqsq&|9D#PlGC$L88fM!1
ziqq3RXQ^4C*>lGoFtIfIpoMo?exuQyX_A;;l0AP4!)JEM$EwMInZkj+8*IHP4vKRd
zKx_l-i*>A*C@{u%ct`y~s6MWAfO{@FPIX&sg8H{GMDc{4M3%$@c8&RAlw0-R<4DO3
trJqdc$mBpWeznn?E0M$F`|3v=`3%T2A17h;rxP7$%JLd=6(2u;`(N3pt&so#

diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/jquery.js b/doc/arkode/examples/source/_themes/bootstrap/static/jquery.js
deleted file mode 100644
index f65cf1dc45..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/jquery.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.2 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call(" ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":(a+"").replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")||(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&p.expr.match.needsContext.test(f),namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=k.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<q;d++)l=o[d],m=l.selector,h[m]===b&&(h[m]=l.needsContext?p(m,this).index(f)>=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){i=u[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){l=i.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,g=((p.event.special[l.origType]||{}).handle||l.handler).apply(i.elem,r),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length===1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h<i;h++)if(f=a[h])if(!c||c(f,d,e))g.push(f),j&&b.push(h);return g}function bl(a,b,c,d,e,f){return d&&!d[o]&&(d=bl(d)),e&&!e[o]&&(e=bl(e,f)),z(function(f,g,h,i){if(f&&e)return;var j,k,l,m=[],n=[],o=g.length,p=f||bo(b||"*",h.nodeType?[h]:h,[],f),q=a&&(f||!b)?bk(p,m,a,h,i):p,r=c?e||(f?a:o||d)?[]:g:q;c&&c(q,r,h,i);if(d){l=bk(r,n),d(l,[],h,i),j=l.length;while(j--)if(k=l[j])r[n[j]]=!(q[n[j]]=k)}if(f){j=a&&r.length;while(j--)if(k=r[j])f[m[j]]=!(g[m[j]]=k)}else r=bk(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):w.apply(g,r)})}function bm(a){var b,c,d,f=a.length,g=e.relative[a[0].type],h=g||e.relative[" "],i=g?1:0,j=bi(function(a){return a===b},h,!0),k=bi(function(a){return y.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i<f;i++)if(c=e.relative[a[i].type])m=[bi(bj(m),c)];else{c=e.filter[a[i].type].apply(null,a[i].matches);if(c[o]){d=++i;for(;d<f;d++)if(e.relative[a[d].type])break;return bl(i>1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i<d&&bm(a.slice(i,d)),d<f&&bm(a=a.slice(d)),d<f&&a.join(""))}m.push(c)}return bj(m)}function bn(a,b){var d=b.length>0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)bc(a,b[e],c,d);return c}function bp(a,b,c,d,f){var g,h,j,k,l,m=bh(a),n=m.length;if(!d&&m.length===1){h=m[0]=m[0].slice(0);if(h.length>2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;b<c;b++)if(this[b]===a)return b;return-1},z=function(a,b){return a[o]=b==null||b,a},A=function(){var a={},b=[];return z(function(c,d){return b.push(c)>e.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d<b;d+=2)a.push(d);return a}),odd:bf(function(a,b,c){for(var d=1;d<b;d+=2)a.push(d);return a}),lt:bf(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},j=s.compareDocumentPosition?function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bg(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bg(e[j],f[j]);return j===c?bg(a,f[j],-1):bg(e[j],b,1)},[0,0].sort(j),m=!k,bc.uniqueSort=function(a){var b,c=1;k=m,a.sort(j);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},bc.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},i=bc.compile=function(a,b){var c,d=[],e=[],f=D[o][a];if(!f){b||(b=bh(a)),c=b.length;while(c--)f=bm(b[c]),f[o]?d.push(f):e.push(f);f=D(a,bn(e,d))}return f},r.querySelectorAll&&function(){var a,b=bp,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[":focus"],f=[":active",":focus"],h=s.matchesSelector||s.mozMatchesSelector||s.webkitMatchesSelector||s.oMatchesSelector||s.msMatchesSelector;X(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j={top:0,left:0},k=this[0],l=k&&k.ownerDocument;if(!l)return;return(d=l.body)===k?p.offset.bodyOffset(k):(c=l.documentElement,p.contains(c,k)?(typeof k.getBoundingClientRect!="undefined"&&(j=k.getBoundingClientRect()),e=da(l),f=c.clientTop||d.clientTop||0,g=c.clientLeft||d.clientLeft||0,h=e.pageYOffset||c.scrollTop,i=e.pageXOffset||c.scrollLeft,{top:j.top+h-f,left:j.left+i-g}):j)},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.js b/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.js
deleted file mode 100644
index c753bd6f8a..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.js
+++ /dev/null
@@ -1,2025 +0,0 @@
-/* ===================================================
- * bootstrap-transition.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
-
-      var transitionEnd = (function () {
-
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
-
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
-
-      }())
-
-      return transitionEnd && {
-        end: transitionEnd
-      }
-
-    })()
-
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-alert.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
-
-  var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
-
-  Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = $(selector)
-
-    e && e.preventDefault()
-
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
-
-    $parent.trigger(e = $.Event('close'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
-      removeElement()
-  }
-
-
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
- /* ALERT DATA-API
-  * ============== */
-
-  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
-
-}(window.jQuery);/* ============================================================
- * bootstrap-button.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
-
-  var Button = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
-  }
-
-  Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
-
-    state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
-
-    $el[val](data[state] || this.options[state])
-
-    // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d)
-    }, 0)
-  }
-
-  Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
-
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
-
-    this.$element.toggleClass('active')
-  }
-
-
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
-
-  $.fn.button = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
-      if (option == 'toggle') data.toggle()
-      else if (option) data.setState(option)
-    })
-  }
-
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
-
-  $.fn.button.Constructor = Button
-
-
- /* BUTTON DATA-API
-  * =============== */
-
-  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
-  })
-
-}(window.jQuery);/* ==========================================================
- * bootstrap-carousel.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
-
-  var Carousel = function (element, options) {
-    this.$element = $(element)
-    this.options = options
-    this.options.slide && this.slide(this.options.slide)
-    this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
-  }
-
-  Carousel.prototype = {
-
-    cycle: function (e) {
-      if (!e) this.paused = false
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
-
-  , to: function (pos) {
-      var $active = this.$element.find('.item.active')
-        , children = $active.parent().children()
-        , activePos = children.index($active)
-        , that = this
-
-      if (pos > (children.length - 1) || pos < 0) return
-
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
-
-      if (activePos == pos) {
-        return this.pause().cycle()
-      }
-
-      return this.slide(pos > activePos ? 'next' : 'prev', $(children[pos]))
-    }
-
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle()
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
-
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
-
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
-    }
-
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
-
-      this.sliding = true
-
-      isCycling && this.pause()
-
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
-
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      })
-
-      if ($next.hasClass('active')) return
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
-          $next.removeClass([type, direction].join(' ')).addClass('active')
-          $active.removeClass(['active', direction].join(' '))
-          that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
-        })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
-    }
-
-  }
-
-
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
-
-  $.fn.carousel = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
-      if (typeof option == 'number') data.to(option)
-      else if (action) data[action]()
-      else if (options.interval) data.cycle()
-    })
-  }
-
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
-
-  $.fn.carousel.Constructor = Carousel
-
-
- /* CAROUSEL DATA-API
-  * ================= */
-
-  $(document).on('click.carousel.data-api', '[data-slide]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-    $target.carousel(options)
-    e.preventDefault()
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-collapse.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
-
-  var Collapse = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
-
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
-    }
-
-    this.options.toggle && this.toggle()
-  }
-
-  Collapse.prototype = {
-
-    constructor: Collapse
-
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
-
-  , show: function () {
-      var dimension
-        , scroll
-        , actives
-        , hasData
-
-      if (this.transitioning) return
-
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
-
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
-
-      this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
-      $.support.transition && this.$element[dimension](this.$element[0][scroll])
-    }
-
-  , hide: function () {
-      var dimension
-      if (this.transitioning) return
-      dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
-      this.$element[dimension](0)
-    }
-
-  , reset: function (size) {
-      var dimension = this.dimension()
-
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || 'auto')
-        [0].offsetWidth
-
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
-
-      return this
-    }
-
-  , transition: function (method, startEvent, completeEvent) {
-      var that = this
-        , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
-            that.$element.trigger(completeEvent)
-          }
-
-      this.$element.trigger(startEvent)
-
-      if (startEvent.isDefaultPrevented()) return
-
-      this.transitioning = 1
-
-      this.$element[method]('in')
-
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
-    }
-
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
-
-  }
-
-
- /* COLLAPSIBLE PLUGIN DEFINITION
-  * ============================== */
-
-  $.fn.collapse = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
-
-  $.fn.collapse.Constructor = Collapse
-
-
- /* COLLAPSIBLE DATA-API
-  * ==================== */
-
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this = $(this), href
-      , target = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-      , option = $(target).data('collapse') ? 'toggle' : $this.data()
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
-  })
-
-}(window.jQuery);/* ============================================================
- * bootstrap-dropdown.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle=dropdown]'
-    , Dropdown = function (element) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
-
-  Dropdown.prototype = {
-
-    constructor: Dropdown
-
-  , toggle: function (e) {
-      var $this = $(this)
-        , $parent
-        , isActive
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      clearMenus()
-
-      if (!isActive) {
-        $parent.toggleClass('open')
-        $this.focus()
-      }
-
-      return false
-    }
-
-  , keydown: function (e) {
-      var $this
-        , $items
-        , $active
-        , $parent
-        , isActive
-        , index
-
-      if (!/(38|40|27)/.test(e.keyCode)) return
-
-      $this = $(this)
-
-      e.preventDefault()
-      e.stopPropagation()
-
-      if ($this.is('.disabled, :disabled')) return
-
-      $parent = getParent($this)
-
-      isActive = $parent.hasClass('open')
-
-      if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
-
-      $items = $('[role=menu] li:not(.divider) a', $parent)
-
-      if (!$items.length) return
-
-      index = $items.index($items.filter(':focus'))
-
-      if (e.keyCode == 38 && index > 0) index--                                        // up
-      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-      if (!~index) index = 0
-
-      $items
-        .eq(index)
-        .focus()
-    }
-
-  }
-
-  function clearMenus() {
-    $(toggle).each(function () {
-      getParent($(this)).removeClass('open')
-    })
-  }
-
-  function getParent($this) {
-    var selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = $(selector)
-    $parent.length || ($parent = $this.parent())
-
-    return $parent
-  }
-
-
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  $.fn.dropdown = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.dropdown.Constructor = Dropdown
-
-
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
-
-  $(document)
-    .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
-    .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
-
-}(window.jQuery);/* =========================================================
- * bootstrap-modal.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
-
-  var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
-  }
-
-  Modal.prototype = {
-
-      constructor: Modal
-
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
-
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
-
-        this.$element.trigger(e)
-
-        if (this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = true
-
-        this.escape()
-
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
-
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
-
-          that.$element
-            .show()
-
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
-
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
-
-          that.enforceFocus()
-
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
-
-        })
-      }
-
-    , hide: function (e) {
-        e && e.preventDefault()
-
-        var that = this
-
-        e = $.Event('hide')
-
-        this.$element.trigger(e)
-
-        if (!this.isShown || e.isDefaultPrevented()) return
-
-        this.isShown = false
-
-        this.escape()
-
-        $(document).off('focusin.modal')
-
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
-
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
-
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
-
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
-        }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
-
-    , hideModal: function (that) {
-        this.$element
-          .hide()
-          .trigger('hidden')
-
-        this.backdrop()
-      }
-
-    , removeBackdrop: function () {
-        this.$backdrop.remove()
-        this.$backdrop = null
-      }
-
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
-
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
-
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
-
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
-
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
-
-          this.$backdrop.addClass('in')
-
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
-
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
-
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
-            this.removeBackdrop()
-
-        } else if (callback) {
-          callback()
-        }
-      }
-  }
-
-
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.modal = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
-    })
-  }
-
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
-
-  $.fn.modal.Constructor = Modal
-
-
- /* MODAL DATA-API
-  * ============== */
-
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
-
-    e.preventDefault()
-
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
-      })
-  })
-
-}(window.jQuery);
-/* ===========================================================
- * bootstrap-tooltip.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#tooltips
- * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Tooltip = function (element, options) {
-    this.init('tooltip', element, options)
-  }
-
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      if (this.options.trigger == 'click') {
-        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-      } else if (this.options.trigger != 'manual') {
-        eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
-        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
-        this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
-    }
-
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
-
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
-      }
-
-      return options
-    }
-
-  , enter: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (!self.options.delay || !self.options.delay.show) return self.show()
-
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
-    }
-
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
-
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
-
-  , show: function () {
-      var $tip
-        , inside
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-
-      if (this.hasContent() && this.enabled) {
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
-
-        inside = /in/.test(placement)
-
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
-          .insertAfter(this.$element)
-
-        pos = this.getPosition(inside)
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (inside ? placement.split(' ')[1] : placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        $tip
-          .offset(tp)
-          .addClass(placement)
-          .addClass('in')
-      }
-    }
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-
-      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
-    }
-
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-
-      $tip.removeClass('in')
-
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
-
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
-
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
-
-      return this
-    }
-
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
-      }
-    }
-
-  , hasContent: function () {
-      return this.getTitle()
-    }
-
-  , getPosition: function (inside) {
-      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
-        width: this.$element[0].offsetWidth
-      , height: this.$element[0].offsetHeight
-      })
-    }
-
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
-
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
-
-      return title
-    }
-
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
-
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
-      }
-    }
-
-  , enable: function () {
-      this.enabled = true
-    }
-
-  , disable: function () {
-      this.enabled = false
-    }
-
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
-
-  , toggle: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
-      self[self.tip().hasClass('in') ? 'hide' : 'show']()
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  }
-
-
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
-
-  $.fn.tooltip = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tooltip.Constructor = Tooltip
-
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover'
-  , title: ''
-  , delay: 0
-  , html: false
-  }
-
-}(window.jQuery);/* ===========================================================
- * bootstrap-popover.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
-
-  var Popover = function (element, options) {
-    this.init('popover', element, options)
-  }
-
-
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
-
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
-
-    constructor: Popover
-
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
-
-      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-      $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content)
-
-      $tip.removeClass('fade top bottom left right in')
-    }
-
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
-
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
-
-      content = $e.attr('data-content')
-        || (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-
-      return content
-    }
-
-  , tip: function () {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
-
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
-
-  })
-
-
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.popover = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.popover.Constructor = Popover
-
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-scrollspy.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
-
-  function ScrollSpy(element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
-    this.selector = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.$body = $('body')
-    this.refresh()
-    this.process()
-  }
-
-  ScrollSpy.prototype = {
-
-      constructor: ScrollSpy
-
-    , refresh: function () {
-        var self = this
-          , $targets
-
-        this.offsets = $([])
-        this.targets = $([])
-
-        $targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var $el = $(this)
-              , href = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
-            return ( $href
-              && $href.length
-              && [[ $href.position().top, href ]] ) || null
-          })
-          .sort(function (a, b) { return a[0] - b[0] })
-          .each(function () {
-            self.offsets.push(this[0])
-            self.targets.push(this[1])
-          })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
-            && this.activate ( i )
-        }
-
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
-
-    , activate: function (target) {
-        var active
-          , selector
-
-        this.activeTarget = target
-
-        $(this.selector)
-          .parent('.active')
-          .removeClass('active')
-
-        selector = this.selector
-          + '[data-target="' + target + '"],'
-          + this.selector + '[href="' + target + '"]'
-
-        active = $(selector)
-          .parent('li')
-          .addClass('active')
-
-        if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
-        }
-
-        active.trigger('activate')
-      }
-
-  }
-
-
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
-
-  $.fn.scrollspy = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.scrollspy.Constructor = ScrollSpy
-
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
-
-
- /* SCROLLSPY DATA-API
-  * ================== */
-
-  $(window).on('load', function () {
-    $('[data-spy="scroll"]').each(function () {
-      var $spy = $(this)
-      $spy.scrollspy($spy.data())
-    })
-  })
-
-}(window.jQuery);/* ========================================================
- * bootstrap-tab.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TAB CLASS DEFINITION
-  * ==================== */
-
-  var Tab = function (element) {
-    this.element = $(element)
-  }
-
-  Tab.prototype = {
-
-    constructor: Tab
-
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
-
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
-
-      previous = $ul.find('.active:last a')[0]
-
-      e = $.Event('show', {
-        relatedTarget: previous
-      })
-
-      $this.trigger(e)
-
-      if (e.isDefaultPrevented()) return
-
-      $target = $(selector)
-
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
-      })
-    }
-
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
-
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
-
-        callback && callback()
-      }
-
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
-
-      $active.removeClass('in')
-    }
-  }
-
-
- /* TAB PLUGIN DEFINITION
-  * ===================== */
-
-  $.fn.tab = function ( option ) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.tab.Constructor = Tab
-
-
- /* TAB DATA-API
-  * ============ */
-
-  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
-    e.preventDefault()
-    $(this).tab('show')
-  })
-
-}(window.jQuery);/* =============================================================
- * bootstrap-typeahead.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function($){
-
-  "use strict"; // jshint ;_;
-
-
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.$menu = $(this.options.menu).appendTo('body')
-    this.source = this.options.source
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.offset(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu.css({
-        top: pos.top + pos.height
-      , left: pos.left
-      })
-
-      this.$menu.show()
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , blur: function (e) {
-      var that = this
-      setTimeout(function () { that.hide() }, 150)
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-    }
-
-  , mouseenter: function (e) {
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /*   TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    e.preventDefault()
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);
-/* ==========================================================
- * bootstrap-affix.js v2.2.1
- * http://twitter.github.com/bootstrap/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
-
-  var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
-    this.checkPosition()
-  }
-
-  Affix.prototype.checkPosition = function () {
-    if (!this.$element.is(':visible')) return
-
-    var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
-
-    if (this.affixed === affix) return
-
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
-
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
-  }
-
-
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.affix = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.affix.Constructor = Affix
-
-  $.fn.affix.defaults = {
-    offset: 0
-  }
-
-
- /* AFFIX DATA-API
-  * ============== */
-
-  $(window).on('load', function () {
-    $('[data-spy="affix"]').each(function () {
-      var $spy = $(this)
-        , data = $spy.data()
-
-      data.offset = data.offset || {}
-
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
-
-      $spy.affix(data)
-    })
-  })
-
-
-}(window.jQuery);
\ No newline at end of file
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.min.js b/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.min.js
deleted file mode 100644
index 55da8c3913..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/js/bootstrap-2.2.1.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*!
-* Bootstrap.js by @fat & @mdo
-* Copyright 2012 Twitter, Inc.
-* http://www.apache.org/licenses/LICENSE-2.0.txt
-*/
-!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()},e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")},e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=n,this.options.slide&&this.slide(this.options.slide),this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},to:function(t){var n=this.$element.find(".item.active"),r=n.parent().children(),i=r.index(n),s=this;if(t>r.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){s.to(t)}):i==t?this.pause().cycle():this.slide(t>i?"next":"prev",e(r[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle()),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0]});if(i.hasClass("active"))return;if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}},e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e(document).on("click.carousel.data-api","[data-slide]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data());i.carousel(s),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning)return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning)return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}},e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=typeof n=="object"&&n;i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;return n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=e(n),r.length||(r=t.parent()),r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||(s.toggleClass("open"),n.focus()),!1},keydown:function(t){var n,r,s,o,u,a;if(!/(38|40|27)/.test(t.keyCode))return;n=e(this),t.preventDefault(),t.stopPropagation();if(n.is(".disabled, :disabled"))return;o=i(n),u=o.hasClass("open");if(!u||u&&t.keyCode==27)return n.click();r=e("[role=menu] li:not(.divider) a",o);if(!r.length)return;a=r.index(r.filter(":focus")),t.keyCode==38&&a>0&&a--,t.keyCode==40&&a<r.length-1&&a++,~a||(a=0),r.eq(a).focus()}},e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e(document).on("click.dropdown.data-api touchstart.dropdown.data-api",r).on("click.dropdown touchstart.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown.data-api touchstart.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api touchstart.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(e){this.$element.hide().trigger("hidden"),this.backdrop()},removeBackdrop:function(){this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,e.proxy(this.removeBackdrop,this)):this.removeBackdrop()):t&&t()}},e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,this.options.trigger=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):this.options.trigger!="manual"&&(i=this.options.trigger=="hover"?"mouseenter":"focus",s=this.options.trigger=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this))),this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,t,this.$element.data()),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);if(!n.options.delay||!n.options.delay.show)return n.show();clearTimeout(this.timeout),n.hoverState="in",this.timeout=setTimeout(function(){n.hoverState=="in"&&n.show()},n.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var e,t,n,r,i,s,o;if(this.hasContent()&&this.enabled){e=this.tip(),this.setContent(),this.options.animation&&e.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,e[0],this.$element[0]):this.options.placement,t=/in/.test(s),e.detach().css({top:0,left:0,display:"block"}).insertAfter(this.$element),n=this.getPosition(t),r=e[0].offsetWidth,i=e[0].offsetHeight;switch(t?s.split(" ")[1]:s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}e.offset(o).addClass(s).addClass("in")}},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function r(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip();return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?r():n.detach(),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").removeAttr("title")},hasContent:function(){return this.getTitle()},getPosition:function(t){return e.extend({},t?{top:0,left:0}:this.$element.offset(),{width:this.$element[0].offsetWidth,height:this.$element[0].offsetHeight})},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);n[n.tip().hasClass("in")?"hide":"show"]()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}},e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover",title:"",delay:0,html:!1}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content > *")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-content")||(typeof n.content=="function"?n.content.call(t[0]):n.content),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}}),e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'})}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var t=e(this),n=t.data("target")||t.attr("href"),r=/^#\w/.test(n)&&e(n);return r&&r.length&&[[r.position().top,n]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}},e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}},e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.$menu=e(this.options.menu).appendTo("body"),this.source=this.options.source,this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.offset(),{height:this.$element[0].offsetHeight});return this.$menu.css({top:t.top+t.height,left:t.left}),this.$menu.show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=!~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},blur:function(e){var t=this;setTimeout(function(){t.hide()},150)},click:function(e){e.stopPropagation(),e.preventDefault(),this.select()},mouseenter:function(t){this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")}},e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;t.preventDefault(),n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))},e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.js b/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.js
deleted file mode 100644
index d4f3bb38cd..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.js
+++ /dev/null
@@ -1,9440 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.8.2
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: Thu Sep 20 2012 21:13:05 GMT-0400 (Eastern Daylight Time)
- */
-(function( window, undefined ) {
-var
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// The deferred used on DOM ready
-	readyList,
-
-	// Use the correct document accordingly with window argument (sandbox)
-	document = window.document,
-	location = window.location,
-	navigator = window.navigator,
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// Save a reference to some core methods
-	core_push = Array.prototype.push,
-	core_slice = Array.prototype.slice,
-	core_indexOf = Array.prototype.indexOf,
-	core_toString = Object.prototype.toString,
-	core_hasOwn = Object.prototype.hasOwnProperty,
-	core_trim = String.prototype.trim,
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context, rootjQuery );
-	},
-
-	// Used for matching numbers
-	core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,
-
-	// Used for detecting and trimming whitespace
-	core_rnotwhite = /\S/,
-	core_rspace = /\s+/,
-
-	// Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return ( letter + "" ).toUpperCase();
-	},
-
-	// The ready event handler and self cleanup method
-	DOMContentLoaded = function() {
-		if ( document.addEventListener ) {
-			document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			jQuery.ready();
-		} else if ( document.readyState === "complete" ) {
-			// we're here because readyState === "complete" in oldIE
-			// which is good enough for us to call the dom ready!
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	},
-
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	constructor: jQuery,
-	init: function( selector, context, rootjQuery ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					context = context instanceof jQuery ? context[0] : context;
-					doc = ( context && context.nodeType ? context.ownerDocument || context : document );
-
-					// scripts is true for back-compat
-					selector = jQuery.parseHTML( match[1], doc, true );
-					if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
-						this.attr.call( selector, context, true );
-					}
-
-					return jQuery.merge( this, selector );
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || rootjQuery ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.8.2",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return core_slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this[ this.length + num ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + ( this.selector ? " " : "" ) + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-
-	ready: function( fn ) {
-		// Add the callback
-		jQuery.ready.promise().done( fn );
-
-		return this;
-	},
-
-	eq: function( i ) {
-		i = +i;
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( core_slice.apply( this, arguments ),
-			"slice", core_slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: core_push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		if ( window.$ === jQuery ) {
-			window.$ = _$;
-		}
-
-		if ( deep && window.jQuery === jQuery ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( !document.body ) {
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.trigger ) {
-			jQuery( document ).trigger("ready").off("ready");
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	isWindow: function( obj ) {
-		return obj != null && obj == obj.window;
-	},
-
-	isNumeric: function( obj ) {
-		return !isNaN( parseFloat(obj) ) && isFinite( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ core_toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		try {
-			// Not own constructor property must be Object
-			if ( obj.constructor &&
-				!core_hasOwn.call(obj, "constructor") &&
-				!core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-				return false;
-			}
-		} catch ( e ) {
-			// IE8,9 Will throw exceptions on certain host objects #9897
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-
-		var key;
-		for ( key in obj ) {}
-
-		return key === undefined || core_hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	// data: string of html
-	// context (optional): If specified, the fragment will be created in this context, defaults to document
-	// scripts (optional): If true, will include scripts passed in the html string
-	parseHTML: function( data, context, scripts ) {
-		var parsed;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		if ( typeof context === "boolean" ) {
-			scripts = context;
-			context = 0;
-		}
-		context = context || document;
-
-		// Single tag
-		if ( (parsed = rsingleTag.exec( data )) ) {
-			return [ context.createElement( parsed[1] ) ];
-		}
-
-		parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
-		return jQuery.merge( [],
-			(parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
-	},
-
-	parseJSON: function( data ) {
-		if ( !data || typeof data !== "string") {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-
-		// Attempt to parse using the native JSON parser first
-		if ( window.JSON && window.JSON.parse ) {
-			return window.JSON.parse( data );
-		}
-
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
-			.replace( rvalidtokens, "]" )
-			.replace( rvalidbraces, "")) ) {
-
-			return ( new Function( "return " + data ) )();
-
-		}
-		jQuery.error( "Invalid JSON: " + data );
-	},
-
-	// Cross-browser xml parsing
-	parseXML: function( data ) {
-		var xml, tmp;
-		if ( !data || typeof data !== "string" ) {
-			return null;
-		}
-		try {
-			if ( window.DOMParser ) { // Standard
-				tmp = new DOMParser();
-				xml = tmp.parseFromString( data , "text/xml" );
-			} else { // IE
-				xml = new ActiveXObject( "Microsoft.XMLDOM" );
-				xml.async = "false";
-				xml.loadXML( data );
-			}
-		} catch( e ) {
-			xml = undefined;
-		}
-		if ( !xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length ) {
-			jQuery.error( "Invalid XML: " + data );
-		}
-		return xml;
-	},
-
-	noop: function() {},
-
-	// Evaluates a script in a global context
-	// Workarounds based on findings by Jim Driscoll
-	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
-	globalEval: function( data ) {
-		if ( data && core_rnotwhite.test( data ) ) {
-			// We use execScript on Internet Explorer
-			// We use an anonymous function so that context is window
-			// rather than jQuery in Firefox
-			( window.execScript || function( data ) {
-				window[ "eval" ].call( window, data );
-			} )( data );
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	// args is for internal usage only
-	each: function( obj, callback, args ) {
-		var name,
-			i = 0,
-			length = obj.length,
-			isObj = length === undefined || jQuery.isFunction( obj );
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in obj ) {
-					if ( callback.apply( obj[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( obj[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in obj ) {
-					if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
-		function( text ) {
-			return text == null ?
-				"" :
-				core_trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				( text + "" ).replace( rtrim, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var type,
-			ret = results || [];
-
-		if ( arr != null ) {
-			// The window, strings (and functions) also have 'length'
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			type = jQuery.type( arr );
-
-			if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
-				core_push.call( ret, arr );
-			} else {
-				jQuery.merge( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		var len;
-
-		if ( arr ) {
-			if ( core_indexOf ) {
-				return core_indexOf.call( arr, elem, i );
-			}
-
-			len = arr.length;
-			i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
-
-			for ( ; i < len; i++ ) {
-				// Skip accessing in sparse arrays
-				if ( i in arr && arr[ i ] === elem ) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var l = second.length,
-			i = first.length,
-			j = 0;
-
-		if ( typeof l === "number" ) {
-			for ( ; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var retVal,
-			ret = [],
-			i = 0,
-			length = elems.length;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var value, key,
-			ret = [],
-			i = 0,
-			length = elems.length,
-			// jquery objects are treated as arrays
-			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
-
-		// Go through the array, translating each of the items to their
-		if ( isArray ) {
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( key in elems ) {
-				value = callback( elems[ key ], key, arg );
-
-				if ( value != null ) {
-					ret[ ret.length ] = value;
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = core_slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context, args.concat( core_slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	// Multifunctional method to get and set values of a collection
-	// The value/s can optionally be executed if it's a function
-	access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
-		var exec,
-			bulk = key == null,
-			i = 0,
-			length = elems.length;
-
-		// Sets many values
-		if ( key && typeof key === "object" ) {
-			for ( i in key ) {
-				jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
-			}
-			chainable = 1;
-
-		// Sets one value
-		} else if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = pass === undefined && jQuery.isFunction( value );
-
-			if ( bulk ) {
-				// Bulk operations only iterate when executing function values
-				if ( exec ) {
-					exec = fn;
-					fn = function( elem, key, value ) {
-						return exec.call( jQuery( elem ), value );
-					};
-
-				// Otherwise they run against the entire set
-				} else {
-					fn.call( elems, value );
-					fn = null;
-				}
-			}
-
-			if ( fn ) {
-				for (; i < length; i++ ) {
-					fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-				}
-			}
-
-			chainable = 1;
-		}
-
-		return chainable ?
-			elems :
-
-			// Gets
-			bulk ?
-				fn.call( elems ) :
-				length ? fn( elems[0], key ) : emptyGet;
-	},
-
-	now: function() {
-		return ( new Date() ).getTime();
-	}
-});
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called after the browser event has already occurred.
-		// we once tried to use readyState "interactive" here, but it caused issues like the one
-		// discovered by ChrisS here: http://bugs.jquery.com/ticket/12282#comment:15
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			setTimeout( jQuery.ready, 1 );
-
-		// Standards-based browsers support DOMContentLoaded
-		} else if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else {
-			// Ensure firing before onload, maybe late but safe also for iframes
-			document.attachEvent( "onreadystatechange", DOMContentLoaded );
-
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var top = false;
-
-			try {
-				top = window.frameElement == null && document.documentElement;
-			} catch(e) {}
-
-			if ( top && top.doScroll ) {
-				(function doScrollCheck() {
-					if ( !jQuery.isReady ) {
-
-						try {
-							// Use the trick by Diego Perini
-							// http://javascript.nwbox.com/IEContentLoaded/
-							top.doScroll("left");
-						} catch(e) {
-							return setTimeout( doScrollCheck, 50 );
-						}
-
-						// and execute any waiting functions
-						jQuery.ready();
-					}
-				})();
-			}
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-// String to Object options format cache
-var optionsCache = {};
-
-// Convert String-formatted options into Object-formatted ones and store in cache
-function createOptions( options ) {
-	var object = optionsCache[ options ] = {};
-	jQuery.each( options.split( core_rspace ), function( _, flag ) {
-		object[ flag ] = true;
-	});
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		( optionsCache[ options ] || createOptions( options ) ) :
-		jQuery.extend( {}, options );
-
-	var // Last fire value (for non-forgettable lists)
-		memory,
-		// Flag to know if list was already fired
-		fired,
-		// Flag to know if list is currently firing
-		firing,
-		// First callback to fire (used internally by add and fireWith)
-		firingStart,
-		// End of the loop when firing
-		firingLength,
-		// Index of currently firing callback (modified by remove if needed)
-		firingIndex,
-		// Actual callback list
-		list = [],
-		// Stack of fire calls for repeatable lists
-		stack = !options.once && [],
-		// Fire callbacks
-		fire = function( data ) {
-			memory = options.memory && data;
-			fired = true;
-			firingIndex = firingStart || 0;
-			firingStart = 0;
-			firingLength = list.length;
-			firing = true;
-			for ( ; list && firingIndex < firingLength; firingIndex++ ) {
-				if ( list[ firingIndex ].apply( data[ 0 ], data[ 1 ] ) === false && options.stopOnFalse ) {
-					memory = false; // To prevent further calls using add
-					break;
-				}
-			}
-			firing = false;
-			if ( list ) {
-				if ( stack ) {
-					if ( stack.length ) {
-						fire( stack.shift() );
-					}
-				} else if ( memory ) {
-					list = [];
-				} else {
-					self.disable();
-				}
-			}
-		},
-		// Actual Callbacks object
-		self = {
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-					// First, we save the current length
-					var start = list.length;
-					(function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							var type = jQuery.type( arg );
-							if ( type === "function" && ( !options.unique || !self.has( arg ) ) ) {
-								list.push( arg );
-							} else if ( arg && arg.length && type !== "string" ) {
-								// Inspect recursively
-								add( arg );
-							}
-						});
-					})( arguments );
-					// Do we need to add the callbacks to the
-					// current firing batch?
-					if ( firing ) {
-						firingLength = list.length;
-					// With memory, if we're not firing then
-					// we should call right away
-					} else if ( memory ) {
-						firingStart = start;
-						fire( memory );
-					}
-				}
-				return this;
-			},
-			// Remove a callback from the list
-			remove: function() {
-				if ( list ) {
-					jQuery.each( arguments, function( _, arg ) {
-						var index;
-						while( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-							list.splice( index, 1 );
-							// Handle firing indexes
-							if ( firing ) {
-								if ( index <= firingLength ) {
-									firingLength--;
-								}
-								if ( index <= firingIndex ) {
-									firingIndex--;
-								}
-							}
-						}
-					});
-				}
-				return this;
-			},
-			// Control if a given callback is in the list
-			has: function( fn ) {
-				return jQuery.inArray( fn, list ) > -1;
-			},
-			// Remove all callbacks from the list
-			empty: function() {
-				list = [];
-				return this;
-			},
-			// Have the list do nothing anymore
-			disable: function() {
-				list = stack = memory = undefined;
-				return this;
-			},
-			// Is it disabled?
-			disabled: function() {
-				return !list;
-			},
-			// Lock the list in its current state
-			lock: function() {
-				stack = undefined;
-				if ( !memory ) {
-					self.disable();
-				}
-				return this;
-			},
-			// Is it locked?
-			locked: function() {
-				return !stack;
-			},
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
-				if ( list && ( !fired || stack ) ) {
-					if ( firing ) {
-						stack.push( args );
-					} else {
-						fire( args );
-					}
-				}
-				return this;
-			},
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-jQuery.extend({
-
-	Deferred: function( func ) {
-		var tuples = [
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks("once memory"), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks("once memory"), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks("memory") ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred(function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var action = tuple[ 0 ],
-								fn = fns[ i ];
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[1] ]( jQuery.isFunction( fn ) ?
-								function() {
-									var returned = fn.apply( this, arguments );
-									if ( returned && jQuery.isFunction( returned.promise ) ) {
-										returned.promise()
-											.done( newDefer.resolve )
-											.fail( newDefer.reject )
-											.progress( newDefer.notify );
-									} else {
-										newDefer[ action + "With" ]( this === deferred ? newDefer : this, [ returned ] );
-									}
-								} :
-								newDefer[ action ]
-							);
-						});
-						fns = null;
-					}).promise();
-				},
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[1] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add(function() {
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ] = list.fire
-			deferred[ tuple[0] ] = list.fire;
-			deferred[ tuple[0] + "With" ] = list.fireWith;
-		});
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = core_slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 || ( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred. If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? core_slice.call( arguments ) : value;
-					if( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject )
-						.progress( updateFunc( i, progressContexts, progressValues ) );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// if we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-});
-jQuery.support = (function() {
-
-	var support,
-		all,
-		a,
-		select,
-		opt,
-		input,
-		fragment,
-		eventName,
-		i,
-		isSupported,
-		clickFn,
-		div = document.createElement("div");
-
-	// Preliminary tests
-	div.setAttribute( "className", "t" );
-	div.innerHTML = "  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>";
-
-	all = div.getElementsByTagName("*");
-	a = div.getElementsByTagName("a")[ 0 ];
-	a.style.cssText = "top:1px;float:left;opacity:.5";
-
-	// Can't get basic test support
-	if ( !all || !all.length ) {
-		return {};
-	}
-
-	// First batch of supports tests
-	select = document.createElement("select");
-	opt = select.appendChild( document.createElement("option") );
-	input = div.getElementsByTagName("input")[ 0 ];
-
-	support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText instead)
-		style: /top/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: ( a.getAttribute("href") === "/a" ),
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.5/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: ( input.value === "on" ),
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
-		getSetAttribute: div.className !== "t",
-
-		// Tests for enctype support on a form(#6743)
-		enctype: !!document.createElement("form").enctype,
-
-		// Makes sure cloning an html5 element does not cause problems
-		// Where outerHTML is undefined, this still works
-		html5Clone: document.createElement("nav").cloneNode( true ).outerHTML !== "<:nav></:nav>",
-
-		// jQuery.support.boxModel DEPRECATED in 1.8 since we don't support Quirks Mode
-		boxModel: ( document.compatMode === "CSS1Compat" ),
-
-		// Will be defined later
-		submitBubbles: true,
-		changeBubbles: true,
-		focusinBubbles: false,
-		deleteExpando: true,
-		noCloneEvent: true,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableMarginRight: true,
-		boxSizingReliable: true,
-		pixelPosition: false
-	};
-
-	// Make sure checked status is properly cloned
-	input.checked = true;
-	support.noCloneChecked = input.cloneNode( true ).checked;
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as disabled)
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete div.test;
-	} catch( e ) {
-		support.deleteExpando = false;
-	}
-
-	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
-		div.attachEvent( "onclick", clickFn = function() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			support.noCloneEvent = false;
-		});
-		div.cloneNode( true ).fireEvent("onclick");
-		div.detachEvent( "onclick", clickFn );
-	}
-
-	// Check if a radio maintains its value
-	// after being appended to the DOM
-	input = document.createElement("input");
-	input.value = "t";
-	input.setAttribute( "type", "radio" );
-	support.radioValue = input.value === "t";
-
-	input.setAttribute( "checked", "checked" );
-
-	// #11217 - WebKit loses check when the name is after the checked attribute
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-	fragment = document.createDocumentFragment();
-	fragment.appendChild( div.lastChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Check if a disconnected checkbox will retain its checked
-	// value of true after appended to the DOM (IE6/7)
-	support.appendChecked = input.checked;
-
-	fragment.removeChild( input );
-	fragment.appendChild( div );
-
-	// Technique from Juriy Zaytsev
-	// http://perfectionkills.com/detecting-event-support-without-browser-sniffing/
-	// We only care about the case where non-standard event systems
-	// are used, namely in IE. Short-circuiting here helps us to
-	// avoid an eval call (in setAttribute) which can cause CSP
-	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
-	if ( div.attachEvent ) {
-		for ( i in {
-			submit: true,
-			change: true,
-			focusin: true
-		}) {
-			eventName = "on" + i;
-			isSupported = ( eventName in div );
-			if ( !isSupported ) {
-				div.setAttribute( eventName, "return;" );
-				isSupported = ( typeof div[ eventName ] === "function" );
-			}
-			support[ i + "Bubbles" ] = isSupported;
-		}
-	}
-
-	// Run tests that need a body at doc ready
-	jQuery(function() {
-		var container, div, tds, marginDiv,
-			divReset = "padding:0;margin:0;border:0;display:block;overflow:hidden;",
-			body = document.getElementsByTagName("body")[0];
-
-		if ( !body ) {
-			// Return for frameset docs that don't have a body
-			return;
-		}
-
-		container = document.createElement("div");
-		container.style.cssText = "visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px";
-		body.insertBefore( container, body.firstChild );
-
-		// Construct the test element
-		div = document.createElement("div");
-		container.appendChild( div );
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
-		tds = div.getElementsByTagName("td");
-		tds[ 0 ].style.cssText = "padding:0;margin:0;border:0;display:none";
-		isSupported = ( tds[ 0 ].offsetHeight === 0 );
-
-		tds[ 0 ].style.display = "";
-		tds[ 1 ].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE <= 8 fail this test)
-		support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
-
-		// Check box-sizing and margin behavior
-		div.innerHTML = "";
-		div.style.cssText = "box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;";
-		support.boxSizing = ( div.offsetWidth === 4 );
-		support.doesNotIncludeMarginInBodyOffset = ( body.offsetTop !== 1 );
-
-		// NOTE: To any future maintainer, we've window.getComputedStyle
-		// because jsdom on node.js will break without it.
-		if ( window.getComputedStyle ) {
-			support.pixelPosition = ( window.getComputedStyle( div, null ) || {} ).top !== "1%";
-			support.boxSizingReliable = ( window.getComputedStyle( div, null ) || { width: "4px" } ).width === "4px";
-
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. For more
-			// info see bug #3333
-			// Fails in WebKit before Feb 2011 nightlies
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			marginDiv = document.createElement("div");
-			marginDiv.style.cssText = div.style.cssText = divReset;
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-			div.appendChild( marginDiv );
-			support.reliableMarginRight =
-				!parseFloat( ( window.getComputedStyle( marginDiv, null ) || {} ).marginRight );
-		}
-
-		if ( typeof div.style.zoom !== "undefined" ) {
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			// (IE < 8 does this)
-			div.innerHTML = "";
-			div.style.cssText = divReset + "width:1px;padding:1px;display:inline;zoom:1";
-			support.inlineBlockNeedsLayout = ( div.offsetWidth === 3 );
-
-			// Check if elements with layout shrink-wrap their children
-			// (IE 6 does this)
-			div.style.display = "block";
-			div.style.overflow = "visible";
-			div.innerHTML = "<div></div>";
-			div.firstChild.style.width = "5px";
-			support.shrinkWrapBlocks = ( div.offsetWidth !== 3 );
-
-			container.style.zoom = 1;
-		}
-
-		// Null elements to avoid leaks in IE
-		body.removeChild( container );
-		container = div = tds = marginDiv = null;
-	});
-
-	// Null elements to avoid leaks in IE
-	fragment.removeChild( div );
-	all = a = select = opt = input = fragment = div = null;
-
-	return support;
-})();
-var rbrace = /(?:\{[\s\S]*\}|\[[\s\S]*\])$/,
-	rmultiDash = /([A-Z])/g;
-
-jQuery.extend({
-	cache: {},
-
-	deletedIds: [],
-
-	// Remove at next major release (1.9/2.0)
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page
-	// Non-digits removed to match rinlinejQuery
-	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	hasData: function( elem ) {
-		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
-		return !!elem && !isEmptyDataObject( elem );
-	},
-
-	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var thisCache, ret,
-			internalKey = jQuery.expando,
-			getByName = typeof name === "string",
-
-			// We have to handle DOM nodes and JS objects differently because IE6-7
-			// can't GC object references properly across the DOM-JS boundary
-			isNode = elem.nodeType,
-
-			// Only DOM nodes need the global jQuery cache; JS object data is
-			// attached directly to the object so GC can occur automatically
-			cache = isNode ? jQuery.cache : elem,
-
-			// Only defining an ID for JS objects if its cache already exists allows
-			// the code to shortcut on the same path as a DOM node with no cache
-			id = isNode ? elem[ internalKey ] : elem[ internalKey ] && internalKey;
-
-		// Avoid doing any more work than we need to when trying to get data on an
-		// object that has no data at all
-		if ( (!id || !cache[id] || (!pvt && !cache[id].data)) && getByName && data === undefined ) {
-			return;
-		}
-
-		if ( !id ) {
-			// Only DOM nodes need a new unique ID for each element since their data
-			// ends up in the global cache
-			if ( isNode ) {
-				elem[ internalKey ] = id = jQuery.deletedIds.pop() || jQuery.guid++;
-			} else {
-				id = internalKey;
-			}
-		}
-
-		if ( !cache[ id ] ) {
-			cache[ id ] = {};
-
-			// Avoids exposing jQuery metadata on plain JS objects when the object
-			// is serialized using JSON.stringify
-			if ( !isNode ) {
-				cache[ id ].toJSON = jQuery.noop;
-			}
-		}
-
-		// An object can be passed to jQuery.data instead of a key/value pair; this gets
-		// shallow copied over onto the existing cache
-		if ( typeof name === "object" || typeof name === "function" ) {
-			if ( pvt ) {
-				cache[ id ] = jQuery.extend( cache[ id ], name );
-			} else {
-				cache[ id ].data = jQuery.extend( cache[ id ].data, name );
-			}
-		}
-
-		thisCache = cache[ id ];
-
-		// jQuery data() is stored in a separate object inside the object's internal data
-		// cache in order to avoid key collisions between internal data and user-defined
-		// data.
-		if ( !pvt ) {
-			if ( !thisCache.data ) {
-				thisCache.data = {};
-			}
-
-			thisCache = thisCache.data;
-		}
-
-		if ( data !== undefined ) {
-			thisCache[ jQuery.camelCase( name ) ] = data;
-		}
-
-		// Check for both converted-to-camel and non-converted data property names
-		// If a data property was specified
-		if ( getByName ) {
-
-			// First Try to find as-is property data
-			ret = thisCache[ name ];
-
-			// Test for null|undefined property data
-			if ( ret == null ) {
-
-				// Try to find the camelCased property
-				ret = thisCache[ jQuery.camelCase( name ) ];
-			}
-		} else {
-			ret = thisCache;
-		}
-
-		return ret;
-	},
-
-	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		var thisCache, i, l,
-
-			isNode = elem.nodeType,
-
-			// See jQuery.data for more information
-			cache = isNode ? jQuery.cache : elem,
-			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
-
-		// If there is already no cache entry for this object, there is no
-		// purpose in continuing
-		if ( !cache[ id ] ) {
-			return;
-		}
-
-		if ( name ) {
-
-			thisCache = pvt ? cache[ id ] : cache[ id ].data;
-
-			if ( thisCache ) {
-
-				// Support array or space separated string names for data keys
-				if ( !jQuery.isArray( name ) ) {
-
-					// try the string as a key before any manipulation
-					if ( name in thisCache ) {
-						name = [ name ];
-					} else {
-
-						// split the camel cased version by spaces unless a key with the spaces exists
-						name = jQuery.camelCase( name );
-						if ( name in thisCache ) {
-							name = [ name ];
-						} else {
-							name = name.split(" ");
-						}
-					}
-				}
-
-				for ( i = 0, l = name.length; i < l; i++ ) {
-					delete thisCache[ name[i] ];
-				}
-
-				// If there is no data left in the cache, we want to continue
-				// and let the cache object itself get destroyed
-				if ( !( pvt ? isEmptyDataObject : jQuery.isEmptyObject )( thisCache ) ) {
-					return;
-				}
-			}
-		}
-
-		// See jQuery.data for more information
-		if ( !pvt ) {
-			delete cache[ id ].data;
-
-			// Don't destroy the parent cache unless the internal data object
-			// had been the only thing left in it
-			if ( !isEmptyDataObject( cache[ id ] ) ) {
-				return;
-			}
-		}
-
-		// Destroy the cache
-		if ( isNode ) {
-			jQuery.cleanData( [ elem ], true );
-
-		// Use delete when supported for expandos or `cache` is not a window per isWindow (#10080)
-		} else if ( jQuery.support.deleteExpando || cache != cache.window ) {
-			delete cache[ id ];
-
-		// When all else fails, null
-		} else {
-			cache[ id ] = null;
-		}
-	},
-
-	// For internal use only.
-	_data: function( elem, name, data ) {
-		return jQuery.data( elem, name, data, true );
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		var noData = elem.nodeName && jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-		// nodes accept data unless otherwise specified; rejection can be conditional
-		return !noData || noData !== true && elem.getAttribute("classid") === noData;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var parts, part, attr, name, l,
-			elem = this[0],
-			i = 0,
-			data = null;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = jQuery.data( elem );
-
-				if ( elem.nodeType === 1 && !jQuery._data( elem, "parsedAttrs" ) ) {
-					attr = elem.attributes;
-					for ( l = attr.length; i < l; i++ ) {
-						name = attr[i].name;
-
-						if ( !name.indexOf( "data-" ) ) {
-							name = jQuery.camelCase( name.substring(5) );
-
-							dataAttr( elem, name, data[ name ] );
-						}
-					}
-					jQuery._data( elem, "parsedAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		parts = key.split( ".", 2 );
-		parts[1] = parts[1] ? "." + parts[1] : "";
-		part = parts[1] + "!";
-
-		return jQuery.access( this, function( value ) {
-
-			if ( value === undefined ) {
-				data = this.triggerHandler( "getData" + part, [ parts[0] ] );
-
-				// Try to fetch any internally stored data first
-				if ( data === undefined && elem ) {
-					data = jQuery.data( elem, key );
-					data = dataAttr( elem, key, data );
-				}
-
-				return data === undefined && parts[1] ?
-					this.data( parts[0] ) :
-					data;
-			}
-
-			parts[1] = value;
-			this.each(function() {
-				var self = jQuery( this );
-
-				self.triggerHandler( "setData" + part, parts );
-				jQuery.data( this, key, value );
-				self.triggerHandler( "changeData" + part, parts );
-			});
-		}, null, value, arguments.length > 1, null, false );
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-
-		var name = "data-" + key.replace( rmultiDash, "-$1" ).toLowerCase();
-
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				// Only convert to a number if it doesn't change the string
-				+data + "" === data ? +data :
-				rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-// checks a cache object for emptiness
-function isEmptyDataObject( obj ) {
-	var name;
-	for ( name in obj ) {
-
-		// if the public data object is empty, the private is still empty
-		if ( name === "data" && jQuery.isEmptyObject( obj[name] ) ) {
-			continue;
-		}
-		if ( name !== "toJSON" ) {
-			return false;
-		}
-	}
-
-	return true;
-}
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = jQuery._data( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray(data) ) {
-					queue = jQuery._data( elem, type, jQuery.makeArray(data) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// not intended for public consumption - generates a queueHooks object, or returns the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return jQuery._data( elem, key ) || jQuery._data( elem, key, {
-			empty: jQuery.Callbacks("once memory").add(function() {
-				jQuery.removeData( elem, type + "queue", true );
-				jQuery.removeData( elem, key, true );
-			})
-		});
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[0], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each(function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[0] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function( next, hooks ) {
-			var timeout = setTimeout( next, time );
-			hooks.stop = function() {
-				clearTimeout( timeout );
-			};
-		});
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while( i-- ) {
-			tmp = jQuery._data( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-});
-var nodeHook, boolHook, fixSpecified,
-	rclass = /[\t\r\n]/g,
-	rreturn = /\r/g,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea|)$/i,
-	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
-	getSetAttribute = jQuery.support.getSetAttribute;
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each(function() {
-			jQuery.removeAttr( this, name );
-		});
-	},
-
-	prop: function( name, value ) {
-		return jQuery.access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		name = jQuery.propFix[ name ] || name;
-		return this.each(function() {
-			// try/catch handles cases where IE balks (such as removing a property on window)
-			try {
-				this[ name ] = undefined;
-				delete this[ name ];
-			} catch( e ) {}
-		});
-	},
-
-	addClass: function( value ) {
-		var classNames, i, l, elem,
-			setClass, c, cl;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).addClass( value.call(this, j, this.className) );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			classNames = value.split( core_rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className && classNames.length === 1 ) {
-						elem.className = value;
-
-					} else {
-						setClass = " " + elem.className + " ";
-
-						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( setClass.indexOf( " " + classNames[ c ] + " " ) < 0 ) {
-								setClass += classNames[ c ] + " ";
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var removes, className, elem, c, cl, i, l;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( j ) {
-				jQuery( this ).removeClass( value.call(this, j, this.className) );
-			});
-		}
-		if ( (value && typeof value === "string") || value === undefined ) {
-			removes = ( value || "" ).split( core_rspace );
-
-			for ( i = 0, l = this.length; i < l; i++ ) {
-				elem = this[ i ];
-				if ( elem.nodeType === 1 && elem.className ) {
-
-					className = (" " + elem.className + " ").replace( rclass, " " );
-
-					// loop over each item in the removal list
-					for ( c = 0, cl = removes.length; c < cl; c++ ) {
-						// Remove until there is nothing to remove,
-						while ( className.indexOf(" " + removes[ c ] + " ") >= 0 ) {
-							className = className.replace( " " + removes[ c ] + " " , " " );
-						}
-					}
-					elem.className = value ? jQuery.trim( className ) : "";
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function( i ) {
-				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( core_rspace );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery._data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ",
-			i = 0,
-			l = this.length;
-		for ( ; i < l; i++ ) {
-			if ( this[i].nodeType === 1 && (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) >= 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[0];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] || jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-					// handle most common string cases
-					ret.replace(rreturn, "") :
-					// handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each(function( i ) {
-			var val,
-				self = jQuery(this);
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, self.val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map(val, function ( value ) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	valHooks: {
-		option: {
-			get: function( elem ) {
-				// attributes.value is undefined in Blackberry 4.7 but
-				// uses .value. See #6932
-				var val = elem.attributes.value;
-				return !val || val.specified ? elem.value : elem.text;
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, i, max, option,
-					index = elem.selectedIndex,
-					values = [],
-					options = elem.options,
-					one = elem.type === "select-one";
-
-				// Nothing was selected
-				if ( index < 0 ) {
-					return null;
-				}
-
-				// Loop through all the selected options
-				i = one ? index : 0;
-				max = one ? index + 1 : options.length;
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// Don't return options that are disabled or in a disabled optgroup
-					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
-							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
-				if ( one && !values.length && options.length ) {
-					return jQuery( options[ index ] ).val();
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var values = jQuery.makeArray( value );
-
-				jQuery(elem).find("option").each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	},
-
-	// Unused in 1.8, left in so attrFn-stabbers won't die; remove in 1.9
-	attrFn: {},
-
-	attr: function( elem, name, value, pass ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set attributes on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( pass && jQuery.isFunction( jQuery.fn[ name ] ) ) {
-			return jQuery( elem )[ name ]( value );
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( notxml ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] || ( rboolean.test( name ) ? boolHook : nodeHook );
-		}
-
-		if ( value !== undefined ) {
-
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-
-			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				elem.setAttribute( name, value + "" );
-				return value;
-			}
-
-		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
-			return ret;
-
-		} else {
-
-			ret = elem.getAttribute( name );
-
-			// Non-existent attributes return null, we normalize to undefined
-			return ret === null ?
-				undefined :
-				ret;
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var propName, attrNames, name, isBool,
-			i = 0;
-
-		if ( value && elem.nodeType === 1 ) {
-
-			attrNames = value.split( core_rspace );
-
-			for ( ; i < attrNames.length; i++ ) {
-				name = attrNames[ i ];
-
-				if ( name ) {
-					propName = jQuery.propFix[ name ] || name;
-					isBool = rboolean.test( name );
-
-					// See #9699 for explanation of this approach (setting first, then removal)
-					// Do not do this for boolean attributes (see #10870)
-					if ( !isBool ) {
-						jQuery.attr( elem, name, "" );
-					}
-					elem.removeAttribute( getSetAttribute ? name : propName );
-
-					// Set corresponding property to false for boolean attributes
-					if ( isBool && propName in elem ) {
-						elem[ propName ] = false;
-					}
-				}
-			}
-		}
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
-					// Setting the type on a radio button after the value resets the value in IE6-9
-					// Reset value to it's default in case type is set after value
-					// This is for element creation
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		},
-		// Use the value property for back compat
-		// Use the nodeHook for button elements in IE6/7 (#1954)
-		value: {
-			get: function( elem, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.get( elem, name );
-				}
-				return name in elem ?
-					elem.value :
-					null;
-			},
-			set: function( elem, value, name ) {
-				if ( nodeHook && jQuery.nodeName( elem, "button" ) ) {
-					return nodeHook.set( elem, value, name );
-				}
-				// Does not return so that setAttribute is also used
-				elem.value = value;
-			}
-		}
-	},
-
-	propFix: {
-		tabindex: "tabIndex",
-		readonly: "readOnly",
-		"for": "htmlFor",
-		"class": "className",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing",
-		cellpadding: "cellPadding",
-		rowspan: "rowSpan",
-		colspan: "colSpan",
-		usemap: "useMap",
-		frameborder: "frameBorder",
-		contenteditable: "contentEditable"
-	},
-
-	prop: function( elem, name, value ) {
-		var ret, hooks, notxml,
-			nType = elem.nodeType;
-
-		// don't get/set properties on text, comment and attribute nodes
-		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
-
-		if ( notxml ) {
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
-				return ret;
-
-			} else {
-				return ( elem[ name ] = value );
-			}
-
-		} else {
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== null ) {
-				return ret;
-
-			} else {
-				return elem[ name ];
-			}
-		}
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				var attributeNode = elem.getAttributeNode("tabindex");
-
-				return attributeNode && attributeNode.specified ?
-					parseInt( attributeNode.value, 10 ) :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-		}
-	}
-});
-
-// Hook for boolean attributes
-boolHook = {
-	get: function( elem, name ) {
-		// Align boolean attributes with corresponding properties
-		// Fall back to attribute presence where some booleans are not supported
-		var attrNode,
-			property = jQuery.prop( elem, name );
-		return property === true || typeof property !== "boolean" && ( attrNode = elem.getAttributeNode(name) ) && attrNode.nodeValue !== false ?
-			name.toLowerCase() :
-			undefined;
-	},
-	set: function( elem, value, name ) {
-		var propName;
-		if ( value === false ) {
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			// value is true since we know at this point it's type boolean and not false
-			// Set boolean attributes to the same name and set the DOM property
-			propName = jQuery.propFix[ name ] || name;
-			if ( propName in elem ) {
-				// Only set the IDL specifically if it already exists on the element
-				elem[ propName ] = true;
-			}
-
-			elem.setAttribute( name, name.toLowerCase() );
-		}
-		return name;
-	}
-};
-
-// IE6/7 do not support getting/setting some attributes with get/setAttribute
-if ( !getSetAttribute ) {
-
-	fixSpecified = {
-		name: true,
-		id: true,
-		coords: true
-	};
-
-	// Use this for any attribute in IE6/7
-	// This fixes almost every IE6/7 issue
-	nodeHook = jQuery.valHooks.button = {
-		get: function( elem, name ) {
-			var ret;
-			ret = elem.getAttributeNode( name );
-			return ret && ( fixSpecified[ name ] ? ret.value !== "" : ret.specified ) ?
-				ret.value :
-				undefined;
-		},
-		set: function( elem, value, name ) {
-			// Set the existing or create a new attribute node
-			var ret = elem.getAttributeNode( name );
-			if ( !ret ) {
-				ret = document.createAttribute( name );
-				elem.setAttributeNode( ret );
-			}
-			return ( ret.value = value + "" );
-		}
-	};
-
-	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
-	// This is for removals
-	jQuery.each([ "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			set: function( elem, value ) {
-				if ( value === "" ) {
-					elem.setAttribute( name, "auto" );
-					return value;
-				}
-			}
-		});
-	});
-
-	// Set contenteditable to false on removals(#10429)
-	// Setting to empty string throws an error as an invalid value
-	jQuery.attrHooks.contenteditable = {
-		get: nodeHook.get,
-		set: function( elem, value, name ) {
-			if ( value === "" ) {
-				value = "false";
-			}
-			nodeHook.set( elem, value, name );
-		}
-	};
-}
-
-
-// Some attributes require a special call on IE
-if ( !jQuery.support.hrefNormalized ) {
-	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
-		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
-			get: function( elem ) {
-				var ret = elem.getAttribute( name, 2 );
-				return ret === null ? undefined : ret;
-			}
-		});
-	});
-}
-
-if ( !jQuery.support.style ) {
-	jQuery.attrHooks.style = {
-		get: function( elem ) {
-			// Return undefined in the case of empty string
-			// Normalize to lowercase since IE uppercases css property names
-			return elem.style.cssText.toLowerCase() || undefined;
-		},
-		set: function( elem, value ) {
-			return ( elem.style.cssText = value + "" );
-		}
-	};
-}
-
-// Safari mis-reports the default selected property of an option
-// Accessing the parent's selectedIndex property fixes it
-if ( !jQuery.support.optSelected ) {
-	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-			return null;
-		}
-	});
-}
-
-// IE6/7 call enctype encoding
-if ( !jQuery.support.enctype ) {
-	jQuery.propFix.enctype = "encoding";
-}
-
-// Radios and checkboxes getter/setter
-if ( !jQuery.support.checkOn ) {
-	jQuery.each([ "radio", "checkbox" ], function() {
-		jQuery.valHooks[ this ] = {
-			get: function( elem ) {
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				return elem.getAttribute("value") === null ? "on" : elem.value;
-			}
-		};
-	});
-}
-jQuery.each([ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0 );
-			}
-		}
-	});
-});
-var rformElems = /^(?:textarea|input|select)$/i,
-	rtypenamespace = /^([^\.]*|)(?:\.(.+)|)$/,
-	rhoverHack = /(?:^|\s)hover(\.\S+|)\b/,
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|contextmenu)|click/,
-	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	hoverHack = function( events ) {
-		return jQuery.event.special.hover ? events : events.replace( rhoverHack, "mouseenter$1 mouseleave$1" );
-	};
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var elemData, eventHandle, events,
-			t, tns, type, namespaces, handleObj,
-			handleObjIn, handlers, special;
-
-		// Don't attach events to noData or text/comment nodes (allow plain objects tho)
-		if ( elem.nodeType === 3 || elem.nodeType === 8 || !types || !handler || !(elemData = jQuery._data( elem )) ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		events = elemData.events;
-		if ( !events ) {
-			elemData.events = events = {};
-		}
-		eventHandle = elemData.handle;
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function( e ) {
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
-					jQuery.event.dispatch.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-			// Add elem as a property of the handle fn to prevent a memory leak with IE non-native events
-			eventHandle.elem = elem;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = jQuery.trim( hoverHack(types) ).split( " " );
-		for ( t = 0; t < types.length; t++ ) {
-
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = tns[1];
-			namespaces = ( tns[2] || "" ).split( "." ).sort();
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend({
-				type: type,
-				origType: tns[1],
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join(".")
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			handlers = events[ type ];
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener/attachEvent if the special events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var t, tns, type, origType, namespaces, origCount,
-			j, events, special, eventType, handleObj,
-			elemData = jQuery.hasData( elem ) && jQuery._data( elem );
-
-		if ( !elemData || !(events = elemData.events) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = jQuery.trim( hoverHack( types || "" ) ).split(" ");
-		for ( t = 0; t < types.length; t++ ) {
-			tns = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tns[1];
-			namespaces = tns[2];
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector? special.delegateType : special.bindType ) || type;
-			eventType = events[ type ] || [];
-			origCount = eventType.length;
-			namespaces = namespaces ? new RegExp("(^|\\.)" + namespaces.split(".").sort().join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-
-			// Remove matching events
-			for ( j = 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					 ( !handler || handler.guid === handleObj.guid ) &&
-					 ( !namespaces || namespaces.test( handleObj.namespace ) ) &&
-					 ( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
-					eventType.splice( j--, 1 );
-
-					if ( handleObj.selector ) {
-						eventType.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( eventType.length === 0 && origCount !== eventType.length ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			delete elemData.handle;
-
-			// removeData also checks for emptiness and clears the expando if empty
-			// so use it instead of delete
-			jQuery.removeData( elem, "events", true );
-		}
-	},
-
-	// Events that are safe to short-circuit if no handlers are attached.
-	// Native DOM events should not be added, they may have inline handlers.
-	customEvent: {
-		"getData": true,
-		"setData": true,
-		"changeData": true
-	},
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-		// Don't do events on text and comment nodes
-		if ( elem && (elem.nodeType === 3 || elem.nodeType === 8) ) {
-			return;
-		}
-
-		// Event object or event type
-		var cache, exclusive, i, cur, old, ontype, special, handle, eventPath, bubbleType,
-			type = event.type || event,
-			namespaces = [];
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "!" ) >= 0 ) {
-			// Exclusive events trigger only for the exact event (no namespaces)
-			type = type.slice(0, -1);
-			exclusive = true;
-		}
-
-		if ( type.indexOf( "." ) >= 0 ) {
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split(".");
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-
-		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
-			// No jQuery handlers for this event type, and it can't have inline handlers
-			return;
-		}
-
-		// Caller can pass in an Event, Object, or just an event type string
-		event = typeof event === "object" ?
-			// jQuery.Event object
-			event[ jQuery.expando ] ? event :
-			// Object literal
-			new jQuery.Event( type, event ) :
-			// Just the event type (string)
-			new jQuery.Event( type );
-
-		event.type = type;
-		event.isTrigger = true;
-		event.exclusive = exclusive;
-		event.namespace = namespaces.join( "." );
-		event.namespace_re = event.namespace? new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)") : null;
-		ontype = type.indexOf( ":" ) < 0 ? "on" + type : "";
-
-		// Handle a global trigger
-		if ( !elem ) {
-
-			// TODO: Stop taunting the data cache; remove global events and always attach to document
-			cache = jQuery.cache;
-			for ( i in cache ) {
-				if ( cache[ i ].events && cache[ i ].events[ type ] ) {
-					jQuery.event.trigger( event, data, cache[ i ].handle.elem, true );
-				}
-			}
-			return;
-		}
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data != null ? jQuery.makeArray( data ) : [];
-		data.unshift( event );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		eventPath = [[ elem, special.bindType || type ]];
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			cur = rfocusMorph.test( bubbleType + type ) ? elem : elem.parentNode;
-			for ( old = elem; cur; cur = cur.parentNode ) {
-				eventPath.push([ cur, bubbleType ]);
-				old = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( old === (elem.ownerDocument || document) ) {
-				eventPath.push([ old.defaultView || old.parentWindow || window, bubbleType ]);
-			}
-		}
-
-		// Fire handlers on the event path
-		for ( i = 0; i < eventPath.length && !event.isPropagationStopped(); i++ ) {
-
-			cur = eventPath[i][0];
-			event.type = eventPath[i][1];
-
-			handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && jQuery._data( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-			// Note that this is a bare JS function and not a jQuery handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && jQuery.acceptData( cur ) && handle.apply && handle.apply( cur, data ) === false ) {
-				event.preventDefault();
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( (!special._default || special._default.apply( elem.ownerDocument, data ) === false) &&
-				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Can't use an .isFunction() check here because IE6/7 fails that test.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				// IE<9 dies on focus/blur to hidden element (#1486)
-				if ( ontype && elem[ type ] && ((type !== "focus" && type !== "blur") || event.target.offsetWidth !== 0) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					old = elem[ ontype ];
-
-					if ( old ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( old ) {
-						elem[ ontype ] = old;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event || window.event );
-
-		var i, j, cur, ret, selMatch, matched, matches, handleObj, sel, related,
-			handlers = ( (jQuery._data( this, "events" ) || {} )[ event.type ] || []),
-			delegateCount = handlers.delegateCount,
-			args = core_slice.call( arguments ),
-			run_all = !event.exclusive && !event.namespace,
-			special = jQuery.event.special[ event.type ] || {},
-			handlerQueue = [];
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[0] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers that should run if there are delegated events
-		// Avoid non-left-click bubbling in Firefox (#3861)
-		if ( delegateCount && !(event.button && event.type === "click") ) {
-
-			for ( cur = event.target; cur != this; cur = cur.parentNode || this ) {
-
-				// Don't process clicks (ONLY) on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.disabled !== true || event.type !== "click" ) {
-					selMatch = {};
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-						sel = handleObj.selector;
-
-						if ( selMatch[ sel ] === undefined ) {
-							selMatch[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) >= 0 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( selMatch[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push({ elem: cur, matches: matches });
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( handlers.length > delegateCount ) {
-			handlerQueue.push({ elem: this, matches: handlers.slice( delegateCount ) });
-		}
-
-		// Run delegates first; they may want to stop propagation beneath us
-		for ( i = 0; i < handlerQueue.length && !event.isPropagationStopped(); i++ ) {
-			matched = handlerQueue[ i ];
-			event.currentTarget = matched.elem;
-
-			for ( j = 0; j < matched.matches.length && !event.isImmediatePropagationStopped(); j++ ) {
-				handleObj = matched.matches[ j ];
-
-				// Triggered event must either 1) be non-exclusive and have no namespace, or
-				// 2) have namespace(s) a subset or equal to those in the bound event (both can have no namespace).
-				if ( run_all || (!event.namespace && !handleObj.namespace) || event.namespace_re && event.namespace_re.test( handleObj.namespace ) ) {
-
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-
-					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-							.apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	// *** attrChange attrName relatedNode srcElement  are not normalized, non-W3C, deprecated, will be removed in 1.8 ***
-	props: "attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split(" "),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: "button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button,
-				fromElement = original.fromElement;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add relatedTarget, if necessary
-			if ( !event.relatedTarget && fromElement ) {
-				event.relatedTarget = fromElement === event.target ? original.toElement : fromElement;
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop,
-			originalEvent = event,
-			fixHook = jQuery.event.fixHooks[ event.type ] || {},
-			copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = jQuery.Event( originalEvent );
-
-		for ( i = copy.length; i; ) {
-			prop = copy[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary (#1925, IE 6/7/8 & Safari2)
-		if ( !event.target ) {
-			event.target = originalEvent.srcElement || document;
-		}
-
-		// Target should not be a text node (#504, Safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// For mouse/key events, metaKey==false if it's undefined (#3368, #11328; IE6/7/8)
-		event.metaKey = !!event.metaKey;
-
-		return fixHook.filter? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-
-		focus: {
-			delegateType: "focusin"
-		},
-		blur: {
-			delegateType: "focusout"
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
-				}
-			},
-
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	},
-
-	simulate: function( type, elem, event, bubble ) {
-		// Piggyback on a donor event to simulate a different one.
-		// Fake originalEvent to avoid donor's stopPropagation, but if the
-		// simulated event prevents default then we do the same on the donor.
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{ type: type,
-				isSimulated: true,
-				originalEvent: {}
-			}
-		);
-		if ( bubble ) {
-			jQuery.event.trigger( e, null, elem );
-		} else {
-			jQuery.event.dispatch.call( elem, e );
-		}
-		if ( e.isDefaultPrevented() ) {
-			event.preventDefault();
-		}
-	}
-};
-
-// Some plugins are using, but it's undocumented/deprecated and will be removed.
-// The 1.7 special event interface should provide all the hooks needed now.
-jQuery.event.handle = jQuery.event.dispatch;
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} :
-	function( elem, type, handle ) {
-		var name = "on" + type;
-
-		if ( elem.detachEvent ) {
-
-			// #8545, #7054, preventing memory leaks for custom events in IE6-8 –
-			// detachEvent needed property on element, by name of that event, to properly expose it to GC
-			if ( typeof elem[ name ] === "undefined" ) {
-				elem[ name ] = null;
-			}
-
-			elem.detachEvent( name, handle );
-		}
-	};
-
-jQuery.Event = function( src, props ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !(this instanceof jQuery.Event) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = ( src.defaultPrevented || src.returnValue === false ||
-			src.getPreventDefault && src.getPreventDefault() ) ? returnTrue : returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj,
-				selector = handleObj.selector;
-
-			// For mousenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-});
-
-// IE submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Lazy-add a submit handler when a descendant form may potentially be submitted
-			jQuery.event.add( this, "click._submit keypress._submit", function( e ) {
-				// Node name check avoids a VML-related crash in IE (#9807)
-				var elem = e.target,
-					form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? elem.form : undefined;
-				if ( form && !jQuery._data( form, "_submit_attached" ) ) {
-					jQuery.event.add( form, "submit._submit", function( event ) {
-						event._submit_bubble = true;
-					});
-					jQuery._data( form, "_submit_attached", true );
-				}
-			});
-			// return undefined since we don't need an event listener
-		},
-
-		postDispatch: function( event ) {
-			// If form was submitted by the user, bubble the event up the tree
-			if ( event._submit_bubble ) {
-				delete event._submit_bubble;
-				if ( this.parentNode && !event.isTrigger ) {
-					jQuery.event.simulate( "submit", this.parentNode, event, true );
-				}
-			}
-		},
-
-		teardown: function() {
-			// Only need this for delegated form submit events
-			if ( jQuery.nodeName( this, "form" ) ) {
-				return false;
-			}
-
-			// Remove delegated handlers; cleanData eventually reaps submit handlers attached above
-			jQuery.event.remove( this, "._submit" );
-		}
-	};
-}
-
-// IE change delegation and checkbox/radio fix
-if ( !jQuery.support.changeBubbles ) {
-
-	jQuery.event.special.change = {
-
-		setup: function() {
-
-			if ( rformElems.test( this.nodeName ) ) {
-				// IE doesn't fire change on a check/radio until blur; trigger it on click
-				// after a propertychange. Eat the blur-change in special.change.handle.
-				// This still fires onchange a second time for check/radio after blur.
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					jQuery.event.add( this, "propertychange._change", function( event ) {
-						if ( event.originalEvent.propertyName === "checked" ) {
-							this._just_changed = true;
-						}
-					});
-					jQuery.event.add( this, "click._change", function( event ) {
-						if ( this._just_changed && !event.isTrigger ) {
-							this._just_changed = false;
-						}
-						// Allow triggered, simulated change events (#11500)
-						jQuery.event.simulate( "change", this, event, true );
-					});
-				}
-				return false;
-			}
-			// Delegated event; lazy-add a change handler on descendant inputs
-			jQuery.event.add( this, "beforeactivate._change", function( e ) {
-				var elem = e.target;
-
-				if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "_change_attached" ) ) {
-					jQuery.event.add( elem, "change._change", function( event ) {
-						if ( this.parentNode && !event.isSimulated && !event.isTrigger ) {
-							jQuery.event.simulate( "change", this.parentNode, event, true );
-						}
-					});
-					jQuery._data( elem, "_change_attached", true );
-				}
-			});
-		},
-
-		handle: function( event ) {
-			var elem = event.target;
-
-			// Swallow native change events from checkbox/radio, we already triggered them above
-			if ( this !== elem || event.isSimulated || event.isTrigger || (elem.type !== "radio" && elem.type !== "checkbox") ) {
-				return event.handleObj.handler.apply( this, arguments );
-			}
-		},
-
-		teardown: function() {
-			jQuery.event.remove( this, "._change" );
-
-			return !rformElems.test( this.nodeName );
-		}
-	};
-}
-
-// Create "bubbling" focus and blur events
-if ( !jQuery.support.focusinBubbles ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler while someone wants focusin/focusout
-		var attaches = 0,
-			handler = function( event ) {
-				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
-			};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( attaches++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			},
-			teardown: function() {
-				if ( --attaches === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-	});
-}
-
-jQuery.fn.extend({
-
-	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
-		var origFn, type;
-
-		// Types can be a map of types/handlers
-		if ( typeof types === "object" ) {
-			// ( types-Object, selector, data )
-			if ( typeof selector !== "string" ) { // && selector != null
-				// ( types-Object, data )
-				data = data || selector;
-				selector = undefined;
-			}
-			for ( type in types ) {
-				this.on( type, selector, data, types[ type ], one );
-			}
-			return this;
-		}
-
-		if ( data == null && fn == null ) {
-			// ( types, fn )
-			fn = selector;
-			data = selector = undefined;
-		} else if ( fn == null ) {
-			if ( typeof selector === "string" ) {
-				// ( types, selector, fn )
-				fn = data;
-				data = undefined;
-			} else {
-				// ( types, data, fn )
-				fn = data;
-				data = selector;
-				selector = undefined;
-			}
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		} else if ( !fn ) {
-			return this;
-		}
-
-		if ( one === 1 ) {
-			origFn = fn;
-			fn = function( event ) {
-				// Can use an empty set, since event contains the info
-				jQuery().off( event );
-				return origFn.apply( this, arguments );
-			};
-			// Use same guid so caller can remove using origFn
-			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-		}
-		return this.each( function() {
-			jQuery.event.add( this, types, fn, data, selector );
-		});
-	},
-	one: function( types, selector, data, fn ) {
-		return this.on( types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each(function() {
-			jQuery.event.remove( this, types, fn, selector );
-		});
-	},
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	live: function( types, data, fn ) {
-		jQuery( this.context ).on( types, this.selector, data, fn );
-		return this;
-	},
-	die: function( types, fn ) {
-		jQuery( this.context ).off( types, this.selector || "**", fn );
-		return this;
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ? this.off( selector, "**" ) : this.off( types, selector || "**", fn );
-	},
-
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			return jQuery.event.trigger( type, data, this[0], true );
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			guid = fn.guid || jQuery.guid++,
-			i = 0,
-			toggler = function( event ) {
-				// Figure out which function to execute
-				var lastToggle = ( jQuery._data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-				jQuery._data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-				// Make sure that clicks stop
-				event.preventDefault();
-
-				// and execute the function
-				return args[ lastToggle ].apply( this, arguments ) || false;
-			};
-
-		// link all the functions, so any of them can unbind this click handler
-		toggler.guid = guid;
-		while ( i < args.length ) {
-			args[ i++ ].guid = guid;
-		}
-
-		return this.click( toggler );
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( rkeyEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.keyHooks;
-	}
-
-	if ( rmouseEvent.test( name ) ) {
-		jQuery.event.fixHooks[ name ] = jQuery.event.mouseHooks;
-	}
-});
-/*!
- * Sizzle CSS Selector Engine
- * Copyright 2012 jQuery Foundation and other contributors
- * Released under the MIT license
- * http://sizzlejs.com/
- */
-(function( window, undefined ) {
-
-var cachedruns,
-	assertGetIdNotName,
-	Expr,
-	getText,
-	isXML,
-	contains,
-	compile,
-	sortOrder,
-	hasDuplicate,
-	outermostContext,
-
-	baseHasDuplicate = true,
-	strundefined = "undefined",
-
-	expando = ( "sizcache" + Math.random() ).replace( ".", "" ),
-
-	Token = String,
-	document = window.document,
-	docElem = document.documentElement,
-	dirruns = 0,
-	done = 0,
-	pop = [].pop,
-	push = [].push,
-	slice = [].slice,
-	// Use a stripped-down indexOf if a native one is unavailable
-	indexOf = [].indexOf || function( elem ) {
-		var i = 0,
-			len = this.length;
-		for ( ; i < len; i++ ) {
-			if ( this[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	// Augment a function for special use by Sizzle
-	markFunction = function( fn, value ) {
-		fn[ expando ] = value == null || value;
-		return fn;
-	},
-
-	createCache = function() {
-		var cache = {},
-			keys = [];
-
-		return markFunction(function( key, value ) {
-			// Only keep the most recent entries
-			if ( keys.push( key ) > Expr.cacheLength ) {
-				delete cache[ keys.shift() ];
-			}
-
-			return (cache[ key ] = value);
-		}, cache );
-	},
-
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-
-	// Regex
-
-	// Whitespace characters http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-	// http://www.w3.org/TR/css3-syntax/#characters
-	characterEncoding = "(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",
-
-	// Loosely modeled on CSS identifier characters
-	// An unquoted value should be a CSS identifier (http://www.w3.org/TR/css3-selectors/#attribute-selectors)
-	// Proper syntax: http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = characterEncoding.replace( "w", "w#" ),
-
-	// Acceptable operators http://www.w3.org/TR/selectors/#attribute-selectors
-	operators = "([*^$|!~]?=)",
-	attributes = "\\[" + whitespace + "*(" + characterEncoding + ")" + whitespace +
-		"*(?:" + operators + whitespace + "*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|(" + identifier + ")|)|)" + whitespace + "*\\]",
-
-	// Prefer arguments not in parens/brackets,
-	//   then attribute selectors and non-pseudos (denoted by :),
-	//   then anything else
-	// These preferences are here to reduce the number of selectors
-	//   needing tokenize in the PSEUDO preFilter
-	pseudos = ":(" + characterEncoding + ")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:" + attributes + ")|[^:]|\\\\.)*|.*))\\)|)",
-
-	// For matchExpr.POS and matchExpr.needsContext
-	pos = ":(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
-		"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([\\x20\\t\\r\\n\\f>+~])" + whitespace + "*" ),
-	rpseudo = new RegExp( pseudos ),
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,
-
-	rnot = /^:not/,
-	rsibling = /[\x20\t\r\n\f]*[+~]/,
-	rendsWithNot = /:not\($/,
-
-	rheader = /h\d/i,
-	rinputs = /input|select|textarea|button/i,
-
-	rbackslash = /\\(?!\\)/g,
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + characterEncoding + ")" ),
-		"CLASS": new RegExp( "^\\.(" + characterEncoding + ")" ),
-		"NAME": new RegExp( "^\\[name=['\"]?(" + characterEncoding + ")['\"]?\\]" ),
-		"TAG": new RegExp( "^(" + characterEncoding.replace( "w", "w*" ) + ")" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"POS": new RegExp( pos, "i" ),
-		"CHILD": new RegExp( "^:(only|nth|first|last)-child(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		// For use in libraries implementing .is()
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|" + pos, "i" )
-	},
-
-	// Support
-
-	// Used for testing something on an element
-	assert = function( fn ) {
-		var div = document.createElement("div");
-
-		try {
-			return fn( div );
-		} catch (e) {
-			return false;
-		} finally {
-			// release memory in IE
-			div = null;
-		}
-	},
-
-	// Check if getElementsByTagName("*") returns only elements
-	assertTagNameNoComments = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	}),
-
-	// Check if getAttribute returns normalized href attributes
-	assertHrefNotNormalized = assert(function( div ) {
-		div.innerHTML = "<a href='#'></a>";
-		return div.firstChild && typeof div.firstChild.getAttribute !== strundefined &&
-			div.firstChild.getAttribute("href") === "#";
-	}),
-
-	// Check if attributes should be retrieved by attribute nodes
-	assertAttributes = assert(function( div ) {
-		div.innerHTML = "<select></select>";
-		var type = typeof div.lastChild.getAttribute("multiple");
-		// IE8 returns a string for some attributes even when not present
-		return type !== "boolean" && type !== "string";
-	}),
-
-	// Check if getElementsByClassName can be trusted
-	assertUsableClassName = assert(function( div ) {
-		// Opera can't find a second classname (in 9.6)
-		div.innerHTML = "<div class='hidden e'></div><div class='hidden'></div>";
-		if ( !div.getElementsByClassName || !div.getElementsByClassName("e").length ) {
-			return false;
-		}
-
-		// Safari 3.2 caches class attributes and doesn't catch changes
-		div.lastChild.className = "e";
-		return div.getElementsByClassName("e").length === 2;
-	}),
-
-	// Check if getElementById returns elements by name
-	// Check if getElementsByName privileges form controls or returns elements by ID
-	assertUsableName = assert(function( div ) {
-		// Inject content
-		div.id = expando + 0;
-		div.innerHTML = "<a name='" + expando + "'></a><div name='" + expando + "'></div>";
-		docElem.insertBefore( div, docElem.firstChild );
-
-		// Test
-		var pass = document.getElementsByName &&
-			// buggy browsers will return fewer than the correct 2
-			document.getElementsByName( expando ).length === 2 +
-			// buggy browsers will return more than the correct 0
-			document.getElementsByName( expando + 0 ).length;
-		assertGetIdNotName = !document.getElementById( expando );
-
-		// Cleanup
-		docElem.removeChild( div );
-
-		return pass;
-	});
-
-// If slice is not available, provide a backup
-try {
-	slice.call( docElem.childNodes, 0 )[0].nodeType;
-} catch ( e ) {
-	slice = function( i ) {
-		var elem,
-			results = [];
-		for ( ; (elem = this[i]); i++ ) {
-			results.push( elem );
-		}
-		return results;
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
-	var match, elem, xml, m,
-		nodeType = context.nodeType;
-
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	if ( nodeType !== 1 && nodeType !== 9 ) {
-		return [];
-	}
-
-	xml = isXML( context );
-
-	if ( !xml && !seed ) {
-		if ( (match = rquickExpr.exec( selector )) ) {
-			// Speed-up: Sizzle("#ID")
-			if ( (m = match[1]) ) {
-				if ( nodeType === 9 ) {
-					elem = context.getElementById( m );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE, Opera, and Webkit return items
-						// by name instead of ID
-						if ( elem.id === m ) {
-							results.push( elem );
-							return results;
-						}
-					} else {
-						return results;
-					}
-				} else {
-					// Context is not a document
-					if ( context.ownerDocument && (elem = context.ownerDocument.getElementById( m )) &&
-						contains( context, elem ) && elem.id === m ) {
-						results.push( elem );
-						return results;
-					}
-				}
-
-			// Speed-up: Sizzle("TAG")
-			} else if ( match[2] ) {
-				push.apply( results, slice.call(context.getElementsByTagName( selector ), 0) );
-				return results;
-
-			// Speed-up: Sizzle(".CLASS")
-			} else if ( (m = match[3]) && assertUsableClassName && context.getElementsByClassName ) {
-				push.apply( results, slice.call(context.getElementsByClassName( m ), 0) );
-				return results;
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed, xml );
-}
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	return Sizzle( expr, null, null, [ elem ] ).length > 0;
-};
-
-// Returns a function to use in pseudos for input types
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for buttons
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-// Returns a function to use in pseudos for positionals
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( nodeType ) {
-		if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-			// Use textContent for elements
-			// innerText usage removed for consistency of new lines (see #11153)
-			if ( typeof elem.textContent === "string" ) {
-				return elem.textContent;
-			} else {
-				// Traverse its children
-				for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-					ret += getText( elem );
-				}
-			}
-		} else if ( nodeType === 3 || nodeType === 4 ) {
-			return elem.nodeValue;
-		}
-		// Do not include comment or processing instruction nodes
-	} else {
-
-		// If no nodeType, this is expected to be an array
-		for ( ; (node = elem[i]); i++ ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	}
-	return ret;
-};
-
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-// Element contains another
-contains = Sizzle.contains = docElem.contains ?
-	function( a, b ) {
-		var adown = a.nodeType === 9 ? a.documentElement : a,
-			bup = b && b.parentNode;
-		return a === bup || !!( bup && bup.nodeType === 1 && adown.contains && adown.contains(bup) );
-	} :
-	docElem.compareDocumentPosition ?
-	function( a, b ) {
-		return b && !!( a.compareDocumentPosition( b ) & 16 );
-	} :
-	function( a, b ) {
-		while ( (b = b.parentNode) ) {
-			if ( b === a ) {
-				return true;
-			}
-		}
-		return false;
-	};
-
-Sizzle.attr = function( elem, name ) {
-	var val,
-		xml = isXML( elem );
-
-	if ( !xml ) {
-		name = name.toLowerCase();
-	}
-	if ( (val = Expr.attrHandle[ name ]) ) {
-		return val( elem );
-	}
-	if ( xml || assertAttributes ) {
-		return elem.getAttribute( name );
-	}
-	val = elem.getAttributeNode( name );
-	return val ?
-		typeof elem[ name ] === "boolean" ?
-			elem[ name ] ? name : null :
-			val.specified ? val.value : null :
-		null;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	// IE6/7 return a modified href
-	attrHandle: assertHrefNotNormalized ?
-		{} :
-		{
-			"href": function( elem ) {
-				return elem.getAttribute( "href", 2 );
-			},
-			"type": function( elem ) {
-				return elem.getAttribute("type");
-			}
-		},
-
-	find: {
-		"ID": assertGetIdNotName ?
-			function( id, context, xml ) {
-				if ( typeof context.getElementById !== strundefined && !xml ) {
-					var m = context.getElementById( id );
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					return m && m.parentNode ? [m] : [];
-				}
-			} :
-			function( id, context, xml ) {
-				if ( typeof context.getElementById !== strundefined && !xml ) {
-					var m = context.getElementById( id );
-
-					return m ?
-						m.id === id || typeof m.getAttributeNode !== strundefined && m.getAttributeNode("id").value === id ?
-							[m] :
-							undefined :
-						[];
-				}
-			},
-
-		"TAG": assertTagNameNoComments ?
-			function( tag, context ) {
-				if ( typeof context.getElementsByTagName !== strundefined ) {
-					return context.getElementsByTagName( tag );
-				}
-			} :
-			function( tag, context ) {
-				var results = context.getElementsByTagName( tag );
-
-				// Filter out possible comments
-				if ( tag === "*" ) {
-					var elem,
-						tmp = [],
-						i = 0;
-
-					for ( ; (elem = results[i]); i++ ) {
-						if ( elem.nodeType === 1 ) {
-							tmp.push( elem );
-						}
-					}
-
-					return tmp;
-				}
-				return results;
-			},
-
-		"NAME": assertUsableName && function( tag, context ) {
-			if ( typeof context.getElementsByName !== strundefined ) {
-				return context.getElementsByName( name );
-			}
-		},
-
-		"CLASS": assertUsableClassName && function( className, context, xml ) {
-			if ( typeof context.getElementsByClassName !== strundefined && !xml ) {
-				return context.getElementsByClassName( className );
-			}
-		}
-	},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( rbackslash, "" );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[4] || match[5] || "" ).replace( rbackslash, "" );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				3 xn-component of xn+y argument ([+-]?\d*n|)
-				4 sign of xn-component
-				5 x of xn-component
-				6 sign of y-component
-				7 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1] === "nth" ) {
-				// nth-child requires argument
-				if ( !match[2] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[3] = +( match[3] ? match[4] + (match[5] || 1) : 2 * ( match[2] === "even" || match[2] === "odd" ) );
-				match[4] = +( ( match[6] + match[7] ) || match[2] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[2] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var unquoted, excess;
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			if ( match[3] ) {
-				match[2] = match[3];
-			} else if ( (unquoted = match[4]) ) {
-				// Only check arguments that contain a pseudo
-				if ( rpseudo.test(unquoted) &&
-					// Get excess from tokenize (recursively)
-					(excess = tokenize( unquoted, true )) &&
-					// advance to the next closing parenthesis
-					(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-					// excess is a negative index
-					unquoted = unquoted.slice( 0, excess );
-					match[0] = match[0].slice( 0, excess );
-				}
-				match[2] = unquoted;
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-		"ID": assertGetIdNotName ?
-			function( id ) {
-				id = id.replace( rbackslash, "" );
-				return function( elem ) {
-					return elem.getAttribute("id") === id;
-				};
-			} :
-			function( id ) {
-				id = id.replace( rbackslash, "" );
-				return function( elem ) {
-					var node = typeof elem.getAttributeNode !== strundefined && elem.getAttributeNode("id");
-					return node && node.value === id;
-				};
-			},
-
-		"TAG": function( nodeName ) {
-			if ( nodeName === "*" ) {
-				return function() { return true; };
-			}
-			nodeName = nodeName.replace( rbackslash, "" ).toLowerCase();
-
-			return function( elem ) {
-				return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-			};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ expando ][ className ];
-			if ( !pattern ) {
-				pattern = classCache( className, new RegExp("(^|" + whitespace + ")" + className + "(" + whitespace + "|$)") );
-			}
-			return function( elem ) {
-				return pattern.test( elem.className || (typeof elem.getAttribute !== strundefined && elem.getAttribute("class")) || "" );
-			};
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem, context ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.substr( result.length - check.length ) === check :
-					operator === "~=" ? ( " " + result + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.substr( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, argument, first, last ) {
-
-			if ( type === "nth" ) {
-				return function( elem ) {
-					var node, diff,
-						parent = elem.parentNode;
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-
-					if ( parent ) {
-						diff = 0;
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								diff++;
-								if ( elem === node ) {
-									break;
-								}
-							}
-						}
-					}
-
-					// Incorporate the offset (or cast to NaN), then check against cycle size
-					diff -= last;
-					return diff === first || ( diff % first === 0 && diff / first >= 0 );
-				};
-			}
-
-			return function( elem ) {
-				var node = elem;
-
-				switch ( type ) {
-					case "only":
-					case "first":
-						while ( (node = node.previousSibling) ) {
-							if ( node.nodeType === 1 ) {
-								return false;
-							}
-						}
-
-						if ( type === "first" ) {
-							return true;
-						}
-
-						node = elem;
-
-						/* falls through */
-					case "last":
-						while ( (node = node.nextSibling) ) {
-							if ( node.nodeType === 1 ) {
-								return false;
-							}
-						}
-
-						return true;
-				}
-			};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf.call( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is only affected by element nodes and content nodes(including text(3), cdata(4)),
-			//   not comment, processing instructions, or others
-			// Thanks to Diego Perini for the nodeName shortcut
-			//   Greater than "@" means alpha characters (specifically not starting with "#" or "?")
-			var nodeType;
-			elem = elem.firstChild;
-			while ( elem ) {
-				if ( elem.nodeName > "@" || (nodeType = elem.nodeType) === 3 || nodeType === 4 ) {
-					return false;
-				}
-				elem = elem.nextSibling;
-			}
-			return true;
-		},
-
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"text": function( elem ) {
-			var type, attr;
-			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc)
-			// use getAttribute instead to test this case
-			return elem.nodeName.toLowerCase() === "input" &&
-				(type = elem.type) === "text" &&
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === type );
-		},
-
-		// Input types
-		"radio": createInputPseudo("radio"),
-		"checkbox": createInputPseudo("checkbox"),
-		"file": createInputPseudo("file"),
-		"password": createInputPseudo("password"),
-		"image": createInputPseudo("image"),
-
-		"submit": createButtonPseudo("submit"),
-		"reset": createButtonPseudo("reset"),
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"focus": function( elem ) {
-			var doc = elem.ownerDocument;
-			return elem === doc.activeElement && (!doc.hasFocus || doc.hasFocus()) && !!(elem.type || elem.href);
-		},
-
-		"active": function( elem ) {
-			return elem === elem.ownerDocument.activeElement;
-		},
-
-		// Positional types
-		"first": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = 0; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = 1; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = argument < 0 ? argument + length : argument; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			for ( var i = argument < 0 ? argument + length : argument; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-function siblingCheck( a, b, ret ) {
-	if ( a === b ) {
-		return ret;
-	}
-
-	var cur = a.nextSibling;
-
-	while ( cur ) {
-		if ( cur === b ) {
-			return -1;
-		}
-
-		cur = cur.nextSibling;
-	}
-
-	return 1;
-}
-
-sortOrder = docElem.compareDocumentPosition ?
-	function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		return ( !a.compareDocumentPosition || !b.compareDocumentPosition ?
-			a.compareDocumentPosition :
-			a.compareDocumentPosition(b) & 4
-		) ? -1 : 1;
-	} :
-	function( a, b ) {
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// Fallback to using sourceIndex (in IE) if it's available on both nodes
-		} else if ( a.sourceIndex && b.sourceIndex ) {
-			return a.sourceIndex - b.sourceIndex;
-		}
-
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-// Always assume the presence of duplicates if sort doesn't
-// pass them to our comparison function (as in Google Chrome).
-[0, 0].sort( sortOrder );
-baseHasDuplicate = !hasDuplicate;
-
-// Document sorting and removing duplicates
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		i = 1;
-
-	hasDuplicate = baseHasDuplicate;
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		for ( ; (elem = results[i]); i++ ) {
-			if ( elem === results[ i - 1 ] ) {
-				results.splice( i--, 1 );
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-function tokenize( selector, parseOnly ) {
-	var matched, match, tokens, type, soFar, groups, preFilters,
-		cached = tokenCache[ expando ][ selector ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				soFar = soFar.slice( match[0].length );
-			}
-			groups.push( tokens = [] );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			tokens.push( matched = new Token( match.shift() ) );
-			soFar = soFar.slice( matched.length );
-
-			// Cast descendant combinators to space
-			matched.type = match[0].replace( rtrim, " " );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				// The last two arguments here are (context, xml) for backCompat
-				(match = preFilters[ type ]( match, document, true ))) ) {
-
-				tokens.push( matched = new Token( match.shift() ) );
-				soFar = soFar.slice( matched.length );
-				matched.type = type;
-				matched.matches = match;
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && combinator.dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( checkNonElements || elem.nodeType === 1  ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			// We can't set arbitrary data on XML nodes, so they don't benefit from dir caching
-			if ( !xml ) {
-				var cache,
-					dirkey = dirruns + " " + doneName + " ",
-					cachedkey = dirkey + cachedruns;
-				while ( (elem = elem[ dir ]) ) {
-					if ( checkNonElements || elem.nodeType === 1 ) {
-						if ( (cache = elem[ expando ]) === cachedkey ) {
-							return elem.sizset;
-						} else if ( typeof cache === "string" && cache.indexOf(dirkey) === 0 ) {
-							if ( elem.sizset ) {
-								return elem;
-							}
-						} else {
-							elem[ expando ] = cachedkey;
-							if ( matcher( elem, context, xml ) ) {
-								elem.sizset = true;
-								return elem;
-							}
-							elem.sizset = false;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( checkNonElements || elem.nodeType === 1 ) {
-						if ( matcher( elem, context, xml ) ) {
-							return elem;
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		// Positional selectors apply to seed elements, so it is invalid to follow them with relative ones
-		if ( seed && postFinder ) {
-			return;
-		}
-
-		var i, elem, postFilterIn,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [], seed ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			postFilterIn = condense( matcherOut, postMap );
-			postFilter( postFilterIn, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = postFilterIn.length;
-			while ( i-- ) {
-				if ( (elem = postFilterIn[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		// Keep seed and results synchronized
-		if ( seed ) {
-			// Ignore postFinder because it can't coexist with seed
-			i = preFilter && matcherOut.length;
-			while ( i-- ) {
-				if ( (elem = matcherOut[i]) ) {
-					seed[ preMap[i] ] = !(results[ preMap[i] ] = elem);
-				}
-			}
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf.call( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			return ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
-		} else {
-			// The concatenated values are (context, xml) for backCompat
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && tokens.slice( 0, i - 1 ).join("").replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && tokens.join("")
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, expandContext ) {
-			var elem, j, matcher,
-				setMatched = [],
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				outermost = expandContext != null,
-				contextBackup = outermostContext,
-				// We must always have either seed elements or context
-				elems = seed || byElement && Expr.find["TAG"]( "*", expandContext && context.parentNode || context ),
-				// Nested matchers should use non-integer dirruns
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.E);
-
-			if ( outermost ) {
-				outermostContext = context !== document && context;
-				cachedruns = superMatcher.el;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			for ( ; (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					for ( j = 0; (matcher = elementMatchers[j]); j++ ) {
-						if ( matcher( elem, context, xml ) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-						cachedruns = ++superMatcher.el;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// Apply set filters to unmatched elements
-			matchedCount += i;
-			if ( bySet && i !== matchedCount ) {
-				for ( j = 0; (matcher = setMatchers[j]); j++ ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	superMatcher.el = 0;
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, group /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ expando ][ selector ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !group ) {
-			group = tokenize( selector );
-		}
-		i = group.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( group[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-	}
-	return cached;
-};
-
-function multipleContexts( selector, contexts, results, seed ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results, seed );
-	}
-	return results;
-}
-
-function select( selector, context, results, seed, xml ) {
-	var i, tokens, token, type, find,
-		match = tokenize( selector ),
-		j = match.length;
-
-	if ( !seed ) {
-		// Try to minimize operations if there is only one group
-		if ( match.length === 1 ) {
-
-			// Take a shortcut and set the context if the root selector is an ID
-			tokens = match[0] = match[0].slice( 0 );
-			if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-					context.nodeType === 9 && !xml &&
-					Expr.relative[ tokens[1].type ] ) {
-
-				context = Expr.find["ID"]( token.matches[0].replace( rbackslash, "" ), context, xml )[0];
-				if ( !context ) {
-					return results;
-				}
-
-				selector = selector.slice( tokens.shift().length );
-			}
-
-			// Fetch a seed set for right-to-left matching
-			for ( i = matchExpr["POS"].test( selector ) ? -1 : tokens.length - 1; i >= 0; i-- ) {
-				token = tokens[i];
-
-				// Abort if we hit a combinator
-				if ( Expr.relative[ (type = token.type) ] ) {
-					break;
-				}
-				if ( (find = Expr.find[ type ]) ) {
-					// Search, expanding context for leading sibling combinators
-					if ( (seed = find(
-						token.matches[0].replace( rbackslash, "" ),
-						rsibling.test( tokens[0].type ) && context.parentNode || context,
-						xml
-					)) ) {
-
-						// If seed is empty or no tokens remain, we can return early
-						tokens.splice( i, 1 );
-						selector = seed.length && tokens.join("");
-						if ( !selector ) {
-							push.apply( results, slice.call( seed, 0 ) );
-							return results;
-						}
-
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function
-	// Provide `match` to avoid retokenization if we modified the selector above
-	compile( selector, match )(
-		seed,
-		context,
-		xml,
-		results,
-		rsibling.test( selector )
-	);
-	return results;
-}
-
-if ( document.querySelectorAll ) {
-	(function() {
-		var disconnectedMatch,
-			oldSelect = select,
-			rescape = /'|\\/g,
-			rattributeQuotes = /\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,
-
-			// qSa(:focus) reports false when true (Chrome 21),
-			// A support test would require too much code (would include document ready)
-			rbuggyQSA = [":focus"],
-
-			// matchesSelector(:focus) reports false when true (Chrome 21),
-			// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-			// A support test would require too much code (would include document ready)
-			// just skip matchesSelector for :active
-			rbuggyMatches = [ ":active", ":focus" ],
-			matches = docElem.matchesSelector ||
-				docElem.mozMatchesSelector ||
-				docElem.webkitMatchesSelector ||
-				docElem.oMatchesSelector ||
-				docElem.msMatchesSelector;
-
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explictly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			div.innerHTML = "<select><option selected=''></option></select>";
-
-			// IE8 - Some boolean attributes are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:checked|disabled|ismap|multiple|readonly|selected|value)" );
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here (do not put tests after this one)
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-		});
-
-		assert(function( div ) {
-
-			// Opera 10-12/IE9 - ^= $= *= and empty values
-			// Should not select anything
-			div.innerHTML = "<p test=''></p>";
-			if ( div.querySelectorAll("[test^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:\"\"|'')" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here (do not put tests after this one)
-			div.innerHTML = "<input type='hidden'/>";
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push(":enabled", ":disabled");
-			}
-		});
-
-		// rbuggyQSA always contains :focus, so no need for a length check
-		rbuggyQSA = /* rbuggyQSA.length && */ new RegExp( rbuggyQSA.join("|") );
-
-		select = function( selector, context, results, seed, xml ) {
-			// Only use querySelectorAll when not filtering,
-			// when this is not xml,
-			// and when no QSA bugs apply
-			if ( !seed && !xml && (!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-				var groups, i,
-					old = true,
-					nid = expando,
-					newContext = context,
-					newSelector = context.nodeType === 9 && selector;
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					groups = tokenize( selector );
-
-					if ( (old = context.getAttribute("id")) ) {
-						nid = old.replace( rescape, "\\$&" );
-					} else {
-						context.setAttribute( "id", nid );
-					}
-					nid = "[id='" + nid + "'] ";
-
-					i = groups.length;
-					while ( i-- ) {
-						groups[i] = nid + groups[i].join("");
-					}
-					newContext = rsibling.test( selector ) && context.parentNode || context;
-					newSelector = groups.join(",");
-				}
-
-				if ( newSelector ) {
-					try {
-						push.apply( results, slice.call( newContext.querySelectorAll(
-							newSelector
-						), 0 ) );
-						return results;
-					} catch(qsaError) {
-					} finally {
-						if ( !old ) {
-							context.removeAttribute("id");
-						}
-					}
-				}
-			}
-
-			return oldSelect( selector, context, results, seed, xml );
-		};
-
-		if ( matches ) {
-			assert(function( div ) {
-				// Check to see if it's possible to do matchesSelector
-				// on a disconnected node (IE 9)
-				disconnectedMatch = matches.call( div, "div" );
-
-				// This should fail with an exception
-				// Gecko does not error, returns false instead
-				try {
-					matches.call( div, "[test!='']:sizzle" );
-					rbuggyMatches.push( "!=", pseudos );
-				} catch ( e ) {}
-			});
-
-			// rbuggyMatches always contains :active and :focus, so no need for a length check
-			rbuggyMatches = /* rbuggyMatches.length && */ new RegExp( rbuggyMatches.join("|") );
-
-			Sizzle.matchesSelector = function( elem, expr ) {
-				// Make sure that attribute selectors are quoted
-				expr = expr.replace( rattributeQuotes, "='$1']" );
-
-				// rbuggyMatches always contains :active, so no need for an existence check
-				if ( !isXML( elem ) && !rbuggyMatches.test( expr ) && (!rbuggyQSA || !rbuggyQSA.test( expr )) ) {
-					try {
-						var ret = matches.call( elem, expr );
-
-						// IE 9's matchesSelector returns false on disconnected nodes
-						if ( ret || disconnectedMatch ||
-								// As well, disconnected nodes are said to be in a document
-								// fragment in IE 9
-								elem.document && elem.document.nodeType !== 11 ) {
-							return ret;
-						}
-					} catch(e) {}
-				}
-
-				return Sizzle( expr, null, null, [ elem ] ).length > 0;
-			};
-		}
-	})();
-}
-
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Back-compat
-function setFilters() {}
-Expr.filters = setFilters.prototype = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-// Override sizzle attribute retrieval
-Sizzle.attr = jQuery.attr;
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.pseudos;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})( window );
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prev(?:Until|All))/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	rneedsContext = jQuery.expr.match.needsContext,
-	// methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var i, l, length, n, r, ret,
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return jQuery( selector ).filter(function() {
-				for ( i = 0, l = self.length; i < l; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			});
-		}
-
-		ret = this.pushStack( "", "find", selector );
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( n = length; n < ret.length; n++ ) {
-					for ( r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var i,
-			targets = jQuery( target, this ),
-			len = targets.length;
-
-		return this.filter(function() {
-			for ( i = 0; i < len; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-
-	is: function( selector ) {
-		return !!selector && (
-			typeof selector === "string" ?
-				// If this is a positional/relative selector, check membership in the returned set
-				// so $("p:first").is("p:last") won't return true for a doc with two "p".
-				rneedsContext.test( selector ) ?
-					jQuery( selector, this.context ).index( this[0] ) >= 0 :
-					jQuery.filter( selector, this ).length > 0 :
-				this.filter( selector ).length > 0 );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			ret = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur && cur.ownerDocument && cur !== context && cur.nodeType !== 11 ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-				}
-				cur = cur.parentNode;
-			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
-
-		return this.pushStack( ret, "closest", selectors );
-	},
-
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[0] && this[0].parentNode ) ? this.prevAll().length : -1;
-		}
-
-		// index in selector
-		if ( typeof elem === "string" ) {
-			return jQuery.inArray( this[0], jQuery( elem ) );
-		}
-
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context ) :
-				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter(selector)
-		);
-	}
-});
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-function sibling( cur, dir ) {
-	do {
-		cur = cur[ dir ];
-	} while ( cur && cur.nodeType !== 1 );
-
-	return cur;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
-
-		if ( this.length > 1 && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, core_slice.call( arguments ).join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-
-	// Can't pass null or undefined to indexOf in Firefox 4
-	// Set to 0 to skip string check
-	qualifier = qualifier || 0;
-
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return ( elem === qualifier ) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return ( jQuery.inArray( elem, qualifier ) >= 0 ) === keep;
-	});
-}
-function createSafeFragment( document ) {
-	var list = nodeNames.split( "|" ),
-	safeFrag = document.createDocumentFragment();
-
-	if ( safeFrag.createElement ) {
-		while ( list.length ) {
-			safeFrag.createElement(
-				list.pop()
-			);
-		}
-	}
-	return safeFrag;
-}
-
-var nodeNames = "abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|" +
-		"header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",
-	rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnoInnerhtml = /<(?:script|style|link)/i,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	rnoshimcache = new RegExp("<(?:" + nodeNames + ")[\\s/>]", "i"),
-	rcheckableType = /^(?:checkbox|radio)$/,
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptType = /\/(java|ecma)script/i,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	},
-	safeFragment = createSafeFragment( document ),
-	fragmentDiv = safeFragment.appendChild( document.createElement("div") );
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags,
-// unless wrapped in a div with non-breaking characters in front of it.
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "X<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( value ) {
-		return jQuery.access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().append( ( this[0] && this[0].ownerDocument || document ).createTextNode( value ) );
-		}, null, value, arguments.length );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each(function(i) {
-			jQuery( this ).wrapAll( isFunction ? html.call(this, i) : html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( !isDisconnected( this[0] ) ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		}
-
-		if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			return this.pushStack( jQuery.merge( set, this ), "before", this.selector );
-		}
-	},
-
-	after: function() {
-		if ( !isDisconnected( this[0] ) ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		}
-
-		if ( arguments.length ) {
-			var set = jQuery.clean( arguments );
-			return this.pushStack( jQuery.merge( this, set ), "after", this.selector );
-		}
-	},
-
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-
-		return this;
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function () {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		});
-	},
-
-	html: function( value ) {
-		return jQuery.access( this, function( value ) {
-			var elem = this[0] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined ) {
-				return elem.nodeType === 1 ?
-					elem.innerHTML.replace( rinlinejQuery, "" ) :
-					undefined;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				( jQuery.support.htmlSerialize || !rnoshimcache.test( value )  ) &&
-				( jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value ) ) &&
-				!wrapMap[ ( rtagName.exec( value ) || ["", ""] )[1].toLowerCase() ] ) {
-
-				value = value.replace( rxhtmlTag, "<$1></$2>" );
-
-				try {
-					for (; i < l; i++ ) {
-						// Remove element nodes and prevent memory leaks
-						elem = this[i] || {};
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( elem.getElementsByTagName( "*" ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch(e) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function( value ) {
-		if ( !isDisconnected( this[0] ) ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		}
-
-		return this.length ?
-			this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
-			this;
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-
-		// Flatten any nested arrays
-		args = [].concat.apply( [], args );
-
-		var results, first, fragment, iNoClone,
-			i = 0,
-			value = args[0],
-			scripts = [],
-			l = this.length;
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && l > 1 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call( this, i, table ? self.html() : undefined );
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			results = jQuery.buildFragment( args, this, scripts );
-			fragment = results.fragment;
-			first = fragment.firstChild;
-
-			if ( fragment.childNodes.length === 1 ) {
-				fragment = first;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				// Use the original fragment for the last item instead of the first because it can end up
-				// being emptied incorrectly in certain situations (#8070).
-				// Fragments from the fragment cache must always be cloned and never used in place.
-				for ( iNoClone = results.cacheable || l - 1; i < l; i++ ) {
-					callback.call(
-						table && jQuery.nodeName( this[i], "table" ) ?
-							findOrAppend( this[i], "tbody" ) :
-							this[i],
-						i === iNoClone ?
-							fragment :
-							jQuery.clone( fragment, true, true )
-					);
-				}
-			}
-
-			// Fix #11809: Avoid leaking memory
-			fragment = first = null;
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, function( i, elem ) {
-					if ( elem.src ) {
-						if ( jQuery.ajax ) {
-							jQuery.ajax({
-								url: elem.src,
-								type: "GET",
-								dataType: "script",
-								async: false,
-								global: false,
-								"throws": true
-							});
-						} else {
-							jQuery.error("no ajax");
-						}
-					} else {
-						jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "" ) );
-					}
-
-					if ( elem.parentNode ) {
-						elem.parentNode.removeChild( elem );
-					}
-				});
-			}
-		}
-
-		return this;
-	}
-});
-
-function findOrAppend( elem, tag ) {
-	return elem.getElementsByTagName( tag )[0] || elem.appendChild( elem.ownerDocument.createElement( tag ) );
-}
-
-function cloneCopyEvent( src, dest ) {
-
-	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
-		return;
-	}
-
-	var type, i, l,
-		oldData = jQuery._data( src ),
-		curData = jQuery._data( dest, oldData ),
-		events = oldData.events;
-
-	if ( events ) {
-		delete curData.handle;
-		curData.events = {};
-
-		for ( type in events ) {
-			for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-				jQuery.event.add( dest, type, events[ type ][ i ] );
-			}
-		}
-	}
-
-	// make the cloned public data object a copy from the original
-	if ( curData.data ) {
-		curData.data = jQuery.extend( {}, curData.data );
-	}
-}
-
-function cloneFixAttributes( src, dest ) {
-	var nodeName;
-
-	// We do not need to do anything for non-Elements
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// clearAttributes removes the attributes, which we don't want,
-	// but also removes the attachEvent events, which we *do* want
-	if ( dest.clearAttributes ) {
-		dest.clearAttributes();
-	}
-
-	// mergeAttributes, in contrast, only merges back on the
-	// original attributes, not the events
-	if ( dest.mergeAttributes ) {
-		dest.mergeAttributes( src );
-	}
-
-	nodeName = dest.nodeName.toLowerCase();
-
-	if ( nodeName === "object" ) {
-		// IE6-10 improperly clones children of object elements using classid.
-		// IE10 throws NoModificationAllowedError if parent is null, #12132.
-		if ( dest.parentNode ) {
-			dest.outerHTML = src.outerHTML;
-		}
-
-		// This path appears unavoidable for IE9. When cloning an object
-		// element in IE9, the outerHTML strategy above is not sufficient.
-		// If the src has innerHTML and the destination does not,
-		// copy the src.innerHTML into the dest.innerHTML. #10324
-		if ( jQuery.support.html5Clone && (src.innerHTML && !jQuery.trim(dest.innerHTML)) ) {
-			dest.innerHTML = src.innerHTML;
-		}
-
-	} else if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		// IE6-8 fails to persist the checked state of a cloned checkbox
-		// or radio button. Worse, IE6-7 fail to give the cloned element
-		// a checked appearance if the defaultChecked value isn't also set
-
-		dest.defaultChecked = dest.checked = src.checked;
-
-		// IE6-7 get confused and end up setting the value of a cloned
-		// checkbox/radio button to an empty string instead of "on"
-		if ( dest.value !== src.value ) {
-			dest.value = src.value;
-		}
-
-	// IE6-8 fails to return the selected option to the default selected
-	// state when cloning options
-	} else if ( nodeName === "option" ) {
-		dest.selected = src.defaultSelected;
-
-	// IE6-8 fails to set the defaultValue to the correct value when
-	// cloning other types of input fields
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-
-	// IE blanks contents when cloning scripts
-	} else if ( nodeName === "script" && dest.text !== src.text ) {
-		dest.text = src.text;
-	}
-
-	// Event data gets referenced instead of copied if the expando
-	// gets copied too
-	dest.removeAttribute( jQuery.expando );
-}
-
-jQuery.buildFragment = function( args, context, scripts ) {
-	var fragment, cacheable, cachehit,
-		first = args[ 0 ];
-
-	// Set context from what may come in as undefined or a jQuery collection or a node
-	// Updated to fix #12266 where accessing context[0] could throw an exception in IE9/10 &
-	// also doubles as fix for #8950 where plain objects caused createDocumentFragment exception
-	context = context || document;
-	context = !context.nodeType && context[0] || context;
-	context = context.ownerDocument || context;
-
-	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	// Lastly, IE6,7,8 will not correctly reuse cached fragments that were created from unknown elems #10501
-	if ( args.length === 1 && typeof first === "string" && first.length < 512 && context === document &&
-		first.charAt(0) === "<" && !rnocache.test( first ) &&
-		(jQuery.support.checkClone || !rchecked.test( first )) &&
-		(jQuery.support.html5Clone || !rnoshimcache.test( first )) ) {
-
-		// Mark cacheable and look for a hit
-		cacheable = true;
-		fragment = jQuery.fragments[ first ];
-		cachehit = fragment !== undefined;
-	}
-
-	if ( !fragment ) {
-		fragment = context.createDocumentFragment();
-		jQuery.clean( args, context, fragment, scripts );
-
-		// Update the cache, but only store false
-		// unless this is a second parsing of the same content
-		if ( cacheable ) {
-			jQuery.fragments[ first ] = cachehit && fragment;
-		}
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			i = 0,
-			ret = [],
-			insert = jQuery( selector ),
-			l = insert.length,
-			parent = this.length === 1 && this[0].parentNode;
-
-		if ( (parent == null || parent && parent.nodeType === 11 && parent.childNodes.length === 1) && l === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-		} else {
-			for ( ; i < l; i++ ) {
-				elems = ( i > 0 ? this.clone(true) : this ).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
-			}
-
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-function getAll( elem ) {
-	if ( typeof elem.getElementsByTagName !== "undefined" ) {
-		return elem.getElementsByTagName( "*" );
-
-	} else if ( typeof elem.querySelectorAll !== "undefined" ) {
-		return elem.querySelectorAll( "*" );
-
-	} else {
-		return [];
-	}
-}
-
-// Used in clean, fixes the defaultChecked property
-function fixDefaultChecked( elem ) {
-	if ( rcheckableType.test( elem.type ) ) {
-		elem.defaultChecked = elem.checked;
-	}
-}
-
-jQuery.extend({
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var srcElements,
-			destElements,
-			i,
-			clone;
-
-		if ( jQuery.support.html5Clone || jQuery.isXMLDoc(elem) || !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) {
-			clone = elem.cloneNode( true );
-
-		// IE<=8 does not properly clone detached, unknown element nodes
-		} else {
-			fragmentDiv.innerHTML = elem.outerHTML;
-			fragmentDiv.removeChild( clone = fragmentDiv.firstChild );
-		}
-
-		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
-				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
-			// IE copies events bound via attachEvent when using cloneNode.
-			// Calling detachEvent on the clone will also remove the events
-			// from the original. In order to get around this, we use some
-			// proprietary methods to clear the events. Thanks to MooTools
-			// guys for this hotness.
-
-			cloneFixAttributes( elem, clone );
-
-			// Using Sizzle here is crazy slow, so we use getElementsByTagName instead
-			srcElements = getAll( elem );
-			destElements = getAll( clone );
-
-			// Weird iteration because IE will replace the length property
-			// with an element if you are cloning the body and one of the
-			// elements on the page has a name or id of "length"
-			for ( i = 0; srcElements[i]; ++i ) {
-				// Ensure that the destination node is not null; Fixes #9587
-				if ( destElements[i] ) {
-					cloneFixAttributes( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			cloneCopyEvent( elem, clone );
-
-			if ( deepDataAndEvents ) {
-				srcElements = getAll( elem );
-				destElements = getAll( clone );
-
-				for ( i = 0; srcElements[i]; ++i ) {
-					cloneCopyEvent( srcElements[i], destElements[i] );
-				}
-			}
-		}
-
-		srcElements = destElements = null;
-
-		// Return the cloned set
-		return clone;
-	},
-
-	clean: function( elems, context, fragment, scripts ) {
-		var i, j, elem, tag, wrap, depth, div, hasBody, tbody, len, handleScript, jsTags,
-			safe = context === document && safeFragment,
-			ret = [];
-
-		// Ensure that context is a document
-		if ( !context || typeof context.createDocumentFragment === "undefined" ) {
-			context = document;
-		}
-
-		// Use the already-created safe fragment if context permits
-		for ( i = 0; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" ) {
-				if ( !rhtml.test( elem ) ) {
-					elem = context.createTextNode( elem );
-				} else {
-					// Ensure a safe container in which to render the html
-					safe = safe || createSafeFragment( context );
-					div = context.createElement("div");
-					safe.appendChild( div );
-
-					// Fix "XHTML"-style tags in all browsers
-					elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-					// Go to html and back, then peel off extra wrappers
-					tag = ( rtagName.exec( elem ) || ["", ""] )[1].toLowerCase();
-					wrap = wrapMap[ tag ] || wrapMap._default;
-					depth = wrap[0];
-					div.innerHTML = wrap[1] + elem + wrap[2];
-
-					// Move to the right depth
-					while ( depth-- ) {
-						div = div.lastChild;
-					}
-
-					// Remove IE's autoinserted <tbody> from table fragments
-					if ( !jQuery.support.tbody ) {
-
-						// String was a <table>, *may* have spurious <tbody>
-						hasBody = rtbody.test(elem);
-							tbody = tag === "table" && !hasBody ?
-								div.firstChild && div.firstChild.childNodes :
-
-								// String was a bare <thead> or <tfoot>
-								wrap[1] === "<table>" && !hasBody ?
-									div.childNodes :
-									[];
-
-						for ( j = tbody.length - 1; j >= 0 ; --j ) {
-							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-								tbody[ j ].parentNode.removeChild( tbody[ j ] );
-							}
-						}
-					}
-
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-					}
-
-					elem = div.childNodes;
-
-					// Take out of fragment container (we need a fresh div each time)
-					div.parentNode.removeChild( div );
-				}
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				jQuery.merge( ret, elem );
-			}
-		}
-
-		// Fix #11356: Clear elements from safeFragment
-		if ( div ) {
-			elem = div = safe = null;
-		}
-
-		// Reset defaultChecked for any radios and checkboxes
-		// about to be appended to the DOM in IE 6/7 (#8060)
-		if ( !jQuery.support.appendChecked ) {
-			for ( i = 0; (elem = ret[i]) != null; i++ ) {
-				if ( jQuery.nodeName( elem, "input" ) ) {
-					fixDefaultChecked( elem );
-				} else if ( typeof elem.getElementsByTagName !== "undefined" ) {
-					jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
-				}
-			}
-		}
-
-		// Append elements to a provided document fragment
-		if ( fragment ) {
-			// Special handling of each script element
-			handleScript = function( elem ) {
-				// Check if we consider it executable
-				if ( !elem.type || rscriptType.test( elem.type ) ) {
-					// Detach the script and store it in the scripts array (if provided) or the fragment
-					// Return truthy to indicate that it has been handled
-					return scripts ?
-						scripts.push( elem.parentNode ? elem.parentNode.removeChild( elem ) : elem ) :
-						fragment.appendChild( elem );
-				}
-			};
-
-			for ( i = 0; (elem = ret[i]) != null; i++ ) {
-				// Check if we're done after handling an executable script
-				if ( !( jQuery.nodeName( elem, "script" ) && handleScript( elem ) ) ) {
-					// Append to fragment and handle embedded scripts
-					fragment.appendChild( elem );
-					if ( typeof elem.getElementsByTagName !== "undefined" ) {
-						// handleScript alters the DOM, so use jQuery.merge to ensure snapshot iteration
-						jsTags = jQuery.grep( jQuery.merge( [], elem.getElementsByTagName("script") ), handleScript );
-
-						// Splice the scripts into ret after their former ancestor and advance our index beyond them
-						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
-						i += jsTags.length;
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	cleanData: function( elems, /* internal */ acceptData ) {
-		var data, id, elem, type,
-			i = 0,
-			internalKey = jQuery.expando,
-			cache = jQuery.cache,
-			deleteExpando = jQuery.support.deleteExpando,
-			special = jQuery.event.special;
-
-		for ( ; (elem = elems[i]) != null; i++ ) {
-
-			if ( acceptData || jQuery.acceptData( elem ) ) {
-
-				id = elem[ internalKey ];
-				data = id && cache[ id ];
-
-				if ( data ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Remove cache only if it was not already removed by jQuery.event.remove
-					if ( cache[ id ] ) {
-
-						delete cache[ id ];
-
-						// IE does not allow us to delete expando properties from nodes,
-						// nor does it have a removeAttribute function on Document nodes;
-						// we must handle all of these cases
-						if ( deleteExpando ) {
-							delete elem[ internalKey ];
-
-						} else if ( elem.removeAttribute ) {
-							elem.removeAttribute( internalKey );
-
-						} else {
-							elem[ internalKey ] = null;
-						}
-
-						jQuery.deletedIds.push( id );
-					}
-				}
-			}
-		}
-	}
-});
-// Limit scope pollution from any deprecated API
-(function() {
-
-var matched, browser;
-
-// Use of jQuery.browser is frowned upon.
-// More details: http://api.jquery.com/jQuery.browser
-// jQuery.uaMatch maintained for back-compat
-jQuery.uaMatch = function( ua ) {
-	ua = ua.toLowerCase();
-
-	var match = /(chrome)[ \/]([\w.]+)/.exec( ua ) ||
-		/(webkit)[ \/]([\w.]+)/.exec( ua ) ||
-		/(opera)(?:.*version|)[ \/]([\w.]+)/.exec( ua ) ||
-		/(msie) ([\w.]+)/.exec( ua ) ||
-		ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec( ua ) ||
-		[];
-
-	return {
-		browser: match[ 1 ] || "",
-		version: match[ 2 ] || "0"
-	};
-};
-
-matched = jQuery.uaMatch( navigator.userAgent );
-browser = {};
-
-if ( matched.browser ) {
-	browser[ matched.browser ] = true;
-	browser.version = matched.version;
-}
-
-// Chrome is Webkit, but Webkit is also Safari.
-if ( browser.chrome ) {
-	browser.webkit = true;
-} else if ( browser.webkit ) {
-	browser.safari = true;
-}
-
-jQuery.browser = browser;
-
-jQuery.sub = function() {
-	function jQuerySub( selector, context ) {
-		return new jQuerySub.fn.init( selector, context );
-	}
-	jQuery.extend( true, jQuerySub, this );
-	jQuerySub.superclass = this;
-	jQuerySub.fn = jQuerySub.prototype = this();
-	jQuerySub.fn.constructor = jQuerySub;
-	jQuerySub.sub = this.sub;
-	jQuerySub.fn.init = function init( selector, context ) {
-		if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
-			context = jQuerySub( context );
-		}
-
-		return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
-	};
-	jQuerySub.fn.init.prototype = jQuerySub.fn;
-	var rootjQuerySub = jQuerySub(document);
-	return jQuerySub;
-};
-
-})();
-var curCSS, iframe, iframeDoc,
-	ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	rposition = /^(top|right|bottom|left)$/,
-	// swappable if display is none or starts with table except "table", "table-cell", or "table-caption"
-	// see here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rmargin = /^margin/,
-	rnumsplit = new RegExp( "^(" + core_pnum + ")(.*)$", "i" ),
-	rnumnonpx = new RegExp( "^(" + core_pnum + ")(?!px)[a-z%]+$", "i" ),
-	rrelNum = new RegExp( "^([-+])=(" + core_pnum + ")", "i" ),
-	elemdisplay = {},
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: 0,
-		fontWeight: 400
-	},
-
-	cssExpand = [ "Top", "Right", "Bottom", "Left" ],
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
-
-	eventsToggle = jQuery.fn.toggle;
-
-// return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( style, name ) {
-
-	// shortcut for names that are not vendor prefixed
-	if ( name in style ) {
-		return name;
-	}
-
-	// check for vendor prefixed names
-	var capName = name.charAt(0).toUpperCase() + name.slice(1),
-		origName = name,
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in style ) {
-			return name;
-		}
-	}
-
-	return origName;
-}
-
-function isHidden( elem, el ) {
-	elem = el || elem;
-	return jQuery.css( elem, "display" ) === "none" || !jQuery.contains( elem.ownerDocument, elem );
-}
-
-function showHide( elements, show ) {
-	var elem, display,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		values[ index ] = jQuery._data( elem, "olddisplay" );
-		if ( show ) {
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && elem.style.display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = jQuery._data( elem, "olddisplay", css_defaultDisplay(elem.nodeName) );
-			}
-		} else {
-			display = curCSS( elem, "display" );
-
-			if ( !values[ index ] && display !== "none" ) {
-				jQuery._data( elem, "olddisplay", display );
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.fn.extend({
-	css: function( name, value ) {
-		return jQuery.access( this, function( elem, name, value ) {
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state, fn2 ) {
-		var bool = typeof state === "boolean";
-
-		if ( jQuery.isFunction( state ) && jQuery.isFunction( fn2 ) ) {
-			return eventsToggle.apply( this, arguments );
-		}
-
-		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"fillOpacity": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// convert relative number strings (+= or -=) to relative numbers. #7345
-			if ( type === "string" && (ret = rrelNum.exec( value )) ) {
-				value = ( ret[1] + 1 ) * ret[2] + parseFloat( jQuery.css( elem, name ) );
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( value == null || type === "number" && isNaN( value ) ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, numeric, extra ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] || ( jQuery.cssProps[ origName ] = vendorPropName( elem.style, origName ) );
-
-		// gets hook for the prefixed version
-		// followed by the unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name );
-		}
-
-		//convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Return, converting to number if forced or a qualifier was provided and val looks numeric
-		if ( numeric || extra !== undefined ) {
-			num = parseFloat( val );
-			return numeric || jQuery.isNumeric( num ) ? num || 0 : val;
-		}
-		return val;
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var ret, name,
-			old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		ret = callback.call( elem );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-
-		return ret;
-	}
-});
-
-// NOTE: To any future maintainer, we've window.getComputedStyle
-// because jsdom on node.js will break without it.
-if ( window.getComputedStyle ) {
-	curCSS = function( elem, name ) {
-		var ret, width, minWidth, maxWidth,
-			computed = window.getComputedStyle( elem, null ),
-			style = elem.style;
-
-		if ( computed ) {
-
-			ret = computed[ name ];
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-
-			// A tribute to the "awesome hack by Dean Edwards"
-			// Chrome < 17 and Safari 5.0 uses "computed value" instead of "used value" for margin-right
-			// Safari 5.1.7 (at least) returns percentage for a larger set of values, but width seems to be reliably pixels
-			// this is against the CSSOM draft spec: http://dev.w3.org/csswg/cssom/#resolved-values
-			if ( rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-				width = style.width;
-				minWidth = style.minWidth;
-				maxWidth = style.maxWidth;
-
-				style.minWidth = style.maxWidth = style.width = ret;
-				ret = computed.width;
-
-				style.width = width;
-				style.minWidth = minWidth;
-				style.maxWidth = maxWidth;
-			}
-		}
-
-		return ret;
-	};
-} else if ( document.documentElement.currentStyle ) {
-	curCSS = function( elem, name ) {
-		var left, rsLeft,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			style = elem.style;
-
-		// Avoid setting ret to empty string here
-		// so we don't default to auto
-		if ( ret == null && style && style[ name ] ) {
-			ret = style[ name ];
-		}
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		// but not position css attributes, as those are proportional to the parent element instead
-		// and we can't measure the parent instead because it might trigger a "stacking dolls" problem
-		if ( rnumnonpx.test( ret ) && !rposition.test( name ) ) {
-
-			// Remember the original values
-			left = style.left;
-			rsLeft = elem.runtimeStyle && elem.runtimeStyle.left;
-
-			// Put in the new values to get a computed value out
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = elem.currentStyle.left;
-			}
-			style.left = name === "fontSize" ? "1em" : ret;
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			if ( rsLeft ) {
-				elem.runtimeStyle.left = rsLeft;
-			}
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-	var matches = rnumsplit.exec( value );
-	return matches ?
-			Math.max( 0, matches[ 1 ] - ( subtract || 0 ) ) + ( matches[ 2 ] || "px" ) :
-			value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-		// If we already have the right measurement, avoid augmentation
-		4 :
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-		// both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			// we use jQuery.css instead of curCSS here
-			// because of the reliableMarginRight CSS hook!
-			val += jQuery.css( elem, extra + cssExpand[ i ], true );
-		}
-
-		// From this point on we use curCSS for maximum performance (relevant in animations)
-		if ( isBorderBox ) {
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-			}
-
-			// at this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-			}
-		} else {
-			// at this point, extra isn't content, so add padding
-			val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-
-			// at this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		valueIsBorderBox = true,
-		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
-
-	// some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test(val) ) {
-			return val;
-		}
-
-		// we need the check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox && ( jQuery.support.boxSizingReliable || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox
-		)
-	) + "px";
-}
-
-
-// Try to determine the default display value of an element
-function css_defaultDisplay( nodeName ) {
-	if ( elemdisplay[ nodeName ] ) {
-		return elemdisplay[ nodeName ];
-	}
-
-	var elem = jQuery( "<" + nodeName + ">" ).appendTo( document.body ),
-		display = elem.css("display");
-	elem.remove();
-
-	// If the simple way fails,
-	// get element's real default display by attaching it to a temp iframe
-	if ( display === "none" || display === "" ) {
-		// Use the already-created iframe if possible
-		iframe = document.body.appendChild(
-			iframe || jQuery.extend( document.createElement("iframe"), {
-				frameBorder: 0,
-				width: 0,
-				height: 0
-			})
-		);
-
-		// Create a cacheable copy of the iframe document on first call.
-		// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
-		// document to it; WebKit & Firefox won't allow reusing the iframe document.
-		if ( !iframeDoc || !iframe.createElement ) {
-			iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
-			iframeDoc.write("<!doctype html><html><body>");
-			iframeDoc.close();
-		}
-
-		elem = iframeDoc.body.appendChild( iframeDoc.createElement(nodeName) );
-
-		display = curCSS( elem, "display" );
-		document.body.removeChild( iframe );
-	}
-
-	// Store the correct default display
-	elemdisplay[ nodeName ] = display;
-
-	return display;
-}
-
-jQuery.each([ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-				// certain elements can have dimension info if we invisibly show them
-				// however, it must have a current display style that would benefit from this
-				if ( elem.offsetWidth === 0 && rdisplayswap.test( curCSS( elem, "display" ) ) ) {
-					return jQuery.swap( elem, cssShow, function() {
-						return getWidthOrHeight( elem, name, extra );
-					});
-				} else {
-					return getWidthOrHeight( elem, name, extra );
-				}
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			return setPositiveNumber( elem, value, extra ?
-				augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
-				) : 0
-			);
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
-				( 0.01 * parseFloat( RegExp.$1 ) ) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style,
-				currentStyle = elem.currentStyle,
-				opacity = jQuery.isNumeric( value ) ? "alpha(opacity=" + value * 100 + ")" : "",
-				filter = currentStyle && currentStyle.filter || style.filter || "";
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// if setting opacity to 1, and no other filters exist - attempt to remove filter attribute #6652
-			if ( value >= 1 && jQuery.trim( filter.replace( ralpha, "" ) ) === "" &&
-				style.removeAttribute ) {
-
-				// Setting style.filter to null, "" & " " still leave "filter:" in the cssText
-				// if "filter:" is present at all, clearType is disabled, we want to avoid this
-				// style.removeAttribute is IE Only, but so apparently is this code path...
-				style.removeAttribute( "filter" );
-
-				// if there there is no filter style applied in a css rule, we are done
-				if ( currentStyle && !currentStyle.filter ) {
-					return;
-				}
-			}
-
-			// otherwise, set new filter values
-			style.filter = ralpha.test( filter ) ?
-				filter.replace( ralpha, opacity ) :
-				filter + " " + opacity;
-		}
-	};
-}
-
-// These hooks cannot be added until DOM ready because the support test
-// for it is not run until after DOM ready
-jQuery(function() {
-	if ( !jQuery.support.reliableMarginRight ) {
-		jQuery.cssHooks.marginRight = {
-			get: function( elem, computed ) {
-				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-				// Work around by temporarily setting element display to inline-block
-				return jQuery.swap( elem, { "display": "inline-block" }, function() {
-					if ( computed ) {
-						return curCSS( elem, "marginRight" );
-					}
-				});
-			}
-		};
-	}
-
-	// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-	// getComputedStyle returns percent when specified for top/left/bottom/right
-	// rather than make the css module depend on the offset module, we just check for it here
-	if ( !jQuery.support.pixelPosition && jQuery.fn.position ) {
-		jQuery.each( [ "top", "left" ], function( i, prop ) {
-			jQuery.cssHooks[ prop ] = {
-				get: function( elem, computed ) {
-					if ( computed ) {
-						var ret = curCSS( elem, prop );
-						// if curCSS returns percentage, fallback to offset
-						return rnumnonpx.test( ret ) ? jQuery( elem ).position()[ prop ] + "px" : ret;
-					}
-				}
-			};
-		});
-	}
-
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		return ( elem.offsetWidth === 0 && elem.offsetHeight === 0 ) || (!jQuery.support.reliableHiddenOffsets && ((elem.style && elem.style.display) || curCSS( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-// These hooks are used by animate to expand properties
-jQuery.each({
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i,
-
-				// assumes a single number if not a string
-				parts = typeof value === "string" ? value.split(" ") : [ value ],
-				expanded = {};
-
-			for ( i = 0; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-});
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rinput = /^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	rselectTextarea = /^(?:select|textarea)/i;
-
-jQuery.fn.extend({
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map(function(){
-			return this.elements ? jQuery.makeArray( this.elements ) : this;
-		})
-		.filter(function(){
-			return this.name && !this.disabled &&
-				( this.checked || rselectTextarea.test( this.nodeName ) ||
-					rinput.test( this.type ) );
-		})
-		.map(function( i, elem ){
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val, i ){
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					}) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		}).get();
-	}
-});
-
-//Serialize an array of form elements or a set of
-//key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		});
-
-	} else {
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-var
-	// Document location
-	ajaxLocParts,
-	ajaxLocation,
-
-	rhash = /#.*$/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-	rquery = /\?/,
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = ["*/"] + ["*"];
-
-// #8138, IE may throw an exception when accessing
-// a field from window.location if document.domain has been set
-try {
-	ajaxLocation = location.href;
-} catch( e ) {
-	// Use the href attribute of an A element
-	// since IE will modify it given document.location
-	ajaxLocation = document.createElement( "a" );
-	ajaxLocation.href = "";
-	ajaxLocation = ajaxLocation.href;
-}
-
-// Segment location into parts
-ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType, list, placeBefore,
-			dataTypes = dataTypeExpression.toLowerCase().split( core_rspace ),
-			i = 0,
-			length = dataTypes.length;
-
-		if ( jQuery.isFunction( func ) ) {
-			// For each dataType in the dataTypeExpression
-			for ( ; i < length; i++ ) {
-				dataType = dataTypes[ i ];
-				// We control if we're asked to add before
-				// any existing element
-				placeBefore = /^\+/.test( dataType );
-				if ( placeBefore ) {
-					dataType = dataType.substr( 1 ) || "*";
-				}
-				list = structure[ dataType ] = structure[ dataType ] || [];
-				// then we add to the structure accordingly
-				list[ placeBefore ? "unshift" : "push" ]( func );
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
-		dataType /* internal */, inspected /* internal */ ) {
-
-	dataType = dataType || options.dataTypes[ 0 ];
-	inspected = inspected || {};
-
-	inspected[ dataType ] = true;
-
-	var selection,
-		list = structure[ dataType ],
-		i = 0,
-		length = list ? list.length : 0,
-		executeOnly = ( structure === prefilters );
-
-	for ( ; i < length && ( executeOnly || !selection ); i++ ) {
-		selection = list[ i ]( options, originalOptions, jqXHR );
-		// If we got redirected to another dataType
-		// we try there if executing only and not done already
-		if ( typeof selection === "string" ) {
-			if ( !executeOnly || inspected[ selection ] ) {
-				selection = undefined;
-			} else {
-				options.dataTypes.unshift( selection );
-				selection = inspectPrefiltersOrTransports(
-						structure, options, originalOptions, jqXHR, selection, inspected );
-			}
-		}
-	}
-	// If we're only executing or nothing was selected
-	// we try the catchall dataType if not done already
-	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
-		selection = inspectPrefiltersOrTransports(
-				structure, options, originalOptions, jqXHR, "*", inspected );
-	}
-	// unnecessary when only executing (prefilters)
-	// but it'll be ignored by the caller in that case
-	return selection;
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-}
-
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	// Don't do a request if no elements are being requested
-	if ( !this.length ) {
-		return this;
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf(" ");
-
-	if ( off >= 0 ) {
-		selector = url.slice( off, url.length );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// Request the remote document
-	jQuery.ajax({
-		url: url,
-
-		// if "type" variable is undefined, then "GET" method will be used
-		type: type,
-		dataType: "html",
-		data: params,
-		complete: function( jqXHR, status ) {
-			if ( callback ) {
-				self.each( callback, response || [ jqXHR.responseText, status, jqXHR ] );
-			}
-		}
-	}).done(function( responseText ) {
-
-		// Save response for use in complete callback
-		response = arguments;
-
-		// See if a selector was specified
-		self.html( selector ?
-
-			// Create a dummy div to hold the results
-			jQuery("<div>")
-
-				// inject the contents of the document in, removing the scripts
-				// to avoid any 'Permission Denied' errors in IE
-				.append( responseText.replace( rscript, "" ) )
-
-				// Locate the specified elements
-				.find( selector ) :
-
-			// If not, just inject the full result
-			responseText );
-
-	});
-
-	return this;
-};
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
-	jQuery.fn[ o ] = function( f ){
-		return this.on( o, f );
-	};
-});
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-		// shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		return jQuery.ajax({
-			type: method,
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	};
-});
-
-jQuery.extend({
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		if ( settings ) {
-			// Building a settings object
-			ajaxExtend( target, jQuery.ajaxSettings );
-		} else {
-			// Extending ajaxSettings
-			settings = target;
-			target = jQuery.ajaxSettings;
-		}
-		ajaxExtend( target, settings );
-		return target;
-	},
-
-	ajaxSettings: {
-		url: ajaxLocation,
-		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			text: "text/plain",
-			json: "application/json, text/javascript",
-			"*": allTypes
-		},
-
-		contents: {
-			xml: /xml/,
-			html: /html/,
-			json: /json/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText"
-		},
-
-		// List of data converters
-		// 1) key format is "source_type destination_type" (a single space in-between)
-		// 2) the catchall symbol "*" can be used for source_type
-		converters: {
-
-			// Convert anything to text
-			"* text": window.String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			context: true,
-			url: true
-		}
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var // ifModified key
-			ifModifiedKey,
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-			// transport
-			transport,
-			// timeout handle
-			timeoutTimer,
-			// Cross-domain detection vars
-			parts,
-			// To know if global events are to be dispatched
-			fireGlobals,
-			// Loop variable
-			i,
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-			// Callbacks context
-			callbackContext = s.context || s,
-			// Context for global events
-			// It's the callbackContext if one was provided in the options
-			// and if it's a DOM node or a jQuery collection
-			globalEventContext = callbackContext !== s &&
-				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
-						jQuery( callbackContext ) : jQuery.event,
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-			// The jqXHR state
-			state = 0,
-			// Default abort message
-			strAbort = "canceled",
-			// Fake xhr
-			jqXHR = {
-
-				readyState: 0,
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					if ( !state ) {
-						var lname = name.toLowerCase();
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match === undefined ? null : match;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					statusText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( statusText );
-					}
-					done( 0, statusText );
-					return this;
-				}
-			};
-
-		// Callback for when everything is done
-		// It is defined here because jslint complains if it is declared
-		// at the end of the function (which would be more logical and readable)
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// If successful, handle type chaining
-			if ( status >= 200 && status < 300 || status === 304 ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-
-					modified = jqXHR.getResponseHeader("Last-Modified");
-					if ( modified ) {
-						jQuery.lastModified[ ifModifiedKey ] = modified;
-					}
-					modified = jqXHR.getResponseHeader("Etag");
-					if ( modified ) {
-						jQuery.etag[ ifModifiedKey ] = modified;
-					}
-				}
-
-				// If not modified
-				if ( status === 304 ) {
-
-					statusText = "notmodified";
-					isSuccess = true;
-
-				// If we have data
-				} else {
-
-					isSuccess = ajaxConvert( s, response );
-					statusText = isSuccess.state;
-					success = isSuccess.data;
-					error = isSuccess.error;
-					isSuccess = !error;
-				}
-			} else {
-				// We extract error from statusText
-				// then normalize statusText and status for non-aborts
-				error = statusText;
-				if ( !statusText || status ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
-						[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		// Attach deferreds
-		deferred.promise( jqXHR );
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-		jqXHR.complete = completeDeferred.add;
-
-		// Status-dependent callbacks
-		jqXHR.statusCode = function( map ) {
-			if ( map ) {
-				var tmp;
-				if ( state < 2 ) {
-					for ( tmp in map ) {
-						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
-					}
-				} else {
-					tmp = map[ jqXHR.status ];
-					jqXHR.always( tmp );
-				}
-			}
-			return this;
-		};
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( core_rspace );
-
-		// A cross-domain request is in order when we have a protocol:host:port mismatch
-		if ( s.crossDomain == null ) {
-			parts = rurl.exec( s.url.toLowerCase() ) || false;
-			s.crossDomain = parts && ( parts.join(":") + ( parts[ 3 ] ? "" : parts[ 1 ] === "http:" ? 80 : 443 ) ) !==
-				( ajaxLocParts.join(":") + ( ajaxLocParts[ 3 ] ? "" : ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) );
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		fireGlobals = s.global;
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Get ifModifiedKey before adding the anti-cache parameter
-			ifModifiedKey = s.url;
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-
-				var ts = jQuery.now(),
-					// try replacing _= if it is there
-					ret = s.url.replace( rts, "$1_=" + ts );
-
-				// if nothing was replaced, add timestamp to the end
-				s.url = ret + ( ( ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			ifModifiedKey = ifModifiedKey || s.url;
-			if ( jQuery.lastModified[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
-			}
-			if ( jQuery.etag[ ifModifiedKey ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
-			}
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
-				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-				// Abort if not done already and return
-				return jqXHR.abort();
-
-		}
-
-		// aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = setTimeout( function(){
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch (e) {
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {}
-
-});
-
-/* Handles responses to an ajax request:
- * - sets all responseXXX fields accordingly
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes,
-		responseFields = s.responseFields;
-
-	// Fill responseXXX fields
-	for ( type in responseFields ) {
-		if ( type in responses ) {
-			jqXHR[ responseFields[type] ] = responses[ type ];
-		}
-	}
-
-	// Remove auto dataType and get content-type in the process
-	while( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-// Chain conversions given the request and the original response
-function ajaxConvert( s, response ) {
-
-	var conv, conv2, current, tmp,
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice(),
-		prev = dataTypes[ 0 ],
-		converters = {},
-		i = 0;
-
-	// Apply the dataFilter if provided
-	if ( s.dataFilter ) {
-		response = s.dataFilter( response, s.dataType );
-	}
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	// Convert to each sequential dataType, tolerating list modification
-	for ( ; (current = dataTypes[++i]); ) {
-
-		// There's only work to do if current dataType is non-auto
-		if ( current !== "*" ) {
-
-			// Convert response if prev dataType is non-auto and differs from current
-			if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split(" ");
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.splice( i--, 0, current );
-								}
-
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s["throws"] ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return { state: "parsererror", error: conv ? e : "No conversion from " + prev + " to " + current };
-						}
-					}
-				}
-			}
-
-			// Update prev for next iteration
-			prev = current;
-		}
-	}
-
-	return { state: "success", data: response };
-}
-var oldCallbacks = [],
-	rquestion = /\?/,
-	rjsonp = /(=)\?(?=&|$)|\?\?/,
-	nonce = jQuery.now();
-
-// Default jsonp settings
-jQuery.ajaxSetup({
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-});
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		data = s.data,
-		url = s.url,
-		hasCallback = s.jsonp !== false,
-		replaceInUrl = hasCallback && rjsonp.test( url ),
-		replaceInData = hasCallback && !replaceInUrl && typeof data === "string" &&
-			!( s.contentType || "" ).indexOf("application/x-www-form-urlencoded") &&
-			rjsonp.test( data );
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( s.dataTypes[ 0 ] === "jsonp" || replaceInUrl || replaceInData ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-		overwritten = window[ callbackName ];
-
-		// Insert callback into url or form data
-		if ( replaceInUrl ) {
-			s.url = url.replace( rjsonp, "$1" + callbackName );
-		} else if ( replaceInData ) {
-			s.data = data.replace( rjsonp, "$1" + callbackName );
-		} else if ( hasCallback ) {
-			s.url += ( rquestion.test( url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters["script json"] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always(function() {
-			// Restore preexisting value
-			window[ callbackName ] = overwritten;
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-				// make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		});
-
-		// Delegate to script
-		return "script";
-	}
-});
-// Install script dataType
-jQuery.ajaxSetup({
-	accepts: {
-		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /javascript|ecmascript/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-});
-
-// Handle cache's special case and global
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-		s.global = false;
-	}
-});
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function(s) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-
-		var script,
-			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
-
-		return {
-
-			send: function( _, callback ) {
-
-				script = document.createElement( "script" );
-
-				script.async = "async";
-
-				if ( s.scriptCharset ) {
-					script.charset = s.scriptCharset;
-				}
-
-				script.src = s.url;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function( _, isAbort ) {
-
-					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-
-						// Remove the script
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-
-						// Dereference the script
-						script = undefined;
-
-						// Callback if not abort
-						if ( !isAbort ) {
-							callback( 200, "success" );
-						}
-					}
-				};
-				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-				// This arises when a base node is used (#2709 and #4378).
-				head.insertBefore( script, head.firstChild );
-			},
-
-			abort: function() {
-				if ( script ) {
-					script.onload( 0, 1 );
-				}
-			}
-		};
-	}
-});
-var xhrCallbacks,
-	// #5280: Internet Explorer will keep connections alive if we don't abort on unload
-	xhrOnUnloadAbort = window.ActiveXObject ? function() {
-		// Abort all pending requests
-		for ( var key in xhrCallbacks ) {
-			xhrCallbacks[ key ]( 0, 1 );
-		}
-	} : false,
-	xhrId = 0;
-
-// Functions to create xhrs
-function createStandardXHR() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch( e ) {}
-}
-
-function createActiveXHR() {
-	try {
-		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
-	} catch( e ) {}
-}
-
-// Create the request object
-// (This is still attached to ajaxSettings for backward compatibility)
-jQuery.ajaxSettings.xhr = window.ActiveXObject ?
-	/* Microsoft failed to properly
-	 * implement the XMLHttpRequest in IE7 (can't request local files),
-	 * so we use the ActiveXObject when it is available
-	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
-	 * we need a fallback.
-	 */
-	function() {
-		return !this.isLocal && createStandardXHR() || createActiveXHR();
-	} :
-	// For all other browsers, use the standard XMLHttpRequest object
-	createStandardXHR;
-
-// Determine support properties
-(function( xhr ) {
-	jQuery.extend( jQuery.support, {
-		ajax: !!xhr,
-		cors: !!xhr && ( "withCredentials" in xhr )
-	});
-})( jQuery.ajaxSettings.xhr() );
-
-// Create transport if the browser can provide an xhr
-if ( jQuery.support.ajax ) {
-
-	jQuery.ajaxTransport(function( s ) {
-		// Cross domain only allowed if supported through XMLHttpRequest
-		if ( !s.crossDomain || jQuery.support.cors ) {
-
-			var callback;
-
-			return {
-				send: function( headers, complete ) {
-
-					// Get a new xhr
-					var handle, i,
-						xhr = s.xhr();
-
-					// Open the socket
-					// Passing null username, generates a login popup on Opera (#2865)
-					if ( s.username ) {
-						xhr.open( s.type, s.url, s.async, s.username, s.password );
-					} else {
-						xhr.open( s.type, s.url, s.async );
-					}
-
-					// Apply custom fields if provided
-					if ( s.xhrFields ) {
-						for ( i in s.xhrFields ) {
-							xhr[ i ] = s.xhrFields[ i ];
-						}
-					}
-
-					// Override mime type if needed
-					if ( s.mimeType && xhr.overrideMimeType ) {
-						xhr.overrideMimeType( s.mimeType );
-					}
-
-					// X-Requested-With header
-					// For cross-domain requests, seeing as conditions for a preflight are
-					// akin to a jigsaw puzzle, we simply never set it to be sure.
-					// (it can always be set on a per-request basis or even using ajaxSetup)
-					// For same-domain requests, won't change header if already provided.
-					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
-						headers[ "X-Requested-With" ] = "XMLHttpRequest";
-					}
-
-					// Need an extra try/catch for cross domain requests in Firefox 3
-					try {
-						for ( i in headers ) {
-							xhr.setRequestHeader( i, headers[ i ] );
-						}
-					} catch( _ ) {}
-
-					// Do send the request
-					// This may raise an exception which is actually
-					// handled in jQuery.ajax (so no try/catch here)
-					xhr.send( ( s.hasContent && s.data ) || null );
-
-					// Listener
-					callback = function( _, isAbort ) {
-
-						var status,
-							statusText,
-							responseHeaders,
-							responses,
-							xml;
-
-						// Firefox throws exceptions when accessing properties
-						// of an xhr when a network error occurred
-						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
-						try {
-
-							// Was never called and is aborted or complete
-							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
-
-								// Only called once
-								callback = undefined;
-
-								// Do not keep as active anymore
-								if ( handle ) {
-									xhr.onreadystatechange = jQuery.noop;
-									if ( xhrOnUnloadAbort ) {
-										delete xhrCallbacks[ handle ];
-									}
-								}
-
-								// If it's an abort
-								if ( isAbort ) {
-									// Abort it manually if needed
-									if ( xhr.readyState !== 4 ) {
-										xhr.abort();
-									}
-								} else {
-									status = xhr.status;
-									responseHeaders = xhr.getAllResponseHeaders();
-									responses = {};
-									xml = xhr.responseXML;
-
-									// Construct response list
-									if ( xml && xml.documentElement /* #4958 */ ) {
-										responses.xml = xml;
-									}
-
-									// When requesting binary data, IE6-9 will throw an exception
-									// on any attempt to access responseText (#11426)
-									try {
-										responses.text = xhr.responseText;
-									} catch( _ ) {
-									}
-
-									// Firefox throws an exception when accessing
-									// statusText for faulty cross-domain requests
-									try {
-										statusText = xhr.statusText;
-									} catch( e ) {
-										// We normalize with Webkit giving an empty statusText
-										statusText = "";
-									}
-
-									// Filter status for non standard behaviors
-
-									// If the request is local and we have data: assume a success
-									// (success with no data won't get notified, that's the best we
-									// can do given current implementations)
-									if ( !status && s.isLocal && !s.crossDomain ) {
-										status = responses.text ? 200 : 404;
-									// IE - #1450: sometimes returns 1223 when it should be 204
-									} else if ( status === 1223 ) {
-										status = 204;
-									}
-								}
-							}
-						} catch( firefoxAccessException ) {
-							if ( !isAbort ) {
-								complete( -1, firefoxAccessException );
-							}
-						}
-
-						// Call complete if needed
-						if ( responses ) {
-							complete( status, statusText, responses, responseHeaders );
-						}
-					};
-
-					if ( !s.async ) {
-						// if we're in sync mode we fire the callback
-						callback();
-					} else if ( xhr.readyState === 4 ) {
-						// (IE6 & IE7) if it's in cache and has been
-						// retrieved directly we need to fire the callback
-						setTimeout( callback, 0 );
-					} else {
-						handle = ++xhrId;
-						if ( xhrOnUnloadAbort ) {
-							// Create the active xhrs callbacks list if needed
-							// and attach the unload handler
-							if ( !xhrCallbacks ) {
-								xhrCallbacks = {};
-								jQuery( window ).unload( xhrOnUnloadAbort );
-							}
-							// Add to list of active xhrs callbacks
-							xhrCallbacks[ handle ] = callback;
-						}
-						xhr.onreadystatechange = callback;
-					}
-				},
-
-				abort: function() {
-					if ( callback ) {
-						callback(0,1);
-					}
-				}
-			};
-		}
-	});
-}
-var fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = new RegExp( "^(?:([-+])=|)(" + core_pnum + ")([a-z%]*)$", "i" ),
-	rrun = /queueHooks$/,
-	animationPrefilters = [ defaultPrefilter ],
-	tweeners = {
-		"*": [function( prop, value ) {
-			var end, unit,
-				tween = this.createTween( prop, value ),
-				parts = rfxnum.exec( value ),
-				target = tween.cur(),
-				start = +target || 0,
-				scale = 1,
-				maxIterations = 20;
-
-			if ( parts ) {
-				end = +parts[2];
-				unit = parts[3] || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-
-				// We need to compute starting value
-				if ( unit !== "px" && start ) {
-					// Iteratively approximate from a nonzero starting point
-					// Prefer the current property, because this process will be trivial if it uses the same units
-					// Fallback to end or a simple constant
-					start = jQuery.css( tween.elem, prop, true ) || end || 1;
-
-					do {
-						// If previous iteration zeroed out, double until we get *something*
-						// Use a string for doubling factor so we don't accidentally see scale as unchanged below
-						scale = scale || ".5";
-
-						// Adjust and apply
-						start = start / scale;
-						jQuery.style( tween.elem, prop, start + unit );
-
-					// Update scale, tolerating zero or NaN from tween.cur()
-					// And breaking the loop if scale is unchanged or perfect, or if we've just had enough
-					} while ( scale !== (scale = tween.cur() / target) && scale !== 1 && --maxIterations );
-				}
-
-				tween.unit = unit;
-				tween.start = start;
-				// If a +=/-= token was provided, we're doing a relative animation
-				tween.end = parts[1] ? start + ( parts[1] + 1 ) * end : end;
-			}
-			return tween;
-		}]
-	};
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	setTimeout(function() {
-		fxNow = undefined;
-	}, 0 );
-	return ( fxNow = jQuery.now() );
-}
-
-function createTweens( animation, props ) {
-	jQuery.each( props, function( prop, value ) {
-		var collection = ( tweeners[ prop ] || [] ).concat( tweeners[ "*" ] ),
-			index = 0,
-			length = collection.length;
-		for ( ; index < length; index++ ) {
-			if ( collection[ index ].call( animation, prop, value ) ) {
-
-				// we're done with this property
-				return;
-			}
-		}
-	});
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		index = 0,
-		tweenerIndex = 0,
-		length = animationPrefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-			// don't match elem in the :animated selector
-			delete tick.elem;
-		}),
-		tick = function() {
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-				percent = 1 - ( remaining / animation.duration || 0 ),
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ]);
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise({
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, { specialEasing: {} }, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end, easing ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-					// if we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// resolve when we played the last frame
-				// otherwise, reject
-				if ( gotoEnd ) {
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		}),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = animationPrefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			return result;
-		}
-	}
-
-	createTweens( animation, props );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			anim: animation,
-			queue: animation.opts.queue,
-			elem: elem
-		})
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// not quite $.extend, this wont overwrite keys already present.
-			// also - reusing 'index' from above because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.split(" ");
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			tweeners[ prop ] = tweeners[ prop ] || [];
-			tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			animationPrefilters.unshift( callback );
-		} else {
-			animationPrefilters.push( callback );
-		}
-	}
-});
-
-function defaultPrefilter( elem, props, opts ) {
-	var index, prop, value, length, dataShow, tween, hooks, oldfire,
-		anim = this,
-		style = elem.style,
-		orig = {},
-		handled = [],
-		hidden = elem.nodeType && isHidden( elem );
-
-	// handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always(function() {
-			// doing this makes sure that the complete handler will be called
-			// before this completes
-			anim.always(function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			});
-		});
-	}
-
-	// height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE does not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		if ( jQuery.css( elem, "display" ) === "inline" &&
-				jQuery.css( elem, "float" ) === "none" ) {
-
-			// inline-level elements accept inline-block;
-			// block-level elements need to be inline with layout
-			if ( !jQuery.support.inlineBlockNeedsLayout || css_defaultDisplay( elem.nodeName ) === "inline" ) {
-				style.display = "inline-block";
-
-			} else {
-				style.zoom = 1;
-			}
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		if ( !jQuery.support.shrinkWrapBlocks ) {
-			anim.done(function() {
-				style.overflow = opts.overflow[ 0 ];
-				style.overflowX = opts.overflow[ 1 ];
-				style.overflowY = opts.overflow[ 2 ];
-			});
-		}
-	}
-
-
-	// show/hide pass
-	for ( index in props ) {
-		value = props[ index ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ index ];
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-				continue;
-			}
-			handled.push( index );
-		}
-	}
-
-	length = handled.length;
-	if ( length ) {
-		dataShow = jQuery._data( elem, "fxshow" ) || jQuery._data( elem, "fxshow", {} );
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done(function() {
-				jQuery( elem ).hide();
-			});
-		}
-		anim.done(function() {
-			var prop;
-			jQuery.removeData( elem, "fxshow", true );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		});
-		for ( index = 0 ; index < length ; index++ ) {
-			prop = handled[ index ];
-			tween = anim.createTween( prop, hidden ? dataShow[ prop ] : 0 );
-			orig[ prop ] = dataShow[ prop ] || jQuery.style( elem, prop );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-	}
-}
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || "swing";
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			if ( tween.elem[ tween.prop ] != null &&
-				(!tween.elem.style || tween.elem.style[ tween.prop ] == null) ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// passing any value as a 4th parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails
-			// so, simple values such as "10px" are parsed to Float.
-			// complex values such as "rotate(1rad)" are returned as is.
-			result = jQuery.css( tween.elem, tween.prop, false, "" );
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-			// use step hook for back compat - use cssHook if its there - use .style if its
-			// available and use plain properties where available
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.style && ( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null || jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Remove in 2.0 - this supports IE8's panic based approach
-// to setting things on disconnected nodes
-
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.each([ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ||
-			// special check for .toggle( handler, handler, ... )
-			( !i && jQuery.isFunction( speed ) && jQuery.isFunction( easing ) ) ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-});
-
-jQuery.fn.extend({
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// animate to the value specified
-			.end().animate({ opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations resolve immediately
-				if ( empty ) {
-					anim.stop( true );
-				}
-			};
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each(function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = jQuery._data( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && (type == null || timers[ index ].queue === type) ) {
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// start the next in the queue if the last step wasn't forced
-			// timers currently will call their complete callbacks, which will dequeue
-			// but only if they were gotoEnd
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	}
-});
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		attrs = { height: type },
-		i = 0;
-
-	// if we include width, step value is 1 to do all cssExpand values,
-	// if we don't include width, step value is 2 to skip over Left and Right
-	includeWidth = includeWidth? 1 : 0;
-	for( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show"),
-	slideUp: genFx("hide"),
-	slideToggle: genFx("toggle"),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-		opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p*Math.PI ) / 2;
-	}
-};
-
-jQuery.timers = [];
-jQuery.fx = Tween.prototype.init;
-jQuery.fx.tick = function() {
-	var timer,
-		timers = jQuery.timers,
-		i = 0;
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-};
-
-jQuery.fx.timer = function( timer ) {
-	if ( timer() && jQuery.timers.push( timer ) && !timerId ) {
-		timerId = setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.interval = 13;
-
-jQuery.fx.stop = function() {
-	clearInterval( timerId );
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-	// Default speed
-	_default: 400
-};
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-var rroot = /^(?:body|html)$/i;
-
-jQuery.fn.offset = function( options ) {
-	if ( arguments.length ) {
-		return options === undefined ?
-			this :
-			this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-	}
-
-	var docElem, body, win, clientTop, clientLeft, scrollTop, scrollLeft,
-		box = { top: 0, left: 0 },
-		elem = this[ 0 ],
-		doc = elem && elem.ownerDocument;
-
-	if ( !doc ) {
-		return;
-	}
-
-	if ( (body = doc.body) === elem ) {
-		return jQuery.offset.bodyOffset( elem );
-	}
-
-	docElem = doc.documentElement;
-
-	// Make sure it's not a disconnected DOM node
-	if ( !jQuery.contains( docElem, elem ) ) {
-		return box;
-	}
-
-	// If we don't have gBCR, just use 0,0 rather than error
-	// BlackBerry 5, iOS 3 (original iPhone)
-	if ( typeof elem.getBoundingClientRect !== "undefined" ) {
-		box = elem.getBoundingClientRect();
-	}
-	win = getWindow( doc );
-	clientTop  = docElem.clientTop  || body.clientTop  || 0;
-	clientLeft = docElem.clientLeft || body.clientLeft || 0;
-	scrollTop  = win.pageYOffset || docElem.scrollTop;
-	scrollLeft = win.pageXOffset || docElem.scrollLeft;
-	return {
-		top: box.top  + scrollTop  - clientTop,
-		left: box.left + scrollLeft - clientLeft
-	};
-};
-
-jQuery.offset = {
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = ( position === "absolute" || position === "fixed" ) && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-
-	position: function() {
-		if ( !this[0] ) {
-			return;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent || document.body;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( {scrollLeft: "pageXOffset", scrollTop: "pageYOffset"}, function( method, prop ) {
-	var top = /Y/.test( prop );
-
-	jQuery.fn[ method ] = function( val ) {
-		return jQuery.access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? (prop in win) ? win[ prop ] :
-					win.document.documentElement[ method ] :
-					elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : jQuery( win ).scrollLeft(),
-					 top ? val : jQuery( win ).scrollTop()
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length, null );
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name }, function( defaultExtra, funcName ) {
-		// margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return jQuery.access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height], whichever is greatest
-					// unfortunately, this causes bug #3838 in IE6/8 only, but there is currently no good, small way to fix it.
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, value, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	});
-});
-// Expose jQuery to the global object
-window.jQuery = window.$ = jQuery;
-
-// Expose jQuery as an AMD module, but only for AMD loaders that
-// understand the issues with loading multiple versions of jQuery
-// in a page that all might call define(). The loader will indicate
-// they have special allowances for multiple jQuery versions by
-// specifying define.amd.jQuery = true. Register as a named module,
-// since jQuery can be concatenated with other files that may use define,
-// but not use a proper concatenation script that understands anonymous
-// AMD modules. A named AMD is safest and most robust way to register.
-// Lowercase jquery is used because AMD module names are derived from
-// file names, and jQuery is normally delivered in a lowercase file name.
-// Do this after creating the global so that if an AMD module wants to call
-// noConflict to hide this version of jQuery, it will work.
-if ( typeof define === "function" && define.amd && define.amd.jQuery ) {
-	define( "jquery", [], function () { return jQuery; } );
-}
-
-})( window );
diff --git a/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.min.js b/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.min.js
deleted file mode 100644
index f65cf1dc45..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/static/js/jquery-1.8.2.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.2 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call(" ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":(a+"").replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")||(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&p.expr.match.needsContext.test(f),namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=k.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<q;d++)l=o[d],m=l.selector,h[m]===b&&(h[m]=l.needsContext?p(m,this).index(f)>=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){i=u[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){l=i.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,g=((p.event.special[l.origType]||{}).handle||l.handler).apply(i.elem,r),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length===1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h<i;h++)if(f=a[h])if(!c||c(f,d,e))g.push(f),j&&b.push(h);return g}function bl(a,b,c,d,e,f){return d&&!d[o]&&(d=bl(d)),e&&!e[o]&&(e=bl(e,f)),z(function(f,g,h,i){if(f&&e)return;var j,k,l,m=[],n=[],o=g.length,p=f||bo(b||"*",h.nodeType?[h]:h,[],f),q=a&&(f||!b)?bk(p,m,a,h,i):p,r=c?e||(f?a:o||d)?[]:g:q;c&&c(q,r,h,i);if(d){l=bk(r,n),d(l,[],h,i),j=l.length;while(j--)if(k=l[j])r[n[j]]=!(q[n[j]]=k)}if(f){j=a&&r.length;while(j--)if(k=r[j])f[m[j]]=!(g[m[j]]=k)}else r=bk(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):w.apply(g,r)})}function bm(a){var b,c,d,f=a.length,g=e.relative[a[0].type],h=g||e.relative[" "],i=g?1:0,j=bi(function(a){return a===b},h,!0),k=bi(function(a){return y.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i<f;i++)if(c=e.relative[a[i].type])m=[bi(bj(m),c)];else{c=e.filter[a[i].type].apply(null,a[i].matches);if(c[o]){d=++i;for(;d<f;d++)if(e.relative[a[d].type])break;return bl(i>1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i<d&&bm(a.slice(i,d)),d<f&&bm(a=a.slice(d)),d<f&&a.join(""))}m.push(c)}return bj(m)}function bn(a,b){var d=b.length>0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)bc(a,b[e],c,d);return c}function bp(a,b,c,d,f){var g,h,j,k,l,m=bh(a),n=m.length;if(!d&&m.length===1){h=m[0]=m[0].slice(0);if(h.length>2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;b<c;b++)if(this[b]===a)return b;return-1},z=function(a,b){return a[o]=b==null||b,a},A=function(){var a={},b=[];return z(function(c,d){return b.push(c)>e.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d<b;d+=2)a.push(d);return a}),odd:bf(function(a,b,c){for(var d=1;d<b;d+=2)a.push(d);return a}),lt:bf(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},j=s.compareDocumentPosition?function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bg(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bg(e[j],f[j]);return j===c?bg(a,f[j],-1):bg(e[j],b,1)},[0,0].sort(j),m=!k,bc.uniqueSort=function(a){var b,c=1;k=m,a.sort(j);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},bc.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},i=bc.compile=function(a,b){var c,d=[],e=[],f=D[o][a];if(!f){b||(b=bh(a)),c=b.length;while(c--)f=bm(b[c]),f[o]?d.push(f):e.push(f);f=D(a,bn(e,d))}return f},r.querySelectorAll&&function(){var a,b=bp,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[":focus"],f=[":active",":focus"],h=s.matchesSelector||s.mozMatchesSelector||s.webkitMatchesSelector||s.oMatchesSelector||s.msMatchesSelector;X(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j={top:0,left:0},k=this[0],l=k&&k.ownerDocument;if(!l)return;return(d=l.body)===k?p.offset.bodyOffset(k):(c=l.documentElement,p.contains(c,k)?(typeof k.getBoundingClientRect!="undefined"&&(j=k.getBoundingClientRect()),e=da(l),f=c.clientTop||d.clientTop||0,g=c.clientLeft||d.clientLeft||0,h=e.pageYOffset||c.scrollTop,i=e.pageXOffset||c.scrollLeft,{top:j.top+h-f,left:j.left+i-g}):j)},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/doc/arkode/examples/source/_themes/bootstrap/theme.conf b/doc/arkode/examples/source/_themes/bootstrap/theme.conf
deleted file mode 100644
index 271b964cc4..0000000000
--- a/doc/arkode/examples/source/_themes/bootstrap/theme.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# Twitter Bootstrap Theme
-[theme]
-inherit = basic
-stylesheet = basic.css
-pygments_style = tango
-
-# Configurable options.
-[options]
-# Global TOC depth for "site" navbar tab. (Default: 1)
-# Switching to -1 shows all levels.
-globaltoc_depth = 1
-
-# HTML navbar class (Default: "navbar") to attach to <div> element.
-# For black navbar, do "navbar navbar-inverse"
-navbar_class = navbar
-
-# Fix navigation bar to top of page?
-# Values: "true" (default) or "false"
-navbar_fixed_top = true
-
-# Location of link to source.
-# Options are "nav" (default), "footer" or anything else to exclude.
-source_link_position = nav
diff --git a/doc/arkode/examples/source/conf.py b/doc/arkode/examples/source/conf.py
index f1f6f74d54..ece4ad0fa1 100644
--- a/doc/arkode/examples/source/conf.py
+++ b/doc/arkode/examples/source/conf.py
@@ -13,24 +13,29 @@
 import sys, os
 sys.path.append(os.path.dirname(os.path.abspath('../../../shared/versions.py')))
 from versions import *
+sys.path.append(os.path.dirname(os.path.abspath('../../../shared')))
 
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
+# -- General configuration ----------------------------------------------------
 
-# -- General configuration -----------------------------------------------------
+# Set variable used to determine which package documentation this is
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# 'ida', 'idas', 'kinsol' or 'super'
+package_name = 'arkode-examples'
 
 # If your documentation needs a minimal Sphinx version, state it here.
 needs_sphinx = '4.0'
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.todo', 'sphinx.ext.mathjax']
+extensions = ['sphinx_rtd_theme', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
+              'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex',
+              'sphinx_copybutton', 'sphinx_sundials']
 
+# References
+bibtex_bibfiles = ['../../../shared/sundials.bib']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ['../../../shared/_templates']
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -43,7 +48,7 @@
 
 # General information about the project.
 project = u'Example Programs for ARKODE'
-copyright = u'2012-2021, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, and Cody J. Balos, release number LLNL-SM-668082'
+copyright = u"""2012-{year}, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos""".format(year = year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -81,6 +86,16 @@
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
+# Number figures, tables, and code blocks (can reference by number with numref)
+numfig = True
+
+# Override format strings that numref/numfig uses
+numfig_format = {
+  'section': '§%s'
+}
+
+rst_prolog = open('../../../shared/global.rst.txt', 'r').read()
+
 rst_epilog = """
 .. |YEAR| replace:: {year}
 .. |CVODE_VERSION| replace:: {cvode_version}
@@ -98,85 +113,18 @@
 kinsol_version = kinsol_version
 )
 
-
 # -- Options for HTML output ---------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
+html_theme = 'sphinx_rtd_theme'
 
-##########
-# agogo theme and configuration
-# html_theme = 'agogo'
-# html_theme_options = {
-#  "bodyfont": "Arial",
-#  "headerfont": "Arial",
-#  "pagewidth": "70em",
-#  "documentwidth": "50em",
-#  "sidebarwidth": "20em",
-#  "bgcolor": "#ffffff",
-#  "headerbg": "#ffffff",
-#  "footerbg": "#ffffff",
-#  "linkcolor": "",
-#  "headercolor1": "",
-#  "headercolor2": "",
-#  "headerlinkcolor": "",
-#  "textalign": "justify"
-#}
-#html_theme_path = ["."]
-
-
-##########
-# custom bootstrap theme and configuration
-
-sys.path.append(os.path.abspath('_themes'))
-html_theme = 'bootstrap'
-html_theme_path = ['_themes']
+# Set theme options
 html_theme_options = {
-    # Global TOC depth for "site" navbar tab. (Default: 1)
-    # Switching to -1 shows all levels.
-    'globaltoc_depth': 1,
-
-    # HTML navbar class (Default: "navbar") to attach to <div>.
-    # For black navbar, do "navbar navbar-inverse"
-    'navbar_class': "navbar navbar-inverse",
-
-    # Fix navigation bar to top of page?
-    # Values: "true" (default) or "false"
-    'navbar_fixed_top': "true",
-
-    # Location of link to source.
-    # Options are "nav" (default), "footer".
-    'source_link_position': "nav",
+    # Allow unlimited depth in table of contents tree
+    'navigation_depth': -1
 }
 
-
-##########
-# bootstrap theme and configuration
-
-# import sphinx_bootstrap_theme
-# html_theme = 'bootstrap'
-# html_theme_path = sphinx_bootstrap_theme.get_html_theme_path()
-# html_theme_options = {
-#     # Global TOC depth for "site" navbar tab. (Default: 1)
-#     # Switching to -1 shows all levels.
-#     'globaltoc_depth': 1,
-
-#     # HTML navbar class (Default: "navbar") to attach to <div>.
-#     # For black navbar, do "navbar navbar-inverse"
-#     'navbar_class': "navbar navbar-inverse",
-
-#     # Fix navigation bar to top of page?
-#     # Values: "true" (default) or "false"
-#     'navbar_fixed_top': "true",
-
-#     # Location of link to source.
-#     # Options are "nav" (default), "footer".
-#     'source_link_position': "nav",
-# }
-
-
-#############
-
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 #html_title = None
@@ -186,7 +134,7 @@
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = 'figs/sundials_logo_blue.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
@@ -196,7 +144,13 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+html_static_path = ['../../../shared/_static']
+
+# These paths are either relative to html_static_path
+# or fully qualified paths (eg. https://...)
+html_css_files = [
+  'css/custom.css'
+]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -245,6 +199,11 @@
 
 # -- Options for LaTeX output --------------------------------------------------
 
+latex_additional_files = ['../../../shared/latex/preamble.tex.txt',
+                          '../../../shared/latex/cover_pages.tex.txt']
+
+im_number = "LLNL-SM-668082"
+
 # 1. the rst file name used to generate the LaTeX file
 # 2. the name of the LaTeX file to generate (and the resulting PDF file name)
 # 3. the document title
@@ -252,9 +211,15 @@
 # 5. the LaTeX theme
 # 6. include the file from 1. in the output
 tex_author = r'''
-    Daniel R. Reynolds\\
-    {\em Department of Mathematics} \\
-    {\em Southern Methodist University}
+    Daniel R. Reynolds$^1$,
+    David J. Gardner$^2$,
+    Carol S. Woodward$^2$,
+    Rujeko Chinomona$^3$, and
+    Cody J. Balos$^2$ \\
+    \\
+    {\em $^1$Department of Mathematics, Southern Methodist University} \\
+    {\em $^2$Center for Applied Scientific Computing, Lawrence Livermore National Laboratory} \\
+    {\em $^3$Department of Mathematics, Temple University}
     '''
 
 latex_documents = [('index', 'ark_examples.tex', project,
@@ -282,142 +247,22 @@
     # background color for code-blocks
     'VerbatimColor={RGB}{240.0,240.0,240.0},'+
     # font used by heading
-    'HeaderFamily=\\rmfamily\\bfseries',
+    'HeaderFamily=\\rmfamily\\bfseries,' +
+    # line breaks are allowed inside inline literals
+    'inlineliteralwraps=true',
 # disable the fncychap package
 'fncychap':'',
 # figure alignment options
 'figure_align': 'htbp',
 # additional preamble content
-'preamble': r'''
-% =====================================================
-% Start custom preamble (see latex_elements in conf.py)
-% =====================================================
-
-% Use ragged-right for the whole document
-\usepackage[document]{ragged2e}
-
-% Specify depths for section numbering and table of contents
-\setcounter{tocdepth}{1}
-\setcounter{secnumdepth}{3}
-
-% Link a footnote to its location in the text
-\usepackage{footnotebackref}
-
-% Add new command for SUNDIALS version
-'''
-+
-r'\newcommand{\sunreleasename}{' + sun_version + r'}'
-+
-r'''
-
-% ===================================================
-% End custom preamble (see latex_elements in conf.py)
-% ===================================================
-''',
+'preamble':
+    '\\input{preamble.tex.txt}\n'+
+    '\\newcommand{\\sunreleasename}{' + sun_version + '}\n' +
+    '\\newcommand{\\imnumber}{' + im_number + '}\n',
+# extra class options
+'extraclassoptions': 'twoside,openright',
 # custom maketitle
-'maketitle': r'''
-% =======================================================
-% Start custom cover page (see latex_elements in conf.py)
-% =======================================================
-
-\makeatletter
-
-% Start roman numbering
-\pagenumbering{Roman}
-
-% Title page
-\begin{titlepage}
-  \newpage
-  \null
-  \vskip 2em%
-  \begin{center}%
-    \let \footnote \thanks
-    {\huge \rmfamily \@title \space \releasename \par}
-    {\Large \rmfamily SUNDIALS \space \sunreleasename \par}
-    \vskip 3.0em%
-    {\large \lineskip .5em%
-     \begin{tabular}[t]{c}%
-       \@author
-     \end{tabular}\par}%
-    \vskip 1em%
-    {\large \@date \par}%
-    \vfill
-    {\includegraphics[width=0.5\textwidth]{doc_logo_blue}}
-    \vfill
-    %{\large \rmfamily LLNL-SM-668082}
-    \vfill
-  \end{center}
-  \par
-  \vskip 1.5em
-\end{titlepage}
-
-\makeatother
-
-\clearpage
-
-% Disclaimer
-\thispagestyle{empty}% no number of this page
-\vglue5\baselineskip
-\begin{center}
-  {\bf DISCLAIMER}
-\end{center}
-\noindent
-This document was prepared as an account of work sponsored by an agency of
-the United States government. Neither the United States government nor
-Lawrence Livermore National Security, LLC, nor any of their employees makes
-any warranty, expressed or implied, or assumes any legal liability or responsibility
-for the accuracy, completeness, or usefulness of any information, apparatus, product,
-or process disclosed, or represents that its use would not infringe privately owned rights.
-Reference herein to any specific commercial product, process, or service by trade name,
-trademark, manufacturer, or otherwise does not necessarily constitute or imply its endorsement,
-recommendation, or favoring by the United States government or Lawrence Livermore National
-Security, LLC. The views and opinions of authors expressed herein do not necessarily state
-or reflect those of the United States government or Lawrence Livermore National Security, LLC,
-and shall not be used for advertising or product endorsement purposes.
-
-\vskip2\baselineskip
-\noindent
-This work was performed under the auspices of the U.S. Department of Energy by Lawrence
-Livermore National Laboratory under Contract DE-AC52-07NA27344.
-\vfill
-\begin{center}
-  Approved for public release; further dissemination unlimited
-\end{center}
-
-\clearpage
-
-% Contributors
-\thispagestyle{empty}% no number of this page
-\vglue5\baselineskip
-\begin{center}
-{\bf CONTRIBUTORS}
-\end{center}
-\noindent
-The SUNDIALS library has been developed over many years by a number of
-contributors. The current SUNDIALS team consists of Cody J. Balos,
-David J. Gardner, Alan C. Hindmarsh, Daniel R. Reynolds, and
-Carol S. Woodward. We thank Radu Serban for significant and critical past
-contributions.\\
-\vskip 2em%
-\noindent
-Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks,
-Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier,
-Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer,
-Yu Pan, Slaven Peles, Cosmin Petra, Steven B. Roberts, H. Hunter Schwartz,
-Jean M. Sexton, Dan Shumaker, Steve G. Smith, Shahbaj Sohal, Allan G. Taylor,
-Hilari C. Tiedeman, Chris White, Ting Yan, and Ulrike M. Yang.
-\clearpage
-
-% clear empty double page
-\newpage{\pagestyle{empty}\cleardoublepage}
-
-% Start arabic numbering
-\pagenumbering{arabic}
-
-% =====================================================
-% End custom cover page (see latex_elements in conf.py)
-% =====================================================
-'''
+'maketitle': '\\input{cover_pages.tex.txt}'
 }
 
 
@@ -426,8 +271,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'arkode_example', u'ARKODE Example Documentation',
-     [u'Daniel R. Reynolds'], 1)
+    ('index', 'ARKODE-examples', u'ARKODE Example Documentation',
+     [u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -440,9 +285,9 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'ARKODE_example', u'ARKODE Example Documentation',
-   u'Daniel R. Reynolds', 'ARKODE_example',
-   'Example programs for the ARKODE time integration package for multi-rate systems of ordinary differntial equations.',
+  ('index', 'ARKODE-examples', u'ARKODE Example Documentation',
+   u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos', 'ARKODE-examples',
+   'Example programs for the ARKODE time integration package for multiphysics systems of ordinary differential equations.',
    'Miscellaneous'),
 ]
 
diff --git a/doc/arkode/examples/source/figs/doc_logo_blue.pdf b/doc/arkode/examples/source/figs/doc_logo_blue.pdf
deleted file mode 100644
index 7be0f972cff62df027feb6ae2992e1116ee09ecd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5290
zcmb_g2{_c-`;T-nT@}^UqWapJY_pohG&6PzW0}ZSG|U&nj2Say$(5yrqL8ASgj@D3
zm1Mh?QbY<7LQzVhNS5NN{@;;q-G2A^|Nj5yx#xN2nKSSCyvupt^Pcy-qiStrqJ>6i
z!&Dny$6bKo02IJ=^M;YhNDI){Q|JZYAqpL7!eR?SK7ce~GlZZK=+0$=R4Pm$<bw<j
zEGXs3Z_crZQkld3o@=WjwpCb{f<$McUP{!2VZz6yvw7X_-2yp@pXRr)oV2bwXeNAY
z$xfQF{rLXVrw?xii^6(aiavkJ0ZV!hzPSqjyuD<sJvHp(oZpD%=#%Vem%D$oa9_Ws
z|2e)fI~6n3jN=lglS;ZOLqkK}_PF$PEp2%@zA+~4Nl%w0w?*M%bNwT~@<A%vvA-_Z
zSf{1?QZst`KGlOY=t#!9>v{@UX)UfZYLio*W4nX<TiB#loi=-9c0;?RM$Gw6d?>Au
ztjf!7xV|x}Ul3_25o;IVG3`p#HOYUl(!tgRgD4Gu9zDgrHM!~1mMvkDj!zqXx%RdA
z-sP7I(zXqfCA%6pOJcfKhkFdfh$XFFcfCnmPKoX$75(5kxd&}V8GW@U_^8uB<1^%m
z$&ay~Qyi-!97=uqM4n=Yp5TqA#80;c1jO>@CVc$B=G4h~$Lu?=I}ref@l#N@wX{)U
zf7FKo{nHMvW1o;pPc4V9E4GHORl2t~C<!or)Fu}6-tI!t%bRfrN&`#=J}O#}1#2Ys
zXq@6Thi=kKWfeCcNX3bzdwcTj_DMu;_M4s@6rK#w4c@)4wmd++Yw#oPQ`(kp`q<u<
z5$TDSR`{@<IvXFEWs`sEK3COeiGRc|kutVR4=f9jHa{2Y6PTWbQ9Zqm;ce+~s3u?f
zHAo3QCa?(nu)8r%N)TbcJM^VRF>kf}66yNXv88M2vh+9MH!gm_QBa)a<le;BN9&h0
z*(_-gr~=##66tOl(q8fC38K!DDmCY%vbNfs#sV9}sv_q*oih?Su?43xAM2#9Dvz|(
zyRKR){!aV&x?0^^z2|EO{Hssiz3l1|zhcgQkGSC0_727~!v28MXAeq-c~)8*NF1gH
zX9^F;Y?0eHrQC;^Ym#X5Lxfk7!fSkPoYr~Twb_g>bbE_Q6RQxLs#;;#9)8fi)I^SU
z!DMK7lLGCEbjMLR;!!62C>Nf3YaeOdb=O!$a{}ULuL9dC%QMc$d$vifoso?#tQmih
zEv|jUW<cFy_<55zhM)lO!gl`=y6VBwa}jQb8XafYwFvtAXmOwT3xkT9&r=F3wyMjj
z76nP>;XlIG^@&GiUrW4XldiP<Xvmv{sGm|`l!MN(8nu_L=awM7^a5`>X?o<y*`8C{
zSU)5->;<n??t<?>Q5JR{(21*cx$fkHJ#(~j_;MlLExgxfR-#80W}TG$ke91YJ1#F%
z^YUd}8fLf76Nzl8ETcO6s}6}$kBM)H_Kj`_RWKJ)1|nHGXV;8$fP8$%j=ZwQs`d3T
zz(`iXYtrm3@pPHcz?U0G=w3<7Ye%V)Z}pSSI@h%AKeRHe=CVqw)mm{s1KFqEZq;^(
zod)?TScIL&sdvRazB`w?UCBHtaF*WB>8fJhp3rKVmRWiAgPhhKwc@}MW%cT^SflK4
znet63^j5#D<vAW|UF~@o#;}ST&0pGa`vr4?kN5=nL1>KZ``pk?DJx?LDFHp3uNgnB
zeSY3}GKXl;)RJb9g$hVXdXRo{?~CEmxcikw@$9wqyyR^$Ra8({J%0A(YtvS}VVr>T
z$WS^cGcb9j+~HRb90Ch{NV)7>dQ@bJn%Nz-75sM=!OJpFNl7ZRma3FE0Cx`@455>3
z=M%kkYATqa6|eahZf@(`)7jT&8+F`Vu{pt2{S8n0k?`meFQ&gwVqWMynI!?y!$ZvF
zv<C?+FMUmJhrIs!7FWIUvG`w=8ry+3i8n*ZLtbfTB$bYZKid}-USKR=S+QdCLzKhD
zkryP>qNdH>hvMmyzfgzIOR3TH8Z7D<b9Wy{v~Dgrwsvjt`F`bsVe>ti_%&9)JvsJC
z#Y9l)x-{62nUJ5SKrUX^l%K1dKWkd%MF<qW9n8C$_e<{KtE-8TW!VN-wytwpPI5Ho
z3lo2H@E&;HZ&TggkziW?v&XQEatsE(#6WtL_ZHgrYlluLYMsguK8&%9&{6&KaB{xF
zAC8->SML^f914e}S;|^B9%Lmfn=3h+p<t9*(Pkopm)}vG-@VI1>Scyp<)xrIDi4BP
zO41}E;D-K@a9PQB3TfNSZ#CUz$-C@(wG0D<8r@^szTX>e74kT9IyQ%-&~Gp^JF#-$
zlyrjP@%$)Meag<G`s5q!(P5KfZeaVZd-|v|C)WE?GT7c@Z&LH5M!h}L4;@|~k|%e3
zwO3+E5!W#PsHUl2a>2A^ZpJ~!Vx^IB!;=Qh6TvRJwP${wX>E&m(XEoJH<pqit2@cG
zppoMpFek5V`cpMEI5~?A0~09&F4r7=<bN-8YHhC2txGBxjUerq2;=OPw@7NDCqDEQ
zn|fw;2BTQGb#RFJ6mE;kgT+OwU%|<iMy@%r>UVVXGy9_3=ciX)xh`QRm&Le!?^J;1
zUUZ5dN%7Iqv3|~|UHy7NBzJi8hU9}Lv6}oFPOEIM)YISJF*3H^vCA8isk|#CIwog~
z9BwsYe`NK&c!SJ(R{5c~iOjStRq?Z1IW(&^A?NM;OGEZCF}GJ8r0)C0bXdKU`807Q
zswA-2_HjeQwXIDmC7bJU%=R?piNWmd`Oo@BR|LP0+-d0uDhGad+CisVhlT=X##Le)
z4Jio$70%q#@6GhIon;+W4RWe~m9+K!6<Zfo{aB?J;lH2gIxuVdqAKCfYD|N+Fjiq_
zvYVfc%*xK>(muC6hZ|tm@8z2_I@z_GyuE(2iXWUVJOfZ1(Cjk-UUxfe_m}mIn4R5s
z(^V>@M&qI5Rhx0WD8Gq2`xEO@-{qAI$r-ghG=O*8^l3YdiZLDC8`q7*f0VsxV)LZ<
z+NSrXN8+sKz)N*2TdOY-<C5>NC}6v)bZoNHxW&Z`E0z4lNmIa^I&h?@x2KK$G<~j?
zcNf)h?+^yGsEh70ui&vlwCT@Rn3#L5$<=qQiQq7~ByC{ZrdVo4POlU$c0=aF)*u@0
zcJ|!NSb;}|2kcB2-Y=)~=%);P4^K9x8D3BHzw%J<M@{I5`pVJKI{Nd%ip^blnflQs
zUK*z>VTGx2^4GE~?M}_#XBFlmTZxs^Cz^g=adIX)G3#8tRFwhS5i1=u6%LD-N;KJ3
zfCqLE?*)6R$ZS{aYa}$6&rKvIAAZppV&%ob+M7>L#qzq>JNqdZSGsPgWY$ed=gm^i
zDu1$--CmNQ7`}C6HWkzjZQ8!p+B3C1#H){vxT*eYLrz-xy4)uB9D9Ef3HzkPp%|0b
zqj=W(QGV^?k6B$SWMy;C#tvV$4e)wfk#)?!{8AQqu7lrM**6(8OCjvW93W;5$JQQG
zFetOxV(K#VxlOBu<IT7G#jty*LH<BO`<itlRaAkg8OG~X!S3?Ogcl#~raK3^2X*wM
z<r&*IdDqKr8Q0MCX1AUE`44lb&dlacPprCB9#|4+T2Mr_BId)99iA;`Zx&D9N}Ipz
z<9*M`>i$qvW}6^=m63*XNIEagH0`42^bLNnuY&J7$pejL<2@H26-JtF{6%SE{y>Dk
z$!KZG2Dnu#Gjr?x)T_I?dWj>E1vW0D=gzNjynE@I;eisFyJ@oQ1A!a*6HYK`iL{z2
zqv1i8ptMM%_8~o|MMx>ayb^e3W=toZ*|=`Q2&3F2u!J0)y<!;KWwz{UiPTJhPjLQn
zLqTg-aA<i|SLMZXr_YWrcVUHa%U<EaNs44}J3hxT&*|QF+>12r;O6;Tl<H1G_G^Oo
z2DRg-d-eu)M3VDcV;Rq~WJWX2StxI>+MIl8zB=HE)4Tf<8dsv^XE~3c_!OfZezJ7U
zSWPU+t=?|tJ#%&Enp$6>@Pz4+`99?t@vwlOAB6RrC<k;_;=`;OTjZaxxLd~#m#QZ!
zd_I@^I)CS+9q?r94bU+;1lywND%j{&;2f#iSN$?pt$s?bd`39vl!!^|XB(Nne=!%@
zxhrh9)yZn)#OL@V-B2@I)p6vO&tl_oujWBt=HiPSnu%WVqPM%~8>556z!quR-(L8(
z`*|SJn&Al|X&{ruFyICO&M0UZt&M>`guO6mkq`O`0j#J8fFbFifa}k92L(`fV9n>c
z?*fI+NT`2+fW|>W(_KQSHvotWSg1Kb8ghMw5VrsjH5GIiL|QaKB<@R-0U$*-01HM4
z0HisKDFB>dA`|Jby#OS^AJUHgjurhE>msKiL&#urJ->=rw3G%48BAye(D^|%;qUz4
z?1mw&tZ4w6N?o*3w2j3^h)#fs*y!IjAd<ScxZuOD>R`xS{%%5%R~={;UmGYi7K^7+
z7Xw4q4dOA}eLx}L270o5De&>i8aTjWQsDMD8j8j<1ie^0g8AUCU`t!~U>|oKCR~>a
zBkMAtc!F9%44#(9LMJ8wK!H0&$&hYgq9g(Yk%Blp4zz0^h{N_3kb)@i1r`!C7m<;0
zU;!fZp}-wz)_{=9W&5y%00yChKx?6~nt%tN!2tugd>;Ufz{4Ste5MD9Ze+435c)-d
zdkKX+5)v607>EeOBDj1{Bw9yD2Z_QUF&Hffp(WVwD`W&|`3jUFeG7)L9R6bS6(AOD
zLb!7|NR|T<jX)v4Dl&q$!)Nh?EUqsgQp|AU`U@#=e}5K}gmNP=i3BW0O9!hBYN62{
zXe|^pv>0wo0tUq6aULM?t2*9yX8uhdv;Zl@LVkc|B<S=q{oO%61#W6>0hoGm1;Q`-
z0UZR207ouv|KG9-ip@WJ0Sf4%8^{obMB_499{Y`;G@@cqXuKARsD;AWqERG_Hc1<!
zg(8qpC^GT~Bousz)e!2$q0apO!1^8XJ60~=7CI7C6ha%T!2|<9_7^=1;KemEQWTl*
zeDZI5iNT}M{&zodIHH3r!jX))?*1I;df938|2ZcAc4V3Ee;Lg4=d%}bg6WO~*`UZa
z0Tf&`WHHm7<iX{07|@Ak@OW&NJ41BPk<dwmQ_0YxkR@b;)P;=GXA8ef*ep>7k=P7h
zPYOIpiwSx#{MkY{)y{VT&HNG#HjDaYvcQM@ChH$!wLpS08VVcouls@u1OBD)?+N;L
zNkW$~1s*860-@R8Ya8a<9sD($xBXKxt3icGlpB!4McJ{<h$Koa6cL3(qcGYFSp`R-
z;1CSTzW;()%!X~>vPA8#f)T_AJz!AnM8QOt)0Y9@aX2gv@BkKRSd2DQNkjwi{Yuj&
z=s-p5?=&o$2-Tk-Xeiu&@S;#?sJ8xy!~O>ji$z0)^9LLj2f6S^8u2@vkk4STK|b_f
zAb{M(3I?IQ0Z2NR3sq!MIRub9eLc8<C=SruV5bq_Og2Jm8yMj6208>|JOO2_uWdvy
p#9<6EIz$7sJ{n_4{qKmqqGB%)GWfy;hidC!2{2VvV=EKb{{WsVUN`^%

diff --git a/doc/arkode/examples/source/figs/sundials_logo_blue.png b/doc/arkode/examples/source/figs/sundials_logo_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..e81055c3d721a96f8c5b8bc5058b9d4d3ba91122
GIT binary patch
literal 40321
zcmXtf1yoht^Y*zkNO#Ajkq!ZAymU!PBaL)-U8O;~L%^$`paLQS5`rKNA|NfHbV+x8
zoA>wqS&QZ3dhR~^%$|AXnP=w2Kh#zsz@x>3Ac#Os6`=<~XzJkC8V3t}@>R9i75szY
zqo`(p1Aanr?Bc-RxSpyeJ`lvubNdTRelm6fKBVzgGWON?aPSSV_O^!t0s{D*++BQZ
ztv&7eJ-i(Y{z=n95HqBPP%sEA+?ovvHTU}>w>xwo^NHQbbZt&gp^hK9wScCoz*m;%
zGmVN&NC^Hjeg(HY3O?e|twPNe(^-<MQ_27CDRo<6<IWsGAOwDvB^YJLC}ozG-gV2K
z`XM>AlaeR@B!k0eWuVZc=w!1q@m}6eKoN(CW6^;{k$?gYOB6A?J$08WL?w6-jqrWy
zHp8^Nws!h%-YdQX^O8^=T=3R`kB_h7%^OD;iACE06<R}F-n_(Nn8UGvgb;^XW)!g^
z4iTSugW%7fKRsj0oT!8kFlA(9b|AqsRopZ^^_o&)_V{#g(VsM9-ZJ)#-f+m8hP#3=
zoeP&GVZ-ANl`?5k5)+0eCQ<~_#N5RrbHnspt&GHu@KFn>Uv^1V475A>H~VXHlKMye
zi$w`-p}!>2`r+8jQEx3%HqWQxySn7ijd86=kTj4eq#t)CY;)cDysIm=e)Bx^F*-#%
ztIz5WcJXbyjSrz}D7GlB1kU_|Ay_p{TeA>ja2<j4ZlKSB6FZJZ9BR5XqV*j@EmPq3
zp^8FyDGS=vKcnS}{@@rjE+1dD{n%*J#g6!RbaK+9o*AdAoY|Mjrml!Hqzm7Zgt}M9
zuyW^%)h#Sur$%wbBjA5{bZdAuNdNcr?LL}^LPp!Ua$A19iUw#VuMEDj>5?i2IyY77
zurFZb3=V}>lymPeJW$L`bQ&$|wfV=x3XImSpX{c?UlP=Vi$N=MM>&pEgCirI%aG>3
z4Wi^rT9GU7dGBtU2r6b8^JIBvaoG!l|NGyzbOuwpAEQ-w+aI(RH(Pfo2rQDIGC8#J
z*_L4y&u{m=BUI%xhJTtg@e)T@-CZT~|17jysJDR)kp|tH(fPKJ)ETD|r`KyITuI8V
zHOi*TqknsD(&BQA^V*1FbiujA)(!-doc;DRL+5jiIPWa&H|+oaq68ZS>95b?WMRyb
zT@SGH)>z+kEq*AC(}=Ul7qou%{Qp0O(kEud$JSCmrl9aU3qNOFBO!Or8QINWftNo<
zR5+tfervb%(w6R1>`Fl_2)_`0m2NU<uGMg2leMi}y<BaeSzO3x<?)ckNBCkusA3>@
zMsKR#S&Bl>FSE0Bgc^=6>1zH8Gm<a7n*||clCAXeVb6|WRIJ^G7Vzv{)v&OZ_qr9r
z!oV?z4LK+i#|Q`sm7jfEc<p<i0gh6Jeu{1*-Db2oGJ=8@yOPkuyG@dK`_skL4V6jR
zL1a9Pu@*%OltO;WJF|m0(IvR^G_?)Yzty=t$v@s$%%f4~j_R;pYm|i+FrgNR(RM}d
zZfWD<-f4gMrJ1t@GjS?{o9LtQd;T=l!tzX0sDz{q;ZUTCAj>_2kXHkt^4v#wA}7a3
zM>2D>vohm^ze&`}{lIOR2L}h=aF@;zE$Bh3-)876v389dz82&~3=a?Qy^jr>h$<^9
zb9yRoW%PC1b*5-+YU;};Y9Yf&@M(3KQ({~X<SC2PPn~y}N82SwwnA%gxJZ$VyOZYa
z*{b&mK39eZM=nbE<epJO-DnaqaWU7w-SbykFX-%phW%O?+b9MuhY*K#q%wTy4LNzO
zQ*(3It?a=+66#&2YSy#umt}ZV5F+-XJDxGt16C_Tum-F)1EMAe$P89HRTt*y=(sws
z5>les5??`?*vSC`D)yf1WcAFBv9p4^+rWEyX3uACGoRw0P$J2o0S=VOfOJ8gqmZK`
zO`LMGQAlGHi&26SH2!@5fQJ%o*Bu^QZ%ut;YclR=|J~NL&aEGc!nXNn%$27Zo|o5(
zW2Hz^^emMjO-5(5meOKkf~Pcma(w)F_a#v#Le1a<Fp6ZkLEkUYZ3U?KNUF%Wbn{#Q
zR*1PUX(v2YlKE^=B9>j@LGQ4{z@EhS1V@wc6?x`V81doaS>9PoewjtZ=6S5<=<fv;
z{H*pGUfQqxuFZB6GcNfB1ypPqz4K^+`te1=&;nk!SLIK?tNJphuMwx>rP9c^>cdYC
zFXfr5v+{=6P|J;#OgjOZhFciW9Y{3rS23G<>|`|vTPSvRJ$up)^6C)GzMxkzNkqUa
zl{3?OU$d!0_#J^cdK)a6{A$4r@ZkNQRRG{BlC7z8$aJZYG+zXwb4|vZ$#F?q7QAvs
zZ9nE3Y)N5|xE)GiK`@7}CKE?Qrwpo}(=0sXMQJU12HYTyb8<A1gYDRGT~c;kL;Q}0
z>^w8rFQS|KBw@bmBc+_@<c|z(S5{^I>DdeCO);LB?DetfqSd%aJ>oN|St4&m=T>pw
z<QfY`ktZpqu%MctUuV=^JDQ`HGcO<C+B!P=4i%QKMQeOs#PhVr6ACkRt&cVuoM9v_
zYktMx+zw}06kq;)1YKMvv%X2r^N86hlzqM^Q5nt=85t?|f{VK}9M39$$eR9MK87lI
zRHQX^68Le0WW~B3$o=~LySap1XpFSmtGOr`9Vt%!awuVZdfFL%aw&lRLGBsqiD+>2
zyjLb&ebbzC5W=Z9o!!G>#a=dcm?<7{?fBXQtjS}luRlr;5kbb%$+0eo!y|aCflsDh
z5vTe9FRMB$-Ol06UFe!{!3n+r+YNN*n^F*nWI;t7)wDVj<3-zL^64ZmhIYNGB!!OA
zCX-yB_J;nRot~bS8xemEj@%d=c_=(V<ly;7rWZ;GBgCuWox1vZIn#kj=XiS)frcqU
znHbyVf7P^HrT6Y9i(G0@ipVJ<ED*JWUWJY$>xZK%_q(_E`vr=#)JwIE)LRJJvLJ09
z=GO<=ye9i~;75+~r;4GM)Da~<mWwyS>1==b8-tWTHKy+#2FaBH_h+xG^P?fSnJTHg
zf1LuiSZB?9agt#(s2Q^@8X}zGZ6BylI>t!nichG0GK|84Pe*Oh$ele@FW-cjTSiqo
zj}%J!SWbVmjU{ON<QgAmhj7Ahb8{QoY`n&(VO5q(LBKbao9-|UPJea@fF@xJme9mz
zV>mam7?K#&(o9}#W<s*5OV+tHRlG8I7eA8BAob(vg@wBdJgtY*)XZ#@HB5vt<pj2d
zzDp00L6icP(jvq-mm<jJ4&}<5aR4(-!$pX)IfPQ*tWb(Xu{5QFC5XQu##n<-kKP-n
z!BS7A9@(afslUR(K%>elJG(b38j<FaE=oEoDn67iw&@CQ?9~c^n_`*#vZ%hkzRuUo
zjO*F{*LwrP>PFf$T{Qp4j~_4g0x!+}c%CBQ=XgjqlG&%$th%uvnHcZ_hlMd$iK`L9
z8s-)~ooDYrmRQvUNHv7`GQXk`$*_RMAt$T)E8}|iS<9*m^N%)49E>Rulx+#2Gr|Xj
z!2KF0gbaD=T{4~h5ar0DIPukc5)C8M)A`BWi{cW=J}e?tvLm+k8(IeM!9H5)Vm{{Q
z$^AhE`H0eny`w)~Pf}&uA0Os7jj`5*cE3qC6@Cmo+qZJBRnNpyfu{`tauvWDBC*%7
zJTBGSDAzE5L`fLyBCM-;-OmX@>g9|AMa{2X*$#x;frn}IU}+ltmgEskqsk{W^5RAR
zK5QDChXVz1y64N!pT%GcQfGCxE8<ivg$YakLMKnrv7N<qy+f`T4@DDLQ^5+gfzsEc
zNVC~mc2t1!tKsN5Wj4a)x=^H^df9xa)r>z~a<!!`xg!N@wmLaJmVL{kaQ`N!C5hyB
zgV^r3p;qKJBi^<=i%D|zru$Fag9e$u-@WM7GDClYd_~q~8+1<!x2A*+c|lTY`Xcyl
zNzKhFCBM0G`tpNY|C|69jczA1KvdK*d;B`+q*b>0E0zt^mYndZvlTKbCd;E3>mCCq
z7(7i?i$i_j5`r8Duo?edc6D_X*VfjO%cP`r{zmbDOfA!2BTGniB$0b2)x$`jn?Y4U
zY6S_vhuUKXc$GLUOlzO$J`kjqHXE(QgtTo|$Y2AIpx8+<ny2r-Kao9;M8ZkhigSY!
z7bR$Q!_ip>LeY>p&FA6<Jl$Sg^TiC%)?7;yN0nTe(?22nMV*1r<iwTY=|;cJ!p=mh
z2x)OrQ*!V;71i#ujV&?Ozk3F5{-DmjG**filui8$va;#9)6<GptJ#vI&r3O~SN;og
z;5~W+dD}XKHn4cU^<n7h1Pk(DLFqK&+g9}Z8+Llp8)0&8ZfrOU>!Ly3UgN}R1qfV(
z-IIKOT~XSWmz9<OT7Bq9rP=j8P|i^ue{Qg?TKiY#xjTv734A`4n30wWQO9_tTT{>L
zaAZj3o&`W(p#|4dA2Qx}Qlvcdf^*VH6fT+bJ>80T@5~5FQb}IEieJ0vwcB^<5d7*p
zWuK#U%yUm3<PRkf&qTz-DdzVg^mTMn=HD0@eQG9SH+dy`-(q4FpaPZ1iSPjxO!GjB
z1Jb`FETI?t^bWDU_9~@v3Q-OmPyt~{4l5cQn7<RP2oNSbv2ycG@Xt4F>ZnGrZ>Dco
zUbOS6x}|@uR=~0jMTQj?d|7Zn;no|kS)m9_;s-(7qCSQa)zb~LM~^oD?w#U6Zj63L
zL{^f>n^C{83~Op-mI?o}hs1`ZpFe*tjtgI?IV-=dTn<E;VGuLiNa@y$4#A9?(WcFT
zdwJys8$*yRHW3l?F&+tnKRkrbTk2?hX2$FjtNH`9r)^_U(O$I%+Ag7k`{w$3klw_R
z4xef5Tb6lkK=lnd=?QPh{{_s4K2R2FUah$=j`kG!ULVbhx@$SVOr~eR=PKD=G<i`K
zWq<?)z*s1%_SPZP%QY6<YDAapAo1vqKdk^~lZ<)qSvM1~-!3UWe-)N9sN?SHdYSqL
zhWjLcg-4fXp>3eT8mu~SX$A$&<K~c(U|uD^q;Gf;EOqot-$hmz4GHqZs!#98qEc`I
zH}thglcQJ^fAIlz_u*$?TpkALz+FnHl1CB!Nqnb`cfi)mK<Te{<ay@(KYuMTn>bP$
zxTG^s=FX`pAUuqmL6n!4Dv_2J-mb}-)>8nxtccU`!56tvoH)9m60i*Y&K<6ni7?#w
z_fLBTPp#3*TsZGC7wk5sY5iwD-+d?QE_|pS{cT(tEj*nlxZ&|D4DP^-`yW1hxGHlB
zCvKDL2%E~;Ye0<Fy2V&Ght*==CjRlQsZU0*z;XM7s&1Q)_d#h>seJ0}zmb$@gtluV
z6e1_mop*-iaLox(ahGcQ(XS%<Ys%h?u5;J94f)WoZVz0lL2}r;;#7Nm*fPI!u!&hk
zw0uhKO%9;<QBAM3yKE^%JcRK(sMia!1Pkv*-M#zheGh;cHwVjQ)Y+Dua1a5qIGDkR
zAOn@LSZmjt9&kUIjIZQQY+N|O!m%dDL0b#~U043`Z|oAPwjG%K#L<mnU7)=zo9?p<
zR?Y8gw`7;DO^z;RPsHJx2Wh_>Uc%Wk&^q{Hq&nzS{MK9EeED*Q0ne|>%-@pup^M1G
zT5uQ~HuAN2Y@feUG9fe$cL@L1iLI(tsq0O@>Vhdc|2DI+64)%YvwC0cv1z(p@&jqc
z8#3exzh!e^Wtr1sv|a0lrn(dkw1s~l4Vi|7T)e}6pm7Vrm7Con2f}bu`~`YQ1qO+{
zYLjZpgJdxmZYUT_J-y&E&_Hshjj4;vyX_!(duKqJ-hfP%*1vN1{QO*Yc6Qc{f)t%Z
z_p6B0fcbl;w1mI=@5R+J_W_7c-C3Xopn$iKF%Zh<JrPDkuY{<F0{sw1;{d?P6FU`S
ztV0nKM|@DxAVpp%c5}!l{4?<m!PkGQvCS!8;J?-@rzyhL@5((x_Y_Bc8W9~#p#tTr
zO)3d{jyeBIHljBgWFT*8Mh`FgRSfv~edH{o-|X+-zeA^fJ_c5#u>aE@O=2<8nySfh
z(=|{Jlc?{}k<7}wDeW23CCi;M{DRf(<?Q@|R7Ajgcxwl77&H{w8@UzS@11AYH&h8R
zFfd$zVyzx(CTa8AwaNi?@z~~95F$2fjp0hRwu_6<^_{jYQrV+cev8Imn`ssKWcXMX
z6fX?a$23vDe*Gd>_CJ?+eE08OV6l-Gz+r~seQTl#zsx1aRoJK~w$|vS5b_J;ez&?Q
z0N|T6bA0++sIgLK%r8s^IgchW7fYO6=XP<Qsi?l9F#LR709|!;rZT(2=WeNXOk#Ud
zep!%dZb}|!$kb!LVNoqo_Ts#<FWtaOuv2E_>wb6gntn-OhGngZqeR#xW*ceogR|c?
z_Wfn2^beF=oSeL%t)6-Y60q0TPSd#j`P+|M!>@c8V}-@$vGi29HO2$7hyZ`WT)6Ul
z9I=je3+i3?9dWP*>^9z3TbST*&3l1!1_VV<$oYqC<;>im^h5`De=<f~SfKt~Qk>mH
zK}fnCWxP|q8#LbFq=9fm1Bp%;lvk}wglI{p4E=(|y$p9*e)mi1R+N&k!)Z_AS2_+u
zXd){&4<JpSVS^vRk<YoZSZC^H8PjDc0OiPJv6!gB*k#RpJlq7rTf8;$t*0=`*Uo)I
ziDBCw8hGF2YD(fbLQ&8!rv5TJoAOMWKizz`bamgYdq4&K_U<61?cNJKnf8UGl@KzB
zU+4?C4HBK<xjKNr<jcGrLwEQ8%AkLj2|iHhIlPsWNXh5C`}fTDqj6kZrQg)=e!O0a
z{^d&XjrDczH^T?cheT9v?MQ<aN_*hP<pY;@$-^D*Lkr@F!+uSU(NESLF_E#M#l991
zRLBsELk1R972NEj*;4Pa5XVau#vr@<$QMdD<?o4ywW(ZC9cijd4A9?b*$4oU(onrP
zT2ZpAA&-N<-*`cp)94?YU$1D_8)e5t2W2de*UP4*k+Sm2nFtyd6oqF*8WxgGWS%%4
zku0QjkRK>LC#IN=0lDU{C_{ASvO{AUIs9R-E(Be2`Zs<9a{O8N>R4PnDfjGMbaLbR
zEk*aB_}O`=Sk!9TP<UJXhiA%iOC?eX$P%`Fim^7|98>ky&`7jd3F6QHdRu(;MOAJl
z<_4L-ETrE$O*?IGZ$EZ&bCVG)!upba;_hD%<vMdsM78Z)WN%VQT54+Y#`k#2QSQzH
z1(nv&&icAn7>6~WBY4R8b_W_e^+sr*@I<@A893r+h&J!68|2{=x)?9Lmtn_;hrBUO
zh-<Z5|HHERm>aY8*G-(dEnrA;wJ>p_>hX=HECC49N01wT@d>MC^HY~Wz)<|5o(tX@
z)2XxUcVb5>IfGS+%CFqcp8Ib!hJzcsv7%;RznVhlSh_oHgv2RY-X+bT7YZDUCg1^F
z;(#?cOy*DuA1pRj&QF7~vQ4WPNG_bvX<k9yz@>^jz%SucRkm!BVQ&6>VWbX-#6+k3
z%A$g}N=FCuvw2aB+_PYa$^YoPSjFehW8;2d*hulE(aJ~4nGiDWpTkNg{|s%Nn~I;s
zJjMbHN<o`^l}YPK|K@32vdxO^|EjT-CKDYIyev%)9rWtXcZ7G->`l<sztBboIs#$x
z=k)Z3)0bHFbg&7s;g_+g*f8@~nT^U5N7#8m3?#E5KO|SB)0#d~r&Vt1$FH#tT<$>T
z6n7j}2tfUX!Y3YXZFD_n9~JfBUit!T_t@9sh6yricyj%8Wo2c@*Vk8CR~27u4Ra}v
zYpgGh6as{+DWi8O1=94LibkvEI$?s^ylRR$JNb*W5IH4XWbCECko{$3Wbxmzq2C+!
z(pfgQrRNK&fa`whs^L5FYl@KE+WNZW+s$(_=sJ1J_ejBRUPJ|!i@hM~!2h~#;=zLn
z|GZ$bufq6?ymmY82Yxxgpc8iZs}kCGeiP)lsF!;Lk~~OCGgVhfHM3oHu4wacS81<M
z<H?%F%u#V59tL!u{ys{N%ztZg?^=3(l?>KQGga_=8Ty)faYF(9kpF}E@bOh>8ba-~
z&#N#u(cuF9X`5q90!zTeu1n6~d{f}wUy+uCQsoAdpB5tVq>yp8AG)`cJI}z3OW5{Y
zR}vleLZt%{MBgzWKA}Ea{U>hiAiP^}0KLqqlHpuq@JbjFq^sV-Ie%~9vcqq4e0yJ*
z5Pptj&MS;1pI`PlkVfM(D_q<$V^HDD&{-hg+$7Ou;aX5f;JM4m8cSSW>qZb;)@l`I
zZA%T1+OsM*qxmbVr~&0k%<Er{Ie?HUHj~Lufbi?#Yay4Nx4JUL%Ycs+@z0MJRI5&Q
zcb_!@p)tHD_K$&>L-?H1Cr^ES{W;EQBVkba3LfNy1)t9*FPh_6{ZyKH=Pj1!OiAKL
zIoYWKy97FrOSZsc%R4F^4Hj=UK8qrWa?8#dgB^evC}**T8ob&Z|1h%|#AY)8tZ7jT
z2l?KRma{Z-29*)S2UTH#z`wy<=;zvA-*1Y4;-#X}{TOyRsT6{_Pzi{}*KRLE{QjEp
zZ?iZ@o}3~F-3~)V+jYO?m7ch}%O>SfC0+HP=<HTbKmZxD*np=io-6b~hi~vJ(nHXw
z=nc#&tA9lc;Ln1+^jIG#ZQ}L#wnOQDhz{<+jIjcuxeks5MINWV6T*V#W15^^b0ca=
z#Y8Rcn*)jQ$M4owV(j>}4OX|ORaoDw1Qieg9rI2rj`3@MkB^T@HU|KVUHW=|CCEJ+
z>cp|bAqk^H7DTFj8;GXAc_;$djpegMi<r-~2ip(Joa(0PT99$!@qa^0n(-H=RoT21
z0EyD?C<;i8%Z5#+IYu~@{^EQ%omO3ga+*H!jFA1qjLdb)*9oT9Gcg5;Rb($v8f(GV
zPJAp=*t!oobz&oxw4EIMW(`twc<`&ld+wBIDQ41)5x8xG`~{C~sJqxLyY!P9o0|CS
z<Z=%TM^)^6{r&$v?_OlmQ*XhYN*nsBc)^BZgo=|9@a}@LAX^ugO>10NutI(uKMQKk
z%fA4QN~!()`O61EON#LiX7!1A^8{8AMOwwW>K6G@DK!q@purZ6&?G3PCQejWeS_IC
z7yRMD8BX~(!jIB)ZqLJEbw++vw7&Cq7auWBC>8SEYMO4TmygKRBOjMc<q;sHHaO)^
zK)GrN4d{}*t%G{LeKRLbW_0@iqWr$N=L1NN3D_8kiY~wzz>R$vMIxA9aXtxy#>s}w
zz-Jy^S40&yz>QK&v;FRqeCU{DWxugn5r9dweE6{ahcwD4TXQrNkiT1zNE2d09PfGy
zj60RWd|{`x_9h;JS_iN80z)qXX~&l?KXMT@R&qj!eJ9(Q<7S|t?9ELzmTjIB^zfqw
z=}5#n7xzM>3Ck-$sE8x`RZbttAy?D1URz@9rkG1UrE;4IN4<KrI7J#`;>F*zRnz;&
zGq7e+A|p#LBTo{tN{u_V6V6-pw#UXB0ql+t1I@#FWihS?t-3hQ5<j*hB}o*{UV|E5
z6GD(<dXggZ1`3t$eF;sEV+1)_=k1^JK2{<8SHoU~2U&WK!Uyp^*>{|nQEEMmB{Rq^
z$6nY{g|Eng0z5b^j<MeDV)*IPr+k24tBDT@#Ha5jRc_wfXBunn5go)%BpLGT&*m$z
zF&Y2l>Gd3g<OrDhfSIaA7ZkrRcz*Z55ZQ3zz-1^KX%LH1mMIQPUksaiyLe;en>3kS
zK_(^<t%Evvln*r^$FPM>{sI9ptxtpffuNU{S@a(G<8%gy!u$2qPoJ}q#$OV*$>t2U
z8YXrV<FFt;r``Fon^9n^s{ZI5mpH*8I>63ax0$-;6h{(899>J`&R?xpTAQBu#DLO*
zlC>xe0Z*fYZTXJ^H5thAFFB3xfYwXe?S2r45$^f0hW1Tk<x!xL>LBKQrY<uLc#dE|
z&;g6--D1#Hr+w2<ruXZWg>RAK-|Sy%ID8EU#2%LN;Pw(YxMW`NfN8<~&XrfWfph%C
z-g6G4kdE!QBWh%v+Rc6cd#dEy+W{vNKnonuGIRJkzUZ0EMH>GbZ9!7pE$?hoOH0ez
zgY|YnJg{Kvmk(A~{vCpI|D4!VK(5W_K+&1sljEnxzs>-qD@zm?E{Kh)+%KPzb#i>m
z=fz;la_&ImGos=*&z<n%Q^aAp<OGLi2rz;bVhotNJOsLvP7uvd8c3xlls_+XZ~qRY
zd`_$wmkyZiX>y#qK*^ansF<ZkKUpc000rH8#e-^cFo%lI^w)x#JXlg)k(B*UlL60X
z(kcDL*<3)DsuE22OF#j>oc^U8(_f60G(L1XG57WuV+;r=zlN;jIg%c%3>FYB@bNcE
z%+<U<pPQSzXnuY-mX?mr19M@_i_Nh(@Nc}h+|}VIcgi^#FaQE{!}^}-ZNx$&KsLq%
z72J}cwB+l}^C6h|wso=ovu{>v8g!t2=BWeNr^)2ku#0a&2P<0WyDMmoK@-hE2OE{m
z`+bAJb=~nyzE+f%JN<ZudFL8?jwuH;LQYy*T3SyU9)r%al04|+eowXU&(`|LyXgd}
zP)v?FXpL4{-qs;!_sko8*XbC#&&Wjtum#K8Bw{qs8uH@4(t*C_arJ-SXNyngy4zS8
z0c(p0`e{horUkhRYaMu~1Y3dZCqa#G**?I8UD7d=HZF?H8n}F6&h8CvOMw7P@)6Jy
zsh_yIhGMjtF#4@SYp`8N!~;m`XwZOkTAmIYN(5$(VfC!wN8VWq=yj2N&4PJ0xy{^w
zy7nxf{#)XR$<ab&5=jxYs#&k#jDg&t-$)?*V;Kx0d&WG&fgPFr0QUw(p_rKf2-g;n
z)PRzYR$^yZZ&8zbMh-W{wOW&)plhoV)w<|9Ke`F`p83C7fX(7Pp}KrOjfwGcYkvoc
z_k&i^CWs%tf`icBu$3m-F9enjn-$#hV&_S52c=>rH&9nh0Bdp?xYTN0lpuvSas$n|
zOYnKUhz}L=5yV&KB)cBqI=1oSM=VDf{N*BrWVguP-qz1OgaqS49yEw%O-s$vx=5~Q
zkmB8HOC`3k^=atZUq@%i3?_QU(9cyD+wn&LT^{5WE6@b;vB&783;2EU<N=4B0JFp!
zG-GH11DS%ob}A|uy?}%vaSt~>SpFlz-1Z|^jO*x)OXo8CV&O@IE-}1gO!)CJx1Y6{
zS;36R1_rXAk+I;R4*DJXac#q`!uAAh%tdmjTcJ`*F;19;idA<!o8KZB<u*fv#&sU#
zz9_1S&;ncs){0)vR_{7Xi_he{a{nj4)q<j4C?Wj-w%V{63nC~3REaG>SuHMin!bWK
zF6jFdy1h`Kl-J|k$1!beMDtjRca%sN!d^4SD%O}vgXe8fDH;IT8F9-=EK4#QvD-e%
zM(;K+O7!2qe?K@h__{_clUis`il%|M4KvlkPBD&$1yt(P05W`l>}LwCW}TK#V4*!-
zz9mX#e^>c5#QkLMvHWG5Q^unr*_+8*4~0lt7fBW4Y;I-qOk-Y3b&iaA*lrN{&CvxM
zDUe@wwh5QhnKEl}>c@SZ_M?QWjS7Zy!H@ys_!)2?xYDcPdeY$}=m($TNeFZ)nx%ea
zb=!|tT5H|<(7c+G@mY0^0Y98GHy>*Lwgck7o#<909~&7#1qTPusUU9p237-qE|Vb+
zMI0>MfQE#9WtcfuQ1=3D&=Tt*`P90Wz)&-pVq5}<sJD24Z?z5VpjVSGGF@3gDX<2r
zwkpu#eDwabZ_KTLNpg%Mfkc<rs6!Qp<+~ubk@JHX>%yJ^M|25-Hs7T_Ji$*%TeZ{k
znR+uKc>}C;K<?VMea{{+VG-aIHmV(Xm&C@(oX{$HUI>>3AqfsFj;DK|*5M$#{@Jfs
z`8ZhaMt~;3A#RXKQ0gC=BWAqvz2}C2zN&pJ#R%Hp2!PPKN{{9ax_f!Z!v)A5E49rq
z?|1=Jjx$F@zx525^~)I-KRR_#sx5rl&#V#+u*&gvF~twl4Q_RK_n90PGN9yx{}xle
zT};8$)R-Y;Z(IXrN@zu6cL*LVK^=7XdD{4hTwhT5?&1noVtGEF-vjyY131Gt;X3Do
zIuX^WVzg1i)JVr@V${;@4F>QFESo6hMV7*NqKLny-Ki$Fx6v{(`u+#kh<G>$#=Coa
zOJZ=xKTR{@GSZ#8)1Ng@@sY2tl2w2yUBD9UobQ+>?<KiijAESABh|vYS)+*mdfx8Q
zrrtgHNlY1LCHkLFR=+M7Qb6Vy1`S_C{QLFuQM$aX%{F7gsc#$r-xR>s6Sk5s>KI*|
zexsp?9^fJHSP)8}^ofIi2^;Ouchv%J=fc9O3e22#dso}rh>m3F3ypai5z9M52|R%V
z%%3oRvELlG+GP&I|2_{1j_%wN1afUs_7py|I#>1kFN!dr<i*35vq6u!nURsdrwln<
zj1FaEvon=!yY(>o)c|RbwVGMu^<eq=`R(7Vc7>rt2>2E!`V)yIYZ^!gIwd2S1yrr&
zR%_E>c*m7IbMK_kmh2`9dFL`&2^`!Bo38ht+m5Hb$v9Q+87ow_G$l=7B_ndv3=+xA
z#TtV9_kP>Bi9)Q|!cQ?~uGYm{7DAuSwQLPYLK?`jH;^a8g4)YAY>-OSL4C3#v!;>R
zW)UDmNt>H}%0~7Tw+r#VZ<(iaC1q4@uEHA7+b-e0H!ko-e#Vqm^Qf=UD&xK<Yxvhf
z)SRabiNNwBsR$=}!1N3ezIPJL?l{Vkgh?}|)Kl(BM%}5u{`Y4w>s7dNNx;SbE>1@{
z;e#}V*;cP{6pHXY_!fy>wFw0A><!7zo?B4rez`Y_f60l&{qMk0hitm{(Ev9iT%ePc
zK6(W00RG4%D_sv&pI?7)d|-`<^a0i(?}9BzAUlxgeb<sFVsx2Tjp%})H|29&(_<yb
zdg6$d^0U4#EGy2kB{$uM7y?-Jle{GErTovhmzGyjB_vOuye^6+URES6)dk|V&Omct
zH}Nq~>D>JIcwKKdwet_Y6So)S_<swmLTQmJ0n&easFB;myjZ;0)eLPmeOGx_1Tt@*
zlhnlP%fn!pPgpNa_<t#$s?0^Of<Xs8=mf$!r%%9KNGx-@o?Ml1Zr`Zn+rb>xY0KRX
z;I*N~;>8jsWZ5Pb_CMaKdr;jkjk}+qj4Y#up*^EzeT_t7Vc3hR$DuM1>%_NI*WF~i
z7&fpkmCXX$5Aeom(Lse)+j8aB%d5x9+9u_6u=CXUkH79aa<SBWx*3v?pMGidrtLcm
z4$eyY8)le7Ck`R|LvKH-cC!6P!7>TTujt~}UW8+NbHUF)={ZlGA8i&NNM$?M02Jzc
zzxIemiAN^(X(qvIx9Cjt*B`cM;kpuVWmR-I9*)!V)UKaPDxfQ{KTZSEY>ME4TX?q@
z#sw7GCOViDj;*&|<C1oIVP*O+fcJB|O&^CcC5t`Th&P&z8aF0FRN2@*<83uZhp*!E
zSkMdqXzZ#doVSH3IJ;xqWhHXZT3=s(BbRw4JhopO>@#G~Y>5ky@}t40S}oPdFH1c?
z{_&G7N2W5k;b9{i&C%G4aTMvb=O`sHv(Xxg^E|M2Td%IJLO|oH3@h^6A_U}v`Pjb(
z2iI;qS&hN}%Nb2Pvr}h3ziV17#NwNSvl#1fV74bozi0jPhkFNARwNXK{yYu~fkybO
zW=0za+LwhO>X_l4fgxCKq2nlL+*$=_2>Cs~7O-B~L6ewwd;aQFPHQy#!{gR#nv{zV
z_gxy9BvVYTXxrk$yY;m6?y*?I)HHexOtXfcaCzDM!n8}ucx$mgf?cwCt^#}C`)R5Q
zG>-Pi$H%X|WQ)K|i-5?Dc=L<786AXC*KNJF^~qUKWOjV^KtS_U_Li!Y`x262iO9D<
zQZ*GmG1F+LeI*P1!lcK@oFB%~y`Rnni&K7evJBe8RG@`~!7s~+-;tYUCirjpi!~v#
zDz7XkvLLr&jNwG~{w$tJJ?!^V0B_cSHM2EXG%AWc2Oow(@sP<%6ocJ~bgXKnD)@Fp
zD^K$uHZh}PMzYB#2R<{<*)K!BVeb%>EiOpDL;iE<<v8iE$|4Z@W5XW3p1J1{f}L@2
zhyPWuaTX$-Rmc(s9vgXXRfqqy*%a}){A|J(jNGUqEEYpgKOua}jN(<@w?{lcFBH{U
z*zGoBISyFnrgbsJtI~IOcd;~2iEPekalESvu)AScywM7GoAkBfLNUpI68j3Wq<&!I
zM~I~orC<8L4jbtoz7>Bl7tHO5z8&>(gWe))Gx%4B?A>;T6E~S-3Fk}nr<FNuPM7JF
z);fBBq7?`(^wZgJPk6B<QuPA8<gHhcG1t!x45_lJR^&9})(93u*O(G?*M>z0BMy&_
zEHD=QiJD$ul<?6eS*Fm^h?%#Xr6qoV7_E;(9jy&%&*ekPA9qwnwOhs5`4#LMOv8@Z
zDJ-dfR&$o8)~Z_Cpx~gjiBaM%O=Pn|(TP{m)FkDUzoHVqwg`<d`n`*Lt2A+RT&j`7
zxU5@jADic-H8Jj@uptYHTqeIM6hcR*X|Gg>&cPC;S0&>;TOw8J!pC>OX(Gjw0v~Di
zZfYA)s%6$lb#<lds(-la&kTft=tYSgjOx)2cdD7XtA{>52WUhWymxLHnzdHIkO$4F
z5VB-`FY{gPgUK8NV1SOf*NP*R@e0biF}&D;>@OI4e`lmlpx)w(WpLg0a}_3z?iS?d
zTL!pdl5Eqy;}h}V9@DN#PEMW|IrsuG9#_u<sh7vT8eS77x;PxmpTAmPy3ck^B|orZ
z+((LzdpCrt)kprN9IHxP+`jM=f+TmI!%}-w?aV4uwN<r=qj{(SesbanNw*EmB1CE0
zQo5c*yaEafrC9p|Q8BS-AX-MCH*|HlgGwk2Na~O0M@IBM`ehmg93f!Wn8=D3dc5C}
zO5iZ7d5*<-ok>UpS=w@`{a@oXaNQN#^9G$>je$#<`t7{43{Ve?htP}$0@1(=0^Np3
zS^vNoT;%3NRYYfptcK04@$>c`OpP4}C!^EXlAr4%_31oZbUQa9pLa2{zVDUD*nK?q
zSQk93RNR^+ls_XIw<ZH@{vp<SxfHZ8=}Ui^LfyfW+oS5`{WH_k*Fzn$i7S;&jCYQ7
zbbjM?83KUN9wGc${D``z=U4PwSr&p^a&KZ>RThmu#T8%gPWW8~!q55eRMWlnEWa;4
zQc+RS5u^^igOm%L+*V6obiJL;h>Q)R?CcA<miQ83>ivpMtx9eB!Dfp0XXi^o)i}87
zOxwSx_Wnp(Qawxg)7Q>q>=qN7@lW`W+>E{xYYI%5CQbg^$w1BnLrNi&+kSN7?)1CW
zazh`sHYC-eA4FiB+O*noV>{8U4Y}><^bLclP<(bxDQt4AB|ic6_h3Cp&UQtlWi2jG
zXBSnh__?mG3}{~DBw^I@sJ4IMR{1Mc&2jIHANjepJbZdX)h69)yJt3CwuRkUf~6$?
zFgcc3jBAnjcx6LKt({H1l!vVJiRgI{#I#r4&kmA9dh8Vi8)M2m?t%?G_?tad!NvLc
z*DZTZOS4Zw{c<FK!Xf>u<W3zYM=k}uDn{*sY8?FyyTO>Z7BtwC1wEA745=0SsGbU8
zT|IRfe5=@4i=tvpj(SmX@!}QhVoV_|pF1MOm<!j^1=k%l?@z#tx>;vj{~edcx@$VJ
z4`?Bcqg5!o!mTqGDQruP)EG8iMO7h=XuF%%w{F?!TUtC@)Y6w>@F*iZizV~yI*<A5
z%geKa2!aJP$fqm#QbLOb^={?Iiwgq}kDW!vBa>7hKYW||<aonFPZ$d`mq_MNg9iry
zQa0L|JV@YBw#a`k9H)KaGPzTL((&Ds9UX4F!Zd-)=UeV2xC+W69Fx3E#Hcz+P3l@4
zCl!{rAAebs7FBHI=vO{jOoFmQCi&1$!`VpBoLyX8rV2k*Zk}U9?=c?AP21+46;IF1
zOl0y`>@{sxb}L?uV(ma{Vd33>v9UY_OFcacDH7<OJ?AFDrX=&nCpJ!JXR$P7vZJT)
zCVtx|Nv7*8=H-{9{0hu?4N?Psxaga*C}HI9>$`PQJ@ky%viVd~Yjhk<B0S3DW>R!;
zQ=MTn@VD2_D}qN{K0s)^OfLOJEf0S%S<Er{>N#^#RGg5bVqL9W1cwwJdsH9+i`2$_
z?k)MT@0>5Vvhy1n!A#)%ABi7I(Dfhd`khDWZYDK$y#*i<GQW87A_C}+U<*5`9#<?t
zoGV}wN&*wN5rwYN!UYc_)%5x}nx)?YY+ue|1MU14Q${PrR9&jnvG<Dj-O#yk6hO~I
zdp3R2e}>DnrD@V&C`3wIdhh#Vp3)zkJ*@ohnhq-|KVC?koPo1ak=gjftRs77_xHKT
zkJBuB6KlJPCoRM{7;|1HvjI$pQgsjhE6{k}Ho^k+x?bu{;&18LPq0j3E{R8Nk)wmO
zEMXL=CrcbfoeX2+YcF{*i@`GL1%E6SV3^ct^U_WjF#6*CYBPtG8!%9Gp-xk277Vx@
znAi4xds`w+jMolA$$L`Sdc6S*BgSz^NrHP^C;ZyRQ+jBi{?Wn_PEKE!NQ=!6D+e5w
z#laHhF~N7mPmE*!5zNn6Fdm!uJ#w29P9b;0vaOr{n5o`}b<9pK%qY-UWV%`sK3O|6
zXLtNtoaOr(xlnSl;Knk(q!6Ll6)hOm;&rgRvyjB-e<6)L$z0^pmNXvy>?eyH#J^>s
zdY;sQ?4>^+zg{YpZOb)1F_mG*s<xGnWM|KgqSiOI)l8Pa>63pi@hl$<Jf&~X)bA9E
zd(45kV)V9mw(1<P(_NsGS#E7_Uwu*udlYRJG4TmWZSgjZ&FLq6OZ$oHRA&>@NBZ{f
zyDkBpQLahsG=`)$uJ_2Wgz@m1-~SnNa%G8mw~oN|G_3WKMuW0{6o`8qw@2UE*<N2S
zKfAaPvq&ja)3kufE*LaEPT_B9@X)KiOD}v+tS9d|DJ9utoRyGYf~yP2nYG{p9H-RI
zxxa$m><kXlN^}QGh*oUk#O_6bkTJ(nld~p1NAB2v=z^U)#tHFh3`*0*2A=8-X05V4
zxwMkfRP&N=Q?u>V;+i$_B_()xm+yUdS>g$f6H2((sE80C9u5Jp&v;xhr2et&BJCh|
zOc_!+W6%&XA*>cJP2K;~%#9}K_$+L)_USStg(X&Peh}TG@eroJK_8Xb92BM5!mv{Q
zrf527qx{X>y2K9?Nc-^ZO#Hy*AD}pHuL1LAsDx#=WLcPLv%b{=at~OV01$!<+V|3l
z%E8>P|5Rg^C)7~bX9!oYAuQ>YEBR@NhnXMXiD{FTl01J{JDgar1|fw!=9;G*3%$C!
zx|t%HT{rkBI{GS$GDNLJDgw3A(XBjCzAkB9!Umz<4XIeK8TQ5E$xwQwuI(kI#JD{Q
zO`kQxk8A<w++jr-LbTFb$3&ppROb)gi2(k0&wV@iNpeiv&L6j_=$iBz+z`@e!|`KM
zm_*qy<DMqG;3>luUUKtnv}ZI<F1dp!*0O~`;!=PtA<$Hc-qkOS8PG$`QLZhevC><k
z0k`S^LEV8A1j^%5W5O~DOEt1S8)~OqZa+d=Wyu4r3jaI04XQ{XvG#`s4j$pU2Es@8
z2xsa&BF?^(=`<(BX|tn(82x5&7CH`Ahvq+rT^uu}oF9(emU^$bzY?{rgOrSa550+O
z+3YO%bjl+Zuflb(^tt9Y+&}rt#8|>p`5Jo4CH_5zB62_y&VfR)slBp0K0F2@e@cB_
z9R~oZ*X}~~<Jg=FmVriz74HE*yU;70J>Kb}Q=YuK7bR)*xoO~rK+)it8cWyfRMujY
z7?@(%|1~pn5&Okw^*TO|5<M>P*EUU^TWiR_-(OA+kB=F5-wvgJxy9{cyLaeqodCAQ
zuy)n;{$vT8RLf+S^zkn+;*t=LP@~g)p`b)P<St0{$MI9>&8m1|E@bh<!$UlNZ4fHj
zt<Z6h#cq4lA;`a1F{EeZuu)vpK=E7yBv6-o=mJE}Yj;P>>(cO(b-TIW!;)UAtDZ%1
zMc^iaz^+&@lA_V|cDgv;4p|*4j=-)-%w7%o<%W(V0<kAB3wDp4a?V>}D-a)EkSn_w
zKyRrr6_rDl70~d0o0#@N=y#EK8)(lJ3Kpu(e@AnXi&!&1V1`GDW)GM0u(gi1Q@G5I
zyhu~E3zDodGadW9?2Pu|P>QhX$g!q7)nKEcKQk^eMwil$NKGm#2b<?)o(myaK_py;
zcpWAGIc@%p3Vz2EhZU(m+qw)9Bcj{;N1GFJtJcLu#$zp|@wtC{C`aDYUZmq)QHYM+
zOTV8a^dWrfWp$)e`(5t5FsgP9md@Nq-9ML3Gb(haigE107{M7d{;jE80-7w%6z*Fu
zY#2N7kfFnCMHl?GW85rUd(_H9n8t4P0|VPOnM!EaTe0^Xk43tSMDW881=S3@a@wBl
z*Wj%P(E9p;?OES#(YoXnQ8_z(^pl>e_GLo)>rAal$r3{qFriY&=P1YlrsFL4SV>W3
zcH+<8?zIppO=WccW}NvN7SagHVZXWNAY3R1Rjn(Pm`4D*!hdxGF~58|co|QR=i4!Z
zxBQj1!q~#vrLOyFm-!nEJE9+B2FI(+QM=<M?AV)+(7)vI65i7~2!T-0G1bqZR*+o-
zLdf*2f#_GdSu6ET0zg~yNX`!qwJ`~aqH4i^e{%^G7(b)xiBW>sqj(`afj)7mi1N2U
z0!=MQxN!OE7QdEL<}_y<Rc$VLye)HsoB9u&_f#=_t7<=bz;?`l*4=wDZFD%AD_tRR
zcfaJ(z1Sy-mj)-CN;GlZi#lLbyB_Tcg9jb_Ttq}bz{WVp<a1Dei2P~IyjS2;*p?dC
zVd=Y@(qbLdYp#&DmBc8C5&t@*oAO4EA^llW){loRr5=ktE*-}(i3!oc)+~<qtY)J}
zJ$d*?%r%{Yck|KP|9zXTK!proNL8hw!qgO7>Am2HVJ;iZD#xhTq4J%noxj;Lr8xgR
z{VnOm%Fb8^DkLWlk9pILNoDVgve-A(Bmb~(^$0wBp+CzCie2R|*l?j|3H#G1dR!<T
zUqO8ZSC<~Y9jSzKmznv5jY1(@iyaK-&wa?ePt~T{`;$uQ{{4S^ewwVe@?psb%zq9G
zfq+CCOml3}Kdg4<RYOC5(+p4Hg!DI-5xy)5@jiYt`+1C1*J+4e?A!MVPW~%2kF6hH
zXF27|?cXhX5Pj~++D3K3pz;!=tceoZ6T)iej9OgnB8?P9yj-@Xg($9ymq+PWPHNeG
zFEm@umcFbOeF_c<nHVaTi@-*jK>Rz~+k*$!trFwDZb5R9UpE8jqt&OPEN~S+FzJ^&
z$x93c1hciNPGXo*7UAg{;1)o{aM%|~ZX<6BUi3Ru{P@0r8i#kopn8wsz{(F!pgD5R
zpuv*<=xAKE&j?|w$<z(NvWDKOy96tn2}P_lL2W}%kv;ZwSv8#Vuc1q0Bm8++EL8X>
zfHyjoZQb+iUpU=JG0T=lAASpQ=}&4vHPh_MfA>&4#2-ENF$hf0Ol5OIMDo{Pieu3D
z!BQeg6raBpco10HcjwO|_*oJT)RsSJR%N&FD!f}a?i;>!Jw1gWN+E}=3B$_!`|OiU
zVt7Q@`i7iX$w-fl`_q|wa^5_5g<%)~>pncix31D8N$PWGk0O5XMKzGzezT?Lkpqi5
ztE#-j!oMq?X3luMq^89=6}l~E4~$#l)R0w;6T+rOtB>5Dzq-fv7V0l=dG<mvGaXG(
z@~@Rm?njr0EFDqzrwCT1&V0+g{J9Ru1hx012<u}g-4j1j+=u)6zF^IY0uhmFGvHc1
zOl$`@$!msmrv_n`)~B>}!3Wvww_+5%d#S5xdS+~<7Um1fN=P%l=i3*>KsUuyp-(I!
ztiri0_;!{}<?9+`mTJAKmBrwlMdc6SRx_f4_hFj5Qk3E&gw_Fy8PPLABjhZFw<m)4
zcI!|3I_-U9<2V~#sO*<yE_L5mPQKXcyLo)_lIDFJfNZRy1ihs!-?=)9A!)*6|HLdq
zO)jU#>56Q^(VP-0u?!f?eJltCMOs0hXOZW>Y1x$hqY72ZV{X*dTijo(WhR^dbN&g$
zO(tyOBPl|0S1f<_+Gk~{&L(|7IP#<OO&v9KrCH3K@r4|I&EWiWp{fZ}iyolf8EoN>
ze!V5jCrQ)uPUxMun<Ok@91V1RG``YfSu*~TJ}arR&*urndCZFB3R$Zpwh4_xmVYU)
z`?FK{6#tKWaOfgs<RgF1LXHl4c2>C!+L4hl3Z!x?0<&nbOLJ1}Et}dt(&#9a1B)gN
zZCnahS3{B3*8j>y-|d00c6c|2{hPI=n2(ukx)m%QC0!BNyOgbqJ#^?H=~1=6cJ~m|
z93K2N7@Fl7s6fT%>{4SZ^7>Ue>6R8bnT`>F9$;nhDsYkH1-~P?+f-Lr1_opBE??~E
z^uv{_C>k%^;!s<n=8EH5I9}9BZMFBYlVUYL6HMh8sD3H@>MyTqf=8f$)jL!5)(%mQ
zRa;xF_u3uC3RJi=+8(>aN?Z?u;M~A_7-!Y%7%a{fszMIqGjY%N=hoz2Tc*=FsW|s$
zJ-du@Y4f5w38ftHIFL#XW#^M@{a`$jEZ#I9qnS)E`+*tp;nv{eDVDvmwjoAdQckP&
zU202Jf6J^9;r|*uHa{k}&&t~;aoE$VD)hofad5Dk*AsDYxUJ;N77zq<vSas5ukiU5
z<1=a>JY?K*pkU1qt?e^`U3(Z9AGyVTQcEY#<mIpOZzYJwpiW|$N?>&ctbf3nI;_I2
zXU^-FhPQ2my4sgycp9QS;lsa;Gh+G1d9S5NfbOa^NIg}lr8CTnw}Px(`ktsR(HLrx
z4f-dxOWapZ`<GbDhJ{W3$$C>}4V>tHh8xFPL^{?<e<9k-WOk+tQas!*cX?>E(%yVd
z#hF@{o+{;XehRlTZHeq!SOaG}LRigd@;k*GE4B7h>{g%DPbp!PK`Fh~1upgIRWd8n
z6-~MrKl{BWLGzBFlJ6xieCth;B-Av=IFW=UVy&b2R6}qw|D(^4;pLkO8t|_1OR-rQ
zDk0BOuz6NKDe=&>k1fUF=*W1M?C4UIvlhN&uH}w=(n0!X0kvv%V?l9ilJl-0wgl>e
zOSX5K8b(HKup99%dK`WxLiDB#3NrUG?!J6nG!Tc(=@+KDGNNc@6H*d9($^DykEe^%
z_Koz|qOD}$@p@U3gh|C5U4V`Xx#MqXaZP$l$9rIjbbi6di1YGgWa3iH{1n%fEB2$j
zj>U<tXbc$KLys~bL;<V&UC)2g?r>of3~`xk-%Mynes2G#s)`<KBa+&uJDHA!uc@gr
zbCeJOi{9k7Ou@+go}j|tL9WRukr(*P_KxpX`=x%$(CAjc9|>Mr+!id|fu+3dPcxgt
z`k&^g<kLH=e}9_JEus5V6wTq6RIYCnS~{z>-H_Ma*x|xjzKJPCHIxB6P<*7QN>Wb2
zmq7(~?4@ejJSR^AJVqBoGyeAdCk+I;!@bE$!W4ez7B(ut<<srSbxPCfrb(~<Zx%qO
zf+tnxaQq9dfn@8D3@)aMe`*dvKg;XH(~Gxv1Zkh8^TziHa&K7$zu0!Zf8UMFlDngz
zO-AjRJ{GHa*4xYQ0=P#v-*100ksl{g$$R%x^;Fe#duuYd_Dw(brVSI}QlRLce6K8<
zj=|qv;OjO+iv`t5R1JRR0C)o(FF=37mJF@uy-IZ9YPLVJ#Xhi}9V*}s$#qO4u1Rbv
zb*|@9@q=|824gGa<h*(5r?xKq6}L9GM3r!8FelW;umK0F6|#z%_j=y_Q_|gAMZbub
zv+2Qy+;&>Wo$+Wc){J(-G9~)AXqMMu_I3PDq8IvjPBS}PJc&zL6s||;Gi4-;;!t~d
zw=iSXYaBHV?*s2La%q_hH?}m0)tb!JM1Uo<jJxZw@%Q-`G|ObCg6jHb+LWrMnKDG$
zbI%s_BwJ0qsQn8mp(Nl#jB4EFk4dmbOKElsXuX!;e4&O^Rs+sfMorT(KGc&L@85qK
z<K@`OU?*PWkSoXg96Xv$hSSisBhl4i-6QEv(f;>u;g$beBwBKMq))U?GM-4;xFnZo
zi}g~)W1|I)Am#_E*?Yki-tc0}EFO7rB+0(i^S#L&Ai}Quzw4s-bh_k8rubY{-jW*S
zi-s}qzFtUZNvmb+Yi-5a!LMTua^teLZnk(mOw-Y;o*=95m&vx$SbRKF*j2k-NW=W?
z!6@^we+l`u#90+UZkV!ST^jEDok`G~Ub*E`FgW%3)!!Zf<nn~01YA$nt(_z^g_j>a
zb&XBs9-eZgg=K7l9&e|g@Aq$+jqU!Q309HSoG%SK3Fp4zt64M&^}I2THu1X|SHcL6
zy*;e2<loAl-BIJ?S?00|Lk=?oh{6GmJ}&j-aQ~t44{ehv!^8C13^q@StB_`nc)e(r
z=&Cb@jzBiIJnwgQ=#QK{vN=`gF_xC$(wVbk4y;RFUlJo}q7fuR%7>BLAfc;(_{KCD
zZCSQ}_z$I$KUQyfzYDB;z|N<xa+`5@0#Tk(TLv?tL~o{JUT<w!jQR+&s%RuB%MSAN
zN1QUW1=4F8t@xYl1(#L|(~l#SxoMd3h}pWH$7~rCOt>ohTj)`|dyUE~Ws}Ro`&bdO
z$v$xC-?~VhxJ*oFaH>t5CYH;61<O~7rTGRo!lD{0=LaTTV1AvjdtTn|r^fn`egR32
zCHwqcu__pO9|0P4RV2wP)~<=GWNTi0D~~KfjR|-GZaL|8IGwxt_m1d#)CNJZ^W8_E
zPte5-3iqt?D`Z&)a^B51TT?p<9o&PYAZb-ZL8czv?X-H~n_*n2ZR3I|h%WOy64<*`
zj&&KT(6R-v)^Ip#jXfG=v=oOa6oc%0G)YLYSDIdn`~R5w%AmTMVB3R)V8Pwp-5o-(
zgF|q4cXvpD;C66L@Zj$55G=U6O9BM<xA|_}TdyiVs7jsLGu<=YYg*Q{!P%ZPXps)T
z=t*jHD^LzOv*g+xiy(<br<*p~e_FWK#H6+81Uf$gz3}ZSOe8m$Zhi5?$Vu(gt-2|Q
z{`4h`Vg^Tt4AeHOMVFEfrxCIIP5**|c|&7!*2-gLF8w>wU(BP>=^A6keGL|kc<9sj
zchwQ;uSP33`yU8-+Bf&_ZI(*^+B;Hvyc~KGnJ#6j;l;av)UBmDVyaPXwd})y`|-!W
zwgXNQ-6~t#Op5`;00P2>VEajc$-feqYIL+ef^Z{Lf%Zkn$Sw&;y2Y#063UJuPa&ho
z-r%iO7T13^iCbTH1>fpMFqU$J@9y<<%{Pg7&Ykw<Oho;5ts+II0(UTHv4-;^z8|iE
zt*8IzM>wQe;uY;<KFs%&U&yO2<T=uJQ+HFfz%<TTPuuvGPco-L&f8R`SVMWb(7^~8
zcqYh@?7Qdwpm)$$cJ8<S3rk(1$LmFN$3y;VbNuR_f%DTkWNW^*a{5g+3;d6#!KQU1
z1|OzJA7%(_IV^IREN!V6o%^$rpug1$K)$|~L>}LV(g$nDbXH?d<5@j2E!LP06-r!%
z2E~e|@~JZ<2e#a<`zpP=YKd@Kfr)#ShV~~myFKp5mF;+(okJpmHkh`o9GZ%#h3pqX
zze{CLL$cspNme@!Iq-G*Wlt{I{q7y>d4QVpj7JOxdJL@BlP0J+G~E$gJhOgyc-VAq
z;(TX$`)9?IrrUG?h5kuk@h?@08Z8)tF=2{Vp@}zUrFI-!-hZSb(VZdhMoE}~FjTmX
z(H+%L9K5ui^VRkdg_not2H&ESC)x<-Jp6DY?LNRFfGTxVxZd+@y#zkiHgtvbVOzlK
zfgZ#^Q^RzySRQEyqi(EdxXhZxU5Kkmg3ztr-I^uE5WOxFWxN>*39jXe5FHw9NAY7!
z<FmGvum)<OSU3$yG}w^%#@g|_EhxlW^eW?GVx9##H>#3aMY9z}Yk_a6O4LYHRR$uM
zc|y28$2g>V8*9`^;c-<zRM4NWJ*Y<Gr++=cS5a)>R!~o-0!Q)bliLm7I^@mH^WV*g
zKF_4uR@fgMe5TE7>9@AAIo|pdhLWuC9y_F~{ZTNzb9FWm#FG(gPCpi6X@QWjH#o;Q
ze;{o3Vg8ge=)eNY#$|$<0Ns>rl&*PdJ#CcaTwDdGkjdQN;MT4!s8K4Ze*WV;t^25b
zET45nU|CmJ7ngv*gCq!*S1OBSxy{pY&MiKhZg--cn9Mej3Y1nV4k;k{T%P`?OdK@7
z&z-|4kl<KBk(Xe@6)!I-G<wXw6@ul+dLplF{Hf<;r1Jg`j_XPi9di=QxeusnLFZMY
zMK5O!*hUA*s&QyjeL&fi*EuEWz09~<JTtjZ>NqcS9KuX3sq!TKJT{!MhXF-J&=;)R
zr`kVM9PD%RZg~>FaSUDUmFL7-6o(~+rY(b0CP#n<jH1!Kf7YOTv>k*QWKL08iCf!>
zvkjmNEcNDe$yA^I^$#jh3r_!ccH$wIf)=wgo$oWlI!?KMl|Pk}E7u~#`tiot5WhWK
zXO*B${0cUdQ;n=CF<P_dbYqUA1NJ#NK$YMH6QrIiiIpQlu?%OFsfs8aOT^C&>@PA-
z(rF!0r_Js!RXyLJ{6h^J$s(!exT(O$#sdP{33MOKxnr@3tM8R1aHnHRcovj%R4e5m
zv#}X8WAnpWs<yJl*)6Q(dFU1-Pyjnn=jNxVRcBCG+Wo}y<Lzr=1jwQ7EDBdyRx}jl
zb~Ea0G|e^7oRx@mA3mEtWmZb%TFqRlN&d69kb_;qjPC7IWeeistZ9R+{YE^%Cv*bk
z)qZg@>G5~<2x#~LI6)eFlrpvjw(C*46)6PZx@GbTRG$<Z`M{7Vs$6`!g)dp}EUgVq
zcl4~i2v`xjjT9*zz06dPAp$!a@39_KJ2>Cr-eFq+o8BQ;*(*lXhLF>dGLI2t7A&F|
zzRtnV-@<wvyzYIFJu%j*>4(}K82+$W0SpZV@~4mKDJS;Ci~Dk5QE2O_SAflybQ!JC
zz@1%5CqMc%D3(8_LgA<M3j$0ai;&x)GI4jpVAU-Pgzp&(6kKtVQmDW1oD~71gxc}s
zQ_BY~<pe{hKmdQ!e0OZFXIK!oHnUut=?~Fyt!(zXQu|JqY(V^wp>BDFT+ubceA$HW
z%=!8G-k?;Fmp`R5z?$JU>&&zzmzbECn#OnjCk%xYv?G8y<S<aeVO&JROSx5Neyy7r
z?XesMua!A9tg8$<weGFSo27o2n<|wY{fb@HvY#Q&lKKd)aIYIYQU%dt)}T#2($LVn
z_|6VJuS}8zXs-=mg39fXPT0>+qfIYOgwSimBWvdKVmP>;=$l)G$q_)-VeCn!&1OAw
z!CwyK5V5Tp(bIaOr3{z9ezzZvPBmNi-0-gh{dIim1@csnrE|yTIw$rL^)czJ-wa=I
z1uR7H2ApyJ5v?N2{dX?uz>t1^S#D@cX0K@*Wzf6@cTQ@IYlZQsn(oX|DHZr*W+ldh
zs@-HL8P)vjHBd435OL^^PNkT$!}ke@_X=Y6TCzr@AH{x>?i}hK%@=Yg6N1Z0PiCg<
zzn|Z$ch~nRlvxmx4EWBNS!5yS-s@aqiZl@ajuEd9r;YK~&7YM8{#aLh^p4I1KK-vo
zFC=kFii!pV-3Rr1H^Fg^Fo$(2q)qBBJLqyX_74?Di{-%?{>IlK^(N(`>_q01F?AC!
z7Qb$y?WyH-*m-E$b(=0qnmpEACxwTg<aq*&?d(pk$AqAasxv3Kx&Odz5`T+rqp&#2
zq)O2!hY3bLiR2G+A<4;1&S?F4U5sx#y<9ou2&b4tMD@typrMY*KtgWn)OT7v5WwVO
zVzP}+(TXEhm^rB;E15&*zx`KQ^UGny+x$4Wt%qq+2Ic9rwJsA>yN{z+3G(ycwNe+f
z5^I2Xo>Qyr&y2O97TPR@yYf$`KvFy{EsYO(Gtlh<y#Z*5c2d5mFU@cr>hW;k7&~tY
zM>FB4mYYm?!J^FEq}9_kBMKCZ$_jm*9}qCsxp9t?C{c_saL!1pqstr*fbZtj^`gg|
zI%B(heRr<6bBl7e*5*mmeuyL8--UL~uB%>&dAvN4`J-BTic*lbh}y_LHg^{bMIkVw
zhWwzX=6s{M@_Ai{LIAw3$HyL6H%Q_ZINd9UAm;x1@+`^=oJ}yjdxGlmf;h^VP?PB0
zqMY^&_S>5OQPJr1ASW?r1;Bv97Qdrld{KohANAG%yiqnCzX#1Z0?%j4!;pYA6V0)X
zuS#!Sw=a7J{bQo2o2;PC%C^4`KCsTr7{Ql36pb8&CEg*mV<%BK<MYF<JWvXugM%%S
zOMJX&+F><3#T7)7HUjD@KWVPM*|*iXht46a&iDT!bT6i%rHumJG@VZ`{9UZsp*9|>
zBZBT4-@Qn6ou6*SG%i-nE;lgdNt@GP){HAtw~o2?Zc8jM$!1GD?={IB*Pu@jzQstU
zg94#9)Rr&<{5cF)Mk(jK@8jArkSTqCRY-8|9_iMH8at}+ZYp6{j8mN-6QhR(U3<sO
zrMwc(b34gq$P(<am+K*{RP<-7=Nt&nZ_C9{GoYMb7R7cz(la0}{!=_Fi6`Zw!gVv=
z@f<9spV#XG-jT!b8E8zijzEL;n6sNDMx3+qE81hz1DQ^>QiOOenoCTp%xJ#Qw!j;f
zI2;`}d23kW(Wig4T@sTr{iOJ5V3WnUwOm<lQ$~s?`6R@rx6^|C4zZp#aU@I3wyuB`
zNib!=@2ZEg3T{U<o$p4L!JyXHIQ*RLlvJJKjv3}Oc3Ma>`kFuHOWG--VR@p^rgl+U
zwLncjwJeCJzR_w<CU4iu-ksKgTtK~6NCo=IzeGdZz}8fC9*PJ1bosXjziO&kak@@z
z0L{q53h3v;$!H^7T5%v?-Qkugf9vLn?*Dp1hni6d=VP3s$Kj@cp^u3+6+nDMHshMt
zT^4g;N8XeGtgM|{Q*)ON?Svc_U{iS5F1uj7!ox`}gwD2L-lGt)qv=Z5&sW)9Hvr=@
zg3=J#vt0eIHuG_NjnMC1BDtYmT@>xmg};4g!nPxgAv3a9+*vHox(wP#bEO-qS(&|Z
zOIJ=_gDL0!OnHI}Re#(r5s_X6T@BT(Xt7?B)C<5w)bK;V1-lU){03Sya-xN%alCVG
zF=w|u_LF6)qu?>AasN(M7k1d0FDt<2YDIm_gYBjs%s_T3U0pfwpEpM~$B#UHO&`}R
zSJ^J|gcPY!dg1q5gt+iWQOi<BQ4z43?-PPnH@!)uq^0Aaywbw|YRaxze%_XlSkdvX
zIPjihGu00N@;&ySS4Am%F64)?s<EQ$wQkfTgVZ&5tH)4oBLgxFe$1DoiZ}<kGWIPq
zYKxDzWZyO#0@dYl-Z32j3kq*+JnvMniss|SC_V%6!EeSNc)vgEeEfT$;T1>+eD@Mm
z>3Ds8@7GCW!gp|YGD$)LGTK{rs6)`rB^zUyM+j9DVu`h_Bbc0EI3&sV>Y5}PiPcoX
z)4id4E}`PnF(65SSqLQO4dFM{iTx(Z2)Z1ciQWSaaRcNOpN{I2bGs>gyXq<wq@^h#
zab~nH9>pr!_J&%2LXGbTxG{H^{ES_Q)lT=ogo^x}R{*#~b0XI3K~J&+j`@8&hN4IL
ztWvt!0v|yhn+)X{tj8Dg11j0dlUUfRmMXY&8;S?>1$S>Zx2v*q=`0kDvbnIo9k=VB
zp@=Of78kWdIlJ0on(AlMIOrt&^pl2c)e9BRxBXF&Mw3opKSYj?^Br&?(kni}^sTDt
z%8$>gZ3jw$)ymP~Ox7W$TeG^#5z~IKn?r<M>i{VqI{;l_gB~Le112y3zG1Q>2b5~d
zNfP(n;RL}=+}x&P#x<fkV&9u;=-77p(w&CB8=5Z^0Z$zpL0^-1ilYd}Y}ABk6Fz9_
zLw|E2nPzv0P@V~y5jOB5)vR+jA~O|;{40?_$GndXaxmW4O;UZkrr@UElc5v;vZ(vM
z0tijMjMQzMdjSgohyRR0_S`O1d900uZpAE5C4GIMhQxl!;4j+r+c@NO^V^)ya9ph(
zmfSh4G`7_06XxaPHb3zK$1|TH+patj_s1E^m+&Qc^Znf8)UtrKSl^$2f-`Xf*^%cl
zg97UGSQb2iCSW{tV(4?D1|8w{MYT1+4QsYkwqbU^!u;4<2VV;PR-d(ZN?M-42^eQ2
z_>JKA6=y%$t-WXiM7F~QHyvFP!sMWpICm&F5ICChnYu(SvQ0a#S^yyegVWKz;Z=E9
zkD`^Rdk+*)%&vaR6+{b40?k4_u|4h5t!=T#D#*)A%u6I9EG&9;(aDlxpyS*~CqI~Q
zmBQY+3sEcO66_>s6tmBzg#6v%RPQZMdf#tQf>{3d%EA6i3$W|+GCWTDN6|Ld?If-y
zt?YMJE7xw$`<{PZq|n9Ap};9$$xD+%%C%q~Ow@{JxsvAiG~7&DV1*Gr+beL#Iki%t
zx`LHW#T8&m(q8xudK-mQ5V1G|g-T6Tm_4aMCl0vkahu@BK=iy?>EG<~JbLfS6^9%v
zEfq9O^;z)27@SUdM8y%hH4wfkEw%2|7YFT`9*Ny3020PYyR&`m6eu-q_{7tVtwJ|=
zwY`{XVP;y5jkHPYL5M`~%$~Wg7kecqn`0te)CabrlEuWtoCNSr<&4fN8~Pfe5o=JQ
z#V4fqoL#ijJGs})>Uq8K4^-$eCi1ra8D*Pxq%*^9(J|hrM`^rQnT|zLH6;FMQDwIM
zJoozl?Ch>+e3;Q=*e*3dj-YCW+F@}q32By=U5MQ6=@RBh+)4heXlsx2s%f<yZ(-?s
zAx(L)!s77I)GP0rHM}}4+AO-ITjh@+4a-FCNLY~i2O-j#2ez8pFVTZy$W2@TS6YMX
zfnu>5gFQ`Ng492^cR?CWNHt$9_8D)^HeT<4qIj*qNDoHbC8`itsarCJaH>DDyilaW
z5suF89Gii)8~*)Lk9OxLUg=#dWP=%sM0797mM@R)Ta1s}sGj!D+-5O9TkjwV8Y1Xg
zZ+rWa7E`ANeZz+ri>k&rz7E=7R3k$g4qtU6kKDq;i}@N6(j3{!RMOp*n>MSIW!T|3
z2|V0f5avs2slZ^(3;40{wR=LXW}viV5+F)hu&$6MU_4}jF_PQ)Hz^MgE|Cbh(M@CQ
zub`3uBwY(q-ebvDAZg32@C-`$t+wjTj{{z?1=|Tzm22Q^8{3RZhOEl|)4%ir97!|7
zLuR=WpRFu`!aYIPLe(Re!dZ>CI~e^KQ(_=|_sz)2h)L4>=l-?0%F_MS&*y@1x_$E*
zNC|ef7*2_z`sDJ2X|;;<M)nh*1ab{mGT?GD-FKHNq^}C`f|tA$x+GJ24PD2%L)94E
zLse~HyEQ<WQ-iaHVIl@q3yvKJIlc_!qz6Jx#6Et4>}$l=&YCWz@@Wa!jua-&6$)C1
zi{+R{zp}rM;*D9iX#~T{aGtN0i)SZ3@M0mgAU6L%t8y4Jre$#b+jiEe4Z8ggA(xYO
z6Q+5Ggg0_r+M=%>j<QocQ~?{)7v`Z|QA_)~TH{YT^{d!O>2tgq{pb05p5luqyE_G#
z@E~sMm`=P(G@GF}p?4HjKF7GM;WgA(?<04-Je(}h6|Q%WQOcGu0)!R611N6IDITn7
z5?ky6H5amN+s*xXk4hRM>S7T?fEhbJYz1L6RglUTh2njwQ}0bjYnpe$CMa9pesyff
zIx4kOnJ(M*V6LW7(K*bpt)vGUjg2i{*b8UN((ld3+Ec<cFjWvhY4_d~J{jq#zB#uo
zzycpvigw_FgnhL->`oG9jM_AyeuaY5l9G;i+0MnmxkSCkQw2&5-0Fk_7Z)w+k!0rj
zgAaOsmG8i>A_UGuFmd_?VE;KcBBTywRgP<#=t$Sgk^AEq=-nSI*AfA==gk#x#~}_^
za*z%hU)+Q)3?3GHXfrQzSRMY<jMy!q(}f6lV^zJ|0Nr8r7uim-0<3EG4MH#m44-xi
zRmlSTV}7JFd4wt+mm@oIueiEGEprfCW!ew)aq-B6v)a9nJ?3^yUJ+H&HW?)tvIqk2
zB@P(aWmBkC5Mh>5>D0G5iJ36UTOOF{;W%6Kr7|R<bIS*pNq$P(lpZ@pZA!K$na+}n
zO)Lkkc^@oHlRY5JI5S}t8!IN*)m`uEd0;_(vRCXWBpNJg|LeoWpvVP7E34YhY@l{c
z$0H~~br5MDvE*L&iV$6Y#D`Nl?9@~(K~L^3tDqgGyFOaE$-%SFwMx?ZkLLt(%u&j`
zKZVSAqhu$E>aU;Qqg=&K+$U}jttgY=hm9K1W?eaQY)*Jcf9I=LF;4CJX=P7dGkKOe
zLUO?T3()5L(X^ID1-R=QXBMpSAp}s=YxSt;KoKGtD3#mj{@jMLEFF2!j@k^Fief^B
z(7lVfYbg4pC4<-!YHxv=LI)Kf&Q)!MSjjrDsC@2YQ(6HIcFNoBFG7)&0NQVTQbR*m
z|C!==l=vhyAMt|lhOG*SZ;F>|34lPK_8bo>pbOb~L}~Q))*DQl70E_=2iCj89%)wC
z>Ulu#>L&HbpRZy~^o`X8yqBhx=c_)+iogG-sGwP32(eNafN_aEqD!Iu^a09c#Jk}L
z52sWXLdB$Bo*qj^RC)Y|YNSdIq8nwU(BL5OHF;!-h-}`>IB&L3)6Te|RB``Gm-X_I
zT3bYjtXwtbW0(Ut30ea71R#S!RurFVgJ{jJ)e$IA7qWos^KpW;QGx&N?~coeHO?&+
zszHjPuDCa271S+UWV*$<`N{cZ>F=c!MxoIXZyr{#o&FU|dVt)wNNLqnDglkUCjv4{
z53!dQS3?6Bqu?XH{mV3ynk&_-#=K~TfsBPT7tB0>xA;1|R5PFuSOuUA^!Iff`k02N
zXFD|R;5@=cTsOHqEHsM)>>^XG;hRJyc+gL8vuDggtyMMkT&8#Td2)?`ufWzstZ|Qk
z{Gt7hrXbm}G^kjpm<I7*l>phD-2x>O%6RkCveTcy{gO2_sd;=;@_Ysf-_zm0S$u8u
zdeE4-`VsFR0g0xIX#Qz^bdODloJEIOuV*L`WP>BR2z(xER4PfR<tRKYVb1ZwsYn)B
z8?@zRa0itvRP*J8AV77P5o_9+G0>ML&Sb#@=PPpES}V=R_zaPNKgQwBPT~{+&6F9o
zKn2+f#NHnRUEC%`m0*Dp-7(Y6f-5-;@|u=`kgRJcqoFz*E(DNJ%T_oZ<cQaIM8ttY
zo@aqhHV+FFmgF9xs?TCY@h#H5g=*<gUNYCjxuzmqH1kZ`MIG_$c4``mG5M0HT)&F`
zO2<PXE^s}on`Q-v$lG?$>wz%}L2P}!5?~fPiX1aJOkXc~K9!V}knnF6)Rg}|zz<5z
zKrvA@z*1C3s{4Lt@*R(Wti^yNYZo7aSR+(Hc<nuI$d_PLYIIBYl#UHMGIubAP2)U0
z7?>Dz1t)QzpXzt2ZAFc)bZU2SFKoJxT;p{SOxompxn8&iwk^OqiF{E%OO3#3XD>j%
z@y$q!JFkFQcqzn6J^Rn!GKki=|0<OnHr%4mS#4>i8_|E^4fQYO|7{njMekmO8X`%t
z3G-b&DcO-V0h{77D&RACuj}Td;G|YHhTl3vwchHwbuQ#MJ9JX(?_5wQPpWtCz9k)p
zST7AJ;F+Ct0Ce9hEg5ijqhHJy^%hwwg7jo54>+b>9C<1yy1^xK7~htB&L9#ca$|Va
ze-IWqiG$FP(4e%3zN?N3B2(X*`LY3LTgx{QqoZ%$RT&tJ-Kx7*Xk<B2;R;9c#Z9Mf
zKiuvy4=DXPDiv4HsSKg!dR#!slmWtTg=|K;&*>?1;=O38cr94*p7{9G*HVp_Cy?DR
zs?)76M!K$Oz$*Hqp=Q{bs8&+L>CB0wCax1HH8n~Hr1U>MP$QgFTXeG%542FJ9Anhz
z446%he___=CW8cn%=D!?*$XXJ*jlUrmBFk?^@W~mb}qS_$O2!cnMjW{7MZNYl&1>j
ztm;ykH&0iIYMC()Ej71S2mzgDp#volz8ciB0Bsw3e3HrT=kfhGRfi<30RkY_GmV)7
zK`(?g5ueCQ=d~JDWJ4!~C7Z$H{?!&_IupSRt+LQP5(((kcj>Mi*dwVjt`nv1lRP=*
zy*iOkKKWUF!-ZNrf%0r{PI(0dEa1iQUQD$&xs?!Ub48jeQT1w!Q$O(!Rq<kU^Z>@{
zJ-snM5-S)&=N?nBjFxIIG#cWZZm~0j6%V0r$oV`If)6N({Rh}42_wwzkvFM?_X}?7
zIj?3Zzl+XQeUgdYm~9pv<E(i@W_7xJ2X(x;g2W!dVq4Z=fX#Tajrdrq2Oc33$wX3e
zGz)_5lGomUx-OT&QAGNrTFP&;y8*u^k2R_Sf~zCY4s$BaGc%MiCQi8ljpT<XDNu&u
zgi?tA+fE@TsAT$#NjzMPw@_zL@V~VH)(d?jkl;wWaK`>xKt~V@4?6-ClXPFXtb4h;
zOBUU^81ep8x$bXSVMhX6@=K+N&{KVOLa5Y$I?<PAiN&Zw%AR~EmpCLsB7=ayTYkZB
z-Nl~X6?!>9i53=_Qb}g@<ek%q!-ZTfER@WjZ79U8!)oZyw&c}~TN!ZCjblUC<Vpd_
zfziEr=IFGO>LRewIu<wRSmo|Qje$f{wA3JZ7K2=F6JP?u{DI9jAhrgaXYI6@C~vHL
z;+jmxIhg>XUJmcn1bQz%br0p*<6|11FQE%S$A0VJ=@M78sWH#`rP(MNIxh;;Cw^2;
zZu%=6mAW!v5MTjdYmd|A{!s~XrJf(?#U#xVM&ME0g|2H$??|L8U+x}L^jfa$LB0TN
z3u|=@Dv%al&V5IGh$j@a==%gT`hmqXQ(&;E>eJ;BDoR<X%}9kEz8eXMA4_)I_Y5@f
z9MjcAOGqO1J0(R=bc|a2;}}3}B)L{olWHOIjmYR7Oe>45f6cUW^-}8$VJBM$Lpbtg
zg-x*RA8H_KuJ2i97Oi;BK(Vz)#mo{{M9}klTo$$=GpdKo&=zaN@={5y#R!s_MQRm-
zBPKFm670)WM++BQx5dfjDS-rl)Zi4Kit10Wv?DrJt=(~q7Dk~1`sa~1TZry#IicNq
zR&ACgUQbr|RMK36xMinKLN5WNsKVG80l`TLAvGRUGOT6m(&~PLpAv?y7T9S*2N0OJ
z;}r1<2K6FeUcKp1Y${!$!TU`PP}QuCqq3}dS_|B!w#7?|>T$vwUFCX*Z%o`i+fKQC
zON2g5>J6EXbN*6$pE8690X?mJba9sMiUpk8bQljz@59)P29+#u?J(SH{X2<1C7ABb
zIk_Sf6JEXenmW2yQd3hCSiW!)=mRu}h?-M4fRukE;ylYhfn?c*m~k15wo=HMvPVPV
z6EZXp{bdn5B;TKAVyjq2i+ny?s*{e1ja@%({d)`bgw5&bu=59I>?sOh)b<5}B&ZH8
zdnsyK&MZ-f1qnMWpRT>W#K=XzaG8EG*y;Tm*1#X*2cQ%3JXM+dd^vh)Rq82{$7x%h
zRJxAq3dc1!AkYy8j2hI#BEs-t^EQrH@aFg8;^H@>JX`&2CyHa!%KjSrSYBxSuo{8B
z<{v+tKYn*O{mLS_B%Zd-VDwqhl#EhtTf#P+X|*be&74YwfSCAsN~hwc3KYQ69oG?^
zE-DJdSZYC{u9E4swj1FPds-cMc)*_k!3({`1LIEyrs_I<$s*F?i@`x(xJ>=m>zrgI
z7YAF#9Y6&i{*!1IS~odJ6svcrD=S>24JgfbC-=L_%aQpm@UDzu5|T;BzkBPTojTK8
zz0n6GU&#j|o*xktu(aPVs+}v#XuFqSrPN&LOh{N#DkK5DSUJx6x1T}cnG~k`q`;qv
zf}VffdIbjke5It0K}C6d8fB3B48}sBXg((99V+gXH{RI8=sok32m*OZE)dI_1ODA8
zRKYVY@*T@`N60vq02H`!AU%SfTq)VY=_+ZbESj>SjZ?;Nw!}S#7VR`;7Z4HDOhf`0
z>#oU!&<%2OiA+TL!FTskA9B$y7t`o!_HilXk}A7i9yHl5+wufR&^sPmPbwc#(TOKY
zzd8^qHSW<t|0}WRNEm#`k_wD8y}d;fuOC!-DOCdw@1?f)i08F4E(nOGeoMda1CdbX
z4GB&9+5zq18_RW;N=BA7s>ezov#$^BI9NnO_b?#dZvj-j;7mB@RXq8Q>^k#s+bPi;
zGztzFYpIC~z+)&kS%twEe~Y<gnXVf`0KHMiy<$v}GT&X&gTkQvpt^S?t`__I`|Gla
ztbiQ|aLFM_baq)~hZ_j9vtO*Sp}GJeftQr<K=Luu`uvIRI?jY7tA@fBbD4GX0;VT`
z{9w!oPB8^La(b$*_`}}QV=y<orKck?i4&9<z5Dpn--Qn_ph|})Xiifgk3$z^m<41_
ze(!HNh+ly*K+VA32L(`$1;?9zc4X;^^q0@LmKv{I<VdCo(LzoLOk|peFJ?eo&hsq{
zk9DV%jm8Cu*>80EV{;nLPy413TZk-9I5#@19YZh9eGLETJp|n6XL3nCUR)@PcEMEU
z7W9+<*nE(?GhEi{-Jrde5)a4O{R~83ln^_7lkCSK_+BI+y#;qxnBUVkq+?GDkGE&6
zjjlgBJ3ASn^nM3~A9#ID|4x}V2YR6l0%FSFA_unNgM8bfjlpAAT<Ij8+TG+*!g<rp
zNj9+rP}b5Zf04)q4j7Dp<7%hAC7&D}7ae7VW_Ow|AqoQF25e8223p;+$(GpSrqA0B
zaG`ggc1!OsNWHO3yyW_HyaZ4X*j@({4S92l%O?@dE7^<^1UJK~i9bC>@6bwlYp(F>
zF@%J707;PYPkbsGKS#Hl`(2a$QI}vv5J8dYfdvD%ex5+eXT$ndY|PKT?F{N%7?i3g
zFMq17CD!S<(McN?7PbMsS;=G4oEMCzBbDXDF*bQ7@q1+SiTa6E*m5-9C=Q_GPypOw
z&1SBWfDdhs=~hPwNK}O)PXn`%@(;;wg`@uo4M=o-e`NxCk)5Cae!S4&EzGK4wXlI;
zR5UQ@cMT}vaXC8QeB*W1HkN!9Dy#9G^E7{?;VMVLrZL@#BfiPfW;z;04^~i5`Jl3f
zE+04LSCi685B>~7N?DM>`nGRuqi?)UMdOD*xA718dys-6-@h#fe4HCo+m-@*F5a%0
z&h>VaB-5Y(wD|+iUiIu4^<wP(Mr3dB$4Ps9leM&;XnDoEpI;7D2RkQdDM0i{yj--u
z_41M&FNBL%MBt|yc{cu?UR_<iU%q<^wAra^s>hehJRETn?Gko~iZhTnaKNvv*&MgW
zrwBpgaYk5-zpSPy+goBbw$sBOcjwj|%eKD|wg+BJ@N>^}yw7~A$<Xz8?l1_Pbzfr$
z!cKj~oU&bsE@Xxc_*LY$_>Of+7K~1L2F;(E;BLmC0P9#I!iQ{B<DxJRVy$ILyWX}1
zXMWH2So*c)gU$i{@HskqTJ<oS42OrD<xjxQz>ve&?{p3I74V!*?g9pZ&(}a?9m2Do
z2emps!43!}=NDk*7t*~4sKV1(?GEZz3K5jF=b*nnVOA~Qm2fv9kF-TcLrUsH@d7+I
zL%UiQZKNy=uHYu*4*~}<zK?4OMeGe8WW7GN_gk_$%fsOWAYWn(?V`lCELt-CTQVm2
zW!=o<eu14JD;TZdjcQqnIHTV3V}Jmv(!ZlFhwR_kF^djf3>2tvw$&r{N0N=_@}El}
zl&aKpPr`Qj8KeO`Kw$N`?fV+ayMXD&ff#FP$~`m}mdOT5OSoU_QO+z6yGl`1A3$6<
zXV%++gT10Z%%!k#?*08=V*LNs;XXlOn%2~>#rf9s(;!r6$!F<$WKSY35od=(qgT`9
zCpg0w%fhC|M-^i&dECN+0`l$+S%7zz=Bw^-_8T#%xf(^RKM7t-T?#M!ib`u)DN1Ej
zR$BHDRHWZ@3uV)d+Qy3h$7Q&!<?(!pL{0(m#7`F)EU67vU325g)3;_sy0T_bQMIZ+
zbm)m3QJZ-S7lJBnXsL#rZyGKiXe=BWib@=T40@RWzm%MF{H>YR_qCFwWZ?GPQ+<Y@
zmbQz=MishVv#Zm*{UI6`AaQr#R%!h?H_4hTy8v_ONLg@p3N%iR@EB|)s4>jB)GkzZ
z9(?!1Nx4?7b#5s{6Aua9#PxAxvMM+&^G27ec1~`%AvA;mC8?IqNgT~B82J7%imG}J
z^?;_xdtCN@{(4*KaNRI=>fw_G7@s&_`8y4*?;8kVcB_KY;YPzY3N=Y@2;cgum|8m$
zh7jO1y(e^i1qkRJF8mc4k{{BO4cyk;7oOqK|5$Mr#bQ#|*KAeJ3(U%unfOrymLepY
z0fF2{rS7+{zk%*jzVux<$b7@Ubk+0tQHlFi8hy&NqBAi(z!s3mXd|W*(Sbi`c?5NI
z&*k25+3Q)n!l4J6LSSXUS)<@f)wlcm?CNUXP_!?=wP`BS&a|t!ydF}m`m1-`3Chpb
z&u`WCB@W>JcCPO<I1Kw-GHc(o>LO=TBT59olJ7uPjPu9)w-D$O&jt*r`ETn9544wd
z6zi>pg@vMrOO^)uaH|A8^W_yqZuzn9eBlzo)_q>DoBc&2L7pHA)QQVWiagGGl5a-L
zj05t+;M1$8=<|`%cVKXT=x)@eE2uHiz|+MV%`+e={S4r<5`(I`9X`>#h8JqkpBqJJ
zPNl}j9GV69rhg_et~j?b9<2eM;<gWw_MgH%SlX~CKnSfn$;Tm)2d@Gjx@-eFFXW^q
zzJ3G&1z*wm&VXM|j9u5Lt~ty}n*=9iwCJ^Qi>IPZ4K>UgYRLMBri;$?bON|iUDm%f
z_?Ejui<5hDizRjjl3Ce$XN@MFy>6?y{7cF}9JZ$u$&NPdS;D$gHQTAS+{tae=K>;L
z(|G5>lIKsqr!-I@D_3L&L&(cd6MFf^VM{v}66_CzhAS#t1&4Ik|D{}yt^VU8<qXTA
zLq`w3w>2g$W~Q2Pq)3PS11aC6D1OZV&qmbta&n?5rp$VSldVXhw6cxMCjqbwmJnO6
z)y4xUyPs`L-Uou3Pb%9)P}>*v=*0uqjtFfVmIGnpZLhD#o~(+8Y><|k{xJhje#zv8
ztZqg!(}-kzSrXXt0&g8g2Y)sX{lx)J(bAqbw`1@c2F6CmM><IajRm}J$#n_7^6oc+
zDD%3a_|gKuXJrX30{m=$SNX*xx>k=*A`TCMhdVkKM{1VMO+Plpe99De8|{5R73;<!
zUVxuwjTJ<i>Fm_HO{<XSU#fE0p@G;zncB$t@%cDM*lnWyR8M4Rj1<I%sZOPHvLPNO
z2{&hREe+)d6Vx<qOE|Q=aP&5A6bN4hBO)oNO=m#Y&-B=17C)_$2U4W{{<FGx#U3|H
zUP=5v=~O!=7RA!?7$w2}*Us~%eT+gNj{v;og{wmMT^LA6c4T+nztv3i?(Xg?0l82>
zFgzeq7$>`u1xyv*cRThax{GeA=$p&@{qzz_jPKfw-4$RyV~3h@A`V$#7nQ=Yu8Oop
z{4Z1wU00C_Yt)oFkeTt0nC3UOs9O?cP91&4?`HfIZJLoDNF9#a`c|R|b!WDN`v=&@
z0I!V#sPY|9jAsp^EiNu5McnqPXm&Td>j$c!M3EdiOueu;B2`k6ie%!cm@-*?wuF0T
zxr|H2(@O91f88f-IEY22YKnD>Wh6KYWij!eGZ9_Md`*H*3dQ!wINuBH@?6)n06-)M
z2o*}JzQn94?fwsds9qo0M0`7eI=!3Z(Y>+=t7`ym4)uww`!x{@Jy}Dq6Ya5Ua(t%D
zVi>K4$i$}J_}1k3mwAVn4jgtR;)kio+(#tpp{Eq%^XaRkeel{<x)ZK|tDBEm^>*Oq
zcIs=W;x9(H$rF7BZe@lh`>5}Tp*Xt&0TA@cd^p)K{s&d)C6mmj3J8If*=)9GmmK4a
zT-1uN&b!P0m*8?OLF_TSPWF5*pdWlq%FV1mS5(JZ?1YM6BpBm(Pz9o$uZ_NDciVv5
zJZy3U>WBKq+G#gIFAFcvkAcjall2(%*WN(DDM@1_trX2facuIyWbM=o#nixb)cQT`
zuNV>q2y#|&yop}?LM<DOnD$UB6#|)o+t~_rSIL`jU_h_fVjZKOQX>v|fl`=2V&Q+-
zOa+W#AAbU&(A+G)k<jX|Loaky%y?oo^QTh<1vPsVL<5WQsp4m3&A+DKNy*2t-mHv%
z69AxC>ev(9=BmfKy%$#ZIUr?2x4RcDg08237<W&<yl2dA?Gmt@Nr{=~?b_w;xU4E`
z_BbznxJKssc;hYX#(bR;>lt19Yg0t(6MJ!S9-pzhD&A)J1OO!^wo3<4l!Y$R7}}I5
z)LjX%v4Mk_Rc|X7_Y+N*_u1lPgkGY}B!@P4R`osKWxKa<Mvgs|0=KnYL_LfhgVpZd
zRvl%Ehxm79q1XNe+{fU?$vfcHruL9<AipFkFM$hk3O{^TaqSA+Mu5+yq7Vzr{&CYk
z^*`O*aWwrc`X&oY%j9|lw3-97b4X{J86grI43O;8iu+xVWC${FTAH9wg2yHdU0>rt
z`9sb6=kk;gn?|VG_vCyo>RDywPtIG46B%@Z0b21|zHe8(88<)BGg@vvrYHB2riYr*
zy7c8L#LAC{e$e|c7YzO^G9V*JqL^Y%n66<))W`~k?jHNDdpzlLULQL+u4(uWE67rQ
zs3soE4ar!eEOT>EQUP;94PM%kSjbQ<tx{z&rm`7vF@8ZSd+TlzDQs-s7Yz!P_1Y3b
z7aHL;)ytM>H@+WgC7m_7rTP^Ks8QQ;(|$9AxUvEHQh#&(4>St7dG_5Vm84l{31t~i
zDuD`a?SBExq7!WF+M2%=b{#D#Lc$G3PO|%RS5K$7@}1h#xzbS>p#KNCv(6y}uH4W;
zPiw3P9?J3RI}co`2HI?;xQ+A_kdQZ4Dbi;`|GFp-#)bxovFm3LU(qx>|F*N!F2z*T
zd@4!xi+rX}3wd#+0|E8l<&>f8m)dRrGE#FqV9X@w)kHT-fWo}=x7`^-tP*PViRqFG
zE>hUwv<%->I3spKfKOYMZXr={I!Or#Q{XQNBL+3tLxB$8r#^lLCyCcvniZgILIJs~
zq}m3?QnZRl<4%>ipcKm_{_%pNP)KiGolRwp`E)a^-LN-Mpx`WI5A&&-N9A9*9ym$f
zWK#q<Z8WTx2NZ+bUVY$Yn<g^vjC}%K5zaEFBJrQp^d(e3ME4xOOqZdSXouyNKOvr*
zwn?#w)U7i5TuI{)zdPUr5+L$D^DQRiI!1ff9`7J@4TCcwb?Tv}bttjp4D#v-*CAAI
zS0MT`pn}wQVIwQMYz_3gtNaQPn0}+}?lvuy-vW?ZDkPGU4S1laG)Zxt<tm^Ic>gq*
zf;c%L;N>vi;})|yAT&e<J#WVK&1HESJ;iBPU$9OeS}xBFhDNY>!zCrBS-hOe0q9f4
zS2)&DhbbO?k?H_j*`<5pXCjig2v^^%E?e`8JGa*R4Dg6R=p=)<bkpgu3lzcq$uYQV
z=1IpcB_F1NF9I?*@#1%d$2<Na?r6)4YT<LPztB-yJ3Z<{mdYJBll=Z?N(EH4O-kci
zrt$JM&$IuiC@)<(q0>Cq`o>B?@?}`E$9z|nDAP3r0GpP?F_`A!%wHH^UFJoSPTF+6
zlZEyreoS3lssJjJ(&&odi=4rsQSB%GU?FNPFqM`gsI6L)@lT$9a4<_zFV}PaLVCik
zfNO1L`lJ^{;x6r68&DYVI|TGfldrcPb#weN%$7u143EMYc3sQdNF56Y4GklbZFbDt
zaOdNMRU|J4jI2o#^b`eum=06s94TT?yY}wWzQ{&PaYJM{***gYl{nMcWNMKEh*+}N
z+S)5c!D~$F5LsP^x<p0GY(&ta1fPEea-NAw+L;$f=(dG;(I!_A0aL)<)%@qN$EOt{
ziQht)aHe{P*{;m`f8fMwY^;|*#7od~?Ck82q>0!I#1346!Cm3Ra#fv3SKGh=QJLvh
zliXU2&akyR(w;ww1Oe%OLL`9{%2)rJSQ>>rB{PwQ<0#WRB~n9)htI$!i_TwM*Ut{s
zl3<E#St3=zxUuDF^s~?yzqYC^sWF$m|Lj~geS!b%34fzVjDZpzXQ*a>y$5LekUobW
zelrAE!Axp(GLCqf#?AH`T8$>RFBdnV?!+uSPXR5gk^8qA5!^U&$Fj#O_9pH&fPymQ
zCOUeyN5~qO`Yv(oK&lcv83`_nH4<7NcAQgb`T5vY`(Vm9(_a(rS3JZc{}6BHJ5yF|
zTK68P$Ve74C8o$2i#NnHsua;EH1Nd08S*r6eP>f{Z=iCyC&DFPIx$zS$Og-&s-gb3
zpy{p6@uNfY4R_t2_MY`FS@8;igh!^JnW7!7X!)*)#p;W{Y)a$7?x8&tc*sArY;UYo
zr3iI#RDnDBuUdkcuj;<aS;c=O)q&;O`90+^KruHc#OXxh;g5DYi8Bq}U{NU&=Sm*@
zpOcdG#&*Z9rY~lXuQ4r+0%4tI<CGuCHvIXA3r<4*ZFY1;7~gzzPmw;R8Ofw{oahtB
zTO~bH7gIoA>%RhzC&LMJMeH;b-D3q0Pn^+0-L5?qjVd)fiU2=8RMHfIF&cCuiW+G_
zHosSpfzJ#}I$kz(VDZu9v=-3ttC9YUl^JJAZ1lN@vvs?CW1Yf*?eNv(-`kJz-kfVt
zW9i>~@#=s8ZFsGRZbY%7wf>e2zyW5vJK1Rf!R(J=X>xSX^A><}LjN9#|6WFLilpwt
zo?8je)CeK93P(u#3lIvIJDSw;!^MEE_K^SsBdFSB0QQVe;AD)u5xHzZgM6TwtctQi
z@J~}4`Tk3jq36<);yPUfg#3Bw7gZ4Fo80B>{NqrjR_qicx%wVHXoeDJ#4yKA@OkAf
z<<oEaAH1Q4xT4=HD$(r&w;yO8!W1_cf#1Je5&BQN5y@#&ORn{rG&&fomXA`a*H``L
zR>ZCC`2PnRe9EdbF!v<wq#v*pWbsUJZ1@PfYAo=r5O9v(mD=!($;U;MXwE!c0H)xa
zh!W0#9{vb4>X!WYgnvzLlF8fsE?l(5)~sOlXa!iY)xz+;^vAo_Bfb<4qg%haLt`Ek
zI`*doDDtmA{>O<tfIqjaugPGdvn9>o{j&K9Qkv_;(iQxL1VTQDbyx@J;*F78`v9o{
zO4FP`BiB(q{zpU8ubKg#L81<|w4Bp39aY@>{Gz6(9J>B|Bql<GC4YDGmytD~K65gD
z<%e;r!J{sS8!%~w8~a;oQ+=m`ta98@q$QFjUjLsv@%-I1s^0yreef9BlUpLwlYe%(
z*a6+?z55c>XAJ7T^_D-i2T(83z&fT=Q9Qym!pRo-#tb2I4iqLiG+7l7`SRI3je5!R
zi)k~&lO*M}EfT@GA0IH+0)Y34ag0<+ft0T*yoaX_cE?C#Qh_RJ6=^J5McT&VzZUKH
zGu&Snw)xZF@@)ny@0PSzaG%jc+8%$&1^)gsB$H?Mh4g$044TZ0H3gcgA06cLnwC67
zaLl>DS_P$FW@3_ED|i~!fIQqEY#&subs+94g3*8Q_B&xpN_VG&@#@~9@F`mV<Ph~!
zS^3Cm95F4M0MpSH5`|H{iA(xGH~P9>8I}1xnKmG5)N;&_gS;I~rBWM0<KK3Kmr}=2
z!Q93jkz+A6qBRGr#M6V#{`+*w&23&OBT|m5(d~a?W^GsQqHupqU-sv>w#0B`!Fgs8
znbM7Z*qi^&8s(!@atODbtX#oJK{(-?H>s(v+4I}2@>!1;?fNZvVl;qGn~$esd(HdN
zKMN2T`6jEvP<7Uq`V>s5#hyHQFz{Jt4@J{a{P)Gb0^*AHO`VsG?SA<le!u-86n`-W
zyFx*+>UuesDug|IFycQ+F&FTF6_gL0l}L&olmE7brwHx93PNx;s>93};{WGb05pLC
zWy?YEi9aT5)FX}t>i5_eEN5O|_6fRSVYXy`!)`>Q_%haXNSV(O>n3u6ZFyYjSP1Ht
zz)=<AIWa1gmEnKEq2r<4e0-+u3?v(#Op+MkXw`eR1=RuHMnwP3nlIbSCC5Q+jYQ`2
z@xMFX40WvqmnZ%iDJdzcn}ae2_2}xGiDK_t)_?*k0mqe7R)0!3)^3?peEccn4>=?+
ztGkp+JZ*m`uX)l;d5D@UF(Qs~^=N!z4gX5hzyQ>0Pt7n5E15N99#V&5Q3{KiR&NS6
zhp#yL@0_dsCS{0#ggUezPgg-*u>w<4>?+$D{t030|7Kfn_m$D-9n{Ny3y-PQ(4~0E
z1u(S18830S3s5blJ=(=bQDZkeCFfBUk3+%sjNka$lXllF*x2!R#n`W&N;YM=;Ti%1
z>NFRK-P=8NG-kz!{D8WjbPUTw9D;`KG`x}C;}LnW{#!(_92IAcoPwtJy~0op(N`d{
z#3^4)H*KbR75PP;iQq%v)?itq5XOAi(B|1jTfJ^4OvvZAsp_ylsNRU$hwqZj@FT*Q
z1GMI-GW0)Kv4g{m_isb)FCcW<r$vmFY2O;#G!Q^=9Ck1J)IQ-$NS>0I?Rcw#A&2uB
zc1$E+yY8<(^(7jU0B<gh&Iz@Xc3T6sU?^AXl!_Un*G=KbJ2MP1K}<U}A?D);hT!!!
zOVm&w7>LA(OH-$_7h=e(sX%P<RWW{L?W-I$Mz<Te=lJPGC_EuLTUx{b;5J`&mVOg*
z0VOXm{S&XyPJnwEB?kpJ-Y%g<7;z|-T8k@av_*sv%2+qE52J)%<Xl`tl^T=M!o6ad
zEDR4=rY#<iyFdm0<iQQj)j@YOt0q${T9cSA#2PXYRf3MiuAPgMbY=o4ne<ki+(M=C
z5D&@Dn>8Gzqmzq&PO_Ji=>1^9kF($e_d0U7mkJc>q)^GSU&Pv12_od70tSP+5*n_c
z2?C!`64g8;HW$^$ED=6&Rk%GRkrrg?pT2CbLac;Qh*!e?${&P3<6Lf*TxNP<j+sXc
zsD~<@!pL0+vAHK&GzO@$0U(ox12Mh`)Mgc+M+#^-b410E{#kG8%*{wD-NY$nXTAZ1
z$s6-B(wKko5W0crgSl6tkh~*44Tx%YX_`=WxEH(1=s2>P*|Ne3mWLz=L^J`G_^3vu
zHfX%N^ZN@SDD9Q)*A$f)M&Y9OLE~u7`@RQkClFh_Nx?2M=9j3KuLh-wTLGKmA;F;X
zm`UVrPupiV-`V%cD_Y3tS)y=GfNx`@0D21u9nt6@1N}!-*I<g0d9&>)P6UwH(_<3~
zs`UClZkAUelN^0Y-0x5qq?xh#*wzDD)S3H{c&5WN%@paiEcx-V<61|WIU-z7V9fU^
z67)q62E&19-JbG8Q;~D{v6Gll)rS52axEw_rK}Js^lBa&;Y5%aXMo_T@LCE*Q&k!P
zY1dELkPU8P>9TLNIY(#`;u8K-40C%N^bkw7vaPgr<5u&l&2h~Sq-^ePEztdol@)!y
z_+I^PL=`fEFT)Tt{it*FG^nHk!X}xt_R--s_7)OOuHb+^Gk8F(S^t!NXk}fLsS;=p
zxnWWK&GUn=^#0E-BW$Cwr9}-e_etNiWlFK|+i}1G`^MqT10!5b7VTIeK-sz)2xVj-
zK>eWWNR;SBwh;d5C8P@@Hd3*3tMDGEZ-lNc4#X520A}Jee6~a`F+?$@A2}VPOC=K+
znc%7*JtYA5y7a-3C}7zQpe3j7{%fzB0~#>0P5hQMdKe{#t7V-1Q#G~qCJ-S3mLB_i
z$0`UEVmUhe8d%f^qEeAXF8=#W{sv*J=8QDt796G$em1hv|FYptK#L4=_qI2C{I1A8
z<M{GxSW?3dnpN{_h}Tf#LN@H(Eg<~Z+$`Ko5|Un;sc5OUpI`yK5Ds=aP#|QXTA(lf
z)kpwf;7r2UJ$fG|3cCs1Vd@zQgSb_zsFtxLT`JPeF!d7P%ccohn(Lv@y%8TYBTh$7
zfjPws`^xx|tRa%|O!oTImuO<#&`Wh@CZY9=@)7mDxL<AQQ>MOT9?|V5O3)jxx7c5%
ze!Po6;#+1<n;PbGe&j&<ocFUXz7a(67mNLy3p-&AZI(;>1Idgr6TpE0T^Mz}0do$(
z1|6wxWyQV(-$W~@P@(%l;1po$p}T(4j@{x;4(O|DYKWqeMYy^-VG)!IG2|qc7JRF`
zFcal7HW<mjtKY#iK`)yjSn`^qhWhc|Q{Q`pxF}x>fEEZ1wkPKXphpEjKJ`0IAAn{w
zV^OM9GcIty)`a=hP$dfjw$fIr9m8f0aL!?8be<W4v;oodvHk^^4w-2CZGoB@s%^%K
zr`Cez>>l~M9Z!Rnd%`!z2@LM>=273B`vTIh>_Mia%shys4$&UdpATyMm#z`M#}D+7
zxt;<|nj0C+C{O7}WGTSqr1zS5@|7Rnke66m7wD>+aXKXm#r_uRO-TplbwK|#d)Q9g
zW=r#l)9JFU(l>d|H~E)3`PSeNYbnQ$2Ac`@_rmb!;{0a+3&}h2u_VA&^iL^kP*#|D
zRjAzod;xu^nJA{zKmlY>rqnl5nsdXn*nEB941bT=Q?7+q(Q0v3e}gFX0;A3+?H@p7
zn~&5J&y|4uf!!UK#!~enOyjrYM)c=bb97HLw*qDj6=1%akL0Y&BM-K5EzX%6?R?rW
zS~#x4J@s!(BTb%B&`OI;tu=ehk<CoJ+0l&Qt;1{75^LnpN%7xnCB|&XK;lH2ea%Ln
zi}J0Ksbq!C7KRI7;r2zjh^1+P=8J$OOhvM+C=GoW?vVjW`2uWH{fQ`ZZD^<sR`R!!
zXDfg>U3lMmtR1%-fGdan8S<wdJvhejTYt&Q)+F?re;IBSZKqMQbJeY5r_wjkv<O_K
zy}`P|3lC6@fC|)|Z?CyIj6Qn1$(kFic=;H)k^e;07Ky_LiL)jDxkA(olze?aT0h>d
z+a%}#LvBRbKcwOcld@Wb84rC!EPiYcTu)H?gi;v!uLlz@*phBV`483AFg=H#h_)O~
z$7njdfPzH<AE<bTi%h(M^zBf!nlf@)5WJ|^Lkf<(fHBdw_V2s9ldRE|2i{VgtqTta
zUoeA;<cFpa!te-P2r9V>PWeAN8mlHrfVHCG@qXDBn6_77vcEjWXzD)zxZF(^qmZQW
z4eg3W8}blK7ZVL=8OA3R8ep2~^dTn!uLI-gX3h-{wy|7R5=!#~F1n$u#p}w)t+>yf
ziw50M0#Zv7)Lg|oL5g52*j4Gq^cIJ;q$^H{yOrI@k3CqEVBd%W9>DmLzJ2To#b*Mn
z1n8cQU%1dmpjgJ(jnh6(45^s6F#S$7hkd!SUh~JDR^k0LGw>$TMuYB-CHjmHb+=N=
zJT6yK)>PgH;Pnc^ig6n(lXauiv~~X-bzKs6VrjJ9MhXznt(Rtn`_(`dD;JBMXWz_>
z{)p~}&EH7r-!;N3k{IYuM~%(2V9?s@?5EVHk|VmW6cLa#*O~e8?{G7(z`A+$fL%PJ
ze365JI||Q$nnIJ<O9LC|t~*w|BGz4#(Z_qb^eJKqO9q45Id+-hg&EF7STDl`FY_N$
z*%pN1$A1{Pk?bzU&Go`y4em~tCU)cD+m>k&3<6|Twx8dDn55Erb^{IwH)yqP(G7m{
zD<`avpoV4F(wY;?2Bf@?{?xHj%T5Z02Ejcq|98@2DXm-x(GR>2hRvn1%bK9h0j+)r
z3;N)#bn{Iv1H?fM^f>YS7-WHAKTF&-ecDl=%oMc}i2i>iU3ol|-}fhFO`j+ld&bz8
zWM?dubueV?OUV-1Wf|E?*<xhulqHNtvQ%Wtj9u33TZ)Lr9@&@qUBB=AIj{Sid+xdC
z-1~mcdCobKpdt{f|Ga6&F~hB@8y#+*0a$Q%K%X*e#Pbb%w#bY=a>Kr)sjH~19)Tli
zm_V8HHtZoLd}D@U1}K{6fheN!d>M@C_9o=5E7%9c@^f;F%0;Hoa)e-7hxPyaBEYJ^
zfoYF8^Wl`}f?k}WI0q6dC8XE&U&)oncFXrD7vweBkj&J@Tn`+6=yltt)Z6cTl)tZX
ztTG(=Oqfkggeg0xyw*N@HX#zYkSyvoDS!iy8fF>){yKe~o`2mco%B{Yp-Y2bz<kMe
zyGI6#EQi=@0{>zd$|X!RBA#UNRPyB@q?<$xD7eP-XUiGK_O>l3?rH41)2j|b@2F;;
zc2*{Ba8GVg4&T-QO-u%{TB3*6$WErz#-7AJKOl~&!L_7!CK*U?&3|C(F-QMO4i@${
zB422y@8?Vmp9pA1lfK5ycB&AumyO{Q0yVHLHeaTD-F82pEJVjtTwwFTm5**etTa1l
z1(=`daFvFpC(|2oL$%t20LX;15++|JSo}Bhx7GK8ewIZhSQmLFCSZ{ae}7^ZIG-73
z2OcqwHwo;@zFT|QDLPmKC-2z$N~iTkQGgT&y}J<NWPFQ>X%n-YZ`|YCw$9c%;PdEf
zx?Ao-Eg6p?>R+ex8>o?9Q=vPHH2O5mvURSpHHo%ifpKpCoG1n|G5kW$w2}ip#EV}k
z$;m?+0Z4lu1VkCX>R~fuy_VZy08JwN{@~ms0?m#@=a@$w#q#XS1_alk8Jw?AZ7h~k
zG-_ibsx1?n&$D<8Y#%k$cpkuqZ)XCN`7_aH?iHAj*-1H~-^pAAa*|9o9jC7__y>{k
zkDg}aqnPZjX&)5oAXZNeiMD3~%)`w~BESx$-81*7%embU;rPDZY{4t|gHp;{g4wZu
zrf}MFb2P7pafcoFCblT0%6a-u01HO#?>k(SBxprESe>IKM^>RE09Ro?Q^fygCNr{V
z=sjYJ=$GQh8#3GdF_e~r1(cp%wmb9y8mU4sGhyauioM6zy792(NWYUQx(u-StxLcq
z%S+$iN3GN?Ujke^6vAh&$uUPI>qs^#TV4gPNm(hB99JwOC~*{d&|J_*rg}yIFcJc=
zz>;I0!mtt|;0!htl}(q~>91DL=H!}(&zC2^7|6WT#tQU>2#$#Qjpu^sDDM)IMT^wS
zL5sY`VnWs6*V7P9!!Qdd1ib97U{6lS65}JI8{g5B+c>H!girYQmQ47@u~iWI9x0El
z_J^OC-QdMnBBJ=vIDjI`da6}t3S>dVneHZZkO4&x+%!d4%gQxAW#p<&-I<#l8Dq}@
z;---t0Qy>WnFO5smk;LuRT00<VN&WSzOQ!`*y4;x(V2(iLketGXjvJG82Sa)S#ai9
zL)Dvb@U=ML9OytaruG(y+YWn98JG6(8~EW4BtOZKW)A5FT)%al!A(i7`1cDU&^y~_
zSjqbR96N=rB$r-h>Xte2qLaV2tPGU17j}}Oq3u&n7?L&On39OzJh!}@D4*nhT28v_
z4tfF6j=uNe%q<;#>@lRBPJ7C2cx?d)p7}~Pnt2d45D?C^=EGj76V{Aw0jxfAY6{w`
z(QEQlx;zb96x|6};fN_Im9<Iv=ScU+{o%_!cu>zQYIEv9KJ8BMAf_pmu&VaAP^U>c
zo`eK*9+Z-9{kl~SgGz;y>uyxwN8W*oM3a7EMw^-5rTQP(+#(K#5}M7jkE;k%$h|fd
zL%&x3jtA+%_<ryBf|?l_pRabqk!{aGrbXBBvEfM@$%@N7>W?k5llel-aq%kMMgue6
z%vrrV8-`#OT{gTax3e>1pD_HuMihYx2J%g=-$`sW_H6$`oew}FbK0w(+Wc8NQ<17^
zE{&4*XCGlRwe3<v@m0bVRRSc@ss0^KVVk<6(m9PA<#bUnU8s+|%~AGb)=()I#kv%i
zo=I%Ps3n0%Phj%I;*O^HzcPCYP0KX_)&inM%HV{B&Xet~=d^|?K0hi~y5}k~FY#jl
z4_b{Y_2#CBn57QN;}nv`n^ZGmw3aBPi^*h@S?;MDck?_qyWnL}z6Ykd^G{V1Pr0Wn
zlIea@lSI+?0{?>dE@pFZ?K+%6MAbx69@Tay_)FOJ6Z0SEGTk0O8*8hsZ~%CFGyG3n
zYDO)im#dGnHZ|{65bXBSGERwpLXXGXN)jtCOAmwSHzDWNh8))mI)7@M2>nNt`NuaP
zXOc+IcMb&JU9C>VgYU&d+=AR>r|-nL`Zpeo$zL+ex&&KaaD|rrtx}I6Gq@dl-Sxuw
znW?mp;_qm(^GmoOoeuCR_0+j(Nblfm=mXR2!Mt_+oi$&{N<+KDC3Ip!DzX!MUL{bS
z89i0)zfYDNWTbG#Io#x3+wT*J0SGBX8V*H*v^1t~d7fpGYrkP}n*}_|wFk~H1ie8;
zu3n4%XEpBytIHb~zIiFJIzTe<XAwv%`jn-MPO^t6y(A$OTa&j>wl+rfXm9bhL%RNj
z5TvO0_s~H79EKxdNUuDz7Av0M&CMif2Q|nIX|5NDUZQ@Yq^a>Y)Lvq<SfN*3m<c!4
zKyTM4>w)X}vr=XyY?$Rqr6L^tEqQQ>9n%3SXI(C>KF{p6GYGvGY_4td6T{t%$Pxi=
z@8*@c;1-{_A@@Y@4`ROQapO8KsfVOA0s4ORbj)k!e=w9E4>ZB-Xtudx=l9)1Z3?)4
zr~Qj8cDvG{oG(v79TR#zP$2z=@TB>Txh>%iSH#Qv8c&`=#y8m6PI08WSbYO|yJ}mu
zx<`vH`h@3nJW^aQ#KDciaCnSMllndDK=BY%jEeiFu*ATwZi&EV$L@p7WPdE|xna2&
zRL(PewoCl_DMdso$-=#Pv*cC38Ql)|AFfXlCCS!BHw^Fw3iq+_M_8dP`S)vv(kAa3
zc=s>_5<K@P?aW_;qat1SO85}3QMWcbCmOpcEIF2gX&1Pdj}p`$7aANk)Z^C`>=~+*
z7Ph(YuSDi>NKF3icHsHr_44Goz3fXx8C`)w_Dj1oJi)@B>KTabIEN~udsM@w&$FyV
zt-CsU>KnDz$zB`l4lCvBa15x<6kL(_nxa^k-y@SYm9^d}j;nj<WgBmqo6=M@hm$Ey
zqPi|Lu>fy%+e)<0)%;t1b-v&5)%3PhmV)|er8GuLq@*QpemnR!P`=rW^FsI7?1f)T
z!5bSPd!5zl8biucihFb0STWlk>`t6dxLSBf|G{hDgjRi9uKvrVYdqEt%hCpJ{Vq!V
zyZ_0qUw^VRg=wF*r@_mL=%SKqln)%=v9LEWgb1M1eON+Vt;&OPQ*(wP7$vN|vTWGR
zQkT#1j^9$nUk6&0kXz;hB_51dtUNlZn7Hkl9FH{-3;2ALI}w`GYMbw`*C}fz6TQ{(
z<hfUeLW%IVO$<|U)I6PfHu{~A@vs|Gv0?`aHSC%>Em!!(F=jii$`03iKV)qp@?&u=
zIGrD{uj+k!RqVF}V~5Tlq+h-2+~;dg42|<oxim@D$<IDfvwkpFqGI<o&>O=KxSk9m
zAT+1m9@<BXfR)!j-l15U8cyo!Tu{fsv!xT3B2Qa2B(>;^lXSDP8uEqj251<G6m_g*
zqeb2P={}8I$o}{sC}^#y_Ag3kYRA@Qbob7x*qb*nQ^)z%8{?m4xDWL<tsR{4u=P}}
zEPA>F8Fco1L%!nOfVLk-UPxGD+PFvAcNleF-7URKK2s|zBakn-T($w*L&fS<g*tKT
zk|_Tg)uxqUSPjckBj5(fOVqh(SN7m)_ojQ@p4<f=?F6AOs#xKkSJgsUHkmW2JB6&@
zdl16xA*M;E89Xffc-=j6ZTS70&j0;tf}zuOP5m6oC<-+l-srPN+D^RU{*h%FGux2?
zkugXw>_}LV?<P%eq<{C`j@LBoyad%Ap0+9-!=0Ymc*ZtF+$h*PWJ7RiF|dA-;j&Bx
zThvVV-cV`U1cS>_OGT)UUo#8!lSDHs%6(}sUiMg<uBKmAec-t&HhP`0;}KH_%Hhou
z^tGo09*F<c3{GDR7XA7Re|xpA$OOawA#7y#qEB{$k?*NvUwlm>&UF1DGJp+FrxH4l
zdxbXKVSl5&ABFsG2bJwGhTITXaDMXTn~4!Uq~el`j0+CdF^3w-yd87Hkl-x#_4`P5
z$XriVR975c2!Wj3+Aq)PU9E^rpRg=7S}vAe>KGo%@*V!dw{K#^E)0p97ttNYOGHMy
z=ig-5iNlRJ=`{a^TmRR%wF9~<ONDos;QpXqW`C^n+T*923#+tEdR?5Yc$c<AgK4Wk
z25GL``s-g)dTQG&(E>FZL++O;^sBK7rCydYP}d6P?30ndPpjEr6wGJJJ>ya&;2#hy
z<u#e>pBc{a2=ltc?AhI^KT>(@R|;f2mP$5{4o<|2)mnhXne+-|{l1RK=baxBG?;Nz
z9O@&NJx<uTnAG2NQZt%i&~}Nh#9%yr<kL~j-oRdhm;dL7RUb#7G+V+8!>GV+nnK8a
zG5@3cZrv7x3X(XN&$a>%FMAZ~99>6rmhhS~5izoE=J)IP(3cfM>qCkbcXoH3q8EF~
z*t&4WN3pN9b%PaHhK5G&@utR`@Ddx-Q^`3(YtZ{Ez1QU}<Cn3ho89=UX*7bFkG;AQ
zf0lFAh~`NMCnK!6fBI)xexM5pTov<?$+NLlwvwU0<Pu@8BV^E2-hr<@FPIWpc3Up8
zOtDU%WO140&4(Q*ue(KXUmDzjCYe;Ahg_gt_q0Ab^pg4LMY+`3&nNhmw^+u*{9-W^
zUM4lSg+X;^lJ?;cE@6moAMp!z%jv`Uhu9&Z!I5zs+>f8l_c-T0P4@cgY9o{fo}kZj
zFB;led64{iiJ!5q!MlMU&6=fZ;NmD!%OzoC%!5IO5k_#|1qq95gCYS`KO`hOrsa*K
z)qYhY(|K>OKt;dwXC`N|qRcs>!Xta%-{WGSv3E`;m8_U9C<Gm%$+-ESloD~TH8r~X
z-4@Z-<J~pk30xXZ7&DD{PHl7TX};%X67u_e4;0YcOu|$K#N!|JRlk0VAVv-ObfJPS
z+q){)__O{^*M`cWS()P6kFFTXm03>Kz<~w9O;R-s2GiG02zGQFkv;a#OvxV?WjmYd
z!#m#`H8glc8_K5ofOE!&U2bP@$tR}lMH>MlEeIycy2(eh4fH(bn7V?O!wbc|ilhnK
zYN@-@e$16RCOHa33LS2v!>HWtJ>*)+s3vg3F>Qr!U{Z`hXysrRT9Q0t7#y&p=#WHx
zoHXt)_Jac++g1VwB!VT|{@#CmOM6ue>eGEnwYpo)<w53z$EN<r!k^6cZF|3b)N_|{
zcKnRnE0STD?GkaCu(9FE$*c|x-)~J#gk!Ydnfhyz8EZosJuHM#VF`Ix_P5ickAI>i
zETvfCm{h?tQe!h~Uo}P1WP=Db=_RVF?O0l}n|FY3XjmaV_El^=w#)KO3ygUtEXqrE
zd}+h<Ha4Xgh$7v8Z|C9C;9=mbD6tqkG!hXy8&J*pXqogsbueKCv~_g(^n+DN>$a5O
z+DOu2nR51)zv!{N{0EZ6r6rOQkJVxO6KFqP-CWmN=>`^pKQ~Z+q|$D=JA1eb&UQ)E
zB-okmuJk6AHK(~Ag}e(Nz)U6=1#AEEZF>()rJ1kCa%q>woY9&3S8=k@him##X&o8R
z-p_~Xh?Wfh_I-VQ`4M?w!mjA>tx#NQRpNgHo1fn|7a5&)AI`P{VyO&K<`GE$$@*Zm
z@Ez?-9sPWxdYXu$bF~dKp9{m&TB*O6Q~6X$$F<qPFA|)8VrqE&1FU0TYnA4KNuN({
zP2@6&UmLRzVRF8|stk2*<{(m~R~EYk9=)h))$uSgV#ePEZAG)@0tU$EpIH-CBU!`s
z{1J@Ybn7bby<}91PLg0}f)e?k-T3biUK~(Aumhw@dJ;3d!@sHHoM&WT?1BXW{X;zr
z%H99m9_g5<m`By0_*#1bc9HF0cJM%U+Kaq+F0BO}5nZTh>F2$lD_V;Q;oqaeFU=d@
z@?F)3#;^rG$e|&JmEYa_Pd+rHS!Y!T+IdEiDkxyxo%8E>h0h+xP1Qu>Yw(njBD&em
zS{044uv+xw8>%X*xHB!#NhFbicR9tr$enNK?^UDv)YcC(_28UXTvvO`V@M|LncMmc
zp|2+!7XYfQIIZkEvq942tCDcE0G{4~hz=lA`d?9N3?vN|OhjrJWW-}*DT-y0g-eDu
zuLbO6H?0>#u7jbRo{f&4Nt8)7BZlr9HXj_t&;rS%{5LRY=cltPA@0akZ@&m`PL)_C
zjj#+Hu3TGJc1l+s8?Exb4kph!8!0$4GoEq6l2=XaGgqvk4^dRoDjq8$`V!?fJ)WCQ
zS2cb4av7f5rEd&g%#3%5hW8Z$l*P*=LoO5#;*uz`Ch8omSR$92bE7K@Rjmp4Vg_`@
zQDCU_?w6RnEZM=-14!k__jJm&Tj~oIKCaY}C4FlyVynFiD`*!lJ|-4^rYy>0eEnh%
zs;rOMt@QxXe<uNkmdkQH?u}A;xaoN3aO9d2D|w_>87-FV0}cbIbNe25n3Gw-&5yM1
zkqtMlS6v{+R3H3K2);7mR(WlyeI(_J3++G!q2}cMM6-rSBoLj(M?68zT)u?{abPOn
z@O?JQ^OX0M-k|+oV_C}Mk(pg~y9&X^M~lJZ5(J;{)d$cteN6;7IM1-f?n{sr7Aiyx
zNqF&?Fj08`xi-2fG{QktZKdYqq2P&dB&swv{){F!G!zy>6!UaOff6Uj4^2<!u&M3+
zs(UWB-Ftje+jrrIHfiTM<l3*sobIW;ufpOu?l$+!Eo23`mqdz*Tg!84blKFW`SbB}
zU5c8n7{Ieh@exmGQ{WrB5Cb{KpYz_T`wiYs!7c8-PIc1L3BD1&5n_@IUG|?0Fcz|e
zdF}pRUE-G$)D=ifKY5zF;1_d@Dd4nMi7||qC~3|$Qp#mQqH=Ljo^lp49E}e(r}J4+
dFH%d$G{&5bH2>yg1Sr4{p=qE|e&@l{{{s-(@(cg~

literal 0
HcmV?d00001

diff --git a/doc/arkode/guide/source/conf.py b/doc/arkode/guide/source/conf.py
index 57a5e00ed3..ef8629d766 100644
--- a/doc/arkode/guide/source/conf.py
+++ b/doc/arkode/guide/source/conf.py
@@ -18,7 +18,8 @@
 # -- General configuration ----------------------------------------------------
 
 # Set variable used to determine which package documentation this is
-# Can be one of 'arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol' or 'super'
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# 'ida', 'idas', 'kinsol' or 'super'
 package_name = 'arkode'
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -286,7 +287,7 @@
 texinfo_documents = [
   ('index', 'ARKODE', u'ARKODE Documentation',
    u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos', 'ARKODE',
-   'Time integration package for multi-rate systems of ordinary differntial equations.',
+   'Time integration package for multiphysics systems of ordinary differential equations.',
    'Miscellaneous'),
 ]
 
diff --git a/doc/cvode/Makefile b/doc/cvode/Makefile
deleted file mode 100644
index 00a00a83c0..0000000000
--- a/doc/cvode/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# -----------------------------------------------------------------
-# Programmer(s): Slaven Peles, Cody Balos @ LLNL
-# -----------------------------------------------------------------
-# SUNDIALS Copyright Start
-# Copyright (c) 2002-2023, Lawrence Livermore National Security
-# and Southern Methodist University.
-# All rights reserved.
-#
-# See the top-level LICENSE and NOTICE files for details.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-# SUNDIALS Copyright End
-# -----------------------------------------------------------------
-# Makefile for CVODE examples documentation
-# -----------------------------------------------------------------
-
-EXAMPLES   = cv_examples
-
-EX_FILES = \
-${EXAMPLES}.tex \
-cv_ex_intro.tex \
-cv_ex_serial.tex \
-cv_ex_parallel.tex \
-cv_ex_parhyp.tex \
-cv_ex_tests.tex
-
-# Remove F77 example text
-# cv_ex_fortran.tex \
-
-include ../Makefile.in
diff --git a/doc/cvode/cv_ex_codes.tex b/doc/cvode/cv_ex_codes.tex
deleted file mode 100644
index 7b3af9d9ae..0000000000
--- a/doc/cvode/cv_ex_codes.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-%% Serial examples
-
-\lstset{language=C}
-
-\newpage
-\section{Listing of cvRoberts\_dns.c}\label{s:cvRoberts_c}
-\includeCode{../../examples/cvode/serial/cvRoberts_dns.c}
-
-\newpage
-\section{Listing of cvAdvDiff\_bnd.c}\label{s:cvAdvDiff_c}
-\includeCode{../../examples/cvode/serial/cvAdvDiff_bnd.c}
-
-\newpage
-\section{Listing of cvDiurnal\_kry.c}\label{s:cvDiurnal_c}
-\includeCode{../../examples/cvode/serial/cvDiurnal_kry.c}
-
-%% Parallel examples
-
-\newpage
-\section{Listing of cvAdvDiff\_non\_p.c}\label{s:cvAdvDiff_p_c}
-\includeCode{../../examples/cvode/parallel/cvAdvDiff_non_p.c}
-
-\newpage
-\section{Listing of cvDiurnal\_kry\_p.c}\label{s:cvDiurnal_p_c}
-\includeCode{../../examples/cvode/parallel/cvDiurnal_kry_p.c}
-
-\newpage
-\section{Listing of cvDiurnal\_kry\_bbd\_p.c}\label{s:cvDiurnal_bbd_p_c}
-\includeCode{../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.c}
-
-%% Fortran examples
-
-%% \lstset{language=[77]Fortran}
-
-%% \newpage
-%% \section{Listing of fcvDiurnal\_kry.f}\label{s:fcvDiurnal_f}
-%% \includeCode{../../examples/cvode/fcmix_serial/fcvDiurnal_kry.f}
-
-%% \newpage
-%% \section{Listing of fcvDiag\_kry\_bbd\_p.f}\label{s:fcvDiag_bbd_p_f}
-%% \includeCode{../../examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.f}
diff --git a/doc/cvode/cv_ex_cuda.tex b/doc/cvode/cv_ex_cuda.tex
deleted file mode 100644
index 26578e73d2..0000000000
--- a/doc/cvode/cv_ex_cuda.tex
+++ /dev/null
@@ -1,42 +0,0 @@
-%===============================================================================
-\section{CUDA example problems}\label{s:ex_cuda}
-%===============================================================================
-
-
-%-------------------------------------------------------------------------------
-
-\subsection{An unpreconditioned Krylov example: cvAdvDiff\_kry\_cuda}\label{ss:cvAdvDiff_cuda}
-
-The example program \id{cvAdvDiff\_kry\_cuda.cu} solves the same 2-D 
-advection-diffusion equation as in Section \ref{ss:cvAdvDiff}, but
-instead of using a banded direct solver, it uses unpreconditioned 
-Krylov solver. Here we only highlight differences between the two 
-examples. 
-
-The \id{cvAdvDiff\_kry\_cuda.cu} program includes files
-\id{sunlinsol\_spmgr.h} in order to use the {\spgmr}
-Krylov linear solver. File \id{cvode.h} provides the prototypes for 
-\id{CVodeSetLinearSolver}, which sets the iterative linear solver for
-{\cvode}, and \id{CVodeSetJacTimes}, which sets the pointer to the user
-supplied Jacobian-vector product function.
-The file \id{nvector\_cuda.h} is included for the definition of the {\cuda}
-\id{N\_Vector} type. The prototype vector is created
-using \id{N\_VNew\_Cuda} function. 
-
-In order to get a good performance and avoid moving data between host
-and device at every iteration, it is recommended that user evaluates  
-model at the device. In the example, model right hand side and Jacobian-vector
-product are implemented as {\cuda} kernels \id{fKernel} and \id{jtvKernel},
-respectively. User provided {\CC} functions \id{f} and \id{jtv}, which are called
-directly by {\cvode}, set thread partitioning and launch thier respective 
-{\cuda} kernels. Vector data on the device is accessed using 
-\id{N\_VGetDeviceArrayPointer\_Cuda} function.
-
-The output generated by \id{cvAdvDiff\_kry\_cuda} is shown below.
-
-%%
-\includeOutput{cvAdvDiff\_kry\_cuda}{../../examples/cvode/cuda/cvAdvDiff_kry_cuda.out}
-%%
-
-%-------------------------------------------------------------------------------
-
diff --git a/doc/cvode/cv_ex_fortran.tex b/doc/cvode/cv_ex_fortran.tex
deleted file mode 100644
index 6507d30d76..0000000000
--- a/doc/cvode/cv_ex_fortran.tex
+++ /dev/null
@@ -1,92 +0,0 @@
-%===================================================================================
-\section{Fortran example problems}\label{s:ex_fortran}
-%===================================================================================
-
-The {\F} example problem programs supplied with the {\cvode}
-package are all written in standard {\F}77 and use double precision
-arithmetic.  Before running any of these examples, the user should
-make sure that the {\F} data types for real and integer variables
-appropriately match the {\CC} types.  See \S\ref{ss:fcdata} in the
-{\cvode} User Document for details.
-
-\subsection{A serial example: fcvDiurnal\_kry}\label{ss:fcvDiurnal} 
-The \id{fcvDiurnal\_kry} example is a {\F} equivalent of the \id{cvDiurnal\_kry} problem.
-(In fact, it was derived from an earlier {\F} example program for VODPK.)
-
-The main program begins with a call to \id{INITKX}, which sets problem
-parameters, loads these into arrays \id{IPAR} and \id{RPAR} for use by other
-routines, and loads \id{Y} (here called \id{U0}) with its initial values.
-\id{Main} calls \id{FNVINITS}, \id{FSUNSPGMRINIT}, \id{FSUNSPGMRSETGSTYPE}, 
-\id{FCVMALLOC}, \id{FCVLSINIT}, and \id{FCVLSSETPREC},
-to initialize the {\nvecs} module, the {\sunlinsolspgmr} module, the
-main solver memory, and the {\cvls} interface, 
-and to specify user-supplied preconditioner setup and solve routines.
-It calls \id{FCVODE} in a loop over \id{TOUT} values, with printing of
-selected solution values and performance data (from the \id{IOUT}  and \id{ROUT}
-arrays).  At the end, it prints a number of performance counters, and
-frees memory with calls to \id{FCVFREE}.
-
-In \id{fcvDiurnal\_kry.f}, the \id{FCVFUN} routine is a straghtforward implementation
-of the discretized form of Eqns. (\ref{cvDiurnalpde}).  In \id{FCVPSET}, the
-block-diagonal part of the Jacobian, $J_{bd}$, is computed (and copied to
-\id{P}) if \id{JOK} = 0, but is simply copied from \id{BD} to \id{P} if
-\id{JOK} = 1.  In both cases, the preconditioner matrix $P$ is formed from 
-$J_{bd}$ and its $2 \times 2$ blocks are LU-factored.  In \id{FCVPSOL},
-the solution of a linear system $Px = z$ is solved by doing backsolve
-operations on the blocks.  Subordinate routines are used to isolate
-these evaluation, factorization, and backsolve operations.
-The remainder of \id{fcvDiurnal\_kry.f} consists of
-routines from LINPACK and the BLAS needed for matrix and vector operations.
-
-The following is sample output from \id{fcvDiurnal\_kry}, using a $10 \times 10$ mesh.
-The performance of {\fcvode} here is quite similar to that of {\cvode} on
-the \id{cvDiurnal\_kry} problem, as expected.
-
-%%
-\includeOutput{fcvDiurnal\_kry}{../../examples/cvode/fcmix_serial/fcvDiurnal_kry.out}
-%%
-
-%-----------------------------------------------------------------------------------
-
-\subsection{A parallel example: fcvDiag\_kry\_bbd\_p}\label{ss:fcvDiag_bbd_p}
-
-This example, \id{fcvDiag\_kry\_bbd\_p}, uses a simple diagonal ODE system to illustrate
-the use of {\fcvode} in a parallel setting.  The system is
-\begin{equation} \label{diagode}
-\dot{y}_i = - \alpha ~i~ y_i ~~~ (i = 1,\ldots, N)
-\end{equation}
-on the time interval $0 \leq t \leq 1$.  In this case, we use $\alpha = 10$
-and $N = 10*$\id{NPES}, where \id{NPES} is the number of processors
-and is specified at run time.  The linear solver to be used is
-{\spgmr} with the {\cvbbdpre} (band-block-diagonal) preconditioner.
-Since the system Jacobian is diagonal, the half-bandwidths specified
-are all zero.  The problem is solved twice --- with preconditioning on
-the left, then on the right.
-
-The source file for this problem begins with MPI calls to initialize
-MPI and to get the number of processors and local processor index.
-\id{FNVINITP} is called to initialize the MPI-parallel {\nvector}
-module, while \id{FSUNSPGMRINIT} and \id{FSUNSPGMRSETGSTYPE} are
-called to initialize the {\spgmr} {\sunlinsol} module.
-Following the call to \id{FCVMALLOC}, the linear solver and
-preconditioner are attached to {\cvode} with calls to
-\id{FCVLSINIT} and \id{FCVBBDINIT}.  In a loop over \id{TOUT} 
-values, it calls \id{FCVODE} and prints the step and $f$ evaluation counters.
-After that, it computes and prints the maximum global error, and all the
-relevant performance counters.  Those specific to {\cvbbdpre} are obtained
-by a call to \id{FCVBBDOPT}.  To prepare for the second run, the program
-calls \id{FCVREINIT}, \id{FCVBBDREINIT}, and \id{FSUNSPGMRSETPRECTYPE}, 
-in addition to resetting the initial conditions.  Finally, it frees
-memory and terminates MPI. Notice that in the \id{FCVFUN} routine, the
-local processor index \id{MYPE} and the local vector size \id{NLOCAL}
-are used to form the global index values needed to evaluate the
-right-hand side of Eq. (\ref{diagode}). 
-
-The following is a sample output from \id{fcvDiag\_kry\_bbd\_p}, with \id{NPES} = 4.
-As expected, the performance is identical for left vs right preconditioning.
-
-%%
-\includeOutput{fcvDiag\_kry\_bbd\_p}{../../examples/cvode/fcmix_parallel/fcvDiag_kry_bbd_p.out}
-%%
-
-%-----------------------------------------------------------------------------------
diff --git a/doc/cvode/cv_ex_intro.tex b/doc/cvode/cv_ex_intro.tex
deleted file mode 100644
index e761486efd..0000000000
--- a/doc/cvode/cv_ex_intro.tex
+++ /dev/null
@@ -1,211 +0,0 @@
-%===============================================================================
-\section{Introduction}\label{s:ex_intro}
-%===============================================================================
-
-This report is intended to serve as a companion document to the User
-Documentation of {\cvode} \cite{cvode_ug}.  It provides details, with
-listings, on the example programs supplied with the {\cvode} distribution
-package.
-
-The {\cvode} distribution contains examples of the following types: serial
-{\CC} examples, parallel {\CC} examples, an OpenMP example, and a {\hypre}
-example.
-%%
-With the exception of ''demo''-type example files, the names of all the examples
-distributed with {\sundials} are of the form \verb![slv][PbName]_[ls]_[prec]_[p]!,
-where
-\begin{description}
-\item [{[slv]}] identifies the solver (for {\cvode} examples this is \id{cv},
-  while for {\fcvode} examples, this is \id{fcv});
-\item [{[PbName]}] identifies the problem;
-\item [{[ls]}] identifies the linear solver module used (for examples using
-  fixed-point iteration for the nonlinear system solver, \id{non} specifies
-  that no linear solver was used);
-\item [{[prec]}] indicates the {\cvode} preconditioner module used, \id{bp} for {\cvbandpre}
-  or \id{bbd} for {\cvbbdpre}
-  (only if applicable, for examples using a Krylov linear solver);
-\item [{[p]}] indicates an example using the parallel vector module {\nvecp}.
-\end{description}
-
-\vspace{0.2in}\noindent
-The following lists summarize all examples distributed with {\cvode}.
-
-\vspace{0.2in}\noindent
-Supplied in the {\em srcdir}\id{/examples/cvode/serial} directory are the
-following serial examples (using the {\nvecs} module):
-
-\begin{itemize}
-\item \id{cvRoberts\_dns}
-  solves a chemical kinetics problem consisting of three rate equations.
-  \newline
-  This program solves the problem with the BDF method and Newton
-  iteration, with the {\sunlinsoldense} linear solver, {\cvls}
-  interface, and a user-supplied Jacobian routine.  It also uses the
-  rootfinding feature of {\cvode}.
-\item \id{cvRoberts\_dns\_constraints}
-  is the same as \id{cvRoberts\_dns} but imposes the constraint
-  $u \geq 0.0$ for all components.
-\item \id{cvRoberts\_dnsL}
-  is the same as \id{cvRoberts\_dns} but uses the LAPACK
-  implementation of {\sunlinsollapdense}.
-\item \id{cvRoberts\_dns\_uw}
-  is the same as \id{cvRoberts\_dns} but demonstrates the user-supplied error
-  weight function feature of {\cvode}.
-\item \id{cvRoberts\_klu}
-  is the same as \id{cvRoberts\_dns} but uses the {\klu} sparse direct
-  linear solver, {\sunlinsolklu}.
-\item \id{cvRoberts\_sps}
-  is the same as \id{cvRoberts\_dns} but uses the {\superlumt} sparse
-  direct linear solver, {\sunlinsolslumt} (with one thread).
-\item \id{cvAdvDiff\_bnd}
-  solves the semi-discrete form of an advection-diffusion equation in 2-D.
-  \newline
-  This program solves the problem with the BDF method and Newton
-  iteration, with the {\sunlinsolband} linear solver, {\cvls}
-  interface, and a user-supplied Jacobian routine.
-\item \id{cvAdvDiff\_bndL}
-  is the same as \id{cvAdvDiff\_bnd} but uses the LAPACK
-  implementation of {\sunlinsollapband}.
-\item \id{cvDiurnal\_kry}
-  solves the semi-discrete form of a two-species diurnal kinetics
-  advection-diffusion PDE system in 2-D.
-  \newline
-  The problem is solved with the BDF/GMRES method (i.e.
-  using the {\sunlinsolspgmr} linear solver and {\cvls} interface)
-  and the block-diagonal part of the Newton matrix as a left
-  preconditioner. A copy of the block-diagonal part of the Jacobian is
-  saved and conditionally reused within the preconditioner setup routine.
-\item \id{cvDiurnal\_kry\_bp}
-  solves the same problem as \id{cvDiurnal\_kry}, with the BDF/GMRES method
-  and a banded preconditioner, generated by difference quotients,
-  using the module {\cvbandpre}.
-  \newline
-  The problem is solved twice: with preconditioning on the left,
-  then on the right.
-\item \id{cvDirectDemo\_ls}
-  is a demonstration program for {\cvode} with direct linear solvers.
-  \newline
-  Two separate problems are solved using both the Adams and BDF linear
-  multistep methods in combination with fixed-point and Newton
-  iterations.
-  \newline
-  The first problem is the Van der Pol oscillator for which
-  the Newton iteration cases use the following types of Jacobian approximations:
-  (1) dense, user-supplied, (2) dense, difference-quotient approximation,
-  (3) diagonal, with difference-quotient approximation. The second
-  problem is a linear ODE with a
-  banded lower triangular matrix derived from a 2-D advection PDE. In this
-  case, the Newton iteration cases use the following types of Jacobian
-  approximation: (1) banded, user-supplied, (2) banded, difference-quotient
-  approximation, (3) diagonal, difference-quotient approximation.
-\item \id{cvKrylovDemo\_ls}
-  solves the same problem as \id{cvDiurnal\_kry}, with the BDF method, but with
-  three Krylov linear solvers: {\sunlinsolspgmr}, {\sunlinsolspbcgs},
-  and {\sunlinsolsptfqmr}.
-\item \id{cvKrylovDemo\_prec}
-  is a demonstration program with the GMRES linear solver.
-  \newline
-  This program solves a stiff ODE system that arises from a system
-  of partial differential equations.  The PDE system is a six-species
-  food web population model, with predator-prey interaction and diffusion
-  on the unit square in two dimensions.
-  \newline
-  The ODE system is solved using Newton iteration, the
-  {\sunlinsolspgmr} linear solver (scaled preconditioned GMRES), and
-  {\cvls} interface.
-  \newline
-  The preconditioner matrix used is the product of two matrices:
-  (1) a matrix, only defined implicitly, based on a fixed number of
-  Gauss-Seidel iterations using the diffusion terms only; and
-  (2) a block-diagonal matrix based on the partial derivatives of the
-  interaction terms only, using block-grouping.
-  \newline
-  Four different runs are made for this problem.
-  The product preconditoner is applied on the left and on the right.
-  In each case, both the modified and classical Gram-Schmidt options
-  are tested.
-\item \id{cvHeat2D\_klu} solves a discretized 2D heat equation using
-  the {\klu} sparse-direct linear solver, {\sunlinsolklu}.
-\end{itemize}
-
-\vspace{0.2in}\noindent Supplied in the
-{\em srcdir}\id{/examples/cvode/parallel} directory are the following
-four parallel examples (using the {\nvecp} module):
-\begin{itemize}
-\item \id{cvAdvDiff\_non\_p} solves the semi-discrete form of a 1-D
-  advection-diffusion equation.
-  \newline
-  This program solves the problem with the option for nonstiff
-  systems, i.e. Adams method and fixed-point iteration.
-\item \id{cvAdvDiff\_diag\_p}
-  solves the same problem as \id{cvAdvDiff\_non\_p}, with the Adams method,
-  but with Newton iteration and the \id{CVDiag} linear solver.
-\item \id{cvDiurnal\_kry\_p}
-  is a parallel implementation of \id{cvDiurnal\_kry}.
-\item \id{cvDiurnal\_kry\_bbd\_p}
-  solves the same problem as \id{cvDiurnal\_kry\_p}, with BDF and the GMRES linear
-  solver, using a block-diagonal matrix with banded blocks as a preconditioner,
-  generated by difference quotients, using the module {\cvbbdpre}.
-\end{itemize}
-
-\vspace{0.2in}\noindent Supplied in the
-{\em srcdir}\id{/examples/cvode/C\_openmp} directory is
-\id{cvAdvDiff\_bnd\_omp}, an example which solves the same problem as
-\id{cvAdvDiff\_bnd} but with the OpenMP {\nvector} module.
-
-\vspace{0.2in}\noindent Supplied in the
-{\em srcdir}\id{/examples/cvode/parhyp} directory is an example
-\id{cvAdvDiff\_non\_ph}, which solves the same problem as
-\id{cvAdvDiff\_non\_p} but with {\hypre} vectors instead of
-{\sundials} parallel vectors.
-
-%% \vspace{0.2in}\noindent
-%% As part of the {\fcvode} module, in the directories
-%% {\em srcdir}\id{/examples/cvode/fcmix\_serial} and
-%% {\em srcdir}\id{/examples/cvode/fcmix\_parallel}, are the following examples for
-%% the {\F}-{\CC} interface.  The first five of these are serial, while
-%% the last three are parallel.
-%% \begin{itemize}
-%% \item \id{fcvRoberts\_dns} is a serial chemical kinetics example (\id{BDF}/{\sunlinsoldense})
-%%   with rootfinding.
-%% \item \id{fcvRoberts\_dns\_constraints} is the same as \id{fcvRoberts\_dns} but
-%%   but imposes the constraint $u \geq 0.0$ for all components.
-%% \item \id{fcvRoberts\_dnsL} is the same as \id{fcvRoberts\_dns} but uses the Lapack
-%%   implementation of {\sunlinsollapdense}.
-%% \item \id{fcvAdvDiff\_bnd} is a serial advection-diffusion example (\id{BDF}/{\sunlinsolband}).
-%% \item \id{fcvDiurnal\_kry} is a serial kinetics-transport example (\id{BDF}/{\sunlinsolspgmr}).
-%% \item \id{fcvDiurnal\_kry\_bp} is the \id{fcvDiurnal\_kry} example with {\fcvbp}.
-%% \item \id{fcvDiag\_non\_p} is a nonstiff parallel diagonal ODE example
-%%   (\id{ADAMS}/\id{FIXEDPOINT}).
-%% \item \id{fcvDiag\_kry\_p} is a stiff parallel diagonal ODE example (\id{BDF}/{\sunlinsolspgmr}).
-%% \item \id{fcvDiag\_kry\_bbd\_p} is the same as the \id{fcvDiag\_kry\_p} example
-%%        but using the {\fcvbbd} module.
-%% \end{itemize}
-
-\vspace{0.2in}\noindent
-In the following sections, we give detailed descriptions of some (but
-not all) of these examples.  We also give our output files for
-each of these examples, but users should be cautioned that their
-results may differ slightly from these.  Differences in solution
-values may differ within the tolerances, and differences in cumulative
-counters, such as numbers of steps or Newton iterations, may differ
-from one machine environment to another by as much as 10\% to 20\%.
-
-The final section of this report describes a set of tests done with the
-parallel version of CVODE, using a problem based on the
-\id{cvDiurnal\_kry}/\id{cvDiurnal\_kry\_p} example.
-
-In the descriptions below, we make frequent references to the {\cvode}
-User Document \cite{cvode_ug}.  All citations to specific sections
-(e.g. \S\ref{s:types}) are references to parts of that User Document, unless
-explicitly stated otherwise.
-
-\vspace{0.2in}\noindent {\bf Note}.
-The examples in the {\cvode} distribution are written in such a way as
-to compile and run for any combination of configuration options during
-the installation of {\sundials} (see Appendix \ref{c:install} in the User Guide).
-As a consequence, they contain portions of code that will not be typically present in a
-user program. For example, all {\CC} example programs make use of the
-variables \id{SUNDIALS\_EXTENDED\_PRECISION} and \id{SUNDIALS\_DOUBLE\_PRECISION}
-to test if the solver libraries were built in extended or double precision,
-and use the appropriate conversion specifiers in \id{printf} functions.
diff --git a/doc/cvode/cv_ex_parallel.tex b/doc/cvode/cv_ex_parallel.tex
deleted file mode 100644
index 146df50eba..0000000000
--- a/doc/cvode/cv_ex_parallel.tex
+++ /dev/null
@@ -1,218 +0,0 @@
-%===============================================================================
-\section{Parallel example problems}\label{s:ex_parallel}
-%===============================================================================
-
-\subsection{A nonstiff example: cvAdvDiff\_non\_p}\label{ss:cvAdvDiff_p}
-
-This problem begins with a simple diffusion-advection equation
-for $u=u(t,x)$
-\begin{equation}
-\frac{\partial u}{\partial t}=\frac{\partial ^{2}u}{\partial x^{2}}
-   + 0.5\frac{\partial u}{\partial x}  \label{PDE1}
-\end{equation}
-for $0 \leq t \leq 5, ~~ 0\leq x \leq 2$, and subject to homogeneous
-Dirichlet boundary conditions and initial values given by
-\begin{eqnarray}
-u(t,0) &=& 0 ~,~~~~u(t,2) = 0 ~, \label{BCIC1} \\
-u(0,x) &=& x(2-x)e^{2x} ~. \nonumber
-\end{eqnarray}
-A system of \id{MX} ODEs is obtained by discretizing the $x$-axis with \id{MX}+2
-grid points and replacing the first and second order spatial derivatives
-with their central difference approximations. Since the value of $u$ is
-constant at the two endpoints, the semi-discrete equations for those points
-can be eliminated.  With $u_{i}$ as the approximation to $u(t,x_{i})$,
-$x_{i} = i(\Delta x)$, and $\Delta x = 2/($\id{MX}$+1)$, the resulting system of
-ODEs, $\dot{u} = f(t,u)$, can now be written:
-\begin{equation}
-\dot{u}_i=\frac{u_{i+1}-2u_{i}+u_{i-1}}{(\Delta x)^{2}}
-  + 0.5 \frac{u_{i+1}-u_{i-1}}{2(\Delta x)} ~. \label{cvAdvDiff_pode}
-\end{equation}
-This equation holds for $i=1,2,\ldots ,$ \id{MX}, with the understanding
-that $u_{0} = u_{\id{MX}+1}=0.$
-
-In the parallel processing environment, we may think of the several
-processors as being laid out on a straight line with each processor to
-compute its contiguous subset of the solution vector.  Consequently
-the computation of the right hand side of Eq. (\ref{cvAdvDiff_pode}) requires
-that each interior processor must pass the first component of its block of
-the solution vector to its left-hand neighbor, acquire the last component of
-that neighbor's block, pass the last component of its block of the solution
-vector to its right-hand neighbor, and acquire the first component of that
-neighbor's block. If the processor is the first ($0$th) or last processor,
-then communication to the left or right (respectively) is not required.
-
-This problem uses the Adams (non-stiff) integration formula and fixed-point
-nonlinear solver.  It is unrealistically simple, but serves to illustrate
-use of the parallel version of CVODE.
-
-The \id{cvAdvDiff\_non\_p.c} file begins with \id{\#include} declarations for
-various required header files, including lines for
-\id{nvector\_parallel} to access the parallel \id{N\_Vector} type and related
-macros, and for \id{mpi.h} to access MPI types and constants. Following
-that are definitions of problem constants and a data block for communication
-with the \id{f} routine.  That block includes the number of PEs, the index
-of the local PE, and the MPI communicator.
-
-The \id{main} program begins with MPI calls to initialize MPI and to set
-multi-processor environment parameters \id{npes} (number of PEs) and
-\id{my\_pe} (local PE index).  The local vector length is set according
-to \id{npes} and the problem size \id{NEQ} (which may or may not be
-multiple of \id{npes}).  The value \id{my\_base} is the base value for
-computing global indices (from 1 to \id{NEQ}) for the local vectors.
-The solution vector \id{u} is created with a call to \id{N\_VNew\_Parallel}
-and loaded with a call to \id{SetIC}.  The calls to \id{CVodeCreate},
-\id{CVodeInit}, and \id{CVodeSStolerances} specify a {\cvode} solution with
-the nonstiff method and scalar tolerances.  The call to \id{CVodeSetUserdata}
-insures that the pointer \id{data} is passed to the \id{f} routine whenever it
-is called.
-A heading is printed (if on processor 0).  In a loop over \id{tout} values,
-\id{CVode} is called, and the return value checked for errors.  The
-max-norm of the solution and the total number of time steps so far
-are printed at each output point.  Finally, some statistical counters are
-printed, memory is freed, and MPI is finalized.
-
-The \id{SetIC} routine uses the last two arguments passed to it to compute
-the set of global indices (\id{my\_base}+1 to \id{my\_base+my\_length})
-corresponding to the local part of the solution vector \id{u}, and then to
-load the corresponding initial values.  The \id{PrintFinalStats} routine
-uses \id{CVodeGet***} calls to get various counters, and then prints these.
-The counters are: \id{nst} (number of steps), \id{nfe} (number of
-\id{f} evaluations), \id{nni} (number of nonlinear iterations),
-\id{netf} (number of error test failures), and \id{ncfn} (number of
-nonlinear convergence failures).  This routine is suitable for general use
-with {\cvode} applications to nonstiff problems.
-
-The \id{f} function is an implementation of Eq. (\ref{cvAdvDiff_pode}), but preceded
-by communication operations appropriate for the parallel setting.
-It copies the local vector \id{u} into a larger array \id{z}, shifted by 1
-to allow for the storage of immediate neighbor components.  The first and last
-components of \id{u} are sent to neighboring processors with \id{MPI\_Send} calls,
-and the immediate neighbor solution values are received from the neighbor
-processors with \id{MPI\_Recv} calls, except that zero is loaded into \id{z[0]}
-or \id{z[my\_length+1]} instead if at the actual boundary.  Then the central
-difference expressions are easily formed from the \id{z} array, and loaded into
-the data array of the \id{udot} vector.
-
-The \id{cvAdvDiff\_non\_p.c} file includes a routine \id{check\_flag} that checks the
-return values from calls in \id{main}.  This routine was written to be used
-by any parallel {\sundials} application.
-
-The output below is for \id{cvAdvDiff\_non\_p} with \id{MX} = 10 and four processors.
-Varying the number of processors will alter the output, only because
-of roundoff-level differences in various vector operations.  The fairly
-high value of \id{ncfn} indicates that this problem is on the borderline
-of being stiff.
-
-%%
-\includeOutput{cvAdvDiff\_non\_p}{../../examples/cvode/parallel/cvAdvDiff_non_p.out}
-%%
-
-%-------------------------------------------------------------------------------
-
-\subsection{A user preconditioner example: cvDiurnal\_kry\_p}\label{ss:cvDiurnal_p}
-
-As an example of using {\cvode} with the Krylov linear solver
-{\sunlinsolspgmr}, {\cvls} linear solver interface, and
-the parallel MPI {\nvecp} module, we describe a test problem based on
-the system PDEs given above for the \id{cvDiurnal\_kry} example.
-As before, we discretize the PDE system with central differencing, to
-obtain an ODE system $\dot{u} = f(t,u)$ representing (\ref{cvDiurnalpde}).
-But in this case, the discrete solution vector is distributed over
-many processors.  Specifically, we may think of the processors as
-being laid out in a rectangle, and each processor being assigned a
-subgrid of size \id{MXSUB}$\times$\id{MYSUB} of the $x-y$ grid. If
-there are \id{NPEX} processors in the $x$ direction and \id{NPEY}
-processors in the $y$ direction, then the overall grid size is
-\id{MX}$\times$\id{MY} with \id{MX}$=$\id{NPEX}$\times$\id{MXSUB} and
-\id{MY}$=$\id{NPEY}$\times$\id{MYSUB}, and the size of the ODE system is
-$2\cdot$\id{MX}$\cdot$\id{MY}.
-
-To compute $f$ in this setting, the processors pass and receive
-information as follows.  The solution components for the bottom row of
-grid points in the current processor are passed to the processor below
-it and the solution for the top row of grid points is received from
-the processor below the current processor. The solution for the top
-row of grid points for the current processor is sent to the processor
-above the current processor, while the solution for the bottom row of
-grid points is received from that processor by the current
-processor. Similarly the solution for the first column of grid points
-is sent from the current processor to the processor to its left and
-the last column of grid points is received from that processor by the
-current processor. The communication for the solution at the right
-edge of the processor is similar. If this is the last processor in a
-particular direction, then message passing and receiving are bypassed
-for that direction.
-
-This code is intended to provide a more realistic example than that in
-\id{cvAdvDiff\_non\_p}, and to provide a template for a stiff ODE system
-arising from a PDE system. The solution method is BDF with Newton
-iteration and {\spgmr}. The left preconditioner is the block-diagonal
-part of the Newton matrix, with $2 \times 2$ blocks, and the
-corresponding diagonal blocks of the Jacobian are saved each time the
-preconditioner is generated, for re-use later under certain conditions.
-
-The organization of the \id{cvDiurnal\_kry\_p} program deserves some comments. The
-right-hand side routine \id{f} calls two other routines: \id{ucomm}, which
-carries out inter-processor communication; and \id{fcalc}, which operates on
-local data only and contains the actual calculation of $f(t,u)$. The
-\id{ucomm} function in turn calls three routines which do, respectively,
-non-blocking receive operations, blocking send operations, and
-receive-waiting. All three use MPI, and transmit data from the local \id{u}
-vector into a local working array \id{uext}, an extended copy of \id{u}.
-The \id{fcalc} function copies \id{u} into \id{uext}, so that the
-calculation of $f(t,u)$ can be done conveniently by operations on
-\id{uext} only.  Most other features of \id{cvDiurnal\_kry\_p.c} are the same as
-in \id{cvDiurnal\_kry.c}, except for extra logic involved with distributed
-vectors.
-
-The following is a sample output from \id{cvDiurnal\_kry\_p}, for four processors
-(in a $2 \times 2$ array) with a $5 \times 5$ subgrid on each.
-The output will vary slightly if the number of processors is changed.
-
-%%
-\includeOutput{cvDiurnal\_kry\_p}{../../examples/cvode/parallel/cvDiurnal_kry_p.out}
-%%
-
-%-------------------------------------------------------------------------------
-
-\subsection{A CVBBDPRE preconditioner example: cvDiurnal\_kry\_bbd\_p}\label{ss:cvDiurnal_bbd_p}
-
-In this example, \id{cvDiurnal\_kry\_bbd\_p}, we solve the same
-problem as in \id{cvDiurnal\_kry\_p}
-above, but instead of supplying the preconditioner, we use the {\cvbbdpre} module,
-which generates and uses a band-block-diagonal preconditioner.  The
-half-bandwidths of the Jacobian block on each processor are both equal to
-$2\cdot$\id{MXSUB}, and that is the value supplied as \id{mudq} and \id{mldq}
-in the call to \id{CVBBDPrecInit}.  But in order to reduce storage and computation
-costs for preconditioning, we supply the values \id{mukeep} = \id{mlkeep} = 2
-(= \id{NVARS}) as the half-bandwidths of the retained band matrix blocks.
-This means that the Jacobian elements are computed with a difference quotient
-scheme using the true bandwidth of the block, but only a narrow band matrix
-(bandwidth 5) is kept as the preconditioner.
-
-As in \id{cvDiurnal\_kry\_p.c}, the \id{f} routine in \id{cvDiurnal\_kry\_bbd\_p.c} simply calls a
-communication routine, \id{fucomm}, and then a strictly computational routine,
-\id{flocal}.  However, the call to \id{CVBBDPrecInit} specifies the pair of
-routines to be called as \id{ucomm} and \id{flocal}, where \id{ucomm} is NULL.
-This is because each call by the solver to \id{ucomm} is
-preceded by a call to \id{f} with the same \id{(t,u)} arguments, and therefore the
-communication needed for \id{flocal} in the solver's calls to it have already been
-done.
-
-In \id{cvDiurnal\_kry\_bbd\_p.c}, the problem is solved twice --- first with preconditioning
-on the left, and then on the right.  Thus prior to the second solution, calls
-are made to reset the initial values (\id{SetInitialProfiles}), the main solver
-memory (\id{CVodeReInit}), the {\cvbbdpre} memory (\id{CVBBDPrecReInit}),
-as well as the preconditioner type (\id{SUNLinSol\_SPGMRSetPrecType}).
-
-Sample output from \id{cvDiurnal\_kry\_bbd\_p} follows, again using $5 \times 5$ subgrids
-on a $2 \times 2$ processor grid.  The performance of the preconditioner,
-as measured by the number of Krylov iterations per Newton iteration,
-\id{nli/nni}, is very close to that of \id{cvDiurnal\_kry\_p} when preconditioning is on
-the left, but slightly poorer when it is on the right.
-
-%%
-\includeOutput{cvDiurnal\_kry\_bbd\_p}{../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out}
-%%
-
-%-------------------------------------------------------------------------------
diff --git a/doc/cvode/cv_ex_parhyp.tex b/doc/cvode/cv_ex_parhyp.tex
deleted file mode 100644
index 761b302754..0000000000
--- a/doc/cvode/cv_ex_parhyp.tex
+++ /dev/null
@@ -1,60 +0,0 @@
-%===============================================================================
-\section{{\hypre} example problems}\label{s:ex_parhyp}
-%===============================================================================
-
-\subsection{A nonstiff example: cvAdvDiff\_non\_ph}\label{ss:cvAdvDiff_ph}
-
-This example is same as \id{cvAdvDiff\_non\_p}, except that it
-uses the {\hypre} vector type instead of the {\sundials} native
-parallel vector implementation. 
-The outputs from the two examples are identical. In the following, we will point 
-out only the differences between the two. Familiarity with {\hypre} library 
-\cite{hypre_um} is helpful.  
-
-We use the {\hypre} IJ vector interface to allocate the template vector and 
-create parallel partitioning: 
-\begin{verbatim}
-  HYPRE_IJVectorCreate(comm, my_base, my_base + local_N - 1, &Uij);
-  HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
-  HYPRE_IJVectorInitialize(Uij);
-\end{verbatim}
-The initialize call means that vector elements are ready to be set using 
-the IJ interface. We choose an initial condition vector $x_0 = x(t_0)$ as the 
-template vector and we set its values in the \verb|SetIC(...)| function. We 
-complete the {\hypre} vector assembly by:
-\begin{verbatim}
-  HYPRE_IJVectorAssemble(Uij);
-  HYPRE_IJVectorGetObject(Uij, (void**) &Upar);
-\end{verbatim}
-The assemble call is collective and it makes {\hypre} vector ready to use. 
-This sets the handle \verb|Upar| to the actual {\hypre} vector. 
-The handle is then passed to the \verb|N_VMake| function, which creates 
-the template \verb|N_Vector| as a wrapper around the {\hypre} vector. 
-All other vectors in the computation are created by cloning the template 
-vector. The template vector does not own the underlying {\hypre} vector, 
-and it is the user's responsibility to destroy it using a
-\verb|HYPRE_IJVectorDestroy(Uij)| call after the template vector has been 
-destroyed. This function will destroy both the {\hypre} vector and its IJ 
-interface.
-
-To access individual elements of solution vectors \verb|u| and \verb|udot| 
-in the residual function, the user needs to extract the {\hypre} vector first 
-by calling \verb|N_VGetVector_ParHyp|, and then use {\hypre} methods from 
-that point on. 
-
-\paragraph{\bf Notes} 
-           
-\begin{itemize}
-                                        
-\item
-  {\warn}At this point interfaces to {\hypre} solvers and preconditioners are 
-  not available. They will be provided in subsequent {\sundials} releases. 
-  The interface to {\hypre} vector is included in this release mainly for 
-  testing purposes and as a preview of functionality to come.
-
-\end{itemize}
-
-
-
-%-------------------------------------------------------------------------------
-
diff --git a/doc/cvode/cv_ex_raja.tex b/doc/cvode/cv_ex_raja.tex
deleted file mode 100644
index f8131b0a39..0000000000
--- a/doc/cvode/cv_ex_raja.tex
+++ /dev/null
@@ -1,34 +0,0 @@
-%===============================================================================
-\section{RAJA example problems}\label{s:ex_raja}
-%===============================================================================
-
-
-%-------------------------------------------------------------------------------
-
-\subsection{An unpreconditioned Krylov example: cvAdvDiff\_kry\_raja}\label{ss:cvAdvDiff_raja}
-
-The example program \id{cvAdvDiff\_kry\_raja.cu} solves the same 2-D 
-advection-diffusion equation as in Sections \ref{ss:cvAdvDiff} and
-\ref{ss:cvAdvDiff_cuda}.
-
-The file \id{nvector\_raja.h} contains the definition of the {\raja}
-\id{N\_Vector} type, and \id{RAJA.hpp} definition of the {\raja}
-\id{forall} loops. The prototype vector in the main body of the program is created
-using \id{N\_VNew\_Raja} function. 
-
-In order to get a good performance and avoid moving data between host
-and device at every iteration, it is recommended that user evaluates  
-model at the device. In the example, user-supplied model right hand side 
-and Jacobian-vector product functions, \id{f} and \id{jtv}, operate on 
-the device data. Vector data on the device is accessed using 
-\id{N\_VGetDeviceArrayPointer\_Raja} function. Looping over vector 
-components is implemented using {\raja} \id{forall} loops.
-
-The output generated by \id{cvAdvDiff\_kry\_raja} is shown below.
-
-%%
-\includeOutput{cvAdvDiff\_kry\_raja}{../../examples/cvode/raja/cvAdvDiff_kry_raja.out}
-%%
-
-%-------------------------------------------------------------------------------
-
diff --git a/doc/cvode/cv_ex_serial.tex b/doc/cvode/cv_ex_serial.tex
deleted file mode 100644
index 35d62d5f79..0000000000
--- a/doc/cvode/cv_ex_serial.tex
+++ /dev/null
@@ -1,508 +0,0 @@
-%===============================================================================
-\section{Serial example problems}\label{s:ex_serial}
-%===============================================================================
-
-\subsection{A dense example: cvRoberts\_dns}\label{ss:cvRoberts}
-
-As an initial illustration of the use of the {\cvode} package for the
-integration of IVP ODEs, we give a sample program called \id{cvRoberts\_dns.c}.
-It uses the {\cvode} linear solver interface {\cvls} with
-dense matrix and linear solver modules ({\sunmatdense} and {\sunlinsoldense})
-and the {\nvecs} module (which provides a serial implementation of {\nvector})
-in the solution of a 3-species chemical kinetics problem.
-
-The problem consists of the following three rate equations:
-\vspace*{-.08in}
-\begin{equation}
-  \begin{split}
-    \dot{y}_1 &= -0.04 \cdot y_1 + 10^4 \cdot y_2 \cdot y_3 \\
-    \dot{y}_2 &=  0.04 \cdot y_1 - 10^4 \cdot y_2 \cdot y_3
-                                  - 3 \cdot 10^7 \cdot y_2^2 \\
-    \dot{y}_3 &=  3 \cdot 10^7 \cdot y_2^2
-  \end{split} 
-\end{equation}
-on the interval $t \in [0, ~4 \cdot 10^{10}]$, with initial conditions
-$y_1(0) = 1.0$, $y_2(0) = y_3(0) = 0.0$.
-While integrating the system, we also use the rootfinding
-feature to find the points at which $y_1 = 10^{-4}$ or at which
-$y_3 = 0.01$.
-
-For the source we give a rather detailed explanation of the parts of the program and
-their interaction with {\cvode}.
-
-Following the initial comment block, this program has a number
-of \id{\#include} lines, which allow access to useful items in {\cvode}
-header files.  The \id{sundials\_types.h} file provides the definition of the
-type \id{sunrealtype} (see \ugref{s:types} for details).  
-For now, it suffices to read \id{sunrealtype} as \id{double}.
-The \id{cvode.h} file provides prototypes for the {\cvode}
-functions to be called (excluding the linear solver selection
-function), and also a number of constants that are to be used in
-setting input arguments and testing the return value of \id{CVode}.
-The \id{sunlinsol\_dense.h}
-file is the header file for the dense implementation of the
-{\sunlinsol} module and includes definitions of the
-\id{SUNLinearSolver} type.  Similarly, the \id{sunmatrix\_dense.h}
-file is the header file for the dense implementation of the
-{\sunmatrix} module, including definitions of the \id{SUNMatrix} type
-as well as macros and functions to access matrix components.  
-We have explicitly included \id{sunmatrix\_dense.h}, but this is not
-necessary because it is included by \id{sunlinsol\_dense.h}.
-The \id{nvector\_serial.h} file is the header file for the serial
-implementation of the {\nvector} module and includes definitions of the 
-\id{N\_Vector} type, a macro to access vector components, and prototypes 
-for the serial implementation specific machine environment memory allocation
-and freeing functions.
-
-This program includes two user-defined accessor macros, \id{Ith} and
-\id{IJth}, that are useful in writing the problem functions in a form
-closely matching the mathematical description of the ODE system,
-i.e. with components numbered from 1 instead of from 0.  The \id{Ith}
-macro is used to access components of a vector of type \id{N\_Vector}
-with a serial implementation.  It is defined using the {\nvecs}
-accessor macro \id{NV\_Ith\_S} which numbers components starting with
-0. The \id{IJth} macro is used to access elements of a dense matrix of
-type \id{SUNMatrix}.  It is similarly defined using the {\sunmatdense}
-accessor macro \id{SM\_ELEMENT\_D} which numbers matrix rows and
-columns starting with 
-0. 
-The macro \id{NV\_Ith\_S} is fully described in \ugref{ss:nvec_ser}.
-The macro \id{SM\_ELEMENT\_D} is fully described in \ugref{ss:sunmat_dense}.
-
-Next, the program includes some problem-specific constants, which are
-isolated to this early location to make it easy to change them as needed.  
-The program prologue ends with prototypes of four private helper
-functions and the three user-supplied functions that are called by {\cvode}.
-
-The \id{main} program begins with some dimensions and type declarations,
-including use of the generic types \id{N\_Vector}, \id{SUNMatrix} and
-\id{SUNLinearSolver}.  The next several lines 
-allocate memory for the \id{y} and \id{abstol} vectors using
-\id{N\_VNew\_Serial} with a length argument of \id{NEQ} ($= 3$). The
-lines following that load the initial values of the dependendent
-variable vector into \id{y} and the absolute tolerances into \id{abstol}
-using the \id{Ith} macro.
-
-The calls to \id{N\_VNew\_Serial}, and also later calls to \id{CVode***}
-functions, make use of a private function, \id{check\_flag}, which examines
-the return value and prints a message if there was a failure.  The
-\id{check\_flag} function was written to be used for any serial {\sundials}
-application.
-
-The call to \id{CVodeCreate} creates the {\cvode} solver memory block,
-specifying the \id{CV\_BDF} integration method with \id{CV\_NEWTON} iteration.
-Its return value is a pointer to that memory block for this
-problem.  In the case of failure, the return value is \id{NULL}.  This
-pointer must be passed in the remaining calls to {\cvode} functions.
-
-The call to \id{CVodeInit} allocates and initializes the solver memory block.
-Its arguments include the name of the {\CC} function \id{f} defining the
-right-hand side function $f(t,y)$, and the initial values of $t$ and $y$.
-The call to \id{CVodeSVtolerances} specifies a vector of absolute tolerances,
-and includes the value of the relative tolerance \id{reltol} and the absolute 
-tolerance vector \id{abstol}.  See \ugref{sss:cvodemalloc} and
-\ugref{sss:cvtolerances} for full details of these calls.
-
-The call to \id{CVodeRootInit} specifies that a rootfinding problem
-is to be solved along with the integration of the ODE system, that the
-root functions are specified in the function \id{g}, and that there are
-two such functions.  Specifically, they are set to $y_1 - 0.0001$ and 
-$y_3 - 0.01$, respectively.
-See \ugref{ss:cvrootinit} for a detailed description of this call.
-
-The call to \id{SUNDenseMatrix} (see \ugref{ss:sunmat_dense}) creates
-a \id{NEQ}$\times$\id{NEQ} dense {\sunmatrix} object to use within the
-Newton solve in {\cvode}.  The following call to
-\id{SUNLinSol\_Dense} (see \ugref{ss:sunlinsol_dense}) creates the 
-dense {\sunlinsol} object that will perform the linear solves within
-the Newton method.  These are attached to the {\cvls} linear
-solver interface with the  call to \id{CVodeSetLinearSolver} (see
-\ugref{sss:lin_solv_init}), and the subsequent call to
-\id{CVodeSetJacFn} (see \ugref{ss:optional_input}) specifies the
-analytic Jacobian supplied by the user-supplied function \id{Jac}.
-
-The actual solution of the ODE initial value problem is accomplished in
-the loop over values of the output time \id{tout}.  In each pass of the
-loop, the program calls \id{CVode} in the \id{CV\_NORMAL} mode, meaning that
-the integrator is to take steps until it overshoots \id{tout} and then
-interpolate to $t = $\id{tout}, putting the computed value of $y$(\id{tout})
-into \id{y}, with \id{t} = \id{tout}.  The return value in this case is
-\id{CV\_SUCCESS}.  However, if \id{CVode} finds a root before reaching the next
-value of \id{tout}, it returns \id{CV\_ROOT\_RETURN} and stores the root
-location in \id{t} and the solution there in \id{y}.  In either case, the
-program prints \id{t} and \id{y}.  In the case of a root, it calls
-\id{CVodeGetRootInfo} to get a length-2 array \id{rootsfound} of bits showing
-which root function was found to have a root.  If \id{CVode} returned any
-negative value (indicating a failure), the program breaks out of the loop.  
-In the case of a \id{CV\_SUCCESS} return, the value of \id{tout} is
-advanced (multiplied by 10) and a counter (\id{iout}) is advanced, so
-that the loop can be ended when that counter reaches the preset number
-of output times, \id{NOUT} = 12.  See \ugref{sss:cvode} for full
-details of the call to \id{CVode}.
-
-Finally, the main program calls \id{PrintFinalStats} to get and print
-all of the relevant statistical quantities.  It then calls \id{NV\_Destroy}
-to free the vectors \id{y} and \id{abstol}, \id{CVodeFree} to free the 
-{\cvode} memory block, \id{SUNLinSolFree} to free the linear solver
-memory, and \id{SUNMatDestroy} to free the matrix \id{A}.
-
-The function \id{PrintFinalStats} used here is actually suitable for
-general use in applications of {\cvode} to any problem with a direct
-linear solver.  It calls various \id{CVodeGet***} 
-functions to obtain the relevant counters, and then prints them.
-Specifically, these are: the cumulative number of steps (\id{nst}), 
-the number of \id{f} evaluations (\id{nfe}) (excluding those for
-difference-quotient Jacobian evaluations),
-the number of matrix factorizations (\id{nsetups}),
-the number of \id{f} evaluations for Jacobian evaluations (\id{nfeLS}
-= 0 here),
-the number of Jacobian evaluations (\id{nje}),
-the number of nonlinear (Newton) iterations (\id{nni}),
-the number of nonlinear convergence failures (\id{ncfn}),
-the number of local error test failures (\id{netf}), and
-the number of \id{g} (root function) evaluations (\id{nge}).
-These optional outputs are described in \ugref{ss:optional_output}.
-
-The function \id{f} is a straightforward expression of the ODEs. 
-It uses the user-defined macro \id{Ith} to extract the components of \id{y}
-and to load the components of \id{ydot}.
-See \ugref{ss:rhsFn} for a detailed specification of \id{f}.
-
-Similarly, the function \id{g} defines the two functions, $g_0$ and $g_1$,
-whose roots are to be found.  See \ugref{ss:rootFn} for a detailed description
-of the \id{g} function.
-
-The function \id{Jac} sets the nonzero elements of the Jacobian as a
-dense matrix.  (Zero elements need not be set because \id{J} is preset
-to zero.)  It uses the user-defined macro \id{IJth} to reference the
-elements of a dense matrix of type {\sunmatrix}.  Here the problem
-size is small, so we need not worry about the inefficiency of using
-\id{NV\_Ith\_S} and \id{SM\_ELEMENT\_D} to access \id{N\_Vector} and
-{\sunmatdense} elements.  Note that in this example, \id{Jac}
-only accesses the \id{y} and \id{J} arguments.  See \ugref{ss:jacFn}
-for a detailed description of the \id{Jac} function.
-
-The output generated by \id{cvRoberts\_dns} is shown below.  It shows the output
-values at the 12 preset values of \id{tout}.  It also shows the two root
-locations found, first at a root of $g_1$, and then at a root of $g_0$.
-
-%%
-\includeOutput{cvRoberts\_dns}{../../examples/cvode/serial/cvRoberts_dns.out}
-%%
-
-%-------------------------------------------------------------------------------
-
-\subsection{A banded example: cvAdvDiff\_bnd}\label{ss:cvAdvDiff}
-
-The example program \id{cvAdvDiff\_bnd.c} solves the semi-discretized form of
-the 2-D advection-diffusion equation
-\vspace*{-.1in}
-\begin{equation}
-\label{eq:adeqn}
-\partial v / \partial t = \partial^2 v / \partial x^2
-  + .5 \partial v / \partial x + \partial^2 v / \partial y^2
-\end{equation}
-on a rectangle, with zero Dirichlet boundary conditions. The PDE is 
-discretized with standard central finite differences on a 
-(\id{MX}+2) $\times$ (\id{MY}+2) mesh, giving an ODE system of size
-\id{MX*MY}.  The discrete value $v_{ij}$ approximates $v$ at $x = i \Delta x$,
-$y = j \Delta y$. The ODEs are
-\begin{equation}
-\label{eq:cdiff}
-\frac{dv_{ij}}{dt} = f_{ij} =
-         \frac{v_{i-1,j} - 2 v_{ij} + v_{i+1,j}}{(\Delta x)^2}
-       + .5  \frac{v_{i+1,j} - v_{i-1,j}}{2 \Delta x}
-       + \frac{v_{i,j-1} - 2 v_{ij} + v_{i,j+1}}{(\Delta y)^2} \, ,
-\end{equation}
-where $1 \leq i \leq $\id{MX} and $1 \leq j \leq $\id{MY}.  The boundary
-conditions are imposed by taking $v_{ij} = 0$ above if $i = 0$
-or \id{MX}$ + 1$, or if $j = 0$ or \id{MY}$ + 1$. 
-If we set $u_{(j-1)+(i-1)*\id{MY}} = v_{ij}$, so that the ODE system is
-$\dot{u} = f(u)$, then the system Jacobian $J = \partial f / \partial u$ is
-a band matrix with upper and lower half-bandwidths both equal to \id{MY}.
-In the example, we take \id{MX} $= 10$ and \id{MY} $= 5$.
-
-The \id{cvAdvDiff\_bnd.c} program includes files
-\id{sunmatrix\_band.h} and \id{sunlinsol\_band.h} in order to use the
-{\sunlinsolband} linear solver. The \id{sunmatrix\_band.h} file
-contains the definition of the banded {\sunmatrix} type, and the
-\id{SM\_COLUMN\_B} and \id{SM\_COLUMN\_ELEMENT\_B} macros for
-accessing banded matrix elements (see \ugref{ss:sunmat_band}).  The
-\id{sunlinsol\_band.h} file contains the definition of the banded
-{\sunlinsol} type.  We note that have explicitly included
-\id{sunmatrix\_band.h}, but this is not necessary because it is
-included by \id{sunlinsol\_band.h}.  The file \id{nvector\_serial.h}
-is included for the definition of the serial \id{N\_Vector} type. 
-
-The include lines at the top of the file are followed by definitions of
-problem constants which include the $x$ and $y$ mesh dimensions, \id{MX} and
-\id{MY}, the number of equations \id{NEQ}, the scalar absolute tolerance
-\id{ATOL}, the initial time \id{T0}, and the initial output time \id{T1}.
-
-Spatial discretization of the PDE naturally produces an ODE system in
-which equations are numbered by mesh coordinates $(i,j)$. The
-user-defined macro \id{IJth} isolates the translation for the
-mathematical two-dimensional index to the one-dimensional
-\id{N\_Vector} index and allows the user to write clean, readable code
-to access components of the dependent variable.  The \id{NV\_DATA\_S}
-macro returns the component array for a given \id{N\_Vector}, and this
-array is passed to \id{IJth} in order to do the actual \id{N\_Vector}
-access.
-
-The type \id{UserData} is a pointer to a structure containing problem
-data used in the \id{f} and \id{Jac} functions.  This structure is
-allocated and initialized at the beginning of \id{main}. The pointer
-to it, called \id{data}, is passed to \id{CVodeSetUserData}, and as a
-result it will be passed back to the \id{f} and \id{Jac} functions
-each time they are called.  The use of the \id{data} pointer
-eliminates the need for global program data.
-
-The \id{main} program is straightforward.  The \id{CVodeCreate} call specifies
-the \id{CV\_BDF} method with a \id{CV\_NEWTON} iteration. Following the
-\id{CVodeInit} call, the call to \id{CVodeSStolerances} indicates scalar
-relative and absolute tolerances, and values \id{reltol} and \id{abstol} are passed.
-The call to \id{SUNBandMatrix} (see \ugref{ss:sunmat_band}) creates a
-banded {\sunmatrix} Jacobian template, and specifies that both
-half-bandwidths of the Jacobian are equal to \id{MY}.  The calls to
-\id{SUNBandLinearSolver} (see \ugref{ss:sunlinsol_band}) and
-\id{CVodeSetLinearSolver} (see \ugref{sss:lin_solv_init}) specifies
-the {\sunlinsolband} linear solver to the {\cvls} interface.
-The call to \id{CVodeSetJacFn} (see \ugref{ss:optional_input}) specifies
-that a user-supplied Jacobian function \id{Jac} is to be used.
-
-The actual solution of the problem is performed by
-the call to \id{CVode} within the loop over the output times \id{tout}.
-The max-norm of the solution vector (from a call to \id{N\_VMaxNorm}) and
-the cumulative number of time steps (from a call to \id{CVodeGetNumSteps}) are
-printed at each output time. Finally, the calls to \id{PrintFinalStats},
-\id{N\_VDestroy}, and \id{CVodeFree} print statistics and free problem memory.
-
-Following the \id{main} program in the \id{cvAdvDiff\_bnd.c} file are definitions of
-five functions: \id{f}, \id{Jac}, \id{SetIC}, \id{PrintHeader}, \id{PrintOutput},
-\id{PrintFinalStats}, and \id{check\_flag}.   The last five functions are called
-only from within the \id{cvAdvDiff\_bnd.c} file.
-The \id{SetIC} function sets the initial dependent variable vector;
-\id{PrintHeader} prints the heading of the output page;
-\id{PrintOutput} prints a line of solution output;
-\id{PrintFinalStats} gets and prints statistics at the end of the run;
-and \id{check\_flag} aids in checking return values.  The statistics
-printed include counters such as the total number of steps (\id{nst}), 
-\id{f} evaluations (excluding those for Jaobian evaluations) (\id{nfe}),
-LU decompositions (\id{nsetups}), \id{f} evaluations for
-difference-quotient Jacobians (\id{nfeLS} = 0 here),
-Jacobian evaluations (\id{nje}), and nonlinear iterations (\id{nni}).
-These optional outputs are described in \ugref{ss:optional_output}.
-Note that \id{PrintFinalStats} is suitable for general use in applications
-of {\cvode} to any problem with a direct linear solver.
-
-The \id{f} function implements the central difference approximation
-(\ref{eq:cdiff}) with $u$ identically zero on the boundary. 
-The constant coefficients $(\Delta x)^{-2}$, $.5(2 \Delta x)^{-1}$, and 
-$(\Delta y)^{-2}$ are computed only once at the beginning of \id{main}, 
-and stored in the locations \id{data->hdcoef}, \id{data->hacoef}, and
-\id{data->vdcoef}, respectively.   When \id{f} receives the \id{data}
-pointer (renamed \id{user\_data} here), it pulls out these values from storage
-in the local variables \id{hordc}, \id{horac}, and \id{verdc}.  It then
-uses these to construct the diffusion and advection terms, which are
-combined to form \id{udot}.  Note the extra lines setting out-of-bounds
-values of $u$ to zero.
-
-The \id{Jac} function is an expression of the derivatives
-\vspace*{-.08in}
-\begin{eqnarray*}
-\partial f_{ij} / \partial v_{ij} &=&
-         -2 [(\Delta x)^{-2} + (\Delta y)^{-2}] \\
-\partial f_{ij} / \partial v_{i \pm 1,j} &=& (\Delta x)^{-2} 
-                  \pm .5 (2 \Delta x)^{-1}, ~~~~
-\partial f_{ij} / \partial v_{i,j \pm 1}  =  (\Delta y)^{-2} ~. 
-\end{eqnarray*}
-This function loads the Jacobian by columns, and like \id{f} it
-makes use of the preset coefficients in \id{data}.
-It loops over the mesh points (\id{i},\id{j}). For each such mesh
-point, the one-dimensional index \id{k = j-1 + (i-1)*MY} is computed
-and the \id{k}th column of the Jacobian matrix $J$ is set. 
-The row index $k'$ of each component $f_{i',j'}$ that depends on
-$v_{i,j}$ must be identified in order to load the corresponding element.
-The elements are loaded with the \id{SM\_COLUMN\_ELEMENT\_B} macro.
-Note that the formula for the global index $k$ implies that decreasing 
-(increasing) \id{i} by $1$ corresponds to decreasing (increasing) 
-\id{k} by \id{MY}, while decreasing (increasing) \id{j} by $1$ 
-corresponds of decreasing (increasing) \id{k} by $1$. 
-These statements are reflected in the arguments to
-\id{SM\_COLUMN\_ELEMENT\_B}.  The first argument passed to the
-\id{SM\_COLUMN\_ELEMENT\_B} macro is a pointer to the diagonal element
-in the column to be accessed. This pointer is obtained via a call to
-the \id{SM\_COLUMN\_B} macro and is stored in \id{kthCol} in 
-the \id{Jac} function. When setting the components of $J$ we must be
-careful not to index out of bounds. The guards \id{(i != 1)} etc.
-in front of the calls to \id{SM\_COLUMN\_ELEMENT\_B} prevent illegal
-indexing. See \ugref{ss:jacFn} for a detailed description of the
-\id{Jac} function.
-
-The output generated by \id{cvAdvDiff\_bnd} is shown below.
-
-%%
-\includeOutput{cvAdvDiff\_bnd}{../../examples/cvode/serial/cvAdvDiff_bnd.out}
-%%
-
-%-------------------------------------------------------------------------------
-
-\subsection{A Krylov example: cvDiurnal\_kry}\label{ss:cvDiurnal}
-
-We give here an example that illustrates the use of {\cvode} with the Krylov
-method {\spgmr}, in the {\sunlinsolspgmr} module, as the linear system
-solver through the {\cvls} interface.
-
-This program solves the semi-discretized form of a pair of
-kinetics-advection-diffusion partial differential equations, which
-represent a simplified model for the transport, production, and loss
-of ozone and the oxygen singlet in the upper atmosphere.  The problem
-includes nonlinear diurnal kinetics, horizontal advection and diffusion, 
-and nonuniform vertical diffusion.  The PDEs can be written as
-\begin{equation}\label{cvDiurnalpde}
-  \frac{\partial c^i}{\partial t}=K_h\frac{\partial^2 c^i}{\partial x^2}
-  +V \frac{\partial c^i}{\partial x}
-  + \frac{\partial} {\partial y} K_v(y) \frac{\partial c^i}{\partial y}
-  + R^i(c^1,c^2,t) \quad (i=1,2)~,
-\end{equation}
-where the superscripts $i$ are used to distinguish the two chemical
-species, and where the reaction terms are given by
-\begin{equation}\label{e:cvDiurnal:r}
-\begin{split}
-  R^1(c^1,c^2,t) & = -q_1c^1c^3-q_2c^1c^2+2q_3(t)c^3+q_4(t)c^2 ~, \\
-  R^2(c^1,c^2,t) & = q_1c^1c^3-q_2c^1c^2-q_4(t)c^2 ~.
-\end{split}
-\end{equation}
-The spatial domain is $0 \leq x \leq 20,\;30 \leq y \leq 50$ (in {\it km}). 
-The various constants and parameters are: $K_h=4.0\cdot 10^{-6},
-~ V=10^{-3},~ K_v=10^{-8}\exp (y/5),~ q_1=1.63\cdot 10^{-16},
-~ q_2=4.66\cdot 10^{-16},~ c^3=3.7\cdot 10^{16},$ and the diurnal
-rate constants are defined as:
-\begin{equation*}
-q_i(t) = 
-\left\{ \begin{array}{ll}
-  \exp [-a_i/\sin \omega t], & \mbox{for } \sin \omega t>0 \\
-  0, & \mbox{for } \sin \omega t\leq 0
-  \end{array} \right\} ~~~(i=3,4) ~,
-\end{equation*}
-where $\omega =\pi /43200, ~ a_3=22.62,~ a_4=7.601.$  The time interval of
-integration is $[0, 86400]$, representing 24 hours measured in seconds.
-
-Homogeneous Neumann boundary conditions are imposed on each boundary, and the
-initial conditions are 
-\begin{equation} \label{cvDiurnalic}
-  \begin{split}
-  c^{1}(x,y,0) &= 10^{6}\alpha (x)\beta (y) ~,~~~ 
-                    c^{2}(x,y,0)=10^{12}\alpha(x)\beta (y) ~, \\
-  \alpha (x) &= 1-(0.1x-1)^{2}+(0.1x-1)^{4}/2 ~, \\
-  \beta (y) &= 1-(0.1y-4)^{2}+(0.1y-4)^{4}/2 ~.
-  \end{split} 
-\end{equation}
-For this example, the equations (\ref{cvDiurnalpde}) are discretized spatially
-with standard central finite differences on a $10 \times 10$ mesh,
-giving an ODE system of size $200$.
-
-Among the initial \id{\#include} lines in this case are lines to
-include \id{sunlinsol\_spgmr.h} and \id{sundials\_math.h}.  The first
-contains constants and function prototypes associated with the
-{\sunlinsolspgmr} module, including the values of the \id{pretype}
-argument to \id{SUNLinSol\_SPGMR}. The inclusion of \id{sundials\_math.h} is
-done to access the \id{SUNSQR} macro for the square of a \id{sunrealtype}
-number. 
-
-The \id{main} program calls \id{CVodeCreate} specifying the \id{CV\_BDF} method
-and \id{CV\_NEWTON} iteration, and then calls \id{CVodeInit}, and
-\id{CVodeSetSStolerances} specifies the scalar tolerances.
-It calls \id{SUNLinSol\_SPGMR} to create the {\spgmr} linear solver with left
-preconditioning, and the default value (indicated by a zero argument)
-for \id{maxl}.  It then calls \id{CVodeSetLinearSolver} (see
-\ugref{sss:lin_solv_init}) to attach this linear solver to the
-{\cvls} interface.  The call to \id{CVodeSetJacTimes} specifies a
-user-supplied function for Jacobian-vector products (the \id{NULL}
-argument specifies that no Jacobian-vector setup routine is needed). 
-Next, user-supplied preconditioner setup and solve functions,
-\id{Precond} and \id{PSolve}, are specified. See
-\ugref{ss:optional_input} for details on the
-\id{CVodeSetPreconditioner} function.
-
-For a sequence of \id{tout} values, \id{CVode} is called in the
-\id{CV\_NORMAL} mode, sampled output is printed, and the return value is
-tested for error conditions.  After that, \id{PrintFinalStats} is called
-to get and print final statistics, and memory is freed by calls to
-\id{N\_VDestroy}, \id{FreeUserData}, and \id{CVodeFree}.  The printed
-statistics include various counters, such as the total numbers of steps
-(\id{nst}), of \id{f} evaluations (excluding those for $Jv$ product
-evaluations) (\id{nfe}), of \id{f} evaluations for $Jv$ evaluations (\id{nfeLS}),
-of nonlinear iterations (\id{nni}), of linear (Krylov) iterations (\id{nli}),
-of preconditioner setups (\id{nsetups}), of preconditioner evaluations
-(\id{npe}), and of preconditioner solves (\id{nps}), among others.  
-Also printed are the lengths of the problem-dependent real and integer
-workspaces used by the main integrator \id{CVode}, denoted \id{lenrw} and
-\id{leniw}, and those used by {\cvls}, denoted \id{lenrwLS} and \id{leniwLS}.
-All of these optional outputs are described in \ugref{ss:optional_output}.
-The \id{PrintFinalStats} function is suitable for general use in applications
-of {\cvode} to any problem with an iterative linear solver.
-
-Mathematically, the dependent variable has three dimensions: species
-number, $x$ mesh point, and $y$ mesh point.  But in {\nvecs}, a vector of
-type \id{N\_Vector} works with a one-dimensional contiguous array of
-data components. The macro \id{IJKth} isolates the translation from
-three dimensions to one. Its use results in clearer code and makes it
-easy to change the underlying layout of the three-dimensional data. 
-Here the problem size is $200$, so we use the \id{NV\_DATA\_S} macro
-for efficient \id{N\_Vector} access.  The \id{NV\_DATA\_S} macro gives
-a pointer to the first component of an \id{N\_Vector} which we pass to
-the \id{IJKth} macro to do an \id{N\_Vector} access.
-
-The preconditioner used here is the block-diagonal part of the true Newton
-matrix.  It is generated and factored in the \id{Precond} routine 
-(see \ugref{ss:precondFn}) and backsolved in the \id{PSolve} routine 
-(see \ugref{ss:psolveFn}). Its diagonal blocks are $2 \times 2$
-matrices that include the interaction Jacobian elements and the diagonal
-contribution of the diffusion Jacobian elements.  The block-diagonal part of
-the Jacobian itself, $J_{bd}$, is saved in separate storage each time it is
-generated, on calls to \id{Precond} with \id{jok}\id{ == SUNFALSE}.
-On calls with \id{jok}\id{ == SUNTRUE}, signifying that saved Jacobian data
-can be reused, the preconditioner $P = I - \gamma J_{bd}$ is formed from the
-saved matrix $J_{bd}$ and factored.  (A call to \id{Precond} with
-\id{jok}\id{ == SUNTRUE} can only occur after a prior call with
-\id{jok}\id{ == SUNFALSE}.)  The \id{Precond} routine must also set the value
-of \id{jcur}, i.e. \id{*jcurPtr}, to \id{SUNTRUE} when $J_{bd}$ is re-evaluated,
-and \id{SUNFALSE} otherwise, to inform {\cvls} of the status of Jacobian data.
-
-We need to take a brief detour to explain one last important aspect of
-this program.  While the generic {\sunlinsoldense} linear solver
-module serves as the interface to dense matrix solves for the main
-{\sundials} solvers, the underlying algebraic operations operate on
-dense matrices with \id{sunrealtype **} as the underlying dense matrix
-type.  To avoid the extra layer of function calls and dense matrix and
-linear solver data structures, \id{cvDiurnal\_kry.c} uses underling small
-dense functions for all operations on the $2 \times 2$ preconditioner blocks.  
-Thus it includes \id{sundials\_dense.h}, and calls the small dense
-matrix functions \id{newDenseMat}, \id{newIndexArray}, \id{denseCopy},
-\id{denseScale}, \id{denseAddIdentity}, \id{denseGETRF}, and
-\id{denseGETRS}. The macro \id{IJth} defined near the top of the file
-is used to access individual elements in each preconditioner block,
-numbered from $1$.  The underlying dense algebra functions are
-available for {\cvode} user programs
-generally.%, and are documented in \ugref{ss:dense}. 
-
-In addition to the functions called by {\cvode}, \id{cvDiurnal\_kry.c} includes
-definitions of several private functions.  These are: \id{AllocUserData}
-to allocate space for $J_{bd}$, $P$, and the pivot arrays; \id{InitUserData}
-to load problem constants in the \id{data} block; \id{FreeUserData} to free
-that block; \id{SetInitialProfiles} to load the initial values in \id{y}; 
-\id{PrintOutput} to retreive and print selected solution values and
-statistics; \id{PrintFinalStats} to print statistics; and \id{check\_flag}
-to check return values for error conditions.
-
-The output generated by \id{cvDiurnal\_kry.c} is shown below.  Note that the
-number of preconditioner evaluations, \id{npe}, is much smaller than
-the number of preconditioner setups, \id{nsetups}, as a result of the
-Jacobian re-use scheme.
-
-%%
-\includeOutput{cvDiurnal\_dns}{../../examples/cvode/serial/cvDiurnal_kry.out}
-%%
-
-%-------------------------------------------------------------------------------
diff --git a/doc/cvode/cv_ex_tests.tex b/doc/cvode/cv_ex_tests.tex
deleted file mode 100644
index 8b747c2ff9..0000000000
--- a/doc/cvode/cv_ex_tests.tex
+++ /dev/null
@@ -1,113 +0,0 @@
-%===============================================================================
-\section{Parallel tests}\label{s:ex_tests}
-%===============================================================================
-
-The stiff example problem \id{cvDiurnal\_kry} described above, or rather its parallel
-version \id{cvDiurnal\_kry\_p}, has been modified and expanded to form a test problem for
-the parallel version of {\cvode}.  This work was largely carried out
-by M. Wittman and reported in \cite{Wit:96}.
-
-To start with, in order to add realistic complexity to the solution, the
-initial profile for this problem was altered to include a rather steep front
-in the vertical direction. Specifically, the function $\beta(y)$ in
-Eq. (\ref{cvDiurnalic}) has been replaced by: 
-\begin{equation}
-\beta(y) = .75 + .25 \tanh(10 y - 400) ~.
-\end{equation}
-This function rises from about .5 to about 1.0 over a $y$ interval of about
-.2 (i.e. 1/100 of the total span in $y$). This vertical variation, together
-with the horizonatal advection and diffusion in the problem, demands a
-fairly fine spatial mesh to achieve acceptable resolution.
-
-In addition, an alternate choice of differencing is used in order to control
-spurious oscillations resulting from the horizontal advection. In place of
-central differencing for that term, a biased upwind approximation is applied
-to each of the terms $\partial c^i/\partial x$, namely: 
-\begin{equation}
-\left. \partial c/\partial x\right| _{x_j}\approx \left[ \frac
-32c_{j+1}-c_j-\frac 12c_{j-1}\right] /(2\Delta x) ~.
-\end{equation}
-
-With this modified form of the problem, we performed tests similar to those
-described above for the example. Here we fix the subgrid dimensions at
-{\tt MXSUB = MYSUB =} 50, so that the local (per-processor) problem size is 5000,
-while the processor array dimensions, {\tt NPEX} and {\tt NPEY}, are varied.
-In one (typical) sequence of tests, we fix {\tt NPEY} = 8 (for a vertical
-mesh size of {\tt MY} = 400), and set {\tt NPEX} = 8 ({\tt MX} = 400),
-{\tt NPEX} = 16 ({\tt MX} = 800), and {\tt NPEX} = 32 ({\tt MX} = 1600). 
-Thus the largest problem size $N$ is $2 \cdot 400 \cdot 1600 = 1,280,000$. 
-For these tests, we also raise the maximum Krylov dimension, {\tt maxl},
-to 10 (from its default value of 5).
-
-For each of the three test cases, the test program was run on a Cray-T3D
-(256 processors) with each of three different message-passing libraries:
-
-\begin{itemize}
-\item  MPICH: an implementation of MPI on top of the Chameleon library
-
-\item  EPCC: an implementation of MPI by the Edinburgh Parallel Computer
-Centre
-
-\item  SHMEM: Cray's Shared Memory Library
-\end{itemize}
-
-The following table gives the run time and selected performance counters for
-these 9 runs. In all cases, the solutions agreed well with each other,
-showing expected small variations with grid size. In the table, M-P denotes
-the message-passing library, RT is the reported run time in CPU seconds, 
-{\tt nst} is the number of time steps, {\tt nfe} is the number of $f$
-evaluations, {\tt nni} is the number of nonlinear (Newton) iterations,
-{\tt nli} is the number of linear (Krylov) iterations, and {\tt npe} is the
-number of evaluations of the preconditioner.
-
-\begin{table}[htb]
-\begin{center}
-\begin{tabular}{|c|c|c|r|r|r|r|r|}
-\hline
-{\tt NPEX} & M-P & RT & {\tt nst} & {\tt nfe} & {\tt nni} & {\tt nli} & 
-{\tt npe} \\ \hline\hline
-8 & MPICH & 436. & 1391 & 9907 & 1512 & 8392 & 24 \\ \hline
-8 & EPCC & 355. & 1391 & 9907 & 1512 & 8392 & 24 \\ \hline
-8 & SHMEM & 349. & 1999 & 10,326 & 2096 & 8227 & 34 \\ \hline\hline
-16 & MPICH & 676. & 2513 & 14,159 & 2583 & 11,573 & 42 \\ \hline
-16 & EPCC & 494. & 2513 & 14,159 & 2583 & 11,573 & 42 \\ \hline
-16 & SHMEM & 471. & 2513 & 14,160 & 2581 & 11,576 & 42 \\ \hline\hline
-32 & MPICH & 1367. & 2536 & 20,153 & 2696 & 17,454 & 43 \\ \hline
-32 & EPCC & 737. & 2536 & 20,153 & 2696 & 17,454 & 43 \\ \hline
-32 & SHMEM & 695. & 2536 & 20,121 & 2694 & 17,424 & 43 \\ \hline
-\end{tabular}
-\label{testtable}
-\end{center}
-\caption{Parallel {\cvode} test results vs problem size and message-passing library}
-\end{table}
-
-Some of the results were as expected, and some were surprising. For a given
-mesh size, variations in performance counts were small or absent, except for
-moderate (but still acceptable) variations for SHMEM in the smallest case.
-The increase in costs with mesh size can be attributed to a decline in the
-quality of the preconditioner, which neglects most of the spatial coupling.
-The preconditioner quality can be inferred from the ratio {\tt nli/nni},
-which is the average number of Krylov iterations per Newton iteration. The
-most interesting (and unexpected) result is the variation of run time with
-library: SHMEM is the most efficient, but EPCC is a very close second, and
-MPICH loses considerable efficiency by comparison, as the problem size
-grows. This means that the highly portable MPI version of {\cvode}, with an
-appropriate choice of MPI implementation, is fully competitive with the
-Cray-specific version using the SHMEM library. While the overall costs do
-not prepresent a well-scaled parallel algorithm (because of the
-preconditioner choice), the cost per function evaluation is quite flat for
-EPCC and SHMEM, at .033 to .037 (for MPICH it ranges from .044 to .068).
-
-For tests that demonstrate speedup from parallelism, we consider runs with
-fixed problem size: {\tt MX =} 800, {\tt MY =} 400. Here we also fix the
-vertical subgrid dimension at {\tt MYSUB =} 50 and the vertical processor
-array dimension at {\tt NPEY =} 8, but vary the corresponding horizontal
-sizes. We take {\tt NPEX =} 8, 16, and 32, with {\tt MXSUB =} 100, 50, and
-25, respectively. The runs for the three cases and three message-passing
-libraries all show very good agreement in solution values and performance
-counts. The run times for EPCC are 947, 494, and 278, showing speedups of
-1.92 and 1.78 as the number of processors is doubled (twice). For the SHMEM
-runs, the times were slightly lower and the ratios were 1.98 and 1.91. For
-MPICH, consistent with the earlier runs, the run times were considerably
-higher, and in fact show speedup ratios of only 1.54 and 1.03.
-
diff --git a/doc/cvode/cv_examples.tex b/doc/cvode/cv_examples.tex
deleted file mode 100644
index 51800eb32f..0000000000
--- a/doc/cvode/cv_examples.tex
+++ /dev/null
@@ -1,52 +0,0 @@
-\documentclass[twoside,titlepage,11pt]{article}
-
-\input{ug.tex}
-
-\externaldocument{install}
-\externaldocument{cv_math}
-\externaldocument{cv_usage}
-%\externaldocument{cv_fcmix}
-\externaldocument{cv_nvec}
-\externaldocument{cv_sunmat}
-\externaldocument{cv_sunlinsol}
-\externaldocument{cv_sunnonlinsol}
-\externaldocument{linsolv}
-
-%===============================================================
-
-\title{Example Programs for {\cvode} {\cvrelease}}
-\author{
-  Alan C. Hindmarsh and Radu Serban\\
-  {\em Center for Applied Scientific Computing} \\
-  {\em Lawrence Livermore National Laboratory}
-}
-\date{
-  \today
-  \vfill 
-  {\centerline{\includegraphics[width=0.5\textwidth]{doc_logo_blue}}}
-  \vfill \cvucrlex
-}
-
-\makeindex
-
-\begin{document}
-
-\frontex
-\raggedbottom
-%===============================================================
-\include{cv_ex_intro}
-\include{cv_ex_serial}
-\include{cv_ex_parallel}
-\include{cv_ex_parhyp}
-\include{cv_ex_cuda}
-\include{cv_ex_raja}
-%\include{cv_ex_fortran}
-\include{cv_ex_tests}
-%===============================================================
-% References
-\bibliographystyle{plain}
-\bibliography{biblio}
-%===============================================================
-\clearemptydoublepage
-%===============================================================
-\end{document}
diff --git a/doc/cvode/examples/Makefile b/doc/cvode/examples/Makefile
new file mode 100644
index 0000000000..d0c3cbf102
--- /dev/null
+++ b/doc/cvode/examples/Makefile
@@ -0,0 +1,20 @@
+# Minimal makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = source
+BUILDDIR      = build
+
+# Put it first so that "make" without argument is like "make help".
+help:
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+
+.PHONY: help Makefile
+
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/doc/cvode/examples/source/References.rst b/doc/cvode/examples/source/References.rst
new file mode 100644
index 0000000000..96bdafbd65
--- /dev/null
+++ b/doc/cvode/examples/source/References.rst
@@ -0,0 +1,30 @@
+..
+   Programmer(s): Daniel R. Reynolds @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _References:
+
+.. only:: html
+
+   ==========
+   References
+   ==========
+
+.. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
+             Programs for CVODE |CVODE_VERSION|. Technical Report
+             UCRL-SM-208110, LLNL, 2021.
+
+.. [R2018] A.C. Hindmarsh, R. Serban and D.R. Reynolds. User Documentation for CVODE
+           |CVODE_VERSION|. Technical Report UCRL-CODE-155951, LLNL, 2023.
diff --git a/doc/cvode/examples/source/c_cuda.rst b/doc/cvode/examples/source/c_cuda.rst
new file mode 100644
index 0000000000..ef9d7502b6
--- /dev/null
+++ b/doc/cvode/examples/source/c_cuda.rst
@@ -0,0 +1,66 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _cuda_c:
+
+====================================
+CUDA C example problems
+====================================
+
+
+
+.. _cvAdvDiff_kry_cuda:
+
+cvAdvDiff_kry_cuda
+===============================
+
+Description
+------------
+
+The example program :literal:`cvAdvDiff_kry_cuda.cu` solves the same :math:`2`-D 
+advection-diffusion equation as in Section :ref:`deep_dive.cvAdvDiff_bnd`, but
+instead of using a banded direct solver, it uses unpreconditioned 
+Krylov solver. Here we only highlight differences between the two 
+examples. 
+
+The :literal:`cvAdvDiff_kry_cuda.cu` program includes files
+:literal:`sunlinsol_spmgr.h` in order to use the SPGMR
+Krylov linear solver. File :literal:`cvode.h` provides the prototypes for
+:literal:`CVodeSetLinearSolver`, which sets the iterative linear solver for
+CVode, and :literal:`CVodeSetJacTimes`, which sets the pointer to the user
+supplied Jacobian-vector product function.
+The file :literal:`nvector_cuda.h` is included for the definition of the CUDA
+:literal:`N_Vector` type. The prototype vector is created
+using :literal:`N_VNew_Cuda` function. 
+
+In order to get a good performance and avoid moving data between host
+and device at every iteration, it is recommended that user evaluates  
+model at the device. In the example, model right hand side and Jacobian-vector
+product are implemented as CUDA kernels :literal:`fKernel` and :literal:`jtvKernel`,
+respectively. User provided C functions :literal:`f` and :literal:`jtv`, which are called
+directly by CVODE, set thread partitioning and launch thier respective 
+CUDA kernels. Vector data on the device is accessed using 
+:literal:`N_VGetDeviceArrayPointer_Cuda` function.
+
+Problem output
+---------------
+
+The output generated by :literal:`cvAdvDiff_kry_cuda` is shown below.
+
+.. include:: ../../../../examples/cvode/cuda/cvAdvDiff_kry_cuda.out
+   :literal:
+
diff --git a/doc/cvode/examples/source/c_mpimanyvec.rst b/doc/cvode/examples/source/c_mpimanyvec.rst
new file mode 100644
index 0000000000..7fe0f02ab0
--- /dev/null
+++ b/doc/cvode/examples/source/c_mpimanyvec.rst
@@ -0,0 +1,113 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _mpimanyvec_c:
+
+===================================================
+Parallel MPIManyVector C example problems
+===================================================
+
+
+
+.. _cvDiurnal_kry_mpimanyvec:
+
+cvDirunal_kry_mpimanyvec
+=================================
+
+Description
+------------
+
+This problem is mathematically identical to the parallel C example
+problem :ref:`cvDiurnal_kry_p`.  As before, this test problem
+models a two-species diurnal kinetics advection-diffusion PDE system
+in two spatial dimensions,
+
+.. math::
+
+   \frac{\partial c_i}{\partial t} = 
+     K_h \frac{\partial^2 c_i}{\partial x^2} + 
+     V \frac{\partial     c_i}{\partial x} + 
+     \frac{\partial}{\partial y}\left( K_v(y) 
+     \frac{\partial c_i}{\partial y}\right) + 
+     R_i(c_1,c_2,t),\qquad i=1,2 
+
+where
+
+.. math::
+
+   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
+   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
+   K_v(y) &= K_{v0} e^{y/5}.
+
+Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
+and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
+vary diurnally.  The problem is posed on the square spatial domain
+:math:`(x,y) \in [0,20]\times[30,50]`, with homogeneous Neumann
+boundary conditions, and for time interval :math:`t\in [0,86400]` sec
+(1 day).
+
+We enforce the initial conditions 
+
+.. math::
+
+   c^1(x,y) &=  10^6 \chi(x)\eta(y) \\
+   c^2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
+   \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
+
+The PDE system is treated by central differences on a uniform
+mesh, with simple polynomial initial profiles.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/C_mpimanyvec/cvDirunal_kry_mpimanyvec.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+Everything about this problem is the same as ``cvDiurnal_kry_p`` except
+that here we use NVECTOR_MPIMANYVECTOR instead of NVECTOR_PARALLEL.
+
+We employ a method of lines approach, wherein we first semi-discretize
+in space to convert the system of 2 PDEs into a larger system of ODEs.
+To this end, the spatial derivatives are computed using second-order
+centered differences, with the data distributed over :math:`Mx*My`
+points on a uniform spatial grid.  As a result, CVode approaches the
+problem as one involving :math:`2*Mx*My` coupled ODEs. 
+
+The problem is decomposed in parallel into uniformly-sized subdomains,
+with two subdomains in each direction (four in total), and where each
+subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
+
+Each species is stored in its own parallel nvector, and are combined
+together using the MPIManyVector module.
+
+This program solves the problem with a DIRK method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver, through the CVode interface.
+
+The preconditioner matrix used is block-diagonal, with block-diagonal
+portion of the Newton matrix used as a left preconditioner.  A copy of
+the block-diagonal portion of the Jacobian is saved and conditionally
+reused within the preconditioner routine. 
+
+Performance data and sampled solution values are printed at
+selected output times, and all performance counters are printed
+on completion.
diff --git a/doc/cvode/examples/source/c_openmp.rst b/doc/cvode/examples/source/c_openmp.rst
new file mode 100644
index 0000000000..573a455e05
--- /dev/null
+++ b/doc/cvode/examples/source/c_openmp.rst
@@ -0,0 +1,107 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _openmp_c:
+
+====================================
+OpenMP C example problems
+====================================
+
+
+
+
+.. _cvAdvDiff_bnd_omp:
+
+cvAdvDiff_bnd_omp
+============================================
+
+Description
+------------
+
+This simple example problem is an OpenMP implementation of previous
+serial C example ``cvAdvDiff_bnd`` showing how to use the CVode solver
+interface with a banded Jacobian.
+
+The problem is the semi-discrete form of the advection-diffusion
+equation in 2-D:
+
+.. math::
+
+   \frac{du}{dt} = \frac{d^2 u}{dx^2} + 0.5 \frac{du}{dx} + \frac{d^2 u}{dy^2}
+
+on the rectangle :math:`0 \leq x \leq 2`, :math:`0 \leq y \leq 1`, and
+the time interval :math:`0 \leq t \leq 1`.  Homogeneous Dirichlet
+boundary conditions are posed, and the initial condition is
+
+.. math::
+
+   u(x, y, t=0) = x (2 - x) y (1 - y) e^{5xy}.
+
+The PDE is discretized on a uniform :math:`mx + 2` by :math:`my + 2`
+grid with central differencing, and with boundary values eliminated,
+leaving an ODE system of size :math:`neq = mx \cdot my`.
+
+This example solves the problem with the BDF method, Newton iteration
+with the SUNBAND linear solver, and a user-supplied Jacobian routine.
+
+It uses scalar relative and absolute tolerances.  Output is printed at
+:math:`t = 0.1, 0.2, \ldots, 1.0`.  Run statistics (optional outputs)
+are printed at the end.
+
+Optionally, we can set the number of threads from environment
+variable or command line. To check the current value for number of
+threads from environment:
+
+.. math::
+
+   \texttt{% echo \$OMP_NUM_THREADS}
+
+Execution
+----------
+
+To use the default value or the number of threads from the environment
+value, run without arguments:
+
+.. math::
+
+   \texttt{% ./cvAdvDiff_bnd_omp}
+
+The environment variable can be over-ridden with a command line
+argument specifying the number of threads to use, e.g:
+
+.. math::
+
+   \texttt{% ./cvAdvDiff_bnd_omp 5}
+
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/C_openmp/cvAdvDiff_bnd_omp.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The numerical method is identical to the previous implementation,
+except that we now use SUNDIALS' OpenMP-enabled vector kernel module,
+NVECTOR_OPENMP, and have similarly threaded the supplied right-hand
+side residual and banded Jacobian construction functions.
+
+
+
diff --git a/doc/cvode/examples/source/c_openmpdev.rst b/doc/cvode/examples/source/c_openmpdev.rst
new file mode 100644
index 0000000000..d00fa5b26d
--- /dev/null
+++ b/doc/cvode/examples/source/c_openmpdev.rst
@@ -0,0 +1,54 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _openmpdev_c:
+
+============================================
+OpenMP Device Offload C example problems
+============================================
+
+
+
+
+.. _cvAdvDiff_kry_ompdev:
+
+cvAdvDiff_kry_ompdev
+===============================
+
+Description
+------------
+
+This simple example problem is an OpenMP dev implementation of previous
+serial C example ``cvAdvDiff_bnd`` except that here we use the SPGMR
+linear solver.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The numerical method is identical to the previous implementation,
+except that we now use SUNDIALS' OpenMP-device-offload-enabled vector
+kernel module, NVECTOR_OPENMPDEV, and have similarly threaded the
+supplied right-hand side residual and banded Jacobian construction
+functions.
+
diff --git a/doc/cvode/examples/source/c_parallel.rst b/doc/cvode/examples/source/c_parallel.rst
new file mode 100644
index 0000000000..fde7bd21f0
--- /dev/null
+++ b/doc/cvode/examples/source/c_parallel.rst
@@ -0,0 +1,285 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _parallel_c:
+
+====================================
+Parallel C example problems
+====================================
+
+
+
+.. _cvAdvDiff_diag_p:
+
+cvAdvDiff_diag_p
+======================
+
+Description
+------------
+
+This is a simple example problem, with the program for its solution 
+provided by CVODE. The problem is the semi-discrete form
+of the advection-diffusion equation in 1-D:
+
+.. math::
+
+   \frac{du}{dt} = \frac{d^2 u}{dx^2} + 0.5 \frac{du}{dx}
+
+on the interval :math:`0 \leq x \leq 2`, and the time interval
+:math:`0 \leq t \leq 5`.  Homogeneous Dirichlet boundary conditions
+are posed, and the initial condition is the following:
+
+.. math::
+
+   u(x,t=0) = x \cdot (2 - x) \cdot e^{2x}.
+
+The PDE is discretized on a uniform grid of size :math:`Mx+2` with
+central differencing, and with boundary values eliminated,
+leaving an ODE system of size :math:`NEQ = Mx`.
+
+This program solves the problem with the ADAMS integration method,
+and with Newton iteration using diagonal approximate Jacobians.
+It uses scalar relative and absolute tolerances.
+
+Output is printed at :math:`t = 0.5, 1.0, \ldots, 5`.  Run
+statistics (optional outputs) are printed at the end.
+
+This version uses MPI for user routines.
+
+Execute with Number of Processors :math:`= N`,  with 
+:math:`1 \leq N \leq Mx`.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_diag_p.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The numerical method is similar to the previous implementation,
+except that we now use SUNDIALS' MPI-enabled vector kernel module,
+NVECTOR_PARALLEL, and have similarly parallelized the supplied right-hand
+side residual.
+
+The example routine solves this problem using the Adams-Moulton module.
+Each stage is solved using the built-in modified Newton iteration.
+Internally, Newton will use the CVDIAG linear solver via the CVode interface.
+The example file contains functions to evaluate :math:`f(t,u)`.
+
+We specify the relative and absolute tolerances, :math:`reltol=0`
+and :math:`abstol=10^{-5}`, respectively.  Aside from these choices,
+this problem uses only the default MPI and CVode solver parameters.
+
+
+.. _cvAdvDiff_non_p:
+
+cvAdvDiff_non_p
+=====================
+
+Description
+------------
+
+This problem is exactly the same as ``cvAdvDiff_diag_p`` above except
+that this program solves the problem with the option for nonstiff
+systems: ADAMS method along with fixed-point iteration.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+Similar to ``cvAdvDiff_diag_p`` above solve except that CVDIAG is
+replaced by SUNNONLINSOL_FIXEDPOINT.
+
+
+.. _cvDiurnal_kry_bbd_p:
+
+cvDiurnal_kry_bbd_p
+===================================================
+
+
+As described in [HSR2017]_, this problem
+models a two-species diurnal kinetics advection-diffusion PDE system
+in two spatial dimensions,
+
+.. math::
+
+   \frac{\partial c_i}{\partial t} = 
+     K_h \frac{\partial^2 c_i}{\partial x^2} + 
+     V \frac{\partial     c_i}{\partial x} + 
+     \frac{\partial}{\partial y}\left( K_v(y) 
+     \frac{\partial c_i}{\partial y}\right) + 
+     R_i(c_1,c_2,t),\qquad i=1,2 
+
+where
+
+.. math::
+
+   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
+   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
+   K_v(y) &= K_{v0} e^{y/5}.
+
+Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
+and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
+vary diurnally.  The problem is posed on the square spatial domain
+:math:`(x,y) \in [0,20]\times[30,50]`, with homogeneous Neumann
+boundary conditions, and for time interval :math:`t\in [0,86400]` sec
+(1 day).
+
+We enforce the initial conditions 
+
+.. math::
+
+   c_1(x,y) &=  10^6 \chi(x)\eta(y) \\
+   c_2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
+   \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
+
+The PDE system is treated by central differences on a uniform
+mesh, with simple polynomial initial profiles.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
+   :literal:
+
+
+Numerical method
+----------------
+
+We employ a method of lines approach, wherein we first
+semi-discretize in space to convert the system of 2 PDEs into a larger
+system of ODEs.  To this end, the spatial derivatives are computed
+using second-order centered differences, with the data distributed
+over :math:`Mx*My` points on a uniform spatial grid.  As a result, CVode
+approaches the problem as one involving :math:`2*Mx*My` coupled ODEs.
+
+The problem is decomposed in parallel into uniformly-sized subdomains,
+with two subdomains in each direction (four in total), and where each
+subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
+
+This program solves the problem with a DIRK method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver through the CVode interface.
+
+The preconditioner matrix used is block-diagonal, with banded blocks,
+constructed using the CVBBDPRE module.  Each block is generated using
+difference quotients, with half-bandwidths ``mudq = mldq = 10``, but
+the retained banded blocks have half-bandwidths ``mukeep = mlkeep = 2``.
+A copy of the approximate Jacobian is saved and conditionally reused
+within the preconditioner routine. 
+
+Two runs are made for this problem, first with left and then with
+right preconditioning.
+
+Performance data and sampled solution values are printed at
+selected output times, and all performance counters are printed
+on completion.
+
+
+
+
+.. _cvDiurnal_kry_p:
+
+cvDiurnal_kry_p
+===================================================
+
+As described in [HSR2017]_, this test problem
+models a two-species diurnal kinetics advection-diffusion PDE system
+in two spatial dimensions,
+
+.. math::
+
+   \frac{\partial c_i}{\partial t} = 
+     K_h \frac{\partial^2 c_i}{\partial x^2} + 
+     V \frac{\partial     c_i}{\partial x} + 
+     \frac{\partial}{\partial y}\left( K_v(y) 
+     \frac{\partial c_i}{\partial y}\right) + 
+     R_i(c_1,c_2,t),\qquad i=1,2 
+
+where
+
+.. math::
+
+   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
+   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
+   K_v(y) &= K_{v0} e^{y/5}.
+
+Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
+and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
+vary diurnally.  The problem is posed on the square spatial domain
+:math:`(x,y) \in [0,20]\times[30,50]`, with homogeneous Neumann
+boundary conditions, and for time interval :math:`t\in [0,86400]` sec
+(1 day).
+
+We enforce the initial conditions 
+
+.. math::
+
+   c^1(x,y) &=  10^6 \chi(x)\eta(y) \\
+   c^2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
+   \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
+
+The PDE system is treated by central differences on a uniform
+mesh, with simple polynomial initial profiles.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
+   :literal:
+
+
+Numerical method
+----------------
+
+We employ a method of lines approach, wherein we first semi-discretize
+in space to convert the system of 2 PDEs into a larger system of ODEs.
+To this end, the spatial derivatives are computed using second-order
+centered differences, with the data distributed over :math:`Mx*My`
+points on a uniform spatial grid.  As a result, CVode approaches the
+problem as one involving :math:`2*Mx*My` coupled ODEs. 
+
+The problem is decomposed in parallel into uniformly-sized subdomains,
+with two subdomains in each direction (four in total), and where each
+subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
+
+This program solves the problem with a DIRK method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver, through the CVode interface.
+
+The preconditioner matrix used is block-diagonal, with block-diagonal
+portion of the Newton matrix used as a left preconditioner.  A copy of
+the block-diagonal portion of the Jacobian is saved and conditionally
+reused within the preconditioner routine. 
+
+Performance data and sampled solution values are printed at
+selected output times, and all performance counters are printed
+on completion.
diff --git a/doc/cvode/examples/source/c_parallel_deep.rst b/doc/cvode/examples/source/c_parallel_deep.rst
new file mode 100644
index 0000000000..2b6b927e2f
--- /dev/null
+++ b/doc/cvode/examples/source/c_parallel_deep.rst
@@ -0,0 +1,277 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _parallel_deep_c:
+
+====================================================
+Parallel C example problems -- Deep dive
+====================================================
+
+
+
+.. _deep_dive.cvAdvDiff_non_p:
+
+A nonstiff example: cvAdvDiff_non_p [DD]
+===============================================
+
+Description -- step-by-step
+----------------------------
+
+This problem begins with a simple diffusion-advection equation
+for :math:`u = u(t,x)`
+
+.. math::
+   :label: PDE1
+
+   \frac{\partial u}{\partial t}=\frac{\partial ^{2}u}{\partial x^{2}}
+   + 0.5\frac{\partial u}{\partial x}
+
+for :math:`0 \leq t \leq 5, ~~ 0\leq x \leq 2`, and subject to homogeneous
+Dirichlet boundary conditions and initial values given by
+
+.. math::
+   :label: BCIC1
+
+   u(t,0) &=& 0 ~,~~~~u(t,2) = 0 ~, \\
+   u(0,x) &=& x(2-x)e^{2x} ~.
+
+A system of :math:`M_X` ODEs is obtained by discretizing the :math:`x`-axis with :math:`M_X + 2`
+grid points and replacing the first and second order spatial derivatives
+with their *central difference approximations*. Since the value of :math:`u` is
+constant at the two endpoints, the semi-discrete equations for those points
+can be eliminated.  With :math:`u_i` as the approximation to :math:`u(t,x_i)`,
+:math:`x_i = i (\Delta x)`, and :math:`\Delta x = \frac{2}{M_X + 1}`, the resulting system of
+ODEs, :math:`\dot u = f(t,u)`, can now be written:
+
+.. math::
+   :label: cvAdvDiff_pode
+
+   \dot{u}_i=\frac{u_{i+1}-2u_{i}+u_{i-1}}{(\Delta x)^{2}}
+             + 0.5 \frac{u_{i+1}-u_{i-1}}{2(\Delta x)} ~.
+
+This equation holds for :math:`i = 1, 2, \ldots, M_X`, with the understanding
+that :math:`u_0 = u_{M_X + 1} = 0.`
+
+In the *parallel processing environment*, we may think of the several
+processors as being laid out on a straight line with each processor to
+compute its contiguous subset of the solution vector.  Consequently
+the computation of the *right hand side* of the Equation (:math:numref:`cvAdvDiff_pode`) requires
+that each interior processor must pass the first component of its block of
+the solution vector to its left-hand neighbor, acquire the last component of
+that neighbor's block, pass the last component of its block of the solution
+vector to its right-hand neighbor, and acquire the first component of that
+neighbor's block. If the processor is the first (:math:`0^\text{th}`) or last processor,
+then communication to the *left or right* (respectively) is not required.
+
+This problem uses the *Adams-Moulton* (non-stiff) integration formula and *fixed-point*
+nonlinear solver.  It is unrealistically simple, but serves to illustrate
+use of the *parallel version* of **CVODE**.
+
+The :literal:`cvAdvDiff_non_p.c` file begins with ``#include`` declarations for
+various required header files, including lines for
+:literal:`nvector_parallel` to access the parallel :literal:`N_Vector` type and related
+*macros*, and for :literal:`mpi.h` to access **MPI** types and constants. Following
+that are definitions of problem constants and a data block for communication
+with the :math:`f` routine.  That block includes the *number of PEs*, the *index*
+of the *local PE*, and the *MPI communicator*.
+
+The :literal:`main` program begins with **MPI** calls to initialize **MPI** and to set
+*multi-processor environment parameters* ``npes`` (*number of PEs*) and
+``my_pe`` (*local PE index*).  The *local vector length* is set according
+to ``npes`` and the *problem size* ``NEQ`` (which may or may not be
+multiple of ``npes``).  The value ``my_base`` is the *base value for
+computing global indices* (from :math:`1` to :math:`NEQ`) for the local vectors.
+The solution vector :math:`u` is created with a call to :literal:`N_VNew_Parallel`
+and loaded with a call to :literal:`SetIC`.  The calls to :literal:`CVodeCreate`,
+:literal:`CVodeInit`, and :literal:`CVodeSStolerances` specify a **CVODE** solution with
+the *nonstiff method* and *scalar tolerances*.  The call to :literal:`CVodeSetUserdata`
+insures that the pointer ``data`` is passed to the :math:`f` routine whenever it
+is called.
+
+A heading is printed (if on processor :math:`0`).  In a loop over :math:`t_{out}` *values*,
+:literal:`CVode` is called, and the return value checked for errors.  The
+*max-norm* of the solution and the total number of time steps so far
+are printed at each output point.  Finally, some statistical counters are
+printed, memory is freed, and **MPI** is finalized.
+
+The :literal:`SetIC` routine uses the last two arguments passed to it to compute
+the set of global indices (:math:`my\_base + 1` to :math:`my\_base + my\_length`)
+corresponding to the local part of the solution vector :math:`u`, and then to
+load the corresponding initial values.  The :literal:`PrintFinalStats` routine
+uses :literal:`CVodeGet***` calls to get various counters, and then prints these.
+The counters are:
+
+* ``nst`` (*number of steps*),
+* ``nfe`` (*number of* :math:`f` *evaluations*),
+* ``nni`` (*number of nonlinear iterations*),
+* ``netf`` (*number of error test failures*),
+* and ``ncfn`` (*number of nonlinear convergence failures*).
+
+This routine is suitable for general use with **CVODE** applications to nonstiff problems.
+
+The :literal:`f` function is an implementation of the Equation (:math:numref:`cvAdvDiff_pode`),
+but preceded by communication operations appropriate for the parallel setting.
+It copies the local vector :math:`u` into a larger array :math:`z`, shifted by :math:`1`
+to allow for the storage of immediate neighbor components.  The first and last
+components of :math:`u` are sent to neighboring processors with :literal:`MPI_Send` calls,
+and the immediate neighbor solution values are received from the neighbor
+processors with :literal:`MPI_Recv` calls, except that zero is loaded into :math:`z[0]`
+or :math:`z[my\_length + 1]` instead if at the actual boundary.  Then the central
+difference expressions are easily formed from the :math:`z` array, and loaded into
+the data array of the :math:`\dot u =` ``udot`` vector.
+
+The :literal:`cvAdvDiff_non_p.c` file includes a routine :literal:`check_flag` that checks the
+return values from calls in :literal:`main`.  This routine was written to be used
+by any *parallel* **SUNDIALS** application.
+
+Program output
+---------------
+
+The output below is for :literal:`cvAdvDiff_non_p` with :math:`M_X = 10` and four processors.
+Varying the number of processors will alter the output, only because
+of roundoff-level differences in various vector operations.  The fairly
+high value of ``ncfn`` indicates that this problem is on the borderline
+of being *stiff*.
+
+.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
+   :literal:
+
+
+.. _deep_dive.cvDiurnal_kry_p:
+
+A user preconditioner example: cvDiurnal_kry_p [DD]
+===============================================================
+
+Description -- step-by-step
+----------------------------
+
+As an example of using **CVODE** with the *Krylov linear solver*
+**SUNLinSol_SPGMR**, **CVode** *linear solver* interface, and
+the *parallel* **MPI NVECTOR_PARALLEL** module, we describe a test problem based on
+the system of PDEs given above for the :literal:`cvDiurnal_kry` example.
+As before, we discretize the PDE system with *central differencing*, to
+obtain an ODE system :math:`\dot u = f(t,u)` representing (:math:numref:`cvDiurnalpde`).
+But in this case, the discrete solution vector is distributed over
+many processors.  Specifically, we may think of the processors as
+being laid out in a rectangle, and each processor being assigned a
+subgrid of size :math:`M_{X_{SUB}} \times M_{Y_{SUB}}` of the :math:`x-y` grid. If
+there are :math:`NPE_X` processors in the :math:`x` direction and :math:`NPE_Y`
+processors in the :math:`y` direction, then the overall grid size is
+:math:`M_X \times M_Y` with :math:`M_X = NPE_X \times M_{X_{SUB}}` and
+:math:`M_Y = NPE_Y \times M_{Y_{SUB}}`, and the size of the ODE system is
+:math:`2 \cdot M_X \cdot M_Y`.
+
+To compute :math:`f` in this setting, the processors pass and receive
+information as follows.  The solution components for the bottom row of
+grid points in the current processor are passed to the processor below
+it and the solution for the top row of grid points is received from
+the processor below the current processor. The solution for the top
+row of grid points for the current processor is sent to the processor
+above the current processor, while the solution for the bottom row of
+grid points is received from that processor by the current
+processor. Similarly the solution for the first column of grid points
+is sent from the current processor to the processor to its left and
+the last column of grid points is received from that processor by the
+current processor. The *communication* for the solution at the right
+edge of the processor is similar. If this is the last processor in a
+particular direction, then message passing and receiving are bypassed
+for that direction.
+
+This code is intended to provide a more realistic example than that in
+:literal:`cvAdvDiff_non_p`, and to provide a template for a stiff ODE system
+arising from a PDE system. The solution method is *BDF* with *Newton*
+iteration and **SPGMR**. The *left preconditioner* is the *block-diagonal*
+part of the *Newton matrix*, with :math:`2 \times 2` *blocks*, and the
+corresponding *diagonal blocks* of the *Jacobian* are saved each time the
+*preconditioner* is generated, for re-use later under certain conditions.
+
+The organization of the :literal:`cvDiurnal_kry_p` program deserves some comments. The
+*right-hand side* routine :math:`f` calls two other routines:
+
+* :literal:`ucomm`, which carries out inter-processor communication;
+* and :literal:`fcalc`, which operates on local data only and contains the actual
+  calculation of :math:`f(t,u)`.
+
+The :literal:`ucomm` function in turn calls three routines which do, respectively,
+non-blocking receive operations, blocking send operations, and
+receive-waiting. All three use **MPI**, and transmit data from the local :math:`u`
+vector into a local working array :math:`u_{ext}`, an extended copy of :math:`u`.
+The :literal:`fcalc` function copies :math:`u` into :math:`u_{ext}`, so that the
+calculation of :math:`f(t,u)` can be done conveniently by operations on
+:math:`u_{ext}` only.  Most other features of :literal:`cvDiurnal_kry_p.c` are the same as
+in :literal:`cvDiurnal_kry.c`, except for extra logic involved with distributed
+vectors.
+
+Program output
+---------------
+
+The following is a sample output from :literal:`cvDiurnal_kry_p`, for four processors
+(in a :math:`2 \times 2` array) with a :math:`5 \times 5` subgrid on each.
+The output will vary slightly if the number of processors is changed.
+
+.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
+   :literal:
+
+
+.. _deep_dive.cvDiurnal_kry_bbd_p:
+
+A CVBBDPRE preconditioner example: cvDiurnal_kry_bbd_p [DD]
+========================================================================
+
+Description -- step-by-step
+----------------------------
+
+In this example, :literal:`cvDiurnal_kry_bbd_p`, we solve the same
+problem as in :literal:`cvDiurnal_kry_p`
+above, but instead of supplying the *preconditioner*, we use the **CVBBDPRE** module,
+which generates and uses a *band-block-diagonal preconditioner*.  The
+*half-bandwidths* of the *Jacobian block* on each processor are both equal to
+:math:`2 \cdot M_{X_{SUB}}`, and that is the value supplied as ``mudq`` and ``mldq``
+in the call to :literal:`CVBBDPrecInit`.  But in order to reduce storage and computation
+costs for *preconditioning*, we supply the values :math:`mu_{keep} = ml_{keep} = 2`
+(:math:`= N_{VARS}`) as the *half-bandwidths* of the retained *band matrix blocks*.
+This means that the *Jacobian elements* are computed with a *difference quotient*
+scheme using the true bandwidth of the block, but only a narrow band matrix
+(bandwidth :math:`5`) is kept as the *preconditioner*.
+
+As in :literal:`cvDiurnal_kry_p.c`, the :math:`f` routine in :literal:`cvDiurnal_kry_bbd_p.c` simply calls a
+*communication* routine, :literal:`fucomm`, and then a strictly computational routine,
+:literal:`flocal`.  However, the call to :literal:`CVBBDPrecInit` specifies the pair of
+routines to be called as :literal:`ucomm` and :literal:`flocal`, where :literal:`ucomm` is ``NULL``.
+This is because each call by the solver to :literal:`ucomm` is
+preceded by a call to :math:`f` with the same :math:`(t,u)` arguments, and therefore the
+*communication* needed for :literal:`flocal` in the solver's calls to it have already been
+done.
+
+In :literal:`cvDiurnal_kry_bbd_p.c`, the problem is *solved twice* --- first with *preconditioning
+on the left*, and then *on the right*.  Thus prior to the second solution, calls
+are made to reset the initial values (:literal:`SetInitialProfiles`), the main solver
+memory (:literal:`CVodeReInit`), the **CVBBDPRE** memory (:literal:`CVBBDPrecReInit`),
+as well as the *preconditioner* type (:literal:`SUNLinSol_SPGMRSetPrecType`).
+
+Program output
+---------------
+
+Sample output from :literal:`cvDiurnal_kry_bbd_p` follows, again using :math:`5 \times 5` *subgrids*
+on a :math:`2 \times 2` processor grid.  The performance of the *preconditioner*,
+as measured by the number of *Krylov* iterations per *Newton* iteration,
+``nli/nni``, is very close to that of :literal:`cvDiurnal_kry_p` when *preconditioning* is *on
+the left*, but slightly poorer when it is *on the right*.
+
+.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
+   :literal:
+
diff --git a/doc/cvode/examples/source/c_parhyp.rst b/doc/cvode/examples/source/c_parhyp.rst
new file mode 100644
index 0000000000..26734c2d08
--- /dev/null
+++ b/doc/cvode/examples/source/c_parhyp.rst
@@ -0,0 +1,127 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+.. _parhyp_c:
+
+====================================
+Parallel Hypre C example problems
+====================================
+
+
+
+
+.. _cvAdvDiff_non_ph:
+
+cvAdvDiff_non_ph
+============================================
+
+This problem is mathematically identical to the parallel C example
+problem :ref:`cvAdvDiff_non_p`.  As before, the problem is the 
+semi-discrete form of the advection-diffusion equation in 1-D:
+
+.. math::
+
+   \frac{du}{dt} = \frac{d^2 u}{dx^2} + 0.5 \frac{du}{dx}
+
+on the interval :math:`0 \leq x \leq 2`, and the time interval
+:math:`0 \leq t \leq 5`.  Homogeneous Dirichlet boundary conditions
+are posed, and the initial condition is the following:
+
+.. math::
+
+   u(x,t=0) = x \cdot (2 - x) \cdot e^{2x}.
+
+The PDE is discretized on a uniform grid of size :math:`Mx+2` with
+central differencing, and with boundary values eliminated,
+leaving an ODE system of size :math:`NEQ = Mx`.
+
+This program solves the problem with the ADAMS integration method,
+and with Newton iteration using diagonal approximate Jacobians.
+It uses scalar relative and absolute tolerances.
+
+Output is printed at :math:`t = 0.5, 1.0, \ldots, 5`.  Run
+statistics (optional outputs) are printed at the end.
+
+This version uses MPI for user routines.
+
+Execute with Number of Processors :math:`= N`,  with 
+:math:`1 \leq N \leq Mx`.
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/parhyp/cvAdvDiff_non_ph.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The numerical method is identical to the previous implementation,
+except that we now use the HYPRE parallel vector module,
+NVECTOR_PARHYP.  The output of these two examples is identical.
+Below, we discuss only the main differences between the two
+implementations; familiarity with the HYPRE library is helpful.
+
+We use the HYPRE IJ vector interface to allocate the template vector
+and create the parallel partitioning:
+
+.. code-block:: c
+
+   HYPRE_IJVectorCreate(comm, my_pe*local_N, (my_pe + 1)*local_N - 1, &Uij);
+   HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
+   HYPRE_IJVectorInitialize(Uij);
+
+The *initialize* call means that vector elements are ready to be set using 
+the IJ interface. We choose the initial condition vector :math:`x_0 =
+x(t_0)` as the template vector, and we set its values in the
+``SetInitialProfiles(...)`` function. We complete assembly of the
+HYPRE vector with the calls:
+
+.. code-block:: c
+
+   HYPRE_IJVectorAssemble(Uij);
+   HYPRE_IJVectorGetObject(Uij, (void**) &Upar);
+
+The *assemble* call is collective and makes the HYPRE vector ready to
+use.  The sets the handle ``Upar`` to the actual HYPRE vector.  The
+handle is then passed to the ``N_VMake`` function, which creates the
+template ``N_Vector``, ``u``, as a wrapper around the HYPRE vector.
+All of the other vectors used in the computation are created by
+cloning this template vector.  
+
+Furthermore, since the template vector does not own the underlying
+HYPRE vector (it was created using the ``HYPRE_IJVectorCreate`` call
+above), so it is the user's responsibility to destroy it by calling
+``HYPRE_IJVectorDestroy(Uij)`` after the template vector ``u`` has
+been destroyed.  This function will destroy both the HYPRE vector
+and its IJ interface.
+
+To access individual elements of the solution and derivative vectors
+``u`` and ``udot`` in the IVP right-hand side function, ``f``, the
+user needs to first extract the HYPRE vector by calling
+``N_VGetVector_ParHyp``, and then use HYPRE-specific methods to access
+the data from that point on. 
+
+.. note::
+           
+   Currently, interfaces to HYPRE solvers and preconditioners are not
+   available directly through the SUNDIALS interfaces, however these
+   could be utilized directly as preconditioners for SUNDIALS' Krylov
+   solvers.  Direct interfaces to the HYPRE solvers will be provided
+   in subsequent SUNDIALS releases.  The current HYPRE vector
+   interface is included in this release mainly for testing purposes
+   and as a preview of functionality to come. 
diff --git a/doc/cvode/examples/source/c_parhyp_deep.rst b/doc/cvode/examples/source/c_parhyp_deep.rst
new file mode 100644
index 0000000000..efa2226213
--- /dev/null
+++ b/doc/cvode/examples/source/c_parhyp_deep.rst
@@ -0,0 +1,76 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _parhyp_deep_c:
+
+==================================================
+Parallel HYPRE C example problems -- Deep dive
+==================================================
+
+
+
+.. _deep_dive.cvAdvDiff_non_ph:
+
+A nonstiff example: cvAdvDiff_non_ph [DD]
+======================================================
+
+This example is same as :literal:`cvAdvDiff_non_p`, except that it
+uses the **HYPRE** vector type instead of the **SUNDIALS** native
+*parallel vector* implementation.
+
+The outputs from the two examples are identical. In the following, we will point 
+out only the differences between the two. Familiarity with `HYPRE <https://github.com/hypre-space/hypre>`_
+library at `HYPRE User Manual <https://hypre.readthedocs.io/en/latest/>`_ is helpful.  
+
+We use the **HYPRE IJ** *vector interface* to allocate the template vector and 
+create parallel partitioning: ::
+
+   HYPRE_IJVectorCreate(comm, my_base, my_base + local_N - 1, &Uij);
+   HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
+   HYPRE_IJVectorInitialize(Uij);
+
+The initialize call means that vector elements are ready to be set using 
+the **IJ** *interface*. We choose an *initial condition vector* :math:`x_0 = x(t_0)` as the 
+*template vector* and we set its values in the :code:`SetIC(...)` function. We 
+complete the **HYPRE vector** *assembly* by: :: 
+
+   HYPRE_IJVectorAssemble(Uij);
+   HYPRE_IJVectorGetObject(Uij, (void**) &Upar);
+
+The *assemble call* is collective and it makes **HYPRE vector** ready to use. 
+This sets the handle :code:`Upar` to the actual **HYPRE vector**. 
+The handle is then passed to the :code:`N_VMake` function, which creates 
+the template :code:`N_Vector` as a *wrapper* around the **HYPRE vector**. 
+All other vectors in the computation are created by cloning the template 
+vector. The template vector does not own the underlying **HYPRE vector**, 
+and it is the user's responsibility to destroy it using a
+:code:`HYPRE_IJVectorDestroy(Uij)` call after the template vector has been 
+destroyed. This function will destroy both the **HYPRE vector** and its **IJ**
+*interface*.
+
+To access individual elements of solution vectors :math:`u =` ``u`` and :math:`\dot u =` ``udot`` 
+in the *residual function*, the user needs to extract the **HYPRE vector** first 
+by calling :code:`N_VGetVector_ParHyp`, and then use **HYPRE methods** from 
+that point on.
+
+.. warning::
+
+   At this point interfaces to **HYPRE** *solvers* and *preconditioners* are 
+   not available. They will be provided in subsequent **SUNDIALS** releases. 
+   The *interface* to **HYPRE vector** is included in this release mainly for 
+   testing purposes and as a preview of functionality to come.
+
diff --git a/doc/cvode/examples/source/c_raja.rst b/doc/cvode/examples/source/c_raja.rst
new file mode 100644
index 0000000000..ae124d535a
--- /dev/null
+++ b/doc/cvode/examples/source/c_raja.rst
@@ -0,0 +1,58 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _raja_c:
+
+====================================
+RAJA C example problems
+====================================
+
+
+
+.. _cvAdvDiff_kry_raja:
+
+cvAdvDiff_kry_raja
+==============================
+
+Description
+------------
+
+The example program :literal:`cvAdvDiff_kry_raja.cu` solves the same :math:`2`-D 
+advection-diffusion equation as in Sections :ref:`deep_dive.cvAdvDiff_bnd` and
+:ref:`cvAdvDiff_kry_cuda`.
+
+The file :literal:`nvector_raja.h` contains the definition of the RAJA
+:literal:`N_Vector` type, and :literal:`RAJA.hpp` definition of the RAJA
+:literal:`forall` loops. The prototype vector in the main body of the program is created
+using :literal:`N_VNew_Raja` function. 
+
+In order to get a good performance and avoid moving data between host
+and device at every iteration, it is recommended that user evaluates  
+model at the device. In the example, user-supplied model right hand side 
+and Jacobian-vector product functions, :literal:`f` and :literal:`jtv`, operate on 
+the device data. Vector data on the device is accessed using 
+:literal:`N_VGetDeviceArrayPointer_Raja` function. Looping over vector 
+components is implemented using RAJA :literal:`forall` loops.
+
+Problem output
+---------------
+
+The output generated by :literal:`cvAdvDiff_kry_raja` is shown below.
+
+.. include:: ../../../../examples/cvode/raja/cvAdvDiff_kry_raja.out
+   :literal:
+
diff --git a/doc/cvode/examples/source/c_serial.rst b/doc/cvode/examples/source/c_serial.rst
new file mode 100644
index 0000000000..ff69a9abb1
--- /dev/null
+++ b/doc/cvode/examples/source/c_serial.rst
@@ -0,0 +1,1118 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _serial_c:
+
+====================================
+Serial C example problems
+====================================
+
+
+
+.. _cvAdvDiff_bnd:
+
+cvAdvDiff_bnd
+====================================
+
+Description
+------------
+
+This is a very simple C example showing how to use the CVode solver
+interface with a banded Jacobian.
+
+The problem is the semi-discrete form of the advection-diffusion
+equation in 2-D:
+
+.. math::
+
+   \frac{du}{dt} = \frac{d^2 u}{dx^2} + 0.5 \frac{du}{dx} + \frac{d^2 u}{dy^2}
+
+on the rectangle :math:`0 \leq x \leq 2`, :math:`0 \leq y \leq 1`, and
+the time interval :math:`0 \leq t \leq 1`.  Homogeneous Dirichlet
+boundary conditions are posed, and the initial condition is
+
+.. math::
+
+   u(x, y, t=0) = x (2 - x) y (1 - y) e^{5xy}.
+
+The PDE is discretized on a uniform :math:`mx + 2` by :math:`my + 2`
+grid with central differencing, and with boundary values eliminated,
+leaving an ODE system of size :math:`neq = mx \cdot my`.
+
+This example solves the problem with the BDF method, Newton iteration
+with the SUNBAND linear solver, and a user-supplied Jacobian routine.
+
+It uses scalar relative and absolute tolerances.  Output is printed at
+:math:`t = 0.1, 0.2, \ldots, 1.0`.  Run statistics (optional outputs)
+are printed at the end.
+
+Following the initial comment block, this program has a number
+of ``#include`` lines, which allow access to useful items in CVODE
+header files.  This is true for all examples.
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
+   :literal:
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface, which in the case
+of this scalar-valued problem is just division.  The example file contains
+functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.  
+
+We specify the relative and absolute tolerances, :math:`reltol=0`
+and :math:`abstol=10^{-5}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+
+
+.. _cvAdvDiff_bndL:
+
+cvAdvDiff_bndL
+====================================
+
+Description
+------------
+
+This example problem is the same as the previous one aside from the
+use of the LAPACK_BAND linear solver. 
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bndL.out
+   :literal:
+
+
+
+.. _cvAnalytic_mels:
+
+cvAnalytic_mels
+==============================================
+
+Description
+------------
+
+This example problem is a simple example problem with an analytical
+solution, represented as follows,
+
+.. math::
+
+   \frac{dy}{dt} = \lambda \cdot y + \frac{1}{1 + t^2} - \lambda \cdot \text{atan} (t)
+
+for :math:`t` in the interval :math:`[0.0, 10.0]` with initial
+condition: :math:`y = 0`.
+
+The stiffness of the problem is directly proportional to the value
+of ':math:`\lambda`'.  The value of :math:`\lambda` should be negative
+in order to result in a well-posed ODE; for values with magnitudes
+larger than 100, the problem becomes quite stiff.
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvAnalytic_mels.out
+   :literal:
+
+Numerical method
+----------------
+
+This program solves the problem with the BDF method, Newton iteration,
+and a custom 'Matrix-embedded' SUNLinearSolver.  Output is printed
+every 1.0 units of time (10 total).  Run statistics (optional outputs)
+are printed at the end.
+
+
+
+.. _cvDirectDemo_ls:
+
+cvDirectDemo_ls
+================================================
+
+Description
+------------
+
+Demonstration program for CVODE -- direct linear solvers.  Two
+separate problems are solved using both the CV_ADAMS and CV_BDF
+linear multistep methods in combination with the SUNNONLINSOL_FIXEDPOINT
+and SUNNONLINSOL_NEWTON nonlinear solver modules:
+
+*  Problem 1: Van der Pol oscillator
+
+   *  :math:`\ddot x - 3 \cdot (1 - x^2) \cdot \dot x + x = 0` where
+      :math:`x(0) = 2` and :math:`\dot x(0) = 0`.
+   
+   *  This second-order ODE is converted to a first-order system by
+      defining :math:`y_0 = x` and :math:`y_1 = \dot x`.
+      
+   *  The NEWTON iteration cases use the following types of Jacobian
+      approximation: (1) dense, user-supplied, (2) dense, difference
+      quotient approximation, (3) diagonal approximation
+
+*  Problem 2: :math:`\dot y = A \cdot y`, where :math:`A` is a banded
+   lower triangular matrix derived from a 2-D advection PDE.
+
+   *  The NEWTON iteration cases use the following types of Jacobian
+      approximation: (1) band, user-supplied, (2) band, difference
+      quotient approximation, (3) diagonal approximation.
+   
+   *  For each problem, in the series of eight runs, CVodeInit is
+      called only once, for the first run, whereas CVodeReInit is
+      called for each of the remaining seven runs.
+
+*  Notes: This program demonstrates the usage of the sequential
+   macros NV_Ith_S, SM_ELEMENT_D, SM_COLUMN_B, and SM_COLUMN_ELEMENT_B.
+
+   *  The NV_Ith_S macro is used to reference the components of an N_Vector.
+
+      *  It works for any size :math:`N = NEQ`, but due to efficiency concerns
+         it should only by used when the problem size is small.
+
+      *  The Problem 1 right hand side and Jacobian functions :math:`f_1` and
+         :math:`Jac_1` both use NV_Ith_S.
+
+      *  The N_VGetArrayPointer function gives the user access to the
+         memory used for the component storage of an N_Vector. In the
+         sequential case, the user may assume that this is one contiguous
+         array of reals. The N_VGetArrayPointer function gives a more
+         efficient means (than the NV_Ith_S macro) to access the components
+         of an N_Vector and should be used when the problem size is large.
+
+      *  The Problem 2 right hand side function :math:`f_2` uses the
+         N_VGetArrayPointer function.
+
+   *  The SM_ELEMENT_D macro used in :math:`Jac_1` gives access to an element
+      of a dense SUNMatrix. It should be used only when the problem size is
+      small (the size of a Dense SUNMatrix is :math:`NEQ \times NEQ`) due to
+      efficiency concerns.
+
+   *  For larger problem sizes, the macro SM_COLUMN_D can be used in order
+      to work directly with a column of a Dense SUNMatrix.
+
+   *  The SM_COLUMN_B and SM_COLUMN_ELEMENT_B allow efficient columnwise access
+      to the elements of a Banded SUNMatix. These macros are used in the 
+      :math:`Jac_2` function.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvDirectDemo_ls.out
+   :literal:
+
+
+Numerical method
+----------------
+
+This program solves the two separate problems first with ADAMS and 
+then with BDF method, using a Fixed-point iteration and a Newton
+iteration for their nonlinear solvers, interchangeably.  The first problem
+uses the SUNLINSOL_DENSE linear solver module via the CVode interface.  
+Similarly, the second problem uses the SUNLINSOL_BAND linear solver
+module via the CVode interface.  Additionally, this example occasionally
+provides a routine to CVode to compute the dense and banded Jacobian,
+respectively. 
+
+The problems are run using scalar relative and absolute tolerances of
+:math:`reltol=0` and :math:`abstol=10^{-6}`, respectively.
+
+4 or 5 outputs are printed at intermittant or multiplicatively equal
+intervals, and run statistics are printed at the end.
+
+
+
+.. _cvDisc_dns:
+
+cvDisc_dns
+=============
+
+Description
+------------
+
+This test problem is a sample of two simple 1D examples to illustrate
+integrating over discontinuities. For instance,
+
+*  Discontinuity in solution
+
+   .. math::
+
+      y' = -y \qquad ; \enspace y(0) = 1 \qquad ; \enspace t = [0, 1] \\
+      y' = -y \qquad ; \enspace y(1) = 1 \qquad ; \enspace t = [1, 2]
+
+*  Discontinuity in RHS (:math:`y'`)
+
+   .. math::
+
+      y' = -y \qquad ; \enspace y(0) = 1 \qquad ; \enspace t = [0, 1] \\
+      z' = -5 \cdot z \quad ; \ z(1) = y(1) \quad ; \enspace t = [1, 2]
+
+   *  This case is solved twice, first by explicitly treating the
+      discontinuity point and secondly by letting the integrator
+      deal with the discontinuity.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvDisc_dns.out
+   :literal:
+
+
+Numerical method
+----------------
+
+This program solves the two separate sample problems both with BDF methods,
+using the built-in Newton iteration for their nonlinear solvers.  Both
+use the SUNLINSOL_DENSE linear solver module via the CVode interface.
+Additionally, this example only advances one step in time using CV_ONE_STEP,
+for both problems. The second problem is run twice, once explicitly, and once
+via CVODE autonomously.
+
+The problems are run using scalar relative and absolute tolerances of
+:math:`reltol=10^{-3}` and :math:`abstol=10^{-4}`, respectively.
+
+22 or 38 outputs are printed, and run statistics are printed at the end.
+
+
+
+.. _cvDiurnal_kry:
+
+cvDiurnal_kry
+================================================
+
+Description
+------------
+
+We now investigate a time-dependent system of discretized partial
+differential equations.  This example problem is an ODE system generated
+from the following 2-species diurnal kinetics advection-diffusion PDE system
+in 2 space dimensions:
+
+.. math::
+
+   \frac{dc(i)}{dt} &= K_h\left(\frac{d}{dx}\right)^2 c(i) + V \frac{dc(i)}{dx} + \frac{d}{dy}\left(K_v(y) \frac{dc(i)}{dy}\right) + R_i(c_1,c_2,t) \quad \text{ for } i = 1,2, \quad \text{ where} \\
+   R_1(c_1,c_2,t) &= -q_1 c_1 c_3 - q_2 c_1 c_2 + 2 q_3(t) c_3 + q_4(t) c_2 , \\
+   R_2(c_1,c_2,t) &=  q_1 c_1 c_3 - q_2 c_1 c_2 - q_4(t) c_2 , \\
+   K_v(y) &= K_{v_0} exp\left(\frac{y}{5}\right) ,
+
+:math:`K_h`, :math:`V`, :math:`K_{v_0}`, :math:`q_1`, :math:`q_2`, and
+:math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)` vary
+diurnally.  The problem is posed on the square :math:`0 \leq x \leq 20`,
+:math:`30 \leq y \leq 50` (all in km), with homogeneous Neumann boundary
+conditions, and for time :math:`0 \leq t \leq 86400` seconds (1 day).
+
+The PDE system is treated by central differences on a uniform
+:math:`10 \times 10` mesh, with simple polynomial initial profiles.
+
+The problem is solved with CVODE, using the BDF/GMRES method (i.e.
+using the SUNLinSol_SPGMR linear solver) and the block-diagonal part
+of the Newton matrix as a left preconditioner. A copy of the block-
+diagonal part of the Jacobian is saved and conditionally reused within
+the Preconditioner routine.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_SPGMR linear solver via the CVode interface, which in the case
+of this scalar-valued problem is just division.  The example file contains
+functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.  
+
+We specify the relative and absolute tolerances, :math:`reltol=10^{-5}`
+and :math:`abstol=10^{-3}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+12 outputs are printed, and run statistics are printed at the end.
+
+
+.. _cvDiurnal_kry_bp:
+
+cvDiurnal_kry_bp
+=====================
+
+This example problem is a duplicate of the :ref:`cvDiurnal_kry` problem
+above, except here we use the module CVBANDPRE and solve with left
+and right preconditioning.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry_bp.out
+   :literal:
+
+
+Numerical method
+----------------
+
+See ``cvDiurnal_kry`` for details.
+   
+
+
+.. _cvHeat2D_klu:
+
+cvHeat2D_klu
+===================
+
+Description
+------------
+
+This (future) example problem is a 2D heat equation in a serial 
+environment using sparse matrices, and is based on ``idaHeat2D_klu.c`` and
+``cvRoberts_klu.c``.
+
+This example solves a discretized 2D heat equation problem, such
+that this version uses the KLU sparse solver.
+
+The PDE system solved is a spatial discretization of the PDE
+
+.. math::
+
+   \frac{du}{dt} = \frac{d^2 u}{dx^2} + \frac{d^2 u}{dy^2}
+
+on the unit square. The boundary condition is :math:`u = 0` on
+all edges.  Initial conditions are given by 
+
+.. math::
+   
+   u = 16 \cdot x \cdot (1 - x) \cdot y \cdot (1 - y).
+
+The PDE is treated with central differences on a uniform 
+:math:`MGRID \times MGRID` grid.  The values of u at the interior
+points satisfy ODEs, and equations :math:`u = 0` at the boundaries
+are appended, to form a DAE system of size :math:`N = MGRID^2`. 
+Here :math:`MGRID = 10`.
+
+The system is solved with CVODE using the direct sparse linear system
+solver, half-bandwidths equal to :math:`M`, and default difference-quotient
+Jacobian.
+
+Output is taken at :math:`t = 0, 0.01, 0.02, 0.04, \ldots, 10.24`.
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_KLU linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=0`
+and :math:`atol=10^{-8}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+12 outputs (will be) printed, and run statistics are printed at the end.
+
+
+
+.. _cvKrylovDemo_ls:
+
+cvKrylovDemo_ls
+========================
+
+Description
+------------
+
+Demonstration program for CVODE -- This example loops through the 
+available iterative linear solvers:
+
+*  SPGMR -- Scaled, Preconditioned, Generalized Minimum Residual
+*  SPFGMR -- Scaled, Preconditioned, Flexible, Generalized Minimum Residual
+*  SPBCGS -- Scaled, Preconditioned, Bi-Conjugate Gradient, Stabilized
+*  SPTFQMR -- Scaled, Preconditioned, Transpose-Free Quasi-Minimum Residual
+
+The example problem is the same problem as is in :ref:`cvDiurnal_kry_bp`
+and :ref:`cvDiurnal_kry` as seen earlier; However, in this case, the
+problem is solved with CVODE, with the BDF/GMRES, BDF/FGMRES
+BDF/Bi-CGStab, and BDF/TFQMR methods (i.e. using the SUNLinSol_SPGMR,
+SUNLinSol_SPFGMR, SUNLinSol_SPBCGS, and SUNLinSol_SPTFQMR linear solvers)
+and the block-diagonal part of the Newton matrix as a left preconditioner.
+
+A copy of the block-diagonal part of the Jacobian is saved and
+conditionally reused within the Preconditioner routine.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvKrylovDemo_ls.out
+   :literal:
+
+
+Numerical method
+----------------
+
+This program solves the same problem four times via the Backwards 
+Differentiation Formula method, using a Newton iteration for their
+nonlinear solvers.  The first portion of this example uses the
+SUNLINSOL_SPGMR linear solver module via the CVode GMRES interface,
+while the second portion uses the SUNLINSOL_SPFGMR linear solver module
+via the CVode FGMRES interface, the third portion uses the SUNLinSol_SPBCGS
+linear solver module via the CVode Bi-CGStab interface, and the fourth
+portion uses the SUNLINSOL_SPTFQMR linear solver module via the CVode
+TFQMR interface.  Additionally, this example provides a routine to CVode
+to compute the densely-referenced, block-diagonal Jacobian. 
+
+The problems are run using scalar relative and absolute tolerances of
+:math:`reltol=10^{-5}` and :math:`abstol=10^{-3}`, respectively.
+
+12 outputs are printed and run statistics are printed at the end.
+
+
+
+.. _cvKrylovDemo_prec:
+
+cvKrylovDemo_prec
+========================
+
+Description
+------------
+
+Demonstration program for CVODE - Krylov linear solver.
+ODE system from :math:`ns`-species interaction PDE in 2 dimensions.
+
+This program solves a stiff ODE system that arises from a system
+of partial differential equations. The PDE system is a food web
+population model, with predator-prey interaction and diffusion on
+the unit square in two dimensions. The dependent variable vector is:
+
+.. math::
+
+   c = (c^1, c^2, \ldots, c^{ns})
+
+and the PDEs are as follows:
+
+.. math::
+
+   \frac{dc^i}{dt} = d(i) \cdot \left( c_{xx}^i + c_{yy}^i \right) +
+      f_i (x, y, c) \qquad (i = 1, \ldots, ns)
+
+where
+
+.. math::
+   
+   f_i (x, y, c) = c^i \cdot \left( b(i) + \sum_{j = 1}^{ns} a(i, j) c^j \right)
+
+The number of species is :math:`ns = 2 \cdot np`, with the first
+:math:`np` being predators. The coefficients :math:`a(i, j)`, :math:`b(i)`,
+and :math:`d(i)` are:
+
+.. math::
+
+   \begin{cases}
+   a(i, j) = -g \qquad &i \leq np, \enspace j > np \\
+   a(i, j) = e \qquad &i > np, \enspace j \leq np \\
+   a(i, j) = -a \qquad &\text{otherwise} \\
+   \end{cases} \\
+   \begin{cases}
+   b(i) = b \cdot (1 + \alpha \cdot x \cdot y) &i \leq np \\
+   b(i) = -b \cdot (1 + \alpha \cdot x \cdot y) &i > np \\
+   \end{cases} \\
+   \begin{cases}
+   d(i) = D_{\text{prey}} &i \leq np \\
+   d(i) = D_{\text{predator}} &i > np \\
+   \end{cases}
+
+The spatial domain is the unit square. The final time is 10.  The
+boundary conditions are: normal derivative = 0.  A polynomial in
+:math:`x` and :math:`y` is used to set the initial conditions.
+
+The PDEs are discretized by central differencing on an 
+:math:`MX \text{ by } MY` mesh.
+
+The resulting ODE system is stiff.
+
+The ODE system is solved using Newton iteration and the
+SUNLinSol_SPGMR linear solver (scaled preconditioned GMRES).
+
+The preconditioner matrix used is the product of two matrices:
+(1) A matrix, only defined implicitly, based on a fixed number of
+Gauss-Seidel iterations using the diffusion terms only.  (2) A
+block-diagonal matrix based on the partial derivatives of the
+interaction terms :math:`f` only, using block-grouping (computing
+only a subset of the :math:`ns` by :math:`ns` blocks).
+
+Four different runs are made for this problem.  The product
+preconditoner is applied on the left and on the right.  In each
+case, both the modified and classical Gram-Schmidt options are
+tested. In the series of runs, CVodeInit, SUNLinSol_SPGMR, and
+CVSetLinearSolver are called only for the first run, whereas
+CVodeReInit, SUNLinSol_SPGMRSetPrecType, and
+SUNLinSol_SPGMRSetGSType are called for each of the remaining
+three runs.
+
+A problem description, performance statistics at selected output
+times, and final statistics are written to standard output.  On
+the first run, solution values are also printed at output times.
+Error and warning messages are written to standard error, but
+there should be no such messages.
+
+Note: This program requires the dense linear solver functions
+SUNDlsMat_newDenseMat, SUNDlsMat_newIndexArray,
+SUNDlsMat_denseAddIdentity, SUNDlsMat_denseGETRF,
+SUNDlsMat_denseGETRS, SUNDlsMat_destroyMat and
+SUNDlsMat_destroyArray.
+
+Note: This program assumes the sequential implementation for the
+type N_Vector and uses the N_VGetArrayPointer function to gain
+access to the contiguous array of components of an N_Vector.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvKrylovDemo_prec.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_SPGMR linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=10^{-5}`
+and :math:`atol=10^{-5}`, respectively.  The Gram-Schmidt type is set
+manually for the SPGMR linear solver, and the Preconditioner is applied
+on the left and the right.
+
+6 species matrix-outputs are printed, and run statistics are printed at
+the end.  A total of 18 time-steps are taken throughout the problem's
+evolution.
+
+
+References
+-----------
+
+Peter N. Brown and Alan C. Hindmarsh, Reduced Storage Matrix Methods
+in Stiff ODE Systems, J. Appl. Math. & Comp., 31 (1989), pp. 40-91.
+Also available as Lawrence Livermore National Laboratory Report
+UCRL-95088, Rev. 1, June 1987.
+
+
+
+.. _cvParticle_dns:
+
+cvParticle_dns
+=====================
+
+Description
+------------
+
+This example problem solves the equation for a particle moving 
+counterclockwise with velocity :math:`\alpha` on the unit circle in
+the :math:`xy`-plane. The ODE system is given by:
+
+.. math::
+
+   x' &= -\alpha \cdot y \\
+   y' &= \alpha \cdot x
+
+where :math:`x` and :math:`y` are subject to the constraint:
+
+.. math::
+
+   x^2 + y^2 - 1 = 0
+
+with initial condition :math:`x = 1` and :math:`y = 0` at :math:`t = 0`.
+The system has the analytic solution:
+
+.. math::
+
+   x(t) &= \cos (\alpha \cdot t) \\
+   y(t) &= \sin (\alpha \cdot t)
+
+For a description of the command line options for this example, run
+the program with the ``--help`` flag.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvParticle_dns.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=10^{-4}`
+and :math:`atol=10^{-9}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+2 output times are printed, and run statistics are printed at the end.
+
+
+
+
+.. _cvPendulum_dns:
+
+cvPendulum_dns
+======================
+
+Description
+------------
+
+This example problem solves a simple pendulum equation in Cartesian
+coordinates where the pendulum bob has mass 1 and is suspended from the
+origin with a rod of length 1.  The governing equations are:
+
+.. math::
+
+   x' &= v_x \\
+   y' &= v_y \\
+   v_x' &= -x \cdot T \\
+   v_y' &= -y \cdot T - g
+
+with the constraints:
+
+.. math::
+
+   &x^2 + y^2 - 1 = 0 \\
+   &x \cdot v_x + y \cdot v_y = 0
+
+where :math:`x` and :math:`y` are the pendulum bob position, :math:`v_x` and
+:math:`v_y` are the bob velocity in the :math:`x` and :math:`y` directions
+respectively, T is the tension in the rod, and :math:`g` is acceleration due
+to gravity chosen such that the pendulum has period 2.  The initial condition
+at :math:`t = 0` is :math:`x = 1`, :math:`y = 0`, :math:`v_x = 0`, and
+:math:`v_y = 0`.
+
+A reference solution is computed using the pendulum equation in terms of the
+angle between the :math:`x`-axis and the pendulum rod i.e., :math:`\theta in [0, -\pi]`.
+The governing equations are:
+
+.. math::
+
+   \theta' &= v_\theta \\
+   v_\theta' &= -g \cdot \cos (\theta)
+
+where :math:`\theta` is the angle from the :math:`x`-axis, :math:`v_\theta` is
+the angular velocity, and :math:`g` the same acceleration due to gravity from above.
+The initial condition at :math:`t = 0` is :math:`\theta = 0` and :math:`v_theta = 0`.
+
+The Cartesian formulation is run to a final time :math:`t_f` (default 30) with
+and without projection for various integration tolerances. The error in the
+position and velocity at :math:`t_f` compared to the reference solution, the
+error in the position constraint equation, and various integrator statistics are
+printed to the screen for each run.
+
+When projection is enabled a user-supplied function is used to project the
+position, velocity, and error to the constraint manifold.
+
+Optional command line inputs may be used to change the final simulation time
+(default 30), the initial tolerance (default :math:`10^{-5}`), the number of outputs
+(default 1), or disable error projection. Use the option ``--help`` for a list
+of the command line flags.
+
+ 
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvPendulum_dns.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+
+We specify the relative and absolute tolerances for several runs to be
+
+*  :math:`rtol=10^{-5}` and :math:`atol=10^{-5}`,
+*  :math:`rtol=10^{-6}` and :math:`atol=10^{-6}`,
+*  :math:`rtol=10^{-7}` and :math:`atol=10^{-7}`,
+*  :math:`rtol=10^{-8}` and :math:`atol=10^{-8}`,
+*  :math:`rtol=10^{-9}` and :math:`atol=10^{-9}`,
+
+respectively.  Aside from these choices, this problem uses only the
+default CVode solver parameters.
+
+2 output times are printed for each solve, one with a user-supplied
+Projection function, and one without.
+
+
+
+.. _cvRoberts_dns:
+
+cvRoberts_dns
+============================================
+
+Description
+------------
+
+This example is a simple problem, with the coding needed for its
+solution completed via CVODE. The problem is from chemical kinetics,
+and consists of the following three rate equations:
+
+.. math::
+
+   \frac{dy_1}{dt} &= -0.04 \cdot y_1 + 10^4 \cdot y_2 \cdot y_3 \\
+   \frac{dy_2}{dt} &= 0.04 \cdot y_1 - 10^4 \cdot y_2 \cdot y_3 - 3 \times 10^7 \cdot y_2^2 \\
+   \frac{dy_3}{dt} &= 3 \times 10^7 \cdot y_2^2
+
+on the interval from :math:`t = 0.0` to :math:`t = 4 \times 10^{10}`,
+with initial conditions: :math:`y_1 = 1.0`, :math:`y_2 = y_3 = 0`.
+The problem is stiff.
+
+While integrating the system, we also use the rootfinding feature to
+find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`. 
+This program solves the problem with the BDF method, Newton iteration
+with the dense linear solver, and a user-supplied Jacobian routine.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dns.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and 
+:math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
+as previously mentioned, find roots at :math:`y_3 = 0.01` and 
+:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
+
+We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
+and :math:`atol=\begin{pmatrix} 10^{-8} \\ 10^{-14} \\ 10^{-6} \end{pmatrix}`
+, respectively.  Aside from these choices, this problem uses only the default
+CVode solver parameters.
+
+11 normal + 2 root output times are printed at multiplicatively equally-spaced
+points as well as at the two roots, and run statistics are printed at the end.
+
+
+
+.. _cvRoberts_dns_constraints:
+
+cvRoberts_dns_constraints
+==========================================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except that the
+constraint :math:`y_i \geq 0` is posed for all components :math:`i = 1, 2, 3`.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_constraints.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Here, we specify the scalar relative and vector-valued absolute tolerances,
+:math:`rtol=10^{-4}` and :math:`atol=\begin{pmatrix} 10^{-6} \\ 10^{-11} \\ 10^{-5} \end{pmatrix}`
+, respectively.
+
+Aside from this, see ``cvRoberts_dns`` above.
+   
+
+
+.. _cvRoberts_dns_negsol:
+
+cvRoberts_dns_negsol
+================================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except that here
+we allow negative solutions to take form in the first run, and intercept them
+via CVode on the second run.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_negsol.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Here, we specify the scalar relative and vector-valued absolute tolerances,
+:math:`rtol=10^{-4}` and :math:`atol=\begin{pmatrix} 10^{-7} \\ 10^{-13} \\ 10^{-5} \end{pmatrix}`
+, respectively.
+
+Aside from this, see ``cvRoberts_dns`` above.
+
+
+
+.. _cvRoberts_dns_uw:
+
+cvRoberts_dns_uw
+======================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except that
+here it uses a user-supplied function to compute the error weights
+required for the WRMS norm calculations.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_uw.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+See ``cvRoberts_dns`` above.
+
+
+
+.. _cvRoberts_dnsL:
+
+cvRoberts_dnsL
+====================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except that
+here we use the LAPACK dense linear solver instead of the dense linear
+solver.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dnsL.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+Aside from using SUNLINSOL_LAPACKDENSE, see ``cvRoberts_dns`` above.
+
+
+
+.. _cvRoberts_klu:
+
+cvRoberts_klu
+===================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except that
+here we use the KLU sparse linear solver instead of the dense linear
+solver.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_klu.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+Aside from using SUNLINSOL_KLU, see ``cvRoberts_dns`` above.
+
+
+
+.. _cvRoberts_block_klu:
+
+cvRoberts_block_klu
+==============================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_klu` above except
+that in this example problem, we simulate a scenario where a set of
+independent ODEs are grouped together to form a larger system.
+
+This program takes one optional argument, the number of groups
+of independent ODE systems:
+
+.. math::
+
+   \qquad \texttt{./cvRoberts_block_klu [number of groups]}
+
+The problem is comparable to the CUDA version -
+``cvRoberts_block_cusolversp_batchqr.cu``.  As previously suggested,
+it was based off of the ``cvRoberts_klu.c`` example.
+ 
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_block_klu.out
+   :literal:
+
+
+Numerical method
+----------------
+
+See ``cvRoberts_klu`` and ``cvRoberts_dns`` above.
+
+
+
+.. _cvRoberts_sps:
+
+cvRoberts_sps
+===================
+
+Description
+------------
+
+This example problem is the same as :ref:`cvRoberts_dns` above except
+that in this example problem, we solve the problem with the SuperLUMT
+sparse direct linear solver.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_sps.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+Aside from using SUNLINSOL_SUPERLUMT along with the necessary sparse
+matrices, see ``cvRoberts_dns`` above.
+
+
+
+.. _cvRocket_dns:
+
+cvRocket_dns
+=================
+
+Description
+------------
+
+The following is a simple example problem, with the coding needed
+for its solution provided by CVODE. The problem is a simpliflied model
+of a rocket, ascending vertically, with mass decreasing over time.  The
+system (of size 2) is given by:
+
+.. math::
+
+   y_1 &= \text{rocket height} \enspace H, &&\text{where } y_1(0) = 0, \\
+   y_2 &= \text{rocket velocity} \enspace v, &&\text{where } y_2(0) = 0, \\
+   \frac{dH}{dt} &= v, \\
+   \frac{dv}{dt} &= a(t,v).
+
+The upward acceleration :math:`a(t,v)` is given by:
+
+.. math::
+
+   a(t,v) = \frac{F}{M_r + M_f} - D \cdot v - g,
+
+where :math:`F =` engine thrust force (constant), :math:`M_r =` rocket mass
+without fuel, :math:`M_f =` fuel mass :math:`= M_{f_0} - r \cdot t`,
+:math:`r =` fuel burn rate, :math:`D =` drag coefficient, and :math:`g =`
+gravitational acceleration.
+
+The engine force is reset to 0 when the fuel mass reaches 0, or when
+:math:`H` reaches a preset height :math:`H_c`, whichever happens first.
+Root-finding is used to locate the time at which :math:`M_f = 0` or
+:math:`H = H_c`, and also the time at which the rocket reaches its maximum
+height, given by the condition :math:`v = 0` and :math:`t > 0`.
+
+The problem is solved with the BDF method and Dense linear solver.
+
+Run statistics (optional outputs) are printed at the end.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/serial/cvRocket_dns.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t, y_1, y_2)` and 
+:math:`J(t, y_1, y_2)`.  Additionally, a root-finding function will,
+as previously mentioned, find roots at either :math:`M_f = 0` or :math:`H = H_c` 
+as well as at :math:`v = 0` for :math:`t > 0` using the built-in root-finding
+mechanism in CVode.
+
+We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-5}`
+and :math:`atol=\begin{pmatrix} 0.01 \\ 0.1 \end{pmatrix}`
+, respectively.  Aside from these choices, this problem uses only the default
+CVode solver parameters.
+
+68 normal + 2 root output times are printed at normatively equally-spaced
+points as well as at the two roots, and run statistics are printed at the end.
+
+
+
diff --git a/doc/cvode/examples/source/c_serial_deep.rst b/doc/cvode/examples/source/c_serial_deep.rst
new file mode 100644
index 0000000000..0b5e14c34e
--- /dev/null
+++ b/doc/cvode/examples/source/c_serial_deep.rst
@@ -0,0 +1,588 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _serial_deep_c:
+
+============================================
+Serial C example problems -- Deep dive
+============================================
+
+
+
+.. _deep_dive.cvRoberts_dns:
+
+A dense example: cvRoberts_dns [DD]
+============================================
+
+Description -- step-by-step
+----------------------------
+
+As an initial illustration of the use of the **CVODE** package for the
+integration of IVP ODEs, we give a sample program called :literal:`cvRoberts_dns.c`.
+It uses the **CVODE** *linear solver interface* **CVode** with
+dense matrix and *linear solver* modules (**SUNMATRIX_DENSE** and **SUNLinSol_Dense**)
+and the **NVECTOR_SERIAL** module (which provides a *serial* implementation of **NVECTOR**)
+in the solution of a :math:`3`-species chemical kinetics problem.
+
+The problem consists of the following three rate equations:
+
+.. math::
+
+   \dot{y}_1 &= -0.04 \cdot y_1 + 10^4 \cdot y_2 \cdot y_3 \\
+   \dot{y}_2 &=  0.04 \cdot y_1 - 10^4 \cdot y_2 \cdot y_3
+                                - 3 \cdot 10^7 \cdot y_2^2 \\
+   \dot{y}_3 &=  3 \cdot 10^7 \cdot y_2^2
+
+on the interval :math:`t \in [0, ~4 \cdot 10^{10}]`, with initial conditions
+:math:`y_1(0) = 1.0`, :math:`y_2(0) = y_3(0) = 0.0`.
+While integrating the system, we also use the *root-finding
+feature* to find the points at which :math:`y_1 = 10^{-4}` or at which
+:math:`y_3 = 0.01`.
+
+For the source we give a rather detailed explanation of the parts of the program and
+their interaction with **CVODE**.
+
+Following the initial comment block, this program has a number
+of ``#include`` lines, which allow access to useful items in **CVODE**
+header files.  The :literal:`sundials_types.h` file provides the definition of the
+type :literal:`realtype` (see `Types
+<https://sundials.readthedocs.io/en/latest/arkode/Usage/General.html#data-types>`_
+for details).  For now, it suffices to read :literal:`realtype` as :literal:`double`.
+The :literal:`cvode.h` file provides prototypes for the **CVODE**
+functions to be called (excluding the *linear solver* selection
+function), and also a number of constants that are to be used in
+setting input arguments and testing the return value of **CVode**.
+The :literal:`sunlinsol_dense.h`
+file is the header file for the *dense* implementation of the
+**SUNLINSOL** module and includes definitions of the
+:literal:`SUNLinearSolver` type.  Similarly, the :literal:`sunmatrix_dense.h`
+file is the header file for the *dense* implementation of the
+**SUNMATRIX** module, including definitions of the :literal:`SUNMatrix` type
+as well as macros and functions to access *matrix components*.  
+We have explicitly included :literal:`sunmatrix_dense.h`, but this is not
+necessary because it is included by :literal:`sunlinsol_dense.h`.
+The :literal:`nvector_serial.h` file is the header file for the *serial*
+implementation of the **NVECTOR** module and includes definitions of the 
+:literal:`N_Vector` type, a macro to access vector components, and prototypes 
+for the *serial* implementation specific machine environment memory allocation
+and freeing functions.
+
+This program includes two *user-defined accessor macros*, :literal:`Ith` and
+:literal:`IJth`, that are useful in writing the problem functions in a form
+closely matching the mathematical description of the ODE system,
+i.e. with components numbered from :math:`1` instead of from :math:`0`.  The :literal:`Ith`
+*macro* is used to access components of a vector of type :literal:`N_Vector`
+with a *serial* implementation.  It is defined using the **NVECTOR_SERIAL**
+*accessor macro* :literal:`NV_Ith_S` which numbers components starting with
+:math:`0`. The :literal:`IJth` *macro* is used to access elements of a dense matrix of
+type :literal:`SUNMatrix`.  It is similarly defined using the **SUNMATRIX_DENSE**
+*accessor macro* :literal:`SM_ELEMENT_D` which numbers matrix rows and
+columns starting with :math:`0`.
+
+The *macro* :literal:`NV_Ith_S` is fully described in `NVECTOR_SERIAL
+<https://sundials.readthedocs.io/en/latest/nvectors/NVector_links.html>`_.
+The *macro* :literal:`SM_ELEMENT_D` is fully described in `SUNMATRIX_DENSE
+<https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html>`_.
+
+Next, the program includes some problem-specific constants, which are
+isolated to this early location to make it easy to change them as needed.  
+The program prologue ends with prototypes of four private helper
+functions and the three *user-supplied functions* that are called by **CVODE**.
+
+The :literal:`main` program begins with some *dimensions* and *type* declarations,
+including use of the generic types :literal:`N_Vector`, :literal:`SUNMatrix` and
+:literal:`SUNLinearSolver`.  The next several lines 
+allocate memory for the :math:`y` and :math:`abstol` vectors using
+:literal:`N_VNew_Serial` with a length argument of :math:`NEQ (= 3)`. The
+lines following that load the *initial values* of the dependendent
+variable vector into :math:`y` and the *absolute tolerances* into :math:`abstol`
+using the :literal:`Ith` macro.
+
+The calls to :literal:`N_VNew_Serial`, and also later calls to :literal:`CVode***`
+functions, make use of a private function, :literal:`check_flag`, which examines
+the return value and prints a message if there was a failure.  The
+:literal:`check_flag` function was written to be used for any *serial* **SUNDIALS**
+application.
+
+The call to :literal:`CVodeCreate` creates the **CVODE** solver memory block,
+specifying the :literal:`CV_BDF` integration method with built-in ``CV_NEWTON`` iteration.
+Its return value is a pointer to that memory block for this
+problem.  In the case of failure, the return value is ``NULL``.  This
+pointer must be passed in the remaining calls to **CVODE** functions.
+
+The call to :literal:`CVodeInit` *allocates* and *initializes* the solver memory block.
+Its arguments include the name of the :literal:`C` function :math:`f` defining the
+right-hand side function :math:`f(t,y)`, and the *initial values* of :math:`t` and :math:`y`.
+The call to :literal:`CVodeSVtolerances` specifies a *vector* of *absolute tolerances*,
+and includes the *value* of the *relative tolerance* :math:`reltol` and the *absolute 
+tolerance vector* :math:`abstol`.  See
+`CVodeCreate and CVodeInit
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-initialization-and-deallocation-functions>`_
+and `CVodeSStolerances and CVodeSVtolerances
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-tolerance-specification-functions>`_
+for full details of these calls.
+
+The call to :literal:`CVodeRootInit` specifies that a *root-finding* problem
+is to be solved along with the integration of the ODE system, that the
+root functions are specified in the function :math:`g`, and that there are
+two such functions.  Specifically, they are set to :math:`y_1 - 0.0001` and 
+:math:`y_3 - 0.01`, respectively. See `CVodeRootInit
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-initialization-function>`_
+for a detailed description of this call.
+
+The call to :literal:`SUNDenseMatrix` (see `SUNMATRIX_DENSE
+<https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#>`_)
+creates a :math:`NEQ \times NEQ` *dense* **SUNMATRIX** object to use within the
+*Newton* solve in **CVODE**.  The following call to :literal:`SUNLinSol_Dense` (see `SUNLinSol_Dense 
+<https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html#the-sunlinsol-dense-module>`_)
+creates the *dense* **SUNLINSOL** object that will perform the linear solves within
+the *Newton* method.  These are attached to the **CVODE** *linear
+solver interface* with the call to :literal:`CVodeSetLinearSolver` (see `CVodeSetLinearSolver interface 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_),
+and the subsequent call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
+specifies the analytic *Jacobian* supplied by the *user-supplied function* :math:`Jac`.
+
+The actual solution of the ODE initial value problem is accomplished in
+the loop over values of the output time :math:`t_{out}`.  In each pass of the
+loop, the program calls :literal:`CVode` in the ``CV_NORMAL`` mode, meaning that
+the integrator is to take steps until it overshoots :math:`t_{out}` and then
+interpolate to :math:`t = t_{out}`, putting the computed value of :math:`y(t_{out})`
+into :math:`y`, with :math:`t = t_{out}`.  The return value in this case is
+``CV_SUCCESS``.  However, if :literal:`CVode` finds a root before reaching the next
+value of :math:`t_{out}`, it returns ``CV_ROOT_RETURN`` and stores the root
+location in :math:`t` and the solution at that point in :math:`y`.  In either case, the
+program prints :math:`t` and :math:`y`.  In the case of a root, it calls
+:literal:`CVodeGetRootInfo` to get a length-:math:`2` array :math:`rootsfound` of bits showing
+which root function was found to have a root.  If :literal:`CVode` returned any
+negative value (*indicating a failure*), the program breaks out of the loop.  
+In the case of a ``CV_SUCCESS`` return, the value of :math:`t_{out}` is
+advanced (multiplied by :math:`10`) and a counter (:math:`i_{out}`) is advanced, so
+that the loop can be ended when that counter reaches the preset number
+of output times, :math:`N_{OUT} = 12`.  See `CVode Solver Function 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-solver-function>`_
+for full details of the call to :literal:`CVode`.
+
+Finally, the main program calls :literal:`PrintFinalStats` to get and print
+all of the relevant statistical quantities.  It then calls :literal:`NV_Destroy`
+to free the vectors :math:`y` and :math:`abstol`, :literal:`CVodeFree` to free the 
+**CVODE** *memory block*, :literal:`SUNLinSolFree` to free the *linear solver
+memory*, and :literal:`SUNMatDestroy` to *free the matrix* :math:`A`.
+
+The function :literal:`PrintFinalStats` used here is actually suitable for
+general use in applications of **CVODE** to any problem with a direct
+*linear solver*.  It calls various :literal:`CVodeGet***` 
+functions to obtain the relevant counters, and then prints them.
+Specifically, these are:
+
+* the cumulative number of steps (``nst``), 
+* the number of :math:`f` evaluations (``nfe``) (excluding those for *difference-quotient Jacobian* evaluations),
+* the number of matrix factorizations (``nsetups``),
+* the number of :math:`f` evaluations for *Jacobian* evaluations (``nfeLS`` :math:`= 0` here),
+* the number of *Jacobian* evaluations (``nje``),
+* the number of nonlinear (*Newton*) iterations (``nni``),
+* the number of nonlinear convergence failures (``ncfn``),
+* the number of local error test failures (``netf``), and
+* the number of :math:`g` (*root function*) evaluations (``nge``).
+
+These optional outputs are described in `CVode Optional Output Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_ .
+
+The function :literal:`f` is a straightforward expression of the ODEs. 
+It uses the *user-defined macro* :literal:`Ith` to extract the components of :math:`y`
+and to load the components of :math:`\dot y =` ``ydot``.  See `ODE RHS Function
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#ode-right-hand-side>`_
+for a detailed specification of :math:`f`.
+
+Similarly, the function :literal:`g` defines the two functions, :math:`g_0` and :math:`g_1`,
+whose roots are to be found.  See `Rootfinding Function 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-function>`_
+for a detailed description of the :math:`g` function.
+
+The function :literal:`Jac` sets the nonzero elements of the Jacobian as a
+dense matrix.  (Zero elements need not be set because :math:`J` is preset
+to zero.)  It uses the *user-defined macro* :literal:`IJth` to reference the
+elements of a dense matrix of type **SUNMATRIX**.  Here the problem
+size is small, so we need not worry about the inefficiency of using
+:literal:`NV_Ith_S` and :literal:`SM_ELEMENT_D` to access :literal:`N_Vector` and
+**SUNMATRIX_DENSE** elements.  Note that in this example, :literal:`Jac`
+only accesses the :math:`y` and :math:`J` arguments.  See `Jacobian Construction 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
+for a detailed description of the :math:`Jac` function.
+
+Program output
+---------------
+
+The output generated by :literal:`cvRoberts_dns` is shown again below.  It shows the output
+values at the :math:`12` preset values of :math:`t_{out}`.  It also shows the two root
+locations found, first at a root of :math:`g_1`, and then at a root of :math:`g_0`.
+
+.. include:: ../../../../examples/cvode/serial/cvRoberts_dns.out
+   :literal:
+
+
+.. _deep_dive.cvAdvDiff_bnd:
+
+A banded example: cvAdvDiff_bnd [DD]
+============================================
+
+Description -- step-by-step
+----------------------------
+
+The example program :literal:`cvAdvDiff_bnd.c` solves the semi-discretized form of
+the :math:`2`-D advection-diffusion equation
+
+.. math::
+   
+   \frac{\partial v}{\partial t} = \frac{\partial^2 v}{\partial x^2}
+                                 + 0.5 \frac{\partial v}{\partial x}
+                                 + \frac{\partial^2 v}{\partial y^2}
+
+on a rectangle, with zero Dirichlet boundary conditions. The PDE is 
+discretized with standard central finite differences on a 
+:math:`(M_X + 2) \times (M_Y + 2)` mesh, giving an ODE system of size
+:math:`M_X * M_Y`.  The discrete value :math:`v_{ij}` approximates :math:`v` at
+:math:`x = i \Delta x`, :math:`y = j \Delta y`. The ODEs are
+
+.. math::
+   
+   \frac{dv_{ij}}{dt} = f_{ij} =
+         \frac{v_{i-1,j} - 2 v_{ij} + v_{i+1,j}}{(\Delta x)^2}
+       + 0.5  \frac{v_{i+1,j} - v_{i-1,j}}{2 \Delta x}
+       + \frac{v_{i,j-1} - 2 v_{ij} + v_{i,j+1}}{(\Delta y)^2} \, ,
+
+where :math:`1 \leq i \leq M_X` and :math:`1 \leq j \leq M_Y`.  The boundary
+conditions are imposed by taking :math:`v_{ij} = 0` above if :math:`i = 0`
+or :math:`M_X + 1`, or if :math:`j = 0` or :math:`M_Y + 1`. 
+If we set :math:`u_{(j-1)+(i-1)*M_Y} = v_{ij}`, so that the ODE system is
+:math:`\dot u = f(u)`, then the system *Jacobian* :math:`J = \frac{\partial f}{\partial u}` is
+a *band matrix* with *upper* and *lower half-bandwidths* both equal to :math:`M_Y`.
+In the example, we take :math:`M_X = 10` and :math:`M_Y = 5`.
+
+The :literal:`cvAdvDiff_bnd.c` program includes files
+:literal:`sunmatrix_band.h` and :literal:`sunlinsol_band.h` in order to use the
+**SUNLinSol_Band** *linear solver*. The :literal:`sunmatrix_band.h` file
+contains the definition of the *banded* **SUNMATRIX** type, and the
+:literal:`SM_COLUMN_B` and :literal:`SM_COLUMN_ELEMENT_B` *macros* for
+accessing *banded matrix elements* (see `SUNMATRIX_BAND 
+<https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_).
+The :literal:`sunlinsol_band.h` file contains the definition of the *banded*
+**SUNLINSOL** type.  We note that have explicitly included
+:literal:`sunmatrix_band.h`, but this is not necessary because it is
+included by :literal:`sunlinsol_band.h`.  The file :literal:`nvector_serial.h`
+is included for the definition of the *serial* :literal:`N_Vector` type. 
+
+The *include* lines at the top of the file are followed by *definitions* of
+*problem constants* which include the :math:`x` and :math:`y` mesh dimensions, :math:`M_X` and
+:math:`M_Y`, the *number of equations* :math:`NEQ`, the *scalar absolute tolerance*
+:math:`ATOL`, the *initial time* :math:`T_0`, and the *initial output time* :math:`T_1`.
+
+Spatial discretization of the PDE naturally produces an ODE system in
+which equations are numbered by mesh coordinates :math:`(i,j)`. The
+*user-defined macro* :literal:`IJth` isolates the *translation* for the
+mathematical *two-dimensional* index to the *one-dimensional*
+:literal:`N_Vector` index and allows the user to write clean, readable code
+to access components of the dependent variable.  The :literal:`NV_DATA_S`
+macro returns the component array for a given :literal:`N_Vector`, and this
+array is passed to :literal:`IJth` in order to do the actual :literal:`N_Vector`
+access.
+
+The type :literal:`UserData` is a pointer to a structure containing problem
+data used in the :literal:`f`` and :literal:`Jac` functions.  This structure is
+allocated and initialized at the beginning of :literal:`main`. The pointer
+to it, called :literal:`data`, is passed to :literal:`CVodeSetUserData`, and as a
+result it will be passed back to the :literal:`f` and :literal:`Jac` functions
+each time they are called.  The use of the :literal:`data` pointer
+eliminates the need for global program data.
+
+The :literal:`main` program is straightforward.  The :literal:`CVodeCreate` call specifies
+the ``CV_BDF`` method with a built-in ``CV_NEWTON`` iteration. Following the
+:literal:`CVodeInit` call, the call to :literal:`CVodeSStolerances` indicates *scalar
+relative and absolute tolerances*, and *values* :math:`reltol` and :math:`abstol` are passed.
+The call to :literal:`SUNBandMatrix` (see `SUNMATRIX_BAND 
+<https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_)
+creates a *banded* **SUNMATRIX** *Jacobian* template, and specifies that both
+*half-bandwidths* of the *Jacobian* are equal to :math:`M_Y`.  The calls to
+:literal:`SUNBandLinearSolver` (see `SUNLinSol_Band 
+<https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html>`_)
+and :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
+specifies the **SUNLinSol_Band** *linear solver* to the **CVode** *interface*.
+The call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
+specifies that a *user-supplied Jacobian* function :literal:`Jac` is to be used.
+
+The actual solution of the problem is performed by
+the call to :literal:`CVode` within the loop over the output times :math:`t_{out}`.
+The max-norm of the solution vector (from a call to :literal:`N_VMaxNorm`) and
+the cumulative number of time steps (from a call to :literal:`CVodeGetNumSteps`) are
+printed at each output time. Finally, the calls to :literal:`PrintFinalStats`,
+:literal:`N_VDestroy`, and :literal:`CVodeFree` print statistics and free problem memory.
+
+Following the :literal:`main` program in the :literal:`cvAdvDiff_bnd.c` file are definitions of
+five functions: :literal:`f`, :literal:`Jac`, :literal:`SetIC`, :literal:`PrintHeader`, :literal:`PrintOutput`,
+:literal:`PrintFinalStats`, and :literal:`check_flag`.   The last five functions are called
+only from within the :literal:`cvAdvDiff_bnd.c` file.
+The :literal:`SetIC` function sets the initial dependent variable vector;
+:literal:`PrintHeader` prints the heading of the output page;
+:literal:`PrintOutput` prints a line of solution output;
+:literal:`PrintFinalStats` gets and prints statistics at the end of the run;
+and :literal:`check_flag` aids in checking return values.  The statistics
+printed include counters such as the total number of steps (``nst``), 
+:math:`f` evaluations (excluding those for *Jaobian* evaluations) (``nfe``),
+:math:`LU` decompositions (``nsetups``), :math:`f` evaluations for
+*difference-quotient Jacobians* (:math:`nfeLS = 0` here),
+*Jacobian* evaluations (``nje``), and nonlinear iterations (``nni``).
+These optional outputs are described in `CVode Optional Output Functions
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
+Note that :literal:`PrintFinalStats` is suitable for general use in applications
+of **CVODE** to any problem with a direct *linear solver*.
+
+.. role:: C(code)
+   :language: C
+
+The :literal:`f` function implements the *central difference approximation* (`IVP Solutions
+Mathematics <https://sundials.readthedocs.io/en/latest/cvode/Mathematics_link.html>`_)
+with :math:`u` identically zero on the boundary. 
+The constant coefficients :math:`(\Delta x)^{-2}`, :math:`0.5 (2 \Delta x)^{-1}`, and 
+:math:`(\Delta y)^{-2}` are computed only once at the beginning of :literal:`main`, 
+and stored in the locations :C:`data->hdcoef`, :C:`data->hacoef`, and
+:C:`data->vdcoef`, respectively.   When :literal:`f` receives the :literal:`data`
+pointer (renamed :literal:`user_data` here), it pulls out these values from storage
+in the local variables ``hordc``, ``horac``, and ``verdc``.  It then
+uses these to construct the diffusion and advection terms, which are
+combined to form :math:`\dot u =` ``udot``.  Note the extra lines setting out-of-bounds
+values of :math:`u` to zero.
+
+The :literal:`Jac` function is an expression of the derivatives
+
+.. math::
+
+   \frac{\partial f_{ij}}{\partial v_{ij}} &=&
+         -2 \left[ (\Delta x)^{-2} + (\Delta y)^{-2} \right] \\
+   \frac{\partial f_{ij}}{\partial v_{i \pm 1,j}} &=& (\Delta x)^{-2} 
+                  \pm 0.5 (2 \Delta x)^{-1}, ~~~~
+   \frac{\partial f_{ij}}{\partial v_{i,j \pm 1}}  =  (\Delta y)^{-2} ~.
+
+This function loads the *Jacobian* by *columns*, and like :literal:`f` it
+makes use of the preset coefficients in :literal:`data`.
+It loops over the mesh points :math:`(i,j)`.  For each such mesh
+point, the one-dimensional index :math:`k = j - 1 + (i - 1) * M_Y` is computed
+and the :math:`k^{th}` *column* of the *Jacobian matrix* :math:`J` is set.
+The row index :math:`k'` of each component :math:`f_{i',j'}` that depends on
+:math:`v_{i,j}` must be identified in order to load the corresponding element.
+The elements are loaded with the :literal:`SM_COLUMN_ELEMENT_B` macro.
+Note that the formula for the global index :math:`k` implies that decreasing 
+(increasing) :math:`i` by :math:`1` corresponds to decreasing (increasing) 
+:math:`k` by :math:`M_Y`, while decreasing (increasing) :math:`j` by :math:`1` 
+corresponds of decreasing (increasing) :math:`k` by :math:`1`. 
+These statements are reflected in the arguments to
+:literal:`SM_COLUMN_ELEMENT_B`.  The first argument passed to the
+:literal:`SM_COLUMN_ELEMENT_B` *macro* is a pointer to the diagonal element
+in the *column* to be accessed.  This pointer is obtained via a call to
+the :literal:`SM_COLUMN_B` *macro* and is stored in :literal:`kthCol` in 
+the :literal:`Jac` function.  When setting the components of :math:`J` we must be
+careful not to index out of bounds. The guards :C:`(i != 1)` etc.
+in front of the calls to :literal:`SM_COLUMN_ELEMENT_B` prevent illegal indexing.
+See `CVode Jacobian Construction 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
+for a detailed description of the :literal:`Jac` function.
+
+Program output
+---------------
+
+The output generated by :literal:`cvAdvDiff_bnd` is again shown below.
+
+.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
+   :literal:
+
+
+.. _deep_dive.cvDiurnal_kry:
+
+A Krylov example: cvDiurnal_kry [DD]
+============================================
+
+Description -- step-by-step
+----------------------------
+
+We give here an example that illustrates the use of **CVODE** with the *Krylov*
+method **SPGMR**, in the **SUNLinSol_SPGMR** module, as the linear system
+solver through the **CVode** *interface*.
+
+This program solves the semi-discretized form of a pair of
+kinetics-advection-diffusion partial differential equations, which
+represent a simplified model for the transport, production, and loss
+of ozone and the oxygen singlet in the upper atmosphere.  The problem
+includes nonlinear diurnal kinetics, horizontal advection and diffusion, 
+and nonuniform vertical diffusion.  The PDEs can be written as
+
+.. math::
+   :label: cvDiurnalpde
+
+   \frac{\partial c^i}{\partial t} = K_h \frac{\partial^2 c^i}{\partial x^2}
+    + V \frac{\partial c^i}{\partial x}
+    + \frac{\partial} {\partial y} K_v(y) \frac{\partial c^i}{\partial y}
+    + R^i(c^1,c^2,t) \quad (i = 1, 2)~,
+
+where the superscripts :math:`i` are used to distinguish the two chemical
+species, and where the reaction terms are given by
+
+.. math::
+   :label: eq:cvDiurnal:r
+
+   R^1(c^1,c^2,t) & = -q_1 c^1 c^3 - q_2 c^1 c^2 + 2 q_3(t) c^3 + q_4(t) c^2 ~, \\
+   R^2(c^1,c^2,t) & = q_1 c^1 c^3 - q_2 c^1 c^2 - q_4(t) c^2 ~.
+
+The spatial domain is :math:`0 \leq x \leq 20,\;30 \leq y \leq 50` (in *km*). 
+The various constants and parameters are: 
+:math:`K_h = 4.0 \cdot 10^{-6},` :math:`V = 10^{-3},` :math:`K_v = 10^{-8} e^{\frac{y}{5}},`
+:math:`q_1 = 1.63 \cdot 10^{-16},` :math:`q_2 = 4.66 \cdot 10^{-16},` :math:`c^3 = 3.7 \cdot 10^{16},`
+and the diurnal rate constants are defined as:
+
+.. math::
+
+   q_i(t) = 
+   \left\{ \begin{array}{ll}
+     \exp \left[ \frac{-a_i}{\sin (\omega t)} \right], & \mbox{for } \sin (\omega t) > 0 \\
+     0, & \mbox{for } \sin (\omega t) \leq 0
+     \end{array} \right\} ~~~(i = 3, 4) ~,
+
+where :math:`\omega = \frac{\pi}{43200},` :math:`a_3 = 22.62,` :math:`a_4 = 7.601.`  The time interval of
+integration is :math:`[0, 86400]`, representing 24 *hours* measured in *seconds*.
+
+Homogeneous Neumann boundary conditions are imposed on each boundary, and the
+initial conditions are 
+
+.. math::
+   :label: cvDiurnalic
+
+   c^1 (x,y,0) &= 10^6 \alpha (x) \beta (y) ~,~~~ 
+                   c^2 (x,y,0) = 10^{12} \alpha (x) \beta (y) ~, \\
+   \alpha (x) &= 1 - (0.1 x - 1)^2 + \frac{1}{2} (0.1 x - 1)^4 ~, \\
+   \beta (y) &= 1 - (0.1 y - 4)^2 + \frac{1}{2} (0.1 y - 4)^4 ~.
+
+For this example, the equations (:math:numref:`cvDiurnalpde`) are discretized spatially
+with standard central finite differences on a :math:`10 \times 10` mesh,
+giving an ODE system of size :math:`200`.
+
+Among the initial ``#include`` lines in this case are lines to
+include :literal:`sunlinsol_spgmr.h` and :literal:`sundials_math.h`.  The first
+contains constants and function prototypes associated with the
+**SUNLinSol_SPGMR** module, including the values of the ``pretype``
+argument to :literal:`SUNLinSol_SPGMR`. The inclusion of :literal:`sundials_math.h` is
+done to access the :literal:`SUNSQR` macro for the square of a :literal:`realtype`
+number. 
+
+The :literal:`main` program calls :literal:`CVodeCreate` specifying the ``CV_BDF`` method
+and built-in ``CV_NEWTON`` iteration, and then calls :literal:`CVodeInit`, and
+:literal:`CVodeSetSStolerances` specifies the *scalar tolerances*.
+It calls :literal:`SUNLinSol_SPGMR` to create the **SPGMR** *linear solver* with *left
+preconditioning*, and the default value (indicated by a zero argument)
+for ``maxl``.  It then calls :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
+to attach this *linear solver* to the
+**CVode** *interface*.  The call to :literal:`CVodeSetJacTimes` specifies a
+*user-supplied function* for *Jacobian-vector products* (the ``NULL``
+argument specifies that no *Jacobian-vector setup routine* is needed). 
+Next, *user-supplied preconditioner setup* and *solve* functions,
+:literal:`Precond` and :literal:`PSolve`, are specified. See `CVode Linear Solver Optional Input Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_
+for details on the :literal:`CVodeSetPreconditioner` function.
+
+For a sequence of :math:`t_{out}` *values*, :literal:`CVode` is called in the
+``CV_NORMAL`` mode, sampled output is printed, and the return value is
+tested for error conditions.  After that, :literal:`PrintFinalStats` is called
+to get and print final statistics, and memory is freed by calls to
+:literal:`N_VDestroy`, :literal:`FreeUserData`, and :literal:`CVodeFree`.  The printed
+statistics include various counters, such as the total numbers of steps
+(``nst``), of :math:`f` evaluations (excluding those for :math:`J \cdot v` product
+evaluations) (``nfe``), of :math:`f` evaluations for :math:`J \cdot v` evaluations (``nfeLS``),
+of nonlinear iterations (``nni``), of linear (*Krylov*) iterations (``nli``),
+of *preconditioner* setups (``nsetups``), of *preconditioner* evaluations
+(``npe``), and of *preconditioner* solves (``nps``), among others.  
+Also printed are the lengths of the problem-dependent *real and integer
+workspaces* used by the main integrator :literal:`CVode`, denoted ``lenrw`` and
+``leniw``, and those used by **CVode**, denoted ``lenrwLS`` and ``leniwLS``.
+All of these optional outputs are described in `CVode Optional Output Functions 
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
+The :literal:`PrintFinalStats` function is suitable for general use in applications
+of **CVODE** to any problem with an iterative *linear solver*.
+
+Mathematically, the dependent variable has three dimensions: species
+number, :math:`x` mesh point, and :math:`y` mesh point.  But in **NVECTOR_SERIAL**, a vector of
+type :literal:`N_Vector` works with a one-dimensional contiguous array of
+data components. The *macro* :literal:`IJKth` isolates the translation from
+three dimensions to one. Its use results in clearer code and makes it
+easy to change the underlying layout of the three-dimensional data. 
+Here the problem size is :math:`200`, so we use the :literal:`NV_DATA_S` *macro*
+for efficient :literal:`N_Vector` access.  The :literal:`NV_DATA_S` *macro* gives
+a pointer to the first component of an :literal:`N_Vector` which we pass to
+the :literal:`IJKth` *macro* to do an :literal:`N_Vector` access.
+
+The *preconditioner* used here is the *block-diagonal part* of the true *Newton
+matrix*.  It is generated and factored in the :literal:`Precond` routine (see `CVode Preconditioner Setup Function
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-setup-iterative-linear-solvers>`_)
+and backsolved in the :literal:`PSolve` routine (see `CVode Preconditioner Solve Function
+<https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-solve-iterative-linear-solvers>`_).
+Its diagonal blocks are :math:`2 \times 2` *matrices* that include the interaction
+*Jacobian elements* and the *diagonal contribution* of the *diffusion Jacobian
+elements*.  The *block-diagonal* part of the *Jacobian* itself, :math:`J_{bd}`, is
+saved in separate storage each time it is generated, on calls to :literal:`Precond`
+with :C:`jok == SUNFALSE`.  On calls with :C:`jok == SUNTRUE`, signifying that
+saved *Jacobian data* can be reused, the *preconditioner* :math:`P = I - \gamma J_{bd}`
+is formed from the *saved matrix* :math:`J_{bd}` and factored.  (A call to
+:literal:`Precond` with :C:`jok == SUNTRUE` can only occur after a prior call with
+:C:`jok == SUNFALSE`.)  The :literal:`Precond` routine must also set the value
+of :C:`jcur`, i.e. :C:`*jcurPtr`, to ``SUNTRUE`` when :math:`J_{bd}` is re-evaluated,
+and ``SUNFALSE`` otherwise, to inform **CVode** of the status of *Jacobian data*.
+
+We need to take a brief detour to explain one last important aspect of
+this program.  While the generic **SUNLinSol_Dense** *linear solver*
+module serves as the *interface* to *dense matrix* solves for the main
+**SUNDIALS** solvers, the underlying algebraic operations operate on
+*dense matrices* with :literal:`realtype **` as the underlying *dense matrix*
+type.  To avoid the extra layer of function calls and *dense matrix* and
+*linear solver data structures*, :literal:`cvDiurnal_kry.c` uses underlying small
+dense functions for all operations on the :math:`2 \times 2` *preconditioner blocks*.  
+Thus it includes :literal:`sundials_dense.h`, and calls the *small dense
+matrix* functions :literal:`newDenseMat`, :literal:`newIndexArray`, :literal:`denseCopy`,
+:literal:`denseScale`, :literal:`denseAddIdentity`, :literal:`denseGETRF`, and
+:literal:`denseGETRS`. The *macro* :literal:`IJth` defined near the top of the file
+is used to access individual elements in each *preconditioner block*,
+numbered from :math:`1`.  The underlying *dense algebra functions* are
+available for **CVODE** user programs generally.
+
+In addition to the functions called by **CVODE**, :literal:`cvDiurnal_kry.c` includes
+definitions of several private functions.  These are: :literal:`AllocUserData`
+to allocate space for :math:`J_{bd}`, :math:`P`, and the pivot arrays; :literal:`InitUserData`
+to load problem constants in the ``data`` block; :literal:`FreeUserData` to free
+that block; :literal:`SetInitialProfiles` to load the *initial values* in :math:`y`; 
+:literal:`PrintOutput` to *retreive* and *print* selected solution values and
+statistics; :literal:`PrintFinalStats` to *print* statistics; and :literal:`check_flag`
+to *check return values* for error conditions.
+
+Program output
+---------------
+
+The output generated by :literal:`cvDiurnal_kry.c` is shown below.  Note that the
+number of *preconditioner* evaluations, ``npe``, is much smaller than
+the number of *preconditioner* setups, ``nsetups``, as a result of the
+*Jacobian* re-use scheme.
+
+.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
+   :literal:
+
diff --git a/doc/cvode/examples/source/c_tests_deep.rst b/doc/cvode/examples/source/c_tests_deep.rst
new file mode 100644
index 0000000000..282f6ffc59
--- /dev/null
+++ b/doc/cvode/examples/source/c_tests_deep.rst
@@ -0,0 +1,25 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _tests_deep_c:
+
+=========================================================
+C example problems -- Parallel tests -- Deep Dive
+=========================================================
+
+
+
diff --git a/doc/cvode/examples/source/conf.py b/doc/cvode/examples/source/conf.py
new file mode 100644
index 0000000000..49da33c59a
--- /dev/null
+++ b/doc/cvode/examples/source/conf.py
@@ -0,0 +1,302 @@
+# ------------------------------------------------------------------------------
+# SUNDIALS Copyright Start
+# Copyright (c) 2002-2023, Lawrence Livermore National Security
+# and Southern Methodist University.
+# All rights reserved.
+#
+# See the top-level LICENSE and NOTICE files for details.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+# SUNDIALS Copyright End
+# ------------------------------------------------------------------------------
+
+import sys, os
+sys.path.append(os.path.dirname(os.path.abspath('../../../shared/versions.py')))
+from versions import *
+sys.path.append(os.path.dirname(os.path.abspath('../../../shared')))
+
+# -- General configuration ----------------------------------------------------
+
+# Set variable used to determine which package documentation this is
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# 'ida', 'idas', 'kinsol' or 'super'
+package_name = 'cvode-examples'
+
+# If your documentation needs a minimal Sphinx version, state it here.
+needs_sphinx = '4.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = ['sphinx_rtd_theme', 'sphinx.ext.ifconfig', 'sphinx.ext.mathjax',
+              'sphinxfortran.fortran_domain', 'sphinxcontrib.bibtex',
+              'sphinx_copybutton', 'sphinx_sundials']
+
+# References
+bibtex_bibfiles = ['../../../shared/sundials.bib']
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['../../../shared/_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'Example Programs for CVODE'
+copyright = """2002-{year}, Alan C. Hindmarsh, Radu Serban, Cody J. Balos, David J. Gardner, Daniel R. Reynolds, and Carol S. Woodward""".format(year = year)
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '{cvode_version}'.format(cvode_version=cvode_version)
+sun_version = '{sundials_version}'.format(sundials_version=sundials_version)
+
+# Set the date format (full-month-name day, full-year)
+today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+highlight_language = "c"
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+# Number figures, tables, and code blocks (can reference by number with numref)
+numfig = True
+
+# Override format strings that numref/numfig uses
+numfig_format = {
+  'section': '§%s'
+}
+
+rst_prolog = open('../../../shared/global.rst.txt', 'r').read()
+
+rst_epilog = """
+.. |YEAR| replace:: {year}
+.. |CVODE_VERSION| replace:: {cvode_version}
+.. |CVODES_VERSION| replace:: {cvodes_version}
+.. |ARKODE_VERSION| replace:: {arkode_version}
+.. |IDA_VERSION| replace:: {ida_version}
+.. |IDAS_VERSION| replace:: {idas_version}
+.. |KINSOL_VERSION| replace:: {kinsol_version}
+""".format(year = year,
+cvode_version = cvode_version,
+cvodes_version = cvodes_version,
+arkode_version = arkode_version,
+ida_version = ida_version,
+idas_version = idas_version,
+kinsol_version = kinsol_version
+)
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages.  See the documentation for
+# a list of builtin themes.
+html_theme = 'sphinx_rtd_theme'
+
+# Set theme options
+html_theme_options = {
+    # Allow unlimited depth in table of contents tree
+    'navigation_depth': -1
+}
+
+# The name for this set of Sphinx documents.  If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar.  Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+html_logo = 'figs/sundials_logo_blue.png'
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['../../../shared/_static']
+
+# These paths are either relative to html_static_path
+# or fully qualified paths (eg. https://...)
+html_css_files = [
+  'css/custom.css'
+]
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+html_show_sourcelink = False
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it.  The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'CVODEExampleDoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_additional_files = ['../../../shared/latex/preamble.tex.txt',
+                          '../../../shared/latex/cover_pages.tex.txt']
+
+im_number = "UCRL-SM-208108"
+
+# 1. the rst file name used to generate the LaTeX file
+# 2. the name of the LaTeX file to generate (and the resulting PDF file name)
+# 3. the document title
+# 4. text for \author
+# 5. the LaTeX theme
+# 6. include the file from 1. in the output
+tex_author = r'''
+Alan C. Hindmarsh$^1$,
+Radu Serban$^1$,
+Cody J. Balos$^1$,
+\\
+David J. Gardner$^1$,
+Daniel R. Reynolds$^2$, and
+Carol S. Woodward$^1$
+\\\\
+{\em $^1$Center for Applied Scientific Computing, Lawrence Livermore National Laboratory}\\
+{\em $^2$Department of Mathematics, Southern Methodist University}
+    '''
+
+latex_documents = [('index', 'cv_examples.tex', project,
+                    tex_author, 'manual', False)]
+
+# make sure the doc logo gets copied to the build directory
+latex_logo = 'figs/doc_logo_blue.pdf'
+
+# LaTeX customizations
+latex_elements = {
+# paper size option of the document class
+'papersize': 'letterpaper',
+# font size option of the document class
+'pointsize': '10pt',
+# set the version number/release name
+'releasename' : version,
+# arguments to the sphinxsetup macro
+'sphinxsetup':
+    # the color for titles
+    'TitleColor={RGB}{0,0,0},'+
+    # disable frames around code-blocks
+    'verbatimwithframe=false,'+
+    # do not wrap long lines in code-blocks
+    'verbatimwrapslines=false,'+
+    # background color for code-blocks
+    'VerbatimColor={RGB}{240.0,240.0,240.0},'+
+    # font used by heading
+    'HeaderFamily=\\rmfamily\\bfseries,' +
+    # line breaks are allowed inside inline literals
+    'inlineliteralwraps=true',
+# disable the fncychap package
+'fncychap':'',
+# figure alignment options
+'figure_align': 'htbp',
+# additional preamble content
+'preamble':
+    '\\input{preamble.tex.txt}\n'+
+    '\\newcommand{\\sunreleasename}{' + sun_version + '}\n' +
+    '\\newcommand{\\imnumber}{' + im_number + '}\n',
+# extra class options
+'extraclassoptions': 'twoside,openright',
+# custom maketitle
+'maketitle': '\\input{cover_pages.tex.txt}'
+}
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+    ('index', 'CVODE-examples', u'CVODE Example Documentation',
+     [u'Alan C. Hindmarsh, Radu Serban, Cody J. Balos, David J. Gardner, Daniel R. Reynolds, and Carol S. Woodward'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+#  dir menu entry, description, category)
+texinfo_documents = [
+  ('index', 'CVODE-examples', u'CVODE Example Documentation',
+   u'Alan C. Hindmarsh, Radu Serban, Cody J. Balos, David J. Gardner, Daniel R. Reynolds, and Carol S. Woodward', 'CVODE_example',
+   'Example programs for the CVODE time integration package for systems of ordinary differntial equations.',
+   'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
diff --git a/doc/cvode/examples/source/cpp_hypre.rst b/doc/cvode/examples/source/cpp_hypre.rst
new file mode 100644
index 0000000000..5a1aa23c58
--- /dev/null
+++ b/doc/cvode/examples/source/cpp_hypre.rst
@@ -0,0 +1,72 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _hypre_cpp:
+
+============================================
+Parallel Hypre C++ example problems
+============================================
+
+.. _cv_heat2D_hypre_ls:
+
+cv_heat2D_hypre_ls
+=============================
+
+Description
+------------
+
+skipped
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls_--np_2_2.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+skipped
+
+
+
+.. _cv_heat2D_hypre_pfmg:
+
+cv_heat2D_hypre_pfmg
+================================
+
+Description
+------------
+
+skipped
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg_--np_2_2.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+skipped
+
+
diff --git a/doc/cvode/examples/source/cpp_onemkl.rst b/doc/cvode/examples/source/cpp_onemkl.rst
new file mode 100644
index 0000000000..ed8d3248a4
--- /dev/null
+++ b/doc/cvode/examples/source/cpp_onemkl.rst
@@ -0,0 +1,94 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _onemkl_cpp:
+
+====================================
+OneMKL C++ example problems
+====================================
+
+.. _cvRoberts_blockdiag_onemkl:
+
+cvRoberts_blockdiag_onemkl
+==================================
+
+Description
+------------
+
+This example is a simple problem, with the coding needed for its
+solution completed via CVODE. The problem is from chemical kinetics,
+and consists of the following three rate equations:
+
+.. math::
+
+   \frac{dy_1}{dt} &= -0.04 \cdot y_1 + 10^4 \cdot y_2 \cdot y_3 \\
+   \frac{dy_2}{dt} &= -\frac{dy_1}{dt} - \frac{dy_3}{dt} \\
+   \frac{dy_3}{dt} &= 3 \times 10^7 \cdot y_2^2
+
+on the interval from :math:`t = 0.0` to :math:`t = 4 \times 10^{10}`,
+with initial conditions: :math:`y_1 = 1.0`, :math:`y_2 = y_3 = 0`.
+The problem is stiff.
+
+This program solves the problem with the BDF method, Newton iteration
+with the dense linear solver, and a user-supplied Jacobian routine.
+since the grouping of the independent systems results in a block diagonal linear
+system, with the oneMKL SUNLinearSolver.  Alternatively, the SPGMR linear
+solver may be used with a Jacobi preconditioner.
+
+The problem uses a scalar relative tolerance and a vector absolute tolerance. 
+Output is printed in decades from :math:`t = 0.1` to :math:`10^6`. Run statistics
+(optional outputs) are printed at the end.
+
+The program takes three optional argument: the number of independent ODE
+systems (default 100), a flag to use a direct (1, default) or iterative (0)
+linear solver, and a flag to enable (1, default) or disable (0) solution
+output:
+
+.. math::
+
+   /texttt{./cvRoberts\_blockdiag\_onemkl [number of groups] [solver type] [output]}
+
+This problem is comparable to the ``cvRoberts_block_klu.c`` example.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CPP_onemkl/cvRoberts_blockdiag_onemkl.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_ONEMKLDENSE linear solver via the CVode interface.  Alternatively,
+Newton can use SUNLINSOL_SPGMR linear solver via the CVode interface.  The
+example file contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)`
+and :math:`J(t, y_1, y_2, y_3)`.
+
+We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
+and :math:`atol=\begin{pmatrix} 10^{-8} \\ 10^{-14} \\ 10^{-6} \end{pmatrix}`
+, respectively.  Aside from these choices, this problem uses only the default
+CVode solver parameters.
+
+8 times are printed with 10 groups at each multiplicatively equally-spaced time-step,
+and run statistics are printed at the end.
+
+
diff --git a/doc/cvode/examples/source/cpp_parallel.rst b/doc/cvode/examples/source/cpp_parallel.rst
new file mode 100644
index 0000000000..ec69b71f77
--- /dev/null
+++ b/doc/cvode/examples/source/cpp_parallel.rst
@@ -0,0 +1,50 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _parallel_cpp:
+
+====================================
+Parallel C++ example problems
+====================================
+
+
+
+.. _cv_heat2D_p:
+
+cv_heat2D_p
+======================================================================
+
+Description
+------------
+
+Exactly the same as ``cv_heat2D`` in :ref:`serial_cpp` except that here we
+are using multiple processors with MPI.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CXX_parallel/cv_heat2D_p_--np_2_2.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The same as ``cv_heat2D`` aside from the use of NVECTOR_PARALLEL.
+
+
diff --git a/doc/cvode/examples/source/cpp_serial.rst b/doc/cvode/examples/source/cpp_serial.rst
new file mode 100644
index 0000000000..e80fd1f279
--- /dev/null
+++ b/doc/cvode/examples/source/cpp_serial.rst
@@ -0,0 +1,157 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _serial_cpp:
+
+====================================
+Serial C++ example problems
+====================================
+
+
+
+.. _cv_heat2D:
+
+cv_heat2D
+===============================================
+
+Description
+------------
+
+This test example simulates a simple anisotropic 2D heat equation,
+
+.. math::
+
+   u_t = k_x u_{xx} + k_y u_{yy} + b,
+
+for :math:`t` in :math:`[0, 1]` and :math:`(x, y)` in :math:`[0, 1]^2`,
+with initial conditions
+
+.. math::
+
+   u(0, x, y) = \sin^2 (\pi x) \sin^2 (\pi y) + 1,
+
+stationary boundary conditions
+
+.. math::
+
+   u_t (t, 0, y) = u_t (t, 1, y) = u_t (t, x, 0) = u_t (t, x, 1) = 0,
+
+and the heat source
+
+.. math::
+
+   b(t, x, y) = -2 \pi \sin^2(\pi x) \sin^2(\pi y) \sin(\pi t) \cos(\pi t)
+                -k_x 2 \pi^2 (\cos^2(\pi x) - \sin^2(\pi x)) \sin^2(\pi y) \cos^2(\pi t)
+                -k_y 2 \pi^2 (\cos^2(\pi y) - \sin^2(\pi y)) \sin^2(\pi x) \cos^2(\pi t).
+
+Under this setup, the problem has the analytical solution
+
+.. math::
+
+   u(t, x, y) =\sin^2(\pi x) \sin^2(\pi y) \cos^2(\pi t) + 1.
+
+The spatial derivatives are computed using second-order centered differences,
+with the data distributed over :math:`nx * ny` points on a uniform spatial grid. The
+problem is advanced in time with BDF methods using an inexact Newton method
+paired with the PCG or SPGMR linear solver. Several command line options are
+available to change the problem parameters and CVODE settings. Use the flag
+``--help`` for more information.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CXX_serial/cv_heat2D.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_PCG linear solver or the SUNLINSOL_SPGMR linear solver via the
+CVode interface.  The example file contains functions to evaluate both
+:math:`f(t,x,y)` and :math:`Pre\_Jac(t,x,y)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=0`
+and :math:`atol=10^{-8}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+12 outputs are printed, and run statistics are printed at the end as well.
+
+
+   
+.. _cv_kpr:
+
+cv_kpr
+================
+
+Description
+------------
+
+This example problem is otherwise known as the Kvaerno-Prothero-Robinson
+ODE test problem, structured in the following way
+
+.. math::
+
+   \begin{bmatrix} u' \\ v' \end{bmatrix} =
+   \begin{bmatrix} a & b \\ c & d \end{bmatrix}
+   \begin{bmatrix} \frac{-1 + u^2 - r(t)}{2u} \\ 
+                   \frac{-2 + v^2 - s(t)}{2v} \end{bmatrix} +
+   \begin{bmatrix} \frac{r'(t)}{2u} \\ \frac{s'(t)}{2v} \end{bmatrix}.
+
+This problem has an analytical solution given by
+
+.. math::
+
+   u(t) = \sqrt{1 + r(t)}
+   v(t) = \sqrt{2 + s(t)}
+
+where, in this test, we use the functions
+
+.. math::
+
+   r(t) = 0.5 \cos(t)
+   s(t) = \cos(2t)
+
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CXX_serial/cv_kpr.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t,u,v)` and :math:`J(t,u,v)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
+and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+10 outputs are printed, and run statistics are printed at the end as well.
+
+
diff --git a/doc/cvode/examples/source/cpp_sycl.rst b/doc/cvode/examples/source/cpp_sycl.rst
new file mode 100644
index 0000000000..bf239c1f1a
--- /dev/null
+++ b/doc/cvode/examples/source/cpp_sycl.rst
@@ -0,0 +1,51 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _sycl_cpp:
+
+====================================
+SYCL C++ example problems
+====================================
+
+.. _cvAdvDiff_kry_sycl:
+
+cvAdvDiff_kry_sycl
+==============================
+
+Description
+------------
+
+This example problem is a simple demonstration of the method
+used to incorporate SYCL into SUNDIALS.  Otherwise, it is exactly
+the same problem as ``cvAdvDiff_bnd`` from :ref:`serial_c` except
+that here we use the SUNDIALS SPGMR linear solver instead.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/CPP_sycl/cvAdvDiff_kry_sycl.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+As previously mentioned, the problem is exactly the same as ``cvAdvDiff_bnd``
+except that here we use SUNLINSOL_SPGMR and NVECTOR_SYCL for demonstration.
+
+
diff --git a/doc/cvode/examples/source/f2003_deep.rst b/doc/cvode/examples/source/f2003_deep.rst
new file mode 100644
index 0000000000..c025f86a76
--- /dev/null
+++ b/doc/cvode/examples/source/f2003_deep.rst
@@ -0,0 +1,174 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _deep_f2003:
+
+===================================================
+Fortran 2003 example problems -- Deep dive
+===================================================
+
+The **Fortran** example problem programs supplied with the **CVODE**
+package are all written in standard **Fortran 2003** and use *double precision
+arithmetic*.  Before running any of these examples, the user should
+make sure that the **Fortran** *data types* for *real* and *integer variables*
+appropriately match the **C** *types*.  See `SUNDIALS Fortran
+<https://sundials.readthedocs.io/en/latest/sundials/Fortran_link.html>`_ in the
+**SUNDIALS User Document** for details.
+
+
+
+.. _deep_dive.cv_diurnal_kry:
+
+A serial example: cv_diurnal_kry [DD]
+==============================================
+
+Description -- step-by-step
+----------------------------
+
+The :literal:`cv_diurnal_kry` example is a **Fortran** equivalent of the :literal:`cvDiurnal_kry` problem.
+(In fact, it was derived from an *earlier* **Fortran** *example program* for **VODPK**.)
+
+The :literal:`main` program begins with several declarations, creating the **SUNDIALS** *context*
+pointer via :literal:`FSUNContext_Create`, creating the **SUNDIALS NVector** pointers
+via :literal:`FN_VNew_Serial`, initializing the **SUNDIALS NVector** external pointer
+(to assist with *data modification*) via :literal:`FN_VGetArrayPointer`, and dual ``do``
+loops to initialize our :math:`u_{vec}` via embedded :math:`x`, :math:`y`, :math:`c_x`,
+and :math:`c_y`.  With this we have successfully initialized the **NVECTOR_SERIAL** module via **SUNDIALS**.
+:literal:`main` then calls :literal:`FCVodeCreate` and :literal:`FCVodeInit` as per usual, thereby
+initializing the **FCVODE** interface with ``CV_BDF``.  :literal:`FCVodeSetMaxNumSteps` and
+:literal:`FCVodeSStolerances` are then called to set the *maximum number of steps* per solve to be
+:math:`1000` and initialize *scalar tolerances*.  :literal:`FSUNLinSol_SPGMR`, :literal:`FSUNLinSol_SPGMRSetGSType`,
+and :literal:`FCVodeSetLinearSolver` are then called to initialize the **SUNLinSol_SPGMR** module with specific
+``iGStype`` characteristics to the pointer ``sunls``.  :literal:`main` then calls :literal:`FCVodeSetPreconditioner`
+to specify *user-supplied preconditioner setup* and *solve* routines.  Then, via a ``do`` loop,
+:literal:`main` calls :literal:`FCVode` in a loop over :math:`t_{out}` values, meanwhile printing
+selected *solution values* and *performance data*, getting ``lnst`` from :literal:`FCVodeGetNumSteps`
+and ``lh`` from :literal:`FCVodeGetCurrentStep`.  At the end, it prints a number of performance counters,
+via the user sub-routine :literal:`CVodeStats`, such as:
+
+* ``nsteps`` (total internal steps taken),
+* ``nfe`` (total *right-hand side* function calls),
+* ``npe`` (total number of *preconditioner* evaluations),
+* ``nps`` (total number of *preconditioner* solves),
+* ``netfails`` (number of *error test fails*),
+* ``nniters`` (number of *nonlinear iterations*),
+* ``nliters`` (number of *linear iterations*),
+* ``avdim`` :math:`\bigg(` average *Krylov space dimension* :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
+* ``ncf`` (number of *nonlinear convergence failures*),
+* ``ncfl`` (number of *linear convergence failures*),
+* ``lenrw`` and ``leniw`` (main solver *real/int workspace size*)
+* ``lenrwls`` and ``leniwls`` (linear solver *real/int workspace size*),
+
+frees memory with calls to :literal:`FCVFree`, :literal:`FN_VDestroy`, :literal:`FSUNLinSolFree`,
+and :literal:`FSUNContext_Free`.
+
+In :literal:`cv_diurnal_kry.f90`, or more specifically, in the :literal:`diurnal_mod` module,
+we have that the :literal:`RhsFn` function is a straghtforward implementation of
+the discretized form of Equations (:math:numref:`cvDiurnalpde`).  In :literal:`PreSet`, the *block-diagonal*
+part of the *Jacobian*, :math:`J_{bd}`, is computed (and copied to :math:`p`) if :math:`jok = 0`
+via the subroutine :literal:`Prec_Jac`, but is simply copied from :math:`bd` to :math:`p` if
+:math:`jok = 1`.  In both cases, the *preconditioner matrix* :math:`p` is formed from 
+:math:`J_{bd}` and its :math:`2 \times 2` blocks are *'LU-factored'* via the subroutine
+:literal:`Prec_LU`, which serves as a sort of *block-by-block inversion* of :math:`p_{2 \times 2} - I_2`.
+In :literal:`PreSolve`, the solution of a linear system :math:`Px = z` is solved by doing *backsolve
+operations* on the :math:`2 \times 2` blocks.  This is done by, first, copying :math:`r` into :math:`z`.
+Then, the subordinate routine :literal:`Prec_Sol` is used to perform *matrix-vector multiplication* to
+finally perform our *backsolve*.  The remainder of :literal:`cv_diurnal_kry.f90` previously consisted of, now
+defunct per our problem's functional requisites, routines from **LINPACK** and the **BLAS** needed for
+*matrix* and *vector* operations.
+
+Program output
+---------------
+
+The following is sample output from :literal:`cv_diurnal_kry`, using a :math:`10 \times 10` mesh.
+The performance of **FCVODE** here is quite similar to that of **CVODE** on the :literal:`cvDiurnal_kry`
+problem, as expected.
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
+   :literal:
+
+
+.. _deep_dive.cv_diag_kry_bbd_p:
+
+A parallel example: cv_diag_kry_bbd_p [DD]
+===================================================
+
+Description -- step-by-step
+----------------------------
+
+This example, :literal:`cv_diag_kry_bbd_p`, uses a simple diagonal ODE system to illustrate
+the use of **FCVODE** in a *parallel* setting.  The system is then
+
+.. math::
+   :label: diagode
+
+   \dot y_i = -\alpha ~i~ y_i ~~~ (i = 1, \ldots, N)
+
+on the time interval :math:`0 \leq t \leq 1`.  In this case, we use :math:`\alpha = 10`
+and :math:`N = 10 * nprocs`, where ``nprocs`` is the *number of processors* specified at run time.
+The *linear solver* to be used is **SPGMR** with the **CVBBDPRE** (*band-block-diagonal*) *preconditioner*.
+Since the system *Jacobian* is *diagonal*, the *half-bandwidths* specified are all *zero*.  The problem
+is solved twice --- with *preconditioning on the left*, then *on the right*.
+
+The source file for this problem begins with **MPI** calls to *initialize* **MPI** and to get the *number
+of processors* and *local processor index*, or ``nprocs`` and ``nlocal`` respectively.  This is done via
+the **MPI** subroutines :literal:`MPI_Init`, :literal:`MPI_Comm_size`, and :literal:`MPI_Comm_rank`.
+:literal:`FSUNContext_Create`, :literal:`FCVodeCreate`, and :literal:`FCVodeInit` are called as usual.
+:literal:`FN_VNew_Parallel` is then called to initialize the **MPI-parallel NVector** module so that we
+can use :literal:`FN_VGetArrayPointer` as per usual, while :literal:`FSUNLinSol_SPGMR` :literal:`FCVodeSetLinearSolver`,
+and :literal:`FSUNLinSol_SPGMRSetGSType` are called as per usual to initialize the **SPGMR SUNLinSol** module
+and attach the *linear solver* to **FCVODE**.
+Following the call to :literal:`FCVodeSStolerances`, the *preconditioner* is attached to **FCVODE** with calls to
+:literal:`FCVBBDPrecInit`.  Then, via a ``do`` loop over ``iPreType``, we have several ``if`` statements, specific
+to ``iPreType``.  In the first one, we consider :code:`iPreType == 2`, calling :literal:`FCVodeReInit`,
+:literal:`FCVBBDPrecReInit`, and :literal:`FSUNLinSol_SPGMRSetPrecType` to *re-initialize* with *preconditioning
+on the right*, as stated in the *print* statement.  This is all that is needed to prepare for the second run of our
+Diagonal PDE.  Meanwhile, in the second one, while :code:`iPreType == 1`, we only *print* out the noted fact that
+we now have *preconditioning on the left*.  After this, in a loop over :math:`t_{out}` values, it calls
+:literal:`FCVode` and *prints* the *step* and :math:`f` *evaluation counters*. After that, it *computes* and *prints*
+the *maximum global error* via :literal:`MPI_Reduce`. Afterwards, it *computes* and *prints* all the relevant performance
+counters, such as:
+
+* ``nst`` (internal *solver steps*),
+* ``nfe`` (total *right-hand side* evaluations),
+* ``npre`` (total *preconditioner* setups),
+* ``npsol`` (total *preconditioner* solves),
+* ``nni`` (total *nonlinear iterations*),
+* ``nli`` (total *linear iterations*),
+* ``avdim`` :math:`\bigg(` average *Krylov subspace dimension* :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
+* ``ncfn`` (total *convergence failures* -- *nonlinear*),
+* ``ncfl`` (total *convergence failures* -- *linear*),
+* ``netf`` (total number of *error test failures*),
+* ``lenrw`` and ``leniw`` (main solver *real/int workspace sizes*),
+* ``lenrwls`` and ``leniwls`` (linear solver *real/int workspace sizes*),
+* ``lenrwbbd`` and ``leniwbbd`` (*BBD preconditioner real/int workspace sizes*),
+* ``ngebbd`` (total number of :math:`g` *evaluations* by *BBD preconditioner*).
+
+Finally, it *frees memory* and terminates **MPI** via the subroutines :literal:`FCVodeFree`, :literal:`FN_VDestroy`,
+:literal:`MPI_Barrier`, and :literal:`MPI_Finalize`.  Notice that in the :literal:`firhs` function, outside of
+the main :literal:`driver` routine, the local processor index ``myid`` and the local vector size ``nlocal``
+are used to form the *module-specific index values* needed to evaluate the *right-hand side* of our Equation (:math:numref:`diagode`). 
+
+Program output
+---------------
+
+The following is a sample output from :literal:`cv_diag_kry_bbd_p`, with `nprocs = 4`.
+As expected, the performance is identical for *left* vs *right preconditioning*.
+
+.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
+   :literal:
+
diff --git a/doc/cvode/examples/source/f2003_parallel.rst b/doc/cvode/examples/source/f2003_parallel.rst
new file mode 100644
index 0000000000..fe62ad8411
--- /dev/null
+++ b/doc/cvode/examples/source/f2003_parallel.rst
@@ -0,0 +1,156 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _parallel_f2003:
+
+=========================================
+Parallel Fortran 2003 example problems
+=========================================
+
+
+
+.. _cv_diag_kry_bbd_p:
+
+cv_diag_kry_bbd_p
+=========================
+
+Description
+------------
+
+As described in [HSR2017]_, this problem models a stiff, linear, diagonal
+ODE system,
+
+.. math::
+
+   \frac{\partial y_i}{\partial t} = -\alpha i y_i, \quad i=1,\ldots N.
+
+
+Here :math:`\alpha=10` and :math:`N=10 * N_P`, where :math:`N_P` is the
+number of MPI tasks used for the problem.  The problem has initial
+conditions :math:`y_i=1` and evolves for the time interval :math:`t\in
+[0,1]`.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+This program solves the problem with a BDF method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver module and CVode interface.
+
+A diagonal preconditioner matrix is used, formed automatically through
+difference quotients within the CVBBDPRE module.  Since CVBBDPRE is
+developed for use of a block-banded preconditioner, in this solver
+each block is set to have half-bandwidths ``mudq = mldq = 0`` to
+retain only the diagonal portion.
+
+Two runs are made for this problem, first with left and then with
+right preconditioning (``iPre`` is first set to :math:`1` and then to :math:`2`).
+
+Performance data is printed at equally-spaced output times, and maximum
+errors and final performance counters are printed on completion. 
+
+
+
+.. _cv_diag_kry_p:
+
+cv_diag_kry_p
+=================
+
+Description
+------------
+
+This is basically the same probelm mathematically as is described above
+in ``cv_diag_kry_bbd_p``.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_f2003.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+This program solves the problem with a BDF method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver module and CVode interface.
+
+A user-supplied preconditioner matrix is used, where in the solver
+routine uses a diagonal preconditioner :math:`P = I - \gamma \cdot J`,
+where :math:`J` is a diagonal approximation to the true Jacobian, given by:
+
+.. math::
+
+   J = diag(0, 0, 0, -4 \alpha, \ldots, -N \alpha).
+
+The vector :math:`r` is copied to :math:`z`, and the inverse of :math:`P`
+(restricted to the local vector segment) is applied to the vecdtor :math:`z`. 
+
+Performance data is printed at equally-spaced output times, and maximum
+errors and final performance counters are printed on completion. 
+
+
+
+.. _cv_diag_non_p:
+
+cv_diag_non_p
+=================
+
+Description
+------------
+
+As described in [HSR2017]_, this problem models a nonstiff, linear, diagonal
+ODE system,
+
+.. math::
+
+   \frac{\partial y_i}{\partial t} = -\alpha i y_i, \quad i=1,\ldots N.
+
+
+Here :math:`\alpha=\frac{10}{N}` and :math:`N=10 N_P`, where :math:`N_P` is the
+number of MPI tasks used for the problem.  The problem has initial
+conditions :math:`y_i=1` and evolves for the time interval :math:`t\in [0,1]`.
+
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_non_f2003.out
+   :literal:
+
+
+Numerical method
+-----------------
+
+This program solves the problem with an ADAMS method, using a Fixed-point
+iteration and CVode interface.
+
+Performance data is printed at equally-spaced output times, and maximum
+errors and final performance counters are printed on completion.
+
+
diff --git a/doc/cvode/examples/source/f2003_serial.rst b/doc/cvode/examples/source/f2003_serial.rst
new file mode 100644
index 0000000000..c67407aeb0
--- /dev/null
+++ b/doc/cvode/examples/source/f2003_serial.rst
@@ -0,0 +1,576 @@
+..
+   Programmer(s): Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+:tocdepth: 3
+
+
+.. _serial_f2003:
+
+=======================================
+Serial Fortran 2003 example problems
+=======================================
+
+
+
+.. _cv_advdiff_bnd:
+
+cv_advdiff_bnd
+===================================================
+
+Description
+------------
+
+This simple example problem is a serial Fortran 2003 implementation of
+previous serial C example ``cvAdvDiff_bnd``.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The numerical method is identical to the previous implementation,
+except that we now use Fortran 2003.
+
+
+
+.. _cv_analytic_fp:
+
+cv_analytic_fp
+===================================================
+
+Description
+------------
+
+This is a simple example problem with an analytical solution.
+Our problem is then:
+
+.. math::
+
+   \frac{dy}{dt} = \lambda \cdot y + \frac{1}{1 + t^2} - \lambda \cdot \text{atan} (t)
+
+for :math:`t` in the interval :math:`[0.0, 10.0]`, with initial
+condition :math:`y = 0`.
+
+The stiffness of the problem is directly proportional to the value
+of :math:`\lambda`. The value of :math:`\lambda` should be negative
+to result in a well-posed ODE; for values with magnitude larger than
+100, the problem becomes quite stiff.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_fp_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Adams-Moulton
+methods.  Each stage is solved using the SUNDIALS Fixed-point iteration.
+The example file contains a function to evaluate :math:`f(t,y)`.
+
+We specify the relative and absolute tolerances, :math:`rtol = 10^{-6}`
+and :math:`atol = 10^{-10}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+Output is printed every 1.0 units of time (10 total).
+Run statistics (optional outputs) are printed at the end.
+
+
+
+.. _cv_analytic_sys_dns:
+
+cv_analytic_sys_dns
+===================================================
+
+Description
+------------
+
+This is a simple example problem with an analytical solution.
+Our problem is then:
+
+.. math::
+
+   \frac{dy}{dt} = A * y
+
+where :math:`A = V * D * V^{-1}` and
+
+.. math::
+
+   A &=\begin{pmatrix} \frac{\lambda}{4} - \frac{23}{40} & 
+                       \frac{\lambda}{4} - \frac{3}{40} &
+                       \frac{\lambda}{4} - \frac{13}{40} \\
+                       \frac{\lambda}{4} + \frac{21}{40} &
+                       \frac{\lambda}{4} + \frac{1}{40} &
+                       \frac{\lambda}{4} - \frac{11}{40} \\
+                       \frac{\lambda}{2} + \frac{1}{20} &
+                       \frac{\lambda}{2} + \frac{1}{20} &
+                       \frac{\lambda}{2} - \frac{1}{20} &
+       \end{pmatrix} \\
+   V &=\begin{pmatrix} 1 & -1 & 1 \\
+                       -1 & 2 & 1 \\
+                       0 & -1 & 2
+       \end{pmatrix} \quad
+   D = \begin{pmatrix} -\frac{1}{2} & 0 & 0 \\
+                       0 & -\frac{1}{10} & 0 \\
+                       0 & 0 & \lambda
+       \end{pmatrix} \quad
+   V^{-1} = \begin{pmatrix} \frac{5}{4} & \frac{1}{4} & -\frac{3}{4} \\
+                            \frac{1}{2} & \frac{1}{2} & -\frac{1}{2} \\
+                            \frac{1}{4} & \frac{1}{4} & \frac{1}{4}
+            \end{pmatrix}
+
+and :math:`\lambda` is a large negative number. The analytical solution
+to this problem is:
+
+.. math::
+
+   y(t) = V * e^{D \cdot t} * V^{-1} * y_0
+
+for :math:`t` in the interval :math:`[0.0, 0.05]`, with initial condition:
+:math:`y(0) = \begin{bmatrix} 1 \\ 1 \\ 1 \end{bmatrix}`.
+
+The stiffness of the problem is directly proportional to the value of :math:`\lambda`.
+The value of :math:`\lambda` should be negative to result in a well-posed ODE;
+for values with magnitude larger than 100 the problem becomes quite stiff.
+
+In this example, we choose :math:`\lambda = -100`.
+
+Output is printed every 1.0 units of time (10 total).
+Run statistics (optional outputs) are printed at the end.
+
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains a function to evaluate :math:`f(t,y)`.  
+
+We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
+and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
+this problem uses only the default CVode solver parameters.
+
+
+.. _cv_analytic_sys_dns_jac:
+
+cv_analytic_sys_dns_jac
+===================================================
+
+Description
+------------
+
+This problem is exactly the same as :ref:`cv_analytic_sys_dns` above except
+that here, as the title suggests, we provide a user-supplied Jacobian function.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_jac_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+As previously stated, this problem is the same as ``cv_analytic_sys_dns``
+apart from the example file containing another function to evaluate our
+Jacobian denoted :math:`J(t,y)`.
+
+
+
+.. _cv_analytic_sys_klu:
+
+cv_analytic_sys_klu
+===================================================
+
+Description
+------------
+
+This problem is exactly the same as :ref:`cv_analytic_sys_dns` above except
+that here, as the title suggests, we use sparse matrices to operate the
+KLU linear solver module using the CVode interface.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_klu_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Again, this problem is the same as ``cv_analytic_sys_dns`` apart from
+using SUNLINSOL_KLU and consequentially, SUNMATRIX_SPARSE as well.
+
+
+.. _cv_brusselator_dns:
+
+cv_brusselator_dns
+===================================================
+
+Description
+------------
+
+This problem has 3 components, :math:`Y = \begin{bmatrix} u \\ v \\ w \end{bmatrix}`,
+that depend on the independent variable :math:`t` satisfying the
+equations,
+
+.. math::
+
+   \frac{du}{dt} &= a - (w + 1) u + v u^2, \\
+   \frac{dv}{dt} &= w u - v u^2, \\
+   \frac{dw}{dt} &= \frac{b - w}{\varepsilon} - w u.
+
+We integrate over the interval :math:`0 \leq t \leq 10`, with the
+initial conditions :math:`Y_0 = \begin{bmatrix} u(0) = 3.9 \\ v(0) = 1.1 \\ w(0) = 2.8 \end{bmatrix}`,
+and parameters :math:`a = 1.2`, :math:`b = 2.5` and :math:`\varepsilon = 10^{-5}`.
+
+Here, all three components exhibit a rapid transient change during
+the first :math:`0.2` time units, followed by a slow and smooth evolution.
+After each unit time interval, the solution is output to the screen.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_brusselator_dns_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Since this driver and utility functions are written in Fortran 2003,
+this example demonstrates the use of the FCVODE interface for the
+CVode solver.  For time integration, the solver uses a BDF method.
+The implicit systems are solved using the built-in modified Newton
+iteration, with the SUNMATRIX_DENSE matrix module and accompanying
+SUNLINSOL_DENSE linear solver module, through the CVode interface.
+Both the Jacobian routine and right-hand side functions are supplied
+by functions provided in the example file.
+
+The only non-default solver options are the tolerances
+:math:`atol=10^{-10}` and :math:`rtol=10^{-6}`, adaptivity method 2 (I
+controller), a maximum of 8 Newton iterations per step, a nonlinear
+solver convergence coefficient :math:`nlscoef=10^{-8}`, and a maximum
+of :math:`1000` internal time steps.
+
+
+
+.. _cv_diurnal_kry_bp:
+
+cv_diurnal_kry_bp
+===================================================
+
+As described in [HSR2017]_, this problem models a two-species diurnal
+kinetics advection-diffusion PDE system in two spatial dimensions,
+
+.. math::
+
+   \frac{\partial c_i}{\partial t} = 
+     K_h \frac{\partial^2 c_i}{\partial x^2} + 
+     V \frac{\partial     c_i}{\partial x} + 
+     \frac{\partial}{\partial y}\left( K_v(y) 
+     \frac{\partial c_i}{\partial y}\right) + 
+     R_i(c_1,c_2,t),\quad i=1,2 
+
+where
+
+.. math::
+
+   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
+   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
+   K_v(y) &= K_{v0} e^{y/5}.
+
+Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
+and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
+vary diurnally.  The problem is posed on the square spatial domain
+:math:`(x,y) \in [0,20] \times [30,50]`, with homogeneous Neumann
+boundary conditions, and for time interval :math:`t \in [0,86400]` sec
+(1 day).
+
+We enforce the initial conditions 
+
+.. math::
+
+   c^1(x,y) &=  10^6 \chi(x) \eta(y) \\
+   c^2(x,y) &=  10^{12} \chi(x) \eta(y) \\
+   \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac{1}{2} \sqrt[4]{\frac{x - 10}{10}} \\
+   \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac{1}{2} \sqrt[4]{\frac{x - 10}{10}}.
+
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+We employ a method of lines approach, wherein we first semi-discretize
+in space to convert the system of 2 PDEs into a larger system of ODEs.
+To this end, the spatial derivatives are computed using second-order
+centered differences, with the data distributed over :math:`Mx*My`
+points on a uniform spatial grid.  As a result, CVode approaches the
+problem as one involving :math:`2*Mx*My` coupled ODEs. In this
+problem, we use a relatively coarse uniform mesh with
+:math:`Mx = My = 10`.  
+
+This program solves the problem with a BDF method, using a Newton
+iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
+solver module, and the CVODE interface.
+
+The left preconditioner used is a banded matrix, constructed using
+the CVBANDPRE module.  The banded preconditioner matrix is generated using 
+difference quotients, with half-bandwidths ``mu = ml = 2``.
+
+Performance data and sampled solution values are printed at
+selected output times, and all performance counters are printed
+on completion.
+
+
+
+.. _cv_diurnal_kry:
+
+cv_diurnal_kry
+===================================================
+
+Description
+------------
+
+This problem is almost exactly similar to :ref:`cv_diurnal_kry_bp` above,
+except here, we don't use the built in Banded Preconditioner, instead
+supplying one. Interestingly, in doing so, we estimate a banded
+preconditioner with ``mu = ml = 2`` as before using only a :math:`2 \times 2`-
+block-diagonal matrix, treating each :math:`2 \times 2` block separately,
+and finding the inverse of each block as they're added to the identity.
+This method is employed to setup our user-supplied Preconditioner.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Instead of relying on CVBANDPRE as previously, we use CVSETPRECONDITIONER instead.
+Interestingly, in doing so, we estimate a banded preconditioner with ``mu = ml = 2``
+as before using only a :math:`2 \times 2`-block-diagonal matrix, treating each
+:math:`2 \times 2` block separately, and finding the inverse of each block as they're
+added to the identity.  This method is employed to setup our user-supplied Preconditioner.
+For our Preconditioner's solver, we employ :math:`2 \times 2` matrix-vector multiplication.
+
+
+
+.. _cv_roberts_dns:
+
+cv_roberts_dns
+===================================================
+
+Description
+------------
+
+This problem is exactly the same problem as the C serial problem
+``cvRoberts_dns`` aside from using FCVODE as a consequence of running
+in Fortran 2003.  The details are significant enough to mention again.
+
+This example is a simple problem, with the coding needed for its
+solution completed via CVODE.  The problem is from chemical kinetics,
+and consists of the following three rate equations:
+
+.. math::
+
+   \frac{dy_1}{dt} &= -0.04 \cdot y_1 + 10^4 \cdot y_2 \cdot y_3 \\
+   \frac{dy_2}{dt} &= 0.04 \cdot y_1 - 10^4 \cdot y_2 \cdot y_3 - 3 \times 10^7 \cdot y_2^2 \\
+   \frac{dy_3}{dt} &= 3 \times 10^7 \cdot y_2^2
+
+on the interval from :math:`t = 0.0` to :math:`t = 4 \times 10^{10}`,
+with initial conditions: :math:`y_1 = 1.0`, :math:`y_2 = y_3 = 0`.
+The problem is stiff.
+
+While integrating the system, we also use the rootfinding feature to
+find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`. 
+This program solves the problem with the BDF method, Newton iteration
+with the dense linear solver, and a user-supplied Jacobian routine.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+The example routine solves this problem using a Backwards Differentiation
+Formula in fixed-leading coefficient form.  Each stage is solved using the 
+built-in modified Newton iteration.  Internally, Newton will use the
+SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and 
+:math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
+as previously mentioned, find roots at :math:`y_3 = 0.01` and 
+:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
+
+We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
+and :math:`atol=\begin{Bmatrix} 10^{-8} \\ 10^{-14} \\ 10^{-6} \end{Bmatrix}`
+, respectively.  Aside from these choices, this problem uses only the default
+CVode solver parameters.
+
+11 normal + 2 root output times are printed at multiplicatively equally-spaced
+points as well as at the two roots, and run statistics are printed at the end.
+
+
+.. _cv_roberts_dns_constraints:
+
+cv_roberts_dns_constraints
+===================================================
+
+Description
+------------
+
+This example problem is the same as :ref:`cv_roberts_dns` above except that the
+constraint :math:`y_i \geq 0` is posed for all components :math:`i = 1, 2, 3`.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_constraints_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Here, we specify the scalar relative and vector-valued absolute tolerances,
+:math:`rtol=10^{-4}` and :math:`atol=\begin{Bmatrix} 10^{-6} \\ 10^{-11} \\ 10^{-5} \end{Bmatrix}`
+, respectively.
+
+Aside from this, see ``cv_roberts_dns`` above.
+
+
+.. _cv_roberts_dnsL:
+
+cv_roberts_dnsL
+===================================================
+
+As described in [HSR2017]_, this problem models
+the kinetics of a three-species autocatalytic reaction.  This is an
+ODE system with 3 components, :math:`Y = \begin{bmatrix} y_1 \\ y_2 \\ y_3 \end{bmatrix}`,
+satisfying the equations, 
+
+.. math::
+
+   \frac{d y_1}{dt} &= -0.04 y_1 + 10^4 y_2 y_3, \\
+   \frac{d y_2}{dt} &= 0.04 y_1 - 10^4 y_2 y_3 - 3 \cdot 10^7 y_2^2, \\
+   \frac{d y_3}{dt} &= 3 \cdot 10^7 y_2^2.
+
+We integrate over the interval :math:`0 \leq t \leq 4 \cdot 10^{10}`, with initial
+conditions  :math:`Y(0) = \begin{bmatrix} 1 \\ 0 \\ 0 \end{bmatrix}`. 
+
+Additionally, we supply the following two root-finding equations:
+
+.. math::
+
+   g_1(u) = u - 10^{-4}, \\
+   g_2(w) = w - 10^{-2}.
+
+While these are not inherently difficult nonlinear equations, they
+easily serve the purpose of determining the times at which our
+solutions attain desired target values.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dnsL_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+This program solves the problem with a BDF method, using a Newton
+iteration with the SUNLINSOL_LAPACKDENSE linear solver module and
+CVode interface.
+
+As with the :ref:`cv_roberts_dns` problem, we enable CVode's
+rootfinding module to find the times at which either :math:`u=10^{-4}`
+or :math:`w=10^{-2}`. 
+
+Performance data and solution values are printed at
+selected output times, along with additional output at root-finding
+events.  All performance counters are printed on completion.
+
+
+
+
+
+.. _cv_roberts_klu:
+
+cv_roberts_klu
+===================================================
+
+Description
+------------
+
+This example problem is the same as :ref:`cv_roberts_dns` above except that
+here we use the KLU sparse linear solver instead of the dense linear
+solver.
+
+
+Problem output
+---------------
+
+.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_klu_f2003.out
+   :literal:
+
+
+Numerical method
+----------------
+
+Aside from using SUNLINSOL_KLU, see ``cv_roberts_dns`` above.
+
+
diff --git a/doc/cvode/examples/source/figs/sundials_logo_blue.png b/doc/cvode/examples/source/figs/sundials_logo_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..e81055c3d721a96f8c5b8bc5058b9d4d3ba91122
GIT binary patch
literal 40321
zcmXtf1yoht^Y*zkNO#Ajkq!ZAymU!PBaL)-U8O;~L%^$`paLQS5`rKNA|NfHbV+x8
zoA>wqS&QZ3dhR~^%$|AXnP=w2Kh#zsz@x>3Ac#Os6`=<~XzJkC8V3t}@>R9i75szY
zqo`(p1Aanr?Bc-RxSpyeJ`lvubNdTRelm6fKBVzgGWON?aPSSV_O^!t0s{D*++BQZ
ztv&7eJ-i(Y{z=n95HqBPP%sEA+?ovvHTU}>w>xwo^NHQbbZt&gp^hK9wScCoz*m;%
zGmVN&NC^Hjeg(HY3O?e|twPNe(^-<MQ_27CDRo<6<IWsGAOwDvB^YJLC}ozG-gV2K
z`XM>AlaeR@B!k0eWuVZc=w!1q@m}6eKoN(CW6^;{k$?gYOB6A?J$08WL?w6-jqrWy
zHp8^Nws!h%-YdQX^O8^=T=3R`kB_h7%^OD;iACE06<R}F-n_(Nn8UGvgb;^XW)!g^
z4iTSugW%7fKRsj0oT!8kFlA(9b|AqsRopZ^^_o&)_V{#g(VsM9-ZJ)#-f+m8hP#3=
zoeP&GVZ-ANl`?5k5)+0eCQ<~_#N5RrbHnspt&GHu@KFn>Uv^1V475A>H~VXHlKMye
zi$w`-p}!>2`r+8jQEx3%HqWQxySn7ijd86=kTj4eq#t)CY;)cDysIm=e)Bx^F*-#%
ztIz5WcJXbyjSrz}D7GlB1kU_|Ay_p{TeA>ja2<j4ZlKSB6FZJZ9BR5XqV*j@EmPq3
zp^8FyDGS=vKcnS}{@@rjE+1dD{n%*J#g6!RbaK+9o*AdAoY|Mjrml!Hqzm7Zgt}M9
zuyW^%)h#Sur$%wbBjA5{bZdAuNdNcr?LL}^LPp!Ua$A19iUw#VuMEDj>5?i2IyY77
zurFZb3=V}>lymPeJW$L`bQ&$|wfV=x3XImSpX{c?UlP=Vi$N=MM>&pEgCirI%aG>3
z4Wi^rT9GU7dGBtU2r6b8^JIBvaoG!l|NGyzbOuwpAEQ-w+aI(RH(Pfo2rQDIGC8#J
z*_L4y&u{m=BUI%xhJTtg@e)T@-CZT~|17jysJDR)kp|tH(fPKJ)ETD|r`KyITuI8V
zHOi*TqknsD(&BQA^V*1FbiujA)(!-doc;DRL+5jiIPWa&H|+oaq68ZS>95b?WMRyb
zT@SGH)>z+kEq*AC(}=Ul7qou%{Qp0O(kEud$JSCmrl9aU3qNOFBO!Or8QINWftNo<
zR5+tfervb%(w6R1>`Fl_2)_`0m2NU<uGMg2leMi}y<BaeSzO3x<?)ckNBCkusA3>@
zMsKR#S&Bl>FSE0Bgc^=6>1zH8Gm<a7n*||clCAXeVb6|WRIJ^G7Vzv{)v&OZ_qr9r
z!oV?z4LK+i#|Q`sm7jfEc<p<i0gh6Jeu{1*-Db2oGJ=8@yOPkuyG@dK`_skL4V6jR
zL1a9Pu@*%OltO;WJF|m0(IvR^G_?)Yzty=t$v@s$%%f4~j_R;pYm|i+FrgNR(RM}d
zZfWD<-f4gMrJ1t@GjS?{o9LtQd;T=l!tzX0sDz{q;ZUTCAj>_2kXHkt^4v#wA}7a3
zM>2D>vohm^ze&`}{lIOR2L}h=aF@;zE$Bh3-)876v389dz82&~3=a?Qy^jr>h$<^9
zb9yRoW%PC1b*5-+YU;};Y9Yf&@M(3KQ({~X<SC2PPn~y}N82SwwnA%gxJZ$VyOZYa
z*{b&mK39eZM=nbE<epJO-DnaqaWU7w-SbykFX-%phW%O?+b9MuhY*K#q%wTy4LNzO
zQ*(3It?a=+66#&2YSy#umt}ZV5F+-XJDxGt16C_Tum-F)1EMAe$P89HRTt*y=(sws
z5>les5??`?*vSC`D)yf1WcAFBv9p4^+rWEyX3uACGoRw0P$J2o0S=VOfOJ8gqmZK`
zO`LMGQAlGHi&26SH2!@5fQJ%o*Bu^QZ%ut;YclR=|J~NL&aEGc!nXNn%$27Zo|o5(
zW2Hz^^emMjO-5(5meOKkf~Pcma(w)F_a#v#Le1a<Fp6ZkLEkUYZ3U?KNUF%Wbn{#Q
zR*1PUX(v2YlKE^=B9>j@LGQ4{z@EhS1V@wc6?x`V81doaS>9PoewjtZ=6S5<=<fv;
z{H*pGUfQqxuFZB6GcNfB1ypPqz4K^+`te1=&;nk!SLIK?tNJphuMwx>rP9c^>cdYC
zFXfr5v+{=6P|J;#OgjOZhFciW9Y{3rS23G<>|`|vTPSvRJ$up)^6C)GzMxkzNkqUa
zl{3?OU$d!0_#J^cdK)a6{A$4r@ZkNQRRG{BlC7z8$aJZYG+zXwb4|vZ$#F?q7QAvs
zZ9nE3Y)N5|xE)GiK`@7}CKE?Qrwpo}(=0sXMQJU12HYTyb8<A1gYDRGT~c;kL;Q}0
z>^w8rFQS|KBw@bmBc+_@<c|z(S5{^I>DdeCO);LB?DetfqSd%aJ>oN|St4&m=T>pw
z<QfY`ktZpqu%MctUuV=^JDQ`HGcO<C+B!P=4i%QKMQeOs#PhVr6ACkRt&cVuoM9v_
zYktMx+zw}06kq;)1YKMvv%X2r^N86hlzqM^Q5nt=85t?|f{VK}9M39$$eR9MK87lI
zRHQX^68Le0WW~B3$o=~LySap1XpFSmtGOr`9Vt%!awuVZdfFL%aw&lRLGBsqiD+>2
zyjLb&ebbzC5W=Z9o!!G>#a=dcm?<7{?fBXQtjS}luRlr;5kbb%$+0eo!y|aCflsDh
z5vTe9FRMB$-Ol06UFe!{!3n+r+YNN*n^F*nWI;t7)wDVj<3-zL^64ZmhIYNGB!!OA
zCX-yB_J;nRot~bS8xemEj@%d=c_=(V<ly;7rWZ;GBgCuWox1vZIn#kj=XiS)frcqU
znHbyVf7P^HrT6Y9i(G0@ipVJ<ED*JWUWJY$>xZK%_q(_E`vr=#)JwIE)LRJJvLJ09
z=GO<=ye9i~;75+~r;4GM)Da~<mWwyS>1==b8-tWTHKy+#2FaBH_h+xG^P?fSnJTHg
zf1LuiSZB?9agt#(s2Q^@8X}zGZ6BylI>t!nichG0GK|84Pe*Oh$ele@FW-cjTSiqo
zj}%J!SWbVmjU{ON<QgAmhj7Ahb8{QoY`n&(VO5q(LBKbao9-|UPJea@fF@xJme9mz
zV>mam7?K#&(o9}#W<s*5OV+tHRlG8I7eA8BAob(vg@wBdJgtY*)XZ#@HB5vt<pj2d
zzDp00L6icP(jvq-mm<jJ4&}<5aR4(-!$pX)IfPQ*tWb(Xu{5QFC5XQu##n<-kKP-n
z!BS7A9@(afslUR(K%>elJG(b38j<FaE=oEoDn67iw&@CQ?9~c^n_`*#vZ%hkzRuUo
zjO*F{*LwrP>PFf$T{Qp4j~_4g0x!+}c%CBQ=XgjqlG&%$th%uvnHcZ_hlMd$iK`L9
z8s-)~ooDYrmRQvUNHv7`GQXk`$*_RMAt$T)E8}|iS<9*m^N%)49E>Rulx+#2Gr|Xj
z!2KF0gbaD=T{4~h5ar0DIPukc5)C8M)A`BWi{cW=J}e?tvLm+k8(IeM!9H5)Vm{{Q
z$^AhE`H0eny`w)~Pf}&uA0Os7jj`5*cE3qC6@Cmo+qZJBRnNpyfu{`tauvWDBC*%7
zJTBGSDAzE5L`fLyBCM-;-OmX@>g9|AMa{2X*$#x;frn}IU}+ltmgEskqsk{W^5RAR
zK5QDChXVz1y64N!pT%GcQfGCxE8<ivg$YakLMKnrv7N<qy+f`T4@DDLQ^5+gfzsEc
zNVC~mc2t1!tKsN5Wj4a)x=^H^df9xa)r>z~a<!!`xg!N@wmLaJmVL{kaQ`N!C5hyB
zgV^r3p;qKJBi^<=i%D|zru$Fag9e$u-@WM7GDClYd_~q~8+1<!x2A*+c|lTY`Xcyl
zNzKhFCBM0G`tpNY|C|69jczA1KvdK*d;B`+q*b>0E0zt^mYndZvlTKbCd;E3>mCCq
z7(7i?i$i_j5`r8Duo?edc6D_X*VfjO%cP`r{zmbDOfA!2BTGniB$0b2)x$`jn?Y4U
zY6S_vhuUKXc$GLUOlzO$J`kjqHXE(QgtTo|$Y2AIpx8+<ny2r-Kao9;M8ZkhigSY!
z7bR$Q!_ip>LeY>p&FA6<Jl$Sg^TiC%)?7;yN0nTe(?22nMV*1r<iwTY=|;cJ!p=mh
z2x)OrQ*!V;71i#ujV&?Ozk3F5{-DmjG**filui8$va;#9)6<GptJ#vI&r3O~SN;og
z;5~W+dD}XKHn4cU^<n7h1Pk(DLFqK&+g9}Z8+Llp8)0&8ZfrOU>!Ly3UgN}R1qfV(
z-IIKOT~XSWmz9<OT7Bq9rP=j8P|i^ue{Qg?TKiY#xjTv734A`4n30wWQO9_tTT{>L
zaAZj3o&`W(p#|4dA2Qx}Qlvcdf^*VH6fT+bJ>80T@5~5FQb}IEieJ0vwcB^<5d7*p
zWuK#U%yUm3<PRkf&qTz-DdzVg^mTMn=HD0@eQG9SH+dy`-(q4FpaPZ1iSPjxO!GjB
z1Jb`FETI?t^bWDU_9~@v3Q-OmPyt~{4l5cQn7<RP2oNSbv2ycG@Xt4F>ZnGrZ>Dco
zUbOS6x}|@uR=~0jMTQj?d|7Zn;no|kS)m9_;s-(7qCSQa)zb~LM~^oD?w#U6Zj63L
zL{^f>n^C{83~Op-mI?o}hs1`ZpFe*tjtgI?IV-=dTn<E;VGuLiNa@y$4#A9?(WcFT
zdwJys8$*yRHW3l?F&+tnKRkrbTk2?hX2$FjtNH`9r)^_U(O$I%+Ag7k`{w$3klw_R
z4xef5Tb6lkK=lnd=?QPh{{_s4K2R2FUah$=j`kG!ULVbhx@$SVOr~eR=PKD=G<i`K
zWq<?)z*s1%_SPZP%QY6<YDAapAo1vqKdk^~lZ<)qSvM1~-!3UWe-)N9sN?SHdYSqL
zhWjLcg-4fXp>3eT8mu~SX$A$&<K~c(U|uD^q;Gf;EOqot-$hmz4GHqZs!#98qEc`I
zH}thglcQJ^fAIlz_u*$?TpkALz+FnHl1CB!Nqnb`cfi)mK<Te{<ay@(KYuMTn>bP$
zxTG^s=FX`pAUuqmL6n!4Dv_2J-mb}-)>8nxtccU`!56tvoH)9m60i*Y&K<6ni7?#w
z_fLBTPp#3*TsZGC7wk5sY5iwD-+d?QE_|pS{cT(tEj*nlxZ&|D4DP^-`yW1hxGHlB
zCvKDL2%E~;Ye0<Fy2V&Ght*==CjRlQsZU0*z;XM7s&1Q)_d#h>seJ0}zmb$@gtluV
z6e1_mop*-iaLox(ahGcQ(XS%<Ys%h?u5;J94f)WoZVz0lL2}r;;#7Nm*fPI!u!&hk
zw0uhKO%9;<QBAM3yKE^%JcRK(sMia!1Pkv*-M#zheGh;cHwVjQ)Y+Dua1a5qIGDkR
zAOn@LSZmjt9&kUIjIZQQY+N|O!m%dDL0b#~U043`Z|oAPwjG%K#L<mnU7)=zo9?p<
zR?Y8gw`7;DO^z;RPsHJx2Wh_>Uc%Wk&^q{Hq&nzS{MK9EeED*Q0ne|>%-@pup^M1G
zT5uQ~HuAN2Y@feUG9fe$cL@L1iLI(tsq0O@>Vhdc|2DI+64)%YvwC0cv1z(p@&jqc
z8#3exzh!e^Wtr1sv|a0lrn(dkw1s~l4Vi|7T)e}6pm7Vrm7Con2f}bu`~`YQ1qO+{
zYLjZpgJdxmZYUT_J-y&E&_Hshjj4;vyX_!(duKqJ-hfP%*1vN1{QO*Yc6Qc{f)t%Z
z_p6B0fcbl;w1mI=@5R+J_W_7c-C3Xopn$iKF%Zh<JrPDkuY{<F0{sw1;{d?P6FU`S
ztV0nKM|@DxAVpp%c5}!l{4?<m!PkGQvCS!8;J?-@rzyhL@5((x_Y_Bc8W9~#p#tTr
zO)3d{jyeBIHljBgWFT*8Mh`FgRSfv~edH{o-|X+-zeA^fJ_c5#u>aE@O=2<8nySfh
z(=|{Jlc?{}k<7}wDeW23CCi;M{DRf(<?Q@|R7Ajgcxwl77&H{w8@UzS@11AYH&h8R
zFfd$zVyzx(CTa8AwaNi?@z~~95F$2fjp0hRwu_6<^_{jYQrV+cev8Imn`ssKWcXMX
z6fX?a$23vDe*Gd>_CJ?+eE08OV6l-Gz+r~seQTl#zsx1aRoJK~w$|vS5b_J;ez&?Q
z0N|T6bA0++sIgLK%r8s^IgchW7fYO6=XP<Qsi?l9F#LR709|!;rZT(2=WeNXOk#Ud
zep!%dZb}|!$kb!LVNoqo_Ts#<FWtaOuv2E_>wb6gntn-OhGngZqeR#xW*ceogR|c?
z_Wfn2^beF=oSeL%t)6-Y60q0TPSd#j`P+|M!>@c8V}-@$vGi29HO2$7hyZ`WT)6Ul
z9I=je3+i3?9dWP*>^9z3TbST*&3l1!1_VV<$oYqC<;>im^h5`De=<f~SfKt~Qk>mH
zK}fnCWxP|q8#LbFq=9fm1Bp%;lvk}wglI{p4E=(|y$p9*e)mi1R+N&k!)Z_AS2_+u
zXd){&4<JpSVS^vRk<YoZSZC^H8PjDc0OiPJv6!gB*k#RpJlq7rTf8;$t*0=`*Uo)I
ziDBCw8hGF2YD(fbLQ&8!rv5TJoAOMWKizz`bamgYdq4&K_U<61?cNJKnf8UGl@KzB
zU+4?C4HBK<xjKNr<jcGrLwEQ8%AkLj2|iHhIlPsWNXh5C`}fTDqj6kZrQg)=e!O0a
z{^d&XjrDczH^T?cheT9v?MQ<aN_*hP<pY;@$-^D*Lkr@F!+uSU(NESLF_E#M#l991
zRLBsELk1R972NEj*;4Pa5XVau#vr@<$QMdD<?o4ywW(ZC9cijd4A9?b*$4oU(onrP
zT2ZpAA&-N<-*`cp)94?YU$1D_8)e5t2W2de*UP4*k+Sm2nFtyd6oqF*8WxgGWS%%4
zku0QjkRK>LC#IN=0lDU{C_{ASvO{AUIs9R-E(Be2`Zs<9a{O8N>R4PnDfjGMbaLbR
zEk*aB_}O`=Sk!9TP<UJXhiA%iOC?eX$P%`Fim^7|98>ky&`7jd3F6QHdRu(;MOAJl
z<_4L-ETrE$O*?IGZ$EZ&bCVG)!upba;_hD%<vMdsM78Z)WN%VQT54+Y#`k#2QSQzH
z1(nv&&icAn7>6~WBY4R8b_W_e^+sr*@I<@A893r+h&J!68|2{=x)?9Lmtn_;hrBUO
zh-<Z5|HHERm>aY8*G-(dEnrA;wJ>p_>hX=HECC49N01wT@d>MC^HY~Wz)<|5o(tX@
z)2XxUcVb5>IfGS+%CFqcp8Ib!hJzcsv7%;RznVhlSh_oHgv2RY-X+bT7YZDUCg1^F
z;(#?cOy*DuA1pRj&QF7~vQ4WPNG_bvX<k9yz@>^jz%SucRkm!BVQ&6>VWbX-#6+k3
z%A$g}N=FCuvw2aB+_PYa$^YoPSjFehW8;2d*hulE(aJ~4nGiDWpTkNg{|s%Nn~I;s
zJjMbHN<o`^l}YPK|K@32vdxO^|EjT-CKDYIyev%)9rWtXcZ7G->`l<sztBboIs#$x
z=k)Z3)0bHFbg&7s;g_+g*f8@~nT^U5N7#8m3?#E5KO|SB)0#d~r&Vt1$FH#tT<$>T
z6n7j}2tfUX!Y3YXZFD_n9~JfBUit!T_t@9sh6yricyj%8Wo2c@*Vk8CR~27u4Ra}v
zYpgGh6as{+DWi8O1=94LibkvEI$?s^ylRR$JNb*W5IH4XWbCECko{$3Wbxmzq2C+!
z(pfgQrRNK&fa`whs^L5FYl@KE+WNZW+s$(_=sJ1J_ejBRUPJ|!i@hM~!2h~#;=zLn
z|GZ$bufq6?ymmY82Yxxgpc8iZs}kCGeiP)lsF!;Lk~~OCGgVhfHM3oHu4wacS81<M
z<H?%F%u#V59tL!u{ys{N%ztZg?^=3(l?>KQGga_=8Ty)faYF(9kpF}E@bOh>8ba-~
z&#N#u(cuF9X`5q90!zTeu1n6~d{f}wUy+uCQsoAdpB5tVq>yp8AG)`cJI}z3OW5{Y
zR}vleLZt%{MBgzWKA}Ea{U>hiAiP^}0KLqqlHpuq@JbjFq^sV-Ie%~9vcqq4e0yJ*
z5Pptj&MS;1pI`PlkVfM(D_q<$V^HDD&{-hg+$7Ou;aX5f;JM4m8cSSW>qZb;)@l`I
zZA%T1+OsM*qxmbVr~&0k%<Er{Ie?HUHj~Lufbi?#Yay4Nx4JUL%Ycs+@z0MJRI5&Q
zcb_!@p)tHD_K$&>L-?H1Cr^ES{W;EQBVkba3LfNy1)t9*FPh_6{ZyKH=Pj1!OiAKL
zIoYWKy97FrOSZsc%R4F^4Hj=UK8qrWa?8#dgB^evC}**T8ob&Z|1h%|#AY)8tZ7jT
z2l?KRma{Z-29*)S2UTH#z`wy<=;zvA-*1Y4;-#X}{TOyRsT6{_Pzi{}*KRLE{QjEp
zZ?iZ@o}3~F-3~)V+jYO?m7ch}%O>SfC0+HP=<HTbKmZxD*np=io-6b~hi~vJ(nHXw
z=nc#&tA9lc;Ln1+^jIG#ZQ}L#wnOQDhz{<+jIjcuxeks5MINWV6T*V#W15^^b0ca=
z#Y8Rcn*)jQ$M4owV(j>}4OX|ORaoDw1Qieg9rI2rj`3@MkB^T@HU|KVUHW=|CCEJ+
z>cp|bAqk^H7DTFj8;GXAc_;$djpegMi<r-~2ip(Joa(0PT99$!@qa^0n(-H=RoT21
z0EyD?C<;i8%Z5#+IYu~@{^EQ%omO3ga+*H!jFA1qjLdb)*9oT9Gcg5;Rb($v8f(GV
zPJAp=*t!oobz&oxw4EIMW(`twc<`&ld+wBIDQ41)5x8xG`~{C~sJqxLyY!P9o0|CS
z<Z=%TM^)^6{r&$v?_OlmQ*XhYN*nsBc)^BZgo=|9@a}@LAX^ugO>10NutI(uKMQKk
z%fA4QN~!()`O61EON#LiX7!1A^8{8AMOwwW>K6G@DK!q@purZ6&?G3PCQejWeS_IC
z7yRMD8BX~(!jIB)ZqLJEbw++vw7&Cq7auWBC>8SEYMO4TmygKRBOjMc<q;sHHaO)^
zK)GrN4d{}*t%G{LeKRLbW_0@iqWr$N=L1NN3D_8kiY~wzz>R$vMIxA9aXtxy#>s}w
zz-Jy^S40&yz>QK&v;FRqeCU{DWxugn5r9dweE6{ahcwD4TXQrNkiT1zNE2d09PfGy
zj60RWd|{`x_9h;JS_iN80z)qXX~&l?KXMT@R&qj!eJ9(Q<7S|t?9ELzmTjIB^zfqw
z=}5#n7xzM>3Ck-$sE8x`RZbttAy?D1URz@9rkG1UrE;4IN4<KrI7J#`;>F*zRnz;&
zGq7e+A|p#LBTo{tN{u_V6V6-pw#UXB0ql+t1I@#FWihS?t-3hQ5<j*hB}o*{UV|E5
z6GD(<dXggZ1`3t$eF;sEV+1)_=k1^JK2{<8SHoU~2U&WK!Uyp^*>{|nQEEMmB{Rq^
z$6nY{g|Eng0z5b^j<MeDV)*IPr+k24tBDT@#Ha5jRc_wfXBunn5go)%BpLGT&*m$z
zF&Y2l>Gd3g<OrDhfSIaA7ZkrRcz*Z55ZQ3zz-1^KX%LH1mMIQPUksaiyLe;en>3kS
zK_(^<t%Evvln*r^$FPM>{sI9ptxtpffuNU{S@a(G<8%gy!u$2qPoJ}q#$OV*$>t2U
z8YXrV<FFt;r``Fon^9n^s{ZI5mpH*8I>63ax0$-;6h{(899>J`&R?xpTAQBu#DLO*
zlC>xe0Z*fYZTXJ^H5thAFFB3xfYwXe?S2r45$^f0hW1Tk<x!xL>LBKQrY<uLc#dE|
z&;g6--D1#Hr+w2<ruXZWg>RAK-|Sy%ID8EU#2%LN;Pw(YxMW`NfN8<~&XrfWfph%C
z-g6G4kdE!QBWh%v+Rc6cd#dEy+W{vNKnonuGIRJkzUZ0EMH>GbZ9!7pE$?hoOH0ez
zgY|YnJg{Kvmk(A~{vCpI|D4!VK(5W_K+&1sljEnxzs>-qD@zm?E{Kh)+%KPzb#i>m
z=fz;la_&ImGos=*&z<n%Q^aAp<OGLi2rz;bVhotNJOsLvP7uvd8c3xlls_+XZ~qRY
zd`_$wmkyZiX>y#qK*^ansF<ZkKUpc000rH8#e-^cFo%lI^w)x#JXlg)k(B*UlL60X
z(kcDL*<3)DsuE22OF#j>oc^U8(_f60G(L1XG57WuV+;r=zlN;jIg%c%3>FYB@bNcE
z%+<U<pPQSzXnuY-mX?mr19M@_i_Nh(@Nc}h+|}VIcgi^#FaQE{!}^}-ZNx$&KsLq%
z72J}cwB+l}^C6h|wso=ovu{>v8g!t2=BWeNr^)2ku#0a&2P<0WyDMmoK@-hE2OE{m
z`+bAJb=~nyzE+f%JN<ZudFL8?jwuH;LQYy*T3SyU9)r%al04|+eowXU&(`|LyXgd}
zP)v?FXpL4{-qs;!_sko8*XbC#&&Wjtum#K8Bw{qs8uH@4(t*C_arJ-SXNyngy4zS8
z0c(p0`e{horUkhRYaMu~1Y3dZCqa#G**?I8UD7d=HZF?H8n}F6&h8CvOMw7P@)6Jy
zsh_yIhGMjtF#4@SYp`8N!~;m`XwZOkTAmIYN(5$(VfC!wN8VWq=yj2N&4PJ0xy{^w
zy7nxf{#)XR$<ab&5=jxYs#&k#jDg&t-$)?*V;Kx0d&WG&fgPFr0QUw(p_rKf2-g;n
z)PRzYR$^yZZ&8zbMh-W{wOW&)plhoV)w<|9Ke`F`p83C7fX(7Pp}KrOjfwGcYkvoc
z_k&i^CWs%tf`icBu$3m-F9enjn-$#hV&_S52c=>rH&9nh0Bdp?xYTN0lpuvSas$n|
zOYnKUhz}L=5yV&KB)cBqI=1oSM=VDf{N*BrWVguP-qz1OgaqS49yEw%O-s$vx=5~Q
zkmB8HOC`3k^=atZUq@%i3?_QU(9cyD+wn&LT^{5WE6@b;vB&783;2EU<N=4B0JFp!
zG-GH11DS%ob}A|uy?}%vaSt~>SpFlz-1Z|^jO*x)OXo8CV&O@IE-}1gO!)CJx1Y6{
zS;36R1_rXAk+I;R4*DJXac#q`!uAAh%tdmjTcJ`*F;19;idA<!o8KZB<u*fv#&sU#
zz9_1S&;ncs){0)vR_{7Xi_he{a{nj4)q<j4C?Wj-w%V{63nC~3REaG>SuHMin!bWK
zF6jFdy1h`Kl-J|k$1!beMDtjRca%sN!d^4SD%O}vgXe8fDH;IT8F9-=EK4#QvD-e%
zM(;K+O7!2qe?K@h__{_clUis`il%|M4KvlkPBD&$1yt(P05W`l>}LwCW}TK#V4*!-
zz9mX#e^>c5#QkLMvHWG5Q^unr*_+8*4~0lt7fBW4Y;I-qOk-Y3b&iaA*lrN{&CvxM
zDUe@wwh5QhnKEl}>c@SZ_M?QWjS7Zy!H@ys_!)2?xYDcPdeY$}=m($TNeFZ)nx%ea
zb=!|tT5H|<(7c+G@mY0^0Y98GHy>*Lwgck7o#<909~&7#1qTPusUU9p237-qE|Vb+
zMI0>MfQE#9WtcfuQ1=3D&=Tt*`P90Wz)&-pVq5}<sJD24Z?z5VpjVSGGF@3gDX<2r
zwkpu#eDwabZ_KTLNpg%Mfkc<rs6!Qp<+~ubk@JHX>%yJ^M|25-Hs7T_Ji$*%TeZ{k
znR+uKc>}C;K<?VMea{{+VG-aIHmV(Xm&C@(oX{$HUI>>3AqfsFj;DK|*5M$#{@Jfs
z`8ZhaMt~;3A#RXKQ0gC=BWAqvz2}C2zN&pJ#R%Hp2!PPKN{{9ax_f!Z!v)A5E49rq
z?|1=Jjx$F@zx525^~)I-KRR_#sx5rl&#V#+u*&gvF~twl4Q_RK_n90PGN9yx{}xle
zT};8$)R-Y;Z(IXrN@zu6cL*LVK^=7XdD{4hTwhT5?&1noVtGEF-vjyY131Gt;X3Do
zIuX^WVzg1i)JVr@V${;@4F>QFESo6hMV7*NqKLny-Ki$Fx6v{(`u+#kh<G>$#=Coa
zOJZ=xKTR{@GSZ#8)1Ng@@sY2tl2w2yUBD9UobQ+>?<KiijAESABh|vYS)+*mdfx8Q
zrrtgHNlY1LCHkLFR=+M7Qb6Vy1`S_C{QLFuQM$aX%{F7gsc#$r-xR>s6Sk5s>KI*|
zexsp?9^fJHSP)8}^ofIi2^;Ouchv%J=fc9O3e22#dso}rh>m3F3ypai5z9M52|R%V
z%%3oRvELlG+GP&I|2_{1j_%wN1afUs_7py|I#>1kFN!dr<i*35vq6u!nURsdrwln<
zj1FaEvon=!yY(>o)c|RbwVGMu^<eq=`R(7Vc7>rt2>2E!`V)yIYZ^!gIwd2S1yrr&
zR%_E>c*m7IbMK_kmh2`9dFL`&2^`!Bo38ht+m5Hb$v9Q+87ow_G$l=7B_ndv3=+xA
z#TtV9_kP>Bi9)Q|!cQ?~uGYm{7DAuSwQLPYLK?`jH;^a8g4)YAY>-OSL4C3#v!;>R
zW)UDmNt>H}%0~7Tw+r#VZ<(iaC1q4@uEHA7+b-e0H!ko-e#Vqm^Qf=UD&xK<Yxvhf
z)SRabiNNwBsR$=}!1N3ezIPJL?l{Vkgh?}|)Kl(BM%}5u{`Y4w>s7dNNx;SbE>1@{
z;e#}V*;cP{6pHXY_!fy>wFw0A><!7zo?B4rez`Y_f60l&{qMk0hitm{(Ev9iT%ePc
zK6(W00RG4%D_sv&pI?7)d|-`<^a0i(?}9BzAUlxgeb<sFVsx2Tjp%})H|29&(_<yb
zdg6$d^0U4#EGy2kB{$uM7y?-Jle{GErTovhmzGyjB_vOuye^6+URES6)dk|V&Omct
zH}Nq~>D>JIcwKKdwet_Y6So)S_<swmLTQmJ0n&easFB;myjZ;0)eLPmeOGx_1Tt@*
zlhnlP%fn!pPgpNa_<t#$s?0^Of<Xs8=mf$!r%%9KNGx-@o?Ml1Zr`Zn+rb>xY0KRX
z;I*N~;>8jsWZ5Pb_CMaKdr;jkjk}+qj4Y#up*^EzeT_t7Vc3hR$DuM1>%_NI*WF~i
z7&fpkmCXX$5Aeom(Lse)+j8aB%d5x9+9u_6u=CXUkH79aa<SBWx*3v?pMGidrtLcm
z4$eyY8)le7Ck`R|LvKH-cC!6P!7>TTujt~}UW8+NbHUF)={ZlGA8i&NNM$?M02Jzc
zzxIemiAN^(X(qvIx9Cjt*B`cM;kpuVWmR-I9*)!V)UKaPDxfQ{KTZSEY>ME4TX?q@
z#sw7GCOViDj;*&|<C1oIVP*O+fcJB|O&^CcC5t`Th&P&z8aF0FRN2@*<83uZhp*!E
zSkMdqXzZ#doVSH3IJ;xqWhHXZT3=s(BbRw4JhopO>@#G~Y>5ky@}t40S}oPdFH1c?
z{_&G7N2W5k;b9{i&C%G4aTMvb=O`sHv(Xxg^E|M2Td%IJLO|oH3@h^6A_U}v`Pjb(
z2iI;qS&hN}%Nb2Pvr}h3ziV17#NwNSvl#1fV74bozi0jPhkFNARwNXK{yYu~fkybO
zW=0za+LwhO>X_l4fgxCKq2nlL+*$=_2>Cs~7O-B~L6ewwd;aQFPHQy#!{gR#nv{zV
z_gxy9BvVYTXxrk$yY;m6?y*?I)HHexOtXfcaCzDM!n8}ucx$mgf?cwCt^#}C`)R5Q
zG>-Pi$H%X|WQ)K|i-5?Dc=L<786AXC*KNJF^~qUKWOjV^KtS_U_Li!Y`x262iO9D<
zQZ*GmG1F+LeI*P1!lcK@oFB%~y`Rnni&K7evJBe8RG@`~!7s~+-;tYUCirjpi!~v#
zDz7XkvLLr&jNwG~{w$tJJ?!^V0B_cSHM2EXG%AWc2Oow(@sP<%6ocJ~bgXKnD)@Fp
zD^K$uHZh}PMzYB#2R<{<*)K!BVeb%>EiOpDL;iE<<v8iE$|4Z@W5XW3p1J1{f}L@2
zhyPWuaTX$-Rmc(s9vgXXRfqqy*%a}){A|J(jNGUqEEYpgKOua}jN(<@w?{lcFBH{U
z*zGoBISyFnrgbsJtI~IOcd;~2iEPekalESvu)AScywM7GoAkBfLNUpI68j3Wq<&!I
zM~I~orC<8L4jbtoz7>Bl7tHO5z8&>(gWe))Gx%4B?A>;T6E~S-3Fk}nr<FNuPM7JF
z);fBBq7?`(^wZgJPk6B<QuPA8<gHhcG1t!x45_lJR^&9})(93u*O(G?*M>z0BMy&_
zEHD=QiJD$ul<?6eS*Fm^h?%#Xr6qoV7_E;(9jy&%&*ekPA9qwnwOhs5`4#LMOv8@Z
zDJ-dfR&$o8)~Z_Cpx~gjiBaM%O=Pn|(TP{m)FkDUzoHVqwg`<d`n`*Lt2A+RT&j`7
zxU5@jADic-H8Jj@uptYHTqeIM6hcR*X|Gg>&cPC;S0&>;TOw8J!pC>OX(Gjw0v~Di
zZfYA)s%6$lb#<lds(-la&kTft=tYSgjOx)2cdD7XtA{>52WUhWymxLHnzdHIkO$4F
z5VB-`FY{gPgUK8NV1SOf*NP*R@e0biF}&D;>@OI4e`lmlpx)w(WpLg0a}_3z?iS?d
zTL!pdl5Eqy;}h}V9@DN#PEMW|IrsuG9#_u<sh7vT8eS77x;PxmpTAmPy3ck^B|orZ
z+((LzdpCrt)kprN9IHxP+`jM=f+TmI!%}-w?aV4uwN<r=qj{(SesbanNw*EmB1CE0
zQo5c*yaEafrC9p|Q8BS-AX-MCH*|HlgGwk2Na~O0M@IBM`ehmg93f!Wn8=D3dc5C}
zO5iZ7d5*<-ok>UpS=w@`{a@oXaNQN#^9G$>je$#<`t7{43{Ve?htP}$0@1(=0^Np3
zS^vNoT;%3NRYYfptcK04@$>c`OpP4}C!^EXlAr4%_31oZbUQa9pLa2{zVDUD*nK?q
zSQk93RNR^+ls_XIw<ZH@{vp<SxfHZ8=}Ui^LfyfW+oS5`{WH_k*Fzn$i7S;&jCYQ7
zbbjM?83KUN9wGc${D``z=U4PwSr&p^a&KZ>RThmu#T8%gPWW8~!q55eRMWlnEWa;4
zQc+RS5u^^igOm%L+*V6obiJL;h>Q)R?CcA<miQ83>ivpMtx9eB!Dfp0XXi^o)i}87
zOxwSx_Wnp(Qawxg)7Q>q>=qN7@lW`W+>E{xYYI%5CQbg^$w1BnLrNi&+kSN7?)1CW
zazh`sHYC-eA4FiB+O*noV>{8U4Y}><^bLclP<(bxDQt4AB|ic6_h3Cp&UQtlWi2jG
zXBSnh__?mG3}{~DBw^I@sJ4IMR{1Mc&2jIHANjepJbZdX)h69)yJt3CwuRkUf~6$?
zFgcc3jBAnjcx6LKt({H1l!vVJiRgI{#I#r4&kmA9dh8Vi8)M2m?t%?G_?tad!NvLc
z*DZTZOS4Zw{c<FK!Xf>u<W3zYM=k}uDn{*sY8?FyyTO>Z7BtwC1wEA745=0SsGbU8
zT|IRfe5=@4i=tvpj(SmX@!}QhVoV_|pF1MOm<!j^1=k%l?@z#tx>;vj{~edcx@$VJ
z4`?Bcqg5!o!mTqGDQruP)EG8iMO7h=XuF%%w{F?!TUtC@)Y6w>@F*iZizV~yI*<A5
z%geKa2!aJP$fqm#QbLOb^={?Iiwgq}kDW!vBa>7hKYW||<aonFPZ$d`mq_MNg9iry
zQa0L|JV@YBw#a`k9H)KaGPzTL((&Ds9UX4F!Zd-)=UeV2xC+W69Fx3E#Hcz+P3l@4
zCl!{rAAebs7FBHI=vO{jOoFmQCi&1$!`VpBoLyX8rV2k*Zk}U9?=c?AP21+46;IF1
zOl0y`>@{sxb}L?uV(ma{Vd33>v9UY_OFcacDH7<OJ?AFDrX=&nCpJ!JXR$P7vZJT)
zCVtx|Nv7*8=H-{9{0hu?4N?Psxaga*C}HI9>$`PQJ@ky%viVd~Yjhk<B0S3DW>R!;
zQ=MTn@VD2_D}qN{K0s)^OfLOJEf0S%S<Er{>N#^#RGg5bVqL9W1cwwJdsH9+i`2$_
z?k)MT@0>5Vvhy1n!A#)%ABi7I(Dfhd`khDWZYDK$y#*i<GQW87A_C}+U<*5`9#<?t
zoGV}wN&*wN5rwYN!UYc_)%5x}nx)?YY+ue|1MU14Q${PrR9&jnvG<Dj-O#yk6hO~I
zdp3R2e}>DnrD@V&C`3wIdhh#Vp3)zkJ*@ohnhq-|KVC?koPo1ak=gjftRs77_xHKT
zkJBuB6KlJPCoRM{7;|1HvjI$pQgsjhE6{k}Ho^k+x?bu{;&18LPq0j3E{R8Nk)wmO
zEMXL=CrcbfoeX2+YcF{*i@`GL1%E6SV3^ct^U_WjF#6*CYBPtG8!%9Gp-xk277Vx@
znAi4xds`w+jMolA$$L`Sdc6S*BgSz^NrHP^C;ZyRQ+jBi{?Wn_PEKE!NQ=!6D+e5w
z#laHhF~N7mPmE*!5zNn6Fdm!uJ#w29P9b;0vaOr{n5o`}b<9pK%qY-UWV%`sK3O|6
zXLtNtoaOr(xlnSl;Knk(q!6Ll6)hOm;&rgRvyjB-e<6)L$z0^pmNXvy>?eyH#J^>s
zdY;sQ?4>^+zg{YpZOb)1F_mG*s<xGnWM|KgqSiOI)l8Pa>63pi@hl$<Jf&~X)bA9E
zd(45kV)V9mw(1<P(_NsGS#E7_Uwu*udlYRJG4TmWZSgjZ&FLq6OZ$oHRA&>@NBZ{f
zyDkBpQLahsG=`)$uJ_2Wgz@m1-~SnNa%G8mw~oN|G_3WKMuW0{6o`8qw@2UE*<N2S
zKfAaPvq&ja)3kufE*LaEPT_B9@X)KiOD}v+tS9d|DJ9utoRyGYf~yP2nYG{p9H-RI
zxxa$m><kXlN^}QGh*oUk#O_6bkTJ(nld~p1NAB2v=z^U)#tHFh3`*0*2A=8-X05V4
zxwMkfRP&N=Q?u>V;+i$_B_()xm+yUdS>g$f6H2((sE80C9u5Jp&v;xhr2et&BJCh|
zOc_!+W6%&XA*>cJP2K;~%#9}K_$+L)_USStg(X&Peh}TG@eroJK_8Xb92BM5!mv{Q
zrf527qx{X>y2K9?Nc-^ZO#Hy*AD}pHuL1LAsDx#=WLcPLv%b{=at~OV01$!<+V|3l
z%E8>P|5Rg^C)7~bX9!oYAuQ>YEBR@NhnXMXiD{FTl01J{JDgar1|fw!=9;G*3%$C!
zx|t%HT{rkBI{GS$GDNLJDgw3A(XBjCzAkB9!Umz<4XIeK8TQ5E$xwQwuI(kI#JD{Q
zO`kQxk8A<w++jr-LbTFb$3&ppROb)gi2(k0&wV@iNpeiv&L6j_=$iBz+z`@e!|`KM
zm_*qy<DMqG;3>luUUKtnv}ZI<F1dp!*0O~`;!=PtA<$Hc-qkOS8PG$`QLZhevC><k
z0k`S^LEV8A1j^%5W5O~DOEt1S8)~OqZa+d=Wyu4r3jaI04XQ{XvG#`s4j$pU2Es@8
z2xsa&BF?^(=`<(BX|tn(82x5&7CH`Ahvq+rT^uu}oF9(emU^$bzY?{rgOrSa550+O
z+3YO%bjl+Zuflb(^tt9Y+&}rt#8|>p`5Jo4CH_5zB62_y&VfR)slBp0K0F2@e@cB_
z9R~oZ*X}~~<Jg=FmVriz74HE*yU;70J>Kb}Q=YuK7bR)*xoO~rK+)it8cWyfRMujY
z7?@(%|1~pn5&Okw^*TO|5<M>P*EUU^TWiR_-(OA+kB=F5-wvgJxy9{cyLaeqodCAQ
zuy)n;{$vT8RLf+S^zkn+;*t=LP@~g)p`b)P<St0{$MI9>&8m1|E@bh<!$UlNZ4fHj
zt<Z6h#cq4lA;`a1F{EeZuu)vpK=E7yBv6-o=mJE}Yj;P>>(cO(b-TIW!;)UAtDZ%1
zMc^iaz^+&@lA_V|cDgv;4p|*4j=-)-%w7%o<%W(V0<kAB3wDp4a?V>}D-a)EkSn_w
zKyRrr6_rDl70~d0o0#@N=y#EK8)(lJ3Kpu(e@AnXi&!&1V1`GDW)GM0u(gi1Q@G5I
zyhu~E3zDodGadW9?2Pu|P>QhX$g!q7)nKEcKQk^eMwil$NKGm#2b<?)o(myaK_py;
zcpWAGIc@%p3Vz2EhZU(m+qw)9Bcj{;N1GFJtJcLu#$zp|@wtC{C`aDYUZmq)QHYM+
zOTV8a^dWrfWp$)e`(5t5FsgP9md@Nq-9ML3Gb(haigE107{M7d{;jE80-7w%6z*Fu
zY#2N7kfFnCMHl?GW85rUd(_H9n8t4P0|VPOnM!EaTe0^Xk43tSMDW881=S3@a@wBl
z*Wj%P(E9p;?OES#(YoXnQ8_z(^pl>e_GLo)>rAal$r3{qFriY&=P1YlrsFL4SV>W3
zcH+<8?zIppO=WccW}NvN7SagHVZXWNAY3R1Rjn(Pm`4D*!hdxGF~58|co|QR=i4!Z
zxBQj1!q~#vrLOyFm-!nEJE9+B2FI(+QM=<M?AV)+(7)vI65i7~2!T-0G1bqZR*+o-
zLdf*2f#_GdSu6ET0zg~yNX`!qwJ`~aqH4i^e{%^G7(b)xiBW>sqj(`afj)7mi1N2U
z0!=MQxN!OE7QdEL<}_y<Rc$VLye)HsoB9u&_f#=_t7<=bz;?`l*4=wDZFD%AD_tRR
zcfaJ(z1Sy-mj)-CN;GlZi#lLbyB_Tcg9jb_Ttq}bz{WVp<a1Dei2P~IyjS2;*p?dC
zVd=Y@(qbLdYp#&DmBc8C5&t@*oAO4EA^llW){loRr5=ktE*-}(i3!oc)+~<qtY)J}
zJ$d*?%r%{Yck|KP|9zXTK!proNL8hw!qgO7>Am2HVJ;iZD#xhTq4J%noxj;Lr8xgR
z{VnOm%Fb8^DkLWlk9pILNoDVgve-A(Bmb~(^$0wBp+CzCie2R|*l?j|3H#G1dR!<T
zUqO8ZSC<~Y9jSzKmznv5jY1(@iyaK-&wa?ePt~T{`;$uQ{{4S^ewwVe@?psb%zq9G
zfq+CCOml3}Kdg4<RYOC5(+p4Hg!DI-5xy)5@jiYt`+1C1*J+4e?A!MVPW~%2kF6hH
zXF27|?cXhX5Pj~++D3K3pz;!=tceoZ6T)iej9OgnB8?P9yj-@Xg($9ymq+PWPHNeG
zFEm@umcFbOeF_c<nHVaTi@-*jK>Rz~+k*$!trFwDZb5R9UpE8jqt&OPEN~S+FzJ^&
z$x93c1hciNPGXo*7UAg{;1)o{aM%|~ZX<6BUi3Ru{P@0r8i#kopn8wsz{(F!pgD5R
zpuv*<=xAKE&j?|w$<z(NvWDKOy96tn2}P_lL2W}%kv;ZwSv8#Vuc1q0Bm8++EL8X>
zfHyjoZQb+iUpU=JG0T=lAASpQ=}&4vHPh_MfA>&4#2-ENF$hf0Ol5OIMDo{Pieu3D
z!BQeg6raBpco10HcjwO|_*oJT)RsSJR%N&FD!f}a?i;>!Jw1gWN+E}=3B$_!`|OiU
zVt7Q@`i7iX$w-fl`_q|wa^5_5g<%)~>pncix31D8N$PWGk0O5XMKzGzezT?Lkpqi5
ztE#-j!oMq?X3luMq^89=6}l~E4~$#l)R0w;6T+rOtB>5Dzq-fv7V0l=dG<mvGaXG(
z@~@Rm?njr0EFDqzrwCT1&V0+g{J9Ru1hx012<u}g-4j1j+=u)6zF^IY0uhmFGvHc1
zOl$`@$!msmrv_n`)~B>}!3Wvww_+5%d#S5xdS+~<7Um1fN=P%l=i3*>KsUuyp-(I!
ztiri0_;!{}<?9+`mTJAKmBrwlMdc6SRx_f4_hFj5Qk3E&gw_Fy8PPLABjhZFw<m)4
zcI!|3I_-U9<2V~#sO*<yE_L5mPQKXcyLo)_lIDFJfNZRy1ihs!-?=)9A!)*6|HLdq
zO)jU#>56Q^(VP-0u?!f?eJltCMOs0hXOZW>Y1x$hqY72ZV{X*dTijo(WhR^dbN&g$
zO(tyOBPl|0S1f<_+Gk~{&L(|7IP#<OO&v9KrCH3K@r4|I&EWiWp{fZ}iyolf8EoN>
ze!V5jCrQ)uPUxMun<Ok@91V1RG``YfSu*~TJ}arR&*urndCZFB3R$Zpwh4_xmVYU)
z`?FK{6#tKWaOfgs<RgF1LXHl4c2>C!+L4hl3Z!x?0<&nbOLJ1}Et}dt(&#9a1B)gN
zZCnahS3{B3*8j>y-|d00c6c|2{hPI=n2(ukx)m%QC0!BNyOgbqJ#^?H=~1=6cJ~m|
z93K2N7@Fl7s6fT%>{4SZ^7>Ue>6R8bnT`>F9$;nhDsYkH1-~P?+f-Lr1_opBE??~E
z^uv{_C>k%^;!s<n=8EH5I9}9BZMFBYlVUYL6HMh8sD3H@>MyTqf=8f$)jL!5)(%mQ
zRa;xF_u3uC3RJi=+8(>aN?Z?u;M~A_7-!Y%7%a{fszMIqGjY%N=hoz2Tc*=FsW|s$
zJ-du@Y4f5w38ftHIFL#XW#^M@{a`$jEZ#I9qnS)E`+*tp;nv{eDVDvmwjoAdQckP&
zU202Jf6J^9;r|*uHa{k}&&t~;aoE$VD)hofad5Dk*AsDYxUJ;N77zq<vSas5ukiU5
z<1=a>JY?K*pkU1qt?e^`U3(Z9AGyVTQcEY#<mIpOZzYJwpiW|$N?>&ctbf3nI;_I2
zXU^-FhPQ2my4sgycp9QS;lsa;Gh+G1d9S5NfbOa^NIg}lr8CTnw}Px(`ktsR(HLrx
z4f-dxOWapZ`<GbDhJ{W3$$C>}4V>tHh8xFPL^{?<e<9k-WOk+tQas!*cX?>E(%yVd
z#hF@{o+{;XehRlTZHeq!SOaG}LRigd@;k*GE4B7h>{g%DPbp!PK`Fh~1upgIRWd8n
z6-~MrKl{BWLGzBFlJ6xieCth;B-Av=IFW=UVy&b2R6}qw|D(^4;pLkO8t|_1OR-rQ
zDk0BOuz6NKDe=&>k1fUF=*W1M?C4UIvlhN&uH}w=(n0!X0kvv%V?l9ilJl-0wgl>e
zOSX5K8b(HKup99%dK`WxLiDB#3NrUG?!J6nG!Tc(=@+KDGNNc@6H*d9($^DykEe^%
z_Koz|qOD}$@p@U3gh|C5U4V`Xx#MqXaZP$l$9rIjbbi6di1YGgWa3iH{1n%fEB2$j
zj>U<tXbc$KLys~bL;<V&UC)2g?r>of3~`xk-%Mynes2G#s)`<KBa+&uJDHA!uc@gr
zbCeJOi{9k7Ou@+go}j|tL9WRukr(*P_KxpX`=x%$(CAjc9|>Mr+!id|fu+3dPcxgt
z`k&^g<kLH=e}9_JEus5V6wTq6RIYCnS~{z>-H_Ma*x|xjzKJPCHIxB6P<*7QN>Wb2
zmq7(~?4@ejJSR^AJVqBoGyeAdCk+I;!@bE$!W4ez7B(ut<<srSbxPCfrb(~<Zx%qO
zf+tnxaQq9dfn@8D3@)aMe`*dvKg;XH(~Gxv1Zkh8^TziHa&K7$zu0!Zf8UMFlDngz
zO-AjRJ{GHa*4xYQ0=P#v-*100ksl{g$$R%x^;Fe#duuYd_Dw(brVSI}QlRLce6K8<
zj=|qv;OjO+iv`t5R1JRR0C)o(FF=37mJF@uy-IZ9YPLVJ#Xhi}9V*}s$#qO4u1Rbv
zb*|@9@q=|824gGa<h*(5r?xKq6}L9GM3r!8FelW;umK0F6|#z%_j=y_Q_|gAMZbub
zv+2Qy+;&>Wo$+Wc){J(-G9~)AXqMMu_I3PDq8IvjPBS}PJc&zL6s||;Gi4-;;!t~d
zw=iSXYaBHV?*s2La%q_hH?}m0)tb!JM1Uo<jJxZw@%Q-`G|ObCg6jHb+LWrMnKDG$
zbI%s_BwJ0qsQn8mp(Nl#jB4EFk4dmbOKElsXuX!;e4&O^Rs+sfMorT(KGc&L@85qK
z<K@`OU?*PWkSoXg96Xv$hSSisBhl4i-6QEv(f;>u;g$beBwBKMq))U?GM-4;xFnZo
zi}g~)W1|I)Am#_E*?Yki-tc0}EFO7rB+0(i^S#L&Ai}Quzw4s-bh_k8rubY{-jW*S
zi-s}qzFtUZNvmb+Yi-5a!LMTua^teLZnk(mOw-Y;o*=95m&vx$SbRKF*j2k-NW=W?
z!6@^we+l`u#90+UZkV!ST^jEDok`G~Ub*E`FgW%3)!!Zf<nn~01YA$nt(_z^g_j>a
zb&XBs9-eZgg=K7l9&e|g@Aq$+jqU!Q309HSoG%SK3Fp4zt64M&^}I2THu1X|SHcL6
zy*;e2<loAl-BIJ?S?00|Lk=?oh{6GmJ}&j-aQ~t44{ehv!^8C13^q@StB_`nc)e(r
z=&Cb@jzBiIJnwgQ=#QK{vN=`gF_xC$(wVbk4y;RFUlJo}q7fuR%7>BLAfc;(_{KCD
zZCSQ}_z$I$KUQyfzYDB;z|N<xa+`5@0#Tk(TLv?tL~o{JUT<w!jQR+&s%RuB%MSAN
zN1QUW1=4F8t@xYl1(#L|(~l#SxoMd3h}pWH$7~rCOt>ohTj)`|dyUE~Ws}Ro`&bdO
z$v$xC-?~VhxJ*oFaH>t5CYH;61<O~7rTGRo!lD{0=LaTTV1AvjdtTn|r^fn`egR32
zCHwqcu__pO9|0P4RV2wP)~<=GWNTi0D~~KfjR|-GZaL|8IGwxt_m1d#)CNJZ^W8_E
zPte5-3iqt?D`Z&)a^B51TT?p<9o&PYAZb-ZL8czv?X-H~n_*n2ZR3I|h%WOy64<*`
zj&&KT(6R-v)^Ip#jXfG=v=oOa6oc%0G)YLYSDIdn`~R5w%AmTMVB3R)V8Pwp-5o-(
zgF|q4cXvpD;C66L@Zj$55G=U6O9BM<xA|_}TdyiVs7jsLGu<=YYg*Q{!P%ZPXps)T
z=t*jHD^LzOv*g+xiy(<br<*p~e_FWK#H6+81Uf$gz3}ZSOe8m$Zhi5?$Vu(gt-2|Q
z{`4h`Vg^Tt4AeHOMVFEfrxCIIP5**|c|&7!*2-gLF8w>wU(BP>=^A6keGL|kc<9sj
zchwQ;uSP33`yU8-+Bf&_ZI(*^+B;Hvyc~KGnJ#6j;l;av)UBmDVyaPXwd})y`|-!W
zwgXNQ-6~t#Op5`;00P2>VEajc$-feqYIL+ef^Z{Lf%Zkn$Sw&;y2Y#063UJuPa&ho
z-r%iO7T13^iCbTH1>fpMFqU$J@9y<<%{Pg7&Ykw<Oho;5ts+II0(UTHv4-;^z8|iE
zt*8IzM>wQe;uY;<KFs%&U&yO2<T=uJQ+HFfz%<TTPuuvGPco-L&f8R`SVMWb(7^~8
zcqYh@?7Qdwpm)$$cJ8<S3rk(1$LmFN$3y;VbNuR_f%DTkWNW^*a{5g+3;d6#!KQU1
z1|OzJA7%(_IV^IREN!V6o%^$rpug1$K)$|~L>}LV(g$nDbXH?d<5@j2E!LP06-r!%
z2E~e|@~JZ<2e#a<`zpP=YKd@Kfr)#ShV~~myFKp5mF;+(okJpmHkh`o9GZ%#h3pqX
zze{CLL$cspNme@!Iq-G*Wlt{I{q7y>d4QVpj7JOxdJL@BlP0J+G~E$gJhOgyc-VAq
z;(TX$`)9?IrrUG?h5kuk@h?@08Z8)tF=2{Vp@}zUrFI-!-hZSb(VZdhMoE}~FjTmX
z(H+%L9K5ui^VRkdg_not2H&ESC)x<-Jp6DY?LNRFfGTxVxZd+@y#zkiHgtvbVOzlK
zfgZ#^Q^RzySRQEyqi(EdxXhZxU5Kkmg3ztr-I^uE5WOxFWxN>*39jXe5FHw9NAY7!
z<FmGvum)<OSU3$yG}w^%#@g|_EhxlW^eW?GVx9##H>#3aMY9z}Yk_a6O4LYHRR$uM
zc|y28$2g>V8*9`^;c-<zRM4NWJ*Y<Gr++=cS5a)>R!~o-0!Q)bliLm7I^@mH^WV*g
zKF_4uR@fgMe5TE7>9@AAIo|pdhLWuC9y_F~{ZTNzb9FWm#FG(gPCpi6X@QWjH#o;Q
ze;{o3Vg8ge=)eNY#$|$<0Ns>rl&*PdJ#CcaTwDdGkjdQN;MT4!s8K4Ze*WV;t^25b
zET45nU|CmJ7ngv*gCq!*S1OBSxy{pY&MiKhZg--cn9Mej3Y1nV4k;k{T%P`?OdK@7
z&z-|4kl<KBk(Xe@6)!I-G<wXw6@ul+dLplF{Hf<;r1Jg`j_XPi9di=QxeusnLFZMY
zMK5O!*hUA*s&QyjeL&fi*EuEWz09~<JTtjZ>NqcS9KuX3sq!TKJT{!MhXF-J&=;)R
zr`kVM9PD%RZg~>FaSUDUmFL7-6o(~+rY(b0CP#n<jH1!Kf7YOTv>k*QWKL08iCf!>
zvkjmNEcNDe$yA^I^$#jh3r_!ccH$wIf)=wgo$oWlI!?KMl|Pk}E7u~#`tiot5WhWK
zXO*B${0cUdQ;n=CF<P_dbYqUA1NJ#NK$YMH6QrIiiIpQlu?%OFsfs8aOT^C&>@PA-
z(rF!0r_Js!RXyLJ{6h^J$s(!exT(O$#sdP{33MOKxnr@3tM8R1aHnHRcovj%R4e5m
zv#}X8WAnpWs<yJl*)6Q(dFU1-Pyjnn=jNxVRcBCG+Wo}y<Lzr=1jwQ7EDBdyRx}jl
zb~Ea0G|e^7oRx@mA3mEtWmZb%TFqRlN&d69kb_;qjPC7IWeeistZ9R+{YE^%Cv*bk
z)qZg@>G5~<2x#~LI6)eFlrpvjw(C*46)6PZx@GbTRG$<Z`M{7Vs$6`!g)dp}EUgVq
zcl4~i2v`xjjT9*zz06dPAp$!a@39_KJ2>Cr-eFq+o8BQ;*(*lXhLF>dGLI2t7A&F|
zzRtnV-@<wvyzYIFJu%j*>4(}K82+$W0SpZV@~4mKDJS;Ci~Dk5QE2O_SAflybQ!JC
zz@1%5CqMc%D3(8_LgA<M3j$0ai;&x)GI4jpVAU-Pgzp&(6kKtVQmDW1oD~71gxc}s
zQ_BY~<pe{hKmdQ!e0OZFXIK!oHnUut=?~Fyt!(zXQu|JqY(V^wp>BDFT+ubceA$HW
z%=!8G-k?;Fmp`R5z?$JU>&&zzmzbECn#OnjCk%xYv?G8y<S<aeVO&JROSx5Neyy7r
z?XesMua!A9tg8$<weGFSo27o2n<|wY{fb@HvY#Q&lKKd)aIYIYQU%dt)}T#2($LVn
z_|6VJuS}8zXs-=mg39fXPT0>+qfIYOgwSimBWvdKVmP>;=$l)G$q_)-VeCn!&1OAw
z!CwyK5V5Tp(bIaOr3{z9ezzZvPBmNi-0-gh{dIim1@csnrE|yTIw$rL^)czJ-wa=I
z1uR7H2ApyJ5v?N2{dX?uz>t1^S#D@cX0K@*Wzf6@cTQ@IYlZQsn(oX|DHZr*W+ldh
zs@-HL8P)vjHBd435OL^^PNkT$!}ke@_X=Y6TCzr@AH{x>?i}hK%@=Yg6N1Z0PiCg<
zzn|Z$ch~nRlvxmx4EWBNS!5yS-s@aqiZl@ajuEd9r;YK~&7YM8{#aLh^p4I1KK-vo
zFC=kFii!pV-3Rr1H^Fg^Fo$(2q)qBBJLqyX_74?Di{-%?{>IlK^(N(`>_q01F?AC!
z7Qb$y?WyH-*m-E$b(=0qnmpEACxwTg<aq*&?d(pk$AqAasxv3Kx&Odz5`T+rqp&#2
zq)O2!hY3bLiR2G+A<4;1&S?F4U5sx#y<9ou2&b4tMD@typrMY*KtgWn)OT7v5WwVO
zVzP}+(TXEhm^rB;E15&*zx`KQ^UGny+x$4Wt%qq+2Ic9rwJsA>yN{z+3G(ycwNe+f
z5^I2Xo>Qyr&y2O97TPR@yYf$`KvFy{EsYO(Gtlh<y#Z*5c2d5mFU@cr>hW;k7&~tY
zM>FB4mYYm?!J^FEq}9_kBMKCZ$_jm*9}qCsxp9t?C{c_saL!1pqstr*fbZtj^`gg|
zI%B(heRr<6bBl7e*5*mmeuyL8--UL~uB%>&dAvN4`J-BTic*lbh}y_LHg^{bMIkVw
zhWwzX=6s{M@_Ai{LIAw3$HyL6H%Q_ZINd9UAm;x1@+`^=oJ}yjdxGlmf;h^VP?PB0
zqMY^&_S>5OQPJr1ASW?r1;Bv97Qdrld{KohANAG%yiqnCzX#1Z0?%j4!;pYA6V0)X
zuS#!Sw=a7J{bQo2o2;PC%C^4`KCsTr7{Ql36pb8&CEg*mV<%BK<MYF<JWvXugM%%S
zOMJX&+F><3#T7)7HUjD@KWVPM*|*iXht46a&iDT!bT6i%rHumJG@VZ`{9UZsp*9|>
zBZBT4-@Qn6ou6*SG%i-nE;lgdNt@GP){HAtw~o2?Zc8jM$!1GD?={IB*Pu@jzQstU
zg94#9)Rr&<{5cF)Mk(jK@8jArkSTqCRY-8|9_iMH8at}+ZYp6{j8mN-6QhR(U3<sO
zrMwc(b34gq$P(<am+K*{RP<-7=Nt&nZ_C9{GoYMb7R7cz(la0}{!=_Fi6`Zw!gVv=
z@f<9spV#XG-jT!b8E8zijzEL;n6sNDMx3+qE81hz1DQ^>QiOOenoCTp%xJ#Qw!j;f
zI2;`}d23kW(Wig4T@sTr{iOJ5V3WnUwOm<lQ$~s?`6R@rx6^|C4zZp#aU@I3wyuB`
zNib!=@2ZEg3T{U<o$p4L!JyXHIQ*RLlvJJKjv3}Oc3Ma>`kFuHOWG--VR@p^rgl+U
zwLncjwJeCJzR_w<CU4iu-ksKgTtK~6NCo=IzeGdZz}8fC9*PJ1bosXjziO&kak@@z
z0L{q53h3v;$!H^7T5%v?-Qkugf9vLn?*Dp1hni6d=VP3s$Kj@cp^u3+6+nDMHshMt
zT^4g;N8XeGtgM|{Q*)ON?Svc_U{iS5F1uj7!ox`}gwD2L-lGt)qv=Z5&sW)9Hvr=@
zg3=J#vt0eIHuG_NjnMC1BDtYmT@>xmg};4g!nPxgAv3a9+*vHox(wP#bEO-qS(&|Z
zOIJ=_gDL0!OnHI}Re#(r5s_X6T@BT(Xt7?B)C<5w)bK;V1-lU){03Sya-xN%alCVG
zF=w|u_LF6)qu?>AasN(M7k1d0FDt<2YDIm_gYBjs%s_T3U0pfwpEpM~$B#UHO&`}R
zSJ^J|gcPY!dg1q5gt+iWQOi<BQ4z43?-PPnH@!)uq^0Aaywbw|YRaxze%_XlSkdvX
zIPjihGu00N@;&ySS4Am%F64)?s<EQ$wQkfTgVZ&5tH)4oBLgxFe$1DoiZ}<kGWIPq
zYKxDzWZyO#0@dYl-Z32j3kq*+JnvMniss|SC_V%6!EeSNc)vgEeEfT$;T1>+eD@Mm
z>3Ds8@7GCW!gp|YGD$)LGTK{rs6)`rB^zUyM+j9DVu`h_Bbc0EI3&sV>Y5}PiPcoX
z)4id4E}`PnF(65SSqLQO4dFM{iTx(Z2)Z1ciQWSaaRcNOpN{I2bGs>gyXq<wq@^h#
zab~nH9>pr!_J&%2LXGbTxG{H^{ES_Q)lT=ogo^x}R{*#~b0XI3K~J&+j`@8&hN4IL
ztWvt!0v|yhn+)X{tj8Dg11j0dlUUfRmMXY&8;S?>1$S>Zx2v*q=`0kDvbnIo9k=VB
zp@=Of78kWdIlJ0on(AlMIOrt&^pl2c)e9BRxBXF&Mw3opKSYj?^Br&?(kni}^sTDt
z%8$>gZ3jw$)ymP~Ox7W$TeG^#5z~IKn?r<M>i{VqI{;l_gB~Le112y3zG1Q>2b5~d
zNfP(n;RL}=+}x&P#x<fkV&9u;=-77p(w&CB8=5Z^0Z$zpL0^-1ilYd}Y}ABk6Fz9_
zLw|E2nPzv0P@V~y5jOB5)vR+jA~O|;{40?_$GndXaxmW4O;UZkrr@UElc5v;vZ(vM
z0tijMjMQzMdjSgohyRR0_S`O1d900uZpAE5C4GIMhQxl!;4j+r+c@NO^V^)ya9ph(
zmfSh4G`7_06XxaPHb3zK$1|TH+patj_s1E^m+&Qc^Znf8)UtrKSl^$2f-`Xf*^%cl
zg97UGSQb2iCSW{tV(4?D1|8w{MYT1+4QsYkwqbU^!u;4<2VV;PR-d(ZN?M-42^eQ2
z_>JKA6=y%$t-WXiM7F~QHyvFP!sMWpICm&F5ICChnYu(SvQ0a#S^yyegVWKz;Z=E9
zkD`^Rdk+*)%&vaR6+{b40?k4_u|4h5t!=T#D#*)A%u6I9EG&9;(aDlxpyS*~CqI~Q
zmBQY+3sEcO66_>s6tmBzg#6v%RPQZMdf#tQf>{3d%EA6i3$W|+GCWTDN6|Ld?If-y
zt?YMJE7xw$`<{PZq|n9Ap};9$$xD+%%C%q~Ow@{JxsvAiG~7&DV1*Gr+beL#Iki%t
zx`LHW#T8&m(q8xudK-mQ5V1G|g-T6Tm_4aMCl0vkahu@BK=iy?>EG<~JbLfS6^9%v
zEfq9O^;z)27@SUdM8y%hH4wfkEw%2|7YFT`9*Ny3020PYyR&`m6eu-q_{7tVtwJ|=
zwY`{XVP;y5jkHPYL5M`~%$~Wg7kecqn`0te)CabrlEuWtoCNSr<&4fN8~Pfe5o=JQ
z#V4fqoL#ijJGs})>Uq8K4^-$eCi1ra8D*Pxq%*^9(J|hrM`^rQnT|zLH6;FMQDwIM
zJoozl?Ch>+e3;Q=*e*3dj-YCW+F@}q32By=U5MQ6=@RBh+)4heXlsx2s%f<yZ(-?s
zAx(L)!s77I)GP0rHM}}4+AO-ITjh@+4a-FCNLY~i2O-j#2ez8pFVTZy$W2@TS6YMX
zfnu>5gFQ`Ng492^cR?CWNHt$9_8D)^HeT<4qIj*qNDoHbC8`itsarCJaH>DDyilaW
z5suF89Gii)8~*)Lk9OxLUg=#dWP=%sM0797mM@R)Ta1s}sGj!D+-5O9TkjwV8Y1Xg
zZ+rWa7E`ANeZz+ri>k&rz7E=7R3k$g4qtU6kKDq;i}@N6(j3{!RMOp*n>MSIW!T|3
z2|V0f5avs2slZ^(3;40{wR=LXW}viV5+F)hu&$6MU_4}jF_PQ)Hz^MgE|Cbh(M@CQ
zub`3uBwY(q-ebvDAZg32@C-`$t+wjTj{{z?1=|Tzm22Q^8{3RZhOEl|)4%ir97!|7
zLuR=WpRFu`!aYIPLe(Re!dZ>CI~e^KQ(_=|_sz)2h)L4>=l-?0%F_MS&*y@1x_$E*
zNC|ef7*2_z`sDJ2X|;;<M)nh*1ab{mGT?GD-FKHNq^}C`f|tA$x+GJ24PD2%L)94E
zLse~HyEQ<WQ-iaHVIl@q3yvKJIlc_!qz6Jx#6Et4>}$l=&YCWz@@Wa!jua-&6$)C1
zi{+R{zp}rM;*D9iX#~T{aGtN0i)SZ3@M0mgAU6L%t8y4Jre$#b+jiEe4Z8ggA(xYO
z6Q+5Ggg0_r+M=%>j<QocQ~?{)7v`Z|QA_)~TH{YT^{d!O>2tgq{pb05p5luqyE_G#
z@E~sMm`=P(G@GF}p?4HjKF7GM;WgA(?<04-Je(}h6|Q%WQOcGu0)!R611N6IDITn7
z5?ky6H5amN+s*xXk4hRM>S7T?fEhbJYz1L6RglUTh2njwQ}0bjYnpe$CMa9pesyff
zIx4kOnJ(M*V6LW7(K*bpt)vGUjg2i{*b8UN((ld3+Ec<cFjWvhY4_d~J{jq#zB#uo
zzycpvigw_FgnhL->`oG9jM_AyeuaY5l9G;i+0MnmxkSCkQw2&5-0Fk_7Z)w+k!0rj
zgAaOsmG8i>A_UGuFmd_?VE;KcBBTywRgP<#=t$Sgk^AEq=-nSI*AfA==gk#x#~}_^
za*z%hU)+Q)3?3GHXfrQzSRMY<jMy!q(}f6lV^zJ|0Nr8r7uim-0<3EG4MH#m44-xi
zRmlSTV}7JFd4wt+mm@oIueiEGEprfCW!ew)aq-B6v)a9nJ?3^yUJ+H&HW?)tvIqk2
zB@P(aWmBkC5Mh>5>D0G5iJ36UTOOF{;W%6Kr7|R<bIS*pNq$P(lpZ@pZA!K$na+}n
zO)Lkkc^@oHlRY5JI5S}t8!IN*)m`uEd0;_(vRCXWBpNJg|LeoWpvVP7E34YhY@l{c
z$0H~~br5MDvE*L&iV$6Y#D`Nl?9@~(K~L^3tDqgGyFOaE$-%SFwMx?ZkLLt(%u&j`
zKZVSAqhu$E>aU;Qqg=&K+$U}jttgY=hm9K1W?eaQY)*Jcf9I=LF;4CJX=P7dGkKOe
zLUO?T3()5L(X^ID1-R=QXBMpSAp}s=YxSt;KoKGtD3#mj{@jMLEFF2!j@k^Fief^B
z(7lVfYbg4pC4<-!YHxv=LI)Kf&Q)!MSjjrDsC@2YQ(6HIcFNoBFG7)&0NQVTQbR*m
z|C!==l=vhyAMt|lhOG*SZ;F>|34lPK_8bo>pbOb~L}~Q))*DQl70E_=2iCj89%)wC
z>Ulu#>L&HbpRZy~^o`X8yqBhx=c_)+iogG-sGwP32(eNafN_aEqD!Iu^a09c#Jk}L
z52sWXLdB$Bo*qj^RC)Y|YNSdIq8nwU(BL5OHF;!-h-}`>IB&L3)6Te|RB``Gm-X_I
zT3bYjtXwtbW0(Ut30ea71R#S!RurFVgJ{jJ)e$IA7qWos^KpW;QGx&N?~coeHO?&+
zszHjPuDCa271S+UWV*$<`N{cZ>F=c!MxoIXZyr{#o&FU|dVt)wNNLqnDglkUCjv4{
z53!dQS3?6Bqu?XH{mV3ynk&_-#=K~TfsBPT7tB0>xA;1|R5PFuSOuUA^!Iff`k02N
zXFD|R;5@=cTsOHqEHsM)>>^XG;hRJyc+gL8vuDggtyMMkT&8#Td2)?`ufWzstZ|Qk
z{Gt7hrXbm}G^kjpm<I7*l>phD-2x>O%6RkCveTcy{gO2_sd;=;@_Ysf-_zm0S$u8u
zdeE4-`VsFR0g0xIX#Qz^bdODloJEIOuV*L`WP>BR2z(xER4PfR<tRKYVb1ZwsYn)B
z8?@zRa0itvRP*J8AV77P5o_9+G0>ML&Sb#@=PPpES}V=R_zaPNKgQwBPT~{+&6F9o
zKn2+f#NHnRUEC%`m0*Dp-7(Y6f-5-;@|u=`kgRJcqoFz*E(DNJ%T_oZ<cQaIM8ttY
zo@aqhHV+FFmgF9xs?TCY@h#H5g=*<gUNYCjxuzmqH1kZ`MIG_$c4``mG5M0HT)&F`
zO2<PXE^s}on`Q-v$lG?$>wz%}L2P}!5?~fPiX1aJOkXc~K9!V}knnF6)Rg}|zz<5z
zKrvA@z*1C3s{4Lt@*R(Wti^yNYZo7aSR+(Hc<nuI$d_PLYIIBYl#UHMGIubAP2)U0
z7?>Dz1t)QzpXzt2ZAFc)bZU2SFKoJxT;p{SOxompxn8&iwk^OqiF{E%OO3#3XD>j%
z@y$q!JFkFQcqzn6J^Rn!GKki=|0<OnHr%4mS#4>i8_|E^4fQYO|7{njMekmO8X`%t
z3G-b&DcO-V0h{77D&RACuj}Td;G|YHhTl3vwchHwbuQ#MJ9JX(?_5wQPpWtCz9k)p
zST7AJ;F+Ct0Ce9hEg5ijqhHJy^%hwwg7jo54>+b>9C<1yy1^xK7~htB&L9#ca$|Va
ze-IWqiG$FP(4e%3zN?N3B2(X*`LY3LTgx{QqoZ%$RT&tJ-Kx7*Xk<B2;R;9c#Z9Mf
zKiuvy4=DXPDiv4HsSKg!dR#!slmWtTg=|K;&*>?1;=O38cr94*p7{9G*HVp_Cy?DR
zs?)76M!K$Oz$*Hqp=Q{bs8&+L>CB0wCax1HH8n~Hr1U>MP$QgFTXeG%542FJ9Anhz
z446%he___=CW8cn%=D!?*$XXJ*jlUrmBFk?^@W~mb}qS_$O2!cnMjW{7MZNYl&1>j
ztm;ykH&0iIYMC()Ej71S2mzgDp#volz8ciB0Bsw3e3HrT=kfhGRfi<30RkY_GmV)7
zK`(?g5ueCQ=d~JDWJ4!~C7Z$H{?!&_IupSRt+LQP5(((kcj>Mi*dwVjt`nv1lRP=*
zy*iOkKKWUF!-ZNrf%0r{PI(0dEa1iQUQD$&xs?!Ub48jeQT1w!Q$O(!Rq<kU^Z>@{
zJ-snM5-S)&=N?nBjFxIIG#cWZZm~0j6%V0r$oV`If)6N({Rh}42_wwzkvFM?_X}?7
zIj?3Zzl+XQeUgdYm~9pv<E(i@W_7xJ2X(x;g2W!dVq4Z=fX#Tajrdrq2Oc33$wX3e
zGz)_5lGomUx-OT&QAGNrTFP&;y8*u^k2R_Sf~zCY4s$BaGc%MiCQi8ljpT<XDNu&u
zgi?tA+fE@TsAT$#NjzMPw@_zL@V~VH)(d?jkl;wWaK`>xKt~V@4?6-ClXPFXtb4h;
zOBUU^81ep8x$bXSVMhX6@=K+N&{KVOLa5Y$I?<PAiN&Zw%AR~EmpCLsB7=ayTYkZB
z-Nl~X6?!>9i53=_Qb}g@<ek%q!-ZTfER@WjZ79U8!)oZyw&c}~TN!ZCjblUC<Vpd_
zfziEr=IFGO>LRewIu<wRSmo|Qje$f{wA3JZ7K2=F6JP?u{DI9jAhrgaXYI6@C~vHL
z;+jmxIhg>XUJmcn1bQz%br0p*<6|11FQE%S$A0VJ=@M78sWH#`rP(MNIxh;;Cw^2;
zZu%=6mAW!v5MTjdYmd|A{!s~XrJf(?#U#xVM&ME0g|2H$??|L8U+x}L^jfa$LB0TN
z3u|=@Dv%al&V5IGh$j@a==%gT`hmqXQ(&;E>eJ;BDoR<X%}9kEz8eXMA4_)I_Y5@f
z9MjcAOGqO1J0(R=bc|a2;}}3}B)L{olWHOIjmYR7Oe>45f6cUW^-}8$VJBM$Lpbtg
zg-x*RA8H_KuJ2i97Oi;BK(Vz)#mo{{M9}klTo$$=GpdKo&=zaN@={5y#R!s_MQRm-
zBPKFm670)WM++BQx5dfjDS-rl)Zi4Kit10Wv?DrJt=(~q7Dk~1`sa~1TZry#IicNq
zR&ACgUQbr|RMK36xMinKLN5WNsKVG80l`TLAvGRUGOT6m(&~PLpAv?y7T9S*2N0OJ
z;}r1<2K6FeUcKp1Y${!$!TU`PP}QuCqq3}dS_|B!w#7?|>T$vwUFCX*Z%o`i+fKQC
zON2g5>J6EXbN*6$pE8690X?mJba9sMiUpk8bQljz@59)P29+#u?J(SH{X2<1C7ABb
zIk_Sf6JEXenmW2yQd3hCSiW!)=mRu}h?-M4fRukE;ylYhfn?c*m~k15wo=HMvPVPV
z6EZXp{bdn5B;TKAVyjq2i+ny?s*{e1ja@%({d)`bgw5&bu=59I>?sOh)b<5}B&ZH8
zdnsyK&MZ-f1qnMWpRT>W#K=XzaG8EG*y;Tm*1#X*2cQ%3JXM+dd^vh)Rq82{$7x%h
zRJxAq3dc1!AkYy8j2hI#BEs-t^EQrH@aFg8;^H@>JX`&2CyHa!%KjSrSYBxSuo{8B
z<{v+tKYn*O{mLS_B%Zd-VDwqhl#EhtTf#P+X|*be&74YwfSCAsN~hwc3KYQ69oG?^
zE-DJdSZYC{u9E4swj1FPds-cMc)*_k!3({`1LIEyrs_I<$s*F?i@`x(xJ>=m>zrgI
z7YAF#9Y6&i{*!1IS~odJ6svcrD=S>24JgfbC-=L_%aQpm@UDzu5|T;BzkBPTojTK8
zz0n6GU&#j|o*xktu(aPVs+}v#XuFqSrPN&LOh{N#DkK5DSUJx6x1T}cnG~k`q`;qv
zf}VffdIbjke5It0K}C6d8fB3B48}sBXg((99V+gXH{RI8=sok32m*OZE)dI_1ODA8
zRKYVY@*T@`N60vq02H`!AU%SfTq)VY=_+ZbESj>SjZ?;Nw!}S#7VR`;7Z4HDOhf`0
z>#oU!&<%2OiA+TL!FTskA9B$y7t`o!_HilXk}A7i9yHl5+wufR&^sPmPbwc#(TOKY
zzd8^qHSW<t|0}WRNEm#`k_wD8y}d;fuOC!-DOCdw@1?f)i08F4E(nOGeoMda1CdbX
z4GB&9+5zq18_RW;N=BA7s>ezov#$^BI9NnO_b?#dZvj-j;7mB@RXq8Q>^k#s+bPi;
zGztzFYpIC~z+)&kS%twEe~Y<gnXVf`0KHMiy<$v}GT&X&gTkQvpt^S?t`__I`|Gla
ztbiQ|aLFM_baq)~hZ_j9vtO*Sp}GJeftQr<K=Luu`uvIRI?jY7tA@fBbD4GX0;VT`
z{9w!oPB8^La(b$*_`}}QV=y<orKck?i4&9<z5Dpn--Qn_ph|})Xiifgk3$z^m<41_
ze(!HNh+ly*K+VA32L(`$1;?9zc4X;^^q0@LmKv{I<VdCo(LzoLOk|peFJ?eo&hsq{
zk9DV%jm8Cu*>80EV{;nLPy413TZk-9I5#@19YZh9eGLETJp|n6XL3nCUR)@PcEMEU
z7W9+<*nE(?GhEi{-Jrde5)a4O{R~83ln^_7lkCSK_+BI+y#;qxnBUVkq+?GDkGE&6
zjjlgBJ3ASn^nM3~A9#ID|4x}V2YR6l0%FSFA_unNgM8bfjlpAAT<Ij8+TG+*!g<rp
zNj9+rP}b5Zf04)q4j7Dp<7%hAC7&D}7ae7VW_Ow|AqoQF25e8223p;+$(GpSrqA0B
zaG`ggc1!OsNWHO3yyW_HyaZ4X*j@({4S92l%O?@dE7^<^1UJK~i9bC>@6bwlYp(F>
zF@%J707;PYPkbsGKS#Hl`(2a$QI}vv5J8dYfdvD%ex5+eXT$ndY|PKT?F{N%7?i3g
zFMq17CD!S<(McN?7PbMsS;=G4oEMCzBbDXDF*bQ7@q1+SiTa6E*m5-9C=Q_GPypOw
z&1SBWfDdhs=~hPwNK}O)PXn`%@(;;wg`@uo4M=o-e`NxCk)5Cae!S4&EzGK4wXlI;
zR5UQ@cMT}vaXC8QeB*W1HkN!9Dy#9G^E7{?;VMVLrZL@#BfiPfW;z;04^~i5`Jl3f
zE+04LSCi685B>~7N?DM>`nGRuqi?)UMdOD*xA718dys-6-@h#fe4HCo+m-@*F5a%0
z&h>VaB-5Y(wD|+iUiIu4^<wP(Mr3dB$4Ps9leM&;XnDoEpI;7D2RkQdDM0i{yj--u
z_41M&FNBL%MBt|yc{cu?UR_<iU%q<^wAra^s>hehJRETn?Gko~iZhTnaKNvv*&MgW
zrwBpgaYk5-zpSPy+goBbw$sBOcjwj|%eKD|wg+BJ@N>^}yw7~A$<Xz8?l1_Pbzfr$
z!cKj~oU&bsE@Xxc_*LY$_>Of+7K~1L2F;(E;BLmC0P9#I!iQ{B<DxJRVy$ILyWX}1
zXMWH2So*c)gU$i{@HskqTJ<oS42OrD<xjxQz>ve&?{p3I74V!*?g9pZ&(}a?9m2Do
z2emps!43!}=NDk*7t*~4sKV1(?GEZz3K5jF=b*nnVOA~Qm2fv9kF-TcLrUsH@d7+I
zL%UiQZKNy=uHYu*4*~}<zK?4OMeGe8WW7GN_gk_$%fsOWAYWn(?V`lCELt-CTQVm2
zW!=o<eu14JD;TZdjcQqnIHTV3V}Jmv(!ZlFhwR_kF^djf3>2tvw$&r{N0N=_@}El}
zl&aKpPr`Qj8KeO`Kw$N`?fV+ayMXD&ff#FP$~`m}mdOT5OSoU_QO+z6yGl`1A3$6<
zXV%++gT10Z%%!k#?*08=V*LNs;XXlOn%2~>#rf9s(;!r6$!F<$WKSY35od=(qgT`9
zCpg0w%fhC|M-^i&dECN+0`l$+S%7zz=Bw^-_8T#%xf(^RKM7t-T?#M!ib`u)DN1Ej
zR$BHDRHWZ@3uV)d+Qy3h$7Q&!<?(!pL{0(m#7`F)EU67vU325g)3;_sy0T_bQMIZ+
zbm)m3QJZ-S7lJBnXsL#rZyGKiXe=BWib@=T40@RWzm%MF{H>YR_qCFwWZ?GPQ+<Y@
zmbQz=MishVv#Zm*{UI6`AaQr#R%!h?H_4hTy8v_ONLg@p3N%iR@EB|)s4>jB)GkzZ
z9(?!1Nx4?7b#5s{6Aua9#PxAxvMM+&^G27ec1~`%AvA;mC8?IqNgT~B82J7%imG}J
z^?;_xdtCN@{(4*KaNRI=>fw_G7@s&_`8y4*?;8kVcB_KY;YPzY3N=Y@2;cgum|8m$
zh7jO1y(e^i1qkRJF8mc4k{{BO4cyk;7oOqK|5$Mr#bQ#|*KAeJ3(U%unfOrymLepY
z0fF2{rS7+{zk%*jzVux<$b7@Ubk+0tQHlFi8hy&NqBAi(z!s3mXd|W*(Sbi`c?5NI
z&*k25+3Q)n!l4J6LSSXUS)<@f)wlcm?CNUXP_!?=wP`BS&a|t!ydF}m`m1-`3Chpb
z&u`WCB@W>JcCPO<I1Kw-GHc(o>LO=TBT59olJ7uPjPu9)w-D$O&jt*r`ETn9544wd
z6zi>pg@vMrOO^)uaH|A8^W_yqZuzn9eBlzo)_q>DoBc&2L7pHA)QQVWiagGGl5a-L
zj05t+;M1$8=<|`%cVKXT=x)@eE2uHiz|+MV%`+e={S4r<5`(I`9X`>#h8JqkpBqJJ
zPNl}j9GV69rhg_et~j?b9<2eM;<gWw_MgH%SlX~CKnSfn$;Tm)2d@Gjx@-eFFXW^q
zzJ3G&1z*wm&VXM|j9u5Lt~ty}n*=9iwCJ^Qi>IPZ4K>UgYRLMBri;$?bON|iUDm%f
z_?Ejui<5hDizRjjl3Ce$XN@MFy>6?y{7cF}9JZ$u$&NPdS;D$gHQTAS+{tae=K>;L
z(|G5>lIKsqr!-I@D_3L&L&(cd6MFf^VM{v}66_CzhAS#t1&4Ik|D{}yt^VU8<qXTA
zLq`w3w>2g$W~Q2Pq)3PS11aC6D1OZV&qmbta&n?5rp$VSldVXhw6cxMCjqbwmJnO6
z)y4xUyPs`L-Uou3Pb%9)P}>*v=*0uqjtFfVmIGnpZLhD#o~(+8Y><|k{xJhje#zv8
ztZqg!(}-kzSrXXt0&g8g2Y)sX{lx)J(bAqbw`1@c2F6CmM><IajRm}J$#n_7^6oc+
zDD%3a_|gKuXJrX30{m=$SNX*xx>k=*A`TCMhdVkKM{1VMO+Plpe99De8|{5R73;<!
zUVxuwjTJ<i>Fm_HO{<XSU#fE0p@G;zncB$t@%cDM*lnWyR8M4Rj1<I%sZOPHvLPNO
z2{&hREe+)d6Vx<qOE|Q=aP&5A6bN4hBO)oNO=m#Y&-B=17C)_$2U4W{{<FGx#U3|H
zUP=5v=~O!=7RA!?7$w2}*Us~%eT+gNj{v;og{wmMT^LA6c4T+nztv3i?(Xg?0l82>
zFgzeq7$>`u1xyv*cRThax{GeA=$p&@{qzz_jPKfw-4$RyV~3h@A`V$#7nQ=Yu8Oop
z{4Z1wU00C_Yt)oFkeTt0nC3UOs9O?cP91&4?`HfIZJLoDNF9#a`c|R|b!WDN`v=&@
z0I!V#sPY|9jAsp^EiNu5McnqPXm&Td>j$c!M3EdiOueu;B2`k6ie%!cm@-*?wuF0T
zxr|H2(@O91f88f-IEY22YKnD>Wh6KYWij!eGZ9_Md`*H*3dQ!wINuBH@?6)n06-)M
z2o*}JzQn94?fwsds9qo0M0`7eI=!3Z(Y>+=t7`ym4)uww`!x{@Jy}Dq6Ya5Ua(t%D
zVi>K4$i$}J_}1k3mwAVn4jgtR;)kio+(#tpp{Eq%^XaRkeel{<x)ZK|tDBEm^>*Oq
zcIs=W;x9(H$rF7BZe@lh`>5}Tp*Xt&0TA@cd^p)K{s&d)C6mmj3J8If*=)9GmmK4a
zT-1uN&b!P0m*8?OLF_TSPWF5*pdWlq%FV1mS5(JZ?1YM6BpBm(Pz9o$uZ_NDciVv5
zJZy3U>WBKq+G#gIFAFcvkAcjall2(%*WN(DDM@1_trX2facuIyWbM=o#nixb)cQT`
zuNV>q2y#|&yop}?LM<DOnD$UB6#|)o+t~_rSIL`jU_h_fVjZKOQX>v|fl`=2V&Q+-
zOa+W#AAbU&(A+G)k<jX|Loaky%y?oo^QTh<1vPsVL<5WQsp4m3&A+DKNy*2t-mHv%
z69AxC>ev(9=BmfKy%$#ZIUr?2x4RcDg08237<W&<yl2dA?Gmt@Nr{=~?b_w;xU4E`
z_BbznxJKssc;hYX#(bR;>lt19Yg0t(6MJ!S9-pzhD&A)J1OO!^wo3<4l!Y$R7}}I5
z)LjX%v4Mk_Rc|X7_Y+N*_u1lPgkGY}B!@P4R`osKWxKa<Mvgs|0=KnYL_LfhgVpZd
zRvl%Ehxm79q1XNe+{fU?$vfcHruL9<AipFkFM$hk3O{^TaqSA+Mu5+yq7Vzr{&CYk
z^*`O*aWwrc`X&oY%j9|lw3-97b4X{J86grI43O;8iu+xVWC${FTAH9wg2yHdU0>rt
z`9sb6=kk;gn?|VG_vCyo>RDywPtIG46B%@Z0b21|zHe8(88<)BGg@vvrYHB2riYr*
zy7c8L#LAC{e$e|c7YzO^G9V*JqL^Y%n66<))W`~k?jHNDdpzlLULQL+u4(uWE67rQ
zs3soE4ar!eEOT>EQUP;94PM%kSjbQ<tx{z&rm`7vF@8ZSd+TlzDQs-s7Yz!P_1Y3b
z7aHL;)ytM>H@+WgC7m_7rTP^Ks8QQ;(|$9AxUvEHQh#&(4>St7dG_5Vm84l{31t~i
zDuD`a?SBExq7!WF+M2%=b{#D#Lc$G3PO|%RS5K$7@}1h#xzbS>p#KNCv(6y}uH4W;
zPiw3P9?J3RI}co`2HI?;xQ+A_kdQZ4Dbi;`|GFp-#)bxovFm3LU(qx>|F*N!F2z*T
zd@4!xi+rX}3wd#+0|E8l<&>f8m)dRrGE#FqV9X@w)kHT-fWo}=x7`^-tP*PViRqFG
zE>hUwv<%->I3spKfKOYMZXr={I!Or#Q{XQNBL+3tLxB$8r#^lLCyCcvniZgILIJs~
zq}m3?QnZRl<4%>ipcKm_{_%pNP)KiGolRwp`E)a^-LN-Mpx`WI5A&&-N9A9*9ym$f
zWK#q<Z8WTx2NZ+bUVY$Yn<g^vjC}%K5zaEFBJrQp^d(e3ME4xOOqZdSXouyNKOvr*
zwn?#w)U7i5TuI{)zdPUr5+L$D^DQRiI!1ff9`7J@4TCcwb?Tv}bttjp4D#v-*CAAI
zS0MT`pn}wQVIwQMYz_3gtNaQPn0}+}?lvuy-vW?ZDkPGU4S1laG)Zxt<tm^Ic>gq*
zf;c%L;N>vi;})|yAT&e<J#WVK&1HESJ;iBPU$9OeS}xBFhDNY>!zCrBS-hOe0q9f4
zS2)&DhbbO?k?H_j*`<5pXCjig2v^^%E?e`8JGa*R4Dg6R=p=)<bkpgu3lzcq$uYQV
z=1IpcB_F1NF9I?*@#1%d$2<Na?r6)4YT<LPztB-yJ3Z<{mdYJBll=Z?N(EH4O-kci
zrt$JM&$IuiC@)<(q0>Cq`o>B?@?}`E$9z|nDAP3r0GpP?F_`A!%wHH^UFJoSPTF+6
zlZEyreoS3lssJjJ(&&odi=4rsQSB%GU?FNPFqM`gsI6L)@lT$9a4<_zFV}PaLVCik
zfNO1L`lJ^{;x6r68&DYVI|TGfldrcPb#weN%$7u143EMYc3sQdNF56Y4GklbZFbDt
zaOdNMRU|J4jI2o#^b`eum=06s94TT?yY}wWzQ{&PaYJM{***gYl{nMcWNMKEh*+}N
z+S)5c!D~$F5LsP^x<p0GY(&ta1fPEea-NAw+L;$f=(dG;(I!_A0aL)<)%@qN$EOt{
ziQht)aHe{P*{;m`f8fMwY^;|*#7od~?Ck82q>0!I#1346!Cm3Ra#fv3SKGh=QJLvh
zliXU2&akyR(w;ww1Oe%OLL`9{%2)rJSQ>>rB{PwQ<0#WRB~n9)htI$!i_TwM*Ut{s
zl3<E#St3=zxUuDF^s~?yzqYC^sWF$m|Lj~geS!b%34fzVjDZpzXQ*a>y$5LekUobW
zelrAE!Axp(GLCqf#?AH`T8$>RFBdnV?!+uSPXR5gk^8qA5!^U&$Fj#O_9pH&fPymQ
zCOUeyN5~qO`Yv(oK&lcv83`_nH4<7NcAQgb`T5vY`(Vm9(_a(rS3JZc{}6BHJ5yF|
zTK68P$Ve74C8o$2i#NnHsua;EH1Nd08S*r6eP>f{Z=iCyC&DFPIx$zS$Og-&s-gb3
zpy{p6@uNfY4R_t2_MY`FS@8;igh!^JnW7!7X!)*)#p;W{Y)a$7?x8&tc*sArY;UYo
zr3iI#RDnDBuUdkcuj;<aS;c=O)q&;O`90+^KruHc#OXxh;g5DYi8Bq}U{NU&=Sm*@
zpOcdG#&*Z9rY~lXuQ4r+0%4tI<CGuCHvIXA3r<4*ZFY1;7~gzzPmw;R8Ofw{oahtB
zTO~bH7gIoA>%RhzC&LMJMeH;b-D3q0Pn^+0-L5?qjVd)fiU2=8RMHfIF&cCuiW+G_
zHosSpfzJ#}I$kz(VDZu9v=-3ttC9YUl^JJAZ1lN@vvs?CW1Yf*?eNv(-`kJz-kfVt
zW9i>~@#=s8ZFsGRZbY%7wf>e2zyW5vJK1Rf!R(J=X>xSX^A><}LjN9#|6WFLilpwt
zo?8je)CeK93P(u#3lIvIJDSw;!^MEE_K^SsBdFSB0QQVe;AD)u5xHzZgM6TwtctQi
z@J~}4`Tk3jq36<);yPUfg#3Bw7gZ4Fo80B>{NqrjR_qicx%wVHXoeDJ#4yKA@OkAf
z<<oEaAH1Q4xT4=HD$(r&w;yO8!W1_cf#1Je5&BQN5y@#&ORn{rG&&fomXA`a*H``L
zR>ZCC`2PnRe9EdbF!v<wq#v*pWbsUJZ1@PfYAo=r5O9v(mD=!($;U;MXwE!c0H)xa
zh!W0#9{vb4>X!WYgnvzLlF8fsE?l(5)~sOlXa!iY)xz+;^vAo_Bfb<4qg%haLt`Ek
zI`*doDDtmA{>O<tfIqjaugPGdvn9>o{j&K9Qkv_;(iQxL1VTQDbyx@J;*F78`v9o{
zO4FP`BiB(q{zpU8ubKg#L81<|w4Bp39aY@>{Gz6(9J>B|Bql<GC4YDGmytD~K65gD
z<%e;r!J{sS8!%~w8~a;oQ+=m`ta98@q$QFjUjLsv@%-I1s^0yreef9BlUpLwlYe%(
z*a6+?z55c>XAJ7T^_D-i2T(83z&fT=Q9Qym!pRo-#tb2I4iqLiG+7l7`SRI3je5!R
zi)k~&lO*M}EfT@GA0IH+0)Y34ag0<+ft0T*yoaX_cE?C#Qh_RJ6=^J5McT&VzZUKH
zGu&Snw)xZF@@)ny@0PSzaG%jc+8%$&1^)gsB$H?Mh4g$044TZ0H3gcgA06cLnwC67
zaLl>DS_P$FW@3_ED|i~!fIQqEY#&subs+94g3*8Q_B&xpN_VG&@#@~9@F`mV<Ph~!
zS^3Cm95F4M0MpSH5`|H{iA(xGH~P9>8I}1xnKmG5)N;&_gS;I~rBWM0<KK3Kmr}=2
z!Q93jkz+A6qBRGr#M6V#{`+*w&23&OBT|m5(d~a?W^GsQqHupqU-sv>w#0B`!Fgs8
znbM7Z*qi^&8s(!@atODbtX#oJK{(-?H>s(v+4I}2@>!1;?fNZvVl;qGn~$esd(HdN
zKMN2T`6jEvP<7Uq`V>s5#hyHQFz{Jt4@J{a{P)Gb0^*AHO`VsG?SA<le!u-86n`-W
zyFx*+>UuesDug|IFycQ+F&FTF6_gL0l}L&olmE7brwHx93PNx;s>93};{WGb05pLC
zWy?YEi9aT5)FX}t>i5_eEN5O|_6fRSVYXy`!)`>Q_%haXNSV(O>n3u6ZFyYjSP1Ht
zz)=<AIWa1gmEnKEq2r<4e0-+u3?v(#Op+MkXw`eR1=RuHMnwP3nlIbSCC5Q+jYQ`2
z@xMFX40WvqmnZ%iDJdzcn}ae2_2}xGiDK_t)_?*k0mqe7R)0!3)^3?peEccn4>=?+
ztGkp+JZ*m`uX)l;d5D@UF(Qs~^=N!z4gX5hzyQ>0Pt7n5E15N99#V&5Q3{KiR&NS6
zhp#yL@0_dsCS{0#ggUezPgg-*u>w<4>?+$D{t030|7Kfn_m$D-9n{Ny3y-PQ(4~0E
z1u(S18830S3s5blJ=(=bQDZkeCFfBUk3+%sjNka$lXllF*x2!R#n`W&N;YM=;Ti%1
z>NFRK-P=8NG-kz!{D8WjbPUTw9D;`KG`x}C;}LnW{#!(_92IAcoPwtJy~0op(N`d{
z#3^4)H*KbR75PP;iQq%v)?itq5XOAi(B|1jTfJ^4OvvZAsp_ylsNRU$hwqZj@FT*Q
z1GMI-GW0)Kv4g{m_isb)FCcW<r$vmFY2O;#G!Q^=9Ck1J)IQ-$NS>0I?Rcw#A&2uB
zc1$E+yY8<(^(7jU0B<gh&Iz@Xc3T6sU?^AXl!_Un*G=KbJ2MP1K}<U}A?D);hT!!!
zOVm&w7>LA(OH-$_7h=e(sX%P<RWW{L?W-I$Mz<Te=lJPGC_EuLTUx{b;5J`&mVOg*
z0VOXm{S&XyPJnwEB?kpJ-Y%g<7;z|-T8k@av_*sv%2+qE52J)%<Xl`tl^T=M!o6ad
zEDR4=rY#<iyFdm0<iQQj)j@YOt0q${T9cSA#2PXYRf3MiuAPgMbY=o4ne<ki+(M=C
z5D&@Dn>8Gzqmzq&PO_Ji=>1^9kF($e_d0U7mkJc>q)^GSU&Pv12_od70tSP+5*n_c
z2?C!`64g8;HW$^$ED=6&Rk%GRkrrg?pT2CbLac;Qh*!e?${&P3<6Lf*TxNP<j+sXc
zsD~<@!pL0+vAHK&GzO@$0U(ox12Mh`)Mgc+M+#^-b410E{#kG8%*{wD-NY$nXTAZ1
z$s6-B(wKko5W0crgSl6tkh~*44Tx%YX_`=WxEH(1=s2>P*|Ne3mWLz=L^J`G_^3vu
zHfX%N^ZN@SDD9Q)*A$f)M&Y9OLE~u7`@RQkClFh_Nx?2M=9j3KuLh-wTLGKmA;F;X
zm`UVrPupiV-`V%cD_Y3tS)y=GfNx`@0D21u9nt6@1N}!-*I<g0d9&>)P6UwH(_<3~
zs`UClZkAUelN^0Y-0x5qq?xh#*wzDD)S3H{c&5WN%@paiEcx-V<61|WIU-z7V9fU^
z67)q62E&19-JbG8Q;~D{v6Gll)rS52axEw_rK}Js^lBa&;Y5%aXMo_T@LCE*Q&k!P
zY1dELkPU8P>9TLNIY(#`;u8K-40C%N^bkw7vaPgr<5u&l&2h~Sq-^ePEztdol@)!y
z_+I^PL=`fEFT)Tt{it*FG^nHk!X}xt_R--s_7)OOuHb+^Gk8F(S^t!NXk}fLsS;=p
zxnWWK&GUn=^#0E-BW$Cwr9}-e_etNiWlFK|+i}1G`^MqT10!5b7VTIeK-sz)2xVj-
zK>eWWNR;SBwh;d5C8P@@Hd3*3tMDGEZ-lNc4#X520A}Jee6~a`F+?$@A2}VPOC=K+
znc%7*JtYA5y7a-3C}7zQpe3j7{%fzB0~#>0P5hQMdKe{#t7V-1Q#G~qCJ-S3mLB_i
z$0`UEVmUhe8d%f^qEeAXF8=#W{sv*J=8QDt796G$em1hv|FYptK#L4=_qI2C{I1A8
z<M{GxSW?3dnpN{_h}Tf#LN@H(Eg<~Z+$`Ko5|Un;sc5OUpI`yK5Ds=aP#|QXTA(lf
z)kpwf;7r2UJ$fG|3cCs1Vd@zQgSb_zsFtxLT`JPeF!d7P%ccohn(Lv@y%8TYBTh$7
zfjPws`^xx|tRa%|O!oTImuO<#&`Wh@CZY9=@)7mDxL<AQQ>MOT9?|V5O3)jxx7c5%
ze!Po6;#+1<n;PbGe&j&<ocFUXz7a(67mNLy3p-&AZI(;>1Idgr6TpE0T^Mz}0do$(
z1|6wxWyQV(-$W~@P@(%l;1po$p}T(4j@{x;4(O|DYKWqeMYy^-VG)!IG2|qc7JRF`
zFcal7HW<mjtKY#iK`)yjSn`^qhWhc|Q{Q`pxF}x>fEEZ1wkPKXphpEjKJ`0IAAn{w
zV^OM9GcIty)`a=hP$dfjw$fIr9m8f0aL!?8be<W4v;oodvHk^^4w-2CZGoB@s%^%K
zr`Cez>>l~M9Z!Rnd%`!z2@LM>=273B`vTIh>_Mia%shys4$&UdpATyMm#z`M#}D+7
zxt;<|nj0C+C{O7}WGTSqr1zS5@|7Rnke66m7wD>+aXKXm#r_uRO-TplbwK|#d)Q9g
zW=r#l)9JFU(l>d|H~E)3`PSeNYbnQ$2Ac`@_rmb!;{0a+3&}h2u_VA&^iL^kP*#|D
zRjAzod;xu^nJA{zKmlY>rqnl5nsdXn*nEB941bT=Q?7+q(Q0v3e}gFX0;A3+?H@p7
zn~&5J&y|4uf!!UK#!~enOyjrYM)c=bb97HLw*qDj6=1%akL0Y&BM-K5EzX%6?R?rW
zS~#x4J@s!(BTb%B&`OI;tu=ehk<CoJ+0l&Qt;1{75^LnpN%7xnCB|&XK;lH2ea%Ln
zi}J0Ksbq!C7KRI7;r2zjh^1+P=8J$OOhvM+C=GoW?vVjW`2uWH{fQ`ZZD^<sR`R!!
zXDfg>U3lMmtR1%-fGdan8S<wdJvhejTYt&Q)+F?re;IBSZKqMQbJeY5r_wjkv<O_K
zy}`P|3lC6@fC|)|Z?CyIj6Qn1$(kFic=;H)k^e;07Ky_LiL)jDxkA(olze?aT0h>d
z+a%}#LvBRbKcwOcld@Wb84rC!EPiYcTu)H?gi;v!uLlz@*phBV`483AFg=H#h_)O~
z$7njdfPzH<AE<bTi%h(M^zBf!nlf@)5WJ|^Lkf<(fHBdw_V2s9ldRE|2i{VgtqTta
zUoeA;<cFpa!te-P2r9V>PWeAN8mlHrfVHCG@qXDBn6_77vcEjWXzD)zxZF(^qmZQW
z4eg3W8}blK7ZVL=8OA3R8ep2~^dTn!uLI-gX3h-{wy|7R5=!#~F1n$u#p}w)t+>yf
ziw50M0#Zv7)Lg|oL5g52*j4Gq^cIJ;q$^H{yOrI@k3CqEVBd%W9>DmLzJ2To#b*Mn
z1n8cQU%1dmpjgJ(jnh6(45^s6F#S$7hkd!SUh~JDR^k0LGw>$TMuYB-CHjmHb+=N=
zJT6yK)>PgH;Pnc^ig6n(lXauiv~~X-bzKs6VrjJ9MhXznt(Rtn`_(`dD;JBMXWz_>
z{)p~}&EH7r-!;N3k{IYuM~%(2V9?s@?5EVHk|VmW6cLa#*O~e8?{G7(z`A+$fL%PJ
ze365JI||Q$nnIJ<O9LC|t~*w|BGz4#(Z_qb^eJKqO9q45Id+-hg&EF7STDl`FY_N$
z*%pN1$A1{Pk?bzU&Go`y4em~tCU)cD+m>k&3<6|Twx8dDn55Erb^{IwH)yqP(G7m{
zD<`avpoV4F(wY;?2Bf@?{?xHj%T5Z02Ejcq|98@2DXm-x(GR>2hRvn1%bK9h0j+)r
z3;N)#bn{Iv1H?fM^f>YS7-WHAKTF&-ecDl=%oMc}i2i>iU3ol|-}fhFO`j+ld&bz8
zWM?dubueV?OUV-1Wf|E?*<xhulqHNtvQ%Wtj9u33TZ)Lr9@&@qUBB=AIj{Sid+xdC
z-1~mcdCobKpdt{f|Ga6&F~hB@8y#+*0a$Q%K%X*e#Pbb%w#bY=a>Kr)sjH~19)Tli
zm_V8HHtZoLd}D@U1}K{6fheN!d>M@C_9o=5E7%9c@^f;F%0;Hoa)e-7hxPyaBEYJ^
zfoYF8^Wl`}f?k}WI0q6dC8XE&U&)oncFXrD7vweBkj&J@Tn`+6=yltt)Z6cTl)tZX
ztTG(=Oqfkggeg0xyw*N@HX#zYkSyvoDS!iy8fF>){yKe~o`2mco%B{Yp-Y2bz<kMe
zyGI6#EQi=@0{>zd$|X!RBA#UNRPyB@q?<$xD7eP-XUiGK_O>l3?rH41)2j|b@2F;;
zc2*{Ba8GVg4&T-QO-u%{TB3*6$WErz#-7AJKOl~&!L_7!CK*U?&3|C(F-QMO4i@${
zB422y@8?Vmp9pA1lfK5ycB&AumyO{Q0yVHLHeaTD-F82pEJVjtTwwFTm5**etTa1l
z1(=`daFvFpC(|2oL$%t20LX;15++|JSo}Bhx7GK8ewIZhSQmLFCSZ{ae}7^ZIG-73
z2OcqwHwo;@zFT|QDLPmKC-2z$N~iTkQGgT&y}J<NWPFQ>X%n-YZ`|YCw$9c%;PdEf
zx?Ao-Eg6p?>R+ex8>o?9Q=vPHH2O5mvURSpHHo%ifpKpCoG1n|G5kW$w2}ip#EV}k
z$;m?+0Z4lu1VkCX>R~fuy_VZy08JwN{@~ms0?m#@=a@$w#q#XS1_alk8Jw?AZ7h~k
zG-_ibsx1?n&$D<8Y#%k$cpkuqZ)XCN`7_aH?iHAj*-1H~-^pAAa*|9o9jC7__y>{k
zkDg}aqnPZjX&)5oAXZNeiMD3~%)`w~BESx$-81*7%embU;rPDZY{4t|gHp;{g4wZu
zrf}MFb2P7pafcoFCblT0%6a-u01HO#?>k(SBxprESe>IKM^>RE09Ro?Q^fygCNr{V
z=sjYJ=$GQh8#3GdF_e~r1(cp%wmb9y8mU4sGhyauioM6zy792(NWYUQx(u-StxLcq
z%S+$iN3GN?Ujke^6vAh&$uUPI>qs^#TV4gPNm(hB99JwOC~*{d&|J_*rg}yIFcJc=
zz>;I0!mtt|;0!htl}(q~>91DL=H!}(&zC2^7|6WT#tQU>2#$#Qjpu^sDDM)IMT^wS
zL5sY`VnWs6*V7P9!!Qdd1ib97U{6lS65}JI8{g5B+c>H!girYQmQ47@u~iWI9x0El
z_J^OC-QdMnBBJ=vIDjI`da6}t3S>dVneHZZkO4&x+%!d4%gQxAW#p<&-I<#l8Dq}@
z;---t0Qy>WnFO5smk;LuRT00<VN&WSzOQ!`*y4;x(V2(iLketGXjvJG82Sa)S#ai9
zL)Dvb@U=ML9OytaruG(y+YWn98JG6(8~EW4BtOZKW)A5FT)%al!A(i7`1cDU&^y~_
zSjqbR96N=rB$r-h>Xte2qLaV2tPGU17j}}Oq3u&n7?L&On39OzJh!}@D4*nhT28v_
z4tfF6j=uNe%q<;#>@lRBPJ7C2cx?d)p7}~Pnt2d45D?C^=EGj76V{Aw0jxfAY6{w`
z(QEQlx;zb96x|6};fN_Im9<Iv=ScU+{o%_!cu>zQYIEv9KJ8BMAf_pmu&VaAP^U>c
zo`eK*9+Z-9{kl~SgGz;y>uyxwN8W*oM3a7EMw^-5rTQP(+#(K#5}M7jkE;k%$h|fd
zL%&x3jtA+%_<ryBf|?l_pRabqk!{aGrbXBBvEfM@$%@N7>W?k5llel-aq%kMMgue6
z%vrrV8-`#OT{gTax3e>1pD_HuMihYx2J%g=-$`sW_H6$`oew}FbK0w(+Wc8NQ<17^
zE{&4*XCGlRwe3<v@m0bVRRSc@ss0^KVVk<6(m9PA<#bUnU8s+|%~AGb)=()I#kv%i
zo=I%Ps3n0%Phj%I;*O^HzcPCYP0KX_)&inM%HV{B&Xet~=d^|?K0hi~y5}k~FY#jl
z4_b{Y_2#CBn57QN;}nv`n^ZGmw3aBPi^*h@S?;MDck?_qyWnL}z6Ykd^G{V1Pr0Wn
zlIea@lSI+?0{?>dE@pFZ?K+%6MAbx69@Tay_)FOJ6Z0SEGTk0O8*8hsZ~%CFGyG3n
zYDO)im#dGnHZ|{65bXBSGERwpLXXGXN)jtCOAmwSHzDWNh8))mI)7@M2>nNt`NuaP
zXOc+IcMb&JU9C>VgYU&d+=AR>r|-nL`Zpeo$zL+ex&&KaaD|rrtx}I6Gq@dl-Sxuw
znW?mp;_qm(^GmoOoeuCR_0+j(Nblfm=mXR2!Mt_+oi$&{N<+KDC3Ip!DzX!MUL{bS
z89i0)zfYDNWTbG#Io#x3+wT*J0SGBX8V*H*v^1t~d7fpGYrkP}n*}_|wFk~H1ie8;
zu3n4%XEpBytIHb~zIiFJIzTe<XAwv%`jn-MPO^t6y(A$OTa&j>wl+rfXm9bhL%RNj
z5TvO0_s~H79EKxdNUuDz7Av0M&CMif2Q|nIX|5NDUZQ@Yq^a>Y)Lvq<SfN*3m<c!4
zKyTM4>w)X}vr=XyY?$Rqr6L^tEqQQ>9n%3SXI(C>KF{p6GYGvGY_4td6T{t%$Pxi=
z@8*@c;1-{_A@@Y@4`ROQapO8KsfVOA0s4ORbj)k!e=w9E4>ZB-Xtudx=l9)1Z3?)4
zr~Qj8cDvG{oG(v79TR#zP$2z=@TB>Txh>%iSH#Qv8c&`=#y8m6PI08WSbYO|yJ}mu
zx<`vH`h@3nJW^aQ#KDciaCnSMllndDK=BY%jEeiFu*ATwZi&EV$L@p7WPdE|xna2&
zRL(PewoCl_DMdso$-=#Pv*cC38Ql)|AFfXlCCS!BHw^Fw3iq+_M_8dP`S)vv(kAa3
zc=s>_5<K@P?aW_;qat1SO85}3QMWcbCmOpcEIF2gX&1Pdj}p`$7aANk)Z^C`>=~+*
z7Ph(YuSDi>NKF3icHsHr_44Goz3fXx8C`)w_Dj1oJi)@B>KTabIEN~udsM@w&$FyV
zt-CsU>KnDz$zB`l4lCvBa15x<6kL(_nxa^k-y@SYm9^d}j;nj<WgBmqo6=M@hm$Ey
zqPi|Lu>fy%+e)<0)%;t1b-v&5)%3PhmV)|er8GuLq@*QpemnR!P`=rW^FsI7?1f)T
z!5bSPd!5zl8biucihFb0STWlk>`t6dxLSBf|G{hDgjRi9uKvrVYdqEt%hCpJ{Vq!V
zyZ_0qUw^VRg=wF*r@_mL=%SKqln)%=v9LEWgb1M1eON+Vt;&OPQ*(wP7$vN|vTWGR
zQkT#1j^9$nUk6&0kXz;hB_51dtUNlZn7Hkl9FH{-3;2ALI}w`GYMbw`*C}fz6TQ{(
z<hfUeLW%IVO$<|U)I6PfHu{~A@vs|Gv0?`aHSC%>Em!!(F=jii$`03iKV)qp@?&u=
zIGrD{uj+k!RqVF}V~5Tlq+h-2+~;dg42|<oxim@D$<IDfvwkpFqGI<o&>O=KxSk9m
zAT+1m9@<BXfR)!j-l15U8cyo!Tu{fsv!xT3B2Qa2B(>;^lXSDP8uEqj251<G6m_g*
zqeb2P={}8I$o}{sC}^#y_Ag3kYRA@Qbob7x*qb*nQ^)z%8{?m4xDWL<tsR{4u=P}}
zEPA>F8Fco1L%!nOfVLk-UPxGD+PFvAcNleF-7URKK2s|zBakn-T($w*L&fS<g*tKT
zk|_Tg)uxqUSPjckBj5(fOVqh(SN7m)_ojQ@p4<f=?F6AOs#xKkSJgsUHkmW2JB6&@
zdl16xA*M;E89Xffc-=j6ZTS70&j0;tf}zuOP5m6oC<-+l-srPN+D^RU{*h%FGux2?
zkugXw>_}LV?<P%eq<{C`j@LBoyad%Ap0+9-!=0Ymc*ZtF+$h*PWJ7RiF|dA-;j&Bx
zThvVV-cV`U1cS>_OGT)UUo#8!lSDHs%6(}sUiMg<uBKmAec-t&HhP`0;}KH_%Hhou
z^tGo09*F<c3{GDR7XA7Re|xpA$OOawA#7y#qEB{$k?*NvUwlm>&UF1DGJp+FrxH4l
zdxbXKVSl5&ABFsG2bJwGhTITXaDMXTn~4!Uq~el`j0+CdF^3w-yd87Hkl-x#_4`P5
z$XriVR975c2!Wj3+Aq)PU9E^rpRg=7S}vAe>KGo%@*V!dw{K#^E)0p97ttNYOGHMy
z=ig-5iNlRJ=`{a^TmRR%wF9~<ONDos;QpXqW`C^n+T*923#+tEdR?5Yc$c<AgK4Wk
z25GL``s-g)dTQG&(E>FZL++O;^sBK7rCydYP}d6P?30ndPpjEr6wGJJJ>ya&;2#hy
z<u#e>pBc{a2=ltc?AhI^KT>(@R|;f2mP$5{4o<|2)mnhXne+-|{l1RK=baxBG?;Nz
z9O@&NJx<uTnAG2NQZt%i&~}Nh#9%yr<kL~j-oRdhm;dL7RUb#7G+V+8!>GV+nnK8a
zG5@3cZrv7x3X(XN&$a>%FMAZ~99>6rmhhS~5izoE=J)IP(3cfM>qCkbcXoH3q8EF~
z*t&4WN3pN9b%PaHhK5G&@utR`@Ddx-Q^`3(YtZ{Ez1QU}<Cn3ho89=UX*7bFkG;AQ
zf0lFAh~`NMCnK!6fBI)xexM5pTov<?$+NLlwvwU0<Pu@8BV^E2-hr<@FPIWpc3Up8
zOtDU%WO140&4(Q*ue(KXUmDzjCYe;Ahg_gt_q0Ab^pg4LMY+`3&nNhmw^+u*{9-W^
zUM4lSg+X;^lJ?;cE@6moAMp!z%jv`Uhu9&Z!I5zs+>f8l_c-T0P4@cgY9o{fo}kZj
zFB;led64{iiJ!5q!MlMU&6=fZ;NmD!%OzoC%!5IO5k_#|1qq95gCYS`KO`hOrsa*K
z)qYhY(|K>OKt;dwXC`N|qRcs>!Xta%-{WGSv3E`;m8_U9C<Gm%$+-ESloD~TH8r~X
z-4@Z-<J~pk30xXZ7&DD{PHl7TX};%X67u_e4;0YcOu|$K#N!|JRlk0VAVv-ObfJPS
z+q){)__O{^*M`cWS()P6kFFTXm03>Kz<~w9O;R-s2GiG02zGQFkv;a#OvxV?WjmYd
z!#m#`H8glc8_K5ofOE!&U2bP@$tR}lMH>MlEeIycy2(eh4fH(bn7V?O!wbc|ilhnK
zYN@-@e$16RCOHa33LS2v!>HWtJ>*)+s3vg3F>Qr!U{Z`hXysrRT9Q0t7#y&p=#WHx
zoHXt)_Jac++g1VwB!VT|{@#CmOM6ue>eGEnwYpo)<w53z$EN<r!k^6cZF|3b)N_|{
zcKnRnE0STD?GkaCu(9FE$*c|x-)~J#gk!Ydnfhyz8EZosJuHM#VF`Ix_P5ickAI>i
zETvfCm{h?tQe!h~Uo}P1WP=Db=_RVF?O0l}n|FY3XjmaV_El^=w#)KO3ygUtEXqrE
zd}+h<Ha4Xgh$7v8Z|C9C;9=mbD6tqkG!hXy8&J*pXqogsbueKCv~_g(^n+DN>$a5O
z+DOu2nR51)zv!{N{0EZ6r6rOQkJVxO6KFqP-CWmN=>`^pKQ~Z+q|$D=JA1eb&UQ)E
zB-okmuJk6AHK(~Ag}e(Nz)U6=1#AEEZF>()rJ1kCa%q>woY9&3S8=k@him##X&o8R
z-p_~Xh?Wfh_I-VQ`4M?w!mjA>tx#NQRpNgHo1fn|7a5&)AI`P{VyO&K<`GE$$@*Zm
z@Ez?-9sPWxdYXu$bF~dKp9{m&TB*O6Q~6X$$F<qPFA|)8VrqE&1FU0TYnA4KNuN({
zP2@6&UmLRzVRF8|stk2*<{(m~R~EYk9=)h))$uSgV#ePEZAG)@0tU$EpIH-CBU!`s
z{1J@Ybn7bby<}91PLg0}f)e?k-T3biUK~(Aumhw@dJ;3d!@sHHoM&WT?1BXW{X;zr
z%H99m9_g5<m`By0_*#1bc9HF0cJM%U+Kaq+F0BO}5nZTh>F2$lD_V;Q;oqaeFU=d@
z@?F)3#;^rG$e|&JmEYa_Pd+rHS!Y!T+IdEiDkxyxo%8E>h0h+xP1Qu>Yw(njBD&em
zS{044uv+xw8>%X*xHB!#NhFbicR9tr$enNK?^UDv)YcC(_28UXTvvO`V@M|LncMmc
zp|2+!7XYfQIIZkEvq942tCDcE0G{4~hz=lA`d?9N3?vN|OhjrJWW-}*DT-y0g-eDu
zuLbO6H?0>#u7jbRo{f&4Nt8)7BZlr9HXj_t&;rS%{5LRY=cltPA@0akZ@&m`PL)_C
zjj#+Hu3TGJc1l+s8?Exb4kph!8!0$4GoEq6l2=XaGgqvk4^dRoDjq8$`V!?fJ)WCQ
zS2cb4av7f5rEd&g%#3%5hW8Z$l*P*=LoO5#;*uz`Ch8omSR$92bE7K@Rjmp4Vg_`@
zQDCU_?w6RnEZM=-14!k__jJm&Tj~oIKCaY}C4FlyVynFiD`*!lJ|-4^rYy>0eEnh%
zs;rOMt@QxXe<uNkmdkQH?u}A;xaoN3aO9d2D|w_>87-FV0}cbIbNe25n3Gw-&5yM1
zkqtMlS6v{+R3H3K2);7mR(WlyeI(_J3++G!q2}cMM6-rSBoLj(M?68zT)u?{abPOn
z@O?JQ^OX0M-k|+oV_C}Mk(pg~y9&X^M~lJZ5(J;{)d$cteN6;7IM1-f?n{sr7Aiyx
zNqF&?Fj08`xi-2fG{QktZKdYqq2P&dB&swv{){F!G!zy>6!UaOff6Uj4^2<!u&M3+
zs(UWB-Ftje+jrrIHfiTM<l3*sobIW;ufpOu?l$+!Eo23`mqdz*Tg!84blKFW`SbB}
zU5c8n7{Ieh@exmGQ{WrB5Cb{KpYz_T`wiYs!7c8-PIc1L3BD1&5n_@IUG|?0Fcz|e
zdF}pRUE-G$)D=ifKY5zF;1_d@Dd4nMi7||qC~3|$Qp#mQqH=Ljo^lp49E}e(r}J4+
dFH%d$G{&5bH2>yg1Sr4{p=qE|e&@l{{{s-(@(cg~

literal 0
HcmV?d00001

diff --git a/doc/cvode/examples/source/index.rst b/doc/cvode/examples/source/index.rst
new file mode 100644
index 0000000000..bd8ac1bdea
--- /dev/null
+++ b/doc/cvode/examples/source/index.rst
@@ -0,0 +1,239 @@
+..
+   Programmer(s): Daniel R. Reynolds @ SMU
+                  modified by Daniel M. Margolis @ SMU
+   ----------------------------------------------------------------
+   SUNDIALS Copyright Start
+   Copyright (c) 2002-2023, Lawrence Livermore National Security
+   and Southern Methodist University.
+   All rights reserved.
+
+   See the top-level LICENSE and NOTICE files for details.
+
+   SPDX-License-Identifier: BSD-3-Clause
+   SUNDIALS Copyright End
+   ----------------------------------------------------------------
+
+.. CVode_example documentation master file, created by
+   sphinx-quickstart on Wed Jun 14 02:10:03 2023.
+   You can adapt this file completely to your liking, but it should at least
+   contain the root `toctree` directive.
+
+==============================================
+CVode Example documentation
+==============================================
+
+CVode Overview
+=============================
+
+This is the documentation for the CVode examples.  CVode is a
+Krylov method integration package for stiff, nonstiff and
+multi-rate systems of ordinary differential equations (ODEs).
+The CVode solver is a component of the `SUNDIALS
+<https://computing.llnl.gov/projects/sundials>`_ suite of
+nonlinear and differential/algebraic equation solvers. It is designed
+to have a similar user experience to the `CVODE
+<https://computing.llnl.gov/projects/sundials/cvode>`_
+solver, with user modes to allow adaptive integration to specified
+output times, return after each internal step and root-finding
+capabilities, for calculations both in serial and parallel (via
+MPI). The default integration and solver options should apply to most
+users, though complete control over all internal parameters and time
+adaptivity algorithms is enabled through optional interface routines.
+
+CVode is developed by `Lawrence Livermore National Laboratory
+<http://www.llnl.gov>`_, with support by the `US Department of Energy
+<http://www.doe.gov>`_ through the `FASTMath
+<https://scidac5-fastmath.lbl.gov/>`_ SciDAC-5 Institute, under
+subcontract 07NA27344.
+
+Along with the CVode solver, we have created a suite of example
+problems demonstrating its usage on applications written in C, C++ and
+Fortran 2003.  These examples demonstrate a large variety of CVode
+solver options, including explicit, implicit and ImEx solvers, root-
+finding, Newton and fixed-point nonlinear solvers, direct and iterative
+linear solvers, adaptive resize capabilities, and the Fortran solver
+interface.  While these examples are not an exhaustive set of all
+possible usage scenarios, they are designed to show a variety of
+exemplars, and can be used as templates for new problems using CVode's
+solvers.  Further information on the CVode package itself may be found
+in the accompanying CVode user guide [R2018]_.
+
+The following tables summarize the salient features of each of the
+example problems in this document.  Each example is designed to be
+relatively self-contained, so that you need only study and/or emulate
+the problem that is most closely related to your own.  We group these
+examples according to programming language (C, C++, Fortran 2003).
+
+
+Tables of Examples
+==========================
+
+C Examples
+-----------
+
+CVode example problems written in C are summarized in the table
+below, and are further described in the chapters :ref:`serial_c`,
+:ref:`openmp_c`, :ref:`openmpdev_c`, :ref:`parallel_c`, :ref:`parhyp_c`,
+:ref:`mpimanyvec_c`, :ref:`cuda_c`, and :ref:`raja_c`.
+
+.. cssclass:: table-bordered
+
+================================   ============  ============  ==========  =============  =========================================================
+Problem                            Integrator    Nonlinear     Linear      Size           Extras
+================================   ============  ============  ==========  =============  =========================================================
+:ref:`cvAdvDiff_bnd`                BDF           Newton        Band        1              user Jacobian
+:ref:`cvAdvDiff_bndL`               BDF           Newton        Band        1              LAPACK band solver, user Jacobian
+:ref:`cvAnalytic_mels`              BDF           Newton        Custom      1              Matrix-embedded Custom Linear Solver
+:ref:`cvDirectDemo_ls`              BDF \\        Newton \\     Dense \\    3 \\           Van der Pol (1) user (2) dif-quot (3) diag + 2 \\
+                                    ADAMS         Fixed-point   Band        1              2D advection (1) user (2) dif-quot (3) diag + 2
+:ref:`cvDisc_dns`                   BDF           Newton        Dense       2              Solves two separate equations, the second twice
+:ref:`cvDiurnal_kry`                BDF           Newton        SPGMR       200            block-diagonal preconditioner
+:ref:`cvDiurnal_kry_bp`             BDF           Newton        SPGMR       200            Solved twice with banded prec. on left and right
+:ref:`cvHeat2D_klu`                 BDF           Newton        KLU         1100           sparse matrices
+:ref:`cvKrylovDemo_ls`              BDF           Newton        4 Krylov    200            SPGMR, SPBCGS, SPTFQMR used
+:ref:`cvKrylovDemo_prec`            BDF           Newton        SPGMR       216            preconditioner matrix (1) implicit GS (2) block-diag
+:ref:`cvParticle_dns`               BDF           Newton        Dense       2              user Jacobian and user projection
+:ref:`cvPendulum_dns`               BDF           Newton        Dense       4, 2           user projection, solves problem via inexact/exact meth.
+:ref:`cvRoberts_dns`                BDF           Newton        Dense       3              user Jacobian, root-finding
+:ref:`cvRoberts_dns_constraints`    BDF           Newton        Dense       3              user Jacobian, root-finding, constraints for all comp.
+:ref:`cvRoberts_dns_negsol`         BDF           Newton        Dense       3              user Jacobian, root-finding, negative solution comp.
+:ref:`cvRoberts_dns_uw`             BDF           Newton        Dense       3              user Jacobian, root-finding, user error weight
+:ref:`cvRoberts_dnsL`               BDF           Newton        Dense       3              user Jacobian, root-finding, LAPACK dense solver
+:ref:`cvRoberts_klu`                BDF           Newton        KLU         :math:`3N`     sparse matrices
+:ref:`cvRoberts_block_klu`          BDF           Newton        KLU         :math:`3N`     sparse matrices
+:ref:`cvRoberts_sps`                BDF           Newton        SuperLUMT   :math:`3N`     finite-element, sparse matrices
+:ref:`cvRocket_dns`                 BDF           Newton        Dense       2              user Jacobian, root-finding
+:ref:`cvAdvDiff_bnd_omp`            BDF           Newton        Band        50             user Jacobian, OpenMP
+:ref:`cvAdvDiff_kry_ompdev`         BDF           Newton        Band        50             user Jacobian, OpenMP-dev
+:ref:`cvAdvDiff_diag_p`             ADAMS         Newton        Diagonal    10             MPI for user routines
+:ref:`cvAdvDiff_non_p`              ADAMS         Fixed-point               10             MPI for user routines
+:ref:`cvDiurnal_kry_bbd_p`          BDF           Newton        SPGMR       200            MPI for user routines, solved twice with BBD prec.
+:ref:`cvDiurnal_kry_p`              BDF           Newton        SPGMR       200            MPI for user routines, block-diagonal left prec.
+:ref:`cvAdvDiff_non_ph`             ADAMS         Fixed-point               10             HYPRE parallel vector with IJ interface
+:ref:`cvDiurnal_kry_mpimanyvec`     BDF           Newton        SPGMR       200            MPI for user routines, MPIManyVector module
+:ref:`cvAdvDiff_kry_cuda`
+:ref:`cvAdvDiff_kry_raja`
+================================   ============  ============  ==========  =============  =========================================================
+
+C Examples Deep Dives
+----------------------
+
+Deep dives into CVode example problems written in C are listed below,
+and are further described in great length in the chapters
+:ref:`serial_deep_c`, :ref:`parallel_deep_c`, and :ref:`parhyp_deep_c`.
+Further testing is discussed in :ref:`tests_deep_c`.
+
+.. cssclass:: table-bordered
+
+======================================   ========================
+Problem                                  Example Type
+======================================   ========================
+:ref:`deep_dive.cvRoberts_dns`            serial
+:ref:`deep_dive.cvAdvDiff_bnd`            serial
+:ref:`deep_dive.cvDiurnal_kry`            serial
+:ref:`deep_dive.cvAdvDiff_non_p`          parallel
+:ref:`deep_dive.cvDiurnal_kry_p`          parallel
+:ref:`deep_dive.cvDiurnal_kry_bbd_p`      parallel
+:ref:`deep_dive.cvAdvDiff_non_ph`         HYPRE parallel
+======================================   ========================
+
+C++ Examples
+-------------
+
+CVode example problems written in C++ are summarized in the table
+below, and are further described in the chapters :ref:`serial_cpp`,
+:ref:`parallel_cpp`, :ref:`hypre_cpp`, :ref:`onemkl_cpp`, and :ref:`sycl_cpp`.
+
+.. cssclass:: table-bordered
+
+=================================  ==========  ===========  ==============  ===============  ===================================
+Problem                            Integrator  Nonlinear    Linear          Size             Extras
+=================================  ==========  ===========  ==============  ===============  ===================================
+:ref:`cv_heat2D`                    BDF         Newton       PCG/SPGMR       :math:`nx*ny`
+:ref:`cv_kpr`                       BDF         Newton       Dense           2
+:ref:`cv_heat2D_p`                  BDF         Newton       PCG/SPGMR       :math:`nx*ny`    MPI parallel vector and routines
+:ref:`cv_heat2D_hypre_ls`           BDF         Newton       PCG/SPGMR       :math:`nx*ny`    HYPRE parallel vector
+:ref:`cv_heat2D_hypre_pfmg`         BDF         Newton       PCG/SPGMR       :math:`nx*ny`    HYPRE parallel vector, PFMG prec.
+:ref:`cvRoberts_blockdiag_onemkl`   BDF         Newton       oneMKL/SPGMR    300              oneMKL linear solver, user Jac.
+:ref:`cvAdvDiff_kry_sycl`           BDF         Newton       SPGMR           50               SYCL parallel vector
+=================================  ==========  ===========  ==============  ===============  ===================================
+
+Fortran Examples
+-----------------
+
+CVode example problems written in Fortran 2003 are summarized in the table
+below, and are further described in the chapters :ref:`serial_f2003` and
+:ref:`parallel_f2003`.
+
+.. cssclass:: table-bordered
+
+=================================   ==========  ===========  ======  =============  =================================================
+Problem                             Integrator  Nonlinear    Linear  Size           Extras
+=================================   ==========  ===========  ======  =============  =================================================
+:ref:`cv_advdiff_bnd`               BDF         Newton       Band    50             banded preconditioner, user Jacobian
+:ref:`cv_analytic_fp`               ADAMS       Fixed-point          1
+:ref:`cv_analytic_sys_dns`          BDF         Newton       Dense   3
+:ref:`cv_analytic_sys_dns_jac`      BDF         Newton       Dense   3              user Jacobian matrix
+:ref:`cv_analytic_sys_klu`          BDF         Newton       KLU     3              sparse matrices, user Jacobian matrix
+:ref:`cv_brusselator_dns`           BDF         Newton       Dense   3              user Jacobian matrix
+:ref:`cv_diurnal_kry_bp`            BDF         Newton       SPGMR   200            banded preconditioner
+:ref:`cv_diurnal_kry`               BDF         Newton       SPGMR   200            user preconditioner and Jacobian
+:ref:`cv_roberts_dns`               BDF         Newton       Dense   3              user Jacobian, root-finding
+:ref:`cv_roberts_dns_constraints`   BDF         Newton       Dense   3              user Jacobian, root-finding, constraints set
+:ref:`cv_roberts_dnsL`              BDF         Newton       Dense   3              user Jacobian, root-finding, LAPACK dense solver 
+:ref:`cv_roberts_klu`               BDF         Newton       KLU     3              sparse matrices, root-finding, user Jacobian
+:ref:`cv_diag_kry_bbd_p`            BDF         Newton       SPGMR   128            parallel MPI, BBD prec. -- left and right solve
+:ref:`cv_diag_kry_p`                BDF         Newton       SPGMR   128            parallel MPI, user prec. -- left and right solve
+:ref:`cv_diag_non_p`                ADAMS       Fixed-point          128            parallel MPI
+=================================   ==========  ===========  ======  =============  =================================================
+
+Fortran Deep Dives
+-------------------
+
+Deep dives into CVode example problems written in Fortran 2003 are listed
+below, and are further described in great length in the chapter :ref:`deep_f2003`.
+
+.. cssclass:: table-bordered
+
+======================================   =================
+Problem                                  Example Type
+======================================   =================
+:ref:`deep_dive.cv_diurnal_kry`           serial
+:ref:`deep_dive.cv_diag_kry_bbd_p`        parallel
+======================================   =================
+
+
+Chapter List of Examples and Deep Dives
+====================================================
+
+Further details on many of the above-listed examples are provided
+in the following chapters:
+
+.. toctree::
+   :maxdepth: 1
+
+   c_serial
+   c_openmp
+   c_openmpdev
+   c_parallel
+   c_parhyp
+   c_mpimanyvec
+   c_cuda
+   c_raja
+   c_serial_deep
+   c_parallel_deep
+   c_parhyp_deep
+   c_tests_deep
+   cpp_serial
+   cpp_parallel
+   cpp_hypre
+   cpp_onemkl
+   cpp_sycl
+   f2003_serial
+   f2003_parallel
+   f2003_deep
+   References
+
+.. only:: html
+
+   * :ref:`search`
diff --git a/doc/cvode/guide/source/conf.py b/doc/cvode/guide/source/conf.py
index 79cc7b7016..04231ae5bd 100644
--- a/doc/cvode/guide/source/conf.py
+++ b/doc/cvode/guide/source/conf.py
@@ -18,7 +18,8 @@
 # -- General configuration ----------------------------------------------------
 
 # Set variable used to determine which package documentation this is
-# Can be one of 'arkode', 'cvode', 'cvodes', 'ida', 'idas', 'kinsol' or 'super'
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# 'ida', 'idas', 'kinsol' or 'super'
 package_name = 'cvode'
 
 # If your documentation needs a minimal Sphinx version, state it here.
@@ -287,7 +288,7 @@
 texinfo_documents = [
   ('index', 'CVODE', u'CVODE Documentation',
    u'Alan C. Hindmarsh, Radu Serban, Cody J. Balos, David J. Gardner, Daniel R. Reynolds, and Carol S. Woodward', 'CVODE',
-   'Time integration package for multi-rate systems of ordinary differntial equations.',
+   'Time integration package for systems of ordinary differntial equations.',
    'Miscellaneous'),
 ]
 

From 0d0d4b6edd460e2cc491576eb8b34c07c1200c95 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Fri, 17 Nov 2023 11:26:06 -0600
Subject: [PATCH 30/35] Fixed ARKODE-examples builds

---
 doc/arkode/examples/source/c_parallel.rst   |  42 ++---
 doc/arkode/examples/source/c_serial.rst     | 170 ++++++++++----------
 doc/arkode/examples/source/conf.py          |  14 +-
 doc/arkode/examples/source/cpp_parallel.rst |  16 +-
 doc/arkode/examples/source/cpp_serial.rst   |  18 +--
 doc/arkode/examples/source/f77_parallel.rst |   6 +-
 doc/arkode/examples/source/f77_serial.rst   |  35 ++--
 doc/arkode/examples/source/f90_serial.rst   |  16 +-
 doc/arkode/examples/source/index.rst        |  50 +++---
 9 files changed, 176 insertions(+), 191 deletions(-)

diff --git a/doc/arkode/examples/source/c_parallel.rst b/doc/arkode/examples/source/c_parallel.rst
index 433461c989..0c0d006599 100644
--- a/doc/arkode/examples/source/c_parallel.rst
+++ b/doc/arkode/examples/source/c_parallel.rst
@@ -28,19 +28,19 @@ ark_diurnal_kry_bbd_p
 ===================================================
 
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``cv_diurnal_kry_bbd_p``.  As described in [HSR2017]_, this problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &= 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\quad i=1,2 
+   \frac{\partial c_i}{\partial t} &=
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\quad i=1,2
 
 where
 
@@ -57,7 +57,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -76,7 +76,7 @@ We employ a method of lines approach, wherein we first
 semi-discretize in space to convert the system of 2 PDEs into a larger
 system of ODEs.  To this end, the spatial derivatives are computed
 using second-order centered differences, with the data distributed
-over :math:`Mx*My` points on a uniform spatial grid.  As a result, ARKode
+over :math:`Mx*My` points on a uniform spatial grid.  As a result, ARKODE
 approaches the problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
@@ -92,7 +92,7 @@ constructed using the ARKBBDPRE module.  Each block is generated using
 difference quotients, with half-bandwidths ``mudq = mldq = 10``, but
 the retained banded blocks have half-bandwidths ``mukeep = mlkeep = 2``.
 A copy of the approximate Jacobian is saved and conditionally reused
-within the preconditioner routine. 
+within the preconditioner routine.
 
 Two runs are made for this problem, first with left and then with
 right preconditioning.
@@ -109,19 +109,19 @@ on completion.
 ark_diurnal_kry_p
 ===================================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``cv_diurnal_kry_p``.  As described in [HSR2017]_, this test problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &= 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\quad i=1,2 
+   \frac{\partial c_i}{\partial t} &=
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\quad i=1,2
 
 where
 
@@ -138,7 +138,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -157,8 +157,8 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, ARKode approaches the
-problem as one involving :math:`2*Mx*My` coupled ODEs. 
+points on a uniform spatial grid.  As a result, ARKODE approaches the
+problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
 with two subdomains in each direction (four in total), and where each
@@ -171,7 +171,7 @@ solver, through the ARKSPILS interface.
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
 the block-diagonal portion of the Jacobian is saved and conditionally
-reused within the preconditioner routine. 
+reused within the preconditioner routine.
 
 Performance data and sampled solution values are printed at
 selected output times, and all performance counters are printed
diff --git a/doc/arkode/examples/source/c_serial.rst b/doc/arkode/examples/source/c_serial.rst
index dfcc8ef165..759aa2c670 100644
--- a/doc/arkode/examples/source/c_serial.rst
+++ b/doc/arkode/examples/source/c_serial.rst
@@ -28,7 +28,7 @@ Serial C example problems
 ark_analytic
 ====================================
 
-This is a very simple C example showing how to use the ARKode solver
+This is a very simple C example showing how to use the ARKODE solver
 interface.
 
 The problem is that of a scalar-valued initial value problem (IVP)
@@ -57,11 +57,11 @@ should only require a single iteration per stage.  Internally, Newton
 will use the SUNLINSOL_DENSE linear solver via the ARKDLS interface,
 which in the case of this scalar-valued problem is just division.  The
 example file contains functions to evaluate both :math:`f(t,y)` and
-:math:`J(t,y)=\lambda`.  
+:math:`J(t,y)=\lambda`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
 and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
-this problem uses only the default ARKode solver parameters.
+this problem uses only the default ARKODE solver parameters.
 
 
 
@@ -93,10 +93,10 @@ This example problem is only marginally more difficult than the
 preceding problem, in that the ODE right-hand side function is
 nonlinear in the solution :math:`y`.  While the implicit solver from
 the preceding problem would also work on this example, because it is
-not stiff we use this to demonstrate how to use ARKode's explicit
+not stiff we use this to demonstrate how to use ARKODE's explicit
 solver interface.  Although both the ARKStep and ERKStep time stepping
 modules are appropriate in this scenario, we use the ERKStep module
-here. 
+here.
 
 The ODE problem is
 
@@ -106,7 +106,7 @@ The ODE problem is
 
 for the interval :math:`t \in [0.0, 10.0]`, with initial condition
 :math:`y(0)=0`.  This has analytical solution :math:`y(t) =
-\log\left(\frac{t^2}{2} + t + 1\right)`.  
+\log\left(\frac{t^2}{2} + t + 1\right)`.
 
 
 
@@ -114,9 +114,9 @@ Numerical method
 ----------------
 
 This program solves the problem with the default ERK method.  Output
-is printed every 1.0 units of time (10 total). 
+is printed every 1.0 units of time (10 total).
 Run statistics (optional outputs) are printed at the end.
-   
+
 
 
 Solutions
@@ -143,11 +143,11 @@ comparable with those specified by the requested error tolerances
 ark_brusselator
 ================================================
 
-We now wish to exercise the ARKode solvers on more challenging
+We now wish to exercise the ARKODE solvers on more challenging
 nonlinear ODE systems.  The following test simulates a brusselator
 problem from chemical kinetics, and is widely used as a standard
 benchmark problem for new solvers.  The ODE system has 3 components,
-:math:`Y = [u,\, v,\, w]`, satisfying the equations, 
+:math:`Y = [u,\, v,\, w]`, satisfying the equations,
 
 .. math::
 
@@ -158,21 +158,21 @@ benchmark problem for new solvers.  The ODE system has 3 components,
 We integrate over the interval :math:`0 \le t \le 10`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`, :math:`w(0)
 = w_0`. After each unit time interval, the solution is output to the
-screen. 
+screen.
 
 The problem implements 3 different testing scenarios:
 
 Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
-:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}` 
+:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
 
 Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
-:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}` 
+:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
 
 Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
-:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}` 
+:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
 
 The example problem currently selects test 2, though that value may be
-easily adjusted to explore different testing scenarios.  
+easily adjusted to explore different testing scenarios.
 
 
 
@@ -182,17 +182,17 @@ Numerical method
 This program solves the problem with the DIRK method, using a
 Newton iteration with the SUNLINSOL_DENSE linear solver module via
 the ARKDLS interface.  Additionally, this example provides a routine
-to ARKDLS to compute the dense Jacobian. 
+to ARKDLS to compute the dense Jacobian.
 
 The problem is run using scalar relative and absolute tolerances of
 :math:`rtol=10^{-6}` and :math:`atol=10^{-10}`, respectively.
 
-10 outputs are printed at equal intervals, and run statistics 
+10 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
-   
-   
+
+
 Solutions
 ---------
 
@@ -254,20 +254,20 @@ that depend on the independent variable :math:`t` via the IVP system
 We integrate over the interval :math:`0 \le t \le 10`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`,
 :math:`w(0) = w_0`.  After each unit time interval, the solution is
-output to the screen. 
+output to the screen.
 
 Again, we have 3 different testing scenarios,
 
 Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
-:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}` 
+:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
 
 Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
-:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}` 
+:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
 
 Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
-:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}` 
+:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
 
-with test 2 selected within in the example file. 
+with test 2 selected within in the example file.
 
 
 
@@ -280,11 +280,11 @@ split the right-hand side into stiff (:math:`f_i(t,y)`) and non-stiff
 
 .. math::
 
-   f_i(t,y) = \left[\begin{array}{c} 
-      0 \\ 0 \\ \frac{b-w}{\varepsilon} 
+   f_i(t,y) = \left[\begin{array}{c}
+      0 \\ 0 \\ \frac{b-w}{\varepsilon}
    \end{array}\right]
    \qquad
-   f_e(t,y) = \left[\begin{array}{c} 
+   f_e(t,y) = \left[\begin{array}{c}
       a - (w+1)u + v u^2 \\ w u - v u^2 \\ - w u
    \end{array}\right].
 
@@ -293,7 +293,7 @@ stages using the available accelerated fixed-point solver, enabled
 through a call to ``ARKodeSetFixedPoint``, with an acceleration
 subspace of dimension 3.
 
-10 outputs are printed at equal intervals, and run statistics 
+10 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
@@ -317,11 +317,11 @@ previous test, this problem has 3 dependent variables :math:`u`, :math:`v` and
 We integrate over the interval :math:`0 \le t \le 2`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`, :math:`w(0)
 = w_0`.  The solution is output to the screen at equal intervals of 0.1 time
-units. 
+units.
 
 The problem implements the following testing scenario: :math:`u_0=1.2`,
 :math:`v_0=3.1`,  :math:`w_0=3`, :math:`a=1`, :math:`b=3.5`, and
-:math:`\varepsilon=10^{-2}`  
+:math:`\varepsilon=10^{-2}`
 
 Numerical method
 ----------------
@@ -331,7 +331,7 @@ This program solves the problem with the default thrid order method.
 The problem is run using a fixed slow step size :math:`hs=0.025` and fast step
 size :math:`0.001`.
 
-20 outputs are printed at equal intervals, and run statistics 
+20 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
@@ -353,7 +353,7 @@ components, :math:`Y = [u,\, v,\, w]^T`, satisfying the equations,
    \frac{dw}{dt} &= 3\cdot10^7 v^2.
 
 We integrate over the interval :math:`0\le t\le 10^{11}`, with initial
-conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`. 
+conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.
 
 
 Numerical method
@@ -362,7 +362,7 @@ Numerical method
 This program is constructed to solve the problem with the DIRK solver.
 Implicit subsystems are solved using a Newton iteration with the
 SUNLINSOL_DENSE dense linear solver module via the ARKDLS interface; a
-routine is provided to ARKDLS to supply the Jacobian matrix. 
+routine is provided to ARKDLS to supply the Jacobian matrix.
 
 The problem is run using scalar relative and absolute tolerances of
 :math:`rtol=10^{-4}` and :math:`atol=10^{-11}`, respectively.
@@ -370,7 +370,7 @@ The problem is run using scalar relative and absolute tolerances of
 100 outputs are printed at equal intervals, and run statistics are
 printed at the end.
 
-   
+
 
 Solutions
 ---------
@@ -378,13 +378,13 @@ Solutions
 Due to the linearly-spaced requested output times in this example, and
 since we plot in a log-log scale, by the first output at
 :math:`t=10^9`, the solutions have already undergone a sharp
-transition from their initial values of :math:`(u,v,w) = (1, 0, 0)`. 
+transition from their initial values of :math:`(u,v,w) = (1, 0, 0)`.
 For additional detail on the early evolution of this problem, see the
 following example, that requests logarithmically-spaced output times.
 
 From the plot here, it is somewhat difficult to see the solution
 values for :math:`w`, which here all have a value of
-:math:`1 \pm 10^{-5}`.  Additionally, we see that near the end of the 
+:math:`1 \pm 10^{-5}`.  Additionally, we see that near the end of the
 evolution, the values for :math:`v` begin to exhibit oscillations;
 this is due to the fact that by this point those values have fallen
 below their specified absolute tolerance.  A smoother behavior (with
@@ -405,7 +405,7 @@ ark_robertson_root
 
 We again test the Robertson problem, but in this example we will
 utilize both a logarithmically-spaced set of output times (to properly
-show the solution behavior), as well as ARKode's root-finding
+show the solution behavior), as well as ARKODE's root-finding
 capabilities.  Again, the Robertson problem consists of an ODE system
 with 3 components, :math:`Y = [u,\, v,\, w]^T`, satisfying the equations,
 
@@ -416,7 +416,7 @@ with 3 components, :math:`Y = [u,\, v,\, w]^T`, satisfying the equations,
    \frac{dw}{dt} &= 3\cdot10^7 v^2.
 
 We integrate over the interval :math:`0\le t\le 10^{11}`, with initial
-conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.  
+conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.
 
 Additionally, we supply the following two root-finding equations:
 
@@ -448,7 +448,7 @@ and set absolute tolerances on :math:`u`, :math:`v` and :math:`w` of
 printed at the end.
 
 However, unlike in the previous problem, while integrating the system,
-we use the rootfinding feature of ARKode to find the times at which
+we use the rootfinding feature of ARKODE to find the times at which
 either :math:`u=10^{-4}` or :math:`w=10^{-2}`.
 
 
@@ -458,14 +458,14 @@ Solutions
 ---------
 
 In the solutions below, we now see the early-time evolution of the
-solution components for the Robertson ODE system.  
+solution components for the Robertson ODE system.
 
 .. figure:: figs/plot-ark_robertson_root.png
    :scale: 70 %
    :align: center
 
 We note that when running this example, the root-finding capabilities
-of ARKode report outside of the typical logarithmically-spaced output
+of ARKODE report outside of the typical logarithmically-spaced output
 times to declare that at time :math:`t=0.264019` the variable
 :math:`w` attains the value :math:`10^{-2}`, and that at time
 :math:`t=2.07951\cdot10^{7}` the variable :math:`u` attains the value
@@ -485,7 +485,7 @@ We now investigate a time-dependent system of partial differential
 equations.  We adapt the previously-described brusselator test problem
 by adding diffusion into the chemical reaction network.  We again have
 a system with 3 components, :math:`Y = [u,\, v,\, w]^T` that satisfy
-the equations, 
+the equations,
 
 .. math::
 
@@ -498,7 +498,7 @@ the equations,
 
 However, now these solutions are also spatially dependent.  We
 integrate for :math:`t \in [0, 10]`, and :math:`x \in [0, 1]`, with
-initial conditions 
+initial conditions
 
 .. math::
 
@@ -506,7 +506,7 @@ initial conditions
    v(0,x) &= \frac{b}{a} + \frac{1}{10}\sin(\pi x),\\
    w(0,x) &=  b + \frac{1}{10}\sin(\pi x),
 
-and with stationary boundary conditions, i.e. 
+and with stationary boundary conditions, i.e.
 
 .. math::
 
@@ -515,7 +515,7 @@ and with stationary boundary conditions, i.e.
    \frac{\partial w}{\partial t}(t,0) &= \frac{\partial w}{\partial t}(t,1) = 0.
 
 We note that these can also be implemented as Dirichlet boundary
-conditions with values identical to the initial conditions. 
+conditions with values identical to the initial conditions.
 
 
 
@@ -526,20 +526,20 @@ We employ a *method of lines* approach, wherein we first
 semi-discretize in space to convert the system of 3 PDEs into a larger
 system of ODEs.  To this end, the spatial derivatives are computed
 using second-order centered differences, with the data distributed
-over :math:`N` points on a uniform spatial grid.  As a result, ARKode
+over :math:`N` points on a uniform spatial grid.  As a result, ARKODE
 approaches the problem as one involving :math:`3N` coupled ODEs.
 
 The problem is run using :math:`N=201` spatial points, with parameters
 :math:`a=0.6`, :math:`b=2.0`, :math:`d_u=0.025`, :math:`d_v=0.025`,
 :math:`d_w=0.025` and :math:`\varepsilon=10^{-5}`.  We specify scalar
 relative and absolute solver tolerances of :math:`rtol=10^{-6}` and
-:math:`atol=10^{-10}`, respectively. 
- 
+:math:`atol=10^{-10}`, respectively.
+
 This program solves the problem with a DIRK method, using a Newton
 iteration with the SUNLINSOL_BAND linear solver module via the ARKDLS
 interface; a routine is supplied to fill the banded Jacobian matrix.
 
-100 outputs are printed at equal intervals, and run statistics 
+100 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
@@ -571,7 +571,7 @@ This problem is mathematically identical to the preceding problem,
 :ref:`ark_brusselator1D`, but instead of using the SUNMATRIX_BAND
 banded matrix module and SUNLINSOL_BAND linear solver module, it uses
 the SUNMATRIX_SPARSE sparse matrix module with the SUNLINSOL_KLU
-linear solver module.  These are still provided to ARKode using the
+linear solver module.  These are still provided to ARKODE using the
 ARKDLS direct linear solver interface, and again a routine is provided
 to supply a compressed-sparse-column version of the Jacobian matrix.
 Additionally, the solution is only output 10 times instead of 100.
@@ -600,7 +600,7 @@ discretize in space using a standard piecewise linear, Galerkin finite
 element method, over a non-uniform discretization of the interval
 :math:`[0,1]` into 100 subintervals.  To this end, we must integrate
 each term in each equation, multiplied by test functions, over each
-subinterval, e.g. 
+subinterval, e.g.
 
 .. math::
 
@@ -612,19 +612,19 @@ therefore approximate these integrals using a three-node Gaussian
 quadrature, exact for polynomials up to degree six.
 
 After this spatial semi-discretization, the system of three PDEs is
-passed to ARKode as a system of :math:`3N` coupled ODEs, as with the
+passed to ARKODE as a system of :math:`3N` coupled ODEs, as with the
 preceding problem.
 
 As with the preceding problem :ref:`ark_brusselator1D_klu`, this
 example solves the problem with a DIRK method, using a Newton
 iteration, and the SUNMATRIX_SPARSE module.  However, this example
 uses the SUNLINSOL_SUPERLUMT linear solver module, both for the Newton
-systems having Jacobian :math:`A=M-\gamma J`, as well as for the 
+systems having Jacobian :math:`A=M-\gamma J`, as well as for the
 mass-matrix-only linear systems with matrix :math:`M`.  Functions
 implementing both :math:`J` and :math:`M` in compressed-sparse-column
-format are supplied.  
+format are supplied.
 
-100 outputs are printed at equal intervals, and run statistics 
+100 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
@@ -655,7 +655,7 @@ ark_heat1D
 
 As with the previous brusselator problem, this example simulates a
 simple one-dimensional partial differential equation; in this case we
-consider the heat equation, 
+consider the heat equation,
 
 .. math::
 
@@ -668,28 +668,28 @@ condition :math:`u(0,x) = 0`, stationary boundary conditions,
 
    \frac{\partial u}{\partial t}(t,0) = \frac{\partial u}{\partial t}(t,1) = 0,
 
-and a point-source heating term, 
+and a point-source heating term,
 
 .. math::
 
    f(t,x) = \begin{cases} 1 & \text{if}\;\; x=1/2, \\
                           0 & \text{otherwise}. \end{cases}
 
- 
+
 
 Numerical method
 ----------------
 
 As with the :ref:`ark_brusselator1D` test problem, this test computes
 spatial derivatives using second-order centered differences, with the
-data distributed over :math:`N` points on a uniform spatial grid. 
+data distributed over :math:`N` points on a uniform spatial grid.
 
 In this example, we use :math:`N=201` spatial points, with heat
 conductivity parameter :math:`k=0.5`, and discretize the equation
 using second-order centered finite-differences.  The problem is run
 using scalar relative and absolute solver tolerances of
-:math:`rtol=10^{-6}` and :math:`atol=10^{-10}`, respectively. 
- 
+:math:`rtol=10^{-6}` and :math:`atol=10^{-10}`, respectively.
+
 This program solves the problem with a DIRK method, utilizing a Newton
 iteration.  The primary utility in including this example is that
 since the Newton linear systems are now symmetric, we solve these
@@ -736,14 +736,14 @@ condition :math:`u(0,x) = 0`, stationary boundary conditions,
 
    \frac{\partial u}{\partial t}(t,0) = \frac{\partial u}{\partial t}(t,1) = 0,
 
-and a point-source heating term, 
+and a point-source heating term,
 
 .. math::
 
    f(t,x) = \begin{cases} 1 & \text{if}\;\; x=1/2, \\
                           0 & \text{otherwise}. \end{cases}
 
- 
+
 
 Numerical method
 ----------------
@@ -756,18 +756,18 @@ x_{i-1}`; however, if these neighbor distances are unequal the
 approximation reduces to first-order accuracy.  The spatial mesh is
 initially distributed uniformly over 21 points in :math:`[0,1]`, but
 as the simulation proceeds the mesh is [crudely] adapted to add points
-to the center of subintervals bordering any node where 
-:math:`\left|\frac{\partial^2 u}{\partial x^2}\right| > 0.003`.  
+to the center of subintervals bordering any node where
+:math:`\left|\frac{\partial^2 u}{\partial x^2}\right| > 0.003`.
 We note that the spatial adaptivity approach employed in this example
-is *ad-hoc*, designed only to exemplify ARKode usage on a problem with
+is *ad-hoc*, designed only to exemplify ARKODE usage on a problem with
 varying size (not to show optimally-adaptive spatial refinement
-methods). 
-      
+methods).
+
 This program solves the problem with a DIRK method, utilizing a Newton
 iteration and the SUNLINSOL_PCG iterative linear solver.
-Additionally, the test problem utilizes ARKode's spatial adaptivity
+Additionally, the test problem utilizes ARKODE's spatial adaptivity
 support (via ``ARKodeResize``), allowing retention of the
-major ARKode data structures across vector length changes.
+major ARKODE data structures across vector length changes.
 
 
 
@@ -778,14 +778,14 @@ major ARKode data structures across vector length changes.
 ark_KrylovDemo_prec
 ============================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``cv_KrylovDemo_prec``.  This is a demonstration program using the
 SUNLINSOL_SPGMR linear solver module.  As explained more thoroughly in
 [HSR2017]_, the problem is a stiff ODE system that arises from a
 system of PDEs modeling a six-species food web population model, with
 predator-prey interaction and diffusion on the unit square in two
 dimensions.  We have a system with 6 components, :math:`C = [c^1,\,
-c^2,\,\ldots, c^6]^T` that satisfy the equations,  
+c^2,\,\ldots, c^6]^T` that satisfy the equations,
 
 .. math::
 
@@ -819,13 +819,13 @@ predators.  The coefficients :math:`a_{i,j}, b_i, d_i` are:
          \end{cases}
 
 The spatial domain is :math:`(x,y) \in [0, 1]^2`; the time domain is
-:math:`t \in [0,10]`, with initial conditions 
+:math:`t \in [0,10]`, with initial conditions
 
 .. math::
 
    c^i(x,y) &=  10 + i \sqrt{4x(1-x)}\sqrt{4y(1-y)}
 
-and with homogeneous Neumann boundary conditions, 
+and with homogeneous Neumann boundary conditions,
 :math:`\nabla c^i \cdot \vec{n} = 0`.
 
 
@@ -838,8 +838,8 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 6 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, ARKode approaches the 
-problem as one involving :math:`6*Mx*My` coupled ODEs. 
+points on a uniform spatial grid.  As a result, ARKODE approaches the
+problem as one involving :math:`6*Mx*My` coupled ODEs.
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
@@ -847,11 +847,11 @@ solver module, and ARKSPILS interface.  The preconditioner matrix used
 is the product of two matrices:
 
 1. A matrix, only defined implicitly, based on a fixed number of
-   Gauss-Seidel iterations using the diffusion terms only. 
+   Gauss-Seidel iterations using the diffusion terms only.
 
 2. A block-diagonal matrix based on the partial derivatives of the
    interaction terms :math:`f` only, using block-grouping (computing
-   only a subset of the :math:`3\times3` blocks). 
+   only a subset of the :math:`3\times3` blocks).
 
 Four different runs are made for this problem.  The product
 preconditoner is applied on the left and on the right.  In each case,
@@ -868,7 +868,7 @@ A problem description, performance statistics at selected output
 times, and final statistics are written to standard output.  On the
 first run, solution values are also printed at output times.  Error
 and warning messages are written to standard error, but there should
-be no such messages. 
+be no such messages.
 
 
 
@@ -889,7 +889,7 @@ the IVP system
 
 We integrate over the interval :math:`0 \le t \le 1`, with the initial
 conditions :math:`u(0) = 1`, :math:`v(0) = 0`, :math:`w(0)= 2`.  The
-solution is output to the screen at equal intervals of 0.1 time units. 
+solution is output to the screen at equal intervals of 0.1 time units.
 
 Numerical method
 ----------------
@@ -899,9 +899,9 @@ This program solves the problem with the default third order method.
 The problem is run using a fixed slow step size :math:`hs=0.001` and fast step
 size :math:`0.0001`.
 
-10 outputs are printed at equal intervals, and run statistics 
+10 outputs are printed at equal intervals, and run statistics
 are printed at the end.
-   
+
 
 Solutions
 ---------
@@ -909,7 +909,7 @@ Solutions
 This system has the analytic solution,
 
 .. math::
-   
+
    u(t) &= \cos(50t), \\
    v(t) &= \sin(50t), \\
    w(t) &= 5051/2501*\exp(-t) - 49/2501*\cos(50t) + 51/2501*\sin(50t).
@@ -923,7 +923,7 @@ ark_twowaycouple_mri
 
 This example simulates a linear system of 3 dependent variables :math:`u`,
 :math:`v` and :math:`w`, that depend on the independent variable :math:`t` via
-the IVP system 
+the IVP system
 
 .. math::
 
@@ -944,5 +944,5 @@ This program solves the problem with the default third order method.
 The problem is run using a fixed slow step size :math:`hs=0.001` and fast step
 size :math:`0.00002`.
 
-20 outputs are printed at equal intervals, and run statistics 
+20 outputs are printed at equal intervals, and run statistics
 are printed at the end.
diff --git a/doc/arkode/examples/source/conf.py b/doc/arkode/examples/source/conf.py
index ece4ad0fa1..1676adf8f5 100644
--- a/doc/arkode/examples/source/conf.py
+++ b/doc/arkode/examples/source/conf.py
@@ -18,7 +18,7 @@
 # -- General configuration ----------------------------------------------------
 
 # Set variable used to determine which package documentation this is
-# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes',
 # 'ida', 'idas', 'kinsol' or 'super'
 package_name = 'arkode-examples'
 
@@ -199,9 +199,6 @@
 
 # -- Options for LaTeX output --------------------------------------------------
 
-latex_additional_files = ['../../../shared/latex/preamble.tex.txt',
-                          '../../../shared/latex/cover_pages.tex.txt']
-
 im_number = "LLNL-SM-668082"
 
 # 1. the rst file name used to generate the LaTeX file
@@ -226,7 +223,7 @@
                     tex_author, 'manual', False)]
 
 # make sure the doc logo gets copied to the build directory
-latex_logo = 'figs/doc_logo_blue.pdf'
+latex_logo = 'figs/sundials_logo_blue.png'
 
 # LaTeX customizations
 latex_elements = {
@@ -254,15 +251,8 @@
 'fncychap':'',
 # figure alignment options
 'figure_align': 'htbp',
-# additional preamble content
-'preamble':
-    '\\input{preamble.tex.txt}\n'+
-    '\\newcommand{\\sunreleasename}{' + sun_version + '}\n' +
-    '\\newcommand{\\imnumber}{' + im_number + '}\n',
 # extra class options
 'extraclassoptions': 'twoside,openright',
-# custom maketitle
-'maketitle': '\\input{cover_pages.tex.txt}'
 }
 
 
diff --git a/doc/arkode/examples/source/cpp_parallel.rst b/doc/arkode/examples/source/cpp_parallel.rst
index 80f04b3771..b54d2a282f 100644
--- a/doc/arkode/examples/source/cpp_parallel.rst
+++ b/doc/arkode/examples/source/cpp_parallel.rst
@@ -28,13 +28,13 @@ Parallel C++ example problems
 ark_heat2D
 ======================================================================
 
-ARKode provides one parallel C++ example problem, that extends our
+ARKODE provides one parallel C++ example problem, that extends our
 previous :ref:`ark_heat1D` test to now simulate a two-dimensional heat
 equation,
 
 .. math::
 
-   \frac{\partial u}{\partial t} = k_x \frac{\partial^2 u}{\partial x^2} 
+   \frac{\partial u}{\partial t} = k_x \frac{\partial^2 u}{\partial x^2}
                                  + k_y \frac{\partial^2 u}{\partial y^2} + h,
 
 for :math:`t \in [0, 0.3]`, and :math:`(x,y) \in [0, 1]^2`, with initial
@@ -42,7 +42,7 @@ condition :math:`u(0,x,y) = 0`, stationary boundary conditions,
 
 .. math::
 
-   \frac{\partial u}{\partial t}(t,0,y) = \frac{\partial u}{\partial t}(t,1,y) = 
+   \frac{\partial u}{\partial t}(t,0,y) = \frac{\partial u}{\partial t}(t,1,y) =
    \frac{\partial u}{\partial t}(t,x,0) = \frac{\partial u}{\partial t}(t,x,1) = 0,
 
 and a periodic heat source,
@@ -50,9 +50,9 @@ and a periodic heat source,
 .. math::
 
    h(x,y) = \sin(\pi x) \sin(2\pi y).
- 
+
 Under these conditions, the problem has an analytical solution of the
-form 
+form
 
 .. math::
 
@@ -64,19 +64,19 @@ Numerical method
 
 The spatial derivatives are computed using second-order centered
 differences, with the data distributed over :math:`nx\times ny` points
-on a uniform spatial grid.  
+on a uniform spatial grid.
 
 The problem is set up to use spatial grid parameters :math:`nx=60` and
 :math:`ny=120`, with heat conductivity parameters :math:`k_x=0.5` and
 :math:`k_y=0.75`.  The problem is run using scalar relative and
 absolute solver tolerances of :math:`rtol=10^{-5}` and
 :math:`atol=10^{-10}`.
- 
+
 As with the 1D version, this program solves the problem with a DIRK
 method, that itself uses a Newton iteration and SUNLINSOL_PCG
 iterative linear solver through the ARKSPILS interface.  However,
 unlike the previous example, here the PCG solver is preconditioned
-using a single Jacobi iteration, and uses ARKSPILS' built-in 
+using a single Jacobi iteration, and uses ARKSPILS' built-in
 finite-difference Jacobian-vector product routine. Additionally, this
 problem uses MPI and the NVECTOR_PARALLEL module for parallelization.
 
diff --git a/doc/arkode/examples/source/cpp_serial.rst b/doc/arkode/examples/source/cpp_serial.rst
index 739db120d1..0869ddc2e2 100644
--- a/doc/arkode/examples/source/cpp_serial.rst
+++ b/doc/arkode/examples/source/cpp_serial.rst
@@ -27,7 +27,7 @@ Serial C++ example problems
 ark_analytic_sys
 ===============================================
 
-This example demonstrates the use of ARKode's fully implicit solver on
+This example demonstrates the use of ARKODE's fully implicit solver on
 a stiff ODE system that has a simple analytical solution.  The problem
 is that of a linear ODE system,
 
@@ -61,33 +61,33 @@ We evolve the problem for :math:`t` in the interval :math:`\left[0,\,
 Numerical method
 ----------------
 
-The stiffness of the problem is directly proportional to the 
+The stiffness of the problem is directly proportional to the
 value of :math:`\lambda`.  The value of :math:`\lambda` should be
 negative to result in a well-posed ODE; for values with magnitude
-larger than 100 the problem becomes quite stiff. 
+larger than 100 the problem becomes quite stiff.
 
 Here, we choose :math:`\lambda = -100`, along with scalar relative and
 absolute tolerances of :math:`rtol=10^{-6}` and :math:`atol=10^{-10}`,
-respectively. 
- 
+respectively.
+
 This program solves the problem with the DIRK method,
 Newton iteration with the SUNMATRIX_DENSE matrix module and
 accompanying SUNLINSOL_DENSE linear solver module, ARKDLS direct
 linear solver interface, and a user-supplied dense Jacobian
-routine.  Output is printed every 0.005 units of time (10 total). 
+routine.  Output is printed every 0.005 units of time (10 total).
 Run statistics (optional outputs) are printed at the end.
 
 
-   
+
 Solutions
 ---------
 
 This problem is included both as a simple example to test systems of
-ODE within ARKode on a problem having an analytical solution,
+ODE within ARKODE on a problem having an analytical solution,
 :math:`Y(t) = V e^{Dt} V^{-1} Y(0)`.  As seen in the plots below, the
 computed solution tracks the analytical solution quite well (left),
 and results in errors with exactly the magnitude as specified by the
-requested error tolerances (right). 
+requested error tolerances (right).
 
 .. image:: figs/plot-ark_analytic_sys.png
    :width: 45 %
diff --git a/doc/arkode/examples/source/f77_parallel.rst b/doc/arkode/examples/source/f77_parallel.rst
index bad13c016e..f8c7a7bba6 100644
--- a/doc/arkode/examples/source/f77_parallel.rst
+++ b/doc/arkode/examples/source/f77_parallel.rst
@@ -28,7 +28,7 @@ Parallel Fortran 77 example problems
 fark_diag_kry_bbd_p
 ===================================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``fcv_diag_kry_bbd_p``.  As described in [HSR2017]_, this problem
 models a stiff, linear, diagonal ODE system,
 
@@ -40,7 +40,7 @@ models a stiff, linear, diagonal ODE system,
 Here :math:`\alpha=10` and :math:`N=10 N_P`, where :math:`N_P` is the
 number of MPI tasks used for the problem.  The problem has initial
 conditions :math:`y_i=1` and evolves for the time interval :math:`t\in
-[0,1]`. 
+[0,1]`.
 
 
 
@@ -75,7 +75,7 @@ errors and final performance counters are printed on completion.
 fark_diag_non_p
 ===================================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``fcv_diag_non_p``.  As described in [HSR2017]_, this problem models a
 nonstiff, linear, diagonal ODE system,
 
diff --git a/doc/arkode/examples/source/f77_serial.rst b/doc/arkode/examples/source/f77_serial.rst
index 3b38653a5d..2c0c783522 100644
--- a/doc/arkode/examples/source/f77_serial.rst
+++ b/doc/arkode/examples/source/f77_serial.rst
@@ -28,19 +28,19 @@ Serial Fortran 77 example problems
 fark_diurnal_kry_bp
 ===================================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``fcv_diurnal_kry_bp``.  As described in [HSR2017]_, this problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &= 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\quad i=1,2 
+   \frac{\partial c_i}{\partial t} &=
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\quad i=1,2
 
 where
 
@@ -57,7 +57,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -76,17 +76,17 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, ARKode approaches the
+points on a uniform spatial grid.  As a result, ARKODE approaches the
 problem as one involving :math:`2*Mx*My` coupled ODEs. In this
 problem, we use a relatively coarse uniform mesh with
-:math:`Mx=My=10`.  
+:math:`Mx=My=10`.
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
 solver module, and the ARKSPILS interface.
 
 The left preconditioner used is a banded matrix, constructed using
-the ARKBP module.  The banded preconditioner matrix is generated using 
+the ARKBP module.  The banded preconditioner matrix is generated using
 difference quotients, with half-bandwidths ``mu = ml = 2``.
 
 Performance data and sampled solution values are printed at
@@ -103,11 +103,11 @@ on completion.
 fark_roberts_dnsL
 ===================================================
 
-This problem is an ARKode clone of the CVODE problem,
+This problem is an ARKODE clone of the CVODE problem,
 ``fcv_roberts_dnsL``.  As described in [HSR2017]_, this problem models
 the kinetics of a three-species autocatalytic reaction.  This is an
 ODE system with 3 components, :math:`Y = [y_1,\, y_2,\, y_3]^T`,
-satisfying the equations, 
+satisfying the equations,
 
 .. math::
 
@@ -116,7 +116,7 @@ satisfying the equations,
    \frac{d y_3}{dt} &= 3\cdot10^7 y_2^2.
 
 We integrate over the interval :math:`0\le t\le 4\cdot10^{10}`, with initial
-conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`. 
+conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.
 
 Additionally, we supply the following two root-finding equations:
 
@@ -137,13 +137,10 @@ This program solves the problem with a DIRK method, using a Newton
 iteration with the SUNLINSOL_LAPACKDENSE linear solver module and
 ARKDLS interface.
 
-As with the :ref:`ark_robertson_root` problem, we enable ARKode's
+As with the :ref:`ark_robertson_root` problem, we enable ARKODE's
 rootfinding module to find the times at which either :math:`u=10^{-4}`
-or :math:`w=10^{-2}`. 
+or :math:`w=10^{-2}`.
 
 Performance data and solution values are printed at
 selected output times, along with additional output at rootfinding
 events.  All performance counters are printed on completion.
-
-
-
diff --git a/doc/arkode/examples/source/f90_serial.rst b/doc/arkode/examples/source/f90_serial.rst
index e5455c8993..116b2d2811 100644
--- a/doc/arkode/examples/source/f90_serial.rst
+++ b/doc/arkode/examples/source/f90_serial.rst
@@ -41,7 +41,7 @@ IVP system
    \frac{dw}{dt} &= \frac{b-w}{\varepsilon} - w u.
 
 We integrate over the interval :math:`0 \le t \le 10`, with the
-initial conditions :math:`u(0) = 3.9`, :math:`v(0) = 1.1`, 
+initial conditions :math:`u(0) = 3.9`, :math:`v(0) = 1.1`,
 :math:`w(0) = 2.8`, and parameters :math:`a=1.2`, :math:`b=2.5` and
 :math:`\varepsilon=10^{-5}`.  After each unit time interval, the
 solution is output to the screen.
@@ -52,16 +52,16 @@ Numerical method
 
 Since this driver and utility functions are written in Fortran-90,
 this example demonstrates the use of the FARKODE interface for the
-ARKode solver.  For time integration, this example uses the
+ARKODE solver.  For time integration, this example uses the
 fourth-order additive Runge-Kutta IMEX method, where the right-hand
 sides are broken up as
 
 .. math::
 
-   f_E(t,u,v,w) = \left(\begin{array}{c} a - (w+1)u + v u^2 \\ 
-     w u - v u^2 \\ - w u  \end{array}\right), \quad\text{and}\quad 
+   f_E(t,u,v,w) = \left(\begin{array}{c} a - (w+1)u + v u^2 \\
+     w u - v u^2 \\ - w u  \end{array}\right), \quad\text{and}\quad
    f_I(t,u,v,w) = \left(\begin{array}{c} 0\\0\\
-     \frac{b-w}{\varepsilon}\end{array}\right). 
+     \frac{b-w}{\varepsilon}\end{array}\right).
 
 The implicit systems are solved using the built-in modified Newton
 iteration, with the SUNMATRIX_DENSE matrix module and accompanying
@@ -77,7 +77,7 @@ of 1000 internal time steps.
 
 
 
-   
+
 
 Solutions
 ---------
@@ -86,7 +86,7 @@ With this setup, all three solution components exhibit a rapid
 transient change during the first 0.2 time units, followed by a slow
 and smooth evolution, as seen in the figure below.  Note that these
 results identically match those from the previous C example with the
-same equations.  
+same equations.
 
 .. figure:: figs/plot-ark_bruss1.png
    :scale: 70 %
@@ -105,5 +105,3 @@ This problem is mathematically identical to the C example problem
 :ref:`ark_brusselator1D_FEM_slu`, but is written in Fortran 90, stores
 the sparse Jacobian and mass matrices in compressed-sparse-row format,
 and uses the KLU sparse-direct linear solver.
-
-           
diff --git a/doc/arkode/examples/source/index.rst b/doc/arkode/examples/source/index.rst
index c98fa9dcc4..55d1032118 100644
--- a/doc/arkode/examples/source/index.rst
+++ b/doc/arkode/examples/source/index.rst
@@ -12,19 +12,19 @@
    SUNDIALS Copyright End
    ----------------------------------------------------------------
 
-.. ARKode_example documentation master file, created by
+.. ARKODE_example documentation master file, created by
    sphinx-quickstart on Sat Dec 22 20:38:03 2012.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
 ==============================================
-ARKode Example documentation
+ARKODE Example documentation
 ==============================================
 
-This is the documentation for the ARKode examples.  ARKode is an
+This is the documentation for the ARKODE examples.  ARKODE is an
 adaptive step time integration package for stiff, nonstiff and
-multi-rate systems of ordinary differential equations (ODEs).  
-The ARKode solver is a component of the `SUNDIALS
+multi-rate systems of ordinary differential equations (ODEs).
+The ARKODE solver is a component of the `SUNDIALS
 <https://computing.llnl.gov/projects/sundials>`_ suite of
 nonlinear and differential/algebraic equation solvers. It is designed
 to have a similar user experience to the `CVODE
@@ -34,26 +34,26 @@ output times, return after each internal step and root-finding
 capabilities, for calculations both in serial and parallel (via
 MPI). The default integration and solver options should apply to most
 users, though complete control over all internal parameters and time
-adaptivity algorithms is enabled through optional interface routines.  
+adaptivity algorithms is enabled through optional interface routines.
 
-ARKode is developed by `Southern Methodist University
+ARKODE is developed by `Southern Methodist University
 <http://www.smu.edu>`_, with support by the `US Department of Energy
 <http://www.doe.gov>`_ through the `FASTMath
 <http://www.fastmath-scidac.org/>`_ SciDAC Institute, under subcontract
 B598130 from `Lawrence Livermore National Laboratory
-<http://www.llnl.gov>`_. 
+<http://www.llnl.gov>`_.
 
-Along with the ARKode solver, we have created a suite of example
+Along with the ARKODE solver, we have created a suite of example
 problems demonstrating its usage on applications written in C, C++ and
 Fortran.  These examples demonstrate a large variety
-of ARKode solver options, including explicit, implicit and ImEx
+of ARKODE solver options, including explicit, implicit and ImEx
 solvers, root-finding, Newton and fixed-point nonlinear solvers,
 direct and iterative linear solvers, adaptive resize capabilities, and
 the Fortran solver interface.  While these examples are not an
 exhaustive set of all possible usage scenarios, they are designed to
 show a variety of exemplars, and can be used as templates for new
-problems using ARKode's solvers.  Further information on the ARKode
-package itself may be found in the accompanying ARKode user guide
+problems using ARKODE's solvers.  Further information on the ARKODE
+package itself may be found in the accompanying ARKODE user guide
 [R2018]_.
 
 The following tables summarize the salient features of each of the
@@ -63,26 +63,26 @@ the problem that is most closely related to your own.  We group these
 examples according to programming language (C, C++, Fortran).
 
 
-ARKode example problems written in C are summarized in the table
+ARKODE example problems written in C are summarized in the table
 below, and are further described in the chapters :ref:`serial_c`,
-:ref:`openmp_c`, :ref:`parallel_c` and :ref:`parhyp_c`. 
+:ref:`openmp_c`, :ref:`parallel_c` and :ref:`parhyp_c`.
 
 .. cssclass:: table-bordered
 
 ================================  ==========  ===========  ==========  =============  =====================================================
 Problem                           Integrator  Nonlinear    Linear      Size           Extras
 ================================  ==========  ===========  ==========  =============  =====================================================
-:ref:`ark_analytic`               DIRK        Newton       Dense       1              
+:ref:`ark_analytic`               DIRK        Newton       Dense       1
 :ref:`ark_analytic_nonlin`        ERK         N.A.         N.A.        1              ERKStep timestepping module
-:ref:`ark_brusselator`            DIRK        Newton       Dense       3              
-:ref:`ark_brusselator_fp`         ARK         Fixed-point  N.A.        3              
-:ref:`ark_robertson`              DIRK        Newton       Dense       3              
+:ref:`ark_brusselator`            DIRK        Newton       Dense       3
+:ref:`ark_brusselator_fp`         ARK         Fixed-point  N.A.        3
+:ref:`ark_robertson`              DIRK        Newton       Dense       3
 :ref:`ark_robertson_root`         DIRK        Newton       Dense       3              rootfinding
-:ref:`ark_brusselator1D`          DIRK        Newton       Band        3N             
+:ref:`ark_brusselator1D`          DIRK        Newton       Band        3N
 :ref:`ark_brusselator1D_omp`      DIRK        Newton       Band        3N             OpenMP-enabled
 :ref:`ark_brusselator1D_klu`      DIRK        Newton       KLU         3N             sparse matrices
 :ref:`ark_brusselator1D_FEM_slu`  DIRK        Newton       SuperLU_MT  3N             finite-element, :math:`M\ne I`, sparse matrices
-:ref:`ark_heat1D`                 DIRK        Newton       PCG         N              
+:ref:`ark_heat1D`                 DIRK        Newton       PCG         N
 :ref:`ark_heat1D_adapt`           DIRK        Newton       PCG         (dynamic)      adaptive vector resizing
 :ref:`ark_KrylovDemo_prec`        DIRK        Newton       SPGMR       216            multiple preconditioners
 :ref:`ark_diurnal_kry_bbd_p`      DIRK        Newton       SPGMR       200            parallel, BBD preconditioner
@@ -91,22 +91,22 @@ Problem                           Integrator  Nonlinear    Linear      Size
 ================================  ==========  ===========  ==========  =============  =====================================================
 
 
-ARKode example problems written in C++ are summarized in the table
+ARKODE example problems written in C++ are summarized in the table
 below, and are further described in the chapters :ref:`serial_cpp` and
-:ref:`parallel_cpp`. 
+:ref:`parallel_cpp`.
 
 .. cssclass:: table-bordered
 
 =======================  ==========  ===========  ======  =============  =================================
 Problem                  Integrator  Nonlinear    Linear  Size           Extras
 =======================  ==========  ===========  ======  =============  =================================
-:ref:`ark_analytic_sys`  DIRK        Newton       Dense   3              
+:ref:`ark_analytic_sys`  DIRK        Newton       Dense   3
 :ref:`ark_heat2D`        DIRK        Newton       PCG     :math:`nx*ny`  parallel
 =======================  ==========  ===========  ======  =============  =================================
 
 
 ..
-   ARKode example problems written in Fortran 77 are summarized in the table
+   ARKODE example problems written in Fortran 77 are summarized in the table
    below, and are further described in the chapters :ref:`serial_f77` and
    :ref:`parallel_f77`.
 
@@ -122,7 +122,7 @@ Problem                  Integrator  Nonlinear    Linear  Size           Extras
    ==========================   ==========  ===========  ======  =============  =================================
 
 
-   ARKode example problems written in Fortran 90 are summarized in the table
+   ARKODE example problems written in Fortran 90 are summarized in the table
    below, and are further described in the chapters :ref:`serial_f90` and
    :ref:`parallel_f90`.
 

From 60806ea925d2753e7d86f12976d921c7a29b20ec Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Fri, 17 Nov 2023 12:13:14 -0600
Subject: [PATCH 31/35] Fixed cvode example guide build

---
 doc/cvode/examples/source/c_mpimanyvec.rst    |  22 ++--
 doc/cvode/examples/source/c_openmp.rst        |  15 +--
 doc/cvode/examples/source/c_parallel_deep.rst |   5 +-
 doc/cvode/examples/source/c_serial.rst        | 100 ++++++++-------
 doc/cvode/examples/source/c_serial_deep.rst   | 117 +++++++++---------
 doc/cvode/examples/source/conf.py             |  14 +--
 doc/cvode/examples/source/cpp_onemkl.rst      |   8 +-
 doc/cvode/examples/source/cpp_sycl.rst        |   4 +-
 8 files changed, 132 insertions(+), 153 deletions(-)

diff --git a/doc/cvode/examples/source/c_mpimanyvec.rst b/doc/cvode/examples/source/c_mpimanyvec.rst
index 7fe0f02ab0..004972a8f9 100644
--- a/doc/cvode/examples/source/c_mpimanyvec.rst
+++ b/doc/cvode/examples/source/c_mpimanyvec.rst
@@ -24,7 +24,7 @@ Parallel MPIManyVector C example problems
 
 .. _cvDiurnal_kry_mpimanyvec:
 
-cvDirunal_kry_mpimanyvec
+cvDiurnal_kry_mpimanyvec
 =================================
 
 Description
@@ -37,12 +37,12 @@ in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} = 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\qquad i=1,2 
+   \frac{\partial c_i}{\partial t} =
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\qquad i=1,2
 
 where
 
@@ -59,7 +59,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -75,7 +75,7 @@ mesh, with simple polynomial initial profiles.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/C_mpimanyvec/cvDirunal_kry_mpimanyvec.out
+.. include:: ../../../../examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out
    :literal:
 
 
@@ -90,7 +90,7 @@ in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
 points on a uniform spatial grid.  As a result, CVode approaches the
-problem as one involving :math:`2*Mx*My` coupled ODEs. 
+problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
 with two subdomains in each direction (four in total), and where each
@@ -106,7 +106,7 @@ solver, through the CVode interface.
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
 the block-diagonal portion of the Jacobian is saved and conditionally
-reused within the preconditioner routine. 
+reused within the preconditioner routine.
 
 Performance data and sampled solution values are printed at
 selected output times, and all performance counters are printed
diff --git a/doc/cvode/examples/source/c_openmp.rst b/doc/cvode/examples/source/c_openmp.rst
index 573a455e05..b16649a212 100644
--- a/doc/cvode/examples/source/c_openmp.rst
+++ b/doc/cvode/examples/source/c_openmp.rst
@@ -65,9 +65,9 @@ Optionally, we can set the number of threads from environment
 variable or command line. To check the current value for number of
 threads from environment:
 
-.. math::
+.. code-block:: bash
 
-   \texttt{% echo \$OMP_NUM_THREADS}
+   echo $OMP_NUM_THREADS
 
 Execution
 ----------
@@ -75,16 +75,16 @@ Execution
 To use the default value or the number of threads from the environment
 value, run without arguments:
 
-.. math::
+.. code-block:: bash
 
-   \texttt{% ./cvAdvDiff_bnd_omp}
+   ./cvAdvDiff_bnd_omp
 
 The environment variable can be over-ridden with a command line
 argument specifying the number of threads to use, e.g:
 
-.. math::
+.. code-block:: bash
 
-   \texttt{% ./cvAdvDiff_bnd_omp 5}
+   ./cvAdvDiff_bnd_omp 5
 
 
 
@@ -102,6 +102,3 @@ The numerical method is identical to the previous implementation,
 except that we now use SUNDIALS' OpenMP-enabled vector kernel module,
 NVECTOR_OPENMP, and have similarly threaded the supplied right-hand
 side residual and banded Jacobian construction functions.
-
-
-
diff --git a/doc/cvode/examples/source/c_parallel_deep.rst b/doc/cvode/examples/source/c_parallel_deep.rst
index 2b6b927e2f..c541b10858 100644
--- a/doc/cvode/examples/source/c_parallel_deep.rst
+++ b/doc/cvode/examples/source/c_parallel_deep.rst
@@ -46,8 +46,8 @@ Dirichlet boundary conditions and initial values given by
 .. math::
    :label: BCIC1
 
-   u(t,0) &=& 0 ~,~~~~u(t,2) = 0 ~, \\
-   u(0,x) &=& x(2-x)e^{2x} ~.
+   u(t,0) &= 0, \quad u(t,2) = 0, \\
+   u(0,x) &= x(2-x)e^{2x}.
 
 A system of :math:`M_X` ODEs is obtained by discretizing the :math:`x`-axis with :math:`M_X + 2`
 grid points and replacing the first and second order spatial derivatives
@@ -274,4 +274,3 @@ the left*, but slightly poorer when it is *on the right*.
 
 .. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
    :literal:
-
diff --git a/doc/cvode/examples/source/c_serial.rst b/doc/cvode/examples/source/c_serial.rst
index ff69a9abb1..e570d87f6c 100644
--- a/doc/cvode/examples/source/c_serial.rst
+++ b/doc/cvode/examples/source/c_serial.rst
@@ -74,11 +74,11 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface, which in the case
 of this scalar-valued problem is just division.  The example file contains
-functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.  
+functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.
 
 We specify the relative and absolute tolerances, :math:`reltol=0`
 and :math:`abstol=10^{-5}`, respectively.  Aside from these choices,
@@ -95,7 +95,7 @@ Description
 ------------
 
 This example problem is the same as the previous one aside from the
-use of the LAPACK_BAND linear solver. 
+use of the LAPACK_BAND linear solver.
 
 Problem output
 ---------------
@@ -161,10 +161,10 @@ and SUNNONLINSOL_NEWTON nonlinear solver modules:
 
    *  :math:`\ddot x - 3 \cdot (1 - x^2) \cdot \dot x + x = 0` where
       :math:`x(0) = 2` and :math:`\dot x(0) = 0`.
-   
+
    *  This second-order ODE is converted to a first-order system by
       defining :math:`y_0 = x` and :math:`y_1 = \dot x`.
-      
+
    *  The NEWTON iteration cases use the following types of Jacobian
       approximation: (1) dense, user-supplied, (2) dense, difference
       quotient approximation, (3) diagonal approximation
@@ -175,7 +175,7 @@ and SUNNONLINSOL_NEWTON nonlinear solver modules:
    *  The NEWTON iteration cases use the following types of Jacobian
       approximation: (1) band, user-supplied, (2) band, difference
       quotient approximation, (3) diagonal approximation.
-   
+
    *  For each problem, in the series of eight runs, CVodeInit is
       called only once, for the first run, whereas CVodeReInit is
       called for each of the remaining seven runs.
@@ -210,7 +210,7 @@ and SUNNONLINSOL_NEWTON nonlinear solver modules:
       to work directly with a column of a Dense SUNMatrix.
 
    *  The SM_COLUMN_B and SM_COLUMN_ELEMENT_B allow efficient columnwise access
-      to the elements of a Banded SUNMatix. These macros are used in the 
+      to the elements of a Banded SUNMatix. These macros are used in the
       :math:`Jac_2` function.
 
 
@@ -224,14 +224,14 @@ Problem output
 Numerical method
 ----------------
 
-This program solves the two separate problems first with ADAMS and 
+This program solves the two separate problems first with ADAMS and
 then with BDF method, using a Fixed-point iteration and a Newton
 iteration for their nonlinear solvers, interchangeably.  The first problem
-uses the SUNLINSOL_DENSE linear solver module via the CVode interface.  
+uses the SUNLINSOL_DENSE linear solver module via the CVode interface.
 Similarly, the second problem uses the SUNLINSOL_BAND linear solver
 module via the CVode interface.  Additionally, this example occasionally
 provides a routine to CVode to compute the dense and banded Jacobian,
-respectively. 
+respectively.
 
 The problems are run using scalar relative and absolute tolerances of
 :math:`reltol=0` and :math:`abstol=10^{-6}`, respectively.
@@ -342,11 +342,11 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_SPGMR linear solver via the CVode interface, which in the case
 of this scalar-valued problem is just division.  The example file contains
-functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.  
+functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.
 
 We specify the relative and absolute tolerances, :math:`reltol=10^{-5}`
 and :math:`abstol=10^{-3}`, respectively.  Aside from these choices,
@@ -376,7 +376,7 @@ Numerical method
 ----------------
 
 See ``cvDiurnal_kry`` for details.
-   
+
 
 
 .. _cvHeat2D_klu:
@@ -387,7 +387,7 @@ cvHeat2D_klu
 Description
 ------------
 
-This (future) example problem is a 2D heat equation in a serial 
+This (future) example problem is a 2D heat equation in a serial
 environment using sparse matrices, and is based on ``idaHeat2D_klu.c`` and
 ``cvRoberts_klu.c``.
 
@@ -401,16 +401,16 @@ The PDE system solved is a spatial discretization of the PDE
    \frac{du}{dt} = \frac{d^2 u}{dx^2} + \frac{d^2 u}{dy^2}
 
 on the unit square. The boundary condition is :math:`u = 0` on
-all edges.  Initial conditions are given by 
+all edges.  Initial conditions are given by
 
 .. math::
-   
+
    u = 16 \cdot x \cdot (1 - x) \cdot y \cdot (1 - y).
 
-The PDE is treated with central differences on a uniform 
+The PDE is treated with central differences on a uniform
 :math:`MGRID \times MGRID` grid.  The values of u at the interior
 points satisfy ODEs, and equations :math:`u = 0` at the boundaries
-are appended, to form a DAE system of size :math:`N = MGRID^2`. 
+are appended, to form a DAE system of size :math:`N = MGRID^2`.
 Here :math:`MGRID = 10`.
 
 The system is solved with CVODE using the direct sparse linear system
@@ -424,10 +424,10 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_KLU linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=0`
 and :math:`atol=10^{-8}`, respectively.  Aside from these choices,
@@ -445,7 +445,7 @@ cvKrylovDemo_ls
 Description
 ------------
 
-Demonstration program for CVODE -- This example loops through the 
+Demonstration program for CVODE -- This example loops through the
 available iterative linear solvers:
 
 *  SPGMR -- Scaled, Preconditioned, Generalized Minimum Residual
@@ -474,7 +474,7 @@ Problem output
 Numerical method
 ----------------
 
-This program solves the same problem four times via the Backwards 
+This program solves the same problem four times via the Backwards
 Differentiation Formula method, using a Newton iteration for their
 nonlinear solvers.  The first portion of this example uses the
 SUNLINSOL_SPGMR linear solver module via the CVode GMRES interface,
@@ -483,7 +483,7 @@ via the CVode FGMRES interface, the third portion uses the SUNLinSol_SPBCGS
 linear solver module via the CVode Bi-CGStab interface, and the fourth
 portion uses the SUNLINSOL_SPTFQMR linear solver module via the CVode
 TFQMR interface.  Additionally, this example provides a routine to CVode
-to compute the densely-referenced, block-diagonal Jacobian. 
+to compute the densely-referenced, block-diagonal Jacobian.
 
 The problems are run using scalar relative and absolute tolerances of
 :math:`reltol=10^{-5}` and :math:`abstol=10^{-3}`, respectively.
@@ -522,7 +522,7 @@ and the PDEs are as follows:
 where
 
 .. math::
-   
+
    f_i (x, y, c) = c^i \cdot \left( b(i) + \sum_{j = 1}^{ns} a(i, j) c^j \right)
 
 The number of species is :math:`ns = 2 \cdot np`, with the first
@@ -549,7 +549,7 @@ The spatial domain is the unit square. The final time is 10.  The
 boundary conditions are: normal derivative = 0.  A polynomial in
 :math:`x` and :math:`y` is used to set the initial conditions.
 
-The PDEs are discretized by central differencing on an 
+The PDEs are discretized by central differencing on an
 :math:`MX \text{ by } MY` mesh.
 
 The resulting ODE system is stiff.
@@ -601,10 +601,10 @@ Numerical method
 -----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_SPGMR linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-5}`
 and :math:`atol=10^{-5}`, respectively.  The Gram-Schmidt type is set
@@ -634,7 +634,7 @@ cvParticle_dns
 Description
 ------------
 
-This example problem solves the equation for a particle moving 
+This example problem solves the equation for a particle moving
 counterclockwise with velocity :math:`\alpha` on the unit circle in
 the :math:`xy`-plane. The ODE system is given by:
 
@@ -672,10 +672,10 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-4}`
 and :math:`atol=10^{-9}`, respectively.  Aside from these choices,
@@ -746,7 +746,7 @@ Optional command line inputs may be used to change the final simulation time
 (default 1), or disable error projection. Use the option ``--help`` for a list
 of the command line flags.
 
- 
+
 Problem output
 ---------------
 
@@ -758,10 +758,10 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.  
+contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances for several runs to be
 
@@ -802,7 +802,7 @@ with initial conditions: :math:`y_1 = 1.0`, :math:`y_2 = y_3 = 0`.
 The problem is stiff.
 
 While integrating the system, we also use the rootfinding feature to
-find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`. 
+find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`.
 This program solves the problem with the BDF method, Newton iteration
 with the dense linear solver, and a user-supplied Jacobian routine.
 
@@ -818,12 +818,12 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and 
+contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and
 :math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
-as previously mentioned, find roots at :math:`y_3 = 0.01` and 
+as previously mentioned, find roots at :math:`y_3 = 0.01` and
 :math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
 
 We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
@@ -863,7 +863,7 @@ Here, we specify the scalar relative and vector-valued absolute tolerances,
 , respectively.
 
 Aside from this, see ``cvRoberts_dns`` above.
-   
+
 
 
 .. _cvRoberts_dns_negsol:
@@ -993,14 +993,14 @@ independent ODEs are grouped together to form a larger system.
 This program takes one optional argument, the number of groups
 of independent ODE systems:
 
-.. math::
+.. code-block::
 
-   \qquad \texttt{./cvRoberts_block_klu [number of groups]}
+   ./cvRoberts_block_klu [number of groups]
 
 The problem is comparable to the CUDA version -
 ``cvRoberts_block_cusolversp_batchqr.cu``.  As previously suggested,
 it was based off of the ``cvRoberts_klu.c`` example.
- 
+
 
 Problem output
 ---------------
@@ -1055,14 +1055,15 @@ Description
 The following is a simple example problem, with the coding needed
 for its solution provided by CVODE. The problem is a simpliflied model
 of a rocket, ascending vertically, with mass decreasing over time.  The
-system (of size 2) is given by:
+system (of size 2) has components :math:`y_1 = H` (rocket height) and
+:math:`y_2 = v` (rocket velocity), with the model is given by
 
 .. math::
 
-   y_1 &= \text{rocket height} \enspace H, &&\text{where } y_1(0) = 0, \\
-   y_2 &= \text{rocket velocity} \enspace v, &&\text{where } y_2(0) = 0, \\
    \frac{dH}{dt} &= v, \\
-   \frac{dv}{dt} &= a(t,v).
+   \frac{dv}{dt} &= a(t,v)
+
+under the initial conditions :math:`y_1(0)=y_2(0)=0`.
 
 The upward acceleration :math:`a(t,v)` is given by:
 
@@ -1097,12 +1098,12 @@ Numerical method
 -----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t, y_1, y_2)` and 
+contains functions to evaluate both :math:`f(t, y_1, y_2)` and
 :math:`J(t, y_1, y_2)`.  Additionally, a root-finding function will,
-as previously mentioned, find roots at either :math:`M_f = 0` or :math:`H = H_c` 
+as previously mentioned, find roots at either :math:`M_f = 0` or :math:`H = H_c`
 as well as at :math:`v = 0` for :math:`t > 0` using the built-in root-finding
 mechanism in CVode.
 
@@ -1113,6 +1114,3 @@ CVode solver parameters.
 
 68 normal + 2 root output times are printed at normatively equally-spaced
 points as well as at the two roots, and run statistics are printed at the end.
-
-
-
diff --git a/doc/cvode/examples/source/c_serial_deep.rst b/doc/cvode/examples/source/c_serial_deep.rst
index 0b5e14c34e..529af23749 100644
--- a/doc/cvode/examples/source/c_serial_deep.rst
+++ b/doc/cvode/examples/source/c_serial_deep.rst
@@ -72,12 +72,12 @@ file is the header file for the *dense* implementation of the
 :literal:`SUNLinearSolver` type.  Similarly, the :literal:`sunmatrix_dense.h`
 file is the header file for the *dense* implementation of the
 **SUNMATRIX** module, including definitions of the :literal:`SUNMatrix` type
-as well as macros and functions to access *matrix components*.  
+as well as macros and functions to access *matrix components*.
 We have explicitly included :literal:`sunmatrix_dense.h`, but this is not
 necessary because it is included by :literal:`sunlinsol_dense.h`.
 The :literal:`nvector_serial.h` file is the header file for the *serial*
-implementation of the **NVECTOR** module and includes definitions of the 
-:literal:`N_Vector` type, a macro to access vector components, and prototypes 
+implementation of the **NVECTOR** module and includes definitions of the
+:literal:`N_Vector` type, a macro to access vector components, and prototypes
 for the *serial* implementation specific machine environment memory allocation
 and freeing functions.
 
@@ -99,13 +99,13 @@ The *macro* :literal:`SM_ELEMENT_D` is fully described in `SUNMATRIX_DENSE
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html>`_.
 
 Next, the program includes some problem-specific constants, which are
-isolated to this early location to make it easy to change them as needed.  
+isolated to this early location to make it easy to change them as needed.
 The program prologue ends with prototypes of four private helper
 functions and the three *user-supplied functions* that are called by **CVODE**.
 
 The :literal:`main` program begins with some *dimensions* and *type* declarations,
 including use of the generic types :literal:`N_Vector`, :literal:`SUNMatrix` and
-:literal:`SUNLinearSolver`.  The next several lines 
+:literal:`SUNLinearSolver`.  The next several lines
 allocate memory for the :math:`y` and :math:`abstol` vectors using
 :literal:`N_VNew_Serial` with a length argument of :math:`NEQ (= 3)`. The
 lines following that load the *initial values* of the dependendent
@@ -128,7 +128,7 @@ The call to :literal:`CVodeInit` *allocates* and *initializes* the solver memory
 Its arguments include the name of the :literal:`C` function :math:`f` defining the
 right-hand side function :math:`f(t,y)`, and the *initial values* of :math:`t` and :math:`y`.
 The call to :literal:`CVodeSVtolerances` specifies a *vector* of *absolute tolerances*,
-and includes the *value* of the *relative tolerance* :math:`reltol` and the *absolute 
+and includes the *value* of the *relative tolerance* :math:`reltol` and the *absolute
 tolerance vector* :math:`abstol`.  See
 `CVodeCreate and CVodeInit
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-initialization-and-deallocation-functions>`_
@@ -139,7 +139,7 @@ for full details of these calls.
 The call to :literal:`CVodeRootInit` specifies that a *root-finding* problem
 is to be solved along with the integration of the ODE system, that the
 root functions are specified in the function :math:`g`, and that there are
-two such functions.  Specifically, they are set to :math:`y_1 - 0.0001` and 
+two such functions.  Specifically, they are set to :math:`y_1 - 0.0001` and
 :math:`y_3 - 0.01`, respectively. See `CVodeRootInit
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-initialization-function>`_
 for a detailed description of this call.
@@ -147,13 +147,13 @@ for a detailed description of this call.
 The call to :literal:`SUNDenseMatrix` (see `SUNMATRIX_DENSE
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#>`_)
 creates a :math:`NEQ \times NEQ` *dense* **SUNMATRIX** object to use within the
-*Newton* solve in **CVODE**.  The following call to :literal:`SUNLinSol_Dense` (see `SUNLinSol_Dense 
+*Newton* solve in **CVODE**.  The following call to :literal:`SUNLinSol_Dense` (see `SUNLinSol_Dense
 <https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html#the-sunlinsol-dense-module>`_)
 creates the *dense* **SUNLINSOL** object that will perform the linear solves within
 the *Newton* method.  These are attached to the **CVODE** *linear
-solver interface* with the call to :literal:`CVodeSetLinearSolver` (see `CVodeSetLinearSolver interface 
+solver interface* with the call to :literal:`CVodeSetLinearSolver` (see `CVodeSetLinearSolver interface
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_),
-and the subsequent call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions 
+and the subsequent call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
 specifies the analytic *Jacobian* supplied by the *user-supplied function* :math:`Jac`.
 
@@ -169,27 +169,27 @@ location in :math:`t` and the solution at that point in :math:`y`.  In either ca
 program prints :math:`t` and :math:`y`.  In the case of a root, it calls
 :literal:`CVodeGetRootInfo` to get a length-:math:`2` array :math:`rootsfound` of bits showing
 which root function was found to have a root.  If :literal:`CVode` returned any
-negative value (*indicating a failure*), the program breaks out of the loop.  
+negative value (*indicating a failure*), the program breaks out of the loop.
 In the case of a ``CV_SUCCESS`` return, the value of :math:`t_{out}` is
 advanced (multiplied by :math:`10`) and a counter (:math:`i_{out}`) is advanced, so
 that the loop can be ended when that counter reaches the preset number
-of output times, :math:`N_{OUT} = 12`.  See `CVode Solver Function 
+of output times, :math:`N_{OUT} = 12`.  See `CVode Solver Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-solver-function>`_
 for full details of the call to :literal:`CVode`.
 
 Finally, the main program calls :literal:`PrintFinalStats` to get and print
 all of the relevant statistical quantities.  It then calls :literal:`NV_Destroy`
-to free the vectors :math:`y` and :math:`abstol`, :literal:`CVodeFree` to free the 
+to free the vectors :math:`y` and :math:`abstol`, :literal:`CVodeFree` to free the
 **CVODE** *memory block*, :literal:`SUNLinSolFree` to free the *linear solver
 memory*, and :literal:`SUNMatDestroy` to *free the matrix* :math:`A`.
 
 The function :literal:`PrintFinalStats` used here is actually suitable for
 general use in applications of **CVODE** to any problem with a direct
-*linear solver*.  It calls various :literal:`CVodeGet***` 
+*linear solver*.  It calls various :literal:`CVodeGet***`
 functions to obtain the relevant counters, and then prints them.
 Specifically, these are:
 
-* the cumulative number of steps (``nst``), 
+* the cumulative number of steps (``nst``),
 * the number of :math:`f` evaluations (``nfe``) (excluding those for *difference-quotient Jacobian* evaluations),
 * the number of matrix factorizations (``nsetups``),
 * the number of :math:`f` evaluations for *Jacobian* evaluations (``nfeLS`` :math:`= 0` here),
@@ -199,17 +199,17 @@ Specifically, these are:
 * the number of local error test failures (``netf``), and
 * the number of :math:`g` (*root function*) evaluations (``nge``).
 
-These optional outputs are described in `CVode Optional Output Functions 
+These optional outputs are described in `CVode Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_ .
 
-The function :literal:`f` is a straightforward expression of the ODEs. 
+The function :literal:`f` is a straightforward expression of the ODEs.
 It uses the *user-defined macro* :literal:`Ith` to extract the components of :math:`y`
 and to load the components of :math:`\dot y =` ``ydot``.  See `ODE RHS Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#ode-right-hand-side>`_
 for a detailed specification of :math:`f`.
 
 Similarly, the function :literal:`g` defines the two functions, :math:`g_0` and :math:`g_1`,
-whose roots are to be found.  See `Rootfinding Function 
+whose roots are to be found.  See `Rootfinding Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-function>`_
 for a detailed description of the :math:`g` function.
 
@@ -220,7 +220,7 @@ elements of a dense matrix of type **SUNMATRIX**.  Here the problem
 size is small, so we need not worry about the inefficiency of using
 :literal:`NV_Ith_S` and :literal:`SM_ELEMENT_D` to access :literal:`N_Vector` and
 **SUNMATRIX_DENSE** elements.  Note that in this example, :literal:`Jac`
-only accesses the :math:`y` and :math:`J` arguments.  See `Jacobian Construction 
+only accesses the :math:`y` and :math:`J` arguments.  See `Jacobian Construction
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
 for a detailed description of the :math:`Jac` function.
 
@@ -247,19 +247,19 @@ The example program :literal:`cvAdvDiff_bnd.c` solves the semi-discretized form
 the :math:`2`-D advection-diffusion equation
 
 .. math::
-   
+
    \frac{\partial v}{\partial t} = \frac{\partial^2 v}{\partial x^2}
                                  + 0.5 \frac{\partial v}{\partial x}
                                  + \frac{\partial^2 v}{\partial y^2}
 
-on a rectangle, with zero Dirichlet boundary conditions. The PDE is 
-discretized with standard central finite differences on a 
+on a rectangle, with zero Dirichlet boundary conditions. The PDE is
+discretized with standard central finite differences on a
 :math:`(M_X + 2) \times (M_Y + 2)` mesh, giving an ODE system of size
 :math:`M_X * M_Y`.  The discrete value :math:`v_{ij}` approximates :math:`v` at
 :math:`x = i \Delta x`, :math:`y = j \Delta y`. The ODEs are
 
 .. math::
-   
+
    \frac{dv_{ij}}{dt} = f_{ij} =
          \frac{v_{i-1,j} - 2 v_{ij} + v_{i+1,j}}{(\Delta x)^2}
        + 0.5  \frac{v_{i+1,j} - v_{i-1,j}}{2 \Delta x}
@@ -267,7 +267,7 @@ discretized with standard central finite differences on a
 
 where :math:`1 \leq i \leq M_X` and :math:`1 \leq j \leq M_Y`.  The boundary
 conditions are imposed by taking :math:`v_{ij} = 0` above if :math:`i = 0`
-or :math:`M_X + 1`, or if :math:`j = 0` or :math:`M_Y + 1`. 
+or :math:`M_X + 1`, or if :math:`j = 0` or :math:`M_Y + 1`.
 If we set :math:`u_{(j-1)+(i-1)*M_Y} = v_{ij}`, so that the ODE system is
 :math:`\dot u = f(u)`, then the system *Jacobian* :math:`J = \frac{\partial f}{\partial u}` is
 a *band matrix* with *upper* and *lower half-bandwidths* both equal to :math:`M_Y`.
@@ -278,13 +278,13 @@ The :literal:`cvAdvDiff_bnd.c` program includes files
 **SUNLinSol_Band** *linear solver*. The :literal:`sunmatrix_band.h` file
 contains the definition of the *banded* **SUNMATRIX** type, and the
 :literal:`SM_COLUMN_B` and :literal:`SM_COLUMN_ELEMENT_B` *macros* for
-accessing *banded matrix elements* (see `SUNMATRIX_BAND 
+accessing *banded matrix elements* (see `SUNMATRIX_BAND
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_).
 The :literal:`sunlinsol_band.h` file contains the definition of the *banded*
 **SUNLINSOL** type.  We note that have explicitly included
 :literal:`sunmatrix_band.h`, but this is not necessary because it is
 included by :literal:`sunlinsol_band.h`.  The file :literal:`nvector_serial.h`
-is included for the definition of the *serial* :literal:`N_Vector` type. 
+is included for the definition of the *serial* :literal:`N_Vector` type.
 
 The *include* lines at the top of the file are followed by *definitions* of
 *problem constants* which include the :math:`x` and :math:`y` mesh dimensions, :math:`M_X` and
@@ -313,13 +313,13 @@ The :literal:`main` program is straightforward.  The :literal:`CVodeCreate` call
 the ``CV_BDF`` method with a built-in ``CV_NEWTON`` iteration. Following the
 :literal:`CVodeInit` call, the call to :literal:`CVodeSStolerances` indicates *scalar
 relative and absolute tolerances*, and *values* :math:`reltol` and :math:`abstol` are passed.
-The call to :literal:`SUNBandMatrix` (see `SUNMATRIX_BAND 
+The call to :literal:`SUNBandMatrix` (see `SUNMATRIX_BAND
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_)
 creates a *banded* **SUNMATRIX** *Jacobian* template, and specifies that both
 *half-bandwidths* of the *Jacobian* are equal to :math:`M_Y`.  The calls to
-:literal:`SUNBandLinearSolver` (see `SUNLinSol_Band 
+:literal:`SUNBandLinearSolver` (see `SUNLinSol_Band
 <https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html>`_)
-and :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions 
+and :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
 specifies the **SUNLinSol_Band** *linear solver* to the **CVode** *interface*.
 The call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions
@@ -342,7 +342,7 @@ The :literal:`SetIC` function sets the initial dependent variable vector;
 :literal:`PrintOutput` prints a line of solution output;
 :literal:`PrintFinalStats` gets and prints statistics at the end of the run;
 and :literal:`check_flag` aids in checking return values.  The statistics
-printed include counters such as the total number of steps (``nst``), 
+printed include counters such as the total number of steps (``nst``),
 :math:`f` evaluations (excluding those for *Jaobian* evaluations) (``nfe``),
 :math:`LU` decompositions (``nsetups``), :math:`f` evaluations for
 *difference-quotient Jacobians* (:math:`nfeLS = 0` here),
@@ -357,9 +357,9 @@ of **CVODE** to any problem with a direct *linear solver*.
 
 The :literal:`f` function implements the *central difference approximation* (`IVP Solutions
 Mathematics <https://sundials.readthedocs.io/en/latest/cvode/Mathematics_link.html>`_)
-with :math:`u` identically zero on the boundary. 
-The constant coefficients :math:`(\Delta x)^{-2}`, :math:`0.5 (2 \Delta x)^{-1}`, and 
-:math:`(\Delta y)^{-2}` are computed only once at the beginning of :literal:`main`, 
+with :math:`u` identically zero on the boundary.
+The constant coefficients :math:`(\Delta x)^{-2}`, :math:`0.5 (2 \Delta x)^{-1}`, and
+:math:`(\Delta y)^{-2}` are computed only once at the beginning of :literal:`main`,
 and stored in the locations :C:`data->hdcoef`, :C:`data->hacoef`, and
 :C:`data->vdcoef`, respectively.   When :literal:`f` receives the :literal:`data`
 pointer (renamed :literal:`user_data` here), it pulls out these values from storage
@@ -372,11 +372,11 @@ The :literal:`Jac` function is an expression of the derivatives
 
 .. math::
 
-   \frac{\partial f_{ij}}{\partial v_{ij}} &=&
+   \frac{\partial f_{ij}}{\partial v_{ij}} &=
          -2 \left[ (\Delta x)^{-2} + (\Delta y)^{-2} \right] \\
-   \frac{\partial f_{ij}}{\partial v_{i \pm 1,j}} &=& (\Delta x)^{-2} 
-                  \pm 0.5 (2 \Delta x)^{-1}, ~~~~
-   \frac{\partial f_{ij}}{\partial v_{i,j \pm 1}}  =  (\Delta y)^{-2} ~.
+   \frac{\partial f_{ij}}{\partial v_{i \pm 1,j}} &= (\Delta x)^{-2}
+                  \pm 0.5 (2 \Delta x)^{-1}, \\
+   \frac{\partial f_{ij}}{\partial v_{i,j \pm 1}}  &=  (\Delta y)^{-2}.
 
 This function loads the *Jacobian* by *columns*, and like :literal:`f` it
 makes use of the preset coefficients in :literal:`data`.
@@ -386,19 +386,19 @@ and the :math:`k^{th}` *column* of the *Jacobian matrix* :math:`J` is set.
 The row index :math:`k'` of each component :math:`f_{i',j'}` that depends on
 :math:`v_{i,j}` must be identified in order to load the corresponding element.
 The elements are loaded with the :literal:`SM_COLUMN_ELEMENT_B` macro.
-Note that the formula for the global index :math:`k` implies that decreasing 
-(increasing) :math:`i` by :math:`1` corresponds to decreasing (increasing) 
-:math:`k` by :math:`M_Y`, while decreasing (increasing) :math:`j` by :math:`1` 
-corresponds of decreasing (increasing) :math:`k` by :math:`1`. 
+Note that the formula for the global index :math:`k` implies that decreasing
+(increasing) :math:`i` by :math:`1` corresponds to decreasing (increasing)
+:math:`k` by :math:`M_Y`, while decreasing (increasing) :math:`j` by :math:`1`
+corresponds of decreasing (increasing) :math:`k` by :math:`1`.
 These statements are reflected in the arguments to
 :literal:`SM_COLUMN_ELEMENT_B`.  The first argument passed to the
 :literal:`SM_COLUMN_ELEMENT_B` *macro* is a pointer to the diagonal element
 in the *column* to be accessed.  This pointer is obtained via a call to
-the :literal:`SM_COLUMN_B` *macro* and is stored in :literal:`kthCol` in 
+the :literal:`SM_COLUMN_B` *macro* and is stored in :literal:`kthCol` in
 the :literal:`Jac` function.  When setting the components of :math:`J` we must be
 careful not to index out of bounds. The guards :C:`(i != 1)` etc.
 in front of the calls to :literal:`SM_COLUMN_ELEMENT_B` prevent illegal indexing.
-See `CVode Jacobian Construction 
+See `CVode Jacobian Construction
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
 for a detailed description of the :literal:`Jac` function.
 
@@ -427,7 +427,7 @@ This program solves the semi-discretized form of a pair of
 kinetics-advection-diffusion partial differential equations, which
 represent a simplified model for the transport, production, and loss
 of ozone and the oxygen singlet in the upper atmosphere.  The problem
-includes nonlinear diurnal kinetics, horizontal advection and diffusion, 
+includes nonlinear diurnal kinetics, horizontal advection and diffusion,
 and nonuniform vertical diffusion.  The PDEs can be written as
 
 .. math::
@@ -447,15 +447,15 @@ species, and where the reaction terms are given by
    R^1(c^1,c^2,t) & = -q_1 c^1 c^3 - q_2 c^1 c^2 + 2 q_3(t) c^3 + q_4(t) c^2 ~, \\
    R^2(c^1,c^2,t) & = q_1 c^1 c^3 - q_2 c^1 c^2 - q_4(t) c^2 ~.
 
-The spatial domain is :math:`0 \leq x \leq 20,\;30 \leq y \leq 50` (in *km*). 
-The various constants and parameters are: 
+The spatial domain is :math:`0 \leq x \leq 20,\;30 \leq y \leq 50` (in *km*).
+The various constants and parameters are:
 :math:`K_h = 4.0 \cdot 10^{-6},` :math:`V = 10^{-3},` :math:`K_v = 10^{-8} e^{\frac{y}{5}},`
 :math:`q_1 = 1.63 \cdot 10^{-16},` :math:`q_2 = 4.66 \cdot 10^{-16},` :math:`c^3 = 3.7 \cdot 10^{16},`
 and the diurnal rate constants are defined as:
 
 .. math::
 
-   q_i(t) = 
+   q_i(t) =
    \left\{ \begin{array}{ll}
      \exp \left[ \frac{-a_i}{\sin (\omega t)} \right], & \mbox{for } \sin (\omega t) > 0 \\
      0, & \mbox{for } \sin (\omega t) \leq 0
@@ -465,12 +465,12 @@ where :math:`\omega = \frac{\pi}{43200},` :math:`a_3 = 22.62,` :math:`a_4 = 7.60
 integration is :math:`[0, 86400]`, representing 24 *hours* measured in *seconds*.
 
 Homogeneous Neumann boundary conditions are imposed on each boundary, and the
-initial conditions are 
+initial conditions are
 
 .. math::
    :label: cvDiurnalic
 
-   c^1 (x,y,0) &= 10^6 \alpha (x) \beta (y) ~,~~~ 
+   c^1 (x,y,0) &= 10^6 \alpha (x) \beta (y) ~,~~~
                    c^2 (x,y,0) = 10^{12} \alpha (x) \beta (y) ~, \\
    \alpha (x) &= 1 - (0.1 x - 1)^2 + \frac{1}{2} (0.1 x - 1)^4 ~, \\
    \beta (y) &= 1 - (0.1 y - 4)^2 + \frac{1}{2} (0.1 y - 4)^4 ~.
@@ -485,21 +485,21 @@ contains constants and function prototypes associated with the
 **SUNLinSol_SPGMR** module, including the values of the ``pretype``
 argument to :literal:`SUNLinSol_SPGMR`. The inclusion of :literal:`sundials_math.h` is
 done to access the :literal:`SUNSQR` macro for the square of a :literal:`realtype`
-number. 
+number.
 
 The :literal:`main` program calls :literal:`CVodeCreate` specifying the ``CV_BDF`` method
 and built-in ``CV_NEWTON`` iteration, and then calls :literal:`CVodeInit`, and
 :literal:`CVodeSetSStolerances` specifies the *scalar tolerances*.
 It calls :literal:`SUNLinSol_SPGMR` to create the **SPGMR** *linear solver* with *left
 preconditioning*, and the default value (indicated by a zero argument)
-for ``maxl``.  It then calls :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions 
+for ``maxl``.  It then calls :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
 to attach this *linear solver* to the
 **CVode** *interface*.  The call to :literal:`CVodeSetJacTimes` specifies a
 *user-supplied function* for *Jacobian-vector products* (the ``NULL``
-argument specifies that no *Jacobian-vector setup routine* is needed). 
+argument specifies that no *Jacobian-vector setup routine* is needed).
 Next, *user-supplied preconditioner setup* and *solve* functions,
-:literal:`Precond` and :literal:`PSolve`, are specified. See `CVode Linear Solver Optional Input Functions 
+:literal:`Precond` and :literal:`PSolve`, are specified. See `CVode Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_
 for details on the :literal:`CVodeSetPreconditioner` function.
 
@@ -513,11 +513,11 @@ statistics include various counters, such as the total numbers of steps
 evaluations) (``nfe``), of :math:`f` evaluations for :math:`J \cdot v` evaluations (``nfeLS``),
 of nonlinear iterations (``nni``), of linear (*Krylov*) iterations (``nli``),
 of *preconditioner* setups (``nsetups``), of *preconditioner* evaluations
-(``npe``), and of *preconditioner* solves (``nps``), among others.  
+(``npe``), and of *preconditioner* solves (``nps``), among others.
 Also printed are the lengths of the problem-dependent *real and integer
 workspaces* used by the main integrator :literal:`CVode`, denoted ``lenrw`` and
 ``leniw``, and those used by **CVode**, denoted ``lenrwLS`` and ``leniwLS``.
-All of these optional outputs are described in `CVode Optional Output Functions 
+All of these optional outputs are described in `CVode Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
 The :literal:`PrintFinalStats` function is suitable for general use in applications
 of **CVODE** to any problem with an iterative *linear solver*.
@@ -527,7 +527,7 @@ number, :math:`x` mesh point, and :math:`y` mesh point.  But in **NVECTOR_SERIAL
 type :literal:`N_Vector` works with a one-dimensional contiguous array of
 data components. The *macro* :literal:`IJKth` isolates the translation from
 three dimensions to one. Its use results in clearer code and makes it
-easy to change the underlying layout of the three-dimensional data. 
+easy to change the underlying layout of the three-dimensional data.
 Here the problem size is :math:`200`, so we use the :literal:`NV_DATA_S` *macro*
 for efficient :literal:`N_Vector` access.  The :literal:`NV_DATA_S` *macro* gives
 a pointer to the first component of an :literal:`N_Vector` which we pass to
@@ -557,7 +557,7 @@ module serves as the *interface* to *dense matrix* solves for the main
 *dense matrices* with :literal:`realtype **` as the underlying *dense matrix*
 type.  To avoid the extra layer of function calls and *dense matrix* and
 *linear solver data structures*, :literal:`cvDiurnal_kry.c` uses underlying small
-dense functions for all operations on the :math:`2 \times 2` *preconditioner blocks*.  
+dense functions for all operations on the :math:`2 \times 2` *preconditioner blocks*.
 Thus it includes :literal:`sundials_dense.h`, and calls the *small dense
 matrix* functions :literal:`newDenseMat`, :literal:`newIndexArray`, :literal:`denseCopy`,
 :literal:`denseScale`, :literal:`denseAddIdentity`, :literal:`denseGETRF`, and
@@ -570,7 +570,7 @@ In addition to the functions called by **CVODE**, :literal:`cvDiurnal_kry.c` inc
 definitions of several private functions.  These are: :literal:`AllocUserData`
 to allocate space for :math:`J_{bd}`, :math:`P`, and the pivot arrays; :literal:`InitUserData`
 to load problem constants in the ``data`` block; :literal:`FreeUserData` to free
-that block; :literal:`SetInitialProfiles` to load the *initial values* in :math:`y`; 
+that block; :literal:`SetInitialProfiles` to load the *initial values* in :math:`y`;
 :literal:`PrintOutput` to *retreive* and *print* selected solution values and
 statistics; :literal:`PrintFinalStats` to *print* statistics; and :literal:`check_flag`
 to *check return values* for error conditions.
@@ -585,4 +585,3 @@ the number of *preconditioner* setups, ``nsetups``, as a result of the
 
 .. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
    :literal:
-
diff --git a/doc/cvode/examples/source/conf.py b/doc/cvode/examples/source/conf.py
index 49da33c59a..fbb30db801 100644
--- a/doc/cvode/examples/source/conf.py
+++ b/doc/cvode/examples/source/conf.py
@@ -18,7 +18,7 @@
 # -- General configuration ----------------------------------------------------
 
 # Set variable used to determine which package documentation this is
-# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes', 
+# Can be one of 'arkode', 'arkode-examples', 'cvode', 'cvode-examples', 'cvodes',
 # 'ida', 'idas', 'kinsol' or 'super'
 package_name = 'cvode-examples'
 
@@ -199,9 +199,6 @@
 
 # -- Options for LaTeX output --------------------------------------------------
 
-latex_additional_files = ['../../../shared/latex/preamble.tex.txt',
-                          '../../../shared/latex/cover_pages.tex.txt']
-
 im_number = "UCRL-SM-208108"
 
 # 1. the rst file name used to generate the LaTeX file
@@ -227,7 +224,7 @@
                     tex_author, 'manual', False)]
 
 # make sure the doc logo gets copied to the build directory
-latex_logo = 'figs/doc_logo_blue.pdf'
+latex_logo = 'figs/sundials_logo_blue.png'
 
 # LaTeX customizations
 latex_elements = {
@@ -255,15 +252,8 @@
 'fncychap':'',
 # figure alignment options
 'figure_align': 'htbp',
-# additional preamble content
-'preamble':
-    '\\input{preamble.tex.txt}\n'+
-    '\\newcommand{\\sunreleasename}{' + sun_version + '}\n' +
-    '\\newcommand{\\imnumber}{' + im_number + '}\n',
 # extra class options
 'extraclassoptions': 'twoside,openright',
-# custom maketitle
-'maketitle': '\\input{cover_pages.tex.txt}'
 }
 
 
diff --git a/doc/cvode/examples/source/cpp_onemkl.rst b/doc/cvode/examples/source/cpp_onemkl.rst
index ed8d3248a4..46074d5220 100644
--- a/doc/cvode/examples/source/cpp_onemkl.rst
+++ b/doc/cvode/examples/source/cpp_onemkl.rst
@@ -49,7 +49,7 @@ since the grouping of the independent systems results in a block diagonal linear
 system, with the oneMKL SUNLinearSolver.  Alternatively, the SPGMR linear
 solver may be used with a Jacobi preconditioner.
 
-The problem uses a scalar relative tolerance and a vector absolute tolerance. 
+The problem uses a scalar relative tolerance and a vector absolute tolerance.
 Output is printed in decades from :math:`t = 0.1` to :math:`10^6`. Run statistics
 (optional outputs) are printed at the end.
 
@@ -68,7 +68,7 @@ This problem is comparable to the ``cvRoberts_block_klu.c`` example.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CPP_onemkl/cvRoberts_blockdiag_onemkl.out
+.. include:: ../../../../examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.out
    :literal:
 
 
@@ -76,7 +76,7 @@ Numerical method
 -----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_ONEMKLDENSE linear solver via the CVode interface.  Alternatively,
 Newton can use SUNLINSOL_SPGMR linear solver via the CVode interface.  The
@@ -90,5 +90,3 @@ CVode solver parameters.
 
 8 times are printed with 10 groups at each multiplicatively equally-spaced time-step,
 and run statistics are printed at the end.
-
-
diff --git a/doc/cvode/examples/source/cpp_sycl.rst b/doc/cvode/examples/source/cpp_sycl.rst
index bf239c1f1a..06347f215f 100644
--- a/doc/cvode/examples/source/cpp_sycl.rst
+++ b/doc/cvode/examples/source/cpp_sycl.rst
@@ -38,7 +38,7 @@ that here we use the SUNDIALS SPGMR linear solver instead.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CPP_sycl/cvAdvDiff_kry_sycl.out
+.. include:: ../../../../examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.out
    :literal:
 
 
@@ -47,5 +47,3 @@ Numerical method
 
 As previously mentioned, the problem is exactly the same as ``cvAdvDiff_bnd``
 except that here we use SUNLINSOL_SPGMR and NVECTOR_SYCL for demonstration.
-
-

From 6ffdae083f4e58cfa66d932011058a05223e1ea7 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Mon, 20 Nov 2023 13:13:35 -0600
Subject: [PATCH 32/35] Fixes for ARKODE example documentation

---
 doc/arkode/examples/source/References.rst   |  21 +--
 doc/arkode/examples/source/c_openmp.rst     |  12 +-
 doc/arkode/examples/source/c_parallel.rst   |  32 ++--
 doc/arkode/examples/source/c_parhyp.rst     |  34 ++--
 doc/arkode/examples/source/c_serial.rst     | 168 +++++++++-----------
 doc/arkode/examples/source/cpp_parallel.rst |   6 +-
 doc/arkode/examples/source/cpp_serial.rst   |  11 +-
 doc/arkode/examples/source/f77_parallel.rst |   6 +-
 doc/arkode/examples/source/f77_serial.rst   |   9 +-
 doc/arkode/examples/source/f90_parallel.rst |  20 +--
 doc/arkode/examples/source/f90_serial.rst   |   2 +-
 doc/arkode/examples/source/index.rst        |  15 +-
 12 files changed, 159 insertions(+), 177 deletions(-)

diff --git a/doc/arkode/examples/source/References.rst b/doc/arkode/examples/source/References.rst
index 64bfcb823b..f51cfaa4dc 100644
--- a/doc/arkode/examples/source/References.rst
+++ b/doc/arkode/examples/source/References.rst
@@ -1,4 +1,4 @@
-..
+.. ----------------------------------------------------------------
    Programmer(s): Daniel R. Reynolds @ SMU
    ----------------------------------------------------------------
    SUNDIALS Copyright Start
@@ -12,19 +12,14 @@
    SUNDIALS Copyright End
    ----------------------------------------------------------------
 
-:tocdepth: 3
-
-.. _References:
+.. _ARKODE.References:
 
 .. only:: html
 
-   ==========
-   References
-   ==========
-
-.. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
-             Programs for CVODE |CVODE_VERSION|. Technical Report
-             UCRL-SM-208110, LLNL, 2021.
+   ************
+   Bibliography
+   ************
 
-.. [R2018] D.R. Reynolds. User Documentation for ARKODE
-           |ARKODE_VERSION|. Technical Report LLNL-CODE-667205, LLNL, 2021.
+.. bibliography::
+   :cited:
+   :style: plain
diff --git a/doc/arkode/examples/source/c_openmp.rst b/doc/arkode/examples/source/c_openmp.rst
index 44bc708677..6a845eb32c 100644
--- a/doc/arkode/examples/source/c_openmp.rst
+++ b/doc/arkode/examples/source/c_openmp.rst
@@ -31,8 +31,8 @@ ark_brusselator1D_omp
 This problem is mathematically identical to the one-dimensional
 reaction-diffusion brusselator model, :ref:`ark_brusselator1D`.  As
 before, we investigate a time-dependent system of partial differential
-equations with 3 components, :math:`Y = [u,\, v,\, w]^T` that satisfy
-the equations,  
+equations with 3 components, :math:`Y = [u,\, v,\, w]^T`, that satisfy
+the equations
 
 .. math::
 
@@ -43,8 +43,8 @@ the equations,
    \frac{\partial w}{\partial t} &= d_w \frac{\partial^2 w}{\partial
       x^2} + \frac{b-w}{\varepsilon} - w u.
 
-We integrate for :math:`t \in [0, 10]`, and :math:`x \in [0, 1]`, with 
-initial conditions 
+We integrate for :math:`t \in [0, 10]` and :math:`x \in [0, 1]`, with
+initial conditions
 
 .. math::
 
@@ -52,7 +52,7 @@ initial conditions
    v(0,x) &= \frac{b}{a} + \frac{1}{10}\sin(\pi x),\\
    w(0,x) &=  b + \frac{1}{10}\sin(\pi x),
 
-and with stationary boundary conditions, i.e. 
+and with stationary boundary conditions, i.e.
 
 .. math::
 
@@ -67,5 +67,5 @@ Numerical method
 
 The numerical method is identical to the previous implementation,
 except that we now use SUNDIALS' OpenMP-enabled vector kernel module,
-NVECTOR_OPENMP, and have similarly threaded the supplied right-hand
+NVECTOR_OPENMP, including OpenMP parallelization of both the supplied right-hand
 side and banded Jacobian construction functions.
diff --git a/doc/arkode/examples/source/c_parallel.rst b/doc/arkode/examples/source/c_parallel.rst
index 0c0d006599..5172515e72 100644
--- a/doc/arkode/examples/source/c_parallel.rst
+++ b/doc/arkode/examples/source/c_parallel.rst
@@ -29,13 +29,13 @@ ark_diurnal_kry_bbd_p
 
 
 This problem is an ARKODE clone of the CVODE problem,
-``cv_diurnal_kry_bbd_p``.  As described in [HSR2017]_, this problem
+``cv_diurnal_kry_bbd_p``.  As described in :cite:p:`cvode_ex`, this problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &=
+   \frac{\partial c_i}{\partial t} =
      K_h \frac{\partial^2 c_i}{\partial x^2} +
      V \frac{\partial     c_i}{\partial x} +
      \frac{\partial}{\partial y}\left( K_v(y)
@@ -46,9 +46,9 @@ where
 
 .. math::
 
-   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
-   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
-   K_v(y) &= K_{v0} e^{y/5}.
+   R_1(c_1,c_2,t) &= -q_1\, c_1\, c_3 - q_2\, c_1\, c_2 + 2\, q_3(t)\, c_3  + q_4(t)\, c_2, \\
+   R_2(c_1,c_2,t) &=  q_1\, c_1\, c_3 - q_2\, c_1\, c_2 - q_4(t)\, c_2, \\
+   K_v(y) &= K_{v0}\, e^{y/5}.
 
 Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
 and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
@@ -61,8 +61,8 @@ We enforce the initial conditions
 
 .. math::
 
-   c_1(x,y) &=  10^6 \chi(x)\eta(y) \\
-   c_2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   c_1(x,y) &=  10^6\, \chi(x)\, \eta(y) \\
+   c_2(x,y) &=  10^{12}\, \chi(x)\, \eta(y) \\
    \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
    \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
 
@@ -85,7 +85,7 @@ subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver through the ARKSPILS interface.
+solver.
 
 The preconditioner matrix used is block-diagonal, with banded blocks,
 constructed using the ARKBBDPRE module.  Each block is generated using
@@ -110,13 +110,13 @@ ark_diurnal_kry_p
 ===================================================
 
 This problem is an ARKODE clone of the CVODE problem,
-``cv_diurnal_kry_p``.  As described in [HSR2017]_, this test problem
+``cv_diurnal_kry_p``.  As described in :cite:p:`cvode_ex`, this test problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &=
+   \frac{\partial c_i}{\partial t} =
      K_h \frac{\partial^2 c_i}{\partial x^2} +
      V \frac{\partial     c_i}{\partial x} +
      \frac{\partial}{\partial y}\left( K_v(y)
@@ -127,9 +127,9 @@ where
 
 .. math::
 
-   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
-   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
-   K_v(y) &= K_{v0} e^{y/5}.
+   R_1(c_1,c_2,t) &= -q_1\, c_1\, c_3 - q_2\, c_1\, c_2 + 2\, q_3(t)\, c_3  + q_4(t)\, c_2, \\
+   R_2(c_1,c_2,t) &=  q_1\, c_1\, c_3 - q_2\, c_1\, c_2 - q_4(t)\, c_2, \\
+   K_v(y) &= K_{v0}\, e^{y/5}.
 
 Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
 and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
@@ -142,8 +142,8 @@ We enforce the initial conditions
 
 .. math::
 
-   c^1(x,y) &=  10^6 \chi(x)\eta(y) \\
-   c^2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   c_1(x,y) &=  10^6\, \chi(x)\, \eta(y) \\
+   c_2(x,y) &=  10^{12}\, \chi(x)\, \eta(y) \\
    \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
    \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
 
@@ -166,7 +166,7 @@ subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver, through the ARKSPILS interface.
+solver.
 
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
diff --git a/doc/arkode/examples/source/c_parhyp.rst b/doc/arkode/examples/source/c_parhyp.rst
index f37a09e157..c6fdd7155b 100644
--- a/doc/arkode/examples/source/c_parhyp.rst
+++ b/doc/arkode/examples/source/c_parhyp.rst
@@ -35,20 +35,20 @@ spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} &= 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\quad i=1,2 
+   \frac{\partial c_i}{\partial t} =
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\quad i=1,2
 
 where
 
 .. math::
 
-   R_1(c_1,c_2,t) &= -q_1*c_1*c_3 - q_2*c_1*c_2 + 2*q_3(t)*c_3 + q_4(t)*c_2, \\
-   R_2(c_1,c_2,t) &=  q_1*c_1*c_3 - q_2*c_1*c_2 - q_4(t)*c_2, \\
-   K_v(y) &= K_{v0} e^{y/5}.
+   R_1(c_1,c_2,t) &= -q_1\, c_1\, c_3 - q_2\, c_1\, c_2 + 2\, q_3(t)\, c_3  + q_4(t)\, c_2, \\
+   R_2(c_1,c_2,t) &=  q_1\, c_1\, c_3 - q_2\, c_1\, c_2 - q_4(t)\, c_2, \\
+   K_v(y) &= K_{v0}\, e^{y/5}.
 
 Here :math:`K_h`, :math:`V`, :math:`K_{v0}`, :math:`q_1`, :math:`q_2`,
 and :math:`c_3` are constants, and :math:`q_3(t)` and :math:`q_4(t)`
@@ -57,12 +57,12 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
-   c^1(x,y) &=  10^6 \chi(x)\eta(y) \\
-   c^2(x,y) &=  10^{12} \chi(x)\eta(y) \\
+   c_1(x,y) &=  10^6\, \chi(x)\, \eta(y) \\
+   c_2(x,y) &=  10^{12}\, \chi(x)\, \eta(y) \\
    \chi(x) &= 1 - \sqrt{\frac{x - 10}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}} \\
    \eta(y) &= 1 - \sqrt{\frac{y - 40}{10}} + \frac12 \sqrt[4]{\frac{x - 10}{10}}.
 
@@ -87,7 +87,7 @@ and create the parallel partitioning:
    HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(Uij);
 
-The *initialize* call means that vector elements are ready to be set using 
+The *initialize* call means that vector elements are ready to be set using
 the IJ interface. We choose the initial condition vector :math:`x_0 =
 x(t_0)` as the template vector, and we set its values in the
 ``SetInitialProfiles(...)`` function. We complete assembly of the
@@ -103,7 +103,7 @@ use.  The sets the handle ``Upar`` to the actual HYPRE vector.  The
 handle is then passed to the ``N_VMake`` function, which creates the
 template ``N_Vector``, ``u``, as a wrapper around the HYPRE vector.
 All of the other vectors used in the computation are created by
-cloning this template vector.  
+cloning this template vector.
 
 Furthermore, since the template vector does not own the underlying
 HYPRE vector (it was created using the ``HYPRE_IJVectorCreate`` call
@@ -116,14 +116,14 @@ To access individual elements of the solution and derivative vectors
 ``u`` and ``udot`` in the IVP right-hand side function, ``f``, the
 user needs to first extract the HYPRE vector by calling
 ``N_VGetVector_ParHyp``, and then use HYPRE-specific methods to access
-the data from that point on. 
+the data from that point on.
 
 .. note::
-           
+
    Currently, interfaces to HYPRE solvers and preconditioners are not
    available directly through the SUNDIALS interfaces, however these
    could be utilized directly as preconditioners for SUNDIALS' Krylov
    solvers.  Direct interfaces to the HYPRE solvers will be provided
    in subsequent SUNDIALS releases.  The current HYPRE vector
    interface is included in this release mainly for testing purposes
-   and as a preview of functionality to come. 
+   and as a preview of functionality to come.
diff --git a/doc/arkode/examples/source/c_serial.rst b/doc/arkode/examples/source/c_serial.rst
index 759aa2c670..08e8e1e2df 100644
--- a/doc/arkode/examples/source/c_serial.rst
+++ b/doc/arkode/examples/source/c_serial.rst
@@ -31,13 +31,13 @@ ark_analytic
 This is a very simple C example showing how to use the ARKODE solver
 interface.
 
-The problem is that of a scalar-valued initial value problem (IVP)
+The problem is that of a scalar initial value problem (IVP)
 that is linear in the dependent variable :math:`y`, but nonlinear in
 the independent variable :math:`t`:
 
 .. math::
 
-   \frac{dy}{dt} = \lambda y + \frac{1}{1+t^2} - \lambda \arctan(t),
+   \frac{\mathrm dy}{\mathrm dt} = \lambda y + \frac{1}{1+t^2} - \lambda \arctan(t),
 
 where :math:`0\le t\le 10` and :math:`y(0)=0`.  The stiffness of the
 problem may be tuned via the parameter :math:`\lambda`.  The value of
@@ -54,7 +54,7 @@ The example routine solves this problem using a diagonally-implicit
 Runge-Kutta method.  Each stage is solved using the built-in modified
 Newton iteration, but since the ODE is linear in :math:`y` these
 should only require a single iteration per stage.  Internally, Newton
-will use the SUNLINSOL_DENSE linear solver via the ARKDLS interface,
+will use the SUNLINSOL_DENSE linear solver,
 which in the case of this scalar-valued problem is just division.  The
 example file contains functions to evaluate both :math:`f(t,y)` and
 :math:`J(t,y)=\lambda`.
@@ -102,7 +102,7 @@ The ODE problem is
 
 .. math::
 
-   \frac{dy}{dt} = (t+1) e^{-y},
+   \frac{\mathrm dy}{\mathrm dt} = (t+1) e^{-y},
 
 for the interval :math:`t \in [0.0, 10.0]`, with initial condition
 :math:`y(0)=0`.  This has analytical solution :math:`y(t) =
@@ -151,9 +151,9 @@ benchmark problem for new solvers.  The ODE system has 3 components,
 
 .. math::
 
-   \frac{du}{dt} &= a - (w+1)u + v u^2, \\
-   \frac{dv}{dt} &= w u - v u^2, \\
-   \frac{dw}{dt} &= \frac{b-w}{\varepsilon} - w u.
+   \frac{\mathrm du}{\mathrm dt} &= a - (w+1)u + v u^2, \\
+   \frac{\mathrm dv}{\mathrm dt} &= w u - v u^2, \\
+   \frac{\mathrm dw}{\mathrm dt} &= \frac{b-w}{\varepsilon} - w u.
 
 We integrate over the interval :math:`0 \le t \le 10`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`, :math:`w(0)
@@ -162,14 +162,14 @@ screen.
 
 The problem implements 3 different testing scenarios:
 
-Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
-:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
+* Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
+  :math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
 
-Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
-:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
+* Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
+  :math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
 
-Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
-:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
+* Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
+  :math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
 
 The example problem currently selects test 2, though that value may be
 easily adjusted to explore different testing scenarios.
@@ -180,9 +180,8 @@ Numerical method
 ----------------
 
 This program solves the problem with the DIRK method, using a
-Newton iteration with the SUNLINSOL_DENSE linear solver module via
-the ARKDLS interface.  Additionally, this example provides a routine
-to ARKDLS to compute the dense Jacobian.
+Newton iteration with the SUNLINSOL_DENSE linear solver module.
+Additionally, this example provides a routine to compute the dense Jacobian.
 
 The problem is run using scalar relative and absolute tolerances of
 :math:`rtol=10^{-6}` and :math:`atol=10^{-10}`, respectively.
@@ -247,9 +246,9 @@ that depend on the independent variable :math:`t` via the IVP system
 
 .. math::
 
-   \frac{du}{dt} &= a - (w+1)u + v u^2, \\
-   \frac{dv}{dt} &= w u - v u^2, \\
-   \frac{dw}{dt} &= \frac{b-w}{\varepsilon} - w u.
+   \frac{\mathrm du}{\mathrm dt} &= a - (w+1)u + v u^2, \\
+   \frac{\mathrm dv}{\mathrm dt} &= w u - v u^2, \\
+   \frac{\mathrm dw}{\mathrm dt} &= \frac{b-w}{\varepsilon} - w u.
 
 We integrate over the interval :math:`0 \le t \le 10`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`,
@@ -258,14 +257,14 @@ output to the screen.
 
 Again, we have 3 different testing scenarios,
 
-Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
-:math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
+* Test 1:  :math:`u_0=3.9`,  :math:`v_0=1.1`,  :math:`w_0=2.8`,
+  :math:`a=1.2`, :math:`b=2.5`, and :math:`\varepsilon=10^{-5}`
 
-Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
-:math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
+* Test 2:  :math:`u_0=1.2`, :math:`v_0=3.1`, :math:`w_0=3`, :math:`a=1`,
+  :math:`b=3.5`, and :math:`\varepsilon=5\cdot10^{-6}`
 
-Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
-:math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
+* Test 3:  :math:`u_0=3`, :math:`v_0=3`, :math:`w_0=3.5`, :math:`a=0.5`,
+  :math:`b=3`, and :math:`\varepsilon=5\cdot10^{-4}`
 
 with test 2 selected within in the example file.
 
@@ -290,7 +289,8 @@ split the right-hand side into stiff (:math:`f_i(t,y)`) and non-stiff
 
 Also unlike the previous test problem, we solve the resulting implicit
 stages using the available accelerated fixed-point solver, enabled
-through a call to ``ARKodeSetFixedPoint``, with an acceleration
+by constructing a SUNNonlinSol_FixedPoint object and attaching that to
+ARKStep via a call to ``ARKStepSetNonlinearSolver``, with an acceleration
 subspace of dimension 3.
 
 10 outputs are printed at equal intervals, and run statistics
@@ -310,9 +310,9 @@ previous test, this problem has 3 dependent variables :math:`u`, :math:`v` and
 
 .. math::
 
-   \frac{du}{dt} &= a - (w+1)u + v u^2, \\
-   \frac{dv}{dt} &= w u - v u^2, \\
-   \frac{dw}{dt} &= \frac{b-w}{\varepsilon} - w u.
+   \frac{\mathrm du}{\mathrm dt} &= a - (w+1)u + v u^2, \\
+   \frac{\mathrm dv}{\mathrm dt} &= w u - v u^2, \\
+   \frac{\mathrm dw}{\mathrm dt} &= \frac{b-w}{\varepsilon} - w u.
 
 We integrate over the interval :math:`0 \le t \le 2`, with the
 initial conditions :math:`u(0) = u_0`, :math:`v(0) = v_0`, :math:`w(0)
@@ -321,16 +321,14 @@ units.
 
 The problem implements the following testing scenario: :math:`u_0=1.2`,
 :math:`v_0=3.1`,  :math:`w_0=3`, :math:`a=1`, :math:`b=3.5`, and
-:math:`\varepsilon=10^{-2}`
+:math:`\varepsilon=10^{-2}`.
+
 
 Numerical method
 ----------------
 
-This program solves the problem with the default thrid order method.
-
-The problem is run using a fixed slow step size :math:`hs=0.025` and fast step
-size :math:`0.001`.
-
+This program solves the problem with the default thrid order method.  It is run
+using a fixed slow step size :math:`hs=0.025` and fixed fast step size :math:`0.001`.
 20 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
@@ -348,9 +346,9 @@ components, :math:`Y = [u,\, v,\, w]^T`, satisfying the equations,
 
 .. math::
 
-   \frac{du}{dt} &= -0.04 u + 10^4 v w, \\
-   \frac{dv}{dt} &= 0.04 u - 10^4 v w - 3\cdot10^7 v^2, \\
-   \frac{dw}{dt} &= 3\cdot10^7 v^2.
+   \frac{\mathrm du}{\mathrm dt} &= -0.04 u + 10^4 v w, \\
+   \frac{\mathrm dv}{\mathrm dt} &= 0.04 u - 10^4 v w - 3\cdot10^7 v^2, \\
+   \frac{\mathrm dw}{\mathrm dt} &= 3\cdot10^7 v^2.
 
 We integrate over the interval :math:`0\le t\le 10^{11}`, with initial
 conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.
@@ -361,8 +359,8 @@ Numerical method
 
 This program is constructed to solve the problem with the DIRK solver.
 Implicit subsystems are solved using a Newton iteration with the
-SUNLINSOL_DENSE dense linear solver module via the ARKDLS interface; a
-routine is provided to ARKDLS to supply the Jacobian matrix.
+SUNLINSOL_DENSE dense linear solver module; a
+routine is provided to supply the Jacobian matrix.
 
 The problem is run using scalar relative and absolute tolerances of
 :math:`rtol=10^{-4}` and :math:`atol=10^{-11}`, respectively.
@@ -411,9 +409,9 @@ with 3 components, :math:`Y = [u,\, v,\, w]^T`, satisfying the equations,
 
 .. math::
 
-   \frac{du}{dt} &= -0.04 u + 10^4 v w, \\
-   \frac{dv}{dt} &= 0.04 u - 10^4 v w - 3\cdot10^7 v^2, \\
-   \frac{dw}{dt} &= 3\cdot10^7 v^2.
+   \frac{\mathrm du}{\mathrm dt} &= -0.04 u + 10^4 v w, \\
+   \frac{\mathrm dv}{\mathrm dt} &= 0.04 u - 10^4 v w - 3\cdot10^7 v^2, \\
+   \frac{\mathrm dw}{\mathrm dt} &= 3\cdot10^7 v^2.
 
 We integrate over the interval :math:`0\le t\le 10^{11}`, with initial
 conditions  :math:`Y(0) = [1,\, 0,\, 0]^T`.
@@ -436,7 +434,7 @@ Numerical method
 
 This program solves the problem with the DIRK solver.  Implicit
 subsystems are solved using a Newton iteration with the
-SUNLINSOL_DENSE linear solver module via the ARKDLS interface; a
+SUNLINSOL_DENSE linear solver module; a
 routine is supplied to provide the dense Jacobian matrix.
 
 The problem is run using scalar relative and vector absolute
@@ -469,8 +467,8 @@ of ARKODE report outside of the typical logarithmically-spaced output
 times to declare that at time :math:`t=0.264019` the variable
 :math:`w` attains the value :math:`10^{-2}`, and that at time
 :math:`t=2.07951\cdot10^{7}` the variable :math:`u` attains the value
-:math:`10^{-4}`; both of our thresholds specified by the root-finding
-function ``g()``.
+:math:`10^{-4}`; both of our thresholds are specified by different
+components in the root-finding function ``g()``.
 
 
 
@@ -497,7 +495,7 @@ the equations,
       x^2} + \frac{b-w}{\varepsilon} - w u.
 
 However, now these solutions are also spatially dependent.  We
-integrate for :math:`t \in [0, 10]`, and :math:`x \in [0, 1]`, with
+integrate for :math:`t \in [0, 10]` and :math:`x \in [0, 1]`, with
 initial conditions
 
 .. math::
@@ -536,8 +534,8 @@ relative and absolute solver tolerances of :math:`rtol=10^{-6}` and
 :math:`atol=10^{-10}`, respectively.
 
 This program solves the problem with a DIRK method, using a Newton
-iteration with the SUNLINSOL_BAND linear solver module via the ARKDLS
-interface; a routine is supplied to fill the banded Jacobian matrix.
+iteration with the SUNLINSOL_BAND linear solver module; a routine is
+supplied to fill the banded Jacobian matrix.
 
 100 outputs are printed at equal intervals, and run statistics
 are printed at the end.
@@ -571,8 +569,7 @@ This problem is mathematically identical to the preceding problem,
 :ref:`ark_brusselator1D`, but instead of using the SUNMATRIX_BAND
 banded matrix module and SUNLINSOL_BAND linear solver module, it uses
 the SUNMATRIX_SPARSE sparse matrix module with the SUNLINSOL_KLU
-linear solver module.  These are still provided to ARKODE using the
-ARKDLS direct linear solver interface, and again a routine is provided
+linear solver module.  A routine is provided
 to supply a compressed-sparse-column version of the Jacobian matrix.
 Additionally, the solution is only output 10 times instead of 100.
 
@@ -661,7 +658,7 @@ consider the heat equation,
 
    \frac{\partial u}{\partial t} = k \frac{\partial^2 u}{\partial x^2} + f,
 
-for :math:`t \in [0, 10]`, and :math:`x \in [0, 1]`, with initial
+for :math:`t \in [0, 10]` and :math:`x \in [0, 1]`, with initial
 condition :math:`u(0,x) = 0`, stationary boundary conditions,
 
 .. math::
@@ -693,9 +690,9 @@ using scalar relative and absolute solver tolerances of
 This program solves the problem with a DIRK method, utilizing a Newton
 iteration.  The primary utility in including this example is that
 since the Newton linear systems are now symmetric, we solve these
-using the SUNLINSOL_PCG iterative linear solver, through the ARKSPILS
-linear solver interface.  A routine to perform the Jacobian-vector
-product routine is supplied, in order to provide an example of its use.
+using the SUNLINSOL_PCG iterative linear solver.  A routine to perform
+the Jacobian-vector product routine is supplied, in order to provide an
+example of its use.
 
 
 
@@ -759,7 +756,7 @@ as the simulation proceeds the mesh is [crudely] adapted to add points
 to the center of subintervals bordering any node where
 :math:`\left|\frac{\partial^2 u}{\partial x^2}\right| > 0.003`.
 We note that the spatial adaptivity approach employed in this example
-is *ad-hoc*, designed only to exemplify ARKODE usage on a problem with
+is ad hoc, designed only to exemplify ARKODE usage on a problem with
 varying size (not to show optimally-adaptive spatial refinement
 methods).
 
@@ -781,7 +778,7 @@ ark_KrylovDemo_prec
 This problem is an ARKODE clone of the CVODE problem,
 ``cv_KrylovDemo_prec``.  This is a demonstration program using the
 SUNLINSOL_SPGMR linear solver module.  As explained more thoroughly in
-[HSR2017]_, the problem is a stiff ODE system that arises from a
+:cite:p:`cvode_ex`, the problem is a stiff ODE system that arises from a
 system of PDEs modeling a six-species food web population model, with
 predator-prey interaction and diffusion on the unit square in two
 dimensions.  We have a system with 6 components, :math:`C = [c^1,\,
@@ -789,7 +786,7 @@ c^2,\,\ldots, c^6]^T` that satisfy the equations,
 
 .. math::
 
-   \frac{\partial c^i}{\partial t} &= d_i \left(\frac{\partial^2 c^i}{\partial
+   \frac{\partial c^i}{\partial t} = d_i \left(\frac{\partial^2 c^i}{\partial
       x^2} + \frac{\partial^2 c^i}{\partial y^2}\right) +
       f_i(x,y,c),\quad i=1,\ldots,6.
 
@@ -823,7 +820,7 @@ The spatial domain is :math:`(x,y) \in [0, 1]^2`; the time domain is
 
 .. math::
 
-   c^i(x,y) &=  10 + i \sqrt{4x(1-x)}\sqrt{4y(1-y)}
+   c^i(x,y) = 10 + i \sqrt{4x(1-x)}\sqrt{4y(1-y)}
 
 and with homogeneous Neumann boundary conditions,
 :math:`\nabla c^i \cdot \vec{n} = 0`.
@@ -843,8 +840,7 @@ problem as one involving :math:`6*Mx*My` coupled ODEs.
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module, and ARKSPILS interface.  The preconditioner matrix used
-is the product of two matrices:
+solver module.  The preconditioner matrix used is the product of two matrices:
 
 1. A matrix, only defined implicitly, based on a fixed number of
    Gauss-Seidel iterations using the diffusion terms only.
@@ -856,13 +852,13 @@ is the product of two matrices:
 Four different runs are made for this problem.  The product
 preconditoner is applied on the left and on the right.  In each case,
 both the modified and classical Gram-Schmidt orthogonalization options
-are tested.  In the series of runs, ``ARKodeInit``, ``SUNSPGMR``,
-``ARKSpilsSetLinearSolver``, ``SUNSPGMRSetGSType``,
-``ARKSpilsSetEpsLin`` and ``ARKSpilsSetPreconditioner`` are called
-only for the first run, whereas ``ARKodeReInit``,
-``SUNSPGMRSetPrecType`` and ``SUNSPGMRSetGSType`` are called to
-re-initialize the integrator and update linear solver parameters for
-each of the remaining three runs.
+are tested.  In the series of runs, ``ARKStepCreate``, ``SUNLinSol_SPGMR``,
+``ARKStepSetLinearSolver``, ``SUNLinSol_SPGMRSetGSType``,
+``ARKStepSetEpsLin`` and ``ARKStepSetPreconditioner`` are called
+only for the first run, whereas ``ARKStepReInit``,
+``SUNLinSol_SPGMRSetPrecType`` and ``SUNLinSol_SPGMRSetGSType`` are
+called to re-initialize the integrator and update linear solver parameters
+for each of the remaining three runs.
 
 A problem description, performance statistics at selected output
 times, and final statistics are written to standard output.  On the
@@ -883,9 +879,9 @@ the IVP system
 
 .. math::
 
-   \frac{du}{dt} &= -50 v, \\
-   \frac{dv}{dt} &= 50 u, \\
-   \frac{dw}{dt} &= -w + u + v.
+   \frac{\mathrm du}{\mathrm dt} &= -50 v, \\
+   \frac{\mathrm dv}{\mathrm dt} &= 50 u, \\
+   \frac{\mathrm dw}{\mathrm dt} &= -w + u + v.
 
 We integrate over the interval :math:`0 \le t \le 1`, with the initial
 conditions :math:`u(0) = 1`, :math:`v(0) = 0`, :math:`w(0)= 2`.  The
@@ -894,25 +890,22 @@ solution is output to the screen at equal intervals of 0.1 time units.
 Numerical method
 ----------------
 
-This program solves the problem with the default third order method.
-
+This program solves the problem with MRIStep's default third order method.
 The problem is run using a fixed slow step size :math:`hs=0.001` and fast step
-size :math:`0.0001`.
-
-10 outputs are printed at equal intervals, and run statistics
+size :math:`0.0001`.  10 outputs are printed at equal intervals, and run statistics
 are printed at the end.
 
 
 Solutions
 ---------
 
-This system has the analytic solution,
+This system has the analytic solution
 
 .. math::
 
    u(t) &= \cos(50t), \\
    v(t) &= \sin(50t), \\
-   w(t) &= 5051/2501*\exp(-t) - 49/2501*\cos(50t) + 51/2501*\sin(50t).
+   w(t) &= \frac{5051}{2501} e^{-t} - \frac{49}{2501}\cos(50t) + \frac{51}{2501}\sin(50t).
 
 
 
@@ -927,22 +920,19 @@ the IVP system
 
 .. math::
 
-   \frac{du}{dt} &= 100 v + w, \\
-   \frac{dv}{dt} &= -100 u, \\
-   \frac{dw}{dt} &= -w + u.
+   \frac{\mathrm du}{\mathrm dt} &= 100 v + w, \\
+   \frac{\mathrm dv}{\mathrm dt} &= -100 u, \\
+   \frac{\mathrm dw}{\mathrm dt} &= -w + u.
 
 We integrate over the interval :math:`0 \le t \le 2`, with the initial
-conditions :math:`u(0) = 9001/10001`, :math:`v(0) = 10^{-5}/10001`,
+conditions :math:`u(0) = \frac{9001}{10001}`, :math:`v(0) = \frac{10^{-5}}{10001}`,
 :math:`w(0)= 1000`.  The solution is output to the screen at equal intervals of
 0.1 time units.
 
 Numerical method
 ----------------
 
-This program solves the problem with the default third order method.
-
-The problem is run using a fixed slow step size :math:`hs=0.001` and fast step
-size :math:`0.00002`.
-
-20 outputs are printed at equal intervals, and run statistics
-are printed at the end.
+This program solves the problem with MRIStep's default third order method.
+The problem is run using a fixed slow step size :math:`hs=0.001` and fixed fast
+step size :math:`0.00002`.  20 outputs are printed at equal intervals, and run
+statistics are printed at the end.
diff --git a/doc/arkode/examples/source/cpp_parallel.rst b/doc/arkode/examples/source/cpp_parallel.rst
index b54d2a282f..7577d44765 100644
--- a/doc/arkode/examples/source/cpp_parallel.rst
+++ b/doc/arkode/examples/source/cpp_parallel.rst
@@ -28,7 +28,7 @@ Parallel C++ example problems
 ark_heat2D
 ======================================================================
 
-ARKODE provides one parallel C++ example problem, that extends our
+ARKODE provides a parallel C++ example problem that extends our
 previous :ref:`ark_heat1D` test to now simulate a two-dimensional heat
 equation,
 
@@ -74,9 +74,9 @@ absolute solver tolerances of :math:`rtol=10^{-5}` and
 
 As with the 1D version, this program solves the problem with a DIRK
 method, that itself uses a Newton iteration and SUNLINSOL_PCG
-iterative linear solver through the ARKSPILS interface.  However,
+iterative linear solver.  However,
 unlike the previous example, here the PCG solver is preconditioned
-using a single Jacobi iteration, and uses ARKSPILS' built-in
+using a single Jacobi iteration, and uses ARKODE's built-in
 finite-difference Jacobian-vector product routine. Additionally, this
 problem uses MPI and the NVECTOR_PARALLEL module for parallelization.
 
diff --git a/doc/arkode/examples/source/cpp_serial.rst b/doc/arkode/examples/source/cpp_serial.rst
index 0869ddc2e2..5f2392e1fc 100644
--- a/doc/arkode/examples/source/cpp_serial.rst
+++ b/doc/arkode/examples/source/cpp_serial.rst
@@ -33,7 +33,7 @@ is that of a linear ODE system,
 
 .. math::
 
-   \frac{dy}{dt} = Ay
+   \frac{\mathrm dy}{\mathrm dt} = Ay
 
 where :math:`A = V D V^{-1}`.  In this example, we use
 
@@ -72,10 +72,9 @@ respectively.
 
 This program solves the problem with the DIRK method,
 Newton iteration with the SUNMATRIX_DENSE matrix module and
-accompanying SUNLINSOL_DENSE linear solver module, ARKDLS direct
-linear solver interface, and a user-supplied dense Jacobian
-routine.  Output is printed every 0.005 units of time (10 total).
-Run statistics (optional outputs) are printed at the end.
+accompanying SUNLINSOL_DENSE linear solver module, and a user-supplied
+dense Jacobian routine.  Output is printed every 0.005 units of time
+(10 total). Run statistics (optional outputs) are printed at the end.
 
 
 
@@ -86,7 +85,7 @@ This problem is included both as a simple example to test systems of
 ODE within ARKODE on a problem having an analytical solution,
 :math:`Y(t) = V e^{Dt} V^{-1} Y(0)`.  As seen in the plots below, the
 computed solution tracks the analytical solution quite well (left),
-and results in errors with exactly the magnitude as specified by the
+and results in errors with precisely the magnitude specified by the
 requested error tolerances (right).
 
 .. image:: figs/plot-ark_analytic_sys.png
diff --git a/doc/arkode/examples/source/f77_parallel.rst b/doc/arkode/examples/source/f77_parallel.rst
index f8c7a7bba6..e1364d70fd 100644
--- a/doc/arkode/examples/source/f77_parallel.rst
+++ b/doc/arkode/examples/source/f77_parallel.rst
@@ -29,7 +29,7 @@ fark_diag_kry_bbd_p
 ===================================================
 
 This problem is an ARKODE clone of the CVODE problem,
-``fcv_diag_kry_bbd_p``.  As described in [HSR2017]_, this problem
+``fcv_diag_kry_bbd_p``.  As described in :cite:p:`cvode_ex`, this problem
 models a stiff, linear, diagonal ODE system,
 
 .. math::
@@ -50,7 +50,7 @@ Numerical method
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module and ARKSPILS interface.
+solver module.
 
 A diagonal preconditioner matrix is used, formed automatically through
 difference quotients within the ARKBBDPRE module.  Since ARKBBDPRE is
@@ -76,7 +76,7 @@ fark_diag_non_p
 ===================================================
 
 This problem is an ARKODE clone of the CVODE problem,
-``fcv_diag_non_p``.  As described in [HSR2017]_, this problem models a
+``fcv_diag_non_p``.  As described in :cite:p:`cvode_ex`, this problem models a
 nonstiff, linear, diagonal ODE system,
 
 .. math::
diff --git a/doc/arkode/examples/source/f77_serial.rst b/doc/arkode/examples/source/f77_serial.rst
index 2c0c783522..63f0891d5b 100644
--- a/doc/arkode/examples/source/f77_serial.rst
+++ b/doc/arkode/examples/source/f77_serial.rst
@@ -29,7 +29,7 @@ fark_diurnal_kry_bp
 ===================================================
 
 This problem is an ARKODE clone of the CVODE problem,
-``fcv_diurnal_kry_bp``.  As described in [HSR2017]_, this problem
+``fcv_diurnal_kry_bp``.  As described in :cite:p:`cvode_ex`, this problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
@@ -83,7 +83,7 @@ problem, we use a relatively coarse uniform mesh with
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module, and the ARKSPILS interface.
+solver module.
 
 The left preconditioner used is a banded matrix, constructed using
 the ARKBP module.  The banded preconditioner matrix is generated using
@@ -104,7 +104,7 @@ fark_roberts_dnsL
 ===================================================
 
 This problem is an ARKODE clone of the CVODE problem,
-``fcv_roberts_dnsL``.  As described in [HSR2017]_, this problem models
+``fcv_roberts_dnsL``.  As described in :cite:p:`cvode_ex`, this problem models
 the kinetics of a three-species autocatalytic reaction.  This is an
 ODE system with 3 components, :math:`Y = [y_1,\, y_2,\, y_3]^T`,
 satisfying the equations,
@@ -134,8 +134,7 @@ Numerical method
 ----------------
 
 This program solves the problem with a DIRK method, using a Newton
-iteration with the SUNLINSOL_LAPACKDENSE linear solver module and
-ARKDLS interface.
+iteration with the SUNLINSOL_LAPACKDENSE linear solver module.
 
 As with the :ref:`ark_robertson_root` problem, we enable ARKODE's
 rootfinding module to find the times at which either :math:`u=10^{-4}`
diff --git a/doc/arkode/examples/source/f90_parallel.rst b/doc/arkode/examples/source/f90_parallel.rst
index 62f0abd412..97aee33d25 100644
--- a/doc/arkode/examples/source/f90_parallel.rst
+++ b/doc/arkode/examples/source/f90_parallel.rst
@@ -29,11 +29,11 @@ fark_heat2D
 
 This test problem is a Fortran-90 version of the same two-dimensional
 heat equation problem as in C++, :ref:`ark_heat2D`.  This models a
-simple two-dimenaional heat equation, 
+simple two-dimenaional heat equation,
 
 .. math::
 
-   \frac{\partial u}{\partial t} = k_x \frac{\partial^2 u}{\partial x^2} 
+   \frac{\partial u}{\partial t} = k_x \frac{\partial^2 u}{\partial x^2}
                                  + k_y \frac{\partial^2 u}{\partial y^2} + h,
 
 for :math:`t \in [0, 0.3]`, and :math:`(x,y) \in [0, 1]^2`, with initial
@@ -41,7 +41,7 @@ condition :math:`u(0,x,y) = 0`, stationary boundary conditions,
 
 .. math::
 
-   \frac{\partial u}{\partial t}(t,0,y) = \frac{\partial u}{\partial t}(t,1,y) = 
+   \frac{\partial u}{\partial t}(t,0,y) = \frac{\partial u}{\partial t}(t,1,y) =
    \frac{\partial u}{\partial t}(t,x,0) = \frac{\partial u}{\partial t}(t,x,1) = 0,
 
 and a periodic heat source,
@@ -49,9 +49,9 @@ and a periodic heat source,
 .. math::
 
    h(x,y) = \sin(\pi x) \sin(2\pi y).
- 
+
 Under these conditions, the problem has an analytical solution of the
-form 
+form
 
 .. math::
 
@@ -63,16 +63,16 @@ Numerical method
 
 The spatial derivatives are computed using second-order centered
 differences, with the data distributed over :math:`nx\times ny` points
-on a uniform spatial grid.  
+on a uniform spatial grid.
 
 The spatial grid is set to :math:`nx=60` and :math:`ny=120`.  The heat
 conductivity parameters are :math:`k_x=0.5` and :math:`k_y=0.75`.
- 
+
 As with the C++ version, this program solves the problem with a DIRK
 method, that itself uses a Newton iteration and SUNLINSOL_PCG
-iterative linear solver module through the ARKSPILS interface.  Also
+iterative linear solver module.  Also
 like the C++ version, the PCG solver is preconditioned using a single
-Jacobi iteration, and uses ARKSPILS' finite-difference Jacobian-vector
+Jacobi iteration, and uses ARKODE's finite-difference Jacobian-vector
 product approximation routine for the PCG polver.  Additionally, this
 problem uses MPI and the Fortran interface to the NVECTOR_PARALLEL
-module for parallelization. 
+module for parallelization.
diff --git a/doc/arkode/examples/source/f90_serial.rst b/doc/arkode/examples/source/f90_serial.rst
index 116b2d2811..253b372e6f 100644
--- a/doc/arkode/examples/source/f90_serial.rst
+++ b/doc/arkode/examples/source/f90_serial.rst
@@ -65,7 +65,7 @@ sides are broken up as
 
 The implicit systems are solved using the built-in modified Newton
 iteration, with the SUNMATRIX_DENSE matrix module and accompanying
-SUNLINSOL_DENSE linear solver module, through the ARKDLS interface.
+SUNLINSOL_DENSE linear solver module.
 Both the Jacobian routine and right-hand side functions are supplied
 by functions provided in the example file.
 
diff --git a/doc/arkode/examples/source/index.rst b/doc/arkode/examples/source/index.rst
index 55d1032118..20f3595dd7 100644
--- a/doc/arkode/examples/source/index.rst
+++ b/doc/arkode/examples/source/index.rst
@@ -37,11 +37,11 @@ users, though complete control over all internal parameters and time
 adaptivity algorithms is enabled through optional interface routines.
 
 ARKODE is developed by `Southern Methodist University
-<http://www.smu.edu>`_, with support by the `US Department of Energy
-<http://www.doe.gov>`_ through the `FASTMath
-<http://www.fastmath-scidac.org/>`_ SciDAC Institute, under subcontract
-B598130 from `Lawrence Livermore National Laboratory
-<http://www.llnl.gov>`_.
+<http://www.smu.edu>`_ and
+`Lawrence Livermore National Laboratory <http://www.llnl.gov>`_, with
+support by the `US Department of Energy <http://www.doe.gov>`_ through
+the `FASTMath <http://www.fastmath-scidac.org/>`_ SciDAC Institute,
+under DOE award DE-SC0021354.
 
 Along with the ARKODE solver, we have created a suite of example
 problems demonstrating its usage on applications written in C, C++ and
@@ -54,7 +54,7 @@ exhaustive set of all possible usage scenarios, they are designed to
 show a variety of exemplars, and can be used as templates for new
 problems using ARKODE's solvers.  Further information on the ARKODE
 package itself may be found in the accompanying ARKODE user guide
-[R2018]_.
+:cite:p:`arkode_ug`.
 
 The following tables summarize the salient features of each of the
 example problems in this document.  Each example is designed to be
@@ -64,8 +64,7 @@ examples according to programming language (C, C++, Fortran).
 
 
 ARKODE example problems written in C are summarized in the table
-below, and are further described in the chapters :ref:`serial_c`,
-:ref:`openmp_c`, :ref:`parallel_c` and :ref:`parhyp_c`.
+below.
 
 .. cssclass:: table-bordered
 

From 8e41653ef7d2d62a3e41dadc001f06cd269b7671 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Mon, 20 Nov 2023 15:31:58 -0600
Subject: [PATCH 33/35] Initial pass at cleaning up CVODE example guide

---
 doc/cvode/examples/source/References.rst      |  21 +-
 doc/cvode/examples/source/c_parallel.rst      |  42 +-
 doc/cvode/examples/source/c_parallel_deep.rst | 190 +++----
 doc/cvode/examples/source/c_parhyp_deep.rst   |  55 +-
 doc/cvode/examples/source/c_serial_deep.rst   | 506 +++++++++---------
 doc/cvode/examples/source/f2003_deep.rst      |  93 ++--
 doc/cvode/examples/source/f2003_parallel.rst  |  12 +-
 doc/cvode/examples/source/f2003_serial.rst    |  44 +-
 doc/cvode/examples/source/index.rst           | 190 +++----
 9 files changed, 577 insertions(+), 576 deletions(-)

diff --git a/doc/cvode/examples/source/References.rst b/doc/cvode/examples/source/References.rst
index 96bdafbd65..f51cfaa4dc 100644
--- a/doc/cvode/examples/source/References.rst
+++ b/doc/cvode/examples/source/References.rst
@@ -1,4 +1,4 @@
-..
+.. ----------------------------------------------------------------
    Programmer(s): Daniel R. Reynolds @ SMU
    ----------------------------------------------------------------
    SUNDIALS Copyright Start
@@ -12,19 +12,14 @@
    SUNDIALS Copyright End
    ----------------------------------------------------------------
 
-:tocdepth: 3
-
-.. _References:
+.. _ARKODE.References:
 
 .. only:: html
 
-   ==========
-   References
-   ==========
-
-.. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
-             Programs for CVODE |CVODE_VERSION|. Technical Report
-             UCRL-SM-208110, LLNL, 2021.
+   ************
+   Bibliography
+   ************
 
-.. [R2018] A.C. Hindmarsh, R. Serban and D.R. Reynolds. User Documentation for CVODE
-           |CVODE_VERSION|. Technical Report UCRL-CODE-155951, LLNL, 2023.
+.. bibliography::
+   :cited:
+   :style: plain
diff --git a/doc/cvode/examples/source/c_parallel.rst b/doc/cvode/examples/source/c_parallel.rst
index fde7bd21f0..0866feb168 100644
--- a/doc/cvode/examples/source/c_parallel.rst
+++ b/doc/cvode/examples/source/c_parallel.rst
@@ -30,7 +30,7 @@ cvAdvDiff_diag_p
 Description
 ------------
 
-This is a simple example problem, with the program for its solution 
+This is a simple example problem, with the program for its solution
 provided by CVODE. The problem is the semi-discrete form
 of the advection-diffusion equation in 1-D:
 
@@ -59,7 +59,7 @@ statistics (optional outputs) are printed at the end.
 
 This version uses MPI for user routines.
 
-Execute with Number of Processors :math:`= N`,  with 
+Execute with Number of Processors :math:`= N`,  with
 :math:`1 \leq N \leq Mx`.
 
 
@@ -121,18 +121,18 @@ cvDiurnal_kry_bbd_p
 ===================================================
 
 
-As described in [HSR2017]_, this problem
+This problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} = 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\qquad i=1,2 
+   \frac{\partial c_i}{\partial t} =
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\qquad i=1,2
 
 where
 
@@ -149,7 +149,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -192,7 +192,7 @@ constructed using the CVBBDPRE module.  Each block is generated using
 difference quotients, with half-bandwidths ``mudq = mldq = 10``, but
 the retained banded blocks have half-bandwidths ``mukeep = mlkeep = 2``.
 A copy of the approximate Jacobian is saved and conditionally reused
-within the preconditioner routine. 
+within the preconditioner routine.
 
 Two runs are made for this problem, first with left and then with
 right preconditioning.
@@ -209,18 +209,18 @@ on completion.
 cvDiurnal_kry_p
 ===================================================
 
-As described in [HSR2017]_, this test problem
+This test problem
 models a two-species diurnal kinetics advection-diffusion PDE system
 in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} = 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\qquad i=1,2 
+   \frac{\partial c_i}{\partial t} =
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\qquad i=1,2
 
 where
 
@@ -237,7 +237,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t\in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -265,7 +265,7 @@ in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
 points on a uniform spatial grid.  As a result, CVode approaches the
-problem as one involving :math:`2*Mx*My` coupled ODEs. 
+problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
 with two subdomains in each direction (four in total), and where each
@@ -278,7 +278,7 @@ solver, through the CVode interface.
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
 the block-diagonal portion of the Jacobian is saved and conditionally
-reused within the preconditioner routine. 
+reused within the preconditioner routine.
 
 Performance data and sampled solution values are printed at
 selected output times, and all performance counters are printed
diff --git a/doc/cvode/examples/source/c_parallel_deep.rst b/doc/cvode/examples/source/c_parallel_deep.rst
index c541b10858..092644145e 100644
--- a/doc/cvode/examples/source/c_parallel_deep.rst
+++ b/doc/cvode/examples/source/c_parallel_deep.rst
@@ -51,7 +51,7 @@ Dirichlet boundary conditions and initial values given by
 
 A system of :math:`M_X` ODEs is obtained by discretizing the :math:`x`-axis with :math:`M_X + 2`
 grid points and replacing the first and second order spatial derivatives
-with their *central difference approximations*. Since the value of :math:`u` is
+with their central difference approximations. Since the value of :math:`u` is
 constant at the two endpoints, the semi-discrete equations for those points
 can be eliminated.  With :math:`u_i` as the approximation to :math:`u(t,x_i)`,
 :math:`x_i = i (\Delta x)`, and :math:`\Delta x = \frac{2}{M_X + 1}`, the resulting system of
@@ -66,89 +66,89 @@ ODEs, :math:`\dot u = f(t,u)`, can now be written:
 This equation holds for :math:`i = 1, 2, \ldots, M_X`, with the understanding
 that :math:`u_0 = u_{M_X + 1} = 0.`
 
-In the *parallel processing environment*, we may think of the several
+In the MPI parallel processing environment, we may think of the several
 processors as being laid out on a straight line with each processor to
 compute its contiguous subset of the solution vector.  Consequently
-the computation of the *right hand side* of the Equation (:math:numref:`cvAdvDiff_pode`) requires
+the computation of the right hand side of the Equation :eq:`cvAdvDiff_pode` requires
 that each interior processor must pass the first component of its block of
 the solution vector to its left-hand neighbor, acquire the last component of
 that neighbor's block, pass the last component of its block of the solution
 vector to its right-hand neighbor, and acquire the first component of that
 neighbor's block. If the processor is the first (:math:`0^\text{th}`) or last processor,
-then communication to the *left or right* (respectively) is not required.
+then communication to the left or right (respectively) is not required.
 
-This problem uses the *Adams-Moulton* (non-stiff) integration formula and *fixed-point*
+This problem uses the Adams-Moulton (non-stiff) integration formula and fixed-point
 nonlinear solver.  It is unrealistically simple, but serves to illustrate
-use of the *parallel version* of **CVODE**.
+use of the parallel version of CVODE.
 
-The :literal:`cvAdvDiff_non_p.c` file begins with ``#include`` declarations for
+The ``cvAdvDiff_non_p.c`` file begins with ``#include`` declarations for
 various required header files, including lines for
-:literal:`nvector_parallel` to access the parallel :literal:`N_Vector` type and related
-*macros*, and for :literal:`mpi.h` to access **MPI** types and constants. Following
+``nvector_parallel`` to access the parallel ``N_Vector`` type and related
+macros, and for ``mpi.h`` to access MPI types and constants. Following
 that are definitions of problem constants and a data block for communication
-with the :math:`f` routine.  That block includes the *number of PEs*, the *index*
-of the *local PE*, and the *MPI communicator*.
-
-The :literal:`main` program begins with **MPI** calls to initialize **MPI** and to set
-*multi-processor environment parameters* ``npes`` (*number of PEs*) and
-``my_pe`` (*local PE index*).  The *local vector length* is set according
-to ``npes`` and the *problem size* ``NEQ`` (which may or may not be
-multiple of ``npes``).  The value ``my_base`` is the *base value for
-computing global indices* (from :math:`1` to :math:`NEQ`) for the local vectors.
-The solution vector :math:`u` is created with a call to :literal:`N_VNew_Parallel`
-and loaded with a call to :literal:`SetIC`.  The calls to :literal:`CVodeCreate`,
-:literal:`CVodeInit`, and :literal:`CVodeSStolerances` specify a **CVODE** solution with
-the *nonstiff method* and *scalar tolerances*.  The call to :literal:`CVodeSetUserdata`
+with the :math:`f` routine.  That block includes the number of PEs, the index
+of the local PE, and the MPI communicator.
+
+The ``main`` program begins with MPI calls to initialize MPI and to set
+multi-processor environment parameters ``npes`` (*number of PEs*) and
+``my_pe`` (*local PE index*).  The local vector length is set according
+to ``npes`` and the problem size ``NEQ`` (which may or may not be
+multiple of ``npes``).  The value ``my_base`` is the base value for
+computing global indices (from :math:`1` to :math:`NEQ`) for the local vectors.
+The solution vector :math:`u` is created with a call to ``N_VNew_Parallel``
+and loaded with a call to ``SetIC``.  The calls to ``CVodeCreate``,
+``CVodeInit``, and ``CVodeSStolerances`` specify a CVODE solution with
+the nonstiff method and scalar tolerances.  The call to ``CVodeSetUserdata``
 insures that the pointer ``data`` is passed to the :math:`f` routine whenever it
 is called.
 
-A heading is printed (if on processor :math:`0`).  In a loop over :math:`t_{out}` *values*,
-:literal:`CVode` is called, and the return value checked for errors.  The
-*max-norm* of the solution and the total number of time steps so far
+A heading is printed (if on processor :math:`0`).  In a loop over :math:`t_{out}` values,
+``CVode`` is called, and the return value checked for errors.  The
+max-norm of the solution and the total number of time steps so far
 are printed at each output point.  Finally, some statistical counters are
-printed, memory is freed, and **MPI** is finalized.
+printed, memory is freed, and MPI is finalized.
 
-The :literal:`SetIC` routine uses the last two arguments passed to it to compute
+The ``SetIC`` routine uses the last two arguments passed to it to compute
 the set of global indices (:math:`my\_base + 1` to :math:`my\_base + my\_length`)
 corresponding to the local part of the solution vector :math:`u`, and then to
-load the corresponding initial values.  The :literal:`PrintFinalStats` routine
-uses :literal:`CVodeGet***` calls to get various counters, and then prints these.
+load the corresponding initial values.  The ``PrintFinalStats`` routine
+uses ``CVodeGet*`` calls to get various counters, and then prints these.
 The counters are:
 
-* ``nst`` (*number of steps*),
-* ``nfe`` (*number of* :math:`f` *evaluations*),
-* ``nni`` (*number of nonlinear iterations*),
-* ``netf`` (*number of error test failures*),
-* and ``ncfn`` (*number of nonlinear convergence failures*).
+* ``nst`` (number of steps),
+* ``nfe`` (number of :math:`f` evaluations),
+* ``nni`` (number of nonlinear iterations),
+* ``netf`` (number of error test failures),
+* and ``ncfn`` (number of nonlinear convergence failures).
 
-This routine is suitable for general use with **CVODE** applications to nonstiff problems.
+This routine is suitable for general use with CVODE applications to nonstiff problems.
 
-The :literal:`f` function is an implementation of the Equation (:math:numref:`cvAdvDiff_pode`),
+The ``f`` function is an implementation of the Equation :eq:`cvAdvDiff_pode`,
 but preceded by communication operations appropriate for the parallel setting.
 It copies the local vector :math:`u` into a larger array :math:`z`, shifted by :math:`1`
 to allow for the storage of immediate neighbor components.  The first and last
-components of :math:`u` are sent to neighboring processors with :literal:`MPI_Send` calls,
+components of :math:`u` are sent to neighboring processors with ``MPI_Send`` calls,
 and the immediate neighbor solution values are received from the neighbor
-processors with :literal:`MPI_Recv` calls, except that zero is loaded into :math:`z[0]`
+processors with ``MPI_Recv`` calls, except that zero is loaded into :math:`z[0]`
 or :math:`z[my\_length + 1]` instead if at the actual boundary.  Then the central
 difference expressions are easily formed from the :math:`z` array, and loaded into
 the data array of the :math:`\dot u =` ``udot`` vector.
 
-The :literal:`cvAdvDiff_non_p.c` file includes a routine :literal:`check_flag` that checks the
-return values from calls in :literal:`main`.  This routine was written to be used
-by any *parallel* **SUNDIALS** application.
+The ``cvAdvDiff_non_p.c`` file includes a routine ``check_flag`` that checks the
+return values from calls in ``main``.  This routine was written to be used
+by any parallel SUNDIALS application.
 
 Program output
 ---------------
 
-The output below is for :literal:`cvAdvDiff_non_p` with :math:`M_X = 10` and four processors.
+The output below is for ``cvAdvDiff_non_p`` with :math:`M_X = 10` and four processors.
 Varying the number of processors will alter the output, only because
 of roundoff-level differences in various vector operations.  The fairly
 high value of ``ncfn`` indicates that this problem is on the borderline
-of being *stiff*.
+of being stiff.
 
 .. include:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
-   :literal:
+
 
 
 .. _deep_dive.cvDiurnal_kry_p:
@@ -159,12 +159,12 @@ A user preconditioner example: cvDiurnal_kry_p [DD]
 Description -- step-by-step
 ----------------------------
 
-As an example of using **CVODE** with the *Krylov linear solver*
-**SUNLinSol_SPGMR**, **CVode** *linear solver* interface, and
-the *parallel* **MPI NVECTOR_PARALLEL** module, we describe a test problem based on
-the system of PDEs given above for the :literal:`cvDiurnal_kry` example.
-As before, we discretize the PDE system with *central differencing*, to
-obtain an ODE system :math:`\dot u = f(t,u)` representing (:math:numref:`cvDiurnalpde`).
+As an example of using CVODE with the Krylov linear solver
+SUNLinSol_SPGMR, CVLS linear solver interface, and
+the parallel MPI NVector_Parallel module, we describe a test problem based on
+the system of PDEs given above for the ``cvDiurnal_kry`` example.
+As before, we discretize the PDE system with central differencing, to
+obtain an ODE system :math:`\dot u = f(t,u)` representing :eq:`cvDiurnalpde`.
 But in this case, the discrete solution vector is distributed over
 many processors.  Specifically, we may think of the processors as
 being laid out in a rectangle, and each processor being assigned a
@@ -186,40 +186,40 @@ grid points is received from that processor by the current
 processor. Similarly the solution for the first column of grid points
 is sent from the current processor to the processor to its left and
 the last column of grid points is received from that processor by the
-current processor. The *communication* for the solution at the right
+current processor. The communication for the solution at the right
 edge of the processor is similar. If this is the last processor in a
 particular direction, then message passing and receiving are bypassed
 for that direction.
 
 This code is intended to provide a more realistic example than that in
-:literal:`cvAdvDiff_non_p`, and to provide a template for a stiff ODE system
-arising from a PDE system. The solution method is *BDF* with *Newton*
-iteration and **SPGMR**. The *left preconditioner* is the *block-diagonal*
-part of the *Newton matrix*, with :math:`2 \times 2` *blocks*, and the
-corresponding *diagonal blocks* of the *Jacobian* are saved each time the
-*preconditioner* is generated, for re-use later under certain conditions.
-
-The organization of the :literal:`cvDiurnal_kry_p` program deserves some comments. The
-*right-hand side* routine :math:`f` calls two other routines:
-
-* :literal:`ucomm`, which carries out inter-processor communication;
-* and :literal:`fcalc`, which operates on local data only and contains the actual
+``cvAdvDiff_non_p``, and to provide a template for a stiff ODE system
+arising from a PDE system. The solution method is BDF with Newton
+iteration and SPGMR. The left preconditioner is the block-diagonal
+part of the Newton matrix, with :math:`2 \times 2` blocks, and the
+corresponding diagonal blocks of the Jacobian are saved each time the
+preconditioner is generated, for re-use later under certain conditions.
+
+The organization of the ``cvDiurnal_kry_p`` program deserves some comments. The
+right-hand side routine :math:`f` calls two other routines:
+
+* ``ucomm``, which carries out inter-processor communication;
+* and ``fcalc``, which operates on local data only and contains the actual
   calculation of :math:`f(t,u)`.
 
-The :literal:`ucomm` function in turn calls three routines which do, respectively,
+The ``ucomm`` function in turn calls three routines which do, respectively,
 non-blocking receive operations, blocking send operations, and
-receive-waiting. All three use **MPI**, and transmit data from the local :math:`u`
+receive-waiting. All three use MPI, and transmit data from the local :math:`u`
 vector into a local working array :math:`u_{ext}`, an extended copy of :math:`u`.
-The :literal:`fcalc` function copies :math:`u` into :math:`u_{ext}`, so that the
+The ``fcalc`` function copies :math:`u` into :math:`u_{ext}`, so that the
 calculation of :math:`f(t,u)` can be done conveniently by operations on
-:math:`u_{ext}` only.  Most other features of :literal:`cvDiurnal_kry_p.c` are the same as
-in :literal:`cvDiurnal_kry.c`, except for extra logic involved with distributed
+:math:`u_{ext}` only.  Most other features of ``cvDiurnal_kry_p.c`` are the same as
+in ``cvDiurnal_kry.c``, except for extra logic involved with distributed
 vectors.
 
 Program output
 ---------------
 
-The following is a sample output from :literal:`cvDiurnal_kry_p`, for four processors
+The following is a sample output from ``cvDiurnal_kry_p``, for four processors
 (in a :math:`2 \times 2` array) with a :math:`5 \times 5` subgrid on each.
 The output will vary slightly if the number of processors is changed.
 
@@ -235,42 +235,42 @@ A CVBBDPRE preconditioner example: cvDiurnal_kry_bbd_p [DD]
 Description -- step-by-step
 ----------------------------
 
-In this example, :literal:`cvDiurnal_kry_bbd_p`, we solve the same
-problem as in :literal:`cvDiurnal_kry_p`
-above, but instead of supplying the *preconditioner*, we use the **CVBBDPRE** module,
-which generates and uses a *band-block-diagonal preconditioner*.  The
-*half-bandwidths* of the *Jacobian block* on each processor are both equal to
+In this example, ``cvDiurnal_kry_bbd_p``, we solve the same
+problem as in ``cvDiurnal_kry_p``
+above, but instead of supplying the preconditioner, we use the CVBBDPRE module,
+which generates and uses a band-block-diagonal preconditioner.  The
+half-bandwidths of the Jacobian block on each processor are both equal to
 :math:`2 \cdot M_{X_{SUB}}`, and that is the value supplied as ``mudq`` and ``mldq``
-in the call to :literal:`CVBBDPrecInit`.  But in order to reduce storage and computation
-costs for *preconditioning*, we supply the values :math:`mu_{keep} = ml_{keep} = 2`
-(:math:`= N_{VARS}`) as the *half-bandwidths* of the retained *band matrix blocks*.
-This means that the *Jacobian elements* are computed with a *difference quotient*
+in the call to ``CVBBDPrecInit``.  But in order to reduce storage and computation
+costs for preconditioning, we supply the values :math:`mu_{keep} = ml_{keep} = 2`
+(:math:`= N_{VARS}`) as the half-bandwidths of the retained band matrix blocks.
+This means that the Jacobian elements are computed with a difference quotient
 scheme using the true bandwidth of the block, but only a narrow band matrix
-(bandwidth :math:`5`) is kept as the *preconditioner*.
+(bandwidth :math:`5`) is kept as the preconditioner.
 
-As in :literal:`cvDiurnal_kry_p.c`, the :math:`f` routine in :literal:`cvDiurnal_kry_bbd_p.c` simply calls a
-*communication* routine, :literal:`fucomm`, and then a strictly computational routine,
-:literal:`flocal`.  However, the call to :literal:`CVBBDPrecInit` specifies the pair of
-routines to be called as :literal:`ucomm` and :literal:`flocal`, where :literal:`ucomm` is ``NULL``.
-This is because each call by the solver to :literal:`ucomm` is
+As in ``cvDiurnal_kry_p.c``, the :math:`f` routine in ``cvDiurnal_kry_bbd_p.c`` simply calls a
+communication routine, ``fucomm``, and then a strictly computational routine,
+``flocal``.  However, the call to ``CVBBDPrecInit`` specifies the pair of
+routines to be called as ``ucomm`` and ``flocal``, where ``ucomm`` is ``NULL``.
+This is because each call by the solver to ``ucomm`` is
 preceded by a call to :math:`f` with the same :math:`(t,u)` arguments, and therefore the
-*communication* needed for :literal:`flocal` in the solver's calls to it have already been
+communication needed for ``flocal`` in the solver's calls to it have already been
 done.
 
-In :literal:`cvDiurnal_kry_bbd_p.c`, the problem is *solved twice* --- first with *preconditioning
-on the left*, and then *on the right*.  Thus prior to the second solution, calls
-are made to reset the initial values (:literal:`SetInitialProfiles`), the main solver
-memory (:literal:`CVodeReInit`), the **CVBBDPRE** memory (:literal:`CVBBDPrecReInit`),
-as well as the *preconditioner* type (:literal:`SUNLinSol_SPGMRSetPrecType`).
+In ``cvDiurnal_kry_bbd_p.c``, the problem is *solved twice* --- first with preconditioning
+on the left, and then on the right.  Thus prior to the second solution, calls
+are made to reset the initial values (``SetInitialProfiles``), the main solver
+memory (``CVodeReInit``), the CVBBDPRE memory (``CVBBDPrecReInit``),
+as well as the preconditioner type (``SUNLinSol_SPGMRSetPrecType``).
 
 Program output
 ---------------
 
-Sample output from :literal:`cvDiurnal_kry_bbd_p` follows, again using :math:`5 \times 5` *subgrids*
-on a :math:`2 \times 2` processor grid.  The performance of the *preconditioner*,
-as measured by the number of *Krylov* iterations per *Newton* iteration,
-``nli/nni``, is very close to that of :literal:`cvDiurnal_kry_p` when *preconditioning* is *on
-the left*, but slightly poorer when it is *on the right*.
+Sample output from ``cvDiurnal_kry_bbd_p`` follows, again using :math:`5 \times 5` subgrids
+on a :math:`2 \times 2` processor grid.  The performance of the preconditioner,
+as measured by the number of Krylov iterations per Newton iteration,
+``nli/nni``, is very close to that of ``cvDiurnal_kry_p`` when preconditioning is on
+the left, but slightly poorer when it is on the right.
 
 .. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
    :literal:
diff --git a/doc/cvode/examples/source/c_parhyp_deep.rst b/doc/cvode/examples/source/c_parhyp_deep.rst
index efa2226213..030fff5100 100644
--- a/doc/cvode/examples/source/c_parhyp_deep.rst
+++ b/doc/cvode/examples/source/c_parhyp_deep.rst
@@ -28,49 +28,52 @@ Parallel HYPRE C example problems -- Deep dive
 A nonstiff example: cvAdvDiff_non_ph [DD]
 ======================================================
 
-This example is same as :literal:`cvAdvDiff_non_p`, except that it
-uses the **HYPRE** vector type instead of the **SUNDIALS** native
+This example is same as ``cvAdvDiff_non_p``, except that it
+uses the *hypre* vector type instead of the SUNDIALS native
 *parallel vector* implementation.
 
-The outputs from the two examples are identical. In the following, we will point 
+The outputs from the two examples are identical. In the following, we will point
 out only the differences between the two. Familiarity with `HYPRE <https://github.com/hypre-space/hypre>`_
-library at `HYPRE User Manual <https://hypre.readthedocs.io/en/latest/>`_ is helpful.  
+library at `HYPRE User Manual <https://hypre.readthedocs.io/en/latest/>`_ is helpful.
 
-We use the **HYPRE IJ** *vector interface* to allocate the template vector and 
-create parallel partitioning: ::
+We use the *hypre* IJ vector interface to allocate the template vector and
+create parallel partitioning:
+
+.. code-block:: c
 
    HYPRE_IJVectorCreate(comm, my_base, my_base + local_N - 1, &Uij);
    HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(Uij);
 
-The initialize call means that vector elements are ready to be set using 
-the **IJ** *interface*. We choose an *initial condition vector* :math:`x_0 = x(t_0)` as the 
-*template vector* and we set its values in the :code:`SetIC(...)` function. We 
-complete the **HYPRE vector** *assembly* by: :: 
+The initialize call means that vector elements are ready to be set using
+the IJ interface. We choose an *initial condition vector* :math:`x_0 = x(t_0)` as the
+template vector and we set its values in the :code:`SetIC(...)` function. We
+complete the *hypre* vector assembly by:
+
+.. code-block:: c
 
    HYPRE_IJVectorAssemble(Uij);
    HYPRE_IJVectorGetObject(Uij, (void**) &Upar);
 
-The *assemble call* is collective and it makes **HYPRE vector** ready to use. 
-This sets the handle :code:`Upar` to the actual **HYPRE vector**. 
-The handle is then passed to the :code:`N_VMake` function, which creates 
-the template :code:`N_Vector` as a *wrapper* around the **HYPRE vector**. 
-All other vectors in the computation are created by cloning the template 
-vector. The template vector does not own the underlying **HYPRE vector**, 
+The assemble call is collective and it makes the *hypre* vector ready to use.
+This sets the handle :code:`Upar` to the actual *hypre* vector.
+The handle is then passed to the :code:`N_VMake` function, which creates
+the template :code:`N_Vector` as a *wrapper* around the *hypre* vector.
+All other vectors in the computation are created by cloning the template
+vector. The template vector does not own the underlying *hypre* vector,
 and it is the user's responsibility to destroy it using a
-:code:`HYPRE_IJVectorDestroy(Uij)` call after the template vector has been 
-destroyed. This function will destroy both the **HYPRE vector** and its **IJ**
-*interface*.
+:code:`HYPRE_IJVectorDestroy(Uij)` call after the template vector has been
+destroyed. This function will destroy both the *hypre* vector and its IJ
+interface.
 
-To access individual elements of solution vectors :math:`u =` ``u`` and :math:`\dot u =` ``udot`` 
-in the *residual function*, the user needs to extract the **HYPRE vector** first 
-by calling :code:`N_VGetVector_ParHyp`, and then use **HYPRE methods** from 
+To access individual elements of solution vectors :math:`u =` ``u`` and :math:`\dot u =` ``udot``
+in the *residual function*, the user needs to extract the *hypre* vector first
+by calling :code:`N_VGetVector_ParHyp`, and then use *hypre* methods from
 that point on.
 
 .. warning::
 
-   At this point interfaces to **HYPRE** *solvers* and *preconditioners* are 
-   not available. They will be provided in subsequent **SUNDIALS** releases. 
-   The *interface* to **HYPRE vector** is included in this release mainly for 
+   At this point interfaces to *hypre* solvers and preconditioners are
+   not available. They will be provided in subsequent SUNDIALS releases.
+   The interface to the *hypre* vector is included in this release mainly for
    testing purposes and as a preview of functionality to come.
-
diff --git a/doc/cvode/examples/source/c_serial_deep.rst b/doc/cvode/examples/source/c_serial_deep.rst
index 529af23749..681878a406 100644
--- a/doc/cvode/examples/source/c_serial_deep.rst
+++ b/doc/cvode/examples/source/c_serial_deep.rst
@@ -31,11 +31,11 @@ A dense example: cvRoberts_dns [DD]
 Description -- step-by-step
 ----------------------------
 
-As an initial illustration of the use of the **CVODE** package for the
-integration of IVP ODEs, we give a sample program called :literal:`cvRoberts_dns.c`.
-It uses the **CVODE** *linear solver interface* **CVode** with
-dense matrix and *linear solver* modules (**SUNMATRIX_DENSE** and **SUNLinSol_Dense**)
-and the **NVECTOR_SERIAL** module (which provides a *serial* implementation of **NVECTOR**)
+As an initial illustration of the use of the CVODE package for the
+integration of IVP ODEs, we give a sample program called ``cvRoberts_dns.c``.
+It uses the CVODE linear solver interface CVLS with
+dense matrix and linear solver modules (SUNMatrix_Dense and SUNLinSol_Dense)
+and the NVector_Serial module (which provides a serial implementation of N_Vector)
 in the solution of a :math:`3`-species chemical kinetics problem.
 
 The problem consists of the following three rate equations:
@@ -49,94 +49,94 @@ The problem consists of the following three rate equations:
 
 on the interval :math:`t \in [0, ~4 \cdot 10^{10}]`, with initial conditions
 :math:`y_1(0) = 1.0`, :math:`y_2(0) = y_3(0) = 0.0`.
-While integrating the system, we also use the *root-finding
-feature* to find the points at which :math:`y_1 = 10^{-4}` or at which
+While integrating the system, we also use the root-finding
+feature to find the points at which :math:`y_1 = 10^{-4}` or at which
 :math:`y_3 = 0.01`.
 
 For the source we give a rather detailed explanation of the parts of the program and
-their interaction with **CVODE**.
+their interaction with CVODE.
 
 Following the initial comment block, this program has a number
-of ``#include`` lines, which allow access to useful items in **CVODE**
-header files.  The :literal:`sundials_types.h` file provides the definition of the
-type :literal:`realtype` (see `Types
+of ``#include`` lines, which allow access to useful items in CVODE
+header files.  The ``sundials_types.h`` file provides the definition of the
+type ``sunrealtype`` (see `Types
 <https://sundials.readthedocs.io/en/latest/arkode/Usage/General.html#data-types>`_
-for details).  For now, it suffices to read :literal:`realtype` as :literal:`double`.
-The :literal:`cvode.h` file provides prototypes for the **CVODE**
-functions to be called (excluding the *linear solver* selection
+for details).  For now, it suffices to read ``sunrealtype`` as ``double``.
+The ``cvode.h`` file provides prototypes for the CVODE
+functions to be called (excluding the linear solver selection
 function), and also a number of constants that are to be used in
-setting input arguments and testing the return value of **CVode**.
-The :literal:`sunlinsol_dense.h`
-file is the header file for the *dense* implementation of the
-**SUNLINSOL** module and includes definitions of the
-:literal:`SUNLinearSolver` type.  Similarly, the :literal:`sunmatrix_dense.h`
-file is the header file for the *dense* implementation of the
-**SUNMATRIX** module, including definitions of the :literal:`SUNMatrix` type
-as well as macros and functions to access *matrix components*.
-We have explicitly included :literal:`sunmatrix_dense.h`, but this is not
-necessary because it is included by :literal:`sunlinsol_dense.h`.
-The :literal:`nvector_serial.h` file is the header file for the *serial*
-implementation of the **NVECTOR** module and includes definitions of the
-:literal:`N_Vector` type, a macro to access vector components, and prototypes
-for the *serial* implementation specific machine environment memory allocation
+setting input arguments and testing the return value of ``CVode``.
+The ``sunlinsol_dense.h``
+file is the header file for the dense implementation of the
+SUNLinearSolver module and includes definitions of the
+``SUNLinearSolver`` type.  Similarly, the ``sunmatrix_dense.h``
+file is the header file for the dense implementation of the
+SUNMatrix module, including definitions of the ``SUNMatrix`` type
+as well as macros and functions to access matrix components.
+We have explicitly included ``sunmatrix_dense.h``, but this is not
+necessary because it is included by ``sunlinsol_dense.h``.
+The ``nvector_serial.h`` file is the header file for the serial
+implementation of the N_Vector module and includes definitions of the
+``N_Vector`` type, a macro to access vector components, and prototypes
+for the serial implementation specific machine environment memory allocation
 and freeing functions.
 
-This program includes two *user-defined accessor macros*, :literal:`Ith` and
-:literal:`IJth`, that are useful in writing the problem functions in a form
+This program includes two user-defined accessor macros, ``Ith`` and
+``IJth``, that are useful in writing the problem functions in a form
 closely matching the mathematical description of the ODE system,
-i.e. with components numbered from :math:`1` instead of from :math:`0`.  The :literal:`Ith`
-*macro* is used to access components of a vector of type :literal:`N_Vector`
-with a *serial* implementation.  It is defined using the **NVECTOR_SERIAL**
-*accessor macro* :literal:`NV_Ith_S` which numbers components starting with
-:math:`0`. The :literal:`IJth` *macro* is used to access elements of a dense matrix of
-type :literal:`SUNMatrix`.  It is similarly defined using the **SUNMATRIX_DENSE**
-*accessor macro* :literal:`SM_ELEMENT_D` which numbers matrix rows and
+i.e. with components numbered from :math:`1` instead of from :math:`0`.  The ``Ith``
+macro is used to access components of a vector of type ``N_Vector``
+with a serial implementation.  It is defined using the NVector_Serial
+accessor macro ``NV_Ith_S`` which numbers components starting with
+:math:`0`. The ``IJth`` macro is used to access elements of a dense matrix of
+type ``SUNMatrix``.  It is similarly defined using the SUNMatrix_Dense
+accessor macro ``SM_ELEMENT_D`` which numbers matrix rows and
 columns starting with :math:`0`.
 
-The *macro* :literal:`NV_Ith_S` is fully described in `NVECTOR_SERIAL
+The macro ``NV_Ith_S`` is fully described in `NVECTOR_SERIAL
 <https://sundials.readthedocs.io/en/latest/nvectors/NVector_links.html>`_.
-The *macro* :literal:`SM_ELEMENT_D` is fully described in `SUNMATRIX_DENSE
+The macro ``SM_ELEMENT_D`` is fully described in `SUNMATRIX_DENSE
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html>`_.
 
 Next, the program includes some problem-specific constants, which are
 isolated to this early location to make it easy to change them as needed.
 The program prologue ends with prototypes of four private helper
-functions and the three *user-supplied functions* that are called by **CVODE**.
+functions and the three user-supplied functions that are called by CVODE.
 
-The :literal:`main` program begins with some *dimensions* and *type* declarations,
-including use of the generic types :literal:`N_Vector`, :literal:`SUNMatrix` and
-:literal:`SUNLinearSolver`.  The next several lines
+The ``main`` program begins with some dimensions and type declarations,
+including use of the generic types ``N_Vector``, ``SUNMatrix`` and
+``SUNLinearSolver``.  The next several lines
 allocate memory for the :math:`y` and :math:`abstol` vectors using
-:literal:`N_VNew_Serial` with a length argument of :math:`NEQ (= 3)`. The
-lines following that load the *initial values* of the dependendent
-variable vector into :math:`y` and the *absolute tolerances* into :math:`abstol`
-using the :literal:`Ith` macro.
+``N_VNew_Serial`` with a length argument of :math:`NEQ (= 3)`. The
+lines following that load the initial values of the dependendent
+variable vector into :math:`y` and the absolute tolerances into :math:`abstol`
+using the ``Ith`` macro.
 
-The calls to :literal:`N_VNew_Serial`, and also later calls to :literal:`CVode***`
-functions, make use of a private function, :literal:`check_flag`, which examines
+The calls to ``N_VNew_Serial``, and also later calls to ``CVode*``
+functions, make use of a private function, ``check_flag``, which examines
 the return value and prints a message if there was a failure.  The
-:literal:`check_flag` function was written to be used for any *serial* **SUNDIALS**
+``check_flag`` function was written to be used for any serial SUNDIALS
 application.
 
-The call to :literal:`CVodeCreate` creates the **CVODE** solver memory block,
-specifying the :literal:`CV_BDF` integration method with built-in ``CV_NEWTON`` iteration.
+The call to ``CVodeCreate`` creates the CVODE solver memory block,
+specifying the ``CV_BDF`` integration method with built-in ``CV_NEWTON`` iteration.
 Its return value is a pointer to that memory block for this
 problem.  In the case of failure, the return value is ``NULL``.  This
-pointer must be passed in the remaining calls to **CVODE** functions.
-
-The call to :literal:`CVodeInit` *allocates* and *initializes* the solver memory block.
-Its arguments include the name of the :literal:`C` function :math:`f` defining the
-right-hand side function :math:`f(t,y)`, and the *initial values* of :math:`t` and :math:`y`.
-The call to :literal:`CVodeSVtolerances` specifies a *vector* of *absolute tolerances*,
-and includes the *value* of the *relative tolerance* :math:`reltol` and the *absolute
-tolerance vector* :math:`abstol`.  See
+pointer must be passed in the remaining calls to CVODE functions.
+
+The call to ``CVodeInit`` allocates and initializes the solver memory block.
+Its arguments include the name of the ``C`` function :math:`f` defining the
+right-hand side function :math:`f(t,y)`, and the initial values of :math:`t` and :math:`y`.
+The call to ``CVodeSVtolerances`` specifies a vector of absolute tolerances,
+and includes the value of the relative tolerance :math:`reltol` and the absolute
+tolerance vector :math:`abstol`.  See
 `CVodeCreate and CVodeInit
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-initialization-and-deallocation-functions>`_
 and `CVodeSStolerances and CVodeSVtolerances
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-tolerance-specification-functions>`_
 for full details of these calls.
 
-The call to :literal:`CVodeRootInit` specifies that a *root-finding* problem
+The call to ``CVodeRootInit`` specifies that a root-finding problem
 is to be solved along with the integration of the ODE system, that the
 root functions are specified in the function :math:`g`, and that there are
 two such functions.  Specifically, they are set to :math:`y_1 - 0.0001` and
@@ -144,82 +144,82 @@ two such functions.  Specifically, they are set to :math:`y_1 - 0.0001` and
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-initialization-function>`_
 for a detailed description of this call.
 
-The call to :literal:`SUNDenseMatrix` (see `SUNMATRIX_DENSE
+The call to ``SUNDenseMatrix`` (see `SUNMATRIX_DENSE
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#>`_)
-creates a :math:`NEQ \times NEQ` *dense* **SUNMATRIX** object to use within the
-*Newton* solve in **CVODE**.  The following call to :literal:`SUNLinSol_Dense` (see `SUNLinSol_Dense
+creates a :math:`NEQ \times NEQ` dense SUNMatrix object to use within the
+Newton solve in CVODE.  The following call to ``SUNLinSol_Dense`` (see `SUNLinSol_Dense
 <https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html#the-sunlinsol-dense-module>`_)
-creates the *dense* **SUNLINSOL** object that will perform the linear solves within
-the *Newton* method.  These are attached to the **CVODE** *linear
-solver interface* with the call to :literal:`CVodeSetLinearSolver` (see `CVodeSetLinearSolver interface
+creates the dense SUNLinearSolver object that will perform the linear solves within
+the Newton method.  These are attached to the CVODE linear
+solver interface with the call to ``CVodeSetLinearSolver`` (see `CVodeSetLinearSolver interface
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_),
-and the subsequent call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions
+and the subsequent call to ``CVodeSetJacFn`` (see `CVode Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
-specifies the analytic *Jacobian* supplied by the *user-supplied function* :math:`Jac`.
+specifies the analytic Jacobian supplied by the user-supplied function :math:`Jac`.
 
 The actual solution of the ODE initial value problem is accomplished in
 the loop over values of the output time :math:`t_{out}`.  In each pass of the
-loop, the program calls :literal:`CVode` in the ``CV_NORMAL`` mode, meaning that
+loop, the program calls ``CVode`` in the ``CV_NORMAL`` mode, meaning that
 the integrator is to take steps until it overshoots :math:`t_{out}` and then
 interpolate to :math:`t = t_{out}`, putting the computed value of :math:`y(t_{out})`
 into :math:`y`, with :math:`t = t_{out}`.  The return value in this case is
-``CV_SUCCESS``.  However, if :literal:`CVode` finds a root before reaching the next
+``CV_SUCCESS``.  However, if ``CVode`` finds a root before reaching the next
 value of :math:`t_{out}`, it returns ``CV_ROOT_RETURN`` and stores the root
 location in :math:`t` and the solution at that point in :math:`y`.  In either case, the
 program prints :math:`t` and :math:`y`.  In the case of a root, it calls
-:literal:`CVodeGetRootInfo` to get a length-:math:`2` array :math:`rootsfound` of bits showing
-which root function was found to have a root.  If :literal:`CVode` returned any
+``CVodeGetRootInfo`` to get a length-:math:`2` array :math:`rootsfound` of bits showing
+which root function was found to have a root.  If ``CVode`` returned any
 negative value (*indicating a failure*), the program breaks out of the loop.
 In the case of a ``CV_SUCCESS`` return, the value of :math:`t_{out}` is
 advanced (multiplied by :math:`10`) and a counter (:math:`i_{out}`) is advanced, so
 that the loop can be ended when that counter reaches the preset number
 of output times, :math:`N_{OUT} = 12`.  See `CVode Solver Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-solver-function>`_
-for full details of the call to :literal:`CVode`.
+for full details of the call to ``CVode``.
 
-Finally, the main program calls :literal:`PrintFinalStats` to get and print
-all of the relevant statistical quantities.  It then calls :literal:`NV_Destroy`
-to free the vectors :math:`y` and :math:`abstol`, :literal:`CVodeFree` to free the
-**CVODE** *memory block*, :literal:`SUNLinSolFree` to free the *linear solver
-memory*, and :literal:`SUNMatDestroy` to *free the matrix* :math:`A`.
+Finally, the main program calls ``PrintFinalStats`` to get and print
+all of the relevant statistical quantities.  It then calls ``NV_Destroy``
+to free the vectors :math:`y` and :math:`abstol`, ``CVodeFree`` to free the
+CVODE memory block, ``SUNLinSolFree`` to free the linear solver
+memory, and ``SUNMatDestroy`` to free the matrix :math:`A`.
 
-The function :literal:`PrintFinalStats` used here is actually suitable for
-general use in applications of **CVODE** to any problem with a direct
-*linear solver*.  It calls various :literal:`CVodeGet***`
+The function ``PrintFinalStats`` used here is actually suitable for
+general use in applications of CVODE to any problem with a direct
+linear solver.  It calls various ``CVodeGet*``
 functions to obtain the relevant counters, and then prints them.
 Specifically, these are:
 
 * the cumulative number of steps (``nst``),
-* the number of :math:`f` evaluations (``nfe``) (excluding those for *difference-quotient Jacobian* evaluations),
+* the number of :math:`f` evaluations (``nfe``) (excluding those for difference-quotient Jacobian evaluations),
 * the number of matrix factorizations (``nsetups``),
-* the number of :math:`f` evaluations for *Jacobian* evaluations (``nfeLS`` :math:`= 0` here),
-* the number of *Jacobian* evaluations (``nje``),
-* the number of nonlinear (*Newton*) iterations (``nni``),
+* the number of :math:`f` evaluations for Jacobian evaluations (``nfeLS`` :math:`= 0` here),
+* the number of Jacobian evaluations (``nje``),
+* the number of nonlinear (Newton) iterations (``nni``),
 * the number of nonlinear convergence failures (``ncfn``),
 * the number of local error test failures (``netf``), and
-* the number of :math:`g` (*root function*) evaluations (``nge``).
+* the number of :math:`g` (root function) evaluations (``nge``).
 
 These optional outputs are described in `CVode Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_ .
 
-The function :literal:`f` is a straightforward expression of the ODEs.
-It uses the *user-defined macro* :literal:`Ith` to extract the components of :math:`y`
+The function ``f`` is a straightforward expression of the ODEs.
+It uses the user-defined macro ``Ith`` to extract the components of :math:`y`
 and to load the components of :math:`\dot y =` ``ydot``.  See `ODE RHS Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#ode-right-hand-side>`_
 for a detailed specification of :math:`f`.
 
-Similarly, the function :literal:`g` defines the two functions, :math:`g_0` and :math:`g_1`,
+Similarly, the function ``g`` defines the two functions, :math:`g_0` and :math:`g_1`,
 whose roots are to be found.  See `Rootfinding Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#rootfinding-function>`_
 for a detailed description of the :math:`g` function.
 
-The function :literal:`Jac` sets the nonzero elements of the Jacobian as a
+The function ``Jac`` sets the nonzero elements of the Jacobian as a
 dense matrix.  (Zero elements need not be set because :math:`J` is preset
-to zero.)  It uses the *user-defined macro* :literal:`IJth` to reference the
-elements of a dense matrix of type **SUNMATRIX**.  Here the problem
+to zero.)  It uses the user-defined macro ``IJth`` to reference the
+elements of a dense matrix of type SUNMatrix.  Here the problem
 size is small, so we need not worry about the inefficiency of using
-:literal:`NV_Ith_S` and :literal:`SM_ELEMENT_D` to access :literal:`N_Vector` and
-**SUNMATRIX_DENSE** elements.  Note that in this example, :literal:`Jac`
+``NV_Ith_S`` and ``SM_ELEMENT_D`` to access ``N_Vector`` and
+SUNMatrix_Dense elements.  Note that in this example, ``Jac``
 only accesses the :math:`y` and :math:`J` arguments.  See `Jacobian Construction
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
 for a detailed description of the :math:`Jac` function.
@@ -227,7 +227,7 @@ for a detailed description of the :math:`Jac` function.
 Program output
 ---------------
 
-The output generated by :literal:`cvRoberts_dns` is shown again below.  It shows the output
+The output generated by ``cvRoberts_dns`` is shown again below.  It shows the output
 values at the :math:`12` preset values of :math:`t_{out}`.  It also shows the two root
 locations found, first at a root of :math:`g_1`, and then at a root of :math:`g_0`.
 
@@ -243,7 +243,7 @@ A banded example: cvAdvDiff_bnd [DD]
 Description -- step-by-step
 ----------------------------
 
-The example program :literal:`cvAdvDiff_bnd.c` solves the semi-discretized form of
+The example program ``cvAdvDiff_bnd.c`` solves the semi-discretized form of
 the :math:`2`-D advection-diffusion equation
 
 .. math::
@@ -269,106 +269,106 @@ where :math:`1 \leq i \leq M_X` and :math:`1 \leq j \leq M_Y`.  The boundary
 conditions are imposed by taking :math:`v_{ij} = 0` above if :math:`i = 0`
 or :math:`M_X + 1`, or if :math:`j = 0` or :math:`M_Y + 1`.
 If we set :math:`u_{(j-1)+(i-1)*M_Y} = v_{ij}`, so that the ODE system is
-:math:`\dot u = f(u)`, then the system *Jacobian* :math:`J = \frac{\partial f}{\partial u}` is
-a *band matrix* with *upper* and *lower half-bandwidths* both equal to :math:`M_Y`.
+:math:`\dot u = f(u)`, then the system Jacobian :math:`J = \frac{\partial f}{\partial u}` is
+a band matrix with upper and lower half-bandwidths both equal to :math:`M_Y`.
 In the example, we take :math:`M_X = 10` and :math:`M_Y = 5`.
 
-The :literal:`cvAdvDiff_bnd.c` program includes files
-:literal:`sunmatrix_band.h` and :literal:`sunlinsol_band.h` in order to use the
-**SUNLinSol_Band** *linear solver*. The :literal:`sunmatrix_band.h` file
-contains the definition of the *banded* **SUNMATRIX** type, and the
-:literal:`SM_COLUMN_B` and :literal:`SM_COLUMN_ELEMENT_B` *macros* for
-accessing *banded matrix elements* (see `SUNMATRIX_BAND
+The ``cvAdvDiff_bnd.c`` program includes files
+``sunmatrix_band.h`` and ``sunlinsol_band.h`` in order to use the
+SUNLinSol_Band linear solver. The ``sunmatrix_band.h`` file
+contains the definition of the banded SUNMatrix type, and the
+``SM_COLUMN_B`` and ``SM_COLUMN_ELEMENT_B`` macros for
+accessing banded matrix elements (see `SUNMATRIX_BAND
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_).
-The :literal:`sunlinsol_band.h` file contains the definition of the *banded*
-**SUNLINSOL** type.  We note that have explicitly included
-:literal:`sunmatrix_band.h`, but this is not necessary because it is
-included by :literal:`sunlinsol_band.h`.  The file :literal:`nvector_serial.h`
-is included for the definition of the *serial* :literal:`N_Vector` type.
+The ``sunlinsol_band.h`` file contains the definition of the banded
+SUNLinearSolver type.  We note that have explicitly included
+``sunmatrix_band.h``, but this is not necessary because it is
+included by ``sunlinsol_band.h``.  The file ``nvector_serial.h``
+is included for the definition of the serial ``N_Vector`` type.
 
-The *include* lines at the top of the file are followed by *definitions* of
-*problem constants* which include the :math:`x` and :math:`y` mesh dimensions, :math:`M_X` and
-:math:`M_Y`, the *number of equations* :math:`NEQ`, the *scalar absolute tolerance*
-:math:`ATOL`, the *initial time* :math:`T_0`, and the *initial output time* :math:`T_1`.
+The include lines at the top of the file are followed by definitions of
+problem constants which include the :math:`x` and :math:`y` mesh dimensions, :math:`M_X` and
+:math:`M_Y`, the number of equations :math:`NEQ`, the scalar absolute tolerance
+:math:`ATOL`, the initial time :math:`T_0`, and the initial output time :math:`T_1`.
 
 Spatial discretization of the PDE naturally produces an ODE system in
 which equations are numbered by mesh coordinates :math:`(i,j)`. The
-*user-defined macro* :literal:`IJth` isolates the *translation* for the
-mathematical *two-dimensional* index to the *one-dimensional*
-:literal:`N_Vector` index and allows the user to write clean, readable code
-to access components of the dependent variable.  The :literal:`NV_DATA_S`
-macro returns the component array for a given :literal:`N_Vector`, and this
-array is passed to :literal:`IJth` in order to do the actual :literal:`N_Vector`
+user-defined macro ``IJth`` isolates the translation for the
+mathematical two-dimensional index to the one-dimensional
+``N_Vector`` index and allows the user to write clean, readable code
+to access components of the dependent variable.  The ``NV_DATA_S``
+macro returns the component array for a given ``N_Vector``, and this
+array is passed to ``IJth`` in order to do the actual ``N_Vector``
 access.
 
-The type :literal:`UserData` is a pointer to a structure containing problem
-data used in the :literal:`f`` and :literal:`Jac` functions.  This structure is
-allocated and initialized at the beginning of :literal:`main`. The pointer
-to it, called :literal:`data`, is passed to :literal:`CVodeSetUserData`, and as a
-result it will be passed back to the :literal:`f` and :literal:`Jac` functions
-each time they are called.  The use of the :literal:`data` pointer
+The type ``UserData`` is a pointer to a structure containing problem
+data used in the ``f`` and ``Jac`` functions.  This structure is
+allocated and initialized at the beginning of ``main``. The pointer
+to it, called ``data``, is passed to ``CVodeSetUserData``, and as a
+result it will be passed back to the ``f`` and ``Jac`` functions
+each time they are called.  The use of the ``data`` pointer
 eliminates the need for global program data.
 
-The :literal:`main` program is straightforward.  The :literal:`CVodeCreate` call specifies
+The ``main`` program is straightforward.  The ``CVodeCreate`` call specifies
 the ``CV_BDF`` method with a built-in ``CV_NEWTON`` iteration. Following the
-:literal:`CVodeInit` call, the call to :literal:`CVodeSStolerances` indicates *scalar
-relative and absolute tolerances*, and *values* :math:`reltol` and :math:`abstol` are passed.
-The call to :literal:`SUNBandMatrix` (see `SUNMATRIX_BAND
+``CVodeInit`` call, the call to ``CVodeSStolerances`` indicates scalar
+relative and absolute tolerances, and values :math:`reltol` and :math:`abstol` are passed.
+The call to ``SUNBandMatrix`` (see `SUNMATRIX_BAND
 <https://sundials.readthedocs.io/en/latest/sunmatrix/SUNMatrix_links.html#the-sunmatrix-band-module>`_)
-creates a *banded* **SUNMATRIX** *Jacobian* template, and specifies that both
-*half-bandwidths* of the *Jacobian* are equal to :math:`M_Y`.  The calls to
-:literal:`SUNBandLinearSolver` (see `SUNLinSol_Band
+creates a banded SUNMatrix Jacobian template, and specifies that both
+half-bandwidths of the Jacobian are equal to :math:`M_Y`.  The calls to
+``SUNBandLinearSolver`` (see `SUNLinSol_Band
 <https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html>`_)
-and :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions
+and ``CVodeSetLinearSolver`` (see `CVode Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
-specifies the **SUNLinSol_Band** *linear solver* to the **CVode** *interface*.
-The call to :literal:`CVodeSetJacFn` (see `CVode Linear Solver Optional Input Functions
+specifies the SUNLinSol_Band linear solver to the CLS interface.
+The call to ``CVodeSetJacFn`` (see `CVode Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
-specifies that a *user-supplied Jacobian* function :literal:`Jac` is to be used.
+specifies that a user-supplied Jacobian function ``Jac`` is to be used.
 
 The actual solution of the problem is performed by
-the call to :literal:`CVode` within the loop over the output times :math:`t_{out}`.
-The max-norm of the solution vector (from a call to :literal:`N_VMaxNorm`) and
-the cumulative number of time steps (from a call to :literal:`CVodeGetNumSteps`) are
-printed at each output time. Finally, the calls to :literal:`PrintFinalStats`,
-:literal:`N_VDestroy`, and :literal:`CVodeFree` print statistics and free problem memory.
-
-Following the :literal:`main` program in the :literal:`cvAdvDiff_bnd.c` file are definitions of
-five functions: :literal:`f`, :literal:`Jac`, :literal:`SetIC`, :literal:`PrintHeader`, :literal:`PrintOutput`,
-:literal:`PrintFinalStats`, and :literal:`check_flag`.   The last five functions are called
-only from within the :literal:`cvAdvDiff_bnd.c` file.
-The :literal:`SetIC` function sets the initial dependent variable vector;
-:literal:`PrintHeader` prints the heading of the output page;
-:literal:`PrintOutput` prints a line of solution output;
-:literal:`PrintFinalStats` gets and prints statistics at the end of the run;
-and :literal:`check_flag` aids in checking return values.  The statistics
+the call to ``CVode`` within the loop over the output times :math:`t_{out}`.
+The max-norm of the solution vector (from a call to ``N_VMaxNorm``) and
+the cumulative number of time steps (from a call to ``CVodeGetNumSteps``) are
+printed at each output time. Finally, the calls to ``PrintFinalStats``,
+``N_VDestroy``, and ``CVodeFree`` print statistics and free problem memory.
+
+Following the ``main`` program in the ``cvAdvDiff_bnd.c`` file are definitions of
+five functions: ``f``, ``Jac``, ``SetIC``, ``PrintHeader``, ``PrintOutput``,
+``PrintFinalStats``, and ``check_flag``.   The last five functions are called
+only from within the ``cvAdvDiff_bnd.c`` file.
+The ``SetIC`` function sets the initial dependent variable vector;
+``PrintHeader`` prints the heading of the output page;
+``PrintOutput`` prints a line of solution output;
+``PrintFinalStats`` gets and prints statistics at the end of the run;
+and ``check_flag`` aids in checking return values.  The statistics
 printed include counters such as the total number of steps (``nst``),
-:math:`f` evaluations (excluding those for *Jaobian* evaluations) (``nfe``),
+:math:`f` evaluations (excluding those for Jaobian evaluations) (``nfe``),
 :math:`LU` decompositions (``nsetups``), :math:`f` evaluations for
-*difference-quotient Jacobians* (:math:`nfeLS = 0` here),
-*Jacobian* evaluations (``nje``), and nonlinear iterations (``nni``).
+difference-quotient Jacobians (:math:`nfeLS = 0` here),
+Jacobian evaluations (``nje``), and nonlinear iterations (``nni``).
 These optional outputs are described in `CVode Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
-Note that :literal:`PrintFinalStats` is suitable for general use in applications
-of **CVODE** to any problem with a direct *linear solver*.
+Note that ``PrintFinalStats`` is suitable for general use in applications
+of CVODE to any problem with a direct linear solver.
 
 .. role:: C(code)
    :language: C
 
-The :literal:`f` function implements the *central difference approximation* (`IVP Solutions
+The ``f`` function implements the central difference approximation (`IVP Solutions
 Mathematics <https://sundials.readthedocs.io/en/latest/cvode/Mathematics_link.html>`_)
 with :math:`u` identically zero on the boundary.
 The constant coefficients :math:`(\Delta x)^{-2}`, :math:`0.5 (2 \Delta x)^{-1}`, and
-:math:`(\Delta y)^{-2}` are computed only once at the beginning of :literal:`main`,
+:math:`(\Delta y)^{-2}` are computed only once at the beginning of ``main``,
 and stored in the locations :C:`data->hdcoef`, :C:`data->hacoef`, and
-:C:`data->vdcoef`, respectively.   When :literal:`f` receives the :literal:`data`
-pointer (renamed :literal:`user_data` here), it pulls out these values from storage
+:C:`data->vdcoef`, respectively.   When ``f`` receives the ``data``
+pointer (renamed ``user_data`` here), it pulls out these values from storage
 in the local variables ``hordc``, ``horac``, and ``verdc``.  It then
 uses these to construct the diffusion and advection terms, which are
 combined to form :math:`\dot u =` ``udot``.  Note the extra lines setting out-of-bounds
 values of :math:`u` to zero.
 
-The :literal:`Jac` function is an expression of the derivatives
+The ``Jac`` function is an expression of the derivatives
 
 .. math::
 
@@ -378,34 +378,34 @@ The :literal:`Jac` function is an expression of the derivatives
                   \pm 0.5 (2 \Delta x)^{-1}, \\
    \frac{\partial f_{ij}}{\partial v_{i,j \pm 1}}  &=  (\Delta y)^{-2}.
 
-This function loads the *Jacobian* by *columns*, and like :literal:`f` it
-makes use of the preset coefficients in :literal:`data`.
+This function loads the Jacobian by columns, and like ``f`` it
+makes use of the preset coefficients in ``data``.
 It loops over the mesh points :math:`(i,j)`.  For each such mesh
 point, the one-dimensional index :math:`k = j - 1 + (i - 1) * M_Y` is computed
-and the :math:`k^{th}` *column* of the *Jacobian matrix* :math:`J` is set.
+and the :math:`k^{th}` column of the Jacobian matrix :math:`J` is set.
 The row index :math:`k'` of each component :math:`f_{i',j'}` that depends on
 :math:`v_{i,j}` must be identified in order to load the corresponding element.
-The elements are loaded with the :literal:`SM_COLUMN_ELEMENT_B` macro.
+The elements are loaded with the ``SM_COLUMN_ELEMENT_B`` macro.
 Note that the formula for the global index :math:`k` implies that decreasing
 (increasing) :math:`i` by :math:`1` corresponds to decreasing (increasing)
 :math:`k` by :math:`M_Y`, while decreasing (increasing) :math:`j` by :math:`1`
 corresponds of decreasing (increasing) :math:`k` by :math:`1`.
 These statements are reflected in the arguments to
-:literal:`SM_COLUMN_ELEMENT_B`.  The first argument passed to the
-:literal:`SM_COLUMN_ELEMENT_B` *macro* is a pointer to the diagonal element
-in the *column* to be accessed.  This pointer is obtained via a call to
-the :literal:`SM_COLUMN_B` *macro* and is stored in :literal:`kthCol` in
-the :literal:`Jac` function.  When setting the components of :math:`J` we must be
+``SM_COLUMN_ELEMENT_B``.  The first argument passed to the
+``SM_COLUMN_ELEMENT_B`` macro is a pointer to the diagonal element
+in the column to be accessed.  This pointer is obtained via a call to
+the ``SM_COLUMN_B`` macro and is stored in ``kthCol`` in
+the ``Jac`` function.  When setting the components of :math:`J` we must be
 careful not to index out of bounds. The guards :C:`(i != 1)` etc.
-in front of the calls to :literal:`SM_COLUMN_ELEMENT_B` prevent illegal indexing.
+in front of the calls to ``SM_COLUMN_ELEMENT_B`` prevent illegal indexing.
 See `CVode Jacobian Construction
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
-for a detailed description of the :literal:`Jac` function.
+for a detailed description of the ``Jac`` function.
 
 Program output
 ---------------
 
-The output generated by :literal:`cvAdvDiff_bnd` is again shown below.
+The output generated by ``cvAdvDiff_bnd`` is again shown below.
 
 .. include:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
    :literal:
@@ -419,9 +419,9 @@ A Krylov example: cvDiurnal_kry [DD]
 Description -- step-by-step
 ----------------------------
 
-We give here an example that illustrates the use of **CVODE** with the *Krylov*
-method **SPGMR**, in the **SUNLinSol_SPGMR** module, as the linear system
-solver through the **CVode** *interface*.
+We give here an example that illustrates the use of CVODE with the Krylov
+method SPGMR, in the SUNLinSol_SPGMR module, as the linear system
+solver through the CVLS interface.
 
 This program solves the semi-discretized form of a pair of
 kinetics-advection-diffusion partial differential equations, which
@@ -462,7 +462,7 @@ and the diurnal rate constants are defined as:
      \end{array} \right\} ~~~(i = 3, 4) ~,
 
 where :math:`\omega = \frac{\pi}{43200},` :math:`a_3 = 22.62,` :math:`a_4 = 7.601.`  The time interval of
-integration is :math:`[0, 86400]`, representing 24 *hours* measured in *seconds*.
+integration is :math:`[0, 86400]`, representing 24 hours measured in seconds.
 
 Homogeneous Neumann boundary conditions are imposed on each boundary, and the
 initial conditions are
@@ -475,113 +475,113 @@ initial conditions are
    \alpha (x) &= 1 - (0.1 x - 1)^2 + \frac{1}{2} (0.1 x - 1)^4 ~, \\
    \beta (y) &= 1 - (0.1 y - 4)^2 + \frac{1}{2} (0.1 y - 4)^4 ~.
 
-For this example, the equations (:math:numref:`cvDiurnalpde`) are discretized spatially
+For this example, the equations :eq:`cvDiurnalpde` are discretized spatially
 with standard central finite differences on a :math:`10 \times 10` mesh,
 giving an ODE system of size :math:`200`.
 
 Among the initial ``#include`` lines in this case are lines to
-include :literal:`sunlinsol_spgmr.h` and :literal:`sundials_math.h`.  The first
+include ``sunlinsol_spgmr.h`` and ``sundials_math.h``.  The first
 contains constants and function prototypes associated with the
-**SUNLinSol_SPGMR** module, including the values of the ``pretype``
-argument to :literal:`SUNLinSol_SPGMR`. The inclusion of :literal:`sundials_math.h` is
-done to access the :literal:`SUNSQR` macro for the square of a :literal:`realtype`
+SUNLinSol_SPGMR module, including the values of the ``pretype``
+argument to ``SUNLinSol_SPGMR``. The inclusion of ``sundials_math.h`` is
+done to access the ``SUNSQR`` macro for the square of a ``realtype``
 number.
 
-The :literal:`main` program calls :literal:`CVodeCreate` specifying the ``CV_BDF`` method
-and built-in ``CV_NEWTON`` iteration, and then calls :literal:`CVodeInit`, and
-:literal:`CVodeSetSStolerances` specifies the *scalar tolerances*.
-It calls :literal:`SUNLinSol_SPGMR` to create the **SPGMR** *linear solver* with *left
-preconditioning*, and the default value (indicated by a zero argument)
-for ``maxl``.  It then calls :literal:`CVodeSetLinearSolver` (see `CVode Linear Solver Functions
+The ``main`` program calls ``CVodeCreate`` specifying the ``CV_BDF`` method
+and built-in ``CV_NEWTON`` iteration, and then calls ``CVodeInit``, and
+``CVodeSetSStolerances`` specifies the scalar tolerances.
+It calls ``SUNLinSol_SPGMR`` to create the SPGMR linear solver with left
+preconditioning, and the default value (indicated by a zero argument)
+for ``maxl``.  It then calls ``CVodeSetLinearSolver`` (see `CVode Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
-to attach this *linear solver* to the
-**CVode** *interface*.  The call to :literal:`CVodeSetJacTimes` specifies a
-*user-supplied function* for *Jacobian-vector products* (the ``NULL``
-argument specifies that no *Jacobian-vector setup routine* is needed).
-Next, *user-supplied preconditioner setup* and *solve* functions,
-:literal:`Precond` and :literal:`PSolve`, are specified. See `CVode Linear Solver Optional Input Functions
+to attach this linear solver to the
+CVLS interface.  The call to ``CVodeSetJacTimes`` specifies a
+user-supplied function for Jacobian-vector products (the ``NULL``
+argument specifies that no Jacobian-vector setup routine is needed).
+Next, user-supplied preconditioner setup and solve functions,
+``Precond`` and ``PSolve``, are specified. See `CVode Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_
-for details on the :literal:`CVodeSetPreconditioner` function.
+for details on the ``CVodeSetPreconditioner`` function.
 
-For a sequence of :math:`t_{out}` *values*, :literal:`CVode` is called in the
+For a sequence of :math:`t_{out}` values, ``CVode`` is called in the
 ``CV_NORMAL`` mode, sampled output is printed, and the return value is
-tested for error conditions.  After that, :literal:`PrintFinalStats` is called
+tested for error conditions.  After that, ``PrintFinalStats`` is called
 to get and print final statistics, and memory is freed by calls to
-:literal:`N_VDestroy`, :literal:`FreeUserData`, and :literal:`CVodeFree`.  The printed
+``N_VDestroy``, ``FreeUserData``, and ``CVodeFree``.  The printed
 statistics include various counters, such as the total numbers of steps
 (``nst``), of :math:`f` evaluations (excluding those for :math:`J \cdot v` product
 evaluations) (``nfe``), of :math:`f` evaluations for :math:`J \cdot v` evaluations (``nfeLS``),
-of nonlinear iterations (``nni``), of linear (*Krylov*) iterations (``nli``),
-of *preconditioner* setups (``nsetups``), of *preconditioner* evaluations
-(``npe``), and of *preconditioner* solves (``nps``), among others.
-Also printed are the lengths of the problem-dependent *real and integer
-workspaces* used by the main integrator :literal:`CVode`, denoted ``lenrw`` and
-``leniw``, and those used by **CVode**, denoted ``lenrwLS`` and ``leniwLS``.
+of nonlinear iterations (``nni``), of linear (Krylov) iterations (``nli``),
+of preconditioner setups (``nsetups``), of preconditioner evaluations
+(``npe``), and of preconditioner solves (``nps``), among others.
+Also printed are the lengths of the problem-dependent real and integer
+workspaces used by the main integrator ``CVode``, denoted ``lenrw`` and
+``leniw``, and those used by CVODE, denoted ``lenrwLS`` and ``leniwLS``.
 All of these optional outputs are described in `CVode Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
-The :literal:`PrintFinalStats` function is suitable for general use in applications
-of **CVODE** to any problem with an iterative *linear solver*.
+The ``PrintFinalStats`` function is suitable for general use in applications
+of CVODE to any problem with an iterative linear solver.
 
 Mathematically, the dependent variable has three dimensions: species
-number, :math:`x` mesh point, and :math:`y` mesh point.  But in **NVECTOR_SERIAL**, a vector of
-type :literal:`N_Vector` works with a one-dimensional contiguous array of
-data components. The *macro* :literal:`IJKth` isolates the translation from
+number, :math:`x` mesh point, and :math:`y` mesh point.  But in NVector_Serial, a vector of
+type ``N_Vector`` works with a one-dimensional contiguous array of
+data components. The macro ``IJKth`` isolates the translation from
 three dimensions to one. Its use results in clearer code and makes it
 easy to change the underlying layout of the three-dimensional data.
-Here the problem size is :math:`200`, so we use the :literal:`NV_DATA_S` *macro*
-for efficient :literal:`N_Vector` access.  The :literal:`NV_DATA_S` *macro* gives
-a pointer to the first component of an :literal:`N_Vector` which we pass to
-the :literal:`IJKth` *macro* to do an :literal:`N_Vector` access.
+Here the problem size is :math:`200`, so we use the ``NV_DATA_S`` macro
+for efficient ``N_Vector`` access.  The ``NV_DATA_S`` macro gives
+a pointer to the first component of an ``N_Vector`` which we pass to
+the ``IJKth`` macro to do an ``N_Vector`` access.
 
-The *preconditioner* used here is the *block-diagonal part* of the true *Newton
-matrix*.  It is generated and factored in the :literal:`Precond` routine (see `CVode Preconditioner Setup Function
+The preconditioner used here is the block-diagonal part of the true Newton
+matrix.  It is generated and factored in the ``Precond`` routine (see `CVode Preconditioner Setup Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-setup-iterative-linear-solvers>`_)
-and backsolved in the :literal:`PSolve` routine (see `CVode Preconditioner Solve Function
+and backsolved in the ``PSolve`` routine (see `CVode Preconditioner Solve Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-solve-iterative-linear-solvers>`_).
-Its diagonal blocks are :math:`2 \times 2` *matrices* that include the interaction
-*Jacobian elements* and the *diagonal contribution* of the *diffusion Jacobian
-elements*.  The *block-diagonal* part of the *Jacobian* itself, :math:`J_{bd}`, is
-saved in separate storage each time it is generated, on calls to :literal:`Precond`
+Its diagonal blocks are :math:`2 \times 2` matrices that include the interaction
+Jacobian elements and the diagonal contribution of the diffusion Jacobian
+elements.  The block-diagonal part of the Jacobian itself, :math:`J_{bd}`, is
+saved in separate storage each time it is generated, on calls to ``Precond``
 with :C:`jok == SUNFALSE`.  On calls with :C:`jok == SUNTRUE`, signifying that
-saved *Jacobian data* can be reused, the *preconditioner* :math:`P = I - \gamma J_{bd}`
-is formed from the *saved matrix* :math:`J_{bd}` and factored.  (A call to
-:literal:`Precond` with :C:`jok == SUNTRUE` can only occur after a prior call with
-:C:`jok == SUNFALSE`.)  The :literal:`Precond` routine must also set the value
+saved Jacobian data can be reused, the preconditioner :math:`P = I - \gamma J_{bd}`
+is formed from the saved matrix :math:`J_{bd}` and factored.  (A call to
+``Precond`` with :C:`jok == SUNTRUE` can only occur after a prior call with
+:C:`jok == SUNFALSE`.)  The ``Precond`` routine must also set the value
 of :C:`jcur`, i.e. :C:`*jcurPtr`, to ``SUNTRUE`` when :math:`J_{bd}` is re-evaluated,
-and ``SUNFALSE`` otherwise, to inform **CVode** of the status of *Jacobian data*.
+and ``SUNFALSE`` otherwise, to inform CVODE of the status of Jacobian data.
 
 We need to take a brief detour to explain one last important aspect of
-this program.  While the generic **SUNLinSol_Dense** *linear solver*
-module serves as the *interface* to *dense matrix* solves for the main
-**SUNDIALS** solvers, the underlying algebraic operations operate on
-*dense matrices* with :literal:`realtype **` as the underlying *dense matrix*
-type.  To avoid the extra layer of function calls and *dense matrix* and
-*linear solver data structures*, :literal:`cvDiurnal_kry.c` uses underlying small
-dense functions for all operations on the :math:`2 \times 2` *preconditioner blocks*.
-Thus it includes :literal:`sundials_dense.h`, and calls the *small dense
-matrix* functions :literal:`newDenseMat`, :literal:`newIndexArray`, :literal:`denseCopy`,
-:literal:`denseScale`, :literal:`denseAddIdentity`, :literal:`denseGETRF`, and
-:literal:`denseGETRS`. The *macro* :literal:`IJth` defined near the top of the file
-is used to access individual elements in each *preconditioner block*,
-numbered from :math:`1`.  The underlying *dense algebra functions* are
-available for **CVODE** user programs generally.
-
-In addition to the functions called by **CVODE**, :literal:`cvDiurnal_kry.c` includes
-definitions of several private functions.  These are: :literal:`AllocUserData`
-to allocate space for :math:`J_{bd}`, :math:`P`, and the pivot arrays; :literal:`InitUserData`
-to load problem constants in the ``data`` block; :literal:`FreeUserData` to free
-that block; :literal:`SetInitialProfiles` to load the *initial values* in :math:`y`;
-:literal:`PrintOutput` to *retreive* and *print* selected solution values and
-statistics; :literal:`PrintFinalStats` to *print* statistics; and :literal:`check_flag`
-to *check return values* for error conditions.
+this program.  While the generic SUNLinSol_Dense linear solver
+module serves as the interface to dense matrix solves for the main
+SUNDIALS solvers, the underlying algebraic operations operate on
+dense matrices with ``sunrealtype`` as the underlying dense matrix
+type.  To avoid the extra layer of function calls and dense matrix and
+linear solver data structures, ``cvDiurnal_kry.c`` uses underlying small
+dense functions for all operations on the :math:`2 \times 2` preconditioner blocks.
+Thus it includes ``sundials_dense.h``, and calls the small dense
+matrix functions ``newDenseMat``, ``newIndexArray``, ``denseCopy``,
+``denseScale``, ``denseAddIdentity``, ``denseGETRF``, and
+``denseGETRS``. The macro ``IJth`` defined near the top of the file
+is used to access individual elements in each preconditioner block,
+numbered from :math:`1`.  The underlying dense algebra functions are
+available for CVODE user programs generally.
+
+In addition to the functions called by CVODE, ``cvDiurnal_kry.c`` includes
+definitions of several private functions.  These are: ``AllocUserData``
+to allocate space for :math:`J_{bd}`, :math:`P`, and the pivot arrays; ``InitUserData``
+to load problem constants in the ``data`` block; ``FreeUserData`` to free
+that block; ``SetInitialProfiles`` to load the initial values in :math:`y`;
+``PrintOutput`` to retreive and print selected solution values and
+statistics; ``PrintFinalStats`` to print statistics; and ``check_flag``
+to check return values for error conditions.
 
 Program output
 ---------------
 
-The output generated by :literal:`cvDiurnal_kry.c` is shown below.  Note that the
-number of *preconditioner* evaluations, ``npe``, is much smaller than
-the number of *preconditioner* setups, ``nsetups``, as a result of the
-*Jacobian* re-use scheme.
+The output generated by ``cvDiurnal_kry.c`` is shown below.  Note that the
+number of preconditioner evaluations, ``npe``, is much smaller than
+the number of preconditioner setups, ``nsetups``, as a result of the
+Jacobian re-use scheme.
 
 .. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
    :literal:
diff --git a/doc/cvode/examples/source/f2003_deep.rst b/doc/cvode/examples/source/f2003_deep.rst
index c025f86a76..171a7d5a4a 100644
--- a/doc/cvode/examples/source/f2003_deep.rst
+++ b/doc/cvode/examples/source/f2003_deep.rst
@@ -39,26 +39,26 @@ A serial example: cv_diurnal_kry [DD]
 Description -- step-by-step
 ----------------------------
 
-The :literal:`cv_diurnal_kry` example is a **Fortran** equivalent of the :literal:`cvDiurnal_kry` problem.
+The ``cv_diurnal_kry`` example is a **Fortran** equivalent of the ``cvDiurnal_kry`` problem.
 (In fact, it was derived from an *earlier* **Fortran** *example program* for **VODPK**.)
 
-The :literal:`main` program begins with several declarations, creating the **SUNDIALS** *context*
-pointer via :literal:`FSUNContext_Create`, creating the **SUNDIALS NVector** pointers
-via :literal:`FN_VNew_Serial`, initializing the **SUNDIALS NVector** external pointer
-(to assist with *data modification*) via :literal:`FN_VGetArrayPointer`, and dual ``do``
+The ``main`` program begins with several declarations, creating the **SUNDIALS** *context*
+pointer via ``FSUNContext_Create``, creating the **SUNDIALS NVector** pointers
+via ``FN_VNew_Serial``, initializing the **SUNDIALS NVector** external pointer
+(to assist with *data modification*) via ``FN_VGetArrayPointer``, and dual ``do``
 loops to initialize our :math:`u_{vec}` via embedded :math:`x`, :math:`y`, :math:`c_x`,
 and :math:`c_y`.  With this we have successfully initialized the **NVECTOR_SERIAL** module via **SUNDIALS**.
-:literal:`main` then calls :literal:`FCVodeCreate` and :literal:`FCVodeInit` as per usual, thereby
-initializing the **FCVODE** interface with ``CV_BDF``.  :literal:`FCVodeSetMaxNumSteps` and
-:literal:`FCVodeSStolerances` are then called to set the *maximum number of steps* per solve to be
-:math:`1000` and initialize *scalar tolerances*.  :literal:`FSUNLinSol_SPGMR`, :literal:`FSUNLinSol_SPGMRSetGSType`,
-and :literal:`FCVodeSetLinearSolver` are then called to initialize the **SUNLinSol_SPGMR** module with specific
-``iGStype`` characteristics to the pointer ``sunls``.  :literal:`main` then calls :literal:`FCVodeSetPreconditioner`
+``main`` then calls ``FCVodeCreate`` and ``FCVodeInit`` as per usual, thereby
+initializing the **FCVODE** interface with ``CV_BDF``.  ``FCVodeSetMaxNumSteps`` and
+``FCVodeSStolerances`` are then called to set the *maximum number of steps* per solve to be
+:math:`1000` and initialize *scalar tolerances*.  ``FSUNLinSol_SPGMR``, ``FSUNLinSol_SPGMRSetGSType``,
+and ``FCVodeSetLinearSolver`` are then called to initialize the **SUNLinSol_SPGMR** module with specific
+``iGStype`` characteristics to the pointer ``sunls``.  ``main`` then calls ``FCVodeSetPreconditioner``
 to specify *user-supplied preconditioner setup* and *solve* routines.  Then, via a ``do`` loop,
-:literal:`main` calls :literal:`FCVode` in a loop over :math:`t_{out}` values, meanwhile printing
-selected *solution values* and *performance data*, getting ``lnst`` from :literal:`FCVodeGetNumSteps`
-and ``lh`` from :literal:`FCVodeGetCurrentStep`.  At the end, it prints a number of performance counters,
-via the user sub-routine :literal:`CVodeStats`, such as:
+``main`` calls ``FCVode`` in a loop over :math:`t_{out}` values, meanwhile printing
+selected *solution values* and *performance data*, getting ``lnst`` from ``FCVodeGetNumSteps``
+and ``lh`` from ``FCVodeGetCurrentStep``.  At the end, it prints a number of performance counters,
+via the user sub-routine ``CVodeStats``, such as:
 
 * ``nsteps`` (total internal steps taken),
 * ``nfe`` (total *right-hand side* function calls),
@@ -73,33 +73,33 @@ via the user sub-routine :literal:`CVodeStats`, such as:
 * ``lenrw`` and ``leniw`` (main solver *real/int workspace size*)
 * ``lenrwls`` and ``leniwls`` (linear solver *real/int workspace size*),
 
-frees memory with calls to :literal:`FCVFree`, :literal:`FN_VDestroy`, :literal:`FSUNLinSolFree`,
-and :literal:`FSUNContext_Free`.
+frees memory with calls to ``FCVFree``, ``FN_VDestroy``, ``FSUNLinSolFree``,
+and ``FSUNContext_Free``.
 
-In :literal:`cv_diurnal_kry.f90`, or more specifically, in the :literal:`diurnal_mod` module,
-we have that the :literal:`RhsFn` function is a straghtforward implementation of
-the discretized form of Equations (:math:numref:`cvDiurnalpde`).  In :literal:`PreSet`, the *block-diagonal*
+In ``cv_diurnal_kry.f90``, or more specifically, in the ``diurnal_mod`` module,
+we have that the ``RhsFn`` function is a straghtforward implementation of
+the discretized form of Equations :eq:`cvDiurnalpde`.  In ``PreSet``, the *block-diagonal*
 part of the *Jacobian*, :math:`J_{bd}`, is computed (and copied to :math:`p`) if :math:`jok = 0`
-via the subroutine :literal:`Prec_Jac`, but is simply copied from :math:`bd` to :math:`p` if
-:math:`jok = 1`.  In both cases, the *preconditioner matrix* :math:`p` is formed from 
+via the subroutine ``Prec_Jac``, but is simply copied from :math:`bd` to :math:`p` if
+:math:`jok = 1`.  In both cases, the *preconditioner matrix* :math:`p` is formed from
 :math:`J_{bd}` and its :math:`2 \times 2` blocks are *'LU-factored'* via the subroutine
-:literal:`Prec_LU`, which serves as a sort of *block-by-block inversion* of :math:`p_{2 \times 2} - I_2`.
-In :literal:`PreSolve`, the solution of a linear system :math:`Px = z` is solved by doing *backsolve
+``Prec_LU``, which serves as a sort of *block-by-block inversion* of :math:`p_{2 \times 2} - I_2`.
+In ``PreSolve``, the solution of a linear system :math:`Px = z` is solved by doing *backsolve
 operations* on the :math:`2 \times 2` blocks.  This is done by, first, copying :math:`r` into :math:`z`.
-Then, the subordinate routine :literal:`Prec_Sol` is used to perform *matrix-vector multiplication* to
-finally perform our *backsolve*.  The remainder of :literal:`cv_diurnal_kry.f90` previously consisted of, now
+Then, the subordinate routine ``Prec_Sol`` is used to perform *matrix-vector multiplication* to
+finally perform our *backsolve*.  The remainder of ``cv_diurnal_kry.f90`` previously consisted of, now
 defunct per our problem's functional requisites, routines from **LINPACK** and the **BLAS** needed for
 *matrix* and *vector* operations.
 
 Program output
 ---------------
 
-The following is sample output from :literal:`cv_diurnal_kry`, using a :math:`10 \times 10` mesh.
-The performance of **FCVODE** here is quite similar to that of **CVODE** on the :literal:`cvDiurnal_kry`
+The following is sample output from ``cv_diurnal_kry``, using a :math:`10 \times 10` mesh.
+The performance of **FCVODE** here is quite similar to that of **CVODE** on the ``cvDiurnal_kry``
 problem, as expected.
 
 .. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
-   :literal:
+   `
 
 
 .. _deep_dive.cv_diag_kry_bbd_p:
@@ -110,7 +110,7 @@ A parallel example: cv_diag_kry_bbd_p [DD]
 Description -- step-by-step
 ----------------------------
 
-This example, :literal:`cv_diag_kry_bbd_p`, uses a simple diagonal ODE system to illustrate
+This example, ``cv_diag_kry_bbd_p``, uses a simple diagonal ODE system to illustrate
 the use of **FCVODE** in a *parallel* setting.  The system is then
 
 .. math::
@@ -126,21 +126,21 @@ is solved twice --- with *preconditioning on the left*, then *on the right*.
 
 The source file for this problem begins with **MPI** calls to *initialize* **MPI** and to get the *number
 of processors* and *local processor index*, or ``nprocs`` and ``nlocal`` respectively.  This is done via
-the **MPI** subroutines :literal:`MPI_Init`, :literal:`MPI_Comm_size`, and :literal:`MPI_Comm_rank`.
-:literal:`FSUNContext_Create`, :literal:`FCVodeCreate`, and :literal:`FCVodeInit` are called as usual.
-:literal:`FN_VNew_Parallel` is then called to initialize the **MPI-parallel NVector** module so that we
-can use :literal:`FN_VGetArrayPointer` as per usual, while :literal:`FSUNLinSol_SPGMR` :literal:`FCVodeSetLinearSolver`,
-and :literal:`FSUNLinSol_SPGMRSetGSType` are called as per usual to initialize the **SPGMR SUNLinSol** module
+the **MPI** subroutines ``MPI_Init``, ``MPI_Comm_size``, and ``MPI_Comm_rank``.
+``FSUNContext_Create``, ``FCVodeCreate``, and ``FCVodeInit`` are called as usual.
+``FN_VNew_Parallel`` is then called to initialize the **MPI-parallel NVector** module so that we
+can use ``FN_VGetArrayPointer`` as per usual, while ``FSUNLinSol_SPGMR`` ``FCVodeSetLinearSolver``,
+and ``FSUNLinSol_SPGMRSetGSType`` are called as per usual to initialize the **SPGMR SUNLinSol** module
 and attach the *linear solver* to **FCVODE**.
-Following the call to :literal:`FCVodeSStolerances`, the *preconditioner* is attached to **FCVODE** with calls to
-:literal:`FCVBBDPrecInit`.  Then, via a ``do`` loop over ``iPreType``, we have several ``if`` statements, specific
-to ``iPreType``.  In the first one, we consider :code:`iPreType == 2`, calling :literal:`FCVodeReInit`,
-:literal:`FCVBBDPrecReInit`, and :literal:`FSUNLinSol_SPGMRSetPrecType` to *re-initialize* with *preconditioning
+Following the call to ``FCVodeSStolerances``, the *preconditioner* is attached to **FCVODE** with calls to
+``FCVBBDPrecInit``.  Then, via a ``do`` loop over ``iPreType``, we have several ``if`` statements, specific
+to ``iPreType``.  In the first one, we consider :code:`iPreType == 2`, calling ``FCVodeReInit``,
+``FCVBBDPrecReInit``, and ``FSUNLinSol_SPGMRSetPrecType`` to *re-initialize* with *preconditioning
 on the right*, as stated in the *print* statement.  This is all that is needed to prepare for the second run of our
 Diagonal PDE.  Meanwhile, in the second one, while :code:`iPreType == 1`, we only *print* out the noted fact that
 we now have *preconditioning on the left*.  After this, in a loop over :math:`t_{out}` values, it calls
-:literal:`FCVode` and *prints* the *step* and :math:`f` *evaluation counters*. After that, it *computes* and *prints*
-the *maximum global error* via :literal:`MPI_Reduce`. Afterwards, it *computes* and *prints* all the relevant performance
+``FCVode`` and *prints* the *step* and :math:`f` *evaluation counters*. After that, it *computes* and *prints*
+the *maximum global error* via ``MPI_Reduce``. Afterwards, it *computes* and *prints* all the relevant performance
 counters, such as:
 
 * ``nst`` (internal *solver steps*),
@@ -158,17 +158,16 @@ counters, such as:
 * ``lenrwbbd`` and ``leniwbbd`` (*BBD preconditioner real/int workspace sizes*),
 * ``ngebbd`` (total number of :math:`g` *evaluations* by *BBD preconditioner*).
 
-Finally, it *frees memory* and terminates **MPI** via the subroutines :literal:`FCVodeFree`, :literal:`FN_VDestroy`,
-:literal:`MPI_Barrier`, and :literal:`MPI_Finalize`.  Notice that in the :literal:`firhs` function, outside of
-the main :literal:`driver` routine, the local processor index ``myid`` and the local vector size ``nlocal``
-are used to form the *module-specific index values* needed to evaluate the *right-hand side* of our Equation (:math:numref:`diagode`). 
+Finally, it *frees memory* and terminates **MPI** via the subroutines ``FCVodeFree``, ``FN_VDestroy``,
+``MPI_Barrier``, and ``MPI_Finalize``.  Notice that in the ``firhs`` function, outside of
+the main ``driver`` routine, the local processor index ``myid`` and the local vector size ``nlocal``
+are used to form the *module-specific index values* needed to evaluate the *right-hand side* of our Equation :eq:`diagode`.
 
 Program output
 ---------------
 
-The following is a sample output from :literal:`cv_diag_kry_bbd_p`, with `nprocs = 4`.
+The following is a sample output from ``cv_diag_kry_bbd_p``, with `nprocs = 4`.
 As expected, the performance is identical for *left* vs *right preconditioning*.
 
 .. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
    :literal:
-
diff --git a/doc/cvode/examples/source/f2003_parallel.rst b/doc/cvode/examples/source/f2003_parallel.rst
index fe62ad8411..164fccdbfa 100644
--- a/doc/cvode/examples/source/f2003_parallel.rst
+++ b/doc/cvode/examples/source/f2003_parallel.rst
@@ -31,7 +31,7 @@ cv_diag_kry_bbd_p
 Description
 ------------
 
-As described in [HSR2017]_, this problem models a stiff, linear, diagonal
+This problem models a stiff, linear, diagonal
 ODE system,
 
 .. math::
@@ -69,7 +69,7 @@ Two runs are made for this problem, first with left and then with
 right preconditioning (``iPre`` is first set to :math:`1` and then to :math:`2`).
 
 Performance data is printed at equally-spaced output times, and maximum
-errors and final performance counters are printed on completion. 
+errors and final performance counters are printed on completion.
 
 
 
@@ -108,10 +108,10 @@ where :math:`J` is a diagonal approximation to the true Jacobian, given by:
    J = diag(0, 0, 0, -4 \alpha, \ldots, -N \alpha).
 
 The vector :math:`r` is copied to :math:`z`, and the inverse of :math:`P`
-(restricted to the local vector segment) is applied to the vecdtor :math:`z`. 
+(restricted to the local vector segment) is applied to the vecdtor :math:`z`.
 
 Performance data is printed at equally-spaced output times, and maximum
-errors and final performance counters are printed on completion. 
+errors and final performance counters are printed on completion.
 
 
 
@@ -123,7 +123,7 @@ cv_diag_non_p
 Description
 ------------
 
-As described in [HSR2017]_, this problem models a nonstiff, linear, diagonal
+This problem models a nonstiff, linear, diagonal
 ODE system,
 
 .. math::
@@ -152,5 +152,3 @@ iteration and CVode interface.
 
 Performance data is printed at equally-spaced output times, and maximum
 errors and final performance counters are printed on completion.
-
-
diff --git a/doc/cvode/examples/source/f2003_serial.rst b/doc/cvode/examples/source/f2003_serial.rst
index c67407aeb0..b70611f5a6 100644
--- a/doc/cvode/examples/source/f2003_serial.rst
+++ b/doc/cvode/examples/source/f2003_serial.rst
@@ -116,7 +116,7 @@ where :math:`A = V * D * V^{-1}` and
 
 .. math::
 
-   A &=\begin{pmatrix} \frac{\lambda}{4} - \frac{23}{40} & 
+   A &=\begin{pmatrix} \frac{\lambda}{4} - \frac{23}{40} &
                        \frac{\lambda}{4} - \frac{3}{40} &
                        \frac{\lambda}{4} - \frac{13}{40} \\
                        \frac{\lambda}{4} + \frac{21}{40} &
@@ -171,10 +171,10 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains a function to evaluate :math:`f(t,y)`.  
+contains a function to evaluate :math:`f(t,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
 and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
@@ -295,17 +295,17 @@ of :math:`1000` internal time steps.
 cv_diurnal_kry_bp
 ===================================================
 
-As described in [HSR2017]_, this problem models a two-species diurnal
+This problem models a two-species diurnal
 kinetics advection-diffusion PDE system in two spatial dimensions,
 
 .. math::
 
-   \frac{\partial c_i}{\partial t} = 
-     K_h \frac{\partial^2 c_i}{\partial x^2} + 
-     V \frac{\partial     c_i}{\partial x} + 
-     \frac{\partial}{\partial y}\left( K_v(y) 
-     \frac{\partial c_i}{\partial y}\right) + 
-     R_i(c_1,c_2,t),\quad i=1,2 
+   \frac{\partial c_i}{\partial t} =
+     K_h \frac{\partial^2 c_i}{\partial x^2} +
+     V \frac{\partial     c_i}{\partial x} +
+     \frac{\partial}{\partial y}\left( K_v(y)
+     \frac{\partial c_i}{\partial y}\right) +
+     R_i(c_1,c_2,t),\quad i=1,2
 
 where
 
@@ -322,7 +322,7 @@ vary diurnally.  The problem is posed on the square spatial domain
 boundary conditions, and for time interval :math:`t \in [0,86400]` sec
 (1 day).
 
-We enforce the initial conditions 
+We enforce the initial conditions
 
 .. math::
 
@@ -350,14 +350,14 @@ centered differences, with the data distributed over :math:`Mx*My`
 points on a uniform spatial grid.  As a result, CVode approaches the
 problem as one involving :math:`2*Mx*My` coupled ODEs. In this
 problem, we use a relatively coarse uniform mesh with
-:math:`Mx = My = 10`.  
+:math:`Mx = My = 10`.
 
 This program solves the problem with a BDF method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
 solver module, and the CVODE interface.
 
 The left preconditioner used is a banded matrix, constructed using
-the CVBANDPRE module.  The banded preconditioner matrix is generated using 
+the CVBANDPRE module.  The banded preconditioner matrix is generated using
 difference quotients, with half-bandwidths ``mu = ml = 2``.
 
 Performance data and sampled solution values are printed at
@@ -429,7 +429,7 @@ with initial conditions: :math:`y_1 = 1.0`, :math:`y_2 = y_3 = 0`.
 The problem is stiff.
 
 While integrating the system, we also use the rootfinding feature to
-find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`. 
+find the points at which :math:`y_1 = 10^{-4}` or at which :math:`y_3 = 0.01`.
 This program solves the problem with the BDF method, Newton iteration
 with the dense linear solver, and a user-supplied Jacobian routine.
 
@@ -445,12 +445,12 @@ Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
 SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and 
+contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and
 :math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
-as previously mentioned, find roots at :math:`y_3 = 0.01` and 
+as previously mentioned, find roots at :math:`y_3 = 0.01` and
 :math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
 
 We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
@@ -496,10 +496,10 @@ Aside from this, see ``cv_roberts_dns`` above.
 cv_roberts_dnsL
 ===================================================
 
-As described in [HSR2017]_, this problem models
+This problem models
 the kinetics of a three-species autocatalytic reaction.  This is an
 ODE system with 3 components, :math:`Y = \begin{bmatrix} y_1 \\ y_2 \\ y_3 \end{bmatrix}`,
-satisfying the equations, 
+satisfying the equations,
 
 .. math::
 
@@ -508,7 +508,7 @@ satisfying the equations,
    \frac{d y_3}{dt} &= 3 \cdot 10^7 y_2^2.
 
 We integrate over the interval :math:`0 \leq t \leq 4 \cdot 10^{10}`, with initial
-conditions  :math:`Y(0) = \begin{bmatrix} 1 \\ 0 \\ 0 \end{bmatrix}`. 
+conditions  :math:`Y(0) = \begin{bmatrix} 1 \\ 0 \\ 0 \end{bmatrix}`.
 
 Additionally, we supply the following two root-finding equations:
 
@@ -538,7 +538,7 @@ CVode interface.
 
 As with the :ref:`cv_roberts_dns` problem, we enable CVode's
 rootfinding module to find the times at which either :math:`u=10^{-4}`
-or :math:`w=10^{-2}`. 
+or :math:`w=10^{-2}`.
 
 Performance data and solution values are printed at
 selected output times, along with additional output at root-finding
@@ -572,5 +572,3 @@ Numerical method
 ----------------
 
 Aside from using SUNLINSOL_KLU, see ``cv_roberts_dns`` above.
-
-
diff --git a/doc/cvode/examples/source/index.rst b/doc/cvode/examples/source/index.rst
index bd8ac1bdea..489b97d3a3 100644
--- a/doc/cvode/examples/source/index.rst
+++ b/doc/cvode/examples/source/index.rst
@@ -13,50 +13,43 @@
    SUNDIALS Copyright End
    ----------------------------------------------------------------
 
-.. CVode_example documentation master file, created by
+.. CVODE_example documentation master file, created by
    sphinx-quickstart on Wed Jun 14 02:10:03 2023.
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
 ==============================================
-CVode Example documentation
+Example Programs for CVODE
 ==============================================
 
-CVode Overview
+Introduction
 =============================
 
-This is the documentation for the CVode examples.  CVode is a
-Krylov method integration package for stiff, nonstiff and
-multi-rate systems of ordinary differential equations (ODEs).
-The CVode solver is a component of the `SUNDIALS
-<https://computing.llnl.gov/projects/sundials>`_ suite of
-nonlinear and differential/algebraic equation solvers. It is designed
-to have a similar user experience to the `CVODE
-<https://computing.llnl.gov/projects/sundials/cvode>`_
-solver, with user modes to allow adaptive integration to specified
-output times, return after each internal step and root-finding
-capabilities, for calculations both in serial and parallel (via
-MPI). The default integration and solver options should apply to most
-users, though complete control over all internal parameters and time
-adaptivity algorithms is enabled through optional interface routines.
-
-CVode is developed by `Lawrence Livermore National Laboratory
-<http://www.llnl.gov>`_, with support by the `US Department of Energy
-<http://www.doe.gov>`_ through the `FASTMath
-<https://scidac5-fastmath.lbl.gov/>`_ SciDAC-5 Institute, under
-subcontract 07NA27344.
-
-Along with the CVode solver, we have created a suite of example
-problems demonstrating its usage on applications written in C, C++ and
-Fortran 2003.  These examples demonstrate a large variety of CVode
-solver options, including explicit, implicit and ImEx solvers, root-
-finding, Newton and fixed-point nonlinear solvers, direct and iterative
-linear solvers, adaptive resize capabilities, and the Fortran solver
-interface.  While these examples are not an exhaustive set of all
-possible usage scenarios, they are designed to show a variety of
-exemplars, and can be used as templates for new problems using CVode's
-solvers.  Further information on the CVode package itself may be found
-in the accompanying CVode user guide [R2018]_.
+
+This report is intended to serve as a companion document to the User
+Documentation of CVODE :cite:p:`cvode_ug`.  It provides details, with
+listings, on many of the example programs supplied with the CVODE
+distribution package.
+
+This document describes CVODE examples of the following types: serial
+C examples, parallel C examples, an OpenMP example, and a *hypre*
+example.  With the exception of "demo"-type example files, the names of
+all the examples  are of the form ``[slv][PbName]_[ls]_[prec]_[p]``,
+where
+
+* ``[slv]`` identifies the solver (for CVODE examples this is ``cv``;
+
+* ``[PbName]`` identifies the problem;
+
+* ``[ls]`` identifies the linear solver module used (for examples using
+  fixed-point iteration for the nonlinear system solver, ``non`` specifies
+  that no linear solver was used);
+
+* ``[prec]`` indicates the CVODE preconditioner module used, ``bp`` for
+  CVBandPre ``bbd`` for CVBBDPre (only if applicable, for examples using
+  a Krylov linear solver);
+
+* ``[p]`` indicates an example using the parallel vector module NVECTOR_PARALLEL.
 
 The following tables summarize the salient features of each of the
 example problems in this document.  Each example is designed to be
@@ -71,57 +64,52 @@ Tables of Examples
 C Examples
 -----------
 
-CVode example problems written in C are summarized in the table
-below, and are further described in the chapters :ref:`serial_c`,
-:ref:`openmp_c`, :ref:`openmpdev_c`, :ref:`parallel_c`, :ref:`parhyp_c`,
-:ref:`mpimanyvec_c`, :ref:`cuda_c`, and :ref:`raja_c`.
+CVODE example problems written in C are summarized in the table
+below.
 
 .. cssclass:: table-bordered
 
-================================   ============  ============  ==========  =============  =========================================================
-Problem                            Integrator    Nonlinear     Linear      Size           Extras
-================================   ============  ============  ==========  =============  =========================================================
-:ref:`cvAdvDiff_bnd`                BDF           Newton        Band        1              user Jacobian
-:ref:`cvAdvDiff_bndL`               BDF           Newton        Band        1              LAPACK band solver, user Jacobian
-:ref:`cvAnalytic_mels`              BDF           Newton        Custom      1              Matrix-embedded Custom Linear Solver
-:ref:`cvDirectDemo_ls`              BDF \\        Newton \\     Dense \\    3 \\           Van der Pol (1) user (2) dif-quot (3) diag + 2 \\
-                                    ADAMS         Fixed-point   Band        1              2D advection (1) user (2) dif-quot (3) diag + 2
-:ref:`cvDisc_dns`                   BDF           Newton        Dense       2              Solves two separate equations, the second twice
-:ref:`cvDiurnal_kry`                BDF           Newton        SPGMR       200            block-diagonal preconditioner
-:ref:`cvDiurnal_kry_bp`             BDF           Newton        SPGMR       200            Solved twice with banded prec. on left and right
-:ref:`cvHeat2D_klu`                 BDF           Newton        KLU         1100           sparse matrices
-:ref:`cvKrylovDemo_ls`              BDF           Newton        4 Krylov    200            SPGMR, SPBCGS, SPTFQMR used
-:ref:`cvKrylovDemo_prec`            BDF           Newton        SPGMR       216            preconditioner matrix (1) implicit GS (2) block-diag
-:ref:`cvParticle_dns`               BDF           Newton        Dense       2              user Jacobian and user projection
-:ref:`cvPendulum_dns`               BDF           Newton        Dense       4, 2           user projection, solves problem via inexact/exact meth.
-:ref:`cvRoberts_dns`                BDF           Newton        Dense       3              user Jacobian, root-finding
-:ref:`cvRoberts_dns_constraints`    BDF           Newton        Dense       3              user Jacobian, root-finding, constraints for all comp.
-:ref:`cvRoberts_dns_negsol`         BDF           Newton        Dense       3              user Jacobian, root-finding, negative solution comp.
-:ref:`cvRoberts_dns_uw`             BDF           Newton        Dense       3              user Jacobian, root-finding, user error weight
-:ref:`cvRoberts_dnsL`               BDF           Newton        Dense       3              user Jacobian, root-finding, LAPACK dense solver
-:ref:`cvRoberts_klu`                BDF           Newton        KLU         :math:`3N`     sparse matrices
-:ref:`cvRoberts_block_klu`          BDF           Newton        KLU         :math:`3N`     sparse matrices
-:ref:`cvRoberts_sps`                BDF           Newton        SuperLUMT   :math:`3N`     finite-element, sparse matrices
-:ref:`cvRocket_dns`                 BDF           Newton        Dense       2              user Jacobian, root-finding
-:ref:`cvAdvDiff_bnd_omp`            BDF           Newton        Band        50             user Jacobian, OpenMP
-:ref:`cvAdvDiff_kry_ompdev`         BDF           Newton        Band        50             user Jacobian, OpenMP-dev
-:ref:`cvAdvDiff_diag_p`             ADAMS         Newton        Diagonal    10             MPI for user routines
-:ref:`cvAdvDiff_non_p`              ADAMS         Fixed-point               10             MPI for user routines
-:ref:`cvDiurnal_kry_bbd_p`          BDF           Newton        SPGMR       200            MPI for user routines, solved twice with BBD prec.
-:ref:`cvDiurnal_kry_p`              BDF           Newton        SPGMR       200            MPI for user routines, block-diagonal left prec.
-:ref:`cvAdvDiff_non_ph`             ADAMS         Fixed-point               10             HYPRE parallel vector with IJ interface
-:ref:`cvDiurnal_kry_mpimanyvec`     BDF           Newton        SPGMR       200            MPI for user routines, MPIManyVector module
-:ref:`cvAdvDiff_kry_cuda`
-:ref:`cvAdvDiff_kry_raja`
-================================   ============  ============  ==========  =============  =========================================================
+==================================== ============  ============  ==========  =============  =========================================================
+Problem                              Integrator    Nonlinear     Linear      Size           Extras
+==================================== ============  ============  ==========  =============  =========================================================
+:ref:`cvAdvDiff_bnd`                 BDF           Newton        Band        1              user Jacobian
+:ref:`cvAdvDiff_bndL`                BDF           Newton        Band        1              LAPACK band solver, user Jacobian
+:ref:`cvAnalytic_mels`               BDF           Newton        Custom      1              Matrix-embedded Custom Linear Solver
+:ref:`cvDirectDemo_ls`               BDF \\        Newton \\     Dense \\    3 \\           Van der Pol (1) user (2) dif-quot (3) diag + 2 \\
+                                     ADAMS         Fixed-point   Band        1              2D advection (1) user (2) dif-quot (3) diag + 2
+:ref:`cvDisc_dns`                    BDF           Newton        Dense       2              Solves two separate equations, the second twice
+:ref:`cvDiurnal_kry`                 BDF           Newton        SPGMR       200            block-diagonal preconditioner
+:ref:`cvDiurnal_kry_bp`              BDF           Newton        SPGMR       200            Solved twice with banded prec. on left and right
+:ref:`cvHeat2D_klu`                  BDF           Newton        KLU         1100           sparse matrices
+:ref:`cvKrylovDemo_ls`               BDF           Newton        4 Krylov    200            SPGMR, SPBCGS, SPTFQMR used
+:ref:`cvKrylovDemo_prec`             BDF           Newton        SPGMR       216            preconditioner matrix (1) implicit GS (2) block-diag
+:ref:`cvParticle_dns`                BDF           Newton        Dense       2              user Jacobian and user projection
+:ref:`cvPendulum_dns`                BDF           Newton        Dense       4, 2           user projection, solves problem via inexact/exact meth.
+:ref:`cvRoberts_dns`                 BDF           Newton        Dense       3              user Jacobian, root-finding
+:ref:`cvRoberts_dns_constraints`     BDF           Newton        Dense       3              user Jacobian, root-finding, constraints for all comp.
+:ref:`cvRoberts_dns_negsol`          BDF           Newton        Dense       3              user Jacobian, root-finding, negative solution comp.
+:ref:`cvRoberts_dns_uw`              BDF           Newton        Dense       3              user Jacobian, root-finding, user error weight
+:ref:`cvRoberts_dnsL`                BDF           Newton        Dense       3              user Jacobian, root-finding, LAPACK dense solver
+:ref:`cvRoberts_klu`                 BDF           Newton        KLU         :math:`3N`     sparse matrices
+:ref:`cvRoberts_block_klu`           BDF           Newton        KLU         :math:`3N`     sparse matrices
+:ref:`cvRoberts_sps`                 BDF           Newton        SuperLUMT   :math:`3N`     finite-element, sparse matrices
+:ref:`cvRocket_dns`                  BDF           Newton        Dense       2              user Jacobian, root-finding
+:ref:`cvAdvDiff_bnd_omp`             BDF           Newton        Band        50             user Jacobian, OpenMP
+:ref:`cvAdvDiff_kry_ompdev`          BDF           Newton        Band        50             user Jacobian, OpenMP-dev
+:ref:`cvAdvDiff_diag_p`              ADAMS         Newton        Diagonal    10             MPI for user routines
+:ref:`cvAdvDiff_non_p`               ADAMS         Fixed-point               10             MPI for user routines
+:ref:`cvDiurnal_kry_bbd_p`           BDF           Newton        SPGMR       200            MPI for user routines, solved twice with BBD prec.
+:ref:`cvDiurnal_kry_p`               BDF           Newton        SPGMR       200            MPI for user routines, block-diagonal left prec.
+:ref:`cvAdvDiff_non_ph`              ADAMS         Fixed-point               10             HYPRE parallel vector with IJ interface
+:ref:`cvDiurnal_kry_mpimanyvec`      BDF           Newton        SPGMR       200            MPI for user routines, MPIManyVector module
+:ref:`cvAdvDiff_kry_cuda`            BDF           Newton        SPGMR       50             CUDA N_Vector module, RHS, and Jacobian product routines
+:ref:`cvAdvDiff_kry_raja`            BDF           Newton        SPGMR       50             RAJA N_Vector module, RHS, and Jacobian product routines
+==================================== ============  ============  ==========  =============  =========================================================
 
 C Examples Deep Dives
 ----------------------
 
-Deep dives into CVode example problems written in C are listed below,
-and are further described in great length in the chapters
-:ref:`serial_deep_c`, :ref:`parallel_deep_c`, and :ref:`parhyp_deep_c`.
-Further testing is discussed in :ref:`tests_deep_c`.
+Deep dives into CVODE example problems written in C are listed below.
 
 .. cssclass:: table-bordered
 
@@ -140,9 +128,8 @@ Problem                                  Example Type
 C++ Examples
 -------------
 
-CVode example problems written in C++ are summarized in the table
-below, and are further described in the chapters :ref:`serial_cpp`,
-:ref:`parallel_cpp`, :ref:`hypre_cpp`, :ref:`onemkl_cpp`, and :ref:`sycl_cpp`.
+CVODE example problems written in C++ are summarized in the table
+below.
 
 .. cssclass:: table-bordered
 
@@ -161,9 +148,8 @@ Problem                            Integrator  Nonlinear    Linear          Size
 Fortran Examples
 -----------------
 
-CVode example problems written in Fortran 2003 are summarized in the table
-below, and are further described in the chapters :ref:`serial_f2003` and
-:ref:`parallel_f2003`.
+CVODE example problems written in Fortran 2003 are summarized in the table
+below.
 
 .. cssclass:: table-bordered
 
@@ -180,7 +166,7 @@ Problem                             Integrator  Nonlinear    Linear  Size
 :ref:`cv_diurnal_kry`               BDF         Newton       SPGMR   200            user preconditioner and Jacobian
 :ref:`cv_roberts_dns`               BDF         Newton       Dense   3              user Jacobian, root-finding
 :ref:`cv_roberts_dns_constraints`   BDF         Newton       Dense   3              user Jacobian, root-finding, constraints set
-:ref:`cv_roberts_dnsL`              BDF         Newton       Dense   3              user Jacobian, root-finding, LAPACK dense solver 
+:ref:`cv_roberts_dnsL`              BDF         Newton       Dense   3              user Jacobian, root-finding, LAPACK dense solver
 :ref:`cv_roberts_klu`               BDF         Newton       KLU     3              sparse matrices, root-finding, user Jacobian
 :ref:`cv_diag_kry_bbd_p`            BDF         Newton       SPGMR   128            parallel MPI, BBD prec. -- left and right solve
 :ref:`cv_diag_kry_p`                BDF         Newton       SPGMR   128            parallel MPI, user prec. -- left and right solve
@@ -190,8 +176,8 @@ Problem                             Integrator  Nonlinear    Linear  Size
 Fortran Deep Dives
 -------------------
 
-Deep dives into CVode example problems written in Fortran 2003 are listed
-below, and are further described in great length in the chapter :ref:`deep_f2003`.
+Deep dives into CVODE example problems written in Fortran 2003 are listed
+below.
 
 .. cssclass:: table-bordered
 
@@ -203,11 +189,33 @@ Problem                                  Example Type
 ======================================   =================
 
 
-Chapter List of Examples and Deep Dives
+Full Section List of Examples and Deep Dives
 ====================================================
 
-Further details on many of the above-listed examples are provided
-in the following chapters:
+In the following sections, we give high-level descriptions of all CVODE examples,
+as well as detailed descriptions ("deep dives") of some examples.  We also give
+our output files for each of these examples, but users should be cautioned that
+their results may differ slightly from these.  Differences in solution
+values may differ within the tolerances, and differences in cumulative
+counters, such as numbers of steps or Newton iterations, may differ
+from one machine environment to another by as much as 10% to 20%.
+
+In the descriptions below, we make frequent references to the CVODE
+User Document :cite:p:`cvode_ug`.  All citations to specific sections
+are references to parts of that User Document, unless explicitly stated
+otherwise.
+
+.. note::
+
+   The examples in the CVODE distribution are written in such a way as
+   to compile and run for any combination of configuration options during
+   the installation of SUNDIALS (see the "Install" section in the User Guide).
+   As a consequence, they contain portions of code that will not be
+   typically present in a user program. For example, all C example programs
+   make use of the variables SUNDIALS_EXTENDED_PRECISION and SUNDIALS_DOUBLE_PRECISION
+   to test if the solver libraries were built in extended or double precision,
+   and use the appropriate conversion specifiers in ``printf`` functions.
+
 
 .. toctree::
    :maxdepth: 1

From aaaf20ce2d3876f6dcb59e5d974f915da81cc38a Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Mon, 20 Nov 2023 17:12:57 -0600
Subject: [PATCH 34/35] Additional cleanup

---
 doc/cvode/examples/source/References.rst      |   2 +-
 doc/cvode/examples/source/c_cuda.rst          |  23 ++-
 doc/cvode/examples/source/c_mpimanyvec.rst    |   8 +-
 doc/cvode/examples/source/c_openmp.rst        |   6 +-
 doc/cvode/examples/source/c_openmpdev.rst     |   5 +-
 doc/cvode/examples/source/c_parallel.rst      |  28 +--
 doc/cvode/examples/source/c_parallel_deep.rst |  12 +-
 doc/cvode/examples/source/c_parhyp.rst        |  18 +-
 doc/cvode/examples/source/c_raja.rst          |  19 +-
 doc/cvode/examples/source/c_serial.rst        | 151 ++++++++--------
 doc/cvode/examples/source/c_serial_deep.rst   |  38 ++--
 doc/cvode/examples/source/cpp_hypre.rst       |  10 +-
 doc/cvode/examples/source/cpp_onemkl.rst      |   8 +-
 doc/cvode/examples/source/cpp_parallel.rst    |   6 +-
 doc/cvode/examples/source/cpp_serial.rst      |  32 ++--
 doc/cvode/examples/source/cpp_sycl.rst        |   4 +-
 doc/cvode/examples/source/f2003_deep.rst      | 168 +++++++++---------
 doc/cvode/examples/source/f2003_parallel.rst  |  18 +-
 doc/cvode/examples/source/f2003_serial.rst    |  75 ++++----
 19 files changed, 310 insertions(+), 321 deletions(-)

diff --git a/doc/cvode/examples/source/References.rst b/doc/cvode/examples/source/References.rst
index f51cfaa4dc..0084487841 100644
--- a/doc/cvode/examples/source/References.rst
+++ b/doc/cvode/examples/source/References.rst
@@ -12,7 +12,7 @@
    SUNDIALS Copyright End
    ----------------------------------------------------------------
 
-.. _ARKODE.References:
+.. _CVODE_Example.References:
 
 .. only:: html
 
diff --git a/doc/cvode/examples/source/c_cuda.rst b/doc/cvode/examples/source/c_cuda.rst
index ef9d7502b6..95d65be728 100644
--- a/doc/cvode/examples/source/c_cuda.rst
+++ b/doc/cvode/examples/source/c_cuda.rst
@@ -31,29 +31,29 @@ cvAdvDiff_kry_cuda
 Description
 ------------
 
-The example program :literal:`cvAdvDiff_kry_cuda.cu` solves the same :math:`2`-D 
+The example program :literal:`cvAdvDiff_kry_cuda.cu` solves the same :math:`2`-D
 advection-diffusion equation as in Section :ref:`deep_dive.cvAdvDiff_bnd`, but
-instead of using a banded direct solver, it uses unpreconditioned 
-Krylov solver. Here we only highlight differences between the two 
-examples. 
+instead of using a banded direct solver, it uses unpreconditioned
+Krylov solver. Here we only highlight differences between the two
+examples.
 
 The :literal:`cvAdvDiff_kry_cuda.cu` program includes files
 :literal:`sunlinsol_spmgr.h` in order to use the SPGMR
 Krylov linear solver. File :literal:`cvode.h` provides the prototypes for
 :literal:`CVodeSetLinearSolver`, which sets the iterative linear solver for
-CVode, and :literal:`CVodeSetJacTimes`, which sets the pointer to the user
+CVODE, and :literal:`CVodeSetJacTimes`, which sets the pointer to the user
 supplied Jacobian-vector product function.
 The file :literal:`nvector_cuda.h` is included for the definition of the CUDA
 :literal:`N_Vector` type. The prototype vector is created
-using :literal:`N_VNew_Cuda` function. 
+using :literal:`N_VNew_Cuda` function.
 
 In order to get a good performance and avoid moving data between host
-and device at every iteration, it is recommended that user evaluates  
+and device at every iteration, it is recommended that user evaluates
 model at the device. In the example, model right hand side and Jacobian-vector
 product are implemented as CUDA kernels :literal:`fKernel` and :literal:`jtvKernel`,
 respectively. User provided C functions :literal:`f` and :literal:`jtv`, which are called
-directly by CVODE, set thread partitioning and launch thier respective 
-CUDA kernels. Vector data on the device is accessed using 
+directly by CVODE, set thread partitioning and launch thier respective
+CUDA kernels. Vector data on the device is accessed using
 :literal:`N_VGetDeviceArrayPointer_Cuda` function.
 
 Problem output
@@ -61,6 +61,5 @@ Problem output
 
 The output generated by :literal:`cvAdvDiff_kry_cuda` is shown below.
 
-.. include:: ../../../../examples/cvode/cuda/cvAdvDiff_kry_cuda.out
-   :literal:
-
+.. literalinclude:: ../../../../examples/cvode/cuda/cvAdvDiff_kry_cuda.out
+   :language: text
diff --git a/doc/cvode/examples/source/c_mpimanyvec.rst b/doc/cvode/examples/source/c_mpimanyvec.rst
index 004972a8f9..9631ad7ded 100644
--- a/doc/cvode/examples/source/c_mpimanyvec.rst
+++ b/doc/cvode/examples/source/c_mpimanyvec.rst
@@ -75,8 +75,8 @@ mesh, with simple polynomial initial profiles.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out
+   :language: text
 
 
 Numerical method
@@ -89,7 +89,7 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, CVode approaches the
+points on a uniform spatial grid.  As a result, CVODE approaches the
 problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
@@ -101,7 +101,7 @@ together using the MPIManyVector module.
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver, through the CVode interface.
+solver, through the CVLS interface.
 
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
diff --git a/doc/cvode/examples/source/c_openmp.rst b/doc/cvode/examples/source/c_openmp.rst
index b16649a212..8cd303edeb 100644
--- a/doc/cvode/examples/source/c_openmp.rst
+++ b/doc/cvode/examples/source/c_openmp.rst
@@ -32,7 +32,7 @@ Description
 ------------
 
 This simple example problem is an OpenMP implementation of previous
-serial C example ``cvAdvDiff_bnd`` showing how to use the CVode solver
+serial C example ``cvAdvDiff_bnd`` showing how to use the CVODE solver
 interface with a banded Jacobian.
 
 The problem is the semi-discrete form of the advection-diffusion
@@ -91,8 +91,8 @@ argument specifying the number of threads to use, e.g:
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/C_openmp/cvAdvDiff_bnd_omp.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/C_openmp/cvAdvDiff_bnd_omp.out
+   :language: text
 
 
 Numerical method
diff --git a/doc/cvode/examples/source/c_openmpdev.rst b/doc/cvode/examples/source/c_openmpdev.rst
index d00fa5b26d..34215906e3 100644
--- a/doc/cvode/examples/source/c_openmpdev.rst
+++ b/doc/cvode/examples/source/c_openmpdev.rst
@@ -39,8 +39,8 @@ linear solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/C_openmpdev/cvAdvDiff_kry_ompdev.out
+   :language: text
 
 
 Numerical method
@@ -51,4 +51,3 @@ except that we now use SUNDIALS' OpenMP-device-offload-enabled vector
 kernel module, NVECTOR_OPENMPDEV, and have similarly threaded the
 supplied right-hand side residual and banded Jacobian construction
 functions.
-
diff --git a/doc/cvode/examples/source/c_parallel.rst b/doc/cvode/examples/source/c_parallel.rst
index 0866feb168..73d51e05f9 100644
--- a/doc/cvode/examples/source/c_parallel.rst
+++ b/doc/cvode/examples/source/c_parallel.rst
@@ -66,8 +66,8 @@ Execute with Number of Processors :math:`= N`,  with
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_diag_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvAdvDiff_diag_p.out
+   :language: text
 
 
 Numerical method
@@ -80,12 +80,12 @@ side residual.
 
 The example routine solves this problem using the Adams-Moulton module.
 Each stage is solved using the built-in modified Newton iteration.
-Internally, Newton will use the CVDIAG linear solver via the CVode interface.
+Internally, Newton will use the CVDIAG linear solver via the CVLS interface.
 The example file contains functions to evaluate :math:`f(t,u)`.
 
 We specify the relative and absolute tolerances, :math:`reltol=0`
 and :math:`abstol=10^{-5}`, respectively.  Aside from these choices,
-this problem uses only the default MPI and CVode solver parameters.
+this problem uses only the default MPI and CVODE solver parameters.
 
 
 .. _cvAdvDiff_non_p:
@@ -104,8 +104,8 @@ systems: ADAMS method along with fixed-point iteration.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
+   :language: text
 
 
 Numerical method
@@ -165,8 +165,8 @@ mesh, with simple polynomial initial profiles.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
+   :language: text
 
 
 Numerical method
@@ -176,7 +176,7 @@ We employ a method of lines approach, wherein we first
 semi-discretize in space to convert the system of 2 PDEs into a larger
 system of ODEs.  To this end, the spatial derivatives are computed
 using second-order centered differences, with the data distributed
-over :math:`Mx*My` points on a uniform spatial grid.  As a result, CVode
+over :math:`Mx*My` points on a uniform spatial grid.  As a result, CVODE
 approaches the problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
@@ -185,7 +185,7 @@ subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver through the CVode interface.
+solver through the CVLS interface.
 
 The preconditioner matrix used is block-diagonal, with banded blocks,
 constructed using the CVBBDPRE module.  Each block is generated using
@@ -253,8 +253,8 @@ mesh, with simple polynomial initial profiles.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
+   :language: text
 
 
 Numerical method
@@ -264,7 +264,7 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, CVode approaches the
+points on a uniform spatial grid.  As a result, CVODE approaches the
 problem as one involving :math:`2*Mx*My` coupled ODEs.
 
 The problem is decomposed in parallel into uniformly-sized subdomains,
@@ -273,7 +273,7 @@ subdomain has five points in each direction (i.e. :math:`Mx=My=10`).
 
 This program solves the problem with a DIRK method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver, through the CVode interface.
+solver, through the CVLS interface.
 
 The preconditioner matrix used is block-diagonal, with block-diagonal
 portion of the Newton matrix used as a left preconditioner.  A copy of
diff --git a/doc/cvode/examples/source/c_parallel_deep.rst b/doc/cvode/examples/source/c_parallel_deep.rst
index 092644145e..81ca1ba18e 100644
--- a/doc/cvode/examples/source/c_parallel_deep.rst
+++ b/doc/cvode/examples/source/c_parallel_deep.rst
@@ -147,8 +147,8 @@ of roundoff-level differences in various vector operations.  The fairly
 high value of ``ncfn`` indicates that this problem is on the borderline
 of being stiff.
 
-.. include:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
-
+.. literalinclude:: ../../../../examples/cvode/parallel/cvAdvDiff_non_p.out
+   :language: text
 
 
 .. _deep_dive.cvDiurnal_kry_p:
@@ -223,8 +223,8 @@ The following is a sample output from ``cvDiurnal_kry_p``, for four processors
 (in a :math:`2 \times 2` array) with a :math:`5 \times 5` subgrid on each.
 The output will vary slightly if the number of processors is changed.
 
-.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvDiurnal_kry_p.out
+   :language: text
 
 
 .. _deep_dive.cvDiurnal_kry_bbd_p:
@@ -272,5 +272,5 @@ as measured by the number of Krylov iterations per Newton iteration,
 ``nli/nni``, is very close to that of ``cvDiurnal_kry_p`` when preconditioning is on
 the left, but slightly poorer when it is on the right.
 
-.. include:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parallel/cvDiurnal_kry_bbd_p.out
+   :language: text
diff --git a/doc/cvode/examples/source/c_parhyp.rst b/doc/cvode/examples/source/c_parhyp.rst
index 26734c2d08..bb2858f122 100644
--- a/doc/cvode/examples/source/c_parhyp.rst
+++ b/doc/cvode/examples/source/c_parhyp.rst
@@ -29,7 +29,7 @@ cvAdvDiff_non_ph
 ============================================
 
 This problem is mathematically identical to the parallel C example
-problem :ref:`cvAdvDiff_non_p`.  As before, the problem is the 
+problem :ref:`cvAdvDiff_non_p`.  As before, the problem is the
 semi-discrete form of the advection-diffusion equation in 1-D:
 
 .. math::
@@ -57,14 +57,14 @@ statistics (optional outputs) are printed at the end.
 
 This version uses MPI for user routines.
 
-Execute with Number of Processors :math:`= N`,  with 
+Execute with Number of Processors :math:`= N`,  with
 :math:`1 \leq N \leq Mx`.
 
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/parhyp/cvAdvDiff_non_ph.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/parhyp/cvAdvDiff_non_ph.out
+   :language: text
 
 
 Numerical method
@@ -85,7 +85,7 @@ and create the parallel partitioning:
    HYPRE_IJVectorSetObjectType(Uij, HYPRE_PARCSR);
    HYPRE_IJVectorInitialize(Uij);
 
-The *initialize* call means that vector elements are ready to be set using 
+The *initialize* call means that vector elements are ready to be set using
 the IJ interface. We choose the initial condition vector :math:`x_0 =
 x(t_0)` as the template vector, and we set its values in the
 ``SetInitialProfiles(...)`` function. We complete assembly of the
@@ -101,7 +101,7 @@ use.  The sets the handle ``Upar`` to the actual HYPRE vector.  The
 handle is then passed to the ``N_VMake`` function, which creates the
 template ``N_Vector``, ``u``, as a wrapper around the HYPRE vector.
 All of the other vectors used in the computation are created by
-cloning this template vector.  
+cloning this template vector.
 
 Furthermore, since the template vector does not own the underlying
 HYPRE vector (it was created using the ``HYPRE_IJVectorCreate`` call
@@ -114,14 +114,14 @@ To access individual elements of the solution and derivative vectors
 ``u`` and ``udot`` in the IVP right-hand side function, ``f``, the
 user needs to first extract the HYPRE vector by calling
 ``N_VGetVector_ParHyp``, and then use HYPRE-specific methods to access
-the data from that point on. 
+the data from that point on.
 
 .. note::
-           
+
    Currently, interfaces to HYPRE solvers and preconditioners are not
    available directly through the SUNDIALS interfaces, however these
    could be utilized directly as preconditioners for SUNDIALS' Krylov
    solvers.  Direct interfaces to the HYPRE solvers will be provided
    in subsequent SUNDIALS releases.  The current HYPRE vector
    interface is included in this release mainly for testing purposes
-   and as a preview of functionality to come. 
+   and as a preview of functionality to come.
diff --git a/doc/cvode/examples/source/c_raja.rst b/doc/cvode/examples/source/c_raja.rst
index ae124d535a..d92c4377b2 100644
--- a/doc/cvode/examples/source/c_raja.rst
+++ b/doc/cvode/examples/source/c_raja.rst
@@ -31,21 +31,21 @@ cvAdvDiff_kry_raja
 Description
 ------------
 
-The example program :literal:`cvAdvDiff_kry_raja.cu` solves the same :math:`2`-D 
+The example program :literal:`cvAdvDiff_kry_raja.cu` solves the same :math:`2`-D
 advection-diffusion equation as in Sections :ref:`deep_dive.cvAdvDiff_bnd` and
 :ref:`cvAdvDiff_kry_cuda`.
 
 The file :literal:`nvector_raja.h` contains the definition of the RAJA
 :literal:`N_Vector` type, and :literal:`RAJA.hpp` definition of the RAJA
 :literal:`forall` loops. The prototype vector in the main body of the program is created
-using :literal:`N_VNew_Raja` function. 
+using :literal:`N_VNew_Raja` function.
 
 In order to get a good performance and avoid moving data between host
-and device at every iteration, it is recommended that user evaluates  
-model at the device. In the example, user-supplied model right hand side 
-and Jacobian-vector product functions, :literal:`f` and :literal:`jtv`, operate on 
-the device data. Vector data on the device is accessed using 
-:literal:`N_VGetDeviceArrayPointer_Raja` function. Looping over vector 
+and device at every iteration, it is recommended that user evaluates
+model at the device. In the example, user-supplied model right hand side
+and Jacobian-vector product functions, :literal:`f` and :literal:`jtv`, operate on
+the device data. Vector data on the device is accessed using
+:literal:`N_VGetDeviceArrayPointer_Raja` function. Looping over vector
 components is implemented using RAJA :literal:`forall` loops.
 
 Problem output
@@ -53,6 +53,5 @@ Problem output
 
 The output generated by :literal:`cvAdvDiff_kry_raja` is shown below.
 
-.. include:: ../../../../examples/cvode/raja/cvAdvDiff_kry_raja.out
-   :literal:
-
+.. literalinclude:: ../../../../examples/cvode/raja/cvAdvDiff_kry_raja.out
+   :language: text
diff --git a/doc/cvode/examples/source/c_serial.rst b/doc/cvode/examples/source/c_serial.rst
index e570d87f6c..99a85170c4 100644
--- a/doc/cvode/examples/source/c_serial.rst
+++ b/doc/cvode/examples/source/c_serial.rst
@@ -31,7 +31,7 @@ cvAdvDiff_bnd
 Description
 ------------
 
-This is a very simple C example showing how to use the CVode solver
+This is a very simple C example showing how to use the CVODE solver
 interface with a banded Jacobian.
 
 The problem is the semi-discrete form of the advection-diffusion
@@ -67,8 +67,8 @@ header files.  This is true for all examples.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
+   :language: text
 
 Numerical method
 ----------------
@@ -76,13 +76,13 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface, which in the case
+SUNLINSOL_DENSE linear solver via the CVODE interface, which in the case
 of this scalar-valued problem is just division.  The example file contains
 functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.
 
 We specify the relative and absolute tolerances, :math:`reltol=0`
 and :math:`abstol=10^{-5}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 
 
@@ -100,8 +100,8 @@ use of the LAPACK_BAND linear solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bndL.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvAdvDiff_bndL.out
+   :language: text
 
 
 
@@ -131,8 +131,8 @@ larger than 100, the problem becomes quite stiff.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvAnalytic_mels.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvAnalytic_mels.out
+   :language: text
 
 Numerical method
 ----------------
@@ -176,8 +176,8 @@ and SUNNONLINSOL_NEWTON nonlinear solver modules:
       approximation: (1) band, user-supplied, (2) band, difference
       quotient approximation, (3) diagonal approximation.
 
-   *  For each problem, in the series of eight runs, CVodeInit is
-      called only once, for the first run, whereas CVodeReInit is
+   *  For each problem, in the series of eight runs, ``CVodeInit`` is
+      called only once, for the first run, whereas ``CVodeReInit`` is
       called for each of the remaining seven runs.
 
 *  Notes: This program demonstrates the usage of the sequential
@@ -217,8 +217,8 @@ and SUNNONLINSOL_NEWTON nonlinear solver modules:
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvDirectDemo_ls.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvDirectDemo_ls.out
+   :language: text
 
 
 Numerical method
@@ -227,10 +227,10 @@ Numerical method
 This program solves the two separate problems first with ADAMS and
 then with BDF method, using a Fixed-point iteration and a Newton
 iteration for their nonlinear solvers, interchangeably.  The first problem
-uses the SUNLINSOL_DENSE linear solver module via the CVode interface.
+uses the SUNLINSOL_DENSE linear solver module via the CVODE interface.
 Similarly, the second problem uses the SUNLINSOL_BAND linear solver
-module via the CVode interface.  Additionally, this example occasionally
-provides a routine to CVode to compute the dense and banded Jacobian,
+module via the CVODE interface.  Additionally, this example occasionally
+provides a routine to CVODE to compute the dense and banded Jacobian,
 respectively.
 
 The problems are run using scalar relative and absolute tolerances of
@@ -274,8 +274,8 @@ integrating over discontinuities. For instance,
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvDisc_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvDisc_dns.out
+   :language: text
 
 
 Numerical method
@@ -283,7 +283,7 @@ Numerical method
 
 This program solves the two separate sample problems both with BDF methods,
 using the built-in Newton iteration for their nonlinear solvers.  Both
-use the SUNLINSOL_DENSE linear solver module via the CVode interface.
+use the SUNLINSOL_DENSE linear solver module via the CVLS interface.
 Additionally, this example only advances one step in time using CV_ONE_STEP,
 for both problems. The second problem is run twice, once explicitly, and once
 via CVODE autonomously.
@@ -334,8 +334,8 @@ the Preconditioner routine.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
+   :language: text
 
 
 Numerical method
@@ -344,13 +344,13 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_SPGMR linear solver via the CVode interface, which in the case
+SUNLINSOL_SPGMR linear solver via the CVLS interface, which in the case
 of this scalar-valued problem is just division.  The example file contains
 functions to evaluate both :math:`f(t,u)` and :math:`J(t,u)`.
 
 We specify the relative and absolute tolerances, :math:`reltol=10^{-5}`
 and :math:`abstol=10^{-3}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 12 outputs are printed, and run statistics are printed at the end.
 
@@ -368,8 +368,8 @@ and right preconditioning.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry_bp.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvDiurnal_kry_bp.out
+   :language: text
 
 
 Numerical method
@@ -426,12 +426,12 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_KLU linear solver via the CVode interface.  The example file
+SUNLINSOL_KLU linear solver via the CVLS interface.  The example file
 contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=0`
 and :math:`atol=10^{-8}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 12 outputs (will be) printed, and run statistics are printed at the end.
 
@@ -467,8 +467,8 @@ conditionally reused within the Preconditioner routine.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvKrylovDemo_ls.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvKrylovDemo_ls.out
+   :language: text
 
 
 Numerical method
@@ -477,13 +477,12 @@ Numerical method
 This program solves the same problem four times via the Backwards
 Differentiation Formula method, using a Newton iteration for their
 nonlinear solvers.  The first portion of this example uses the
-SUNLINSOL_SPGMR linear solver module via the CVode GMRES interface,
-while the second portion uses the SUNLINSOL_SPFGMR linear solver module
-via the CVode FGMRES interface, the third portion uses the SUNLinSol_SPBCGS
-linear solver module via the CVode Bi-CGStab interface, and the fourth
-portion uses the SUNLINSOL_SPTFQMR linear solver module via the CVode
-TFQMR interface.  Additionally, this example provides a routine to CVode
-to compute the densely-referenced, block-diagonal Jacobian.
+SUNLINSOL_SPGMR linear solver module, while the second portion uses
+the SUNLINSOL_SPFGMR linear solver module, the third portion uses the
+SUNLinSol_SPBCGS linear solver module, and the fourth portion uses the
+SUNLINSOL_SPTFQMR linear solver module.  Additionally, this example
+provides a routine to CVODE to compute the densely-referenced,
+block-diagonal Jacobian.
 
 The problems are run using scalar relative and absolute tolerances of
 :math:`reltol=10^{-5}` and :math:`abstol=10^{-3}`, respectively.
@@ -567,10 +566,10 @@ only a subset of the :math:`ns` by :math:`ns` blocks).
 Four different runs are made for this problem.  The product
 preconditoner is applied on the left and on the right.  In each
 case, both the modified and classical Gram-Schmidt options are
-tested. In the series of runs, CVodeInit, SUNLinSol_SPGMR, and
-CVSetLinearSolver are called only for the first run, whereas
-CVodeReInit, SUNLinSol_SPGMRSetPrecType, and
-SUNLinSol_SPGMRSetGSType are called for each of the remaining
+tested. In the series of runs, ``CVodeInit``, ``SUNLinSol_SPGMR``, and
+``CVSetLinearSolver`` are called only for the first run, whereas
+``CVodeReInit``, ``SUNLinSol_SPGMRSetPrecType``, and
+``SUNLinSol_SPGMRSetGSType`` are called for each of the remaining
 three runs.
 
 A problem description, performance statistics at selected output
@@ -593,8 +592,8 @@ access to the contiguous array of components of an N_Vector.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvKrylovDemo_prec.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvKrylovDemo_prec.out
+   :language: text
 
 
 Numerical method
@@ -603,7 +602,7 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_SPGMR linear solver via the CVode interface.  The example file
+SUNLINSOL_SPGMR linear solver via the CVLS interface.  The example file
 contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-5}`
@@ -664,8 +663,8 @@ the program with the ``--help`` flag.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvParticle_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvParticle_dns.out
+   :language: text
 
 
 Numerical method
@@ -674,12 +673,12 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver via the CVLS interface.  The example file
 contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-4}`
 and :math:`atol=10^{-9}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 2 output times are printed, and run statistics are printed at the end.
 
@@ -750,8 +749,8 @@ of the command line flags.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvPendulum_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvPendulum_dns.out
+   :language: text
 
 
 Numerical method
@@ -760,7 +759,7 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver via the CVLS interface.  The example file
 contains functions to evaluate both :math:`f(t,x,y)` and :math:`J(t,x,y)`.
 
 We specify the relative and absolute tolerances for several runs to be
@@ -772,7 +771,7 @@ We specify the relative and absolute tolerances for several runs to be
 *  :math:`rtol=10^{-9}` and :math:`atol=10^{-9}`,
 
 respectively.  Aside from these choices, this problem uses only the
-default CVode solver parameters.
+default CVODE solver parameters.
 
 2 output times are printed for each solve, one with a user-supplied
 Projection function, and one without.
@@ -810,8 +809,8 @@ with the dense linear solver, and a user-supplied Jacobian routine.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dns.out
+   :language: text
 
 
 Numerical method
@@ -820,16 +819,16 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver via the CVLS interface.  The example file
 contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and
 :math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
 as previously mentioned, find roots at :math:`y_3 = 0.01` and
-:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
+:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVODE.
 
 We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
 and :math:`atol=\begin{pmatrix} 10^{-8} \\ 10^{-14} \\ 10^{-6} \end{pmatrix}`
 , respectively.  Aside from these choices, this problem uses only the default
-CVode solver parameters.
+CVODE solver parameters.
 
 11 normal + 2 root output times are printed at multiplicatively equally-spaced
 points as well as at the two roots, and run statistics are printed at the end.
@@ -851,8 +850,8 @@ constraint :math:`y_i \geq 0` is posed for all components :math:`i = 1, 2, 3`.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_constraints.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dns_constraints.out
+   :language: text
 
 
 Numerical method
@@ -876,14 +875,14 @@ Description
 
 This example problem is the same as :ref:`cvRoberts_dns` above except that here
 we allow negative solutions to take form in the first run, and intercept them
-via CVode on the second run.
+via CVODE on the second run.
 
 
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_negsol.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dns_negsol.out
+   :language: text
 
 
 Numerical method
@@ -913,8 +912,8 @@ required for the WRMS norm calculations.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dns_uw.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dns_uw.out
+   :language: text
 
 
 Numerical method
@@ -940,8 +939,8 @@ solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dnsL.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dnsL.out
+   :language: text
 
 
 Numerical method
@@ -967,8 +966,8 @@ solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_klu.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_klu.out
+   :language: text
 
 
 Numerical method
@@ -1005,8 +1004,8 @@ it was based off of the ``cvRoberts_klu.c`` example.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_block_klu.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_block_klu.out
+   :language: text
 
 
 Numerical method
@@ -1032,8 +1031,8 @@ sparse direct linear solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_sps.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_sps.out
+   :language: text
 
 
 Numerical method
@@ -1090,8 +1089,8 @@ Run statistics (optional outputs) are printed at the end.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/serial/cvRocket_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRocket_dns.out
+   :language: text
 
 
 Numerical method
@@ -1100,17 +1099,17 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver.  The example file
 contains functions to evaluate both :math:`f(t, y_1, y_2)` and
 :math:`J(t, y_1, y_2)`.  Additionally, a root-finding function will,
 as previously mentioned, find roots at either :math:`M_f = 0` or :math:`H = H_c`
 as well as at :math:`v = 0` for :math:`t > 0` using the built-in root-finding
-mechanism in CVode.
+mechanism in CVODE.
 
 We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-5}`
 and :math:`atol=\begin{pmatrix} 0.01 \\ 0.1 \end{pmatrix}`
 , respectively.  Aside from these choices, this problem uses only the default
-CVode solver parameters.
+CVODE solver parameters.
 
 68 normal + 2 root output times are printed at normatively equally-spaced
 points as well as at the two roots, and run statistics are printed at the end.
diff --git a/doc/cvode/examples/source/c_serial_deep.rst b/doc/cvode/examples/source/c_serial_deep.rst
index 681878a406..38e6191bf3 100644
--- a/doc/cvode/examples/source/c_serial_deep.rst
+++ b/doc/cvode/examples/source/c_serial_deep.rst
@@ -153,7 +153,7 @@ creates the dense SUNLinearSolver object that will perform the linear solves wit
 the Newton method.  These are attached to the CVODE linear
 solver interface with the call to ``CVodeSetLinearSolver`` (see `CVodeSetLinearSolver interface
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_),
-and the subsequent call to ``CVodeSetJacFn`` (see `CVode Linear Solver Optional Input Functions
+and the subsequent call to ``CVodeSetJacFn`` (see `CVODE Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
 specifies the analytic Jacobian supplied by the user-supplied function :math:`Jac`.
 
@@ -173,7 +173,7 @@ negative value (*indicating a failure*), the program breaks out of the loop.
 In the case of a ``CV_SUCCESS`` return, the value of :math:`t_{out}` is
 advanced (multiplied by :math:`10`) and a counter (:math:`i_{out}`) is advanced, so
 that the loop can be ended when that counter reaches the preset number
-of output times, :math:`N_{OUT} = 12`.  See `CVode Solver Function
+of output times, :math:`N_{OUT} = 12`.  See `CVODE Solver Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#cvode-solver-function>`_
 for full details of the call to ``CVode``.
 
@@ -199,7 +199,7 @@ Specifically, these are:
 * the number of local error test failures (``netf``), and
 * the number of :math:`g` (root function) evaluations (``nge``).
 
-These optional outputs are described in `CVode Optional Output Functions
+These optional outputs are described in `CVODE Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_ .
 
 The function ``f`` is a straightforward expression of the ODEs.
@@ -231,8 +231,8 @@ The output generated by ``cvRoberts_dns`` is shown again below.  It shows the ou
 values at the :math:`12` preset values of :math:`t_{out}`.  It also shows the two root
 locations found, first at a root of :math:`g_1`, and then at a root of :math:`g_0`.
 
-.. include:: ../../../../examples/cvode/serial/cvRoberts_dns.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvRoberts_dns.out
+   :language: text
 
 
 .. _deep_dive.cvAdvDiff_bnd:
@@ -319,10 +319,10 @@ creates a banded SUNMatrix Jacobian template, and specifies that both
 half-bandwidths of the Jacobian are equal to :math:`M_Y`.  The calls to
 ``SUNBandLinearSolver`` (see `SUNLinSol_Band
 <https://sundials.readthedocs.io/en/latest/sunlinsol/SUNLinSol_links.html>`_)
-and ``CVodeSetLinearSolver`` (see `CVode Linear Solver Functions
+and ``CVodeSetLinearSolver`` (see `CVODE Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
-specifies the SUNLinSol_Band linear solver to the CLS interface.
-The call to ``CVodeSetJacFn`` (see `CVode Linear Solver Optional Input Functions
+specifies the SUNLinSol_Band linear solver to the CVLS interface.
+The call to ``CVodeSetJacFn`` (see `CVODE Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_)
 specifies that a user-supplied Jacobian function ``Jac`` is to be used.
 
@@ -347,7 +347,7 @@ printed include counters such as the total number of steps (``nst``),
 :math:`LU` decompositions (``nsetups``), :math:`f` evaluations for
 difference-quotient Jacobians (:math:`nfeLS = 0` here),
 Jacobian evaluations (``nje``), and nonlinear iterations (``nni``).
-These optional outputs are described in `CVode Optional Output Functions
+These optional outputs are described in `CVODE Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
 Note that ``PrintFinalStats`` is suitable for general use in applications
 of CVODE to any problem with a direct linear solver.
@@ -398,7 +398,7 @@ the ``SM_COLUMN_B`` macro and is stored in ``kthCol`` in
 the ``Jac`` function.  When setting the components of :math:`J` we must be
 careful not to index out of bounds. The guards :C:`(i != 1)` etc.
 in front of the calls to ``SM_COLUMN_ELEMENT_B`` prevent illegal indexing.
-See `CVode Jacobian Construction
+See `CVODE Jacobian Construction
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#jacobian-construction-matrix-based-linear-solvers>`_
 for a detailed description of the ``Jac`` function.
 
@@ -407,8 +407,8 @@ Program output
 
 The output generated by ``cvAdvDiff_bnd`` is again shown below.
 
-.. include:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvAdvDiff_bnd.out
+   :language: text
 
 
 .. _deep_dive.cvDiurnal_kry:
@@ -492,14 +492,14 @@ and built-in ``CV_NEWTON`` iteration, and then calls ``CVodeInit``, and
 ``CVodeSetSStolerances`` specifies the scalar tolerances.
 It calls ``SUNLinSol_SPGMR`` to create the SPGMR linear solver with left
 preconditioning, and the default value (indicated by a zero argument)
-for ``maxl``.  It then calls ``CVodeSetLinearSolver`` (see `CVode Linear Solver Functions
+for ``maxl``.  It then calls ``CVodeSetLinearSolver`` (see `CVODE Linear Solver Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-functions>`_)
 to attach this linear solver to the
 CVLS interface.  The call to ``CVodeSetJacTimes`` specifies a
 user-supplied function for Jacobian-vector products (the ``NULL``
 argument specifies that no Jacobian-vector setup routine is needed).
 Next, user-supplied preconditioner setup and solve functions,
-``Precond`` and ``PSolve``, are specified. See `CVode Linear Solver Optional Input Functions
+``Precond`` and ``PSolve``, are specified. See `CVODE Linear Solver Optional Input Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#linear-solver-interface-optional-input-functions>`_
 for details on the ``CVodeSetPreconditioner`` function.
 
@@ -517,7 +517,7 @@ of preconditioner setups (``nsetups``), of preconditioner evaluations
 Also printed are the lengths of the problem-dependent real and integer
 workspaces used by the main integrator ``CVode``, denoted ``lenrw`` and
 ``leniw``, and those used by CVODE, denoted ``lenrwLS`` and ``leniwLS``.
-All of these optional outputs are described in `CVode Optional Output Functions
+All of these optional outputs are described in `CVODE Optional Output Functions
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#optional-output-functions>`_.
 The ``PrintFinalStats`` function is suitable for general use in applications
 of CVODE to any problem with an iterative linear solver.
@@ -534,9 +534,9 @@ a pointer to the first component of an ``N_Vector`` which we pass to
 the ``IJKth`` macro to do an ``N_Vector`` access.
 
 The preconditioner used here is the block-diagonal part of the true Newton
-matrix.  It is generated and factored in the ``Precond`` routine (see `CVode Preconditioner Setup Function
+matrix.  It is generated and factored in the ``Precond`` routine (see `CVODE Preconditioner Setup Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-setup-iterative-linear-solvers>`_)
-and backsolved in the ``PSolve`` routine (see `CVode Preconditioner Solve Function
+and backsolved in the ``PSolve`` routine (see `CVODE Preconditioner Solve Function
 <https://sundials.readthedocs.io/en/latest/cvode/Usage/index.html#preconditioner-solve-iterative-linear-solvers>`_).
 Its diagonal blocks are :math:`2 \times 2` matrices that include the interaction
 Jacobian elements and the diagonal contribution of the diffusion Jacobian
@@ -583,5 +583,5 @@ number of preconditioner evaluations, ``npe``, is much smaller than
 the number of preconditioner setups, ``nsetups``, as a result of the
 Jacobian re-use scheme.
 
-.. include:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/serial/cvDiurnal_kry.out
+   :language: text
diff --git a/doc/cvode/examples/source/cpp_hypre.rst b/doc/cvode/examples/source/cpp_hypre.rst
index 5a1aa23c58..c4fd561a34 100644
--- a/doc/cvode/examples/source/cpp_hypre.rst
+++ b/doc/cvode/examples/source/cpp_hypre.rst
@@ -35,8 +35,8 @@ skipped
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls_--np_2_2.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls_--np_2_2.out
+   :language: text
 
 
 Numerical method
@@ -60,13 +60,11 @@ skipped
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg_--np_2_2.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg_--np_2_2.out
+   :language: text
 
 
 Numerical method
 -----------------
 
 skipped
-
-
diff --git a/doc/cvode/examples/source/cpp_onemkl.rst b/doc/cvode/examples/source/cpp_onemkl.rst
index 46074d5220..52f7439592 100644
--- a/doc/cvode/examples/source/cpp_onemkl.rst
+++ b/doc/cvode/examples/source/cpp_onemkl.rst
@@ -68,8 +68,8 @@ This problem is comparable to the ``cvRoberts_block_klu.c`` example.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_onemkl/cvRoberts_blockdiag_onemkl.out
+   :language: text
 
 
 Numerical method
@@ -78,8 +78,8 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_ONEMKLDENSE linear solver via the CVode interface.  Alternatively,
-Newton can use SUNLINSOL_SPGMR linear solver via the CVode interface.  The
+SUNLINSOL_ONEMKLDENSE linear solver.  Alternatively,
+Newton can use SUNLINSOL_SPGMR linear solver.  The
 example file contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)`
 and :math:`J(t, y_1, y_2, y_3)`.
 
diff --git a/doc/cvode/examples/source/cpp_parallel.rst b/doc/cvode/examples/source/cpp_parallel.rst
index ec69b71f77..12073c0254 100644
--- a/doc/cvode/examples/source/cpp_parallel.rst
+++ b/doc/cvode/examples/source/cpp_parallel.rst
@@ -38,13 +38,11 @@ are using multiple processors with MPI.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_parallel/cv_heat2D_p_--np_2_2.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_parallel/cv_heat2D_p_--np_2_2.out
+   :language: text
 
 
 Numerical method
 ----------------
 
 The same as ``cv_heat2D`` aside from the use of NVECTOR_PARALLEL.
-
-
diff --git a/doc/cvode/examples/source/cpp_serial.rst b/doc/cvode/examples/source/cpp_serial.rst
index e80fd1f279..e31c9aae70 100644
--- a/doc/cvode/examples/source/cpp_serial.rst
+++ b/doc/cvode/examples/source/cpp_serial.rst
@@ -75,28 +75,28 @@ available to change the problem parameters and CVODE settings. Use the flag
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_serial/cv_heat2D.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_serial/cv_heat2D.out
+   :language: text
 
 
 Numerical method
 ----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_PCG linear solver or the SUNLINSOL_SPGMR linear solver via the
-CVode interface.  The example file contains functions to evaluate both
-:math:`f(t,x,y)` and :math:`Pre\_Jac(t,x,y)`.  
+SUNLINSOL_PCG linear solver or the SUNLINSOL_SPGMR linear solver.  The
+example file contains functions to evaluate both
+:math:`f(t,x,y)` and :math:`Pre\_Jac(t,x,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=0`
 and :math:`atol=10^{-8}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 12 outputs are printed, and run statistics are printed at the end as well.
 
 
-   
+
 .. _cv_kpr:
 
 cv_kpr
@@ -112,7 +112,7 @@ ODE test problem, structured in the following way
 
    \begin{bmatrix} u' \\ v' \end{bmatrix} =
    \begin{bmatrix} a & b \\ c & d \end{bmatrix}
-   \begin{bmatrix} \frac{-1 + u^2 - r(t)}{2u} \\ 
+   \begin{bmatrix} \frac{-1 + u^2 - r(t)}{2u} \\
                    \frac{-2 + v^2 - s(t)}{2v} \end{bmatrix} +
    \begin{bmatrix} \frac{r'(t)}{2u} \\ \frac{s'(t)}{2v} \end{bmatrix}.
 
@@ -135,23 +135,21 @@ where, in this test, we use the functions
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_serial/cv_kpr.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_serial/cv_kpr.out
+   :language: text
 
 
 Numerical method
 -----------------
 
 The example routine solves this problem using a Backwards Differentiation
-Formula in fixed-leading coefficient form.  Each stage is solved using the 
+Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
-contains functions to evaluate both :math:`f(t,u,v)` and :math:`J(t,u,v)`.  
+SUNLINSOL_DENSE linear solver.  The example file contains functions to
+evaluate both :math:`f(t,u,v)` and :math:`J(t,u,v)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
 and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 10 outputs are printed, and run statistics are printed at the end as well.
-
-
diff --git a/doc/cvode/examples/source/cpp_sycl.rst b/doc/cvode/examples/source/cpp_sycl.rst
index 06347f215f..218fe3e5cf 100644
--- a/doc/cvode/examples/source/cpp_sycl.rst
+++ b/doc/cvode/examples/source/cpp_sycl.rst
@@ -38,8 +38,8 @@ that here we use the SUNDIALS SPGMR linear solver instead.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/CXX_sycl/cvAdvDiff_kry_sycl.out
+   :language: text
 
 
 Numerical method
diff --git a/doc/cvode/examples/source/f2003_deep.rst b/doc/cvode/examples/source/f2003_deep.rst
index 171a7d5a4a..33544276aa 100644
--- a/doc/cvode/examples/source/f2003_deep.rst
+++ b/doc/cvode/examples/source/f2003_deep.rst
@@ -21,13 +21,13 @@
 Fortran 2003 example problems -- Deep dive
 ===================================================
 
-The **Fortran** example problem programs supplied with the **CVODE**
-package are all written in standard **Fortran 2003** and use *double precision
-arithmetic*.  Before running any of these examples, the user should
-make sure that the **Fortran** *data types* for *real* and *integer variables*
-appropriately match the **C** *types*.  See `SUNDIALS Fortran
+The Fortran example problem programs supplied with the CVODE
+package are all written in standard Fortran 2003 and use double precision
+arithmetic.  Before running any of these examples, the user should
+make sure that the Fortran data types for real and integer variables
+appropriately match the C types.  See `SUNDIALS Fortran
 <https://sundials.readthedocs.io/en/latest/sundials/Fortran_link.html>`_ in the
-**SUNDIALS User Document** for details.
+SUNDIALS User Document for details.
 
 
 
@@ -39,67 +39,67 @@ A serial example: cv_diurnal_kry [DD]
 Description -- step-by-step
 ----------------------------
 
-The ``cv_diurnal_kry`` example is a **Fortran** equivalent of the ``cvDiurnal_kry`` problem.
-(In fact, it was derived from an *earlier* **Fortran** *example program* for **VODPK**.)
+The ``cv_diurnal_kry`` example is a Fortran equivalent of the ``cvDiurnal_kry`` problem.
+(In fact, it was derived from an earlier Fortran example program for VODPK.)
 
-The ``main`` program begins with several declarations, creating the **SUNDIALS** *context*
-pointer via ``FSUNContext_Create``, creating the **SUNDIALS NVector** pointers
-via ``FN_VNew_Serial``, initializing the **SUNDIALS NVector** external pointer
-(to assist with *data modification*) via ``FN_VGetArrayPointer``, and dual ``do``
+The ``main`` program begins with several declarations, creating the SUNDIALS context
+pointer via ``FSUNContext_Create``, creating the SUNDIALS NVector pointers
+via ``FN_VNew_Serial``, initializing the SUNDIALS NVector external pointer
+(to assist with data modification) via ``FN_VGetArrayPointer``, and dual ``do``
 loops to initialize our :math:`u_{vec}` via embedded :math:`x`, :math:`y`, :math:`c_x`,
-and :math:`c_y`.  With this we have successfully initialized the **NVECTOR_SERIAL** module via **SUNDIALS**.
+and :math:`c_y`.  With this we have successfully initialized the NVECTOR_SERIAL module via SUNDIALS.
 ``main`` then calls ``FCVodeCreate`` and ``FCVodeInit`` as per usual, thereby
-initializing the **FCVODE** interface with ``CV_BDF``.  ``FCVodeSetMaxNumSteps`` and
-``FCVodeSStolerances`` are then called to set the *maximum number of steps* per solve to be
-:math:`1000` and initialize *scalar tolerances*.  ``FSUNLinSol_SPGMR``, ``FSUNLinSol_SPGMRSetGSType``,
-and ``FCVodeSetLinearSolver`` are then called to initialize the **SUNLinSol_SPGMR** module with specific
+initializing the FCVODE interface with ``CV_BDF``.  ``FCVodeSetMaxNumSteps`` and
+``FCVodeSStolerances`` are then called to set the maximum number of steps per solve to be
+:math:`1000` and initialize scalar tolerances.  ``FSUNLinSol_SPGMR``, ``FSUNLinSol_SPGMRSetGSType``,
+and ``FCVodeSetLinearSolver`` are then called to initialize the SUNLinSol_SPGMR module with specific
 ``iGStype`` characteristics to the pointer ``sunls``.  ``main`` then calls ``FCVodeSetPreconditioner``
-to specify *user-supplied preconditioner setup* and *solve* routines.  Then, via a ``do`` loop,
+to specify user-supplied preconditioner setup and solve routines.  Then, via a ``do`` loop,
 ``main`` calls ``FCVode`` in a loop over :math:`t_{out}` values, meanwhile printing
-selected *solution values* and *performance data*, getting ``lnst`` from ``FCVodeGetNumSteps``
+selected solution values and performance data, getting ``lnst`` from ``FCVodeGetNumSteps``
 and ``lh`` from ``FCVodeGetCurrentStep``.  At the end, it prints a number of performance counters,
 via the user sub-routine ``CVodeStats``, such as:
 
 * ``nsteps`` (total internal steps taken),
-* ``nfe`` (total *right-hand side* function calls),
-* ``npe`` (total number of *preconditioner* evaluations),
-* ``nps`` (total number of *preconditioner* solves),
-* ``netfails`` (number of *error test fails*),
-* ``nniters`` (number of *nonlinear iterations*),
-* ``nliters`` (number of *linear iterations*),
-* ``avdim`` :math:`\bigg(` average *Krylov space dimension* :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
-* ``ncf`` (number of *nonlinear convergence failures*),
-* ``ncfl`` (number of *linear convergence failures*),
-* ``lenrw`` and ``leniw`` (main solver *real/int workspace size*)
-* ``lenrwls`` and ``leniwls`` (linear solver *real/int workspace size*),
+* ``nfe`` (total right-hand side function calls),
+* ``npe`` (total number of preconditioner evaluations),
+* ``nps`` (total number of preconditioner solves),
+* ``netfails`` (number of error test fails),
+* ``nniters`` (number of nonlinear iterations),
+* ``nliters`` (number of linear iterations),
+* ``avdim`` :math:`\bigg(` average Krylov space dimension :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
+* ``ncf`` (number of nonlinear convergence failures),
+* ``ncfl`` (number of linear convergence failures),
+* ``lenrw`` and ``leniw`` (main solver real/int workspace size)
+* ``lenrwls`` and ``leniwls`` (linear solver real/int workspace size),
 
 frees memory with calls to ``FCVFree``, ``FN_VDestroy``, ``FSUNLinSolFree``,
 and ``FSUNContext_Free``.
 
 In ``cv_diurnal_kry.f90``, or more specifically, in the ``diurnal_mod`` module,
 we have that the ``RhsFn`` function is a straghtforward implementation of
-the discretized form of Equations :eq:`cvDiurnalpde`.  In ``PreSet``, the *block-diagonal*
-part of the *Jacobian*, :math:`J_{bd}`, is computed (and copied to :math:`p`) if :math:`jok = 0`
+the discretized form of Equations :eq:`cvDiurnalpde`.  In ``PreSet``, the block-diagonal
+part of the Jacobian, :math:`J_{bd}`, is computed (and copied to :math:`p`) if :math:`jok = 0`
 via the subroutine ``Prec_Jac``, but is simply copied from :math:`bd` to :math:`p` if
-:math:`jok = 1`.  In both cases, the *preconditioner matrix* :math:`p` is formed from
-:math:`J_{bd}` and its :math:`2 \times 2` blocks are *'LU-factored'* via the subroutine
-``Prec_LU``, which serves as a sort of *block-by-block inversion* of :math:`p_{2 \times 2} - I_2`.
-In ``PreSolve``, the solution of a linear system :math:`Px = z` is solved by doing *backsolve
-operations* on the :math:`2 \times 2` blocks.  This is done by, first, copying :math:`r` into :math:`z`.
-Then, the subordinate routine ``Prec_Sol`` is used to perform *matrix-vector multiplication* to
-finally perform our *backsolve*.  The remainder of ``cv_diurnal_kry.f90`` previously consisted of, now
-defunct per our problem's functional requisites, routines from **LINPACK** and the **BLAS** needed for
-*matrix* and *vector* operations.
+:math:`jok = 1`.  In both cases, the preconditioner matrix :math:`p` is formed from
+:math:`J_{bd}` and its :math:`2 \times 2` blocks are 'LU-factored' via the subroutine
+``Prec_LU``, which serves as a sort of block-by-block inversion of :math:`p_{2 \times 2} - I_2`.
+In ``PreSolve``, the solution of a linear system :math:`Px = z` is solved by doing backsolve
+operations on the :math:`2 \times 2` blocks.  This is done by, first, copying :math:`r` into :math:`z`.
+Then, the subordinate routine ``Prec_Sol`` is used to perform matrix-vector multiplication to
+finally perform our backsolve.  The remainder of ``cv_diurnal_kry.f90`` previously consisted of, now
+defunct per our problem's functional requisites, routines from LINPACK and the BLAS needed for
+matrix and vector operations.
 
 Program output
 ---------------
 
 The following is sample output from ``cv_diurnal_kry``, using a :math:`10 \times 10` mesh.
-The performance of **FCVODE** here is quite similar to that of **CVODE** on the ``cvDiurnal_kry``
+The performance of FCVODE here is quite similar to that of CVODE on the ``cvDiurnal_kry``
 problem, as expected.
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
-   `
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
+   :language: text
 
 
 .. _deep_dive.cv_diag_kry_bbd_p:
@@ -111,7 +111,7 @@ Description -- step-by-step
 ----------------------------
 
 This example, ``cv_diag_kry_bbd_p``, uses a simple diagonal ODE system to illustrate
-the use of **FCVODE** in a *parallel* setting.  The system is then
+the use of FCVODE in a parallel setting.  The system is then
 
 .. math::
    :label: diagode
@@ -119,55 +119,55 @@ the use of **FCVODE** in a *parallel* setting.  The system is then
    \dot y_i = -\alpha ~i~ y_i ~~~ (i = 1, \ldots, N)
 
 on the time interval :math:`0 \leq t \leq 1`.  In this case, we use :math:`\alpha = 10`
-and :math:`N = 10 * nprocs`, where ``nprocs`` is the *number of processors* specified at run time.
-The *linear solver* to be used is **SPGMR** with the **CVBBDPRE** (*band-block-diagonal*) *preconditioner*.
-Since the system *Jacobian* is *diagonal*, the *half-bandwidths* specified are all *zero*.  The problem
-is solved twice --- with *preconditioning on the left*, then *on the right*.
-
-The source file for this problem begins with **MPI** calls to *initialize* **MPI** and to get the *number
-of processors* and *local processor index*, or ``nprocs`` and ``nlocal`` respectively.  This is done via
-the **MPI** subroutines ``MPI_Init``, ``MPI_Comm_size``, and ``MPI_Comm_rank``.
+and :math:`N = 10 * nprocs`, where ``nprocs`` is the number of processors specified at run time.
+The linear solver to be used is SPGMR with the CVBBDPRE (band-block-diagonal) preconditioner.
+Since the system Jacobian is diagonal, the half-bandwidths specified are all zero.  The problem
+is solved twice --- with preconditioning on the left, then on the right.
+
+The source file for this problem begins with MPI calls to initialize MPI and to get the number
+of processors and local processor index, or ``nprocs`` and ``nlocal`` respectively.  This is done via
+the MPI subroutines ``MPI_Init``, ``MPI_Comm_size``, and ``MPI_Comm_rank``.
 ``FSUNContext_Create``, ``FCVodeCreate``, and ``FCVodeInit`` are called as usual.
-``FN_VNew_Parallel`` is then called to initialize the **MPI-parallel NVector** module so that we
-can use ``FN_VGetArrayPointer`` as per usual, while ``FSUNLinSol_SPGMR`` ``FCVodeSetLinearSolver``,
-and ``FSUNLinSol_SPGMRSetGSType`` are called as per usual to initialize the **SPGMR SUNLinSol** module
-and attach the *linear solver* to **FCVODE**.
-Following the call to ``FCVodeSStolerances``, the *preconditioner* is attached to **FCVODE** with calls to
+``FN_VNew_Parallel`` is then called to initialize the MPI-parallel NVector module so that we
+can use ``FN_VGetArrayPointer`` as per usual, while ``FSUNLinSol_SPGMR``, ``FCVodeSetLinearSolver``,
+and ``FSUNLinSol_SPGMRSetGSType`` are called as per usual to initialize the SPGMR SUNLinSol module
+and attach the linear solver to FCVODE.
+Following the call to ``FCVodeSStolerances``, the preconditioner is attached to FCVODE with calls to
 ``FCVBBDPrecInit``.  Then, via a ``do`` loop over ``iPreType``, we have several ``if`` statements, specific
 to ``iPreType``.  In the first one, we consider :code:`iPreType == 2`, calling ``FCVodeReInit``,
-``FCVBBDPrecReInit``, and ``FSUNLinSol_SPGMRSetPrecType`` to *re-initialize* with *preconditioning
-on the right*, as stated in the *print* statement.  This is all that is needed to prepare for the second run of our
-Diagonal PDE.  Meanwhile, in the second one, while :code:`iPreType == 1`, we only *print* out the noted fact that
-we now have *preconditioning on the left*.  After this, in a loop over :math:`t_{out}` values, it calls
-``FCVode`` and *prints* the *step* and :math:`f` *evaluation counters*. After that, it *computes* and *prints*
-the *maximum global error* via ``MPI_Reduce``. Afterwards, it *computes* and *prints* all the relevant performance
+``FCVBBDPrecReInit``, and ``FSUNLinSol_SPGMRSetPrecType`` to re-initialize with preconditioning
+on the right, as stated in the print statement.  This is all that is needed to prepare for the second run of our
+Diagonal PDE.  Meanwhile, in the second one, while :code:`iPreType == 1`, we only print out the noted fact that
+we now have preconditioning on the left.  After this, in a loop over :math:`t_{out}` values, it calls
+``FCVode`` and prints the step and :math:`f` evaluation counters. After that, it computes and prints
+the maximum global error via ``MPI_Reduce``. Afterwards, it computes and prints all the relevant performance
 counters, such as:
 
-* ``nst`` (internal *solver steps*),
-* ``nfe`` (total *right-hand side* evaluations),
-* ``npre`` (total *preconditioner* setups),
-* ``npsol`` (total *preconditioner* solves),
-* ``nni`` (total *nonlinear iterations*),
-* ``nli`` (total *linear iterations*),
-* ``avdim`` :math:`\bigg(` average *Krylov subspace dimension* :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
-* ``ncfn`` (total *convergence failures* -- *nonlinear*),
-* ``ncfl`` (total *convergence failures* -- *linear*),
-* ``netf`` (total number of *error test failures*),
-* ``lenrw`` and ``leniw`` (main solver *real/int workspace sizes*),
-* ``lenrwls`` and ``leniwls`` (linear solver *real/int workspace sizes*),
-* ``lenrwbbd`` and ``leniwbbd`` (*BBD preconditioner real/int workspace sizes*),
-* ``ngebbd`` (total number of :math:`g` *evaluations* by *BBD preconditioner*).
-
-Finally, it *frees memory* and terminates **MPI** via the subroutines ``FCVodeFree``, ``FN_VDestroy``,
+* ``nst`` (internal solver steps),
+* ``nfe`` (total right-hand side evaluations),
+* ``npre`` (total preconditioner setups),
+* ``npsol`` (total preconditioner solves),
+* ``nni`` (total nonlinear iterations),
+* ``nli`` (total linear iterations),
+* ``avdim`` :math:`\bigg(` average Krylov subspace dimension :math:`= \frac{\texttt{nliters}}{\texttt{nniters}} \bigg)`,
+* ``ncfn`` (total convergence failures -- nonlinear),
+* ``ncfl`` (total convergence failures -- linear),
+* ``netf`` (total number of error test failures),
+* ``lenrw`` and ``leniw`` (main solver real/int workspace sizes),
+* ``lenrwls`` and ``leniwls`` (linear solver real/int workspace sizes),
+* ``lenrwbbd`` and ``leniwbbd`` (BBD preconditioner real/int workspace sizes),
+* ``ngebbd`` (total number of :math:`g` evaluations by BBD preconditioner).
+
+Finally, it frees memory and terminates MPI via the subroutines ``FCVodeFree``, ``FN_VDestroy``,
 ``MPI_Barrier``, and ``MPI_Finalize``.  Notice that in the ``firhs`` function, outside of
 the main ``driver`` routine, the local processor index ``myid`` and the local vector size ``nlocal``
-are used to form the *module-specific index values* needed to evaluate the *right-hand side* of our Equation :eq:`diagode`.
+are used to form the module-specific index values needed to evaluate the right-hand side of our Equation :eq:`diagode`.
 
 Program output
 ---------------
 
 The following is a sample output from ``cv_diag_kry_bbd_p``, with `nprocs = 4`.
-As expected, the performance is identical for *left* vs *right preconditioning*.
+As expected, the performance is identical for left vs right preconditioning.
 
-.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
+   :language: text
diff --git a/doc/cvode/examples/source/f2003_parallel.rst b/doc/cvode/examples/source/f2003_parallel.rst
index 164fccdbfa..9fbe96ae0b 100644
--- a/doc/cvode/examples/source/f2003_parallel.rst
+++ b/doc/cvode/examples/source/f2003_parallel.rst
@@ -48,8 +48,8 @@ conditions :math:`y_i=1` and evolves for the time interval :math:`t\in
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_bbd_f2003.out
+   :language: text
 
 
 Numerical method
@@ -57,7 +57,7 @@ Numerical method
 
 This program solves the problem with a BDF method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module and CVode interface.
+solver module.
 
 A diagonal preconditioner matrix is used, formed automatically through
 difference quotients within the CVBBDPRE module.  Since CVBBDPRE is
@@ -88,8 +88,8 @@ in ``cv_diag_kry_bbd_p``.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_parallel/cv_diag_kry_f2003.out
+   :language: text
 
 
 Numerical method
@@ -97,7 +97,7 @@ Numerical method
 
 This program solves the problem with a BDF method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module and CVode interface.
+solver module.
 
 A user-supplied preconditioner matrix is used, where in the solver
 routine uses a diagonal preconditioner :math:`P = I - \gamma \cdot J`,
@@ -140,15 +140,15 @@ conditions :math:`y_i=1` and evolves for the time interval :math:`t\in [0,1]`.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_parallel/cv_diag_non_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_parallel/cv_diag_non_f2003.out
+   :language: text
 
 
 Numerical method
 -----------------
 
 This program solves the problem with an ADAMS method, using a Fixed-point
-iteration and CVode interface.
+iteration.
 
 Performance data is printed at equally-spaced output times, and maximum
 errors and final performance counters are printed on completion.
diff --git a/doc/cvode/examples/source/f2003_serial.rst b/doc/cvode/examples/source/f2003_serial.rst
index b70611f5a6..c9b3bc373a 100644
--- a/doc/cvode/examples/source/f2003_serial.rst
+++ b/doc/cvode/examples/source/f2003_serial.rst
@@ -38,8 +38,8 @@ previous serial C example ``cvAdvDiff_bnd``.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out
+   :language: text
 
 
 Numerical method
@@ -77,8 +77,8 @@ to result in a well-posed ODE; for values with magnitude larger than
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_fp_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_analytic_fp_f2003.out
+   :language: text
 
 
 Numerical method
@@ -90,7 +90,7 @@ The example file contains a function to evaluate :math:`f(t,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol = 10^{-6}`
 and :math:`atol = 10^{-10}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 Output is printed every 1.0 units of time (10 total).
 Run statistics (optional outputs) are printed at the end.
@@ -163,8 +163,8 @@ Run statistics (optional outputs) are printed at the end.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_f2003.out
+   :language: text
 
 
 Numerical method
@@ -173,12 +173,12 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver.  The example file
 contains a function to evaluate :math:`f(t,y)`.
 
 We specify the relative and absolute tolerances, :math:`rtol=10^{-6}`
 and :math:`atol=10^{-10}`, respectively.  Aside from these choices,
-this problem uses only the default CVode solver parameters.
+this problem uses only the default CVODE solver parameters.
 
 
 .. _cv_analytic_sys_dns_jac:
@@ -196,8 +196,8 @@ that here, as the title suggests, we provide a user-supplied Jacobian function.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_jac_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_dns_jac_f2003.out
+   :language: text
 
 
 Numerical method
@@ -219,14 +219,14 @@ Description
 
 This problem is exactly the same as :ref:`cv_analytic_sys_dns` above except
 that here, as the title suggests, we use sparse matrices to operate the
-KLU linear solver module using the CVode interface.
+KLU linear solver module.
 
 
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_klu_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_analytic_sys_klu_f2003.out
+   :language: text
 
 
 Numerical method
@@ -266,8 +266,8 @@ After each unit time interval, the solution is output to the screen.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_brusselator_dns_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_brusselator_dns_f2003.out
+   :language: text
 
 
 Numerical method
@@ -275,10 +275,10 @@ Numerical method
 
 Since this driver and utility functions are written in Fortran 2003,
 this example demonstrates the use of the FCVODE interface for the
-CVode solver.  For time integration, the solver uses a BDF method.
+CVODE solver.  For time integration, the solver uses a BDF method.
 The implicit systems are solved using the built-in modified Newton
 iteration, with the SUNMATRIX_DENSE matrix module and accompanying
-SUNLINSOL_DENSE linear solver module, through the CVode interface.
+SUNLINSOL_DENSE linear solver module.
 Both the Jacobian routine and right-hand side functions are supplied
 by functions provided in the example file.
 
@@ -336,8 +336,8 @@ We enforce the initial conditions
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out
+   :language: text
 
 
 Numerical method
@@ -347,14 +347,14 @@ We employ a method of lines approach, wherein we first semi-discretize
 in space to convert the system of 2 PDEs into a larger system of ODEs.
 To this end, the spatial derivatives are computed using second-order
 centered differences, with the data distributed over :math:`Mx*My`
-points on a uniform spatial grid.  As a result, CVode approaches the
+points on a uniform spatial grid.  As a result, CVODE approaches the
 problem as one involving :math:`2*Mx*My` coupled ODEs. In this
 problem, we use a relatively coarse uniform mesh with
 :math:`Mx = My = 10`.
 
 This program solves the problem with a BDF method, using a Newton
 iteration with the preconditioned SUNLINSOL_SPGMR iterative linear
-solver module, and the CVODE interface.
+solver module.
 
 The left preconditioner used is a banded matrix, constructed using
 the CVBANDPRE module.  The banded preconditioner matrix is generated using
@@ -386,8 +386,8 @@ This method is employed to setup our user-supplied Preconditioner.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_diurnal_kry_f2003.out
+   :language: text
 
 
 Numerical method
@@ -437,8 +437,8 @@ with the dense linear solver, and a user-supplied Jacobian routine.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_f2003.out
+   :language: text
 
 
 Numerical method
@@ -447,16 +447,16 @@ Numerical method
 The example routine solves this problem using a Backwards Differentiation
 Formula in fixed-leading coefficient form.  Each stage is solved using the
 built-in modified Newton iteration.  Internally, Newton will use the
-SUNLINSOL_DENSE linear solver via the CVode interface.  The example file
+SUNLINSOL_DENSE linear solver.  The example file
 contains functions to evaluate both :math:`f(t, y_1, y_2, y_3)` and
 :math:`J(t, y_1, y_2, y_3)`.  Additionally, a root-finding function will,
 as previously mentioned, find roots at :math:`y_3 = 0.01` and
-:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVode.
+:math:`y_1 = 10^{-4}` using the built-in root-finding mechanism in CVODE.
 
 We specify the scalar relative and vector-valued absolute tolerances, :math:`rtol=10^{-4}`
 and :math:`atol=\begin{Bmatrix} 10^{-8} \\ 10^{-14} \\ 10^{-6} \end{Bmatrix}`
 , respectively.  Aside from these choices, this problem uses only the default
-CVode solver parameters.
+CVODE solver parameters.
 
 11 normal + 2 root output times are printed at multiplicatively equally-spaced
 points as well as at the two roots, and run statistics are printed at the end.
@@ -477,8 +477,8 @@ constraint :math:`y_i \geq 0` is posed for all components :math:`i = 1, 2, 3`.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_constraints_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_roberts_dns_constraints_f2003.out
+   :language: text
 
 
 Numerical method
@@ -525,18 +525,17 @@ solutions attain desired target values.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_dnsL_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_roberts_dnsL_f2003.out
+   :language: text
 
 
 Numerical method
 ----------------
 
 This program solves the problem with a BDF method, using a Newton
-iteration with the SUNLINSOL_LAPACKDENSE linear solver module and
-CVode interface.
+iteration with the SUNLINSOL_LAPACKDENSE linear solver module.
 
-As with the :ref:`cv_roberts_dns` problem, we enable CVode's
+As with the :ref:`cv_roberts_dns` problem, we enable CVODE's
 rootfinding module to find the times at which either :math:`u=10^{-4}`
 or :math:`w=10^{-2}`.
 
@@ -564,8 +563,8 @@ solver.
 Problem output
 ---------------
 
-.. include:: ../../../../examples/cvode/F2003_serial/cv_roberts_klu_f2003.out
-   :literal:
+.. literalinclude:: ../../../../examples/cvode/F2003_serial/cv_roberts_klu_f2003.out
+   :language: text
 
 
 Numerical method

From 32628f1e35b043db42bdf378d96805e03bac33f6 Mon Sep 17 00:00:00 2001
From: "Daniel R. Reynolds" <reynolds@smu.edu>
Date: Tue, 21 Nov 2023 09:16:43 -0600
Subject: [PATCH 35/35] Minor cleanup, and reorganization of section order

---
 doc/cvode/examples/source/c_cuda.rst          |   6 +-
 doc/cvode/examples/source/c_mpimanyvec.rst    |   6 +-
 doc/cvode/examples/source/c_openmp.rst        |   6 +-
 doc/cvode/examples/source/c_openmpdev.rst     |   6 +-
 doc/cvode/examples/source/c_parallel.rst      |   6 +-
 doc/cvode/examples/source/c_parallel_deep.rst |   6 +-
 doc/cvode/examples/source/c_parhyp.rst        |   6 +-
 doc/cvode/examples/source/c_parhyp_deep.rst   |   6 +-
 doc/cvode/examples/source/c_raja.rst          |   6 +-
 doc/cvode/examples/source/c_serial.rst        |   6 +-
 doc/cvode/examples/source/c_serial_deep.rst   |   6 +-
 doc/cvode/examples/source/c_tests_deep.rst    |   9 +-
 doc/cvode/examples/source/cpp_hypre.rst       |   6 +-
 doc/cvode/examples/source/cpp_onemkl.rst      |   6 +-
 doc/cvode/examples/source/cpp_parallel.rst    |   6 +-
 doc/cvode/examples/source/cpp_serial.rst      |   6 +-
 doc/cvode/examples/source/cpp_sycl.rst        |   6 +-
 doc/cvode/examples/source/f2003_deep.rst      |   6 +-
 doc/cvode/examples/source/f2003_parallel.rst  |   6 +-
 doc/cvode/examples/source/f2003_serial.rst    |   6 +-
 doc/cvode/examples/source/index.rst           | 106 +++++++++---------
 21 files changed, 116 insertions(+), 113 deletions(-)

diff --git a/doc/cvode/examples/source/c_cuda.rst b/doc/cvode/examples/source/c_cuda.rst
index 95d65be728..4caba8a52c 100644
--- a/doc/cvode/examples/source/c_cuda.rst
+++ b/doc/cvode/examples/source/c_cuda.rst
@@ -17,9 +17,9 @@
 
 .. _cuda_c:
 
-====================================
-CUDA C example problems
-====================================
+===============
+CUDA C Examples
+===============
 
 
 
diff --git a/doc/cvode/examples/source/c_mpimanyvec.rst b/doc/cvode/examples/source/c_mpimanyvec.rst
index 9631ad7ded..0938da7f87 100644
--- a/doc/cvode/examples/source/c_mpimanyvec.rst
+++ b/doc/cvode/examples/source/c_mpimanyvec.rst
@@ -16,9 +16,9 @@
 
 .. _mpimanyvec_c:
 
-===================================================
-Parallel MPIManyVector C example problems
-===================================================
+=================================
+Parallel MPIManyVector C Examples
+=================================
 
 
 
diff --git a/doc/cvode/examples/source/c_openmp.rst b/doc/cvode/examples/source/c_openmp.rst
index 8cd303edeb..51286b0997 100644
--- a/doc/cvode/examples/source/c_openmp.rst
+++ b/doc/cvode/examples/source/c_openmp.rst
@@ -16,9 +16,9 @@
 
 .. _openmp_c:
 
-====================================
-OpenMP C example problems
-====================================
+=================
+OpenMP C Examples
+=================
 
 
 
diff --git a/doc/cvode/examples/source/c_openmpdev.rst b/doc/cvode/examples/source/c_openmpdev.rst
index 34215906e3..87192a66ec 100644
--- a/doc/cvode/examples/source/c_openmpdev.rst
+++ b/doc/cvode/examples/source/c_openmpdev.rst
@@ -16,9 +16,9 @@
 
 .. _openmpdev_c:
 
-============================================
-OpenMP Device Offload C example problems
-============================================
+================================
+OpenMP Device Offload C Examples
+================================
 
 
 
diff --git a/doc/cvode/examples/source/c_parallel.rst b/doc/cvode/examples/source/c_parallel.rst
index 73d51e05f9..6b15d8deed 100644
--- a/doc/cvode/examples/source/c_parallel.rst
+++ b/doc/cvode/examples/source/c_parallel.rst
@@ -16,9 +16,9 @@
 
 .. _parallel_c:
 
-====================================
-Parallel C example problems
-====================================
+===================
+Parallel C Examples
+===================
 
 
 
diff --git a/doc/cvode/examples/source/c_parallel_deep.rst b/doc/cvode/examples/source/c_parallel_deep.rst
index 81ca1ba18e..4c339b111f 100644
--- a/doc/cvode/examples/source/c_parallel_deep.rst
+++ b/doc/cvode/examples/source/c_parallel_deep.rst
@@ -17,9 +17,9 @@
 
 .. _parallel_deep_c:
 
-====================================================
-Parallel C example problems -- Deep dive
-====================================================
+============================
+Detailed Parallel C Examples
+============================
 
 
 
diff --git a/doc/cvode/examples/source/c_parhyp.rst b/doc/cvode/examples/source/c_parhyp.rst
index bb2858f122..0d548846a9 100644
--- a/doc/cvode/examples/source/c_parhyp.rst
+++ b/doc/cvode/examples/source/c_parhyp.rst
@@ -16,9 +16,9 @@
 
 .. _parhyp_c:
 
-====================================
-Parallel Hypre C example problems
-====================================
+=========================
+Parallel Hypre C Examples
+=========================
 
 
 
diff --git a/doc/cvode/examples/source/c_parhyp_deep.rst b/doc/cvode/examples/source/c_parhyp_deep.rst
index 030fff5100..83b7e2f4ee 100644
--- a/doc/cvode/examples/source/c_parhyp_deep.rst
+++ b/doc/cvode/examples/source/c_parhyp_deep.rst
@@ -17,9 +17,9 @@
 
 .. _parhyp_deep_c:
 
-==================================================
-Parallel HYPRE C example problems -- Deep dive
-==================================================
+==================================
+Detailed Parallel HYPRE C Examples
+==================================
 
 
 
diff --git a/doc/cvode/examples/source/c_raja.rst b/doc/cvode/examples/source/c_raja.rst
index d92c4377b2..96a02380b9 100644
--- a/doc/cvode/examples/source/c_raja.rst
+++ b/doc/cvode/examples/source/c_raja.rst
@@ -17,9 +17,9 @@
 
 .. _raja_c:
 
-====================================
-RAJA C example problems
-====================================
+===============
+RAJA C Examples
+===============
 
 
 
diff --git a/doc/cvode/examples/source/c_serial.rst b/doc/cvode/examples/source/c_serial.rst
index 99a85170c4..e2978a2f25 100644
--- a/doc/cvode/examples/source/c_serial.rst
+++ b/doc/cvode/examples/source/c_serial.rst
@@ -17,9 +17,9 @@
 
 .. _serial_c:
 
-====================================
-Serial C example problems
-====================================
+=================
+Serial C Examples
+=================
 
 
 
diff --git a/doc/cvode/examples/source/c_serial_deep.rst b/doc/cvode/examples/source/c_serial_deep.rst
index 38e6191bf3..d74b39f45a 100644
--- a/doc/cvode/examples/source/c_serial_deep.rst
+++ b/doc/cvode/examples/source/c_serial_deep.rst
@@ -17,9 +17,9 @@
 
 .. _serial_deep_c:
 
-============================================
-Serial C example problems -- Deep dive
-============================================
+==========================
+Detailed Serial C Examples
+==========================
 
 
 
diff --git a/doc/cvode/examples/source/c_tests_deep.rst b/doc/cvode/examples/source/c_tests_deep.rst
index 282f6ffc59..9fae951dc8 100644
--- a/doc/cvode/examples/source/c_tests_deep.rst
+++ b/doc/cvode/examples/source/c_tests_deep.rst
@@ -17,9 +17,6 @@
 
 .. _tests_deep_c:
 
-=========================================================
-C example problems -- Parallel tests -- Deep Dive
-=========================================================
-
-
-
+=========================
+Detailed C Parallel Tests
+=========================
diff --git a/doc/cvode/examples/source/cpp_hypre.rst b/doc/cvode/examples/source/cpp_hypre.rst
index c4fd561a34..1e4a06ed2b 100644
--- a/doc/cvode/examples/source/cpp_hypre.rst
+++ b/doc/cvode/examples/source/cpp_hypre.rst
@@ -17,9 +17,9 @@
 
 .. _hypre_cpp:
 
-============================================
-Parallel Hypre C++ example problems
-============================================
+===========================
+Parallel Hypre C++ Examples
+===========================
 
 .. _cv_heat2D_hypre_ls:
 
diff --git a/doc/cvode/examples/source/cpp_onemkl.rst b/doc/cvode/examples/source/cpp_onemkl.rst
index 52f7439592..013698ba23 100644
--- a/doc/cvode/examples/source/cpp_onemkl.rst
+++ b/doc/cvode/examples/source/cpp_onemkl.rst
@@ -17,9 +17,9 @@
 
 .. _onemkl_cpp:
 
-====================================
-OneMKL C++ example problems
-====================================
+===================
+OneMKL C++ Examples
+===================
 
 .. _cvRoberts_blockdiag_onemkl:
 
diff --git a/doc/cvode/examples/source/cpp_parallel.rst b/doc/cvode/examples/source/cpp_parallel.rst
index 12073c0254..85e0d6d8ad 100644
--- a/doc/cvode/examples/source/cpp_parallel.rst
+++ b/doc/cvode/examples/source/cpp_parallel.rst
@@ -17,9 +17,9 @@
 
 .. _parallel_cpp:
 
-====================================
-Parallel C++ example problems
-====================================
+=====================
+Parallel C++ Examples
+=====================
 
 
 
diff --git a/doc/cvode/examples/source/cpp_serial.rst b/doc/cvode/examples/source/cpp_serial.rst
index e31c9aae70..17e0d60d80 100644
--- a/doc/cvode/examples/source/cpp_serial.rst
+++ b/doc/cvode/examples/source/cpp_serial.rst
@@ -17,9 +17,9 @@
 
 .. _serial_cpp:
 
-====================================
-Serial C++ example problems
-====================================
+===================
+Serial C++ Examples
+===================
 
 
 
diff --git a/doc/cvode/examples/source/cpp_sycl.rst b/doc/cvode/examples/source/cpp_sycl.rst
index 218fe3e5cf..999ecf2680 100644
--- a/doc/cvode/examples/source/cpp_sycl.rst
+++ b/doc/cvode/examples/source/cpp_sycl.rst
@@ -17,9 +17,9 @@
 
 .. _sycl_cpp:
 
-====================================
-SYCL C++ example problems
-====================================
+=================
+SYCL C++ Examples
+=================
 
 .. _cvAdvDiff_kry_sycl:
 
diff --git a/doc/cvode/examples/source/f2003_deep.rst b/doc/cvode/examples/source/f2003_deep.rst
index 33544276aa..31af32f9df 100644
--- a/doc/cvode/examples/source/f2003_deep.rst
+++ b/doc/cvode/examples/source/f2003_deep.rst
@@ -17,9 +17,9 @@
 
 .. _deep_f2003:
 
-===================================================
-Fortran 2003 example problems -- Deep dive
-===================================================
+==============================
+Detailed Fortran 2003 Examples
+==============================
 
 The Fortran example problem programs supplied with the CVODE
 package are all written in standard Fortran 2003 and use double precision
diff --git a/doc/cvode/examples/source/f2003_parallel.rst b/doc/cvode/examples/source/f2003_parallel.rst
index 9fbe96ae0b..2440b5ef69 100644
--- a/doc/cvode/examples/source/f2003_parallel.rst
+++ b/doc/cvode/examples/source/f2003_parallel.rst
@@ -17,9 +17,9 @@
 
 .. _parallel_f2003:
 
-=========================================
-Parallel Fortran 2003 example problems
-=========================================
+==============================
+Parallel Fortran 2003 Examples
+==============================
 
 
 
diff --git a/doc/cvode/examples/source/f2003_serial.rst b/doc/cvode/examples/source/f2003_serial.rst
index c9b3bc373a..092115a3fe 100644
--- a/doc/cvode/examples/source/f2003_serial.rst
+++ b/doc/cvode/examples/source/f2003_serial.rst
@@ -17,9 +17,9 @@
 
 .. _serial_f2003:
 
-=======================================
-Serial Fortran 2003 example problems
-=======================================
+============================
+Serial Fortran 2003 Examples
+============================
 
 
 
diff --git a/doc/cvode/examples/source/index.rst b/doc/cvode/examples/source/index.rst
index 489b97d3a3..5aea1815f3 100644
--- a/doc/cvode/examples/source/index.rst
+++ b/doc/cvode/examples/source/index.rst
@@ -31,11 +31,13 @@ Documentation of CVODE :cite:p:`cvode_ug`.  It provides details, with
 listings, on many of the example programs supplied with the CVODE
 distribution package.
 
-This document describes CVODE examples of the following types: serial
-C examples, parallel C examples, an OpenMP example, and a *hypre*
-example.  With the exception of "demo"-type example files, the names of
-all the examples  are of the form ``[slv][PbName]_[ls]_[prec]_[p]``,
-where
+This document provides detailed descriptions of CVODE examples of the
+following types: serial C examples, parallel C examples, an OpenMP
+example, and a *hypre* example.  Additionally, it provides high level
+descriptions of all remaining CVODE examples.
+
+With the exception of "demo"-type example files, the names of all the
+examples are of the form ``[slv][PbName]_[ls]_[prec]_[p]``, where
 
 * ``[slv]`` identifies the solver (for CVODE examples this is ``cv``;
 
@@ -58,8 +60,45 @@ the problem that is most closely related to your own.  We group these
 examples according to programming language (C, C++, Fortran 2003).
 
 
+
+Detailed examples
+=================
+
+Deep dives into CVODE example problems written in C are listed below.
+
+.. cssclass:: table-bordered
+
+======================================   ========================
+Problem                                  Example Type
+======================================   ========================
+:ref:`deep_dive.cvRoberts_dns`            serial
+:ref:`deep_dive.cvAdvDiff_bnd`            serial
+:ref:`deep_dive.cvDiurnal_kry`            serial
+:ref:`deep_dive.cvAdvDiff_non_p`          parallel
+:ref:`deep_dive.cvDiurnal_kry_p`          parallel
+:ref:`deep_dive.cvDiurnal_kry_bbd_p`      parallel
+:ref:`deep_dive.cvAdvDiff_non_ph`         HYPRE parallel
+======================================   ========================
+
+
+
+Deep dives into CVODE example problems written in Fortran 2003 are listed
+below.
+
+.. cssclass:: table-bordered
+
+======================================   =================
+Problem                                  Example Type
+======================================   =================
+:ref:`deep_dive.cv_diurnal_kry`           serial
+:ref:`deep_dive.cv_diag_kry_bbd_p`        parallel
+======================================   =================
+
+
+
+
 Tables of Examples
-==========================
+==================
 
 C Examples
 -----------
@@ -106,24 +145,6 @@ Problem                              Integrator    Nonlinear     Linear      Siz
 :ref:`cvAdvDiff_kry_raja`            BDF           Newton        SPGMR       50             RAJA N_Vector module, RHS, and Jacobian product routines
 ==================================== ============  ============  ==========  =============  =========================================================
 
-C Examples Deep Dives
-----------------------
-
-Deep dives into CVODE example problems written in C are listed below.
-
-.. cssclass:: table-bordered
-
-======================================   ========================
-Problem                                  Example Type
-======================================   ========================
-:ref:`deep_dive.cvRoberts_dns`            serial
-:ref:`deep_dive.cvAdvDiff_bnd`            serial
-:ref:`deep_dive.cvDiurnal_kry`            serial
-:ref:`deep_dive.cvAdvDiff_non_p`          parallel
-:ref:`deep_dive.cvDiurnal_kry_p`          parallel
-:ref:`deep_dive.cvDiurnal_kry_bbd_p`      parallel
-:ref:`deep_dive.cvAdvDiff_non_ph`         HYPRE parallel
-======================================   ========================
 
 C++ Examples
 -------------
@@ -173,32 +194,17 @@ Problem                             Integrator  Nonlinear    Linear  Size
 :ref:`cv_diag_non_p`                ADAMS       Fixed-point          128            parallel MPI
 =================================   ==========  ===========  ======  =============  =================================================
 
-Fortran Deep Dives
--------------------
-
-Deep dives into CVODE example problems written in Fortran 2003 are listed
-below.
-
-.. cssclass:: table-bordered
-
-======================================   =================
-Problem                                  Example Type
-======================================   =================
-:ref:`deep_dive.cv_diurnal_kry`           serial
-:ref:`deep_dive.cv_diag_kry_bbd_p`        parallel
-======================================   =================
 
 
 Full Section List of Examples and Deep Dives
 ====================================================
 
-In the following sections, we give high-level descriptions of all CVODE examples,
-as well as detailed descriptions ("deep dives") of some examples.  We also give
-our output files for each of these examples, but users should be cautioned that
-their results may differ slightly from these.  Differences in solution
-values may differ within the tolerances, and differences in cumulative
-counters, such as numbers of steps or Newton iterations, may differ
-from one machine environment to another by as much as 10% to 20%.
+The following sections provide the detailed "deep dive" examples, followed by the
+high-level descriptions of all CVODE examples.  For each example we show
+our output files, but users should be cautioned that their results may differ
+slightly from these.  Differences in solution values may differ within the tolerances,
+and differences in cumulative counters, such as numbers of steps or Newton iterations,
+may differ from one machine environment to another by as much as 10% to 20%.
 
 In the descriptions below, we make frequent references to the CVODE
 User Document :cite:p:`cvode_ug`.  All citations to specific sections
@@ -220,6 +226,11 @@ otherwise.
 .. toctree::
    :maxdepth: 1
 
+   c_serial_deep
+   c_parallel_deep
+   c_parhyp_deep
+   c_tests_deep
+   f2003_deep
    c_serial
    c_openmp
    c_openmpdev
@@ -228,10 +239,6 @@ otherwise.
    c_mpimanyvec
    c_cuda
    c_raja
-   c_serial_deep
-   c_parallel_deep
-   c_parhyp_deep
-   c_tests_deep
    cpp_serial
    cpp_parallel
    cpp_hypre
@@ -239,7 +246,6 @@ otherwise.
    cpp_sycl
    f2003_serial
    f2003_parallel
-   f2003_deep
    References
 
 .. only:: html